From: APTX Date: Wed, 13 Jun 2012 11:55:03 +0000 (+0200) Subject: Fix clang warnings X-Git-Url: https://gitweb.tyo.aptx.org/?a=commitdiff_plain;h=5b98201c737c9d0c38bea3cdc145ac6ec035b0b0;p=anidbudpclient.git Fix clang warnings --- diff --git a/client.cpp b/client.cpp index c34bda6..9d7cf1c 100644 --- a/client.cpp +++ b/client.cpp @@ -1219,7 +1219,7 @@ Client *Client::m_instance = 0; const int Client::UDP_API_COMMAND_TIMEOUT; #endif -ANIDBUDPCLIENTSHARED_EXPORT char *revision() +ANIDBUDPCLIENTSHARED_EXPORT const char *revision() { #ifdef REVISION #define ANI_GET_REV_I(X) #X diff --git a/client.h b/client.h index a2e1d62..417c52c 100644 --- a/client.h +++ b/client.h @@ -237,7 +237,7 @@ private: QHistoryState *connectedHistoryState; }; -ANIDBUDPCLIENTSHARED_EXPORT char *revision(); +ANIDBUDPCLIENTSHARED_EXPORT const char *revision(); } // namespace AniDBUdpClient diff --git a/filecommand.cpp b/filecommand.cpp index 4b6e888..5d2830b 100644 --- a/filecommand.cpp +++ b/filecommand.cpp @@ -176,7 +176,7 @@ bool FileCommand::waitForResult() const bool FileCommand::isValid() const { - const bool validAnameGE = !m_aname.isEmpty() && (!m_gname.isEmpty() && m_epno || m_gid && m_epno); + const bool validAnameGE = !m_aname.isEmpty() && ((!m_gname.isEmpty() && m_epno) || (m_gid && m_epno)); const bool validAidGE = m_aid && ((!m_gname.isEmpty() && m_epno) || (m_gid && m_epno)); return (m_fid || (!m_ed2k.isEmpty() && m_size) || validAnameGE || validAidGE); // fmask & amask don't need to be checked as all invalid bits are removed diff --git a/votecommand.cpp b/votecommand.cpp index 349c933..9921524 100644 --- a/votecommand.cpp +++ b/votecommand.cpp @@ -126,7 +126,7 @@ bool VoteCommand::waitForResult() const bool VoteCommand::isValid() const { return (m_id || !m_name.isEmpty()) - && (m_epno && m_voteType == AnimeVote || !m_epno); + && ((m_epno && m_voteType == AnimeVote) || !m_epno); // Value is set to 0 if not in valid range }