From 52b605ff36089fc56c1c41d413adcd131cde845c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 24 Oct 2017 11:52:43 +0200 Subject: loplugin:includeform: vcl (macOS) Change-Id: I4382a45dcffb32c7c001ee722ac1deccb2b01c2d --- vcl/inc/osx/osxvcltypes.h | 4 ++-- vcl/inc/osx/printview.h | 4 ++-- vcl/inc/osx/runinmain.hxx | 2 +- vcl/inc/osx/saldata.hxx | 12 ++++++------ vcl/inc/osx/salframe.h | 10 +++++----- vcl/inc/osx/salframeview.h | 2 +- vcl/inc/osx/salinst.h | 8 ++++---- vcl/inc/osx/salmenu.h | 6 +++--- vcl/inc/osx/salnstimer.h | 6 +++--- vcl/inc/osx/salobj.h | 2 +- vcl/inc/osx/salprn.h | 4 ++-- vcl/inc/osx/salsys.h | 2 +- vcl/inc/osx/saltimer.h | 6 +++--- vcl/inc/osx/svsys.h | 6 +++--- vcl/inc/osx/vclnsapp.h | 6 +++--- 15 files changed, 40 insertions(+), 40 deletions(-) (limited to 'vcl/inc/osx') diff --git a/vcl/inc/osx/osxvcltypes.h b/vcl/inc/osx/osxvcltypes.h index f1659c4fc622..bf3f4ec46f7d 100644 --- a/vcl/inc/osx/osxvcltypes.h +++ b/vcl/inc/osx/osxvcltypes.h @@ -20,10 +20,10 @@ #ifndef INCLUDED_VCL_INC_OSX_OSXVCLTYPES_H #define INCLUDED_VCL_INC_OSX_OSXVCLTYPES_H -#include "premac.h" +#include #import #import -#include "postmac.h" +#include #endif // INCLUDED_VCL_INC_OSX_OSXVCLTYPES_H diff --git a/vcl/inc/osx/printview.h b/vcl/inc/osx/printview.h index 83516c681336..a2a6e5454ef2 100644 --- a/vcl/inc/osx/printview.h +++ b/vcl/inc/osx/printview.h @@ -20,9 +20,9 @@ #ifndef INCLUDED_VCL_INC_OSX_PRINTVIEW_H #define INCLUDED_VCL_INC_OSX_PRINTVIEW_H -#include "premac.h" +#include #include -#include "postmac.h" +#include #include diff --git a/vcl/inc/osx/runinmain.hxx b/vcl/inc/osx/runinmain.hxx index 0c2a5268d70a..a57b7908214d 100644 --- a/vcl/inc/osx/runinmain.hxx +++ b/vcl/inc/osx/runinmain.hxx @@ -45,7 +45,7 @@ #include #include "saltimer.h" -#include "salframe.hxx" +#include union RuninmainResult { diff --git a/vcl/inc/osx/saldata.hxx b/vcl/inc/osx/saldata.hxx index 357a2df6a74b..f813118803d2 100644 --- a/vcl/inc/osx/saldata.hxx +++ b/vcl/inc/osx/saldata.hxx @@ -22,16 +22,16 @@ #include -#include "premac.h" +#include #include -#include "postmac.h" +#include -#include "com/sun/star/uno/Reference.hxx" +#include #include -#include "svdata.hxx" -#include "salwtype.hxx" +#include +#include #include #include @@ -43,7 +43,7 @@ #include #include -#include "apple_remote/RemoteMainController.h" +#include class AquaSalFrame; class AquaSalInstance; diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h index 55779e6868be..0d93e9e9b2ff 100644 --- a/vcl/inc/osx/salframe.h +++ b/vcl/inc/osx/salframe.h @@ -26,12 +26,12 @@ #include -#include "osx/salinst.h" -#include "osx/salmenu.h" -#include "osx/saldata.hxx" -#include "osx/osxvcltypes.h" +#include +#include +#include +#include -#include "salframe.hxx" +#include #include #include diff --git a/vcl/inc/osx/salframeview.h b/vcl/inc/osx/salframeview.h index 0d3226680593..d3f40111d103 100644 --- a/vcl/inc/osx/salframeview.h +++ b/vcl/inc/osx/salframeview.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_INC_OSX_SALFRAMEVIEW_H #define INCLUDED_VCL_INC_OSX_SALFRAMEVIEW_H -#include "osx/a11ywrapper.h" +#include enum class SalEvent; diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h index a80af4fb5ee7..f70bbcac1ca5 100644 --- a/vcl/inc/osx/salinst.h +++ b/vcl/inc/osx/salinst.h @@ -28,13 +28,13 @@ #include #ifdef MACOSX -#include "osx/osxvcltypes.h" +#include #endif -#include "salinst.hxx" +#include -#include "osx/runinmain.hxx" +#include -#include "salusereventlist.hxx" +#include class AquaSalFrame; class SalFrame; diff --git a/vcl/inc/osx/salmenu.h b/vcl/inc/osx/salmenu.h index 4d3ffaaf752e..f98e44ca0c23 100644 --- a/vcl/inc/osx/salmenu.h +++ b/vcl/inc/osx/salmenu.h @@ -20,11 +20,11 @@ #ifndef INCLUDED_VCL_INC_OSX_SALMENU_H #define INCLUDED_VCL_INC_OSX_SALMENU_H -#include "premac.h" +#include #include -#include "postmac.h" +#include -#include "salmenu.hxx" +#include #include diff --git a/vcl/inc/osx/salnstimer.h b/vcl/inc/osx/salnstimer.h index cce2746c1535..d1928fe9d671 100644 --- a/vcl/inc/osx/salnstimer.h +++ b/vcl/inc/osx/salnstimer.h @@ -20,9 +20,9 @@ #ifndef INCLUDED_VCL_INC_OSX_SALNSTIMER_H #define INCLUDED_VCL_INC_OSX_SALNSTIMER_H -#include "premac.h" -#include "Cocoa/Cocoa.h" -#include "postmac.h" +#include +#include +#include @interface TimerCallbackCaller : NSObject { diff --git a/vcl/inc/osx/salobj.h b/vcl/inc/osx/salobj.h index 25a59cf85702..40b51004992d 100644 --- a/vcl/inc/osx/salobj.h +++ b/vcl/inc/osx/salobj.h @@ -21,7 +21,7 @@ #define INCLUDED_VCL_INC_OSX_SALOBJ_H #include -#include "salobj.hxx" +#include class AquaSalFrame; class AquaSalObject; diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h index 86e04bb548dd..f98a4c4e595f 100644 --- a/vcl/inc/osx/salprn.h +++ b/vcl/inc/osx/salprn.h @@ -20,9 +20,9 @@ #ifndef INCLUDED_VCL_INC_OSX_SALPRN_H #define INCLUDED_VCL_INC_OSX_SALPRN_H -#include "osx/osxvcltypes.h" +#include -#include "salprn.hxx" +#include #include diff --git a/vcl/inc/osx/salsys.h b/vcl/inc/osx/salsys.h index c619a99eef4e..b0bc98578b35 100644 --- a/vcl/inc/osx/salsys.h +++ b/vcl/inc/osx/salsys.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_INC_OSX_SALSYS_H #define INCLUDED_VCL_INC_OSX_SALSYS_H -#include "salsys.hxx" +#include #include diff --git a/vcl/inc/osx/saltimer.h b/vcl/inc/osx/saltimer.h index a9934f280636..0680cf966bbc 100644 --- a/vcl/inc/osx/saltimer.h +++ b/vcl/inc/osx/saltimer.h @@ -20,11 +20,11 @@ #ifndef INCLUDED_VCL_INC_OSX_SALTIMER_H #define INCLUDED_VCL_INC_OSX_SALTIMER_H -#include "premac.h" +#include #include -#include "postmac.h" +#include -#include "saltimer.hxx" +#include /** * if NO == bAtStart, then it has to be run in the main thread, diff --git a/vcl/inc/osx/svsys.h b/vcl/inc/osx/svsys.h index 7c5451c33f2b..9fcabe074f70 100644 --- a/vcl/inc/osx/svsys.h +++ b/vcl/inc/osx/svsys.h @@ -20,9 +20,9 @@ #ifndef INCLUDED_VCL_INC_OSX_SVSYS_H #define INCLUDED_VCL_INC_OSX_SVSYS_H -#include "premac.h" -#include "Cocoa/Cocoa.h" -#include "postmac.h" +#include +#include +#include #endif // INCLUDED_VCL_INC_OSX_SVSYS_H diff --git a/vcl/inc/osx/vclnsapp.h b/vcl/inc/osx/vclnsapp.h index 39bd3170abaf..82f0229a9f93 100644 --- a/vcl/inc/osx/vclnsapp.h +++ b/vcl/inc/osx/vclnsapp.h @@ -22,9 +22,9 @@ #include -#include "premac.h" -#include "Cocoa/Cocoa.h" -#include "postmac.h" +#include +#include +#include class AquaSalFrame; -- cgit