| author | kergoth <kergoth> | 2002-06-07 18:53:14 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2002-06-07 18:53:14 (UTC) |
| commit | 640d964cfdc7467f6cacb513087cd3acda2c04f0 (patch) (unidiff) | |
| tree | 9a784686c1795f8b1f81eb344598f3b549d43467 /library/alarmserver.h | |
| parent | dfb9c76738bb68e235114c5ad43dbd26a59b98ab (diff) | |
| download | opie-640d964cfdc7467f6cacb513087cd3acda2c04f0.zip opie-640d964cfdc7467f6cacb513087cd3acda2c04f0.tar.gz opie-640d964cfdc7467f6cacb513087cd3acda2c04f0.tar.bz2 | |
Backing out unintentional merge from TT branch.
| -rw-r--r-- | library/alarmserver.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/library/alarmserver.h b/library/alarmserver.h index 665c3ae..f12a63d 100644 --- a/library/alarmserver.h +++ b/library/alarmserver.h | |||
| @@ -28,6 +28,9 @@ class AlarmServer | |||
| 28 | public: | 28 | public: |
| 29 | static void addAlarm ( QDateTime when, const QCString& channel, const QCString& msg, int data=0); | 29 | static void addAlarm ( QDateTime when, const QCString& channel, const QCString& msg, int data=0); |
| 30 | static void deleteAlarm (QDateTime when, const QCString& channel, const QCString& msg, int data=0); | 30 | static void deleteAlarm (QDateTime when, const QCString& channel, const QCString& msg, int data=0); |
| 31 | |||
| 32 | private: | ||
| 33 | friend int initApplication(int, char **); | ||
| 31 | static void initialize(); | 34 | static void initialize(); |
| 32 | }; | 35 | }; |
| 33 | 36 | ||