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
/
aliasesmodel.cpp
diff --git
a/src/qtui/settingspages/aliasesmodel.cpp
b/src/qtui/settingspages/aliasesmodel.cpp
index
4271614
..
780b152
100644
(file)
--- a/
src/qtui/settingspages/aliasesmodel.cpp
+++ b/
src/qtui/settingspages/aliasesmodel.cpp
@@
-244,47
+244,41
@@
QModelIndex AliasesModel::index(int row, int column, const QModelIndex& parent)
const AliasManager& AliasesModel::aliasManager() const
{
const AliasManager& AliasesModel::aliasManager() const
{
- if (_configChanged)
- return _clonedAliasManager;
- else
- return *Client::aliasManager();
+ return _clonedAliasManager ? *_clonedAliasManager : *Client::aliasManager();
}
AliasManager& AliasesModel::aliasManager()
{
}
AliasManager& AliasesModel::aliasManager()
{
- if (_configChanged)
- return _clonedAliasManager;
- else
- return *Client::aliasManager();
+ return _clonedAliasManager ? *_clonedAliasManager : *Client::aliasManager();
}
AliasManager& AliasesModel::cloneAliasManager()
{
}
AliasManager& AliasesModel::cloneAliasManager()
{
- if (!_c
onfigChanged
) {
- _clonedAliasManager =
*Client::aliasManager
();
- _c
onfigChanged = true
;
+ if (!_c
lonedAliasManager
) {
+ _clonedAliasManager =
std::make_unique<ClientAliasManager>
();
+ _c
lonedAliasManager->fromVariantMap(Client::aliasManager()->toVariantMap())
;
emit configChanged(true);
}
emit configChanged(true);
}
- return _clonedAliasManager;
+ return
*
_clonedAliasManager;
}
void AliasesModel::revert()
{
}
void AliasesModel::revert()
{
- if (!_c
onfigChanged
)
+ if (!_c
lonedAliasManager
)
return;
return;
- _configChanged = false;
- emit configChanged(false);
beginResetModel();
beginResetModel();
+ _clonedAliasManager.reset();
endResetModel();
endResetModel();
+ emit configChanged(false);
}
void AliasesModel::commit()
{
}
void AliasesModel::commit()
{
- if (!_c
onfigChanged
)
+ if (!_c
lonedAliasManager
)
return;
return;
- Client::aliasManager()->requestUpdate(_clonedAliasManager
.
toVariantMap());
+ Client::aliasManager()->requestUpdate(_clonedAliasManager
->
toVariantMap());
revert();
}
revert();
}
@@
-307,10
+301,9
@@
void AliasesModel::clientConnected()
void AliasesModel::clientDisconnected()
{
void AliasesModel::clientDisconnected()
{
- // clear
- _clonedAliasManager = ClientAliasManager();
_modelReady = false;
beginResetModel();
_modelReady = false;
beginResetModel();
+ _clonedAliasManager.reset();
endResetModel();
emit modelReady(false);
}
endResetModel();
emit modelReady(false);
}