author | zecke <zecke> | 2003-08-28 14:42:16 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-08-28 14:42:16 (UTC) |
commit | 2765a1008ca0ea05af1762616a827d1f3c35431e (patch) (unidiff) | |
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 | |||
@@ -29,7 +29,6 @@ class QCopBridge; | |||
29 | class QHostAddress; | 29 | class QHostAddress; |
30 | class TransferServer; | 30 | class TransferServer; |
31 | class PackageHandler; | 31 | class PackageHandler; |
32 | class DeviceButton; | ||
33 | class ServiceRequest; | 32 | class ServiceRequest; |
34 | class TempScreenSaverMonitor; | 33 | class TempScreenSaverMonitor; |
35 | class AppLauncher; | 34 | class AppLauncher; |
@@ -38,6 +37,9 @@ class StorageInfo; | |||
38 | class SyncDialog; | 37 | class SyncDialog; |
39 | class DocumentList; | 38 | class DocumentList; |
40 | class ServerInterface; | 39 | class ServerInterface; |
40 | namespace Opie { | ||
41 | class ODeviceButton; | ||
42 | } | ||
41 | 43 | ||
42 | class Server : public QWidget { | 44 | class Server : public QWidget { |
43 | Q_OBJECT | 45 | Q_OBJECT |
@@ -49,7 +51,6 @@ public: | |||
49 | 51 | ||
50 | void show(); | 52 | void show(); |
51 | 53 | ||
52 | static void soundAlarm(); | ||
53 | static bool setKeyboardLayout( const QString &kb ); | 54 | static bool setKeyboardLayout( const QString &kb ); |
54 | 55 | ||
55 | public slots: | 56 | public slots: |
@@ -59,7 +60,7 @@ public slots: | |||
59 | void pokeTimeMonitors(); | 60 | void pokeTimeMonitors(); |
60 | 61 | ||
61 | private slots: | 62 | private slots: |
62 | void activate(const DeviceButton*,bool); | 63 | void activate(const Opie::ODeviceButton*,bool); |
63 | void syncConnectionClosed( const QHostAddress & ); | 64 | void syncConnectionClosed( const QHostAddress & ); |
64 | void applicationLaunched(int pid, const QString &app); | 65 | void applicationLaunched(int pid, const QString &app); |
65 | void applicationTerminated(int pid, const QString &app); | 66 | void applicationTerminated(int pid, const QString &app); |
@@ -72,6 +73,7 @@ protected: | |||
72 | void timerEvent( QTimerEvent *e ); | 73 | void timerEvent( QTimerEvent *e ); |
73 | 74 | ||
74 | private: | 75 | private: |
76 | void layout(); | ||
75 | void startTransferServer(); | 77 | void startTransferServer(); |
76 | void preloadApps(); | 78 | void preloadApps(); |
77 | 79 | ||
@@ -80,8 +82,9 @@ private: | |||
80 | PackageHandler *packageHandler; | 82 | PackageHandler *packageHandler; |
81 | QDate last_today_show; | 83 | QDate last_today_show; |
82 | int tid_xfer; | 84 | int tid_xfer; |
83 | int tid_today; | 85 | /* ### FIXME two below### */ |
84 | TempScreenSaverMonitor *tsmMonitor; | 86 | // int tid_today; |
87 | // TempScreenSaverMonitor *tsmMonitor; | ||
85 | StorageInfo *storage; | 88 | StorageInfo *storage; |
86 | SyncDialog *syncDialog; | 89 | SyncDialog *syncDialog; |
87 | AppLauncher *appLauncher; | 90 | AppLauncher *appLauncher; |