f-spot r3626 - in trunk/src: . Core Widgets

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Sat Feb  2 13:44:38 2008
New Revision: 3626
URL: http://svn.gnome.org/viewvc/f-spot?rev=3626&view=rev

Log:
fixing some gendarme warnings

Modified:
   trunk/src/Core/BrowsablePointer.cs
   trunk/src/Core/DbItem.cs
   trunk/src/Core/IBrowsableCollection.cs
   trunk/src/ExportStore.cs
   trunk/src/FileImportBackend.cs
   trunk/src/JobStore.cs
   trunk/src/MainWindow.cs
   trunk/src/MetaStore.cs
   trunk/src/PhotoArray.cs
   trunk/src/PhotoQuery.cs
   trunk/src/Widgets/IconView.cs

Modified: trunk/src/Core/BrowsablePointer.cs
==============================================================================
--- trunk/src/Core/BrowsablePointer.cs	(original)
+++ trunk/src/Core/BrowsablePointer.cs	Sat Feb  2 13:44:38 2008
@@ -133,7 +133,7 @@
 		}
 
 		protected void HandleCollectionItemsChanged (IBrowsableCollection collection,
-							     BrowsableArgs event_args)
+							     BrowsableEventArgs event_args)
 		{
 			foreach (int item in event_args.Items)
 				if (item == Index) 

Modified: trunk/src/Core/DbItem.cs
==============================================================================
--- trunk/src/Core/DbItem.cs	(original)
+++ trunk/src/Core/DbItem.cs	Sat Feb  2 13:44:38 2008
@@ -4,16 +4,19 @@
  * Author(s):
  *	Larry Ewing
  *
- * This is fre software. See COPYING for details.
+ * This is free software. See COPYING for details.
  */
 
-public class DbItem {
-	uint id;
-	public uint Id {
-		get { return id; }
-	}
-
-	protected DbItem (uint id) {
-		this.id = id;
+namespace FSpot
+{
+	public class DbItem {
+		uint id;
+		public uint Id {
+			get { return id; }
+		}
+	
+		protected DbItem (uint id) {
+			this.id = id;
+		}
 	}
 }

Modified: trunk/src/Core/IBrowsableCollection.cs
==============================================================================
--- trunk/src/Core/IBrowsableCollection.cs	(original)
+++ trunk/src/Core/IBrowsableCollection.cs	Sat Feb  2 13:44:38 2008
@@ -10,21 +10,21 @@
 namespace FSpot
 {
 	public delegate void IBrowsableCollectionChangedHandler (IBrowsableCollection collection);
-	public delegate void IBrowsableCollectionItemsChangedHandler (IBrowsableCollection collection, BrowsableArgs args);
+	public delegate void IBrowsableCollectionItemsChangedHandler (IBrowsableCollection collection, BrowsableEventArgs args);
 
-	public class BrowsableArgs : System.EventArgs {
+	public class BrowsableEventArgs : System.EventArgs {
 		int [] items;
 
 		public int [] Items {
 			get { return items; }
 		}
 
-		public BrowsableArgs (int num)
+		public BrowsableEventArgs (int num)
 		{
 			items = new int [] { num };
 		}
 
-		public BrowsableArgs (int [] items)
+		public BrowsableEventArgs (int [] items)
 		{
 			this.items = items;
 		}

Modified: trunk/src/ExportStore.cs
==============================================================================
--- trunk/src/ExportStore.cs	(original)
+++ trunk/src/ExportStore.cs	Sat Feb  2 13:44:38 2008
@@ -6,6 +6,7 @@
 using System.IO;
 using System;
 using Banshee.Database;
+using FSpot;
 
 public class ExportItem : DbItem {
 

Modified: trunk/src/FileImportBackend.cs
==============================================================================
--- trunk/src/FileImportBackend.cs	(original)
+++ trunk/src/FileImportBackend.cs	Sat Feb  2 13:44:38 2008
@@ -8,7 +8,6 @@
 using FSpot.UI.Dialog;
 using System.IO;
 using Mono.Unix;
-using FSpot;
 
 public class ImportException : System.Exception {
 	public ImportException (string msg) : base (msg)

Modified: trunk/src/JobStore.cs
==============================================================================
--- trunk/src/JobStore.cs	(original)
+++ trunk/src/JobStore.cs	Sat Feb  2 13:44:38 2008
@@ -16,6 +16,7 @@
 using Banshee.Kernel;
 using FSpot.Jobs;
 using FSpot.Utils;
+using FSpot;
 
 public abstract class Job : DbItem, IJob
 {

Modified: trunk/src/MainWindow.cs
==============================================================================
--- trunk/src/MainWindow.cs	(original)
+++ trunk/src/MainWindow.cs	Sat Feb  2 13:44:38 2008
@@ -693,7 +693,7 @@
 			}
 		}
 
-		private void HandleQueryItemsChanged (IBrowsableCollection collection, BrowsableArgs args)
+		private void HandleQueryItemsChanged (IBrowsableCollection collection, BrowsableEventArgs args)
 		{
 			// FIXME for now we only listen to changes directly from the query
 			// when we are in PhotoView mode because we presume that we'll get
@@ -703,7 +703,7 @@
 
 			foreach (int item in args.Items) {
 				if (win.photo_view.Item.Index == item ) {
-					ItemsChanged (this, new BrowsableArgs (0));
+					ItemsChanged (this, new BrowsableEventArgs (0));
 					break;
 				}
 			}
@@ -723,7 +723,7 @@
 
 		}
 
-		private void HandleSelectionItemsChanged (IBrowsableCollection collection,  BrowsableArgs args)
+		private void HandleSelectionItemsChanged (IBrowsableCollection collection,  BrowsableEventArgs args)
 		{
 			if (win.view_mode == ModeType.IconView && ItemsChanged != null)
 				ItemsChanged (this, args);
@@ -744,7 +744,7 @@
 		UpdateStatusLabel();	
 	}
 
-	private void HandleSelectionItemsChanged (IBrowsableCollection collection, BrowsableArgs args)
+	private void HandleSelectionItemsChanged (IBrowsableCollection collection, BrowsableEventArgs args)
 	{
 		UpdateMenus ();
 		UpdateTagEntryFromSelection ();

Modified: trunk/src/MetaStore.cs
==============================================================================
--- trunk/src/MetaStore.cs	(original)
+++ trunk/src/MetaStore.cs	Sat Feb  2 13:44:38 2008
@@ -6,6 +6,7 @@
 using System.IO;
 using System;
 using Banshee.Database;
+using FSpot;
 
 public class MetaItem : DbItem {
 	private string name;

Modified: trunk/src/PhotoArray.cs
==============================================================================
--- trunk/src/PhotoArray.cs	(original)
+++ trunk/src/PhotoArray.cs	Sat Feb  2 13:44:38 2008
@@ -80,10 +80,10 @@
 		
 		public void MarkChanged (int num)
 		{
-			MarkChanged (new BrowsableArgs (num));
+			MarkChanged (new BrowsableEventArgs (num));
 		}
 
-		public void MarkChanged (BrowsableArgs args)
+		public void MarkChanged (BrowsableEventArgs args)
 		{
 			if (ItemsChanged != null)
 				ItemsChanged (this, args);
@@ -159,7 +159,7 @@
 		public void MarkChanged (int item)
 		{
 			if (ItemsChanged != null)
-				ItemsChanged (this, new BrowsableArgs (item));
+				ItemsChanged (this, new BrowsableEventArgs (item));
 		}
 
 		public void Reload ()

Modified: trunk/src/PhotoQuery.cs
==============================================================================
--- trunk/src/PhotoQuery.cs	(original)
+++ trunk/src/PhotoQuery.cs	Sat Feb  2 13:44:38 2008
@@ -202,7 +202,7 @@
 		
 		public void MarkChanged (int index)
 		{
-			ItemsChanged (this, new BrowsableArgs (index));
+			ItemsChanged (this, new BrowsableEventArgs (index));
 		}
 	}
 }

Modified: trunk/src/Widgets/IconView.cs
==============================================================================
--- trunk/src/Widgets/IconView.cs	(original)
+++ trunk/src/Widgets/IconView.cs	Sat Feb  2 13:44:38 2008
@@ -2,7 +2,7 @@
 * Widgets/IconView.cs
 *
 * Author(s):
-	* 	Etore Perazzoli
+* 	Etore Perazzoli
 *	Larry Ewing <lewing novell com>
 *	Stephane Delcroix <stephane delcroix org>
 *
@@ -254,7 +254,7 @@
 			QueueResize ();
 		}
 
-		private void HandleItemsChanged (FSpot.IBrowsableCollection sender, BrowsableArgs args)
+		private void HandleItemsChanged (FSpot.IBrowsableCollection sender, BrowsableEventArgs args)
 		{
 			foreach (int item in args.Items) {
 				UpdateThumbnail (item);
@@ -331,7 +331,7 @@
 				parent.MarkChanged ((int) selected_cells [item]);
 			}
 
-			private void HandleParentItemsChanged (IBrowsableCollection collection, BrowsableArgs args)
+			private void HandleParentItemsChanged (IBrowsableCollection collection, BrowsableEventArgs args)
 			{
 				if (this.ItemsChanged == null)
 					return;
@@ -350,7 +350,7 @@
 				if (local_ids.Count == 0)
 					return;
 
-				ItemsChanged (this, new BrowsableArgs ((int [])local_ids.ToArray (typeof (int))));
+				ItemsChanged (this, new BrowsableEventArgs ((int [])local_ids.ToArray (typeof (int))));
 			}
 
 			public int [] Ids {