From kde-commits  Sun Apr 30 23:34:14 2006
From: =?utf-8?q?G=C3=A1bor=20Lehel?= <illissius () gmail ! com>
Date: Sun, 30 Apr 2006 23:34:14 +0000
To: kde-commits
Subject: extragear/multimedia/amarok/src
Message-Id: <1146440054.502915.17690.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=114644006230907

SVN commit 536015 by illissius:

update when clicking apply/ok

 M  +3 -3      app.cpp  
 M  +2 -0      app.h  
 M  +6 -1      configdialog.cpp  
 M  +2 -2      contextbrowser.cpp  


--- trunk/extragear/multimedia/amarok/src/app.cpp #536014:536015
@@ -1262,9 +1262,9 @@
         return s;
     }
 
-    void setUseScores( bool use ) { static_cast<App*>( qApp )->setUseScores( use ); }
-    void setUseRatings( bool use ) { static_cast<App*>( qApp )->setUseRatings( use ); }
-    KIO::Job *trashFiles( const KURL::List &files ) { return static_cast<App*>( qApp )->trashFiles( files ); }
+    void setUseScores( bool use ) { App::instance()->setUseScores( use ); }
+    void setUseRatings( bool use ) { App::instance()->setUseRatings( use ); }
+    KIO::Job *trashFiles( const KURL::List &files ) { return App::instance()->trashFiles( files ); }
 }
 
 #include "app.moc"
--- trunk/extragear/multimedia/amarok/src/app.h #536014:536015
@@ -45,6 +45,8 @@
         App();
        ~App();
 
+        static App *instance() { return static_cast<App*>( qApp ); }
+
         static void handleCliArgs();
         static void initCliArgs( int argc, char *argv[] );
 
--- trunk/extragear/multimedia/amarok/src/configdialog.cpp #536014:536015
@@ -277,6 +277,9 @@
     {
         PlaylistWindow::self()->addBrowser( "MediaBrowser", MediaBrowser::instance(), i18n( "Media Device" ), amaroK::icon( "device" ) );
     }
+
+    amaroK::setUseScores( m_opt1->kcfg_UseScores->isChecked() );
+    amaroK::setUseRatings( m_opt1->kcfg_UseRatings->isChecked() );
 }
 
 
@@ -324,7 +327,9 @@
             amaroK::databaseTypeCode(  m_opt7->dbSetupFrame->databaseEngine->currentText()  ) != AmarokConfig::databaseEngine().toInt() ||
             m_engineConfig && m_engineConfig->hasChanged() ||
             m_deviceManager && m_deviceManager->hasChanged() ||
-            externalBrowser() != AmarokConfig::externalBrowser();
+            externalBrowser() != AmarokConfig::externalBrowser() ||
+            m_opt1->kcfg_UseScores->isChecked() != AmarokConfig::useScores() ||
+            m_opt1->kcfg_UseRatings->isChecked() != AmarokConfig::useRatings();
 }
 
 
--- trunk/extragear/multimedia/amarok/src/contextbrowser.cpp #536014:536015
@@ -292,9 +292,9 @@
     connect( CollectionDB::instance(), SIGNAL( imageFetched( const QString& ) ),
              this, SLOT( imageFetched( const QString& ) ) );
 
-    connect( static_cast<App*>( qApp ), SIGNAL( useScores( bool ) ),
+    connect( App::instance(), SIGNAL( useScores( bool ) ),
              this, SLOT( refreshCurrentTrackPage() ) );
-    connect( static_cast<App*>( qApp ), SIGNAL( useRatings( bool ) ),
+    connect( App::instance(), SIGNAL( useRatings( bool ) ),
              this, SLOT( refreshCurrentTrackPage() ) );
 
     showContext( KURL( "current://track" ) );