projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qa: Avoid deprecation warnings for QList/QSet conversions
[quassel.git]
/
src
/
qtui
/
settingspages
/
chatmonitorsettingspage.h
diff --git
a/src/qtui/settingspages/chatmonitorsettingspage.h
b/src/qtui/settingspages/chatmonitorsettingspage.h
index
be15f71
..
1f9b5f2
100644
(file)
--- a/
src/qtui/settingspages/chatmonitorsettingspage.h
+++ b/
src/qtui/settingspages/chatmonitorsettingspage.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
2
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 *
@@
-21,10
+21,11
@@
#ifndef _CHATMONITORSETTINGSPAGE_H_
#define _CHATMONITORSETTINGSPAGE_H_
#ifndef _CHATMONITORSETTINGSPAGE_H_
#define _CHATMONITORSETTINGSPAGE_H_
+#include <QHash>
+
#include "settingspage.h"
#include "settingspage.h"
-#include "ui_chatmonitorsettingspage.h"
-#include
<QHash>
+#include
"ui_chatmonitorsettingspage.h"
class BufferViewConfig;
class BufferViewConfig;
@@
-33,14
+34,14
@@
class ChatMonitorSettingsPage : public SettingsPage
Q_OBJECT
public:
Q_OBJECT
public:
- ChatMonitorSettingsPage(QWidget
*parent = 0
);
- bool hasDefaults() const;
+ ChatMonitorSettingsPage(QWidget
* parent = nullptr
);
+ bool hasDefaults() const
override
;
public slots:
public slots:
- void save();
- void load();
+ void save()
override
;
+ void load()
override
;
void loadSettings();
void loadSettings();
- void defaults();
+ void defaults()
override
;
private slots:
void widgetHasChanged();
private slots:
void widgetHasChanged();
@@
-52,11
+53,10
@@
private:
Ui::ChatMonitorSettingsPage ui;
QHash<QString, QVariant> settings;
bool testHasChanged();
Ui::ChatMonitorSettingsPage ui;
QHash<QString, QVariant> settings;
bool testHasChanged();
- void toggleBuffers(BufferView
*inView, BufferViewConfig *inCfg, BufferView *outView, BufferViewConfig *
outCfg);
+ void toggleBuffers(BufferView
* inView, BufferViewConfig* inCfg, BufferView* outView, BufferViewConfig*
outCfg);
- BufferViewConfig
*
_configAvailable;
- BufferViewConfig
*
_configActive;
+ BufferViewConfig
*
_configAvailable;
+ BufferViewConfig
*
_configActive;
};
};
-
#endif
#endif