GNOME.org
 

[solang] Renamed PhotoSearchCritera to IPhotoSearchCriteria

commit 3a9d2c80cc9a9d8ba4b4e9d60361edbeffdbfcd8
Author: Debarshi Ray <rishi gnu org>
Date:   Fri Jan 29 00:34:55 2010 +0200

    Renamed PhotoSearchCritera to IPhotoSearchCriteria

 src/application/application.cpp                    |    6 +++---
 src/application/application.h                      |    4 ++--
 src/application/engine.cpp                         |    9 +++++----
 src/application/engine.h                           |   10 +++++-----
 src/attribute/modification-date.cpp                |    6 +++---
 src/attribute/modification-date.h                  |    6 +++---
 src/attribute/search-basket-column-record.cpp      |    4 ++--
 src/attribute/search-basket-column-record.h        |    6 +++---
 src/attribute/search-criterion-repo.h              |    6 +++---
 src/attribute/search-criterion-source.h            |    4 +++-
 src/attribute/search-manager.cpp                   |    8 ++++----
 src/attribute/search-manager.h                     |    2 +-
 src/attribute/tag.cpp                              |    7 ++++---
 src/attribute/tag.h                                |    5 +++--
 src/common/Makefile.am                             |    4 ++--
 src/common/database.cpp                            |   11 ++++++-----
 src/common/database.h                              |    6 +++---
 src/common/exif-data-key.cpp                       |    4 ++--
 src/common/exif-data-key.h                         |    5 +++--
 ...ch-criteria.cpp => i-photo-search-criteria.cpp} |    7 ++++---
 ...search-criteria.h => i-photo-search-criteria.h} |   14 +++++++-------
 src/common/types.h                                 |   15 ++++++++-------
 src/renderer/browser-renderer.cpp                  |    1 -
 src/renderer/enlarged-renderer.cpp                 |    1 -
 24 files changed, 79 insertions(+), 72 deletions(-)
---
diff --git a/src/application/application.cpp b/src/application/application.cpp
index 5352e5a..72635a6 100644
--- a/src/application/application.cpp
+++ b/src/application/application.cpp
@@ -272,7 +272,7 @@ Application::init() throw()
 {
     engine_.init("");
     engine_.search_async(
-        PhotoSearchCriteriaList(),
+        IPhotoSearchCriteriaList(),
         sigc::mem_fun(*this,
                       &Application::on_async_search));
 
@@ -490,7 +490,7 @@ Application::on_async_search(PhotoList & photos) throw()
 }
 
 void
