diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
| commit | 1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch) | |
| tree | f2defe163a805a9e34a2142dfde4cdb5e49241e7 /kmobile/kmobiledevice.h | |
| parent | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff) | |
| download | tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip | |
Enable kdepim compilation under Qt4
This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmobile/kmobiledevice.h')
| -rw-r--r-- | kmobile/kmobiledevice.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h index 16e12aad5..d89e3f2d8 100644 --- a/kmobile/kmobiledevice.h +++ b/kmobile/kmobiledevice.h @@ -38,7 +38,7 @@ class KConfig; #define KMOBILE_MIMETYPE_DEVICE "kdetqdevice/mobiletqdevice" -#define KMOBILE_MIMETYPE_DEVICE_KONTQUEROR(name) TQString("kdetqdevice/kmobile_%1").arg(name) +#define KMOBILE_MIMETYPE_DEVICE_KONTQUEROR(name) TQString("kdetqdevice/kmobile_%1").tqarg(name) #define KMOBILE_MIMETYPE_INODE "inode/" #define KMOBILE_ICON_UNKNOWN "mobile_unknown" @@ -64,8 +64,8 @@ class KConfig; class KDE_EXPORT KMobileDevice : public KLibFactory { -Q_OBJECT - TQ_OBJECT + Q_OBJECT + TQ_OBJECT friend class KMobileView; public: @@ -428,9 +428,10 @@ signals: */ void finished(); - +#ifndef Q_MOC_RUN enum MessageBoxType { QuestionYesNo = 1, WarningYesNo = 2, WarningContinueCancel = 3, WarningYesNoCancel = 4, Information = 5, SSLMessageBox = 6 }; +#endif // Q_MOC_RUN /** * Call this to show a message box from the slave (it will in fact be handled |