X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetworkconfig.h;h=c1a0f907f50feba1ee8c094b5a12229bbbc00186;hp=8f613639069380ecf8edd607f5697dad1f8d8fc0;hb=921e54680da16fcf2adb7a90506875aceb6633a4;hpb=08adbf35b56f8ce8cf3a8edf614aa0c67061e60f

diff --git a/src/common/networkconfig.h b/src/common/networkconfig.h
index 8f613639..c1a0f907 100644
--- a/src/common/networkconfig.h
+++ b/src/common/networkconfig.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   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.         *
  ***************************************************************************/
 
 #ifndef NETWORKCONFIG_H_
@@ -23,76 +23,88 @@
 
 #include "syncableobject.h"
 
-class NetworkConfig : public SyncableObject {
-  Q_OBJECT
-  Q_PROPERTY(bool pingTimeoutEnabled READ pingTimeoutEnabled WRITE setPingTimeoutEnabled)
-  Q_PROPERTY(int pingInterval READ pingInterval WRITE setPingInterval)
-  Q_PROPERTY(int maxPingCount READ maxPingCount WRITE setMaxPingCount)
-  Q_PROPERTY(bool autoWhoEnabled READ autoWhoEnabled WRITE setAutoWhoEnabled)
-  Q_PROPERTY(int autoWhoInterval READ autoWhoInterval WRITE setAutoWhoInterval)
-  Q_PROPERTY(int autoWhoNickLimit READ autoWhoNickLimit WRITE setAutoWhoNickLimit)
-  Q_PROPERTY(int autoWhoDelay READ autoWhoDelay WRITE setAutoWhoDelay)
+class NetworkConfig : public SyncableObject
+{
+    SYNCABLE_OBJECT
+    Q_OBJECT
 
-public:
-  NetworkConfig(const QString &objectName = "GlobalNetworkConfig", QObject *parent = 0);
+    Q_PROPERTY(bool pingTimeoutEnabled READ pingTimeoutEnabled WRITE setPingTimeoutEnabled)
+    Q_PROPERTY(int pingInterval READ pingInterval WRITE setPingInterval)
+    Q_PROPERTY(int maxPingCount READ maxPingCount WRITE setMaxPingCount)
+    Q_PROPERTY(bool autoWhoEnabled READ autoWhoEnabled WRITE setAutoWhoEnabled)
+    Q_PROPERTY(int autoWhoInterval READ autoWhoInterval WRITE setAutoWhoInterval)
+    Q_PROPERTY(int autoWhoNickLimit READ autoWhoNickLimit WRITE setAutoWhoNickLimit)
+    Q_PROPERTY(int autoWhoDelay READ autoWhoDelay WRITE setAutoWhoDelay)
+    Q_PROPERTY(bool standardCtcp READ standardCtcp WRITE setStandardCtcp)
 
-  inline virtual const QMetaObject *syncMetaObject() const { return &staticMetaObject; }
+public :
+        NetworkConfig(const QString &objectName = "GlobalNetworkConfig", QObject *parent = 0);
+
+    inline virtual const QMetaObject *syncMetaObject() const { return &staticMetaObject; }
 
 public slots:
-  inline bool pingTimeoutEnabled() const { return _pingTimeoutEnabled; }
-  void setPingTimeoutEnabled(bool);
-  virtual inline void requestSetPingTimeoutEnabled(bool b) { emit setPingTimeoutEnabledRequested(b); }
+    inline bool pingTimeoutEnabled() const { return _pingTimeoutEnabled; }
+    void setPingTimeoutEnabled(bool);
+    virtual inline void requestSetPingTimeoutEnabled(bool b) { REQUEST(ARG(b)) }
+
+    inline int pingInterval() const { return _pingInterval; }
+    void setPingInterval(int);
+    virtual inline void requestSetPingInterval(int i) { REQUEST(ARG(i)) }
 
-  inline int pingInterval() const { return _pingInterval; }
-  void setPingInterval(int);
-  virtual inline void requestSetPingInterval(int i) { emit setPingIntervalRequested(i); }
+    inline int maxPingCount() const { return _maxPingCount; }
+    void setMaxPingCount(int);
+    virtual inline void requestSetMaxPingCount(int i) { REQUEST(ARG(i)) }
 
-  inline int maxPingCount() const { return _maxPingCount; }
-  void setMaxPingCount(int);
-  virtual inline void requestSetMaxPingCount(int i) { emit setMaxPingCountRequested(i); }
+    inline bool autoWhoEnabled() const { return _autoWhoEnabled; }
+    void setAutoWhoEnabled(bool);
+    virtual inline void requestSetAutoWhoEnabled(bool b) { REQUEST(ARG(b)) }
 
-  inline bool autoWhoEnabled() const { return _autoWhoEnabled; }
-  void setAutoWhoEnabled(bool);
-  virtual inline void requestSetAutoWhoEnabled(bool b) { emit setAutoWhoEnabledRequested(b); }
+    inline int autoWhoInterval() const { return _autoWhoInterval; }
+    void setAutoWhoInterval(int);
+    virtual inline void requestSetAutoWhoInterval(int i) { REQUEST(ARG(i)) }
 
-  inline int autoWhoInterval() const { return _autoWhoInterval; }
-  void setAutoWhoInterval(int);
-  virtual inline void requestSetAutoWhoInterval(int i) { emit setAutoWhoIntervalRequested(i); }
+    inline int autoWhoNickLimit() const { return _autoWhoNickLimit; }
+    void setAutoWhoNickLimit(int);
+    virtual inline void requestSetAutoWhoNickLimit(int i) { REQUEST(ARG(i)) }
 
-  inline int autoWhoNickLimit() const { return _autoWhoNickLimit; }
-  void setAutoWhoNickLimit(int);
-  virtual inline void requestSetAutoWhoNickLimit(int i) { emit setAutoWhoNickLimitRequested(i); }
+    inline int autoWhoDelay() const { return _autoWhoDelay; }
+    void setAutoWhoDelay(int);
+    virtual inline void requestSetAutoWhoDelay(int i) { REQUEST(ARG(i)) }
 
-  inline int autoWhoDelay() const { return _autoWhoDelay; }
-  void setAutoWhoDelay(int);
-  virtual inline void requestSetAutoWhoDelay(int i) { emit setAutoWhoDelayRequested(i); }
+    inline bool standardCtcp() const { return _standardCtcp; }
+    void setStandardCtcp(bool);
+    virtual inline void requestSetStandardCtcp(bool b) { REQUEST(ARG(b)) }
 
 signals:
-  void pingTimeoutEnabledSet(bool);
-  void pingIntervalSet(int);
-  void maxPingCountSet(int);
-  void autoWhoEnabledSet(bool);
-  void autoWhoIntervalSet(int);
-  void autoWhoNickLimitSet(int);
-  void autoWhoDelaySet(int);
-
-  void setPingTimeoutEnabledRequested(bool);
-  void setPingIntervalRequested(int);
-  void setMaxPingCountRequested(int);
-  void setAutoWhoEnabledRequested(bool);
-  void setAutoWhoIntervalRequested(int);
-  void setAutoWhoNickLimitRequested(int);
-  void setAutoWhoDelayRequested(int);
+    void pingTimeoutEnabledSet(bool);
+    void pingIntervalSet(int);
+//   void maxPingCountSet(int);
+    void autoWhoEnabledSet(bool);
+    void autoWhoIntervalSet(int);
+//   void autoWhoNickLimitSet(int);
+    void autoWhoDelaySet(int);
+    void standardCtcpSet(bool);
+
+//   void setPingTimeoutEnabledRequested(bool);
+//   void setPingIntervalRequested(int);
+//   void setMaxPingCountRequested(int);
+//   void setAutoWhoEnabledRequested(bool);
+//   void setAutoWhoIntervalRequested(int);
+//   void setAutoWhoNickLimitRequested(int);
+//   void setAutoWhoDelayRequested(int);
 
 private:
-  bool _pingTimeoutEnabled;
-  int _pingInterval;
-  int _maxPingCount;
-
-  bool _autoWhoEnabled;
-  int _autoWhoInterval;
-  int _autoWhoNickLimit;
-  int _autoWhoDelay;
+    bool _pingTimeoutEnabled;
+    int _pingInterval;
+    int _maxPingCount;
+
+    bool _autoWhoEnabled;
+    int _autoWhoInterval;
+    int _autoWhoNickLimit;
+    int _autoWhoDelay;
+
+    bool _standardCtcp;
 };
 
+
 #endif