[Libreoffice-commits] core.git: include/vcl solenv/clang-format toolkit/source vcl/Library_vcl.mk vcl/source

[Libreoffice Gerrit user]

 include/vcl/toolkit/README         |    2 ++
 solenv/clang-format/blacklist      |    4 ++--
 toolkit/source/awt/vclxtoolkit.cxx |    2 +-
 vcl/Library_vcl.mk                 |    2 +-
 vcl/source/toolkit/README          |    2 ++
 vcl/source/toolkit/group.cxx       |    2 +-
 6 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 17a416248235d89f145e8c15dac01d6946ac8460
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Oct 14 19:38:43 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Oct 14 22:16:37 2018 +0200

    split out vcl stuff used solely by toolkit module
    
    Change-Id: Idb1dfcdaaefefa9a8d97ecdd22e39377cb31bc62
    Reviewed-on: https://gerrit.libreoffice.org/61763
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/toolkit/README b/include/vcl/toolkit/README
new file mode 100644
index 000000000000..889f0b20aa50
--- /dev/null
+++ b/include/vcl/toolkit/README
@@ -0,0 +1,2 @@
+These are includes which are now only used by the toolkit module, which exposes
+them via uno. Don't use these in any new code.
diff --git a/include/vcl/group.hxx b/include/vcl/toolkit/group.hxx
similarity index 100%
rename from include/vcl/group.hxx
rename to include/vcl/toolkit/group.hxx
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 2dcbc9d4d4cf..5f15395d1dca 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7963,7 +7963,6 @@ include/vcl/gradient.hxx
 include/vcl/graph.hxx
 include/vcl/graphicfilter.hxx
 include/vcl/graphictools.hxx
-include/vcl/group.hxx
 include/vcl/hatch.hxx
 include/vcl/help.hxx
 include/vcl/i18nhelp.hxx
@@ -8052,6 +8051,7 @@ include/vcl/threadex.hxx
 include/vcl/throbber.hxx
 include/vcl/timer.hxx
 include/vcl/toolbox.hxx
+include/vcl/toolkit/group.hxx
 include/vcl/txtattr.hxx
 include/vcl/uitest/factory.hxx
 include/vcl/uitest/logger.hxx
@@ -17987,7 +17987,6 @@ vcl/source/control/field.cxx
 vcl/source/control/field2.cxx
 vcl/source/control/fixed.cxx
 vcl/source/control/fixedhyper.cxx
-vcl/source/control/group.cxx
 vcl/source/control/imgctrl.cxx
 vcl/source/control/imp_listbox.cxx
 vcl/source/control/listbox.cxx
@@ -18181,6 +18180,7 @@ vcl/source/outdev/transparent.cxx
 vcl/source/outdev/vclreferencebase.cxx
 vcl/source/outdev/wallpaper.cxx
 vcl/source/salmain/salmain.cxx
+vcl/source/toolkit/group.cxx
 vcl/source/uipreviewer/previewer.cxx
 vcl/source/uitest/logger.cxx
 vcl/source/uitest/uiobject.cxx
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index d65bf794dc88..a045fa430ed3 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -94,7 +94,7 @@
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/floatwin.hxx>
-#include <vcl/group.hxx>
+#include <vcl/toolkit/group.hxx>
 #include <vcl/scheduler.hxx>
 #include <vcl/imgctrl.hxx>
 #include <vcl/longcurr.hxx>
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index ca04103ac8cc..b856204a8569 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -182,7 +182,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/control/field \
     vcl/source/control/fixed \
     vcl/source/control/fixedhyper \
-    vcl/source/control/group \
     vcl/source/control/imgctrl \
     vcl/source/control/listctrl \
     vcl/source/control/longcurr \
@@ -207,6 +206,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/edit/textview \
     vcl/source/edit/txtattr \
     vcl/source/edit/xtextedt \
+    vcl/source/toolkit/group \
     vcl/source/outdev/outdev \
     vcl/source/outdev/outdevstate \
     vcl/source/outdev/outdevstatestack \
diff --git a/vcl/source/toolkit/README b/vcl/source/toolkit/README
new file mode 100644
index 000000000000..78863390f1a7
--- /dev/null
+++ b/vcl/source/toolkit/README
@@ -0,0 +1,2 @@
+These are controls which are now only used by the toolkit module, which exposes
+them via uno. Don't use these in any new code.
diff --git a/vcl/source/control/group.cxx b/vcl/source/toolkit/group.cxx
similarity index 99%
rename from vcl/source/control/group.cxx
rename to vcl/source/toolkit/group.cxx
index 78f4fc90f122..8ef95d4ff587 100644
--- a/vcl/source/control/group.cxx
+++ b/vcl/source/toolkit/group.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <vcl/event.hxx>
-#include <vcl/group.hxx>
+#include <vcl/toolkit/group.hxx>
 #include <vcl/settings.hxx>
 
 #include <controldata.hxx>