[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source

[Szymon KÅ‚os (via logerrit)]

 vcl/inc/salvtables.hxx        |    2 +-
 vcl/source/app/salvtables.cxx |    2 +-
 vcl/source/window/builder.cxx |    2 +-
 vcl/source/window/dialog.cxx  |    2 +-
 vcl/source/window/layout.cxx  |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit abd31ac764ab722f37a18513e02025efb452f323
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri May 22 09:33:25 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri May 22 11:52:43 2020 +0200

    Revert "Move messagedialog header to shared include"
    
    This reverts commit 2c2af2ebf8b2bed78286df4b4ffcbac556223ca8.
    
    Change-Id: I287abf8fa7239e67d7764cd96a12ab77431b572e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94465
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/include/vcl/messagedialog.hxx b/vcl/inc/messagedialog.hxx
similarity index 100%
rename from include/vcl/messagedialog.hxx
rename to vcl/inc/messagedialog.hxx
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index c7c8bcb60214..6cc85731952e 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -22,7 +22,7 @@
 #include <vcl/toolkit/combobox.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/layout.hxx>
-#include <vcl/messagedialog.hxx>
+#include "messagedialog.hxx"
 
 class SalInstanceBuilder : public weld::Builder
 {
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 3713585d20e3..b3c9d2cfb77d 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -36,7 +36,7 @@
 #include <strings.hrc>
 #include <svdata.hxx>
 #include <svimpbox.hxx>
-#include <vcl/messagedialog.hxx>
+#include <messagedialog.hxx>
 #include <treeglue.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <unotools/configmgr.hxx>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 2a3578eab70e..9fc721ddb010 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -57,7 +57,7 @@
 #include <iconview.hxx>
 #include <svdata.hxx>
 #include <bitmaps.hlst>
-#include <vcl/messagedialog.hxx>
+#include <messagedialog.hxx>
 #include <OptionalBox.hxx>
 #include <window.h>
 #include <xmlreader/xmlreader.hxx>
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index b40fce405a6b..53f2a4e80778 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -58,7 +58,7 @@
 #include <vcl/uitest/uiobject.hxx>
 #include <vcl/uitest/logger.hxx>
 #include <vcl/IDialogRenderable.hxx>
-#include <vcl/messagedialog.hxx>
+#include <messagedialog.hxx>
 #include <salframe.hxx>
 
 #include <iostream>
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 04e5aafdb125..9225c27b05a8 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -20,7 +20,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <bitmaps.hlst>
-#include <vcl/messagedialog.hxx>
+#include <messagedialog.hxx>
 #include <svdata.hxx>
 #include <window.h>
 #include <boost/multi_array.hpp>