-rw-r--r-- | kaddressbook/kabcore.h | 40 |
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 | |||
@@ -23,21 +23,25 @@ | |||
23 | 23 | ||
24 | #ifndef KABCORE_H | 24 | #ifndef KABCORE_H |
25 | #define KABCORE_H | 25 | #define KABCORE_H |
26 | 26 | ||
27 | #include <kabc/field.h> | 27 | #include <kabc/field.h> |
28 | 28 | ||
29 | #ifndef KAB_EMBEDDED | 29 | #ifndef KAB_EMBEDDED |
30 | #endif //KAB_EMBEDDED | 30 | #endif //KAB_EMBEDDED |
31 | #include <qdict.h> | 31 | #include <q3dict.h> |
32 | #include <qtimer.h> | 32 | #include <qtimer.h> |
33 | 33 | ||
34 | #include <qwidget.h> | 34 | #include <qwidget.h> |
35 | #include <qpopupmenu.h> | 35 | #include <q3popupmenu.h> |
36 | //Added by qt3to4: | ||
37 | #include <Q3CString> | ||
38 | #include <QPixmap> | ||
39 | #include <QResizeEvent> | ||
36 | #include <ksyncmanager.h> | 40 | #include <ksyncmanager.h> |
37 | #ifndef DESKTOP_VERSION | 41 | #ifndef DESKTOP_VERSION |
38 | #include <qcopchannel_qws.h> | 42 | #include <qcopchannel_qws.h> |
39 | #endif | 43 | #endif |
40 | 44 | ||
41 | namespace KABC { | 45 | namespace KABC { |
42 | class AddressBook; | 46 | class AddressBook; |
43 | } | 47 | } |
@@ -80,19 +84,19 @@ class KABCore : public QWidget, public KSyncInterface | |||
80 | KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name = 0 ); | 84 | KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name = 0 ); |
81 | 85 | ||
82 | 86 | ||
83 | ~KABCore(); | 87 | ~KABCore(); |
84 | 88 | ||
85 | 89 | ||
86 | #ifdef KAB_EMBEDDED | 90 | #ifdef KAB_EMBEDDED |
87 | //US added functionality | 91 | //US added functionality |
88 | QPopupMenu* getViewMenu() {return viewMenu;} | 92 | Q3PopupMenu* getViewMenu() {return viewMenu;} |
89 | QPopupMenu* getFilterMenu() {return filterMenu;} | 93 | Q3PopupMenu* getFilterMenu() {return filterMenu;} |
90 | QPopupMenu* getSettingsMenu() {return settingsMenu;} | 94 | Q3PopupMenu* getSettingsMenu() {return settingsMenu;} |
91 | void addActionsManually(); | 95 | void addActionsManually(); |
92 | #endif //KAB_EMBEDDED | 96 | #endif //KAB_EMBEDDED |
93 | /** | 97 | /** |
94 | Restores the global settings. | 98 | Restores the global settings. |
95 | */ | 99 | */ |
96 | void restoreSettings(); | 100 | void restoreSettings(); |
97 | 101 | ||
98 | 102 | ||
@@ -130,18 +134,18 @@ class KABCore : public QWidget, public KSyncInterface | |||
130 | */ | 134 | */ |
131 | KABC::Resource *requestResource( QWidget *parent ); | 135 | KABC::Resource *requestResource( QWidget *parent ); |
132 | 136 | ||
133 | #ifndef KAB_EMBEDDED | 137 | #ifndef KAB_EMBEDDED |
134 | static KAboutData *createAboutData(); | 138 | static KAboutData *createAboutData(); |
135 | #endif //KAB_EMBEDDED | 139 | #endif //KAB_EMBEDDED |
136 | 140 | ||
137 | #ifdef KAB_EMBEDDED | 141 | #ifdef KAB_EMBEDDED |
138 | inline QPopupMenu* getImportMenu() { return ImportMenu;} | 142 | inline Q3PopupMenu* getImportMenu() { return ImportMenu;} |
139 | inline QPopupMenu* getExportMenu() { return ExportMenu;} | 143 | inline Q3PopupMenu* getExportMenu() { return ExportMenu;} |
140 | #endif //KAB_EMBEDDED | 144 | #endif //KAB_EMBEDDED |
141 | 145 | ||
142 | public slots: | 146 | public slots: |
143 | #ifdef KAB_EMBEDDED | 147 | #ifdef KAB_EMBEDDED |
144 | void createAboutData(); | 148 | void createAboutData(); |
145 | #endif //KAB_EMBEDDED | 149 | #endif //KAB_EMBEDDED |
146 | void setDetailsToggle(); | 150 | void setDetailsToggle(); |
147 | 151 | ||
@@ -361,18 +365,18 @@ class KABCore : public QWidget, public KSyncInterface | |||
361 | void setDetailsVisible( bool visible ); | 365 | void setDetailsVisible( bool visible ); |
362 | void setDetailsToState(); | 366 | void setDetailsToState(); |
363 | 367 | ||
364 | void saveSettings(); | 368 | void saveSettings(); |
365 | 369 | ||
366 | private slots: | 370 | private slots: |
367 | void updateToolBar(); | 371 | void updateToolBar(); |
368 | void updateMainWindow(); | 372 | void updateMainWindow(); |
369 | void receive( const QCString& cmsg, const QByteArray& data ); | 373 | void receive( const Q3CString& cmsg, const QByteArray& data ); |
370 | void receiveStart( const QCString& cmsg, const QByteArray& data ); | 374 | void receiveStart( const Q3CString& cmsg, const QByteArray& data ); |
371 | void toggleBeamReceive( ); | 375 | void toggleBeamReceive( ); |
372 | void disableBR(bool); | 376 | void disableBR(bool); |
373 | void setJumpButtonBarVisible( bool visible ); | 377 | void setJumpButtonBarVisible( bool visible ); |
374 | void setJumpButtonBar( bool visible ); | 378 | void setJumpButtonBar( bool visible ); |
375 | void setCaptionBack(); | 379 | void setCaptionBack(); |
376 | void resizeAndCallContactdialog(); | 380 | void resizeAndCallContactdialog(); |
377 | void callContactdialog(); | 381 | void callContactdialog(); |
378 | void doRingSync(); | 382 | void doRingSync(); |
@@ -389,17 +393,17 @@ class KABCore : public QWidget, public KSyncInterface | |||
389 | void configureResources(); | 393 | void configureResources(); |
390 | #endif //KAB_EMBEDDED | 394 | #endif //KAB_EMBEDDED |
391 | 395 | ||
392 | void slotEditorDestroyed( const QString &uid ); | 396 | void slotEditorDestroyed( const QString &uid ); |
393 | void configurationChanged(); | 397 | void configurationChanged(); |
394 | void addressBookChanged(); | 398 | void addressBookChanged(); |
395 | 399 | ||
396 | private: | 400 | private: |
397 | QCString mCStringMess; | 401 | Q3CString mCStringMess; |
398 | QByteArray mByteData; | 402 | QByteArray mByteData; |
399 | QString mEmailSourceChannel; | 403 | QString mEmailSourceChannel; |
400 | QString mEmailSourceUID; | 404 | QString mEmailSourceUID; |
401 | void resizeEvent(QResizeEvent* e ); | 405 | void resizeEvent(QResizeEvent* e ); |
402 | bool mBRdisabled; | 406 | bool mBRdisabled; |
403 | #ifndef DESKTOP_VERSION | 407 | #ifndef DESKTOP_VERSION |
404 | QCopChannel* infrared; | 408 | QCopChannel* infrared; |
405 | #endif | 409 | #endif |
@@ -481,24 +485,24 @@ class KABCore : public QWidget, public KSyncInterface | |||
481 | KAction *mActionWN; | 485 | KAction *mActionWN; |
482 | KAction *mActionSyncHowto; | 486 | KAction *mActionSyncHowto; |
483 | KAction *mActionStorageHowto; | 487 | KAction *mActionStorageHowto; |
484 | KAction *mActionKdeSyncHowto; | 488 | KAction *mActionKdeSyncHowto; |
485 | KAction *mActionMultiSyncHowto; | 489 | KAction *mActionMultiSyncHowto; |
486 | 490 | ||
487 | KAction *mActionDeleteView; | 491 | KAction *mActionDeleteView; |
488 | 492 | ||
489 | QPopupMenu *viewMenu; | 493 | Q3PopupMenu *viewMenu; |
490 | QPopupMenu *filterMenu; | 494 | Q3PopupMenu *filterMenu; |
491 | QPopupMenu *settingsMenu; | 495 | Q3PopupMenu *settingsMenu; |
492 | QPopupMenu *changeMenu; | 496 | Q3PopupMenu *changeMenu; |
493 | QPopupMenu *beamMenu; | 497 | Q3PopupMenu *beamMenu; |
494 | //US QAction *mActionSave; | 498 | //US QAction *mActionSave; |
495 | QPopupMenu *ImportMenu; | 499 | Q3PopupMenu *ImportMenu; |
496 | QPopupMenu *ExportMenu; | 500 | Q3PopupMenu *ExportMenu; |
497 | //LR additional methods | 501 | //LR additional methods |
498 | KAction *mActionRemoveVoice; | 502 | KAction *mActionRemoveVoice; |
499 | KAction *mActionSetFormattedName; | 503 | KAction *mActionSetFormattedName; |
500 | KAction * mActionImportOL; | 504 | KAction * mActionImportOL; |
501 | 505 | ||
502 | #ifndef KAB_EMBEDDED | 506 | #ifndef KAB_EMBEDDED |
503 | KAddressBookService *mAddressBookService; | 507 | KAddressBookService *mAddressBookService; |
504 | #endif //KAB_EMBEDDED | 508 | #endif //KAB_EMBEDDED |
@@ -519,17 +523,17 @@ class KABCore : public QWidget, public KSyncInterface | |||
519 | bool writeOLdata( KABC::AddressBook* local ); | 523 | bool writeOLdata( KABC::AddressBook* local ); |
520 | bool syncOL(); | 524 | bool syncOL(); |
521 | bool syncPhone(); | 525 | bool syncPhone(); |
522 | void message( QString m , bool startTimer = true); | 526 | void message( QString m , bool startTimer = true); |
523 | 527 | ||
524 | // LR ******************************* | 528 | // LR ******************************* |
525 | // sync stuff! | 529 | // sync stuff! |
526 | QString sentSyncFile(); | 530 | QString sentSyncFile(); |
527 | QPopupMenu *syncMenu; | 531 | Q3PopupMenu *syncMenu; |
528 | KSyncManager* syncManager; | 532 | KSyncManager* syncManager; |
529 | int mGlobalSyncMode; | 533 | int mGlobalSyncMode; |
530 | bool synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode); | 534 | bool synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode); |
531 | KABC::Addressee getLastSyncAddressee(); | 535 | KABC::Addressee getLastSyncAddressee(); |
532 | QDateTime mLastAddressbookSync; | 536 | QDateTime mLastAddressbookSync; |
533 | int takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, int mode , bool full ); | 537 | int takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, int mode , bool full ); |
534 | // ********************* | 538 | // ********************* |
535 | //OL sync stuff | 539 | //OL sync stuff |