projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes
[quassel.git]
/
src
/
core
/
corealiasmanager.cpp
diff --git
a/src/core/corealiasmanager.cpp
b/src/core/corealiasmanager.cpp
index
8fcdb02
..
9576c04
100644
(file)
--- a/
src/core/corealiasmanager.cpp
+++ b/
src/core/corealiasmanager.cpp
@@
-34,11
+34,9
@@
CoreAliasManager::CoreAliasManager(CoreSession *parent)
}
QVariantMap aliases = Core::getUserSetting(session->user(), "Aliases").toMap();
}
QVariantMap aliases = Core::getUserSetting(session->user(), "Aliases").toMap();
- if(aliases.isEmpty()) {
+ initSetAliases(Core::getUserSetting(session->user(), "Aliases").toMap());
+ if(isEmpty())
loadDefaults();
loadDefaults();
- } else {
- initSetAliases(aliases);
- }
}
}
@@
-52,7
+50,9
@@
CoreAliasManager::~CoreAliasManager() {
Core::setUserSetting(session->user(), "Aliases", initAliases());
}
Core::setUserSetting(session->user(), "Aliases", initAliases());
}
+
void CoreAliasManager::loadDefaults() {
void CoreAliasManager::loadDefaults() {
- // Default Aliases:
- addAlias("j", "/join $1");
+ foreach(Alias alias, AliasManager::defaults()) {
+ addAlias(alias.name, alias.expansion);
+ }
}
}