[Libreoffice-commits] core.git: accessibility/source include/vcl solenv/clang-format toolkit/inc toolkit/source vcl/inc vcl/jsdialog vcl/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Wed Aug 19 08:13:04 UTC 2020
accessibility/source/standard/vclxaccessibleedit.cxx | 2 +-
include/vcl/toolkit/vclmedit.hxx | 9 +++++----
solenv/clang-format/excludelist | 2 +-
toolkit/inc/controls/svmedit.hxx | 2 +-
toolkit/source/awt/vclxtoolkit.cxx | 2 +-
vcl/inc/pch/precompiled_vcl.hxx | 4 ++--
vcl/jsdialog/jsdialogbuilder.cxx | 2 +-
vcl/source/app/salvtables.cxx | 2 +-
vcl/source/edit/vclmedit.cxx | 2 +-
vcl/source/uitest/uiobject.cxx | 2 +-
vcl/source/window/builder.cxx | 2 +-
vcl/source/window/layout.cxx | 2 +-
12 files changed, 17 insertions(+), 16 deletions(-)
New commits:
commit cee0a2a93e2956e1a29019ef3ca92d4dd5d69c1f
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Aug 18 15:55:27 2020 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Aug 19 10:12:19 2020 +0200
move VclMultiLineEdit to toolkit-only headers
Change-Id: I2e8728061e484f79768fcfe67d674cb76367a94d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100951
Tested-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index 0da8a6ff70b1..10a28afc626c 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -34,7 +34,7 @@
#include <vcl/window.hxx>
#include <vcl/settings.hxx>
#include <vcl/edit.hxx>
-#include <vcl/vclmedit.hxx>
+#include <vcl/toolkit/vclmedit.hxx>
#include <vcl/textdata.hxx>
#include <vcl/txtattr.hxx>
#include <vcl/xtextedt.hxx>
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/toolkit/vclmedit.hxx
similarity index 97%
rename from include/vcl/vclmedit.hxx
rename to include/vcl/toolkit/vclmedit.hxx
index 9292ebe037cd..a15ca2aaa901 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/toolkit/vclmedit.hxx
@@ -17,8 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_VCLMEDIT_HXX
-#define INCLUDED_VCL_VCLMEDIT_HXX
+#pragma once
+
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS)
+#error "don't use this in new code"
+#endif
#include <tools/lineend.hxx>
#include <tools/wintypes.hxx>
@@ -177,6 +180,4 @@ public:
virtual void DumpAsPropertyTree(tools::JsonWriter&) override;
};
-#endif // INCLUDED_VCL_VCLMEDIT_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 5150456678a5..66f37795aa41 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -7445,6 +7445,7 @@ include/vcl/toolkit/treelist.hxx
include/vcl/toolkit/treelistbox.hxx
include/vcl/toolkit/treelistentry.hxx
include/vcl/toolkit/unowrap.hxx
+include/vcl/toolkit/vclmedit.hxx
include/vcl/toolkit/viewdataentry.hxx
include/vcl/transfer.hxx
include/vcl/txtattr.hxx
@@ -7457,7 +7458,6 @@ include/vcl/vclenum.hxx
include/vcl/vclevent.hxx
include/vcl/vcllayout.hxx
include/vcl/vclmain.hxx
-include/vcl/vclmedit.hxx
include/vcl/vclptr.hxx
include/vcl/vclreferencebase.hxx
include/vcl/vectorgraphicdata.hxx
diff --git a/toolkit/inc/controls/svmedit.hxx b/toolkit/inc/controls/svmedit.hxx
index b783ce79487c..33586c84f064 100644
--- a/toolkit/inc/controls/svmedit.hxx
+++ b/toolkit/inc/controls/svmedit.hxx
@@ -19,7 +19,7 @@
#pragma once
-#include <vcl/vclmedit.hxx>
+#include <vcl/toolkit/vclmedit.hxx>
class MultiLineEdit : public VclMultiLineEdit
{
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 4f7dc2150d61..ab4d8ae58585 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -64,7 +64,7 @@
#include <vcl/sysdata.hxx>
#include <vcl/textrectinfo.hxx>
-#include <vcl/vclmedit.hxx>
+#include <vcl/toolkit/vclmedit.hxx>
#include <toolkit/awt/vclxwindows.hxx>
#include <awt/vclxsystemdependentwindow.hxx>
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index b6fa73b6d062..29f9379fe5b3 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2020-08-12 11:16:23 using:
+ Generated on 2020-08-18 15:54:52 using:
./bin/update_pch vcl vcl --cutoff=6 --exclude:system --include:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -325,6 +325,7 @@
#include <vcl/toolkit/treelistentries.hxx>
#include <vcl/toolkit/treelistentry.hxx>
#include <vcl/toolkit/unowrap.hxx>
+#include <vcl/toolkit/vclmedit.hxx>
#include <vcl/toolkit/viewdataentry.hxx>
#include <vcl/transfer.hxx>
#include <vcl/uitest/logger.hxx>
@@ -332,7 +333,6 @@
#include <vcl/unohelp.hxx>
#include <vcl/vclenum.hxx>
#include <vcl/vclevent.hxx>
-#include <vcl/vclmedit.hxx>
#include <vcl/vclptr.hxx>
#include <vcl/virdev.hxx>
#include <vcl/weld.hxx>
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 93214876f3e5..af48c181bff6 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -20,7 +20,7 @@
#include <o3tl/deleter.hxx>
#include <memory>
#include <vcl/toolbox.hxx>
-#include <vcl/vclmedit.hxx>
+#include <vcl/toolkit/vclmedit.hxx>
#include <boost/property_tree/json_parser.hpp>
JSDialogNotifyIdle::JSDialogNotifyIdle(VclPtr<vcl::Window> aWindow)
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 2a138f1575a1..aa44a1ac0275 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -66,7 +66,7 @@
#include <vcl/toolkit/unowrap.hxx>
#include <vcl/weld.hxx>
#include <vcl/weldutils.hxx>
-#include <vcl/vclmedit.hxx>
+#include <vcl/toolkit/vclmedit.hxx>
#include <vcl/toolkit/viewdataentry.hxx>
#include <vcl/virdev.hxx>
#include <bitmaps.hlst>
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index eabdfa5c6dc3..d4035e57419a 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -25,7 +25,7 @@
#include <vcl/event.hxx>
#include <vcl/specialchars.hxx>
#include <vcl/timer.hxx>
-#include <vcl/vclmedit.hxx>
+#include <vcl/toolkit/vclmedit.hxx>
#include <vcl/xtextedt.hxx>
#include <vcl/textview.hxx>
#include <vcl/ptrstyle.hxx>
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 1b501e2676e5..38007063bd3a 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -27,7 +27,7 @@
#include <vcl/toolkit/field.hxx>
#include <vcl/edit.hxx>
#include <vcl/menubtn.hxx>
-#include <vcl/vclmedit.hxx>
+#include <vcl/toolkit/vclmedit.hxx>
#include <vcl/uitest/logger.hxx>
#include <uiobject-internal.hxx>
#include <verticaltabctrl.hxx>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index b0cb0e053fce..020ea6c5f74c 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -47,7 +47,7 @@
#include <vcl/toolkit/throbber.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/toolkit/treelistentry.hxx>
-#include <vcl/vclmedit.hxx>
+#include <vcl/toolkit/vclmedit.hxx>
#include <vcl/settings.hxx>
#include <slider.hxx>
#include <vcl/weld.hxx>
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 30168a47a3f3..a4a008df7448 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -29,7 +29,7 @@
#include <window.h>
#include <boost/multi_array.hpp>
#include <boost/property_tree/ptree.hpp>
-#include <vcl/vclmedit.hxx>
+#include <vcl/toolkit/vclmedit.hxx>
#include <sal/log.hxx>
#include <tools/json_writer.hxx>
More information about the Libreoffice-commits
mailing list