summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-10-28 04:06:23 +0100
committerThomas Arnhold <thomas@arnhold.org>2013-10-28 15:16:20 +0100
commite22242fddb73f5eadb11f340c314bbc4a6cfe361 (patch)
treeecb44159350783558370b18569b247c3a1d8e224
parent4adf622925e2900ac111e5e60b15e82ba1bf54e0 (diff)
fixincludeguards.sh: vcl
Change-Id: I3858c2152267474afab8e5a72b9f5da0ac623012
-rw-r--r--vcl/aqua/source/a11y/aqua11yactionwrapper.h6
-rw-r--r--vcl/aqua/source/a11y/aqua11ycomponentwrapper.h6
-rw-r--r--vcl/aqua/source/a11y/aqua11yfocuslistener.hxx6
-rw-r--r--vcl/aqua/source/a11y/aqua11yrolehelper.h6
-rw-r--r--vcl/aqua/source/a11y/aqua11yselectionwrapper.h6
-rw-r--r--vcl/aqua/source/a11y/aqua11ytablewrapper.h6
-rw-r--r--vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h6
-rw-r--r--vcl/aqua/source/a11y/aqua11ytextwrapper.h6
-rw-r--r--vcl/aqua/source/a11y/aqua11yutil.h6
-rw-r--r--vcl/aqua/source/a11y/aqua11yvaluewrapper.h6
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperbutton.h6
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappercheckbox.h4
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappercombobox.h6
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappergroup.h6
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperlist.h6
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h4
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperrow.h6
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h6
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h6
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappersplitter.h6
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperstatictext.h6
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappertabgroup.h6
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappertextarea.h6
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappertoolbar.h6
-rw-r--r--vcl/aqua/source/a11y/documentfocuslistener.hxx6
-rw-r--r--vcl/aqua/source/dtrans/DataFlavorMapping.hxx4
-rw-r--r--vcl/aqua/source/dtrans/DragSource.hxx4
-rw-r--r--vcl/aqua/source/dtrans/DragSourceContext.hxx4
-rw-r--r--vcl/aqua/source/dtrans/DropTarget.hxx4
-rw-r--r--vcl/aqua/source/dtrans/HtmlFmtFlt.hxx4
-rw-r--r--vcl/aqua/source/dtrans/PictToBmpFlt.hxx4
-rw-r--r--vcl/aqua/source/dtrans/aqua_clipboard.hxx4
-rw-r--r--vcl/generic/glyphs/gcach_ftyp.hxx6
-rw-r--r--vcl/generic/print/glyphset.hxx4
-rw-r--r--vcl/generic/print/psputil.hxx6
-rw-r--r--vcl/inc/accel.h6
-rw-r--r--vcl/inc/accmgr.hxx6
-rw-r--r--vcl/inc/android/androidinst.hxx6
-rw-r--r--vcl/inc/android/svsys.h6
-rw-r--r--vcl/inc/aqua/aqua11yfactory.h6
-rw-r--r--vcl/inc/aqua/aqua11yfocustracker.hxx6
-rw-r--r--vcl/inc/aqua/aqua11ylistener.hxx6
-rw-r--r--vcl/inc/aqua/aqua11ywrapper.h6
-rw-r--r--vcl/inc/aqua/aquaprintview.h4
-rw-r--r--vcl/inc/aqua/aquavcltypes.h6
-rw-r--r--vcl/inc/aqua/atsui/salatsuifontutils.hxx6
-rw-r--r--vcl/inc/aqua/keyboardfocuslistener.hxx6
-rw-r--r--vcl/inc/aqua/salframeview.h4
-rw-r--r--vcl/inc/aqua/salmathutils.hxx6
-rw-r--r--vcl/inc/aqua/salnativewidgets.h6
-rw-r--r--vcl/inc/aqua/salnsmenu.h4
-rw-r--r--vcl/inc/aqua/salnstimer.h4
-rw-r--r--vcl/inc/aqua/vclnsapp.h4
-rw-r--r--vcl/inc/bmpfast.hxx6
-rw-r--r--vcl/inc/brdwin.hxx6
-rw-r--r--vcl/inc/canvasbitmap.hxx4
-rw-r--r--vcl/inc/controldata.hxx6
-rw-r--r--vcl/inc/coretext/common.h6
-rw-r--r--vcl/inc/cupsmgr.hxx4
-rw-r--r--vcl/inc/cvtsvm.hxx6
-rw-r--r--vcl/inc/dbggui.hxx6
-rw-r--r--vcl/inc/dndevdis.hxx4
-rw-r--r--vcl/inc/dndlcon.hxx4
-rw-r--r--vcl/inc/fontcache.hxx6
-rw-r--r--vcl/inc/fontsubset.hxx6
-rw-r--r--vcl/inc/generic/gendata.hxx4
-rw-r--r--vcl/inc/generic/gendisp.hxx6
-rw-r--r--vcl/inc/generic/geninst.h6
-rw-r--r--vcl/inc/generic/genprn.h4
-rw-r--r--vcl/inc/generic/genpspgraphics.h6
-rw-r--r--vcl/inc/generic/gensys.h6
-rw-r--r--vcl/inc/generic/glyphcache.hxx6
-rw-r--r--vcl/inc/generic/printergfx.hxx6
-rw-r--r--vcl/inc/generic/printerjob.hxx6
-rw-r--r--vcl/inc/graphite_layout.hxx6
-rw-r--r--vcl/inc/graphite_serverfont.hxx6
-rw-r--r--vcl/inc/headless/svpbmp.hxx4
-rw-r--r--vcl/inc/headless/svpdummies.hxx2
-rw-r--r--vcl/inc/headless/svpframe.hxx4
-rw-r--r--vcl/inc/headless/svpgdi.hxx4
-rw-r--r--vcl/inc/headless/svpinst.hxx4
-rw-r--r--vcl/inc/headless/svpprn.hxx6
-rw-r--r--vcl/inc/headless/svpvd.hxx6
-rw-r--r--vcl/inc/helpwin.hxx6
-rw-r--r--vcl/inc/idlemgr.hxx6
-rw-r--r--vcl/inc/ilstbox.hxx6
-rw-r--r--vcl/inc/image.h6
-rw-r--r--vcl/inc/impbmp.hxx6
-rw-r--r--vcl/inc/impfont.hxx6
-rw-r--r--vcl/inc/impgraph.hxx6
-rw-r--r--vcl/inc/impimagetree.hxx4
-rw-r--r--vcl/inc/impoct.hxx6
-rw-r--r--vcl/inc/ios/iosinst.hxx6
-rw-r--r--vcl/inc/ios/svsys.h6
-rw-r--r--vcl/inc/jobset.h6
-rw-r--r--vcl/inc/langboost.hxx4
-rw-r--r--vcl/inc/list.h6
-rw-r--r--vcl/inc/outdata.hxx6
-rw-r--r--vcl/inc/outdev.h6
-rw-r--r--vcl/inc/outfont.hxx6
-rw-r--r--vcl/inc/print.h6
-rw-r--r--vcl/inc/printdlg.hxx6
-rw-r--r--vcl/inc/quartz/salbmp.h6
-rw-r--r--vcl/inc/quartz/salgdicommon.hxx6
-rw-r--r--vcl/inc/quartz/utils.h6
-rw-r--r--vcl/inc/regionband.hxx6
-rw-r--r--vcl/inc/saldatabasic.hxx4
-rw-r--r--vcl/inc/salframe.hxx6
-rw-r--r--vcl/inc/salgdi.hxx6
-rw-r--r--vcl/inc/salgeom.hxx6
-rw-r--r--vcl/inc/salimestatus.hxx4
-rw-r--r--vcl/inc/sallayout.hxx6
-rw-r--r--vcl/inc/salmenu.hxx6
-rw-r--r--vcl/inc/salobj.hxx6
-rw-r--r--vcl/inc/salprn.hxx6
-rw-r--r--vcl/inc/salptype.hxx6
-rw-r--r--vcl/inc/salsession.hxx4
-rw-r--r--vcl/inc/salsys.hxx6
-rw-r--r--vcl/inc/saltimer.hxx6
-rw-r--r--vcl/inc/salvd.hxx6
-rw-r--r--vcl/inc/salwtype.hxx6
-rw-r--r--vcl/inc/sft.hxx6
-rw-r--r--vcl/inc/svdata.hxx6
-rw-r--r--vcl/inc/svsys.h4
-rw-r--r--vcl/inc/textlayout.hxx6
-rw-r--r--vcl/inc/toolbox.h6
-rw-r--r--vcl/inc/unx/desktops.hxx6
-rw-r--r--vcl/inc/unx/gtk/atkbridge.hxx4
-rw-r--r--vcl/inc/unx/gtk/gloactiongroup.h6
-rw-r--r--vcl/inc/unx/gtk/glomenu.h6
-rw-r--r--vcl/inc/unx/gtk/gtkdata.hxx6
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx6
-rw-r--r--vcl/inc/unx/gtk/gtkgdi.hxx6
-rw-r--r--vcl/inc/unx/gtk/gtkinst.hxx6
-rw-r--r--vcl/inc/unx/gtk/gtkobject.hxx4
-rw-r--r--vcl/inc/unx/gtk/gtkprn.hxx6
-rw-r--r--vcl/inc/unx/gtk/gtksalmenu.hxx6
-rw-r--r--vcl/inc/unx/gtk/gtksys.hxx6
-rw-r--r--vcl/inc/unx/i18n_cb.hxx6
-rw-r--r--vcl/inc/unx/i18n_ic.hxx6
-rw-r--r--vcl/inc/unx/i18n_im.hxx6
-rw-r--r--vcl/inc/unx/i18n_keysym.hxx6
-rw-r--r--vcl/inc/unx/i18n_status.hxx6
-rw-r--r--vcl/inc/unx/i18n_xkb.hxx6
-rw-r--r--vcl/inc/unx/kde/kdedata.hxx6
-rw-r--r--vcl/inc/unx/saltype.h6
-rw-r--r--vcl/inc/unx/salunx.h4
-rw-r--r--vcl/inc/unx/salunxtime.h6
-rw-r--r--vcl/inc/unx/sm.hxx4
-rw-r--r--vcl/inc/unx/wmadaptor.hxx4
-rw-r--r--vcl/inc/unx/x11/x11sys.hxx6
-rw-r--r--vcl/inc/vclpluginapi.h4
-rw-r--r--vcl/inc/wall2.hxx6
-rw-r--r--vcl/inc/win/wincomp.hxx6
-rw-r--r--vcl/inc/window.h6
-rw-r--r--vcl/inc/xconnection.hxx6
-rw-r--r--vcl/source/control/thumbpos.hxx6
-rw-r--r--vcl/source/edit/textdat2.hxx6
-rw-r--r--vcl/source/edit/textdoc.hxx6
-rw-r--r--vcl/source/edit/textund2.hxx6
-rw-r--r--vcl/source/edit/textundo.hxx6
-rw-r--r--vcl/source/filter/FilterConfigCache.hxx6
-rw-r--r--vcl/source/filter/igif/decode.hxx4
-rw-r--r--vcl/source/filter/igif/gifread.hxx6
-rw-r--r--vcl/source/filter/ixbm/xbmread.hxx6
-rw-r--r--vcl/source/filter/ixpm/xpmread.hxx6
-rw-r--r--vcl/source/filter/jpeg/Exif.hxx6
-rw-r--r--vcl/source/filter/jpeg/JpegReader.hxx6
-rw-r--r--vcl/source/filter/jpeg/JpegTransform.hxx4
-rw-r--r--vcl/source/filter/jpeg/JpegWriter.hxx6
-rw-r--r--vcl/source/filter/jpeg/jpeg.h4
-rw-r--r--vcl/source/filter/sgfbram.hxx6
-rw-r--r--vcl/source/filter/sgffilt.hxx6
-rw-r--r--vcl/source/filter/sgvmain.hxx6
-rw-r--r--vcl/source/filter/sgvspln.hxx6
-rw-r--r--vcl/source/filter/wmf/emfwr.hxx6
-rw-r--r--vcl/source/filter/wmf/winmtf.hxx4
-rw-r--r--vcl/source/filter/wmf/wmfwr.hxx4
-rw-r--r--vcl/source/fontsubset/gsub.h6
-rw-r--r--vcl/source/fontsubset/ttcr.hxx6
-rw-r--r--vcl/source/fontsubset/xlat.hxx6
-rw-r--r--vcl/source/gdi/impanmvw.hxx4
-rw-r--r--vcl/source/gdi/impvect.hxx4
-rw-r--r--vcl/source/gdi/pdffontcache.hxx4
-rw-r--r--vcl/source/gdi/pdfwriter_impl.hxx4
-rw-r--r--vcl/unx/generic/dtrans/X11_clipboard.hxx4
-rw-r--r--vcl/unx/generic/dtrans/X11_dndcontext.hxx6
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.hxx4
-rw-r--r--vcl/unx/generic/dtrans/X11_transferable.hxx4
-rw-r--r--vcl/unx/generic/dtrans/bmp.hxx4
-rw-r--r--vcl/unx/generic/gdi/gcach_xpeer.hxx6
-rw-r--r--vcl/unx/generic/gdi/xrender_peer.hxx6
-rw-r--r--vcl/unx/generic/window/FWS.hxx6
-rw-r--r--vcl/unx/gtk/a11y/atkfactory.hxx4
-rw-r--r--vcl/unx/gtk/a11y/atklistener.hxx6
-rw-r--r--vcl/unx/gtk/a11y/atkregistry.hxx4
-rw-r--r--vcl/unx/gtk/a11y/atktextattributes.hxx4
-rw-r--r--vcl/unx/gtk/a11y/atkutil.hxx4
-rw-r--r--vcl/unx/gtk/a11y/atkwindow.hxx4
-rw-r--r--vcl/unx/gtk/a11y/atkwrapper.hxx6
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx6
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx6
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkPicker.hxx4
-rw-r--r--vcl/unx/gtk/inc/gtkprintwrapper.hxx6
-rw-r--r--vcl/unx/gtk3/inc/gtkprintwrapper.hxx6
-rw-r--r--vcl/unx/kde/UnxCommandThread.hxx6
-rw-r--r--vcl/unx/kde/UnxFilePicker.hxx6
-rw-r--r--vcl/unx/kde/UnxNotifyThread.hxx6
-rw-r--r--vcl/unx/kde/fpicker/kdecommandthread.hxx6
-rw-r--r--vcl/unx/kde/fpicker/kdefilepicker.hxx6
-rw-r--r--vcl/unx/kde/fpicker/kdemodalityfilter.hxx6
211 files changed, 575 insertions, 575 deletions
diff --git a/vcl/aqua/source/a11y/aqua11yactionwrapper.h b/vcl/aqua/source/a11y/aqua11yactionwrapper.h
index 95c36c1c4f9d..c92473ccb080 100644
--- a/vcl/aqua/source/a11y/aqua11yactionwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yactionwrapper.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11ACTIONWRAPPER_H
-#define _SV_AQUA11ACTIONWRAPPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YACTIONWRAPPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YACTIONWRAPPER_H
#include "aqua/aquavcltypes.h"
#include "aqua/aqua11ywrapper.h"
@@ -30,6 +30,6 @@
+(void)doAction:(NSString *)action ofElement:(AquaA11yWrapper *)wrapper;
@end
-#endif // _SV_AQUA11ACTIONWRAPPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YACTIONWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
index 85c59b9c489a..74d804e74d91 100644
--- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11COMPONENTWRAPPER_H
-#define _SV_AQUA11COMPONENTWRAPPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YCOMPONENTWRAPPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YCOMPONENTWRAPPER_H
#include "aqua/aquavcltypes.h"
#include "aqua/aqua11ywrapper.h"
@@ -34,6 +34,6 @@
+(void)setFocusedAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
@end
-#endif // _SV_AQUA11COMPONENTWRAPPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YCOMPONENTWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
index 4e7cc11b4816..a889683a4304 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _AQUA11YFOCUSLISTENER_HXX_
-#define _AQUA11YFOCUSLISTENER_HXX_
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YFOCUSLISTENER_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YFOCUSLISTENER_HXX
#include <salhelper/refobj.hxx>
@@ -49,6 +49,6 @@ public:
virtual oslInterlockedCount SAL_CALL release() SAL_THROW(());
};
-#endif // _AQUA11YFOCUSLISTENER_HXX_
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YFOCUSLISTENER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yrolehelper.h b/vcl/aqua/source/a11y/aqua11yrolehelper.h
index fdbbcc11358e..a45cde447ff6 100644
--- a/vcl/aqua/source/a11y/aqua11yrolehelper.h
+++ b/vcl/aqua/source/a11y/aqua11yrolehelper.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11ROLEHELPER_H
-#define _SV_AQUA11ROLEHELPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YROLEHELPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YROLEHELPER_H
#include "aqua/salinst.h"
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
@@ -31,6 +31,6 @@
+(id)getRoleDescriptionFrom: (NSString *) role with: (NSString *) subRole;
@end
-#endif // _SV_AQUA11ROLEHELPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YROLEHELPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
index 8a435779cae2..af3c297dd363 100644
--- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11SELECTIONWRAPPER_H
-#define _SV_AQUA11SELECTIONWRAPPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YSELECTIONWRAPPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YSELECTIONWRAPPER_H
#include "aqua/aquavcltypes.h"
#include "aqua/aqua11ywrapper.h"
@@ -32,6 +32,6 @@
+(void)setSelectedChildrenAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
@end
-#endif // _SV_AQUA11SELECTIONWRAPPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YSELECTIONWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ytablewrapper.h b/vcl/aqua/source/a11y/aqua11ytablewrapper.h
index d6d0b39b2914..09b3ff733759 100644
--- a/vcl/aqua/source/a11y/aqua11ytablewrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytablewrapper.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11TABLEWRAPPER_H
-#define _SV_AQUA11TABLEWRAPPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTABLEWRAPPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTABLEWRAPPER_H
#include "aqua/aqua11ywrapper.h"
@@ -33,6 +33,6 @@
-(id)rowsAttribute;
-(id)columnsAttribute;
@end
-#endif // _SV_AQUA11TABLEWRAPPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTABLEWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
index 407c9078b423..4464bd32bfaf 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11TEXTATTRIBUTESWRAPPER_H
-#define _SV_AQUA11TEXTATTRIBUTESWRAPPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTATTRIBUTESWRAPPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTATTRIBUTESWRAPPER_H
#include "aqua/aqua11ywrapper.h"
@@ -27,6 +27,6 @@
}
+(NSMutableAttributedString *)createAttributedStringForElement:(AquaA11yWrapper *)wrapper inOrigRange:(id)origRange;
@end
-#endif // _SV_AQUA11TEXTATTRIBUTESWRAPPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTATTRIBUTESWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.h b/vcl/aqua/source/a11y/aqua11ytextwrapper.h
index c5ee680cfe63..91b2bd929538 100644
--- a/vcl/aqua/source/a11y/aqua11ytextwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11TEXTWRAPPER_H
-#define _SV_AQUA11TEXTWRAPPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTWRAPPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTWRAPPER_H
#include "aqua/aquavcltypes.h"
#include "aqua/aqua11ywrapper.h"
@@ -53,6 +53,6 @@
+(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
@end
-#endif // _SV_AQUA11TEXTWRAPPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yutil.h b/vcl/aqua/source/a11y/aqua11yutil.h
index 0e49079653d7..6f597dc354b0 100644
--- a/vcl/aqua/source/a11y/aqua11yutil.h
+++ b/vcl/aqua/source/a11y/aqua11yutil.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11YUTIL_H
-#define _SV_AQUA11YUTIL_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YUTIL_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YUTIL_H
#include <com/sun/star/awt/Point.hpp>
@@ -28,5 +28,5 @@
+(::com::sun::star::awt::Point)nsPointToVclPoint:(NSValue *)nsPoint;
@end
-#endif // _SV_AQUA11YUTIL_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YUTIL_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
index a0136d973970..6aa2eab1331d 100644
--- a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11VALUEWRAPPER_H
-#define _SV_AQUA11VALUEWRAPPER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YVALUEWRAPPER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YVALUEWRAPPER_H
#include "aqua/salinst.h"
#include "aqua/aquavcltypes.h"
@@ -35,6 +35,6 @@
+(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
@end
-#endif // _SV_AQUA11VALUEWRAPPER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YVALUEWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
index bce043a67667..ecb747f05016 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERBUTTON_H
-#define _SV_AQUA11WRAPPERBUTTON_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERBUTTON_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERBUTTON_H
#include "aqua/aqua11ywrapper.h"
@@ -30,6 +30,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERBUTTON_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERBUTTON_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
index 8aa45fe4d63d..90433ddc53da 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERCHECKBOX_H
-#define _SV_AQUA11WRAPPERCHECKBOX_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCHECKBOX_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCHECKBOX_H
#include "aqua/aqua11ywrapper.h"
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
index a368d136c060..6c8c1fef190b 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERCOMBOBOX_H
-#define _SV_AQUA11WRAPPERCOMBOBOX_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCOMBOBOX_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCOMBOBOX_H
#include "aqua/aqua11ywrapper.h"
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
@@ -39,6 +39,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERCOMBOBOX_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCOMBOBOX_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappergroup.h b/vcl/aqua/source/a11y/aqua11ywrappergroup.h
index 91c3468b69d2..d018927950c7 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappergroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappergroup.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERGROUP_H
-#define _SV_AQUA11WRAPPERGROUP_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERGROUP_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERGROUP_H
#include "aqua/aqua11ywrapper.h"
@@ -29,6 +29,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERGROUP_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERGROUP_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperlist.h b/vcl/aqua/source/a11y/aqua11ywrapperlist.h
index 1ae72a694bda..14fc22b4afc3 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperlist.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperlist.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERLIST_H
-#define _SV_AQUA11WRAPPERLIST_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERLIST_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERLIST_H
#include "aqua/aqua11ywrapper.h"
@@ -28,6 +28,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERLIST_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERLIST_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
index 6e09b9e8487a..15943efbfa82 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERRADIOBUTTON_H
-#define _SV_AQUA11WRAPPERRADIOBUTTON_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOBUTTON_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOBUTTON_H
#include "aqua/aqua11ywrapper.h"
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperrow.h b/vcl/aqua/source/a11y/aqua11ywrapperrow.h
index 2b6f6c0356fa..fa7b64d12a5e 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperrow.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperrow.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERROW_H
-#define _SV_AQUA11WRAPPERROW_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERROW_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERROW_H
#include "aqua/aqua11ywrapper.h"
@@ -29,6 +29,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERROW_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERROW_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
index d0dc1009bef5..e58acb207c67 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERSCROLLAREA_H
-#define _SV_AQUA11WRAPPERSCROLLAREA_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLAREA_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLAREA_H
#include "aqua/aqua11ywrapper.h"
@@ -30,6 +30,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERSCROLLAREA_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLAREA_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
index f417069339d2..c2ca6d93b81e 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERSCROLLBAR_H
-#define _SV_AQUA11WRAPPERSCROLLBAR_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLBAR_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLBAR_H
#include "aqua/aqua11ywrapper.h"
@@ -28,6 +28,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERSCROLLBAR_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLBAR_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
index 0c651fc32f66..27eaa9b47272 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERSPLITTER_H
-#define _SV_AQUA11WRAPPERSPLITTER_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSPLITTER_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSPLITTER_H
#include "aqua/aqua11ywrapper.h"
@@ -28,6 +28,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERSPLITTER_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSPLITTER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
index e6f75d8737cb..627d6e37b2a2 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERSTATICTEXT_H
-#define _SV_AQUA11WRAPPERSTATICTEXT_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSTATICTEXT_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSTATICTEXT_H
#include "aqua/aqua11ywrapper.h"
@@ -29,6 +29,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERSTATICTEXT_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSTATICTEXT_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
index 3b3f9600096b..bd0937e3b3f8 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERTABGROUP_H
-#define _SV_AQUA11WRAPPERTABGROUP_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTABGROUP_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTABGROUP_H
#include "aqua/aqua11ywrapper.h"
@@ -28,6 +28,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERTABGROUP_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTABGROUP_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
index 6290f154f2f0..e39fcdc6e39a 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERTEXTAREA_H
-#define _SV_AQUA11WRAPPERTEXTAREA_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTEXTAREA_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTEXTAREA_H
#include "aqua/aqua11ywrapper.h"
@@ -28,6 +28,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERTEXTAREA_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTEXTAREA_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
index 5bea6d005a8b..6c388216e565 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_AQUA11WRAPPERTOOLBAR_H
-#define _SV_AQUA11WRAPPERTOOLBAR_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTOOLBAR_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTOOLBAR_H
#include "aqua/aqua11ywrapper.h"
@@ -28,6 +28,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // _SV_AQUA11WRAPPERTOOLBAR_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTOOLBAR_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/documentfocuslistener.hxx b/vcl/aqua/source/a11y/documentfocuslistener.hxx
index 04dd215092ce..1baba33597d7 100644
--- a/vcl/aqua/source/a11y/documentfocuslistener.hxx
+++ b/vcl/aqua/source/a11y/documentfocuslistener.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DOCUMENTFOCUSLISTENER_HXX_
-#define _DOCUMENTFOCUSLISTENER_HXX_
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_DOCUMENTFOCUSLISTENER_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_DOCUMENTFOCUSLISTENER_HXX
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
@@ -87,5 +87,5 @@ private:
AquaA11yFocusTracker& m_aFocusTracker;
};
-#endif // _DOCUMENTFOCUSLISTENER_HXX_
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_DOCUMENTFOCUSLISTENER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
index a7ae636c8748..f5c579ef8965 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DATAFLAVORMAPPING_HXX_
-#define INCLUDED_DATAFLAVORMAPPING_HXX_
+#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_DATAFLAVORMAPPING_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_DATAFLAVORMAPPING_HXX
#include <com/sun/star/datatransfer/DataFlavor.hpp>
#include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
diff --git a/vcl/aqua/source/dtrans/DragSource.hxx b/vcl/aqua/source/dtrans/DragSource.hxx
index 2932a83e7cef..be4443a5e191 100644
--- a/vcl/aqua/source/dtrans/DragSource.hxx
+++ b/vcl/aqua/source/dtrans/DragSource.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DRAGSOURCE_HXX_
-#define _DRAGSOURCE_HXX_
+#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_DRAGSOURCE_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_DRAGSOURCE_HXX
#include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
diff --git a/vcl/aqua/source/dtrans/DragSourceContext.hxx b/vcl/aqua/source/dtrans/DragSourceContext.hxx
index 100edef7828b..6d8d0d9bac18 100644
--- a/vcl/aqua/source/dtrans/DragSourceContext.hxx
+++ b/vcl/aqua/source/dtrans/DragSourceContext.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DRAGSOURCECONTEXT_HXX_
-#define _DRAGSOURCECONTEXT_HXX_
+#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_DRAGSOURCECONTEXT_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_DRAGSOURCECONTEXT_HXX
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
diff --git a/vcl/aqua/source/dtrans/DropTarget.hxx b/vcl/aqua/source/dtrans/DropTarget.hxx
index 988943873e6c..9318d80b9b46 100644
--- a/vcl/aqua/source/dtrans/DropTarget.hxx
+++ b/vcl/aqua/source/dtrans/DropTarget.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DROPTARGET_HXX_
-#define _DROPTARGET_HXX_
+#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_DROPTARGET_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_DROPTARGET_HXX
#include "DataFlavorMapping.hxx"
#include <cppuhelper/compbase5.hxx>
diff --git a/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx b/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx
index 251961bd3414..393aed89fb72 100644
--- a/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx
+++ b/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_HTMLFMTFLT_HXX
-#define INCLUDED_HTMLFMTFLT_HXX
+#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_HTMLFMTFLT_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_HTMLFMTFLT_HXX
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.hxx b/vcl/aqua/source/dtrans/PictToBmpFlt.hxx
index abff9a8f7fc1..65a7771caf1d 100644
--- a/vcl/aqua/source/dtrans/PictToBmpFlt.hxx
+++ b/vcl/aqua/source/dtrans/PictToBmpFlt.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_PICTTOBMPFLT_HXX
-#define INCLUDED_PICTTOBMPFLT_HXX
+#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_PICTTOBMPFLT_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_PICTTOBMPFLT_HXX
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.hxx b/vcl/aqua/source/dtrans/aqua_clipboard.hxx
index 2e7670588ede..ba0aecd9f172 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.hxx
+++ b/vcl/aqua/source/dtrans/aqua_clipboard.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _AQUA_CLIPBOARD_HXX_
-#define _AQUA_CLIPBOARD_HXX_
+#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_AQUA_CLIPBOARD_HXX
+#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_AQUA_CLIPBOARD_HXX
#include "DataFlavorMapping.hxx"
#include <rtl/ustring.hxx>
diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx
index e2527b316b08..f4abb2fb886b 100644
--- a/vcl/generic/glyphs/gcach_ftyp.hxx
+++ b/vcl/generic/glyphs/gcach_ftyp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_GCACHFTYP_HXX
-#define _SV_GCACHFTYP_HXX
+#ifndef INCLUDED_VCL_GENERIC_GLYPHS_GCACH_FTYP_HXX
+#define INCLUDED_VCL_GENERIC_GLYPHS_GCACH_FTYP_HXX
#include "generic/glyphcache.hxx"
@@ -176,6 +176,6 @@ public:
// -----------------------------------------------------------------------
-#endif // _SV_GCACHFTYP_HXX
+#endif // INCLUDED_VCL_GENERIC_GLYPHS_GCACH_FTYP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/generic/print/glyphset.hxx b/vcl/generic/print/glyphset.hxx
index a062bb829b1b..0225109c7dd8 100644
--- a/vcl/generic/print/glyphset.hxx
+++ b/vcl/generic/print/glyphset.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PSPRINT_GLYPHSET_HXX_
-#define _PSPRINT_GLYPHSET_HXX_
+#ifndef INCLUDED_VCL_GENERIC_PRINT_GLYPHSET_HXX
+#define INCLUDED_VCL_GENERIC_PRINT_GLYPHSET_HXX
#include "vcl/fontmanager.hxx"
diff --git a/vcl/generic/print/psputil.hxx b/vcl/generic/print/psputil.hxx
index 55e3d3b4c129..e085f4704278 100644
--- a/vcl/generic/print/psputil.hxx
+++ b/vcl/generic/print/psputil.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PSPRINT_PRINTERUTIL_HXX_
-#define _PSPRINT_PRINTERUTIL_HXX_
+#ifndef INCLUDED_VCL_GENERIC_PRINT_PSPUTIL_HXX
+#define INCLUDED_VCL_GENERIC_PRINT_PSPUTIL_HXX
#include "osl/file.hxx"
@@ -65,6 +65,6 @@ ConverterFactory& GetConverterFactory ();
} /* namespace psp */
-#endif /* _PSPRINT_PRINTERUTIL_HXX_ */
+#endif // INCLUDED_VCL_GENERIC_PRINT_PSPUTIL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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: */
diff --git a/vcl/source/control/thumbpos.hxx b/vcl/source/control/thumbpos.hxx
index 4077da84359b..00e3d3c769eb 100644
--- a/vcl/source/control/thumbpos.hxx
+++ b/vcl/source/control/thumbpos.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef _VCL_THUMBPOS_HXX
-#define _VCL_THUMBPOS_HXX
+#ifndef INCLUDED_VCL_SOURCE_CONTROL_THUMBPOS_HXX
+#define INCLUDED_VCL_SOURCE_CONTROL_THUMBPOS_HXX
inline long ImplMulDiv( long nNumber, long nNumerator, long nDenominator )
{
@@ -18,6 +18,6 @@ inline long ImplMulDiv( long nNumber, long nNumerator, long nDenominator )
return (long)n;
}
-#endif // _VCL_THUMBPOS_HXX
+#endif // INCLUDED_VCL_SOURCE_CONTROL_THUMBPOS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx
index 5267029e80d6..fd91bd11e023 100644
--- a/vcl/source/edit/textdat2.hxx
+++ b/vcl/source/edit/textdat2.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TEXTDAT2_HXX
-#define _TEXTDAT2_HXX
+#ifndef INCLUDED_VCL_SOURCE_EDIT_TEXTDAT2_HXX
+#define INCLUDED_VCL_SOURCE_EDIT_TEXTDAT2_HXX
#include <vcl/seleng.hxx>
#include <vcl/virdev.hxx>
@@ -296,6 +296,6 @@ struct TextDDInfo
}
};
-#endif // _TEXTDAT2_HXX
+#endif // INCLUDED_VCL_SOURCE_EDIT_TEXTDAT2_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/edit/textdoc.hxx b/vcl/source/edit/textdoc.hxx
index 4b4afc1b5595..e00cafddd664 100644
--- a/vcl/source/edit/textdoc.hxx
+++ b/vcl/source/edit/textdoc.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _TEXTDOC_HXX
-#define _TEXTDOC_HXX
+#ifndef INCLUDED_VCL_SOURCE_EDIT_TEXTDOC_HXX
+#define INCLUDED_VCL_SOURCE_EDIT_TEXTDOC_HXX
#include <rtl/ustring.hxx>
#include <vcl/textdata.hxx>
@@ -130,6 +130,6 @@ public:
sal_Bool IsValidPaM( const TextPaM& rPaM );
};
-#endif // _TEXTDOC_HXX
+#endif // INCLUDED_VCL_SOURCE_EDIT_TEXTDOC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx
index 0678e5923971..89151854f777 100644
--- a/vcl/source/edit/textund2.hxx
+++ b/vcl/source/edit/textund2.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 _TEXTUND2_HXX
-#define _TEXTUND2_HXX
+#ifndef INCLUDED_VCL_SOURCE_EDIT_TEXTUND2_HXX
+#define INCLUDED_VCL_SOURCE_EDIT_TEXTUND2_HXX
#include "textundo.hxx"
#include <vcl/textdata.hxx>
@@ -130,6 +130,6 @@ public:
virtual OUString GetComment () const;
};
-#endif // _TEXTUND2_HXX
+#endif // INCLUDED_VCL_SOURCE_EDIT_TEXTUND2_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/edit/textundo.hxx b/vcl/source/edit/textundo.hxx
index 4d062d2f4893..2ff08a2efa8d 100644
--- a/vcl/source/edit/textundo.hxx
+++ b/vcl/source/edit/textundo.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 _TEXTUNDO_HXX
-#define _TEXTUNDO_HXX
+#ifndef INCLUDED_VCL_SOURCE_EDIT_TEXTUNDO_HXX
+#define INCLUDED_VCL_SOURCE_EDIT_TEXTUNDO_HXX
#include <svl/undo.hxx>
#include <vcl/texteng.hxx>
@@ -76,6 +76,6 @@ public:
virtual OUString GetComment() const;
};
-#endif // _TEXTUNDO_HXX
+#endif // INCLUDED_VCL_SOURCE_EDIT_TEXTUNDO_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/filter/FilterConfigCache.hxx b/vcl/source/filter/FilterConfigCache.hxx
index f8cc38bba551..a9b693e73c00 100644
--- a/vcl/source/filter/FilterConfigCache.hxx
+++ b/vcl/source/filter/FilterConfigCache.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FILTER_CONFIG_CACHE_HXX_
-#define _FILTER_CONFIG_CACHE_HXX_
+#ifndef INCLUDED_VCL_SOURCE_FILTER_FILTERCONFIGCACHE_HXX
+#define INCLUDED_VCL_SOURCE_FILTER_FILTERCONFIGCACHE_HXX
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/uno/Reference.h>
@@ -123,6 +123,6 @@ public:
~FilterConfigCache();
};
-#endif // _FILTER_CONFIG_CACHE_HXX_
+#endif // INCLUDED_VCL_SOURCE_FILTER_FILTERCONFIGCACHE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/filter/igif/decode.hxx b/vcl/source/filter/igif/decode.hxx
index cc2b25e701f7..3e1a783eaf0d 100644
--- a/vcl/source/filter/igif/decode.hxx
+++ b/vcl/source/filter/igif/decode.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DECODE_HXX
-#define _DECODE_HXX
+#ifndef INCLUDED_VCL_SOURCE_FILTER_IGIF_DECODE_HXX
+#define INCLUDED_VCL_SOURCE_FILTER_IGIF_DECODE_HXX
#include <vcl/bmpacc.hxx>
diff --git a/vcl/source/filter/igif/gifread.hxx b/vcl/source/filter/igif/gifread.hxx
index 8a839d2fcc6b..d4e7394e2ab3 100644
--- a/vcl/source/filter/igif/gifread.hxx
+++ b/vcl/source/filter/igif/gifread.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _GIFREAD_HXX
-#define _GIFREAD_HXX
+#ifndef INCLUDED_VCL_SOURCE_FILTER_IGIF_GIFREAD_HXX
+#define INCLUDED_VCL_SOURCE_FILTER_IGIF_GIFREAD_HXX
#include <vcl/graph.hxx>
#include <vcl/bmpacc.hxx>
@@ -114,6 +114,6 @@ public:
bool ImportGIF( SvStream& rStream, Graphic& rGraphic );
-#endif // _GIFREAD_HXX
+#endif // INCLUDED_VCL_SOURCE_FILTER_IGIF_GIFREAD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/filter/ixbm/xbmread.hxx b/vcl/source/filter/ixbm/xbmread.hxx
index ce2cfe079092..dc62ff446045 100644
--- a/vcl/source/filter/ixbm/xbmread.hxx
+++ b/vcl/source/filter/ixbm/xbmread.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _XBMREAD_HXX
-#define _XBMREAD_HXX
+#ifndef INCLUDED_VCL_SOURCE_FILTER_IXBM_XBMREAD_HXX
+#define INCLUDED_VCL_SOURCE_FILTER_IXBM_XBMREAD_HXX
#include <vcl/graph.hxx>
#include <vcl/bmpacc.hxx>
@@ -70,6 +70,6 @@ public:
bool ImportXBM( SvStream& rStream, Graphic& rGraphic );
-#endif // _XBMREAD_HXX
+#endif // INCLUDED_VCL_SOURCE_FILTER_IXBM_XBMREAD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/filter/ixpm/xpmread.hxx b/vcl/source/filter/ixpm/xpmread.hxx
index 3419c64c08fc..d7ede08a225f 100644
--- a/vcl/source/filter/ixpm/xpmread.hxx
+++ b/vcl/source/filter/ixpm/xpmread.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _XPMREAD_HXX
-#define _XPMREAD_HXX
+#ifndef INCLUDED_VCL_SOURCE_FILTER_IXPM_XPMREAD_HXX
+#define INCLUDED_VCL_SOURCE_FILTER_IXPM_XPMREAD_HXX
#include <vcl/bitmap.hxx>
@@ -106,6 +106,6 @@ public:
bool ImportXPM( SvStream& rStream, Graphic& rGraphic );
-#endif // _XPMREAD_HXX
+#endif // INCLUDED_VCL_SOURCE_FILTER_IXPM_XPMREAD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/filter/jpeg/Exif.hxx b/vcl/source/filter/jpeg/Exif.hxx
index 40faa581d593..4be2f94e1b1b 100644
--- a/vcl/source/filter/jpeg/Exif.hxx
+++ b/vcl/source/filter/jpeg/Exif.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _EXIF_HXX
-#define _EXIF_HXX
+#ifndef INCLUDED_VCL_SOURCE_FILTER_JPEG_EXIF_HXX
+#define INCLUDED_VCL_SOURCE_FILTER_JPEG_EXIF_HXX
#include <osl/endian.h>
#include <vcl/graph.hxx>
@@ -88,6 +88,6 @@ public :
};
-#endif // _EXIF_HXX
+#endif // INCLUDED_VCL_SOURCE_FILTER_JPEG_EXIF_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/filter/jpeg/JpegReader.hxx b/vcl/source/filter/jpeg/JpegReader.hxx
index f9c004a3c8b3..061eb2d32f4b 100644
--- a/vcl/source/filter/jpeg/JpegReader.hxx
+++ b/vcl/source/filter/jpeg/JpegReader.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _JPEG_READER_HXX
-#define _JPEG_READER_HXX
+#ifndef INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGREADER_HXX
+#define INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGREADER_HXX
#include <vcl/graph.hxx>
#include <vcl/fltcall.hxx>
@@ -57,6 +57,6 @@ public:
void* CreateBitmap( void* JPEGCreateBitmapParam );
};
-#endif //_JPEG_READER_HXX
+#endif // INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGREADER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/filter/jpeg/JpegTransform.hxx b/vcl/source/filter/jpeg/JpegTransform.hxx
index d1b84a0d8738..c3d55539a8f5 100644
--- a/vcl/source/filter/jpeg/JpegTransform.hxx
+++ b/vcl/source/filter/jpeg/JpegTransform.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _JPEG_TRANSFORM_HXX
-#define _JPEG_TRANSFORM_HXX
+#ifndef INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGTRANSFORM_HXX
+#define INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGTRANSFORM_HXX
#include <tools/solar.h>
#include <vcl/graph.hxx>
diff --git a/vcl/source/filter/jpeg/JpegWriter.hxx b/vcl/source/filter/jpeg/JpegWriter.hxx
index 4c762a2efd84..88b6352f0c1b 100644
--- a/vcl/source/filter/jpeg/JpegWriter.hxx
+++ b/vcl/source/filter/jpeg/JpegWriter.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _JPEG_WRITER_HXX
-#define _JPEG_WRITER_HXX
+#ifndef INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGWRITER_HXX
+#define INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGWRITER_HXX
#include <vcl/graph.hxx>
#include <vcl/fltcall.hxx>
@@ -53,6 +53,6 @@ public:
};
-#endif // _JPEG_WRITER_HXX
+#endif // INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGWRITER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/filter/jpeg/jpeg.h b/vcl/source/filter/jpeg/jpeg.h
index 13ccf4e67ee2..bcbe75c5f4ec 100644
--- a/vcl/source/filter/jpeg/jpeg.h
+++ b/vcl/source/filter/jpeg/jpeg.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _JPEG_H
-#define _JPEG_H
+#ifndef INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEG_H
+#define INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEG_H
#if defined( ICC )
#include <stdio.h>
diff --git a/vcl/source/filter/sgfbram.hxx b/vcl/source/filter/sgfbram.hxx
index 80a11ca6bf69..b38d72d57606 100644
--- a/vcl/source/filter/sgfbram.hxx
+++ b/vcl/source/filter/sgfbram.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SGFBRAM_HXX
-#define _SGFBRAM_HXX
+#ifndef INCLUDED_VCL_SOURCE_FILTER_SGFBRAM_HXX
+#define INCLUDED_VCL_SOURCE_FILTER_SGFBRAM_HXX
#include <tools/solar.h>
@@ -146,6 +146,6 @@ public:
RGBQuad(sal_uInt8 R, sal_uInt8 G, sal_uInt8 B) { Red=R; Grn=G; Blu=B; Fil=0; }
};
-#endif //_SGFBRAM_HXX
+#endif // INCLUDED_VCL_SOURCE_FILTER_SGFBRAM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/filter/sgffilt.hxx b/vcl/source/filter/sgffilt.hxx
index 707b326e5658..2eef485f9c50 100644
--- a/vcl/source/filter/sgffilt.hxx
+++ b/vcl/source/filter/sgffilt.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SGFFILT_HXX
-#define _SGFFILT_HXX
+#ifndef INCLUDED_VCL_SOURCE_FILTER_SGFFILT_HXX
+#define INCLUDED_VCL_SOURCE_FILTER_SGFFILT_HXX
#include <tools/urlobj.hxx>
sal_uInt8 CheckSgfTyp(SvStream& rInp, sal_uInt16& nVersion);
@@ -35,6 +35,6 @@ bool SgfSDrwFilter(SvStream& rInp, GDIMetaFile& rMtf, INetURLObject aIniPath );
#define SGV_VERSION 3 /* SGV mit anderer Version wird abgewiesen */
/* 3 entspricht StarDraw 2.00/2.01 Mrz'93 */
-#endif //_SGFFILT_HXX
+#endif // INCLUDED_VCL_SOURCE_FILTER_SGFFILT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx
index ea4a897aa266..989954133599 100644
--- a/vcl/source/filter/sgvmain.hxx
+++ b/vcl/source/filter/sgvmain.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SGVMAIN_HXX
-#define _SGVMAIN_HXX
+#ifndef INCLUDED_VCL_SOURCE_FILTER_SGVMAIN_HXX
+#define INCLUDED_VCL_SOURCE_FILTER_SGVMAIN_HXX
#include <vcl/font.hxx>
#include <vcl/outdev.hxx>
@@ -329,6 +329,6 @@ public:
SgfFontOne* GetFontDesc(sal_uInt32 ID);
};
-#endif //_SGVMAIN_HXX
+#endif // INCLUDED_VCL_SOURCE_FILTER_SGVMAIN_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/filter/sgvspln.hxx b/vcl/source/filter/sgvspln.hxx
index 8c3a57a5144b..910d243eec2b 100644
--- a/vcl/source/filter/sgvspln.hxx
+++ b/vcl/source/filter/sgvspln.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SGVSPLN_HXX
-#define _SGVSPLN_HXX
+#ifndef INCLUDED_VCL_SOURCE_FILTER_SGVSPLN_HXX
+#define INCLUDED_VCL_SOURCE_FILTER_SGVSPLN_HXX
/*************************************************************************
|*
@@ -58,6 +58,6 @@ bool CalcSpline(Polygon& rPoly, bool Periodic, sal_uInt16& n,
*************************************************************************/
bool Spline2Poly(Polygon& rSpln, bool Periodic, Polygon& rPoly);
-#endif //_SGVSPLN_HXX
+#endif // INCLUDED_VCL_SOURCE_FILTER_SGVSPLN_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/filter/wmf/emfwr.hxx b/vcl/source/filter/wmf/emfwr.hxx
index d64fbe2c45d5..54228e6cd8c6 100644
--- a/vcl/source/filter/wmf/emfwr.hxx
+++ b/vcl/source/filter/wmf/emfwr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _EMFWR_HXX
-#define _EMFWR_HXX
+#ifndef INCLUDED_VCL_SOURCE_FILTER_WMF_EMFWR_HXX
+#define INCLUDED_VCL_SOURCE_FILTER_WMF_EMFWR_HXX
#include <vcl/metaact.hxx>
#include <vcl/graph.hxx>
@@ -100,6 +100,6 @@ public:
sal_Bool WriteEMF( const GDIMetaFile& rMtf, FilterConfigItem* pConfigItem = NULL );
};
-#endif // _EMFWR_HXX
+#endif // INCLUDED_VCL_SOURCE_FILTER_WMF_EMFWR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index 99e068594fb6..14def6d888ef 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _WINMTF_HXX
-#define _WINMTF_HXX
+#ifndef INCLUDED_VCL_SOURCE_FILTER_WMF_WINMTF_HXX
+#define INCLUDED_VCL_SOURCE_FILTER_WMF_WINMTF_HXX
#ifdef DBG_UTIL
#define WIN_MTF_ASSERT
diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx
index b427a007ae70..a6850ca4b5e9 100644
--- a/vcl/source/filter/wmf/wmfwr.hxx
+++ b/vcl/source/filter/wmf/wmfwr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _WMFWR_HXX
-#define _WMFWR_HXX
+#ifndef INCLUDED_VCL_SOURCE_FILTER_WMF_WMFWR_HXX
+#define INCLUDED_VCL_SOURCE_FILTER_WMF_WMFWR_HXX
#include <vcl/metaact.hxx>
#include <vcl/graph.hxx>
diff --git a/vcl/source/fontsubset/gsub.h b/vcl/source/fontsubset/gsub.h
index 6eb898300ef0..66ac7bc3a77f 100644
--- a/vcl/source/fontsubset/gsub.h
+++ b/vcl/source/fontsubset/gsub.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PSP_GSUB_H
-#define _PSP_GSUB_H
+#ifndef INCLUDED_VCL_SOURCE_FONTSUBSET_GSUB_H
+#define INCLUDED_VCL_SOURCE_FONTSUBSET_GSUB_H
namespace vcl
{
@@ -33,6 +33,6 @@ void ReleaseGSUB( struct vcl::_TrueTypeFont* pTTFile );
}
-#endif /* _PSP_GSUB_H */
+#endif // INCLUDED_VCL_SOURCE_FONTSUBSET_GSUB_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/fontsubset/ttcr.hxx b/vcl/source/fontsubset/ttcr.hxx
index cbe3b152be7a..da9932c0600d 100644
--- a/vcl/source/fontsubset/ttcr.hxx
+++ b/vcl/source/fontsubset/ttcr.hxx
@@ -24,8 +24,8 @@
* @author Alexander Gelfenbain
*/
-#ifndef __TTCR_H
-#define __TTCR_H
+#ifndef INCLUDED_VCL_SOURCE_FONTSUBSET_TTCR_HXX
+#define INCLUDED_VCL_SOURCE_FONTSUBSET_TTCR_HXX
#include "sft.hxx"
@@ -250,6 +250,6 @@ extern "C"
void TrueTypeCreatorDispose(vcl::TrueTypeCreator *_this);
}
-#endif /* __TTCR_H */
+#endif // INCLUDED_VCL_SOURCE_FONTSUBSET_TTCR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/fontsubset/xlat.hxx b/vcl/source/fontsubset/xlat.hxx
index d7003dd8a300..2eb67832aeb5 100644
--- a/vcl/source/fontsubset/xlat.hxx
+++ b/vcl/source/fontsubset/xlat.hxx
@@ -20,8 +20,8 @@
/*| Author: Alexander Gelfenbain |*/
-#ifndef __XLAT_H
-#define __XLAT_H
+#ifndef INCLUDED_VCL_SOURCE_FONTSUBSET_XLAT_HXX
+#define INCLUDED_VCL_SOURCE_FONTSUBSET_XLAT_HXX
//####include "sft.hxx"
@@ -42,6 +42,6 @@ namespace vcl
void TranslateString16(sal_uInt16 *, sal_uInt16 *, sal_uInt32);
}
-#endif /* __XLAT_H */
+#endif // INCLUDED_VCL_SOURCE_FONTSUBSET_XLAT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/impanmvw.hxx b/vcl/source/gdi/impanmvw.hxx
index 4e20f1d8768b..8fb0df5207be 100644
--- a/vcl/source/gdi/impanmvw.hxx
+++ b/vcl/source/gdi/impanmvw.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_IMPANMVW_HXX
-#define _SV_IMPANMVW_HXX
+#ifndef INCLUDED_VCL_SOURCE_GDI_IMPANMVW_HXX
+#define INCLUDED_VCL_SOURCE_GDI_IMPANMVW_HXX
#include <vcl/animate.hxx>
diff --git a/vcl/source/gdi/impvect.hxx b/vcl/source/gdi/impvect.hxx
index 72910dd60d07..5543c13a7458 100644
--- a/vcl/source/gdi/impvect.hxx
+++ b/vcl/source/gdi/impvect.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_IMPVECT_HXX
-#define _SV_IMPVECT_HXX
+#ifndef INCLUDED_VCL_SOURCE_GDI_IMPVECT_HXX
+#define INCLUDED_VCL_SOURCE_GDI_IMPVECT_HXX
#include <tools/poly.hxx>
#include <vcl/gdimtf.hxx>
diff --git a/vcl/source/gdi/pdffontcache.hxx b/vcl/source/gdi/pdffontcache.hxx
index 84cf2504b0b1..88229e293379 100644
--- a/vcl/source/gdi/pdffontcache.hxx
+++ b/vcl/source/gdi/pdffontcache.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef VCL_PDFFONTCACHE_HXX
-#define VCL_PDFFONTCACHE_HXX
+#ifndef INCLUDED_VCL_SOURCE_GDI_PDFFONTCACHE_HXX
+#define INCLUDED_VCL_SOURCE_GDI_PDFFONTCACHE_HXX
#include <sal/types.h>
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 6296497ee84f..46020446fd48 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.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_PDFWRITER_IMPL_HXX
-#define _VCL_PDFWRITER_IMPL_HXX
+#ifndef INCLUDED_VCL_SOURCE_GDI_PDFWRITER_IMPL_HXX
+#define INCLUDED_VCL_SOURCE_GDI_PDFWRITER_IMPL_HXX
#include "vcl/pdfwriter.hxx"
#include "rtl/ustring.hxx"
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx
index cb26b67754ab..eaff1710a4c6 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.hxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DTRANS_X11_CLIPBOARD_HXX_
-#define _DTRANS_X11_CLIPBOARD_HXX_
+#ifndef INCLUDED_VCL_UNX_GENERIC_DTRANS_X11_CLIPBOARD_HXX
+#define INCLUDED_VCL_UNX_GENERIC_DTRANS_X11_CLIPBOARD_HXX
#include <X11_selection.hxx>
diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.hxx b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
index 09a7d200e4b8..abdf58e8d81d 100644
--- a/vcl/unx/generic/dtrans/X11_dndcontext.hxx
+++ b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DTRANS_X11_DNDCONTEXT_HXX
-#define _DTRANS_X11_DNDCONTEXT_HXX
+#ifndef INCLUDED_VCL_UNX_GENERIC_DTRANS_X11_DNDCONTEXT_HXX
+#define INCLUDED_VCL_UNX_GENERIC_DTRANS_X11_DNDCONTEXT_HXX
#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTargetDropContext.hpp>
@@ -93,6 +93,6 @@ namespace x11 {
};
} // namespace
-#endif // _DTRANS_X11_DNDCONTEXT_HXX
+#endif // INCLUDED_VCL_UNX_GENERIC_DTRANS_X11_DNDCONTEXT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx
index d7948f586293..5b5ad959b842 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DTRANS_X11_SELECTION_HXX_
-#define _DTRANS_X11_SELECTION_HXX_
+#ifndef INCLUDED_VCL_UNX_GENERIC_DTRANS_X11_SELECTION_HXX
+#define INCLUDED_VCL_UNX_GENERIC_DTRANS_X11_SELECTION_HXX
#include <cppuhelper/compbase3.hxx>
#include <cppuhelper/compbase4.hxx>
diff --git a/vcl/unx/generic/dtrans/X11_transferable.hxx b/vcl/unx/generic/dtrans/X11_transferable.hxx
index 6f04f91fbfd5..1a4145462b06 100644
--- a/vcl/unx/generic/dtrans/X11_transferable.hxx
+++ b/vcl/unx/generic/dtrans/X11_transferable.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DTRANS_X11_TRANSFERABLE_HXX_
-#define _DTRANS_X11_TRANSFERABLE_HXX_
+#ifndef INCLUDED_VCL_UNX_GENERIC_DTRANS_X11_TRANSFERABLE_HXX
+#define INCLUDED_VCL_UNX_GENERIC_DTRANS_X11_TRANSFERABLE_HXX
#include <X11_selection.hxx>
#include <com/sun/star/datatransfer/XTransferable.hpp>
diff --git a/vcl/unx/generic/dtrans/bmp.hxx b/vcl/unx/generic/dtrans/bmp.hxx
index 8fb93410d33a..6a0c801b0eac 100644
--- a/vcl/unx/generic/dtrans/bmp.hxx
+++ b/vcl/unx/generic/dtrans/bmp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _DTRANS_BMP_HXX_
-#define _DTRANS_BMP_HXX_
+#ifndef INCLUDED_VCL_UNX_GENERIC_DTRANS_BMP_HXX
+#define INCLUDED_VCL_UNX_GENERIC_DTRANS_BMP_HXX
#include <prex.h>
#include <X11/Xatom.h>
diff --git a/vcl/unx/generic/gdi/gcach_xpeer.hxx b/vcl/unx/generic/gdi/gcach_xpeer.hxx
index 844e9600eabe..acc1affc38e5 100644
--- a/vcl/unx/generic/gdi/gcach_xpeer.hxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_GCACH_XPEER_HXX
-#define _SV_GCACH_XPEER_HXX
+#ifndef INCLUDED_VCL_UNX_GENERIC_GDI_GCACH_XPEER_HXX
+#define INCLUDED_VCL_UNX_GENERIC_GDI_GCACH_XPEER_HXX
#include "generic/glyphcache.hxx"
@@ -41,6 +41,6 @@ public:
static void KillInstance();
};
-#endif // _SV_GCACH_XPEER_HXX
+#endif // INCLUDED_VCL_UNX_GENERIC_GDI_GCACH_XPEER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx
index e1fb1c231f46..6695fc9e59d1 100644
--- a/vcl/unx/generic/gdi/xrender_peer.hxx
+++ b/vcl/unx/generic/gdi/xrender_peer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_XRENDER_PEER_HXX
-#define _SV_XRENDER_PEER_HXX
+#ifndef INCLUDED_VCL_UNX_GENERIC_GDI_XRENDER_PEER_HXX
+#define INCLUDED_VCL_UNX_GENERIC_GDI_XRENDER_PEER_HXX
#include <prex.h>
struct _XTrap; // on some older systems this is not declared within Xrender.h
@@ -214,6 +214,6 @@ inline XRenderColor GetXRenderColor( const SalColor& rSalColor, double fTranspar
//=====================================================================
-#endif // _SV_XRENDER_PEER_HXX
+#endif // INCLUDED_VCL_UNX_GENERIC_GDI_XRENDER_PEER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/window/FWS.hxx b/vcl/unx/generic/window/FWS.hxx
index 569fe9c84a48..25acd432faf6 100644
--- a/vcl/unx/generic/window/FWS.hxx
+++ b/vcl/unx/generic/window/FWS.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FOREIGN_WINDOW_SYSTEM_HXX
-#define _FOREIGN_WINDOW_SYSTEM_HXX
+#ifndef INCLUDED_VCL_UNX_GENERIC_WINDOW_FWS_HXX
+#define INCLUDED_VCL_UNX_GENERIC_WINDOW_FWS_HXX
#include <X11/Xlib.h>
@@ -52,6 +52,6 @@ AddFwsProtocols (Display *display, Window window);
} /* extern "C" */
#endif
-#endif // _FOREIGN_WINDOW_SYSTEM_HXX
+#endif // INCLUDED_VCL_UNX_GENERIC_WINDOW_FWS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk/a11y/atkfactory.hxx b/vcl/unx/gtk/a11y/atkfactory.hxx
index 389e1749e358..dcd6f84938a5 100644
--- a/vcl/unx/gtk/a11y/atkfactory.hxx
+++ b/vcl/unx/gtk/a11y/atkfactory.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __ATK_FACTORY_HXX__
-#define __ATK_FACTORY_HXX__
+#ifndef INCLUDED_VCL_UNX_GTK_A11Y_ATKFACTORY_HXX
+#define INCLUDED_VCL_UNX_GTK_A11Y_ATKFACTORY_HXX
#include <atk/atk.h>
diff --git a/vcl/unx/gtk/a11y/atklistener.hxx b/vcl/unx/gtk/a11y/atklistener.hxx
index fdcac8715bae..c878a1fe469a 100644
--- a/vcl/unx/gtk/a11y/atklistener.hxx
+++ b/vcl/unx/gtk/a11y/atklistener.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ATK_LISTENER_HXX_
-#define _ATK_LISTENER_HXX_
+#ifndef INCLUDED_VCL_UNX_GTK_A11Y_ATKLISTENER_HXX
+#define INCLUDED_VCL_UNX_GTK_A11Y_ATKLISTENER_HXX
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
#include <cppuhelper/implbase1.hxx>
@@ -67,6 +67,6 @@ private:
const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& rxParent);
};
-#endif /* _ATK_LISTENER_HXX_ */
+#endif // INCLUDED_VCL_UNX_GTK_A11Y_ATKLISTENER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk/a11y/atkregistry.hxx b/vcl/unx/gtk/a11y/atkregistry.hxx
index e3527a5c2572..c5f70a8528e9 100644
--- a/vcl/unx/gtk/a11y/atkregistry.hxx
+++ b/vcl/unx/gtk/a11y/atkregistry.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __ATK_REGISTRY_HXX__
-#define __ATK_REGISTRY_HXX__
+#ifndef INCLUDED_VCL_UNX_GTK_A11Y_ATKREGISTRY_HXX
+#define INCLUDED_VCL_UNX_GTK_A11Y_ATKREGISTRY_HXX
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <atk/atk.h>
diff --git a/vcl/unx/gtk/a11y/atktextattributes.hxx b/vcl/unx/gtk/a11y/atktextattributes.hxx
index 7c6e997432a8..11bcffe1d665 100644
--- a/vcl/unx/gtk/a11y/atktextattributes.hxx
+++ b/vcl/unx/gtk/a11y/atktextattributes.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __ATK_ATKTEXTATTRIBUTES_HXX__
-#define __ATK_ATKTEXTATTRIBUTES_HXX__
+#ifndef INCLUDED_VCL_UNX_GTK_A11Y_ATKTEXTATTRIBUTES_HXX
+#define INCLUDED_VCL_UNX_GTK_A11Y_ATKTEXTATTRIBUTES_HXX
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/vcl/unx/gtk/a11y/atkutil.hxx b/vcl/unx/gtk/a11y/atkutil.hxx
index f6a5d554983c..f61a4bd1c595 100644
--- a/vcl/unx/gtk/a11y/atkutil.hxx
+++ b/vcl/unx/gtk/a11y/atkutil.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __ATK_UTIL_HXX__
-#define __ATK_UTIL_HXX__
+#ifndef INCLUDED_VCL_UNX_GTK_A11Y_ATKUTIL_HXX
+#define INCLUDED_VCL_UNX_GTK_A11Y_ATKUTIL_HXX
#include <atk/atk.h>
diff --git a/vcl/unx/gtk/a11y/atkwindow.hxx b/vcl/unx/gtk/a11y/atkwindow.hxx
index 36d0dfcb70f6..40dd4e83a256 100644
--- a/vcl/unx/gtk/a11y/atkwindow.hxx
+++ b/vcl/unx/gtk/a11y/atkwindow.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __ATK_WINDOW_HXX__
-#define __ATK_WINDOW_HXX__
+#ifndef INCLUDED_VCL_UNX_GTK_A11Y_ATKWINDOW_HXX
+#define INCLUDED_VCL_UNX_GTK_A11Y_ATKWINDOW_HXX
#include <atk/atk.h>
diff --git a/vcl/unx/gtk/a11y/atkwrapper.hxx b/vcl/unx/gtk/a11y/atkwrapper.hxx
index e613cfa1e90d..2b018b92a9fe 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.hxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __ATK_WRAPPER_HXX__
-#define __ATK_WRAPPER_HXX__
+#ifndef INCLUDED_VCL_UNX_GTK_A11Y_ATKWRAPPER_HXX
+#define INCLUDED_VCL_UNX_GTK_A11Y_ATKWRAPPER_HXX
#include <atk/atk.h>
#include <com/sun/star/accessibility/XAccessible.hpp>
@@ -114,6 +114,6 @@ OUStringToGChar(const OUString& rString )
#define OUStringToConstGChar( string ) OUStringToOString( string, RTL_TEXTENCODING_UTF8 ).getStr()
-#endif /* __ATK_WRAPPER_HXX__ */
+#endif // INCLUDED_VCL_UNX_GTK_A11Y_ATKWRAPPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
index 6a2df47f0707..60e886fed937 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SALGTKFILEPICKER_HXX_
-#define _SALGTKFILEPICKER_HXX_
+#ifndef INCLUDED_VCL_UNX_GTK_FPICKER_SALGTKFILEPICKER_HXX
+#define INCLUDED_VCL_UNX_GTK_FPICKER_SALGTKFILEPICKER_HXX
#include <cppuhelper/compbase5.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -308,6 +308,6 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base
virtual ~SalGtkFilePicker();
};
-#endif // _SALGTKFILEPICKER_HXX_
+#endif // INCLUDED_VCL_UNX_GTK_FPICKER_SALGTKFILEPICKER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
index 2e7aef490fa8..9e7689e0f363 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SALGTKFOLDERPICKER_HXX_
-#define _SALGTKFOLDERPICKER_HXX_
+#ifndef INCLUDED_VCL_UNX_GTK_FPICKER_SALGTKFOLDERPICKER_HXX
+#define INCLUDED_VCL_UNX_GTK_FPICKER_SALGTKFOLDERPICKER_HXX
#include <list>
#include <memory>
@@ -83,6 +83,6 @@ class SalGtkFolderPicker :
SalGtkFolderPicker& operator=( const SalGtkFolderPicker& );
};
-#endif // _SALGTKFOLDERPICKER_HXX_
+#endif // INCLUDED_VCL_UNX_GTK_FPICKER_SALGTKFOLDERPICKER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
index db3fe634f322..57889bbec785 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SALGTKFPICKER_HXX_
-#define _SALGTKFPICKER_HXX_
+#ifndef INCLUDED_VCL_UNX_GTK_FPICKER_SALGTKPICKER_HXX
+#define INCLUDED_VCL_UNX_GTK_FPICKER_SALGTKPICKER_HXX
#include <osl/mutex.hxx>
#include <cppuhelper/compbase2.hxx>
diff --git a/vcl/unx/gtk/inc/gtkprintwrapper.hxx b/vcl/unx/gtk/inc/gtkprintwrapper.hxx
index 001e967fd90d..dd92bfe53837 100644
--- a/vcl/unx/gtk/inc/gtkprintwrapper.hxx
+++ b/vcl/unx/gtk/inc/gtkprintwrapper.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef UNX_GTK_INC_GTKPRINTWRAPPER_HXX_INCLUDED
-#define UNX_GTK_INC_GTKPRINTWRAPPER_HXX_INCLUDED
+#ifndef INCLUDED_VCL_UNX_GTK_INC_GTKPRINTWRAPPER_HXX
+#define INCLUDED_VCL_UNX_GTK_INC_GTKPRINTWRAPPER_HXX
#include <boost/noncopyable.hpp>
@@ -127,6 +127,6 @@ private:
}
}
-#endif // UNX_GTK_INC_GTKPRINTWRAPPER_HXX_INCLUDED
+#endif // INCLUDED_VCL_UNX_GTK_INC_GTKPRINTWRAPPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/inc/gtkprintwrapper.hxx b/vcl/unx/gtk3/inc/gtkprintwrapper.hxx
index 21d246012e31..032080ddf6e3 100644
--- a/vcl/unx/gtk3/inc/gtkprintwrapper.hxx
+++ b/vcl/unx/gtk3/inc/gtkprintwrapper.hxx
@@ -7,11 +7,11 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef UNX_GTK3_INC_GTKPRINTWRAPPER_HXX_INCLUDED
-#define UNX_GTK3_INC_GTKPRINTWRAPPER_HXX_INCLUDED
+#ifndef INCLUDED_VCL_UNX_GTK3_INC_GTKPRINTWRAPPER_HXX
+#define INCLUDED_VCL_UNX_GTK3_INC_GTKPRINTWRAPPER_HXX
#include "../../gtk/inc/gtkprintwrapper.hxx"
-#endif // UNX_GTK3_INC_GTKPRINTWRAPPER_HXX_INCLUDED
+#endif // INCLUDED_VCL_UNX_GTK3_INC_GTKPRINTWRAPPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde/UnxCommandThread.hxx b/vcl/unx/kde/UnxCommandThread.hxx
index ef569740eaec..b893eb3559d7 100644
--- a/vcl/unx/kde/UnxCommandThread.hxx
+++ b/vcl/unx/kde/UnxCommandThread.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UNXCOMMANDTHREAD_HXX_
-#define _UNXCOMMANDTHREAD_HXX_
+#ifndef INCLUDED_VCL_UNX_KDE_UNXCOMMANDTHREAD_HXX
+#define INCLUDED_VCL_UNX_KDE_UNXCOMMANDTHREAD_HXX
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
@@ -121,6 +121,6 @@ protected:
::std::list< OUString > SAL_CALL tokenize( const OUString &rCommand );
};
-#endif // _UNXCOMMANDTHREAD_HXX_
+#endif // INCLUDED_VCL_UNX_KDE_UNXCOMMANDTHREAD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde/UnxFilePicker.hxx b/vcl/unx/kde/UnxFilePicker.hxx
index 198eba03a962..3459e64a7476 100644
--- a/vcl/unx/kde/UnxFilePicker.hxx
+++ b/vcl/unx/kde/UnxFilePicker.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UNXFILEPICKER_HXX_
-#define _UNXFILEPICKER_HXX_
+#ifndef INCLUDED_VCL_UNX_KDE_UNXFILEPICKER_HXX
+#define INCLUDED_VCL_UNX_KDE_UNXFILEPICKER_HXX
#include <cppuhelper/compbase5.hxx>
#include <osl/conditn.hxx>
@@ -167,6 +167,6 @@ private:
void sendAppendControlCommand( sal_Int16 nControlId );
};
-#endif // _UNXFILEPICKER_HXX_
+#endif // INCLUDED_VCL_UNX_KDE_UNXFILEPICKER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde/UnxNotifyThread.hxx b/vcl/unx/kde/UnxNotifyThread.hxx
index 266f190f49e9..a4529453f94e 100644
--- a/vcl/unx/kde/UnxNotifyThread.hxx
+++ b/vcl/unx/kde/UnxNotifyThread.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UNXNOTIFYTHREAD_HXX_
-#define _UNXNOTIFYTHREAD_HXX_
+#ifndef INCLUDED_VCL_UNX_KDE_UNXNOTIFYTHREAD_HXX
+#define INCLUDED_VCL_UNX_KDE_UNXNOTIFYTHREAD_HXX
#include <com/sun/star/ui/dialogs/XFilePickerListener.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -74,6 +74,6 @@ protected:
virtual void SAL_CALL run();
};
-#endif // _UNXNOTIFYTHREAD_HXX_
+#endif // INCLUDED_VCL_UNX_KDE_UNXNOTIFYTHREAD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde/fpicker/kdecommandthread.hxx b/vcl/unx/kde/fpicker/kdecommandthread.hxx
index b78592c3982e..ec7697b8040a 100644
--- a/vcl/unx/kde/fpicker/kdecommandthread.hxx
+++ b/vcl/unx/kde/fpicker/kdecommandthread.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _KDECOMMANDTHREAD_HXX_
-#define _KDECOMMANDTHREAD_HXX_
+#ifndef INCLUDED_VCL_UNX_KDE_FPICKER_KDECOMMANDTHREAD_HXX
+#define INCLUDED_VCL_UNX_KDE_FPICKER_KDECOMMANDTHREAD_HXX
#include <config_vclplug.h>
@@ -95,6 +95,6 @@ protected:
QStringList* tokenize( const QString &rString );
};
-#endif // _KDECOMMANDTHREAD_HXX_
+#endif // INCLUDED_VCL_UNX_KDE_FPICKER_KDECOMMANDTHREAD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde/fpicker/kdefilepicker.hxx b/vcl/unx/kde/fpicker/kdefilepicker.hxx
index e317a7d0e996..173e242f5cf1 100644
--- a/vcl/unx/kde/fpicker/kdefilepicker.hxx
+++ b/vcl/unx/kde/fpicker/kdefilepicker.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _KDEFILEPICKER_HXX_
-#define _KDEFILEPICKER_HXX_
+#ifndef INCLUDED_VCL_UNX_KDE_FPICKER_KDEFILEPICKER_HXX
+#define INCLUDED_VCL_UNX_KDE_FPICKER_KDEFILEPICKER_HXX
#include <config_vclplug.h>
@@ -134,6 +134,6 @@ public:
void setCurrentFilter( const QString& filter );
};
-#endif // _KDEFILEPICKER_HXX_
+#endif // INCLUDED_VCL_UNX_KDE_FPICKER_KDEFILEPICKER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde/fpicker/kdemodalityfilter.hxx b/vcl/unx/kde/fpicker/kdemodalityfilter.hxx
index fadf77d24097..f173f904d042 100644
--- a/vcl/unx/kde/fpicker/kdemodalityfilter.hxx
+++ b/vcl/unx/kde/fpicker/kdemodalityfilter.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _KDEMODALITYFILTER_HXX_
-#define _KDEMODALITYFILTER_HXX_
+#ifndef INCLUDED_VCL_UNX_KDE_FPICKER_KDEMODALITYFILTER_HXX
+#define INCLUDED_VCL_UNX_KDE_FPICKER_KDEMODALITYFILTER_HXX
#include <config_vclplug.h>
@@ -44,6 +44,6 @@ public:
virtual bool eventFilter( QObject *pObject, QEvent *pEvent );
};
-#endif // _KDEMODALITYFILTER_HXX_
+#endif // INCLUDED_VCL_UNX_KDE_FPICKER_KDEMODALITYFILTER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */