X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffile.h;h=97d1bd5f8a3f2abef0ae55c6b52b8f0707affb6a;hb=ff31b395d471c7ba841b3e46936712e030f4805e;hp=2eaace640deb60abb24451bb418865c6f71f6d7d;hpb=b45b3ca12c271745b18a142d10a6ac8efd9f79cc;p=inkscape.git

diff --git a/src/file.h b/src/file.h
index 2eaace640..97d1bd5f8 100644
--- a/src/file.h
+++ b/src/file.h
@@ -20,16 +20,10 @@
 #include <gtk/gtkwidget.h>
 
 #include "extension/extension-forward.h"
-
-#include <iostream>
-#include <fstream>
-#include <glibmm/i18n.h>
-
-#include "uri.h"
-#include "streams-webdav.h"
+#include "extension/system.h"
 
 struct SPDesktop;
-struct Document;
+struct SPDocument;
 
 namespace Inkscape {
     namespace Extension {
@@ -37,6 +31,7 @@ namespace Inkscape {
     }
 }
 
+
 /*######################
 ## N E W
 ######################*/
@@ -71,17 +66,6 @@ bool sp_file_open(
     bool replace_empty = true
     );
 
-//NOTE1
-/*
- * Opens a new file and window from the given URI (class)
- */
-bool sp_file_open_uri(
-    const Inkscape::URI &uri,
-    Inkscape::Extension::Extension *key,
-    bool add_to_recent = true,
-    bool replace_empty = true
-    );
-
 /**
  * Displays a file open dialog. Calls sp_file_open on
  * an OK.
@@ -101,7 +85,7 @@ void sp_file_revert_dialog ();
  * Added to make only the remote savings.
  */
 
-bool file_save_remote(Document *doc, const Glib::ustring &uri,
+bool file_save_remote(SPDocument *doc, const Glib::ustring &uri,
 		 Inkscape::Extension::Extension *key, bool saveas, bool official);
 
 /**
@@ -126,10 +110,10 @@ bool sp_file_save_a_copy (Gtk::Window &parentWindow, gpointer object, gpointer d
  *  Saves the given document.  Displays a file select dialog
  *  if needed.
  */
-bool sp_file_save_document (Gtk::Window &parentWindow, Document *document);
+bool sp_file_save_document (Gtk::Window &parentWindow, SPDocument *document);
 
 /* Do the saveas dialog with a document as the parameter */
-bool sp_file_save_dialog (Gtk::Window &parentWindow, Document *doc, bool bAsCopy = FALSE);
+bool sp_file_save_dialog (Gtk::Window &parentWindow, SPDocument *doc, Inkscape::Extension::FileSaveMethod save_method);
 
 
 /*######################
@@ -145,7 +129,7 @@ void sp_file_import (Gtk::Window &parentWindow);
 /**
  * Imports a resource
  */
-void file_import(Document *in_doc, const Glib::ustring &uri,
+void file_import(SPDocument *in_doc, const Glib::ustring &uri,
                  Inkscape::Extension::Extension *key);
 
 /*######################
@@ -157,7 +141,7 @@ void file_import(Document *in_doc, const Glib::ustring &uri,
  * additional type selection, to allow the user to export
  * the a document as a given type.
  */
-bool sp_file_export_dialog (void *widget);
+bool sp_file_export_dialog (Gtk::Window &parentWindow);
 
 
 /*######################
@@ -167,13 +151,13 @@ bool sp_file_export_dialog (void *widget);
 /**
  * Export the current document to OCAL
  */
-void sp_file_export_to_ocal (Gtk::Window &parentWindow );
+//void sp_file_export_to_ocal (Gtk::Window &parentWindow );
 
 
 /**
  * Export the current document to OCAL
  */
-bool sp_file_export_to_ocal_dialog (void *widget);
+//bool sp_file_export_to_ocal_dialog (void *widget);
 
 
 /*######################
@@ -217,15 +201,6 @@ void sp_file_vacuum ();
 #endif
 
 
-//namespace Inkscape {
-//namespace Net {
-
-
-
-//}
-//}
-// #endif
-
 /*
   Local Variables:
   mode:c++