diff --git a/src/myx/redis/client-inl.hpp b/src/myx/redis/client-inl.hpp index 1bd7f0c..474a43a 100644 --- a/src/myx/redis/client-inl.hpp +++ b/src/myx/redis/client-inl.hpp @@ -11,32 +11,32 @@ namespace myx { namespace redis { -Client::Client( QObject* parent ) : +MYXLIB_INLINE Client::Client( QObject* parent ) : QObject( parent ), d ( new ClientPrivate( this ) ) { } -void Client::connectToHost( const QString& hostName, quint16 port ) +MYXLIB_INLINE void Client::connectToHost( const QString& hostName, quint16 port ) { d->m_socket.connectToHost( hostName, port ); } -void Client::disconnectFromHost() +MYXLIB_INLINE void Client::disconnectFromHost() { d->m_socket.disconnectFromHost(); } -bool Client::isConnected() const +MYXLIB_INLINE bool Client::isConnected() const { return( d->m_socket.state() == QAbstractSocket::ConnectedState ); } -Request* Client::sendCommand( const QByteArray& command ) +MYXLIB_INLINE Request* Client::sendCommand( const QByteArray& command ) { d->m_socket.write( command + "\r\n" ); @@ -46,13 +46,13 @@ Request* Client::sendCommand( const QByteArray& command ) } -bool Client::waitForConnected( int msecs ) +MYXLIB_INLINE bool Client::waitForConnected( int msecs ) { return( d->m_socket.waitForConnected( msecs ) ); } -bool Client::waitForDisconnected( int msecs ) +MYXLIB_INLINE bool Client::waitForDisconnected( int msecs ) { return( d->m_socket.waitForDisconnected( msecs ) ); } diff --git a/src/myx/redis/lexer-inl.hpp b/src/myx/redis/lexer-inl.hpp index 12048e3..a6826fb 100644 --- a/src/myx/redis/lexer-inl.hpp +++ b/src/myx/redis/lexer-inl.hpp @@ -11,7 +11,7 @@ namespace myx { namespace redis { -Lexer::Lexer( QIODevice* device, QObject* parent ) : +MYXLIB_INLINE Lexer::Lexer( QIODevice* device, QObject* parent ) : QObject ( parent ), m_device( device ), m_state ( kDoingNothing ), @@ -22,7 +22,7 @@ Lexer::Lexer( QIODevice* device, QObject* parent ) : } -void Lexer::readData() +MYXLIB_INLINE void Lexer::readData() { m_buffer.append( m_device->readAll() ); @@ -54,7 +54,7 @@ void Lexer::readData() } // Lexer::readData -bool Lexer::readCharacter() +MYXLIB_INLINE bool Lexer::readCharacter() { if ( m_buffer.isEmpty() ) { @@ -80,7 +80,7 @@ bool Lexer::readCharacter() } // Lexer::readCharacter -bool Lexer::readUnsafeString() +MYXLIB_INLINE bool Lexer::readUnsafeString() { m_crlf = m_buffer.indexOf( "\r\n", m_crlf ); if ( m_crlf == -1 ) @@ -107,7 +107,7 @@ bool Lexer::readUnsafeString() } // Lexer::readUnsafeString -bool Lexer::readSafeString() +MYXLIB_INLINE bool Lexer::readSafeString() { if ( m_buffer.size() - m_length < 2 ) { diff --git a/src/myx/redis/parser-inl.hpp b/src/myx/redis/parser-inl.hpp index defca6a..bea4888 100644 --- a/src/myx/redis/parser-inl.hpp +++ b/src/myx/redis/parser-inl.hpp @@ -11,7 +11,7 @@ namespace myx { namespace redis { -Parser::Parser( Lexer* lexer, QObject* parent ) : +MYXLIB_INLINE Parser::Parser( Lexer* lexer, QObject* parent ) : QObject( parent ) { connect( lexer, &Lexer::character, this, &Parser::readCharacter ); @@ -20,7 +20,7 @@ Parser::Parser( Lexer* lexer, QObject* parent ) : } -void Parser::readCharacter( const char c ) +MYXLIB_INLINE void Parser::readCharacter( const char c ) { switch ( c ) { @@ -40,7 +40,7 @@ void Parser::readCharacter( const char c ) } -void Parser::readUnsafeString( const QString& value ) +MYXLIB_INLINE void Parser::readUnsafeString( const QString& value ) { if ( tos().m_reply.type() == Reply::kMultiBulk ) { @@ -55,14 +55,14 @@ void Parser::readUnsafeString( const QString& value ) } -void Parser::readSafeString( const QByteArray& value ) +MYXLIB_INLINE void Parser::readSafeString( const QByteArray& value ) { tos().m_reply.value() = value; descend(); } -void Parser::descend() +MYXLIB_INLINE void Parser::descend() { while ( true ) { diff --git a/src/myx/redis/reply.hpp b/src/myx/redis/reply.hpp index 6054300..cd1db37 100644 --- a/src/myx/redis/reply.hpp +++ b/src/myx/redis/reply.hpp @@ -106,6 +106,6 @@ private: } // namespace myx -Q_DECLARE_METATYPE( myx::redis::Reply ) +Q_DECLARE_METATYPE( myx::redis::Reply ) // NOLINT #endif // ifndef MYX_REDIS_REPLY_HPP_ diff --git a/src/myx/redis/request-inl.hpp b/src/myx/redis/request-inl.hpp index 15497b5..5c630c5 100644 --- a/src/myx/redis/request-inl.hpp +++ b/src/myx/redis/request-inl.hpp @@ -15,7 +15,7 @@ namespace myx { namespace redis { -Request::Request( QObject* parent ) : +MYXLIB_INLINE Request::Request( QObject* parent ) : QObject( parent ), d ( new Loop ) { @@ -23,7 +23,7 @@ Request::Request( QObject* parent ) : } -bool Request::waitForReply( int msecs ) +MYXLIB_INLINE bool Request::waitForReply( int msecs ) { QTimer timer; timer.setInterval( msecs );