projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Make SyncableObject non-copyable
[quassel.git]
/
src
/
qtui
/
settingspages
/
dccsettingspage.cpp
diff --git
a/src/qtui/settingspages/dccsettingspage.cpp
b/src/qtui/settingspages/dccsettingspage.cpp
index
54a7fd4
..
3d74449
100644
(file)
--- a/
src/qtui/settingspages/dccsettingspage.cpp
+++ b/
src/qtui/settingspages/dccsettingspage.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-20
18
by the Quassel Project *
+ * Copyright (C) 2005-20
20
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 *
@@
-81,14
+81,14
@@
bool DccSettingsPage::hasDefaults() const
void DccSettingsPage::defaults()
{
void DccSettingsPage::defaults()
{
- _localConfig
= DccConfig(
);
+ _localConfig
.fromVariantMap(DccConfig{}.toVariantMap()
);
SettingsPage::load();
widgetHasChanged();
}
void DccSettingsPage::load()
{
SettingsPage::load();
widgetHasChanged();
}
void DccSettingsPage::load()
{
- _localConfig
= isClientConfigValid() ? *_clientConfig : DccConfig{}
;
+ _localConfig
.fromVariantMap(isClientConfigValid() ? _clientConfig->toVariantMap() : DccConfig{}.toVariantMap())
;
SettingsPage::load();
widgetHasChanged();
}
SettingsPage::load();
widgetHasChanged();
}