projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a flag to enable Qt deprecation warnings on Qt < 5.13
[quassel.git]
/
src
/
common
/
dccconfig.cpp
diff --git
a/src/common/dccconfig.cpp
b/src/common/dccconfig.cpp
index
e1f8380
..
800ae88
100644
(file)
--- a/
src/common/dccconfig.cpp
+++ b/
src/common/dccconfig.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
8
by the Quassel Project *
+ * Copyright (C) 2005-201
9
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 *
@@
-24,10
+24,8
@@
#include "types.h"
#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");
{
static auto regTypes = []() -> bool {
qRegisterMetaTypeStreamOperators<IpDetectionMode>("DccConfig::IpDetectionMode");
@@
-36,12
+34,10
@@
DccConfig::DccConfig(QObject *parent)
}();
Q_UNUSED(regTypes);
}();
Q_UNUSED(regTypes);
- renameObject("DccConfig");
setAllowClientUpdates(true);
}
setAllowClientUpdates(true);
}
-
-DccConfig &DccConfig::operator=(const DccConfig &other)
+DccConfig& DccConfig::operator=(const DccConfig& other)
{
if (this == &other)
return *this;
{
if (this == &other)
return *this;
@@
-57,8
+53,7
@@
DccConfig &DccConfig::operator=(const DccConfig &other)
return *this;
}
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();
{
// NOTE: We don't compare the SyncableObject attributes (isInitialized, clientUpdatesAllowed())
static auto propCount = staticMetaObject.propertyCount();
@@
-72,126
+67,106
@@
bool DccConfig::operator==(const DccConfig &other)
return false;
}
else if (property(propName) != other.property(propName))
return false;
}
else if (property(propName) != other.property(propName))
-
return false;
+ return false;
}
return true;
}
}
return true;
}
-
bool DccConfig::isDccEnabled() const
{
return _dccEnabled;
}
bool DccConfig::isDccEnabled() const
{
return _dccEnabled;
}
-
void DccConfig::setDccEnabled(bool enabled)
{
_dccEnabled = enabled;
}
void DccConfig::setDccEnabled(bool enabled)
{
_dccEnabled = enabled;
}
-
QHostAddress DccConfig::outgoingIp() const
{
return _outgoingIp;
}
QHostAddress DccConfig::outgoingIp() const
{
return _outgoingIp;
}
-
-void DccConfig::setOutgoingIp(const QHostAddress &outgoingIp)
+void DccConfig::setOutgoingIp(const QHostAddress& outgoingIp)
{
_outgoingIp = outgoingIp;
}
{
_outgoingIp = outgoingIp;
}
-
DccConfig::IpDetectionMode DccConfig::ipDetectionMode() const
{
return _ipDetectionMode;
}
DccConfig::IpDetectionMode DccConfig::ipDetectionMode() const
{
return _ipDetectionMode;
}
-
void DccConfig::setIpDetectionMode(DccConfig::IpDetectionMode detectionMode)
{
_ipDetectionMode = detectionMode;
}
void DccConfig::setIpDetectionMode(DccConfig::IpDetectionMode detectionMode)
{
_ipDetectionMode = detectionMode;
}
-
DccConfig::PortSelectionMode DccConfig::portSelectionMode() const
{
return _portSelectionMode;
}
DccConfig::PortSelectionMode DccConfig::portSelectionMode() const
{
return _portSelectionMode;
}
-
void DccConfig::setPortSelectionMode(DccConfig::PortSelectionMode portSelectionMode)
{
_portSelectionMode = portSelectionMode;
}
void DccConfig::setPortSelectionMode(DccConfig::PortSelectionMode portSelectionMode)
{
_portSelectionMode = portSelectionMode;
}
-
quint16 DccConfig::minPort() const
{
return _minPort;
}
quint16 DccConfig::minPort() const
{
return _minPort;
}
-
void DccConfig::setMinPort(quint16 port)
{
_minPort = port;
}
void DccConfig::setMinPort(quint16 port)
{
_minPort = port;
}
-
quint16 DccConfig::maxPort() const
{
return _maxPort;
}
quint16 DccConfig::maxPort() const
{
return _maxPort;
}
-
void DccConfig::setMaxPort(quint16 port)
{
_maxPort = port;
}
void DccConfig::setMaxPort(quint16 port)
{
_maxPort = port;
}
-
int DccConfig::chunkSize() const
{
return _chunkSize;
}
int DccConfig::chunkSize() const
{
return _chunkSize;
}
-
void DccConfig::setChunkSize(int chunkSize)
{
_chunkSize = chunkSize;
}
void DccConfig::setChunkSize(int chunkSize)
{
_chunkSize = chunkSize;
}
-
int DccConfig::sendTimeout() const
{
return _sendTimeout;
}
int DccConfig::sendTimeout() const
{
return _sendTimeout;
}
-
void DccConfig::setSendTimeout(int timeout)
{
_sendTimeout = timeout;
}
void DccConfig::setSendTimeout(int timeout)
{
_sendTimeout = timeout;
}
-
bool DccConfig::usePassiveDcc() const
{
return _usePassiveDcc;
}
bool DccConfig::usePassiveDcc() const
{
return _usePassiveDcc;
}
-
void DccConfig::setUsePassiveDcc(bool use)
{
_usePassiveDcc = use;
}
void DccConfig::setUsePassiveDcc(bool use)
{
_usePassiveDcc = use;
}
-
bool DccConfig::useFastSend() const
{
return _useFastSend;
}
bool DccConfig::useFastSend() const
{
return _useFastSend;
}
-
void DccConfig::setUseFastSend(bool use)
{
_useFastSend = use;
void DccConfig::setUseFastSend(bool use)
{
_useFastSend = use;