summaryrefslogtreecommitdiffstats
path: root/abs/core/mythinstall/MythVantage-app/mythinstall/installationtype.cpp
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2016-03-22 19:32:09 (GMT)
committerBritney Fransen <brfransen@gmail.com>2016-03-22 19:32:09 (GMT)
commit6de33c4a76f1aa43608a4f68318e648222fdefe8 (patch)
treef52671d263abc730df1d12415667cef90f64b90b /abs/core/mythinstall/MythVantage-app/mythinstall/installationtype.cpp
parent4cc2306549593b5738e84772aa3a5db3e7801954 (diff)
downloadlinhes_pkgbuild-6de33c4a76f1aa43608a4f68318e648222fdefe8.zip
linhes_pkgbuild-6de33c4a76f1aa43608a4f68318e648222fdefe8.tar.gz
linhes_pkgbuild-6de33c4a76f1aa43608a4f68318e648222fdefe8.tar.bz2
mythinstall: update for mythtv 0.28 and QT5
Diffstat (limited to 'abs/core/mythinstall/MythVantage-app/mythinstall/installationtype.cpp')
-rwxr-xr-xabs/core/mythinstall/MythVantage-app/mythinstall/installationtype.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installationtype.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/installationtype.cpp
index 80bd5d5..9fa3b1a 100755
--- a/abs/core/mythinstall/MythVantage-app/mythinstall/installationtype.cpp
+++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installationtype.cpp
@@ -1,8 +1,7 @@
#include <mythcontext.h>
#include <unistd.h>
#include "installationtype.h"
-//Added by qt3to4:
-#include <Q3TextStream>
+#include <QTextStream>
#include <qdir.h>
#include "mv_common.h"
@@ -94,11 +93,11 @@ static HostSpinBox *HOSTSWAPsize()
QFile file("/proc/meminfo");
if ( file.open(QIODevice::ReadOnly | QIODevice::Text) )
{
- Q3TextStream t( &file ); // use a text stream
+ QTextStream t( &file ); // use a text stream
line = t.readLine();
if ( line.startsWith("MemTotal:"))
{
- currentitem = line.simplifyWhiteSpace();
+ currentitem = line.trimmed();
currentitem = currentitem.section( " ", 1, 1 );
}
}