Skip to content

Commit

Permalink
Move most of gui/auxiliary to gui/core to reflect its true nature
Browse files Browse the repository at this point in the history
  • Loading branch information
@CelticMinstrel
CelticMinstrel committed Mar 21, 2016
1 parent 040b4ca commit 6307b94
Show file tree
Hide file tree
Showing 121 changed files with 314 additions and 322 deletions.
66 changes: 33 additions & 33 deletions projectfiles/CodeBlocks/wesnoth.cbp
View file
Expand Up @@ -450,16 +450,16 @@
<Unit filename="../../src/gettext.hpp" />
<Unit filename="../../src/gettext_boost.cpp" />
<Unit filename="../../src/global.hpp" />
<Unit filename="../../src/gui/auxiliary/canvas.cpp" />
<Unit filename="../../src/gui/auxiliary/canvas.hpp" />
<Unit filename="../../src/gui/auxiliary/event/dispatcher.cpp" />
<Unit filename="../../src/gui/auxiliary/event/dispatcher.hpp" />
<Unit filename="../../src/gui/auxiliary/event/dispatcher_private.hpp" />
<Unit filename="../../src/gui/auxiliary/event/distributor.cpp" />
<Unit filename="../../src/gui/auxiliary/event/distributor.hpp" />
<Unit filename="../../src/gui/auxiliary/event/handler.cpp" />
<Unit filename="../../src/gui/auxiliary/event/handler.hpp" />
<Unit filename="../../src/gui/auxiliary/event/message.hpp" />
<Unit filename="../../src/gui/core/canvas.cpp" />
<Unit filename="../../src/gui/core/canvas.hpp" />
<Unit filename="../../src/gui/core/event/dispatcher.cpp" />
<Unit filename="../../src/gui/core/event/dispatcher.hpp" />
<Unit filename="../../src/gui/core/event/dispatcher_private.hpp" />
<Unit filename="../../src/gui/core/event/distributor.cpp" />
<Unit filename="../../src/gui/core/event/distributor.hpp" />
<Unit filename="../../src/gui/core/event/handler.cpp" />
<Unit filename="../../src/gui/core/event/handler.hpp" />
<Unit filename="../../src/gui/core/event/message.hpp" />
<Unit filename="../../src/gui/auxiliary/filter.hpp" />
<Unit filename="../../src/gui/auxiliary/formula.hpp" />
<Unit filename="../../src/gui/auxiliary/iterator/exception.hpp" />
Expand All @@ -472,31 +472,31 @@
<Unit filename="../../src/gui/auxiliary/iterator/walker_grid.hpp" />
<Unit filename="../../src/gui/auxiliary/iterator/walker_widget.cpp" />
<Unit filename="../../src/gui/auxiliary/iterator/walker_widget.hpp" />
<Unit filename="../../src/gui/auxiliary/layout_exception.hpp" />
<Unit filename="../../src/gui/auxiliary/log.cpp" />
<Unit filename="../../src/gui/auxiliary/log.hpp" />
<Unit filename="../../src/gui/auxiliary/notifiee.hpp" />
<Unit filename="../../src/gui/auxiliary/notifier.hpp" />
<Unit filename="../../src/gui/core/layout_exception.hpp" />
<Unit filename="../../src/gui/core/log.cpp" />
<Unit filename="../../src/gui/core/log.hpp" />
<Unit filename="../../src/gui/core/notifiee.hpp" />
<Unit filename="../../src/gui/core/notifier.hpp" />
<Unit filename="../../src/gui/auxiliary/old_markup.cpp" />
<Unit filename="../../src/gui/auxiliary/old_markup.hpp" />
<Unit filename="../../src/gui/auxiliary/placer.cpp" />
<Unit filename="../../src/gui/auxiliary/placer.hpp" />
<Unit filename="../../src/gui/auxiliary/placer/horizontal_list.cpp" />
<Unit filename="../../src/gui/auxiliary/placer/horizontal_list.hpp" />
<Unit filename="../../src/gui/auxiliary/placer/vertical_list.cpp" />
<Unit filename="../../src/gui/auxiliary/placer/vertical_list.hpp" />
<Unit filename="../../src/gui/auxiliary/timer.cpp" />
<Unit filename="../../src/gui/auxiliary/timer.hpp" />
<Unit filename="../../src/gui/auxiliary/tips.cpp" />
<Unit filename="../../src/gui/auxiliary/tips.hpp" />
<Unit filename="../../src/gui/auxiliary/widget_definition.cpp" />
<Unit filename="../../src/gui/auxiliary/widget_definition.hpp" />
<Unit filename="../../src/gui/auxiliary/window_builder.cpp" />
<Unit filename="../../src/gui/auxiliary/window_builder.hpp" />
<Unit filename="../../src/gui/auxiliary/window_builder/helper.cpp" />
<Unit filename="../../src/gui/auxiliary/window_builder/helper.hpp" />
<Unit filename="../../src/gui/auxiliary/window_builder/instance.cpp" />
<Unit filename="../../src/gui/auxiliary/window_builder/instance.hpp" />
<Unit filename="../../src/gui/core/placer.cpp" />
<Unit filename="../../src/gui/core/placer.hpp" />
<Unit filename="../../src/gui/core/placer/horizontal_list.cpp" />
<Unit filename="../../src/gui/core/placer/horizontal_list.hpp" />
<Unit filename="../../src/gui/core/placer/vertical_list.cpp" />
<Unit filename="../../src/gui/core/placer/vertical_list.hpp" />
<Unit filename="../../src/gui/core/timer.cpp" />
<Unit filename="../../src/gui/core/timer.hpp" />
<Unit filename="../../src/gui/core/tips.cpp" />
<Unit filename="../../src/gui/core/tips.hpp" />
<Unit filename="../../src/gui/core/widget_definition.cpp" />
<Unit filename="../../src/gui/core/widget_definition.hpp" />
<Unit filename="../../src/gui/core/window_builder.cpp" />
<Unit filename="../../src/gui/core/window_builder.hpp" />
<Unit filename="../../src/gui/core/window_builder/helper.cpp" />
<Unit filename="../../src/gui/core/window_builder/helper.hpp" />
<Unit filename="../../src/gui/core/window_builder/instance.cpp" />
<Unit filename="../../src/gui/core/window_builder/instance.hpp" />
<Unit filename="../../src/gui/dialogs/addon/description.cpp" />
<Unit filename="../../src/gui/dialogs/addon/description.hpp" />
<Unit filename="../../src/gui/dialogs/addon/filter_options.cpp" />
Expand Down
62 changes: 31 additions & 31 deletions projectfiles/VC9/wesnoth.vcproj
View file
Expand Up @@ -11148,7 +11148,7 @@
Name="Auxiliary"
>
<File
RelativePath="..\..\src\gui\auxiliary\canvas.cpp"
RelativePath="..\..\src\gui\core\canvas.cpp"
>
<FileConfiguration
Name="Debug|Win32"
Expand Down Expand Up @@ -11200,7 +11200,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\canvas.hpp"
RelativePath="..\..\src\gui\core\canvas.hpp"
>
</File>
<File
Expand All @@ -11216,11 +11216,11 @@
>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\layout_exception.hpp"
RelativePath="..\..\src\gui\core\layout_exception.hpp"
>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\log.cpp"
RelativePath="..\..\src\gui\core\log.cpp"
>
<FileConfiguration
Name="Debug|Win32"
Expand Down Expand Up @@ -11272,7 +11272,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\log.hpp"
RelativePath="..\..\src\gui\core\log.hpp"
>
</File>
<File
Expand All @@ -11284,7 +11284,7 @@
>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\placer.cpp"
RelativePath="..\..\src\gui\core\placer.cpp"
>
<FileConfiguration
Name="Debug|Win32"
Expand Down Expand Up @@ -11336,7 +11336,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\placer.hpp"
RelativePath="..\..\src\gui\core\placer.hpp"
>
</File>
<File
Expand All @@ -11348,7 +11348,7 @@
>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\timer.cpp"
RelativePath="..\..\src\gui\core\timer.cpp"
>
<FileConfiguration
Name="Debug|Win32"
Expand Down Expand Up @@ -11400,15 +11400,15 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\timer.hpp"
RelativePath="..\..\src\gui\core\timer.hpp"
>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\tips.cpp"
RelativePath="..\..\src\gui\core\tips.cpp"
>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\tips.hpp"
RelativePath="..\..\src\gui\core\tips.hpp"
>
</File>
<File
Expand All @@ -11424,7 +11424,7 @@
>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\widget_definition.cpp"
RelativePath="..\..\src\gui\core\widget_definition.cpp"
>
<FileConfiguration
Name="Debug|Win32"
Expand Down Expand Up @@ -11476,11 +11476,11 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\widget_definition.hpp"
RelativePath="..\..\src\gui\core\widget_definition.hpp"
>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\window_builder.cpp"
RelativePath="..\..\src\gui\core\window_builder.cpp"
>
<FileConfiguration
Name="Debug|Win32"
Expand Down Expand Up @@ -11532,14 +11532,14 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\window_builder.hpp"
RelativePath="..\..\src\gui\core\window_builder.hpp"
>
</File>
<Filter
Name="Window_Builder"
>
<File
RelativePath="..\..\src\gui\auxiliary\window_builder\helper.cpp"
RelativePath="..\..\src\gui\core\window_builder\helper.cpp"
>
<FileConfiguration
Name="Debug|Win32"
Expand Down Expand Up @@ -11591,11 +11591,11 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\window_builder\helper.hpp"
RelativePath="..\..\src\gui\core\window_builder\helper.hpp"
>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\window_builder\instance.cpp"
RelativePath="..\..\src\gui\core\window_builder\instance.cpp"
>
<FileConfiguration
Name="Debug|Win32"
Expand Down Expand Up @@ -11647,15 +11647,15 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\window_builder\instance.hpp"
RelativePath="..\..\src\gui\core\window_builder\instance.hpp"
>
</File>
</Filter>
<Filter
Name="Event"
>
<File
RelativePath="..\..\src\gui\auxiliary\event\dispatcher.cpp"
RelativePath="..\..\src\gui\core\event\dispatcher.cpp"
>
<FileConfiguration
Name="Debug|Win32"
Expand Down Expand Up @@ -11707,15 +11707,15 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\event\dispatcher.hpp"
RelativePath="..\..\src\gui\core\event\dispatcher.hpp"
>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\event\dispatcher_private.hpp"
RelativePath="..\..\src\gui\core\event\dispatcher_private.hpp"
>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\event\distributor.cpp"
RelativePath="..\..\src\gui\core\event\distributor.cpp"
>
<FileConfiguration
Name="Debug|Win32"
Expand Down Expand Up @@ -11767,11 +11767,11 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\event\distributor.hpp"
RelativePath="..\..\src\gui\core\event\distributor.hpp"
>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\event\handler.cpp"
RelativePath="..\..\src\gui\core\event\handler.cpp"
>
<FileConfiguration
Name="Debug|Win32"
Expand Down Expand Up @@ -11823,11 +11823,11 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\event\handler.hpp"
RelativePath="..\..\src\gui\core\event\handler.hpp"
>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\event\message.hpp"
RelativePath="..\..\src\gui\core\event\message.hpp"
>
</File>
</Filter>
Expand Down Expand Up @@ -11995,7 +11995,7 @@
Name="Placer"
>
<File
RelativePath="..\..\src\gui\auxiliary\placer\horizontal_list.cpp"
RelativePath="..\..\src\gui\core\placer\horizontal_list.cpp"
>
<FileConfiguration
Name="Debug|Win32"
Expand Down Expand Up @@ -12047,11 +12047,11 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\placer\horizontal_list.hpp"
RelativePath="..\..\src\gui\core\placer\horizontal_list.hpp"
>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\placer\vertical_list.cpp"
RelativePath="..\..\src\gui\core\placer\vertical_list.cpp"
>
<FileConfiguration
Name="Debug|Win32"
Expand Down Expand Up @@ -12103,7 +12103,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\gui\auxiliary\placer\vertical_list.hpp"
RelativePath="..\..\src\gui\core\placer\vertical_list.hpp"
>
</File>
</Filter>
Expand Down

0 comments on commit 6307b94

Please sign in to comment.