13 files changed, 167 insertions, 152 deletions

diff --git a/microkde/kdecore/kcatalogue.cpp b/microkde/kdecore/kcatalogue.cpp
index 97ac326..1600b08 100644
--- a/microkde/kdecore/kcatalogue.cpp
+++ b/microkde/kdecore/kcatalogue.cpp
@@ -22,2 +22,4 @@
 #include <qfile.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -90,3 +92,3 @@ void KCatalogue::setFileName( const QString & fileName )
 
-  QCString newFileName = QFile::encodeName( fileName );
+  Q3CString newFileName = QFile::encodeName( fileName );
 
diff --git a/microkde/kdecore/kconfigbase.h b/microkde/kdecore/kconfigbase.h
index 7e56d11..1ef6a04 100644
--- a/microkde/kdecore/kconfigbase.h
+++ b/microkde/kdecore/kconfigbase.h
@@ -28,2 +28,4 @@
 #include "kconfig.h"
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -84,3 +86,3 @@ public:
 
-  KConfigGroupSaver( KConfig* config, const QCString &group )
+  KConfigGroupSaver( KConfig* config, const Q3CString &group )
       : _config(config), _oldgroup(config->group())
diff --git a/microkde/kdecore/klibloader.cpp b/microkde/kdecore/klibloader.cpp
index 6d0475a..0b54eb6 100644
--- a/microkde/kdecore/klibloader.cpp
+++ b/microkde/kdecore/klibloader.cpp
@@ -22,5 +22,8 @@
 #include <qtimer.h>
-#include <qobjectdict.h>
-#include <qwidgetlist.h>
+#include <q3objectdict.h>
 #include <qwidget.h>
+#include <qwidget.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3PtrList>
 
@@ -47,3 +50,3 @@
 
-template class QAsciiDict<KLibrary>;
+template class Q3AsciiDict<KLibrary>;
 
