1 files changed, 14 insertions, 12 deletions

diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 71d17e9..32c6557 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -21,30 +21,32 @@
 */
 #ifndef _KSYNCMANAGER_H
 #define _KSYNCMANAGER_H
 
 #include <qobject.h>
 #include <qstring.h>
-#include <qsocket.h>
+#include <q3socket.h>
 #include <qdatetime.h>
-#include <qserversocket.h> 
-#include <qtextstream.h>
+#include <q3serversocket.h> 
+#include <q3textstream.h>
 #include <qregexp.h>
-#include <qprogressdialog.h>
+#include <q3progressdialog.h>
+//Added by qt3to4:
+#include <Q3PopupMenu>
 #include <kdialog.h>
 
-class QPopupMenu;
+class Q3PopupMenu;
 class KSyncProfile;
 class KPimPrefs;
 class QWidget;
 class KSyncManager;
 class KSyncInterface;
-class QProgressBar;
+class Q3ProgressBar;
 
 
-class KServerSocket : public QServerSocket
+class KServerSocket : public Q3ServerSocket
 {
     Q_OBJECT
 
         public:
     KServerSocket ( QString password, Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 );
 
@@ -71,13 +73,13 @@ class KServerSocket : public QServerSocket
     bool blockRC;
     void send_file();
     void get_file();
     void end_connect();
     void error_connect( QString );
     QDialog* mSyncActionDialog;
-    QSocket* mSocket; 
+    Q3Socket* mSocket; 
     QString mPassWord;
     QString mFileName; 
     QTime piTime;
     QString piFileString;
 };
 
@@ -105,13 +107,13 @@ class KCommandSocket : public QObject
  private :
     QString mRemoteResource;
     int mConnectCount;
     int mConnectMax;
     KProgressDialog mConnectProgress;
     QWidget* tlw;
-    QSocket* mSocket; 
+    Q3Socket* mSocket; 
     QString mPassWord;
     Q_UINT16 mPort;
     QString mHost;
     QString mFileName;
     QTimer* mTimerSocket;
     int mRetVal;
@@ -129,13 +131,13 @@ class KSyncManager : public QObject
         public:
     enum TargetApp {
         KOPI = 0,
         KAPI = 1,
         PWMPI = 2 };
   
-    KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu);
+    KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, Q3PopupMenu* syncmenu);
     ~KSyncManager() ;
 
     void multiSync( bool askforPrefs  );
     bool blockSave() { return mBlockSaveFlag; }
     void setBlockSave(bool sa) { mBlockSaveFlag = sa; }
     void setDefaultFileName( QString s) ;
@@ -216,14 +218,14 @@ class KSyncManager : public QObject
     QString mCurrentResourceLocal;
     QString mCurrentResourceRemote;
     bool mBlockSaveFlag;
     QWidget* mParent;
     KSyncInterface* mImplementation;
     TargetApp mTargetApp; 
-    QPopupMenu* mSyncMenu;
-    QProgressBar* bar;
+    Q3PopupMenu* mSyncMenu;
+    Q3ProgressBar* bar;
     bool mSyncWithDesktop;
 
 private slots:
     void displayErrorPort();
     void confSync();