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

List:       kde-commits
Subject:    extragear/graphics/digikam/digikam
From:       Marcel Wiesweg <marcel.wiesweg () gmx ! de>
Date:       2007-09-01 16:06:00
Message-ID: 1188662760.674702.15578.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 707353 by mwiesweg:

AlbumLister::componentData -> AlbumLister::instance
Provide a proper cleanUp() method


 M  +3 -3      albumiconview.cpp  
 M  +6 -2      albumlister.cpp  
 M  +3 -2      albumlister.h  
 M  +3 -3      digikamapp.cpp  
 M  +1 -1      dio.cpp  
 M  +5 -5      monthwidget.cpp  
 M  +1 -1      tagfilterview.cpp  


--- trunk/extragear/graphics/digikam/digikam/albumiconview.cpp #707352:707353
@@ -206,7 +206,7 @@
 {
     d = new AlbumIconViewPrivate;
     d->init();
-    d->imageLister = AlbumLister::componentData();
+    d->imageLister = AlbumLister::instance();
     d->toolTip     = new AlbumFileTip(this);
 
     setAcceptDrops(true);
@@ -834,7 +834,7 @@
             this, SLOT(slotRenamed(KIO::Job*, const KUrl &, const KUrl&)));
 
     // The AlbumManager KDirWatch will trigger a DIO::scan.
-    // When this is completed, DIO will call AlbumLister::componentData()->refresh().
+    // When this is completed, DIO will call AlbumLister::instance()->refresh().
     // Usually the AlbumLister will ignore changes to already listed items.
     // So the renamed item need explicitly be invalidated.
     d->imageLister->invalidateItem(renameInfo);
@@ -890,7 +890,7 @@
             this, SLOT(slotDIOResult(KJob*)));
 
     // The AlbumManager KDirWatch will trigger a DIO::scan.
-    // When this is completed, DIO will call AlbumLister::componentData()->refresh().
+    // When this is completed, DIO will call AlbumLister::instance()->refresh().
 }
 
 void AlbumIconView::slotDeleteSelectedItemsDirectly(bool useTrash)
--- trunk/extragear/graphics/digikam/digikam/albumlister.cpp #707352:707353
@@ -99,7 +99,7 @@
 
 AlbumLister* AlbumLister::m_instance = 0;
 
-AlbumLister* AlbumLister::componentData()
+AlbumLister* AlbumLister::instance()
 {
     if (!m_instance)
         new AlbumLister();
@@ -107,6 +107,11 @@
     return m_instance;
 }
 
+void AlbumLister::cleanUp()
+{
+    delete m_instance;
+}
+
 AlbumLister::AlbumLister()
 {
     m_instance = this;
@@ -121,7 +126,6 @@
 
 AlbumLister::~AlbumLister()
 {
-    delete d->filterTimer;
     delete d;
     m_instance = 0;
 }
--- trunk/extragear/graphics/digikam/digikam/albumlister.h #707352:707353
@@ -73,8 +73,9 @@
 
 public:
 
-    static AlbumLister* componentData();
-    
+    static AlbumLister* instance();
+    static void cleanUp();
+
     ~AlbumLister();
 
     /**
--- trunk/extragear/graphics/digikam/digikam/digikamapp.cpp #707352:707353
@@ -137,7 +137,7 @@
     d->albumSettings->readSettings();
 
     d->albumManager = AlbumManager::instance();
-    AlbumLister::componentData();
+    AlbumLister::instance();
 
     LoadingCacheInterface::initialize();
 
@@ -211,11 +211,11 @@
         delete d->view;
 
     d->albumSettings->saveSettings();
+
     delete d->albumSettings;
-
     delete d->albumManager;
-    delete AlbumLister::componentData();
 
+    AlbumLister::cleanUp();
     ImageAttributesWatch::cleanUp();
     LoadingCacheInterface::cleanUp();
     KDcrawIface::DcrawBinary::cleanUp();
--- trunk/extragear/graphics/digikam/digikam/dio.cpp #707352:707353
@@ -226,7 +226,7 @@
 void Watch::slotDone(KJob*)
 {
     Digikam::AlbumManager::instance()->refresh();
-    Digikam::AlbumLister::componentData()->refresh();
+    Digikam::AlbumLister::instance()->refresh();
     m_runCount--;
 
     delete this;
--- trunk/extragear/graphics/digikam/digikam/monthwidget.cpp #707352:707353
@@ -300,7 +300,7 @@
             filterDays.append(m_days[i].day);
     }
 
-    AlbumLister::componentData()->setDayFilter(filterDays);
+    AlbumLister::instance()->setDayFilter(filterDays);
     
     update();
 }
@@ -314,10 +314,10 @@
     
     if (m_active)
     {
-        connect(AlbumLister::componentData(),
+        connect(AlbumLister::instance(),
                 SIGNAL(signalNewItems(const ImageInfoList&)),
                 SLOT(slotAddItems(const ImageInfoList&)));
-        connect(AlbumLister::componentData(),
+        connect(AlbumLister::instance(),
                 SIGNAL(signalDeleteItem(ImageInfo*)),
                 SLOT(slotDeleteItem(ImageInfo*)));
     }
@@ -325,9 +325,9 @@
     {
         QDate date = QDate::currentDate();
         setYearMonth(date.year(), date.month());
-        AlbumLister::componentData()->setDayFilter(Q3ValueList<int>());
+        AlbumLister::instance()->setDayFilter(Q3ValueList<int>());
 
-        disconnect(AlbumLister::componentData());
+        disconnect(AlbumLister::instance());
     }
 }
 
--- trunk/extragear/graphics/digikam/digikam/tagfilterview.cpp #707352:707353
@@ -756,7 +756,7 @@
         ++it;
     }
 
-    AlbumLister::componentData()->setTagFilter(filterTags, d->matchingCond, showUnTagged);
+    AlbumLister::instance()->setTagFilter(filterTags, d->matchingCond, showUnTagged);
 }
 
 void TagFilterView::slotContextMenu(Q3ListViewItem* it, const QPoint&, int)
[prev in list] [next in list] [prev in thread] [next in thread]