Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-10-23 08:43:50 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-10-23 08:43:50 (GMT) |
| commit | ca8268eb662fedeef039bc39f7b8206c08610299 (patch) | |
| tree | e317c4c8225efed85d1cd22a3a7f84015f7a2d3c | |
| parent | 96be62f4a700e3bd50f4b6f177f02e5820a09106 (diff) | |
| download | swift-ca8268eb662fedeef039bc39f7b8206c08610299.zip swift-ca8268eb662fedeef039bc39f7b8206c08610299.tar.bz2 | |
Fixed compilation errors due to previous commit.
| -rw-r--r-- | SwifTools/Notifier/SnarlNotifier.cpp | 2 | ||||
| -rw-r--r-- | Swift/QtUI/FreeDesktopNotifier.cpp | 2 | ||||
| -rw-r--r-- | Swift/QtUI/FreeDesktopNotifier.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/SwifTools/Notifier/SnarlNotifier.cpp b/SwifTools/Notifier/SnarlNotifier.cpp index 1822b49..eb4addc 100644 --- a/SwifTools/Notifier/SnarlNotifier.cpp +++ b/SwifTools/Notifier/SnarlNotifier.cpp @@ -33,7 +33,7 @@ SnarlNotifier::~SnarlNotifier() { } } -void SnarlNotifier::doShowMessage(Type type, const String& subject, const String& description, const boost::filesystem::path& picture, boost::function<void()> callback) { +void SnarlNotifier::showMessage(Type type, const String& subject, const String& description, const boost::filesystem::path& picture, boost::function<void()> callback) { int timeout = (type == Type::IncomingMessage || type == Type::SystemMessage) ? DEFAULT_MESSAGE_NOTIFICATION_TIMEOUT_SECONDS : DEFAULT_STATUS_NOTIFICATION_TIMEOUT_SECONDS; int notificationID = snarl.ShowMessageEx(typeToString(type).getUTF8Data(), subject.getUTF8Data(), description.getUTF8Data(), timeout, picture.string().c_str(), window->getID(), SWIFT_SNARLNOTIFIER_MESSAGE_ID); if (notificationID > 0) { diff --git a/Swift/QtUI/FreeDesktopNotifier.cpp b/Swift/QtUI/FreeDesktopNotifier.cpp index 2560882..0f0bfe0 100644 --- a/Swift/QtUI/FreeDesktopNotifier.cpp +++ b/Swift/QtUI/FreeDesktopNotifier.cpp @@ -21,7 +21,7 @@ namespace Swift { FreeDesktopNotifier::FreeDesktopNotifier(const String& name) : applicationName(name) { } -void FreeDesktopNotifier::doShowMessage(Type type, const String& subject, const String& description, const boost::filesystem::path& picture, boost::function<void()>) { +void FreeDesktopNotifier::showMessage(Type type, const String& subject, const String& description, const boost::filesystem::path& picture, boost::function<void()>) { QDBusConnection bus = QDBusConnection::sessionBus(); if (!bus.isConnected()) { return; diff --git a/Swift/QtUI/FreeDesktopNotifier.h b/Swift/QtUI/FreeDesktopNotifier.h index 087e9e3..6583493 100644 --- a/Swift/QtUI/FreeDesktopNotifier.h +++ b/Swift/QtUI/FreeDesktopNotifier.h @@ -13,7 +13,7 @@ namespace Swift { public: FreeDesktopNotifier(const String& name); - virtual void doShowMessage(Type type, const String& subject, const String& description, const boost::filesystem::path& picture, boost::function<void()> callback); + virtual void showMessage(Type type, const String& subject, const String& description, const boost::filesystem::path& picture, boost::function<void()> callback); private: String applicationName; |