1 files changed, 22 insertions, 18 deletions

diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index ec6a9ec..4351720 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -25,17 +25,21 @@
 #define KABCORE_H
 
 #include <kabc/field.h>
 
 #ifndef KAB_EMBEDDED
 #endif //KAB_EMBEDDED
-#include <qdict.h>
+#include <q3dict.h>
 #include <qtimer.h>
 
 #include <qwidget.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <QPixmap>
+#include <QResizeEvent>
 #include <ksyncmanager.h>
 #ifndef DESKTOP_VERSION
 #include <qcopchannel_qws.h> 
 #endif
 
 namespace KABC {
@@ -82,15 +86,15 @@ class KABCore : public QWidget, public KSyncInterface
 
     ~KABCore();
 
 
 #ifdef KAB_EMBEDDED
   //US added functionality
-    QPopupMenu* getViewMenu() {return viewMenu;}
-    QPopupMenu* getFilterMenu() {return filterMenu;}
-    QPopupMenu* getSettingsMenu() {return settingsMenu;}
+    Q3PopupMenu* getViewMenu() {return viewMenu;}
+    Q3PopupMenu* getFilterMenu() {return filterMenu;}
+    Q3PopupMenu* getSettingsMenu() {return settingsMenu;}
     void addActionsManually();
 #endif //KAB_EMBEDDED
     /**
       Restores the global settings.
      */
     void restoreSettings();
@@ -132,14 +136,14 @@ class KABCore : public QWidget, public KSyncInterface
 
 #ifndef KAB_EMBEDDED
     static KAboutData *createAboutData();
 #endif //KAB_EMBEDDED
 
 #ifdef KAB_EMBEDDED
-    inline QPopupMenu* getImportMenu() { return ImportMenu;}
-    inline QPopupMenu* getExportMenu() { return ExportMenu;}
+    inline Q3PopupMenu* getImportMenu() { return ImportMenu;}
+    inline Q3PopupMenu* getExportMenu() { return ExportMenu;}
 #endif //KAB_EMBEDDED
 
   public slots:
 #ifdef KAB_EMBEDDED
     void createAboutData();
 #endif //KAB_EMBEDDED
@@ -363,14 +367,14 @@ class KABCore : public QWidget, public KSyncInterface
    
     void saveSettings();
 
   private slots:
     void updateToolBar();
     void updateMainWindow();
-    void receive( const QCString& cmsg, const QByteArray& data );
-    void receiveStart( const QCString& cmsg, const QByteArray& data );
+    void receive( const Q3CString& cmsg, const QByteArray& data );
+    void receiveStart( const Q3CString& cmsg, const QByteArray& data );
     void toggleBeamReceive( );
     void disableBR(bool);
     void setJumpButtonBarVisible( bool visible );
     void setJumpButtonBar( bool visible );
     void setCaptionBack();
     void resizeAndCallContactdialog();
@@ -391,13 +395,13 @@ class KABCore : public QWidget, public KSyncInterface
 
     void slotEditorDestroyed( const QString &uid );
     void configurationChanged();
     void addressBookChanged();
 
   private:
-    QCString mCStringMess;
+    Q3CString mCStringMess;
     QByteArray mByteData;
     QString mEmailSourceChannel;
     QString mEmailSourceUID;
     void resizeEvent(QResizeEvent* e );
     bool mBRdisabled;
 #ifndef DESKTOP_VERSION
@@ -483,20 +487,20 @@ class KABCore : public QWidget, public KSyncInterface
     KAction *mActionStorageHowto;
     KAction *mActionKdeSyncHowto;
     KAction *mActionMultiSyncHowto;
 
     KAction *mActionDeleteView;
 
-    QPopupMenu *viewMenu;
-    QPopupMenu *filterMenu;
-    QPopupMenu *settingsMenu;
-    QPopupMenu *changeMenu;
-    QPopupMenu *beamMenu;
+    Q3PopupMenu *viewMenu;
+    Q3PopupMenu *filterMenu;
+    Q3PopupMenu *settingsMenu;
+    Q3PopupMenu *changeMenu;
+    Q3PopupMenu *beamMenu;
 //US    QAction *mActionSave;
-    QPopupMenu *ImportMenu;
-    QPopupMenu *ExportMenu;
+    Q3PopupMenu *ImportMenu;
+    Q3PopupMenu *ExportMenu;
     //LR additional methods
     KAction *mActionRemoveVoice;
     KAction *mActionSetFormattedName;
     KAction * mActionImportOL;
 
 #ifndef KAB_EMBEDDED
@@ -521,13 +525,13 @@ class KABCore : public QWidget, public KSyncInterface
     bool syncPhone();
     void message( QString m , bool startTimer = true);
 
     // LR *******************************
     // sync stuff!
     QString sentSyncFile();
-    QPopupMenu *syncMenu;
+    Q3PopupMenu *syncMenu;
     KSyncManager* syncManager;
     int mGlobalSyncMode; 
     bool synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode);
     KABC::Addressee getLastSyncAddressee();
     QDateTime mLastAddressbookSync;
     int  takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, int mode , bool full );