diff options
Diffstat (limited to 'vcl/inc')
121 files changed, 334 insertions, 334 deletions
diff --git a/vcl/inc/accel.h b/vcl/inc/accel.h index 2225e29b587e..b2bef1ac8a6e 100644 --- a/vcl/inc/accel.h +++ b/vcl/inc/accel.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_ACCEL_H -#define _SV_ACCEL_H +#ifndef INCLUDED_VCL_INC_ACCEL_H +#define INCLUDED_VCL_INC_ACCEL_H #include <tools/solar.h> #include <vcl/keycod.hxx> @@ -37,6 +37,6 @@ public: void ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& rCode2, sal_uInt16& rCode3, sal_uInt16& rCode4 ); -#endif // _SV_ACCEL_H +#endif // INCLUDED_VCL_INC_ACCEL_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/accmgr.hxx b/vcl/inc/accmgr.hxx index 8d089ae426b6..e4c59b74555f 100644 --- a/vcl/inc/accmgr.hxx +++ b/vcl/inc/accmgr.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_ACCMGR_HXX -#define _SV_ACCMGR_HXX +#ifndef INCLUDED_VCL_INC_ACCMGR_HXX +#define INCLUDED_VCL_INC_ACCMGR_HXX #include <tools/solar.h> #include <vector> @@ -55,6 +55,6 @@ public: sal_Bool IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat ); }; -#endif // _SV_ACCMGR_HXX +#endif // INCLUDED_VCL_INC_ACCMGR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/android/androidinst.hxx b/vcl/inc/android/androidinst.hxx index 64dfc6a5656b..76067efeac01 100644 --- a/vcl/inc/android/androidinst.hxx +++ b/vcl/inc/android/androidinst.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef ANDROID_SALINST_H -#define ANDROID_SALINST_H +#ifndef INCLUDED_VCL_INC_ANDROID_ANDROIDINST_HXX +#define INCLUDED_VCL_INC_ANDROID_ANDROIDINST_HXX #include <jni.h> #include <android/input.h> @@ -48,6 +48,6 @@ public: void damaged(AndroidSalFrame *frame); }; -#endif // ANDROID_SALINST_H +#endif // INCLUDED_VCL_INC_ANDROID_ANDROIDINST_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/android/svsys.h b/vcl/inc/android/svsys.h index a9df68ac9d9e..25fac687d6ac 100644 --- a/vcl/inc/android/svsys.h +++ b/vcl/inc/android/svsys.h @@ -7,12 +7,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef _VCL_ANDROID_SVSYS_H -#define _VCL_ANDROID_SVSYS_H +#ifndef INCLUDED_VCL_INC_ANDROID_SVSYS_H +#define INCLUDED_VCL_INC_ANDROID_SVSYS_H // ? -#endif // _VCL_ANDROID_SVSYS_H +#endif // INCLUDED_VCL_INC_ANDROID_SVSYS_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/aqua/aqua11yfactory.h b/vcl/inc/aqua/aqua11yfactory.h index dc7a71d5fafc..2a4a7dc49467 100644 --- a/vcl/inc/aqua/aqua11yfactory.h +++ b/vcl/inc/aqua/aqua11yfactory.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_AQUA11FACTORY_H -#define _SV_AQUA11FACTORY_H +#ifndef INCLUDED_VCL_INC_AQUA_AQUA11YFACTORY_H +#define INCLUDED_VCL_INC_AQUA_AQUA11YFACTORY_H #include "aquavcltypes.h" #include "aqua11ywrapper.h" @@ -36,6 +36,6 @@ +(void)registerView: (NSView *) theView; +(void)revokeView: (NSView *) theViewt; @end -#endif // _SV_AQUA11FACTORY_H +#endif // INCLUDED_VCL_INC_AQUA_AQUA11YFACTORY_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/aqua/aqua11yfocustracker.hxx b/vcl/inc/aqua/aqua11yfocustracker.hxx index 8e54013ebd1b..22896c2a8b1d 100644 --- a/vcl/inc/aqua/aqua11yfocustracker.hxx +++ b/vcl/inc/aqua/aqua11yfocustracker.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _AQUA11YFOCUSTRACKER_HXX_ -#define _AQUA11YFOCUSTRACKER_HXX_ +#ifndef INCLUDED_VCL_INC_AQUA_AQUA11YFOCUSTRACKER_HXX +#define INCLUDED_VCL_INC_AQUA_AQUA11YFOCUSTRACKER_HXX #include <com/sun/star/accessibility/XAccessible.hpp> @@ -95,6 +95,6 @@ private: const ::com::sun::star::uno::Reference< DocumentFocusListener > m_xDocumentFocusListener; }; -#endif // _AQUA11YFOCUSTRACKER_HXX_ +#endif // INCLUDED_VCL_INC_AQUA_AQUA11YFOCUSTRACKER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/aqua/aqua11ylistener.hxx b/vcl/inc/aqua/aqua11ylistener.hxx index 100e09af63fe..97c71ef447ee 100644 --- a/vcl/inc/aqua/aqua11ylistener.hxx +++ b/vcl/inc/aqua/aqua11ylistener.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _AQUA11YLISTENER_HXX_ -#define _AQUA11YLISTENER_HXX_ +#ifndef INCLUDED_VCL_INC_AQUA_AQUA11YLISTENER_HXX +#define INCLUDED_VCL_INC_AQUA_AQUA11YLISTENER_HXX #include <com/sun/star/accessibility/XAccessibleEventListener.hpp> #include <cppuhelper/implbase1.hxx> @@ -54,5 +54,5 @@ private: ::com::sun::star::awt::Rectangle m_oldBounds; }; -#endif // _AQUA11YLISTENER_HXX_ +#endif // INCLUDED_VCL_INC_AQUA_AQUA11YLISTENER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/aqua/aqua11ywrapper.h b/vcl/inc/aqua/aqua11ywrapper.h index d7767c1b21cc..95edcae2e040 100644 --- a/vcl/inc/aqua/aqua11ywrapper.h +++ b/vcl/inc/aqua/aqua11ywrapper.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_AQUA11WRAPPER_H -#define _SV_AQUA11WRAPPER_H +#ifndef INCLUDED_VCL_INC_AQUA_AQUA11YWRAPPER_H +#define INCLUDED_VCL_INC_AQUA_AQUA11YWRAPPER_H #include "aquavcltypes.h" #include <com/sun/star/accessibility/XAccessibleAction.hpp> @@ -105,6 +105,6 @@ struct ReferenceWrapper -(::com::sun::star::accessibility::XAccessibleTextMarkup *)accessibleTextMarkup; @end -#endif // _SV_AQUA11WRAPPER_H +#endif // INCLUDED_VCL_INC_AQUA_AQUA11YWRAPPER_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/aqua/aquaprintview.h b/vcl/inc/aqua/aquaprintview.h index e31d24dd3da5..fbd8077ea96b 100644 --- a/vcl/inc/aqua/aquaprintview.h +++ b/vcl/inc/aqua/aquaprintview.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCL_AQUAPRINTVIEW_H -#define _VCL_AQUAPRINTVIEW_H +#ifndef INCLUDED_VCL_INC_AQUA_AQUAPRINTVIEW_H +#define INCLUDED_VCL_INC_AQUA_AQUAPRINTVIEW_H #include "premac.h" #include <Cocoa/Cocoa.h> diff --git a/vcl/inc/aqua/aquavcltypes.h b/vcl/inc/aqua/aquavcltypes.h index 7b45c4c136b6..5101a5a2615e 100644 --- a/vcl/inc/aqua/aquavcltypes.h +++ b/vcl/inc/aqua/aquavcltypes.h @@ -17,14 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _AQUAVCLTYPES_H -#define _AQUAVCLTYPES_H +#ifndef INCLUDED_VCL_INC_AQUA_AQUAVCLTYPES_H +#define INCLUDED_VCL_INC_AQUA_AQUAVCLTYPES_H #include "premac.h" #import <Cocoa/Cocoa.h> #import <AppKit/NSEvent.h> #include "postmac.h" -#endif /* _AQUAVCLTYPES_H */ +#endif // INCLUDED_VCL_INC_AQUA_AQUAVCLTYPES_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/aqua/atsui/salatsuifontutils.hxx b/vcl/inc/aqua/atsui/salatsuifontutils.hxx index 1258f5421e49..f8920cda6676 100644 --- a/vcl/inc/aqua/atsui/salatsuifontutils.hxx +++ b/vcl/inc/aqua/atsui/salatsuifontutils.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_SALATSUIFONTUTILS_HXX -#define _SV_SALATSUIFONTUTILS_HXX +#ifndef INCLUDED_VCL_INC_AQUA_ATSUI_SALATSUIFONTUTILS_HXX +#define INCLUDED_VCL_INC_AQUA_ATSUI_SALATSUIFONTUTILS_HXX class ImplMacFontData; class ImplDevFontList; @@ -51,6 +51,6 @@ private: void InitGlyphFallbacks(); }; -#endif // _SV_SALATSUIFONTUTILS_HXX +#endif // INCLUDED_VCL_INC_AQUA_ATSUI_SALATSUIFONTUTILS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/aqua/keyboardfocuslistener.hxx b/vcl/inc/aqua/keyboardfocuslistener.hxx index 6549e20a96eb..45979e28a374 100644 --- a/vcl/inc/aqua/keyboardfocuslistener.hxx +++ b/vcl/inc/aqua/keyboardfocuslistener.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _KEYBOARDFOCUSLISTENER_HXX_ -#define _KEYBOARDFOCUSLISTENER_HXX_ +#ifndef INCLUDED_VCL_INC_AQUA_KEYBOARDFOCUSLISTENER_HXX +#define INCLUDED_VCL_INC_AQUA_KEYBOARDFOCUSLISTENER_HXX #include <com/sun/star/accessibility/XAccessible.hpp> @@ -34,5 +34,5 @@ public: virtual void SAL_CALL focusedObjectChanged(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible) = 0; }; -#endif // _KEYBOARDFOCUSLISTENER_HXX_ +#endif // INCLUDED_VCL_INC_AQUA_KEYBOARDFOCUSLISTENER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/aqua/salframeview.h b/vcl/inc/aqua/salframeview.h index 23874111a220..4be71b3b7e5c 100644 --- a/vcl/inc/aqua/salframeview.h +++ b/vcl/inc/aqua/salframeview.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCL_SALFRAMEVIEW_H -#define _VCL_SALFRAMEVIEW_H +#ifndef INCLUDED_VCL_INC_AQUA_SALFRAMEVIEW_H +#define INCLUDED_VCL_INC_AQUA_SALFRAMEVIEW_H #include "aqua/aqua11ywrapper.h" diff --git a/vcl/inc/aqua/salmathutils.hxx b/vcl/inc/aqua/salmathutils.hxx index a4f24277b560..e3c223ee3f26 100644 --- a/vcl/inc/aqua/salmathutils.hxx +++ b/vcl/inc/aqua/salmathutils.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_SALMATHUTILS_HXX -#define _SV_SALMATHUTILS_HXX +#ifndef INCLUDED_VCL_INC_AQUA_SALMATHUTILS_HXX +#define INCLUDED_VCL_INC_AQUA_SALMATHUTILS_HXX #ifdef __cplusplus extern "C" { @@ -76,6 +76,6 @@ unsigned long Euclidian2Norm ( const LRectCoorVector pVec ); } #endif -#endif // _SV_SALMATHUTILS_HXX +#endif // INCLUDED_VCL_INC_AQUA_SALMATHUTILS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/aqua/salnativewidgets.h b/vcl/inc/aqua/salnativewidgets.h index f17ed3604b84..5c67a825962c 100644 --- a/vcl/inc/aqua/salnativewidgets.h +++ b/vcl/inc/aqua/salnativewidgets.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_NATIVEWIDGETS_H -#define _SV_NATIVEWIDGETS_H +#ifndef INCLUDED_VCL_INC_AQUA_SALNATIVEWIDGETS_H +#define INCLUDED_VCL_INC_AQUA_SALNATIVEWIDGETS_H // since 10.4 ... no metrics are returned, and we have to fix the values #define BUTTON_WIDTH 16 @@ -59,6 +59,6 @@ #define CLIP_FUZZ 1 -#endif // _SV_NATIVEWIDGETS_H +#endif // INCLUDED_VCL_INC_AQUA_SALNATIVEWIDGETS_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/aqua/salnsmenu.h b/vcl/inc/aqua/salnsmenu.h index 966a83711d36..585961280c3f 100644 --- a/vcl/inc/aqua/salnsmenu.h +++ b/vcl/inc/aqua/salnsmenu.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCL_SALNSMENU_H -#define _VCL_SALNSMENU_H +#ifndef INCLUDED_VCL_INC_AQUA_SALNSMENU_H +#define INCLUDED_VCL_INC_AQUA_SALNSMENU_H class AquaSalMenu; class AquaSalMenuItem; diff --git a/vcl/inc/aqua/salnstimer.h b/vcl/inc/aqua/salnstimer.h index fcbf0c2ad3b3..3d05fc8fc247 100644 --- a/vcl/inc/aqua/salnstimer.h +++ b/vcl/inc/aqua/salnstimer.h @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCL_SALNSTIMER_H -#define _VCL_SALNSTIMER_H +#ifndef INCLUDED_VCL_INC_AQUA_SALNSTIMER_H +#define INCLUDED_VCL_INC_AQUA_SALNSTIMER_H #include "premac.h" #include "Cocoa/Cocoa.h" diff --git a/vcl/inc/aqua/vclnsapp.h b/vcl/inc/aqua/vclnsapp.h index 18114c203e73..7413361114db 100644 --- a/vcl/inc/aqua/vclnsapp.h +++ b/vcl/inc/aqua/vclnsapp.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCL_VCLNSAPP_H -#define _VCL_VCLNSAPP_H +#ifndef INCLUDED_VCL_INC_AQUA_VCLNSAPP_H +#define INCLUDED_VCL_INC_AQUA_VCLNSAPP_H #include <config_features.h> diff --git a/vcl/inc/bmpfast.hxx b/vcl/inc/bmpfast.hxx index 6796e17e2708..a637d9f4e6b3 100644 --- a/vcl/inc/bmpfast.hxx +++ b/vcl/inc/bmpfast.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_BMPFAST_HXX -#define _SV_BMPFAST_HXX +#ifndef INCLUDED_VCL_INC_BMPFAST_HXX +#define INCLUDED_VCL_INC_BMPFAST_HXX class BitmapWriteAccess; class BitmapReadAccess; @@ -40,6 +40,6 @@ bool ImplFastBitmapBlending( BitmapWriteAccess& rDst, bool ImplFastEraseBitmap( BitmapBuffer&, const BitmapColor& ); -#endif // _SV_BMPFAST_HXX +#endif // INCLUDED_VCL_INC_BMPFAST_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx index e89fdd0be6e2..71b67b66ee40 100644 --- a/vcl/inc/brdwin.hxx +++ b/vcl/inc/brdwin.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_BRDWIN_HXX -#define _SV_BRDWIN_HXX +#ifndef INCLUDED_VCL_INC_BRDWIN_HXX +#define INCLUDED_VCL_INC_BRDWIN_HXX #include <tools/solar.h> #include <vcl/window.hxx> @@ -339,6 +339,6 @@ public: }; -#endif // _SV_BRDWIN_HXX +#endif // INCLUDED_VCL_INC_BRDWIN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx index 68deab218699..3187dc9bd31a 100644 --- a/vcl/inc/canvasbitmap.hxx +++ b/vcl/inc/canvasbitmap.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCL_CANVASBITMAP_HXX -#define _VCL_CANVASBITMAP_HXX +#ifndef INCLUDED_VCL_INC_CANVASBITMAP_HXX +#define INCLUDED_VCL_INC_CANVASBITMAP_HXX #include <cppuhelper/compbase3.hxx> #include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp> diff --git a/vcl/inc/controldata.hxx b/vcl/inc/controldata.hxx index 3b0e1eb00543..8040fa8c8dfb 100644 --- a/vcl/inc/controldata.hxx +++ b/vcl/inc/controldata.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef VCL_CONTROLDATA_HXX -#define VCL_CONTROLDATA_HXX +#ifndef INCLUDED_VCL_INC_CONTROLDATA_HXX +#define INCLUDED_VCL_INC_CONTROLDATA_HXX #include <vcl/controllayout.hxx> @@ -51,6 +51,6 @@ namespace vcl } // namespace vcl //........................................................................ -#endif // VCL_CONTROLDATA_HXX +#endif // INCLUDED_VCL_INC_CONTROLDATA_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/coretext/common.h b/vcl/inc/coretext/common.h index f26d48c9e738..1f1211b05c12 100644 --- a/vcl/inc/coretext/common.h +++ b/vcl/inc/coretext/common.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCL_CORETEXT_COMMON_H -#define _VCL_CORETEXT_COMMON_H +#ifndef INCLUDED_VCL_INC_CORETEXT_COMMON_H +#define INCLUDED_VCL_INC_CORETEXT_COMMON_H #include <iostream> @@ -48,6 +48,6 @@ std::ostream &operator <<(std::ostream& s, CTFontRef pFont); -#endif /* _VCL_CORETEXT_COMMON_H */ +#endif // INCLUDED_VCL_INC_CORETEXT_COMMON_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx index ac040b07ea6b..8c659fe276e8 100644 --- a/vcl/inc/cupsmgr.hxx +++ b/vcl/inc/cupsmgr.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _PSPRINT_CUPSMGR_HXX_ -#define _PSPRINT_CUPSMGR_HXX_ +#ifndef INCLUDED_VCL_INC_CUPSMGR_HXX +#define INCLUDED_VCL_INC_CUPSMGR_HXX #include "vcl/printerinfomanager.hxx" #include "osl/module.h" diff --git a/vcl/inc/cvtsvm.hxx b/vcl/inc/cvtsvm.hxx index c6597df53708..dd92f8edd699 100644 --- a/vcl/inc/cvtsvm.hxx +++ b/vcl/inc/cvtsvm.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_CVTSVM_HXX -#define INCLUDED_VCL_CVTSVM_HXX +#ifndef INCLUDED_VCL_INC_CVTSVM_HXX +#define INCLUDED_VCL_INC_CVTSVM_HXX #include <stack> #include <vcl/dllapi.h> @@ -97,6 +97,6 @@ private: SVMConverter& operator=( const SVMConverter& ); }; -#endif // INCLUDED_VCL_CVTSVM_HXX +#endif // INCLUDED_VCL_INC_CVTSVM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/dbggui.hxx b/vcl/inc/dbggui.hxx index c3393e6278fc..9ee6dc2d0e29 100644 --- a/vcl/inc/dbggui.hxx +++ b/vcl/inc/dbggui.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_DBGGUI_HXX -#define _SV_DBGGUI_HXX +#ifndef INCLUDED_VCL_INC_DBGGUI_HXX +#define INCLUDED_VCL_INC_DBGGUI_HXX #include <tools/solar.h> @@ -54,6 +54,6 @@ void DbgDialogTest( Window* pWindow ); #endif -#endif // _SV_DBGGUI_HXX +#endif // INCLUDED_VCL_INC_DBGGUI_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/dndevdis.hxx b/vcl/inc/dndevdis.hxx index 182554aa1683..223f672eb173 100644 --- a/vcl/inc/dndevdis.hxx +++ b/vcl/inc/dndevdis.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DNDEVDIS_HXX_ -#define _DNDEVDIS_HXX_ +#ifndef INCLUDED_VCL_INC_DNDEVDIS_HXX +#define INCLUDED_VCL_INC_DNDEVDIS_HXX #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp> diff --git a/vcl/inc/dndlcon.hxx b/vcl/inc/dndlcon.hxx index f8a099b17ec2..dcda3c5419d8 100644 --- a/vcl/inc/dndlcon.hxx +++ b/vcl/inc/dndlcon.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DNDLCON_HXX_ -#define _DNDLCON_HXX_ +#ifndef INCLUDED_VCL_INC_DNDLCON_HXX +#define INCLUDED_VCL_INC_DNDLCON_HXX #include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp> #include <com/sun/star/datatransfer/dnd/XDragSource.hpp> diff --git a/vcl/inc/fontcache.hxx b/vcl/inc/fontcache.hxx index a2b5b8a721b3..d70b641695dd 100644 --- a/vcl/inc/fontcache.hxx +++ b/vcl/inc/fontcache.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _PSPRINT_FONTCACHE_HXX -#define _PSPRINT_FONTCACHE_HXX +#ifndef INCLUDED_VCL_INC_FONTCACHE_HXX +#define INCLUDED_VCL_INC_FONTCACHE_HXX #include <rtl/ustring.hxx> #include <vcl/dllapi.h> @@ -84,6 +84,6 @@ public: } // namespace psp -#endif // _PSPRINT_FONTCACHE_HXX +#endif // INCLUDED_VCL_INC_FONTCACHE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/fontsubset.hxx b/vcl/inc/fontsubset.hxx index 4f00487da2c4..a827a95ea7d1 100644 --- a/vcl/inc/fontsubset.hxx +++ b/vcl/inc/fontsubset.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_FONTSUBSET_HXX -#define _SV_FONTSUBSET_HXX +#ifndef INCLUDED_VCL_INC_FONTSUBSET_HXX +#define INCLUDED_VCL_INC_FONTSUBSET_HXX #include <rtl/ustring.hxx> #include <tools/gen.hxx> @@ -87,6 +87,6 @@ protected: bool CreateFontSubsetFromType1( sal_Int32* pOutGlyphWidths = NULL ); }; -#endif // _SV_FONTSUBSET_HXX +#endif // INCLUDED_VCL_INC_FONTSUBSET_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/generic/gendata.hxx b/vcl/inc/generic/gendata.hxx index 6783c36e262b..ec587ce6f699 100644 --- a/vcl/inc/generic/gendata.hxx +++ b/vcl/inc/generic/gendata.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef _SV_GENDATA_HXX -#define _SV_GENDATA_HXX +#ifndef INCLUDED_VCL_INC_GENERIC_GENDATA_HXX +#define INCLUDED_VCL_INC_GENERIC_GENDATA_HXX #include <osl/socket.hxx> #include <saldatabasic.hxx> diff --git a/vcl/inc/generic/gendisp.hxx b/vcl/inc/generic/gendisp.hxx index 9e603b933166..285a9dc2e70a 100644 --- a/vcl/inc/generic/gendisp.hxx +++ b/vcl/inc/generic/gendisp.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCL_GEN_DISP_HXX -#define _VCL_GEN_DISP_HXX +#ifndef INCLUDED_VCL_INC_GENERIC_GENDISP_HXX +#define INCLUDED_VCL_INC_GENERIC_GENDISP_HXX #include <sal/types.h> #include <osl/mutex.h> @@ -75,6 +75,6 @@ public: }; -#endif // _VCL_GEN_DISP_HXX +#endif // INCLUDED_VCL_INC_GENERIC_GENDISP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/generic/geninst.h b/vcl/inc/generic/geninst.h index acbe1d49e2fb..59ac04f0d009 100644 --- a/vcl/inc/generic/geninst.h +++ b/vcl/inc/generic/geninst.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_GENERIC_INST_H -#define _SV_GENERIC_INST_H +#ifndef INCLUDED_VCL_INC_GENERIC_GENINST_H +#define INCLUDED_VCL_INC_GENERIC_GENINST_H #include <tools/solar.h> #include <osl/thread.hxx> @@ -118,6 +118,6 @@ inline SalGenericInstance *GetGenericInstance() return static_cast<SalGenericInstance *>(GetSalData()->m_pInstance); } -#endif // _SV_GENERIC_INST_H +#endif // INCLUDED_VCL_INC_GENERIC_GENINST_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/generic/genprn.h b/vcl/inc/generic/genprn.h index 698cc3e95dfc..00e061e029f8 100644 --- a/vcl/inc/generic/genprn.h +++ b/vcl/inc/generic/genprn.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_GENERIC_PRN_H -#define _SV_GENERIC_PRN_H +#ifndef INCLUDED_VCL_INC_GENERIC_GENPRN_H +#define INCLUDED_VCL_INC_GENERIC_GENPRN_H #include "vcl/jobdata.hxx" #include "generic/printergfx.hxx" diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h index 636606e85b7a..74ccf65137ee 100644 --- a/vcl/inc/generic/genpspgraphics.h +++ b/vcl/inc/generic/genpspgraphics.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCL_GENPSPGRAPHICS_H -#define _VCL_GENPSPGRAPHICS_H +#ifndef INCLUDED_VCL_INC_GENERIC_GENPSPGRAPHICS_H +#define INCLUDED_VCL_INC_GENERIC_GENPSPGRAPHICS_H #include "vcl/fontmanager.hxx" @@ -191,6 +191,6 @@ public: virtual SystemFontData GetSysFontData( int nFallbacklevel ) const; }; -#endif // _VCL_GENPSPGRAPHICS_H +#endif // INCLUDED_VCL_INC_GENERIC_GENPSPGRAPHICS_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/generic/gensys.h b/vcl/inc/generic/gensys.h index 25d73a09743b..77ff2edfa8bf 100644 --- a/vcl/inc/generic/gensys.h +++ b/vcl/inc/generic/gensys.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_GENSYS_H -#define _SV_GENSYS_H +#ifndef INCLUDED_VCL_INC_GENERIC_GENSYS_H +#define INCLUDED_VCL_INC_GENERIC_GENSYS_H #include <salsys.hxx> #include <salframe.hxx> @@ -50,6 +50,6 @@ class VCL_DLLPUBLIC SalGenericSystem : public SalSystem #endif }; -#endif // _SV_GENSYS_H +#endif // INCLUDED_VCL_INC_GENERIC_GENSYS_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index 7e1acaff7e3b..452cf4bf0f4e 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_GLYPHCACHE_HXX -#define _SV_GLYPHCACHE_HXX +#ifndef INCLUDED_VCL_INC_GENERIC_GLYPHCACHE_HXX +#define INCLUDED_VCL_INC_GENERIC_GLYPHCACHE_HXX #include <vcl/dllapi.h> @@ -368,6 +368,6 @@ public: int mnYOffset; }; -#endif // _SV_GLYPHCACHE_HXX +#endif // INCLUDED_VCL_INC_GENERIC_GLYPHCACHE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx index 94848cbfe80b..48f759b867ba 100644 --- a/vcl/inc/generic/printergfx.hxx +++ b/vcl/inc/generic/printergfx.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _PSPRINT_PRINTERGFX_HXX_ -#define _PSPRINT_PRINTERGFX_HXX_ +#ifndef INCLUDED_VCL_INC_GENERIC_PRINTERGFX_HXX +#define INCLUDED_VCL_INC_GENERIC_PRINTERGFX_HXX #include "vcl/helper.hxx" #include "sallayout.hxx" @@ -412,6 +412,6 @@ public: } /* namespace psp */ -#endif /* _PSPRINT_PRINTERGFX_HXX_ */ +#endif // INCLUDED_VCL_INC_GENERIC_PRINTERGFX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/generic/printerjob.hxx b/vcl/inc/generic/printerjob.hxx index b60cc098323b..5c521bb37675 100644 --- a/vcl/inc/generic/printerjob.hxx +++ b/vcl/inc/generic/printerjob.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _PSPRINT_PRINTERJOB_HXX_ -#define _PSPRINT_PRINTERJOB_HXX_ +#ifndef INCLUDED_VCL_INC_GENERIC_PRINTERJOB_HXX +#define INCLUDED_VCL_INC_GENERIC_PRINTERJOB_HXX #include "vcl/jobdata.hxx" #include "osl/file.hxx" @@ -132,6 +132,6 @@ public: } /* namespace psp */ -#endif /* _PSPRINT_PRINTERJOB_HXX_ */ +#endif // INCLUDED_VCL_INC_GENERIC_PRINTERJOB_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx index b81083458e1a..434d6f6dca94 100644 --- a/vcl/inc/graphite_layout.hxx +++ b/vcl/inc/graphite_layout.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_GRAPHITELAYOUT_HXX -#define _SV_GRAPHITELAYOUT_HXX +#ifndef INCLUDED_VCL_INC_GRAPHITE_LAYOUT_HXX +#define INCLUDED_VCL_INC_GRAPHITE_LAYOUT_HXX // Description: An implementation of the SalLayout interface that uses the // Graphite engine. @@ -158,6 +158,6 @@ private: long & rDXOffset, bool bIsBase, int baseChar); }; -#endif // _SV_GRAPHITELAYOUT_HXX +#endif // INCLUDED_VCL_INC_GRAPHITE_LAYOUT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/graphite_serverfont.hxx b/vcl/inc/graphite_serverfont.hxx index cfd2cd679079..e21590aa9ef4 100644 --- a/vcl/inc/graphite_serverfont.hxx +++ b/vcl/inc/graphite_serverfont.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_GRAPHITESERVERFONT_HXX -#define _SV_GRAPHITESERVERFONT_HXX +#ifndef INCLUDED_VCL_INC_GRAPHITE_SERVERFONT_HXX +#define INCLUDED_VCL_INC_GRAPHITE_SERVERFONT_HXX // We need this to enable namespace support in libgrengine headers. #define GR_NAMESPACE @@ -95,6 +95,6 @@ public: }; #endif -#endif //_SV_GRAPHITESERVERFONT_HXX +#endif // INCLUDED_VCL_INC_GRAPHITE_SERVERFONT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx index d081e2e648b4..861e53e0c298 100644 --- a/vcl/inc/headless/svpbmp.hxx +++ b/vcl/inc/headless/svpbmp.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SVP_SVBMP_HXX -#define SVP_SVBMP_HXX +#ifndef INCLUDED_VCL_INC_HEADLESS_SVPBMP_HXX +#define INCLUDED_VCL_INC_HEADLESS_SVPBMP_HXX #include "sal/config.h" diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx index 84cdf0ed5c5d..157f6a047bac 100644 --- a/vcl/inc/headless/svpdummies.hxx +++ b/vcl/inc/headless/svpdummies.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVP_SVPDUMMIES_HXX +#ifndef INCLUDED_VCL_INC_HEADLESS_SVPDUMMIES_HXX #include <vcl/sysdata.hxx> #include <generic/gensys.h> diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index 64853308d94e..f5fe6dd55dcd 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVP_SVPFRAME_HXX +#ifndef INCLUDED_VCL_INC_HEADLESS_SVPFRAME_HXX #include <vcl/sysdata.hxx> #include <basegfx/range/b2ibox.hxx> @@ -135,6 +135,6 @@ public: static SvpSalFrame* GetFocusFrame() { return s_pFocusFrame; } }; -#endif // _SVP_SVPFRAME_HXX +#endif // INCLUDED_VCL_INC_HEADLESS_SVPFRAME_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index 13f8b1a5653a..c36cfd3ab732 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVP_SVPGDI_HXX -#define _SVP_SVPGDI_HXX +#ifndef INCLUDED_VCL_INC_HEADLESS_SVPGDI_HXX +#define INCLUDED_VCL_INC_HEADLESS_SVPGDI_HXX #include <basebmp/bitmapdevice.hxx> #include <basebmp/color.hxx> diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx index af0c68051008..d0e6a6e9d9bc 100644 --- a/vcl/inc/headless/svpinst.hxx +++ b/vcl/inc/headless/svpinst.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVP_SALINST_HXX -#define _SVP_SALINST_HXX +#ifndef INCLUDED_VCL_INC_HEADLESS_SVPINST_HXX +#define INCLUDED_VCL_INC_HEADLESS_SVPINST_HXX #include <vcl/solarmutex.hxx> diff --git a/vcl/inc/headless/svpprn.hxx b/vcl/inc/headless/svpprn.hxx index 266c029b4e27..d9ac08f8fb6c 100644 --- a/vcl/inc/headless/svpprn.hxx +++ b/vcl/inc/headless/svpprn.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVP_SVPPRN_HXX -#define _SVP_SVPPRN_HXX +#ifndef INCLUDED_VCL_INC_HEADLESS_SVPPRN_HXX +#define INCLUDED_VCL_INC_HEADLESS_SVPPRN_HXX #include "vcl/jobdata.hxx" #include "generic/printergfx.hxx" @@ -39,6 +39,6 @@ public: SvpSalPrinter( SalInfoPrinter* pInfoPrinter ); }; -#endif // _SVP_SVPPRN_HXX +#endif // INCLUDED_VCL_INC_HEADLESS_SVPPRN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx index 2bb850d10e50..6a0b031c132a 100644 --- a/vcl/inc/headless/svpvd.hxx +++ b/vcl/inc/headless/svpvd.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVP_SVPVD_HXX -#define _SVP_SVPVD_HXX +#ifndef INCLUDED_VCL_INC_HEADLESS_SVPVD_HXX +#define INCLUDED_VCL_INC_HEADLESS_SVPVD_HXX #include <salvd.hxx> @@ -49,6 +49,6 @@ public: virtual void GetSize( long& rWidth, long& rHeight ); }; -#endif // _SVP_SVPVD_HXX +#endif // INCLUDED_VCL_INC_HEADLESS_SVPVD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx index 6923c2bedc95..389c8143ace9 100644 --- a/vcl/inc/helpwin.hxx +++ b/vcl/inc/helpwin.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_HELPWIN_HXX -#define _SV_HELPWIN_HXX +#ifndef INCLUDED_VCL_INC_HELPWIN_HXX +#define INCLUDED_VCL_INC_HELPWIN_HXX #include <vcl/floatwin.hxx> #include <vcl/timer.hxx> @@ -79,6 +79,6 @@ void ImplDestroyHelpWindow( bool bUpdateHideTime ); void ImplSetHelpWindowPos( Window* pHelpWindow, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle, const Point& rPos, const Rectangle* pHelpArea ); -#endif // _SV_HELPWIN_HXX +#endif // INCLUDED_VCL_INC_HELPWIN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/idlemgr.hxx b/vcl/inc/idlemgr.hxx index 03d21e931ec5..527d76f0a01c 100644 --- a/vcl/inc/idlemgr.hxx +++ b/vcl/inc/idlemgr.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_IDLEMGR_HXX -#define _SV_IDLEMGR_HXX +#ifndef INCLUDED_VCL_INC_IDLEMGR_HXX +#define INCLUDED_VCL_INC_IDLEMGR_HXX #include <tools/solar.h> #include <vcl/timer.hxx> @@ -51,6 +51,6 @@ public: DECL_LINK(TimeoutHdl, void *); }; -#endif // _SV_IDLEMGR_HXX +#endif // INCLUDED_VCL_INC_IDLEMGR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index 9edb315b9c6e..315f4ce0f1df 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_ILSTBOX_HXX -#define _SV_ILSTBOX_HXX +#ifndef INCLUDED_VCL_INC_ILSTBOX_HXX +#define INCLUDED_VCL_INC_ILSTBOX_HXX #include <boost/ptr_container/ptr_vector.hpp> @@ -654,6 +654,6 @@ public: void ImplInitFieldSettings( Window* pWin, sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); void ImplInitDropDownButton( PushButton* pButton ); -#endif // _SV_ILSTBOX_HXX +#endif // INCLUDED_VCL_INC_ILSTBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/image.h b/vcl/inc/image.h index ec12a3d41aba..a59c865b23ed 100644 --- a/vcl/inc/image.h +++ b/vcl/inc/image.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_IMAGE_H -#define _SV_IMAGE_H +#ifndef INCLUDED_VCL_INC_IMAGE_H +#define INCLUDED_VCL_INC_IMAGE_H #include <vcl/bitmapex.hxx> @@ -156,6 +156,6 @@ private: // prevent assignment and copy construction void operator=( const ImplImage&); }; -#endif // _SV_IMAGE_H +#endif // INCLUDED_VCL_INC_IMAGE_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx index e5b7855274cf..fa48db174bf8 100644 --- a/vcl/inc/impbmp.hxx +++ b/vcl/inc/impbmp.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_IMPBMP_HXX -#define _SV_IMPBMP_HXX +#ifndef INCLUDED_VCL_INC_IMPBMP_HXX +#define INCLUDED_VCL_INC_IMPBMP_HXX #include <tools/gen.hxx> #include <tools/solar.h> @@ -90,6 +90,6 @@ inline void ImpBitmap::ImplSetSourceSize( const Size& rSize) maSourceSize = rSize; } -#endif // _SV_IMPBMP_HXX +#endif // INCLUDED_VCL_INC_IMPBMP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index 8abdd35192ac..b464ee56ed30 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_IMPFONT_HXX -#define _SV_IMPFONT_HXX +#ifndef INCLUDED_VCL_INC_IMPFONT_HXX +#define INCLUDED_VCL_INC_IMPFONT_HXX #include <rtl/ustring.hxx> #include <tools/gen.hxx> @@ -232,6 +232,6 @@ bool ParseCMAP( const unsigned char* pRawData, int nRawLength, CmapResult& ); void UpdateAttributesFromPSName( const OUString& rPSName, ImplDevFontAttributes& ); -#endif // _SV_IMPFONT_HXX +#endif // INCLUDED_VCL_INC_IMPFONT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx index 4c879d6ba75c..8ccabf6711f0 100644 --- a/vcl/inc/impgraph.hxx +++ b/vcl/inc/impgraph.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_IMPGRAPH_HXX -#define _SV_IMPGRAPH_HXX +#ifndef INCLUDED_VCL_INC_IMPGRAPH_HXX +#define INCLUDED_VCL_INC_IMPGRAPH_HXX #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> @@ -167,6 +167,6 @@ private: const SvgDataPtr& getSvgData() const; }; -#endif // _SV_IMPGRAPH_HXX +#endif // INCLUDED_VCL_INC_IMPGRAPH_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx index a24faaa834ce..68cb2418271a 100644 --- a/vcl/inc/impimagetree.hxx +++ b/vcl/inc/impimagetree.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_IMPIMAGETREE_HXX -#define INCLUDED_VCL_IMPIMAGETREE_HXX +#ifndef INCLUDED_VCL_INC_IMPIMAGETREE_HXX +#define INCLUDED_VCL_INC_IMPIMAGETREE_HXX #include "sal/config.h" diff --git a/vcl/inc/impoct.hxx b/vcl/inc/impoct.hxx index 860a898b593a..3fc916a62b22 100644 --- a/vcl/inc/impoct.hxx +++ b/vcl/inc/impoct.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_IMPOCT_HXX -#define _SV_IMPOCT_HXX +#ifndef INCLUDED_VCL_INC_IMPOCT_HXX +#define INCLUDED_VCL_INC_IMPOCT_HXX #include <vcl/octree.hxx> @@ -168,6 +168,6 @@ inline void ImpNodeCache::ImplReleaseNode( OctreeNode* pNode ) pActNode = pNode; } -#endif // _SV_IMPOCT_HXX +#endif // INCLUDED_VCL_INC_IMPOCT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/ios/iosinst.hxx b/vcl/inc/ios/iosinst.hxx index 58f0648007b4..5d4ad0c9fc77 100644 --- a/vcl/inc/ios/iosinst.hxx +++ b/vcl/inc/ios/iosinst.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef IOS_SALINST_H -#define IOS_SALINST_H +#ifndef INCLUDED_VCL_INC_IOS_IOSINST_HXX +#define INCLUDED_VCL_INC_IOS_IOSINST_HXX #include <pthread.h> @@ -78,6 +78,6 @@ public: pthread_cond_t m_aRenderCond; }; -#endif // IOS_SALINST_H +#endif // INCLUDED_VCL_INC_IOS_IOSINST_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/ios/svsys.h b/vcl/inc/ios/svsys.h index 9e4d04898165..b476b74259b8 100644 --- a/vcl/inc/ios/svsys.h +++ b/vcl/inc/ios/svsys.h @@ -7,12 +7,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef _VCL_IOS_SVSYS_H -#define _VCL_IOS_SVSYS_H +#ifndef INCLUDED_VCL_INC_IOS_SVSYS_H +#define INCLUDED_VCL_INC_IOS_SVSYS_H // ? -#endif // _VCL_IOS_SVSYS_H +#endif // INCLUDED_VCL_INC_IOS_SVSYS_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h index 262e8b5818da..99143124b7a5 100644 --- a/vcl/inc/jobset.h +++ b/vcl/inc/jobset.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_JOBSET_H -#define _SV_JOBSET_H +#ifndef INCLUDED_VCL_INC_JOBSET_H +#define INCLUDED_VCL_INC_JOBSET_H #include <tools/solar.h> #include <vcl/prntypes.hxx> @@ -67,6 +67,6 @@ struct ImplJobSetup // Papierbreite/hoehe wird wenn 0 im unabhaengigen Teil automatisch aus // Papierformat berechnet, wenn dieses ungleich PAPER_USER ist -#endif // _SV_JOBSET_H +#endif // INCLUDED_VCL_INC_JOBSET_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/langboost.hxx b/vcl/inc/langboost.hxx index f612cbaa1ddb..84bdb2d84111 100644 --- a/vcl/inc/langboost.hxx +++ b/vcl/inc/langboost.hxx @@ -6,8 +6,8 @@ * 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/. */ -#ifndef _VCL_LANGBOOST_HXX -#define _VCL_LANGBOOST_HXX +#ifndef INCLUDED_VCL_INC_LANGBOOST_HXX +#define INCLUDED_VCL_INC_LANGBOOST_HXX namespace vcl { diff --git a/vcl/inc/list.h b/vcl/inc/list.h index 733bb19ce84d..b19591022700 100644 --- a/vcl/inc/list.h +++ b/vcl/inc/list.h @@ -25,8 +25,8 @@ /*| Author: Alexander Gelfenbain |*/ /*[]---------------------------------------------------[]*/ -#ifndef __CLIST_H -#define __CLIST_H +#ifndef INCLUDED_VCL_INC_LIST_H +#define INCLUDED_VCL_INC_LIST_H #ifdef __cplusplus extern "C" @@ -85,6 +85,6 @@ extern "C" #endif -#endif /* __CLIST_H */ +#endif // INCLUDED_VCL_INC_LIST_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/outdata.hxx b/vcl/inc/outdata.hxx index f5e2ab74bbd7..fde89eff64da 100644 --- a/vcl/inc/outdata.hxx +++ b/vcl/inc/outdata.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_OUTDATA_HXX -#define _SV_OUTDATA_HXX +#ifndef INCLUDED_VCL_INC_OUTDATA_HXX +#define INCLUDED_VCL_INC_OUTDATA_HXX #include <tools/solar.h> #include <tools/color.hxx> @@ -38,6 +38,6 @@ inline int ImplIsColorTransparent( Color aColor ) return aColor.GetTransparency(); } -#endif // _SV_OUTDATA_HXX +#endif // INCLUDED_VCL_INC_OUTDATA_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h index 6291866be855..226a83d8688f 100644 --- a/vcl/inc/outdev.h +++ b/vcl/inc/outdev.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_OUTDEV_H -#define _SV_OUTDEV_H +#ifndef INCLUDED_VCL_INC_OUTDEV_H +#define INCLUDED_VCL_INC_OUTDEV_H #include <tools/solar.h> #include <outfont.hxx> @@ -245,6 +245,6 @@ struct ImplOutDevData basegfx::B2DHomMatrix* mpInverseViewTransform; }; -#endif // _SV_OUTDEV_H +#endif // INCLUDED_VCL_INC_OUTDEV_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index 6e3210bf3703..eb3c48023b38 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_OUTFONT_HXX -#define _SV_OUTFONT_HXX +#ifndef INCLUDED_VCL_INC_OUTFONT_HXX +#define INCLUDED_VCL_INC_OUTFONT_HXX #include <rtl/ustring.hxx> #include <sal/types.h> @@ -410,6 +410,6 @@ private: ImplMultiTextLineInfo& operator=( const ImplMultiTextLineInfo& ); }; -#endif // _SV_OUTFONT_HXX +#endif // INCLUDED_VCL_INC_OUTFONT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/print.h b/vcl/inc/print.h index bd642c66bdd9..4b56092f37c2 100644 --- a/vcl/inc/print.h +++ b/vcl/inc/print.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_PRINT_H -#define _SV_PRINT_H +#ifndef INCLUDED_VCL_INC_PRINT_H +#define INCLUDED_VCL_INC_PRINT_H #include "tools/solar.h" #include "vcl/dllapi.h" @@ -72,6 +72,6 @@ void ImplDeletePrnQueueList(); void SAL_DLLPRIVATE ImplUpdateJobSetupPaper( JobSetup& rJobSetup ); -#endif // _SV_PRINT_H +#endif // INCLUDED_VCL_INC_PRINT_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index 618e2f9d936a..3b07b6b38828 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_PRNDLG_HXX -#define _SV_PRNDLG_HXX +#ifndef INCLUDED_VCL_INC_PRINTDLG_HXX +#define INCLUDED_VCL_INC_PRINTDLG_HXX #include <vcl/dllapi.h> @@ -298,6 +298,6 @@ namespace vcl } -#endif // _SV_PRNDLG_HXX +#endif // INCLUDED_VCL_INC_PRINTDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h index 24aebeb87c18..8641fd906322 100644 --- a/vcl/inc/quartz/salbmp.h +++ b/vcl/inc/quartz/salbmp.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCL_QUARTZ_SALBMP_H -#define _VCL_QUARTZ_SALBMP_H +#ifndef INCLUDED_VCL_INC_QUARTZ_SALBMP_H +#define INCLUDED_VCL_INC_QUARTZ_SALBMP_H #include "tools/gen.hxx" @@ -100,6 +100,6 @@ public: CGImageRef CreateCroppedImage( int nX, int nY, int nWidth, int nHeight ) const; }; -#endif // _VCL_QUARTZ_SALBMP_H +#endif // INCLUDED_VCL_INC_QUARTZ_SALBMP_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/quartz/salgdicommon.hxx b/vcl/inc/quartz/salgdicommon.hxx index c8a18198ffe9..c20f99106aaa 100644 --- a/vcl/inc/quartz/salgdicommon.hxx +++ b/vcl/inc/quartz/salgdicommon.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCL_AQUA_SALGDICOMMON_H -#define _VCL_AQUA_SALGDICOMMON_H +#ifndef INCLUDED_VCL_INC_QUARTZ_SALGDICOMMON_HXX +#define INCLUDED_VCL_INC_QUARTZ_SALGDICOMMON_HXX #include <premac.h> #ifdef IOS @@ -89,4 +89,4 @@ private: bool m_bIsEnabled; }; -#endif /* _VCL_AQUA_SALGDICOMMON_H */ +#endif // INCLUDED_VCL_INC_QUARTZ_SALGDICOMMON_HXX diff --git a/vcl/inc/quartz/utils.h b/vcl/inc/quartz/utils.h index 28cc508573e2..fe81c1d49fdf 100644 --- a/vcl/inc/quartz/utils.h +++ b/vcl/inc/quartz/utils.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_QUARTZ_UTILS_HXX -#define INCLUDED_QUARTZ_UTILS_HXX +#ifndef INCLUDED_VCL_INC_QUARTZ_UTILS_H +#define INCLUDED_VCL_INC_QUARTZ_UTILS_H #include <iostream> @@ -44,6 +44,6 @@ std::ostream &operator <<(std::ostream& s, CGPoint &rPoint); std::ostream &operator <<(std::ostream& s, CGSize &rSize); std::ostream &operator <<(std::ostream& s, CGColorRef pSize); -#endif // INCLUDED_QUARTZ_UTILS_HXX +#endif // INCLUDED_VCL_INC_QUARTZ_UTILS_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/regionband.hxx b/vcl/inc/regionband.hxx index 89657036adff..c913cc8eabed 100644 --- a/vcl/inc/regionband.hxx +++ b/vcl/inc/regionband.hxx @@ -15,8 +15,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_REGIONBAND_HXX -#define _SV_REGIONBAND_HXX +#ifndef INCLUDED_VCL_INC_REGIONBAND_HXX +#define INCLUDED_VCL_INC_REGIONBAND_HXX #include <vcl/regband.hxx> #include <vcl/region.hxx> @@ -77,7 +77,7 @@ public: void GetRegionRectangles(RectangleVector& rTarget) const; }; -#endif // _SV_REGIONBAND_HXX +#endif // INCLUDED_VCL_INC_REGIONBAND_HXX ////////////////////////////////////////////////////////////////////////////// //eof diff --git a/vcl/inc/saldatabasic.hxx b/vcl/inc/saldatabasic.hxx index 42d95d714b84..8c9886e0ea1d 100644 --- a/vcl/inc/saldatabasic.hxx +++ b/vcl/inc/saldatabasic.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_SALDATABASIC_HXX -#define _SV_SALDATABASIC_HXX +#ifndef INCLUDED_VCL_INC_SALDATABASIC_HXX +#define INCLUDED_VCL_INC_SALDATABASIC_HXX #include <svdata.hxx> #include <salinst.hxx> diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index 531d0d4f50b1..3712cd718f58 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_SALFRAME_HXX -#define _SV_SALFRAME_HXX +#ifndef INCLUDED_VCL_INC_SALFRAME_HXX +#define INCLUDED_VCL_INC_SALFRAME_HXX #include <tools/solar.h> #include <vcl/dllapi.h> @@ -243,6 +243,6 @@ public: // public for Sal Implementation { return m_pProc ? m_pProc( m_pWindow, const_cast<SalFrame*>(this), nEvent, pEvent ) : 0; } }; -#endif // _SV_SALFRAME_HXX +#endif // INCLUDED_VCL_INC_SALFRAME_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index d0edf597177b..323c66add610 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_SALGDI_HXX -#define _SV_SALGDI_HXX +#ifndef INCLUDED_VCL_INC_SALGDI_HXX +#define INCLUDED_VCL_INC_SALGDI_HXX #include "tools/solar.h" #include "vcl/dllapi.h" @@ -506,6 +506,6 @@ public: virtual SystemFontData GetSysFontData( int nFallbacklevel ) const = 0; }; -#endif // _SV_SALGDI_HXX +#endif // INCLUDED_VCL_INC_SALGDI_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/salgeom.hxx b/vcl/inc/salgeom.hxx index d054a7ea3aa3..138a6d96acdf 100644 --- a/vcl/inc/salgeom.hxx +++ b/vcl/inc/salgeom.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_SALGEOM_HXX -#define _SV_SALGEOM_HXX +#ifndef INCLUDED_VCL_INC_SALGEOM_HXX +#define INCLUDED_VCL_INC_SALGEOM_HXX typedef struct _SalFrameGeometry { // screen position of upper left corner of drawable area in pixel @@ -40,6 +40,6 @@ typedef struct _SalFrameGeometry { {} } SalFrameGeometry; -#endif // _SV_SALGEOM_HXX +#endif // INCLUDED_VCL_INC_SALGEOM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/salimestatus.hxx b/vcl/inc/salimestatus.hxx index f961a12fb808..bf3488fd2511 100644 --- a/vcl/inc/salimestatus.hxx +++ b/vcl/inc/salimestatus.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_SALIMESTATUS_HXX -#define _SV_SALIMESTATUS_HXX +#ifndef INCLUDED_VCL_INC_SALIMESTATUS_HXX +#define INCLUDED_VCL_INC_SALIMESTATUS_HXX #include <vcl/dllapi.h> diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index 3bfab2ce06e4..1f933a4b844d 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_SALLAYOUT_HXX -#define _SV_SALLAYOUT_HXX +#ifndef INCLUDED_VCL_INC_SALLAYOUT_HXX +#define INCLUDED_VCL_INC_SALLAYOUT_HXX #include <iostream> @@ -390,6 +390,6 @@ private: #undef SalGraphics -#endif // _SV_SALLAYOUT_HXX +#endif // INCLUDED_VCL_INC_SALLAYOUT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx index addedfd4972b..2a15583dbbfa 100644 --- a/vcl/inc/salmenu.hxx +++ b/vcl/inc/salmenu.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_SALMENU_HXX -#define _SV_SALMENU_HXX +#ifndef INCLUDED_VCL_INC_SALMENU_HXX +#define INCLUDED_VCL_INC_SALMENU_HXX #include <tools/solar.h> #include "vcl/dllapi.h" @@ -92,6 +92,6 @@ public: }; -#endif // _SV_SALMENU_HXX +#endif // INCLUDED_VCL_INC_SALMENU_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx index 4e8f6b1af2f8..302200a6a9c2 100644 --- a/vcl/inc/salobj.hxx +++ b/vcl/inc/salobj.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_SALOBJ_HXX -#define _SV_SALOBJ_HXX +#ifndef INCLUDED_VCL_INC_SALOBJ_HXX +#define INCLUDED_VCL_INC_SALOBJ_HXX #include <tools/solar.h> #include <vcl/dllapi.h> @@ -77,6 +77,6 @@ public: { return m_bEraseBackground; } }; -#endif // _SV_SALOBJ_HXX +#endif // INCLUDED_VCL_INC_SALOBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx index 4f1066cd843d..b608439fbd45 100644 --- a/vcl/inc/salprn.hxx +++ b/vcl/inc/salprn.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_SALPRN_HXX -#define _SV_SALPRN_HXX +#ifndef INCLUDED_VCL_INC_SALPRN_HXX +#define INCLUDED_VCL_INC_SALPRN_HXX #include <rtl/ustring.hxx> @@ -114,6 +114,6 @@ public: // public for Sal Implementation }; -#endif // _SV_SALPRN_HXX +#endif // INCLUDED_VCL_INC_SALPRN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/salptype.hxx b/vcl/inc/salptype.hxx index 291872d7349f..36fb3c29a830 100644 --- a/vcl/inc/salptype.hxx +++ b/vcl/inc/salptype.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_SALPTYPE_HXX -#define _SV_SALPTYPE_HXX +#ifndef INCLUDED_VCL_INC_SALPTYPE_HXX +#define INCLUDED_VCL_INC_SALPTYPE_HXX #include <tools/solar.h> @@ -49,6 +49,6 @@ class SalPrinter; typedef long (*SALPRNABORTPROC)( void* pInst, SalPrinter* pPrinter ); -#endif // _SV_SALPTYPE_HXX +#endif // INCLUDED_VCL_INC_SALPTYPE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/salsession.hxx b/vcl/inc/salsession.hxx index 7806dba14978..37788b64db71 100644 --- a/vcl/inc/salsession.hxx +++ b/vcl/inc/salsession.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCL_SALSESSION_HXX -#define _VCL_SALSESSION_HXX +#ifndef INCLUDED_VCL_INC_SALSESSION_HXX +#define INCLUDED_VCL_INC_SALSESSION_HXX #include "vcl/dllapi.h" diff --git a/vcl/inc/salsys.hxx b/vcl/inc/salsys.hxx index 3d453b5fffc1..927cd6238125 100644 --- a/vcl/inc/salsys.hxx +++ b/vcl/inc/salsys.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_SALSYS_HXX -#define _SV_SALSYS_HXX +#ifndef INCLUDED_VCL_INC_SALSYS_HXX +#define INCLUDED_VCL_INC_SALSYS_HXX #include <tools/gen.hxx> #include <vcl/dllapi.h> @@ -124,6 +124,6 @@ public: SalSystem* ImplGetSalSystem(); -#endif // _SV_SALSYS_HXX +#endif // INCLUDED_VCL_INC_SALSYS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/saltimer.hxx b/vcl/inc/saltimer.hxx index 5bca38b330e6..3bdfbc358da6 100644 --- a/vcl/inc/saltimer.hxx +++ b/vcl/inc/saltimer.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_SALTIMER_HXX -#define _SV_SALTIMER_HXX +#ifndef INCLUDED_VCL_INC_SALTIMER_HXX +#define INCLUDED_VCL_INC_SALTIMER_HXX #include <tools/solar.h> #include <vcl/dllapi.h> @@ -54,6 +54,6 @@ public: } }; -#endif // _SV_SALTIMER_HXX +#endif // INCLUDED_VCL_INC_SALTIMER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/salvd.hxx b/vcl/inc/salvd.hxx index 2afebbefb756..74e4930ce017 100644 --- a/vcl/inc/salvd.hxx +++ b/vcl/inc/salvd.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_SALVD_HXX -#define _SV_SALVD_HXX +#ifndef INCLUDED_VCL_INC_SALVD_HXX +#define INCLUDED_VCL_INC_SALVD_HXX #include <tools/solar.h> #include <vcl/dllapi.h> @@ -51,6 +51,6 @@ public: // public for Sal Implementation virtual void GetSize( long& rWidth, long& rHeight ) = 0; }; -#endif // _SV_SALVD_HXX +#endif // INCLUDED_VCL_INC_SALVD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index 544c7ad1844c..135cd5da39fb 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_SALWTYPE_HXX -#define _SV_SALWTYPE_HXX +#ifndef INCLUDED_VCL_INC_SALWTYPE_HXX +#define INCLUDED_VCL_INC_SALWTYPE_HXX #include <i18nlangtag/lang.h> #include <rtl/ustring.hxx> @@ -296,6 +296,6 @@ struct SalInputContext typedef void (*SALTIMERPROC)(); -#endif // _SV_SALWTYPE_HXX +#endif // INCLUDED_VCL_INC_SALWTYPE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx index 3cef61bc99d9..112e73966e4d 100644 --- a/vcl/inc/sft.hxx +++ b/vcl/inc/sft.hxx @@ -49,8 +49,8 @@ */ -#ifndef __SUBFONT_H -#define __SUBFONT_H +#ifndef INCLUDED_VCL_INC_SFT_HXX +#define INCLUDED_VCL_INC_SFT_HXX #ifdef UNX #include <sys/types.h> @@ -609,6 +609,6 @@ namespace vcl } // namespace vcl -#endif /* __SUBFONT_H */ +#endif // INCLUDED_VCL_INC_SFT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 3043ad7cf5d4..8648eda56d3a 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_SVDATA_HXX -#define _SV_SVDATA_HXX +#ifndef INCLUDED_VCL_INC_SVDATA_HXX +#define INCLUDED_VCL_INC_SVDATA_HXX #include "sal/types.h" @@ -408,6 +408,6 @@ struct ImplSVEvent sal_Bool mbCall; }; -#endif // _SV_SVDATA_HXX +#endif // INCLUDED_VCL_INC_SVDATA_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/svsys.h b/vcl/inc/svsys.h index 6bd76f66a2f2..997b3fb1da0d 100644 --- a/vcl/inc/svsys.h +++ b/vcl/inc/svsys.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCL_SVSYS_H -#define _VCL_SVSYS_H +#ifndef INCLUDED_VCL_INC_SVSYS_H +#define INCLUDED_VCL_INC_SVSYS_H #ifdef WNT #include "win/svsys.h" diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx index dfc4008bd158..541fcf4587b1 100644 --- a/vcl/inc/textlayout.hxx +++ b/vcl/inc/textlayout.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef VCL_TEXTLAYOUT_HXX -#define VCL_TEXTLAYOUT_HXX +#ifndef INCLUDED_VCL_INC_TEXTLAYOUT_HXX +#define INCLUDED_VCL_INC_TEXTLAYOUT_HXX #include <rtl/ustring.hxx> #include <tools/solar.h> @@ -126,6 +126,6 @@ namespace vcl } // namespace vcl //........................................................................ -#endif // VCL_TEXTLAYOUT_HXX +#endif // INCLUDED_VCL_INC_TEXTLAYOUT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h index 115182364dd8..029d3ec48181 100644 --- a/vcl/inc/toolbox.h +++ b/vcl/inc/toolbox.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_TOOLBOX_H -#define _SV_TOOLBOX_H +#ifndef INCLUDED_VCL_INC_TOOLBOX_H +#define INCLUDED_VCL_INC_TOOLBOX_H #include <rtl/ustring.hxx> #include <tools/gen.hxx> @@ -181,6 +181,6 @@ struct ImplToolBoxPrivateData }; -#endif // _SV_TOOLBOX_H +#endif // INCLUDED_VCL_INC_TOOLBOX_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/desktops.hxx b/vcl/inc/unx/desktops.hxx index e41add4b588e..f67e8ca9a8ba 100644 --- a/vcl/inc/unx/desktops.hxx +++ b/vcl/inc/unx/desktops.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_DESKTOPS_HXX -#define INCLUDED_VCL_DESKTOPS_HXX +#ifndef INCLUDED_VCL_INC_UNX_DESKTOPS_HXX +#define INCLUDED_VCL_INC_UNX_DESKTOPS_HXX enum DesktopType { DESKTOP_NONE, // headless, i.e. no X connection at all @@ -31,6 +31,6 @@ enum DesktopType { DESKTOP_TDE }; // keep in sync with desktop_strings[] in salplug.cxx -#endif // INCLUDED_VCL_DESKTOPS_HXX +#endif // INCLUDED_VCL_INC_UNX_DESKTOPS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/gtk/atkbridge.hxx b/vcl/inc/unx/gtk/atkbridge.hxx index 36b9b4a27f6e..480ce917fc5e 100644 --- a/vcl/inc/unx/gtk/atkbridge.hxx +++ b/vcl/inc/unx/gtk/atkbridge.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __ATK_BRIDGE_HXX__ -#define __ATK_BRIDGE_HXX__ +#ifndef INCLUDED_VCL_INC_UNX_GTK_ATKBRIDGE_HXX +#define INCLUDED_VCL_INC_UNX_GTK_ATKBRIDGE_HXX #include <vclpluginapi.h> diff --git a/vcl/inc/unx/gtk/gloactiongroup.h b/vcl/inc/unx/gtk/gloactiongroup.h index fb05d436094f..ea005aef3935 100644 --- a/vcl/inc/unx/gtk/gloactiongroup.h +++ b/vcl/inc/unx/gtk/gloactiongroup.h @@ -8,8 +8,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef GLOACTIONGROUP_H -#define GLOACTIONGROUP_H +#ifndef INCLUDED_VCL_INC_UNX_GTK_GLOACTIONGROUP_H +#define INCLUDED_VCL_INC_UNX_GTK_GLOACTIONGROUP_H #include <gio/gio.h> @@ -77,6 +77,6 @@ void g_lo_action_group_clear (GLOActionGroup G_END_DECLS -#endif // GLOACTIONGROUP_H +#endif // INCLUDED_VCL_INC_UNX_GTK_GLOACTIONGROUP_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/gtk/glomenu.h b/vcl/inc/unx/gtk/glomenu.h index f74af4b4c050..197752f86b9c 100644 --- a/vcl/inc/unx/gtk/glomenu.h +++ b/vcl/inc/unx/gtk/glomenu.h @@ -8,8 +8,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef __G_LO_MENU_H__ -#define __G_LO_MENU_H__ +#ifndef INCLUDED_VCL_INC_UNX_GTK_GLOMENU_H +#define INCLUDED_VCL_INC_UNX_GTK_GLOMENU_H #include <gio/gio.h> @@ -130,6 +130,6 @@ GLOMenu * g_lo_menu_get_menu_containing_item (GLOMenu G_END_DECLS -#endif /* __G_LO_MENU_H__ */ +#endif // INCLUDED_VCL_INC_UNX_GTK_GLOMENU_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index 702c76463ad1..c1259050373d 100644 --- a/vcl/inc/unx/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCL_GTKDATA_HXX -#define _VCL_GTKDATA_HXX +#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKDATA_HXX +#define INCLUDED_VCL_INC_UNX_GTK_GTKDATA_HXX #include <prex.h> #define GLIB_DISABLE_DEPRECATION_WARNINGS @@ -187,6 +187,6 @@ inline GdkDisplay *GtkData::GetGdkDisplay() #if !GTK_CHECK_VERSION(3,0,0) #endif -#endif // _VCL_GTKDATA_HXX +#endif // INCLUDED_VCL_INC_UNX_GTK_GTKDATA_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 4d4eaa6cf747..0cf197a7d70d 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCL_GTKFRAME_HXX -#define _VCL_GTKFRAME_HXX +#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKFRAME_HXX +#define INCLUDED_VCL_INC_UNX_GTK_GTKFRAME_HXX #include <prex.h> #include <cairo.h> @@ -459,6 +459,6 @@ GType ooo_fixed_get_type( void ); } // extern "C" -#endif //_VCL_GTKFRAME_HXX +#endif // INCLUDED_VCL_INC_UNX_GTK_GTKFRAME_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index d75e9dc07e29..9ddd99b48c5b 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCL_GTKGDI_HXX -#define _VCL_GTKGDI_HXX +#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKGDI_HXX +#define INCLUDED_VCL_INC_UNX_GTK_GTKGDI_HXX #include <prex.h> #include <gtk/gtk.h> @@ -280,6 +280,6 @@ protected: #endif // !gtk3 -#endif // _VCL_GTKGDI_HXX +#endif // INCLUDED_VCL_INC_UNX_GTK_GTKGDI_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index 4787b211569e..9ec7c1e6d11d 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCL_GTKINST_HXX -#define _VCL_GTKINST_HXX +#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKINST_HXX +#define INCLUDED_VCL_INC_UNX_GTK_GTKINST_HXX #include <boost/shared_ptr.hpp> @@ -116,6 +116,6 @@ public: mutable boost::shared_ptr<vcl::unx::GtkPrintWrapper> m_pPrintWrapper; }; -#endif // _VCL_GTKINST_HXX +#endif // INCLUDED_VCL_INC_UNX_GTK_GTKINST_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx index 1690908f477c..d19e45d9d018 100644 --- a/vcl/inc/unx/gtk/gtkobject.hxx +++ b/vcl/inc/unx/gtk/gtkobject.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCL_GTKOBJECT_HXX -#define _VCL_GTKOBJECT_HXX +#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKOBJECT_HXX +#define INCLUDED_VCL_INC_UNX_GTK_GTKOBJECT_HXX #include <tools/solar.h> #include <vcl/sysdata.hxx> diff --git a/vcl/inc/unx/gtk/gtkprn.hxx b/vcl/inc/unx/gtk/gtkprn.hxx index 73ba680a6914..2550dd38052f 100644 --- a/vcl/inc/unx/gtk/gtkprn.hxx +++ b/vcl/inc/unx/gtk/gtkprn.hxx @@ -8,8 +8,8 @@ */ -#ifndef UNX_GTK_GTKPRN_HXX_INCLUDED -#define UNX_GTK_GTKPRN_HXX_INCLUDED +#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX +#define INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX #include "generic/genprn.h" @@ -48,6 +48,6 @@ public: }; -#endif // UNX_GTK_GTKPRN_HXX_INCLUDED +#endif // INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 89c1af044165..4b2ac33dc26f 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef GTKSALMENU_HXX -#define GTKSALMENU_HXX +#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX +#define INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX #include <vector> #ifdef ENABLE_GIO @@ -120,6 +120,6 @@ public: GtkSalMenu* mpSubMenu; // Submenu of this item (if defined) }; -#endif // GTKSALMENU_HXX +#endif // INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx index d787476f52bc..46c6402e357d 100644 --- a/vcl/inc/unx/gtk/gtksys.hxx +++ b/vcl/inc/unx/gtk/gtksys.hxx @@ -6,8 +6,8 @@ * 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/. */ -#ifndef _VCL_GTKSYS_HXX_ -#define _VCL_GTKSYS_HXX_ +#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKSYS_HXX +#define INCLUDED_VCL_INC_UNX_GTK_GTKSYS_HXX #include "generic/gensys.h" #include <gtk/gtk.h> @@ -46,6 +46,6 @@ public: GdkScreen *getScreenMonitorFromIdx (int nIdx, gint &nMonitor); }; -#endif // _VCL_GTKSYS_HXX_ +#endif // INCLUDED_VCL_INC_UNX_GTK_GTKSYS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/i18n_cb.hxx b/vcl/inc/unx/i18n_cb.hxx index 74276caf1e20..4d13799dbd0a 100644 --- a/vcl/inc/unx/i18n_cb.hxx +++ b/vcl/inc/unx/i18n_cb.hxx @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SAL_I18N_CALLBACK_HXX -#define _SAL_I18N_CALLBACK_HXX +#ifndef INCLUDED_VCL_INC_UNX_I18N_CB_HXX +#define INCLUDED_VCL_INC_UNX_I18N_CB_HXX #include <salwtype.hxx> #include <vector> @@ -80,6 +80,6 @@ typedef struct { std::vector< sal_uInt16 > aInputFlags; } preedit_data_t; -#endif /* _SAL_I18N_CALLBACK_HXX */ +#endif // INCLUDED_VCL_INC_UNX_I18N_CB_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx index 3a49368fc84f..603451759783 100644 --- a/vcl/inc/unx/i18n_ic.hxx +++ b/vcl/inc/unx/i18n_ic.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SAL_I18N_INPUTCONTEXT_HXX -#define _SAL_I18N_INPUTCONTEXT_HXX +#ifndef INCLUDED_VCL_INC_UNX_I18N_IC_HXX +#define INCLUDED_VCL_INC_UNX_I18N_IC_HXX #include <i18nlangtag/lang.h> #include "i18n_cb.hxx" @@ -84,7 +84,7 @@ private: }; -#endif // _SAL_I18N_INPUTCONTEXT_HXX +#endif // INCLUDED_VCL_INC_UNX_I18N_IC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/i18n_im.hxx b/vcl/inc/unx/i18n_im.hxx index 9a20fc55342e..0da25d677c78 100644 --- a/vcl/inc/unx/i18n_im.hxx +++ b/vcl/inc/unx/i18n_im.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SAL_I18N_INPUTMETHOD_HXX -#define _SAL_I18N_INPUTMETHOD_HXX +#ifndef INCLUDED_VCL_INC_UNX_I18N_IM_HXX +#define INCLUDED_VCL_INC_UNX_I18N_IM_HXX #include <vclpluginapi.h> @@ -49,7 +49,7 @@ public: ~SalI18N_InputMethod(); }; -#endif // _SAL_I18N_INPUTMETHOD_HXX +#endif // INCLUDED_VCL_INC_UNX_I18N_IM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/i18n_keysym.hxx b/vcl/inc/unx/i18n_keysym.hxx index bc200d0ade61..86138672e5cc 100644 --- a/vcl/inc/unx/i18n_keysym.hxx +++ b/vcl/inc/unx/i18n_keysym.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SAL_I18N_KEYSYM_HXX -#define _SAL_I18N_KEYSYM_HXX +#ifndef INCLUDED_VCL_INC_UNX_I18N_KEYSYM_HXX +#define INCLUDED_VCL_INC_UNX_I18N_KEYSYM_HXX /* convert a keysym as defined in /usr/{X11R6|openwin}/include/X11/keysymdef.h @@ -58,7 +58,7 @@ sal_Unicode KeysymToUnicode (KeySym nKeySym); -#endif /* _SAL_I18N_KEYSYM_HXX */ +#endif // INCLUDED_VCL_INC_UNX_I18N_KEYSYM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx index f1769ed7221d..bec53de9f708 100644 --- a/vcl/inc/unx/i18n_status.hxx +++ b/vcl/inc/unx/i18n_status.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SAL_I18N_STATUS_HXX -#define _SAL_I18N_STATUS_HXX +#ifndef INCLUDED_VCL_INC_UNX_I18N_STATUS_HXX +#define INCLUDED_VCL_INC_UNX_I18N_STATUS_HXX #include <rtl/ustring.hxx> #include <salimestatus.hxx> @@ -103,6 +103,6 @@ public: } // namespace -#endif // _SAL_I18N_STATUS_HXX +#endif // INCLUDED_VCL_INC_UNX_I18N_STATUS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx index d22f02b2a9cb..2c5f13942ca9 100644 --- a/vcl/inc/unx/i18n_xkb.hxx +++ b/vcl/inc/unx/i18n_xkb.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SAL_I18N_XKBDEXTENSION_HXX -#define _SAL_I18N_XKBDEXTENSION_HXX +#ifndef INCLUDED_VCL_INC_UNX_I18N_XKB_HXX +#define INCLUDED_VCL_INC_UNX_I18N_XKB_HXX #include <sal/types.h> #include <vclpluginapi.h> @@ -89,6 +89,6 @@ SalI18N_KeyboardExtension::GetEventBase() const return mnEventBase; } -#endif // _SAL_I18N_XKBDEXTENSION_HXX +#endif // INCLUDED_VCL_INC_UNX_I18N_XKB_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/kde/kdedata.hxx b/vcl/inc/unx/kde/kdedata.hxx index b29a0726c6f8..249dde6359c5 100644 --- a/vcl/inc/unx/kde/kdedata.hxx +++ b/vcl/inc/unx/kde/kdedata.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCL_KDEDATA_HXX -#define _VCL_KDEDATA_HXX +#ifndef INCLUDED_VCL_INC_UNX_KDE_KDEDATA_HXX +#define INCLUDED_VCL_INC_UNX_KDE_KDEDATA_HXX #include <unx/saldisp.hxx> #include <unx/saldata.hxx> @@ -105,6 +105,6 @@ public: void doStartup(); }; -#endif // _VCL_KDEDATA_HXX +#endif // INCLUDED_VCL_INC_UNX_KDE_KDEDATA_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/saltype.h b/vcl/inc/unx/saltype.h index c55dbee48ad2..c7d62d3a8414 100644 --- a/vcl/inc/unx/saltype.h +++ b/vcl/inc/unx/saltype.h @@ -6,8 +6,8 @@ * 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/. */ -#ifndef SAL_TYPE_H -#define SAL_TYPE_H +#ifndef INCLUDED_VCL_INC_UNX_SALTYPE_H +#define INCLUDED_VCL_INC_UNX_SALTYPE_H // an X11 screen index - this unpleasant construct is to allow // us to cleanly separate the 'DisplayScreen' concept - as used @@ -22,5 +22,5 @@ public: bool operator!=(const SalX11Screen &rOther) { return rOther.mnXScreen != mnXScreen; } }; -#endif // SAL_TYPE_H +#endif // INCLUDED_VCL_INC_UNX_SALTYPE_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/salunx.h b/vcl/inc/unx/salunx.h index 0606736c170b..13bb033dbbdf 100644 --- a/vcl/inc/unx/salunx.h +++ b/vcl/inc/unx/salunx.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SALUNX_H -#define _SALUNX_H +#ifndef INCLUDED_VCL_INC_UNX_SALUNX_H +#define INCLUDED_VCL_INC_UNX_SALUNX_H #include <prex.h> #include <postx.h> diff --git a/vcl/inc/unx/salunxtime.h b/vcl/inc/unx/salunxtime.h index a10033b3ee06..aa6f4a266396 100644 --- a/vcl/inc/unx/salunxtime.h +++ b/vcl/inc/unx/salunxtime.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SALUNX_TIME_H -#define _SALUNX_TIME_H +#ifndef INCLUDED_VCL_INC_UNX_SALUNXTIME_H +#define INCLUDED_VCL_INC_UNX_SALUNXTIME_H #if defined LINUX || defined FREEBSD || \ defined NETBSD || defined OPENBSD || defined DRAGONFLY @@ -105,6 +105,6 @@ inline timeval operator - ( const timeval &t1, const timeval &t2 ) return t0 -= t2; } -#endif // _SALUNX_TIME_H +#endif // INCLUDED_VCL_INC_UNX_SALUNXTIME_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/sm.hxx b/vcl/inc/unx/sm.hxx index 29897289637e..3aee67a02d9a 100644 --- a/vcl/inc/unx/sm.hxx +++ b/vcl/inc/unx/sm.hxx @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCL_SM_HXX -#define _VCL_SM_HXX +#ifndef INCLUDED_VCL_INC_UNX_SM_HXX +#define INCLUDED_VCL_INC_UNX_SM_HXX #include "sal/config.h" diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx index 2c2ee3b38c13..e62ecce3e57e 100644 --- a/vcl/inc/unx/wmadaptor.hxx +++ b/vcl/inc/unx/wmadaptor.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCL_WMADAPTOR_HXX_ -#define _VCL_WMADAPTOR_HXX_ +#ifndef INCLUDED_VCL_INC_UNX_WMADAPTOR_HXX +#define INCLUDED_VCL_INC_UNX_WMADAPTOR_HXX #include <rtl/ustring.hxx> #include <tools/gen.hxx> diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx index b5edfa9a5ebb..60128a9adc0d 100644 --- a/vcl/inc/unx/x11/x11sys.hxx +++ b/vcl/inc/unx/x11/x11sys.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_X11SYS_H -#define _SV_X11SYS_H +#ifndef INCLUDED_VCL_INC_UNX_X11_X11SYS_HXX +#define INCLUDED_VCL_INC_UNX_X11_X11SYS_HXX #include <tools/solar.h> #include <osl/mutex.hxx> @@ -44,6 +44,6 @@ public: int nDefButton ); }; -#endif // _SV_X11SYS_H +#endif // INCLUDED_VCL_INC_UNX_X11_X11SYS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vclpluginapi.h b/vcl/inc/vclpluginapi.h index 3eb1249c0075..86fbf1748813 100644 --- a/vcl/inc/vclpluginapi.h +++ b/vcl/inc/vclpluginapi.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCLPLUGINAPI_H -#define _VCLPLUGINAPI_H +#ifndef INCLUDED_VCL_INC_VCLPLUGINAPI_H +#define INCLUDED_VCL_INC_VCLPLUGINAPI_H #include "sal/config.h" #include "sal/types.h" diff --git a/vcl/inc/wall2.hxx b/vcl/inc/wall2.hxx index 7142be61e150..f47c8f663cea 100644 --- a/vcl/inc/wall2.hxx +++ b/vcl/inc/wall2.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_WALL2_HXX -#define _SV_WALL2_HXX +#ifndef INCLUDED_VCL_INC_WALL2_HXX +#define INCLUDED_VCL_INC_WALL2_HXX #include <vcl/wall.hxx> @@ -49,6 +49,6 @@ public: }; -#endif // _SV_WALL2_HXX +#endif // INCLUDED_VCL_INC_WALL2_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/win/wincomp.hxx b/vcl/inc/win/wincomp.hxx index 8660c1b3ded7..c14ecf1f9224 100644 --- a/vcl/inc/win/wincomp.hxx +++ b/vcl/inc/win/wincomp.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_WINCOMP_HXX -#define _SV_WINCOMP_HXX +#ifndef INCLUDED_VCL_INC_WIN_WINCOMP_HXX +#define INCLUDED_VCL_INC_WIN_WINCOMP_HXX #include <string.h> @@ -250,6 +250,6 @@ typedef int (APIENTRY* SysAgt_Enable_PROC)( int ); #define UNICODE_NOCHAR 0xFFFF #endif -#endif // _SV_WINCOMP_HXX +#endif // INCLUDED_VCL_INC_WIN_WINCOMP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 092417b554d0..42998d025b01 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SV_WINDOW_H -#define _SV_WINDOW_H +#ifndef INCLUDED_VCL_INC_WINDOW_H +#define INCLUDED_VCL_INC_WINDOW_H #include <vector> #include <tools/solar.h> @@ -410,6 +410,6 @@ long ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse sal_uInt16 nCode, sal_uInt16 nMode ); void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight ); -#endif // _SV_WINDOW_H +#endif // INCLUDED_VCL_INC_WINDOW_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/xconnection.hxx b/vcl/inc/xconnection.hxx index 88feafe3d0c4..4a6a7603d82e 100644 --- a/vcl/inc/xconnection.hxx +++ b/vcl/inc/xconnection.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _VCL_XCONNECTION_HXX -#define _VCL_XCONNECTION_HXX +#ifndef INCLUDED_VCL_INC_XCONNECTION_HXX +#define INCLUDED_VCL_INC_XCONNECTION_HXX #include <osl/mutex.hxx> #include <rtl/ref.hxx> @@ -60,6 +60,6 @@ namespace vcl { } -#endif // _VCL_XCONNECTION_HXX +#endif // INCLUDED_VCL_INC_XCONNECTION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |