vcl: split exception types from input types

Having them in the file apptypes.hxx isn't necessary helpful, IMO so
I've split the types into inputtypes.hxx and exceptiontypes.hxx

Change-Id: I89a1ff168c3ae276b2f5486669d4ec2dda062d57

4 files changed, 39 insertions, 14 deletions

diff --git a/include/vcl/exceptiontypes.hxx b/include/vcl/exceptiontypes.hxx
new file mode 100644
index 000000000000..92df26636b7a
--- /dev/null
+++ b/include/vcl/exceptiontypes.hxx
@@ -0,0 +1,31 @@
+/* -*- 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 .
+ */
+
+#ifndef INCLUDED_VCL_EXCEPTIONTYPES_HXX
+#define INCLUDED_VCL_EXCEPTIONTYPES_HXX
+
+#define EXC_RSCNOTLOADED   ((sal_uInt16)0x0100)
+#define EXC_SYSTEM         ((sal_uInt16)0x0300)
+#define EXC_DISPLAY        ((sal_uInt16)0x0400)
+#define EXC_MAJORTYPE      ((sal_uInt16)0xFF00)
+#define EXC_MINORTYPE      ((sal_uInt16)0x00FF)
+
+#endif // INCLUDED_VCL_EXCEPTIONTYPES_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/apptypes.hxx b/include/vcl/inputtypes.hxx
index f63602e238df..c5805084b581 100644
--- a/include/vcl/apptypes.hxx
+++ b/include/vcl/inputtypes.hxx
@@ -17,18 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_APPTYPES_HXX
-#define INCLUDED_VCL_APPTYPES_HXX
+#ifndef INCLUDED_VCL_INPUTTYPES_HXX
+#define INCLUDED_VCL_INPUTTYPES_HXX
 
-#include <vcl/dllapi.h>
 #include <o3tl/typed_flags_set.hxx>
 
-#define EXC_RSCNOTLOADED   ((sal_uInt16)0x0100)
-#define EXC_SYSTEM         ((sal_uInt16)0x0300)
-#define EXC_DISPLAY        ((sal_uInt16)0x0400)
-#define EXC_MAJORTYPE      ((sal_uInt16)0xFF00)
-#define EXC_MINORTYPE      ((sal_uInt16)0x00FF)
-
 enum class VclInputFlags {
     NONE                  = 0x0000,
     MOUSE                 = 0x0001,
@@ -45,6 +38,6 @@ namespace o3tl
 
 #define VCL_INPUT_ANY                 (VclInputFlags::MOUSE | VclInputFlags::KEYBOARD | VclInputFlags::PAINT | VclInputFlags::TIMER | VclInputFlags::OTHER | VclInputFlags::APPEVENT)
 
-#endif // INCLUDED_VCL_APPTYPES_HXX
+#endif // INCLUDED_VCL_INPUTTYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 2b7fe62e0bb7..dcb805739721 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -34,7 +34,8 @@
 #include <tools/link.hxx>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
-#include <vcl/apptypes.hxx>
+#include <vcl/inputtypes.hxx>
+#include <vcl/exceptiontypes.hxx>
 #include <vcl/keycod.hxx>
 #include <vcl/vclevent.hxx>
 #include <vcl/metric.hxx>
@@ -424,7 +425,7 @@ public:
 
      @remark This is not actually an exception. It merely takes an
         error code, then in most cases aborts. The list of exception
-        identifiers can be found at include/vcl/apptypes.hxx - each
+        identifiers can be found at include/vcl/inputtypes.hxx - each
         one starts with EXC_*
 
      @param nError      The error code identifier
@@ -575,7 +576,7 @@ public:
 
     /** Determine if there are any pending input events.
 
-     @param     nType   input identifier, defined in include/vcl/apptypes.hxx
+     @param     nType   input identifier, defined in include/vcl/inputtypes.hxx
                         The default is VCL_INPUT_ANY.
 
      @returns   true if there are pending events, false if not.
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 11a81069d1b5..59432a6cc520 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -27,7 +27,7 @@
 #include <vcl/pointr.hxx>
 #include <tools/wintypes.hxx>
 #include <rsc/rsc-vcl-shared-types.hxx>
-#include <vcl/apptypes.hxx>
+#include <vcl/inputtypes.hxx>
 #include <vcl/cursor.hxx>
 #include <vcl/inputctx.hxx>
 #include <vcl/keycodes.hxx>