summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-11-04 12:07:22 +0000
committerCaolán McNamara <caolanm@redhat.com>2019-11-04 16:45:12 +0100
commit074cab391c20be872a4b5d14a342eda5c541b6fd (patch)
tree472762efa5c62bcc12d83fbacd378777dab4a324
parent57aa9ea3a6d178fcea016fadb005dfbcc2ca2e8d (diff)
ProgressBar now only use in vcl and toolkit
Change-Id: I5d56a4df155806e41cafa6f65a3a030e8443b8f7 Reviewed-on: https://gerrit.libreoffice.org/82005 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--include/vcl/toolkit/prgsbar.hxx (renamed from include/vcl/prgsbar.hxx)4
-rw-r--r--solenv/clang-format/blacklist2
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx2
-rw-r--r--toolkit/source/awt/vclxwindows.cxx2
-rw-r--r--vcl/source/app/salvtables.cxx2
-rw-r--r--vcl/source/control/prgsbar.cxx2
-rw-r--r--vcl/source/window/builder.cxx2
7 files changed, 10 insertions, 6 deletions
diff --git a/include/vcl/prgsbar.hxx b/include/vcl/toolkit/prgsbar.hxx
index 292c54a13254..9b9f251c81d2 100644
--- a/include/vcl/prgsbar.hxx
+++ b/include/vcl/toolkit/prgsbar.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_VCL_PRGSBAR_HXX
#define INCLUDED_VCL_PRGSBAR_HXX
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION)
+#error "don't use this in new code"
+#endif
+
#include <vcl/dllapi.h>
#include <vcl/window.hxx>
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index cbc4723e32b8..081e8b37fca3 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7855,7 +7855,6 @@ include/vcl/pngread.hxx
include/vcl/pngwrite.hxx
include/vcl/popupmenuwindow.hxx
include/vcl/ppdparser.hxx
-include/vcl/prgsbar.hxx
include/vcl/print.hxx
include/vcl/prntypes.hxx
include/vcl/ptrstyle.hxx
@@ -7901,6 +7900,7 @@ include/vcl/toolkit/fixedhyper.hxx
include/vcl/toolkit/group.hxx
include/vcl/toolkit/imgctrl.hxx
include/vcl/toolkit/morebtn.hxx
+include/vcl/toolkit/prgsbar.hxx
include/vcl/toolkit/roadmap.hxx
include/vcl/toolkit/spin.hxx
include/vcl/toolkit/tabdlg.hxx
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index a32c26cc5765..c73e2fca05fd 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -90,7 +90,7 @@
#include <vcl/fixed.hxx>
#include <vcl/toolkit/fixedhyper.hxx>
#include <vcl/floatwin.hxx>
-#include <vcl/prgsbar.hxx>
+#include <vcl/toolkit/prgsbar.hxx>
#include <vcl/scheduler.hxx>
#include <vcl/longcurr.hxx>
#include <vcl/lstbox.hxx>
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 69f391824723..5645bf099288 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -49,7 +49,7 @@
#include <vcl/longcurr.hxx>
#include <vcl/toolkit/imgctrl.hxx>
#include <vcl/dialog.hxx>
-#include <vcl/prgsbar.hxx>
+#include <vcl/toolkit/prgsbar.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/svapp.hxx>
#include <vcl/tabpage.hxx>
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 2c59c5868c3d..bd367355eb62 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -53,7 +53,7 @@
#include <vcl/ivctrl.hxx>
#include <vcl/layout.hxx>
#include <vcl/menubtn.hxx>
-#include <vcl/prgsbar.hxx>
+#include <vcl/toolkit/prgsbar.hxx>
#include <vcl/ptrstyle.hxx>
#include <vcl/slider.hxx>
#include <vcl/sysdata.hxx>
diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx
index 2531423a922f..16ec32de0597 100644
--- a/vcl/source/control/prgsbar.cxx
+++ b/vcl/source/control/prgsbar.cxx
@@ -19,7 +19,7 @@
#include <vcl/event.hxx>
#include <vcl/status.hxx>
-#include <vcl/prgsbar.hxx>
+#include <vcl/toolkit/prgsbar.hxx>
#include <vcl/settings.hxx>
#include <sal/log.hxx>
#include <vcl/svapp.hxx>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index c06fa544e54a..35758ce26ac2 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -34,7 +34,7 @@
#include <vcl/lstbox.hxx>
#include <vcl/menubtn.hxx>
#include <vcl/mnemonic.hxx>
-#include <vcl/prgsbar.hxx>
+#include <vcl/toolkit/prgsbar.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/svapp.hxx>
#include <vcl/svtabbx.hxx>