Merge branch 'cleanups' of gitlab.com:stfacc/inkscape

11 files changed, 3 insertions, 105 deletions

diff --git a/src/ui/cache/makefile.in b/src/ui/cache/makefile.in
deleted file mode 100644
index af45adb0f..000000000
--- a/src/ui/cache/makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-# Convenience stub makefile to call the real Makefile.
-
-@SET_MAKE@
-
-OBJEXT = @OBJEXT@
-
-# Explicit so that it's the default rule.
-all:
-	cd ../.. && $(MAKE) ui/cache/all
-
-clean %.a %.$(OBJEXT):
-	cd ../.. && $(MAKE) ui/cache/$@
-
-.PHONY: all clean
-
-.SUFFIXES:
-.SUFFIXES: .a .$(OBJEXT)
diff --git a/src/ui/dialog/makefile.in b/src/ui/dialog/makefile.in
deleted file mode 100644
index 805c48aef..000000000
--- a/src/ui/dialog/makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-# Convenience stub makefile to call the real Makefile.
-
-@SET_MAKE@
-
-OBJEXT = @OBJEXT@
-
-# Explicit so that it's the default rule.
-all:
-	cd ../.. && $(MAKE) ui/dialog/all
-
-clean %.a %.$(OBJEXT):
-	cd ../.. && $(MAKE) ui/dialog/$@
-
-.PHONY: all clean
-
-.SUFFIXES:
-.SUFFIXES: .a .$(OBJEXT)
diff --git a/src/ui/dialog/print.cpp b/src/ui/dialog/print.cpp
index 4d248fd09..532a8c364 100644
--- a/src/ui/dialog/print.cpp
+++ b/src/ui/dialog/print.cpp
@@ -26,7 +26,6 @@
 #include "util/units.h"
 #include "helper/png-write.h"
 #include "svg/svg-color.h"
-#include "io/sys.h"
 
 #include <glibmm/i18n.h>
 