@@ -122,3 +125,3 @@ KLibrary::~KLibrary()
         {
-            QPtrListIterator<QObject> it( m_objs );
+            Q3PtrListIterator<QObject> it( m_objs );
             for ( ; it.current() ; ++it )
@@ -154,3 +157,3 @@ KLibFactory* KLibrary::factory()
 
-        QCString symname;
+        Q3CString symname;
         symname.sprintf("init_%s", name().latin1() );
@@ -307,4 +310,4 @@ class KLibLoaderPrivate
 public:
-    QPtrList<KLibWrapPrivate> loaded_stack;
-    QPtrList<KLibWrapPrivate> pending_close;
+    Q3PtrList<KLibWrapPrivate> loaded_stack;
+    Q3PtrList<KLibWrapPrivate> pending_close;
     enum {UNKNOWN, UNLOAD, DONT_UNLOAD} unload_mode;
@@ -350,3 +353,3 @@ KLibLoader::~KLibLoader()
 
-    QAsciiDictIterator<KLibWrapPrivate> it( m_libs );
+    Q3AsciiDictIterator<KLibWrapPrivate> it( m_libs );
     for (; it.current(); ++it )
@@ -366,3 +369,3 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta
 {
-    QCString libname( name );
+    Q3CString libname( name );
 
@@ -423,3 +426,3 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta
         kdDebug(150) << "library=" << libname << ": No file names " << libname.data() << " found in paths." << endl;
-        self()->d->errorMessage = i18n("Library files for \"%1\" not found in paths").arg(libname); 
+        self()->d->errorMessage = i18n("Library files for \"%1\" not found in paths").arg(QString(libname)); 
             
@@ -471,3 +474,3 @@ KLibrary* KLibLoader::library( const char *name )
        unloaded meanwhile, whithout being dlclose()'ed.  */
-    QPtrListIterator<KLibWrapPrivate> it(d->loaded_stack);
+    Q3PtrListIterator<KLibWrapPrivate> it(d->loaded_stack);
     for (; it.current(); ++it) {
@@ -552,3 +555,3 @@ void KLibLoader::slotLibraryDestroyed()
 
-  QAsciiDictIterator<KLibWrapPrivate> it( m_libs );
+  Q3AsciiDictIterator<KLibWrapPrivate> it( m_libs );
   for (; it.current(); ++it )
@@ -571,3 +574,3 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap)
      the DSO behind it.  */
-  QPtrListIterator<KLibWrapPrivate> it(d->pending_close);
+  Q3PtrListIterator<KLibWrapPrivate> it(d->pending_close);
   for (; it.current(); ++it) {
diff --git a/microkde/kdecore/klibloader.h b/microkde/kdecore/klibloader.h
index ed57109..53d146e 100644
--- a/microkde/kdecore/klibloader.h
+++ b/microkde/kdecore/klibloader.h
@@ -23,4 +23,4 @@
 #include <qstringlist.h>
-#include <qasciidict.h>
-#include <qptrlist.h>
+#include <q3asciidict.h>
+#include <q3ptrlist.h>
 #include <kglobal.h>
@@ -54,3 +54,3 @@ class KLibrary : public QObject
     friend class KLibLoader;
-    friend class QAsciiDict<KLibrary>;
+    friend class Q3AsciiDict<KLibrary>;
 
@@ -129,3 +129,3 @@ private:
     QLibrary* m_handle;
-    QPtrList<QObject> m_objs;
+    Q3PtrList<QObject> m_objs;
     QTimer *m_timer;
@@ -289,3 +289,3 @@ private:
     void close_pending( KLibWrapPrivate * );
-    QAsciiDict<KLibWrapPrivate> m_libs;
+    Q3AsciiDict<KLibWrapPrivate> m_libs;
 
diff --git a/microkde/kdecore/klocale.cpp b/microkde/kdecore/klocale.cpp
index 1d8ae9f..dd310fa 100644
--- a/microkde/kdecore/klocale.cpp
+++ b/microkde/kdecore/klocale.cpp
@@ -2,2 +2,3 @@
 #include <qapplication.h>
+#include <QDesktopWidget>
 
@@ -13,4 +14,4 @@
 
-QDict<QString> *mLocaleDict = 0;
-void setLocaleDict( QDict<QString> * dict )
+Q3Dict<QString> *mLocaleDict = 0;
+void setLocaleDict( Q3Dict<QString> * dict )
 {
@@ -47,3 +48,3 @@ void addExist(const char *text,QString trans )
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
@@ -55,6 +56,6 @@ void dumpMissing()
     QFile file( fileName );
-    if (!file.open( IO_WriteOnly ) ) {
+    if (!file.open( QIODevice::WriteOnly ) ) {
         return ;
     } 
-    QTextStream ts( &file );
+    Q3TextStream ts( &file );
     ts.setCodec( QTextCodec::codecForName("utf8") );
@@ -72,6 +73,6 @@ void dumpMissing()
     QFile file( fileName );
-    if (!file.open( IO_WriteOnly ) ) {
+    if (!file.open( QIODevice::WriteOnly ) ) {
         return ;
     } 
-    QTextStream ts( &file );
+    Q3TextStream ts( &file );
     ts.setCodec( QTextCodec::codecForName("utf8") );
@@ -469,3 +470,3 @@ QString KLocale::formatDateTime(const QDateTime &pDateTime,
     format = "%1 %2";
-  else  if ( intIntDateFormat == ISODate )
+  else  if ( intIntDateFormat == Qt::ISODate )
     format = "%1T%2";
@@ -529,3 +530,3 @@ QDate KLocale::readDate(const QString &intstr, const QString &fmt, bool* ok) con
       c = fmt.at(fmtpos++);
-      switch (c)
+      switch (c.unicode())
       {
@@ -640,3 +641,3 @@ QTime KLocale::readTime(const QString &intstr, bool seconds, bool *ok) const
       c = Format.at(Formatpos++);
-      switch (c)
+      switch (c.unicode())
         {
@@ -736,3 +737,3 @@ QDateTime KLocale::readDateTime(const QString &intstr,
   QDate m_date = readDate(date, dformat, &ok1);
-  QTime m_time = readTime(time, tformat, &ok2);
+  QTime m_time = readTime(time, !tformat.isEmpty(), &ok2);
 
diff --git a/microkde/kdecore/klocale.h b/microkde/kdecore/klocale.h
index 58e0b39..840fc9d 100644
--- a/microkde/kdecore/klocale.h
+++ b/microkde/kdecore/klocale.h
@@ -6,3 +6,3 @@
 #include <qdatetime.h>
-#include <qdict.h>
+#include <q3dict.h>
 
@@ -13,3 +13,3 @@
 class KCalendarSystem;
-void setLocaleDict( QDict<QString> * dict );
+void setLocaleDict( Q3Dict<QString> * dict );
 QString i18n(const char *text);
diff --git a/microkde/kdecore/kmdcodec.cpp b/microkde/kdecore/kmdcodec.cpp
index bc03569..db11e52 100644
--- a/microkde/kdecore/kmdcodec.cpp
+++ b/microkde/kdecore/kmdcodec.cpp
@@ -41,2 +41,4 @@
 #include "kmdcodec.h"
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -149,3 +151,3 @@ static int rikFindChar(register const char * _s, const char c)
 
-QCString KCodecs::quotedPrintableEncode(const QByteArray& in, bool useCRLF)
+Q3CString KCodecs::quotedPrintableEncode(const QByteArray& in, bool useCRLF)
 {
@@ -153,6 +155,6 @@ QCString KCodecs::quotedPrintableEncode(const QByteArray& in, bool useCRLF)
   quotedPrintableEncode (in, out, useCRLF);
-  return QCString (out.data(), out.size()+1);
+  return Q3CString (out.data(), out.size()+1);
 }
 
-QCString KCodecs::quotedPrintableEncode(const QCString& str, bool useCRLF)
+Q3CString KCodecs::quotedPrintableEncode(const Q3CString& str, bool useCRLF)
 {
@@ -282,3 +284,3 @@ void KCodecs::quotedPrintableEncode(const QByteArray& in, QByteArray& out, bool
 
-QCString KCodecs::quotedPrintableDecode(const QByteArray & in)
+Q3CString KCodecs::quotedPrintableDecode(const QByteArray & in)
 {
@@ -286,6 +288,6 @@ QCString KCodecs::quotedPrintableDecode(const QByteArray & in)
   quotedPrintableDecode (in, out);
-  return QCString (out.data(), out.size()+1);
+  return Q3CString (out.data(), out.size()+1);
 }
 
-QCString KCodecs::quotedPrintableDecode(const QCString & str)
+Q3CString KCodecs::quotedPrintableDecode(const Q3CString & str)
 {
@@ -357,3 +359,3 @@ void KCodecs::quotedPrintableDecode(const QByteArray& in, QByteArray& out)
 
-QCString KCodecs::base64Encode( const QCString& str, bool insertLFs )
+Q3CString KCodecs::base64Encode( const Q3CString& str, bool insertLFs )
 {
@@ -367,3 +369,3 @@ QCString KCodecs::base64Encode( const QCString& str, bool insertLFs )
 
-QCString KCodecs::base64Encode( const QByteArray& in, bool insertLFs )
+Q3CString KCodecs::base64Encode( const QByteArray& in, bool insertLFs )
 {
@@ -371,3 +373,3 @@ QCString KCodecs::base64Encode( const QByteArray& in, bool insertLFs )
     base64Encode( in, out, insertLFs );
-    return QCString( out.data(), out.size()+1 );
+    return Q3CString( out.data(), out.size()+1 );
 }
@@ -407,11 +409,11 @@ void KCodecs::base64Encode( const QByteArray& in, QByteArray& out,
                 if ( count && (count%76) == 0 )
-                    out.at(didx++) = '\n';
+                    out[didx++] = '\n';
                 count += 4;
             }
-            out.at(didx++) = Base64EncMap[(data[sidx] >> 2) & 077];
-            out.at(didx++) = Base64EncMap[(data[sidx+1] >> 4) & 017 |
+            out[didx++] = Base64EncMap[(data[sidx] >> 2) & 077];
+            out[didx++] = Base64EncMap[(data[sidx+1] >> 4) & 017 |
                                        (data[sidx] << 4) & 077];
-            out.at(didx++) = Base64EncMap[(data[sidx+2] >> 6) & 003 |
+            out[didx++] = Base64EncMap[(data[sidx+2] >> 6) & 003 |
                                        (data[sidx+1] << 2) & 077];
-            out.at(didx++) = Base64EncMap[data[sidx+2] & 077];
+            out[didx++] = Base64EncMap[data[sidx+2] & 077];
             sidx += 3;
@@ -423,10 +425,10 @@ void KCodecs::base64Encode( const QByteArray& in, QByteArray& out,
         if ( insertLFs && (count > 0) && (count%76) == 0 )
-           out.at(didx++) = '\n';
+           out[didx++] = '\n';
 
-        out.at(didx++) = Base64EncMap[(data[sidx] >> 2) & 077];
+        out[didx++] = Base64EncMap[(data[sidx] >> 2) & 077];
         if (sidx < len-1)
         {
-            out.at(didx++) = Base64EncMap[(data[sidx+1] >> 4) & 017 |
+            out[didx++] = Base64EncMap[(data[sidx+1] >> 4) & 017 |
                                        (data[sidx] << 4) & 077];
-            out.at(didx++) = Base64EncMap[(data[sidx+1] << 2) & 077];
+            out[didx++] = Base64EncMap[(data[sidx+1] << 2) & 077];
         }
@@ -434,3 +436,3 @@ void KCodecs::base64Encode( const QByteArray& in, QByteArray& out,
         {
-            out.at(didx++) = Base64EncMap[(data[sidx] << 4) & 077];
+            out[didx++] = Base64EncMap[(data[sidx] << 4) & 077];
         }
@@ -440,9 +442,6 @@ void KCodecs::base64Encode( const QByteArray& in, QByteArray& out,
     while (didx < out.size())
-    {
-        out.at(didx) = '=';
-        didx++;
-    }
+        out[didx++] = '=';
 }
 
-QCString KCodecs::base64Decode( const QCString& str )
+Q3CString KCodecs::base64Decode( const Q3CString& str )
 {
@@ -456,3 +455,3 @@ QCString KCodecs::base64Decode( const QCString& str )
 
-QCString KCodecs::base64Decode( const QByteArray& in )
+Q3CString KCodecs::base64Decode( const QByteArray& in )
 {
@@ -460,3 +459,3 @@ QCString KCodecs::base64Decode( const QByteArray& in )
     base64Decode( in, out );
-    return QCString( out.data(), out.size()+1 );
+    return Q3CString( out.data(), out.size()+1 );
 }
@@ -507,3 +506,3 @@ void KCodecs::base64Decode( const QByteArray& in, QByteArray& out )
         {
-            out.at(outIdx++) = Base64DecMap[ch];
+            out[outIdx++] = Base64DecMap[ch];
         }
@@ -525,5 +524,5 @@ void KCodecs::base64Decode( const QByteArray& in, QByteArray& out )
       {
-          out.at(didx) = (((out.at(sidx) << 2) & 255) | ((out.at(sidx+1) >> 4) & 003));
-          out.at(didx+1) = (((out.at(sidx+1) << 4) & 255) | ((out.at(sidx+2) >> 2) & 017));
-          out.at(didx+2) = (((out.at(sidx+2) << 6) & 255) | (out.at(sidx+3) & 077));
+          out[didx] = (((out[sidx] << 2) & 255) | ((out[sidx+1] >> 4) & 003));
+          out[didx+1] = (((out[sidx+1] << 4) & 255) | ((out[sidx+2] >> 2) & 017));
+          out[didx+2] = (((out[sidx+2] << 6) & 255) | (out[sidx+3] & 077));
           sidx += 4;
@@ -534,6 +533,6 @@ void KCodecs::base64Decode( const QByteArray& in, QByteArray& out )
     if (didx < len)
-        out.at(didx) = (((out.at(sidx) << 2) & 255) | ((out.at(sidx+1) >> 4) & 003));
+        out[didx] = (((out[sidx] << 2) & 255) | ((out[sidx+1] >> 4) & 003));
 
     if (++didx < len )
-        out.at(didx) = (((out.at(sidx+1) << 4) & 255) | ((out.at(sidx+2) >> 2) & 017));
+        out[didx] = (((out[sidx+1] << 4) & 255) | ((out[sidx+2] >> 2) & 017));
 
@@ -544,3 +543,3 @@ void KCodecs::base64Decode( const QByteArray& in, QByteArray& out )
 
-QCString KCodecs::uuencode( const QCString& str )
+Q3CString KCodecs::uuencode( const Q3CString& str )
 {
@@ -555,3 +554,3 @@ QCString KCodecs::uuencode( const QCString& str )
 
-QCString KCodecs::uuencode( const QByteArray& in )
+Q3CString KCodecs::uuencode( const QByteArray& in )
 {
@@ -559,3 +558,3 @@ QCString KCodecs::uuencode( const QByteArray& in )
     uuencode( in, out );
-    return QCString( out.data(), out.size()+1 );
+    return Q3CString( out.data(), out.size()+1 );
 }
@@ -582,3 +581,3 @@ void KCodecs::uuencode( const QByteArray& in, QByteArray& out )
         // line length
-        out.at(didx++) = UUEncMap[line_len];
+        out[didx++] = UUEncMap[line_len];
 
@@ -587,8 +586,8 @@ void KCodecs::uuencode( const QByteArray& in, QByteArray& out )
         {
-            out.at(didx++) = UUEncMap[(data[sidx] >> 2) & 077];
-            out.at(didx++) = UUEncMap[(data[sidx+1] >> 4) & 017 |
+            out[didx++] = UUEncMap[(data[sidx] >> 2) & 077];
+            out[didx++] = UUEncMap[(data[sidx+1] >> 4) & 017 |
                                    (data[sidx] << 4) & 077];
-            out.at(didx++) = UUEncMap[(data[sidx+2] >> 6) & 003 |
+            out[didx++] = UUEncMap[(data[sidx+2] >> 6) & 003 |
                                 (data[sidx+1] << 2) & 077];
-            out.at(didx++) = UUEncMap[data[sidx+2] & 077];
+            out[didx++] = UUEncMap[data[sidx+2] & 077];
         }
@@ -597,3 +596,3 @@ void KCodecs::uuencode( const QByteArray& in, QByteArray& out )
         //for (unsigned int idx=0; idx < nl_len; idx++)
-        //out.at(didx++) = nl[idx];
+        //out[didx++] = nl[idx];
         memcpy(out.data()+didx, nl, nl_len);
@@ -603,3 +602,3 @@ void KCodecs::uuencode( const QByteArray& in, QByteArray& out )
     // line length
-    out.at(didx++) = UUEncMap[len-sidx];
+    out[didx++] = UUEncMap[len-sidx];
     // 3-byte to 4-byte conversion + 0-63 to ascii printable conversion
@@ -607,8 +606,8 @@ void KCodecs::uuencode( const QByteArray& in, QByteArray& out )
     {
-        out.at(didx++) = UUEncMap[(data[sidx] >> 2) & 077];
-        out.at(didx++) = UUEncMap[(data[sidx+1] >> 4) & 017 |
+        out[didx++] = UUEncMap[(data[sidx] >> 2) & 077];
+        out[didx++] = UUEncMap[(data[sidx+1] >> 4) & 017 |
                                (data[sidx] << 4) & 077];
-        out.at(didx++) = UUEncMap[(data[sidx+2] >> 6) & 003 |
+        out[didx++] = UUEncMap[(data[sidx+2] >> 6) & 003 |
                                (data[sidx+1] << 2) & 077];
-        out.at(didx++) = UUEncMap[data[sidx+2] & 077];
+        out[didx++] = UUEncMap[data[sidx+2] & 077];
         sidx += 3;
@@ -618,7 +617,7 @@ void KCodecs::uuencode( const QByteArray& in, QByteArray& out )
     {
-        out.at(didx++) = UUEncMap[(data[sidx] >> 2) & 077];
-        out.at(didx++) = UUEncMap[(data[sidx+1] >> 4) & 017 |
+        out[didx++] = UUEncMap[(data[sidx] >> 2) & 077];
+        out[didx++] = UUEncMap[(data[sidx+1] >> 4) & 017 |
                                (data[sidx] << 4) & 077];
-        out.at(didx++) = UUEncMap[(data[sidx+1] << 2) & 077];
-        out.at(didx++) = UUEncMap[0];
+        out[didx++] = UUEncMap[(data[sidx+1] << 2) & 077];
+        out[didx++] = UUEncMap[0];
     }
@@ -626,6 +625,6 @@ void KCodecs::uuencode( const QByteArray& in, QByteArray& out )
     {
-        out.at(didx++) = UUEncMap[(data[sidx] >> 2) & 077];
-        out.at(didx++) = UUEncMap[(data[sidx] << 4) & 077];
-        out.at(didx++) = UUEncMap[0];
-        out.at(didx++) = UUEncMap[0];
+        out[didx++] = UUEncMap[(data[sidx] >> 2) & 077];
+        out[didx++] = UUEncMap[(data[sidx] << 4) & 077];
+        out[didx++] = UUEncMap[0];
+        out[didx++] = UUEncMap[0];
     }
@@ -641,3 +640,3 @@ void KCodecs::uuencode( const QByteArray& in, QByteArray& out )
 
-QCString KCodecs::uudecode( const QCString& str )
+Q3CString KCodecs::uudecode( const Q3CString& str )
 {
@@ -652,3 +651,3 @@ QCString KCodecs::uudecode( const QCString& str )
 
-QCString KCodecs::uudecode( const QByteArray& in )
+Q3CString KCodecs::uudecode( const QByteArray& in )
 {
@@ -656,3 +655,3 @@ QCString KCodecs::uudecode( const QByteArray& in )
     uudecode( in, out );
-    return QCString( out.data(), out.size()+1 );
+    return Q3CString( out.data(), out.size()+1 );
 }
@@ -707,5 +706,5 @@ void KCodecs::uudecode( const QByteArray& in, QByteArray& out )
              D = UUDecMap[(unsigned char) data[sidx+3]];
-             out.at(didx++) = ( ((A << 2) & 255) | ((B >> 4) & 003) );
-             out.at(didx++) = ( ((B << 4) & 255) | ((C >> 2) & 017) );
-             out.at(didx++) = ( ((C << 6) & 255) | (D & 077) );
+             out[didx++] = ( ((A << 2) & 255) | ((B >> 4) & 003) );
+             out[didx++] = ( ((B << 4) & 255) | ((C >> 2) & 017) );
+             out[didx++] = ( ((C << 6) & 255) | (D & 077) );
              sidx += 4;
@@ -718,3 +717,3 @@ void KCodecs::uudecode( const QByteArray& in, QByteArray& out )
             B = UUDecMap[(unsigned char) data[sidx+1]];
-            out.at(didx++) = ( ((A << 2) & 255) | ((B >> 4) & 003) );
+            out[didx++] = ( ((A << 2) & 255) | ((B >> 4) & 003) );
         }
@@ -725,3 +724,3 @@ void KCodecs::uudecode( const QByteArray& in, QByteArray& out )
             C = UUDecMap[(unsigned char) data[sidx+2]];
-            out.at(didx++) = ( ((B << 4) & 255) | ((C >> 2) & 017) );
+            out[didx++] = ( ((B << 4) & 255) | ((C >> 2) & 017) );
         }
@@ -763,3 +762,3 @@ KMD5::KMD5(const QByteArray& in)
 
-KMD5::KMD5(const QCString& in)
+KMD5::KMD5(const Q3CString& in)
 {
@@ -774,3 +773,3 @@ void KMD5::update(const QByteArray& in)
 
-void KMD5::update(const QCString& in)
+void KMD5::update(const Q3CString& in)
 {
@@ -875,3 +874,3 @@ bool KMD5::verify( const KMD5::Digest& digest)
 
-bool KMD5::verify( const QCString& hexdigest)
+bool KMD5::verify( const Q3CString& hexdigest)
 {
@@ -894,5 +893,5 @@ void KMD5::rawDigest( KMD5::Digest& bin )
 
-QCString KMD5::hexDigest()
+Q3CString KMD5::hexDigest()
 {
-    QCString s(33);
+    Q3CString s(33);
 
@@ -907,3 +906,3 @@ QCString KMD5::hexDigest()
 
-void KMD5::hexDigest(QCString& s)
+void KMD5::hexDigest(Q3CString& s)
 {
@@ -917,3 +916,3 @@ void KMD5::hexDigest(QCString& s)
 
-QCString KMD5::base64Digest()
+Q3CString KMD5::base64Digest()
 {
@@ -958,3 +957,3 @@ void KMD5::transform( const unsigned char block[64] )
 //US    Q_ASSERT(!m_finalized);  // not just a user error, since the method is private
-    ASSERT(!m_finalized);  // not just a user error, since the method is private
+    Q_ASSERT(!m_finalized);  // not just a user error, since the method is private
 
diff --git a/microkde/kdecore/kmdcodec.h b/microkde/kdecore/kmdcodec.h
index 2c4d611..616b683 100644
--- a/microkde/kdecore/kmdcodec.h
+++ b/microkde/kdecore/kmdcodec.h
@@ -41,2 +41,4 @@
 #include <qiodevice.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -83,3 +85,3 @@ public:
    */
-  static QCString quotedPrintableEncode(const QByteArray & in,
+  static Q3CString quotedPrintableEncode(const QByteArray & in,
                                         bool useCRLF = true);
@@ -98,3 +100,3 @@ public:
    */
-  static QCString quotedPrintableEncode(const QCString & str,
+  static Q3CString quotedPrintableEncode(const Q3CString & str,
                                         bool useCRLF = true);
@@ -131,3 +133,3 @@ public:
    */
-  static QCString quotedPrintableDecode(const QByteArray & in);
+  static Q3CString quotedPrintableDecode(const QByteArray & in);
 
@@ -142,3 +144,3 @@ public:
    */
-  static QCString quotedPrintableDecode(const QCString & str);
+  static Q3CString quotedPrintableDecode(const Q3CString & str);
 
@@ -177,3 +179,3 @@ public:
    */
-  static QCString uuencode( const QByteArray& in );
+  static Q3CString uuencode( const QByteArray& in );
 
@@ -188,3 +190,3 @@ public:
    */
-  static QCString uuencode( const QCString& str );
+  static Q3CString uuencode( const Q3CString& str );
 
@@ -217,3 +219,3 @@ public:
    */
-  static QCString uudecode( const QByteArray& in );
+  static Q3CString uudecode( const QByteArray& in );
 
@@ -228,3 +230,3 @@ public:
    */
-  static QCString uudecode( const QCString& str );
+  static Q3CString uudecode( const Q3CString& str );
 
@@ -265,3 +267,3 @@ public:
    */
-  static QCString base64Encode( const QByteArray& in, bool insertLFs = false);
+  static Q3CString base64Encode( const QByteArray& in, bool insertLFs = false);
 
@@ -277,3 +279,3 @@ public:
    */
-  static QCString base64Encode( const QCString& str, bool insertLFs = false );
+  static Q3CString base64Encode( const Q3CString& str, bool insertLFs = false );
 
@@ -310,3 +312,3 @@ public:
    */
-  static QCString base64Decode( const QByteArray& in );
+  static Q3CString base64Decode( const QByteArray& in );
 
@@ -321,3 +323,3 @@ public:
    */
-  static QCString base64Decode( const QCString& str );
+  static Q3CString base64Decode( const Q3CString& str );
 
@@ -433,3 +435,3 @@ public:
    */
-  KMD5(const QCString& a );
+  KMD5(const Q3CString& a );
 
@@ -462,3 +464,3 @@ public:
    */
-  void update(const QCString& in );
+  void update(const Q3CString& in );
 
@@ -504,3 +506,3 @@ public:
    */
-  QCString hexDigest ();
+  Q3CString hexDigest ();
 
@@ -509,3 +511,3 @@ public:
    */
-  void hexDigest(QCString&);
+  void hexDigest(Q3CString&);
 
@@ -515,3 +517,3 @@ public:
    */
-  QCString base64Digest ();
+  Q3CString base64Digest ();
 
@@ -526,3 +528,3 @@ public:
    */
-  bool verify(const QCString&);
+  bool verify(const Q3CString&);
 
diff --git a/microkde/kdecore/kprefs.cpp b/microkde/kdecore/kprefs.cpp
index 0220a34..d4010fa 100644
--- a/microkde/kdecore/kprefs.cpp
+++ b/microkde/kdecore/kprefs.cpp
@@ -23,2 +23,4 @@
 #include <qcolor.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
@@ -142,4 +144,4 @@ class KPrefsItemIntList : public KPrefsItem {
   public:
-    KPrefsItemIntList(const QString &group,const QString &name,QValueList<int> *,
-                      const QValueList<int> &defaultValue=QValueList<int>());
+    KPrefsItemIntList(const QString &group,const QString &name,Q3ValueList<int> *,
+                      const Q3ValueList<int> &defaultValue=Q3ValueList<int>());
     virtual ~KPrefsItemIntList() {}
@@ -151,4 +153,4 @@ class KPrefsItemIntList : public KPrefsItem {
   private:
-    QValueList<int> *mReference;
-    QValueList<int> mDefault;
+    Q3ValueList<int> *mReference;
+    Q3ValueList<int> mDefault;
 };
@@ -366,3 +368,3 @@ void KPrefsItemStringList::readConfig(KConfig *config)
 KPrefsItemIntList::KPrefsItemIntList(const QString &group,const QString &name,
-                                     QValueList<int> *reference,const QValueList<int> &defaultValue) :
+                                     Q3ValueList<int> *reference,const Q3ValueList<int> &defaultValue) :
   KPrefsItem(group,name)
@@ -507,4 +509,4 @@ void KPrefs::addItemStringList(const QString &key,QStringList *reference,
 
-void KPrefs::addItemIntList(const QString &key,QValueList<int> *reference,
-                            const QValueList<int> &defaultValue)
+void KPrefs::addItemIntList(const QString &key,Q3ValueList<int> *reference,
+                            const Q3ValueList<int> &defaultValue)
 {
diff --git a/microkde/kdecore/kprefs.h b/microkde/kdecore/kprefs.h
index 95d2724..d9d1572 100644
--- a/microkde/kdecore/kprefs.h
+++ b/microkde/kdecore/kprefs.h
@@ -23,3 +23,3 @@
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qcolor.h>
@@ -28,2 +28,4 @@
 #include <qstringlist.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
@@ -285,4 +287,4 @@ class KPrefs {
     */
-    void addItemIntList(const QString &key,QValueList<int> *reference,
-                        const QValueList<int> &defaultValue=QValueList<int>());
+    void addItemIntList(const QString &key,Q3ValueList<int> *reference,
+                        const Q3ValueList<int> &defaultValue=Q3ValueList<int>());
 
@@ -312,3 +314,3 @@ class KPrefs {
 
-    QPtrList<KPrefsItem> mItems;
+    Q3PtrList<KPrefsItem> mItems;
 };
diff --git a/microkde/kdecore/kshortcut.h b/microkde/kdecore/kshortcut.h
index 4813734..244d590 100644
--- a/microkde/kdecore/kshortcut.h
+++ b/microkde/kdecore/kshortcut.h
@@ -565,3 +565,3 @@ class KShortcut
          */
-        KShortcut( int keyQt ) {}
+        KShortcut( int /*keyQt */) {}
 
@@ -601,3 +601,3 @@ class KShortcut
          */
-        KShortcut( const char* shortcut ) {}
+        KShortcut( const char* /*shortcut */) {}
 
@@ -610,3 +610,3 @@ class KShortcut
          */
-        KShortcut( const QString& shortcut ) {}
+        KShortcut( const QString& /*shortcut */) {}
         ~KShortcut() {}
@@ -818,3 +818,3 @@ class KShortcut
          */
-  QString toStringInternal( const KShortcut* pcutDefault = 0 ) const
+  QString toStringInternal( const KShortcut* /*pcutDefault*/ = 0 ) const
   {
diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp
index d5bfefd..f10934b 100644
--- a/microkde/kdecore/kstandarddirs.cpp
+++ b/microkde/kdecore/kstandarddirs.cpp
@@ -39,4 +39,4 @@
 #include <qregexp.h>
-#include <qasciidict.h>
-#include <qdict.h>
+#include <q3asciidict.h>
+#include <q3dict.h>
 #include <qdir.h>
@@ -48,2 +48,4 @@
 #include <qstringlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -61,11 +63,11 @@ QString KStandardDirs::mAppDir = QString::null;
 
-template class QDict<QStringList>;
+template class Q3Dict<QStringList>;
 
 #if 0
-#include <qtextedit.h>
+#include <q3textedit.h>
 void ddd( QString op )
 {
-  static QTextEdit * dot = 0;
+  static Q3TextEdit * dot = 0;
   if ( ! dot )
-  dot = new QTextEdit();
+  dot = new Q3TextEdit();
 
@@ -87,3 +89,3 @@ public:
    bool dataRestrictionActive;
-   QAsciiDict<bool> restrictions;
+   Q3AsciiDict<bool> restrictions;
    QStringList xdgdata_prefixes;
@@ -447,3 +449,3 @@ static void lookupDirectory(const QString& path, const QString &relPart,
 //US this should do the same:
-      int pos = regexp.match(fn);
+      int pos = regexp.exactMatch(fn);
       if (!recursive && !pos == 0)
@@ -484,3 +486,3 @@ static void lookupDirectory(const QString& path, const QString &relPart,
 //US this should do the same:
-        pos = regexp.match(fn);
+        pos = regexp.exactMatch(fn);
         if (!pos == 0)
@@ -1110,3 +1112,3 @@ bool KStandardDirs::makeDir(const QString& dir2, int mode)
         base += target.mid(i - 1, pos - i + 1);
-        QCString baseEncoded = QFile::encodeName(base);
+        Q3CString baseEncoded = QFile::encodeName(base);
         // bail out if we encountered a problem
@@ -1210,3 +1212,3 @@ QString readEnvPath(const char *env)
   //#else
-  QCString c_path;
+  Q3CString c_path;
   if ( getenv(env) != NULL )
diff --git a/microkde/kdecore/kstandarddirs.h b/microkde/kdecore/kstandarddirs.h
index 901384e..f0e28fc 100644
--- a/microkde/kdecore/kstandarddirs.h
+++ b/microkde/kdecore/kstandarddirs.h
@@ -26,3 +26,3 @@
 #include <qstring.h>
-#include <qdict.h>
+#include <q3dict.h>
 #include <qstringlist.h>
@@ -576,7 +576,7 @@ public:
         // Directory dictionaries
-        QDict<QStringList> absolutes;
-        QDict<QStringList> relatives;
+        Q3Dict<QStringList> absolutes;
+        Q3Dict<QStringList> relatives;
 
-        mutable QDict<QStringList> dircache;
-        mutable QDict<QString> savelocations;
+        mutable Q3Dict<QStringList> dircache;
+        mutable Q3Dict<QString> savelocations;