Fitting the SyncableObjects to the new Style

[quassel.git] / src / common / networkconfig.h

diff --git a/src/common/networkconfig.h b/src/common/networkconfig.h
index 8f61363..d906318 100644 (file)
--- a/src/common/networkconfig.h
+++ b/src/common/networkconfig.h
@@ -24,7 +24,9 @@
 #include "syncableobject.h"
 
 class NetworkConfig : public SyncableObject {
+  SYNCABLE_OBJECT
   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)
@@ -41,48 +43,48 @@ public:
 public slots:
   inline bool pingTimeoutEnabled() const { return _pingTimeoutEnabled; }
   void setPingTimeoutEnabled(bool);
-  virtual inline void requestSetPingTimeoutEnabled(bool b) { emit setPingTimeoutEnabledRequested(b); }
+  virtual inline void requestSetPingTimeoutEnabled(bool b) { REQUEST(ARG(b)) }
 
   inline int pingInterval() const { return _pingInterval; }
   void setPingInterval(int);
-  virtual inline void requestSetPingInterval(int i) { emit setPingIntervalRequested(i); }
+  virtual inline void requestSetPingInterval(int i) { REQUEST(ARG(i)) }
 
   inline int maxPingCount() const { return _maxPingCount; }
   void setMaxPingCount(int);
-  virtual inline void requestSetMaxPingCount(int i) { emit setMaxPingCountRequested(i); }
+  virtual inline void requestSetMaxPingCount(int i) { REQUEST(ARG(i)) }
 
   inline bool autoWhoEnabled() const { return _autoWhoEnabled; }
   void setAutoWhoEnabled(bool);
-  virtual inline void requestSetAutoWhoEnabled(bool b) { emit setAutoWhoEnabledRequested(b); }
+  virtual inline void requestSetAutoWhoEnabled(bool b) { REQUEST(ARG(b)) }
 
   inline int autoWhoInterval() const { return _autoWhoInterval; }
   void setAutoWhoInterval(int);
-  virtual inline void requestSetAutoWhoInterval(int i) { emit setAutoWhoIntervalRequested(i); }
+  virtual inline void requestSetAutoWhoInterval(int i) { REQUEST(ARG(i)) }
 
   inline int autoWhoNickLimit() const { return _autoWhoNickLimit; }
   void setAutoWhoNickLimit(int);
-  virtual inline void requestSetAutoWhoNickLimit(int i) { emit setAutoWhoNickLimitRequested(i); }
+  virtual inline void requestSetAutoWhoNickLimit(int i) { REQUEST(ARG(i)) }
 
   inline int autoWhoDelay() const { return _autoWhoDelay; }
   void setAutoWhoDelay(int);
-  virtual inline void requestSetAutoWhoDelay(int i) { emit setAutoWhoDelayRequested(i); }
+  virtual inline void requestSetAutoWhoDelay(int i) { REQUEST(ARG(i)) }
 
 signals:
   void pingTimeoutEnabledSet(bool);
   void pingIntervalSet(int);
-  void maxPingCountSet(int);
+//   void maxPingCountSet(int);
   void autoWhoEnabledSet(bool);
   void autoWhoIntervalSet(int);
-  void autoWhoNickLimitSet(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 setPingTimeoutEnabledRequested(bool);
+//   void setPingIntervalRequested(int);
+//   void setMaxPingCountRequested(int);
+//   void setAutoWhoEnabledRequested(bool);
+//   void setAutoWhoIntervalRequested(int);
+//   void setAutoWhoNickLimitRequested(int);
+//   void setAutoWhoDelayRequested(int);
 
 private:
   bool _pingTimeoutEnabled;