diff options
27 files changed, 196 insertions, 196 deletions
diff --git a/src/kvilib/core/KviMemory.cpp b/src/kvilib/core/KviMemory.cpp index c5a941469..4fdc2dab9 100644 --- a/src/kvilib/core/KviMemory.cpp +++ b/src/kvilib/core/KviMemory.cpp @@ -238,7 +238,7 @@ namespace KviMemory // WE WANT repnz; movsq\n"!!! - inline void copy(void * dst_ptr,const void *src_ptr,int len) + void copy(void * dst_ptr,const void *src_ptr,int len) { __asm__ __volatile__( " cld\n" @@ -256,7 +256,7 @@ namespace KviMemory ); } - inline void copy(void * dst_ptr,const void *src_ptr,int len) + void copy(void * dst_ptr,const void *src_ptr,int len) { __asm__ __volatile__( " cld\n" @@ -447,7 +447,7 @@ namespace KviMemory // only by gcc // - inline bool kvi_strEqualCS(const char * pcStr1, const char * pcStr2) + bool kvi_strEqualCS(const char * pcStr1, const char * pcStr2) { // An instruction pattern is really useful in this case. // When inlining, GCC can optimize to load esi and edi @@ -473,7 +473,7 @@ namespace KviMemory return bEax; } - inline bool kvi_strEqualCSN(const char * pcStr1, const char * pcStr2, int iLen) + bool kvi_strEqualCSN(const char * pcStr1, const char * pcStr2, int iLen) { register bool bEax; __asm__ __volatile__ ( @@ -508,7 +508,7 @@ namespace KviMemory // These will NOT work with localizable characters: // 'a' with umlaut will be not equal to 'A' with umlaut - inline bool kvi_strEqualNoLocaleCI(const char * pcStr1, const char * pcStr2) + bool kvi_strEqualNoLocaleCI(const char * pcStr1, const char * pcStr2) { // Trivial implementation // Ignores completely locales....only A-Z chars are transformed to a-z @@ -548,7 +548,7 @@ namespace KviMemory return bEax; } - inline bool kvi_strEqualNoLocaleCIN(const char * pcStr1, const char * pcStr2, int iLen) + bool kvi_strEqualNoLocaleCIN(const char * pcStr1, const char * pcStr2, int iLen) { register int iReg; @@ -589,7 +589,7 @@ namespace KviMemory return bEax; } - inline int kvi_strLen(const char * pcStr) + int kvi_strLen(const char * pcStr) { register int iEcx; __asm__ __volatile__( diff --git a/src/kvilib/core/KviPtrListIterator.h b/src/kvilib/core/KviPtrListIterator.h index 6ef974bf4..247bb0268 100644 --- a/src/kvilib/core/KviPtrListIterator.h +++ b/src/kvilib/core/KviPtrListIterator.h @@ -51,7 +51,7 @@ public: return *this; } - inline bool operator!=(const KviPtrListIterator & other) const + bool operator!=(const KviPtrListIterator & other) const { return this->c != other.c; } diff --git a/src/kvilib/ext/KviAnimatedPixmap.h b/src/kvilib/ext/KviAnimatedPixmap.h index 6b5a86a52..afbc5f3cf 100644 --- a/src/kvilib/ext/KviAnimatedPixmap.h +++ b/src/kvilib/ext/KviAnimatedPixmap.h @@ -93,7 +93,7 @@ public: * Returns true if animation is started. * Returns false otherways. */ - inline bool isStarted() + bool isStarted() const { return m_iStarted > 0; } @@ -112,7 +112,7 @@ public: * Returns true if animation has at least one loaded frame. * Returns false otherways. */ - inline bool isValid() + bool isValid() const { return (m_pFrameData->count() > 0); } @@ -122,7 +122,7 @@ public: * Never fails. */ - inline QPixmap * pixmap() + QPixmap * pixmap() { if(m_pFrameData->count() > 0) return m_pFrameData->at(m_uCurrentFrameNumber).pixmap; @@ -133,7 +133,7 @@ public: /* * Returns active frame number */ - inline uint activeFrameNumber() + uint activeFrameNumber() const { return m_uCurrentFrameNumber; } @@ -141,7 +141,7 @@ public: /* * Returns animation frame count */ - inline uint framesCount() + uint framesCount() const { return m_pFrameData->count(); } @@ -149,7 +149,7 @@ public: /* * Returns current image size */ - inline const QSize & size() + const QSize & size() const { return m_pFrameData->size; } 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 diff --git a/src/kvirc/ui/KviConsoleWindow.h b/src/kvirc/ui/KviConsoleWindow.h index 2396abd05..81cd77b61 100644 --- a/src/kvirc/ui/KviConsoleWindow.h +++ b/src/kvirc/ui/KviConsoleWindow.h @@ -126,23 +126,23 @@ public: KviIrcContext * context() { return m_pContext; }; // UI - inline KviUserListView * notifyListView() { return m_pNotifyListView; }; - inline int selectedCount(); + KviUserListView * notifyListView() const { return m_pNotifyListView; } + int selectedCount(); // // State // - inline KviIrcContext::State state() { return context()->state(); }; + KviIrcContext::State state() { return context()->state(); } // these should disappear! - inline bool isConnected() { return context()->isConnected(); }; - inline bool isIPv6Connection(); - inline bool isNotConnected(); + bool isConnected() { return context()->isConnected(); } + bool isIPv6Connection(); + bool isNotConnected(); bool connectionInProgress(); // // This connection info // - inline QString currentNetworkName(); + QString currentNetworkName(); KviAvatar * currentAvatar(); // // IRC Context wide helpers (connection related) @@ -182,7 +182,7 @@ public: void terminateConnectionRequest(bool bForce = false, const char * quitMsg = 0); // Status string (usermode + nick) (connection related too) - inline const QString & statusString() { return m_szStatusString; }; + const QString & statusString() const { return m_szStatusString; } KviWindow * activeWindow(); // User db, connection related diff --git a/src/kvirc/ui/KviInput.h b/src/kvirc/ui/KviInput.h index 97e72a3aa..d0097567d 100644 --- a/src/kvirc/ui/KviInput.h +++ b/src/kvirc/ui/KviInput.h @@ -165,13 +165,13 @@ public: * \brief Return the instance of the input editor * \return KviInputEditor * */ - inline KviInputEditor * editor() { return m_pInputEditor; }; + KviInputEditor * editor() const { return m_pInputEditor; } /** * \brief Return the instance of the input history * \return KviInputHistory * */ - inline KviInputHistory * history() { return KviInputHistory::instance(); }; + KviInputHistory * history() { return KviInputHistory::instance(); } protected: void installShortcuts(); virtual void focusInEvent(QFocusEvent * e); diff --git a/src/kvirc/ui/KviInputEditor.h b/src/kvirc/ui/KviInputEditor.h index 41412d0e7..cab113307 100644 --- a/src/kvirc/ui/KviInputEditor.h +++ b/src/kvirc/ui/KviInputEditor.h @@ -503,13 +503,13 @@ private: * \brief Returns true is there are some action in the undo stack * \return bool */ - inline bool isUndoAvailable() const { return !m_bReadOnly && !m_UndoStack.empty(); } + bool isUndoAvailable() const { return !m_bReadOnly && !m_UndoStack.empty(); } /** * \brief Returns true is there are some action in the redo stack * \return bool */ - inline bool isRedoAvailable() const { return !m_bReadOnly && !m_RedoStack.empty(); } + bool isRedoAvailable() const { return !m_bReadOnly && !m_RedoStack.empty(); } /** * \brief Inserts one action in the undo stack diff --git a/src/kvirc/ui/KviIpEditor.h b/src/kvirc/ui/KviIpEditor.h index 56e0e8a07..77133ea2c 100644 --- a/src/kvirc/ui/KviIpEditor.h +++ b/src/kvirc/ui/KviIpEditor.h @@ -47,7 +47,7 @@ public: bool setAddress(const QString & ipAddr); QString address() const; void setAddressType(AddressType addrType); - inline AddressType addressType() const { return m_addrType; } + AddressType addressType() const { return m_addrType; } bool isValid() const; }; diff --git a/src/kvirc/ui/KviIrcView_tools.h b/src/kvirc/ui/KviIrcView_tools.h index 0eac0309d..efbf40fa5 100644 --- a/src/kvirc/ui/KviIrcView_tools.h +++ b/src/kvirc/ui/KviIrcView_tools.h @@ -122,7 +122,7 @@ public: }; void setFindResult(const QString & text); void focusStringToFind(); - inline bool messageEnabled(int msg_type) { return m_pFilterItems[msg_type]->isOn(); }; + bool messageEnabled(int msg_type) { return m_pFilterItems[msg_type]->isOn(); } void forceRepaint(); protected slots: void findPrev(); diff --git a/src/kvirc/ui/KviModeEditor.cpp b/src/kvirc/ui/KviModeEditor.cpp index 3e8eafbde..daa4c1db2 100644 --- a/src/kvirc/ui/KviModeEditor.cpp +++ b/src/kvirc/ui/KviModeEditor.cpp @@ -437,7 +437,7 @@ void KviModeEditor::commit() emit done(); } -inline const QString * KviModeEditor::getModeDescription(char cMode) +const QString * KviModeEditor::getModeDescription(char cMode) { if(!m_pChannel) return nullptr; @@ -447,7 +447,7 @@ inline const QString * KviModeEditor::getModeDescription(char cMode) return nullptr; } -inline bool KviModeEditor::modeNeedsParameterOnlyWhenSet(char cMode) +bool KviModeEditor::modeNeedsParameterOnlyWhenSet(char cMode) { if(!m_pChannel) return false; diff --git a/src/kvirc/ui/KviStatusBarApplet.h b/src/kvirc/ui/KviStatusBarApplet.h index 5df4129e4..8520a4b21 100644 --- a/src/kvirc/ui/KviStatusBarApplet.h +++ b/src/kvirc/ui/KviStatusBarApplet.h @@ -100,8 +100,8 @@ public: KviStatusBar * statusBar() { return m_pStatusBar; }; KviMainWindow * frame() { return m_pStatusBar->frame(); }; KviStatusBarAppletDescriptor * descriptor() { return m_pDescriptor; }; - inline void setIndex(int i) { mIndex = i; }; - inline int index() const { return mIndex; }; + void setIndex(int i) { mIndex = i; } + int index() const { return mIndex; } protected: virtual void fillContextPopup(QMenu *){}; virtual void loadState(const char *, KviConfigurationFile *){}; diff --git a/src/kvirc/ui/KviWindow.h b/src/kvirc/ui/KviWindow.h index 923391e15..265781d26 100644 --- a/src/kvirc/ui/KviWindow.h +++ b/src/kvirc/ui/KviWindow.h @@ -203,7 +203,7 @@ protected: // almost private: don't touch :D bool m_bProcessingInputEvent; public: - inline bool isDocked() { return m_bIsDocked; } + bool isDocked() const { return m_bIsDocked; } /** * \brief Returns the global ID of this window @@ -211,7 +211,7 @@ public: * This is unique in the application * \return QString */ - inline QString id() { return QString("%1").arg(m_uId); }; + QString id() const { return QString("%1").arg(m_uId); } /** * \brief Returns the global ID of this window @@ -219,13 +219,13 @@ public: * This is unique in the application * \return QString */ - inline unsigned long int numericId() { return m_uId; }; + unsigned long int numericId() const { return m_uId; } /** * \brief Returns the name of this window * \return const QString & */ - inline const QString & windowName() { return m_szName; }; + const QString & windowName() const { return m_szName; } /** * \brief Sets the name of the window @@ -247,22 +247,22 @@ public: * \brief Returns the type of the window * \return Type */ - inline Type type() const { return m_eType; }; + Type type() const { return m_eType; } /** * Returns true if the window is a channel */ - inline bool isChannel() const { return m_eType == Channel; }; + bool isChannel() const { return m_eType == Channel; } /** * Returns true if the window is a query */ - inline bool isQuery() const { return m_eType == Query; }; + bool isQuery() const { return m_eType == Query; } /** * Returns true if the window is a console */ - inline bool isConsole() const { return m_eType == Console; }; + bool isConsole() const { return m_eType == Console; } /** * \brief Returns a descriptive name of the window type @@ -270,7 +270,7 @@ public: */ virtual const char * typeString(); - inline QTextCodec * textCodec() { return m_pTextCodec ? m_pTextCodec : defaultTextCodec(); }; + QTextCodec * textCodec() { return m_pTextCodec ? m_pTextCodec : defaultTextCodec(); } void forceTextCodec(QTextCodec * pCodec); /** @@ -279,7 +279,7 @@ public: * May be NULL if the window has no KviIrcView (and thus supports no direct output) * \return KviIrcView * */ - inline KviIrcView * view() const { return m_pIrcView; }; + KviIrcView * view() const { return m_pIrcView; } /** * \brief Returns the KviIrcView that was last clicked in this window @@ -296,7 +296,7 @@ public: * May be null for windows that aren't bound to irc contexts * \return KviConsoleWindow * */ - inline KviConsoleWindow * console() { return m_pConsole; }; + KviConsoleWindow * console() const { return m_pConsole; } KviIrcContext * context(); @@ -312,7 +312,7 @@ public: * It *shouldn't* be null... but... well... who knows ? :D ...better check it * \return KviTalSplitter * */ - inline KviTalSplitter * splitter() { return m_pSplitter; }; + KviTalSplitter * splitter() const { return m_pSplitter; } /** * \brief Returns the windowList item @@ -320,7 +320,7 @@ public: * The window has ALWAYS a WindowList item * \return KviWindowListItem * */ - inline KviWindowListItem * windowListItem() { return m_pWindowListItem; }; + KviWindowListItem * windowListItem() const { return m_pWindowListItem; } // The window *might* have a button container virtual QFrame * buttonContainer() { return (QFrame *)m_pButtonBox; }; @@ -330,7 +330,7 @@ public: virtual KviWindow * outputProxy(); // The window input widget - inline KviInput * input() { return m_pInput; }; + KviInput * input() const { return m_pInput; } // The target of this window: empty when it makes no sense :D virtual const QString & target() { return KviQString::Empty; }; @@ -354,20 +354,20 @@ public: void unhighlight(); - virtual inline void getWindowListTipText(QString & szBuffer) { szBuffer = m_szPlainTextCaption; }; + virtual void getWindowListTipText(QString & szBuffer) { szBuffer = m_szPlainTextCaption; } // This is meaningful only if view() is non NULL const QString & lastLineOfText(); const QString & lastMessageText(); - inline const QString & textEncoding() { return m_szTextEncoding; }; + const QString & textEncoding() const { return m_szTextEncoding; } // returns true if the encoding could be successfully set bool setTextEncoding(const QString & szTextEncoding); // this must return a default text codec suitable for this window virtual QTextCodec * defaultTextCodec(); // encode the text from szSource by using m_uTextEncoding - inline QByteArray encodeText(const QString & szText); - inline QString decodeText(const char * pcText); + QByteArray encodeText(const QString & szText); + QString decodeText(const char * pcText); //return a text encoder QTextEncoder * makeEncoder(); @@ -434,7 +434,7 @@ public: // call this in the constructor if your caption is fixed: // it will set m_szPlainTextCaption to szCaption and it will // automatically use it without the need of overriding fillCaptionBuffers - inline void setFixedCaption(const QString & szCaption) { m_szPlainTextCaption = szCaption; }; + void setFixedCaption(const QString & szCaption) { m_szPlainTextCaption = szCaption; } void setWindowTitle(QString & szTitle); @@ -476,7 +476,7 @@ protected: // this by default calls fillSingleColorCaptionBuffer(plainTextCaption()); virtual void fillCaptionBuffers(); // protected helper - inline void fillSingleColorCaptionBuffers(const QString & szName) { m_szPlainTextCaption = szName; }; + void fillSingleColorCaptionBuffers(const QString & szName) { m_szPlainTextCaption = szName; } // Virtual events that signal dock state change virtual void youAreDocked(); virtual void youAreUndocked(); diff --git a/src/kvirc/ui/KviWindowStack.h b/src/kvirc/ui/KviWindowStack.h index 00c549e52..f1dfa6cde 100644 --- a/src/kvirc/ui/KviWindowStack.h +++ b/src/kvirc/ui/KviWindowStack.h @@ -88,7 +88,7 @@ public: * \brief Returns the window popup * \return QMenu * */ - inline QMenu * windowPopup() { return m_pWindowPopup; }; + QMenu * windowPopup() const { return m_pWindowPopup; } /** * \brief Remove and delete the subwindow diff --git a/src/modules/aliaseditor/AliasEditorWindow.h b/src/modules/aliaseditor/AliasEditorWindow.h index c9102b559..cd993f83f 100644 --- a/src/modules/aliaseditor/AliasEditorWindow.h +++ b/src/modules/aliaseditor/AliasEditorWindow.h @@ -62,17 +62,17 @@ protected: int m_cPos; public: - inline const QString & name() { return m_szName; }; + const QString & name() const { return m_szName; } void setName(const QString & szName); - inline Type type() { return m_eType; }; + Type type() const { return m_eType; } void setType(Type t); - inline bool isAlias() { return m_eType == Alias; }; - inline bool isNamespace() { return m_eType == Namespace; }; + bool isAlias() const { return m_eType == Alias; } + bool isNamespace() const { return m_eType == Namespace; } void setParentItem(AliasEditorTreeWidgetItem * it) { m_pParentItem = it; }; AliasEditorTreeWidgetItem * parentItem() { return m_pParentItem; }; - inline void setBuffer(const QString & szBuffer) { m_szBuffer = szBuffer; }; - inline const QString & buffer() { return m_szBuffer; }; - inline const int & cursorPosition() { return m_cPos; }; + void setBuffer(const QString & szBuffer) { m_szBuffer = szBuffer; } + const QString & buffer() const { return m_szBuffer; } + const int & cursorPosition() const { return m_cPos; } void setCursorPosition(const int & cPos) { m_cPos = cPos; }; }; diff --git a/src/modules/dcc/DccVideoWindow.h b/src/modules/dcc/DccVideoWindow.h index eca3ed97f..492744a57 100644 --- a/src/modules/dcc/DccVideoWindow.h +++ b/src/modules/dcc/DccVideoWindow.h @@ -102,7 +102,7 @@ protected: void stopRecording(); void startPlaying(); void stopPlaying(); - inline bool isPlaying() { return m_bPlaying; }; + bool isPlaying() const { return m_bPlaying; } virtual void run(); virtual bool handleIncomingData(KviDccThreadIncomingData * data, bool bCritical); }; diff --git a/src/modules/list/ListWindow.h b/src/modules/list/ListWindow.h index 08c8811b0..997c471a4 100644 --- a/src/modules/list/ListWindow.h +++ b/src/modules/list/ListWindow.h @@ -80,7 +80,7 @@ private: public: bool operator<(const QTreeWidgetItem & other) const; - inline ChannelTreeWidgetItemData * itemData() { return m_pData; }; + ChannelTreeWidgetItemData * itemData() const { return m_pData; } }; class ChannelTreeWidget : public KviThemedTreeWidget diff --git a/src/modules/notifier/NotifierMessage.h b/src/modules/notifier/NotifierMessage.h index 02c72078a..60c0d76b4 100644 --- a/src/modules/notifier/NotifierMessage.h +++ b/src/modules/notifier/NotifierMessage.h @@ -75,12 +75,12 @@ public: * \brief Returns the original irc message * \return const QString & */ - inline const QString & text() const { return m_szText; } + const QString & text() const { return m_szText; } /** * \brief Returns the message icon * \return QPixmap * */ - inline QPixmap * pixmap() const { return m_pPixmap; } + QPixmap * pixmap() const { return m_pPixmap; } /** * \brief Updates the aspect of this message * \return void diff --git a/src/modules/notifier/NotifierWindow.cpp b/src/modules/notifier/NotifierWindow.cpp index 8158b5063..956383176 100644 --- a/src/modules/notifier/NotifierWindow.cpp +++ b/src/modules/notifier/NotifierWindow.cpp @@ -864,7 +864,7 @@ void NotifierWindow::resize(QPoint, bool) setGeometry(m_wndRect); } -inline void NotifierWindow::setCursor(int iCur) +void NotifierWindow::setCursor(int iCur) { if(m_cursor.shape() != iCur) { diff --git a/src/modules/notifier/NotifierWindow.h b/src/modules/notifier/NotifierWindow.h index de29fb60f..20665b871 100644 --- a/src/modules/notifier/NotifierWindow.h +++ b/src/modules/notifier/NotifierWindow.h @@ -112,13 +112,13 @@ public: void addMessage(KviWindow * pWnd, const QString & szImageId, const QString & szText, unsigned int uMessageTime); void setDisableHideOnMainWindowGotAttention(bool b) { m_bDisableHideOnMainWindowGotAttention = b; }; void showLineEdit(bool bShow); - inline int countTabs() const + int countTabs() const { if(m_pWndTabs) return m_pWndTabs->count(); return 0; - }; - inline State state() const { return m_eState; }; + } + State state() const { return m_eState; } protected: void showEvent(QShowEvent * e) override; void hideEvent(QHideEvent * e) override; diff --git a/src/modules/notifier/NotifierWindowBorder.h b/src/modules/notifier/NotifierWindowBorder.h index 37e86e81b..1c6a6ff90 100644 --- a/src/modules/notifier/NotifierWindowBorder.h +++ b/src/modules/notifier/NotifierWindowBorder.h @@ -132,17 +132,17 @@ public: void resetIcons(); // writing methods... - inline int x() const { return m_pnt.x(); } - inline int y() const { return m_pnt.y(); } - inline int width() const { return m_rct.width(); } - inline int height() const { return m_rct.height(); } - inline int baseLine() const { return (y() + height()); } + int x() const { return m_pnt.x(); } + int y() const { return m_pnt.y(); } + int width() const { return m_rct.width(); } + int height() const { return m_rct.height(); } + int baseLine() const { return (y() + height()); } - inline QRect bodyRect() const { return m_bodyRect; } - inline QRect captionRect() const { return m_captionRect; } - inline QRect rect() const { return m_rct; } - inline QRect closeRect() const { return m_closeIconRect; } - inline QRect titleRect() const { return m_titleRect; } + QRect bodyRect() const { return m_bodyRect; } + QRect captionRect() const { return m_captionRect; } + QRect rect() const { return m_rct; } + QRect closeRect() const { return m_closeIconRect; } + QRect titleRect() const { return m_titleRect; } void draw(QPainter *, bool b = false); void setPics(bool b = false); diff --git a/src/modules/notifier/NotifierWindowTab.h b/src/modules/notifier/NotifierWindowTab.h index dfc9714cf..550d3dd60 100644 --- a/src/modules/notifier/NotifierWindowTab.h +++ b/src/modules/notifier/NotifierWindowTab.h @@ -88,13 +88,13 @@ public: * \brief Returns the name of the current window * \return QString */ - inline QString label() const { return m_szLabel; } + QString label() const { return m_szLabel; } /** * \brief Returns the pointer of the current window * \return KviWindow * */ - inline KviWindow * wnd() const { return m_pWnd; } + KviWindow * wnd() const { return m_pWnd; } protected: void mouseDoubleClickEvent(QMouseEvent * e) override; void resizeEvent(QResizeEvent * e) override; diff --git a/src/modules/objects/KvsObject_list.cpp b/src/modules/objects/KvsObject_list.cpp index 1cf6e0db7..83bc9ca5c 100644 --- a/src/modules/objects/KvsObject_list.cpp +++ b/src/modules/objects/KvsObject_list.cpp @@ -316,7 +316,7 @@ KVSO_CLASS_FUNCTION(list, clear) return true; } -inline int kvi_compare(const KviKvsVariant * p1, const KviKvsVariant * p2) +int kvi_compare(const KviKvsVariant * p1, const KviKvsVariant * p2) { return p1->compare(p2); } diff --git a/src/modules/options/OptionsWidget_message.h b/src/modules/options/OptionsWidget_message.h index 188a09389..fb65be65d 100644 --- a/src/modules/options/OptionsWidget_message.h +++ b/src/modules/options/OptionsWidget_message.h @@ -130,8 +130,8 @@ private: KviMessageTypeSettings * m_pMsgType; public: - inline int optionId() { return m_iOptId; }; - inline KviMessageTypeSettings * msgType() { return m_pMsgType; }; + int optionId() const { return m_iOptId; } + KviMessageTypeSettings * msgType() const { return m_pMsgType; } }; class MessageColorListWidgetItem : public KviTalListWidgetText @@ -144,7 +144,7 @@ public: int m_iClrIdx; public: - inline int clrIdx() { return m_iClrIdx; }; + int clrIdx() const { return m_iClrIdx; } }; class MessageColorListWidgetItemDelegate : public QItemDelegate diff --git a/src/modules/rijndael/BlowFish.cpp b/src/modules/rijndael/BlowFish.cpp index e56178276..1d16a1d43 100644 --- a/src/modules/rijndael/BlowFish.cpp +++ b/src/modules/rijndael/BlowFish.cpp @@ -436,7 +436,7 @@ void BlowFish::Decrypt(SBlock & block) } //Semi-Portable Byte Shuffling -inline void BytesToBlock(unsigned char const * p, SBlock & b) +void BytesToBlock(unsigned char const * p, SBlock & b) { unsigned int y; //Left @@ -467,7 +467,7 @@ inline void BytesToBlock(unsigned char const * p, SBlock & b) b.m_uir |= y; } -inline void BlockToBytes(SBlock const & b, unsigned char * p) +void BlockToBytes(SBlock const & b, unsigned char * p) { unsigned int y; //Right |