1 files changed, 11 insertions, 14 deletions
diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp
index 95a0bd0..8f5926f 100755
--- a/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp
+++ b/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp
@@ -1,7 +1,4 @@
 //#include <qapplication.h>
-//Added by qt3to4:
-#include <Q3TextStream>
-
 
 #include "installdialog.h"
 #include "installsettings.h"
@@ -16,7 +13,7 @@
 #include <QApplication>
 #include <QFileInfo>
 #include <QDir>
-
+#include <QTextStream>
 
 
 #include <cstdlib>
@@ -151,7 +148,8 @@ int main(int argc, char **argv)
       bShowSettings = true;
       LOG(VB_GENERAL, LOG_INFO, QString("mythinstall: Screen stuff"));
       QString tmpArg = (cmdline.toString("screen")) ;
-      QStringList pairs = QStringList::split(",", tmpArg);
+//      QStringList pairs = QStringList::split(",", tmpArg);
+      QStringList pairs = tmpArg.split(",");
         for (int index = 0; index < pairs.size(); ++index)
         {
             if ( pairs[index]  == "network" )
@@ -401,10 +399,9 @@ int main(int argc, char **argv)
         int status = system("diff /tmp/systemconfig.bak /etc/systemconfig");
         bool restart = false;
         //save my settings in case db switches
-        QString cmdtxt;
-        cmdtxt=MV_ROOT  ;
-        cmdtxt.append("bin/myth_settings_wrapper.sh -c save -t syssettings  -d "  + olddb);
-        system(cmdtxt);
+        QString cmdtxt=MV_ROOT;
+        cmdtxt.append("bin/myth_settings_wrapper.sh -c save -t syssettings  -d " + olddb);
+        system(qPrintable(cmdtxt));
 
         if ( status != 0 )
         {
@@ -417,9 +414,9 @@ int main(int argc, char **argv)
             restart = true;
             //db changed save setting from olddb
             QString cmdtxt;
-            cmdtxt=MV_ROOT  ;
+            cmdtxt=MV_ROOT;
             cmdtxt.append("bin/myth_settings_wrapper.sh -c save  -t  syssettings  -d " + olddb ) ;
-            system(cmdtxt);
+            system(qPrintable(cmdtxt));
         }
 
         if ( runconfig )
@@ -460,7 +457,7 @@ int main(int argc, char **argv)
             QString cmdtxt;
             cmdtxt=MV_ROOT  ;
             cmdtxt.append("bin/systemconfig.sh  reloadfe" );
-            system(cmdtxt);
+            system(qPrintable(cmdtxt));
         }
         gCoreContext->ActivateSettingsCache(false);
         gCoreContext->ClearSettingsCache();
@@ -596,8 +593,8 @@ int main(int argc, char **argv)
         QFile file("/usr/MythVantage/README");
         if ( file.open(QIODevice::ReadOnly | QIODevice::Text) )
         {
-            Q3TextStream t( &file );        // use a text stream
-            while ( !t.eof() )
+            QTextStream t( &file );        // use a text stream
+            while ( !t.atEnd() )
             {
                 line = t.readLine();
                 problems->append(line);