X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetworkconfig.cpp;h=bb18d48d390eaa34c9dc0a052534be98e34dffaa;hp=dea582e396d945749075fed0e68a49c669fc5ce7;hb=db5fe27be95654222c02ccd0e5d365b90ad93630;hpb=08adbf35b56f8ce8cf3a8edf614aa0c67061e60f

diff --git a/src/common/networkconfig.cpp b/src/common/networkconfig.cpp
index dea582e3..bb18d48d 100644
--- a/src/common/networkconfig.cpp
+++ b/src/common/networkconfig.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2014 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,76 +15,107 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "networkconfig.h"
 
+INIT_SYNCABLE_OBJECT(NetworkConfig)
 NetworkConfig::NetworkConfig(const QString &objectName, QObject *parent)
-: SyncableObject(objectName, parent),
-  _pingTimeoutEnabled(true),
-  _pingInterval(30),
-  _maxPingCount(6),
-  _autoWhoEnabled(true),
-  _autoWhoInterval(90),
-  _autoWhoNickLimit(200),
-  _autoWhoDelay(5)
+    : SyncableObject(objectName, parent),
+    _pingTimeoutEnabled(true),
+    _pingInterval(30),
+    _maxPingCount(6),
+    _autoWhoEnabled(true),
+    _autoWhoInterval(90),
+    _autoWhoNickLimit(200),
+    _autoWhoDelay(5),
+    _standardCtcp(false)
 {
+}
+
 
+void NetworkConfig::setPingTimeoutEnabled(bool enabled)
+{
+    if (_pingTimeoutEnabled == enabled)
+        return;
+
+    _pingTimeoutEnabled = enabled;
+    SYNC(ARG(enabled))
+    emit pingTimeoutEnabledSet(enabled);
 }
 
-void NetworkConfig::setPingTimeoutEnabled(bool enabled) {
-  if(_pingTimeoutEnabled == enabled)
-    return;
 
-  _pingTimeoutEnabled = enabled;
-  emit pingTimeoutEnabledSet(enabled);
+void NetworkConfig::setPingInterval(int interval)
+{
+    if (_pingInterval == interval)
+        return;
+
+    _pingInterval = interval;
+    SYNC(ARG(interval))
+    emit pingIntervalSet(interval);
 }
 
-void NetworkConfig::setPingInterval(int interval) {
-  if(_pingInterval == interval)
-    return;
 
-  _pingInterval = interval;
-  emit pingIntervalSet(interval);
+void NetworkConfig::setMaxPingCount(int count)
+{
+    if (_maxPingCount == count)
+        return;
+
+    _maxPingCount = count;
+    SYNC(ARG(count))
 }
 
-void NetworkConfig::setMaxPingCount(int count) {
-  if(_maxPingCount == count)
-    return;
 
-  _maxPingCount = count;
-  emit maxPingCountSet(count);
+void NetworkConfig::setAutoWhoEnabled(bool enabled)
+{
+    if (_autoWhoEnabled == enabled)
+        return;
+
+    _autoWhoEnabled = enabled;
+    SYNC(ARG(enabled))
+    emit autoWhoEnabledSet(enabled);
 }
 
-void NetworkConfig::setAutoWhoEnabled(bool enabled) {
-  if(_autoWhoEnabled == enabled)
-    return;
 
-  _autoWhoEnabled = enabled;
-  emit autoWhoEnabledSet(enabled);
+void NetworkConfig::setAutoWhoInterval(int interval)
+{
+    if (_autoWhoInterval == interval)
+        return;
+
+    _autoWhoInterval = interval;
+    SYNC(ARG(interval))
+    emit autoWhoIntervalSet(interval);
 }
 
-void NetworkConfig::setAutoWhoInterval(int interval) {
-  if(_autoWhoInterval == interval)
-    return;
 
-  _autoWhoInterval = interval;
-  emit autoWhoIntervalSet(interval);
+void NetworkConfig::setAutoWhoNickLimit(int nickLimit)
+{
+    if (_autoWhoNickLimit == nickLimit)
+        return;
+
+    _autoWhoNickLimit = nickLimit;
+    SYNC(ARG(nickLimit))
 }
 
-void NetworkConfig::setAutoWhoNickLimit(int nickLimit) {
-  if(_autoWhoNickLimit == nickLimit)
-    return;
 
-  _autoWhoNickLimit = nickLimit;
-  emit autoWhoNickLimitSet(nickLimit);
+void NetworkConfig::setAutoWhoDelay(int delay)
+{
+    if (_autoWhoDelay == delay)
+        return;
+
+    _autoWhoDelay = delay;
+    SYNC(ARG(delay))
+    emit autoWhoDelaySet(delay);
 }
 
-void NetworkConfig::setAutoWhoDelay(int delay) {
-  if(_autoWhoDelay == delay)
-    return;
 
-  _autoWhoDelay = delay;
-  emit autoWhoDelaySet(delay);
+void NetworkConfig::setStandardCtcp(bool enabled)
+{
+    if (_standardCtcp == enabled)
+        return;
+
+    _standardCtcp = enabled;
+    SYNC(ARG(enabled))
+    emit standardCtcpSet(enabled);
 }