[f-spot] Cleaned up all of the using statements
- From: Stephen Shaw <sshaw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [f-spot] Cleaned up all of the using statements
- Date: Sat, 30 Jun 2012 19:52:00 +0000 (UTC)
commit 7790000e81eb4d3276a9288c5afede2278af5259
Author: Stephen Shaw <sshaw decriptor com>
Date: Fri Jun 29 10:08:56 2012 -0600
Cleaned up all of the using statements
Remove unused using statements
Rearranged them in groups
Removed reference to gtk 2.16 in a couple files
src/Clients/MainApp/DependentListStore.cs | 8 ++--
.../MainApp/FSpot.ColorAdjustment/Adjustment.cs | 5 ++-
.../MainApp/FSpot.ColorAdjustment/AutoStretch.cs | 7 +++-
.../MainApp/FSpot.ColorAdjustment/Desaturate.cs | 4 ++-
.../FSpot.ColorAdjustment/FullColorAdjustment.cs | 4 +-
.../MainApp/FSpot.ColorAdjustment/SepiaTone.cs | 4 ++-
src/Clients/MainApp/FSpot.Database/Db.cs | 4 ++-
src/Clients/MainApp/FSpot.Database/DbStore.cs | 3 ++
.../FSpot.Database/FSpotDatabaseConnection.cs | 1 -
src/Clients/MainApp/FSpot.Database/Updater.cs | 7 ++--
.../MainApp/FSpot.Editors/AutoStretchEditor.cs | 3 +-
src/Clients/MainApp/FSpot.Editors/ColorEditor.cs | 8 +++--
src/Clients/MainApp/FSpot.Editors/CropEditor.cs | 12 ++++--
.../MainApp/FSpot.Editors/DesaturateEditor.cs | 3 +-
src/Clients/MainApp/FSpot.Editors/Editor.cs | 5 ++-
src/Clients/MainApp/FSpot.Editors/RedEyeEditor.cs | 4 +-
src/Clients/MainApp/FSpot.Editors/SepiaEditor.cs | 3 +-
.../MainApp/FSpot.Editors/SoftFocusEditor.cs | 3 +-
src/Clients/MainApp/FSpot.Editors/TiltEditor.cs | 1 +
.../FSpot.Extensions/CommandMenuItemNode.cs | 4 ++-
.../FSpot.Extensions/ComplexMenuItemNode.cs | 4 +-
.../MainApp/FSpot.Extensions/ExportMenuItemNode.cs | 3 +-
src/Clients/MainApp/FSpot.Extensions/IExporter.cs | 3 --
src/Clients/MainApp/FSpot.Extensions/MenuNode.cs | 1 +
.../MainApp/FSpot.Extensions/PopupCommands.cs | 2 -
.../MainApp/FSpot.Extensions/ServiceNode.cs | 1 +
.../MainApp/FSpot.Extensions/SidebarPage.cs | 8 +---
.../MainApp/FSpot.Extensions/SidebarPageNode.cs | 1 -
.../MainApp/FSpot.Extensions/TransitionNode.cs | 3 +-
src/Clients/MainApp/FSpot.Filters/FilterRequest.cs | 2 -
src/Clients/MainApp/FSpot.Filters/JpegFilter.cs | 3 --
src/Clients/MainApp/FSpot.Filters/ResizeFilter.cs | 6 ---
src/Clients/MainApp/FSpot.Filters/SharpFilter.cs | 5 ---
.../MainApp/FSpot.Filters/UniqueNameFilter.cs | 2 +-
src/Clients/MainApp/FSpot.Imaging/Ciff.cs | 4 +--
src/Clients/MainApp/FSpot.Imaging/DCRawFile.cs | 3 --
src/Clients/MainApp/FSpot.Imaging/IImageFile.cs | 8 +---
src/Clients/MainApp/FSpot.Imaging/IOChannel.cs | 2 +-
src/Clients/MainApp/FSpot.Imaging/ImageFile.cs | 9 +----
.../MainApp/FSpot.Imaging/InternalProcess.cs | 2 +-
src/Clients/MainApp/FSpot.Imaging/RafFile.cs | 2 -
src/Clients/MainApp/FSpot.Imaging/Tiff.cs | 7 ++--
.../MainApp/FSpot.Import/FileImportSource.cs | 7 +++-
src/Clients/MainApp/FSpot.Import/IImportSource.cs | 4 --
.../MainApp/FSpot.Import/ImportController.cs | 9 +++--
.../MainApp/FSpot.Import/MetadataImporter.cs | 4 ++-
src/Clients/MainApp/FSpot.Jobs/CalculateHashJob.cs | 2 +
src/Clients/MainApp/FSpot.Jobs/SyncMetadataJob.cs | 4 ++-
.../MainApp/FSpot.Loaders/AreaPreparedEventArgs.cs | 1 -
.../MainApp/FSpot.Loaders/AreaUpdatedEventArgs.cs | 1 -
.../MainApp/FSpot.Loaders/GdkImageLoader.cs | 5 ++-
src/Clients/MainApp/FSpot.Loaders/IImageLoader.cs | 4 ++-
src/Clients/MainApp/FSpot.Loaders/ImageLoader.cs | 6 ++-
src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs | 2 +
.../MainApp/FSpot.UI.Dialog/AdjustTimeDialog.cs | 5 ++-
.../MainApp/FSpot.UI.Dialog/BuilderDialog.cs | 1 -
.../MainApp/FSpot.UI.Dialog/DateRangeDialog.cs | 5 ++-
.../MainApp/FSpot.UI.Dialog/EditExceptionDialog.cs | 4 ++
.../MainApp/FSpot.UI.Dialog/EditTagDialog.cs | 5 ++-
.../MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs | 4 ++
.../MainApp/FSpot.UI.Dialog/ImportDialog.cs | 9 +++--
.../MainApp/FSpot.UI.Dialog/ImportFailureDialog.cs | 3 ++
.../MainApp/FSpot.UI.Dialog/LastRollDialog.cs | 2 +
.../MainApp/FSpot.UI.Dialog/PreferenceDialog.cs | 4 ++-
.../MainApp/FSpot.UI.Dialog/ProgressDialog.cs | 4 +-
.../MainApp/FSpot.UI.Dialog/RatingFilterDialog.cs | 2 +-
.../MainApp/FSpot.UI.Dialog/RepairDbDialog.cs | 3 ++
.../MainApp/FSpot.UI.Dialog/RepairDialog.cs | 6 ++--
.../MainApp/FSpot.UI.Dialog/TagSelectionDialog.cs | 3 +-
.../FSpot.Widgets/BrowseablePointerGridView.cs | 2 -
.../FSpot.Widgets/CellRendererTextProgress.cs | 7 ----
src/Clients/MainApp/FSpot.Widgets/EditorPage.cs | 5 ++-
src/Clients/MainApp/FSpot.Widgets/Filmstrip.cs | 2 -
src/Clients/MainApp/FSpot.Widgets/FindBar.cs | 5 ++-
.../MainApp/FSpot.Widgets/FolderTreeModel.cs | 5 +--
.../MainApp/FSpot.Widgets/FolderTreePage.cs | 3 +-
.../MainApp/FSpot.Widgets/FolderTreeView.cs | 1 -
src/Clients/MainApp/FSpot.Widgets/ImageInfo.cs | 3 ++
src/Clients/MainApp/FSpot.Widgets/InfoBox.cs | 9 +++--
src/Clients/MainApp/FSpot.Widgets/Loupe.cs | 8 ++--
.../MainApp/FSpot.Widgets/MetadataDisplay.cs | 4 +--
.../MainApp/FSpot.Widgets/PhotoImageView.cs | 10 +++--
src/Clients/MainApp/FSpot.Widgets/PreviewPopup.cs | 8 +++-
src/Clients/MainApp/FSpot.Widgets/QueryView.cs | 3 --
.../MainApp/FSpot.Widgets/RatingMenuItem.cs | 1 -
.../FSpot.Widgets/SelectionCollectionGridView.cs | 1 -
src/Clients/MainApp/FSpot.Widgets/Sharpener.cs | 9 +++--
src/Clients/MainApp/FSpot.Widgets/Sidebar.cs | 9 +++--
src/Clients/MainApp/FSpot.Widgets/SlideShow.cs | 2 +
src/Clients/MainApp/FSpot.Widgets/SoftFocus.cs | 12 +++---
src/Clients/MainApp/FSpot.Widgets/TagEntry.cs | 2 +-
src/Clients/MainApp/FSpot.Widgets/TagMenu.cs | 12 +++----
src/Clients/MainApp/FSpot.Widgets/TagView.cs | 2 +
.../FSpot.Widgets/ThumbnailCaptionRenderer.cs | 3 --
.../FSpot.Widgets/ThumbnailDateCaptionRenderer.cs | 2 -
.../FSpot.Widgets/ThumbnailDecorationRenderer.cs | 3 --
.../ThumbnailFilenameCaptionRenderer.cs | 2 -
.../ThumbnailRatingDecorationRenderer.cs | 3 --
.../FSpot.Widgets/ThumbnailTagsCaptionRenderer.cs | 3 --
.../FSpot.Widgets/ThumbnailTextCaptionRenderer.cs | 3 --
src/Clients/MainApp/FSpot.Widgets/TrayView.cs | 4 --
src/Clients/MainApp/FSpot/Accelerometer.cs | 1 -
src/Clients/MainApp/FSpot/BitConverter.cs | 3 --
src/Clients/MainApp/FSpot/ColorManagement.cs | 1 +
src/Clients/MainApp/FSpot/ControlOverlay.cs | 8 ++--
src/Clients/MainApp/FSpot/DragDropTargets.cs | 1 -
src/Clients/MainApp/FSpot/ExportStore.cs | 5 +--
src/Clients/MainApp/FSpot/FolderQueryWidget.cs | 2 -
src/Clients/MainApp/FSpot/FullScreenView.cs | 5 ++-
src/Clients/MainApp/FSpot/GroupAdaptor.cs | 1 -
src/Clients/MainApp/FSpot/GroupSelector.cs | 4 ++-
src/Clients/MainApp/FSpot/ItemAction.cs | 6 ++-
src/Clients/MainApp/FSpot/JobStore.cs | 9 +++--
src/Clients/MainApp/FSpot/Literal.cs | 5 ++-
src/Clients/MainApp/FSpot/MainWindow.cs | 4 --
src/Clients/MainApp/FSpot/MetaStore.cs | 6 +--
src/Clients/MainApp/FSpot/Photo.cs | 2 -
src/Clients/MainApp/FSpot/PhotoLoader.cs | 2 -
src/Clients/MainApp/FSpot/PhotoQuery.cs | 3 +-
src/Clients/MainApp/FSpot/PhotoStore.cs | 8 +----
src/Clients/MainApp/FSpot/PhotoView.cs | 10 ++----
src/Clients/MainApp/FSpot/PixbufCache.cs | 4 +--
src/Clients/MainApp/FSpot/Preferences.cs | 4 ++-
src/Clients/MainApp/FSpot/PrintOperation.cs | 3 ++
src/Clients/MainApp/FSpot/ProgressItem.cs | 2 -
src/Clients/MainApp/FSpot/QueryWidget.cs | 3 +-
src/Clients/MainApp/FSpot/RollStore.cs | 7 +---
src/Clients/MainApp/FSpot/RotateCommand.cs | 5 +--
src/Clients/MainApp/FSpot/SingleView.cs | 2 +
src/Clients/MainApp/FSpot/TagQueryWidget.cs | 4 +-
src/Clients/MainApp/FSpot/TagSelectionWidget.cs | 6 +---
src/Clients/MainApp/FSpot/TagStore.cs | 11 +++---
src/Clients/MainApp/FSpot/Term.cs | 6 ++-
src/Clients/MainApp/FSpot/ThumbnailCache.cs | 2 +-
src/Clients/MainApp/FSpot/ThumbnailGenerator.cs | 4 +-
src/Clients/MainApp/FSpot/TimeAdaptor.cs | 2 +
src/Clients/MainApp/FSpot/UriCollection.cs | 3 +-
src/Clients/MainApp/FSpot/XScreenSaverSlide.cs | 6 +---
src/Clients/MainApp/FSpot/main.cs | 9 ++---
src/Clients/MainApp/PhotoTagMenu.cs | 7 ++--
src/Clients/MainApp/PhotoVersionCommands.cs | 8 +++-
src/Clients/MainApp/PhotoVersionMenu.cs | 10 ++---
src/Clients/MainApp/Pinta/CairoExtensions.cs | 1 -
src/Clients/MainApp/Pinta/ColorBgra.cs | 3 --
src/Clients/MainApp/Pinta/GaussianBlurEffect.cs | 2 -
src/Clients/MainApp/PixbufUtils.cs | 14 +++++---
src/Clients/MainApp/TagCommands.cs | 12 +++----
src/Clients/MainApp/TagPopup.cs | 3 ++
src/Clients/MainApp/ThumbnailCommand.cs | 2 +-
src/Core/FSpot.Bling/FSpot.Bling/Animation.cs | 1 +
src/Core/FSpot.Bling/FSpot.Bling/BackEase.cs | 3 +-
src/Core/FSpot.Bling/FSpot.Bling/CubicEase.cs | 5 +--
.../FSpot.Bling/FSpot.Bling/DoubleAnimation.cs | 3 +-
src/Core/FSpot.Bling/FSpot.Bling/QuinticEase.cs | 5 +--
src/Core/FSpot.Cms/Cms/CctTable.cs | 6 ++-
src/Core/FSpot.Cms/Cms/CmsException.cs | 6 ++-
src/Core/FSpot.Cms/Cms/ColorCIELCh.cs | 13 ++-----
src/Core/FSpot.Cms/Cms/ColorCIELab.cs | 11 ++----
src/Core/FSpot.Cms/Cms/ColorCIEXYZ.cs | 10 ++---
src/Core/FSpot.Cms/Cms/ColorCIExyY.cs | 8 ++--
src/Core/FSpot.Cms/Cms/Format.cs | 3 +-
src/Core/FSpot.Cms/Cms/GammaTable.cs | 6 ++-
src/Core/FSpot.Cms/Cms/IccColorSpace.cs | 3 +-
src/Core/FSpot.Cms/Cms/IccProfileClass.cs | 3 +-
src/Core/FSpot.Cms/Cms/Intent.cs | 3 +-
src/Core/FSpot.Cms/Cms/Profile.cs | 10 ++---
src/Core/FSpot.Cms/Cms/SaveException.cs | 6 ++-
src/Core/FSpot.Cms/Cms/Transform.cs | 10 ++---
.../FSpot.Core/BrowsableCollectionProxy.cs | 4 +-
.../FSpot.Core/FSpot.Core/BrowsableEventArgs.cs | 5 +--
src/Core/FSpot.Core/FSpot.Core/BrowsablePointer.cs | 3 +-
src/Core/FSpot.Core/FSpot.Core/FilePhoto.cs | 2 -
src/Core/FSpot.Core/FSpot.Core/Global.cs | 7 +++-
.../FSpot.Core/FSpot.Core/IBrowsableCollection.cs | 3 +-
src/Core/FSpot.Core/FSpot.Core/IPhoto.cs | 4 --
src/Core/FSpot.Core/FSpot.Core/IPhotoVersion.cs | 3 --
.../FSpot.Core/FSpot.Core/IPhotoVersionable.cs | 2 -
src/Core/FSpot.Core/FSpot.Core/PhotoChanges.cs | 1 -
src/Core/FSpot.Core/FSpot.Core/PhotoList.cs | 1 -
src/Core/FSpot.Core/FSpot.Core/PhotosChanges.cs | 1 -
src/Core/FSpot.Core/FSpot.Core/Roll.cs | 1 +
src/Core/FSpot.Core/FSpot.Core/Tag.cs | 6 +++-
src/Core/FSpot.Gui/FSpot.Gui/CompositeUtils.cs | 10 ++++--
src/Core/FSpot.Gui/FSpot.Gui/WindowOpacityFader.cs | 2 +-
.../FSpot.Gui/FSpot.Transitions/CairoTransition.cs | 4 --
.../FSpot.Transitions/SlideShowTransition.cs | 5 ---
.../FSpot.Widgets/ApplicationActivatedEventArgs.cs | 1 +
src/Core/FSpot.Gui/FSpot.Widgets/BuilderWindow.cs | 1 -
src/Core/FSpot.Gui/FSpot.Widgets/CellGridView.cs | 3 --
src/Core/FSpot.Gui/FSpot.Widgets/CheckPattern.cs | 1 +
src/Core/FSpot.Gui/FSpot.Widgets/Curve.cs | 1 +
.../FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs | 3 +-
src/Core/FSpot.Gui/FSpot.Widgets/DateEdit.cs | 2 +
src/Core/FSpot.Gui/FSpot.Widgets/DateEditFlags.cs | 3 +-
src/Core/FSpot.Gui/FSpot.Widgets/HighlightedBox.cs | 1 +
src/Core/FSpot.Gui/FSpot.Widgets/ImageView.cs | 2 -
.../FSpot.Gui/FSpot.Widgets/ImageView_Container.cs | 3 +-
.../FSpot.Gui/FSpot.Widgets/ImageView_Panning.cs | 2 -
src/Core/FSpot.Gui/FSpot.Widgets/Layout.cs | 1 +
src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs | 9 ++---
src/Core/FSpot.Gui/FSpot.Widgets/RatingEntry.cs | 2 -
src/Core/FSpot.Gui/FSpot.Widgets/RatingRenderer.cs | 3 --
src/Core/FSpot.Gui/FSpot.Widgets/SaneTreeView.cs | 1 +
src/Core/FSpot.Gui/FSpot.Widgets/ScrolledView.cs | 8 +++-
.../FSpot.Gui/FSpot.Widgets/SelectionCollection.cs | 1 +
src/Core/FSpot.Gui/FSpot.Widgets/ToolTipWindow.cs | 1 -
.../Banshee.Kernel/IInstanceCriticalJob.cs | 2 -
src/Core/FSpot.JobScheduler/Banshee.Kernel/IJob.cs | 2 -
.../Banshee.Kernel/JobPriority.cs | 16 ++++-----
.../FSpot.JobScheduler/Banshee.Kernel/Scheduler.cs | 1 +
.../FSpot.JobScheduler/FSpot.Jobs/JobStatus.cs | 3 +-
.../FSpot.Platform/PreferenceBackend.cs | 1 -
.../FSpot.Platform/FSpot.Platform/ScreenSaver.cs | 1 -
src/Core/FSpot.Platform/FSpot.Platform/WebProxy.cs | 4 ++-
src/Core/FSpot.Query/FSpot.Query/DateRange.cs | 3 +-
src/Core/FSpot.Query/FSpot.Query/FolderSet.cs | 1 +
src/Core/FSpot.Query/FSpot.Query/LogicalTerm.cs | 2 +
src/Core/FSpot.Query/FSpot.Query/OrderByTime.cs | 3 +-
src/Core/FSpot.Utils/FSpot.Utils/Cache.cs | 2 +-
src/Core/FSpot.Utils/FSpot.Utils/CairoUtils.cs | 8 +++--
src/Core/FSpot.Utils/FSpot.Utils/FileExtensions.cs | 4 +--
.../FSpot.Utils/GIOTagLibFileAbstraction.cs | 2 +
src/Core/FSpot.Utils/FSpot.Utils/GdkUtils.cs | 10 ++++--
src/Core/FSpot.Utils/FSpot.Utils/GtkUtil.cs | 3 +-
src/Core/FSpot.Utils/FSpot.Utils/HashUtils.cs | 3 +-
src/Core/FSpot.Utils/FSpot.Utils/Metadata.cs | 5 ++-
src/Core/FSpot.Utils/FSpot.Utils/PixbufUtils.cs | 39 ++++++++++----------
.../FSpot.Utils/RecursiveFileEnumerator.cs | 2 +-
.../FSpot.Utils/FSpot.Utils/SafeUriExtensions.cs | 3 +-
.../FSpot.Utils/SidecarXmpExtensions.cs | 3 +-
.../FSpot.Utils/TargetListExtensionMethods.cs | 29 ++++++++++++++-
src/Core/FSpot.Utils/FSpot.Utils/UriExtensions.cs | 1 -
src/Core/FSpot.Utils/FSpot.Utils/UriList.cs | 3 +-
src/Core/FSpot.Utils/FSpot.Utils/UriUtils.cs | 1 -
src/Core/FSpot.Utils/FSpot.Utils/Vector.cs | 6 ++-
.../FSpot.Utils/FSpot.Utils/XdgThumbnailSpec.cs | 5 ++-
.../FSpot.Addins.Editors/BWEditor.cs | 11 ++++--
.../FSpot.Addins.Editors/BlackoutEditor.cs | 9 +++--
.../FSpot.Addins.Editors/FlipEditor.cs | 9 +++--
.../FSpot.Addins.Editors/PixelateEditor.cs | 9 +++--
.../FSpot.Addins.Editors/ResizeEditor.cs | 10 ++++--
.../FSpot.Exporters.CD/Brasero.cs | 2 +-
.../FSpot.Exporters.CD/CDExport.cs | 17 +++------
.../FSpot.Exporters.CD/CDExportDialog.cs | 12 ++----
.../FSpot.Exporters.Facebook/FacebookExport.cs | 8 +++--
.../FSpot.Exporters.Facebook/FacebookTagPopup.cs | 2 +
.../FindNullableClashes.cs | 1 +
.../Mono.Facebook/Album.cs | 6 +--
.../Mono.Facebook/Error.cs | 1 -
.../Mono.Facebook/Event.cs | 6 +--
.../Mono.Facebook/FacebookSession.cs | 4 --
.../Mono.Facebook/Friend.cs | 7 +---
.../Mono.Facebook/FriendInfo.cs | 2 +-
.../Mono.Facebook/Group.cs | 3 +-
.../Mono.Facebook/Location.cs | 2 +-
.../Mono.Facebook/Notification.cs | 4 +--
.../Mono.Facebook/PeopleList.cs | 3 +-
.../Mono.Facebook/Photo.cs | 2 +
.../Mono.Facebook/Responses.cs | 3 +-
.../Mono.Facebook/SessionInfo.cs | 3 +-
.../Mono.Facebook/SessionWrapper.cs | 1 -
.../FSpot.Exporters.Facebook/Mono.Facebook/Tag.cs | 1 +
.../FSpot.Exporters.Facebook/Mono.Facebook/User.cs | 2 +
.../FSpot.Exporters.Facebook/Mono.Facebook/Util.cs | 1 +
.../Mono.Facebook/facebook.cs | 8 ++--
.../FSpot.Exporters.Flickr/FlickrExport.cs | 10 +++--
.../FSpot.Exporters.Flickr/FlickrRemote.cs | 11 +++---
.../FSpot.Exporters.Folder/FolderExport.cs | 8 +----
.../FSpot.Exporters.Folder/HtmlGallery.cs | 1 -
.../FSpot.Exporters.Gallery/AccountDialog.cs | 5 +--
.../FSpot.Exporters.Gallery/FormClient.cs | 2 +-
.../FSpot.Exporters.Gallery/GalleryAccount.cs | 3 +-
.../FSpot.Exporters.Gallery/GalleryExport.cs | 1 -
.../FSpot.Exporters.Gallery/GalleryRemote.cs | 7 +---
.../FSpot.Exporters.PicasaWeb/GoogleAccount.cs | 21 ++---------
.../GoogleAccountDialog.cs | 18 ++--------
.../GoogleAccountManager.cs | 2 +
.../FSpot.Exporters.PicasaWeb/GoogleAddAlbum.cs | 21 +++--------
.../FSpot.Exporters.PicasaWeb/PicasaWebExport.cs | 2 +
.../FSpot.Exporters.SmugMug/SmugMugAccount.cs | 20 ++--------
.../SmugMugAccountDialog.cs | 20 +---------
.../SmugMugAccountManager.cs | 15 +-------
.../FSpot.Exporters.SmugMug/SmugMugAddAlbum.cs | 20 ++--------
.../FSpot.Exporters.SmugMug/SmugMugExport.cs | 13 ++++---
.../ApplicationCentricCertificatePolicy.cs | 9 ++---
.../BlindTrustCertificatePolicy.cs | 6 ++-
.../FSpot.Exporters.Tabblo/FSpotTraceListener.cs | 8 ++--
.../FSpot.Exporters.Tabblo/FSpotUploadProgress.cs | 13 ++++---
.../FSpot.Exporters.Tabblo/TabbloExport.cs | 16 ++++----
.../FSpot.Exporters.Tabblo/TabbloExportModel.cs | 14 +++----
.../FSpot.Exporters.Tabblo/TabbloExportView.cs | 11 ++----
.../UserDecisionCertificatePolicy.cs | 9 ++---
.../FSpot.Exporters.Zip/ZipExport.cs | 17 +++++----
.../ChangePhotoPathController.cs | 10 ++---
.../ChangePhotoPathGui.cs | 6 ++--
.../AbstractDevelopInUFRaw.cs | 5 ++-
.../FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.cs | 12 ++-----
.../DevelopInUFRawBatch.cs | 11 +++---
.../GalleryRequestHandler.cs | 1 +
.../FSpot.Tools.LiveWebGallery/LiveWebGallery.cs | 7 ----
.../LiveWebGalleryDialog.cs | 6 ++-
.../PhotoRequestHandler.cs | 3 +-
.../ResourceRequestHandler.cs | 4 --
.../FSpot.Tools.LiveWebGallery/SimpleWebServer.cs | 3 +-
.../FSpot.Tools.MergeDb/MergeDb.cs | 4 +-
.../FSpot.Tools.MergeDb/MergeDbDialog.cs | 3 +-
.../FSpot.Tools.MergeDb/PickFolderDialog.cs | 4 +-
.../FSpot.Tools.RawPlusJpeg/RawPlusJpeg.cs | 1 -
.../FSpot.Tools.RetroactiveRoll/RetroactiveRoll.cs | 4 ++-
.../FSpot.Addins.Transitions/Cover.cs | 2 +-
.../FSpot.Addins.Transitions/Dissolve.cs | 2 +-
.../FSpot.Addins.Transitions/Push.cs | 2 +-
312 files changed, 745 insertions(+), 855 deletions(-)
---
diff --git a/src/Clients/MainApp/DependentListStore.cs b/src/Clients/MainApp/DependentListStore.cs
index 1c1161f..ba69535 100644
--- a/src/Clients/MainApp/DependentListStore.cs
+++ b/src/Clients/MainApp/DependentListStore.cs
@@ -28,13 +28,13 @@
//
using Gtk;
-using Gdk;
-using System;
-public class DependentListStore : ListStore {
+public class DependentListStore : ListStore
+{
private TreeModel parent = null;
- public TreeModel Parent {
+ public TreeModel Parent
+ {
get { return parent; }
set {
if (parent != null) {
diff --git a/src/Clients/MainApp/FSpot.ColorAdjustment/Adjustment.cs b/src/Clients/MainApp/FSpot.ColorAdjustment/Adjustment.cs
index e85da0a..a3917d7 100644
--- a/src/Clients/MainApp/FSpot.ColorAdjustment/Adjustment.cs
+++ b/src/Clients/MainApp/FSpot.ColorAdjustment/Adjustment.cs
@@ -29,10 +29,11 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot.Utils;
+using System.Collections.Generic;
+
using Cms;
+
using Gdk;
-using System.Collections.Generic;
namespace FSpot.ColorAdjustment {
public abstract class Adjustment {
diff --git a/src/Clients/MainApp/FSpot.ColorAdjustment/AutoStretch.cs b/src/Clients/MainApp/FSpot.ColorAdjustment/AutoStretch.cs
index e4181ac..9c3bc36 100644
--- a/src/Clients/MainApp/FSpot.ColorAdjustment/AutoStretch.cs
+++ b/src/Clients/MainApp/FSpot.ColorAdjustment/AutoStretch.cs
@@ -27,10 +27,13 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Cms;
-using Gdk;
using System;
using System.Collections.Generic;
+
+using Cms;
+
+using Gdk;
+
using Hyena;
namespace FSpot.ColorAdjustment {
diff --git a/src/Clients/MainApp/FSpot.ColorAdjustment/Desaturate.cs b/src/Clients/MainApp/FSpot.ColorAdjustment/Desaturate.cs
index 9c13282..6e77e65 100644
--- a/src/Clients/MainApp/FSpot.ColorAdjustment/Desaturate.cs
+++ b/src/Clients/MainApp/FSpot.ColorAdjustment/Desaturate.cs
@@ -27,9 +27,11 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+using System.Collections.Generic;
+
using Cms;
+
using Gdk;
-using System.Collections.Generic;
namespace FSpot.ColorAdjustment {
public class Desaturate : Adjustment {
diff --git a/src/Clients/MainApp/FSpot.ColorAdjustment/FullColorAdjustment.cs b/src/Clients/MainApp/FSpot.ColorAdjustment/FullColorAdjustment.cs
index 22f39fd..9bfac37 100644
--- a/src/Clients/MainApp/FSpot.ColorAdjustment/FullColorAdjustment.cs
+++ b/src/Clients/MainApp/FSpot.ColorAdjustment/FullColorAdjustment.cs
@@ -27,11 +27,11 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Cms;
-using Gdk;
using System;
using System.Collections.Generic;
+using Gdk;
+
namespace FSpot.ColorAdjustment {
public class FullColorAdjustment : Adjustment {
private double exposure;
diff --git a/src/Clients/MainApp/FSpot.ColorAdjustment/SepiaTone.cs b/src/Clients/MainApp/FSpot.ColorAdjustment/SepiaTone.cs
index 2a84f96..532432c 100644
--- a/src/Clients/MainApp/FSpot.ColorAdjustment/SepiaTone.cs
+++ b/src/Clients/MainApp/FSpot.ColorAdjustment/SepiaTone.cs
@@ -27,9 +27,11 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+using System.Collections.Generic;
+
using Cms;
+
using Gdk;
-using System.Collections.Generic;
namespace FSpot.ColorAdjustment {
public class SepiaTone : Adjustment {
diff --git a/src/Clients/MainApp/FSpot.Database/Db.cs b/src/Clients/MainApp/FSpot.Database/Db.cs
index d617fea..6b5023e 100644
--- a/src/Clients/MainApp/FSpot.Database/Db.cs
+++ b/src/Clients/MainApp/FSpot.Database/Db.cs
@@ -26,8 +26,10 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System.IO;
+
using System;
+using System.IO;
+
using Hyena;
// A Store maps to a SQL table. We have separate stores (i.e. SQL tables) for tags, photos and imports.
diff --git a/src/Clients/MainApp/FSpot.Database/DbStore.cs b/src/Clients/MainApp/FSpot.Database/DbStore.cs
index 710a80f..9ea4d28 100644
--- a/src/Clients/MainApp/FSpot.Database/DbStore.cs
+++ b/src/Clients/MainApp/FSpot.Database/DbStore.cs
@@ -26,9 +26,12 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+
using System;
using System.Collections.Generic;
+
using Hyena;
+
using FSpot.Core;
namespace FSpot.Database
diff --git a/src/Clients/MainApp/FSpot.Database/FSpotDatabaseConnection.cs b/src/Clients/MainApp/FSpot.Database/FSpotDatabaseConnection.cs
index 4e92bcc..c804678 100644
--- a/src/Clients/MainApp/FSpot.Database/FSpotDatabaseConnection.cs
+++ b/src/Clients/MainApp/FSpot.Database/FSpotDatabaseConnection.cs
@@ -26,7 +26,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using Hyena;
using Hyena.Data.Sqlite;
diff --git a/src/Clients/MainApp/FSpot.Database/Updater.cs b/src/Clients/MainApp/FSpot.Database/Updater.cs
index 4f71d87..474516f 100644
--- a/src/Clients/MainApp/FSpot.Database/Updater.cs
+++ b/src/Clients/MainApp/FSpot.Database/Updater.cs
@@ -34,12 +34,13 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Mono.Unix;
-using Gtk;
using System;
-using System.Collections;
using System.Collections.Generic;
+using Mono.Unix;
+
+using Gtk;
+
using FSpot.Utils;
using FSpot.UI.Dialog;
diff --git a/src/Clients/MainApp/FSpot.Editors/AutoStretchEditor.cs b/src/Clients/MainApp/FSpot.Editors/AutoStretchEditor.cs
index a0ff4dc..f47ecc0 100644
--- a/src/Clients/MainApp/FSpot.Editors/AutoStretchEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/AutoStretchEditor.cs
@@ -27,9 +27,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot;
using FSpot.ColorAdjustment;
+
using Gdk;
+
using Mono.Unix;
namespace FSpot.Editors {
diff --git a/src/Clients/MainApp/FSpot.Editors/ColorEditor.cs b/src/Clients/MainApp/FSpot.Editors/ColorEditor.cs
index 41b3e12..b03eced 100644
--- a/src/Clients/MainApp/FSpot.Editors/ColorEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/ColorEditor.cs
@@ -29,14 +29,16 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot;
+using System;
+
using FSpot.ColorAdjustment;
+
using Gdk;
using Gtk;
+
using Mono.Unix;
-using System;
-using GtkBeans;
+
namespace FSpot.Editors {
class ColorEditor : Editor {
diff --git a/src/Clients/MainApp/FSpot.Editors/CropEditor.cs b/src/Clients/MainApp/FSpot.Editors/CropEditor.cs
index 0dc4d4c..eee89d7 100644
--- a/src/Clients/MainApp/FSpot.Editors/CropEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/CropEditor.cs
@@ -27,17 +27,21 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml.Serialization;
+
using FSpot;
using FSpot.UI.Dialog;
using FSpot.Utils;
+
using Hyena;
+
using Gdk;
using Gtk;
+
using Mono.Unix;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml.Serialization;
namespace FSpot.Editors {
class CropEditor : Editor {
diff --git a/src/Clients/MainApp/FSpot.Editors/DesaturateEditor.cs b/src/Clients/MainApp/FSpot.Editors/DesaturateEditor.cs
index d8ad3b4..718608d 100644
--- a/src/Clients/MainApp/FSpot.Editors/DesaturateEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/DesaturateEditor.cs
@@ -27,9 +27,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot;
using FSpot.ColorAdjustment;
+
using Gdk;
+
using Mono.Unix;
namespace FSpot.Editors {
diff --git a/src/Clients/MainApp/FSpot.Editors/Editor.cs b/src/Clients/MainApp/FSpot.Editors/Editor.cs
index 3d9051b..c179a48 100644
--- a/src/Clients/MainApp/FSpot.Editors/Editor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/Editor.cs
@@ -27,6 +27,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+using System;
+
using Hyena;
using FSpot.Core;
@@ -37,9 +39,8 @@ using Gdk;
using Gtk;
using Mono.Addins;
-using Mono.Unix;
-using System;
+
namespace FSpot.Editors {
diff --git a/src/Clients/MainApp/FSpot.Editors/RedEyeEditor.cs b/src/Clients/MainApp/FSpot.Editors/RedEyeEditor.cs
index 72224fc..1afc424 100644
--- a/src/Clients/MainApp/FSpot.Editors/RedEyeEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/RedEyeEditor.cs
@@ -30,11 +30,11 @@
//
using FSpot;
-using FSpot.Utils;
+
using Gdk;
using Gtk;
+
using Mono.Unix;
-using System;
namespace FSpot.Editors {
class RedEyeEditor : Editor {
diff --git a/src/Clients/MainApp/FSpot.Editors/SepiaEditor.cs b/src/Clients/MainApp/FSpot.Editors/SepiaEditor.cs
index 29b3cf1..55805d4 100644
--- a/src/Clients/MainApp/FSpot.Editors/SepiaEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/SepiaEditor.cs
@@ -27,9 +27,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot;
using FSpot.ColorAdjustment;
+
using Gdk;
+
using Mono.Unix;
namespace FSpot.Editors {
diff --git a/src/Clients/MainApp/FSpot.Editors/SoftFocusEditor.cs b/src/Clients/MainApp/FSpot.Editors/SoftFocusEditor.cs
index 3d0f995..95757ef 100644
--- a/src/Clients/MainApp/FSpot.Editors/SoftFocusEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/SoftFocusEditor.cs
@@ -29,9 +29,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using Mono.Unix;
+
using Cairo;
+
using Gdk;
using Gtk;
diff --git a/src/Clients/MainApp/FSpot.Editors/TiltEditor.cs b/src/Clients/MainApp/FSpot.Editors/TiltEditor.cs
index 8d68283..04cebda 100644
--- a/src/Clients/MainApp/FSpot.Editors/TiltEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/TiltEditor.cs
@@ -30,6 +30,7 @@
//
using System;
+
using Mono.Unix;
using Gdk;
diff --git a/src/Clients/MainApp/FSpot.Extensions/CommandMenuItemNode.cs b/src/Clients/MainApp/FSpot.Extensions/CommandMenuItemNode.cs
index 5ecd94f..020e43a 100644
--- a/src/Clients/MainApp/FSpot.Extensions/CommandMenuItemNode.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/CommandMenuItemNode.cs
@@ -27,9 +27,11 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Mono.Addins;
using System;
+using Mono.Addins;
+
+
namespace FSpot.Extensions
{
[ExtensionNode ("Command")]
diff --git a/src/Clients/MainApp/FSpot.Extensions/ComplexMenuItemNode.cs b/src/Clients/MainApp/FSpot.Extensions/ComplexMenuItemNode.cs
index eeeb7d1..95bc196 100644
--- a/src/Clients/MainApp/FSpot.Extensions/ComplexMenuItemNode.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/ComplexMenuItemNode.cs
@@ -29,10 +29,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Mono.Addins;
-using FSpot.Widgets;
using System;
+using Mono.Addins;
+
using Hyena.Widgets;
namespace FSpot.Extensions
diff --git a/src/Clients/MainApp/FSpot.Extensions/ExportMenuItemNode.cs b/src/Clients/MainApp/FSpot.Extensions/ExportMenuItemNode.cs
index 3b430bd..20e4814 100644
--- a/src/Clients/MainApp/FSpot.Extensions/ExportMenuItemNode.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/ExportMenuItemNode.cs
@@ -27,9 +27,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Mono.Addins;
using System;
+using Mono.Addins;
+
using FSpot.Core;
namespace FSpot.Extensions
diff --git a/src/Clients/MainApp/FSpot.Extensions/IExporter.cs b/src/Clients/MainApp/FSpot.Extensions/IExporter.cs
index 838a672..a7f5da8 100644
--- a/src/Clients/MainApp/FSpot.Extensions/IExporter.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/IExporter.cs
@@ -29,9 +29,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Mono.Addins;
-using System;
-
using FSpot.Core;
namespace FSpot.Extensions
diff --git a/src/Clients/MainApp/FSpot.Extensions/MenuNode.cs b/src/Clients/MainApp/FSpot.Extensions/MenuNode.cs
index 8b81c61..110784b 100644
--- a/src/Clients/MainApp/FSpot.Extensions/MenuNode.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/MenuNode.cs
@@ -28,6 +28,7 @@
//
using System;
+
using Mono.Addins;
using Mono.Unix;
diff --git a/src/Clients/MainApp/FSpot.Extensions/PopupCommands.cs b/src/Clients/MainApp/FSpot.Extensions/PopupCommands.cs
index dccbdf9..28b5514 100644
--- a/src/Clients/MainApp/FSpot.Extensions/PopupCommands.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/PopupCommands.cs
@@ -30,8 +30,6 @@
//
using System;
-using GLib;
-using FSpot.Widgets;
namespace FSpot.Extensions
{
diff --git a/src/Clients/MainApp/FSpot.Extensions/ServiceNode.cs b/src/Clients/MainApp/FSpot.Extensions/ServiceNode.cs
index e83b4cc..c022c53 100644
--- a/src/Clients/MainApp/FSpot.Extensions/ServiceNode.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/ServiceNode.cs
@@ -28,6 +28,7 @@
//
using System;
+
using Mono.Addins;
namespace FSpot.Extensions
diff --git a/src/Clients/MainApp/FSpot.Extensions/SidebarPage.cs b/src/Clients/MainApp/FSpot.Extensions/SidebarPage.cs
index 93f88e3..fab7530 100644
--- a/src/Clients/MainApp/FSpot.Extensions/SidebarPage.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/SidebarPage.cs
@@ -27,13 +27,9 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot.Extensions;
-using FSpot.Utils;
-using Gtk;
-using Mono.Addins;
-using Mono.Unix;
using System;
-using System.Collections.Generic;
+
+using Gtk;
namespace FSpot.Extensions
{
diff --git a/src/Clients/MainApp/FSpot.Extensions/SidebarPageNode.cs b/src/Clients/MainApp/FSpot.Extensions/SidebarPageNode.cs
index 12e43a9..e31766d 100644
--- a/src/Clients/MainApp/FSpot.Extensions/SidebarPageNode.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/SidebarPageNode.cs
@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using Mono.Addins;
namespace FSpot.Extensions
diff --git a/src/Clients/MainApp/FSpot.Extensions/TransitionNode.cs b/src/Clients/MainApp/FSpot.Extensions/TransitionNode.cs
index dc7aecd..2d8dd21 100644
--- a/src/Clients/MainApp/FSpot.Extensions/TransitionNode.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/TransitionNode.cs
@@ -27,9 +27,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using Mono.Addins;
-using Gdk;
+
using FSpot.Transitions;
namespace FSpot.Extensions
diff --git a/src/Clients/MainApp/FSpot.Filters/FilterRequest.cs b/src/Clients/MainApp/FSpot.Filters/FilterRequest.cs
index e110fab..ea3c913 100644
--- a/src/Clients/MainApp/FSpot.Filters/FilterRequest.cs
+++ b/src/Clients/MainApp/FSpot.Filters/FilterRequest.cs
@@ -32,11 +32,9 @@
//
using System;
-using System.Collections;
using System.Collections.Generic;
using Hyena;
-using FSpot.Utils;
namespace FSpot.Filters {
diff --git a/src/Clients/MainApp/FSpot.Filters/JpegFilter.cs b/src/Clients/MainApp/FSpot.Filters/JpegFilter.cs
index 4a0e50c..51d6a97 100644
--- a/src/Clients/MainApp/FSpot.Filters/JpegFilter.cs
+++ b/src/Clients/MainApp/FSpot.Filters/JpegFilter.cs
@@ -29,9 +29,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-using FSpot.Utils;
-using FSpot.Imaging;
namespace FSpot.Filters {
public class JpegFilter : IFilter {
diff --git a/src/Clients/MainApp/FSpot.Filters/ResizeFilter.cs b/src/Clients/MainApp/FSpot.Filters/ResizeFilter.cs
index 5e6f397..9e7b8eb 100644
--- a/src/Clients/MainApp/FSpot.Filters/ResizeFilter.cs
+++ b/src/Clients/MainApp/FSpot.Filters/ResizeFilter.cs
@@ -29,14 +29,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-using System.IO;
-
-using FSpot.Utils;
using FSpot.Imaging;
-using Mono.Unix;
-
using Gdk;
namespace FSpot.Filters {
diff --git a/src/Clients/MainApp/FSpot.Filters/SharpFilter.cs b/src/Clients/MainApp/FSpot.Filters/SharpFilter.cs
index a4e3b6a..e7e56e2 100644
--- a/src/Clients/MainApp/FSpot.Filters/SharpFilter.cs
+++ b/src/Clients/MainApp/FSpot.Filters/SharpFilter.cs
@@ -29,13 +29,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-using System.IO;
using Gdk;
-using Mono.Unix;
-
-using FSpot.Utils;
using FSpot.Imaging;
namespace FSpot.Filters {
diff --git a/src/Clients/MainApp/FSpot.Filters/UniqueNameFilter.cs b/src/Clients/MainApp/FSpot.Filters/UniqueNameFilter.cs
index cc90f1d..abda7a0 100644
--- a/src/Clients/MainApp/FSpot.Filters/UniqueNameFilter.cs
+++ b/src/Clients/MainApp/FSpot.Filters/UniqueNameFilter.cs
@@ -30,7 +30,7 @@
//
using System;
-using FSpot.Utils;
+
using Hyena;
namespace FSpot.Filters {
diff --git a/src/Clients/MainApp/FSpot.Imaging/Ciff.cs b/src/Clients/MainApp/FSpot.Imaging/Ciff.cs
index 55e1724..5be8277 100644
--- a/src/Clients/MainApp/FSpot.Imaging/Ciff.cs
+++ b/src/Clients/MainApp/FSpot.Imaging/Ciff.cs
@@ -30,11 +30,9 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.Collections.Generic;
-using FSpot.Utils;
+
using Hyena;
-using TagLib.Image;
namespace FSpot.Imaging.Ciff {
internal enum Tag {
diff --git a/src/Clients/MainApp/FSpot.Imaging/DCRawFile.cs b/src/Clients/MainApp/FSpot.Imaging/DCRawFile.cs
index 08ecc49..809d400 100644
--- a/src/Clients/MainApp/FSpot.Imaging/DCRawFile.cs
+++ b/src/Clients/MainApp/FSpot.Imaging/DCRawFile.cs
@@ -29,9 +29,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System.Diagnostics;
-using System.IO;
-using System;
using Hyena;
namespace FSpot.Imaging {
diff --git a/src/Clients/MainApp/FSpot.Imaging/IImageFile.cs b/src/Clients/MainApp/FSpot.Imaging/IImageFile.cs
index 5d3ee55..ccdbba8 100644
--- a/src/Clients/MainApp/FSpot.Imaging/IImageFile.cs
+++ b/src/Clients/MainApp/FSpot.Imaging/IImageFile.cs
@@ -29,18 +29,14 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Hyena;
using System;
using System.IO;
-using System.Collections.Generic;
+
+using Hyena;
using FSpot.Utils;
-using Mono.Unix;
-using Mono.Unix.Native;
-using Gdk;
-using GLib;
using TagLib.Image;
using GFileInfo = GLib.FileInfo;
diff --git a/src/Clients/MainApp/FSpot.Imaging/IOChannel.cs b/src/Clients/MainApp/FSpot.Imaging/IOChannel.cs
index 043ccff..3356433 100644
--- a/src/Clients/MainApp/FSpot.Imaging/IOChannel.cs
+++ b/src/Clients/MainApp/FSpot.Imaging/IOChannel.cs
@@ -30,8 +30,8 @@
using System;
using System.IO;
using System.Runtime.InteropServices;
+
using GLib;
-using Hyena;
namespace FSpot.Imaging {
diff --git a/src/Clients/MainApp/FSpot.Imaging/ImageFile.cs b/src/Clients/MainApp/FSpot.Imaging/ImageFile.cs
index 78a9358..8b659df 100644
--- a/src/Clients/MainApp/FSpot.Imaging/ImageFile.cs
+++ b/src/Clients/MainApp/FSpot.Imaging/ImageFile.cs
@@ -30,19 +30,14 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Hyena;
-
using System;
-using System.IO;
using System.Collections.Generic;
-using FSpot.Utils;
-using Mono.Unix;
-using Mono.Unix.Native;
+using Hyena;
+
using Gdk;
using GLib;
-using TagLib.Image;
using GFileInfo = GLib.FileInfo;
diff --git a/src/Clients/MainApp/FSpot.Imaging/InternalProcess.cs b/src/Clients/MainApp/FSpot.Imaging/InternalProcess.cs
index 852ada3..0d2d793 100644
--- a/src/Clients/MainApp/FSpot.Imaging/InternalProcess.cs
+++ b/src/Clients/MainApp/FSpot.Imaging/InternalProcess.cs
@@ -28,8 +28,8 @@
//
using System;
-using System.IO;
using System.Runtime.InteropServices;
+
using GLib;
namespace FSpot.Imaging {
diff --git a/src/Clients/MainApp/FSpot.Imaging/RafFile.cs b/src/Clients/MainApp/FSpot.Imaging/RafFile.cs
index 422d8cc..1ca6de6 100644
--- a/src/Clients/MainApp/FSpot.Imaging/RafFile.cs
+++ b/src/Clients/MainApp/FSpot.Imaging/RafFile.cs
@@ -29,9 +29,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot.Utils;
using Hyena;
-using TagLib.Image;
namespace FSpot.Imaging {
// This is reverse engineered from looking at the sample files I have
diff --git a/src/Clients/MainApp/FSpot.Imaging/Tiff.cs b/src/Clients/MainApp/FSpot.Imaging/Tiff.cs
index 5f026c5..ef64b6e 100644
--- a/src/Clients/MainApp/FSpot.Imaging/Tiff.cs
+++ b/src/Clients/MainApp/FSpot.Imaging/Tiff.cs
@@ -28,14 +28,13 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot;
-using FSpot.Utils;
+
using System;
using System.IO;
-using System.Collections.Generic;
+
using Hyena;
+
using TagLib;
-using TagLib.Image;
using TagLib.IFD;
using TagLib.IFD.Entries;
using TagLib.IFD.Tags;
diff --git a/src/Clients/MainApp/FSpot.Import/FileImportSource.cs b/src/Clients/MainApp/FSpot.Import/FileImportSource.cs
index 337abfe..e94af2b 100644
--- a/src/Clients/MainApp/FSpot.Import/FileImportSource.cs
+++ b/src/Clients/MainApp/FSpot.Import/FileImportSource.cs
@@ -26,15 +26,18 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Hyena;
+
using System;
using System.Threading;
using System.Collections.Generic;
+
+using Hyena;
+
using FSpot.Core;
using FSpot.Utils;
using FSpot.Imaging;
+
using Gtk;
-using Mono.Unix.Native;
namespace FSpot.Import
{
diff --git a/src/Clients/MainApp/FSpot.Import/IImportSource.cs b/src/Clients/MainApp/FSpot.Import/IImportSource.cs
index 0790486..e2926c9 100644
--- a/src/Clients/MainApp/FSpot.Import/IImportSource.cs
+++ b/src/Clients/MainApp/FSpot.Import/IImportSource.cs
@@ -29,12 +29,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Hyena;
-using System;
-
using FSpot.Core;
-
namespace FSpot.Import
{
public interface IImportSource {
diff --git a/src/Clients/MainApp/FSpot.Import/ImportController.cs b/src/Clients/MainApp/FSpot.Import/ImportController.cs
index 292878f..d5c6302 100644
--- a/src/Clients/MainApp/FSpot.Import/ImportController.cs
+++ b/src/Clients/MainApp/FSpot.Import/ImportController.cs
@@ -27,12 +27,15 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Hyena;
-using FSpot.Core;
-using FSpot.Utils;
using System;
using System.Collections.Generic;
using System.Threading;
+
+using Hyena;
+
+using FSpot.Core;
+using FSpot.Utils;
+
using Mono.Unix;
namespace FSpot.Import
diff --git a/src/Clients/MainApp/FSpot.Import/MetadataImporter.cs b/src/Clients/MainApp/FSpot.Import/MetadataImporter.cs
index b170f91..5504514 100644
--- a/src/Clients/MainApp/FSpot.Import/MetadataImporter.cs
+++ b/src/Clients/MainApp/FSpot.Import/MetadataImporter.cs
@@ -28,8 +28,10 @@
//
using System;
-using Mono.Unix;
using System.Collections.Generic;
+
+using Mono.Unix;
+
using FSpot.Core;
using FSpot.Utils;
diff --git a/src/Clients/MainApp/FSpot.Jobs/CalculateHashJob.cs b/src/Clients/MainApp/FSpot.Jobs/CalculateHashJob.cs
index 94836ad..a9cecbb 100644
--- a/src/Clients/MainApp/FSpot.Jobs/CalculateHashJob.cs
+++ b/src/Clients/MainApp/FSpot.Jobs/CalculateHashJob.cs
@@ -30,7 +30,9 @@
//
using System;
+
using Banshee.Kernel;
+
using Hyena;
namespace FSpot.Jobs {
diff --git a/src/Clients/MainApp/FSpot.Jobs/SyncMetadataJob.cs b/src/Clients/MainApp/FSpot.Jobs/SyncMetadataJob.cs
index 9818f4a..c6ca5e7 100644
--- a/src/Clients/MainApp/FSpot.Jobs/SyncMetadataJob.cs
+++ b/src/Clients/MainApp/FSpot.Jobs/SyncMetadataJob.cs
@@ -30,11 +30,13 @@
//
using System;
+
using Banshee.Kernel;
+
using Hyena;
+
using FSpot.Core;
using FSpot.Utils;
-using Mono.Unix;
namespace FSpot.Jobs {
public class SyncMetadataJob : Job
diff --git a/src/Clients/MainApp/FSpot.Loaders/AreaPreparedEventArgs.cs b/src/Clients/MainApp/FSpot.Loaders/AreaPreparedEventArgs.cs
index 31d4a1b..0d4bc19 100644
--- a/src/Clients/MainApp/FSpot.Loaders/AreaPreparedEventArgs.cs
+++ b/src/Clients/MainApp/FSpot.Loaders/AreaPreparedEventArgs.cs
@@ -28,7 +28,6 @@
//
using System;
-using Gdk;
namespace FSpot.Loaders {
public class AreaPreparedEventArgs : EventArgs
diff --git a/src/Clients/MainApp/FSpot.Loaders/AreaUpdatedEventArgs.cs b/src/Clients/MainApp/FSpot.Loaders/AreaUpdatedEventArgs.cs
index cb48789..0a059b3 100644
--- a/src/Clients/MainApp/FSpot.Loaders/AreaUpdatedEventArgs.cs
+++ b/src/Clients/MainApp/FSpot.Loaders/AreaUpdatedEventArgs.cs
@@ -28,7 +28,6 @@
//
using System;
-using Gdk;
namespace FSpot.Loaders {
public class AreaUpdatedEventArgs : EventArgs
diff --git a/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs b/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
index ab5300b..25fc50d 100644
--- a/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
+++ b/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
@@ -30,11 +30,14 @@
//
using System;
using System.Threading;
+
using Gdk;
+
using FSpot.Utils;
-using FSpot.Platform;
using FSpot.Imaging;
+
using Hyena;
+
using TagLib.Image;
namespace FSpot.Loaders
diff --git a/src/Clients/MainApp/FSpot.Loaders/IImageLoader.cs b/src/Clients/MainApp/FSpot.Loaders/IImageLoader.cs
index d477977..90c3758 100644
--- a/src/Clients/MainApp/FSpot.Loaders/IImageLoader.cs
+++ b/src/Clients/MainApp/FSpot.Loaders/IImageLoader.cs
@@ -27,10 +27,12 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot.Utils;
using System;
+
using Gdk;
+
using Hyena;
+
using TagLib.Image;
namespace FSpot.Loaders {
diff --git a/src/Clients/MainApp/FSpot.Loaders/ImageLoader.cs b/src/Clients/MainApp/FSpot.Loaders/ImageLoader.cs
index 51a355c..f297911 100644
--- a/src/Clients/MainApp/FSpot.Loaders/ImageLoader.cs
+++ b/src/Clients/MainApp/FSpot.Loaders/ImageLoader.cs
@@ -29,11 +29,13 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot.Utils;
-using FSpot.Imaging;
using System;
using System.Collections.Generic;
+
+using FSpot.Imaging;
+
using Gdk;
+
using Hyena;
namespace FSpot.Loaders {
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs
index da370cf..b0d91fd 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs
@@ -29,7 +29,9 @@
using System;
using System.IO;
+
using Mono.Unix;
+
using Hyena;
namespace FSpot.UI.Dialog
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/AdjustTimeDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/AdjustTimeDialog.cs
index b6e4e8a..75880b5 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/AdjustTimeDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/AdjustTimeDialog.cs
@@ -32,12 +32,15 @@
//
using System;
+
using Gtk;
-using System.Collections;
+
using Mono.Unix;
+
using FSpot.Core;
using FSpot.Database;
using FSpot.Widgets;
+
using Hyena;
namespace FSpot.UI.Dialog {
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/BuilderDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/BuilderDialog.cs
index f29b8b9..fe99e24 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/BuilderDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/BuilderDialog.cs
@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using GtkBeans;
namespace FSpot.UI.Dialog
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs
index 8f811a7..ba735b1 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs
@@ -29,9 +29,12 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Gtk;
using System;
+
+using Gtk;
+
using Mono.Unix;
+
using FSpot.Query;
using FSpot.Widgets;
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/EditExceptionDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/EditExceptionDialog.cs
index ab1fd17..e7aeffa 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/EditExceptionDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/EditExceptionDialog.cs
@@ -30,10 +30,14 @@
//
using System;
+
using Mono.Unix;
+
using Gtk;
+
using Hyena;
using Hyena.Widgets;
+
using FSpot.Core;
namespace FSpot.UI.Dialog
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/EditTagDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/EditTagDialog.cs
index 57fc7f7..f4d3da4 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/EditTagDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/EditTagDialog.cs
@@ -26,11 +26,14 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+
using System;
-using System.Collections;
using System.Collections.Generic;
+
using Mono.Unix;
+
using Gtk;
+
using FSpot.Core;
using FSpot.Database;
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs
index 094dfa2..2be79c9 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs
@@ -30,13 +30,17 @@
//
using System;
+
using Mono.Unix;
+
using Gtk;
+
using FSpot.Core;
using FSpot.Database;
using FSpot.Widgets;
using FSpot.Utils;
using FSpot.Imaging;
+
using Hyena;
using Hyena.Widgets;
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs
index e5f2104..bd8996a 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs
@@ -27,15 +27,18 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot.Core;
+using System;
+using System.Collections.Generic;
+
using FSpot.UI.Dialog;
using FSpot.Widgets;
using FSpot.Utils;
using FSpot.Import;
+
using Gtk;
+
using Hyena;
-using System;
-using System.Collections.Generic;
+
using Mono.Unix;
namespace FSpot.UI.Dialog
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/ImportFailureDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/ImportFailureDialog.cs
index ad7b4db..229331c 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/ImportFailureDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/ImportFailureDialog.cs
@@ -29,8 +29,11 @@
using System;
using System.Collections.Generic;
+
using Gtk;
+
using Mono.Unix;
+
using Hyena;
namespace FSpot.UI.Dialog
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/LastRollDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/LastRollDialog.cs
index 2a31caa..c92bcee 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/LastRollDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/LastRollDialog.cs
@@ -29,10 +29,12 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+
using System;
using System.Collections.Generic;
using Gtk;
+
using FSpot.Core;
using FSpot.Query;
using FSpot.UI.Dialog;
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/PreferenceDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/PreferenceDialog.cs
index 39c48d5..0333fd0 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/PreferenceDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/PreferenceDialog.cs
@@ -33,11 +33,13 @@ using System;
using System.IO;
using System.Collections.Generic;
using System.Linq;
+
using Gtk;
+
using Mono.Unix;
+
using Hyena;
-using FSpot.Widgets;
namespace FSpot.UI.Dialog {
public class PreferenceDialog : BuilderDialog
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/ProgressDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/ProgressDialog.cs
index 9a1a6f3..797bb0b 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/ProgressDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/ProgressDialog.cs
@@ -29,10 +29,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using GLib;
-using Gtk;
using System;
+using Gtk;
+
using Mono.Unix;
namespace FSpot.UI.Dialog {
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/RatingFilterDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/RatingFilterDialog.cs
index 4e80982..32db710 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/RatingFilterDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/RatingFilterDialog.cs
@@ -32,7 +32,7 @@
//
using Gtk;
-using FSpot;
+
using FSpot.Query;
using FSpot.Widgets;
using FSpot.UI.Dialog;
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/RepairDbDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/RepairDbDialog.cs
index b38f9f5..f7d8849 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/RepairDbDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/RepairDbDialog.cs
@@ -30,8 +30,11 @@
//
using System;
+
using Gtk;
+
using Mono.Unix;
+
using Hyena;
using Hyena.Widgets;
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/RepairDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/RepairDialog.cs
index e62a223..0aa6986 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/RepairDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/RepairDialog.cs
@@ -29,11 +29,11 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Gtk;
-using System;
using System.IO;
-using FSpot.Widgets;
+using Gtk;
+
+using FSpot.Widgets;
using FSpot.Core;
namespace FSpot. UI.Dialog
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/TagSelectionDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/TagSelectionDialog.cs
index cae51bf..3f4f0df 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/TagSelectionDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/TagSelectionDialog.cs
@@ -31,9 +31,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-using Gdk;
using Gtk;
+
using FSpot.Core;
namespace FSpot.UI.Dialog {
diff --git a/src/Clients/MainApp/FSpot.Widgets/BrowseablePointerGridView.cs b/src/Clients/MainApp/FSpot.Widgets/BrowseablePointerGridView.cs
index c9b0f4a..33a8846 100644
--- a/src/Clients/MainApp/FSpot.Widgets/BrowseablePointerGridView.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/BrowseablePointerGridView.cs
@@ -30,11 +30,9 @@
using System;
using Gdk;
-using Gtk;
using FSpot.Core;
-
namespace FSpot.Widgets
{
/// <summary>
diff --git a/src/Clients/MainApp/FSpot.Widgets/CellRendererTextProgress.cs b/src/Clients/MainApp/FSpot.Widgets/CellRendererTextProgress.cs
index 2d1c7fc..e1900fc 100644
--- a/src/Clients/MainApp/FSpot.Widgets/CellRendererTextProgress.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/CellRendererTextProgress.cs
@@ -30,15 +30,8 @@
//
using System;
-using System.Collections.Generic;
using Gtk;
-using GLib;
-
-using FSpot;
-using FSpot.Utils;
-
-using Mono.Unix;
namespace FSpot.Widgets
{
diff --git a/src/Clients/MainApp/FSpot.Widgets/EditorPage.cs b/src/Clients/MainApp/FSpot.Widgets/EditorPage.cs
index c9576a5..32ab7c8 100644
--- a/src/Clients/MainApp/FSpot.Widgets/EditorPage.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/EditorPage.cs
@@ -29,6 +29,9 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+using System;
+using System.Collections.Generic;
+
using FSpot;
using FSpot.Extensions;
using FSpot.Editors;
@@ -41,8 +44,6 @@ using Gtk;
using Mono.Addins;
using Mono.Unix;
-using System;
-using System.Collections.Generic;
using Hyena;
using Hyena.Widgets;
diff --git a/src/Clients/MainApp/FSpot.Widgets/Filmstrip.cs b/src/Clients/MainApp/FSpot.Widgets/Filmstrip.cs
index 7b33096..d1799d6 100644
--- a/src/Clients/MainApp/FSpot.Widgets/Filmstrip.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/Filmstrip.cs
@@ -37,7 +37,6 @@
// * Handle orientation changes (low) (require gtk# changes, so I can trigger an OrientationChanged event)
using System;
-using System.Collections;
using System.Collections.Generic;
using Gtk;
@@ -45,7 +44,6 @@ using Gdk;
using FSpot.Core;
using FSpot.Utils;
-using FSpot.Platform;
using FSpot.Bling;
using Hyena;
diff --git a/src/Clients/MainApp/FSpot.Widgets/FindBar.cs b/src/Clients/MainApp/FSpot.Widgets/FindBar.cs
index 75ee91d..a233ed4 100644
--- a/src/Clients/MainApp/FSpot.Widgets/FindBar.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/FindBar.cs
@@ -32,15 +32,16 @@
//
using System;
-using System.Collections;
using System.Text;
using System.Text.RegularExpressions;
+
using Gtk;
-using Gdk;
+
using Mono.Unix;
using FSpot.Core;
using FSpot.Query;
+
using Hyena;
namespace FSpot.Widgets {
diff --git a/src/Clients/MainApp/FSpot.Widgets/FolderTreeModel.cs b/src/Clients/MainApp/FSpot.Widgets/FolderTreeModel.cs
index 9c047c7..0312608 100644
--- a/src/Clients/MainApp/FSpot.Widgets/FolderTreeModel.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/FolderTreeModel.cs
@@ -30,19 +30,16 @@
//
using System;
-using System.Collections.Generic;
using Gtk;
-using GLib;
using FSpot;
using FSpot.Database;
using FSpot.Core;
+
using Hyena;
using Hyena.Data.Sqlite;
-using Mono.Unix;
-
namespace FSpot.Widgets
{
public class FolderTreeModel : TreeStore
diff --git a/src/Clients/MainApp/FSpot.Widgets/FolderTreePage.cs b/src/Clients/MainApp/FSpot.Widgets/FolderTreePage.cs
index aba8bc8..a1ee65f 100644
--- a/src/Clients/MainApp/FSpot.Widgets/FolderTreePage.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/FolderTreePage.cs
@@ -29,9 +29,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using Gtk;
+
using Mono.Unix;
+
using FSpot.Extensions;
namespace FSpot.Widgets
diff --git a/src/Clients/MainApp/FSpot.Widgets/FolderTreeView.cs b/src/Clients/MainApp/FSpot.Widgets/FolderTreeView.cs
index c760a5a..32d6126 100644
--- a/src/Clients/MainApp/FSpot.Widgets/FolderTreeView.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/FolderTreeView.cs
@@ -30,7 +30,6 @@
//
using System;
-using System.Collections.Generic;
using Gtk;
using GLib;
diff --git a/src/Clients/MainApp/FSpot.Widgets/ImageInfo.cs b/src/Clients/MainApp/FSpot.Widgets/ImageInfo.cs
index 55dbacd..6872a3d 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ImageInfo.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ImageInfo.cs
@@ -30,11 +30,14 @@
//
using System;
+
using Cairo;
using Gdk;
using Gtk;
+
using FSpot.Utils;
using FSpot.Imaging;
+
using Hyena;
namespace FSpot.Widgets {
diff --git a/src/Clients/MainApp/FSpot.Widgets/InfoBox.cs b/src/Clients/MainApp/FSpot.Widgets/InfoBox.cs
index 7ea7307..cb9a44c 100644
--- a/src/Clients/MainApp/FSpot.Widgets/InfoBox.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/InfoBox.cs
@@ -31,18 +31,19 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Gtk;
using System;
using System.Collections.Generic;
-using System.IO;
+
+using Mono.Unix;
+
using FSpot.Core;
using FSpot.Imaging;
-using Mono.Unix;
using FSpot.Utils;
+
+using Gtk;
using GLib;
using GFile = GLib.File;
using GFileInfo = GLib.FileInfo;
-using Hyena;
// FIXME TODO: We want to use something like EClippedLabel here throughout so it handles small sizes
// gracefully using ellipsis.
diff --git a/src/Clients/MainApp/FSpot.Widgets/Loupe.cs b/src/Clients/MainApp/FSpot.Widgets/Loupe.cs
index 12bae67..b5571ca 100644
--- a/src/Clients/MainApp/FSpot.Widgets/Loupe.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/Loupe.cs
@@ -27,16 +27,16 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Cairo;
+using System;
+using Cairo;
using Gtk;
using Gdk;
-using System;
-using System.Runtime.InteropServices;
-using Mono.Unix;
+
using FSpot.Core;
using FSpot.Utils;
using FSpot.Gui;
+
using Hyena;
namespace FSpot.Widgets {
diff --git a/src/Clients/MainApp/FSpot.Widgets/MetadataDisplay.cs b/src/Clients/MainApp/FSpot.Widgets/MetadataDisplay.cs
index 2201dbd..34e4d57 100644
--- a/src/Clients/MainApp/FSpot.Widgets/MetadataDisplay.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/MetadataDisplay.cs
@@ -28,9 +28,8 @@
//
using System;
-using System.IO;
-using System.Text;
using System.Collections.Generic;
+
using Gtk;
using Mono.Unix;
@@ -38,7 +37,6 @@ using Mono.Unix;
using FSpot.Core;
using FSpot.Utils;
using FSpot.Extensions;
-using FSpot.Imaging;
namespace FSpot.Widgets {
public class MetadataDisplayPage : SidebarPage {
diff --git a/src/Clients/MainApp/FSpot.Widgets/PhotoImageView.cs b/src/Clients/MainApp/FSpot.Widgets/PhotoImageView.cs
index eac9421..38f9ffc 100644
--- a/src/Clients/MainApp/FSpot.Widgets/PhotoImageView.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/PhotoImageView.cs
@@ -32,18 +32,20 @@
//
using System;
+
using FSpot.Core;
-using FSpot.Editors;
-using FSpot.Utils;
using FSpot.Loaders;
using Hyena;
+
using Gdk;
using TagLib.Image;
-namespace FSpot.Widgets {
- public class PhotoImageView : ImageView {
+namespace FSpot.Widgets
+{
+ public class PhotoImageView : ImageView
+ {
#region public API
protected PhotoImageView (IntPtr raw) : base (raw) { }
diff --git a/src/Clients/MainApp/FSpot.Widgets/PreviewPopup.cs b/src/Clients/MainApp/FSpot.Widgets/PreviewPopup.cs
index 1c08095..0d2c376 100644
--- a/src/Clients/MainApp/FSpot.Widgets/PreviewPopup.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/PreviewPopup.cs
@@ -30,15 +30,19 @@
//
using System;
+
using Cairo;
using Gdk;
+
using FSpot.Core;
using FSpot.Widgets;
using FSpot.Utils;
using FSpot.Gui;
-namespace FSpot {
- public class PreviewPopup : Gtk.Window {
+namespace FSpot
+{
+ public class PreviewPopup : Gtk.Window
+ {
private CollectionGridView view;
private Gtk.Image image;
private Gtk.Label label;
diff --git a/src/Clients/MainApp/FSpot.Widgets/QueryView.cs b/src/Clients/MainApp/FSpot.Widgets/QueryView.cs
index 16fb9b1..c368661 100644
--- a/src/Clients/MainApp/FSpot.Widgets/QueryView.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/QueryView.cs
@@ -35,14 +35,11 @@
// Copyright (C) 2004 Novell, Inc.
//
-using System;
-
using Gdk;
using Gtk;
using FSpot.Core;
-
namespace FSpot.Widgets
{
public class QueryView : SelectionCollectionGridView
diff --git a/src/Clients/MainApp/FSpot.Widgets/RatingMenuItem.cs b/src/Clients/MainApp/FSpot.Widgets/RatingMenuItem.cs
index 74d786e..496d564 100644
--- a/src/Clients/MainApp/FSpot.Widgets/RatingMenuItem.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/RatingMenuItem.cs
@@ -30,7 +30,6 @@
using System;
-
namespace FSpot.Widgets
{
public class RatingMenuItem : Hyena.Widgets.RatingMenuItem
diff --git a/src/Clients/MainApp/FSpot.Widgets/SelectionCollectionGridView.cs b/src/Clients/MainApp/FSpot.Widgets/SelectionCollectionGridView.cs
index 23952fc..c14c3d7 100644
--- a/src/Clients/MainApp/FSpot.Widgets/SelectionCollectionGridView.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/SelectionCollectionGridView.cs
@@ -35,7 +35,6 @@ using Gtk;
using FSpot.Core;
-
namespace FSpot.Widgets
{
diff --git a/src/Clients/MainApp/FSpot.Widgets/Sharpener.cs b/src/Clients/MainApp/FSpot.Widgets/Sharpener.cs
index 3e3ebc5..2dea60e 100644
--- a/src/Clients/MainApp/FSpot.Widgets/Sharpener.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/Sharpener.cs
@@ -28,15 +28,16 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Cairo;
-using Gtk;
-using Gdk;
using System;
-using System.Runtime.InteropServices;
+
+using Gtk;
+
using Mono.Unix;
+
using FSpot.Widgets;
using FSpot.UI.Dialog;
+
using Hyena.Widgets;
namespace FSpot.Widgets
diff --git a/src/Clients/MainApp/FSpot.Widgets/Sidebar.cs b/src/Clients/MainApp/FSpot.Widgets/Sidebar.cs
index 40fa08d..e4f2561 100644
--- a/src/Clients/MainApp/FSpot.Widgets/Sidebar.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/Sidebar.cs
@@ -27,14 +27,15 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+using System;
+using System.Collections.Generic;
+
using FSpot.Core;
using FSpot.Extensions;
-using FSpot.Utils;
+
using Gtk;
-using Mono.Addins;
+
using Mono.Unix;
-using System;
-using System.Collections.Generic;
namespace FSpot.Widgets
{
diff --git a/src/Clients/MainApp/FSpot.Widgets/SlideShow.cs b/src/Clients/MainApp/FSpot.Widgets/SlideShow.cs
index bd20866..9daf682 100644
--- a/src/Clients/MainApp/FSpot.Widgets/SlideShow.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/SlideShow.cs
@@ -32,7 +32,9 @@ using System.Collections.Generic;
using Gtk;
using Gdk;
+
using Mono.Addins;
+
using FSpot.Core;
using FSpot.Bling;
using FSpot.Extensions;
diff --git a/src/Clients/MainApp/FSpot.Widgets/SoftFocus.cs b/src/Clients/MainApp/FSpot.Widgets/SoftFocus.cs
index 613f13a..3ccc4a6 100644
--- a/src/Clients/MainApp/FSpot.Widgets/SoftFocus.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/SoftFocus.cs
@@ -29,16 +29,16 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Cairo;
using System;
-using System.Runtime.InteropServices;
-
-using Pinta.Core;
-namespace FSpot.Widgets {
+using Cairo;
- public class SoftFocus : IDisposable {
+using Pinta.Core;
+namespace FSpot.Widgets
+{
+ public class SoftFocus : IDisposable
+ {
ImageInfo info;
double radius;
double amount;
diff --git a/src/Clients/MainApp/FSpot.Widgets/TagEntry.cs b/src/Clients/MainApp/FSpot.Widgets/TagEntry.cs
index ad18266..81bf936 100644
--- a/src/Clients/MainApp/FSpot.Widgets/TagEntry.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/TagEntry.cs
@@ -33,8 +33,8 @@
//
using System.Text;
-using System.Collections;
using System.Collections.Generic;
+
using FSpot.Core;
namespace FSpot.Widgets
diff --git a/src/Clients/MainApp/FSpot.Widgets/TagMenu.cs b/src/Clients/MainApp/FSpot.Widgets/TagMenu.cs
index 58818e1..7442cef 100644
--- a/src/Clients/MainApp/FSpot.Widgets/TagMenu.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/TagMenu.cs
@@ -31,15 +31,16 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+using System;
+
using Gtk;
-#if GTK_2_16
using GtkBeans;
-#endif
-using System;
+
using FSpot;
+using FSpot.Core;
using FSpot.Utils;
+
using Hyena;
-using FSpot.Core;
public class TagMenu : Menu {
private TagStore tag_store;
@@ -63,10 +64,7 @@ public class TagMenu : Menu {
Value = t;
if (t.Icon != null) {
this.Image = new Gtk.Image (t.SizedIcon);
-#if GTK_2_16
- // override Gnome 2.28+ default setting not to show menuitem icons
this.SetAlwaysShowImage (true);
-#endif
}
}
diff --git a/src/Clients/MainApp/FSpot.Widgets/TagView.cs b/src/Clients/MainApp/FSpot.Widgets/TagView.cs
index b337e7b..a378dd0 100644
--- a/src/Clients/MainApp/FSpot.Widgets/TagView.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/TagView.cs
@@ -32,8 +32,10 @@
//
using System;
+
using Gtk;
using Gdk;
+
using FSpot.Core;
namespace FSpot.Widgets {
diff --git a/src/Clients/MainApp/FSpot.Widgets/ThumbnailCaptionRenderer.cs b/src/Clients/MainApp/FSpot.Widgets/ThumbnailCaptionRenderer.cs
index e17ed3c..a940115 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ThumbnailCaptionRenderer.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ThumbnailCaptionRenderer.cs
@@ -27,14 +27,11 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
using Gtk;
using Gdk;
using FSpot.Core;
-
namespace FSpot.Widgets
{
/// <summary>
diff --git a/src/Clients/MainApp/FSpot.Widgets/ThumbnailDateCaptionRenderer.cs b/src/Clients/MainApp/FSpot.Widgets/ThumbnailDateCaptionRenderer.cs
index 0bf105d..884ffe7 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ThumbnailDateCaptionRenderer.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ThumbnailDateCaptionRenderer.cs
@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.Collections.Generic;
using Gtk;
@@ -37,7 +36,6 @@ using Hyena.Gui;
using FSpot.Core;
-
namespace FSpot.Widgets
{
/// <summary>
diff --git a/src/Clients/MainApp/FSpot.Widgets/ThumbnailDecorationRenderer.cs b/src/Clients/MainApp/FSpot.Widgets/ThumbnailDecorationRenderer.cs
index 534e44e..655aec4 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ThumbnailDecorationRenderer.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ThumbnailDecorationRenderer.cs
@@ -27,14 +27,11 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
using Gtk;
using Gdk;
using FSpot.Core;
-
namespace FSpot.Widgets
{
/// <summary>
diff --git a/src/Clients/MainApp/FSpot.Widgets/ThumbnailFilenameCaptionRenderer.cs b/src/Clients/MainApp/FSpot.Widgets/ThumbnailFilenameCaptionRenderer.cs
index 55cf635..5e93fcd 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ThumbnailFilenameCaptionRenderer.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ThumbnailFilenameCaptionRenderer.cs
@@ -27,12 +27,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.IO;
using FSpot.Core;
-
namespace FSpot.Widgets
{
diff --git a/src/Clients/MainApp/FSpot.Widgets/ThumbnailRatingDecorationRenderer.cs b/src/Clients/MainApp/FSpot.Widgets/ThumbnailRatingDecorationRenderer.cs
index 12a9a6e..548cbf7 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ThumbnailRatingDecorationRenderer.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ThumbnailRatingDecorationRenderer.cs
@@ -27,14 +27,11 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
using Gtk;
using Gdk;
using FSpot.Core;
-
namespace FSpot.Widgets
{
diff --git a/src/Clients/MainApp/FSpot.Widgets/ThumbnailTagsCaptionRenderer.cs b/src/Clients/MainApp/FSpot.Widgets/ThumbnailTagsCaptionRenderer.cs
index d668f2e..741a26f 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ThumbnailTagsCaptionRenderer.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ThumbnailTagsCaptionRenderer.cs
@@ -27,14 +27,11 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
using Gtk;
using Gdk;
using FSpot.Core;
-
namespace FSpot.Widgets
{
public class ThumbnailTagsCaptionRenderer : ThumbnailCaptionRenderer
diff --git a/src/Clients/MainApp/FSpot.Widgets/ThumbnailTextCaptionRenderer.cs b/src/Clients/MainApp/FSpot.Widgets/ThumbnailTextCaptionRenderer.cs
index 2b3555a..acbada1 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ThumbnailTextCaptionRenderer.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ThumbnailTextCaptionRenderer.cs
@@ -27,8 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
using Gtk;
using Gdk;
@@ -36,7 +34,6 @@ using Hyena.Gui;
using FSpot.Core;
-
namespace FSpot.Widgets
{
/// <summary>
diff --git a/src/Clients/MainApp/FSpot.Widgets/TrayView.cs b/src/Clients/MainApp/FSpot.Widgets/TrayView.cs
index 82e5b23..157c4ec 100644
--- a/src/Clients/MainApp/FSpot.Widgets/TrayView.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/TrayView.cs
@@ -29,12 +29,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Gdk;
-using Gtk;
-
using FSpot.Core;
-
namespace FSpot.Widgets
{
/// <summary>
diff --git a/src/Clients/MainApp/FSpot/Accelerometer.cs b/src/Clients/MainApp/FSpot/Accelerometer.cs
index 77ac544..2ddb061 100644
--- a/src/Clients/MainApp/FSpot/Accelerometer.cs
+++ b/src/Clients/MainApp/FSpot/Accelerometer.cs
@@ -36,7 +36,6 @@
using System;
using System.IO;
-using FSpot.Utils;
using Hyena;
using TagLib.Image;
diff --git a/src/Clients/MainApp/FSpot/BitConverter.cs b/src/Clients/MainApp/FSpot/BitConverter.cs
index 6dc953e..440de93 100644
--- a/src/Clients/MainApp/FSpot/BitConverter.cs
+++ b/src/Clients/MainApp/FSpot/BitConverter.cs
@@ -29,9 +29,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-using System.Runtime.InteropServices;
-
namespace FSpot {
//[Obsolete ("use Mono.DataConvert instead")]
public class BitConverter {
diff --git a/src/Clients/MainApp/FSpot/ColorManagement.cs b/src/Clients/MainApp/FSpot/ColorManagement.cs
index c297154..8f22bef 100644
--- a/src/Clients/MainApp/FSpot/ColorManagement.cs
+++ b/src/Clients/MainApp/FSpot/ColorManagement.cs
@@ -30,6 +30,7 @@
using System;
using System.IO;
using System.Collections.Generic;
+
using FSpot.Core;
namespace FSpot {
diff --git a/src/Clients/MainApp/FSpot/ControlOverlay.cs b/src/Clients/MainApp/FSpot/ControlOverlay.cs
index f91b6dc..0b45765 100644
--- a/src/Clients/MainApp/FSpot/ControlOverlay.cs
+++ b/src/Clients/MainApp/FSpot/ControlOverlay.cs
@@ -32,11 +32,11 @@
using Cairo;
using System;
-using Gtk;
-using FSpot.Widgets;
-using FSpot.Utils;
-using FSpot.Core;
+
using FSpot.Gui;
+using FSpot.Utils;
+
+using Gtk;
namespace FSpot {
public class ControlOverlay : Window {
diff --git a/src/Clients/MainApp/FSpot/DragDropTargets.cs b/src/Clients/MainApp/FSpot/DragDropTargets.cs
index ab5e034..5f71484 100644
--- a/src/Clients/MainApp/FSpot/DragDropTargets.cs
+++ b/src/Clients/MainApp/FSpot/DragDropTargets.cs
@@ -31,7 +31,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using Gtk;
namespace FSpot
diff --git a/src/Clients/MainApp/FSpot/ExportStore.cs b/src/Clients/MainApp/FSpot/ExportStore.cs
index a29d187..8759e71 100644
--- a/src/Clients/MainApp/FSpot/ExportStore.cs
+++ b/src/Clients/MainApp/FSpot/ExportStore.cs
@@ -31,17 +31,14 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-using Gdk;
-using Gtk;
using System;
-using System.Collections;
using System.Collections.Generic;
-using System.IO;
using FSpot;
using FSpot.Core;
using FSpot.Database;
+
using Hyena.Data.Sqlite;
namespace FSpot
diff --git a/src/Clients/MainApp/FSpot/FolderQueryWidget.cs b/src/Clients/MainApp/FSpot/FolderQueryWidget.cs
index 1431cb1..f845ea5 100644
--- a/src/Clients/MainApp/FSpot/FolderQueryWidget.cs
+++ b/src/Clients/MainApp/FSpot/FolderQueryWidget.cs
@@ -31,7 +31,6 @@
using System;
using System.Text;
-using System.Collections;
using System.Collections.Generic;
using System.Linq;
@@ -39,7 +38,6 @@ using Gtk;
using Hyena;
using FSpot;
-using FSpot.Utils;
using FSpot.Query;
namespace FSpot
diff --git a/src/Clients/MainApp/FSpot/FullScreenView.cs b/src/Clients/MainApp/FSpot/FullScreenView.cs
index 3de6420..b2f749a 100644
--- a/src/Clients/MainApp/FSpot/FullScreenView.cs
+++ b/src/Clients/MainApp/FSpot/FullScreenView.cs
@@ -30,13 +30,16 @@
//
using System;
+
using Gtk;
-using Gdk;
+
using FSpot.Core;
using FSpot.Widgets;
using FSpot.Gui;
using FSpot.Utils;
+
using Hyena;
+
using Mono.Unix;
namespace FSpot {
diff --git a/src/Clients/MainApp/FSpot/GroupAdaptor.cs b/src/Clients/MainApp/FSpot/GroupAdaptor.cs
index e7c0c4f..1f1828b 100644
--- a/src/Clients/MainApp/FSpot/GroupAdaptor.cs
+++ b/src/Clients/MainApp/FSpot/GroupAdaptor.cs
@@ -30,7 +30,6 @@
//
using FSpot.Core;
-using FSpot.Utils;
namespace FSpot {
public interface ILimitable {
diff --git a/src/Clients/MainApp/FSpot/GroupSelector.cs b/src/Clients/MainApp/FSpot/GroupSelector.cs
index e9e172c..0e6803b 100644
--- a/src/Clients/MainApp/FSpot/GroupSelector.cs
+++ b/src/Clients/MainApp/FSpot/GroupSelector.cs
@@ -30,11 +30,13 @@
//
using System;
+
using Mono.Unix;
+
using Gtk;
using Gdk;
using GLib;
-using FSpot.Core;
+
using FSpot.Utils;
using FSpot.Widgets;
diff --git a/src/Clients/MainApp/FSpot/ItemAction.cs b/src/Clients/MainApp/FSpot/ItemAction.cs
index ce377c6..3dad05c 100644
--- a/src/Clients/MainApp/FSpot/ItemAction.cs
+++ b/src/Clients/MainApp/FSpot/ItemAction.cs
@@ -31,11 +31,13 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+using System;
+
using Gtk;
+
using Mono.Unix;
+
using FSpot.Core;
-using FSpot.Filters;
-using System;
using FSpot.UI.Dialog;
namespace FSpot {
diff --git a/src/Clients/MainApp/FSpot/JobStore.cs b/src/Clients/MainApp/FSpot/JobStore.cs
index ca50335..89c8880 100644
--- a/src/Clients/MainApp/FSpot/JobStore.cs
+++ b/src/Clients/MainApp/FSpot/JobStore.cs
@@ -29,14 +29,15 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System.Collections;
-using System.IO;
using System;
+
using Banshee.Kernel;
-using FSpot.Jobs;
-using FSpot.Database;
+
using FSpot;
using FSpot.Core;
+using FSpot.Database;
+using FSpot.Jobs;
+
using Hyena;
using Hyena.Data.Sqlite;
diff --git a/src/Clients/MainApp/FSpot/Literal.cs b/src/Clients/MainApp/FSpot/Literal.cs
index df2a168..67a7e00 100644
--- a/src/Clients/MainApp/FSpot/Literal.cs
+++ b/src/Clients/MainApp/FSpot/Literal.cs
@@ -34,13 +34,14 @@
// http://mail.gnome.org/archives/f-spot-list/2005-November/msg00053.html
// http://bugzilla-attachments.gnome.org/attachment.cgi?id=54566
using System;
-using System.Collections;
using System.Collections.Generic;
using System.Text;
+
using Mono.Unix;
+
using Gtk;
using Gdk;
-using Hyena;
+
using FSpot.Core;
namespace FSpot
diff --git a/src/Clients/MainApp/FSpot/MainWindow.cs b/src/Clients/MainApp/FSpot/MainWindow.cs
index 378f2db..c819725 100644
--- a/src/Clients/MainApp/FSpot/MainWindow.cs
+++ b/src/Clients/MainApp/FSpot/MainWindow.cs
@@ -30,10 +30,7 @@
//
using System;
-using System.Text;
using System.Linq;
-using System.IO;
-using System.Collections;
using System.Collections.Generic;
using Gdk;
@@ -44,7 +41,6 @@ using Mono.Unix;
using Hyena;
using Hyena.Widgets;
-using Banshee.Kernel;
using FSpot;
using FSpot.Core;
diff --git a/src/Clients/MainApp/FSpot/MetaStore.cs b/src/Clients/MainApp/FSpot/MetaStore.cs
index 643bcb9..2281373 100644
--- a/src/Clients/MainApp/FSpot/MetaStore.cs
+++ b/src/Clients/MainApp/FSpot/MetaStore.cs
@@ -29,14 +29,12 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Gdk;
-using Gtk;
-using System.Collections;
-using System.IO;
using System;
+
using FSpot;
using FSpot.Core;
using FSpot.Database;
+
using Hyena.Data.Sqlite;
namespace FSpot {
diff --git a/src/Clients/MainApp/FSpot/Photo.cs b/src/Clients/MainApp/FSpot/Photo.cs
index 78c64aa..773c69a 100644
--- a/src/Clients/MainApp/FSpot/Photo.cs
+++ b/src/Clients/MainApp/FSpot/Photo.cs
@@ -34,14 +34,12 @@ using Hyena;
using System;
using System.IO;
using System.Linq;
-using System.Collections;
using System.Collections.Generic;
using Mono.Unix;
using FSpot.Core;
using FSpot.Utils;
-using FSpot.Platform;
using FSpot.Imaging;
namespace FSpot
diff --git a/src/Clients/MainApp/FSpot/PhotoLoader.cs b/src/Clients/MainApp/FSpot/PhotoLoader.cs
index 6d281b2..1f0bfe1 100644
--- a/src/Clients/MainApp/FSpot/PhotoLoader.cs
+++ b/src/Clients/MainApp/FSpot/PhotoLoader.cs
@@ -34,9 +34,7 @@
using System;
using FSpot.Core;
-using FSpot.Platform;
using FSpot.Imaging;
-using Hyena;
namespace FSpot {
[Obsolete ("nuke or rename this")]
diff --git a/src/Clients/MainApp/FSpot/PhotoQuery.cs b/src/Clients/MainApp/FSpot/PhotoQuery.cs
index 3f9c4af..1ed8600 100644
--- a/src/Clients/MainApp/FSpot/PhotoQuery.cs
+++ b/src/Clients/MainApp/FSpot/PhotoQuery.cs
@@ -34,10 +34,11 @@
//
using System;
-using System.Collections;
using System.Collections.Generic;
+
using FSpot.Core;
using FSpot.Query;
+
using Hyena;
namespace FSpot {
diff --git a/src/Clients/MainApp/FSpot/PhotoStore.cs b/src/Clients/MainApp/FSpot/PhotoStore.cs
index 79f823f..497145d 100644
--- a/src/Clients/MainApp/FSpot/PhotoStore.cs
+++ b/src/Clients/MainApp/FSpot/PhotoStore.cs
@@ -33,24 +33,18 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Gdk;
-using Gtk;
using Mono.Unix;
-using System.Collections;
+using System;
using System.Collections.Generic;
-using System.IO;
using System.Text;
-using System;
using FSpot;
using FSpot.Core;
using FSpot.Database;
using FSpot.Jobs;
using FSpot.Query;
-using FSpot.Utils;
-using FSpot.Platform;
using Hyena;
using Hyena.Data.Sqlite;
diff --git a/src/Clients/MainApp/FSpot/PhotoView.cs b/src/Clients/MainApp/FSpot/PhotoView.cs
index b02e057..1672139 100644
--- a/src/Clients/MainApp/FSpot/PhotoView.cs
+++ b/src/Clients/MainApp/FSpot/PhotoView.cs
@@ -31,20 +31,16 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+using System;
+
using Gdk;
-using GLib;
using Gtk;
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Xml.Serialization;
+
using Mono.Unix;
using FSpot.Core;
using FSpot.Widgets;
using FSpot.Utils;
-using Hyena;
-using FSpot.UI.Dialog;
namespace FSpot {
public class PhotoView : EventBox {
diff --git a/src/Clients/MainApp/FSpot/PixbufCache.cs b/src/Clients/MainApp/FSpot/PixbufCache.cs
index f276cbf..8c67407 100644
--- a/src/Clients/MainApp/FSpot/PixbufCache.cs
+++ b/src/Clients/MainApp/FSpot/PixbufCache.cs
@@ -29,14 +29,12 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-using System.Collections;
using System.Collections.Generic;
using System.Threading;
+
using Hyena;
using FSpot.Utils;
-using FSpot.Platform;
namespace FSpot
{
diff --git a/src/Clients/MainApp/FSpot/Preferences.cs b/src/Clients/MainApp/FSpot/Preferences.cs
index dba243d..935c242 100644
--- a/src/Clients/MainApp/FSpot/Preferences.cs
+++ b/src/Clients/MainApp/FSpot/Preferences.cs
@@ -31,12 +31,14 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System.Net;
using System;
using System.Collections.Generic;
+
using Mono.Unix;
+
using FSpot.Core;
using FSpot.Platform;
+
using Hyena;
namespace FSpot
diff --git a/src/Clients/MainApp/FSpot/PrintOperation.cs b/src/Clients/MainApp/FSpot/PrintOperation.cs
index c5aaaf5..e7e3d51 100644
--- a/src/Clients/MainApp/FSpot/PrintOperation.cs
+++ b/src/Clients/MainApp/FSpot/PrintOperation.cs
@@ -28,13 +28,16 @@
//
using Cairo;
+
using System;
using System.Runtime.InteropServices;
+
using Mono.Unix;
using FSpot.Core;
using FSpot.Widgets;
using FSpot.Imaging;
+
using Hyena;
namespace FSpot
diff --git a/src/Clients/MainApp/FSpot/ProgressItem.cs b/src/Clients/MainApp/FSpot/ProgressItem.cs
index 5313275..1879151 100644
--- a/src/Clients/MainApp/FSpot/ProgressItem.cs
+++ b/src/Clients/MainApp/FSpot/ProgressItem.cs
@@ -27,8 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
namespace FSpot {
public class ProgressItem {
public ProgressItem () {
diff --git a/src/Clients/MainApp/FSpot/QueryWidget.cs b/src/Clients/MainApp/FSpot/QueryWidget.cs
index fe41915..8327294 100644
--- a/src/Clients/MainApp/FSpot/QueryWidget.cs
+++ b/src/Clients/MainApp/FSpot/QueryWidget.cs
@@ -42,9 +42,8 @@ using Gtk;
using FSpot.Core;
using FSpot.Database;
-using FSpot.Utils;
-using FSpot.Query;
using FSpot.Widgets;
+
using Hyena;
diff --git a/src/Clients/MainApp/FSpot/RollStore.cs b/src/Clients/MainApp/FSpot/RollStore.cs
index 7f355eb..bb4088d 100644
--- a/src/Clients/MainApp/FSpot/RollStore.cs
+++ b/src/Clients/MainApp/FSpot/RollStore.cs
@@ -31,15 +31,12 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
+
using System;
+using System.Collections.Generic;
using FSpot.Core;
using FSpot.Database;
-using FSpot.Utils;
-using FSpot;
using Hyena;
using Hyena.Data.Sqlite;
diff --git a/src/Clients/MainApp/FSpot/RotateCommand.cs b/src/Clients/MainApp/FSpot/RotateCommand.cs
index 3c0f889..459ba22 100644
--- a/src/Clients/MainApp/FSpot/RotateCommand.cs
+++ b/src/Clients/MainApp/FSpot/RotateCommand.cs
@@ -35,15 +35,14 @@ using System;
using System.IO;
using Gtk;
-using Gdk;
using FSpot;
+using FSpot.Core;
using FSpot.UI.Dialog;
+using FSpot.Utils;
using Hyena;
using Hyena.Widgets;
-using FSpot.Utils;
-using FSpot.Core;
using Mono.Unix;
diff --git a/src/Clients/MainApp/FSpot/SingleView.cs b/src/Clients/MainApp/FSpot/SingleView.cs
index 8607683..38e8733 100644
--- a/src/Clients/MainApp/FSpot/SingleView.cs
+++ b/src/Clients/MainApp/FSpot/SingleView.cs
@@ -33,6 +33,7 @@
using Gtk;
using Gdk;
+
using System;
using System.Collections.Generic;
@@ -40,6 +41,7 @@ using Mono.Addins;
using Mono.Unix;
using Hyena;
+
using FSpot.Extensions;
using FSpot.Utils;
using FSpot.UI.Dialog;
diff --git a/src/Clients/MainApp/FSpot/TagQueryWidget.cs b/src/Clients/MainApp/FSpot/TagQueryWidget.cs
index 94fe2e8..3ff85cf 100644
--- a/src/Clients/MainApp/FSpot/TagQueryWidget.cs
+++ b/src/Clients/MainApp/FSpot/TagQueryWidget.cs
@@ -30,10 +30,10 @@
//
using System;
-using System.Collections;
using System.Collections.Generic;
-using System.Text;
+
using Mono.Unix;
+
using Gtk;
using Gdk;
diff --git a/src/Clients/MainApp/FSpot/TagSelectionWidget.cs b/src/Clients/MainApp/FSpot/TagSelectionWidget.cs
index afc3a8e..cf69395 100644
--- a/src/Clients/MainApp/FSpot/TagSelectionWidget.cs
+++ b/src/Clients/MainApp/FSpot/TagSelectionWidget.cs
@@ -29,13 +29,9 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System.Collections;
using System.Collections.Generic;
-using System.IO;
using System;
-using GLib;
-
using Gdk;
using Gtk;
@@ -47,7 +43,7 @@ using FSpot.Core;
using FSpot.Database;
using FSpot.Utils;
using FSpot.Widgets;
-using FSpot.UI.Dialog;
+
using Hyena.Widgets;
diff --git a/src/Clients/MainApp/FSpot/TagStore.cs b/src/Clients/MainApp/FSpot/TagStore.cs
index a532434..651250e 100644
--- a/src/Clients/MainApp/FSpot/TagStore.cs
+++ b/src/Clients/MainApp/FSpot/TagStore.cs
@@ -31,19 +31,18 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Gdk;
-using Gtk;
using Mono.Unix;
-using System.Collections.Generic;
-using System.Collections;
-using System.IO;
+
using System;
+using System.Collections;
+using System.Collections.Generic;
+
using FSpot;
using FSpot.Core;
using FSpot.Database;
using FSpot.Jobs;
-using FSpot.Query;
using FSpot.Utils;
+
using Hyena;
using Hyena.Data.Sqlite;
diff --git a/src/Clients/MainApp/FSpot/Term.cs b/src/Clients/MainApp/FSpot/Term.cs
index b79e595..fccb46b 100644
--- a/src/Clients/MainApp/FSpot/Term.cs
+++ b/src/Clients/MainApp/FSpot/Term.cs
@@ -34,13 +34,15 @@
// http://mail.gnome.org/archives/f-spot-list/2005-November/msg00053.html
// http://bugzilla-attachments.gnome.org/attachment.cgi?id=54566
using System;
-using System.Collections;
using System.Collections.Generic;
using System.Text;
+
using Mono.Unix;
+
using Gtk;
-using Gdk;
+
using Hyena;
+
using FSpot.Core;
namespace FSpot
diff --git a/src/Clients/MainApp/FSpot/ThumbnailCache.cs b/src/Clients/MainApp/FSpot/ThumbnailCache.cs
index c785c5e..6291242 100644
--- a/src/Clients/MainApp/FSpot/ThumbnailCache.cs
+++ b/src/Clients/MainApp/FSpot/ThumbnailCache.cs
@@ -33,11 +33,11 @@
//
using System;
-using System.Collections;
using System.Collections.Generic;
using Gdk;
using Hyena;
+
using FSpot.Utils;
namespace FSpot
diff --git a/src/Clients/MainApp/FSpot/ThumbnailGenerator.cs b/src/Clients/MainApp/FSpot/ThumbnailGenerator.cs
index 26e7233..7a52bdb 100644
--- a/src/Clients/MainApp/FSpot/ThumbnailGenerator.cs
+++ b/src/Clients/MainApp/FSpot/ThumbnailGenerator.cs
@@ -32,11 +32,11 @@
//
using System;
+
using Hyena;
+
using FSpot.Utils;
-using FSpot.Platform;
-using Mono.Unix.Native;
using GFileInfo = GLib.FileInfo;
namespace FSpot {
diff --git a/src/Clients/MainApp/FSpot/TimeAdaptor.cs b/src/Clients/MainApp/FSpot/TimeAdaptor.cs
index 33c970f..f407fe8 100644
--- a/src/Clients/MainApp/FSpot/TimeAdaptor.cs
+++ b/src/Clients/MainApp/FSpot/TimeAdaptor.cs
@@ -36,8 +36,10 @@
using System;
using System.Threading;
using System.Collections.Generic;
+
using FSpot.Core;
using FSpot.Query;
+
using Hyena;
namespace FSpot {
diff --git a/src/Clients/MainApp/FSpot/UriCollection.cs b/src/Clients/MainApp/FSpot/UriCollection.cs
index 85f168f..6e12a45 100644
--- a/src/Clients/MainApp/FSpot/UriCollection.cs
+++ b/src/Clients/MainApp/FSpot/UriCollection.cs
@@ -29,13 +29,12 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.IO;
-using System.Collections;
using System.Collections.Generic;
using System.Xml;
using Hyena;
+
using GLib;
using FSpot.Core;
diff --git a/src/Clients/MainApp/FSpot/XScreenSaverSlide.cs b/src/Clients/MainApp/FSpot/XScreenSaverSlide.cs
index 1c4e0b6..8d649cf 100644
--- a/src/Clients/MainApp/FSpot/XScreenSaverSlide.cs
+++ b/src/Clients/MainApp/FSpot/XScreenSaverSlide.cs
@@ -31,12 +31,8 @@
using Gtk;
using Gdk;
+
using System;
-using GLib;
-using System.Runtime.InteropServices;
-using FSpot;
-using FSpot.Utils;
-using Hyena;
namespace FSpot {
public class XScreenSaverSlide : Gtk.Window {
diff --git a/src/Clients/MainApp/FSpot/main.cs b/src/Clients/MainApp/FSpot/main.cs
index 64b44db..4e8c3a6 100644
--- a/src/Clients/MainApp/FSpot/main.cs
+++ b/src/Clients/MainApp/FSpot/main.cs
@@ -33,22 +33,19 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Gtk;
using System;
using System.Reflection;
using System.IO;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Collections;
using System.Collections.Generic;
+
using Mono.Unix;
using Mono.Addins;
using Mono.Addins.Setup;
+
using FSpot.Core;
using FSpot.Utils;
-using FSpot.UI.Dialog;
-using FSpot.Extensions;
using FSpot.Imaging;
+
using Hyena;
using Hyena.CommandLine;
using Hyena.Gui;
diff --git a/src/Clients/MainApp/PhotoTagMenu.cs b/src/Clients/MainApp/PhotoTagMenu.cs
index bf183c6..d338826 100644
--- a/src/Clients/MainApp/PhotoTagMenu.cs
+++ b/src/Clients/MainApp/PhotoTagMenu.cs
@@ -29,15 +29,16 @@
//
using System;
-using System.Collections;
using System.Collections.Generic;
+
using Gtk;
-using FSpot;
using FSpot.Core;
+
using Hyena;
-public class PhotoTagMenu : Menu {
+public class PhotoTagMenu : Menu
+{
public delegate void TagSelectedHandler (Tag t);
public event TagSelectedHandler TagSelected;
diff --git a/src/Clients/MainApp/PhotoVersionCommands.cs b/src/Clients/MainApp/PhotoVersionCommands.cs
index 873733c..b5861fb 100644
--- a/src/Clients/MainApp/PhotoVersionCommands.cs
+++ b/src/Clients/MainApp/PhotoVersionCommands.cs
@@ -31,13 +31,17 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Gtk;
using System;
+
+using Gtk;
+
using Mono.Unix;
+
using FSpot;
+using FSpot.UI.Dialog;
+
using Hyena;
using Hyena.Widgets;
-using FSpot.UI.Dialog;
public class PhotoVersionCommands
{
diff --git a/src/Clients/MainApp/PhotoVersionMenu.cs b/src/Clients/MainApp/PhotoVersionMenu.cs
index 6e4fbbc..9a5eabf 100644
--- a/src/Clients/MainApp/PhotoVersionMenu.cs
+++ b/src/Clients/MainApp/PhotoVersionMenu.cs
@@ -29,17 +29,15 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-
-using Gtk;
-
using System;
using System.Collections.Generic;
-using FSpot;
-using FSpot.Core;
+using Gtk;
+using FSpot.Core;
-public class PhotoVersionMenu : Menu {
+public class PhotoVersionMenu : Menu
+{
public IPhotoVersion Version {
get; private set;
diff --git a/src/Clients/MainApp/Pinta/CairoExtensions.cs b/src/Clients/MainApp/Pinta/CairoExtensions.cs
index 2a663af..45a634e 100644
--- a/src/Clients/MainApp/Pinta/CairoExtensions.cs
+++ b/src/Clients/MainApp/Pinta/CairoExtensions.cs
@@ -35,7 +35,6 @@
using System;
using Cairo;
-using System.Collections.Generic;
namespace Pinta.Core
{
diff --git a/src/Clients/MainApp/Pinta/ColorBgra.cs b/src/Clients/MainApp/Pinta/ColorBgra.cs
index d07ec11..8525453 100644
--- a/src/Clients/MainApp/Pinta/ColorBgra.cs
+++ b/src/Clients/MainApp/Pinta/ColorBgra.cs
@@ -6,9 +6,6 @@
/////////////////////////////////////////////////////////////////////////////////
using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
using System.Runtime.InteropServices;
namespace Pinta.Core
diff --git a/src/Clients/MainApp/Pinta/GaussianBlurEffect.cs b/src/Clients/MainApp/Pinta/GaussianBlurEffect.cs
index 2009e6f..3f24b32 100644
--- a/src/Clients/MainApp/Pinta/GaussianBlurEffect.cs
+++ b/src/Clients/MainApp/Pinta/GaussianBlurEffect.cs
@@ -7,10 +7,8 @@
// Ported to Pinta by: Jonathan Pobst <monkey jpobst com> //
/////////////////////////////////////////////////////////////////////////////////
-using System;
using Cairo;
using Pinta.Core;
-using Mono.Unix;
namespace Pinta.Effects
{
diff --git a/src/Clients/MainApp/PixbufUtils.cs b/src/Clients/MainApp/PixbufUtils.cs
index 4594ca4..52c26da 100644
--- a/src/Clients/MainApp/PixbufUtils.cs
+++ b/src/Clients/MainApp/PixbufUtils.cs
@@ -30,19 +30,23 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Gdk;
-using System.Collections;
-using System.Runtime.InteropServices;
+
using System;
using System.IO;
+using System.Runtime.InteropServices;
+
+using Cairo;
+using Gdk;
+
using FSpot;
using FSpot.Core;
using FSpot.Utils;
using FSpot.Imaging;
+using FSpot.UI.Dialog;
+
using Hyena;
+
using TagLib.Image;
-using Cairo;
-using FSpot.UI.Dialog;
using Pinta.Core;
using Pinta.Effects;
diff --git a/src/Clients/MainApp/TagCommands.cs b/src/Clients/MainApp/TagCommands.cs
index 82276f4..0b4c0ff 100644
--- a/src/Clients/MainApp/TagCommands.cs
+++ b/src/Clients/MainApp/TagCommands.cs
@@ -31,20 +31,18 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Gtk;
-using Gdk;
-
using System;
-using System.Text;
-using System.Collections;
using System.Collections.Generic;
+using Gtk;
+using Gdk;
+
using Mono.Unix;
+
using FSpot;
using FSpot.Core;
-using FSpot.Utils;
using FSpot.UI.Dialog;
-using FSpot.Widgets;
+
using Hyena;
public class TagCommands {
diff --git a/src/Clients/MainApp/TagPopup.cs b/src/Clients/MainApp/TagPopup.cs
index 51abf8f..e903d5c 100644
--- a/src/Clients/MainApp/TagPopup.cs
+++ b/src/Clients/MainApp/TagPopup.cs
@@ -32,8 +32,11 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+
using System;
+
using Mono.Unix;
+
using FSpot;
using FSpot.Core;
using FSpot.Utils;
diff --git a/src/Clients/MainApp/ThumbnailCommand.cs b/src/Clients/MainApp/ThumbnailCommand.cs
index ba36a81..96c715f 100644
--- a/src/Clients/MainApp/ThumbnailCommand.cs
+++ b/src/Clients/MainApp/ThumbnailCommand.cs
@@ -30,7 +30,7 @@
//
using System;
-using Gtk;
+
using FSpot;
using FSpot.Core;
using FSpot.Utils;
diff --git a/src/Core/FSpot.Bling/FSpot.Bling/Animation.cs b/src/Core/FSpot.Bling/FSpot.Bling/Animation.cs
index b007ab5..1809d6f 100644
--- a/src/Core/FSpot.Bling/FSpot.Bling/Animation.cs
+++ b/src/Core/FSpot.Bling/FSpot.Bling/Animation.cs
@@ -31,6 +31,7 @@
using System;
using System.ComponentModel;
+
using GLibBeans;
namespace FSpot.Bling
diff --git a/src/Core/FSpot.Bling/FSpot.Bling/BackEase.cs b/src/Core/FSpot.Bling/FSpot.Bling/BackEase.cs
index 25b12ce..5b202cc 100644
--- a/src/Core/FSpot.Bling/FSpot.Bling/BackEase.cs
+++ b/src/Core/FSpot.Bling/FSpot.Bling/BackEase.cs
@@ -30,7 +30,8 @@
using System;
namespace FSpot.Bling
-{ public abstract class BackEase : EasingFunction
+{
+ public abstract class BackEase : EasingFunction
{
double amplitude;
diff --git a/src/Core/FSpot.Bling/FSpot.Bling/CubicEase.cs b/src/Core/FSpot.Bling/FSpot.Bling/CubicEase.cs
index 99647c0..1e26506 100644
--- a/src/Core/FSpot.Bling/FSpot.Bling/CubicEase.cs
+++ b/src/Core/FSpot.Bling/FSpot.Bling/CubicEase.cs
@@ -27,10 +27,9 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
namespace FSpot.Bling
-{ public class CubicEase : EasingFunction
+{
+ public class CubicEase : EasingFunction
{
public CubicEase () : base ()
{
diff --git a/src/Core/FSpot.Bling/FSpot.Bling/DoubleAnimation.cs b/src/Core/FSpot.Bling/FSpot.Bling/DoubleAnimation.cs
index 3961f2a..0cc23be 100644
--- a/src/Core/FSpot.Bling/FSpot.Bling/DoubleAnimation.cs
+++ b/src/Core/FSpot.Bling/FSpot.Bling/DoubleAnimation.cs
@@ -30,7 +30,8 @@
using System;
namespace FSpot.Bling
-{ public class DoubleAnimation : EasedAnimation<double>
+{
+ public class DoubleAnimation : EasedAnimation<double>
{
public DoubleAnimation (double from, double to, TimeSpan duration, Action<double> action) : base (from, to, duration, action)
{
diff --git a/src/Core/FSpot.Bling/FSpot.Bling/QuinticEase.cs b/src/Core/FSpot.Bling/FSpot.Bling/QuinticEase.cs
index 3542641..3f6977d 100644
--- a/src/Core/FSpot.Bling/FSpot.Bling/QuinticEase.cs
+++ b/src/Core/FSpot.Bling/FSpot.Bling/QuinticEase.cs
@@ -27,10 +27,9 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
namespace FSpot.Bling
-{ public abstract class QuinticEase : EasingFunction
+{
+ public abstract class QuinticEase : EasingFunction
{
public QuinticEase () : base ()
{
diff --git a/src/Core/FSpot.Cms/Cms/CctTable.cs b/src/Core/FSpot.Cms/Cms/CctTable.cs
index b3d51ea..959713f 100644
--- a/src/Core/FSpot.Cms/Cms/CctTable.cs
+++ b/src/Core/FSpot.Cms/Cms/CctTable.cs
@@ -27,8 +27,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-namespace Cms {
- public static class CctTable {
+namespace Cms
+{
+ public static class CctTable
+ {
public static void GetXY (int temp, out double x, out double y)
{
x = XY[temp - 1000, 0];
diff --git a/src/Core/FSpot.Cms/Cms/CmsException.cs b/src/Core/FSpot.Cms/Cms/CmsException.cs
index b4bb642..ace3aef 100644
--- a/src/Core/FSpot.Cms/Cms/CmsException.cs
+++ b/src/Core/FSpot.Cms/Cms/CmsException.cs
@@ -30,9 +30,11 @@
using System;
using System.Runtime.Serialization;
-namespace Cms {
+namespace Cms
+{
[Serializable]
- public class CmsException : System.Exception {
+ public class CmsException : Exception
+ {
public CmsException (string message) : base (message)
{
}
diff --git a/src/Core/FSpot.Cms/Cms/ColorCIELCh.cs b/src/Core/FSpot.Cms/Cms/ColorCIELCh.cs
index 25fea0c..e025f6f 100644
--- a/src/Core/FSpot.Cms/Cms/ColorCIELCh.cs
+++ b/src/Core/FSpot.Cms/Cms/ColorCIELCh.cs
@@ -27,15 +27,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-using System.IO;
-using System.Collections;
-using System.Runtime.InteropServices;
-using System.Reflection;
-using System.Runtime.Serialization;
-
-namespace Cms {
- public struct ColorCIELCh {
+namespace Cms
+{
+ public struct ColorCIELCh
+ {
public double L;
public double C;
public double h;
diff --git a/src/Core/FSpot.Cms/Cms/ColorCIELab.cs b/src/Core/FSpot.Cms/Cms/ColorCIELab.cs
index 5c14bde..f4881ec 100644
--- a/src/Core/FSpot.Cms/Cms/ColorCIELab.cs
+++ b/src/Core/FSpot.Cms/Cms/ColorCIELab.cs
@@ -28,14 +28,11 @@
//
using System;
-using System.IO;
-using System.Collections;
-using System.Runtime.InteropServices;
-using System.Reflection;
-using System.Runtime.Serialization;
-namespace Cms {
- public struct ColorCIELab {
+namespace Cms
+{
+ public struct ColorCIELab
+ {
public double L;
public double a;
public double b;
diff --git a/src/Core/FSpot.Cms/Cms/ColorCIEXYZ.cs b/src/Core/FSpot.Cms/Cms/ColorCIEXYZ.cs
index 479a69a..1db439c 100644
--- a/src/Core/FSpot.Cms/Cms/ColorCIEXYZ.cs
+++ b/src/Core/FSpot.Cms/Cms/ColorCIEXYZ.cs
@@ -28,14 +28,12 @@
//
using System;
-using System.IO;
-using System.Collections;
using System.Runtime.InteropServices;
-using System.Reflection;
-using System.Runtime.Serialization;
-namespace Cms {
- public struct ColorCIEXYZ {
+namespace Cms
+{
+ public struct ColorCIEXYZ
+ {
public double x;
public double y;
public double z;
diff --git a/src/Core/FSpot.Cms/Cms/ColorCIExyY.cs b/src/Core/FSpot.Cms/Cms/ColorCIExyY.cs
index 7397bb9..0cfed1e 100644
--- a/src/Core/FSpot.Cms/Cms/ColorCIExyY.cs
+++ b/src/Core/FSpot.Cms/Cms/ColorCIExyY.cs
@@ -29,13 +29,13 @@
using System;
using System.IO;
-using System.Collections;
using System.Runtime.InteropServices;
using System.Reflection;
-using System.Runtime.Serialization;
-namespace Cms {
- public struct ColorCIExyY {
+namespace Cms
+{
+ public struct ColorCIExyY
+ {
public double x;
public double y;
public double Y;
diff --git a/src/Core/FSpot.Cms/Cms/Format.cs b/src/Core/FSpot.Cms/Cms/Format.cs
index 0bc6c5c..58d19a7 100644
--- a/src/Core/FSpot.Cms/Cms/Format.cs
+++ b/src/Core/FSpot.Cms/Cms/Format.cs
@@ -27,7 +27,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-namespace Cms {
+namespace Cms
+{
public enum Format : uint {
Rgb8 = 262169,
Rgba8 = 262297,
diff --git a/src/Core/FSpot.Cms/Cms/GammaTable.cs b/src/Core/FSpot.Cms/Cms/GammaTable.cs
index 8d95350..1cd89e4 100644
--- a/src/Core/FSpot.Cms/Cms/GammaTable.cs
+++ b/src/Core/FSpot.Cms/Cms/GammaTable.cs
@@ -34,8 +34,10 @@ using System.Runtime.InteropServices;
using System.Reflection;
using System.Runtime.Serialization;
-namespace Cms {
- public class GammaTable : IDisposable {
+namespace Cms
+{
+ public class GammaTable : IDisposable
+ {
public HandleRef Handle { get; private set; }
// internal struct GammaTableStruct {
diff --git a/src/Core/FSpot.Cms/Cms/IccColorSpace.cs b/src/Core/FSpot.Cms/Cms/IccColorSpace.cs
index ebf9412..5a66638 100644
--- a/src/Core/FSpot.Cms/Cms/IccColorSpace.cs
+++ b/src/Core/FSpot.Cms/Cms/IccColorSpace.cs
@@ -27,7 +27,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-namespace Cms {
+namespace Cms
+{
public enum IccColorSpace : uint {
XYZ = 0x58595A20, /* 'XYZ ' */
Lab = 0x4C616220, /* 'Lab ' */
diff --git a/src/Core/FSpot.Cms/Cms/IccProfileClass.cs b/src/Core/FSpot.Cms/Cms/IccProfileClass.cs
index 9dcd38f..142cb3a 100644
--- a/src/Core/FSpot.Cms/Cms/IccProfileClass.cs
+++ b/src/Core/FSpot.Cms/Cms/IccProfileClass.cs
@@ -27,7 +27,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-namespace Cms {
+namespace Cms
+{
public enum IccProfileClass : uint {
Input = 0x73636e72, /* 'scnr' */
Display = 0x6D6e7472, /* 'mntr' */
diff --git a/src/Core/FSpot.Cms/Cms/Intent.cs b/src/Core/FSpot.Cms/Cms/Intent.cs
index 9f9673c..9ae436b 100644
--- a/src/Core/FSpot.Cms/Cms/Intent.cs
+++ b/src/Core/FSpot.Cms/Cms/Intent.cs
@@ -27,7 +27,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-namespace Cms {
+namespace Cms
+{
public enum Intent {
Perceptual = 0,
RelativeColorimetric = 1,
diff --git a/src/Core/FSpot.Cms/Cms/Profile.cs b/src/Core/FSpot.Cms/Cms/Profile.cs
index c469858..afd0409 100644
--- a/src/Core/FSpot.Cms/Cms/Profile.cs
+++ b/src/Core/FSpot.Cms/Cms/Profile.cs
@@ -28,14 +28,12 @@
//
using System;
-using System.IO;
-using System.Collections;
using System.Runtime.InteropServices;
-using System.Reflection;
-using System.Runtime.Serialization;
-namespace Cms {
- public class Profile : IDisposable {
+namespace Cms
+{
+ public class Profile : IDisposable
+ {
static Profile srgb = new Profile (NativeMethods.CmsCreateSRGBProfile());
static Profile ()
diff --git a/src/Core/FSpot.Cms/Cms/SaveException.cs b/src/Core/FSpot.Cms/Cms/SaveException.cs
index 4edf837..100b79a 100644
--- a/src/Core/FSpot.Cms/Cms/SaveException.cs
+++ b/src/Core/FSpot.Cms/Cms/SaveException.cs
@@ -30,9 +30,11 @@
using System;
using System.Runtime.Serialization;
-namespace Cms {
+namespace Cms
+{
[Serializable]
- public class SaveException : CmsException {
+ public class SaveException : CmsException
+ {
public SaveException (string message) : base (message)
{
}
diff --git a/src/Core/FSpot.Cms/Cms/Transform.cs b/src/Core/FSpot.Cms/Cms/Transform.cs
index 2ceddc8..ed0d786 100644
--- a/src/Core/FSpot.Cms/Cms/Transform.cs
+++ b/src/Core/FSpot.Cms/Cms/Transform.cs
@@ -28,14 +28,12 @@
//
using System;
-using System.IO;
-using System.Collections;
using System.Runtime.InteropServices;
-using System.Reflection;
-using System.Runtime.Serialization;
-namespace Cms {
- public class Transform : IDisposable {
+namespace Cms
+{
+ public class Transform : IDisposable
+ {
public HandleRef Handle { get; private set; }
public Transform (Profile [] profiles,
diff --git a/src/Core/FSpot.Core/FSpot.Core/BrowsableCollectionProxy.cs b/src/Core/FSpot.Core/FSpot.Core/BrowsableCollectionProxy.cs
index 87bb6e1..9e3cfc4 100644
--- a/src/Core/FSpot.Core/FSpot.Core/BrowsableCollectionProxy.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/BrowsableCollectionProxy.cs
@@ -27,9 +27,9 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System.Collections.Generic;
-namespace FSpot.Core {
+namespace FSpot.Core
+{
public class BrowsableCollectionProxy : IBrowsableCollection {
private IBrowsableCollection collection;
diff --git a/src/Core/FSpot.Core/FSpot.Core/BrowsableEventArgs.cs b/src/Core/FSpot.Core/FSpot.Core/BrowsableEventArgs.cs
index 7df9e43..95861ad 100644
--- a/src/Core/FSpot.Core/FSpot.Core/BrowsableEventArgs.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/BrowsableEventArgs.cs
@@ -29,11 +29,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
namespace FSpot.Core
{
- public class BrowsableEventArgs : System.EventArgs {
+ public class BrowsableEventArgs : System.EventArgs
+ {
private readonly int [] items;
public int [] Items {
get { return items; }
diff --git a/src/Core/FSpot.Core/FSpot.Core/BrowsablePointer.cs b/src/Core/FSpot.Core/FSpot.Core/BrowsablePointer.cs
index d9e59ef..29f25b2 100644
--- a/src/Core/FSpot.Core/FSpot.Core/BrowsablePointer.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/BrowsablePointer.cs
@@ -34,7 +34,8 @@ using System;
namespace FSpot.Core
{
- public class BrowsablePointer {
+ public class BrowsablePointer
+ {
IBrowsableCollection collection;
IPhoto item;
int index;
diff --git a/src/Core/FSpot.Core/FSpot.Core/FilePhoto.cs b/src/Core/FSpot.Core/FSpot.Core/FilePhoto.cs
index 834e3e8..3d08e59 100644
--- a/src/Core/FSpot.Core/FSpot.Core/FilePhoto.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/FilePhoto.cs
@@ -28,9 +28,7 @@
//
using System;
-using System.IO;
using System.Collections.Generic;
-using System.Xml;
using Hyena;
using FSpot.Utils;
diff --git a/src/Core/FSpot.Core/FSpot.Core/Global.cs b/src/Core/FSpot.Core/FSpot.Core/Global.cs
index 4e9596d..2783fd0 100644
--- a/src/Core/FSpot.Core/FSpot.Core/Global.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/Global.cs
@@ -32,10 +32,13 @@
//
using System;
+
using Hyena;
-namespace FSpot.Core {
- public static class Global {
+namespace FSpot.Core
+{
+ public static class Global
+ {
public static string HomeDirectory {
get { return System.IO.Path.Combine (System.Environment.GetEnvironmentVariable ("HOME"), System.String.Empty); }
}
diff --git a/src/Core/FSpot.Core/FSpot.Core/IBrowsableCollection.cs b/src/Core/FSpot.Core/FSpot.Core/IBrowsableCollection.cs
index 1bed494..2b0c136 100644
--- a/src/Core/FSpot.Core/FSpot.Core/IBrowsableCollection.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/IBrowsableCollection.cs
@@ -34,7 +34,8 @@ namespace FSpot.Core
public delegate void IBrowsableCollectionChangedHandler (IBrowsableCollection collection);
public delegate void IBrowsableCollectionItemsChangedHandler (IBrowsableCollection collection, BrowsableEventArgs args);
- public interface IBrowsableCollection {
+ public interface IBrowsableCollection
+ {
// FIXME this should really be ToArray ()
IPhoto [] Items {
get;
diff --git a/src/Core/FSpot.Core/FSpot.Core/IPhoto.cs b/src/Core/FSpot.Core/FSpot.Core/IPhoto.cs
index 44f07d0..2e99f7a 100644
--- a/src/Core/FSpot.Core/FSpot.Core/IPhoto.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/IPhoto.cs
@@ -29,12 +29,8 @@
using System.Collections.Generic;
-using Hyena;
-
-
namespace FSpot.Core
{
-
public interface IPhoto
{
diff --git a/src/Core/FSpot.Core/FSpot.Core/IPhotoVersion.cs b/src/Core/FSpot.Core/FSpot.Core/IPhotoVersion.cs
index bbd6c6e..29c93e2 100644
--- a/src/Core/FSpot.Core/FSpot.Core/IPhotoVersion.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/IPhotoVersion.cs
@@ -29,13 +29,10 @@
using Hyena;
-
namespace FSpot.Core
{
-
public interface IPhotoVersion : ILoadable
{
-
#region Metadata
/// <summary>
diff --git a/src/Core/FSpot.Core/FSpot.Core/IPhotoVersionable.cs b/src/Core/FSpot.Core/FSpot.Core/IPhotoVersionable.cs
index 0a3eee6..8d2dedf 100644
--- a/src/Core/FSpot.Core/FSpot.Core/IPhotoVersionable.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/IPhotoVersionable.cs
@@ -27,8 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System.Collections.Generic;
-
namespace FSpot.Core
{
/// <summary>
diff --git a/src/Core/FSpot.Core/FSpot.Core/PhotoChanges.cs b/src/Core/FSpot.Core/FSpot.Core/PhotoChanges.cs
index cb903c4..9652153 100644
--- a/src/Core/FSpot.Core/FSpot.Core/PhotoChanges.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/PhotoChanges.cs
@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.Collections.Generic;
namespace FSpot.Core
diff --git a/src/Core/FSpot.Core/FSpot.Core/PhotoList.cs b/src/Core/FSpot.Core/FSpot.Core/PhotoList.cs
index 91ee84a..348074d 100644
--- a/src/Core/FSpot.Core/FSpot.Core/PhotoList.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/PhotoList.cs
@@ -31,7 +31,6 @@ using System.Collections.Generic;
namespace FSpot.Core
{
-
public class PhotoList : IBrowsableCollection
{
protected List<IPhoto> list;
diff --git a/src/Core/FSpot.Core/FSpot.Core/PhotosChanges.cs b/src/Core/FSpot.Core/FSpot.Core/PhotosChanges.cs
index f986eba..c9657cb 100644
--- a/src/Core/FSpot.Core/FSpot.Core/PhotosChanges.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/PhotosChanges.cs
@@ -28,7 +28,6 @@
//
using System;
-using System.Collections.Generic;
namespace FSpot.Core
{
diff --git a/src/Core/FSpot.Core/FSpot.Core/Roll.cs b/src/Core/FSpot.Core/FSpot.Core/Roll.cs
index f99e31a..61d36a3 100644
--- a/src/Core/FSpot.Core/FSpot.Core/Roll.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/Roll.cs
@@ -32,6 +32,7 @@
//
using System;
+
using Hyena;
namespace FSpot.Core
diff --git a/src/Core/FSpot.Core/FSpot.Core/Tag.cs b/src/Core/FSpot.Core/FSpot.Core/Tag.cs
index 912d807..f558360 100644
--- a/src/Core/FSpot.Core/FSpot.Core/Tag.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/Tag.cs
@@ -30,13 +30,17 @@
//
using System;
+
using Gdk;
+
using FSpot.Utils;
+
using Hyena;
namespace FSpot.Core
{
- public class Tag : DbItem, IComparable<Tag>, IDisposable {
+ public class Tag : DbItem, IComparable<Tag>, IDisposable
+ {
public string Name { get; set; }
public int Popularity { get; set; }
public int SortPriority { get; set; }
diff --git a/src/Core/FSpot.Gui/FSpot.Gui/CompositeUtils.cs b/src/Core/FSpot.Gui/FSpot.Gui/CompositeUtils.cs
index 3e4d87b..fcfd27b 100644
--- a/src/Core/FSpot.Gui/FSpot.Gui/CompositeUtils.cs
+++ b/src/Core/FSpot.Gui/FSpot.Gui/CompositeUtils.cs
@@ -29,14 +29,18 @@
using System;
using System.Runtime.InteropServices;
+
using Gdk;
using Gtk;
+
using FSpot.Utils;
-using Hyena;
-namespace FSpot.Gui {
+using Hyena;
- public class CompositeUtils {
+namespace FSpot.Gui
+{
+ public class CompositeUtils
+ {
[DllImport("libgdk-2.0-0.dll")]
static extern bool gdk_screen_is_composited (IntPtr screen);
diff --git a/src/Core/FSpot.Gui/FSpot.Gui/WindowOpacityFader.cs b/src/Core/FSpot.Gui/FSpot.Gui/WindowOpacityFader.cs
index 9c1645e..e2040e2 100644
--- a/src/Core/FSpot.Gui/FSpot.Gui/WindowOpacityFader.cs
+++ b/src/Core/FSpot.Gui/FSpot.Gui/WindowOpacityFader.cs
@@ -28,7 +28,7 @@
//
using System;
-using Gtk;
+
using FSpot.Bling;
namespace FSpot.Gui
diff --git a/src/Core/FSpot.Gui/FSpot.Transitions/CairoTransition.cs b/src/Core/FSpot.Gui/FSpot.Transitions/CairoTransition.cs
index cf7f0b1..dcdfe94 100644
--- a/src/Core/FSpot.Gui/FSpot.Transitions/CairoTransition.cs
+++ b/src/Core/FSpot.Gui/FSpot.Transitions/CairoTransition.cs
@@ -27,13 +27,9 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
using Cairo;
using Gdk;
-using FSpot.Utils;
-
using Color = Cairo.Color;
namespace FSpot.Transitions
diff --git a/src/Core/FSpot.Gui/FSpot.Transitions/SlideShowTransition.cs b/src/Core/FSpot.Gui/FSpot.Transitions/SlideShowTransition.cs
index 042c122..04ce2e1 100644
--- a/src/Core/FSpot.Gui/FSpot.Transitions/SlideShowTransition.cs
+++ b/src/Core/FSpot.Gui/FSpot.Transitions/SlideShowTransition.cs
@@ -27,13 +27,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
-using Cairo;
using Gdk;
-using FSpot.Utils;
-
using Color = Cairo.Color;
namespace FSpot.Transitions
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/ApplicationActivatedEventArgs.cs b/src/Core/FSpot.Gui/FSpot.Widgets/ApplicationActivatedEventArgs.cs
index 4e1d439..031216e 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/ApplicationActivatedEventArgs.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/ApplicationActivatedEventArgs.cs
@@ -28,6 +28,7 @@
//
using System;
+
using GLib;
namespace FSpot.Widgets
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/BuilderWindow.cs b/src/Core/FSpot.Gui/FSpot.Widgets/BuilderWindow.cs
index 19533ca..131d699 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/BuilderWindow.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/BuilderWindow.cs
@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using GtkBeans;
namespace FSpot.Widgets
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/CellGridView.cs b/src/Core/FSpot.Gui/FSpot.Widgets/CellGridView.cs
index 8a31ab4..1e521f1 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/CellGridView.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/CellGridView.cs
@@ -33,9 +33,6 @@ using System.Collections.Generic;
using Gtk;
using Gdk;
-using Hyena;
-
-
namespace FSpot.Widgets
{
/// <summary>
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/CheckPattern.cs b/src/Core/FSpot.Gui/FSpot.Widgets/CheckPattern.cs
index 079e0da..7648075 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/CheckPattern.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/CheckPattern.cs
@@ -28,6 +28,7 @@
//
using System;
+
using Gdk;
namespace FSpot.Widgets
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/Curve.cs b/src/Core/FSpot.Gui/FSpot.Widgets/Curve.cs
index 37d4a6e..32cf6fb 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/Curve.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/Curve.cs
@@ -29,6 +29,7 @@
using System;
using System.Collections.Generic;
+
using Gtk;
using Gdk;
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs b/src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs
index f90f609..c318cf3 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs
@@ -30,9 +30,10 @@
//
using System;
+
using Mono.Unix;
+
using Gtk;
-using FSpot.Utils;
namespace FSpot.Widgets
{
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/DateEdit.cs b/src/Core/FSpot.Gui/FSpot.Widgets/DateEdit.cs
index 9b2964f..d8b0c38 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/DateEdit.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/DateEdit.cs
@@ -28,7 +28,9 @@
//
using System;
+
using Mono.Unix;
+
using Gtk;
namespace FSpot.Widgets
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/DateEditFlags.cs b/src/Core/FSpot.Gui/FSpot.Widgets/DateEditFlags.cs
index 5ee5174..0c8b5f8 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/DateEditFlags.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/DateEditFlags.cs
@@ -30,8 +30,7 @@
namespace FSpot.Widgets
{
[System.Flags]
- public enum DateEditFlags
- {
+ public enum DateEditFlags {
None = 0,
ShowTime = 1 << 0,
ShowSeconds = 1 << 1,
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/HighlightedBox.cs b/src/Core/FSpot.Gui/FSpot.Widgets/HighlightedBox.cs
index 975f182..5f3b439 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/HighlightedBox.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/HighlightedBox.cs
@@ -28,6 +28,7 @@
//
using System;
+
using Gtk;
namespace FSpot.Widgets
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/ImageView.cs b/src/Core/FSpot.Gui/FSpot.Widgets/ImageView.cs
index 8843d85..1228129 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/ImageView.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/ImageView.cs
@@ -30,8 +30,6 @@
//
using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
using Gtk;
using Gdk;
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/ImageView_Container.cs b/src/Core/FSpot.Gui/FSpot.Widgets/ImageView_Container.cs
index ca6995d..97fe810 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/ImageView_Container.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/ImageView_Container.cs
@@ -27,9 +27,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Gtk;
using System.Collections.Generic;
+using Gtk;
+
namespace FSpot.Widgets
{
public partial class ImageView : Container
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/ImageView_Panning.cs b/src/Core/FSpot.Gui/FSpot.Widgets/ImageView_Panning.cs
index 57ee06d..809b789 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/ImageView_Panning.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/ImageView_Panning.cs
@@ -28,13 +28,11 @@
//
using Gdk;
-using Gtk;
namespace FSpot.Widgets
{
public partial class ImageView
{
-
#region Panning
/// <summary>
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/Layout.cs b/src/Core/FSpot.Gui/FSpot.Widgets/Layout.cs
index 50dab91..3f2a2f2 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/Layout.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/Layout.cs
@@ -29,6 +29,7 @@
using System;
using System.Collections.Generic;
+
using Hyena;
namespace FSpot.Widgets
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs b/src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs
index 444eeb8..df1dcbc 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs
@@ -33,14 +33,15 @@ using System;
using System.Collections.Generic;
using Gtk;
-using Gdk;
using GLib;
using GtkBeans;
using Mono.Unix;
-namespace FSpot.Widgets {
- public class OpenWithMenu: Gtk.Menu {
+namespace FSpot.Widgets
+{
+ public class OpenWithMenu: Gtk.Menu
+ {
public event EventHandler<ApplicationActivatedEventArgs> ApplicationActivated;
public delegate IEnumerable<string> TypeFetcher ();
@@ -131,9 +132,7 @@ namespace FSpot.Widgets {
return;
Image = GtkBeans.Image.NewFromIcon (app.Icon, IconSize.Menu);
-#if GTK_2_16
this.SetAlwaysShowImage (true);
-#endif
}
}
}
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/RatingEntry.cs b/src/Core/FSpot.Gui/FSpot.Widgets/RatingEntry.cs
index 6fc6723..ef2977c 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/RatingEntry.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/RatingEntry.cs
@@ -27,8 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
namespace FSpot.Widgets
{
public class RatingEntry : Hyena.Widgets.RatingEntry
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/RatingRenderer.cs b/src/Core/FSpot.Gui/FSpot.Widgets/RatingRenderer.cs
index f47bb50..e74d81d 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/RatingRenderer.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/RatingRenderer.cs
@@ -27,8 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
using Gdk;
using Cairo;
@@ -36,7 +34,6 @@ using Hyena.Gui;
using FSpot.Utils;
-
namespace FSpot.Widgets
{
public class RatingRenderer : Hyena.Gui.RatingRenderer
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/SaneTreeView.cs b/src/Core/FSpot.Gui/FSpot.Widgets/SaneTreeView.cs
index 94e0092..c10f367 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/SaneTreeView.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/SaneTreeView.cs
@@ -38,6 +38,7 @@
*/
using System;
+
using Gdk;
using Gtk;
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/ScrolledView.cs b/src/Core/FSpot.Gui/FSpot.Widgets/ScrolledView.cs
index 3f4a270..018e273 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/ScrolledView.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/ScrolledView.cs
@@ -28,11 +28,15 @@
//
using System;
+
using Gtk;
+
using FSpot.Utils;
-namespace FSpot.Widgets {
- public class ScrolledView : Fixed {
+namespace FSpot.Widgets
+{
+ public class ScrolledView : Fixed
+ {
private DelayedOperation hide;
public EventBox ControlBox { get; private set; }
public ScrolledWindow ScrolledWindow { get; private set; }
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/SelectionCollection.cs b/src/Core/FSpot.Gui/FSpot.Widgets/SelectionCollection.cs
index 5973bba..0bfa536 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/SelectionCollection.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/SelectionCollection.cs
@@ -27,6 +27,7 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+
using System;
using System.Linq;
using System.Collections;
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/ToolTipWindow.cs b/src/Core/FSpot.Gui/FSpot.Widgets/ToolTipWindow.cs
index acd39f4..ba5adc4 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/ToolTipWindow.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/ToolTipWindow.cs
@@ -28,7 +28,6 @@
//
using Gtk;
-using Gdk;
namespace FSpot.Widgets
{
diff --git a/src/Core/FSpot.JobScheduler/Banshee.Kernel/IInstanceCriticalJob.cs b/src/Core/FSpot.JobScheduler/Banshee.Kernel/IInstanceCriticalJob.cs
index a99581a..0cdf324 100644
--- a/src/Core/FSpot.JobScheduler/Banshee.Kernel/IInstanceCriticalJob.cs
+++ b/src/Core/FSpot.JobScheduler/Banshee.Kernel/IInstanceCriticalJob.cs
@@ -55,8 +55,6 @@
* DEALINGS IN THE SOFTWARE.
*/
-using System;
-
namespace Banshee.Kernel
{
public interface IInstanceCriticalJob : IJob
diff --git a/src/Core/FSpot.JobScheduler/Banshee.Kernel/IJob.cs b/src/Core/FSpot.JobScheduler/Banshee.Kernel/IJob.cs
index 3855c93..21184f7 100644
--- a/src/Core/FSpot.JobScheduler/Banshee.Kernel/IJob.cs
+++ b/src/Core/FSpot.JobScheduler/Banshee.Kernel/IJob.cs
@@ -55,8 +55,6 @@
* DEALINGS IN THE SOFTWARE.
*/
-using System;
-
namespace Banshee.Kernel
{
public interface IJob
diff --git a/src/Core/FSpot.JobScheduler/Banshee.Kernel/JobPriority.cs b/src/Core/FSpot.JobScheduler/Banshee.Kernel/JobPriority.cs
index d9c309c..5a90ae7 100644
--- a/src/Core/FSpot.JobScheduler/Banshee.Kernel/JobPriority.cs
+++ b/src/Core/FSpot.JobScheduler/Banshee.Kernel/JobPriority.cs
@@ -55,16 +55,14 @@
* DEALINGS IN THE SOFTWARE.
*/
-using System;
namespace Banshee.Kernel
{
- public enum JobPriority
- {
- Lowest,
- BelowNormal,
- Normal,
- AboveNormal,
- Highest
- }
+ public enum JobPriority {
+ Lowest,
+ BelowNormal,
+ Normal,
+ AboveNormal,
+ Highest
+ }
}
diff --git a/src/Core/FSpot.JobScheduler/Banshee.Kernel/Scheduler.cs b/src/Core/FSpot.JobScheduler/Banshee.Kernel/Scheduler.cs
index 575b9d2..a088b87 100644
--- a/src/Core/FSpot.JobScheduler/Banshee.Kernel/Scheduler.cs
+++ b/src/Core/FSpot.JobScheduler/Banshee.Kernel/Scheduler.cs
@@ -58,6 +58,7 @@
using System;
using System.Threading;
using System.Collections.Generic;
+
using Hyena;
namespace Banshee.Kernel
diff --git a/src/Core/FSpot.JobScheduler/FSpot.Jobs/JobStatus.cs b/src/Core/FSpot.JobScheduler/FSpot.Jobs/JobStatus.cs
index b249606..ee3c23e 100644
--- a/src/Core/FSpot.JobScheduler/FSpot.Jobs/JobStatus.cs
+++ b/src/Core/FSpot.JobScheduler/FSpot.Jobs/JobStatus.cs
@@ -29,8 +29,7 @@
namespace FSpot.Jobs
{
- public enum JobStatus
- {
+ public enum JobStatus {
Created,
Scheduled,
Running,
diff --git a/src/Core/FSpot.Platform/FSpot.Platform/PreferenceBackend.cs b/src/Core/FSpot.Platform/FSpot.Platform/PreferenceBackend.cs
index e420b93..fcd95d2 100644
--- a/src/Core/FSpot.Platform/FSpot.Platform/PreferenceBackend.cs
+++ b/src/Core/FSpot.Platform/FSpot.Platform/PreferenceBackend.cs
@@ -30,7 +30,6 @@
using System;
using System.Runtime.Serialization;
-
namespace FSpot
{
public class NotifyEventArgs : System.EventArgs
diff --git a/src/Core/FSpot.Platform/FSpot.Platform/ScreenSaver.cs b/src/Core/FSpot.Platform/FSpot.Platform/ScreenSaver.cs
index b4e6742..6ef6360 100644
--- a/src/Core/FSpot.Platform/FSpot.Platform/ScreenSaver.cs
+++ b/src/Core/FSpot.Platform/FSpot.Platform/ScreenSaver.cs
@@ -29,7 +29,6 @@
//
using System;
-using System.Runtime.InteropServices;
using DBus;
diff --git a/src/Core/FSpot.Platform/FSpot.Platform/WebProxy.cs b/src/Core/FSpot.Platform/FSpot.Platform/WebProxy.cs
index 0cec2d0..69834a4 100644
--- a/src/Core/FSpot.Platform/FSpot.Platform/WebProxy.cs
+++ b/src/Core/FSpot.Platform/FSpot.Platform/WebProxy.cs
@@ -28,11 +28,13 @@
//
using System;
+
using Hyena;
namespace FSpot.Platform
{
- public class WebProxy {
+ public class WebProxy
+ {
const string PROXY = "/system/http_proxy/";
const string PROXY_USE_PROXY = PROXY + "use_http_proxy";
diff --git a/src/Core/FSpot.Query/FSpot.Query/DateRange.cs b/src/Core/FSpot.Query/FSpot.Query/DateRange.cs
index e77a501..0da3ab2 100644
--- a/src/Core/FSpot.Query/FSpot.Query/DateRange.cs
+++ b/src/Core/FSpot.Query/FSpot.Query/DateRange.cs
@@ -30,7 +30,8 @@
using System;
using Hyena;
-namespace FSpot.Query {
+namespace FSpot.Query
+{
public class DateRange : IQueryCondition
{
public DateTime Start { get; private set; }
diff --git a/src/Core/FSpot.Query/FSpot.Query/FolderSet.cs b/src/Core/FSpot.Query/FSpot.Query/FolderSet.cs
index 5f1ac52..2b318c0 100644
--- a/src/Core/FSpot.Query/FSpot.Query/FolderSet.cs
+++ b/src/Core/FSpot.Query/FSpot.Query/FolderSet.cs
@@ -31,6 +31,7 @@
using System;
using System.Collections.Generic;
+
using Hyena;
diff --git a/src/Core/FSpot.Query/FSpot.Query/LogicalTerm.cs b/src/Core/FSpot.Query/FSpot.Query/LogicalTerm.cs
index 3c4e5d6..7a7400a 100644
--- a/src/Core/FSpot.Query/FSpot.Query/LogicalTerm.cs
+++ b/src/Core/FSpot.Query/FSpot.Query/LogicalTerm.cs
@@ -29,7 +29,9 @@
using System;
using System.Collections.Generic;
+
using Hyena;
+
using FSpot.Core;
namespace FSpot.Query
diff --git a/src/Core/FSpot.Query/FSpot.Query/OrderByTime.cs b/src/Core/FSpot.Query/FSpot.Query/OrderByTime.cs
index e3e4071..8e8085d 100644
--- a/src/Core/FSpot.Query/FSpot.Query/OrderByTime.cs
+++ b/src/Core/FSpot.Query/FSpot.Query/OrderByTime.cs
@@ -29,7 +29,8 @@
using System;
-namespace FSpot.Query {
+namespace FSpot.Query
+{
public class OrderByTime : IQueryCondition, IOrderCondition
{
public static OrderByTime OrderByTimeAsc = new OrderByTime (true);
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/Cache.cs b/src/Core/FSpot.Utils/FSpot.Utils/Cache.cs
index 15dc0a9..7481461 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/Cache.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/Cache.cs
@@ -29,8 +29,8 @@
using System;
using System.Collections.Generic;
-using Hyena;
+using Hyena;
namespace FSpot.Utils
{
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/CairoUtils.cs b/src/Core/FSpot.Utils/FSpot.Utils/CairoUtils.cs
index 607575a..bb81c25 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/CairoUtils.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/CairoUtils.cs
@@ -28,11 +28,13 @@
//
using System;
+
using Cairo;
-using System.Runtime.InteropServices;
-namespace FSpot.Utils {
- public class CairoUtils {
+namespace FSpot.Utils
+{
+ public class CairoUtils
+ {
public static Surface CreateSurface (Gdk.Drawable d)
{
int width, height;
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/FileExtensions.cs b/src/Core/FSpot.Utils/FSpot.Utils/FileExtensions.cs
index 068a4dc..054e939 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/FileExtensions.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/FileExtensions.cs
@@ -29,11 +29,9 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.IO;
-using Mono.Unix;
+
using GLib;
-using Hyena;
namespace FSpot.Utils
{
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/GIOTagLibFileAbstraction.cs b/src/Core/FSpot.Utils/FSpot.Utils/GIOTagLibFileAbstraction.cs
index d477648..7c5d2ca 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/GIOTagLibFileAbstraction.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/GIOTagLibFileAbstraction.cs
@@ -29,7 +29,9 @@
using System;
using System.IO;
+
using GLib;
+
using Hyena;
namespace FSpot.Utils
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/GdkUtils.cs b/src/Core/FSpot.Utils/FSpot.Utils/GdkUtils.cs
index 7804bac..c10f57d 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/GdkUtils.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/GdkUtils.cs
@@ -32,12 +32,16 @@
//
using System;
-using Gdk;
using System.Runtime.InteropServices;
+
+using Gdk;
+
using Hyena;
-namespace FSpot.Utils {
- public class GdkUtils {
+namespace FSpot.Utils
+{
+ public class GdkUtils
+ {
public static Pixbuf Deserialize (byte [] data)
{
Pixdata pixdata = new Pixdata ();
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/GtkUtil.cs b/src/Core/FSpot.Utils/FSpot.Utils/GtkUtil.cs
index f1639b0..cc77146 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/GtkUtil.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/GtkUtil.cs
@@ -33,7 +33,8 @@ using System;
namespace FSpot.Utils
{
- public static class GtkUtil {
+ public static class GtkUtil
+ {
public static Gtk.MenuItem MakeMenuItem (Gtk.Menu menu, string l, EventHandler e)
{
return MakeMenuItem (menu, l, e, true);
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/HashUtils.cs b/src/Core/FSpot.Utils/FSpot.Utils/HashUtils.cs
index fce4f48..06087e0 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/HashUtils.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/HashUtils.cs
@@ -31,7 +31,8 @@ using Hyena;
namespace FSpot
{
- public class HashUtils {
+ public class HashUtils
+ {
public static string GenerateMD5 (SafeUri uri)
{
var file = GLib.FileFactory.NewForUri (uri);
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/Metadata.cs b/src/Core/FSpot.Utils/FSpot.Utils/Metadata.cs
index bf65a31..0b69b7e 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/Metadata.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/Metadata.cs
@@ -27,9 +27,12 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+using System;
+
using Hyena;
+
using TagLib;
-using System;
+
using GLib;
namespace FSpot.Utils
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/PixbufUtils.cs b/src/Core/FSpot.Utils/FSpot.Utils/PixbufUtils.cs
index 6c4a195..7d28493 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/PixbufUtils.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/PixbufUtils.cs
@@ -30,34 +30,33 @@
//
using Gdk;
-using System;
-using System.Runtime.InteropServices;
+
using TagLib.Image;
namespace FSpot.Utils
{
public static class PixbufUtils
{
- static public ImageOrientation Rotate270 (ImageOrientation orientation)
- {
- if (orientation == ImageOrientation.None) {
- orientation = ImageOrientation.TopLeft;
- }
+ static public ImageOrientation Rotate270 (ImageOrientation orientation)
+ {
+ if (orientation == ImageOrientation.None) {
+ orientation = ImageOrientation.TopLeft;
+ }
- ImageOrientation [] rot = new ImageOrientation [] {
- ImageOrientation.LeftBottom,
- ImageOrientation.LeftTop,
- ImageOrientation.RightTop,
- ImageOrientation.RightBottom,
- ImageOrientation.BottomLeft,
- ImageOrientation.TopLeft,
- ImageOrientation.TopRight,
- ImageOrientation.BottomRight
- };
+ ImageOrientation [] rot = new ImageOrientation [] {
+ ImageOrientation.LeftBottom,
+ ImageOrientation.LeftTop,
+ ImageOrientation.RightTop,
+ ImageOrientation.RightBottom,
+ ImageOrientation.BottomLeft,
+ ImageOrientation.TopLeft,
+ ImageOrientation.TopRight,
+ ImageOrientation.BottomRight
+ };
- orientation = rot [((int)orientation) -1];
- return orientation;
- }
+ orientation = rot [((int)orientation) -1];
+ return orientation;
+ }
static public ImageOrientation Rotate90 (ImageOrientation orientation)
{
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/RecursiveFileEnumerator.cs b/src/Core/FSpot.Utils/FSpot.Utils/RecursiveFileEnumerator.cs
index de02098..9aeafda 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/RecursiveFileEnumerator.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/RecursiveFileEnumerator.cs
@@ -29,9 +29,9 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.Collections;
using System.Collections.Generic;
+
using GLib;
namespace FSpot.Utils
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/SafeUriExtensions.cs b/src/Core/FSpot.Utils/FSpot.Utils/SafeUriExtensions.cs
index 9eb73cc..60a6dec 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/SafeUriExtensions.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/SafeUriExtensions.cs
@@ -27,9 +27,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Hyena;
using System;
+using Hyena;
+
namespace FSpot
{
public static class SafeUriExtensions
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/SidecarXmpExtensions.cs b/src/Core/FSpot.Utils/FSpot.Utils/SidecarXmpExtensions.cs
index 81b2a3f..e002f02 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/SidecarXmpExtensions.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/SidecarXmpExtensions.cs
@@ -31,8 +31,9 @@
using System;
using System.IO;
+
using Hyena;
-using TagLib.Image;
+
using TagLib.Xmp;
namespace FSpot.Utils
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/TargetListExtensionMethods.cs b/src/Core/FSpot.Utils/FSpot.Utils/TargetListExtensionMethods.cs
index 57a110d..9e3ffef 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/TargetListExtensionMethods.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/TargetListExtensionMethods.cs
@@ -1,4 +1,31 @@
-using System;
+//
+// UriExtensions.cs
+//
+// Author:
+// Ruben Vermeersch <ruben savanne be>
+// Stephen Shaw <sshaw decriptor com>
+//
+// Copyright (C) 2012 Stephen Shaw
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
using Gtk;
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/UriExtensions.cs b/src/Core/FSpot.Utils/FSpot.Utils/UriExtensions.cs
index c627ab2..1ca492b 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/UriExtensions.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/UriExtensions.cs
@@ -31,7 +31,6 @@ using System;
namespace FSpot.Utils
{
-
public static class UriExtensions
{
public static Uri GetDirectoryUri (this Uri uri)
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/UriList.cs b/src/Core/FSpot.Utils/FSpot.Utils/UriList.cs
index 3cfab05..8c8a153 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/UriList.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/UriList.cs
@@ -27,9 +27,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+using System;
using System.Collections.Generic;
using System.Text;
-using System;
+
using Hyena;
namespace FSpot.Utils
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/UriUtils.cs b/src/Core/FSpot.Utils/FSpot.Utils/UriUtils.cs
index a46b8bb..d9b71ab 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/UriUtils.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/UriUtils.cs
@@ -29,7 +29,6 @@
using System;
using System.Text;
-using System.IO;
namespace FSpot.Utils
{
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/Vector.cs b/src/Core/FSpot.Utils/FSpot.Utils/Vector.cs
index 35006f4..b71d96d 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/Vector.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/Vector.cs
@@ -29,8 +29,10 @@
using System;
-namespace FSpot.Utils {
- public class Vector {
+namespace FSpot.Utils
+{
+ public class Vector
+ {
double X;
double Y;
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/XdgThumbnailSpec.cs b/src/Core/FSpot.Utils/FSpot.Utils/XdgThumbnailSpec.cs
index 5e42794..c6eb6c7 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/XdgThumbnailSpec.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/XdgThumbnailSpec.cs
@@ -27,9 +27,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Gdk;
using System;
-using System.Runtime.InteropServices;
+
+using Gdk;
+
using Hyena;
namespace FSpot.Utils
diff --git a/src/Extensions/Editors/FSpot.Editors.BW/FSpot.Addins.Editors/BWEditor.cs b/src/Extensions/Editors/FSpot.Editors.BW/FSpot.Addins.Editors/BWEditor.cs
index 06a490b..07c2f77 100644
--- a/src/Extensions/Editors/FSpot.Editors.BW/FSpot.Addins.Editors/BWEditor.cs
+++ b/src/Extensions/Editors/FSpot.Editors.BW/FSpot.Addins.Editors/BWEditor.cs
@@ -28,16 +28,21 @@
//
using System;
-using FSpot;
+
using FSpot.Editors;
+
using Gtk;
using Gdk;
+
using Mono.Unix;
using Mono.Simd;
+
using Hyena;
-namespace FSpot.Addins.Editors {
- class BWEditor : Editor {
+namespace FSpot.Addins.Editors
+{
+ class BWEditor : Editor
+ {
public BWEditor () : base (Catalog.GetString ("Convert to B/W"), null) {
CanHandleMultiple = false;
HasSettings = true;
diff --git a/src/Extensions/Editors/FSpot.Editors.Blackout/FSpot.Addins.Editors/BlackoutEditor.cs b/src/Extensions/Editors/FSpot.Editors.Blackout/FSpot.Addins.Editors/BlackoutEditor.cs
index 89964ae..0de8243 100644
--- a/src/Extensions/Editors/FSpot.Editors.Blackout/FSpot.Addins.Editors/BlackoutEditor.cs
+++ b/src/Extensions/Editors/FSpot.Editors.Blackout/FSpot.Addins.Editors/BlackoutEditor.cs
@@ -27,14 +27,17 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot;
using FSpot.Editors;
+
using Gdk;
using Gtk;
+
using Mono.Unix;
-namespace FSpot.Addins.Editors {
- class BlackoutEditor : Editor {
+namespace FSpot.Addins.Editors
+{
+ class BlackoutEditor : Editor
+ {
public BlackoutEditor () : base (Catalog.GetString ("Blackout"), null) {
CanHandleMultiple = false;
NeedsSelection = true;
diff --git a/src/Extensions/Editors/FSpot.Editors.Flip/FSpot.Addins.Editors/FlipEditor.cs b/src/Extensions/Editors/FSpot.Editors.Flip/FSpot.Addins.Editors/FlipEditor.cs
index 1f5c64a..8fa3877 100644
--- a/src/Extensions/Editors/FSpot.Editors.Flip/FSpot.Addins.Editors/FlipEditor.cs
+++ b/src/Extensions/Editors/FSpot.Editors.Flip/FSpot.Addins.Editors/FlipEditor.cs
@@ -27,13 +27,16 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot;
using FSpot.Editors;
+
using Gdk;
+
using Mono.Unix;
-namespace FSpot.Addins.Editors {
- class FlipEditor : Editor {
+namespace FSpot.Addins.Editors
+{
+ class FlipEditor : Editor
+ {
public FlipEditor () : base (Catalog.GetString ("Flip"), "object-flip-horizontal") {
CanHandleMultiple = true;
}
diff --git a/src/Extensions/Editors/FSpot.Editors.Pixelate/FSpot.Addins.Editors/PixelateEditor.cs b/src/Extensions/Editors/FSpot.Editors.Pixelate/FSpot.Addins.Editors/PixelateEditor.cs
index 62968f1..e0417f4 100644
--- a/src/Extensions/Editors/FSpot.Editors.Pixelate/FSpot.Addins.Editors/PixelateEditor.cs
+++ b/src/Extensions/Editors/FSpot.Editors.Pixelate/FSpot.Addins.Editors/PixelateEditor.cs
@@ -29,14 +29,17 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot;
using FSpot.Editors;
+
using Gdk;
using Gtk;
+
using Mono.Unix;
-namespace FSpot.Addins.Editors {
- class PixelateEditor : Editor {
+namespace FSpot.Addins.Editors
+{
+ class PixelateEditor : Editor
+ {
public PixelateEditor () : base (Catalog.GetString ("Pixelate"), null) {
CanHandleMultiple = false;
NeedsSelection = true;
diff --git a/src/Extensions/Editors/FSpot.Editors.Resize/FSpot.Addins.Editors/ResizeEditor.cs b/src/Extensions/Editors/FSpot.Editors.Resize/FSpot.Addins.Editors/ResizeEditor.cs
index b9d80fa..5bc5514 100644
--- a/src/Extensions/Editors/FSpot.Editors.Resize/FSpot.Addins.Editors/ResizeEditor.cs
+++ b/src/Extensions/Editors/FSpot.Editors.Resize/FSpot.Addins.Editors/ResizeEditor.cs
@@ -28,15 +28,19 @@
//
using System;
-using FSpot;
+
using FSpot.Editors;
using FSpot.Imaging;
+
using Gtk;
using Gdk;
+
using Mono.Unix;
-namespace FSpot.Addins.Editors {
- class ResizeEditor : Editor {
+namespace FSpot.Addins.Editors
+{
+ class ResizeEditor : Editor
+ {
SpinButton size;
public ResizeEditor () : base (Catalog.GetString ("Resize"), null) {
diff --git a/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/Brasero.cs b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/Brasero.cs
index d723bec..ebf42ae 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/Brasero.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/Brasero.cs
@@ -27,7 +27,7 @@
// Borrowed parts from banshee.
// src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs
-using System;
+
using System.IO;
using System.Diagnostics;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs
index 871c743..ae47749 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs
@@ -29,26 +29,21 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-using System.IO;
-using System.Reflection;
-using System.Runtime.InteropServices;
-
using Mono.Unix;
-using FSpot;
using FSpot.Core;
using FSpot.Filters;
-using FSpot.Widgets;
-using Hyena;
using FSpot.UI.Dialog;
+using Hyena;
+
using GLib;
using Gtk;
-using GtkBeans;
-namespace FSpot.Exporters.CD {
- public class CDExport : FSpot.Extensions.IExporter {
+namespace FSpot.Exporters.CD
+{
+ public class CDExport : FSpot.Extensions.IExporter
+ {
IBrowsableCollection selection;
IDiscBurner burner;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExportDialog.cs b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExportDialog.cs
index 1e52b56..9b2f76c 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExportDialog.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExportDialog.cs
@@ -30,23 +30,19 @@
//
using System;
-using System.IO;
using System.Reflection;
-using System.Runtime.InteropServices;
-using Mono.Unix;
-using FSpot;
+
using FSpot.Core;
-using FSpot.Filters;
using FSpot.Widgets;
-using Hyena;
using FSpot.UI.Dialog;
+
using GLib;
using Gtk;
-using GtkBeans;
namespace FSpot.Exporters.CD
{
- class CDExportDialog : BuilderDialog {
+ class CDExportDialog : BuilderDialog
+ {
Gtk.Window listwindow;
System.Uri dest;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs
index 5ec17be..cf954ce 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs
@@ -32,20 +32,22 @@
using System;
using System.IO;
-using System.Threading;
using System.Collections;
using System.Collections.Generic;
+
using Mono.Unix;
+
using Gtk;
using Gnome.Keyring;
using FSpot.Core;
-using Hyena;
-using Hyena.Widgets;
using FSpot.UI.Dialog;
using FSpot.Extensions;
using FSpot.Filters;
+using Hyena;
+using Hyena.Widgets;
+
using Mono.Facebook;
namespace FSpot.Exporters.Facebook
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookTagPopup.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookTagPopup.cs
index 313d8c2..251b0aa 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookTagPopup.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookTagPopup.cs
@@ -29,7 +29,9 @@
using System.Reflection;
using System.Collections.Generic;
+
using FSpot.Widgets;
+
using Mono.Facebook;
namespace FSpot.Exporters.Facebook
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/FindNullableClashes.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FindNullableClashes.cs
index 4f6ea90..a8e6d7f 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/FindNullableClashes.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FindNullableClashes.cs
@@ -31,6 +31,7 @@
using System;
using System.Reflection;
+
using Hyena;
public class FindNullableClashes {
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Album.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Album.cs
index 9c27846..d285bae 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Album.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Album.cs
@@ -27,16 +27,14 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
-using System.Collections.Generic;
-using System.IO;
using System.Xml.Serialization;
using System.Text;
-using System.Net;
+
using Mono.Facebook.Schemas;
namespace Mono.Facebook
{
- [System.Xml.Serialization.XmlRootAttribute("photos_createAlbum_response", Namespace="http://api.facebook.com/1.0/")]
+ [System.Xml.Serialization.XmlRootAttribute("photos_createAlbum_response", Namespace="http://api.facebook.com/1.0/")]
public class Album : album, SessionWrapper
{
[XmlIgnore]
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Error.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Error.cs
index 191a0fe..337e841 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Error.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Error.cs
@@ -26,7 +26,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.Xml.Serialization;
namespace Mono.Facebook
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Event.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Event.cs
index 2ff027a..84148f0 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Event.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Event.cs
@@ -23,10 +23,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
-using System.Collections.Generic;
-using System.IO;
using System.Xml.Serialization;
-using System.Text;
+
using Mono.Facebook.Schemas;
namespace Mono.Facebook
@@ -41,7 +39,7 @@ namespace Mono.Facebook
public class Event : @event, SessionWrapper
{
- [XmlIgnore]
+ [XmlIgnore]
public FacebookSession Session { get; set; }
[XmlIgnore ()]
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookSession.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookSession.cs
index 43377dd..f5a950f 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookSession.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookSession.cs
@@ -30,11 +30,7 @@
using System;
using System.Xml;
using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Net;
using System.Linq;
-using Mono.Facebook.Schemas;
namespace Mono.Facebook
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Friend.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Friend.cs
index de26293..cbc13c3 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Friend.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Friend.cs
@@ -24,18 +24,13 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml.Serialization;
-using System.Text;
namespace Mono.Facebook
{
public class Friend : SessionWrapper
{
public FacebookSession Session { get; set; }
- public long UId { get; set; }
+ public long UId { get; set; }
public Friend (long UId, FacebookSession session)
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FriendInfo.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FriendInfo.cs
index c64e33a..093237d 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FriendInfo.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FriendInfo.cs
@@ -24,7 +24,7 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
+
using System.Xml.Serialization;
namespace Mono.Facebook
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Group.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Group.cs
index 719fd83..dd05a6c 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Group.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Group.cs
@@ -28,13 +28,14 @@
//
using System;
using System.Xml.Serialization;
+
using Mono.Facebook.Schemas;
namespace Mono.Facebook
{
public class Group : group, SessionWrapper
{
- [XmlIgnore]
+ [XmlIgnore]
public FacebookSession Session { get; set; }
[XmlIgnore ()]
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Location.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Location.cs
index feb6221..18af52f 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Location.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Location.cs
@@ -23,7 +23,7 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
+
using System.Xml.Serialization;
namespace Mono.Facebook
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Notification.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Notification.cs
index 3792ebc..4daf7c0 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Notification.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Notification.cs
@@ -23,10 +23,8 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-using System.IO;
+
using System.Xml.Serialization;
-using System.Text;
namespace Mono.Facebook
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/PeopleList.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/PeopleList.cs
index 6278330..49774a5 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/PeopleList.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/PeopleList.cs
@@ -23,9 +23,8 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
+
using System.Xml.Serialization;
-using System.Collections;
namespace Mono.Facebook
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Photo.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Photo.cs
index 3ddbcdf..0098ae3 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Photo.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Photo.cs
@@ -25,7 +25,9 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+
using System.Xml.Serialization;
+
using Mono.Facebook.Schemas;
namespace Mono.Facebook
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Responses.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Responses.cs
index 105e737..c6f0bbf 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Responses.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Responses.cs
@@ -26,9 +26,8 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
+
using System.Xml.Serialization;
-using Mono.Facebook.Schemas;
namespace Mono.Facebook
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/SessionInfo.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/SessionInfo.cs
index f385ef3..ef8936e 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/SessionInfo.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/SessionInfo.cs
@@ -25,8 +25,9 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
+
using System.Xml.Serialization;
+
using Mono.Facebook.Schemas;
namespace Mono.Facebook
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/SessionWrapper.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/SessionWrapper.cs
index 5874380..bd984b8 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/SessionWrapper.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/SessionWrapper.cs
@@ -26,7 +26,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System.Xml.Serialization;
namespace Mono.Facebook
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Tag.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Tag.cs
index 4d7393e..ded7285 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Tag.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Tag.cs
@@ -27,6 +27,7 @@
//
using System.Xml.Serialization;
+
using Mono.Facebook.Schemas;
namespace Mono.Facebook
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/User.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/User.cs
index 3d1ca17..e0f2f44 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/User.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/User.cs
@@ -27,8 +27,10 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+
using System;
using System.Xml.Serialization;
+
using Mono.Facebook.Schemas;
namespace Mono.Facebook
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Util.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Util.cs
index b71cb0a..14ef367 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Util.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Util.cs
@@ -26,6 +26,7 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+
using System;
using System.Collections.Generic;
using System.IO;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/facebook.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/facebook.cs
index eb2165c..16431b2 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/facebook.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/facebook.cs
@@ -40,13 +40,13 @@
//
//This source code was auto-generated by MonoXSD
//
-namespace Mono.Facebook.Schemas {
-
-
+namespace Mono.Facebook.Schemas
+{
/// <remarks/>
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://api.facebook.com/1.0/")]
[System.Xml.Serialization.XmlRootAttribute("feed_getRegisteredTemplateBundleByID_response", Namespace="http://api.facebook.com/1.0/")]
- public class template_bundle {
+ public class template_bundle
+ {
/// <remarks/>
public template_bundleOne_line_story_templates one_line_story_templates;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs b/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs
index 3a738bc..d7e410f 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs
@@ -30,26 +30,28 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FlickrNet;
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Threading;
+
using Mono.Unix;
+using FlickrNet;
+
using FSpot;
using FSpot.Core;
using FSpot.Filters;
using FSpot.Widgets;
-using FSpot.Utils;
using FSpot.UI.Dialog;
+
using Hyena;
using Hyena.Widgets;
-using GtkBeans;
-namespace FSpot.Exporters.Flickr {
+namespace FSpot.Exporters.Flickr
+{
public class TwentyThreeHQExport : FlickrExport
{
public override void Run (IBrowsableCollection selection)
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs b/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs
index da35672..bb716b5 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs
@@ -42,20 +42,21 @@
*
*/
using System;
-using System.IO;
using System.Text;
-using System.Collections;
using System.Collections.Generic;
using FlickrNet;
+
using FSpot;
using FSpot.Core;
-using FSpot.Utils;
using FSpot.Filters;
+
using Hyena;
-namespace FSpot.Exporters.Flickr {
-public class FlickrRemote {
+namespace FSpot.Exporters.Flickr
+{
+public class FlickrRemote
+ {
public static Licenses licenses;
private string frob;
private string token;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs
index 270f228..a7ac6d0 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs
@@ -51,20 +51,14 @@
//This should be used to export the selected pics to an original gallery
//located on a GIO location.
+
using System;
using System.IO;
-using System.Runtime.InteropServices;
-using System.Collections;
-using System.Collections.Generic;
using Hyena;
using Mono.Unix;
-using ICSharpCode.SharpZipLib.Checksums;
-using ICSharpCode.SharpZipLib.Zip;
-using ICSharpCode.SharpZipLib.GZip;
-
using FSpot;
using FSpot.Core;
using FSpot.Filters;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/HtmlGallery.cs b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/HtmlGallery.cs
index b877ebe..ba6dfc9 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/HtmlGallery.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/HtmlGallery.cs
@@ -54,7 +54,6 @@
using System;
using System.IO;
-using System.Collections;
using System.Collections.Generic;
using Mono.Unix;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs
index c98e249..ff6d6b6 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs
@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-
using System;
using Mono.Unix;
@@ -35,10 +34,10 @@ using Mono.Unix;
using Hyena;
using Hyena.Widgets;
-
namespace FSpot.Exporters.Gallery
{
- public class AccountDialog {
+ public class AccountDialog
+ {
public AccountDialog (Gtk.Window parent) : this (parent, null, false) {
add_dialog.Response += HandleAddResponse;
add_button.Sensitive = false;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/FormClient.cs b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/FormClient.cs
index b224103..def3b0f 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/FormClient.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/FormClient.cs
@@ -39,8 +39,8 @@ using System.Text;
using System.Web;
using FSpot.Core;
-using Mono.Unix;
+using Mono.Unix;
namespace FSpot.Exporters.Gallery
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryAccount.cs b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryAccount.cs
index b66427e..0d059cb 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryAccount.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryAccount.cs
@@ -33,7 +33,8 @@ using Hyena;
namespace FSpot.Exporters.Gallery
{
- public class GalleryAccount {
+ public class GalleryAccount
+ {
public GalleryAccount (string name, string url, string username, string password) : this (name, url, username, password, GalleryVersion.VersionUnknown) {}
public GalleryAccount (string name, string url, string username, string password, GalleryVersion version)
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs
index a7bd093..4b0c6e1 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs
@@ -43,7 +43,6 @@ using FSpot.UI.Dialog;
using FSpot.Extensions;
using Hyena;
-using Hyena.Widgets;
namespace FSpot.Exporters.Gallery
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryRemote.cs b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryRemote.cs
index a225aa4..74661f7 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryRemote.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryRemote.cs
@@ -31,17 +31,12 @@
//
using System;
-using System.Net;
using System.IO;
-using System.Text;
-using System.Collections;
using System.Collections.Generic;
-using Mono.Unix;
-using FSpot;
using FSpot.Core;
+
using Hyena;
-using Hyena.Widgets;
/* These classes are based off the documentation at
*
diff --git a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccount.cs b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccount.cs
index 864867b..e9a6e83 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccount.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccount.cs
@@ -27,30 +27,17 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.Net;
-using System.IO;
-using System.Text;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Web;
-using Mono.Unix;
+
using Hyena;
-using Hyena.Widgets;
-using FSpot;
-using FSpot.Core;
-using FSpot.Filters;
-using FSpot.Widgets;
-using FSpot.Imaging;
-using FSpot.UI.Dialog;
-using Gnome.Keyring;
+
using Mono.Google;
using Mono.Google.Picasa;
namespace FSpot.Exporters.PicasaWeb
{
- public class GoogleAccount {
-
+ public class GoogleAccount
+ {
private string username;
private string password;
private string token;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccountDialog.cs b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccountDialog.cs
index cbe45f6..fcd0f28 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccountDialog.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccountDialog.cs
@@ -28,24 +28,12 @@
//
using System;
-using System.Net;
-using System.IO;
-using System.Text;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Web;
-using Mono.Unix;
+
using Hyena;
-using Hyena.Widgets;
-using FSpot;
-using FSpot.Core;
-using FSpot.Filters;
-using FSpot.Widgets;
+
using FSpot.Imaging;
-using FSpot.UI.Dialog;
-using Gnome.Keyring;
+
using Mono.Google;
-using Mono.Google.Picasa;
namespace FSpot.Exporters.PicasaWeb
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccountManager.cs b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccountManager.cs
index 5389e59..562d14b 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccountManager.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccountManager.cs
@@ -31,7 +31,9 @@
using System;
using System.Collections;
using System.Collections.Generic;
+
using Hyena;
+
using Gnome.Keyring;
namespace FSpot.Exporters.PicasaWeb
diff --git a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAddAlbum.cs b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAddAlbum.cs
index 9fc6408..e36adfd 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAddAlbum.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAddAlbum.cs
@@ -28,28 +28,17 @@
//
using System;
-using System.Net;
-using System.IO;
-using System.Text;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Web;
+
using Mono.Unix;
-using Hyena;
+
using Hyena.Widgets;
-using FSpot;
-using FSpot.Core;
-using FSpot.Filters;
-using FSpot.Widgets;
-using FSpot.Imaging;
-using FSpot.UI.Dialog;
-using Gnome.Keyring;
-using Mono.Google;
+
using Mono.Google.Picasa;
namespace FSpot.Exporters.PicasaWeb
{
- public class GoogleAddAlbum {
+ public class GoogleAddAlbum
+ {
[GtkBeans.Builder.Object] Gtk.Dialog dialog;
[GtkBeans.Builder.Object] Gtk.Entry title_entry;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs
index f40d17d..e6892ce 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs
@@ -41,7 +41,9 @@ using System.IO;
using System.Text;
using System.Collections;
using System.Collections.Generic;
+
using Mono.Unix;
+
using Hyena;
using FSpot;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccount.cs b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccount.cs
index e103b03..13936c2 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccount.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccount.cs
@@ -27,28 +27,16 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.Net;
-using System.IO;
-using System.Text;
-using System.Threading;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Web;
-using Mono.Unix;
-using Gtk;
-using FSpot;
-using FSpot.Core;
-using FSpot.Filters;
-using FSpot.Widgets;
+
using Hyena;
-using FSpot.UI.Dialog;
-using Gnome.Keyring;
+
using SmugMugNet;
namespace FSpot.Exporters.SmugMug
{
- public class SmugMugAccount {
+ public class SmugMugAccount
+ {
private string username;
private string password;
private SmugMugApi smugmug_proxy;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccountDialog.cs b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccountDialog.cs
index 114bfc2..9edcfa4 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccountDialog.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccountDialog.cs
@@ -28,27 +28,11 @@
//
using System;
-using System.Net;
-using System.IO;
-using System.Text;
-using System.Threading;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Web;
-using Mono.Unix;
-using Gtk;
-using FSpot;
-using FSpot.Core;
-using FSpot.Filters;
-using FSpot.Widgets;
-using Hyena;
-using FSpot.UI.Dialog;
-using Gnome.Keyring;
-using SmugMugNet;
namespace FSpot.Exporters.SmugMug
{
- public class SmugMugAccountDialog {
+ public class SmugMugAccountDialog
+ {
public SmugMugAccountDialog (Gtk.Window parent) : this (parent, null) {
Dialog.Response += HandleAddResponse;
add_button.Sensitive = false;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccountManager.cs b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccountManager.cs
index bd1032c..61190ce 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccountManager.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccountManager.cs
@@ -29,25 +29,12 @@
//
using System;
-using System.Net;
-using System.IO;
-using System.Text;
-using System.Threading;
using System.Collections;
using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Web;
-
-using Mono.Unix;
-using Gtk;
-using FSpot;
-using FSpot.Core;
-using FSpot.Filters;
-using FSpot.Widgets;
+
using Hyena;
-using FSpot.UI.Dialog;
+
using Gnome.Keyring;
-using SmugMugNet;
namespace FSpot.Exporters.SmugMug
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAddAlbum.cs b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAddAlbum.cs
index df6d8c6..289d481 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAddAlbum.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAddAlbum.cs
@@ -28,27 +28,15 @@
//
using System;
-using System.Net;
-using System.IO;
-using System.Text;
-using System.Threading;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Web;
-using Mono.Unix;
+
using Gtk;
-using FSpot;
-using FSpot.Core;
-using FSpot.Filters;
-using FSpot.Widgets;
-using Hyena;
-using FSpot.UI.Dialog;
-using Gnome.Keyring;
+
using SmugMugNet;
namespace FSpot.Exporters.SmugMug
{
- public class SmugMugAddAlbum {
+ public class SmugMugAddAlbum
+ {
[GtkBeans.Builder.Object] Gtk.Dialog dialog;
[GtkBeans.Builder.Object] Gtk.Entry title_entry;
[GtkBeans.Builder.Object] Gtk.CheckButton public_check;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs
index f2417e5..6feb541 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs
@@ -41,23 +41,24 @@
using System;
using System.IO;
-using System.Text;
-using System.Threading;
using System.Collections.Generic;
+
using Mono.Unix;
-using Gtk;
using FSpot;
using FSpot.Core;
using FSpot.Filters;
using FSpot.Widgets;
-using Hyena;
using FSpot.UI.Dialog;
+using Hyena;
+
using SmugMugNet;
-namespace FSpot.Exporters.SmugMug {
- public class SmugMugExport : FSpot.Extensions.IExporter {
+namespace FSpot.Exporters.SmugMug
+{
+ public class SmugMugExport : FSpot.Extensions.IExporter
+ {
public SmugMugExport () {}
public void Run (IBrowsableCollection selection)
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/ApplicationCentricCertificatePolicy.cs b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/ApplicationCentricCertificatePolicy.cs
index 059114e..6a0bede 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/ApplicationCentricCertificatePolicy.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/ApplicationCentricCertificatePolicy.cs
@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
@@ -39,10 +38,10 @@ using System.Security.Cryptography.X509Certificates;
using Hyena;
-namespace FSpot.Exporters.Tabblo {
-
- class ApplicationCentricCertificatePolicy : ICertificatePolicy {
-
+namespace FSpot.Exporters.Tabblo
+{
+ class ApplicationCentricCertificatePolicy : ICertificatePolicy
+ {
protected enum Decision {
DontTrust,
TrustOnce,
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/BlindTrustCertificatePolicy.cs b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/BlindTrustCertificatePolicy.cs
index 90b700d..2b31296 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/BlindTrustCertificatePolicy.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/BlindTrustCertificatePolicy.cs
@@ -32,8 +32,10 @@ using System.Security.Cryptography.X509Certificates;
using Hyena;
-namespace FSpot.Exporters.Tabblo {
- class BlindTrustCertificatePolicy : ICertificatePolicy {
+namespace FSpot.Exporters.Tabblo
+{
+ class BlindTrustCertificatePolicy : ICertificatePolicy
+ {
public bool CheckValidationResult (ServicePoint service_point,
X509Certificate certificate,
WebRequest request,
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/FSpotTraceListener.cs b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/FSpotTraceListener.cs
index 5c8caf9..615cb01 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/FSpotTraceListener.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/FSpotTraceListener.cs
@@ -29,10 +29,10 @@
using Hyena;
-namespace FSpot.Exporters.Tabblo {
-
- class FSpotTraceListener : System.Diagnostics.TraceListener {
-
+namespace FSpot.Exporters.Tabblo
+{
+ class FSpotTraceListener : System.Diagnostics.TraceListener
+ {
public override void Write (string message)
{
Log.Debug ("Mono.Tabblo", message);
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/FSpotUploadProgress.cs b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/FSpotUploadProgress.cs
index 8b0b1f6..fc14181 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/FSpotUploadProgress.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/FSpotUploadProgress.cs
@@ -27,16 +27,17 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Mono.Tabblo;
-using Mono.Unix;
using System;
-using FSpot.UI.Dialog;
-using FSpot.Utils;
-namespace FSpot.Exporters.Tabblo {
+using Mono.Tabblo;
+using Mono.Unix;
- class FSpotUploadProgress : TotalUploadProgress {
+using FSpot.UI.Dialog;
+namespace FSpot.Exporters.Tabblo
+{
+ class FSpotUploadProgress : TotalUploadProgress
+ {
private ThreadProgressDialog progress_dialog;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExport.cs b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExport.cs
index 615c684..2fc3d98 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExport.cs
@@ -27,24 +27,24 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Mono.Tabblo;
-using Mono.Unix;
-
using System;
-using System.Collections;
using System.Diagnostics;
using System.Net;
using System.Threading;
+using Mono.Tabblo;
+using Mono.Unix;
+
using Hyena;
+
using FSpot;
using FSpot.Core;
using FSpot.UI.Dialog;
-namespace FSpot.Exporters.Tabblo {
-
- public class TabbloExport : FSpot.Extensions.IExporter {
-
+namespace FSpot.Exporters.Tabblo
+{
+ public class TabbloExport : FSpot.Extensions.IExporter
+ {
private readonly TabbloExportModel model;
private TabbloExportView main_dialog;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExportModel.cs b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExportModel.cs
index c129c24..122aed4 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExportModel.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExportModel.cs
@@ -27,21 +27,19 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Hyena;
-
-using Mono.Tabblo;
-
using System;
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
-using FSpot.Core;
-
-namespace FSpot.Exporters.Tabblo {
+using Hyena;
- class TabbloExportModel : Mono.Tabblo.IPreferences {
+using FSpot.Core;
+namespace FSpot.Exporters.Tabblo
+{
+ class TabbloExportModel : Mono.Tabblo.IPreferences
+ {
private IBrowsableCollection photo_collection;
private string username;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExportView.cs b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExportView.cs
index 875064b..390378a 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExportView.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExportView.cs
@@ -27,18 +27,15 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-using System.Diagnostics;
using System.Reflection;
using FSpot.Core;
using FSpot.Widgets;
-namespace FSpot.Exporters.Tabblo {
-
-
- class TabbloExportView : FSpot.UI.Dialog.BuilderDialog {
-
+namespace FSpot.Exporters.Tabblo
+{
+ class TabbloExportView : FSpot.UI.Dialog.BuilderDialog
+ {
private const string DialogName = "tabblo_export_dialog";
[GtkBeans.Builder.Object]
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/UserDecisionCertificatePolicy.cs b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/UserDecisionCertificatePolicy.cs
index ede6243..8189726 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/UserDecisionCertificatePolicy.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/UserDecisionCertificatePolicy.cs
@@ -36,11 +36,10 @@ using System.Threading;
using Hyena;
-namespace FSpot.Exporters.Tabblo {
-
- class UserDecisionCertificatePolicy
- : ApplicationCentricCertificatePolicy {
-
+namespace FSpot.Exporters.Tabblo
+{
+ class UserDecisionCertificatePolicy : ApplicationCentricCertificatePolicy
+ {
private const string DialogName = "trust_error_dialog";
[GtkBeans.Builder.Object] Gtk.Dialog dialog;
[GtkBeans.Builder.Object] Gtk.Label url_label;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs b/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs
index 4f6382f..c46d4e7 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs
@@ -29,25 +29,28 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+using System;
+using System.IO;
+
using FSpot;
using FSpot.UI.Dialog;
using FSpot.Core;
using FSpot.Extensions;
using FSpot.Filters;
+
using Hyena;
using Hyena.Widgets;
-using System;
-using System.IO;
-using System.Collections;
+
using Mono.Unix;
+
using Gtk;
using ICSharpCode.SharpZipLib.Checksums;
using ICSharpCode.SharpZipLib.Zip;
-using ICSharpCode.SharpZipLib.GZip;
-
-namespace FSpot.Exporters.Zip {
- public class Zip : IExporter {
+namespace FSpot.Exporters.Zip
+{
+ public class Zip : IExporter
+ {
[GtkBeans.Builder.Object] Gtk.Dialog zipdiag;
[GtkBeans.Builder.Object] Gtk.HBox dirchooser_hbox;
[GtkBeans.Builder.Object] Gtk.CheckButton scale_check;
diff --git a/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath/ChangePhotoPathController.cs b/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath/ChangePhotoPathController.cs
index 3e62978..59b2882 100644
--- a/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath/ChangePhotoPathController.cs
+++ b/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath/ChangePhotoPathController.cs
@@ -36,15 +36,14 @@
// Copyright (C) 2007
//
-
-using FSpot;
-using FSpot.Core;
-using FSpot.Query;
using System;
using System.IO;
-using System.Collections;
using System.Collections.Generic;
using System.Collections.Specialized;
+
+using FSpot;
+using FSpot.Core;
+
using Hyena;
/*
@@ -64,7 +63,6 @@ A bit of mixture between URI and path. Old and New base path are in String path.
namespace FSpot.Tools.ChangePhotoPath
{
-
public enum ProcessResult {
Ok, Cancelled, Error, SamePath, NoPhotosFound, Processing
}
diff --git a/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath/ChangePhotoPathGui.cs b/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath/ChangePhotoPathGui.cs
index d9c50f1..dd5b1a2 100644
--- a/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath/ChangePhotoPathGui.cs
+++ b/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath/ChangePhotoPathGui.cs
@@ -36,17 +36,17 @@
// Copyright (C) 2007
//
+using System;
+
using FSpot.Extensions;
using FSpot.UI.Dialog;
-using System;
//using Gnome.Vfs;
-using Gtk;
+
using Hyena;
using Hyena.Widgets;
namespace FSpot.Tools.ChangePhotoPath
{
-
public class Dump : Gtk.Dialog, ICommand, IChangePhotoPathGui
{
private string dialog_name = "ChangePhotoPath";
diff --git a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/AbstractDevelopInUFRaw.cs b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/AbstractDevelopInUFRaw.cs
index 3985c58..d09b676 100644
--- a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/AbstractDevelopInUFRaw.cs
+++ b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/AbstractDevelopInUFRaw.cs
@@ -31,14 +31,15 @@
using System;
using System.IO;
+
using Mono.Unix;
+
using Hyena;
+
using FSpot;
using FSpot.Core;
-using FSpot.Utils;
using FSpot.Extensions;
using FSpot.Imaging;
-using FSpot.UI.Dialog;
namespace FSpot.Tools.DevelopInUFraw
{
diff --git a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.cs b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.cs
index bcbdd96..2d552e1 100644
--- a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.cs
+++ b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.cs
@@ -28,22 +28,16 @@
//
using System;
-using System.IO;
-
-using Mono.Unix;
using Hyena;
+
using FSpot;
-using FSpot.Core;
-using FSpot.Utils;
-using FSpot.Extensions;
-using FSpot.Imaging;
-using FSpot.UI.Dialog;
namespace FSpot.Tools.DevelopInUFraw
{
// GUI Version
- public class DevelopInUFRaw : AbstractDevelopInUFRaw {
+ public class DevelopInUFRaw : AbstractDevelopInUFRaw
+ {
public DevelopInUFRaw() : base("ufraw")
{
}
diff --git a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRawBatch.cs b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRawBatch.cs
index 5dc4d35..955ec28 100644
--- a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRawBatch.cs
+++ b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRawBatch.cs
@@ -28,20 +28,19 @@
//
using System;
-using System.IO;
+
using Mono.Unix;
+
using Hyena;
+
using FSpot;
-using FSpot.Core;
-using FSpot.Utils;
-using FSpot.Extensions;
-using FSpot.Imaging;
using FSpot.UI.Dialog;
namespace FSpot.Tools.DevelopInUFraw
{
// Batch Version
- public class DevelopInUFRawBatch : AbstractDevelopInUFRaw {
+ public class DevelopInUFRawBatch : AbstractDevelopInUFRaw
+ {
public DevelopInUFRawBatch() : base("ufraw-batch")
{
}
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs
index fa71e06..1698910 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs
@@ -34,6 +34,7 @@ using System.Reflection;
using FSpot;
using FSpot.Core;
+
using Mono.Unix;
namespace FSpot.Tools.LiveWebGallery
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGallery.cs b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGallery.cs
index 386af52..d78505c 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGallery.cs
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGallery.cs
@@ -28,19 +28,12 @@
//
using System;
-using System.IO;
using System.Net;
-using System.Collections.Generic;
using Gtk;
-using FSpot;
using FSpot.Core;
using FSpot.Extensions;
-using FSpot.Utils;
-using FSpot.Query;
-using FSpot.UI.Dialog;
-using Mono.Unix;
namespace FSpot.Tools.LiveWebGallery
{
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs
index 6a2dd80..579219f 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs
@@ -30,12 +30,14 @@
using System;
using System.Net;
using System.Reflection;
+
using FSpot;
using FSpot.Core;
-using FSpot.Extensions;
-using FSpot.Query;
+
using Gtk;
+
using Mono.Unix;
+
using Hyena;
namespace FSpot.Tools.LiveWebGallery
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/PhotoRequestHandler.cs b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/PhotoRequestHandler.cs
index 84ed578..be35e64 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/PhotoRequestHandler.cs
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/PhotoRequestHandler.cs
@@ -27,13 +27,12 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.IO;
-using System.Text;
using FSpot;
using FSpot.Filters;
using FSpot.Utils;
+
using Hyena;
namespace FSpot.Tools.LiveWebGallery
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/ResourceRequestHandler.cs b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/ResourceRequestHandler.cs
index 7ce3923..e9223df 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/ResourceRequestHandler.cs
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/ResourceRequestHandler.cs
@@ -27,13 +27,9 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.IO;
-using System.Text;
using System.Reflection;
-using FSpot;
-
namespace FSpot.Tools.LiveWebGallery
{
public class ResourceRequestHandler : RequestHandler
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/SimpleWebServer.cs b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/SimpleWebServer.cs
index 00c42a0..ae227e2 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/SimpleWebServer.cs
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/SimpleWebServer.cs
@@ -31,13 +31,12 @@ using System;
using System.IO;
using System.Net;
using System.Net.Sockets;
-using System.Collections;
using System.Collections.Generic;
using System.Text;
using System.Threading;
-using FSpot;
using FSpot.Extensions;
+
using Hyena;
namespace FSpot.Tools.LiveWebGallery
diff --git a/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDb.cs b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDb.cs
index 036a5de..ff2f774 100644
--- a/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDb.cs
+++ b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDb.cs
@@ -40,8 +40,9 @@ using FSpot.Core;
using FSpot.Database;
using FSpot.Extensions;
using FSpot.Query;
-using FSpot.UI.Dialog;
+
using Mono.Unix;
+
using Hyena;
using Hyena.Widgets;
@@ -49,7 +50,6 @@ namespace FSpot.Tools.MergeDb
{
public class MergeDb : ICommand
{
-
Db from_db;
Db to_db;
Roll [] new_rolls;
diff --git a/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDbDialog.cs b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDbDialog.cs
index 382c7e6..25ae378 100644
--- a/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDbDialog.cs
+++ b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDbDialog.cs
@@ -30,9 +30,8 @@
//
using System;
-using FSpot;
+
using FSpot.Core;
-using FSpot.Query;
namespace FSpot.Tools.MergeDb
{
diff --git a/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/PickFolderDialog.cs b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/PickFolderDialog.cs
index c71dfbf..479ea9f 100644
--- a/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/PickFolderDialog.cs
+++ b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/PickFolderDialog.cs
@@ -30,9 +30,9 @@
//
using System;
-using FSpot;
-using FSpot.Query;
+
using Mono.Unix;
+
using Hyena;
namespace FSpot.Tools.MergeDb
diff --git a/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/FSpot.Tools.RawPlusJpeg/RawPlusJpeg.cs b/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/FSpot.Tools.RawPlusJpeg/RawPlusJpeg.cs
index 3ce0a74..96b92f9 100644
--- a/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/FSpot.Tools.RawPlusJpeg/RawPlusJpeg.cs
+++ b/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/FSpot.Tools.RawPlusJpeg/RawPlusJpeg.cs
@@ -34,7 +34,6 @@ using Gtk;
using FSpot;
using FSpot.Core;
-using FSpot.UI.Dialog;
using FSpot.Extensions;
using FSpot.Imaging;
diff --git a/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/FSpot.Tools.RetroactiveRoll/RetroactiveRoll.cs b/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/FSpot.Tools.RetroactiveRoll/RetroactiveRoll.cs
index 697644d..8eb8c54 100644
--- a/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/FSpot.Tools.RetroactiveRoll/RetroactiveRoll.cs
+++ b/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/FSpot.Tools.RetroactiveRoll/RetroactiveRoll.cs
@@ -29,10 +29,12 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+using System;
+
using FSpot;
using FSpot.Core;
using FSpot.Extensions;
-using System;
+
using Hyena;
using Hyena.Data.Sqlite;
diff --git a/src/Extensions/Transitions/FSpot.Transitions.Cover/FSpot.Addins.Transitions/Cover.cs b/src/Extensions/Transitions/FSpot.Transitions.Cover/FSpot.Addins.Transitions/Cover.cs
index 277c3a7..cbe408d 100644
--- a/src/Extensions/Transitions/FSpot.Transitions.Cover/FSpot.Addins.Transitions/Cover.cs
+++ b/src/Extensions/Transitions/FSpot.Transitions.Cover/FSpot.Addins.Transitions/Cover.cs
@@ -28,12 +28,12 @@
//
using System;
+
using Mono.Unix;
using Cairo;
using Gdk;
-using FSpot.Utils;
using FSpot.Transitions;
using Color = Cairo.Color;
diff --git a/src/Extensions/Transitions/FSpot.Transitions.Dissolve/FSpot.Addins.Transitions/Dissolve.cs b/src/Extensions/Transitions/FSpot.Transitions.Dissolve/FSpot.Addins.Transitions/Dissolve.cs
index bb65a7d..63dcebb 100644
--- a/src/Extensions/Transitions/FSpot.Transitions.Dissolve/FSpot.Addins.Transitions/Dissolve.cs
+++ b/src/Extensions/Transitions/FSpot.Transitions.Dissolve/FSpot.Addins.Transitions/Dissolve.cs
@@ -28,12 +28,12 @@
//
using System;
+
using Mono.Unix;
using Cairo;
using Gdk;
-using FSpot.Utils;
using FSpot.Transitions;
using Color = Cairo.Color;
diff --git a/src/Extensions/Transitions/FSpot.Transitions.Push/FSpot.Addins.Transitions/Push.cs b/src/Extensions/Transitions/FSpot.Transitions.Push/FSpot.Addins.Transitions/Push.cs
index 1f5c63a..c1d9771 100644
--- a/src/Extensions/Transitions/FSpot.Transitions.Push/FSpot.Addins.Transitions/Push.cs
+++ b/src/Extensions/Transitions/FSpot.Transitions.Push/FSpot.Addins.Transitions/Push.cs
@@ -28,12 +28,12 @@
//
using System;
+
using Mono.Unix;
using Cairo;
using Gdk;
-using FSpot.Utils;
using FSpot.Transitions;
using Color = Cairo.Color;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]