From b7d03ded077ab175c29e67092d3d8822b28418e0 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 1 Apr 2013 20:52:20 -0300
Subject: [PATCH] Move tools/ink_type.h to settings/

---
 src/{tools => settings}/ink_type.h | 6 +++---
 src/settings/settings.h            | 2 +-
 src/widgets/context_bar.cpp        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename src/{tools => settings}/ink_type.h (90%)

diff --git a/src/tools/ink_type.h b/src/settings/ink_type.h
similarity index 90%
rename from src/tools/ink_type.h
rename to src/settings/ink_type.h
index 0f6ec5c1d..b50fb5312 100644
--- a/src/tools/ink_type.h
+++ b/src/settings/ink_type.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef TOOLS_INK_TYPE_H_INCLUDED
-#define TOOLS_INK_TYPE_H_INCLUDED
+#ifndef SETTINGS_INK_TYPE_H_INCLUDED
+#define SETTINGS_INK_TYPE_H_INCLUDED
 
 // If you change this enumeration, you should change update the
 // ContextBar::InkTypeField() UI widget
@@ -33,4 +33,4 @@ enum InkType {
   kMaxInks
 };
 
-#endif // TOOLS_INK_TYPE_H_INCLUDED
+#endif // SETTINGS_INK_TYPE_H_INCLUDED
diff --git a/src/settings/settings.h b/src/settings/settings.h
index 54e8b7143..2814a959d 100644
--- a/src/settings/settings.h
+++ b/src/settings/settings.h
@@ -23,7 +23,7 @@
 #include "gfx/point.h"
 #include "gfx/rect.h"
 #include "raster/pen_type.h"
-#include "tools/ink_type.h"
+#include "settings/ink_type.h"
 
 class Document;
 class IDocumentSettings;
diff --git a/src/widgets/context_bar.cpp b/src/widgets/context_bar.cpp
index fe90a1129..4f5ca5122 100644
--- a/src/widgets/context_bar.cpp
+++ b/src/widgets/context_bar.cpp
@@ -23,10 +23,10 @@
 #include "modules/gui.h"
 #include "raster/image.h"
 #include "raster/pen.h"
+#include "settings/ink_type.h"
 #include "settings/settings.h"
 #include "skin/skin_theme.h"
 #include "tools/ink.h"
-#include "tools/ink_type.h"
 #include "tools/point_shape.h"
 #include "tools/tool.h"
 #include "ui/button.h"