From: Manuel Nickschas Date: Thu, 17 Jan 2013 22:00:07 +0000 (+0100) Subject: Move inline keywords to the definitions X-Git-Tag: 0.9-beta1~40 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=c9e3e41c9446e58073225db379d28e1a08e15cd8;hp=e111d8af8271d490365cc017c16160c4645d606b Move inline keywords to the definitions Makes the header a bit cleaner. --- diff --git a/src/client/coreconnection.h b/src/client/coreconnection.h index 0b64e9b5..e04921ce 100644 --- a/src/client/coreconnection.h +++ b/src/client/coreconnection.h @@ -60,23 +60,23 @@ public: void init(); - inline bool isConnected() const; - inline ConnectionState state() const; - inline CoreAccount currentAccount() const; + bool isConnected() const; + ConnectionState state() const; + CoreAccount currentAccount() const; bool isEncrypted() const; bool isLocalConnection() const; - inline int progressMinimum() const; - inline int progressMaximum() const; - inline int progressValue() const; - inline QString progressText() const; + int progressMinimum() const; + int progressMaximum() const; + int progressValue() const; + QString progressText() const; //! Check if we consider the last connect as reconnect - inline bool wasReconnect() const { return _wasReconnect; } + bool wasReconnect() const { return _wasReconnect; } #ifdef HAVE_SSL - inline const QSslSocket *sslSocket() const; + const QSslSocket *sslSocket() const; #endif public slots: @@ -198,18 +198,18 @@ private: Q_DECLARE_METATYPE(CoreConnection::ConnectionState) // Inlines -int CoreConnection::progressMinimum() const { return _progressMinimum; } -int CoreConnection::progressMaximum() const { return _progressMaximum; } -int CoreConnection::progressValue() const { return _progressValue; } -QString CoreConnection::progressText() const { return _progressText; } +inline int CoreConnection::progressMinimum() const { return _progressMinimum; } +inline int CoreConnection::progressMaximum() const { return _progressMaximum; } +inline int CoreConnection::progressValue() const { return _progressValue; } +inline QString CoreConnection::progressText() const { return _progressText; } -CoreConnection::ConnectionState CoreConnection::state() const { return _state; } -bool CoreConnection::isConnected() const { return state() >= Connected; } -CoreAccount CoreConnection::currentAccount() const { return _account; } -CoreAccountModel *CoreConnection::accountModel() const { return _model; } +inline CoreConnection::ConnectionState CoreConnection::state() const { return _state; } +inline bool CoreConnection::isConnected() const { return state() >= Connected; } +inline CoreAccount CoreConnection::currentAccount() const { return _account; } +inline CoreAccountModel *CoreConnection::accountModel() const { return _model; } #ifdef HAVE_SSL -const QSslSocket *CoreConnection::sslSocket() const { return qobject_cast(_socket); } +inline const QSslSocket *CoreConnection::sslSocket() const { return qobject_cast(_socket); } #endif #endif