-rw-r--r-- | core/launcher/server.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/core/launcher/server.h b/core/launcher/server.h index 21b03af..91bf883 100644 --- a/core/launcher/server.h +++ b/core/launcher/server.h @@ -28,17 +28,19 @@ class QCopBridge; class QHostAddress; class TransferServer; class PackageHandler; -class DeviceButton; class ServiceRequest; class TempScreenSaverMonitor; class AppLauncher; class AppLnkSet; class StorageInfo; class SyncDialog; class DocumentList; class ServerInterface; +namespace Opie { + class ODeviceButton; +} class Server : public QWidget { Q_OBJECT public: @@ -48,9 +50,8 @@ public: static bool mkdir(const QString &path); void show(); - static void soundAlarm(); static bool setKeyboardLayout( const QString &kb ); public slots: void systemMsg(const QCString &, const QByteArray &); @@ -58,9 +59,9 @@ public slots: void terminateServers(); void pokeTimeMonitors(); private slots: - void activate(const DeviceButton*,bool); + void activate(const Opie::ODeviceButton*,bool); void syncConnectionClosed( const QHostAddress & ); void applicationLaunched(int pid, const QString &app); void applicationTerminated(int pid, const QString &app); void applicationConnected(const QString &app); @@ -71,18 +72,20 @@ protected: void styleChange( QStyle & ); void timerEvent( QTimerEvent *e ); private: + void layout(); void startTransferServer(); void preloadApps(); QCopBridge *qcopBridge; TransferServer *transferServer; PackageHandler *packageHandler; QDate last_today_show; int tid_xfer; - int tid_today; - TempScreenSaverMonitor *tsmMonitor; + /* ### FIXME two below### */ +// int tid_today; +// TempScreenSaverMonitor *tsmMonitor; StorageInfo *storage; SyncDialog *syncDialog; AppLauncher *appLauncher; DocumentList *docList; |