projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #180 from digitalcircuit/ircv3-expanded-caps
[quassel.git]
/
src
/
common
/
network.h
diff --git
a/src/common/network.h
b/src/common/network.h
index
01e6158
..
190c62c
100644
(file)
--- a/
src/common/network.h
+++ b/
src/common/network.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
5
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 *
@@
-213,10
+213,6
@@
public :
inline bool autoAwayActive() const { return _autoAwayActive; }
inline void setAutoAwayActive(bool active) { _autoAwayActive = active; }
inline bool autoAwayActive() const { return _autoAwayActive; }
inline void setAutoAwayActive(bool active) { _autoAwayActive = active; }
- static QStringList presetNetworks(bool onlyDefault = false);
- static QStringList presetDefaultChannels(const QString &networkName);
- static NetworkInfo networkInfoFromPreset(const QString &networkName);
-
public slots:
void setNetworkName(const QString &networkName);
void setCurrentServer(const QString ¤tServer);
public slots:
void setNetworkName(const QString &networkName);
void setCurrentServer(const QString ¤tServer);
@@
-372,8
+368,6
@@
private:
bool _autoAwayActive; // when this is active handle305 and handle306 don't trigger any output
bool _autoAwayActive; // when this is active handle305 and handle306 don't trigger any output
- static QString _networksIniPath;
-
friend class IrcUser;
friend class IrcChannel;
};
friend class IrcUser;
friend class IrcChannel;
};