[Libreoffice-commits] core.git: include/vcl solenv/clang-format toolkit/source vcl/inc vcl/qa vcl/source vcl/workben
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Fri May 8 08:11:35 UTC 2020
include/vcl/button.hxx | 18 --------------
include/vcl/toolkit/button.hxx | 45 ++++++++++++++++++++++++++++++++++++
solenv/clang-format/blacklist | 1
toolkit/source/awt/vclxtoolkit.cxx | 2 -
toolkit/source/helper/btndlg.cxx | 2 -
vcl/inc/listbox.hxx | 2 -
vcl/inc/pch/precompiled_vcl.hxx | 6 +++-
vcl/inc/wizdlg.hxx | 2 -
vcl/qa/cppunit/lifecycle.cxx | 2 -
vcl/source/control/button.cxx | 2 -
vcl/source/control/tabctrl.cxx | 2 -
vcl/source/treelist/svlbitm.cxx | 2 -
vcl/source/uitest/uiobject.cxx | 2 -
vcl/source/window/builder.cxx | 2 -
vcl/source/window/dialog.cxx | 2 -
vcl/source/window/dlgctrl.cxx | 2 -
vcl/source/window/layout.cxx | 2 -
vcl/source/window/menubarwindow.hxx | 2 -
vcl/source/window/msgbox.cxx | 2 -
vcl/workben/icontest.cxx | 2 -
20 files changed, 66 insertions(+), 36 deletions(-)
New commits:
commit 4d1d64ebd3ef8880459f1778d0a34a4ca15f87ca
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu May 7 20:20:23 2020 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri May 8 10:10:53 2020 +0200
split button.hxx into toolkit-only piece
Change-Id: I792efb417504a3b55043ff4fc3fd3597a9b953f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93678
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index bfdb4d5323b3..35e98c52bba6 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -253,24 +253,6 @@ public:
explicit CloseButton(vcl::Window* pParent, WinBits nStyle = 0);
};
-class VCL_DLLPUBLIC HelpButton : public PushButton
-{
-protected:
- using PushButton::ImplInit;
-private:
- SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
-
- HelpButton( const HelpButton & ) = delete;
- HelpButton & operator= ( const HelpButton & ) = delete;
-
- virtual void StateChanged( StateChangedType nStateChange ) override;
-
-public:
- explicit HelpButton( vcl::Window* pParent, WinBits nStyle = 0 );
-
- virtual void Click() override;
-};
-
class VCL_DLLPUBLIC RadioButton : public Button
{
private:
diff --git a/include/vcl/toolkit/button.hxx b/include/vcl/toolkit/button.hxx
new file mode 100644
index 000000000000..d2ec4d2ceb0c
--- /dev/null
+++ b/include/vcl/toolkit/button.hxx
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#pragma once
+
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS)
+#error "don't use this in new code"
+#endif
+
+#include <vcl/button.hxx>
+
+class VCL_DLLPUBLIC HelpButton : public PushButton
+{
+protected:
+ using PushButton::ImplInit;
+private:
+ SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
+
+ HelpButton( const HelpButton & ) = delete;
+ HelpButton & operator= ( const HelpButton & ) = delete;
+
+ virtual void StateChanged( StateChangedType nStateChange ) override;
+
+public:
+ explicit HelpButton( vcl::Window* pParent, WinBits nStyle = 0 );
+
+ virtual void Click() override;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 19dc44686a92..4beebbfc6a5d 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7455,6 +7455,7 @@ include/vcl/textview.hxx
include/vcl/threadex.hxx
include/vcl/timer.hxx
include/vcl/toolbox.hxx
+include/vcl/toolkit/button.hxx
include/vcl/toolkit/controllayout.hxx
include/vcl/toolkit/dialog.hxx
include/vcl/toolkit/field.hxx
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index d39a70659161..69d4c01d1e4d 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -80,7 +80,7 @@
#include <toolkit/helper/convert.hxx>
#include <controls/filectrl.hxx>
#include <controls/treecontrolpeer.hxx>
-#include <vcl/button.hxx>
+#include <vcl/toolkit/button.hxx>
#include <vcl/combobox.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/toolkit/dialog.hxx>
diff --git a/toolkit/source/helper/btndlg.cxx b/toolkit/source/helper/btndlg.cxx
index 7b8884b4ee62..9885f9468b85 100644
--- a/toolkit/source/helper/btndlg.cxx
+++ b/toolkit/source/helper/btndlg.cxx
@@ -19,7 +19,7 @@
#include <memory>
-#include <vcl/button.hxx>
+#include <vcl/toolkit/button.hxx>
#include <vcl/stdtext.hxx>
#include <helper/btndlg.hxx>
#include <sal/log.hxx>
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index 5c74904f54a3..71612358be6e 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -23,7 +23,7 @@
#include <sal/config.h>
#include <o3tl/safeint.hxx>
-#include <vcl/button.hxx>
+#include <vcl/toolkit/button.hxx>
#include <vcl/floatwin.hxx>
#include <vcl/quickselectionengine.hxx>
#include <vcl/glyphitem.hxx>
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 35c8f8b4ae70..2e94519a4aeb 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-04-25 20:56:04 using:
+ Generated on 2020-05-07 20:21:38 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:
@@ -163,6 +163,7 @@
#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/util/DateTime.hpp>
#include <comphelper/comphelperdllapi.h>
+#include <comphelper/fileformat.h>
#include <comphelper/lok.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
@@ -202,6 +203,7 @@
#include <svl/svldllapi.h>
#include <svl/typedwhich.hxx>
#include <test/outputdevice.hxx>
+#include <tools/UnitConversion.hxx>
#include <tools/color.hxx>
#include <tools/contnr.hxx>
#include <tools/date.hxx>
@@ -269,7 +271,6 @@
#include <vcl/bitmapaccess.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/builder.hxx>
-#include <vcl/button.hxx>
#include <vcl/canvastools.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/commandinfoprovider.hxx>
@@ -315,6 +316,7 @@
#include <vcl/taskpanelist.hxx>
#include <vcl/timer.hxx>
#include <vcl/toolbox.hxx>
+#include <vcl/toolkit/button.hxx>
#include <vcl/toolkit/dialog.hxx>
#include <vcl/toolkit/unowrap.hxx>
#include <vcl/transfer.hxx>
diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx
index d9f0e658b6fc..946af0530866 100644
--- a/vcl/inc/wizdlg.hxx
+++ b/vcl/inc/wizdlg.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_VCL_WIZDLG_HXX
#include <memory>
-#include <vcl/button.hxx>
+#include <vcl/toolkit/button.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 7df57d9ddf69..097852770814 100644
--- a/vcl/qa/cppunit/lifecycle.cxx
+++ b/vcl/qa/cppunit/lifecycle.cxx
@@ -10,9 +10,9 @@
#include <test/bootstrapfixture.hxx>
#include <vcl/wrkwin.hxx>
-#include <vcl/button.hxx>
#include <vcl/edit.hxx>
#include <vcl/combobox.hxx>
+#include <vcl/toolkit/button.hxx>
#include <vcl/toolkit/dialog.hxx>
#include <vcl/toolkit/field.hxx>
#include <vcl/virdev.hxx>
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index b818fef15f68..20528189da18 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -27,7 +27,7 @@
#include <vcl/settings.hxx>
#include <vcl/toolkit/dialog.hxx>
#include <vcl/fixed.hxx>
-#include <vcl/button.hxx>
+#include <vcl/toolkit/button.hxx>
#include <vcl/salnativewidgets.hxx>
#include <vcl/edit.hxx>
#include <vcl/layout.hxx>
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index c02ed29fddff..3d492a9a6b0f 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -25,7 +25,7 @@
#include <vcl/help.hxx>
#include <vcl/event.hxx>
#include <vcl/menu.hxx>
-#include <vcl/button.hxx>
+#include <vcl/toolkit/button.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/tabctrl.hxx>
#include <vcl/toolkit/controllayout.hxx>
diff --git a/vcl/source/treelist/svlbitm.cxx b/vcl/source/treelist/svlbitm.cxx
index 8fff9071dcdb..da5074283545 100644
--- a/vcl/source/treelist/svlbitm.cxx
+++ b/vcl/source/treelist/svlbitm.cxx
@@ -22,7 +22,7 @@
#include <vcl/treelistentry.hxx>
#include <vcl/viewdataentry.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/button.hxx>
+#include <vcl/toolkit/button.hxx>
#include <vcl/decoview.hxx>
#include <vcl/salnativewidgets.hxx>
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 3a5360706459..cbbd35f26754 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -17,7 +17,7 @@
#include <vcl/lstbox.hxx>
#include <vcl/toolkit/spin.hxx>
#include <vcl/spinfld.hxx>
-#include <vcl/button.hxx>
+#include <vcl/toolkit/button.hxx>
#include <vcl/toolkit/dialog.hxx>
#include <vcl/edit.hxx>
#include <vcl/vclmedit.hxx>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 8cb3ca6b2fbe..9aef02f6c887 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -22,7 +22,7 @@
#include <unotools/localedatawrapper.hxx>
#include <unotools/resmgr.hxx>
#include <vcl/builder.hxx>
-#include <vcl/button.hxx>
+#include <vcl/toolkit/button.hxx>
#include <vcl/calendar.hxx>
#include <vcl/toolkit/dialog.hxx>
#include <vcl/edit.hxx>
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 9ea561abe64f..53f2a4e80778 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -48,7 +48,7 @@
#include <vcl/event.hxx>
#include <vcl/waitobj.hxx>
#include <vcl/wrkwin.hxx>
-#include <vcl/button.hxx>
+#include <vcl/toolkit/button.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/toolkit/dialog.hxx>
#include <vcl/dialoghelper.hxx>
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index 1c7fb30f4f99..903a731405ce 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -28,7 +28,7 @@
#include <vcl/svapp.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/tabctrl.hxx>
-#include <vcl/button.hxx>
+#include <vcl/toolkit/button.hxx>
#include <vcl/settings.hxx>
#include <sal/log.hxx>
#include <i18nlangtag/languagetag.hxx>
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 91324ed9bb67..22f8f12ad13a 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -10,7 +10,7 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <o3tl/enumarray.hxx>
#include <o3tl/enumrange.hxx>
-#include <vcl/button.hxx>
+#include <vcl/toolkit/button.hxx>
#include <vcl/decoview.hxx>
#include <vcl/toolkit/dialog.hxx>
#include <vcl/layout.hxx>
diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx
index c871455ad25c..487746c09c80 100644
--- a/vcl/source/window/menubarwindow.hxx
+++ b/vcl/source/window/menubarwindow.hxx
@@ -22,7 +22,7 @@
#include "menuwindow.hxx"
-#include <vcl/button.hxx>
+#include <vcl/toolkit/button.hxx>
#include <vcl/menu.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/window.hxx>
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index aaaf8bc3de79..112ab1f8cf21 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -30,7 +30,7 @@
#include <vcl/fixed.hxx>
#include <vcl/vclmedit.hxx>
#include <vcl/msgbox.hxx>
-#include <vcl/button.hxx>
+#include <vcl/toolkit/button.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/settings.hxx>
diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index d41f31c489b9..4b2bb7303e8b 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -32,7 +32,7 @@
#include <sal/log.hxx>
#include <tools/stream.hxx>
#include <vcl/builder.hxx>
-#include <vcl/button.hxx>
+#include <vcl/toolkit/button.hxx>
#include <vcl/toolkit/dialog.hxx>
#include <vcl/fixed.hxx>
#include <vcl/graph.hxx>
More information about the Libreoffice-commits
mailing list