From f07e6dcf24876a583af5c817682a941d210fc66a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matt=C3=A9o=20Delabre?= <contact@matteodelabre.me>
Date: Sun, 10 Apr 2016 14:07:21 +0200
Subject: [PATCH] =?UTF-8?q?D=C3=A9placement=20des=20widgets=20dans=20le=20?=
 =?UTF-8?q?dossier=20pricipal?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt                         | 2 +-
 include/editor.hpp                     | 4 ++--
 include/{util => }/widget_button.hpp   | 0
 include/{util => }/widget_selector.hpp | 0
 include/{util => }/widget_timer.hpp    | 2 +-
 src/{util => }/widget_button.cpp       | 2 +-
 src/{util => }/widget_selector.cpp     | 2 +-
 src/{util => }/widget_timer.cpp        | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename include/{util => }/widget_button.hpp (100%)
 rename include/{util => }/widget_selector.hpp (100%)
 rename include/{util => }/widget_timer.hpp (97%)
 rename src/{util => }/widget_button.cpp (98%)
 rename src/{util => }/widget_selector.cpp (98%)
 rename src/{util => }/widget_timer.cpp (99%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb4a367..10ae9c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project(ptf)
 
 # Inclusion des fichiers d'en-tête et de source
 include_directories(include)
-file(GLOB SOURCES "src/*.cpp" "src/*.c" "src/util/*.cpp")
+file(GLOB SOURCES "src/*.cpp")
 
 # Affichage de tous les avertisements
 if(MSVC)
diff --git a/include/editor.hpp b/include/editor.hpp
index d4717fb..3d4700d 100644
--- a/include/editor.hpp
+++ b/include/editor.hpp
@@ -3,8 +3,8 @@
 
 #include <unordered_map>
 #include "level.hpp"
-#include "util/widget_timer.hpp"
-#include "util/widget_selector.hpp"
+#include "widget_timer.hpp"
+#include "widget_selector.hpp"
 
 enum class DragMode {NONE, PLACE, SELECT_RECT, SELECT_BULK, CONTROL_POINT, REMOVE};
 enum class SelectionMode {REPLACE, FLIP, ADD};
diff --git a/include/util/widget_button.hpp b/include/widget_button.hpp
similarity index 100%
rename from include/util/widget_button.hpp
rename to include/widget_button.hpp
diff --git a/include/util/widget_selector.hpp b/include/widget_selector.hpp
similarity index 100%
rename from include/util/widget_selector.hpp
rename to include/widget_selector.hpp
diff --git a/include/util/widget_timer.hpp b/include/widget_timer.hpp
similarity index 97%
rename from include/util/widget_timer.hpp
rename to include/widget_timer.hpp
index 2417c6f..81c9011 100644
--- a/include/util/widget_timer.hpp
+++ b/include/widget_timer.hpp
@@ -3,7 +3,7 @@
 
 #include <SFML/Graphics.hpp>
 #include <functional>
-#include "util/widget_button.hpp"
+#include "widget_button.hpp"
 #include "manager.hpp"
 
 /**
diff --git a/src/util/widget_button.cpp b/src/widget_button.cpp
similarity index 98%
rename from src/util/widget_button.cpp
rename to src/widget_button.cpp
index 587073b..2f93266 100644
--- a/src/util/widget_button.cpp
+++ b/src/widget_button.cpp
@@ -1,4 +1,4 @@
-#include "util/widget_button.hpp"
+#include "widget_button.hpp"
 
 const unsigned int WidgetButton::ARROW_UP = 0;
 const unsigned int WidgetButton::ARROW_DOWN = 1;
diff --git a/src/util/widget_selector.cpp b/src/widget_selector.cpp
similarity index 98%
rename from src/util/widget_selector.cpp
rename to src/widget_selector.cpp
index b2200bc..47e36a6 100644
--- a/src/util/widget_selector.cpp
+++ b/src/widget_selector.cpp
@@ -1,4 +1,4 @@
-#include "util/widget_selector.hpp"
+#include "widget_selector.hpp"
 #include <utility>
 
 const int PADDING = 8;
diff --git a/src/util/widget_timer.cpp b/src/widget_timer.cpp
similarity index 99%
rename from src/util/widget_timer.cpp
rename to src/widget_timer.cpp
index d4fd0c2..13730c7 100644
--- a/src/util/widget_timer.cpp
+++ b/src/widget_timer.cpp
@@ -1,5 +1,5 @@
+#include "widget_timer.hpp"
 #include <cmath>
-#include "util/widget_timer.hpp"
 
 WidgetTimer::WidgetTimer(Manager& manager, bool can_change, std::function<void(int)> time_left_cb) :
     manager(manager), can_change(can_change), time_left_cb(time_left_cb),