[Libreoffice-commits] core.git: include/vcl solenv/clang-format toolkit/inc toolkit/source vcl/CppunitTest_vcl_lifecycle.mk vcl/Executable_icontest.mk vcl/Executable_ui-previewer.mk vcl/inc vcl/qa vcl/source vcl/workben
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Fri Feb 14 08:59:47 UTC 2020
include/vcl/toolkit/dialog.hxx | 4 ++++
include/vcl/toolkit/tabdlg.hxx | 2 +-
solenv/clang-format/blacklist | 2 +-
toolkit/inc/helper/btndlg.hxx | 2 +-
toolkit/inc/helper/scrollabledialog.hxx | 3 +--
toolkit/source/awt/vclxaccessiblecomponent.cxx | 2 +-
toolkit/source/awt/vclxtoolkit.cxx | 2 +-
toolkit/source/awt/vclxwindows.cxx | 2 +-
vcl/CppunitTest_vcl_lifecycle.mk | 4 ++++
vcl/Executable_icontest.mk | 4 ++++
vcl/Executable_ui-previewer.mk | 4 ++++
vcl/inc/aboutdialog.hxx | 2 +-
vcl/inc/messagedialog.hxx | 2 +-
vcl/inc/pch/precompiled_vcl.hxx | 2 +-
vcl/inc/wizdlg.hxx | 2 +-
vcl/qa/cppunit/lifecycle.cxx | 2 +-
vcl/source/app/salvtables.cxx | 2 +-
vcl/source/app/svapp.cxx | 2 +-
vcl/source/app/svdata.cxx | 2 +-
vcl/source/app/svmain.cxx | 2 +-
vcl/source/control/button.cxx | 2 +-
vcl/source/uipreviewer/previewer.cxx | 2 +-
vcl/source/uitest/uiobject.cxx | 2 +-
vcl/source/uitest/uitest.cxx | 2 +-
vcl/source/window/builder.cxx | 2 +-
vcl/source/window/dialog.cxx | 2 +-
vcl/source/window/layout.cxx | 2 +-
vcl/source/window/window2.cxx | 2 +-
vcl/source/window/winproc.cxx | 2 +-
vcl/workben/icontest.cxx | 2 +-
30 files changed, 42 insertions(+), 27 deletions(-)
New commits:
commit 29e9fe918d10001ddd2c7ce68064397ada98f4f6
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Feb 13 12:08:13 2020 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Feb 14 09:59:12 2020 +0100
move dialog.hxx to vcl/include/toolkit
Change-Id: Ia3877f58b6e5ccc4fb1621e6b928638e0c850e7a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88602
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/vcl/dialog.hxx b/include/vcl/toolkit/dialog.hxx
similarity index 97%
rename from include/vcl/dialog.hxx
rename to include/vcl/toolkit/dialog.hxx
index e4c9aecaf7d1..2b341e7f99f1 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/toolkit/dialog.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_VCL_DIALOG_HXX
#define INCLUDED_VCL_DIALOG_HXX
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_WORKBEN)
+#error "don't use this in new code"
+#endif
+
#include <memory>
#include <vcl/dllapi.h>
#include <vcl/syswin.hxx>
diff --git a/include/vcl/toolkit/tabdlg.hxx b/include/vcl/toolkit/tabdlg.hxx
index 30613c926617..fb6e5b9b418f 100644
--- a/include/vcl/toolkit/tabdlg.hxx
+++ b/include/vcl/toolkit/tabdlg.hxx
@@ -25,7 +25,7 @@
#endif
#include <vcl/dllapi.h>
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
class FixedLine;
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 9324dcfbb7b7..8ec37780bbfe 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7470,7 +7470,6 @@ include/vcl/ctrl.hxx
include/vcl/cursor.hxx
include/vcl/cvtgrf.hxx
include/vcl/decoview.hxx
-include/vcl/dialog.hxx
include/vcl/dibtools.hxx
include/vcl/dllapi.h
include/vcl/dndhelp.hxx
@@ -7584,6 +7583,7 @@ include/vcl/textview.hxx
include/vcl/threadex.hxx
include/vcl/timer.hxx
include/vcl/toolbox.hxx
+include/vcl/toolkit/dialog.hxx
include/vcl/toolkit/field.hxx
include/vcl/toolkit/fixedhyper.hxx
include/vcl/toolkit/group.hxx
diff --git a/toolkit/inc/helper/btndlg.hxx b/toolkit/inc/helper/btndlg.hxx
index 46e6e9197004..5f3d994d4f81 100644
--- a/toolkit/inc/helper/btndlg.hxx
+++ b/toolkit/inc/helper/btndlg.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_BTNDLG_HXX
#define INCLUDED_VCL_BTNDLG_HXX
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <vector>
diff --git a/toolkit/inc/helper/scrollabledialog.hxx b/toolkit/inc/helper/scrollabledialog.hxx
index 6dce324dbccb..099bbbd6045e 100644
--- a/toolkit/inc/helper/scrollabledialog.hxx
+++ b/toolkit/inc/helper/scrollabledialog.hxx
@@ -20,10 +20,9 @@
#ifndef INCLUDED_TOOLKIT_AWT_SCROLLABLEDIALOG_HXX
#define INCLUDED_TOOLKIT_AWT_SCROLLABLEDIALOG_HXX
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <vcl/scrbar.hxx>
-
namespace toolkit
{
class ScrollableDialog final : public Dialog
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index e2349b27ecc9..5e4002fb67f3 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -28,7 +28,7 @@
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/convert.hxx>
#include <toolkit/awt/vclxfont.hxx>
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <vcl/vclevent.hxx>
#include <vcl/window.hxx>
#include <vcl/edit.hxx>
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index bf875134d9cf..cc3adf9c3cde 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -82,7 +82,7 @@
#include <vcl/button.hxx>
#include <vcl/combobox.hxx>
#include <vcl/ctrl.hxx>
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <vcl/dockingarea.hxx>
#include <vcl/dockwin.hxx>
#include <vcl/edit.hxx>
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 1a500e869e7e..35bda5bf4580 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -49,7 +49,7 @@
#include <vcl/toolkit/fixedhyper.hxx>
#include <vcl/longcurr.hxx>
#include <vcl/toolkit/imgctrl.hxx>
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <vcl/toolkit/prgsbar.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/svapp.hxx>
diff --git a/vcl/CppunitTest_vcl_lifecycle.mk b/vcl/CppunitTest_vcl_lifecycle.mk
index 209a2a8d5915..ff6a85c1b057 100644
--- a/vcl/CppunitTest_vcl_lifecycle.mk
+++ b/vcl/CppunitTest_vcl_lifecycle.mk
@@ -33,6 +33,10 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_lifecycle, \
vcl \
))
+$(eval $(call gb_CppunitTest_add_defs,vcl_lifecycle,\
+ -DVCL_WORKBEN \
+))
+
$(eval $(call gb_CppunitTest_use_sdk_api,vcl_lifecycle))
$(eval $(call gb_CppunitTest_use_ure,vcl_lifecycle))
diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk
index 6faf33703aa1..cdf47e6dc198 100644
--- a/vcl/Executable_icontest.mk
+++ b/vcl/Executable_icontest.mk
@@ -25,6 +25,10 @@ $(eval $(call gb_Executable_add_defs,icontest,\
))
endif
+$(eval $(call gb_Executable_add_defs,icontest,\
+ -DVCL_WORKBEN \
+))
+
$(eval $(call gb_Executable_use_api,icontest,\
offapi \
udkapi \
diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk
index c728de8c61d1..b848c07a300a 100644
--- a/vcl/Executable_ui-previewer.mk
+++ b/vcl/Executable_ui-previewer.mk
@@ -34,6 +34,10 @@ $(eval $(call gb_Executable_add_exception_objects,ui-previewer,\
vcl/source/uipreviewer/previewer \
))
+$(eval $(call gb_Executable_add_defs,ui-previewer,\
+ -DVCL_WORKBEN \
+))
+
ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Executable_add_libs,ui-previewer,\
-lm $(DLOPEN_LIBS) \
diff --git a/vcl/inc/aboutdialog.hxx b/vcl/inc/aboutdialog.hxx
index 562316ae4a8c..85da1cf27076 100644
--- a/vcl/inc/aboutdialog.hxx
+++ b/vcl/inc/aboutdialog.hxx
@@ -12,7 +12,7 @@
#include <vcl/fixed.hxx>
#include <vcl/toolkit/fixedhyper.hxx>
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <vcl/layout.hxx>
#include <vcl/vclmedit.hxx>
diff --git a/vcl/inc/messagedialog.hxx b/vcl/inc/messagedialog.hxx
index c809b0cfb144..679767be7920 100644
--- a/vcl/inc/messagedialog.hxx
+++ b/vcl/inc/messagedialog.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_VCL_INC_MESSAGEDIALOG_HXX
#define INCLUDED_VCL_INC_MESSAGEDIALOG_HXX
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <vcl/layout.hxx>
#include <vcl/fixed.hxx>
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index ff64669c1c94..da5d58564480 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -276,7 +276,6 @@
#include <vcl/cursor.hxx>
#include <vcl/cvtgrf.hxx>
#include <vcl/decoview.hxx>
-#include <vcl/dialog.hxx>
#include <vcl/dibtools.hxx>
#include <vcl/dllapi.h>
#include <vcl/dockwin.hxx>
@@ -313,6 +312,7 @@
#include <vcl/taskpanelist.hxx>
#include <vcl/timer.hxx>
#include <vcl/toolbox.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <vcl/toolkit/unowrap.hxx>
#include <vcl/transfer.hxx>
#include <vcl/treelist.hxx>
diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx
index dbda04a66da8..d9f0e658b6fc 100644
--- a/vcl/inc/wizdlg.hxx
+++ b/vcl/inc/wizdlg.hxx
@@ -22,7 +22,7 @@
#include <memory>
#include <vcl/button.hxx>
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <vcl/roadmapwizard.hxx>
#include <vcl/tabpage.hxx>
diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx
index 857ad9b46d08..faf009a01f0e 100644
--- a/vcl/qa/cppunit/lifecycle.cxx
+++ b/vcl/qa/cppunit/lifecycle.cxx
@@ -16,7 +16,7 @@
#include <vcl/field.hxx>
#include <vcl/virdev.hxx>
#include <vcl/tabctrl.hxx>
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <vcl/layout.hxx>
#include <vcl/scheduler.hxx>
#include <com/sun/star/awt/XWindow.hpp>
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 4eca514388d3..ba8869e6ad6e 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -46,7 +46,7 @@
#include <vcl/calendar.hxx>
#include <vcl/combobox.hxx>
#include <vcl/lstbox.hxx>
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <vcl/fixed.hxx>
#include <vcl/toolkit/fixedhyper.hxx>
#include <vcl/fmtfield.hxx>
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 4f70cceae081..b6b5917b3eac 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -32,7 +32,7 @@
#include <unotools/configmgr.hxx>
#include <unotools/syslocaleoptions.hxx>
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <vcl/dialoghelper.hxx>
#include <vcl/lok.hxx>
#include <vcl/floatwin.hxx>
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 70db9440f6a4..05d53060b51e 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -37,7 +37,7 @@
#include <salframe.hxx>
#include <scrwnd.hxx>
#include <helpwin.hxx>
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <salinst.hxx>
#include <salgdi.hxx>
#include <svdata.hxx>
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 6c3cd630561c..ca1818fc20ff 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -43,7 +43,7 @@
#include <configsettings.hxx>
#include <vcl/lazydelete.hxx>
#include <vcl/embeddedfontshelper.hxx>
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <vcl/menu.hxx>
#include <vcl/virdev.hxx>
#include <vcl/print.hxx>
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 72849df32944..cee637ee8e03 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -25,7 +25,7 @@
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
#include <vcl/salnativewidgets.hxx>
diff --git a/vcl/source/uipreviewer/previewer.cxx b/vcl/source/uipreviewer/previewer.cxx
index f089a75fcdc9..ab4d5f91d9b5 100644
--- a/vcl/source/uipreviewer/previewer.cxx
+++ b/vcl/source/uipreviewer/previewer.cxx
@@ -15,7 +15,7 @@
#include <cppuhelper/bootstrap.hxx>
#include <osl/file.hxx>
#include <vcl/builder.hxx>
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <vcl/help.hxx>
#include <vcl/svapp.hxx>
#include <vcl/vclmain.hxx>
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 201a05e02bb7..206b6a32e3b3 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -16,7 +16,7 @@
#include <vcl/toolkit/spin.hxx>
#include <vcl/spinfld.hxx>
#include <vcl/button.hxx>
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <vcl/edit.hxx>
#include <vcl/vclmedit.hxx>
#include <vcl/uitest/logger.hxx>
diff --git a/vcl/source/uitest/uitest.cxx b/vcl/source/uitest/uitest.cxx
index 0e2a9d93511a..b29655826490 100644
--- a/vcl/source/uitest/uitest.cxx
+++ b/vcl/source/uitest/uitest.cxx
@@ -11,7 +11,7 @@
#include <vcl/uitest/uitest.hxx>
#include <vcl/uitest/uiobject.hxx>
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <svdata.hxx>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index c3646e313168..87cbd5eef9c0 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -23,7 +23,7 @@
#include <vcl/builder.hxx>
#include <vcl/button.hxx>
#include <vcl/calendar.hxx>
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <vcl/edit.hxx>
#include <vcl/toolkit/field.hxx>
#include <vcl/fmtfield.hxx>
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 91516baffeb5..b1f18b499b80 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -49,7 +49,7 @@
#include <vcl/wrkwin.hxx>
#include <vcl/button.hxx>
#include <vcl/mnemonic.hxx>
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <vcl/dialoghelper.hxx>
#include <vcl/settings.hxx>
#include <vcl/virdev.hxx>
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 2426d056a542..cddd8f5519fd 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -12,7 +12,7 @@
#include <o3tl/enumrange.hxx>
#include <vcl/button.hxx>
#include <vcl/decoview.hxx>
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <vcl/layout.hxx>
#include <vcl/stdtext.hxx>
#include <vcl/svapp.hxx>
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index d8aca4adc5eb..01d224f55057 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -22,7 +22,7 @@
#include <o3tl/float_int_conversion.hxx>
#include <sal/log.hxx>
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <vcl/event.hxx>
#include <vcl/fixed.hxx>
#include <vcl/layout.hxx>
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 50116e908559..a9e4503024fc 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -35,7 +35,7 @@
#include <vcl/cursor.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/floatwin.hxx>
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <vcl/help.hxx>
#include <vcl/dockwin.hxx>
#include <vcl/menu.hxx>
diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index 4203ecdaf9d3..d41f31c489b9 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -33,7 +33,7 @@
#include <tools/stream.hxx>
#include <vcl/builder.hxx>
#include <vcl/button.hxx>
-#include <vcl/dialog.hxx>
+#include <vcl/toolkit/dialog.hxx>
#include <vcl/fixed.hxx>
#include <vcl/graph.hxx>
#include <vcl/graphicfilter.hxx>
More information about the Libreoffice-commits
mailing list