bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx | 2 bridges/source/cpp_uno/gcc3_macosx_x86-64/call.cxx | 2 bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.cxx | 10 +- bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx | 8 - bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx | 10 +- bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx | 16 +-- bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx | 2 bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx | 8 - connectivity/source/drivers/macab/MacabConnection.hxx | 2 connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx | 4 connectivity/source/drivers/macab/MacabDriver.cxx | 2 connectivity/source/drivers/macab/MacabPreparedStatement.cxx | 6 - connectivity/source/drivers/macab/MacabResultSet.cxx | 6 - connectivity/source/drivers/macab/MacabResultSetMetaData.cxx | 2 connectivity/source/drivers/macab/MacabStatement.cxx | 8 - fpicker/source/aqua/CFStringUtilities.mm | 2 fpicker/source/aqua/ControlHelper.mm | 2 fpicker/source/aqua/FilterHelper.mm | 2 fpicker/source/aqua/NSURL_OOoAdditions.mm | 2 fpicker/source/aqua/SalAquaFilePicker.mm | 4 fpicker/source/aqua/SalAquaFolderPicker.mm | 2 fpicker/source/aqua/SalAquaPicker.mm | 4 fpicker/source/aqua/resourceprovider.mm | 2 lingucomponent/source/spellcheck/macosxspell/macspellimp.mm | 2 sal/osl/unx/osxlocale.cxx | 2 sfx2/source/appl/shutdowniconaqua.mm | 6 - shell/source/backends/macbe/macbackend.mm | 6 - soltools/cpp/_getopt.c | 2 soltools/cpp/_unix.c | 2 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 2 toolkit/source/awt/vclxsystemdependentwindow.cxx | 4 toolkit/source/awt/vclxtoolkit.cxx | 4 toolkit/source/awt/vclxtopwindow.cxx | 4 toolkit/source/awt/vclxwindow1.cxx | 4 unoidl/source/sourcetreeprovider.cxx | 2 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 - vcl/inc/quartz/ctfonts.hxx | 4 vcl/inc/quartz/salbmp.h | 10 +- vcl/inc/quartz/salgdi.h | 20 ++-- vcl/inc/quartz/salvd.h | 8 - vcl/osx/DataFlavorMapping.cxx | 16 +-- vcl/osx/DragSource.cxx | 4 vcl/osx/a11yactionwrapper.h | 4 vcl/osx/a11yactionwrapper.mm | 4 vcl/osx/a11ycomponentwrapper.h | 4 vcl/osx/a11ycomponentwrapper.mm | 2 vcl/osx/a11yfactory.mm | 6 - vcl/osx/a11yfocuslistener.cxx | 4 vcl/osx/a11yfocuslistener.hxx | 4 vcl/osx/a11yfocustracker.cxx | 2 vcl/osx/a11ylistener.cxx | 10 +- vcl/osx/a11yrolehelper.mm | 2 vcl/osx/a11yselectionwrapper.h | 4 vcl/osx/a11yselectionwrapper.mm | 4 vcl/osx/a11ytablewrapper.h | 2 vcl/osx/a11ytablewrapper.mm | 2 vcl/osx/a11ytextattributeswrapper.h | 2 vcl/osx/a11ytextattributeswrapper.mm | 6 - vcl/osx/a11ytextwrapper.h | 4 vcl/osx/a11ytextwrapper.mm | 4 vcl/osx/a11yutil.mm | 2 vcl/osx/a11yvaluewrapper.h | 6 - vcl/osx/a11ywrapper.mm | 14 +-- vcl/osx/a11ywrapperbutton.h | 2 vcl/osx/a11ywrapperbutton.mm | 2 vcl/osx/a11ywrappercheckbox.h | 2 vcl/osx/a11ywrappercheckbox.mm | 2 vcl/osx/a11ywrappercombobox.h | 2 vcl/osx/a11ywrappercombobox.mm | 2 vcl/osx/a11ywrappergroup.h | 2 vcl/osx/a11ywrappergroup.mm | 2 vcl/osx/a11ywrapperlist.h | 2 vcl/osx/a11ywrapperlist.mm | 2 vcl/osx/a11ywrapperradiobutton.h | 2 vcl/osx/a11ywrapperradiobutton.mm | 2 vcl/osx/a11ywrapperradiogroup.h | 2 vcl/osx/a11ywrapperradiogroup.mm | 2 vcl/osx/a11ywrapperrow.h | 2 vcl/osx/a11ywrapperrow.mm | 2 vcl/osx/a11ywrapperscrollarea.h | 2 vcl/osx/a11ywrapperscrollarea.mm | 2 vcl/osx/a11ywrapperscrollbar.h | 2 vcl/osx/a11ywrapperscrollbar.mm | 2 vcl/osx/a11ywrappersplitter.h | 2 vcl/osx/a11ywrappersplitter.mm | 2 vcl/osx/a11ywrapperstatictext.h | 2 vcl/osx/a11ywrapperstatictext.mm | 2 vcl/osx/a11ywrappertabgroup.h | 2 vcl/osx/a11ywrappertabgroup.mm | 2 vcl/osx/a11ywrappertextarea.h | 2 vcl/osx/a11ywrappertextarea.mm | 2 vcl/osx/a11ywrappertoolbar.h | 2 vcl/osx/a11ywrappertoolbar.mm | 2 vcl/osx/clipboard.cxx | 2 vcl/osx/documentfocuslistener.hxx | 2 vcl/osx/printaccessoryview.mm | 18 ++-- vcl/osx/printview.mm | 4 vcl/osx/saldata.cxx | 8 - vcl/osx/salframe.cxx | 28 +++--- vcl/osx/salframeview.mm | 12 +- vcl/osx/salinst.cxx | 44 +++++----- vcl/osx/salmenu.cxx | 18 ++-- vcl/osx/salnativewidgets.cxx | 14 +-- vcl/osx/salnsmenu.mm | 10 +- vcl/osx/salnstimer.mm | 10 +- vcl/osx/salobj.cxx | 10 +- vcl/osx/salprn.cxx | 24 ++--- vcl/osx/salsys.cxx | 12 +- vcl/osx/saltimer.cxx | 10 +- vcl/osx/service_entry.cxx | 4 vcl/osx/vclnsapp.mm | 18 ++-- vcl/quartz/ctfonts.cxx | 20 ++-- vcl/quartz/salbmp.cxx | 8 - vcl/quartz/salgdi.cxx | 24 ++--- vcl/quartz/salgdicommon.cxx | 10 +- vcl/quartz/salgdiutils.cxx | 8 - vcl/quartz/salvd.cxx | 12 +- vcl/quartz/utils.cxx | 2 132 files changed, 387 insertions(+), 387 deletions(-)
New commits: commit b18c1bdafdd849f6c3a8857067e1b32aac2a57ff Author: Stephan Bergmann <[email protected]> Date: Tue Oct 24 11:55:40 2017 +0200 loplugin:includeform Change-Id: I65867177fa36e50afb8c370c1e84cd54e3be6821 diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx index c5d08cf027aa..06f1f012646d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx @@ -8,7 +8,7 @@ */ #include <memory> -#include "config_test.h" +#include <config_test.h> #ifdef MACOSX #define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0 commit f17bc7f55146b681da41f2b8d17998d8ff553a4a Author: Stephan Bergmann <[email protected]> Date: Tue Oct 24 11:55:28 2017 +0200 loplugin:includeform: bridges (macOS) Change-Id: I9df97c6684de7dfc60f79dd11abaed069e5f08b2 diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx index 519abd627c48..3da3adac5fc3 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx @@ -50,7 +50,7 @@ OTHER DEALINGS IN THE SOFTWARE. ----------------------------------------------------------------------- */ -#include "sal/config.h" +#include <sal/config.h> #include "abi.hxx" diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/call.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/call.cxx index 16f5e784e29e..2359d88c23ab 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/call.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/call.cxx @@ -20,7 +20,7 @@ #include <sal/config.h> -#include <call.hxx> +#include "call.hxx" void privateSnippetExecutor() { diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.cxx index 47f383a6e885..83a9ca81d8b2 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.cxx @@ -17,14 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" +#include <sal/config.h> #include <cstring> -#include "cppu/macros.hxx" -#include "sal/types.h" -#include "typelib/typeclass.h" -#include "typelib/typedescription.h" +#include <cppu/macros.hxx> +#include <sal/types.h> +#include <typelib/typeclass.h> +#include <typelib/typedescription.h> #include "abi.hxx" #include "callvirtualmethod.hxx" diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx index 53c5ac0986c6..ac096ed89279 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx @@ -20,11 +20,11 @@ #ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_MACOSX_X86_64_CALLVIRTUALMETHOD_HXX #define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_MACOSX_X86_64_CALLVIRTUALMETHOD_HXX -#include "sal/config.h" +#include <sal/config.h> -#include "cppu/macros.hxx" -#include "sal/types.h" -#include "typelib/typedescription.h" +#include <cppu/macros.hxx> +#include <sal/types.h> +#include <typelib/typedescription.h> namespace CPPU_CURRENT_NAMESPACE { diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx index 3b7beeac3102..71a207b69c1c 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx @@ -25,14 +25,14 @@ #include <sal/log.hxx> #include <com/sun/star/uno/genfunc.hxx> -#include "com/sun/star/uno/RuntimeException.hpp" +#include <com/sun/star/uno/RuntimeException.hpp> #include <uno/data.h> #include <typelib/typedescription.hxx> -#include "bridge.hxx" -#include "cppinterfaceproxy.hxx" -#include "types.hxx" -#include "vtablefactory.hxx" +#include <bridge.hxx> +#include <cppinterfaceproxy.hxx> +#include <types.hxx> +#include <vtablefactory.hxx> #include "abi.hxx" #include "call.hxx" diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx index 17b95473f92c..541e251506dd 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" +#include <sal/config.h> #include <cassert> #include <new> @@ -28,14 +28,14 @@ #include <cxxabi.h> #include <dlfcn.h> -#include "com/sun/star/uno/RuntimeException.hpp" -#include "com/sun/star/uno/genfunc.hxx" +#include <com/sun/star/uno/RuntimeException.hpp> +#include <com/sun/star/uno/genfunc.hxx> #include <sal/log.hxx> -#include "osl/mutex.hxx" -#include "rtl/strbuf.hxx" -#include "rtl/ustrbuf.hxx" -#include "typelib/typedescription.h" -#include "uno/any2.h" +#include <osl/mutex.hxx> +#include <rtl/strbuf.hxx> +#include <rtl/ustrbuf.hxx> +#include <typelib/typedescription.h> +#include <uno/any2.h> #include <unordered_map> #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx index 5d9ca4659b26..6cc59bf2e0ed 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_MACOSX_X86_64_SHARE_HXX #define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_MACOSX_X86_64_SHARE_HXX -#include "uno/mapping.h" +#include <uno/mapping.h> #include <typeinfo> #include <exception> diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx index 0a62a0abd015..ae1dab7e1702 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx @@ -22,17 +22,17 @@ #include <exception> #include <typeinfo> -#include "rtl/alloc.h" +#include <rtl/alloc.h> #include <com/sun/star/uno/genfunc.hxx> -#include "com/sun/star/uno/RuntimeException.hpp" +#include <com/sun/star/uno/RuntimeException.hpp> #include <o3tl/runtimetooustring.hxx> #include <uno/data.h> #include <bridge.hxx> #include <types.hxx> -#include "unointerfaceproxy.hxx" -#include "vtables.hxx" +#include <unointerfaceproxy.hxx> +#include <vtables.hxx> #include "abi.hxx" #include "callvirtualmethod.hxx" commit 5460a1dcb92fe40aedd080911a02033c32eb9cf1 Author: Stephan Bergmann <[email protected]> Date: Tue Oct 24 11:55:18 2017 +0200 loplugin:includeform: connectivity (macOS) Change-Id: Ib87a1dae55f926baffe1cf436fedeab59508d253 diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx index 01bcae6b91df..8cf5c3d0aff0 100644 --- a/connectivity/source/drivers/macab/MacabConnection.hxx +++ b/connectivity/source/drivers/macab/MacabConnection.hxx @@ -30,7 +30,7 @@ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <comphelper/broadcasthelper.hxx> #include <cppuhelper/compbase.hxx> -#include "TConnection.hxx" +#include <TConnection.hxx> namespace connectivity { diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx index 10963ef1e3f9..635b929c2106 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx @@ -25,8 +25,8 @@ #include "macabutilities.hxx" #include "MacabDriver.hxx" -#include "FDatabaseMetaDataResultSet.hxx" -#include "OTypeInfo.hxx" +#include <FDatabaseMetaDataResultSet.hxx> +#include <OTypeInfo.hxx> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbc/TransactionIsolation.hpp> diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx index 8b8e97c3fb20..18a1e017d9cf 100644 --- a/connectivity/source/drivers/macab/MacabDriver.cxx +++ b/connectivity/source/drivers/macab/MacabDriver.cxx @@ -26,7 +26,7 @@ #include <com/sun/star/frame/Desktop.hpp> #include <rtl/ustrbuf.hxx> #include <tools/diagnose_ex.h> -#include "strings.hrc" +#include <strings.hrc> #include <comphelper/processfactory.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx index 49d5ec92cfd8..7874e3af40f3 100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx @@ -20,11 +20,11 @@ #include "MacabPreparedStatement.hxx" #include "MacabAddressBook.hxx" -#include "propertyids.hxx" +#include <propertyids.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> -#include "strings.hrc" -#include "resource/sharedresources.hxx" +#include <strings.hrc> +#include <resource/sharedresources.hxx> using namespace connectivity::macab; using namespace com::sun::star::uno; diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx index 71d4dbfb05a8..f9bb5ab0744d 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.cxx +++ b/connectivity/source/drivers/macab/MacabResultSet.cxx @@ -28,10 +28,10 @@ #include "macaborder.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/sdbcx/CompareBookmark.hpp> -#include "TConnection.hxx" +#include <TConnection.hxx> #include <connectivity/dbexception.hxx> -#include "resource/sharedresources.hxx" -#include "strings.hrc" +#include <resource/sharedresources.hxx> +#include <strings.hrc> using namespace connectivity::macab; using namespace cppu; diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx index 6cdccdd9c460..c424b1ea9302 100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx @@ -23,7 +23,7 @@ #include "MacabRecords.hxx" #include "MacabAddressBook.hxx" #include "macabutilities.hxx" -#include "strings.hrc" +#include <strings.hrc> using namespace connectivity::macab; using namespace com::sun::star::uno; diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx index 53a58d4950c8..c8a7e8307356 100644 --- a/connectivity/source/drivers/macab/MacabStatement.cxx +++ b/connectivity/source/drivers/macab/MacabStatement.cxx @@ -19,7 +19,7 @@ #include "MacabStatement.hxx" -#include "sqlbison.hxx" +#include <sqlbison.hxx> #include "MacabConnection.hxx" #include "MacabAddressBook.hxx" #include "MacabDriver.hxx" @@ -27,10 +27,10 @@ #include "MacabResultSetMetaData.hxx" #include "macabcondition.hxx" #include "macaborder.hxx" -#include "TConnection.hxx" +#include <TConnection.hxx> #include <connectivity/dbexception.hxx> -#include "resource/sharedresources.hxx" -#include "strings.hrc" +#include <resource/sharedresources.hxx> +#include <strings.hrc> using namespace connectivity::macab; using namespace com::sun::star::uno; commit f70d864e42e479e0f29cd2dae4544146930b6591 Author: Stephan Bergmann <[email protected]> Date: Tue Oct 24 11:55:06 2017 +0200 loplugin:includeform: fpicker (macOS) Change-Id: If52eeafcf6dab4825138c3f123d201dacd45ad28 diff --git a/fpicker/source/aqua/CFStringUtilities.mm b/fpicker/source/aqua/CFStringUtilities.mm index a9fcd03c420d..2458116a4288 100644 --- a/fpicker/source/aqua/CFStringUtilities.mm +++ b/fpicker/source/aqua/CFStringUtilities.mm @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/log.hxx" +#include <sal/log.hxx> #include "CFStringUtilities.hxx" rtl::OUString CFStringToOUString(const CFStringRef sOrig) diff --git a/fpicker/source/aqua/ControlHelper.mm b/fpicker/source/aqua/ControlHelper.mm index a9ab107bec2a..2b988d741792 100644 --- a/fpicker/source/aqua/ControlHelper.mm +++ b/fpicker/source/aqua/ControlHelper.mm @@ -26,7 +26,7 @@ #include "CFStringUtilities.hxx" #include "resourceprovider.hxx" #include "NSString_OOoAdditions.hxx" -#include "sal/log.hxx" +#include <sal/log.hxx> #include "ControlHelper.hxx" diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm index 668d0f643cd5..1cca2ad8816f 100644 --- a/fpicker/source/aqua/FilterHelper.mm +++ b/fpicker/source/aqua/FilterHelper.mm @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" +#include <sal/config.h> #include <algorithm> #include <osl/mutex.hxx> diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.mm b/fpicker/source/aqua/NSURL_OOoAdditions.mm index 7c63b79bc0c6..7c4ddbade36a 100644 --- a/fpicker/source/aqua/NSURL_OOoAdditions.mm +++ b/fpicker/source/aqua/NSURL_OOoAdditions.mm @@ -19,7 +19,7 @@ #include "NSString_OOoAdditions.hxx" #include "NSURL_OOoAdditions.hxx" -#include "sal/log.hxx" +#include <sal/log.hxx> @implementation NSURL (OOoAdditions) - (rtl::OUString) OUStringForInfo:(InfoType)info diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm index 2742d4ad33af..af0b1712fc69 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.mm +++ b/fpicker/source/aqua/SalAquaFilePicker.mm @@ -19,7 +19,7 @@ #include <config_features.h> -#include "sal/config.h" +#include <sal/config.h> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -32,7 +32,7 @@ #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/ControlActions.hpp> #include <com/sun/star/uno/Any.hxx> -#include <FPServiceInfo.hxx> +#include "FPServiceInfo.hxx" #include <osl/mutex.hxx> #include <vcl/svapp.hxx> diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm index b7abcf6bcf56..8ab74dba6d00 100644 --- a/fpicker/source/aqua/SalAquaFolderPicker.mm +++ b/fpicker/source/aqua/SalAquaFolderPicker.mm @@ -26,7 +26,7 @@ #include <cppuhelper/supportsservice.hxx> #include <osl/diagnose.h> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> -#include <FPServiceInfo.hxx> +#include "FPServiceInfo.hxx" #include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include "SalAquaFolderPicker.hxx" diff --git a/fpicker/source/aqua/SalAquaPicker.mm b/fpicker/source/aqua/SalAquaPicker.mm index e0bed327d831..3c22ea900680 100644 --- a/fpicker/source/aqua/SalAquaPicker.mm +++ b/fpicker/source/aqua/SalAquaPicker.mm @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" +#include <sal/config.h> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/interfacecontainer.h> #include <osl/diagnose.h> -#include <FPServiceInfo.hxx> +#include "FPServiceInfo.hxx" #include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include "SalAquaPicker.hxx" diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm index 7543d322c295..cdd039ce389b 100644 --- a/fpicker/source/aqua/resourceprovider.mm +++ b/fpicker/source/aqua/resourceprovider.mm @@ -30,7 +30,7 @@ #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> #include "NSString_OOoAdditions.hxx" -#include "fpsofficeResMgr.hxx" +#include <fpsofficeResMgr.hxx> #include "resourceprovider.hxx" using rtl::OUString; commit ed8cdc0946f4978c1ca2bcd7887385dc09117384 Author: Stephan Bergmann <[email protected]> Date: Tue Oct 24 11:54:56 2017 +0200 loplugin:includeform: lingucomponent (macOS) Change-Id: I24d4a68ec7608f6f116337250893d96cdd68b938 diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm index 145c45c3884e..217e030204fe 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm @@ -26,7 +26,7 @@ #include <tools/debug.hxx> #include <osl/mutex.hxx> -#include <macspellimp.hxx> +#include "macspellimp.hxx" #include <linguistic/spelldta.hxx> #include <unotools/pathoptions.hxx> commit a0a3667995ba648dbd2fe1fff04f66f1aa4af674 Author: Stephan Bergmann <[email protected]> Date: Tue Oct 24 11:54:46 2017 +0200 loplugin:includeform: sal (macOS) Change-Id: Ic4d73e1fc328aecd897163b71edf0b4c9b8a090b diff --git a/sal/osl/unx/osxlocale.cxx b/sal/osl/unx/osxlocale.cxx index 6f4f028b0ca9..b1bf89827212 100644 --- a/sal/osl/unx/osxlocale.cxx +++ b/sal/osl/unx/osxlocale.cxx @@ -29,7 +29,7 @@ #include <rtl/ustrbuf.hxx> -#include <nlsupport.hxx> +#include "nlsupport.hxx" namespace { commit 3201e8ac4d36131465372c5df126867127a58a46 Author: Stephan Bergmann <[email protected]> Date: Tue Oct 24 11:54:29 2017 +0200 loplugin:includeform: sfx2 (macOS) Change-Id: Id189589ae0847a1c14f512ab0912bf47f7838e43 diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm index 78dbec386269..50d09f5c4f02 100644 --- a/sfx2/source/appl/shutdowniconaqua.mm +++ b/sfx2/source/appl/shutdowniconaqua.mm @@ -27,7 +27,7 @@ #include <comphelper/sequenceashashmap.hxx> #include <sfx2/app.hxx> #include <sal/macros.h> -#include "sfx2/strings.hrc" +#include <sfx2/strings.hrc> #include "shutdownicon.hxx" #include <com/sun/star/util/XStringWidth.hpp> @@ -37,10 +37,10 @@ #include <set> #include <vector> -#include "premac.h" +#include <premac.h> #include <objc/objc-runtime.h> #include <Cocoa/Cocoa.h> -#include "postmac.h" +#include <postmac.h> #define MI_OPEN 1 #define MI_WRITER 2 commit 37604bca4138ed45187547ffcf578ca9abfdb679 Author: Stephan Bergmann <[email protected]> Date: Tue Oct 24 11:54:15 2017 +0200 loplugin:includeform: shell (macOS) Change-Id: I2a254633124caa03d48ec9e6d21751b0b8750c0b diff --git a/shell/source/backends/macbe/macbackend.mm b/shell/source/backends/macbe/macbackend.mm index a8551428817b..14628e91c728 100644 --- a/shell/source/backends/macbe/macbackend.mm +++ b/shell/source/backends/macbe/macbackend.mm @@ -28,11 +28,11 @@ #include "macbackend.hxx" -#include "com/sun/star/beans/Optional.hpp" +#include <com/sun/star/beans/Optional.hpp> #include <cppuhelper/supportsservice.hxx> -#include "rtl/ustrbuf.hxx" +#include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> -#include "osl/file.h" +#include <osl/file.h> #define SPACE ' ' #define SEMI_COLON ';' commit 6f694e961271fed7518ecb29841a6ffeb8e31697 Author: Stephan Bergmann <[email protected]> Date: Tue Oct 24 11:53:57 2017 +0200 loplugin:includeform: soltools (macOS) Change-Id: I7e2a8d13e068f651bf6e8fbbb66363a4b2b5b0e7 diff --git a/soltools/cpp/_getopt.c b/soltools/cpp/_getopt.c index 4e609bae92de..a5cd4389558b 100644 --- a/soltools/cpp/_getopt.c +++ b/soltools/cpp/_getopt.c @@ -20,7 +20,7 @@ #include <stdio.h> #include <string.h> -#include <_getopt.h> +#include "_getopt.h" #define EPR fprintf(stderr, #define ERR(str, chr) if(opterr) { EPR "%s%c\n", str, chr); } diff --git a/soltools/cpp/_unix.c b/soltools/cpp/_unix.c index c42d22b4b586..7d15d57ed45a 100644 --- a/soltools/cpp/_unix.c +++ b/soltools/cpp/_unix.c @@ -32,7 +32,7 @@ #include "cpp.h" #if defined(MACOSX) || defined(AIX) || defined(_WIN32) -#include <_getopt.h> +#include "_getopt.h" #else #include <getopt.h> #endif commit 9e7c95213aa736bd50e8af15ed364b0c4d418f62 Author: Stephan Bergmann <[email protected]> Date: Tue Oct 24 11:53:22 2017 +0200 loplugin:includeform: toolkit (macOS) Change-Id: I8a95a73a9e20e2f9d35371faf58890ffdc60963c diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index 4c1e4ef31275..ea3de1bb9618 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -29,9 +29,9 @@ #include <cppuhelper/queryinterface.hxx> #ifdef MACOSX -#include "premac.h" +#include <premac.h> #include <Cocoa/Cocoa.h> -#include "postmac.h" +#include <postmac.h> #endif #include <vcl/svapp.hxx> diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 623866a5a854..f5a68b8a2645 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -60,9 +60,9 @@ #include <tools/wintypes.hxx> #ifdef MACOSX -#include "premac.h" +#include <premac.h> #include <Cocoa/Cocoa.h> -#include "postmac.h" +#include <postmac.h> #endif #include <vcl/sysdata.hxx> diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index fbd00b907937..17d79d7bfecd 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -24,9 +24,9 @@ #include <com/sun/star/awt/SystemDependentXWindow.hpp> #if defined ( MACOSX ) -#include "premac.h" +#include <premac.h> #include <Cocoa/Cocoa.h> -#include "postmac.h" +#include <postmac.h> #endif #include <vcl/syschild.hxx> diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx index 93c99d8150a8..613fbb0b1fe8 100644 --- a/toolkit/source/awt/vclxwindow1.cxx +++ b/toolkit/source/awt/vclxwindow1.cxx @@ -27,9 +27,9 @@ #include <prewin.h> #include <postwin.h> #elif defined ( MACOSX ) -#include "premac.h" +#include <premac.h> #include <Cocoa/Cocoa.h> -#include "postmac.h" +#include <postmac.h> #endif #include <vcl/sysdata.hxx> commit fcbc0a31b6db068ecaaad84ac61c1ed3804226b6 Author: Stephan Bergmann <[email protected]> Date: Tue Oct 24 11:53:06 2017 +0200 loplugin:includeform: unoidl (macOS) Change-Id: I264ff44b441be5addfd03f48218b053c0f7f875d diff --git a/unoidl/source/sourcetreeprovider.cxx b/unoidl/source/sourcetreeprovider.cxx index df6a81c3f5ab..592ad0e363a6 100644 --- a/unoidl/source/sourcetreeprovider.cxx +++ b/unoidl/source/sourcetreeprovider.cxx @@ -28,7 +28,7 @@ #if defined MACOSX #include <dirent.h> -#include "osl/thread.h" +#include <osl/thread.h> #endif namespace unoidl { namespace detail { commit 52b605ff36089fc56c1c41d413adcd131cde845c Author: Stephan Bergmann <[email protected]> Date: Tue Oct 24 11:52:43 2017 +0200 loplugin:includeform: vcl (macOS) Change-Id: I4382a45dcffb32c7c001ee722ac1deccb2b01c2d 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 <premac.h> #import <Cocoa/Cocoa.h> #import <AppKit/NSEvent.h> -#include "postmac.h" +#include <postmac.h> #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 <premac.h> #include <Cocoa/Cocoa.h> -#include "postmac.h" +#include <postmac.h> #include <vcl/print.hxx> 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 <osl/thread.h> #include "saltimer.h" -#include "salframe.hxx" +#include <salframe.hxx> 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 <config_features.h> -#include "premac.h" +#include <premac.h> #include <Cocoa/Cocoa.h> -#include "postmac.h" +#include <postmac.h> -#include "com/sun/star/uno/Reference.hxx" +#include <com/sun/star/uno/Reference.hxx> #include <vcl/ptrstyle.hxx> -#include "svdata.hxx" -#include "salwtype.hxx" +#include <svdata.hxx> +#include <salwtype.hxx> #include <functional> #include <list> @@ -43,7 +43,7 @@ #include <cstdio> #include <cstdarg> -#include "apple_remote/RemoteMainController.h" +#include <apple_remote/RemoteMainController.h> 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 <vcl/sysdata.hxx> -#include "osx/salinst.h" -#include "osx/salmenu.h" -#include "osx/saldata.hxx" -#include "osx/osxvcltypes.h" +#include <osx/salinst.h> +#include <osx/salmenu.h> +#include <osx/saldata.hxx> +#include <osx/osxvcltypes.h> -#include "salframe.hxx" +#include <salframe.hxx> #include <vector> #include <utility> 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 <osx/a11ywrapper.h> 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 <osl/thread.hxx> #ifdef MACOSX -#include "osx/osxvcltypes.h" +#include <osx/osxvcltypes.h> #endif -#include "salinst.hxx" +#include <salinst.hxx> -#include "osx/runinmain.hxx" +#include <osx/runinmain.hxx> -#include "salusereventlist.hxx" +#include <salusereventlist.hxx> 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 <premac.h> #include <Cocoa/Cocoa.h> -#include "postmac.h" +#include <postmac.h> -#include "salmenu.hxx" +#include <salmenu.hxx> #include <vector> 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 <premac.h> +#include <Cocoa/Cocoa.h> +#include <postmac.h> @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 <vcl/sysdata.hxx> -#include "salobj.hxx" +#include <salobj.hxx> 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 <osx/osxvcltypes.h> -#include "salprn.hxx" +#include <salprn.hxx> #include <memory> 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 <salsys.hxx> #include <list> 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 <premac.h> #include <Cocoa/Cocoa.h> -#include "postmac.h" +#include <postmac.h> -#include "saltimer.hxx" +#include <saltimer.hxx> /** * 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 <premac.h> +#include <Cocoa/Cocoa.h> +#include <postmac.h> #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 <config_features.h> -#include "premac.h" -#include "Cocoa/Cocoa.h" -#include "postmac.h" +#include <premac.h> +#include <Cocoa/Cocoa.h> +#include <postmac.h> class AquaSalFrame; diff --git a/vcl/inc/quartz/ctfonts.hxx b/vcl/inc/quartz/ctfonts.hxx index 1a3dd7a1eaa8..78f13242c62d 100644 --- a/vcl/inc/quartz/ctfonts.hxx +++ b/vcl/inc/quartz/ctfonts.hxx @@ -20,11 +20,11 @@ #ifndef INCLUDED_VCL_INC_QUARTZ_CTFONTS_HXX #define INCLUDED_VCL_INC_QUARTZ_CTFONTS_HXX -#include "quartz/salgdi.h" +#include <quartz/salgdi.h> #ifdef IOS #include "headless/svpgdi.hxx" #endif -#include "sallayout.hxx" +#include <sallayout.hxx> SystemFontList* GetCoretextFontList(); FontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef, bool* ); diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h index 7c79110ed509..a4dca65c0ee3 100644 --- a/vcl/inc/quartz/salbmp.h +++ b/vcl/inc/quartz/salbmp.h @@ -20,15 +20,15 @@ #ifndef INCLUDED_VCL_INC_QUARTZ_SALBMP_H #define INCLUDED_VCL_INC_QUARTZ_SALBMP_H -#include "tools/gen.hxx" +#include <tools/gen.hxx> #include <vcl/salbtype.hxx> -#include "quartz/salgdi.h" +#include <quartz/salgdi.h> -#include "salinst.hxx" -#include "salvd.hxx" -#include "salbmp.hxx" +#include <salinst.hxx> +#include <salvd.hxx> +#include <salbmp.hxx> #include <memory> diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index 9a9626719169..9c952d69be20 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -22,28 +22,28 @@ #include <vector> -#include "basegfx/polygon/b2dpolypolygon.hxx" +#include <basegfx/polygon/b2dpolypolygon.hxx> -#include "premac.h" +#include <premac.h> #ifdef MACOSX #include <ApplicationServices/ApplicationServices.h> -#include "osx/osxvcltypes.h" -#include "osx/salframe.h" +#include <osx/osxvcltypes.h> +#include <osx/salframe.h> #else #include <CoreGraphics/CoreGraphics.h> #include <CoreText/CoreText.h> #endif -#include "postmac.h" +#include <postmac.h> #include <vcl/fontcapabilities.hxx> #include <vcl/metric.hxx> -#include "fontinstance.hxx" -#include "impfontmetricdata.hxx" -#include "PhysicalFontFace.hxx" -#include "salgdi.hxx" +#include <fontinstance.hxx> +#include <impfontmetricdata.hxx> +#include <PhysicalFontFace.hxx> +#include <salgdi.hxx> -#include "quartz/salgdicommon.hxx" +#include <quartz/salgdicommon.hxx> #include <unordered_map> #include <hb-ot.h> diff --git a/vcl/inc/quartz/salvd.h b/vcl/inc/quartz/salvd.h index ac2a1f280b9d..17d539182d7f 100644 --- a/vcl/inc/quartz/salvd.h +++ b/vcl/inc/quartz/salvd.h @@ -20,17 +20,17 @@ #ifndef INCLUDED_VCL_INC_QUARTZ_SALVD_H #define INCLUDED_VCL_INC_QUARTZ_SALVD_H -#include "premac.h" +#include <premac.h> #ifdef MACOSX #include <ApplicationServices/ApplicationServices.h> #else #include <CoreGraphics/CoreGraphics.h> #endif -#include "postmac.h" +#include <postmac.h> -#include "quartz/salgdi.h" +#include <quartz/salgdi.h> -#include "salvd.hxx" +#include <salvd.hxx> class AquaSalGraphics; diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx index 54a769a121c3..d9df38ac6666 100644 --- a/vcl/osx/DataFlavorMapping.cxx +++ b/vcl/osx/DataFlavorMapping.cxx @@ -17,17 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" +#include <sal/config.h> -#include <DataFlavorMapping.hxx> +#include "DataFlavorMapping.hxx" #include "HtmlFmtFlt.hxx" #include "PictToBmpFlt.hxx" -#include "com/sun/star/datatransfer/UnsupportedFlavorException.hpp" -#include "com/sun/star/datatransfer/XMimeContentType.hpp" -#include "com/sun/star/datatransfer/MimeContentTypeFactory.hpp" -#include "com/sun/star/lang/IllegalArgumentException.hpp" -#include "com/sun/star/uno/Sequence.hxx" -#include "comphelper/processfactory.hxx" +#include <com/sun/star/datatransfer/UnsupportedFlavorException.hpp> +#include <com/sun/star/datatransfer/XMimeContentType.hpp> +#include <com/sun/star/datatransfer/MimeContentTypeFactory.hpp> +#include <com/sun/star/lang/IllegalArgumentException.hpp> +#include <com/sun/star/uno/Sequence.hxx> +#include <comphelper/processfactory.hxx> #include <rtl/ustring.hxx> #include <osl/endian.h> diff --git a/vcl/osx/DragSource.cxx b/vcl/osx/DragSource.cxx index 559ae5c9461a..5adb522610d9 100644 --- a/vcl/osx/DragSource.cxx +++ b/vcl/osx/DragSource.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/awt/MouseButton.hpp> -#include "rtl/ustring.hxx" +#include <rtl/ustring.hxx> #include <cppuhelper/supportsservice.hxx> @@ -30,7 +30,7 @@ #include "clipboard.hxx" #include "DragActionConversion.hxx" -#include "osx/salframe.h" +#include <osx/salframe.h> #include <cassert> diff --git a/vcl/osx/a11yactionwrapper.h b/vcl/osx/a11yactionwrapper.h index 0fda9a32ae21..20b2bad1b4af 100644 --- a/vcl/osx/a11yactionwrapper.h +++ b/vcl/osx/a11yactionwrapper.h @@ -20,8 +20,8 @@ #ifndef INCLUDED_VCL_OSX_A11YACTIONWRAPPER_H #define INCLUDED_VCL_OSX_A11YACTIONWRAPPER_H -#include "osx/osxvcltypes.h" -#include "osx/a11ywrapper.h" +#include <osx/osxvcltypes.h> +#include <osx/a11ywrapper.h> @interface AquaA11yActionWrapper : NSObject { diff --git a/vcl/osx/a11yactionwrapper.mm b/vcl/osx/a11yactionwrapper.mm index 5319c47bff3c..8af087edf75e 100644 --- a/vcl/osx/a11yactionwrapper.mm +++ b/vcl/osx/a11yactionwrapper.mm @@ -18,8 +18,8 @@ */ -#include "osx/salinst.h" -#include "quartz/utils.h" +#include <osx/salinst.h> +#include <quartz/utils.h> #include "a11yactionwrapper.h" diff --git a/vcl/osx/a11ycomponentwrapper.h b/vcl/osx/a11ycomponentwrapper.h index 450f0688155e..92c6b1b493fd 100644 --- a/vcl/osx/a11ycomponentwrapper.h +++ b/vcl/osx/a11ycomponentwrapper.h @@ -20,8 +20,8 @@ #ifndef INCLUDED_VCL_OSX_A11YCOMPONENTWRAPPER_H #define INCLUDED_VCL_OSX_A11YCOMPONENTWRAPPER_H -#include "osx/osxvcltypes.h" -#include "osx/a11ywrapper.h" +#include <osx/osxvcltypes.h> +#include <osx/a11ywrapper.h> @interface AquaA11yComponentWrapper : NSObject { diff --git a/vcl/osx/a11ycomponentwrapper.mm b/vcl/osx/a11ycomponentwrapper.mm index d7d0327b7b8a..e389f176d637 100644 --- a/vcl/osx/a11ycomponentwrapper.mm +++ b/vcl/osx/a11ycomponentwrapper.mm @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "quartz/utils.h" +#include <quartz/utils.h> #include "a11ycomponentwrapper.h" #include "a11yrolehelper.h" #include <com/sun/star/accessibility/AccessibleRole.hpp> diff --git a/vcl/osx/a11yfactory.mm b/vcl/osx/a11yfactory.mm index e9ce490049f7..0068bf853aca 100644 --- a/vcl/osx/a11yfactory.mm +++ b/vcl/osx/a11yfactory.mm @@ -18,9 +18,9 @@ */ -#include "osx/salinst.h" -#include "osx/a11yfactory.h" -#include "osx/a11yfocustracker.hxx" +#include <osx/salinst.h> +#include <osx/a11yfactory.h> +#include <osx/a11yfocustracker.hxx> #include "a11yfocuslistener.hxx" #include "a11yrolehelper.h" diff --git a/vcl/osx/a11yfocuslistener.cxx b/vcl/osx/a11yfocuslistener.cxx index 07014cf5b7e9..6c9efc4aafd0 100644 --- a/vcl/osx/a11yfocuslistener.cxx +++ b/vcl/osx/a11yfocuslistener.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "osx/a11yfocustracker.hxx" -#include "osx/a11yfactory.h" +#include <osx/a11yfocustracker.hxx> +#include <osx/a11yfactory.h> #include "a11yfocuslistener.hxx" diff --git a/vcl/osx/a11yfocuslistener.hxx b/vcl/osx/a11yfocuslistener.hxx index 22620b863229..12c76d92741b 100644 --- a/vcl/osx/a11yfocuslistener.hxx +++ b/vcl/osx/a11yfocuslistener.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_VCL_OSX_A11YFOCUSLISTENER_HXX #define INCLUDED_VCL_OSX_A11YFOCUSLISTENER_HXX -#include "osx/keyboardfocuslistener.hxx" -#include "osx/osxvcltypes.h" +#include <osx/keyboardfocuslistener.hxx> +#include <osx/osxvcltypes.h> class AquaA11yFocusListener : public KeyboardFocusListener { diff --git a/vcl/osx/a11yfocustracker.cxx b/vcl/osx/a11yfocustracker.cxx index fdc00b78b2b0..b650720adcb1 100644 --- a/vcl/osx/a11yfocustracker.cxx +++ b/vcl/osx/a11yfocustracker.cxx @@ -22,7 +22,7 @@ #include <vcl/toolbox.hxx> #include <vcl/menu.hxx> -#include "osx/a11yfocustracker.hxx" +#include <osx/a11yfocustracker.hxx> #include "documentfocuslistener.hxx" diff --git a/vcl/osx/a11ylistener.cxx b/vcl/osx/a11ylistener.cxx index 018106fd9304..3a9499c7ffcc 100644 --- a/vcl/osx/a11ylistener.cxx +++ b/vcl/osx/a11ylistener.cxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "osx/salinst.h" -#include "osx/a11ylistener.hxx" -#include "osx/a11yfactory.h" -#include "osx/a11yfocustracker.hxx" -#include "osx/a11ywrapper.h" +#include <osx/salinst.h> +#include <osx/a11ylistener.hxx> +#include <osx/a11yfactory.h> +#include <osx/a11yfocustracker.hxx> +#include <osx/a11ywrapper.h> #include "a11ytextwrapper.h" diff --git a/vcl/osx/a11yrolehelper.mm b/vcl/osx/a11yrolehelper.mm index f3cb57dd1416..e28fc1ad4d6f 100644 --- a/vcl/osx/a11yrolehelper.mm +++ b/vcl/osx/a11yrolehelper.mm @@ -18,7 +18,7 @@ */ -#include "osx/a11yfactory.h" +#include <osx/a11yfactory.h> #include "a11yrolehelper.h" diff --git a/vcl/osx/a11yselectionwrapper.h b/vcl/osx/a11yselectionwrapper.h index 9b254d7df1f6..923737b652c7 100644 --- a/vcl/osx/a11yselectionwrapper.h +++ b/vcl/osx/a11yselectionwrapper.h @@ -20,8 +20,8 @@ #ifndef INCLUDED_VCL_OSX_A11YSELECTIONWRAPPER_H #define INCLUDED_VCL_OSX_A11YSELECTIONWRAPPER_H -#include "osx/osxvcltypes.h" -#include "osx/a11ywrapper.h" +#include <osx/osxvcltypes.h> +#include <osx/a11ywrapper.h> @interface AquaA11ySelectionWrapper : NSObject { diff --git a/vcl/osx/a11yselectionwrapper.mm b/vcl/osx/a11yselectionwrapper.mm index e341aedacfe0..cc5b280994bd 100644 --- a/vcl/osx/a11yselectionwrapper.mm +++ b/vcl/osx/a11yselectionwrapper.mm @@ -18,8 +18,8 @@ */ -#include "osx/salinst.h" -#include "osx/a11yfactory.h" +#include <osx/salinst.h> +#include <osx/a11yfactory.h> #include "a11yselectionwrapper.h" diff --git a/vcl/osx/a11ytablewrapper.h b/vcl/osx/a11ytablewrapper.h index 94b29bd44c78..450a829c12f3 100644 --- a/vcl/osx/a11ytablewrapper.h +++ b/vcl/osx/a11ytablewrapper.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_OSX_A11YTABLEWRAPPER_H #define INCLUDED_VCL_OSX_A11YTABLEWRAPPER_H -#include "osx/a11ywrapper.h" +#include <osx/a11ywrapper.h> #define MAXIMUM_ACCESSIBLE_TABLE_CELLS 1000 diff --git a/vcl/osx/a11ytablewrapper.mm b/vcl/osx/a11ytablewrapper.mm index 1b24dd8a2b71..be26940b275f 100644 --- a/vcl/osx/a11ytablewrapper.mm +++ b/vcl/osx/a11ytablewrapper.mm @@ -18,7 +18,7 @@ */ -#include "osx/a11yfactory.h" +#include <osx/a11yfactory.h> #include "a11ytablewrapper.h" diff --git a/vcl/osx/a11ytextattributeswrapper.h b/vcl/osx/a11ytextattributeswrapper.h index 03e3b3a82eef..4170f5f8a8cc 100644 --- a/vcl/osx/a11ytextattributeswrapper.h +++ b/vcl/osx/a11ytextattributeswrapper.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_OSX_A11YTEXTATTRIBUTESWRAPPER_H #define INCLUDED_VCL_OSX_A11YTEXTATTRIBUTESWRAPPER_H -#include "osx/a11ywrapper.h" +#include <osx/a11ywrapper.h> @interface AquaA11yTextAttributesWrapper : NSObject { diff --git a/vcl/osx/a11ytextattributeswrapper.mm b/vcl/osx/a11ytextattributeswrapper.mm index 5d5f84fedc6c..425534a8f898 100644 --- a/vcl/osx/a11ytextattributeswrapper.mm +++ b/vcl/osx/a11ytextattributeswrapper.mm @@ -18,9 +18,9 @@ */ -#include "osx/salinst.h" -#include "quartz/utils.h" -#include "quartz/salgdi.h" +#include <osx/salinst.h> +#include <quartz/utils.h> +#include <quartz/salgdi.h> #include "a11ytextattributeswrapper.h" diff --git a/vcl/osx/a11ytextwrapper.h b/vcl/osx/a11ytextwrapper.h index c1830a2072c6..5d2154ff6298 100644 --- a/vcl/osx/a11ytextwrapper.h +++ b/vcl/osx/a11ytextwrapper.h @@ -20,8 +20,8 @@ #ifndef INCLUDED_VCL_OSX_A11YTEXTWRAPPER_H #define INCLUDED_VCL_OSX_A11YTEXTWRAPPER_H -#include "osx/osxvcltypes.h" -#include "osx/a11ywrapper.h" +#include <osx/osxvcltypes.h> +#include <osx/a11ywrapper.h> @interface AquaA11yTextWrapper : NSObject { diff --git a/vcl/osx/a11ytextwrapper.mm b/vcl/osx/a11ytextwrapper.mm index 14a63aa8fd9e..b76bee5f5594 100644 --- a/vcl/osx/a11ytextwrapper.mm +++ b/vcl/osx/a11ytextwrapper.mm @@ -18,8 +18,8 @@ */ -#include "osx/salinst.h" -#include "quartz/utils.h" +#include <osx/salinst.h> +#include <quartz/utils.h> #include "a11ytextwrapper.h" #include "a11ytextattributeswrapper.h" #include "a11yutil.h" diff --git a/vcl/osx/a11yutil.mm b/vcl/osx/a11yutil.mm index 68438643ace7..66d574fac616 100644 --- a/vcl/osx/a11yutil.mm +++ b/vcl/osx/a11yutil.mm @@ -18,7 +18,7 @@ */ -#include "osx/osxvcltypes.h" +#include <osx/osxvcltypes.h> #include "a11yutil.h" diff --git a/vcl/osx/a11yvaluewrapper.h b/vcl/osx/a11yvaluewrapper.h index 3ff33d491424..b4db1de964ab 100644 --- a/vcl/osx/a11yvaluewrapper.h +++ b/vcl/osx/a11yvaluewrapper.h @@ -20,9 +20,9 @@ #ifndef INCLUDED_VCL_OSX_A11YVALUEWRAPPER_H #define INCLUDED_VCL_OSX_A11YVALUEWRAPPER_H -#include "osx/salinst.h" -#include "osx/osxvcltypes.h" -#include "osx/a11ywrapper.h" +#include <osx/salinst.h> +#include <osx/osxvcltypes.h> +#include <osx/a11ywrapper.h> @interface AquaA11yValueWrapper : NSObject { diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm index 13571189be71..37ad10c3242a 100644 --- a/vcl/osx/a11ywrapper.mm +++ b/vcl/osx/a11ywrapper.mm @@ -18,15 +18,15 @@ */ -#include "osx/salinst.h" -#include "osx/saldata.hxx" +#include <osx/salinst.h> +#include <osx/saldata.hxx> -#include "osx/a11ywrapper.h" -#include "osx/a11ylistener.hxx" -#include "osx/a11yfactory.h" -#include "osx/a11yfocustracker.hxx" +#include <osx/a11ywrapper.h> +#include <osx/a11ylistener.hxx> +#include <osx/a11yfactory.h> +#include <osx/a11yfocustracker.hxx> -#include "quartz/utils.h" +#include <quartz/utils.h> #include "a11yfocuslistener.hxx" #include "a11yactionwrapper.h" diff --git a/vcl/osx/a11ywrapperbutton.h b/vcl/osx/a11ywrapperbutton.h index 0bf115f130be..23103cd92b98 100644 --- a/vcl/osx/a11ywrapperbutton.h +++ b/vcl/osx/a11ywrapperbutton.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_OSX_A11YWRAPPERBUTTON_H #define INCLUDED_VCL_OSX_A11YWRAPPERBUTTON_H -#include "osx/a11ywrapper.h" +#include <osx/a11ywrapper.h> @interface AquaA11yWrapperButton : AquaA11yWrapper { diff --git a/vcl/osx/a11ywrapperbutton.mm b/vcl/osx/a11ywrapperbutton.mm index eab7e07d00e3..ca5f16af3d42 100644 --- a/vcl/osx/a11ywrapperbutton.mm +++ b/vcl/osx/a11ywrapperbutton.mm @@ -18,7 +18,7 @@ */ -#include "osx/salinst.h" +#include <osx/salinst.h> #include "a11ywrapperbutton.h" #include "a11ytextwrapper.h" diff --git a/vcl/osx/a11ywrappercheckbox.h b/vcl/osx/a11ywrappercheckbox.h index 58cd2986e41e..6f20a888b271 100644 --- a/vcl/osx/a11ywrappercheckbox.h +++ b/vcl/osx/a11ywrappercheckbox.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_OSX_A11YWRAPPERCHECKBOX_H #define INCLUDED_VCL_OSX_A11YWRAPPERCHECKBOX_H -#include "osx/a11ywrapper.h" +#include <osx/a11ywrapper.h> @interface AquaA11yWrapperCheckBox : AquaA11yWrapper { diff --git a/vcl/osx/a11ywrappercheckbox.mm b/vcl/osx/a11ywrappercheckbox.mm index e8e6ad3d0210..d67c5b610ded 100644 --- a/vcl/osx/a11ywrappercheckbox.mm +++ b/vcl/osx/a11ywrappercheckbox.mm @@ -18,7 +18,7 @@ */ -#include "osx/salinst.h" +#include <osx/salinst.h> #include "a11ywrappercheckbox.h" #include "a11yvaluewrapper.h" diff --git a/vcl/osx/a11ywrappercombobox.h b/vcl/osx/a11ywrappercombobox.h index 4b7534805104..7995f06b69fd 100644 --- a/vcl/osx/a11ywrappercombobox.h +++ b/vcl/osx/a11ywrappercombobox.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_OSX_A11YWRAPPERCOMBOBOX_H #define INCLUDED_VCL_OSX_A11YWRAPPERCOMBOBOX_H -#include "osx/a11ywrapper.h" +#include <osx/a11ywrapper.h> #include <com/sun/star/accessibility/XAccessibleContext.hpp> @interface AquaA11yWrapperComboBox : AquaA11yWrapper diff --git a/vcl/osx/a11ywrappercombobox.mm b/vcl/osx/a11ywrappercombobox.mm index 2467718c79d4..0f0a8c4129a9 100644 --- a/vcl/osx/a11ywrappercombobox.mm +++ b/vcl/osx/a11ywrappercombobox.mm @@ -18,7 +18,7 @@ */ -#include "osx/salinst.h" +#include <osx/salinst.h> #include "a11ywrappercombobox.h" #include "a11yrolehelper.h" diff --git a/vcl/osx/a11ywrappergroup.h b/vcl/osx/a11ywrappergroup.h index af2baea63e11..5309c155b1c4 100644 --- a/vcl/osx/a11ywrappergroup.h +++ b/vcl/osx/a11ywrappergroup.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_OSX_A11YWRAPPERGROUP_H #define INCLUDED_VCL_OSX_A11YWRAPPERGROUP_H -#include "osx/a11ywrapper.h" +#include <osx/a11ywrapper.h> @interface AquaA11yWrapperGroup : AquaA11yWrapper { diff --git a/vcl/osx/a11ywrappergroup.mm b/vcl/osx/a11ywrappergroup.mm index 04c17a266f65..39cbd9adfcbc 100644 --- a/vcl/osx/a11ywrappergroup.mm +++ b/vcl/osx/a11ywrappergroup.mm @@ -18,7 +18,7 @@ */ -#include "osx/salinst.h" +#include <osx/salinst.h> #include "a11ywrappergroup.h" // Wrapper for AXGroup role diff --git a/vcl/osx/a11ywrapperlist.h b/vcl/osx/a11ywrapperlist.h index 65f605a173b1..8864555f283e 100644 --- a/vcl/osx/a11ywrapperlist.h +++ b/vcl/osx/a11ywrapperlist.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_OSX_A11YWRAPPERLIST_H #define INCLUDED_VCL_OSX_A11YWRAPPERLIST_H -#include "osx/a11ywrapper.h" +#include <osx/a11ywrapper.h> @interface AquaA11yWrapperList : AquaA11yWrapper { diff --git a/vcl/osx/a11ywrapperlist.mm b/vcl/osx/a11ywrapperlist.mm index e10bf727858f..9b0bac733bf9 100644 --- a/vcl/osx/a11ywrapperlist.mm +++ b/vcl/osx/a11ywrapperlist.mm @@ -18,7 +18,7 @@ */ -#include "osx/salinst.h" +#include <osx/salinst.h> #include "a11ywrapperlist.h" using namespace ::com::sun::star::accessibility; diff --git a/vcl/osx/a11ywrapperradiobutton.h b/vcl/osx/a11ywrapperradiobutton.h index 83e3f5fc9e89..ec8999f36035 100644 --- a/vcl/osx/a11ywrapperradiobutton.h +++ b/vcl/osx/a11ywrapperradiobutton.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_OSX_A11YWRAPPERRADIOBUTTON_H #define INCLUDED_VCL_OSX_A11YWRAPPERRADIOBUTTON_H -#include "osx/a11ywrapper.h" +#include <osx/a11ywrapper.h> @interface AquaA11yWrapperRadioButton : AquaA11yWrapper { diff --git a/vcl/osx/a11ywrapperradiobutton.mm b/vcl/osx/a11ywrapperradiobutton.mm index de94af6a196e..21fd9529bb96 100644 --- a/vcl/osx/a11ywrapperradiobutton.mm +++ b/vcl/osx/a11ywrapperradiobutton.mm @@ -18,7 +18,7 @@ */ -#include "osx/salinst.h" +#include <osx/salinst.h> #include "a11ywrapperradiobutton.h" #include "a11ytextwrapper.h" #include "a11yvaluewrapper.h" diff --git a/vcl/osx/a11ywrapperradiogroup.h b/vcl/osx/a11ywrapperradiogroup.h index 6ae98cbfd583..98e5a5cf5789 100644 --- a/vcl/osx/a11ywrapperradiogroup.h +++ b/vcl/osx/a11ywrapperradiogroup.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_OSX_A11YWRAPPERRADIOGROUP_H #define INCLUDED_VCL_OSX_A11YWRAPPERRADIOGROUP_H -#include "osx/a11ywrapper.h" +#include <osx/a11ywrapper.h> @interface AquaA11yWrapperRadioGroup : AquaA11yWrapper { diff --git a/vcl/osx/a11ywrapperradiogroup.mm b/vcl/osx/a11ywrapperradiogroup.mm index d66192df67bb..557e0b1bca15 100644 --- a/vcl/osx/a11ywrapperradiogroup.mm +++ b/vcl/osx/a11ywrapperradiogroup.mm @@ -18,7 +18,7 @@ */ -#include "osx/salinst.h" +#include <osx/salinst.h> #include "a11ywrapperradiogroup.h" #include "a11ytextwrapper.h" diff --git a/vcl/osx/a11ywrapperrow.h b/vcl/osx/a11ywrapperrow.h index 45cd7477d6ec..00e32f4dfdb4 100644 --- a/vcl/osx/a11ywrapperrow.h +++ b/vcl/osx/a11ywrapperrow.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_OSX_A11YWRAPPERROW_H #define INCLUDED_VCL_OSX_A11YWRAPPERROW_H -#include "osx/a11ywrapper.h" +#include <osx/a11ywrapper.h> @interface AquaA11yWrapperRow : AquaA11yWrapper { diff --git a/vcl/osx/a11ywrapperrow.mm b/vcl/osx/a11ywrapperrow.mm index 98739e6597d1..1b7ee56dd456 100644 --- a/vcl/osx/a11ywrapperrow.mm +++ b/vcl/osx/a11ywrapperrow.mm @@ -18,7 +18,7 @@ */ -#include "osx/salinst.h" +#include <osx/salinst.h> #include "a11ywrapperrow.h" #include "a11ytextwrapper.h" diff --git a/vcl/osx/a11ywrapperscrollarea.h b/vcl/osx/a11ywrapperscrollarea.h index 35a2aa15a028..c1556f9a9c19 100644 --- a/vcl/osx/a11ywrapperscrollarea.h +++ b/vcl/osx/a11ywrapperscrollarea.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_OSX_A11YWRAPPERSCROLLAREA_H #define INCLUDED_VCL_OSX_A11YWRAPPERSCROLLAREA_H -#include "osx/a11ywrapper.h" +#include <osx/a11ywrapper.h> @interface AquaA11yWrapperScrollArea : AquaA11yWrapper { diff --git a/vcl/osx/a11ywrapperscrollarea.mm b/vcl/osx/a11ywrapperscrollarea.mm index f70f44962ddb..bd5edf75f519 100644 --- a/vcl/osx/a11ywrapperscrollarea.mm +++ b/vcl/osx/a11ywrapperscrollarea.mm @@ -18,7 +18,7 @@ */ -#include "osx/salinst.h" +#include <osx/salinst.h> #include "a11ywrapperscrollarea.h" #include "a11ywrapperscrollbar.h" diff --git a/vcl/osx/a11ywrapperscrollbar.h b/vcl/osx/a11ywrapperscrollbar.h index a6d87079a31b..88beceb4f1cd 100644 --- a/vcl/osx/a11ywrapperscrollbar.h +++ b/vcl/osx/a11ywrapperscrollbar.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_OSX_A11YWRAPPERSCROLLBAR_H #define INCLUDED_VCL_OSX_A11YWRAPPERSCROLLBAR_H -#include "osx/a11ywrapper.h" +#include <osx/a11ywrapper.h> @interface AquaA11yWrapperScrollBar : AquaA11yWrapper { diff --git a/vcl/osx/a11ywrapperscrollbar.mm b/vcl/osx/a11ywrapperscrollbar.mm index 3717cafc883b..a4b7a246b411 100644 --- a/vcl/osx/a11ywrapperscrollbar.mm +++ b/vcl/osx/a11ywrapperscrollbar.mm @@ -18,7 +18,7 @@ */ -#include "osx/salinst.h" +#include <osx/salinst.h> #include "a11ywrapperscrollbar.h" diff --git a/vcl/osx/a11ywrappersplitter.h b/vcl/osx/a11ywrappersplitter.h index 18cdb6e0cdca..22397e869488 100644 --- a/vcl/osx/a11ywrappersplitter.h +++ b/vcl/osx/a11ywrappersplitter.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_OSX_A11YWRAPPERSPLITTER_H #define INCLUDED_VCL_OSX_A11YWRAPPERSPLITTER_H -#include "osx/a11ywrapper.h" +#include <osx/a11ywrapper.h> @interface AquaA11yWrapperSplitter : AquaA11yWrapper { diff --git a/vcl/osx/a11ywrappersplitter.mm b/vcl/osx/a11ywrappersplitter.mm index 66db6dc92f36..b43928bd43cd 100644 --- a/vcl/osx/a11ywrappersplitter.mm +++ b/vcl/osx/a11ywrappersplitter.mm @@ -18,7 +18,7 @@ */ -#include "osx/salinst.h" +#include <osx/salinst.h> #include "a11ywrappersplitter.h" using namespace ::com::sun::star::accessibility; diff --git a/vcl/osx/a11ywrapperstatictext.h b/vcl/osx/a11ywrapperstatictext.h index a210d80b7550..c02a1f3b82a4 100644 --- a/vcl/osx/a11ywrapperstatictext.h +++ b/vcl/osx/a11ywrapperstatictext.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_OSX_A11YWRAPPERSTATICTEXT_H #define INCLUDED_VCL_OSX_A11YWRAPPERSTATICTEXT_H -#include "osx/a11ywrapper.h" +#include <osx/a11ywrapper.h> @interface AquaA11yWrapperStaticText : AquaA11yWrapper { diff --git a/vcl/osx/a11ywrapperstatictext.mm b/vcl/osx/a11ywrapperstatictext.mm index ce0d7c425d92..cd4728544c00 100644 --- a/vcl/osx/a11ywrapperstatictext.mm +++ b/vcl/osx/a11ywrapperstatictext.mm @@ -18,7 +18,7 @@ */ -#include "osx/salinst.h" +#include <osx/salinst.h> #include "a11ywrapperstatictext.h" // Wrapper for AXStaticText role diff --git a/vcl/osx/a11ywrappertabgroup.h b/vcl/osx/a11ywrappertabgroup.h index b340d7506995..38c12ed21afb 100644 --- a/vcl/osx/a11ywrappertabgroup.h +++ b/vcl/osx/a11ywrappertabgroup.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_OSX_A11YWRAPPERTABGROUP_H #define INCLUDED_VCL_OSX_A11YWRAPPERTABGROUP_H -#include "osx/a11ywrapper.h" +#include <osx/a11ywrapper.h> @interface AquaA11yWrapperTabGroup : AquaA11yWrapper { diff --git a/vcl/osx/a11ywrappertabgroup.mm b/vcl/osx/a11ywrappertabgroup.mm index 0174e43093e2..ad5971865449 100644 --- a/vcl/osx/a11ywrappertabgroup.mm +++ b/vcl/osx/a11ywrappertabgroup.mm @@ -18,7 +18,7 @@ */ -#include "osx/salinst.h" +#include <osx/salinst.h> #include "a11ywrappertabgroup.h" // Wrapper for AXTabGroup role diff --git a/vcl/osx/a11ywrappertextarea.h b/vcl/osx/a11ywrappertextarea.h index a0cf4f68d6af..325284973eac 100644 --- a/vcl/osx/a11ywrappertextarea.h +++ b/vcl/osx/a11ywrappertextarea.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_OSX_A11YWRAPPERTEXTAREA_H #define INCLUDED_VCL_OSX_A11YWRAPPERTEXTAREA_H -#include "osx/a11ywrapper.h" +#include <osx/a11ywrapper.h> @interface AquaA11yWrapperTextArea : AquaA11yWrapper { diff --git a/vcl/osx/a11ywrappertextarea.mm b/vcl/osx/a11ywrappertextarea.mm index 9b4fbf995733..3f51f3541bd1 100644 --- a/vcl/osx/a11ywrappertextarea.mm +++ b/vcl/osx/a11ywrappertextarea.mm @@ -18,7 +18,7 @@ */ -#include "osx/salinst.h" +#include <osx/salinst.h> #include "a11ywrappertextarea.h" // Wrapper for AXTextArea role diff --git a/vcl/osx/a11ywrappertoolbar.h b/vcl/osx/a11ywrappertoolbar.h index 64bd14250e9e..d8871a507879 100644 --- a/vcl/osx/a11ywrappertoolbar.h +++ b/vcl/osx/a11ywrappertoolbar.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_OSX_A11YWRAPPERTOOLBAR_H #define INCLUDED_VCL_OSX_A11YWRAPPERTOOLBAR_H -#include "osx/a11ywrapper.h" +#include <osx/a11ywrapper.h> @interface AquaA11yWrapperToolbar : AquaA11yWrapper { diff --git a/vcl/osx/a11ywrappertoolbar.mm b/vcl/osx/a11ywrappertoolbar.mm index 9636d7882705..05e9b30e255e 100644 --- a/vcl/osx/a11ywrappertoolbar.mm +++ b/vcl/osx/a11ywrappertoolbar.mm @@ -18,7 +18,7 @@ */ -#include "osx/salinst.h" +#include <osx/salinst.h> #include "a11ywrappertoolbar.h" // Wrapper for AXToolbar role diff --git a/vcl/osx/clipboard.cxx b/vcl/osx/clipboard.cxx index a702432dd3f1..53326fb6634d 100644 --- a/vcl/osx/clipboard.cxx +++ b/vcl/osx/clipboard.cxx @@ -23,7 +23,7 @@ #include "OSXTransferable.hxx" #include <com/sun/star/datatransfer/MimeContentTypeFactory.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include "comphelper/processfactory.hxx" +#include <comphelper/processfactory.hxx> #include <cppuhelper/supportsservice.hxx> using namespace com::sun::star::datatransfer; diff --git a/vcl/osx/documentfocuslistener.hxx b/vcl/osx/documentfocuslistener.hxx index f22f7e371305..93bc8136a984 100644 --- a/vcl/osx/documentfocuslistener.hxx +++ b/vcl/osx/documentfocuslistener.hxx @@ -24,7 +24,7 @@ #include <cppuhelper/implbase.hxx> -#include "osx/a11yfocustracker.hxx" +#include <osx/a11yfocustracker.hxx> #include <set> diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm index ad4ea5af9de7..dda38c4479c8 100644 --- a/vcl/osx/printaccessoryview.mm +++ b/vcl/osx/printaccessoryview.mm @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" +#include <sal/config.h> #include <vcl/print.hxx> #include <vcl/image.hxx> @@ -26,16 +26,16 @@ #include <vcl/unohelp.hxx> #include <vcl/settings.hxx> -#include "osx/printview.h" -#include "osx/salinst.h" -#include "quartz/utils.h" +#include <osx/printview.h> +#include <osx/salinst.h> +#include <quartz/utils.h> -#include "svdata.hxx" -#include "strings.hrc" -#include "printaccessoryview.hrc" +#include <svdata.hxx> +#include <strings.hrc> +#include <printaccessoryview.hrc> -#include "com/sun/star/i18n/XBreakIterator.hpp" -#include "com/sun/star/i18n/WordType.hpp" +#include <com/sun/star/i18n/XBreakIterator.hpp> +#include <com/sun/star/i18n/WordType.hpp> #include <map> diff --git a/vcl/osx/printview.mm b/vcl/osx/printview.mm index 51b9b5ad04e7..95875a26f767 100644 --- a/vcl/osx/printview.mm +++ b/vcl/osx/printview.mm @@ -20,8 +20,8 @@ #include <vcl/print.hxx> -#include "osx/printview.h" -#include "osx/salprn.h" +#include <osx/printview.h> +#include <osx/salprn.h> @implementation AquaPrintView diff --git a/vcl/osx/saldata.cxx b/vcl/osx/saldata.cxx index a445e5cfb7ad..48ee575fbea8 100644 --- a/vcl/osx/saldata.cxx +++ b/vcl/osx/saldata.cxx @@ -19,10 +19,10 @@ #include <config_features.h> -#include "osx/saldata.hxx" -#include "osx/salnsmenu.h" -#include "osx/salinst.h" -#include "o3tl/enumarray.hxx" +#include <osx/saldata.hxx> +#include <osx/salnsmenu.h> +#include <osx/salinst.h> +#include <o3tl/enumarray.hxx> #import "apple_remote/RemoteMainController.h" diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index ff87c83e3205..476ef9ab3bad 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -20,33 +20,33 @@ #include <string> #include <comphelper/fileurl.hxx> -#include "rtl/ustrbuf.hxx" +#include <rtl/ustrbuf.hxx> -#include "osl/file.h" +#include <osl/file.h> #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/syswin.hxx> #include <vcl/settings.hxx> -#include "osx/saldata.hxx" -#include "quartz/salgdi.h" -#include "osx/salframe.h" -#include "osx/salmenu.h" -#include "osx/salinst.h" -#include "osx/salframeview.h" -#include "osx/a11yfactory.h" -#include "osx/runinmain.hxx" -#include "quartz/utils.h" +#include <osx/saldata.hxx> +#include <quartz/salgdi.h> +#include <osx/salframe.h> +#include <osx/salmenu.h> +#include <osx/salinst.h> +#include <osx/salframeview.h> +#include <osx/a11yfactory.h> +#include <osx/runinmain.hxx> +#include <quartz/utils.h> -#include "salwtype.hxx" +#include <salwtype.hxx> -#include "premac.h" +#include <premac.h> #include <objc/objc-runtime.h> // needed for theming // FIXME: move theming code to salnativewidgets.cxx #include <Carbon/Carbon.h> -#include "postmac.h" +#include <postmac.h> using namespace std; diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm index c0d28fe4bc3f..c79244a0011e 100644 --- a/vcl/osx/salframeview.mm +++ b/vcl/osx/salframeview.mm @@ -26,12 +26,12 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> -#include "osx/a11yfactory.h" -#include "osx/salframe.h" -#include "osx/salframeview.h" -#include "osx/salinst.h" -#include "quartz/salgdi.h" -#include "quartz/utils.h" +#include <osx/a11yfactory.h> +#include <osx/salframe.h> +#include <osx/salframeview.h> +#include <osx/salinst.h> +#include <quartz/salgdi.h> +#include <quartz/utils.h> #define WHEEL_EVENT_FACTOR 1.5 diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index 922046bcbfe8..50623eac24aa 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -23,11 +23,11 @@ #include <comphelper/solarmutex.hxx> -#include "comphelper/lok.hxx" +#include <comphelper/lok.hxx> -#include "osl/process.h" +#include <osl/process.h> -#include "rtl/ustrbuf.hxx" +#include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> @@ -35,34 +35,34 @@ #include <vcl/svmain.hxx> #include <vcl/opengl/OpenGLContext.hxx> -#include "osx/saldata.hxx" -#include "osx/salinst.h" -#include "osx/salframe.h" -#include "osx/salobj.h" -#include "osx/salsys.h" -#include "quartz/salvd.h" -#include "quartz/salbmp.h" -#include "quartz/utils.h" -#include "osx/salprn.h" -#include "osx/saltimer.h" -#include "osx/vclnsapp.h" -#include "osx/runinmain.hxx" - -#include "print.h" -#include "impbmp.hxx" -#include "salimestatus.hxx" +#include <osx/saldata.hxx> +#include <osx/salinst.h> +#include <osx/salframe.h> +#include <osx/salobj.h> +#include <osx/salsys.h> +#include <quartz/salvd.h> +#include <quartz/salbmp.h> +#include <quartz/utils.h> +#include <osx/salprn.h> +#include <osx/saltimer.h> +#include <osx/vclnsapp.h> +#include <osx/runinmain.hxx> + +#include <print.h> +#include <impbmp.hxx> +#include <salimestatus.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/uri/ExternalUriReferenceTranslator.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include "premac.h" +#include <premac.h> #include <Foundation/Foundation.h> #include <ApplicationServices/ApplicationServices.h> #import "apple_remote/RemoteMainController.h" -#include "apple_remote/RemoteControl.h" -#include "postmac.h" +#include <apple_remote/RemoteControl.h> +#include <postmac.h> extern "C" { #include <crt_externs.h> diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx index abab89f1dee7..4fb54d224503 100644 --- a/vcl/osx/salmenu.cxx +++ b/vcl/osx/salmenu.cxx @@ -29,15 +29,15 @@ #include <vcl/window.hxx> #include <vcl/svapp.hxx> -#include "osx/saldata.hxx" -#include "osx/salinst.h" -#include "osx/salmenu.h" -#include "osx/salnsmenu.h" -#include "osx/salframe.h" -#include "osx/a11ywrapper.h" -#include "quartz/utils.h" -#include "strings.hrc" -#include "window.h" +#include <osx/saldata.hxx> +#include <osx/salinst.h> +#include <osx/salmenu.h> +#include <osx/salnsmenu.h> +#include <osx/salframe.h> +#include <osx/a11ywrapper.h> +#include <quartz/utils.h> +#include <strings.hrc> +#include <window.h> namespace { diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx index 39cb514ddcbf..42add9e30d5a 100644 --- a/vcl/osx/salnativewidgets.cxx +++ b/vcl/osx/salnativewidgets.cxx @@ -25,16 +25,16 @@ #include <vcl/timer.hxx> #include <vcl/settings.hxx> -#include "quartz/salgdi.h" -#include "osx/salnativewidgets.h" -#include "osx/saldata.hxx" -#include "osx/salframe.h" +#include <quartz/salgdi.h> +#include <osx/salnativewidgets.h> +#include <osx/saldata.hxx> +#include <osx/salframe.h> -#include "premac.h" +#include <premac.h> #include <Carbon/Carbon.h> -#include "postmac.h" +#include <postmac.h> -#include <cuidraw.hxx> +#include "cuidraw.hxx" #if !HAVE_FEATURE_MACOSX_SANDBOX diff --git a/vcl/osx/salnsmenu.mm b/vcl/osx/salnsmenu.mm index 1b65d1e2ed9c..8a00b4105964 100644 --- a/vcl/osx/salnsmenu.mm +++ b/vcl/osx/salnsmenu.mm @@ -21,11 +21,11 @@ #include <vcl/window.hxx> -#include "osx/salinst.h" -#include "osx/saldata.hxx" -#include "osx/salframe.h" -#include "osx/salmenu.h" -#include "osx/salnsmenu.h" +#include <osx/salinst.h> +#include <osx/saldata.hxx> +#include <osx/salframe.h> +#include <osx/salmenu.h> +#include <osx/salnsmenu.h> @implementation SalNSMenu -(id)initWithMenu: (AquaSalMenu*)pMenu diff --git a/vcl/osx/salnstimer.mm b/vcl/osx/salnstimer.mm index 9647bb6b87c1..95be181644a5 100644 --- a/vcl/osx/salnstimer.mm +++ b/vcl/osx/salnstimer.mm @@ -19,11 +19,11 @@ #include <sal/config.h> -#include "osx/saltimer.h" -#include "osx/salnstimer.h" -#include "osx/salinst.h" -#include "osx/saldata.hxx" -#include "svdata.hxx" +#include <osx/saltimer.h> +#include <osx/salnstimer.h> +#include <osx/salinst.h> +#include <osx/saldata.hxx> +#include <svdata.hxx> @implementation TimerCallbackCaller diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx index b6cea6e614bc..e282780f67fa 100644 --- a/vcl/osx/salobj.cxx +++ b/vcl/osx/salobj.cxx @@ -22,11 +22,11 @@ #include <vcl/opengl/OpenGLHelper.hxx> #include <opengl/zone.hxx> -#include "osx/saldata.hxx" -#include "osx/salframe.h" -#include "osx/salinst.h" -#include "osx/salobj.h" -#include "osx/runinmain.hxx" +#include <osx/saldata.hxx> +#include <osx/salframe.h> +#include <osx/salinst.h> +#include <osx/salobj.h> +#include <osx/runinmain.hxx> #include <AppKit/NSOpenGLView.h> diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx index 25f312b1daf9..4285d418da84 100644 --- a/vcl/osx/salprn.cxx +++ b/vcl/osx/salprn.cxx @@ -17,24 +17,24 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "officecfg/Office/Common.hxx" +#include <officecfg/Office/Common.hxx> #include <vcl/print.hxx> #include <sal/macros.h> -#include "osx/salinst.h" -#include "osx/salprn.h" -#include "osx/printview.h" -#include "quartz/salgdi.h" -#include "osx/saldata.hxx" -#include "quartz/utils.h" +#include <osx/salinst.h> +#include <osx/salprn.h> +#include <osx/printview.h> +#include <quartz/salgdi.h> +#include <osx/saldata.hxx> +#include <quartz/utils.h> -#include "jobset.h" -#include "salptype.hxx" +#include <jobset.h> +#include <salptype.hxx> -#include "com/sun/star/beans/PropertyValue.hpp" -#include "com/sun/star/awt/Size.hpp" -#include "com/sun/star/uno/Sequence.hxx" +#include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/awt/Size.hpp> +#include <com/sun/star/uno/Sequence.hxx> #include <algorithm> #include <cstdlib> diff --git a/vcl/osx/salsys.cxx b/vcl/osx/salsys.cxx index 7051aeedeb44..1927ba27cb9e 100644 --- a/vcl/osx/salsys.cxx +++ b/vcl/osx/salsys.cxx @@ -17,16 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "rtl/ustrbuf.hxx" +#include <rtl/ustrbuf.hxx> #include <vcl/button.hxx> -#include "osx/salsys.h" -#include "osx/saldata.hxx" -#include "osx/salinst.h" -#include "quartz/utils.h" +#include <osx/salsys.h> +#include <osx/saldata.hxx> +#include <osx/salinst.h> +#include <quartz/utils.h> -#include "strings.hrc" +#include <strings.hrc> AquaSalSystem::~AquaSalSystem() { diff --git a/vcl/osx/saltimer.cxx b/vcl/osx/saltimer.cxx index 3d74da42a3dc..43931d722ef8 100644 --- a/vcl/osx/saltimer.cxx +++ b/vcl/osx/saltimer.cxx @@ -22,11 +22,11 @@ #include <rtl/math.hxx> #include <tools/time.hxx> -#include "osx/saltimer.h" -#include "osx/salnstimer.h" -#include "osx/saldata.hxx" -#include "osx/salframe.h" -#include "osx/salinst.h" +#include <osx/saltimer.h> +#include <osx/salnstimer.h> +#include <osx/saldata.hxx> +#include <osx/salframe.h> +#include <osx/salinst.h> void ImplNSAppPostEvent( short nEventId, BOOL bAtStart, int nUserData ) diff --git a/vcl/osx/service_entry.cxx b/vcl/osx/service_entry.cxx index 111983d68fba..50f8498c2f63 100644 --- a/vcl/osx/service_entry.cxx +++ b/vcl/osx/service_entry.cxx @@ -20,8 +20,8 @@ #include <vcl/svapp.hxx> -#include "osx/saldata.hxx" -#include "osx/salinst.h" +#include <osx/saldata.hxx> +#include <osx/salinst.h> #include "DragSource.hxx" #include "DropTarget.hxx" diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm index 23b22c360eeb..473c8d7f9a30 100644 --- a/vcl/osx/vclnsapp.mm +++ b/vcl/osx/vclnsapp.mm @@ -28,18 +28,18 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> -#include "osx/saldata.hxx" -#include "osx/salframe.h" -#include "osx/salframeview.h" -#include "osx/salinst.h" -#include "osx/vclnsapp.h" -#include "quartz/utils.h" - -#include "premac.h" +#include <osx/saldata.hxx> +#include <osx/salframe.h> +#include <osx/salframeview.h> +#include <osx/salinst.h> +#include <osx/vclnsapp.h> +#include <quartz/utils.h> + +#include <premac.h> #include <objc/objc-runtime.h> #import "Carbon/Carbon.h" #import "apple_remote/RemoteControl.h" -#include "postmac.h" +#include <postmac.h> @implementation CocoaThreadEnabler diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index 9c2acbd2de01..f9e7bc2bacbf 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -25,18 +25,18 @@ #include <vcl/settings.hxx> -#include "quartz/ctfonts.hxx" -#include "impfont.hxx" +#include <quartz/ctfonts.hxx> +#include <impfont.hxx> #ifdef MACOSX -#include "osx/saldata.hxx" -#include "osx/salinst.h" +#include <osx/saldata.hxx> +#include <osx/salinst.h> #endif -#include "fontinstance.hxx" -#include "fontattributes.hxx" -#include "PhysicalFontCollection.hxx" -#include "quartz/salgdi.h" -#include "quartz/utils.h" -#include "sallayout.hxx" +#include <fontinstance.hxx> +#include <fontattributes.hxx> +#include <PhysicalFontCollection.hxx> +#include <quartz/salgdi.h> +#include <quartz/utils.h> +#include <sallayout.hxx> inline double toRadian(int nDegree) diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx index fe8aa8920f7b..b96e25421686 100644 --- a/vcl/quartz/salbmp.cxx +++ b/vcl/quartz/salbmp.cxx @@ -28,12 +28,12 @@ #include <vcl/bitmap.hxx> #include <vcl/salbtype.hxx> -#include "bmpfast.hxx" -#include "quartz/salbmp.h" -#include "quartz/utils.h" +#include <bmpfast.hxx> +#include <quartz/salbmp.h> +#include <quartz/utils.h> #ifdef MACOSX -#include "osx/saldata.hxx" +#include <osx/saldata.hxx> #else #include "saldatabasic.hxx" #endif diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index 42bb48ffefd4..e84702eabb12 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -35,24 +35,24 @@ #include <vcl/svapp.hxx> #include <vcl/sysdata.hxx> -#include "quartz/ctfonts.hxx" -#include "fontsubset.hxx" -#include "impfont.hxx" -#include "impfontcharmap.hxx" -#include "impfontmetricdata.hxx" -#include "CommonSalLayout.hxx" -#include "outdev.h" -#include "PhysicalFontCollection.hxx" +#include <quartz/ctfonts.hxx> +#include <fontsubset.hxx> +#include <impfont.hxx> +#include <impfontcharmap.hxx> +#include <impfontmetricdata.hxx> +#include <CommonSalLayout.hxx> +#include <outdev.h> +#include <PhysicalFontCollection.hxx> #ifdef MACOSX -#include "osx/salframe.h" +#include <osx/salframe.h> #endif -#include "quartz/utils.h" +#include <quartz/utils.h> #ifdef IOS #include "saldatabasic.hxx" #endif -#include "sallayout.hxx" -#include "sft.hxx" +#include <sallayout.hxx> +#include <sft.hxx> using namespace vcl; diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index 099c33e3e817..5022a93c70f0 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -29,16 +29,16 @@ #include <vcl/sysdata.hxx> -#include "fontsubset.hxx" -#include "quartz/salbmp.h" +#include <fontsubset.hxx> +#include <quartz/salbmp.h> #ifdef MACOSX -#include "quartz/salgdi.h" +#include <quartz/salgdi.h> #endif -#include "quartz/utils.h" +#include <quartz/utils.h> #ifdef IOS #include "saldatabasic.hxx" #endif -#include "sft.hxx" +#include <sft.hxx> #if defined(IOS) && defined(DBG_UTIL) diff --git a/vcl/quartz/salgdiutils.cxx b/vcl/quartz/salgdiutils.cxx index 6149eceadae4..acda751afb67 100644 --- a/vcl/quartz/salgdiutils.cxx +++ b/vcl/quartz/salgdiutils.cxx @@ -26,10 +26,10 @@ #include <basegfx/vector/b2ivector.hxx> #include <vcl/svapp.hxx> -#include "quartz/salgdi.h" -#include "quartz/utils.h" -#include "osx/salframe.h" -#include "osx/saldata.hxx" +#include <quartz/salgdi.h> +#include <quartz/utils.h> +#include <osx/salframe.h> +#include <osx/saldata.hxx> void AquaSalGraphics::SetWindowGraphics( AquaSalFrame* pFrame ) { diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx index 26f90af338e7..3d9d700cb4d9 100644 --- a/vcl/quartz/salvd.cxx +++ b/vcl/quartz/salvd.cxx @@ -23,18 +23,18 @@ #include <vcl/sysdata.hxx> #ifdef MACOSX -#include "osx/salinst.h" -#include "osx/saldata.hxx" -#include "osx/salframe.h" +#include <osx/salinst.h> +#include <osx/saldata.hxx> +#include <osx/salframe.h> #else #include "headless/svpframe.hxx" #include "headless/svpgdi.hxx" #include "headless/svpinst.hxx" #include "headless/svpvd.hxx" #endif -#include "quartz/salgdi.h" -#include "quartz/salvd.h" -#include "quartz/utils.h" +#include <quartz/salgdi.h> +#include <quartz/salvd.h> +#include <quartz/utils.h> SalVirtualDevice* AquaSalInstance::CreateVirtualDevice( SalGraphics* pGraphics, long &nDX, long &nDY, diff --git a/vcl/quartz/utils.cxx b/vcl/quartz/utils.cxx index f0ebb9a65c20..2a65acd0af2f 100644 --- a/vcl/quartz/utils.cxx +++ b/vcl/quartz/utils.cxx @@ -25,7 +25,7 @@ #include <rtl/alloc.h> #include <rtl/ustrbuf.hxx> -#include "quartz/utils.h" +#include <quartz/utils.h> OUString GetOUString( CFStringRef rStr ) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
