initial public commit of qt4 portp1

4 files changed, 20 insertions, 16 deletions

diff --git a/microkde/kio/kfile/kurlrequester.cpp b/microkde/kio/kfile/kurlrequester.cpp
index ca94570..ce62da7 100644
--- a/microkde/kio/kfile/kurlrequester.cpp
+++ b/microkde/kio/kfile/kurlrequester.cpp
@@ -29,2 +29,4 @@
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <QPixmap>
 
@@ -184,3 +186,3 @@ KURLRequester::KURLRequester( QWidget *editWidget, QWidget *parent,
 KURLRequester::KURLRequester( QWidget *parent, const char *name )
-  : QHBox( parent, name )
+  : Q3HBox( parent, name )
 {
@@ -193,3 +195,3 @@ KURLRequester::KURLRequester( const QString& url, QWidget *parent,
                               const char *name )
-  : QHBox( parent, name )
+  : Q3HBox( parent, name )
 {
@@ -218,4 +220,4 @@ void KURLRequester::init()
     myButton = new KURLDragPushButton( this, "kfile button");
-    QIconSet iconSet = SmallIconSet("fileopen");
-    QPixmap pixMap = iconSet.pixmap( QIconSet::Small, QIconSet::Normal );
+    QIcon iconSet = SmallIconSet("fileopen");
+    QPixmap pixMap = iconSet.pixmap( QIcon::Small, QIcon::Normal );
     myButton->setIconSet( iconSet );
diff --git a/microkde/kio/kfile/kurlrequester.h b/microkde/kio/kfile/kurlrequester.h
index faa3326..5d4fa11 100644
--- a/microkde/kio/kfile/kurlrequester.h
+++ b/microkde/kio/kfile/kurlrequester.h
@@ -22,3 +22,3 @@
 
-#include <qhbox.h>
+#include <q3hbox.h>
 
@@ -55,3 +55,3 @@ class QTimer;
  */
-class KURLRequester : public QHBox
+class KURLRequester : public Q3HBox
 {
diff --git a/microkde/kio/kio/kdirwatch.cpp b/microkde/kio/kio/kdirwatch.cpp
index 1596d1f..5f07c54 100644
--- a/microkde/kio/kio/kdirwatch.cpp
+++ b/microkde/kio/kio/kdirwatch.cpp
@@ -54,4 +54,4 @@ $Id$
 #include <qfile.h>
-#include <qintdict.h>
-#include <qptrlist.h>
+#include <q3intdict.h>
+#include <q3ptrlist.h>
 #include <qsocketnotifier.h>
@@ -59,2 +59,4 @@ $Id$
 #include <qtimer.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -186,3 +188,3 @@ KDirWatchPrivate::KDirWatchPrivate()
   KConfig *config = KGlobal::config();
-  KConfigGroupSaver saver( config, QCString("DirWatch") );
+  KConfigGroupSaver saver( config, Q3CString("DirWatch") );
   
@@ -733,3 +735,3 @@ void KDirWatchPrivate::removeEntries( KDirWatch* instance )
 {
-  QPtrList<Entry> list;
+  Q3PtrList<Entry> list;
   int minfreq = 3600000;
@@ -1009,3 +1011,3 @@ void KDirWatchPrivate::slotRescan()
 #ifdef HAVE_DNOTIFY
-  QPtrList<Entry> dList, cList;
+  Q3PtrList<Entry> dList, cList;
 
diff --git a/microkde/kio/kio/kdirwatch_p.h b/microkde/kio/kio/kdirwatch_p.h
index 0ab482f..be74f2a 100644
--- a/microkde/kio/kio/kdirwatch_p.h
+++ b/microkde/kio/kio/kdirwatch_p.h
@@ -20,3 +20,3 @@ $Id$
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
@@ -60,5 +60,5 @@ public:
     // instances interested in events
-    QPtrList<Client> m_clients;
+    Q3PtrList<Client> m_clients;
     // nonexistent entries of this directory
-    QPtrList<Entry> m_entries;
+    Q3PtrList<Entry> m_entries;
     QString path;
@@ -126,3 +126,3 @@ private:
   bool delayRemove;
-  QPtrList<Entry> removeList;
+  Q3PtrList<Entry> removeList;
 
@@ -143,3 +143,3 @@ private:
   QSocketNotifier *mSn;
-  QIntDict<Entry> fd_Entry;
+  Q3IntDict<Entry> fd_Entry;