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

List:       kde-commits
Subject:    [Amarok] 0224493: removed dependency on StatusBar/MainWindow
From:       Maximilian Kossick <maximilian.kossick () googlemail ! com>
Date:       2010-04-07 20:48:04
Message-ID: 201004072048.o37Km4iq003846 () kore ! kollide ! net
[Download RAW message or body]

commit 0224493095aa0dc8e9a9ef0d9900d70114d33fae
Author: Maximilian Kossick <maximilian.kossick@googlemail.com>
Date:   Wed Apr 7 22:59:42 2010 +0200

    removed dependency on StatusBar/MainWindow

diff --git a/src/core-impl/collections/sqlcollection/SqlCollectionLocation.cpp \
b/src/core-impl/collections/sqlcollection/SqlCollectionLocation.cpp index \
                aad599e..6c99587 100644
--- a/src/core-impl/collections/sqlcollection/SqlCollectionLocation.cpp
+++ b/src/core-impl/collections/sqlcollection/SqlCollectionLocation.cpp
@@ -23,6 +23,7 @@
 #include "core/collections/CollectionLocationDelegate.h"
 #include "core/support/Components.h"
 #include "core/support/Debug.h"
+#include "core/interfaces/Logger.h"
 #include "core/collections/support/SqlStorage.h"
 #include "core/meta/Meta.h"
 #include "core/meta/support/MetaUtility.h"
@@ -30,7 +31,6 @@
 #include "ScanResultProcessor.h"
 #include "SqlCollection.h"
 #include "SqlMeta.h"
-#include "statusbar/StatusBar.h"
 
 #include <QDir>
 #include <QFile>
@@ -377,7 +377,7 @@ SqlCollectionLocation::copyUrlsToCollection( const \
QMap<Meta::TrackPtr, KUrl> &s  statusBarTxt = i18n( "Copying tracks" );
 
     m_transferjob = new TransferJob( this );
-    The::statusBar()->newProgressOperation( m_transferjob, statusBarTxt \
)->setAbortSlot( this, SLOT( slotTransferJobAborted() ) ); +    \
Amarok::Components::logger()->newProgressOperation( m_transferjob, statusBarTxt, \
                this, SLOT( slotTransferJobAborted() ) );
     connect( m_transferjob, SIGNAL( result( KJob * ) ), this, SLOT( \
slotTransferJobFinished( KJob * ) ) );  m_transferjob->start();
 }
@@ -607,7 +607,7 @@ bool SqlCollectionLocation::startNextRemoveJob()
             if( track->artist() )
                 name = QString( "%1 - %2" ).arg( track->artist()->name(), \
track->prettyName() );  
-            The::statusBar()->newProgressOperation( job, i18n( "Removing: %1", name \
) ); +            Amarok::Components::logger()->newProgressOperation( job, i18n( \
"Removing: %1", name ) );  m_removejobs.insert( job, track );
             return true;
         }


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