summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-08-30 20:19:30 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-08-31 13:12:44 +0200
commit4a52aae51d73fcc8c321da5b6920cb60bd1f1925 (patch)
tree43e04c920596debaa91960ff572db1e2a94de41b
parentd688a8a5a59f9a152229f005964697218b31c621 (diff)
roadmap.hxx only used by vcl and toolkit now
Change-Id: I2a00687fbc53b2b5f2b8ad94e4813e778eb15f21 Reviewed-on: https://gerrit.libreoffice.org/78323 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--include/vcl/toolkit/roadmap.hxx (renamed from include/vcl/roadmap.hxx)0
-rw-r--r--solenv/clang-format/blacklist2
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx8
-rw-r--r--vcl/source/control/roadmap.cxx2
-rw-r--r--vcl/source/control/roadmapwizard.cxx2
5 files changed, 7 insertions, 7 deletions
diff --git a/include/vcl/roadmap.hxx b/include/vcl/toolkit/roadmap.hxx
index f3811ba56812..f3811ba56812 100644
--- a/include/vcl/roadmap.hxx
+++ b/include/vcl/toolkit/roadmap.hxx
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 4b3e8a60c84f..eafeb2fc651b 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7901,7 +7901,6 @@ include/vcl/prntypes.hxx
include/vcl/ptrstyle.hxx
include/vcl/quickselectionengine.hxx
include/vcl/region.hxx
-include/vcl/roadmap.hxx
include/vcl/roadmapwizard.hxx
include/vcl/salctype.hxx
include/vcl/salgtype.hxx
@@ -7943,6 +7942,7 @@ include/vcl/timer.hxx
include/vcl/toolbox.hxx
include/vcl/toolkit/group.hxx
include/vcl/toolkit/morebtn.hxx
+include/vcl/toolkit/roadmap.hxx
include/vcl/toolkit/tabdlg.hxx
include/vcl/toolkit/unowrap.hxx
include/vcl/transfer.hxx
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 79073b719b2c..06f157d80b66 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -71,7 +71,6 @@
#include <vcl/sysdata.hxx>
#include <vcl/textrectinfo.hxx>
#include <vcl/vclmedit.hxx>
-#include <vcl/roadmap.hxx>
#include <toolkit/awt/vclxwindows.hxx>
#include <toolkit/awt/vclxsystemdependentwindow.hxx>
@@ -99,13 +98,11 @@
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
#include <vcl/floatwin.hxx>
-#include <vcl/toolkit/group.hxx>
#include <vcl/scheduler.hxx>
#include <vcl/imgctrl.hxx>
#include <vcl/longcurr.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/menubtn.hxx>
-#include <vcl/toolkit/morebtn.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/spin.hxx>
@@ -115,13 +112,16 @@
#include <vcl/svapp.hxx>
#include <vcl/syschild.hxx>
#include <vcl/tabctrl.hxx>
-#include <vcl/toolkit/tabdlg.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/virdev.hxx>
#include <vcl/window.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/throbber.hxx>
+#include <vcl/toolkit/group.hxx>
+#include <vcl/toolkit/morebtn.hxx>
+#include <vcl/toolkit/roadmap.hxx>
+#include <vcl/toolkit/tabdlg.hxx>
#if HAVE_FEATURE_OPENGL
#include <vcl/opengl/OpenGLWrapper.hxx>
#endif
diff --git a/vcl/source/control/roadmap.cxx b/vcl/source/control/roadmap.cxx
index e7f0cfedbeb9..d171d3baf8af 100644
--- a/vcl/source/control/roadmap.cxx
+++ b/vcl/source/control/roadmap.cxx
@@ -20,7 +20,7 @@
#include <vector>
#include <algorithm>
#include <vcl/event.hxx>
-#include <vcl/roadmap.hxx>
+#include <vcl/toolkit/roadmap.hxx>
#include <vcl/settings.hxx>
#include <tools/color.hxx>
#include <rtl/ustring.hxx>
diff --git a/vcl/source/control/roadmapwizard.cxx b/vcl/source/control/roadmapwizard.cxx
index eb1294a95b68..ea0f1efa0026 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -19,7 +19,7 @@
#include <vcl/roadmapwizard.hxx>
-#include <vcl/roadmap.hxx>
+#include <vcl/toolkit/roadmap.hxx>
#include <tools/debug.hxx>
#include <osl/diagnose.h>