diff options
Diffstat (limited to 'kpilot/pilotDaemon.h')
| -rw-r--r-- | kpilot/pilotDaemon.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/kpilot/pilotDaemon.h b/kpilot/pilotDaemon.h index 54c70fe..bfae7bc 100644 --- a/kpilot/pilotDaemon.h +++ b/kpilot/pilotDaemon.h @@ -54,6 +54,7 @@ class KPilotDeviceLink; class PilotDaemonTray : public KSystemTray { Q_OBJECT + TQ_OBJECT friend class PilotDaemon; @@ -126,7 +127,8 @@ private: class PilotDaemon : public TQObject, virtual public PilotDaemonDCOP { -Q_OBJECT + Q_OBJECT + TQ_OBJECT // The tray must be our friend so that we can let it stop the daemon. friend class PilotDaemonTray; @@ -136,7 +138,7 @@ public: PilotDaemon(); ~PilotDaemon(); - enum DaemonStatus + enum DaemontqStatus { HOTSYNC_START, // Hotsync is running HOTSYNC_END, // Hotsync is cleaning up @@ -147,7 +149,7 @@ public: NOT_LISTENING }; - DaemonStatus status() const { return fDaemonStatus; } ; + DaemontqStatus status() const { return fDaemontqStatus; } ; /* DCOP */ virtual TQString statusString(); /* DCOP */ virtual TQString shorStatusString(); @@ -163,7 +165,15 @@ public: // Some are also slots. // public slots: +// MOC_SKIP_BEGIN +#ifdef Q_MOC_RUN + virtual void requestSync(int); +#else // Q_MOC_RUN +// MOC_SKIP_END virtual ASYNC requestSync(int); +// MOC_SKIP_BEGIN +#endif // Q_MOC_RUN +// MOC_SKIP_END public: virtual ASYNC requestSyncType(TQString); virtual ASYNC requestRegularSyncNext(); @@ -188,7 +198,7 @@ public: virtual bool killDaemonOnExit(); protected: - DaemonStatus fDaemonStatus; + DaemontqStatus fDaemontqStatus; enum postSyncActions { None=0, @@ -234,7 +244,7 @@ private: /** * Set or change the tooltip displayed by the tray icon. */ - void updateTrayStatus(const TQString &s=TQString::null); + void updateTraytqStatus(const TQString &s=TQString()); FileInstaller *fInstaller; |