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.cpp
diff --git
a/src/qtui/settingspages/chatmonitorsettingspage.cpp
b/src/qtui/settingspages/chatmonitorsettingspage.cpp
index
16a4ca9
..
8a8faf7
100644
(file)
--- a/
src/qtui/settingspages/chatmonitorsettingspage.cpp
+++ b/
src/qtui/settingspages/chatmonitorsettingspage.cpp
@@
-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 *
@@
-30,6
+30,7
@@
#include "client.h"
#include "icon.h"
#include "networkmodel.h"
#include "client.h"
#include "icon.h"
#include "networkmodel.h"
+#include "util.h"
ChatMonitorSettingsPage::ChatMonitorSettingsPage(QWidget* parent)
: SettingsPage(tr("Interface"), tr("Chat Monitor"), parent)
ChatMonitorSettingsPage::ChatMonitorSettingsPage(QWidget* parent)
: SettingsPage(tr("Interface"), tr("Chat Monitor"), parent)
@@
-156,7
+157,7
@@
void ChatMonitorSettingsPage::save()
// save list of active buffers
QVariantList saveableBufferIdList;
foreach (BufferId id, _configActive->bufferList()) {
// save list of active buffers
QVariantList saveableBufferIdList;
foreach (BufferId id, _configActive->bufferList()) {
- saveableBufferIdList << QVariant::fromValue
<BufferId>
(id);
+ saveableBufferIdList << QVariant::fromValue(id);
}
chatViewSettings.setValue("Buffers", saveableBufferIdList);
}
chatViewSettings.setValue("Buffers", saveableBufferIdList);
@@
-189,7
+190,7
@@
bool ChatMonitorSettingsPage::testHasChanged()
if (_configActive->bufferList().count() != settings["Buffers"].toList().count())
return true;
if (_configActive->bufferList().count() != settings["Buffers"].toList().count())
return true;
- QSet<BufferId> uiBufs =
_configActive->bufferList().toSet(
);
+ QSet<BufferId> uiBufs =
toQSet(_configActive->bufferList()
);
QSet<BufferId> settingsBufs;
foreach (QVariant v, settings["Buffers"].toList())
settingsBufs << v.value<BufferId>();
QSet<BufferId> settingsBufs;
foreach (QVariant v, settings["Buffers"].toList())
settingsBufs << v.value<BufferId>();