GNOME.org
 

niepce r16 - in trunk: . doc src src/db src/engine src/engine/db src/engine/library src/library src/libraryclient src/niepce src/niepce/modules/darkroom src/niepce/ui src/niepce/ui/thumb-view

Author: hub
Date: Wed Feb 11 09:09:20 2009
New Revision: 16
URL: http://svn.gnome.org/viewvc/niepce?rev=16&view=rev

Log:
	* src/db -> src/engine/db
	* src/library -> src/engine/library
	move to engine subdir.



Added:
   trunk/src/engine/   (props changed)
   trunk/src/engine/Makefile.am
   trunk/src/engine/db/   (props changed)
      - copied from r15, /trunk/src/db/
   trunk/src/engine/library/   (props changed)
      - copied from r15, /trunk/src/library/
Removed:
   trunk/src/db/
   trunk/src/library/
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/doc/code-organization.txt
   trunk/src/Makefile.am
   trunk/src/engine/db/libfile.h
   trunk/src/engine/db/libmetadata.h
   trunk/src/engine/db/library.h
   trunk/src/engine/db/storage.h
   trunk/src/engine/library/commands.cpp
   trunk/src/engine/library/commands.h
   trunk/src/engine/library/op.h
   trunk/src/engine/library/thumbnailcache.h
   trunk/src/libraryclient/clientimpl.cpp
   trunk/src/libraryclient/clientimpl.h
   trunk/src/libraryclient/libraryclient.h
   trunk/src/libraryclient/locallibraryserver.h
   trunk/src/niepce/Makefile.am
   trunk/src/niepce/modules/darkroom/darkroommodule.h
   trunk/src/niepce/ui/filmstripcontroller.cpp
   trunk/src/niepce/ui/imageliststore.cpp
   trunk/src/niepce/ui/imageliststore.h
   trunk/src/niepce/ui/librarycellrenderer.h
   trunk/src/niepce/ui/librarymainviewcontroller.cpp
   trunk/src/niepce/ui/librarymainviewcontroller.h
   trunk/src/niepce/ui/niepcewindow.cpp
   trunk/src/niepce/ui/selectioncontroller.cpp
   trunk/src/niepce/ui/thumb-view/eog-thumb-view.cpp
   trunk/src/niepce/ui/thumb-view/eog-thumb-view.h
   trunk/src/niepce/ui/workspacecontroller.cpp
   trunk/src/niepce/ui/workspacecontroller.h

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Feb 11 09:09:20 2009
@@ -172,8 +172,9 @@
 src/fwk/utils/db/Makefile
 src/fwk/utils/db/sqlite/Makefile
 src/fwk/toolkit/Makefile
-src/db/Makefile
-src/library/Makefile
+src/engine/Makefile
+src/engine/db/Makefile
+src/engine/library/Makefile
 src/libraryclient/Makefile
 src/ncr/Makefile
 po/Makefile.in

Modified: trunk/doc/code-organization.txt
==============================================================================
--- trunk/doc/code-organization.txt	(original)
+++ trunk/doc/code-organization.txt	Wed Feb 11 09:09:20 2009
@@ -14,9 +14,10 @@
 	           sqlite3.
         * toolkit - the UI toolkit (Gtkmm based)
             * widgets - reusable widgets
-    * db - the database storage
-    * library - the library ("server" side). Relies on DB
-                for the data storage.
+    * engine - the backend engine
+        * db - the database storage
+        * library - the library ("server" side). Relies on DB
+                    for the data storage.
     * libraryclient - the library client
     * ncr - Niepce Camera RAW: the RAW processing engine
     * niepce - The application

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Wed Feb 11 09:09:20 2009
@@ -2,4 +2,4 @@
 AM_CPPFLAGS = -DNIEPCE_LOCALEDIR=\"${NIEPCE_LOCALEDIR}\"
 
 SUBDIRS = ext fwk \
-	db library libraryclient ncr niepce
+	engine libraryclient ncr niepce

Added: trunk/src/engine/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/engine/Makefile.am	Wed Feb 11 09:09:20 2009
@@ -0,0 +1,3 @@
+
+
+SUBDIRS = db library
\ No newline at end of file

