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

Caolán McNamara caolanm at redhat.com
Tue Aug 8 00:01:44 UTC 2017


 include/vcl/layout.hxx  |   18 ------------------
 include/vcl/vclenum.hxx |   19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 18 deletions(-)

New commits:
commit aa084cc1dcb518ffc1984e122abbf4401c4d0ce0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Aug 6 15:38:41 2017 +0100

    move these non-layout enums to vclenum
    
    Change-Id: Ie6dad53d1b8511b03c953d49b7a9f5d6f66ed56a
    Reviewed-on: https://gerrit.libreoffice.org/40850
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index e9475b3d4630..2c0f00fe7a4b 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -610,24 +610,6 @@ public:
     bool set_property(const OString &rKey, const OUString &rValue);
 };
 
-enum class VclButtonsType
-{
-    NONE,
-    Ok,
-    Close,
-    Cancel,
-    YesNo,
-    OkCancel
-};
-
-enum class VclMessageType
-{
-    Info,
-    Warning,
-    Question,
-    Error
-};
-
 class VCL_DLLPUBLIC MessageDialog : public Dialog
 {
 private:
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index 95e977c696dd..15711cb9ea04 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -237,6 +237,25 @@ enum VclResponseType
     RET_HELP    = 10
 };
 
+enum class VclButtonsType
+{
+    NONE,
+    Ok,
+    Close,
+    Cancel,
+    YesNo,
+    OkCancel
+};
+
+enum class VclMessageType
+{
+    Info,
+    Warning,
+    Question,
+    Error
+};
+
+
 #endif // INCLUDED_VCL_VCLENUM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list