Fix stupid bug with function scope.

ChangeLog

@@ -1,3 +1,9 @@
+qcma (0.3.6) unstable; urgency=low
+
+  * Fix stupid bug with function scope.
+
+ -- codestation <codestation404@gmail.com>  Thu, 11 Oct 2014 00:00:00 -0000
+
 qcma (0.3.5) unstable; urgency=low
 
   * Added selector to override the default protocol version.

qcma_common.pri

@@ -6,7 +6,7 @@
 
 QT += core network sql
 
-VERSION = 0.3.5
+VERSION = 0.3.6
 
 TEMPLATE = app
 

rpmbuild/qcma-fedora.spec

@@ -6,7 +6,7 @@ Name:           qcma
 Summary:        PSVita Content Manager Assistant
 License:        GPL-3.0
 Release:        1
-Version:        0.3.5
+Version:        0.3.6
 URL:            https://github.com/codestation/qcma
 Source:         https://github.com/codestation/qcma.git
 Group:          Productivity/File utilities

rpmbuild/qcma-openSUSE.spec

@@ -6,7 +6,7 @@ Name:           qcma
 Summary:        PSVita Content Manager Assistant
 License:        GPL-3.0
 Release:        1
-Version:        0.3.5
+Version:        0.3.6
 URL:            https://github.com/codestation/qcma
 Source:         https://github.com/codestation/qcma.git
 Group:          Productivity/File utilities

src/capability.cpp

@@ -18,6 +18,7 @@
  */
 
 #include "capability.h"
+#include "cmautils.h"
 
 #include <QDebug>
 #include <QHostInfo>
@@ -41,7 +42,7 @@ bool DeviceCapability::exchangeInfo(vita_device_t *device)
     }
 
     QString hostname = QHostInfo::localHostName();
-    int protocol_version = getProtocolVersion();
+    int protocol_version = ::getVitaProtocolVersion();
     const initiator_info_t *pc_info = VitaMTP_Data_Initiator_New(hostname.toUtf8().data(), protocol_version);
 
     // Next, we send the client's (this program) info (discard the const here)

src/cmabroadcast.cpp

@@ -86,7 +86,7 @@ void CmaBroadcast::readPendingDatagrams()
 void CmaBroadcast::setAvailable()
 {
     QMutexLocker locker(&mutex);
-    int protocol_version = getProtocolVersion();
+    int protocol_version = ::getVitaProtocolVersion();
 
     reply.clear();    
     reply.insert(0, broadcast_reply
@@ -100,7 +100,7 @@ void CmaBroadcast::setAvailable()
 void CmaBroadcast::setUnavailable()
 {
     QMutexLocker locker(&mutex);
-    int protocol_version = QSettings().value("protocolVersion", VITAMTP_PROTOCOL_MAX_VERSION).toInt();
+    int protocol_version = ::getVitaProtocolVersion();
 
     reply.clear();
     reply.insert(0, broadcast_reply

src/cmautils.cpp

@@ -186,7 +186,7 @@ QString readable_size(qint64 size, bool use_gib)
     return QString().setNum(size_f,'f',2) + " " + unit;
 }
 
-int getProtocolVersion()
+int getVitaProtocolVersion()
 {
     bool useCustom = QSettings().value("useCustomProtocol").toBool();
     if(useCustom)

src/cmautils.h

@@ -49,6 +49,6 @@ bool removeRecursively(const QString &path);
 QString readable_size(qint64 size, bool use_gib = false);
 bool getDiskSpace(const QString &dir, quint64 *free, quint64 *total);
 QByteArray getThumbnail(const QString &path, DataType type, metadata_t *metadata);
-int getProtocolVersion();
+int getVitaProtocolVersion();
 
 #endif // UTILS_H

windows/qcma.nsi

@@ -10,7 +10,7 @@
 !define PRODUCT_EXE_NAME "qcma.exe"
 !define PRODUCT_VERSION_MAJOR 0
 !define PRODUCT_VERSION_MINOR 3
-!define PRODUCT_VERSION_BUILD 5
+!define PRODUCT_VERSION_BUILD 6
 !define PRODUCT_PUBLISHER "codestation"
 !define PRODUCT_WEB_SITE "https://github.com/codestation/qcma"
 !define HELPURL "https://github.com/xiannox/qcma/wiki"