author | zecke <zecke> | 2003-08-28 14:42:16 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-08-28 14:42:16 (UTC) |
commit | 2765a1008ca0ea05af1762616a827d1f3c35431e (patch) (side-by-side diff) | |
tree | 385268125d4f12dc2f0bc3cb1f02216d29cffbb6 /core/launcher/server.h | |
parent | fcc9c16cbd679ebc459ff0ec6228bbdedbfdfe1d (diff) | |
download | opie-2765a1008ca0ea05af1762616a827d1f3c35431e.zip opie-2765a1008ca0ea05af1762616a827d1f3c35431e.tar.gz opie-2765a1008ca0ea05af1762616a827d1f3c35431e.tar.bz2 |
Opiefy and include Opie changes
-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 @@ -30,5 +30,4 @@ class QHostAddress; class TransferServer; class PackageHandler; -class DeviceButton; class ServiceRequest; class TempScreenSaverMonitor; @@ -39,4 +38,7 @@ class SyncDialog; class DocumentList; class ServerInterface; +namespace Opie { + class ODeviceButton; +} class Server : public QWidget { @@ -50,5 +52,4 @@ public: void show(); - static void soundAlarm(); static bool setKeyboardLayout( const QString &kb ); @@ -60,5 +61,5 @@ public slots: private slots: - void activate(const DeviceButton*,bool); + void activate(const Opie::ODeviceButton*,bool); void syncConnectionClosed( const QHostAddress & ); void applicationLaunched(int pid, const QString &app); @@ -73,4 +74,5 @@ protected: private: + void layout(); void startTransferServer(); void preloadApps(); @@ -81,6 +83,7 @@ private: QDate last_today_show; int tid_xfer; - int tid_today; - TempScreenSaverMonitor *tsmMonitor; + /* ### FIXME two below### */ +// int tid_today; +// TempScreenSaverMonitor *tsmMonitor; StorageInfo *storage; SyncDialog *syncDialog; |