diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2016-01-17 15:22:46 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2016-01-17 15:22:46 +0000 |
| commit | 6368191fa18cd8dbeee7a847711db343c1b6c6bf (patch) | |
| tree | 47a2c92ff5370c82c3b6b59f07a84ec9daee67f9 /src | |
| parent | 732cf510bc813bf11453f2f14dd5084d641793fa (diff) | |
| download | qmmp-6368191fa18cd8dbeee7a847711db343c1b6c6bf.tar.gz qmmp-6368191fa18cd8dbeee7a847711db343c1b6c6bf.tar.bz2 qmmp-6368191fa18cd8dbeee7a847711db343c1b6c6bf.zip | |
fixed gcc warnings
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6044 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/General/scrobbler/scrobbler.cpp | 6 | ||||
| -rw-r--r-- | src/qmmp/qmmp.cpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/General/scrobbler/scrobbler.cpp b/src/plugins/General/scrobbler/scrobbler.cpp index 852cbe4ea..a9dcd4818 100644 --- a/src/plugins/General/scrobbler/scrobbler.cpp +++ b/src/plugins/General/scrobbler/scrobbler.cpp @@ -417,7 +417,7 @@ void ScrobblerAuth::getToken() url.addQueryItem("api_key", API_KEY); QByteArray data; - data.append("api_key"API_KEY); + data.append("api_key" API_KEY); data.append("methodauth.getToken"); data.append(SECRET); url.addQueryItem("api_sig", QCryptographicHash::hash(data,QCryptographicHash::Md5).toHex()); @@ -439,7 +439,7 @@ void ScrobblerAuth::getSession() url.addQueryItem("token", m_token); QByteArray data; - data.append("api_key"API_KEY); + data.append("api_key" API_KEY); data.append("methodauth.getSession"); data.append("token" + m_token.toUtf8()); data.append(SECRET); @@ -521,7 +521,7 @@ void ScrobblerAuth::processResponse(QNetworkReply *reply) { m_token = response.token; qDebug("ScrobblerAuth[%s]: token: %s", qPrintable(m_name), qPrintable(m_token)); - QDesktopServices::openUrl(m_authUrl + "?api_key="API_KEY"&token="+m_token); + QDesktopServices::openUrl(m_authUrl + "?api_key=" API_KEY "&token="+m_token); emit(tokenRequestFinished(NO_ERROR)); } else if(error_code.isEmpty()) diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp index a59491042..f0946da90 100644 --- a/src/qmmp/qmmp.cpp +++ b/src/qmmp/qmmp.cpp @@ -60,9 +60,9 @@ const QString Qmmp::strVersion() .arg(QMMP_VERSION_PATCH); #if !QMMP_VERSION_STABLE #ifdef SVN_REVISION - ver += "-svn-"SVN_REVISION; + ver += "-svn-" SVN_REVISION; #else - ver += "-"DEV_SUFFIX; + ver += "-" DEV_SUFFIX; #endif #endif return ver; @@ -76,12 +76,12 @@ const QString Qmmp::pluginsPath() #ifdef Q_OS_MAC QDir dir(qApp->applicationDirPath() + "/../Frameworks/qmmp"); #elif defined (QMMP_INSTALL_PREFIX) - QDir dir(QMMP_INSTALL_PREFIX"/"LIB_DIR"/qmmp"); + QDir dir(QMMP_INSTALL_PREFIX "/" LIB_DIR "/qmmp"); //qDebug(QMMP_INSTALL_PREFIX"/"LIB_DIR"/qmmp"); #elif defined(Q_OS_WIN) && !defined(Q_OS_CYGWIN) QDir dir(qApp->applicationDirPath() + "/plugins"); #else - QDir dir(qApp->applicationDirPath() + "/../"LIB_DIR"/qmmp"); + QDir dir(qApp->applicationDirPath() + "/../" LIB_DIR "/qmmp"); #endif return dir.canonicalPath(); } |