mythinstall: update for mythtv 0.28 and QT5

1 files changed, 10 insertions, 13 deletions

diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/xorgsettings.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/xorgsettings.cpp
index 00a375e..d8f35af 100755
--- a/abs/core/mythinstall/MythVantage-app/mythinstall/xorgsettings.cpp
+++ b/abs/core/mythinstall/MythVantage-app/mythinstall/xorgsettings.cpp
@@ -1,9 +1,6 @@
 #include <unistd.h>
 
-
-
-//Added by qt3to4:
-#include <Q3TextStream>
+#include <QTextStream>
 #include "mythcontext.h"
 //#include "tv.h"
 #include <stdlib.h>
@@ -25,8 +22,8 @@ void ReadDDCvalues (void)
     QFile file("/tmp/ddcinfo");
     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();
             if  ( line.contains("Timing ranges:") )
@@ -43,7 +40,7 @@ void ReadDDCvalues (void)
         file.close();
     }
 };
-
+/*
 static HostCheckBox *HostXUseAdvanced()
 {
     HostCheckBox *gc = new HostCheckBox("HostXUseAdvanced");
@@ -64,7 +61,7 @@ static HostComboBox *HostXgeneric_connection()
     gc->setHelpText(QObject::tr("Video-out"));
     return gc;
 }
-
+*/
 
 static HostCheckBox *HostXIgnoreEDID()
 {
@@ -157,8 +154,8 @@ void AdvancedXGeneric_modelines::generic_fillselection(QString modelinefile )
         QFile file(currentfile);
         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();
                 if ( line.startsWith("ModeLine"))
@@ -363,8 +360,8 @@ void AdvancedXNvidia_modelines::Nvidia_fillselection(QString modelinefile )
         QFile file(currentfile);
         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();
                 if ( line.startsWith("ModeLine"))
@@ -512,7 +509,7 @@ AdvancedXcardtype::AdvancedXcardtype():
     addChild(HostXcardtype);
     setTrigger(HostXcardtype);
 
-    AdvancedXGeneric_modelines *ADVANCEDXGENERICMODELINES = new AdvancedXGeneric_modelines;
+    //AdvancedXGeneric_modelines *ADVANCEDXGENERICMODELINES = new AdvancedXGeneric_modelines;
     AdvancedXNvidiaConnections *ADVANCEDXNVIDIACONNECTIONS = new AdvancedXNvidiaConnections;