From 861a1b9a69b01930ded920710846b8d9c65b3bd5 Mon Sep 17 00:00:00 2001 From: codestation Date: Sun, 15 Mar 2015 16:09:36 -0430 Subject: [PATCH] Bump version to 0.3.10. Update changelog. Change most of qDebug() meant to be errors to qWarning(). --- debian/changelog | 10 ++++++++++ qcma_common.pri | 2 +- rpmbuild/qcma.spec | 2 +- src/avdecoder.cpp | 1 - src/cli/headlessmanager.cpp | 6 +++--- src/cli/main_cli.cpp | 2 +- src/cmabroadcast.cpp | 2 +- src/gui/main.cpp | 2 +- src/gui/mainwidget.cpp | 12 ++++++------ src/indicator/unityindicator.cpp | 2 +- windows/qcma.nsi | 2 +- 11 files changed, 26 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index a6c4c94..38ab83f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +qcma (0.3.10) unstable; urgency=low + + * debian: switch to libvitamtp* + * Added manpages. + * Added french translation. + * Added systemd unit file for qcma_cli. + * Replaced dbus with unix signals. + + -- codestation Sun, 15 Mar 2015 14:35:04 -0000 + qcma (0.3.9) unstable; urgency=low * Set correct organization name in qcma_cli. diff --git a/qcma_common.pri b/qcma_common.pri index 62a6d0b..4ef42df 100644 --- a/qcma_common.pri +++ b/qcma_common.pri @@ -6,7 +6,7 @@ QT += core network sql -VERSION = 0.3.9 +VERSION = 0.3.10 TEMPLATE = app diff --git a/rpmbuild/qcma.spec b/rpmbuild/qcma.spec index 11c9aa9..867b425 100644 --- a/rpmbuild/qcma.spec +++ b/rpmbuild/qcma.spec @@ -2,7 +2,7 @@ # qcma spec file # -%define _version 0.3.9 +%define _version 0.3.10 %if "%{_version}" == "testing" || "%{_version}" == "master" %define _verprefix %{_version} diff --git a/src/avdecoder.cpp b/src/avdecoder.cpp index dbb4490..74ec2d2 100644 --- a/src/avdecoder.cpp +++ b/src/avdecoder.cpp @@ -21,7 +21,6 @@ #include "avdecoder.h" #include "database.h" -#include #include #include #include diff --git a/src/cli/headlessmanager.cpp b/src/cli/headlessmanager.cpp index b4875fe..f836f99 100644 --- a/src/cli/headlessmanager.cpp +++ b/src/cli/headlessmanager.cpp @@ -63,14 +63,14 @@ void HeadlessManager::refreshDatabase() QTextStream(stdout) << "Database scan has started" << endl; if(!m_db->rescan()) { - qDebug("No PS Vita system has been registered"); + qWarning("No PS Vita system has been registered"); } } void HeadlessManager::start() { if(VitaMTP_Init() < 0) { - qDebug("Cannot initialize VitaMTP library"); + qCritical("Cannot initialize VitaMTP library"); return; } @@ -127,7 +127,7 @@ void HeadlessManager::start() } if(thread_count == 0) { - qDebug("You must enable at least USB or Wireless monitoring"); + qCritical("You must enable at least USB or Wireless monitoring"); } } diff --git a/src/cli/main_cli.cpp b/src/cli/main_cli.cpp index 07f37a9..6118c95 100644 --- a/src/cli/main_cli.cpp +++ b/src/cli/main_cli.cpp @@ -129,7 +129,7 @@ int main(int argc, char *argv[]) if(translator.load("qcma_" + locale, ":/resources/translations")) { app.installTranslator(&translator); } else { - qDebug() << "Cannot load translation for locale:" << locale; + qWarning() << "Cannot load translation for locale:" << locale; } QTranslator system_translator; diff --git a/src/cmabroadcast.cpp b/src/cmabroadcast.cpp index 9aa0bea..72058ea 100644 --- a/src/cmabroadcast.cpp +++ b/src/cmabroadcast.cpp @@ -69,7 +69,7 @@ CmaBroadcast::CmaBroadcast(QObject *obj_parent) : #endif if(!socket->bind(host_address, QCMA_REQUEST_PORT, QUdpSocket::ShareAddress | QUdpSocket::ReuseAddressHint)) { - qDebug() << "Failed to bind address for UDP broadcast"; + qCritical() << "Failed to bind address for UDP broadcast"; } } diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 3e0efe2..cf29db4 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -124,7 +124,7 @@ int main(int argc, char *argv[]) if(translator.load("qcma_" + locale, ":/resources/translations")) { app.installTranslator(&translator); } else { - qDebug() << "Cannot load translation for locale:" << locale; + qWarning() << "Cannot load translation for locale:" << locale; } QTranslator system_translator; diff --git a/src/gui/mainwidget.cpp b/src/gui/mainwidget.cpp index 109eb77..efbb3bb 100644 --- a/src/gui/mainwidget.cpp +++ b/src/gui/mainwidget.cpp @@ -155,12 +155,12 @@ void MainWidget::showAboutDialog() { QMessageBox about; - about.setText(QString("QCMA ") + QCMA_VER); - about.setWindowTitle(tr("About QCMA")); + about.setText(QString("Qcma ") + QCMA_VER); + about.setWindowTitle(tr("About Qcma")); #ifndef QCMA_BUILD_HASH - about.setInformativeText(tr("Copyright (C) 2014 Codestation") + "\n"); + about.setInformativeText(tr("Copyright (C) 2015 Codestation") + "\n"); #else - about.setInformativeText(tr("Copyright (C) 2014 Codestation\n\nbuild hash: %1\nbuild branch: %2").arg(QCMA_BUILD_HASH).arg(QCMA_BUILD_BRANCH)); + about.setInformativeText(tr("Copyright (C) 2015 Codestation\n\nbuild hash: %1\nbuild branch: %2").arg(QCMA_BUILD_HASH).arg(QCMA_BUILD_BRANCH)); #endif about.setStandardButtons(QMessageBox::Ok); about.setIconPixmap(QPixmap(":/main/resources/images/qcma.png")); @@ -211,7 +211,7 @@ TrayIndicator *MainWidget::createTrayObject(QWidget *obj_parent) if(library.load()) create_tray = reinterpret_cast(library.resolve("createTrayIndicator")); else - qDebug() << "Cannot load libqcma_kdenotifier plugin"; + qWarning() << "Cannot load libqcma_kdenotifier plugin"; } else // try to use the appindicator if is available @@ -222,7 +222,7 @@ TrayIndicator *MainWidget::createTrayObject(QWidget *obj_parent) if(library.load()) create_tray = reinterpret_cast(library.resolve("createTrayIndicator")); else - qDebug() << "Cannot load libqcma_appindicator plugin"; + qWarning() << "Cannot load libqcma_appindicator plugin"; } #endif // else QSystemTrayIcon diff --git a/src/indicator/unityindicator.cpp b/src/indicator/unityindicator.cpp index 646d9a6..dc67bcf 100644 --- a/src/indicator/unityindicator.cpp +++ b/src/indicator/unityindicator.cpp @@ -163,7 +163,7 @@ void UnityIndicator::init() app_indicator_set_icon_theme_path(m_indicator, qPrintable(icon_path)); } else - qDebug() << "Cannot find qcma icons."; + qWarning() << "Cannot find qcma icons."; app_indicator_set_status(m_indicator, APP_INDICATOR_STATUS_ACTIVE); app_indicator_set_menu(m_indicator, GTK_MENU(menu)); diff --git a/windows/qcma.nsi b/windows/qcma.nsi index 6225833..7a376b6 100644 --- a/windows/qcma.nsi +++ b/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 9 +!define PRODUCT_VERSION_BUILD 10 !define PRODUCT_PUBLISHER "codestation" !define PRODUCT_WEB_SITE "https://github.com/codestation/qcma" !define HELPURL "https://github.com/xiannox/qcma/wiki"