--- a/inc/mpengine.h Mon May 03 12:29:20 2010 +0300
+++ b/inc/mpengine.h Fri May 14 15:49:53 2010 +0300
@@ -26,7 +26,7 @@
class QStringList;
class QTranslator;
-class HbProgressDialog;
+class HbPopup;
class MpMpxHarvesterFrameworkWrapper;
class MpSongScanner;
class MpMediaKeyHandler;
@@ -67,7 +67,6 @@
void close();
// Harvester related
- void refreshLibrary();
bool verifyUsbBlocking( bool showMessage = false );
void checkForSystemEvents();
@@ -97,8 +96,8 @@
signals:
// Harvester related
- void libraryAboutToRefresh();
- void libraryRefreshed();
+ void libraryAboutToUpdate();
+ void libraryUpdated();
void usbBlocked( bool blocked );
// Collection related
@@ -112,11 +111,12 @@
public slots:
// Harvester related
+ void refreshLibrary();
void handleScanStarted();
void handleScanEnded( int count, int error );
void handleDiskEvent( MpxDiskEvents event );
void handleUsbEvent( MpxUsbEvents event );
- void handleBlockingNoteClosing();
+ void handleOutstandingNoteClosing();
// Collection related
void reopenCollection();
@@ -144,6 +144,7 @@
void changeUsbBlockingState( UsbBlockingState state );
void launchBlockingNote();
+ void setOutstandingPopup( HbPopup *popup );
private:
@@ -153,7 +154,7 @@
MpMpxHarvesterFrameworkWrapper *mMpxHarvesterWrapper; // Own
MpSongScanner *mSongScanner; // Own
MpMediaKeyHandler *mMediaKeyHandler; // Own
- HbProgressDialog *mUsbBlockingNote; // Own
+ HbPopup *mUsbOutstandingNote; // Own
// Collection related
MpMpxCollectionFrameworkWrapper *mMpxCollectionWrapper; //Own