Merged trunk

(bzr r14954.1.29)

14 files changed, 15 insertions, 28 deletions

diff --git a/src/extension/db.cpp b/src/extension/db.cpp
index a3c54915d..f17b784a9 100644
--- a/src/extension/db.cpp
+++ b/src/extension/db.cpp
@@ -13,7 +13,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 #include "db.h"
 #include "input.h"
diff --git a/src/extension/dbus/document-interface.cpp b/src/extension/dbus/document-interface.cpp
index d0a2e81aa..5a8fb0918 100644
--- a/src/extension/dbus/document-interface.cpp
+++ b/src/extension/dbus/document-interface.cpp
@@ -189,7 +189,7 @@ selection_get_center_y (Inkscape::Selection *sel){
 std::vector<SPObject*>
 selection_swap(Inkscape::Selection *sel, gchar *name, GError **error)
 {
-    std::vector<SPObject*> oldsel = sel->list();
+    std::vector<SPObject*> oldsel = std::vector<SPObject*>(sel->objects().begin(), sel->objects().end());
     
     sel->set(get_object_by_name(sel->layers()->getDocument(), name, error));
     return oldsel;
@@ -1087,14 +1087,14 @@ void document_interface_update(DocumentInterface *doc_interface, GError ** error
 gboolean document_interface_selection_get(DocumentInterface *doc_interface, char ***out, GError ** /*error*/)
 {
     Inkscape::Selection * sel = doc_interface->target.getSelection();
-    std::vector<SPObject*> oldsel = sel->list();
+    auto oldsel = sel->objects();
 
     int size = oldsel.size();
 
     *out = g_new0 (char *, size + 1);
 
     int i = 0;
-    for (std::vector<SPObject*>::iterator iter = oldsel.begin(), e = oldsel.end(); iter != e; ++iter) {
+    for (auto iter = oldsel.begin(); iter != oldsel.end(); ++iter) {
         (*out)[i] = g_strdup((*iter)->getId());
         i++;
     }
@@ -1252,7 +1252,7 @@ gboolean document_interface_selection_move_to(DocumentInterface *doc_interface,
     Geom::OptRect sel_bbox = sel->visualBounds();
     if (sel_bbox) {
         Geom::Point m( x - selection_get_center_x(sel) , 0 - (y - selection_get_center_y(sel)) );
-        sp_selection_move_relative(sel, m, true);
+        sp_object_set_move_relative(sel, m, true);
     }
     return TRUE;
 }
diff --git a/src/extension/dependency.cpp b/src/extension/dependency.cpp
index 624be12f9..837520381 100644
--- a/src/extension/dependency.cpp
+++ b/src/extension/dependency.cpp
@@ -9,14 +9,12 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <glibmm/i18n.h>
 #include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
-#include "config.h"
-#include "path-prefix.h"
 #include "dependency.h"
 #include "db.h"
 #include "extension.h"
diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp
index e7299ba51..ef254f623 100644
--- a/src/extension/effect.cpp
+++ b/src/extension/effect.cpp
@@ -13,7 +13,6 @@
 #include "helper/action.h"
 #include "ui/view/view.h"
 
-#include "selection.h"
 #include "sp-namedview.h"
 #include "desktop.h"
 #include "implementation/implementation.h"
diff --git a/src/extension/error-file.cpp b/src/extension/error-file.cpp
index db354c0ce..9ec643759 100644
--- a/src/extension/error-file.cpp
+++ b/src/extension/error-file.cpp
@@ -9,7 +9,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "ui/dialog/extensions.h"
diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp
index 73376bd91..624813863 100644
--- a/src/extension/execution-env.cpp
+++ b/src/extension/execution-env.cpp
@@ -8,10 +8,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <config.h>
-
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include "gtkmm/messagedialog.h"
@@ -25,7 +23,6 @@
 #include "document.h"
 #include "document-undo.h"
 #include "desktop.h"
-#include "ui/view/view.h"
 #include "sp-namedview.h"
 
 #include "display/sp-canvas.h"
diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index 6f7539360..56ff0a5f4 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -16,7 +16,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+#include <config.h>
 #endif
 
 #include <gtkmm/box.h>
diff --git a/src/extension/implementation/implementation.cpp b/src/extension/implementation/implementation.cpp
index 6139ed367..6e6100d2b 100644
--- a/src/extension/implementation/implementation.cpp
+++ b/src/extension/implementation/implementation.cpp
@@ -11,7 +11,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 #include "implementation.h"
 
@@ -22,7 +22,6 @@
 #include "selection.h"
 #include "desktop.h"
 
-#include "ui/view/view.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/implementation/xslt.cpp b/src/extension/implementation/xslt.cpp
index 85ae9efde..373378d97 100644
--- a/src/extension/implementation/xslt.cpp
+++ b/src/extension/implementation/xslt.cpp
@@ -13,7 +13,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include "file.h"
@@ -22,13 +22,11 @@
 #include "../output.h"
 #include "extension/input.h"
 
-#include "xml/repr.h"
 #include "io/sys.h"
 #include <unistd.h>
 #include <cstring>
 #include "document.h"
 
-#include <libxml/parser.h>
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
 
diff --git a/src/extension/input.cpp b/src/extension/input.cpp
index 5cef38009..2ba48ffda 100644
--- a/src/extension/input.cpp
+++ b/src/extension/input.cpp
@@ -8,14 +8,12 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
 #endif
 
 #include "prefdialog.h"
 #include "implementation/implementation.h"
 #include "timer.h"
 #include "input.h"
-#include "io/sys.h"
 
 /* Inkscape::Extension::Input */
 
diff --git a/src/extension/loader.cpp b/src/extension/loader.cpp
index 863a176ca..3bea0e1e6 100644
--- a/src/extension/loader.cpp
+++ b/src/extension/loader.cpp
@@ -11,7 +11,6 @@
 
 #include "loader.h"
 #include "system.h"
-#include <exception>
 #include <string.h>
 #include "dependency.h"
 #include "inkscape-version.h"
diff --git a/src/extension/loader.h b/src/extension/loader.h
index 0d3a69061..cd362f87b 100644
--- a/src/extension/loader.h
+++ b/src/extension/loader.h
@@ -1,4 +1,5 @@
-/** @file
+/** @file#include <config.h>
+
  * Loader for external plug-ins.
  *//*
  *
diff --git a/src/extension/patheffect.cpp b/src/extension/patheffect.cpp
index bedab7fd8..e30ec97df 100644
--- a/src/extension/patheffect.cpp
+++ b/src/extension/patheffect.cpp
@@ -8,7 +8,6 @@
  */
 
 #include "document-private.h"
-#include "sp-object.h"
 
 #include "patheffect.h"
 #include "db.h"
diff --git a/src/extension/system.cpp b/src/extension/system.cpp
index 3c623455a..afa8346df 100644
--- a/src/extension/system.cpp
+++ b/src/extension/system.cpp
@@ -17,12 +17,10 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include "ui/interface.h"
-#include <unistd.h>
-#include <glibmm/miscutils.h>
 
 #include "system.h"
 #include "preferences.h"
@@ -41,6 +39,7 @@
 #include "document-undo.h"
 #include "loader.h"
 
+#include <glibmm/miscutils.h>
 
 namespace Inkscape {
 namespace Extension {