diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
| commit | cc29364f06178f8f6b457384f2ec37a042bd9d43 (patch) | |
| tree | 7c77a3184c698bbf9d98cef09fb1ba8124daceba /kalarm/functions.cpp | |
| parent | 4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff) | |
| download | tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip | |
* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch
* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kalarm/functions.cpp')
| -rw-r--r-- | kalarm/functions.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index 45537e3d..28f73499 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -71,9 +71,6 @@ bool sendToKOrganizer(const KAEvent&); bool deleteFromKOrganizer(const TQString& eventID); bool runKOrganizer(); } -#ifdef HAVE_XTEST -void x11_cancelScreenSaver(); -#endif namespace KAlarm @@ -931,17 +928,6 @@ TQString stripAccel(const TQString& text) return out; } -/****************************************************************************** -* Cancel the screen saver, in case it is active. -* Only implemented if the X11 XTest extension is installed. -*/ -void cancelScreenSaver() -{ -#ifdef HAVE_XTEST - x11_cancelScreenSaver(); -#endif // HAVE_XTEST -} - } // namespace KAlarm |