[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia/libkcddb
From:       Richard Lärkäng <richard () goteborg ! utfors ! se>
Date:       2005-07-31 20:29:27
Message-ID: 1122841767.834217.22892.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 441748 by larkang:

Less Q3 compat classes


 M  +2 -2      cddb.h  
 M  +3 -4      cddbplookup.cpp  
 M  +3 -3      cdinfo.h  
 M  +1 -1      client.cpp  
 M  +3 -4      kcmcddb/cddbconfigwidget.cpp  
 M  +2 -3      lookup.h  
 M  +4 -6      sites.cpp  
 M  +3 -3      sites.h  
 M  +3 -4      test/sitestest.cpp  


--- trunk/KDE/kdemultimedia/libkcddb/cddb.h #441747:441748
@@ -24,7 +24,7 @@
 
 #include <qstring.h>
 #include <qpair.h>
-#include <q3valuelist.h>
+#include <qlist.h>
 
 #include <kdelibs_export.h>
 
@@ -37,7 +37,7 @@
     as the first frame of the first track, the
     last one is the start frame of the leadout track.
     */
-  typedef Q3ValueList<uint> TrackOffsetList;
+  typedef QList<uint> TrackOffsetList;
 
   class KDE_EXPORT CDDB
   {
--- trunk/KDE/kdemultimedia/libkcddb/cddbplookup.cpp #441747:441748
@@ -22,8 +22,7 @@
 #include <kdebug.h>
 
 #include "cddbplookup.h"
-//Added by qt3to4:
-#include <Q3CString>
+#include <qbytearray.h>
 
 namespace KCDDB
 {
@@ -105,8 +104,8 @@
     }
 
     kdDebug(60010) << "WRITE: [" << line << "]" << endl;
-    Q3CString buf = line.utf8();
-    buf.append( "\n" );
+    QByteArray buf(line.utf8());
+    buf.append( '\n' );
 
     return socket_->writeBlock( buf.data(), buf.length() );
   }
--- trunk/KDE/kdemultimedia/libkcddb/cdinfo.h #441747:441748
@@ -23,7 +23,7 @@
 #define KCDDB_CDINFO_H
 
 #include <qstringlist.h>
-#include <q3valuelist.h>
+#include <qlist.h>
 #include <kdemacros.h>
 #include <qvariant.h>
 
@@ -88,7 +88,7 @@
 
   };
 
-  typedef Q3ValueList<TrackInfo> TrackInfoList;
+  typedef QList<TrackInfo> TrackInfoList;
 
   class KDE_EXPORT CDInfo
   {
@@ -123,7 +123,7 @@
       class CDInfoPrivate *d;
   };
 
-  typedef Q3ValueList<CDInfo> CDInfoList;
+  typedef QList<CDInfo> CDInfoList;
 }
 
 #endif // KCDDB_CDINFO_H
--- trunk/KDE/kdemultimedia/libkcddb/client.cpp #441747:441748
@@ -237,7 +237,7 @@
       return CDDB::CannotSave;
 
     uint last=0;
