initial public commit of qt4 portp1

1 files changed, 16 insertions, 14 deletions

diff --git a/microkde/kconfig.cpp b/microkde/kconfig.cpp
index 940196e..12063ca 100644
--- a/microkde/kconfig.cpp
+++ b/microkde/kconfig.cpp
@@ -1,9 +1,11 @@
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qwidget.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 #include "kdebug.h"
 
 #include "kurl.h"
 #include "kstandarddirs.h"
 #include "kconfig.h"
@@ -50,17 +52,17 @@ void KConfig::setGroup( const QString &group )
 //US
 QString KConfig::group() const {
   return mGroup;
 }
 
 //US added method
-QValueList<int> KConfig::readIntListEntry( const QString & key)
+Q3ValueList<int> KConfig::readIntListEntry( const QString & key)
 {
 //  qDebug("KConfig::readIntListEntry key=%s:", key.latin1());
   
-  QValueList<int> result;
+  Q3ValueList<int> result;
 
   QMap<QString,QString>::ConstIterator mit = mStringMap.find( mGroup + key );
   
   if ( mit == mStringMap.end() ) {
     return result;
   }
@@ -108,13 +110,13 @@ QString KConfig::readEntry( const QString &key, const QString &def )
   
   return QString::fromUtf8((*it).latin1());
 }
 
 QSize KConfig::readSizeEntry( const QString &key, QSize* def )
 {
-  QValueList<int> intlist = readIntListEntry(key);
+  Q3ValueList<int> intlist = readIntListEntry(key);
 
   if (intlist.count() < 2)
     {
       if (def)
       return *def;
       else
@@ -191,17 +193,17 @@ QDateTime KConfig::readDateTimeEntry( const QString &key, const QDateTime *def )
   }
 
   return *it;
 }
 
 //US added method
-void KConfig::writeEntry( const QString &key, const QValueList<int> &value)
+void KConfig::writeEntry( const QString &key, const Q3ValueList<int> &value)
 {
   QStringList valuesAsStrings;
 
-  QValueList<int>::ConstIterator it;
+  Q3ValueList<int>::ConstIterator it;
   
   for( it = value.begin(); it != value.end(); ++it )
   {
     valuesAsStrings << QString::number(*it);
   }
   
@@ -243,13 +245,13 @@ void KConfig::writeEntry( const QString & e, const QColor & c )
     l.append( QString::number ( c.blue() ) );
     writeEntry(  e.utf8(), l );
 }
 
 void KConfig::writeEntry( const QString & e, const QSize & s )
 {
-  QValueList<int> intlist;
+  Q3ValueList<int> intlist;
   intlist << s.width() << s.height();
   writeEntry(  e, intlist );
 }
 
 void KConfig::writeEntry( const QString & e , const QFont & f )
 {
@@ -268,26 +270,26 @@ void KConfig::writeEntry( const QString &key, const QDateTime &dt )
 
 void KConfig::load()
 {
   
 
   QFile f( mFileName );
-  if ( !f.open( IO_ReadOnly ) ) {
+  if ( !f.open( QIODevice::ReadOnly ) ) {
       //qDebug("KConfig: could not open file %s ",mFileName.latin1() );
       return;
   }
 
   mBoolMap.clear();
   mStringMap.clear();
   
-  QTextStream t( &f );
-  t.setEncoding( QTextStream::Latin1 );
+  Q3TextStream t( &f );
+  t.setEncoding( Q3TextStream::Latin1 );
   QString line = t.readLine();
 
   while ( !line.isNull() ) {
-    QStringList tokens = QStringList::split( ",", line );
+    QStringList tokens = line.split(',');
     if ( tokens[0] == "bool" ) {
       bool value = false;
       if ( tokens[2] == "1" ) value = true;      
       mBoolMap.insert( tokens[1], value );
     } else if ( tokens[0] == "QString" ) {
       QString value = tokens[2];
@@ -320,21 +322,21 @@ void KConfig::sync()
   KURL path;
   path.setPath(mFileName);
   QString dir=path.directory();
   KStandardDirs::makeDir(dir);
   
   QFile f( mFileName );
-  if ( !f.open( IO_WriteOnly ) ) {
+  if ( !f.open( QIODevice::WriteOnly ) ) {
   
     qDebug("KConfig::sync() Can't open file %s ",mFileName.latin1() );
     
     return;
   }
 
-  QTextStream t( &f );
-  t.setEncoding( QTextStream::Latin1 );
+  Q3TextStream t( &f );
+  t.setEncoding( Q3TextStream::Latin1 );
   QMap<QString,bool>::ConstIterator itBool;
   for( itBool = mBoolMap.begin(); itBool != mBoolMap.end(); ++itBool ) {
     t << "bool," << itBool.key() << "," << ( *itBool ? "1" : "0"  ) << endl;
   }
 
   QMap<QString,QString>::ConstIterator itString;