[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [amarok] src: Fix for C++ warnings about unused variables and deprecated functions
From:       Matěj_Laitl <matej () laitl ! cz>
Date:       2016-08-20 11:01:20
Message-ID: E1bb41g-0004Us-1e () code ! kde ! org
[Download RAW message or body]

Git commit 970e985d6100070aa105dd602da8c294687385ac by Matěj Laitl, on behalf of \
Stefano Pettini. Committed on 20/08/2016 at 11:00.
Pushed by laitl into branch 'master'.

Fix for C++ warnings about unused variables and deprecated functions

Thank you, Stefano!

REVIEW: 127458

M  +0    -2    src/configdialog/dialogs/DatabaseConfig.cpp
M  +1    -1    src/core-impl/collections/db/sql/SqlScanResultProcessor.cpp
M  +1    -0    src/core-impl/storage/sql/mysqlserverstorage/MySqlServerStorageFactory.cpp
 M  +5    -2    src/services/mp3tunes/harmonydaemon/Mp3tunesHarmonyDaemon.cpp
M  +2    -2    src/services/mp3tunes/libmp3tunes/harmony.c
M  +2    -0    src/statemanagement/DefaultApplicationController.cpp

http://commits.kde.org/amarok/970e985d6100070aa105dd602da8c294687385ac

diff --git a/src/configdialog/dialogs/DatabaseConfig.cpp \
b/src/configdialog/dialogs/DatabaseConfig.cpp index 1cb2d97..ff4f6c5 100644
--- a/src/configdialog/dialogs/DatabaseConfig.cpp
+++ b/src/configdialog/dialogs/DatabaseConfig.cpp
@@ -82,7 +82,6 @@ DatabaseConfig::testDatabaseConnection() //SLOT
     factories = Plugins::PluginManager::instance()->factories( \
Plugins::PluginManager::Storage );  
     // try if they have a testSettings slot that we can call
-    bool tested = false;
     foreach( Plugins::PluginFactory* factory, factories )
     {
         bool callSucceeded = false;
@@ -100,7 +99,6 @@ DatabaseConfig::testDatabaseConnection() //SLOT
 
         if( callSucceeded )
         {
-            tested = true;
             if( connectionErrors.isEmpty() )
                 KMessageBox::messageBox( this, KMessageBox::Information,
                                          i18n( "Amarok was able to establish a \
                successful connection to the database." ),
diff --git a/src/core-impl/collections/db/sql/SqlScanResultProcessor.cpp \
b/src/core-impl/collections/db/sql/SqlScanResultProcessor.cpp index 71589a0..367c02a \
                100644
--- a/src/core-impl/collections/db/sql/SqlScanResultProcessor.cpp
+++ b/src/core-impl/collections/db/sql/SqlScanResultProcessor.cpp
@@ -301,7 +301,7 @@ SqlScanResultProcessor::commitTrack( CollectionScanner::Track \
*track,  metaTrack->setType( track->filetype() );
 
     if( m_type == GenericScanManager::FullScan ||
-        !track->bpm() >= 0 )
+        track->bpm() >= 0 )
         metaTrack->setBpm( track->bpm() );
 
     if( m_type == GenericScanManager::FullScan ||
diff --git a/src/core-impl/storage/sql/mysqlserverstorage/MySqlServerStorageFactory.cpp \
b/src/core-impl/storage/sql/mysqlserverstorage/MySqlServerStorageFactory.cpp index \
                5cdb693..6f9ee59 100644
--- a/src/core-impl/storage/sql/mysqlserverstorage/MySqlServerStorageFactory.cpp
+++ b/src/core-impl/storage/sql/mysqlserverstorage/MySqlServerStorageFactory.cpp
@@ -69,6 +69,7 @@ MySqlServerStorageFactory::testSettings( const QString &host, const \
QString &use  
     MySqlServerStorage* storage = new MySqlServerStorage();
     bool initResult = storage->init( host, user, password, port, databaseName );
+    Q_UNUSED( initResult );
 
     // we are just interested in the errors.
     errors = storage->getLastErrors();
diff --git a/src/services/mp3tunes/harmonydaemon/Mp3tunesHarmonyDaemon.cpp \
b/src/services/mp3tunes/harmonydaemon/Mp3tunesHarmonyDaemon.cpp index \
                5b09f07..d8ae295 100644
--- a/src/services/mp3tunes/harmonydaemon/Mp3tunesHarmonyDaemon.cpp
+++ b/src/services/mp3tunes/harmonydaemon/Mp3tunesHarmonyDaemon.cpp
@@ -155,8 +155,11 @@ Mp3tunesHarmonyDaemon::init()
 {
 
     qDebug()  << "Begin initing";
-        /* g_type_init required for using the GObjects for Harmony. */
-    g_type_init();
+
+#if !GLIB_CHECK_VERSION(2,36,0)
+    /* g_type_init required for using the GObjects in versions of glib older than \
2.36. */ +    g_type_init ();
+#endif
 
     m_harmony = mp3tunes_harmony_new();
 
diff --git a/src/services/mp3tunes/libmp3tunes/harmony.c \
b/src/services/mp3tunes/libmp3tunes/harmony.c index ead0345..df00be2 100644
--- a/src/services/mp3tunes/libmp3tunes/harmony.c
+++ b/src/services/mp3tunes/libmp3tunes/harmony.c
@@ -643,7 +643,7 @@ gboolean mp3tunes_harmony_disconnect(MP3tunesHarmony *harmony, \
GError** err) {  gboolean success = close_connection(harmony);
     harmony->connected = FALSE;
     if (success == FALSE) {
-        err = &harmony->error;
+        *err = harmony->error;
         return success;
     }
     return success;
@@ -658,7 +658,7 @@ gboolean mp3tunes_harmony_connect(MP3tunesHarmony* harmony, \
GError** err) {  success = open_connection(harmony);
 
     if (success == FALSE) {
-        err = &harmony->error;
+        *err = harmony->error;
         mp3tunes_harmony_disconnect(harmony, err);
         return success;
     }
diff --git a/src/statemanagement/DefaultApplicationController.cpp \
b/src/statemanagement/DefaultApplicationController.cpp index 5886789..acc4213 100644
--- a/src/statemanagement/DefaultApplicationController.cpp
+++ b/src/statemanagement/DefaultApplicationController.cpp
@@ -32,6 +32,7 @@ DefaultApplicationController::DefaultApplicationController( QObject \
*parent )  //there can be only one applicationcontroller
     ApplicationController *oldController = Components::setApplicationController( \
this );  Q_ASSERT( !oldController );
+    Q_UNUSED( oldController );
 }
 
 DefaultApplicationController::~DefaultApplicationController()
@@ -88,6 +89,7 @@ DefaultApplicationController::initEngineController()
     Components::setEngineController( controller );
     bool invoked = QMetaObject::invokeMethod( controller, "initializePhonon", \
Qt::DirectConnection );  Q_ASSERT( invoked );
+    Q_UNUSED( invoked );
 }
 
 void


[prev in list] [next in list] [prev in thread] [next in thread]