From a2716cdd012e0060fa1035afbdc50d4c1958f6f0 Mon Sep 17 00:00:00 2001 From: codereader Date: Thu, 14 Oct 2021 17:00:50 +0200 Subject: [PATCH] #5588: Move iorthocontextmenu.h and iresourcechooser.h headers to ui/ folder. --- include/precompiled_interfaces.h | 2 -- include/{ => ui}/iorthocontextmenu.h | 0 include/{ => ui}/iresourcechooser.h | 0 plugins/dm.conversation/CommandArgumentItem.cpp | 2 +- radiant/ui/UserInterfaceModule.cpp | 1 - radiant/ui/UserInterfaceModule.h | 2 +- radiant/ui/common/SoundChooser.h | 2 +- radiant/ui/einspector/SoundPropertyEditor.cpp | 2 +- radiant/ui/ortho/OrthoContextMenu.cpp | 2 +- radiant/ui/ortho/OrthoContextMenu.h | 2 +- radiantcore/selection/group/SelectionGroupManager.cpp | 1 - tools/msvc/include.vcxproj | 4 ++-- tools/msvc/include.vcxproj.filters | 8 ++++++-- 13 files changed, 14 insertions(+), 14 deletions(-) rename include/{ => ui}/iorthocontextmenu.h (100%) rename include/{ => ui}/iresourcechooser.h (100%) diff --git a/include/precompiled_interfaces.h b/include/precompiled_interfaces.h index 415e4688bf..8a81994ca4 100644 --- a/include/precompiled_interfaces.h +++ b/include/precompiled_interfaces.h @@ -51,7 +51,6 @@ #include "inameobserver.h" #include "inamespace.h" #include "inode.h" -#include "iorthocontextmenu.h" #include "iorthoview.h" #include "iparticlenode.h" #include "iparticles.h" @@ -64,7 +63,6 @@ #include "irender.h" #include "irenderable.h" #include "irendersystemfactory.h" -#include "iresourcechooser.h" #include "iscenegraph.h" #include "iscenegraphfactory.h" #include "iselectable.h" diff --git a/include/iorthocontextmenu.h b/include/ui/iorthocontextmenu.h similarity index 100% rename from include/iorthocontextmenu.h rename to include/ui/iorthocontextmenu.h diff --git a/include/iresourcechooser.h b/include/ui/iresourcechooser.h similarity index 100% rename from include/iresourcechooser.h rename to include/ui/iresourcechooser.h diff --git a/plugins/dm.conversation/CommandArgumentItem.cpp b/plugins/dm.conversation/CommandArgumentItem.cpp index 676f918bea..dc199461f0 100644 --- a/plugins/dm.conversation/CommandArgumentItem.cpp +++ b/plugins/dm.conversation/CommandArgumentItem.cpp @@ -2,7 +2,7 @@ #include "ui/ianimationchooser.h" #include "ui/idialogmanager.h" -#include "iresourcechooser.h" +#include "ui/iresourcechooser.h" #include "i18n.h" #include "string/convert.h" #include diff --git a/radiant/ui/UserInterfaceModule.cpp b/radiant/ui/UserInterfaceModule.cpp index 294cd05b9b..64cc5a7186 100644 --- a/radiant/ui/UserInterfaceModule.cpp +++ b/radiant/ui/UserInterfaceModule.cpp @@ -10,7 +10,6 @@ #include "imap.h" #include "ibrush.h" #include "ipatch.h" -#include "iorthocontextmenu.h" #include "ui/ieventmanager.h" #include "imousetool.h" #include "ui/imainframe.h" diff --git a/radiant/ui/UserInterfaceModule.h b/radiant/ui/UserInterfaceModule.h index 37aa5d7949..f19a357587 100644 --- a/radiant/ui/UserInterfaceModule.h +++ b/radiant/ui/UserInterfaceModule.h @@ -4,7 +4,7 @@ #include #include "iuserinterface.h" -#include "iorthocontextmenu.h" +#include "ui/iorthocontextmenu.h" #include "icommandsystem.h" #include "LongRunningOperationHandler.h" diff --git a/radiant/ui/common/SoundChooser.h b/radiant/ui/common/SoundChooser.h index 37f3ce5223..e3f6cca2db 100644 --- a/radiant/ui/common/SoundChooser.h +++ b/radiant/ui/common/SoundChooser.h @@ -1,6 +1,6 @@ #pragma once -#include "iresourcechooser.h" +#include "ui/iresourcechooser.h" #include "wxutil/dialog/DialogBase.h" #include "wxutil/dataview/ResourceTreeView.h" #include "wxutil/menu/PopupMenu.h" diff --git a/radiant/ui/einspector/SoundPropertyEditor.cpp b/radiant/ui/einspector/SoundPropertyEditor.cpp index 7f3c67a0c1..5ef1b9e9ed 100644 --- a/radiant/ui/einspector/SoundPropertyEditor.cpp +++ b/radiant/ui/einspector/SoundPropertyEditor.cpp @@ -1,7 +1,7 @@ #include "SoundPropertyEditor.h" #include "PropertyEditorFactory.h" -#include "iresourcechooser.h" +#include "ui/iresourcechooser.h" #include "ui/idialogmanager.h" #include "i18n.h" #include "ientity.h" diff --git a/radiant/ui/ortho/OrthoContextMenu.cpp b/radiant/ui/ortho/OrthoContextMenu.cpp index 1f1ba2b9ca..933f28d5e1 100644 --- a/radiant/ui/ortho/OrthoContextMenu.cpp +++ b/radiant/ui/ortho/OrthoContextMenu.cpp @@ -4,7 +4,7 @@ #include "selectionlib.h" #include "ibrush.h" #include "isound.h" -#include "iresourcechooser.h" +#include "ui/iresourcechooser.h" #include "ui/idialogmanager.h" #include "entitylib.h" // EntityFindByClassnameWalker #include "selectionlib.h" diff --git a/radiant/ui/ortho/OrthoContextMenu.h b/radiant/ui/ortho/OrthoContextMenu.h index b2bae93310..b06f3ae45b 100644 --- a/radiant/ui/ortho/OrthoContextMenu.h +++ b/radiant/ui/ortho/OrthoContextMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "iorthocontextmenu.h" +#include "ui/iorthocontextmenu.h" #include "iradiant.h" #include diff --git a/radiantcore/selection/group/SelectionGroupManager.cpp b/radiantcore/selection/group/SelectionGroupManager.cpp index 8a425ea57a..8c9c10afeb 100644 --- a/radiantcore/selection/group/SelectionGroupManager.cpp +++ b/radiantcore/selection/group/SelectionGroupManager.cpp @@ -7,7 +7,6 @@ #include "imapinfofile.h" #include "icommandsystem.h" #include "iselection.h" -#include "iorthocontextmenu.h" #include "module/StaticModule.h" #include "selection/algorithm/Group.h" diff --git a/tools/msvc/include.vcxproj b/tools/msvc/include.vcxproj index 16fef28bf5..44163b9621 100644 --- a/tools/msvc/include.vcxproj +++ b/tools/msvc/include.vcxproj @@ -158,7 +158,6 @@ - @@ -173,7 +172,6 @@ - @@ -222,6 +220,8 @@ + + diff --git a/tools/msvc/include.vcxproj.filters b/tools/msvc/include.vcxproj.filters index 5fe826d2bd..ee0e2e81b1 100644 --- a/tools/msvc/include.vcxproj.filters +++ b/tools/msvc/include.vcxproj.filters @@ -62,7 +62,6 @@ - @@ -77,7 +76,6 @@ - @@ -150,6 +148,12 @@ ui + + ui + + + ui +