aboutsummaryrefslogtreecommitdiffstats
path: root/src/kvilib/irc
diff options
context:
space:
mode:
authorGravatar IceN9ne2018-11-27 21:38:17 -0500
committerGravatar IceN9ne2018-11-28 22:02:03 -0500
commit7de8aed0e6497b4d60c07047fee488690cb2bf00 (patch)
tree262c4ec16051bd37fb453e4de5d934573a9b62b3 /src/kvilib/irc
parentRemove Q_UNUSED macros (diff)
downloadKVIrc-7de8aed0e6497b4d60c07047fee488690cb2bf00.tar.gz
KVIrc-7de8aed0e6497b4d60c07047fee488690cb2bf00.tar.bz2
KVIrc-7de8aed0e6497b4d60c07047fee488690cb2bf00.zip
Remove unnecessary usages of the inline keyword per language evolution.
Diffstat (limited to 'src/kvilib/irc')
-rw-r--r--src/kvilib/irc/KviAvatar.h18
-rw-r--r--src/kvilib/irc/KviIrcNetwork.h60
-rw-r--r--src/kvilib/irc/KviIrcServer.h132
-rw-r--r--src/kvilib/irc/KviIrcServerDataBase.h10
4 files changed, 110 insertions, 110 deletions
diff --git a/src/kvilib/irc/KviAvatar.h b/src/kvilib/irc/KviAvatar.h
index 17d78ad57..26fc1fe3a 100644
--- a/src/kvilib/irc/KviAvatar.h
+++ b/src/kvilib/irc/KviAvatar.h
@@ -82,13 +82,13 @@ public:
* \brief Returns true, if avatar is remote.
* \return bool
*/
- inline bool isRemote() { return m_bRemote; }
+ bool isRemote() const { return m_bRemote; }
/**
* \brief Returns filepath
* \return const QString &
*/
- inline const QString & localPath() { return m_szLocalPath; }
+ const QString & localPath() const { return m_szLocalPath; }
/**
* \brief Returns fiename.
@@ -96,25 +96,25 @@ public:
* For remote avatars, remote address will be returned.
* \return const QString &
*/
- inline const QString & name() { return m_szName; }
+ const QString & name() const { return m_szName; }
/**
* \brief Returns true, if underlying pixmap contains more then one frame.
* \return bool
*/
- inline bool isAnimated() { return (m_pPixmap->framesCount() > 1); }
+ bool isAnimated() const { return (m_pPixmap->framesCount() > 1); }
/**
* \brief Returns original pixmap's size
* \return const QSize &
*/
- inline const QSize & size() { return m_pPixmap->size(); }
+ const QSize & size() const { return m_pPixmap->size(); }
/**
* \brief Returns unscaled original frame.
* \return QPixmap *
*/
- inline QPixmap * pixmap() { return m_pPixmap->pixmap(); }
+ QPixmap * pixmap() const { return m_pPixmap->pixmap(); }
/**
* \brief Returns true if pixmap has at least one loaded frame.
@@ -122,13 +122,13 @@ public:
* Returns false otherwise.
* \return bool
*/
- inline bool isValid() { return m_pPixmap->isValid(); }
+ bool isValid() const { return m_pPixmap->isValid(); }
/**
* \brief Returns original animated pixmap.
* \return KviAnimatedPixmap *
*/
- inline KviAnimatedPixmap * animatedPixmap() { return m_pPixmap; }
+ KviAnimatedPixmap * animatedPixmap() const { return m_pPixmap; }
/**
* \brief Returns animated pixmap, scaled to the requisted size.
@@ -161,7 +161,7 @@ public:
* \param uHeight The height of the avatar
* \return KviAnimatedPixmap *
*/
- inline KviAnimatedPixmap * forSize(unsigned int uWidth, unsigned int uHeight) { return forSize(QSize(uWidth, uHeight)); }
+ KviAnimatedPixmap * forSize(unsigned int uWidth, unsigned int uHeight) { return forSize(QSize(uWidth, uHeight)); }
/**
* \brief Returns the string that uniquely identifies this avatar.
diff --git a/src/kvilib/irc/KviIrcNetwork.h b/src/kvilib/irc/KviIrcNetwork.h
index d3b3745fe..608f330c2 100644
--- a/src/kvilib/irc/KviIrcNetwork.h
+++ b/src/kvilib/irc/KviIrcNetwork.h
@@ -92,7 +92,7 @@ public:
* \brief Returns the name of the network
* \return const QString &
*/
- inline const QString & name() const { return m_szName; };
+ const QString & name() const { return m_szName; }
/**
* \brief Returns the encoding of the network
@@ -101,7 +101,7 @@ public:
* communicating with the server
* \return const QString &
*/
- inline const QString & encoding() const { return m_szEncoding; };
+ const QString & encoding() const { return m_szEncoding; }
/**
* \brief Returns the text encoding of the network
@@ -109,85 +109,85 @@ public:
* This is the default encoding when talking on channels or queries
* \return const QString &
*/
- inline const QString & textEncoding() const { return m_szTextEncoding; };
+ const QString & textEncoding() const { return m_szTextEncoding; }
/**
* \brief Returns the description of the network
* \return const QString &
*/
- inline const QString & description() const { return m_szDescription; };
+ const QString & description() const { return m_szDescription; }
/**
* \brief Returns the nickname of the user associated to the network
* \return const QString &
*/
- inline const QString & nickName() const { return m_szNickName; };
+ const QString & nickName() const { return m_szNickName; }
/**
* \brief Returns the alternative nickname of the user associated to the network
* \return const QString &
*/
- inline const QString & alternativeNickName() const { return m_szAlternativeNickName; };
+ const QString & alternativeNickName() const { return m_szAlternativeNickName; }
/**
* \brief Returns the realname of the user associated to the network
* \return const QString &
*/
- inline const QString & realName() const { return m_szRealName; };
+ const QString & realName() const { return m_szRealName; }
/**
* \brief Returns the username of the user associated to the network
* \return const QString &
*/
- inline const QString & userName() const { return m_szUserName; };
+ const QString & userName() const { return m_szUserName; }
/**
* \brief Returns the password of the user associated to the network
* \return const QString &
*/
- inline const QString & password() const { return m_szPass; };
+ const QString & password() const { return m_szPass; }
/**
* \brief Returns the commands to run on network login
* \return const QString &
*/
- inline const QString & onLoginCommand() const { return m_szOnLoginCommand; };
+ const QString & onLoginCommand() const { return m_szOnLoginCommand; }
/**
* \brief Returns the commands to run on network connect
* \return const QString &
*/
- inline const QString & onConnectCommand() const { return m_szOnConnectCommand; };
+ const QString & onConnectCommand() const { return m_szOnConnectCommand; }
/**
* \brief Returns the user identity of the user associated to the network
* \return const QString &
*/
- inline const QString & userIdentityId() const { return m_szUserIdentityId; };
+ const QString & userIdentityId() const { return m_szUserIdentityId; }
/**
* \brief Returns true if the network has the autoconnect state on
* \return bool
*/
- inline bool autoConnect() const { return m_bAutoConnect; };
+ bool autoConnect() const { return m_bAutoConnect; }
/**
* \brief Returns the list of channels with autojoin flag
* \return QStringList *
*/
- inline QStringList * autoJoinChannelList() { return m_pChannelList; };
+ QStringList * autoJoinChannelList() { return m_pChannelList; }
/**
* \brief Returns the list of channels with autojoin flag as a string
* \return const QString &
*/
- inline const QString autoJoinChannelListAsString() { return m_pChannelList ? m_pChannelList->join(",") : ""; };
+ const QString autoJoinChannelListAsString() { return m_pChannelList ? m_pChannelList->join(",") : ""; }
/**
* \brief Returns a set of rules for the NickServ
* \return KviNickServRuleSet *
*/
- inline KviNickServRuleSet * nickServRuleSet() { return m_pNickServRuleSet; };
+ KviNickServRuleSet * nickServRuleSet() { return m_pNickServRuleSet; }
/**
* \brief Sets the rules for NickServ
@@ -208,7 +208,7 @@ public:
* \param szName The name of the network
* \return void
*/
- inline void setName(const QString & szName) { m_szName = szName; };
+ void setName(const QString & szName) { m_szName = szName; }
/**
* \brief Sets the encondig of the network
@@ -218,7 +218,7 @@ public:
* \param szEncoding The encoding of the network
* \return void
*/
- inline void setEncoding(const QString & szEncoding) { m_szEncoding = szEncoding; };
+ void setEncoding(const QString & szEncoding) { m_szEncoding = szEncoding; }
/**
* \brief Sets the text encondig of the network
@@ -227,63 +227,63 @@ public:
* \param szEncoding The text encoding of the network
* \return void
*/
- inline void setTextEncoding(const QString & szEncoding) { m_szTextEncoding = szEncoding; };
+ void setTextEncoding(const QString & szEncoding) { m_szTextEncoding = szEncoding; }
/**
* \brief Sets the description of the network
* \param szDescription The description of the network
* \return void
*/
- inline void setDescription(const QString & szDescription) { m_szDescription = szDescription; };
+ void setDescription(const QString & szDescription) { m_szDescription = szDescription; }
/**
* \brief Sets the list of commands to run on network connection
* \param szCmd The commands list to run
* \return void
*/
- inline void setOnConnectCommand(const QString & szCmd) { m_szOnConnectCommand = szCmd; };
+ void setOnConnectCommand(const QString & szCmd) { m_szOnConnectCommand = szCmd; }
/**
* \brief Sets the list of commands to run on network login
* \param szCmd The commands list to run
* \return void
*/
- inline void setOnLoginCommand(const QString & szCmd) { m_szOnLoginCommand = szCmd; };
+ void setOnLoginCommand(const QString & szCmd) { m_szOnLoginCommand = szCmd; }
/**
* \brief Sets the nickname of the user associated to the network
* \param szNick The nickname
* \return void
*/
- inline void setNickName(const QString & szNick) { m_szNickName = szNick; };
+ void setNickName(const QString & szNick) { m_szNickName = szNick; }
/**
* \brief Sets the alternative nickname of the user associated to the network
* \param szNick The nickname
* \return void
*/
- inline void setAlternativeNickName(const QString & szNick) { m_szAlternativeNickName = szNick; };
+ void setAlternativeNickName(const QString & szNick) { m_szAlternativeNickName = szNick; }
/**
* \brief Sets the realname of the user associated to the network
* \param szReal The realname
* \return void
*/
- inline void setRealName(const QString & szReal) { m_szRealName = szReal; };
+ void setRealName(const QString & szReal) { m_szRealName = szReal; }
/**
* \brief Sets the username of the user associated to the network
* \param szUser The username
* \return void
*/
- inline void setUserName(const QString & szUser) { m_szUserName = szUser; };
+ void setUserName(const QString & szUser) { m_szUserName = szUser; }
/**
* \brief Sets the password of the user associated to the network
* \param szPass The password
* \return void
*/
- inline void setPassword(const QString & szPass) { m_szPass = szPass; };
+ void setPassword(const QString & szPass) { m_szPass = szPass; }
/**
* \brief Sets the list of channels to mark for autojoin
@@ -304,20 +304,20 @@ public:
* \param bAutoConnect The state of the autoconnect flag
* \return void
*/
- inline void setAutoConnect(bool bAutoConnect) { m_bAutoConnect = bAutoConnect; };
+ void setAutoConnect(bool bAutoConnect) { m_bAutoConnect = bAutoConnect; }
/**
* \brief Sets the user identity id of the user associated to the network
* \param szUserIdentityId The user identity
* \return void
*/
- inline void setUserIdentityId(const QString & szUserIdentityId) { m_szUserIdentityId = szUserIdentityId; };
+ void setUserIdentityId(const QString & szUserIdentityId) { m_szUserIdentityId = szUserIdentityId; }
/**
* \brief Returns a list of servers associated to the network
* \return KviPointerList<KviIrcServer> *
*/
- inline KviPointerList<KviIrcServer> * serverList() { return m_pServerList; };
+ KviPointerList<KviIrcServer> * serverList() const { return m_pServerList; }
/**
* \brief Returns the current server
diff --git a/src/kvilib/irc/KviIrcServer.h b/src/kvilib/irc/KviIrcServer.h
index e2d21df4d..152120a72 100644
--- a/src/kvilib/irc/KviIrcServer.h
+++ b/src/kvilib/irc/KviIrcServer.h
@@ -127,7 +127,7 @@ public:
* \brief Returns the proxy server's id
* \return int
*/
- inline int proxy() { return m_iProxy; };
+ int proxy() const { return m_iProxy; }
/**
* \brief Returns the proxy server
@@ -140,25 +140,25 @@ public:
* \brief Returns the port number
* \return kvi_u32_t
*/
- inline kvi_u32_t port() const { return m_uPort; };
+ kvi_u32_t port() const { return m_uPort; }
/**
* \brief Returns the password of the user associated to the server
* \return const QString &
*/
- inline const QString & password() const { return m_szPass; };
+ const QString & password() const { return m_szPass; }
/**
* \brief Returns the nickname used for sasl auth
* \return const QString &
*/
- inline const QString & saslNick() const { return m_szSaslNick; };
+ const QString & saslNick() const { return m_szSaslNick; }
/**
* \brief Returns the password used for sasl auth
* \return const QString &
*/
- inline const QString & saslPass() const { return m_szSaslPass; };
+ const QString & saslPass() const { return m_szSaslPass; }
/**
* \brief Returns the sasl authentication method to be used
@@ -170,67 +170,67 @@ public:
* \brief Returns the nickname of the user associated to the server
* \return const QString &
*/
- inline const QString & nickName() const { return m_szNick; };
+ const QString & nickName() const { return m_szNick; }
/**
* \brief Returns the alternative nickname of the user associated to the server
* \return const QString &
*/
- inline const QString & alternativeNickName() const { return m_szAlternativeNick; };
+ const QString & alternativeNickName() const { return m_szAlternativeNick; }
/**
* \brief Returns the user modes of the user associated to the server
* \return const QString &
*/
- inline const QString & initUMode() const { return m_szInitUMode; };
+ const QString & initUMode() const { return m_szInitUMode; }
/**
* \brief Returns the hostname of the user associated to the server
* \return const QString &
*/
- inline const QString & hostName() const { return m_szHostname; };
+ const QString & hostName() const { return m_szHostname; }
/**
* \brief Returns the IP address of the server
* \return const QString &
*/
- inline const QString & ip() const { return m_szIp; };
+ const QString & ip() const { return m_szIp; }
/**
* \brief Returns the commands to run on server login
* \return const QString &
*/
- inline const QString & onLoginCommand() const { return m_szOnLoginCommand; };
+ const QString & onLoginCommand() const { return m_szOnLoginCommand; }
/**
* \brief Returns the commands to run on server connection
* \return const QString &
*/
- inline const QString & onConnectCommand() const { return m_szOnConnectCommand; };
+ const QString & onConnectCommand() const { return m_szOnConnectCommand; }
/**
* \brief Returns the username of the user associated to the server
* \return const QString &
*/
- inline const QString & userName() const { return m_szUser; };
+ const QString & userName() const { return m_szUser; }
/**
* \brief Returns the realname of the user associated to the server
* \return const QString &
*/
- inline const QString & realName() const { return m_szRealName; };
+ const QString & realName() const { return m_szRealName; }
/**
* \brief Returns the filter applied on the server
* \return const QString &
*/
- inline const QString & linkFilter() const { return m_szLinkFilter; };
+ const QString & linkFilter() const { return m_szLinkFilter; }
/**
* \brief Returns the description of the server
* \return const QString &
*/
- inline const QString & description() const { return m_szDescription; };
+ const QString & description() const { return m_szDescription; }
/**
* \brief Returns the encoding associated to the server
@@ -238,80 +238,80 @@ public:
* communicating with the server
* \return const QString &
*/
- inline const QString & encoding() const { return m_szEncoding; };
+ const QString & encoding() const { return m_szEncoding; }
/**
* \brief Returns the text encoding associated to the server
* This is the default encoding when talking on channels or queries
* \return const QString &
*/
- inline const QString & textEncoding() const { return m_szTextEncoding; };
+ const QString & textEncoding() const { return m_szTextEncoding; }
/**
* \brief Returns the id of the server
* \return const QString &
*/
- inline const QString & id() const { return m_szId; };
+ const QString & id() const { return m_szId; }
/**
* \brief Returns the id of the user associated to the server
* \return const QString &
*/
- inline const QString & userIdentityId() const { return m_szUserIdentityId; };
+ const QString & userIdentityId() const { return m_szUserIdentityId; }
/**
* \brief Returns true if the server is in autoconnect mode
* \return bool
*/
- inline bool autoConnect() const { return m_bAutoConnect; };
+ bool autoConnect() const { return m_bAutoConnect; }
/**
* \brief Returns the list of the channels in the autojoin list
* \return QStringList *
*/
- inline QStringList * autoJoinChannelList() { return m_pAutoJoinChannelList; };
+ QStringList * autoJoinChannelList() { return m_pAutoJoinChannelList; }
/**
* \brief Returns the list of the channels in the autojoin list as a string
* \return const QString &
*/
- inline const QString autoJoinChannelListAsString() { return m_pAutoJoinChannelList ? m_pAutoJoinChannelList->join(",") : ""; };
+ const QString autoJoinChannelListAsString() { return m_pAutoJoinChannelList ? m_pAutoJoinChannelList->join(",") : ""; }
/**
* \brief Returns true if the server uses IPv6
* \return bool
*/
- inline bool isIPv6() const { return (m_uFlags & KviIrcServer::IPv6); };
+ bool isIPv6() const { return (m_uFlags & KviIrcServer::IPv6); }
/**
* \brief Returns true if the server uses SSL
* \return bool
*/
- inline bool useSSL() const { return (m_uFlags & KviIrcServer::SSL); };
+ bool useSSL() const { return (m_uFlags & KviIrcServer::SSL); }
/**
* \brief Returns true if the CAP protocol is enabled for this server
* \return bool
*/
- inline bool enabledCAP() const { return (m_uFlags & KviIrcServer::CAP); };
+ bool enabledCAP() const { return (m_uFlags & KviIrcServer::CAP); }
/**
* \brief Returns true if the STARTTLS protocol is enabled for this server
* \return bool
*/
- inline bool enabledSTARTTLS() const { return (m_uFlags & KviIrcServer::STARTTLS); };
+ bool enabledSTARTTLS() const { return (m_uFlags & KviIrcServer::STARTTLS); }
/**
* \brief Returns true if the SASL protocol is enabled for this server
* \return bool
*/
- inline bool enabledSASL() const { return (m_uFlags & KviIrcServer::SASL); };
+ bool enabledSASL() const { return (m_uFlags & KviIrcServer::SASL); }
/**
* \brief Returns true if the server caches the IP
* \return bool
*/
- inline bool cacheIp() const { return (m_uFlags & KviIrcServer::CacheIP); };
+ bool cacheIp() const { return (m_uFlags & KviIrcServer::CacheIP); }
/**
* \brief Returns the irc URI for the server
@@ -325,77 +325,77 @@ public:
* \param iProxy The proxy to connect through
* \return void
*/
- inline void setProxy(int iProxy) { m_iProxy = iProxy; };
+ void setProxy(int iProxy) { m_iProxy = iProxy; }
/**
* \brief Sets the IP for the server
* \param szIp The IP of the server
* \return void
*/
- inline void setIp(const QString & szIp) { m_szIp = szIp; };
+ void setIp(const QString & szIp) { m_szIp = szIp; }
/**
* \brief Sets the port for the server
* \param uPort The port of the server
* \return void
*/
- inline void setPort(kvi_u32_t uPort) { m_uPort = uPort; };
+ void setPort(kvi_u32_t uPort) { m_uPort = uPort; }
/**
* \brief Sets the hostname for the server
* \param szHost The host name of the user
* \return void
*/
- inline void setHostName(const QString & szHost) { m_szHostname = szHost; };
+ void setHostName(const QString & szHost) { m_szHostname = szHost; }
/**
* \brief Sets the description for the server
* \param szDesc The description of the server
* \return void
*/
- inline void setDescription(const QString & szDesc) { m_szDescription = szDesc; };
+ void setDescription(const QString & szDesc) { m_szDescription = szDesc; }
/**
* \brief Sets the username of the user associated to the server
* \param szUser The user name of the user
* \return void
*/
- inline void setUserName(const QString & szUser) { m_szUser = szUser; };
+ void setUserName(const QString & szUser) { m_szUser = szUser; }
/**
* \brief Sets the password of the user associated to the server
* \param szPass The password of the user
* \return void
*/
- inline void setPassword(const QString & szPass) { m_szPass = szPass; };
+ void setPassword(const QString & szPass) { m_szPass = szPass; }
/**
* \brief Sets the nickname of the user associated to the server
* \param szNick The nick name of the user
* \return void
*/
- inline void setNickName(const QString & szNick) { m_szNick = szNick; };
+ void setNickName(const QString & szNick) { m_szNick = szNick; }
/**
* \brief Sets the alternative nickname of the user associated to the server
* \param szNick The nick name of the user
* \return void
*/
- inline void setAlternativeNickName(const QString & szNick) { m_szAlternativeNick = szNick; };
+ void setAlternativeNickName(const QString & szNick) { m_szAlternativeNick = szNick; }
/**
* \brief Sets the password used for sasl auth
* \param szPass The password of the user
* \return void
*/
- inline void setSaslPass(const QString & szPass) { m_szSaslPass = szPass; };
+ void setSaslPass(const QString & szPass) { m_szSaslPass = szPass; }
/**
* \brief Sets the nickname used for sasl auth
* \param szNick The nick name of the user
* \return void
*/
- inline void setSaslNick(const QString & szNick) { m_szSaslNick = szNick; };
+ void setSaslNick(const QString & szNick) { m_szSaslNick = szNick; }
/**
* \brief Sets the sasl method to be used for auth
@@ -409,7 +409,7 @@ public:
* \param szReal The real name of the user
* \return void
*/
- inline void setRealName(const QString & szReal) { m_szRealName = szReal; };
+ void setRealName(const QString & szReal) { m_szRealName = szReal; }
/**
* \brief Sets the encoding associated to the server
@@ -419,7 +419,7 @@ public:
* \param szEncoding The default encoding of the text
* \return void
*/
- inline void setEncoding(const QString & szEncoding) { m_szEncoding = szEncoding; };
+ void setEncoding(const QString & szEncoding) { m_szEncoding = szEncoding; }
/**
* \brief Sets the encoding associated to the server
@@ -427,28 +427,28 @@ public:
* \param szEncoding The default encoding of the text
* \return void
*/
- inline void setTextEncoding(const QString & szEncoding) { m_szTextEncoding = szEncoding; };
+ void setTextEncoding(const QString & szEncoding) { m_szTextEncoding = szEncoding; }
/**
* \brief Sets the user modes of the user associated to the server
* \param szUMode The user modes of the user
* \return void
*/
- inline void setInitUMode(const QString & szUMode) { m_szInitUMode = szUMode; };
+ void setInitUMode(const QString & szUMode) { m_szInitUMode = szUMode; }
/**
* \brief Sets the commands to run on server connection
* \param szCmd The comands to run on connection
* \return void
*/
- inline void setOnConnectCommand(const QString & szCmd) { m_szOnConnectCommand = szCmd; };
+ void setOnConnectCommand(const QString & szCmd) { m_szOnConnectCommand = szCmd; }
/**
* \brief Sets the commands to run on server login
* \param szCmd The comands to run on login
* \return void
*/
- inline void setOnLoginCommand(const QString & szCmd) { m_szOnLoginCommand = szCmd; };
+ void setOnLoginCommand(const QString & szCmd) { m_szOnLoginCommand = szCmd; }
/**
* \brief Applies the filter to the server
@@ -459,7 +459,7 @@ public:
* \param szFilter
* \return void
*/
- inline void setLinkFilter(const QString & szFilter) { m_szLinkFilter = szFilter; };
+ void setLinkFilter(const QString & szFilter) { m_szLinkFilter = szFilter; }
/**
* \brief Sets the list of channels to autojoin after connection
@@ -481,92 +481,92 @@ public:
* \param bAutoConnect Whether to set the autoconnection
* \return void
*/
- inline void setAutoConnect(bool bAutoConnect) { m_bAutoConnect = bAutoConnect; };
+ void setAutoConnect(bool bAutoConnect) { m_bAutoConnect = bAutoConnect; }
/**
* \brief Sets the id of the user associated to the server
* \param szUserIdentityId The user identity id to set
* \return void
*/
- inline void setUserIdentityId(const QString & szUserIdentityId) { m_szUserIdentityId = szUserIdentityId; };
+ void setUserIdentityId(const QString & szUserIdentityId) { m_szUserIdentityId = szUserIdentityId; }
/**
* \brief Sets if the server uses IPv6
* \param bSet Whether to set the support for IPv6
* \return void
*/
- inline void setIPv6(bool bSet)
+ void setIPv6(bool bSet)
{
if(bSet)
m_uFlags |= KviIrcServer::IPv6;
else
m_uFlags &= static_cast<unsigned short>(~KviIrcServer::IPv6);
- };
+ }
/**
* \brief Sets if the server uses SSL
* \param bSet Whether to set the support for SSL
* \return void
*/
- inline void setUseSSL(bool bSet)
+ void setUseSSL(bool bSet)
{
if(bSet)
m_uFlags |= KviIrcServer::SSL;
else
m_uFlags &= static_cast<unsigned short>(~KviIrcServer::SSL);
- };
+ }
/**
* \brief Sets if STARTTLS support is enabled/disabled for this server
* \param bSet Whether to enable the support for STARTTLS
* \return void
*/
- inline void setEnabledSTARTTLS(bool bSet)
+ void setEnabledSTARTTLS(bool bSet)
{
if(bSet)
m_uFlags |= KviIrcServer::STARTTLS;
else
m_uFlags &= static_cast<unsigned short>(~KviIrcServer::STARTTLS);
- };
+ }
/**
* \brief Sets if CAP support is enabled/disabled for this server
* \param bSet Whether to enable the support for CAP
* \return void
*/
- inline void setEnabledCAP(bool bSet)
+ void setEnabledCAP(bool bSet)
{
if(bSet)
m_uFlags |= KviIrcServer::CAP;
else
m_uFlags &= static_cast<unsigned short>(~KviIrcServer::CAP);
- };
+ }
/**
* \brief Sets if SASL support is enabled/disabled for this server
* \param bSet Whether to enable the support for SASL
* \return void
*/
- inline void setEnabledSASL(bool bSet)
+ void setEnabledSASL(bool bSet)
{
if(bSet)
m_uFlags |= KviIrcServer::SASL;
else
m_uFlags &= static_cast<unsigned short>(~KviIrcServer::SASL);
- };
+ }
/**
* \brief Sets if the server caches the IP
* \param bSet Whether to set the cache for the IP
* \return void
*/
- inline void setCacheIp(bool bSet)
+ void setCacheIp(bool bSet)
{
if(bSet)
m_uFlags |= KviIrcServer::CacheIP;
else
m_uFlags &= static_cast<unsigned short>(~KviIrcServer::CacheIP);
- };
+ }
/**
* \brief Generates an unique id for the server and sets it
@@ -579,12 +579,12 @@ public:
* \param szId The id of the server
* \return void
*/
- inline void setId(const QString & szId)
+ void setId(const QString & szId)
{
m_szId = szId;
if(m_szId.isEmpty())
generateUniqueId();
- };
+ }
/**
* \brief Loads the information from the configuration file
@@ -614,19 +614,19 @@ public:
* \param bSet whether the server is a favorite or not
* \return void
*/
- inline void setFavorite(bool bSet)
+ void setFavorite(bool bSet)
{
if(bSet)
m_uFlags |= KviIrcServer::FAVORITE;
else
m_uFlags &= static_cast<unsigned short>(~KviIrcServer::FAVORITE);
- };
+ }
/**
* \brief Returns if the server is a favorite
* \return bool
*/
- inline bool favorite() const { return (m_uFlags & KviIrcServer::FAVORITE); };
+ bool favorite() const { return (m_uFlags & KviIrcServer::FAVORITE); }
};
#endif //_KVI_IRCSERVER_H_
diff --git a/src/kvilib/irc/KviIrcServerDataBase.h b/src/kvilib/irc/KviIrcServerDataBase.h
index 18639ba1a..a0f8e59a8 100644
--- a/src/kvilib/irc/KviIrcServerDataBase.h
+++ b/src/kvilib/irc/KviIrcServerDataBase.h
@@ -94,7 +94,7 @@ public:
* \brief Returns the record dictionary of the database
* \return KviPointerHashTable<QString,KviIrcNetwork> *
*/
- inline KviPointerHashTable<QString, KviIrcNetwork> * recordDict() { return m_pRecords; };
+ KviPointerHashTable<QString, KviIrcNetwork> * recordDict() const { return m_pRecords; }
/**
* \brief Returns a list of servers to connect on startup
@@ -106,7 +106,7 @@ public:
* later.
* \return KviPointerList<KviIrcServer> *
*/
- inline KviPointerList<KviIrcServer> * autoConnectOnStartupServers() { return m_pAutoConnectOnStartupServers; };
+ KviPointerList<KviIrcServer> * autoConnectOnStartupServers() const { return m_pAutoConnectOnStartupServers; }
/**
* \brief Returns a list of networks to connect on startup
@@ -118,7 +118,7 @@ public:
* updated later.
* \return KviPointerList<KviIrcNetwork> *
*/
- inline KviPointerList<KviIrcNetwork> * autoConnectOnStartupNetworks() { return m_pAutoConnectOnStartupNetworks; };
+ KviPointerList<KviIrcNetwork> * autoConnectOnStartupNetworks() const { return m_pAutoConnectOnStartupNetworks; }
/**
* \brief Deletes the list of autoconnect servers
@@ -137,13 +137,13 @@ public:
* \param szNetName The name of the network
* \return void
*/
- inline void setCurrentNetwork(const QString & szNetName) { m_szCurrentNetwork = szNetName; };
+ void setCurrentNetwork(const QString & szNetName) { m_szCurrentNetwork = szNetName; }
/**
* \brief Returns the current network name
* \return const QString &
*/
- inline const QString & currentNetworkName() { return m_szCurrentNetwork; };
+ const QString & currentNetworkName() const { return m_szCurrentNetwork; }
/**
* \brief Returns the current network