From 29e9fe918d10001ddd2c7ce68064397ada98f4f6 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 13 Feb 2020 12:08:13 +0000 Subject: move dialog.hxx to vcl/include/toolkit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia3877f58b6e5ccc4fb1621e6b928638e0c850e7a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88602 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- 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 +- 22 files changed, 31 insertions(+), 19 deletions(-) (limited to 'vcl') 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 #include -#include +#include #include #include 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 +#include #include #include 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 #include #include -#include #include #include #include @@ -313,6 +312,7 @@ #include #include #include +#include #include #include #include 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 #include -#include +#include #include #include 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 #include #include -#include +#include #include #include #include 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 #include #include -#include +#include #include #include #include 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 #include -#include +#include #include #include #include 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 #include #include -#include +#include #include #include #include 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 #include #include -#include +#include #include #include #include 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 #include #include -#include +#include #include #include #include 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 #include #include -#include +#include #include #include #include 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 #include #include -#include +#include #include #include #include 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 #include -#include +#include #include 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 #include #include -#include +#include #include #include #include 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 #include #include -#include +#include #include #include #include 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 #include #include -#include +#include #include #include #include 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 #include -#include +#include #include #include #include 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 #include #include -#include +#include #include #include #include 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 #include #include -#include +#include #include #include #include -- cgit