@@ -52,7 +51,7 @@ static void draw_page(GtkPrintOperation *,
         std::string tmp_base = "inkscape-print-png-XXXXXX";
 
         int tmp_fd;
-        if ( (tmp_fd = Inkscape::IO::file_open_tmp (tmp_png, tmp_base)) >= 0) {
+        if ( (tmp_fd = Glib::file_open_tmp(tmp_png, tmp_base)) >= 0) {
             close(tmp_fd);
 
             guint32 bgcolor = 0x00000000;
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index f6a353b33..4f1e5cd6f 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -110,8 +110,7 @@ static GtkTargetEntry *completeDropTargets = 0;
 static int completeDropTargetsCount = 0;
 static bool temporarily_block_actions = false;
 
-#define ENTRIES_SIZE(n) sizeof(n)/sizeof(n[0])
-static guint nui_drop_target_entries = ENTRIES_SIZE(ui_drop_target_entries);
+static guint nui_drop_target_entries = G_N_ELEMENTS(ui_drop_target_entries);
 static void sp_ui_import_files(gchar *buffer);
 static void sp_ui_import_one_file(char const *filename);
 static void sp_ui_import_one_file_with_check(gpointer filename, gpointer unused);
diff --git a/src/ui/makefile.in b/src/ui/makefile.in
deleted file mode 100644
index f8a407592..000000000
--- a/src/ui/makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-# Convenience stub makefile to call the real Makefile.
-
-@SET_MAKE@
-
-OBJEXT = @OBJEXT@
-
-# Explicit so that it's the default rule.
-all:
-	cd .. && $(MAKE) ui/all
-
-clean %.a %.$(OBJEXT):
-	cd .. && $(MAKE) ui/$@
-
-.PHONY: all clean
-
-.SUFFIXES:
-.SUFFIXES: .a .$(OBJEXT)
diff --git a/src/ui/tool/control-point-selection.h b/src/ui/tool/control-point-selection.h
index f122a468d..ec845b1b3 100644
--- a/src/ui/tool/control-point-selection.h
+++ b/src/ui/tool/control-point-selection.h
@@ -20,7 +20,6 @@
 #include <2geom/forward.h>
 #include <2geom/point.h>
 #include <2geom/rect.h>
-#include "util/accumulators.h"
 #include "util/unordered-containers.h"
 #include "ui/tool/commit-events.h"
 #include "ui/tool/manipulator.h"
diff --git a/src/ui/tool/control-point.h b/src/ui/tool/control-point.h
index 4a01b9f21..bc1f060cd 100644
--- a/src/ui/tool/control-point.h
+++ b/src/ui/tool/control-point.h
@@ -18,7 +18,6 @@
 #include <2geom/point.h>
 
 #include "ui/control-types.h"
-#include "util/accumulators.h"
 #include "display/sodipodi-ctrl.h"
 #include "enums.h"
 
@@ -76,8 +75,6 @@ namespace UI {
  */
 class ControlPoint : boost::noncopyable, public sigc::trackable {
 public:
-    typedef Inkscape::Util::ReverseInterruptible RInt;
-    typedef Inkscape::Util::Interruptible Int;
 
     /**
      * Enumeration representing the possible states of the control point, used to determine
@@ -162,15 +159,6 @@ public:
     void transferGrab(ControlPoint *from, GdkEventMotion *event);
     /// @}
 
-    /// @name Receive notifications about control point events
-    /// @{
-    /*sigc::signal<void, Geom::Point const &, Geom::Point &, GdkEventMotion*> signal_dragged;
-    sigc::signal<bool, GdkEventButton*>::accumulated<RInt> signal_clicked;
-    sigc::signal<bool, GdkEventButton*>::accumulated<RInt> signal_doubleclicked;
-    sigc::signal<bool, GdkEventMotion*>::accumulated<Int> signal_grabbed;
-    sigc::signal<void, GdkEventButton*> signal_ungrabbed;*/
-    /// @}
-
     /// @name Inspect the state of the control point
     /// @{
     State state() const { return _state; }
diff --git a/src/ui/view/makefile.in b/src/ui/view/makefile.in
deleted file mode 100644
index 0fe15637a..000000000
--- a/src/ui/view/makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-# Convenience stub makefile to call the real Makefile.
-
-@SET_MAKE@
-
-OBJEXT = @OBJEXT@
-
-# Explicit so that it's the default rule.
-all:
-	cd ../.. && $(MAKE) ui/view/all
-
-clean %.a %.$(OBJEXT):
-	cd ../.. && $(MAKE) ui/view/$@
-
-.PHONY: all clean
-
-.SUFFIXES:
-.SUFFIXES: .a .$(OBJEXT)
diff --git a/src/ui/widget/makefile.in b/src/ui/widget/makefile.in
deleted file mode 100644
index e479d7031..000000000
--- a/src/ui/widget/makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-# Convenience stub makefile to call the real Makefile.
-
-@SET_MAKE@
-
-OBJEXT = @OBJEXT@
-
-# Explicit so that it's the default rule.
-all:
-	cd ../.. && $(MAKE) ui/widget/all
-
-clean %.a %.$(OBJEXT):
-	cd ../.. && $(MAKE) ui/widget/$@
-
-.PHONY: all clean
-
-.SUFFIXES:
-.SUFFIXES: .a .$(OBJEXT)
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index 9332fe0f9..aea9b7e8e 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -24,7 +24,6 @@
 #include <glibmm/i18n.h>
 
 #include "panel.h"
-#include "icon-size.h"
 #include "preferences.h"
 #include "desktop.h"
 
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index 5d911e9d2..d9b93f6db 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -107,8 +107,7 @@ static const GtkTargetEntry ui_drop_target_entries [] = {
     {"application/x-color", 0, APP_X_COLOR}
 };
 
-#define ENTRIES_SIZE(n) sizeof(n)/sizeof(n[0])
-static guint nui_drop_target_entries = ENTRIES_SIZE(ui_drop_target_entries);
+static guint nui_drop_target_entries = G_N_ELEMENTS(ui_drop_target_entries);
 
 /* convenience function */
 static Dialog::FillAndStroke *get_fill_and_stroke_panel(SPDesktop *desktop);