GNOME.org
 

[f-spot] Move all stores into the FSpot namespace.

commit e17d6c1383443768153ac76ead45f069eb3ead1d
Author: Ruben Vermeersch <ruben savanne be>
Date:   Mon Aug 9 14:18:35 2010 +0200

    Move all stores into the FSpot namespace.

 src/Clients/MainApp/{ => FSpot}/ExportStore.cs     |    2 ++
 src/Clients/MainApp/{ => FSpot}/JobStore.cs        |    2 ++
 src/Clients/MainApp/{ => FSpot}/MetaStore.cs       |    3 ++-
 src/Clients/MainApp/{ => FSpot}/PhotoStore.cs      |    2 ++
 src/Clients/MainApp/{ => FSpot}/RollStore.cs       |    3 ++-
 src/Clients/MainApp/{ => FSpot}/TagStore.cs        |    2 ++
 src/Clients/MainApp/MainApp.csproj                 |   12 ++++++------
 src/Clients/MainApp/Makefile.am                    |   12 ++++++------
 .../Exporters/TabbloExport/TabbloExport.cs         |    1 +
 9 files changed, 25 insertions(+), 14 deletions(-)
---
diff --git a/src/Clients/MainApp/ExportStore.cs b/src/Clients/MainApp/FSpot/ExportStore.cs
similarity index 99%
rename from src/Clients/MainApp/ExportStore.cs
rename to src/Clients/MainApp/FSpot/ExportStore.cs
index c81956b..7fbff5d 100644
--- a/src/Clients/MainApp/ExportStore.cs
+++ b/src/Clients/MainApp/FSpot/ExportStore.cs
@@ -9,6 +9,7 @@ using FSpot.Core;
 using FSpot.Database;
 using Hyena.Data.Sqlite;
 
+namespace FSpot {
 public class ExportItem : DbItem {
 
     private uint image_id;
@@ -146,3 +147,4 @@ public class ExportStore : DbStore<ExportItem> {
 			LoadAllItems ();
 	}
 }
+}
diff --git a/src/Clients/MainApp/JobStore.cs b/src/Clients/MainApp/FSpot/JobStore.cs
similarity index 99%
rename from src/Clients/MainApp/JobStore.cs
rename to src/Clients/MainApp/FSpot/JobStore.cs
index 755cc30..7fc11ab 100644
--- a/src/Clients/MainApp/JobStore.cs
+++ b/src/Clients/MainApp/FSpot/JobStore.cs
@@ -21,6 +21,7 @@ using Hyena;
 
 using Hyena.Data.Sqlite;
 
+namespace FSpot {
 public abstract class Job : DbItem, IJob
 {
 	public Job (uint id, string job_options, JobPriority job_priority, DateTime run_at, bool persistent) : base (id)
@@ -211,3 +212,4 @@ public class JobStore : DbStore<Job> {
                 }
 	}
 }
+}
\ No newline at end of file
diff --git a/src/Clients/MainApp/MetaStore.cs b/src/Clients/MainApp/FSpot/MetaStore.cs
similarity index 99%
rename from src/Clients/MainApp/MetaStore.cs
rename to src/Clients/MainApp/FSpot/MetaStore.cs
index ee6a725..cc9847f 100644
--- a/src/Clients/MainApp/MetaStore.cs
+++ b/src/Clients/MainApp/FSpot/MetaStore.cs
@@ -9,7 +9,7 @@ using FSpot.Core;
 using FSpot.Database;
 using Hyena.Data.Sqlite;
 
