Revert recent refactoring changes by johnce because they break the build, which cannot be fixed easily.

(bzr r8422)

1 files changed, 6 insertions, 6 deletions

diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index d203e094f..a101b9eeb 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -747,7 +747,7 @@ sp_psel_pattern_change(GtkWidget *widget,  SPPaintSelector *psel)
  *  Returns NULL if there are no patterns in the document.
  */
 GSList *
-ink_pattern_list_get (Document *source)
+ink_pattern_list_get (SPDocument *source)
 {
     if (source == NULL)
         return NULL;
@@ -768,7 +768,7 @@ ink_pattern_list_get (Document *source)
  * Adds menu items for pattern list - derived from marker code, left hb etc in to make addition of previews easier at some point.
  */
 static void
-sp_pattern_menu_build (GtkWidget *m, GSList *pattern_list, Document */*source*/)
+sp_pattern_menu_build (GtkWidget *m, GSList *pattern_list, SPDocument */*source*/)
 {
 
     for (; pattern_list != NULL; pattern_list = pattern_list->next) {
@@ -813,7 +813,7 @@ sp_pattern_menu_build (GtkWidget *m, GSList *pattern_list, Document */*source*/)
  *
  */
 static void
-sp_pattern_list_from_doc (GtkWidget *m, Document *current_doc, Document *source, Document *pattern_doc)
+sp_pattern_list_from_doc (GtkWidget *m, SPDocument *current_doc, SPDocument *source, SPDocument *pattern_doc)
 {
     (void)current_doc;
     (void)pattern_doc;
@@ -838,9 +838,9 @@ sp_pattern_list_from_doc (GtkWidget *m, Document *current_doc, Document *source,
 
 
 static void
-ink_pattern_menu_populate_menu(GtkWidget *m, Document *doc)
+ink_pattern_menu_populate_menu(GtkWidget *m, SPDocument *doc)
 {
-    static Document *patterns_doc = NULL;
+    static SPDocument *patterns_doc = NULL;
 
     // find and load patterns.svg
     if (patterns_doc == NULL) {
@@ -878,7 +878,7 @@ ink_pattern_menu(GtkWidget *mnu)
    /* Create new menu widget */
     GtkWidget *m = gtk_menu_new();
     gtk_widget_show(m);
-    Document *doc = SP_ACTIVE_DOCUMENT;
+    SPDocument *doc = SP_ACTIVE_DOCUMENT;
 
     if (!doc) {
         GtkWidget *i;