projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compile with Qt 4.6
[quassel.git]
/
src
/
core
/
corealiasmanager.cpp
diff --git
a/src/core/corealiasmanager.cpp
b/src/core/corealiasmanager.cpp
index
af3353f
..
68c3881
100644
(file)
--- a/
src/core/corealiasmanager.cpp
+++ b/
src/core/corealiasmanager.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8
by the Quassel Project *
+ * Copyright (C) 2005-0
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,8
+21,10
@@
#include "corealiasmanager.h"
#include "core.h"
#include "corealiasmanager.h"
#include "core.h"
+#include "corenetwork.h"
#include "coresession.h"
#include "coresession.h"
+INIT_SYNCABLE_OBJECT(CoreAliasManager)
CoreAliasManager::CoreAliasManager(CoreSession *parent)
: AliasManager(parent)
{
CoreAliasManager::CoreAliasManager(CoreSession *parent)
: AliasManager(parent)
{
@@
-33,15
+35,11
@@
CoreAliasManager::CoreAliasManager(CoreSession *parent)
return;
}
return;
}
-
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);
- }
}
}
-
CoreAliasManager::~CoreAliasManager() {
CoreSession *session = qobject_cast<CoreSession *>(parent());
if(!session) {
CoreAliasManager::~CoreAliasManager() {
CoreSession *session = qobject_cast<CoreSession *>(parent());
if(!session) {
@@
-52,7
+50,12
@@
CoreAliasManager::~CoreAliasManager() {
Core::setUserSetting(session->user(), "Aliases", initAliases());
}
Core::setUserSetting(session->user(), "Aliases", initAliases());
}
+const Network *CoreAliasManager::network(NetworkId id) const {
+ return qobject_cast<CoreSession *>(parent())->network(id);
+}
+
void CoreAliasManager::loadDefaults() {
void CoreAliasManager::loadDefaults() {
- // Default Aliases:
- addAlias("j", "/join #$1");
+ foreach(Alias alias, AliasManager::defaults()) {
+ addAlias(alias.name, alias.expansion);
+ }
}
}