X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fdccconfig.cpp;h=93f6e9f920ae2fd228aab34b8ab03fdd9f5bb62e;hp=e1f8380f66ea4acfe01a04474fb1fe7bafdd7149;hb=cc21148ce02b9dd111e9821411846541187297bb;hpb=68878dc8366f2f4a0afe132847aad9a51a80cdbf

diff --git a/src/common/dccconfig.cpp b/src/common/dccconfig.cpp
index e1f8380f..93f6e9f9 100644
--- a/src/common/dccconfig.cpp
+++ b/src/common/dccconfig.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -24,10 +24,8 @@
 
 #include "types.h"
 
-INIT_SYNCABLE_OBJECT(DccConfig)
-
-DccConfig::DccConfig(QObject *parent)
-    : SyncableObject(parent)
+DccConfig::DccConfig(QObject* parent)
+    : SyncableObject("DccConfig", parent)
 {
     static auto regTypes = []() -> bool {
         qRegisterMetaTypeStreamOperators<IpDetectionMode>("DccConfig::IpDetectionMode");
@@ -36,29 +34,10 @@ DccConfig::DccConfig(QObject *parent)
     }();
     Q_UNUSED(regTypes);
 
-    renameObject("DccConfig");
     setAllowClientUpdates(true);
 }
 
-
-DccConfig &DccConfig::operator=(const DccConfig &other)
-{
-    if (this == &other)
-        return *this;
-
-    SyncableObject::operator=(other);
-
-    static auto propCount = staticMetaObject.propertyCount();
-    for (int i = 0; i < propCount; ++i) {
-        auto propName = staticMetaObject.property(i).name();
-        setProperty(propName, other.property(propName));
-    }
-
-    return *this;
-}
-
-
-bool DccConfig::operator==(const DccConfig &other)
+bool DccConfig::operator==(const DccConfig& other)
 {
     // NOTE: We don't compare the SyncableObject attributes (isInitialized, clientUpdatesAllowed())
     static auto propCount = staticMetaObject.propertyCount();
@@ -72,126 +51,106 @@ bool DccConfig::operator==(const DccConfig &other)
                 return false;
         }
         else if (property(propName) != other.property(propName))
-                return false;
+            return false;
     }
     return true;
 }
 
-
 bool DccConfig::isDccEnabled() const
 {
     return _dccEnabled;
 }
 
-
 void DccConfig::setDccEnabled(bool enabled)
 {
     _dccEnabled = enabled;
 }
 
-
 QHostAddress DccConfig::outgoingIp() const
 {
     return _outgoingIp;
 }
 
-
-void DccConfig::setOutgoingIp(const QHostAddress &outgoingIp)
+void DccConfig::setOutgoingIp(const QHostAddress& outgoingIp)
 {
     _outgoingIp = outgoingIp;
 }
 
-
 DccConfig::IpDetectionMode DccConfig::ipDetectionMode() const
 {
     return _ipDetectionMode;
 }
 
-
 void DccConfig::setIpDetectionMode(DccConfig::IpDetectionMode detectionMode)
 {
     _ipDetectionMode = detectionMode;
 }
 
-
 DccConfig::PortSelectionMode DccConfig::portSelectionMode() const
 {
     return _portSelectionMode;
 }
 
-
 void DccConfig::setPortSelectionMode(DccConfig::PortSelectionMode portSelectionMode)
 {
     _portSelectionMode = portSelectionMode;
 }
 
-
 quint16 DccConfig::minPort() const
 {
     return _minPort;
 }
 
-
 void DccConfig::setMinPort(quint16 port)
 {
     _minPort = port;
 }
 
-
 quint16 DccConfig::maxPort() const
 {
     return _maxPort;
 }
 
-
 void DccConfig::setMaxPort(quint16 port)
 {
     _maxPort = port;
 }
 
-
 int DccConfig::chunkSize() const
 {
     return _chunkSize;
 }
 
-
 void DccConfig::setChunkSize(int chunkSize)
 {
     _chunkSize = chunkSize;
 }
 
-
 int DccConfig::sendTimeout() const
 {
     return _sendTimeout;
 }
 
-
 void DccConfig::setSendTimeout(int timeout)
 {
     _sendTimeout = timeout;
 }
 
-
 bool DccConfig::usePassiveDcc() const
 {
     return _usePassiveDcc;
 }
 
-
 void DccConfig::setUsePassiveDcc(bool use)
 {
     _usePassiveDcc = use;
 }
 
-
 bool DccConfig::useFastSend() const
 {
     return _useFastSend;
 }
 
-
 void DccConfig::setUseFastSend(bool use)
 {
     _useFastSend = use;