[dia/dia-next: 55/59] Group tools in a subdirectory

[Zander <zbrown src gnome org>]

commit 2d7f215cfe873c10baf91e9b9b8811dd12ea0e3c
Author: Zander Brown <zbrown gnome org>
Date:   Mon Jan 7 22:41:05 2019 +0000

    Group tools in a subdirectory

 app/Makefile.am                 | 24 ++++++++++++------------
 app/app_procs.c                 |  4 ++--
 app/disp_callbacks.c            |  6 +++---
 app/menus.c                     |  2 +-
 app/toolbox.h                   |  2 +-
 app/{ => tools}/create_object.c |  0
 app/{ => tools}/create_object.h |  0
 app/{ => tools}/magnify.c       |  0
 app/{ => tools}/magnify.h       |  0
 app/{ => tools}/modify_tool.c   |  0
 app/{ => tools}/modify_tool.h   |  0
 app/{ => tools}/scroll_tool.c   |  0
 app/{ => tools}/scroll_tool.h   |  0
 app/{ => tools}/textedit_tool.c |  0
 app/{ => tools}/textedit_tool.h |  0
 app/{ => tools}/tool.c          |  0
 app/{ => tools}/tool.h          |  0
 17 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/app/Makefile.am b/app/Makefile.am
index 4d8f74c7..6e1f7b49 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -146,22 +146,22 @@ dia_core_files = \
        toolbox.c \
        toolbox.h \
        dia-app-icons.h \
-       modify_tool.c \
-       modify_tool.h \
-       scroll_tool.c \
-       scroll_tool.h \
-       create_object.c \
-       create_object.h \
-       magnify.c \
-       magnify.h \
+       tools/modify_tool.c \
+       tools/modify_tool.h \
+       tools/scroll_tool.c \
+       tools/scroll_tool.h \
+       tools/create_object.c \
+       tools/create_object.h \
+       tools/magnify.c \
+       tools/magnify.h \
        menus.c \
        menus.h \
        cut_n_paste.c \
        cut_n_paste.h \
        ruler.c \
        ruler.h \
-       tool.c \
-       tool.h \
+       tools/tool.c \
+       tools/tool.h \
        diapagelayout.c \
        diapagelayout.h \
        pagesetup.c \
@@ -206,8 +206,8 @@ dia_core_files = \
        highlight.h \
        textedit.c \
        textedit.h \
-       textedit_tool.c \
-       textedit_tool.h \
+       tools/textedit_tool.c \
+       tools/textedit_tool.h \
        diagrid.h
 
 dia_SOURCES = \
diff --git a/app/app_procs.c b/app/app_procs.c
index bf469b93..82b2b6e1 100644
--- a/app/app_procs.c
+++ b/app/app_procs.c
@@ -50,9 +50,9 @@
 #include "app_procs.h"
 #include "object.h"
 #include "commands.h"
-#include "tool.h"
+#include "tools/tool.h"
 #include "interface.h"
-#include "modify_tool.h"
+#include "tools/modify_tool.h"
 #include "group.h"
 #include "message.h"
 #include "display.h"
diff --git a/app/disp_callbacks.c b/app/disp_callbacks.c
index 1271acd6..b18dd7e2 100644
--- a/app/disp_callbacks.c
+++ b/app/disp_callbacks.c
@@ -28,7 +28,7 @@
 
 #include "display.h"
 #include "diagram.h"
-#include "tool.h"
+#include "tools/tool.h"
 #include "interface.h"
 #include "focus.h"
 #include "object_ops.h"
@@ -36,10 +36,10 @@
 #include "menus.h"
 #include "message.h"
 #include "intl.h"
-#include "magnify.h"
+#include "tools/magnify.h"
 #include "diamenu.h"
 #include "preferences.h"
-#include "scroll_tool.h"
+#include "tools/scroll_tool.h"
 #include "commands.h"
 #include "textedit.h"
 #include "lib/parent.h"
diff --git a/app/menus.c b/app/menus.c
index cdf63f87..40d9cca5 100644
--- a/app/menus.c
+++ b/app/menus.c
@@ -27,7 +27,7 @@
 
 #include "intl.h"
 #include "menus.h"
-#include "tool.h"
+#include "tools/tool.h"
 #include "commands.h"
 #include "message.h"
 #include "interface.h"
diff --git a/app/toolbox.h b/app/toolbox.h
index 60c1f600..55b418bd 100644
--- a/app/toolbox.h
+++ b/app/toolbox.h
@@ -1,4 +1,4 @@
-#include "tool.h"
+#include "tools/tool.h"
 
 G_BEGIN_DECLS
 
diff --git a/app/create_object.c b/app/tools/create_object.c
similarity index 100%
rename from app/create_object.c
rename to app/tools/create_object.c
diff --git a/app/create_object.h b/app/tools/create_object.h
similarity index 100%
rename from app/create_object.h
rename to app/tools/create_object.h
diff --git a/app/magnify.c b/app/tools/magnify.c
similarity index 100%
rename from app/magnify.c
rename to app/tools/magnify.c
diff --git a/app/magnify.h b/app/tools/magnify.h
similarity index 100%
rename from app/magnify.h
rename to app/tools/magnify.h
diff --git a/app/modify_tool.c b/app/tools/modify_tool.c
similarity index 100%
rename from app/modify_tool.c
rename to app/tools/modify_tool.c
diff --git a/app/modify_tool.h b/app/tools/modify_tool.h
similarity index 100%
rename from app/modify_tool.h
rename to app/tools/modify_tool.h
diff --git a/app/scroll_tool.c b/app/tools/scroll_tool.c
similarity index 100%
rename from app/scroll_tool.c
rename to app/tools/scroll_tool.c
diff --git a/app/scroll_tool.h b/app/tools/scroll_tool.h
similarity index 100%
rename from app/scroll_tool.h
rename to app/tools/scroll_tool.h
diff --git a/app/textedit_tool.c b/app/tools/textedit_tool.c
similarity index 100%
rename from app/textedit_tool.c
rename to app/tools/textedit_tool.c
diff --git a/app/textedit_tool.h b/app/tools/textedit_tool.h
similarity index 100%
rename from app/textedit_tool.h
rename to app/tools/textedit_tool.h
diff --git a/app/tool.c b/app/tools/tool.c
similarity index 100%
rename from app/tool.c
rename to app/tools/tool.c
diff --git a/app/tool.h b/app/tools/tool.h
similarity index 100%
rename from app/tool.h
rename to app/tools/tool.h