-Application::on_criteria_changed(PhotoSearchCriteriaList & criteria)
+Application::on_criteria_changed(IPhotoSearchCriteriaList & criteria)
                                  throw()
 {
     engine_.search_async(
@@ -605,7 +605,7 @@ Application::get_drag_drop_map() throw()
 
 void
 Application::set_drag_item(const Glib::ustring & key,
-                const PhotoSearchCriteriaPtr &criteria) throw()
+                const IPhotoSearchCriteriaPtr &criteria) throw()
 {
     //Existing item will be replaced
     //This handles double dragging of same criteria
diff --git a/src/application/application.h b/src/application/application.h
index b5ca6b6..4b03471 100644
--- a/src/application/application.h
+++ b/src/application/application.h
@@ -92,7 +92,7 @@ class Application :
 
         void
         set_drag_item(const Glib::ustring &, //key
-                      const PhotoSearchCriteriaPtr &) throw();
+                      const IPhotoSearchCriteriaPtr &) throw();
 
     protected:
 
@@ -113,7 +113,7 @@ class Application :
         on_async_search(PhotoList & photos) throw();
 
         void
-        on_criteria_changed(PhotoSearchCriteriaList & criteria)
+        on_criteria_changed(IPhotoSearchCriteriaList & criteria)
                             throw();
 
         void
diff --git a/src/application/engine.cpp b/src/application/engine.cpp
index 35f97c7..b68e7b7 100644
--- a/src/application/engine.cpp
+++ b/src/application/engine.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * Copyright (C) 2009 Debarshi Ray <rishi gnu org>
+ * Copyright (C) 2009, 2010 Debarshi Ray <rishi gnu org>
  * Copyright (C) 2009 Santanu Sinha <santanu sinha gmail com>
  *
  * Solang is free software: you can redistribute it and/or modify it
@@ -74,7 +74,8 @@ void
 Engine::criteria_changed() throw()
 {
     criterionRepo_.update();
-    PhotoSearchCriteriaList criteria = criterionRepo_.get_criterion();
+    IPhotoSearchCriteriaList criteria
+                                 = criterionRepo_.get_criterion();
     criteriaChanged_.emit(criteria);
 }
 
@@ -190,7 +191,7 @@ Engine::import(const IPhotoSourcePtr & source,
 }
 
 void
-Engine::search_async(const PhotoSearchCriteriaList & criteria,
+Engine::search_async(const IPhotoSearchCriteriaList & criteria,
                      const Database::SlotAsyncPhotos & slot) const
                      throw()
 {
@@ -300,7 +301,7 @@ Engine::selection_changed() throw()
     return selectionChanged_;
 }
 
-sigc::signal<void, PhotoSearchCriteriaList &> &
+sigc::signal<void, IPhotoSearchCriteriaList &> &
 Engine::signal_criteria_changed() throw()
 {
     return criteriaChanged_;
diff --git a/src/application/engine.h b/src/application/engine.h
index 43ba484..de35778 100644
--- a/src/application/engine.h
+++ b/src/application/engine.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * Copyright (C) 2009 Debarshi Ray <rishi gnu org>
+ * Copyright (C) 2009, 2010 Debarshi Ray <rishi gnu org>
  * Copyright (C) 2009 Santanu Sinha <santanu sinha gmail com>
  *
  * Solang is free software: you can redistribute it and/or modify it
@@ -26,10 +26,10 @@
 
 #include "database.h"
 #include "deletion-queue.h"
+#include "i-photo-search-criteria.h"
 #include "i-storage.h"
 #include "non-copyable.h"
 #include "photo.h"
-#include "photo-search-criteria.h"
 #include "search-criterion-repo.h"
 #include "types.h"
 
@@ -96,7 +96,7 @@ class Engine :
                const ProgressObserverPtr & observer) throw();
 
         void
-        search_async(const PhotoSearchCriteriaList & criteria,
+        search_async(const IPhotoSearchCriteriaList & criteria,
                      const Database::SlotAsyncPhotos & slot) const
                      throw();
 
@@ -141,7 +141,7 @@ class Engine :
         Glib::Dispatcher &
         photo_import_end() throw();
 
-        sigc::signal<void, PhotoSearchCriteriaList &> &
+        sigc::signal<void, IPhotoSearchCriteriaList &> &
         signal_criteria_changed() throw();
 
         Glib::Dispatcher &
@@ -189,7 +189,7 @@ class Engine :
 
         Glib::Dispatcher tagAddEnd_;
 
-        sigc::signal<void, PhotoSearchCriteriaList &>
+        sigc::signal<void, IPhotoSearchCriteriaList &>
             criteriaChanged_;
 
         sigc::signal<void> selectionChanged_;
diff --git a/src/attribute/modification-date.cpp b/src/attribute/modification-date.cpp
index c4e101f..4cc5383 100644
--- a/src/attribute/modification-date.cpp
+++ b/src/attribute/modification-date.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * Copyright (C) 2009 Debarshi Ray <rishi gnu org>
+ * Copyright (C) 2009, 2010 Debarshi Ray <rishi gnu org>
  * Copyright (C) 2009 Santanu Sinha <santanu sinha gmail com>
  *
  * Solang is free software: you can redistribute it and/or modify it
@@ -36,10 +36,10 @@ ModificationDate::get_query_criteria() const throw()
     return Glib::ustring();
 }
 
-PhotoSearchCriteria::ClubbingOperationType
+IPhotoSearchCriteria::ClubbingOperationType
 ModificationDate::get_clubbing_type() const throw()
 {
-    return PhotoSearchCriteria::CLUB_OR;
+    return IPhotoSearchCriteria::CLUB_OR;
 }
 
 gint32
diff --git a/src/attribute/modification-date.h b/src/attribute/modification-date.h
index 3b371be..5203e95 100644
--- a/src/attribute/modification-date.h
+++ b/src/attribute/modification-date.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * Copyright (C) 2009 Debarshi Ray <rishi gnu org>
+ * Copyright (C) 2009, 2010 Debarshi Ray <rishi gnu org>
  * Copyright (C) 2009 Santanu Sinha <santanu sinha gmail com>
  *
  * Solang is free software: you can redistribute it and/or modify it
@@ -20,13 +20,13 @@
 #ifndef SOLANG_MODIFICATION_DATE_H
 #define SOLANG_MODIFICATION_DATE_H
 
-#include "photo-search-criteria.h"
+#include "i-photo-search-criteria.h"
 
 namespace Solang
 {
 
 class ModificationDate
-    : public PhotoSearchCriteria
+    : public IPhotoSearchCriteria
 {
     private:
         gint32 day_;
diff --git a/src/attribute/search-basket-column-record.cpp b/src/attribute/search-basket-column-record.cpp
index 9f1a7c2..a7d91de 100644
--- a/src/attribute/search-basket-column-record.cpp
+++ b/src/attribute/search-basket-column-record.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * Copyright (C) Debarshi Ray 2009 <rishi gnu org>
+ * Copyright (C) Debarshi Ray 2009, 2010 <rishi gnu org>
  *
  * Solang is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -72,7 +72,7 @@ SearchBasketColumnRecord::get_column_description_num() const throw()
     return COLUMN_DESCRIPTION;
 }
 
-const Gtk::TreeModelColumn<PhotoSearchCriteriaPtr> &
+const Gtk::TreeModelColumn<IPhotoSearchCriteriaPtr> &
 SearchBasketColumnRecord::get_column_criteria() const throw()
 {
     return criteria_;
diff --git a/src/attribute/search-basket-column-record.h b/src/attribute/search-basket-column-record.h
index 4935598..50077b8 100644
--- a/src/attribute/search-basket-column-record.h
+++ b/src/attribute/search-basket-column-record.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * Copyright (C) Debarshi Ray 2009 <rishi gnu org>
+ * Copyright (C) Debarshi Ray 2009, 2010 <rishi gnu org>
  *
  * Solang is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -49,7 +49,7 @@ class SearchBasketColumnRecord :
         gint
         get_column_description_num() const throw();
 
-        const Gtk::TreeModelColumn<PhotoSearchCriteriaPtr> &
+        const Gtk::TreeModelColumn<IPhotoSearchCriteriaPtr> &
         get_column_criteria() const throw();
 
         gint
@@ -60,7 +60,7 @@ class SearchBasketColumnRecord :
 
         Gtk::TreeModelColumn<Glib::ustring> columnDescription_;
 
-        Gtk::TreeModelColumn<PhotoSearchCriteriaPtr> criteria_;
+        Gtk::TreeModelColumn<IPhotoSearchCriteriaPtr> criteria_;
 
     private:
 };
diff --git a/src/attribute/search-criterion-repo.h b/src/attribute/search-criterion-repo.h
index 9df8b4c..f664663 100644
--- a/src/attribute/search-criterion-repo.h
+++ b/src/attribute/search-criterion-repo.h
@@ -29,14 +29,14 @@ class SearchCriterionRepo
 {
     private:
         Glib::Mutex mutex_;
-        PhotoSearchCriteriaList criterion_;
+        IPhotoSearchCriteriaList criterion_;
         SearchCriterionSourceList sources_;
 
     public:
         SearchCriterionRepo();
         ~SearchCriterionRepo();
 
-        inline const PhotoSearchCriteriaList &
+        inline const IPhotoSearchCriteriaList &
         get_criterion() const throw();
 
         void
@@ -49,7 +49,7 @@ class SearchCriterionRepo
 };
 
 
-inline const PhotoSearchCriteriaList &
+inline const IPhotoSearchCriteriaList &
 SearchCriterionRepo::get_criterion() const throw()
 {
     return criterion_;
diff --git a/src/attribute/search-criterion-source.h b/src/attribute/search-criterion-source.h
index e29d578..eabcad3 100644
--- a/src/attribute/search-criterion-source.h
+++ b/src/attribute/search-criterion-source.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
+ * Copyright (C) 2010 Debarshi Ray <rishi gnu org>
  * Copyright (C) 2009 Santanu Sinha <santanu sinha gmail com>
  *
  * Solang is free software: you can redistribute it and/or modify it
@@ -33,7 +34,8 @@ class SearchCriterionSource :
         ~SearchCriterionSource() throw();
 
         virtual
-        void get_criterion(PhotoSearchCriteriaList &) const throw() = 0;
+        void get_criterion(IPhotoSearchCriteriaList &) const
+                           throw() = 0;
 
     protected:
         SearchCriterionSource() throw();
diff --git a/src/attribute/search-manager.cpp b/src/attribute/search-manager.cpp
index c644d29..116a282 100644
--- a/src/attribute/search-manager.cpp
+++ b/src/attribute/search-manager.cpp
@@ -275,7 +275,7 @@ SearchManager::add_item_to_list( const Glib::ustring &key )
 
     SearchBasketColumnRecord model_column_record;
 
-    PhotoSearchCriteriaPtr criteria = (*it).second;
+    IPhotoSearchCriteriaPtr criteria = (*it).second;
     Glib::ustring iconPath = criteria->get_criteria_icon_path();
     Glib::ustring description
                     = criteria->get_criteria_description();
@@ -286,7 +286,7 @@ SearchManager::add_item_to_list( const Glib::ustring &key )
                                 current != children.end(); current++)
     {
         Gtk::TreeModel::Row row = (*current);
-        PhotoSearchCriteriaPtr tag
+        IPhotoSearchCriteriaPtr tag
                 = row[ model_column_record.get_column_criteria()];
 
         if( tag->get_criteria_description() == description )
@@ -322,7 +322,7 @@ SearchManager::apply_criterion()
 
 void
 SearchManager::get_criterion(
-                    PhotoSearchCriteriaList &criterion) const throw()
+                    IPhotoSearchCriteriaList &criterion) const throw()
 {
     SearchBasketColumnRecord model_column_record;
     Gtk::TreeModel::Children children = listStore_->children();
@@ -330,7 +330,7 @@ SearchManager::get_criterion(
                                 current != children.end(); current++)
     {
         Gtk::TreeModel::Row row = (*current);
-        PhotoSearchCriteriaPtr tag
+        IPhotoSearchCriteriaPtr tag
                 = row[ model_column_record.get_column_criteria()];
         criterion.push_back( tag );
     }
diff --git a/src/attribute/search-manager.h b/src/attribute/search-manager.h
index 2f263ed..19867f1 100644
--- a/src/attribute/search-manager.h
+++ b/src/attribute/search-manager.h
@@ -66,7 +66,7 @@ class SearchManager :
         add_item_to_list( const Glib::ustring &key );
 
         virtual void
-        get_criterion(PhotoSearchCriteriaList &) const throw();
+        get_criterion(IPhotoSearchCriteriaList &) const throw();
 
     protected:
         void
diff --git a/src/attribute/tag.cpp b/src/attribute/tag.cpp
index 2575e8e..1bc56d8 100644
--- a/src/attribute/tag.cpp
+++ b/src/attribute/tag.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
+ * Copyright (C) 2009, 2010 Debarshi Ray <rishi gnu org>
  * Copyright (C) 2009 Santanu Sinha <santanu sinha gmail com>
  *
  * Solang is free software: you can redistribute it and/or modify it
@@ -34,7 +35,7 @@ Tag::Tag(const Glib::ustring & name,
          const Glib::ustring & description,
          const std::string & urn) throw() :
     DBObject(),
-    PhotoSearchCriteria(),
+    IPhotoSearchCriteria(),
     name_(name),
     description_(description),
     urn_(urn)
@@ -153,10 +154,10 @@ Tag::set_icon_path(Glib::ustring const & value)
     iconPath_ = value;
 }
 
-PhotoSearchCriteria::ClubbingOperationType
+IPhotoSearchCriteria::ClubbingOperationType
 Tag::get_clubbing_type() const throw()
 {
-    return PhotoSearchCriteria::CLUB_OR;
+    return IPhotoSearchCriteria::CLUB_OR;
 }
 
 gint32
diff --git a/src/attribute/tag.h b/src/attribute/tag.h
index 6d02212..16945fe 100644
--- a/src/attribute/tag.h
+++ b/src/attribute/tag.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
+ * Copyright (C) 2009, 2010 Debarshi Ray <rishi gnu org>
  * Copyright (C) 2009 Santanu Sinha <santanu sinha gmail com>
  *
  * Solang is free software: you can redistribute it and/or modify it
@@ -24,7 +25,7 @@
 #include <glibmm.h>
 
 #include "db-object.h"
-#include "photo-search-criteria.h"
+#include "i-photo-search-criteria.h"
 #include "types.h"
 
 namespace Solang
@@ -34,7 +35,7 @@ class Database;
 
 class Tag :
     public DBObject,
-    public PhotoSearchCriteria 
+    public IPhotoSearchCriteria 
 {
     private:
         Glib::ustring name_;
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index e0af9d4..8656280 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -41,6 +41,8 @@ libcommon_la_SOURCES = \
 	i-operation.h \
 	i-photo-destination.cpp \
 	i-photo-destination.h \
+	i-photo-search-criteria.cpp \
+	i-photo-search-criteria.h \
 	i-photo-source.cpp \
 	i-photo-source.h \
 	i-plugin.cpp \
@@ -57,8 +59,6 @@ libcommon_la_SOURCES = \
 	operation.h \
 	photo.cpp \
 	photo.h \
-	photo-search-criteria.cpp \
-	photo-search-criteria.h \
 	plugin.cpp \
 	plugin.h \
 	pixbuf-maker.cpp \
diff --git a/src/common/database.cpp b/src/common/database.cpp
index b1acbe9..55fcb14 100644
--- a/src/common/database.cpp
+++ b/src/common/database.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * Copyright (C) 2009 Debarshi Ray <rishi gnu org>
+ * Copyright (C) 2009, 2010 Debarshi Ray <rishi gnu org>
  * Copyright (C) 2009 Santanu Sinha <santanu sinha gmail com>
  *
  * Solang is free software: you can redistribute it and/or modify it
@@ -41,8 +41,8 @@ namespace Solang
 class Comparator
 {
     public:
-        bool operator()  ( const PhotoSearchCriteriaPtr &lhs,
-                            const PhotoSearchCriteriaPtr &rhs )
+        bool operator()  ( const IPhotoSearchCriteriaPtr &lhs,
+                            const IPhotoSearchCriteriaPtr &rhs )
         {
             return lhs->get_id() < rhs->get_id();
         }
@@ -146,12 +146,13 @@ Database::save_async(const Tag & tag, const SlotAsyncReady & slot)
 }
 
 void
-Database::search_async(const PhotoSearchCriteriaList & criteria,
+Database::search_async(const IPhotoSearchCriteriaList & criteria,
                        const SlotAsyncPhotos & slot) const throw()
 {
     Glib::ustring clauses = "";
 
-    for (PhotoSearchCriteriaList::const_iterator it = criteria.begin();
+    for (IPhotoSearchCriteriaList::const_iterator it
+             = criteria.begin();
          criteria.end() != it;
          it++)
     {
diff --git a/src/common/database.h b/src/common/database.h
index 9e65e70..e10a226 100644
--- a/src/common/database.h
+++ b/src/common/database.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * Copyright (C) 2009 Debarshi Ray <rishi gnu org>
+ * Copyright (C) 2009, 2010 Debarshi Ray <rishi gnu org>
  * Copyright (C) 2009 Santanu Sinha <santanu sinha gmail com>
  *
  * Solang is free software: you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 #include <sigc++/sigc++.h>
 
-#include "photo-search-criteria.h"
+#include "i-photo-search-criteria.h"
 #include "tracker-client.h"
 #include "types.h"
 
@@ -86,7 +86,7 @@ class Database
                    throw();
 
         void
-        search_async(const PhotoSearchCriteriaList & criteria,
+        search_async(const IPhotoSearchCriteriaList & criteria,
                      const SlotAsyncPhotos & slot) const throw();
 
         //Group by year
diff --git a/src/common/exif-data-key.cpp b/src/common/exif-data-key.cpp
index f35c674..7ed2953 100644
--- a/src/common/exif-data-key.cpp
+++ b/src/common/exif-data-key.cpp
@@ -14,10 +14,10 @@ ExifDataKey::get_query_criteria() const throw()
     return Glib::ustring::compose("%1 '%2' .", key_, value_);
 }
 
-PhotoSearchCriteria::ClubbingOperationType
+IPhotoSearchCriteria::ClubbingOperationType
 ExifDataKey::get_clubbing_type() const throw()
 {
-    return PhotoSearchCriteria::CLUB_AND;
+    return IPhotoSearchCriteria::CLUB_AND;
 }
 
 gint32
diff --git a/src/common/exif-data-key.h b/src/common/exif-data-key.h
index 0517868..9fd534a 100644
--- a/src/common/exif-data-key.h
+++ b/src/common/exif-data-key.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
+ * Copyright (C) 2010 Debarshi Ray <rishi gnu org>
  * Copyright (C) 2009 Santanu Sinha <santanu sinha gmail com>
  *
  * Solang is free software: you can redistribute it and/or modify it
@@ -19,13 +20,13 @@
 #ifndef SOLANG_EXIF_DATA_KEY_H
 #define SOLANG_EXIF_DATA_KEY_H
 
-#include "photo-search-criteria.h"
+#include "i-photo-search-criteria.h"
 
 namespace Solang
 {
 
 class ExifDataKey :
-    public PhotoSearchCriteria
+    public IPhotoSearchCriteria
 {
     private:
         Glib::ustring title_;
diff --git a/src/common/photo-search-criteria.cpp b/src/common/i-photo-search-criteria.cpp
similarity index 82%
rename from src/common/photo-search-criteria.cpp
rename to src/common/i-photo-search-criteria.cpp
index 15e8a9a..fcc5945 100644
--- a/src/common/photo-search-criteria.cpp
+++ b/src/common/i-photo-search-criteria.cpp
@@ -1,5 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
+ * Copyright (C) 2010 Debarshi Ray <rishi gnu org>
  * Copyright (C) 2009 Santanu Sinha <santanu sinha gmail com>
  *
  * Solang is free software: you can redistribute it and/or modify it
@@ -20,16 +21,16 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include "photo-search-criteria.h"
+#include "i-photo-search-criteria.h"
 
 namespace Solang
 {
 
-PhotoSearchCriteria::PhotoSearchCriteria()
+IPhotoSearchCriteria::IPhotoSearchCriteria()
 {
 }
 
-PhotoSearchCriteria::~PhotoSearchCriteria() throw()
+IPhotoSearchCriteria::~IPhotoSearchCriteria() throw()
 {
 }
 
diff --git a/src/common/photo-search-criteria.h b/src/common/i-photo-search-criteria.h
similarity index 87%
rename from src/common/photo-search-criteria.h
rename to src/common/i-photo-search-criteria.h
index 7aa1ac9..6758406 100644
--- a/src/common/photo-search-criteria.h
+++ b/src/common/i-photo-search-criteria.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
+ * Copyright (C) 2010 Debarshi Ray <rishi gnu org>
  * Copyright (C) 2009 Santanu Sinha <santanu sinha gmail com>
  *
  * Solang is free software: you can redistribute it and/or modify it
@@ -16,8 +17,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SOLANG_PHOTO_SEARCH_CRITERIA_H
-#define SOLANG_PHOTO_SEARCH_CRITERIA_H
+#ifndef SOLANG_I_PHOTO_SEARCH_CRITERIA_H
+#define SOLANG_I_PHOTO_SEARCH_CRITERIA_H
 
 #include <tr1/memory>
 
@@ -29,7 +30,7 @@
 namespace Solang
 {
 
-class PhotoSearchCriteria :
+class IPhotoSearchCriteria :
     public NonCopyable
 {
     public:
@@ -41,11 +42,11 @@ class PhotoSearchCriteria :
                         //clubbed using "OR"
         };
     protected:
-        PhotoSearchCriteria();
+        IPhotoSearchCriteria();
 
     public:
         virtual
-        ~PhotoSearchCriteria() throw();
+        ~IPhotoSearchCriteria() throw();
 
         //Returns SQL formatted string that can be appended
         //in the where clause
@@ -64,9 +65,8 @@ class PhotoSearchCriteria :
 
         virtual Glib::ustring
         get_criteria_icon_path() const throw() = 0;
-
 };
 
 } // namespace Solang
 
-#endif // SOLANG_PHOTO_SEARCH_CRITERIA_H
+#endif // SOLANG_I_PHOTO_SEARCH_CRITERIA_H
diff --git a/src/common/types.h b/src/common/types.h
index 5d9df49..ad3aec0 100644
--- a/src/common/types.h
+++ b/src/common/types.h
@@ -202,13 +202,14 @@ typedef std::tr1::shared_ptr<Photo> PhotoPtr;
 typedef Photo * UnrefPhotoPtr;
 typedef std::vector<PhotoPtr> PhotoList;
 
-class PhotoSearchCriteria;
-typedef std::tr1::shared_ptr<const PhotoSearchCriteria>
-    ConstPhotoSearchCriteriaPtr;
-typedef std::tr1::shared_ptr<PhotoSearchCriteria>
-    PhotoSearchCriteriaPtr;
-typedef std::vector<PhotoSearchCriteriaPtr> PhotoSearchCriteriaList;
-typedef std::map<Glib::ustring,PhotoSearchCriteriaPtr> DragDropCriteriaMap;
+class IPhotoSearchCriteria;
+typedef std::tr1::shared_ptr<const IPhotoSearchCriteria>
+    ConstIPhotoSearchCriteriaPtr;
+typedef std::tr1::shared_ptr<IPhotoSearchCriteria>
+    IPhotoSearchCriteriaPtr;
+typedef std::vector<IPhotoSearchCriteriaPtr> IPhotoSearchCriteriaList;
+typedef std::map<Glib::ustring, IPhotoSearchCriteriaPtr>
+    DragDropCriteriaMap;
 
 class PixbufMaker;
 typedef std::tr1::shared_ptr<const PixbufMaker> ConstPixbufMakerPtr;
diff --git a/src/renderer/browser-renderer.cpp b/src/renderer/browser-renderer.cpp
index 83e03e0..6d8fd7d 100644
--- a/src/renderer/browser-renderer.cpp
+++ b/src/renderer/browser-renderer.cpp
@@ -35,7 +35,6 @@
 #include "i-renderer-selector.h"
 #include "main-window.h"
 #include "photo.h"
-#include "photo-search-criteria.h"
 #include "scale-action.h"
 
 namespace Solang
diff --git a/src/renderer/enlarged-renderer.cpp b/src/renderer/enlarged-renderer.cpp
index db33059..71e5c30 100644
--- a/src/renderer/enlarged-renderer.cpp
+++ b/src/renderer/enlarged-renderer.cpp
@@ -33,7 +33,6 @@
 #include "i-renderer-selector.h"
 #include "main-window.h"
 #include "photo.h"
-#include "photo-search-criteria.h"
 #include "pixbuf-maker.h"
 #include "types.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]