solenv/clang-format/blacklist | 2 +-
toolkit/source/awt/animatedimagespeer.cxx | 2 +-
toolkit/source/awt/vclxtoolkit.cxx | 2 +-
toolkit/source/controls/spinningprogress.cxx | 2 +-
vcl/source/app/salvtables.cxx | 2 +-
vcl/source/control/throbber.cxx | 2 +-
vcl/source/window/builder.cxx | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit ce066621d6d09403e3e27399979298a8cb628a7d
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Aug 30 20:21:53 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Aug 31 13:12:54 2019 +0200
throbber.hxx only used by vcl and toolkit now
Change-Id: I69e7f99a02ea1f1144896e83aa188d0eec9a638b
Reviewed-on: https://gerrit.libreoffice.org/78324
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/throbber.hxx b/include/vcl/toolkit/throbber.hxx
similarity index 100%
rename from include/vcl/throbber.hxx
rename to include/vcl/toolkit/throbber.hxx
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index eafeb2fc651b..b894de96c7a9 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7937,13 +7937,13 @@ include/vcl/texteng.hxx
include/vcl/textrectinfo.hxx
include/vcl/textview.hxx
include/vcl/threadex.hxx
-include/vcl/throbber.hxx
include/vcl/timer.hxx
include/vcl/toolbox.hxx
include/vcl/toolkit/group.hxx
include/vcl/toolkit/morebtn.hxx
include/vcl/toolkit/roadmap.hxx
include/vcl/toolkit/tabdlg.hxx
+include/vcl/toolkit/throbber.hxx
include/vcl/toolkit/unowrap.hxx
include/vcl/transfer.hxx
include/vcl/treelist.hxx
diff --git a/toolkit/source/awt/animatedimagespeer.cxx
b/toolkit/source/awt/animatedimagespeer.cxx
index f065c8efaebe..fccfc8b0571f 100644
--- a/toolkit/source/awt/animatedimagespeer.cxx
+++ b/toolkit/source/awt/animatedimagespeer.cxx
@@ -34,7 +34,7 @@
#include <rtl/ustrbuf.hxx>
#include <tools/diagnose_ex.h>
#include <tools/urlobj.hxx>
-#include <vcl/throbber.hxx>
+#include <vcl/toolkit/throbber.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index 06f157d80b66..7bd8d963ca9e 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -117,11 +117,11 @@
#include <vcl/virdev.hxx>
#include <vcl/window.hxx>
#include <vcl/wrkwin.hxx>
-#include <vcl/throbber.hxx>
#include <vcl/toolkit/group.hxx>
#include <vcl/toolkit/morebtn.hxx>
#include <vcl/toolkit/roadmap.hxx>
#include <vcl/toolkit/tabdlg.hxx>
+#include <vcl/toolkit/throbber.hxx>
#if HAVE_FEATURE_OPENGL
#include <vcl/opengl/OpenGLWrapper.hxx>
#endif
diff --git a/toolkit/source/controls/spinningprogress.cxx
b/toolkit/source/controls/spinningprogress.cxx
index 22479c7035b2..00bd78f45c5d 100644
--- a/toolkit/source/controls/spinningprogress.cxx
+++ b/toolkit/source/controls/spinningprogress.cxx
@@ -21,7 +21,7 @@
#include <rtl/ustrbuf.hxx>
#include <toolkit/controls/animatedimages.hxx>
#include <tools/diagnose_ex.h>
-#include <vcl/throbber.hxx>
+#include <vcl/toolkit/throbber.hxx>
using namespace css;
using namespace css::uno;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 3812375462cb..29fba041d41e 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -58,8 +58,8 @@
#include <vcl/svtabbx.hxx>
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
-#include <vcl/throbber.hxx>
#include <vcl/treelistentry.hxx>
+#include <vcl/toolkit/throbber.hxx>
#include <vcl/toolkit/unowrap.hxx>
#include <vcl/weld.hxx>
#include <vcl/vclmedit.hxx>
diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx
index 104a3cc66778..a60d9fbc6668 100644
--- a/vcl/source/control/throbber.cxx
+++ b/vcl/source/control/throbber.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/throbber.hxx>
+#include <vcl/toolkit/throbber.hxx>
#include <vcl/svapp.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 486d0572bff5..a50072d5fa50 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -41,7 +41,7 @@
#include <vcl/svtabbx.hxx>
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
-#include <vcl/throbber.hxx>
+#include <vcl/toolkit/throbber.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/treelistentry.hxx>
#include <vcl/vclmedit.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
