move filedialog to its new home

(bzr r1398)

5 files changed, 16 insertions, 16 deletions

diff --git a/src/dialogs/Makefile_insert b/src/dialogs/Makefile_insert
index c1133014c..e09f16809 100644
--- a/src/dialogs/Makefile_insert
+++ b/src/dialogs/Makefile_insert
@@ -26,8 +26,6 @@ dialogs_libspdialogs_a_SOURCES = \
 	dialogs/export.h	\
 	dialogs/extensions.cpp	\
 	dialogs/extensions.h	\
-	dialogs/filedialog.cpp	\
-	dialogs/filedialog.h	\
 	dialogs/fill-style.cpp	\
 	dialogs/fill-style.h	\
 	dialogs/guidelinedialog.cpp	\
diff --git a/src/file.cpp b/src/file.cpp
index 0ad55e2ac..2d863f39a 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -43,7 +43,7 @@
 #include "print.h"
 #include "file.h"
 #include "message-stack.h"
-#include "dialogs/filedialog.h"
+#include "ui/dialog/filedialog.h"
 #include "prefs-utils.h"
 #include "path-prefix.h"
 
@@ -352,7 +352,7 @@ void dump_ustr(Glib::ustring const &ustr)
     g_message("---------------");
 }
 
-static Inkscape::UI::Dialogs::FileOpenDialog *openDialogInstance = NULL;
+static Inkscape::UI::Dialog::FileOpenDialog *openDialogInstance = NULL;
 
 /**
  *  Display an file Open selector.  Open a document if OK is pressed.
@@ -377,9 +377,9 @@ sp_file_open_dialog(gpointer object, gpointer data)
 
     if (!openDialogInstance) {
         openDialogInstance =
-              Inkscape::UI::Dialogs::FileOpenDialog::create(
+              Inkscape::UI::Dialog::FileOpenDialog::create(
                  (char const *)open_path,
-                 Inkscape::UI::Dialogs::SVG_TYPES,
+                 Inkscape::UI::Dialog::SVG_TYPES,
                  (char const *)_("Select file to open"));
     }
     bool const success = openDialogInstance->show();
@@ -569,7 +569,7 @@ file_save(SPDocument *doc, gchar const *uri, Inkscape::Extension::Extension *key
     return TRUE;
 }
 
-static Inkscape::UI::Dialogs::FileSaveDialog *saveDialogInstance = NULL;
+static Inkscape::UI::Dialog::FileSaveDialog *saveDialogInstance = NULL;
 
 /**
  *  Display a SaveAs dialog.  Save the document if OK pressed.
@@ -651,9 +651,9 @@ sp_file_save_dialog(SPDocument *doc)
 
     if (!saveDialogInstance) {
         saveDialogInstance =
-             Inkscape::UI::Dialogs::FileSaveDialog::create(
+             Inkscape::UI::Dialog::FileSaveDialog::create(
                  (char const *) save_loc,
-                 Inkscape::UI::Dialogs::SVG_TYPES,
+                 Inkscape::UI::Dialog::SVG_TYPES,
                  (char const *) _("Select file to save to"),
                  default_extension
             );
@@ -909,7 +909,7 @@ file_import(SPDocument *in_doc, gchar const *uri, Inkscape::Extension::Extension
 }
 
 
-static Inkscape::UI::Dialogs::FileOpenDialog *importDialogInstance = NULL;
+static Inkscape::UI::Dialog::FileOpenDialog *importDialogInstance = NULL;
 
 /**
  *  Display an Open dialog, import a resource if OK pressed.
@@ -923,9 +923,9 @@ sp_file_import(GtkWidget *widget)
 
     if (!importDialogInstance) {
         importDialogInstance =
-             Inkscape::UI::Dialogs::FileOpenDialog::create(
+             Inkscape::UI::Dialog::FileOpenDialog::create(
                  (char const *)import_path,
-                 Inkscape::UI::Dialogs::IMPORT_TYPES,
+                 Inkscape::UI::Dialog::IMPORT_TYPES,
                  (char const *)_("Select file to import"));
     }
     bool success = importDialogInstance->show();
diff --git a/src/ui/dialog/Makefile_insert b/src/ui/dialog/Makefile_insert
index 4a76a68ca..2b04d3e45 100644
--- a/src/ui/dialog/Makefile_insert
+++ b/src/ui/dialog/Makefile_insert
@@ -20,6 +20,8 @@ ui_dialog_libuidialog_a_SOURCES =		\
 	ui/dialog/export.h			\
 	ui/dialog/extension-editor.cpp		\
 	ui/dialog/extension-editor.h		\
+	ui/dialog/filedialog.cpp		\
+	ui/dialog/filedialog.h			\
 	ui/dialog/fill-and-stroke.cpp		\
 	ui/dialog/fill-and-stroke.h		\
 	ui/dialog/find.cpp			\
diff --git a/src/dialogs/filedialog.cpp b/src/ui/dialog/filedialog.cpp
index 2ca1e3570..07052559d 100644
--- a/src/dialogs/filedialog.cpp
+++ b/src/ui/dialog/filedialog.cpp
@@ -57,7 +57,7 @@ void dump_ustr( const Glib::ustring& ustr );
 
 namespace Inkscape {
 namespace UI {
-namespace Dialogs {
+namespace Dialog {
 
 void FileDialogExtensionToPattern (Glib::ustring &pattern, gchar * in_file_extension);
 
@@ -1431,7 +1431,7 @@ FileDialogExtensionToPattern (Glib::ustring &pattern, gchar * in_file_extension)
     }
 }
 
-} //namespace Dialogs
+} //namespace Dialog
 } //namespace UI
 } //namespace Inkscape
 
diff --git a/src/dialogs/filedialog.h b/src/ui/dialog/filedialog.h
index ab3615bf6..7755aae7d 100644
--- a/src/dialogs/filedialog.h
+++ b/src/ui/dialog/filedialog.h
@@ -14,7 +14,7 @@ class Extension;
 }
 
 namespace UI {
-namespace Dialogs {
+namespace Dialog {
 
 
 /**
@@ -153,7 +153,7 @@ public:
 }; //FileSaveDialog
 
 
-} //namespace Dialogs
+} //namespace Dialog
 } //namespace UI
 } //namespace Inkscape