diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-06 12:50:45 +1100 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-06 12:55:43 +1100 |
commit | 249e3d6d1927705aac81fa7f40fccc5c82be43d7 (patch) | |
tree | 0ef2341deed4549db48c1ddd4bd54312bc6346a6 /vcl | |
parent | 9739aa9f40367a51dd71ce23f091e970d98947d5 (diff) |
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
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/headless/svpinst.cxx | 28 | ||||
-rw-r--r-- | vcl/source/app/svapp.cxx | 62 | ||||
-rw-r--r-- | vcl/source/app/svmain.cxx | 58 | ||||
-rw-r--r-- | vcl/unx/generic/app/salinst.cxx | 26 | ||||
-rw-r--r-- | vcl/unx/gtk/gtkinst.cxx | 2 | ||||
-rw-r--r-- | vcl/win/app/salinst.cxx | 26 |
6 files changed, 101 insertions, 101 deletions
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx index 50f070506f55..8897a1f740a8 100644 --- a/vcl/headless/svpinst.cxx +++ b/vcl/headless/svpinst.cxx @@ -24,25 +24,25 @@ #include <sal/types.h> -#include <vcl/apptypes.hxx> +#include <vcl/inputtypes.hxx> -#include "headless/svpinst.hxx" -#include "headless/svpframe.hxx" -#include "headless/svpdummies.hxx" -#include "headless/svpvd.hxx" +#include <headless/svpinst.hxx> +#include <headless/svpframe.hxx> +#include <headless/svpdummies.hxx> +#include <headless/svpvd.hxx> #ifdef IOS -#include "quartz/salbmp.h" -#include "quartz/salgdi.h" -#include "quartz/salvd.h" +#include <quartz/salbmp.h> +#include <quartz/salgdi.h> +#include <quartz/salvd.h> #endif -#include "headless/svpbmp.hxx" -#include "headless/svpgdi.hxx" +#include <headless/svpbmp.hxx> +#include <headless/svpgdi.hxx> -#include <salframe.hxx> -#include <svdata.hxx> -#include <unx/gendata.hxx> +#include "salframe.hxx" +#include "svdata.hxx" +#include "unx/gendata.hxx" // FIXME: remove when we re-work the svp mainloop -#include <unx/salunxtime.h> +#include "unx/salunxtime.h" bool SvpSalInstance::isFrameAlive( const SalFrame* pFrame ) const { diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 1e75afb64863..94e91022b4e2 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -19,39 +19,39 @@ #include <config_features.h> -#include "comphelper/processfactory.hxx" +#include <comphelper/processfactory.hxx> -#include "osl/module.h" -#include "osl/file.hxx" -#include "osl/thread.h" +#include <osl/module.h> +#include <osl/file.hxx> +#include <osl/thread.h> -#include "rtl/tencinfo.h" -#include "rtl/instance.hxx" +#include <rtl/tencinfo.h> +#include <rtl/instance.hxx> -#include "tools/debug.hxx" -#include "tools/time.hxx" +#include <tools/debug.hxx> +#include <tools/time.hxx> -#include "i18nlangtag/mslangid.hxx" +#include <i18nlangtag/mslangid.hxx> #include <unotools/configmgr.hxx> #include <unotools/syslocaleoptions.hxx> -#include "vcl/dialog.hxx" -#include "vcl/floatwin.hxx" -#include "vcl/settings.hxx" -#include "vcl/keycod.hxx" -#include "vcl/event.hxx" -#include "vcl/vclevent.hxx" -#include "vcl/virdev.hxx" -#include "vcl/wrkwin.hxx" -#include "vcl/svapp.hxx" -#include "vcl/cvtgrf.hxx" -#include "vcl/unowrap.hxx" -#include "vcl/timer.hxx" -#include "vcl/scheduler.hxx" -#include "vcl/unohelp.hxx" -#include "vcl/lazydelete.hxx" -#include "vcl/opengl/OpenGLWrapper.hxx" +#include <vcl/dialog.hxx> +#include <vcl/floatwin.hxx> +#include <vcl/settings.hxx> +#include <vcl/keycod.hxx> +#include <vcl/event.hxx> +#include <vcl/vclevent.hxx> +#include <vcl/virdev.hxx> +#include <vcl/wrkwin.hxx> +#include <vcl/svapp.hxx> +#include <vcl/cvtgrf.hxx> +#include <vcl/unowrap.hxx> +#include <vcl/timer.hxx> +#include <vcl/scheduler.hxx> +#include <vcl/unohelp.hxx> +#include <vcl/lazydelete.hxx> +#include <vcl/opengl/OpenGLWrapper.hxx> #include "salinst.hxx" #include "salframe.hxx" @@ -64,14 +64,14 @@ #include "idlemgr.hxx" #include "svids.hrc" -#include "com/sun/star/uno/Reference.h" -#include "com/sun/star/awt/XToolkit.hpp" +#include <com/sun/star/uno/Reference.h> +#include <com/sun/star/awt/XToolkit.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include "com/sun/star/uno/XNamingService.hpp" +#include <com/sun/star/uno/XNamingService.hpp> #include <com/sun/star/util/XModifiable.hpp> -#include "com/sun/star/lang/XMultiServiceFactory.hpp" -#include "comphelper/solarmutex.hxx" -#include "osl/process.h" +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <comphelper/solarmutex.hxx> +#include <osl/process.h> #include <cassert> #include <utility> diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 7631df2ea39b..67345868be3f 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -24,25 +24,25 @@ #include <osl/file.hxx> #include <osl/signal.h> -#include "tools/debug.hxx" -#include "tools/resmgr.hxx" - -#include "comphelper/processfactory.hxx" - -#include "unotools/syslocaleoptions.hxx" -#include "vcl/svapp.hxx" -#include "vcl/wrkwin.hxx" -#include "vcl/cvtgrf.hxx" -#include "vcl/scheduler.hxx" -#include "vcl/image.hxx" -#include "vcl/implimagetree.hxx" -#include "vcl/settings.hxx" -#include "vcl/unowrap.hxx" -#include "vcl/commandinfoprovider.hxx" -#include "vcl/configsettings.hxx" -#include "vcl/lazydelete.hxx" -#include "vcl/embeddedfontshelper.hxx" -#include "vcl/debugevent.hxx" +#include <tools/debug.hxx> +#include <tools/resmgr.hxx> + +#include <comphelper/processfactory.hxx> + +#include <unotools/syslocaleoptions.hxx> +#include <vcl/svapp.hxx> +#include <vcl/wrkwin.hxx> +#include <vcl/cvtgrf.hxx> +#include <vcl/scheduler.hxx> +#include <vcl/image.hxx> +#include <vcl/implimagetree.hxx> +#include <vcl/settings.hxx> +#include <vcl/unowrap.hxx> +#include <vcl/commandinfoprovider.hxx> +#include <vcl/configsettings.hxx> +#include <vcl/lazydelete.hxx> +#include <vcl/embeddedfontshelper.hxx> +#include <vcl/debugevent.hxx> #ifdef WNT #include <svsys.h> @@ -58,7 +58,7 @@ #include "salinst.hxx" #include "salwtype.hxx" #include "svdata.hxx" -#include "vcl/svmain.hxx" +#include <vcl/svmain.hxx> #include "dbggui.hxx" #include "accmgr.hxx" #include "idlemgr.hxx" @@ -72,22 +72,22 @@ #include "salimestatus.hxx" #include "xconnection.hxx" -#include "vcl/opengl/OpenGLContext.hxx" +#include <vcl/opengl/OpenGLContext.hxx> -#include "osl/process.h" -#include "com/sun/star/lang/XMultiServiceFactory.hpp" -#include "com/sun/star/lang/XComponent.hpp" -#include "com/sun/star/frame/Desktop.hpp" +#include <osl/process.h> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/frame/Desktop.hpp> #include <cppuhelper/implbase.hxx> -#include "uno/current_context.hxx" +#include <uno/current_context.hxx> -#include "opengl/zone.hxx" -#include "opengl/watchdog.hxx" +#include <opengl/zone.hxx> +#include <opengl/watchdog.hxx> #if OSL_DEBUG_LEVEL > 0 #include <typeinfo> -#include "rtl/strbuf.hxx" +#include <rtl/strbuf.hxx> #endif using namespace ::com::sun::star; diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx index 74d576b0804c..0ead21f1f7b6 100644 --- a/vcl/unx/generic/app/salinst.cxx +++ b/vcl/unx/generic/app/salinst.cxx @@ -21,19 +21,19 @@ #include <stdio.h> #include <stdlib.h> -#include "osl/module.hxx" - -#include "unx/salunx.h" -#include "unx/saldata.hxx" -#include "unx/saldisp.hxx" -#include "unx/geninst.h" -#include "unx/genpspgraphics.h" -#include "unx/salframe.h" -#include "unx/genprn.h" -#include "unx/sm.hxx" - -#include "vcl/apptypes.hxx" -#include "vcl/helper.hxx" +#include <osl/module.hxx> + +#include <unx/salunx.h> +#include <unx/saldata.hxx> +#include <unx/saldisp.hxx> +#include <unx/geninst.h> +#include <unx/genpspgraphics.h> +#include <unx/salframe.h> +#include <unx/genprn.h> +#include <unx/sm.hxx> + +#include <vcl/inputtypes.hxx> +#include <vcl/helper.hxx> #include "salwtype.hxx" #include <sal/macros.h> diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx index 0c65c35e0bb7..0b3ef7b70460 100644 --- a/vcl/unx/gtk/gtkinst.cxx +++ b/vcl/unx/gtk/gtkinst.cxx @@ -31,7 +31,7 @@ #include <unx/gtk/gtksalmenu.hxx> #include <headless/svpvd.hxx> #include <headless/svpbmp.hxx> -#include <vcl/apptypes.hxx> +#include <vcl/inputtypes.hxx> #include <unx/genpspgraphics.h> #include <rtl/strbuf.hxx> #include <rtl/uri.hxx> diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx index 55f606f77b37..1e37ece50411 100644 --- a/vcl/win/app/salinst.cxx +++ b/vcl/win/app/salinst.cxx @@ -24,23 +24,23 @@ #include <osl/file.hxx> #include <comphelper/solarmutex.hxx> -#include <vcl/apptypes.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/opengl/OpenGLHelper.hxx> #include <vcl/opengl/OpenGLContext.hxx> #include <vcl/timer.hxx> -#include <opengl/salbmp.hxx> -#include <win/wincomp.hxx> -#include <win/salids.hrc> -#include <win/saldata.hxx> -#include <win/salinst.h> -#include <win/salframe.h> -#include <win/salobj.h> -#include <win/saltimer.h> -#include <win/salbmp.h> - -#include <salimestatus.hxx> -#include <salsys.hxx> +#include "opengl/salbmp.hxx" +#include "win/wincomp.hxx" +#include "win/salids.hrc" +#include "win/saldata.hxx" +#include "win/salinst.h" +#include "win/salframe.h" +#include "win/salobj.h" +#include "win/saltimer.h" +#include "win/salbmp.h" + +#include "salimestatus.hxx" +#include "salsys.hxx" #if defined _MSC_VER #ifndef min |