[solang] Carried out some housekeeping



commit 8d82b8736d593d2f9a0f198abe24ecf751507b7b
Author: Debarshi Ray <rishi gnu org>
Date:   Sat Feb 6 11:37:24 2010 +0200

    Carried out some housekeeping
    
    + No need for the renderers to be sigc::trackable.
    + No need for the SearchManager to be sigc::trackable.
    + Undock BrowserRenderer::dockItem_ in BrowserRenderer::final.
    + Removed unused BrowserRenderer::on_init_end.

 src/attribute/search-manager.cpp    |    1 -
 src/attribute/search-manager.h      |    1 -
 src/renderer/browser-renderer.cpp   |   14 ++------------
 src/renderer/browser-renderer.h     |    6 +-----
 src/renderer/enlarged-renderer.cpp  |    1 -
 src/renderer/enlarged-renderer.h    |    3 +--
 src/renderer/slideshow-renderer.cpp |    1 -
 src/renderer/slideshow-renderer.h   |    3 +--
 8 files changed, 5 insertions(+), 25 deletions(-)
---
diff --git a/src/attribute/search-manager.cpp b/src/attribute/search-manager.cpp
index c182db5..58d0d28 100644
--- a/src/attribute/search-manager.cpp
+++ b/src/attribute/search-manager.cpp
@@ -43,7 +43,6 @@ const std::string SearchManager::uiFile_
 
 SearchManager::SearchManager() throw() :
     Plugin(),
-    sigc::trackable(),
     actionGroup_(Gtk::ActionGroup::create(
                      Glib::ustring::compose("%1:%2",
                                             __FILE__,
diff --git a/src/attribute/search-manager.h b/src/attribute/search-manager.h
index b11b090..7d4ec93 100644
--- a/src/attribute/search-manager.h
+++ b/src/attribute/search-manager.h
@@ -38,7 +38,6 @@ class RendererRegistry;
 
 class SearchManager :
     public Plugin,
-    public sigc::trackable,
     public SearchCriterionSource
 {
     public:
diff --git a/src/renderer/browser-renderer.cpp b/src/renderer/browser-renderer.cpp
index 8f98ac9..976f481 100644
--- a/src/renderer/browser-renderer.cpp
+++ b/src/renderer/browser-renderer.cpp
@@ -67,7 +67,6 @@ static const std::string uiFileThumbnail
 BrowserRenderer::BrowserRenderer() throw() :
     IRenderer(),
     Plugin(),
-    sigc::trackable(),
     application_(NULL),
     iconFactory_(Gtk::IconFactory::create()),
     actionGroup_(Gtk::ActionGroup::create(
@@ -334,11 +333,6 @@ BrowserRenderer::init(Application & application) throw()
 
     ui_manager->insert_action_group(actionGroup_);
 
-    signalInitEnd_
-        = application.init_end().connect(
-              sigc::mem_fun(*this,
-                            &BrowserRenderer::on_init_end));
-
     // NB: This should not be done in the constructor because if
     //     'false == application_' then the handler will crash.
     //     Better safe than sorry.
@@ -386,6 +380,8 @@ BrowserRenderer::final(Application & application) throw()
 
     treeModelFilter_.reset();
 
+    main_window.undock_object_center(GDL_DOCK_OBJECT(dockItem_));
+
     RendererRegistry & renderer_registry
         = application.get_renderer_registry();
     renderer_registry.remove(this);
@@ -544,12 +540,6 @@ BrowserRenderer::on_action_view_slideshow() throw()
 }
 
 void
-BrowserRenderer::on_init_end(Application & application) throw()
-{
-    signalInitEnd_.disconnect();
-}
-
-void
 BrowserRenderer::on_selection_changed() throw()
 {
     application_->get_engine().selection_changed().emit();
diff --git a/src/renderer/browser-renderer.h b/src/renderer/browser-renderer.h
index 1656126..19e8128 100644
--- a/src/renderer/browser-renderer.h
+++ b/src/renderer/browser-renderer.h
@@ -38,8 +38,7 @@ namespace Solang
 
 class BrowserRenderer :
     public IRenderer,
-    public Plugin,
-    public sigc::trackable
+    public Plugin
 {
     public:
         BrowserRenderer() throw();
@@ -69,9 +68,6 @@ class BrowserRenderer :
         render(const PhotoList & photos) throw();
 
         void
-        on_init_end(Application & application) throw();
-
-        void
         on_selection_changed() throw();
 
         virtual PhotoList
diff --git a/src/renderer/enlarged-renderer.cpp b/src/renderer/enlarged-renderer.cpp
index 5147cf1..60230bb 100644
--- a/src/renderer/enlarged-renderer.cpp
+++ b/src/renderer/enlarged-renderer.cpp
@@ -63,7 +63,6 @@ image_view_on_scroll_event(GtkImageView * view,
 EnlargedRenderer::EnlargedRenderer() throw() :
     IRenderer(),
     Plugin(),
-    sigc::trackable(),
     application_(NULL),
     firstUse_(true),
     iconFactory_(Gtk::IconFactory::create()),
diff --git a/src/renderer/enlarged-renderer.h b/src/renderer/enlarged-renderer.h
index a857484..6421288 100644
--- a/src/renderer/enlarged-renderer.h
+++ b/src/renderer/enlarged-renderer.h
@@ -36,8 +36,7 @@ namespace Solang
 
 class EnlargedRenderer :
     public IRenderer,
-    public Plugin,
-    public sigc::trackable
+    public Plugin
 {
     public:
         EnlargedRenderer() throw();
diff --git a/src/renderer/slideshow-renderer.cpp b/src/renderer/slideshow-renderer.cpp
index 324a9f8..6b04785 100644
--- a/src/renderer/slideshow-renderer.cpp
+++ b/src/renderer/slideshow-renderer.cpp
@@ -44,7 +44,6 @@ static const std::string uiFile
 SlideshowRenderer::SlideshowRenderer() throw() :
     IRenderer(),
     Plugin(),
-    sigc::trackable(),
     application_(0),
     firstUse_(true),
     actionGroup_(0),
diff --git a/src/renderer/slideshow-renderer.h b/src/renderer/slideshow-renderer.h
index b27e972..94f82c9 100644
--- a/src/renderer/slideshow-renderer.h
+++ b/src/renderer/slideshow-renderer.h
@@ -34,8 +34,7 @@ namespace Solang
 
 class SlideshowRenderer :
     public IRenderer,
-    public Plugin,
-    public sigc::trackable
+    public Plugin
 {
     public:
         SlideshowRenderer() throw();



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]