projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
warnings--
[quassel.git]
/
src
/
qtui
/
mainwin.cpp
diff --git
a/src/qtui/mainwin.cpp
b/src/qtui/mainwin.cpp
index
66d4f6f
..
e134bc0
100644
(file)
--- a/
src/qtui/mainwin.cpp
+++ b/
src/qtui/mainwin.cpp
@@
-45,8
+45,6
@@
#include "qtuisettings.h"
#include "jumpkeyhandler.h"
#include "qtuisettings.h"
#include "jumpkeyhandler.h"
-#include "uisettings.h"
-
#include "selectionmodelsynchronizer.h"
#include "mappedselectionmodel.h"
#include "selectionmodelsynchronizer.h"
#include "mappedselectionmodel.h"
@@
-100,12
+98,6
@@
MainWin::MainWin(QtUi *_gui, QWidget *parent)
installEventFilter(new JumpKeyHandler(this));
installEventFilter(new JumpKeyHandler(this));
- UiSettings uiSettings;
- QString style = uiSettings.value("Style", QString("")).toString();
- if(style != "") {
- QApplication::setStyle(style);
- }
-
#ifdef HAVE_DBUS
desktopNotifications = new org::freedesktop::Notifications(
"org.freedesktop.Notifications",
#ifdef HAVE_DBUS
desktopNotifications = new org::freedesktop::Notifications(
"org.freedesktop.Notifications",
@@
-674,20
+666,17
@@
void MainWin::sendDesktopNotification(const QString &title, const QString &messa
void MainWin::desktopNotificationClosed(uint id, uint reason) {
void MainWin::desktopNotificationClosed(uint id, uint reason) {
+ Q_UNUSED(id); Q_UNUSED(reason);
// qDebug() << "OID: " << notificationId << " ID: " << id << " Reason: " << reason << " Time: " << QTime::currentTime().toString();
notificationId = 0;
}
void MainWin::desktopNotificationInvoked(uint id, const QString & action) {
// qDebug() << "OID: " << notificationId << " ID: " << id << " Reason: " << reason << " Time: " << QTime::currentTime().toString();
notificationId = 0;
}
void MainWin::desktopNotificationInvoked(uint id, const QString & action) {
+ Q_UNUSED(id); Q_UNUSED(action);
// qDebug() << "OID: " << notificationId << " ID: " << id << " Action: " << action << " Time: " << QTime::currentTime().toString();
}
// qDebug() << "OID: " << notificationId << " ID: " << id << " Action: " << action << " Time: " << QTime::currentTime().toString();
}
-#else /* HAVE_DBUS */
-
-void MainWin::desktopNotificationClosed(uint, uint) {}
-void MainWin::desktopNotificationInvoked(uint, const QString &) {}
-
#endif /* HAVE_DBUS */
void MainWin::displayTrayIconMessage(const QString &title, const QString &message) {
#endif /* HAVE_DBUS */
void MainWin::displayTrayIconMessage(const QString &title, const QString &message) {