projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'simplify-time-formatting' of https://github.com/justjanne/quassel
[quassel.git]
/
src
/
qtui
/
knotificationbackend.h
diff --git
a/src/qtui/knotificationbackend.h
b/src/qtui/knotificationbackend.h
index
3b0a4af
..
c6268e7
100644
(file)
--- a/
src/qtui/knotificationbackend.h
+++ b/
src/qtui/knotificationbackend.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
8
by the Quassel Project *
+ * Copyright (C) 2005-201
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-34,11
+34,11
@@
class KNotificationBackend : public AbstractNotificationBackend
Q_OBJECT
public:
Q_OBJECT
public:
- KNotificationBackend(QObject
*
parent = nullptr);
+ KNotificationBackend(QObject
*
parent = nullptr);
- void notify(const Notification
&) override;
+ void notify(const Notification&) override;
void close(uint notificationId) override;
void close(uint notificationId) override;
- SettingsPage
*
createConfigWidget() const override;
+ SettingsPage
*
createConfigWidget() const override;
private slots:
void notificationActivated();
private slots:
void notificationActivated();
@@
-54,13
+54,12
@@
private:
QList<QPair<uint, QPointer<KNotification>>> _notifications;
};
QList<QPair<uint, QPointer<KNotification>>> _notifications;
};
-
class KNotificationBackend::ConfigWidget : public SettingsPage
{
Q_OBJECT
public:
class KNotificationBackend::ConfigWidget : public SettingsPage
{
Q_OBJECT
public:
- ConfigWidget(QWidget
*
parent = nullptr);
+ ConfigWidget(QWidget
*
parent = nullptr);
void save() override;
void load() override;
void save() override;
void load() override;
@@
-69,5
+68,5
@@
private slots:
void widgetChanged(bool);
private:
void widgetChanged(bool);
private:
- KNotifyConfigWidget
*
_widget;
+ KNotifyConfigWidget
*
_widget;
};
};