-
+namespace FSpot {
 public class MetaItem : DbItem {
 	private string name;
 	public string Name {
@@ -162,3 +162,4 @@ public class MetaStore : DbStore<MetaItem> {
 			LoadAllItems ();
 	}
 }
+}
\ No newline at end of file
diff --git a/src/Clients/MainApp/PhotoStore.cs b/src/Clients/MainApp/FSpot/PhotoStore.cs
similarity index 99%
rename from src/Clients/MainApp/PhotoStore.cs
rename to src/Clients/MainApp/FSpot/PhotoStore.cs
index fd1eb96..ad88899 100644
--- a/src/Clients/MainApp/PhotoStore.cs
+++ b/src/Clients/MainApp/FSpot/PhotoStore.cs
@@ -32,6 +32,7 @@ using FSpot.Platform;
 using Hyena;
 using Hyena.Data.Sqlite;
 
+namespace FSpot {
 public class PhotoStore : DbStore<Photo> {
 	public int TotalPhotos {
 		get {
@@ -923,3 +924,4 @@ public class PhotoStore : DbStore<Photo> {
 		return Query (query_builder.ToString ());
 	}
 }
+}
\ No newline at end of file
diff --git a/src/Clients/MainApp/RollStore.cs b/src/Clients/MainApp/FSpot/RollStore.cs
similarity index 99%
rename from src/Clients/MainApp/RollStore.cs
rename to src/Clients/MainApp/FSpot/RollStore.cs
index 4dce7a5..b4dd0d1 100644
--- a/src/Clients/MainApp/RollStore.cs
+++ b/src/Clients/MainApp/FSpot/RollStore.cs
@@ -23,7 +23,7 @@ using Hyena;
 
 using Hyena.Data.Sqlite;
 
-
+namespace FSpot {
 public class RollStore : DbStore<Roll>
 {
 	public RollStore (FSpotDatabaseConnection database, bool is_new) : base (database, false)
@@ -122,3 +122,4 @@ public class RollStore : DbStore<Roll>
 		return (Roll []) list.ToArray (typeof (Roll));
 	}
 }
+}
\ No newline at end of file
diff --git a/src/Clients/MainApp/TagStore.cs b/src/Clients/MainApp/FSpot/TagStore.cs
similarity index 99%
rename from src/Clients/MainApp/TagStore.cs
rename to src/Clients/MainApp/FSpot/TagStore.cs
index 4fb50ad..958eecf 100644
--- a/src/Clients/MainApp/TagStore.cs
+++ b/src/Clients/MainApp/FSpot/TagStore.cs
@@ -16,6 +16,7 @@ using Hyena;
 
 using Hyena.Data.Sqlite;
 
+namespace FSpot {
 public class InvalidTagOperationException : InvalidOperationException {
 	public Tag tag;
 
@@ -393,3 +394,4 @@ public class TagStore : DbStore<Tag> {
 		EmitChanged (tags);
 	}
 }
+}
\ No newline at end of file
diff --git a/src/Clients/MainApp/MainApp.csproj b/src/Clients/MainApp/MainApp.csproj
index ecaf8e6..0a8f5db 100644
--- a/src/Clients/MainApp/MainApp.csproj
+++ b/src/Clients/MainApp/MainApp.csproj
@@ -35,7 +35,6 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Compile Include="DependentListStore.cs" />
-    <Compile Include="ExportStore.cs" />
     <Compile Include="FSpot\Accelerometer.cs" />
     <Compile Include="FSpot\App.cs" />
     <Compile Include="FSpot\BitConverter.cs" />
@@ -198,18 +197,19 @@
     <Compile Include="FSpot.Widgets\Wipe.cs" />
     <Compile Include="FSpot\XScreenSaverSlide.cs" />
     <Compile Include="ImageLoaderThread.cs" />
-    <Compile Include="JobStore.cs" />
-    <Compile Include="MetaStore.cs" />
-    <Compile Include="PhotoStore.cs" />
     <Compile Include="PhotoTagMenu.cs" />
     <Compile Include="PhotoVersionCommands.cs" />
     <Compile Include="PhotoVersionMenu.cs" />
     <Compile Include="PixbufUtils.cs" />
-    <Compile Include="RollStore.cs" />
     <Compile Include="TagCommands.cs" />
     <Compile Include="TagPopup.cs" />
-    <Compile Include="TagStore.cs" />
     <Compile Include="ThumbnailCommand.cs" />
+    <Compile Include="FSpot\ExportStore.cs" />
+    <Compile Include="FSpot\JobStore.cs" />
+    <Compile Include="FSpot\MetaStore.cs" />
+    <Compile Include="FSpot\PhotoStore.cs" />
+    <Compile Include="FSpot\RollStore.cs" />
+    <Compile Include="FSpot\TagStore.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\..\..\COPYING">
diff --git a/src/Clients/MainApp/Makefile.am b/src/Clients/MainApp/Makefile.am
index f5a20a0..ea2d054 100644
--- a/src/Clients/MainApp/Makefile.am
+++ b/src/Clients/MainApp/Makefile.am
@@ -5,7 +5,6 @@ ASSEMBLY_BUILD_FLAGS = -unsafe
 
 SOURCES =  \
 	DependentListStore.cs \
-	ExportStore.cs \
 	FSpot.ColorAdjustment/Adjustment.cs \
 	FSpot.ColorAdjustment/AutoStretch.cs \
 	FSpot.ColorAdjustment/Desaturate.cs \
@@ -129,6 +128,7 @@ SOURCES =  \
 	FSpot/ColorManagement.cs \
 	FSpot/ControlOverlay.cs \
 	FSpot/DragDropTargets.cs \
+	FSpot/ExportStore.cs \
 	FSpot/Fader.cs \
 	FSpot/FolderQueryWidget.cs \
 	FSpot/FullScreenView.cs \
@@ -137,15 +137,18 @@ SOURCES =  \
 	FSpot/Histogram.cs \
 	FSpot/InfoOverlay.cs \
 	FSpot/ItemAction.cs \
+	FSpot/JobStore.cs \
 	FSpot/main.cs \
 	FSpot/MainWindow.cs \
 	FSpot/MemorySurface.cs \
+	FSpot/MetaStore.cs \
 	FSpot/Photo.cs \
 	FSpot/PhotoEventArgs.cs \
 	FSpot/PhotoList.cs \
 	FSpot/PhotoLoader.cs \
 	FSpot/PhotoPopup.cs \
 	FSpot/PhotoQuery.cs \
+	FSpot/PhotoStore.cs \
 	FSpot/PhotoVersion.cs \
 	FSpot/PhotoView.cs \
 	FSpot/PixbufCache.cs \
@@ -153,12 +156,14 @@ SOURCES =  \
 	FSpot/PrintOperation.cs \
 	FSpot/ProgressItem.cs \
 	FSpot/QueryWidget.cs \
+	FSpot/RollStore.cs \
 	FSpot/RotateCommand.cs \
 	FSpot/SelectionDataExtensions.cs \
 	FSpot/SendEmail.cs \
 	FSpot/SingleView.cs \
 	FSpot/TagQueryWidget.cs \
 	FSpot/TagSelectionWidget.cs \
+	FSpot/TagStore.cs \
 	FSpot/Term.cs \
 	FSpot/ThumbnailCache.cs \
 	FSpot/ThumbnailGenerator.cs \
@@ -168,17 +173,12 @@ SOURCES =  \
 	FSpot/Vector.cs \
 	FSpot/XScreenSaverSlide.cs \
 	ImageLoaderThread.cs \
-	JobStore.cs \
-	MetaStore.cs \
-	PhotoStore.cs \
 	PhotoTagMenu.cs \
 	PhotoVersionCommands.cs \
 	PhotoVersionMenu.cs \
 	PixbufUtils.cs \
-	RollStore.cs \
 	TagCommands.cs \
 	TagPopup.cs \
-	TagStore.cs \
 	ThumbnailCommand.cs
 
 RESOURCES =  \
diff --git a/src/Extensions/Exporters/TabbloExport/TabbloExport.cs b/src/Extensions/Exporters/TabbloExport/TabbloExport.cs
index da96cd8..aad9ee7 100644
--- a/src/Extensions/Exporters/TabbloExport/TabbloExport.cs
+++ b/src/Extensions/Exporters/TabbloExport/TabbloExport.cs
@@ -37,6 +37,7 @@ using System.Net;
 using System.Threading;
 
 using Hyena;
+using FSpot;
 using FSpot.Core;
 using FSpot.UI.Dialog;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]