-    for (uint i=0; i < (offsetList.count()-2); i++)
+    for (int i=0; i < (offsetList.count()-2); i++)
     {
       if(last >= offsetList[i])
         return CDDB::CannotSave;
--- trunk/KDE/kdemultimedia/libkcddb/kcmcddb/cddbconfigwidget.cpp #441747:441748
@@ -27,8 +27,7 @@
 #include <qcombobox.h>
 #include <qspinbox.h>
 #include <qlineedit.h>
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <qlist.h>
 #include <kfiledialog.h>
 #include <kapplication.h>
 #include <klocale.h>
@@ -58,9 +57,9 @@
 {
     KCDDB::Sites s;
 
-    Q3ValueList<KCDDB::Mirror> sites = s.siteList();
+    QList<KCDDB::Mirror> sites = s.siteList();
     QMap<QString, KCDDB::Mirror> keys;
-    for (Q3ValueList<KCDDB::Mirror>::Iterator it = sites.begin(); it != sites.end(); ++it)
+    for (QList<KCDDB::Mirror>::Iterator it = sites.begin(); it != sites.end(); ++it)
       if ((*it).transport == KCDDB::Lookup::CDDBP)
         keys[(*it).address + "(CDDBP, " + QString::number((*it).port) + ") " + (*it).description] = *it;
       else
--- trunk/KDE/kdemultimedia/libkcddb/lookup.h #441747:441748
@@ -25,13 +25,12 @@
 #include "cddb.h"
 #include "cdinfo.h"
 #include <qobject.h>
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <qlist.h>
 
 namespace KCDDB
 {
   typedef QPair<QString, QString> CDDBMatch;
-  typedef Q3ValueList<CDDBMatch> CDDBMatchList;
+  typedef QList<CDDBMatch> CDDBMatchList;
 
   class Lookup : public CDDB, public QObject
   {
--- trunk/KDE/kdemultimedia/libkcddb/sites.cpp #441747:441748
@@ -21,8 +21,6 @@
 #include <kurl.h>
 #include <kio/netaccess.h>
 #include <qfile.h>
-//Added by qt3to4:
-#include <Q3ValueList>
 #include <QTextStream>
 #include <kdebug.h>
 #include <qregexp.h>
@@ -35,7 +33,7 @@
 
   }
 
-    Q3ValueList<Mirror>
+    QList<Mirror>
   Sites::siteList()
   {
     KURL url;
@@ -53,7 +51,7 @@
     url.addQueryItem( "hello", hello );
     url.addQueryItem( "proto", "5" );
 
-    Q3ValueList<Mirror> result;
+    QList<Mirror> result;
 
     QString tmpFile;
     if( KIO::NetAccess::download( url, tmpFile, 0 ) )
@@ -65,10 +63,10 @@
     return result;
   }
 
-    Q3ValueList<Mirror>
+    QList<Mirror>
   Sites::readFile(const QString& fileName)
   {
-    Q3ValueList<Mirror> result;
+    QList<Mirror> result;
 
     QFile f(fileName);
     if (!f.open(QIODevice::ReadOnly))
--- trunk/KDE/kdemultimedia/libkcddb/sites.h #441747:441748
@@ -20,7 +20,7 @@
 #ifndef KCDDB_SITES_H
 #define KCDDB_SITES_H
 
-#include <q3valuelist.h>
+#include <qlist.h>
 #include "cddb.h"
 #include "lookup.h"
 #include <kdelibs_export.h>
@@ -41,9 +41,9 @@
     public:
       Sites();
 
-      Q3ValueList<Mirror> siteList();
+      QList<Mirror> siteList();
     private:
-      Q3ValueList<Mirror> readFile(const QString& fileName);
+      QList<Mirror> readFile(const QString& fileName);
       Mirror parseLine(const QString& line);
   } ;
 }
--- trunk/KDE/kdemultimedia/libkcddb/test/sitestest.cpp #441747:441748
@@ -22,8 +22,7 @@
 #include <kcmdlineargs.h>
 
 #include "libkcddb/sites.h"
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <qlist.h>
 
   int
 main(int argc, char ** argv)
@@ -38,8 +37,8 @@
 
   kdDebug() << "Sites: " << endl;
 
-  Q3ValueList<Mirror> sites = s.siteList();
-  for (Q3ValueList<Mirror>::Iterator it = sites.begin(); it != sites.end(); ++it)
+  QList<Mirror> sites = s.siteList();
+  for (QList<Mirror>::Iterator it = sites.begin(); it != sites.end(); ++it)
     if ((*it).transport == Lookup::CDDBP)
       kdDebug() << (*it).address << " CDDBP " << (*it).port << " " << (*it).description << endl;
     else
[prev in list] [next in list] [prev in thread] [next in thread]