easthighNerd/qcma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix stupid bug with function scope.

Browse Source
This commit is contained in:
codestation
2014-10-11 18:32:10 -04:30
parent 8b6ab4f733
commit 953afb0280
9 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -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 qcma (0.3.5) unstable; urgency=low
* Added selector to override the default protocol version. * Added selector to override the default protocol version.

2
qcma_common.pri
View File

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

2
rpmbuild/qcma-fedora.spec
View File

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

2
rpmbuild/qcma-openSUSE.spec
View File

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

3
src/capability.cpp
View File

@@ -18,6 +18,7 @@
*/ */
#include "capability.h" #include "capability.h"
#include "cmautils.h"
#include <QDebug> #include <QDebug>
#include <QHostInfo> #include <QHostInfo>
@@ -41,7 +42,7 @@ bool DeviceCapability::exchangeInfo(vita_device_t *device)
} }
QString hostname = QHostInfo::localHostName(); 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); 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) // Next, we send the client's (this program) info (discard the const here)

4
src/cmabroadcast.cpp
View File

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

2
src/cmautils.cpp
View File

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

2
src/cmautils.h
View File

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

2
windows/qcma.nsi
View File

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