Modified: trunk/src/engine/db/libfile.h
==============================================================================
--- /trunk/src/db/libfile.h	(original)
+++ trunk/src/engine/db/libfile.h	Wed Feb 11 09:09:20 2009
@@ -26,9 +26,9 @@
 #include <boost/filesystem/path.hpp>
 
 #include "fwk/toolkit/mimetype.h"
-#include "db/keyword.h"
-#include "db/storage.h"
-#include "db/fsfile.h"
+#include "engine/db/keyword.h"
+#include "engine/db/storage.h"
+#include "engine/db/fsfile.h"
 
 namespace db {
 

Modified: trunk/src/engine/db/libmetadata.h
==============================================================================
--- /trunk/src/db/libmetadata.h	(original)
+++ trunk/src/engine/db/libmetadata.h	Wed Feb 11 09:09:20 2009
@@ -26,7 +26,7 @@
 #include <boost/any.hpp>
 
 #include "fwk/utils/exempi.h"
-#include "db/metadata.h"
+#include "engine/db/metadata.h"
 
 namespace db {
 

Modified: trunk/src/engine/db/library.h
==============================================================================
--- /trunk/src/db/library.h	(original)
+++ trunk/src/engine/db/library.h	Wed Feb 11 09:09:20 2009
@@ -32,10 +32,10 @@
 #include "fwk/toolkit/notificationcenter.h"
 #include "fwk/utils/db/iconnectiondriver.h"
 #include "fwk/utils/db/iconnectionmanagerdriver.h"
-#include "db/libfolder.h"
-#include "db/libfile.h"
-#include "db/libmetadata.h"
-#include "db/keyword.h"
+#include "engine/db/libfolder.h"
+#include "engine/db/libfile.h"
+#include "engine/db/libmetadata.h"
+#include "engine/db/keyword.h"
 
 // The database schema version. Increase at each change.
 // Some will be persistent and have a conversion TBD.

Modified: trunk/src/engine/db/storage.h
==============================================================================
--- /trunk/src/db/storage.h	(original)
+++ trunk/src/engine/db/storage.h	Wed Feb 11 09:09:20 2009
@@ -23,7 +23,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "db/keyword.h"
+#include "engine/db/keyword.h"
 
 namespace db {
 
@@ -40,4 +40,14 @@
 
 }
 
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+
 #endif

Modified: trunk/src/engine/library/commands.cpp
==============================================================================
--- /trunk/src/library/commands.cpp	(original)
+++ trunk/src/engine/library/commands.cpp	Wed Feb 11 09:09:20 2009
@@ -25,11 +25,11 @@
 
 
 #include "fwk/utils/debug.h"
-#include "db/library.h"
-#include "db/libfolder.h"
-#include "db/libfile.h"
-#include "db/libmetadata.h"
-#include "db/keyword.h"
+#include "engine/db/library.h"
+#include "engine/db/libfolder.h"
+#include "engine/db/libfile.h"
+#include "engine/db/libmetadata.h"
+#include "engine/db/keyword.h"
 #include "commands.h"
 
 namespace bfs = boost::filesystem;

Modified: trunk/src/engine/library/commands.h
==============================================================================
--- /trunk/src/library/commands.h	(original)
+++ trunk/src/engine/library/commands.h	Wed Feb 11 09:09:20 2009
@@ -24,7 +24,7 @@
 
 #include "op.h"
 #include "fwk/utils/files.h"
-#include "db/library.h"
+#include "engine/db/library.h"
 
 namespace library {
 

Modified: trunk/src/engine/library/op.h
==============================================================================
--- /trunk/src/library/op.h	(original)
+++ trunk/src/engine/library/op.h	Wed Feb 11 09:09:20 2009
@@ -24,8 +24,8 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 
-#include "library/clienttypes.h"
-#include "db/library.h"
+#include "engine/library/clienttypes.h"
+#include "engine/db/library.h"
 
 namespace library {
 

Modified: trunk/src/engine/library/thumbnailcache.h
==============================================================================
--- /trunk/src/library/thumbnailcache.h	(original)
+++ trunk/src/engine/library/thumbnailcache.h	Wed Feb 11 09:09:20 2009
@@ -26,7 +26,7 @@
 
 #include "fwk/utils/worker.h"
 #include "fwk/toolkit/notificationcenter.h"
-#include "db/libfile.h"
+#include "engine/db/libfile.h"
 
 namespace library {
 

Modified: trunk/src/libraryclient/clientimpl.cpp
==============================================================================
--- trunk/src/libraryclient/clientimpl.cpp	(original)
+++ trunk/src/libraryclient/clientimpl.cpp	Wed Feb 11 09:09:20 2009
@@ -20,8 +20,8 @@
 
 #include "fwk/utils/debug.h"
 #include "fwk/utils/files.h"
-#include "library/op.h"
-#include "library/commands.h"
+#include "engine/library/op.h"
+#include "engine/library/commands.h"
 #include "libraryclient.h"
 #include "clientimpl.h"
 #include "locallibraryserver.h"

Modified: trunk/src/libraryclient/clientimpl.h
==============================================================================
--- trunk/src/libraryclient/clientimpl.h	(original)
+++ trunk/src/libraryclient/clientimpl.h	Wed Feb 11 09:09:20 2009
@@ -24,7 +24,7 @@
 #include <string>
 
 #include "fwk/utils/moniker.h"
-#include "library/clienttypes.h"
+#include "engine/library/clienttypes.h"
 
 
 namespace libraryclient {

Modified: trunk/src/libraryclient/libraryclient.h
==============================================================================
--- trunk/src/libraryclient/libraryclient.h	(original)
+++ trunk/src/libraryclient/libraryclient.h	Wed Feb 11 09:09:20 2009
@@ -23,9 +23,9 @@
 #include <string>
 #include <boost/shared_ptr.hpp>
 
-#include "library/clienttypes.h"
-#include "library/thumbnailcache.h"
-#include "db/storage.h"
+#include "engine/library/clienttypes.h"
+#include "engine/library/thumbnailcache.h"
+#include "engine/db/storage.h"
 
 namespace utils {
 	class Moniker;

Modified: trunk/src/libraryclient/locallibraryserver.h
==============================================================================
--- trunk/src/libraryclient/locallibraryserver.h	(original)
+++ trunk/src/libraryclient/locallibraryserver.h	Wed Feb 11 09:09:20 2009
@@ -25,8 +25,8 @@
 #define _LIBRARYCLIENT_LOCALLIBRARYSERVER_H_
 
 #include "fwk/utils/worker.h"
-#include "library/op.h"
-#include "db/library.h"
+#include "engine/library/op.h"
+#include "engine/db/library.h"
 
 namespace libraryclient {
 

Modified: trunk/src/niepce/Makefile.am
==============================================================================
--- trunk/src/niepce/Makefile.am	(original)
+++ trunk/src/niepce/Makefile.am	Wed Feb 11 09:09:20 2009
@@ -11,12 +11,12 @@
 niepce_LDFLAGS = -Wl,--as-needed @BOOST_FILESYSTEM_LDFLAGS@ \
 	@BOOST_THREAD_LDFLAGS@ @BOOST_SIGNALS_LDFLAGS@
 niepce_LDADD = \
-	$(top_builddir)/src/db/libniepcedb.a \
+	$(top_builddir)/src/engine/db/libniepcedb.a \
 	$(top_builddir)/src/niepce/ui/libniepceui.a \
-	$(top_builddir)/src/library/libniepcelibrary.a \
+	$(top_builddir)/src/engine/library/libniepcelibrary.a \
 	$(top_builddir)/src/libraryclient/liblibraryclient.a \
-	$(top_builddir)/src/library/libniepcelibrary.a \
-	$(top_builddir)/src/db/libniepcedb.a \
+	$(top_builddir)/src/engine/library/libniepcelibrary.a \
+	$(top_builddir)/src/engine/db/libniepcedb.a \
 	$(top_builddir)/src/niepce/modules/darkroom/libmoduledarkroom.a \
 	$(top_builddir)/src/fwk/toolkit/libniepceframework.a \
 	$(top_builddir)/src/fwk/utils/libniepceutils.a \

Modified: trunk/src/niepce/modules/darkroom/darkroommodule.h
==============================================================================
--- trunk/src/niepce/modules/darkroom/darkroommodule.h	(original)
+++ trunk/src/niepce/modules/darkroom/darkroommodule.h	Wed Feb 11 09:09:20 2009
@@ -30,7 +30,7 @@
 #include <gtkmm/scrolledwindow.h>
 
 #include "fwk/toolkit/controller.h"
-#include "db/libfile.h"
+#include "engine/db/libfile.h"
 #include "libraryclient/libraryclient.h"
 #include "ncr/image.h"
 #include "modules/darkroom/imagecanvas.h"

Modified: trunk/src/niepce/ui/filmstripcontroller.cpp
==============================================================================
--- trunk/src/niepce/ui/filmstripcontroller.cpp	(original)
+++ trunk/src/niepce/ui/filmstripcontroller.cpp	Wed Feb 11 09:09:20 2009
@@ -21,8 +21,8 @@
 #include <gtkmm/iconview.h>
 
 #include "niepce/notifications.h"
-#include "db/library.h"
-#include "library/thumbnailnotification.h"
+#include "engine/db/library.h"
+#include "engine/library/thumbnailnotification.h"
 #include "fwk/utils/debug.h"
 
 #include "eog-thumb-nav.h"

Modified: trunk/src/niepce/ui/imageliststore.cpp
==============================================================================
--- trunk/src/niepce/ui/imageliststore.cpp	(original)
+++ trunk/src/niepce/ui/imageliststore.cpp	Wed Feb 11 09:09:20 2009
@@ -24,8 +24,8 @@
 #include "fwk/toolkit/application.h"
 #include "fwk/toolkit/gdkutils.h"
 #include "niepce/notifications.h"
-#include "db/library.h"
-#include "library/thumbnailnotification.h"
+#include "engine/db/library.h"
+#include "engine/library/thumbnailnotification.h"
 #include "niepcewindow.h"
 
 namespace ui {

Modified: trunk/src/niepce/ui/imageliststore.h
==============================================================================
--- trunk/src/niepce/ui/imageliststore.h	(original)
+++ trunk/src/niepce/ui/imageliststore.h	Wed Feb 11 09:09:20 2009
@@ -28,7 +28,7 @@
 
 #include "fwk/toolkit/notification.h"
 #include "fwk/toolkit/controller.h"
-#include "db/libfile.h"
+#include "engine/db/libfile.h"
 #include "libraryclient/libraryclient.h"
 
 namespace ui {

Modified: trunk/src/niepce/ui/librarycellrenderer.h
==============================================================================
--- trunk/src/niepce/ui/librarycellrenderer.h	(original)
+++ trunk/src/niepce/ui/librarycellrenderer.h	Wed Feb 11 09:09:20 2009
@@ -25,7 +25,7 @@
 #include <gtkmm/cellrendererpixbuf.h>
 #include <cairomm/surface.h>
 
-#include "db/libfile.h"
+#include "engine/db/libfile.h"
 
 namespace ui {
 

Modified: trunk/src/niepce/ui/librarymainviewcontroller.cpp
==============================================================================
--- trunk/src/niepce/ui/librarymainviewcontroller.cpp	(original)
+++ trunk/src/niepce/ui/librarymainviewcontroller.cpp	Wed Feb 11 09:09:20 2009
@@ -28,7 +28,7 @@
 
 #include "fwk/utils/debug.h"
 #include "niepce/notifications.h"
-#include "db/library.h"
+#include "engine/db/library.h"
 #include "fwk/toolkit/application.h"
 #include "fwk/toolkit/widgets/dock.h"
 #include "librarymainviewcontroller.h"

Modified: trunk/src/niepce/ui/librarymainviewcontroller.h
==============================================================================
--- trunk/src/niepce/ui/librarymainviewcontroller.h	(original)
+++ trunk/src/niepce/ui/librarymainviewcontroller.h	Wed Feb 11 09:09:20 2009
@@ -29,7 +29,7 @@
 #include <gtkmm/paned.h>
 
 #include "librarymainview.h"
-#include "db/libfile.h"
+#include "engine/db/libfile.h"
 #include "libraryclient/libraryclient.h"
 #include "fwk/toolkit/controller.h"
 #include "fwk/toolkit/notification.h"

Modified: trunk/src/niepce/ui/niepcewindow.cpp
==============================================================================
--- trunk/src/niepce/ui/niepcewindow.cpp	(original)
+++ trunk/src/niepce/ui/niepcewindow.cpp	Wed Feb 11 09:09:20 2009
@@ -35,7 +35,7 @@
 #include "fwk/utils/debug.h"
 #include "fwk/utils/moniker.h"
 #include "fwk/utils/boost.h"
-#include "db/library.h"
+#include "engine/db/library.h"
 #include "libraryclient/libraryclient.h"
 #include "fwk/toolkit/application.h"
 #include "fwk/toolkit/configuration.h"

Modified: trunk/src/niepce/ui/selectioncontroller.cpp
==============================================================================
--- trunk/src/niepce/ui/selectioncontroller.cpp	(original)
+++ trunk/src/niepce/ui/selectioncontroller.cpp	Wed Feb 11 09:09:20 2009
@@ -27,7 +27,7 @@
 #include "fwk/toolkit/undo.h"
 #include "fwk/toolkit/command.h"
 #include "fwk/toolkit/application.h"
-#include "db/metadata.h"
+#include "engine/db/metadata.h"
 #include "libraryclient/libraryclient.h"
 #include "niepcewindow.h"
 #include "selectioncontroller.h"

Modified: trunk/src/niepce/ui/thumb-view/eog-thumb-view.cpp
==============================================================================
--- trunk/src/niepce/ui/thumb-view/eog-thumb-view.cpp	(original)
+++ trunk/src/niepce/ui/thumb-view/eog-thumb-view.cpp	Wed Feb 11 09:09:20 2009
@@ -40,7 +40,7 @@
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
 
 #include "fwk/utils/boost.h"
-#include "db/libfile.h"
+#include "engine/db/libfile.h"
 
 #define EOG_THUMB_VIEW_SPACING 0
 

Modified: trunk/src/niepce/ui/thumb-view/eog-thumb-view.h
==============================================================================
--- trunk/src/niepce/ui/thumb-view/eog-thumb-view.h	(original)
+++ trunk/src/niepce/ui/thumb-view/eog-thumb-view.h	Wed Feb 11 09:09:20 2009
@@ -23,12 +23,12 @@
 #define EOG_THUMB_VIEW_H
 
 #include <gtk/gtkiconview.h>
-#include "ui/imageliststore.h"
+#include "niepce/ui/imageliststore.h"
 
 /*#include "eog-image.h"*/
 //#include "eog-list-store.h"
 
-#include "db/libfile.h"
+#include "engine/db/libfile.h"
 
 G_BEGIN_DECLS
 

Modified: trunk/src/niepce/ui/workspacecontroller.cpp
==============================================================================
--- trunk/src/niepce/ui/workspacecontroller.cpp	(original)
+++ trunk/src/niepce/ui/workspacecontroller.cpp	Wed Feb 11 09:09:20 2009
@@ -27,7 +27,7 @@
 
 #include "fwk/utils/debug.h"
 #include "niepce/notifications.h"
-#include "db/library.h" // FIXME uh oh. this shouldn't be
+#include "engine/db/library.h" // FIXME uh oh. this shouldn't be
 #include "libraryclient/libraryclient.h"
 #include "fwk/toolkit/application.h"
 #include "niepcewindow.h"

Modified: trunk/src/niepce/ui/workspacecontroller.h
==============================================================================
--- trunk/src/niepce/ui/workspacecontroller.h	(original)
+++ trunk/src/niepce/ui/workspacecontroller.h	Wed Feb 11 09:09:20 2009
@@ -31,7 +31,7 @@
 #include <gtkmm/label.h>
 #include <gtkmm/treestore.h>
 
-#include "db/libfolder.h"
+#include "engine/db/libfolder.h"
 #include "fwk/toolkit/controller.h"
 #include "fwk/toolkit/notification.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]