summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-10-22 17:03:24 +0200
committerCaolán McNamara <caolanm@redhat.com>2013-10-23 10:28:07 +0000
commitf852bda5ecf68c9450925bc95138509ffadb4a43 (patch)
treeccb34263bd4a07f7fbc0aa57c487ec9c10331d0f /framework
parentb009e8fd4fce06d9abae8aaac8750ece7df212e4 (diff)
clean up some include guards
Conflicts: sw/source/ui/inc/content.hxx Change-Id: I58d81881271fc6e3320bf3b5f1321594b28614a6 Reviewed-on: https://gerrit.libreoffice.org/6388 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/helper/uiconfigelementwrapperbase.hxx6
-rw-r--r--framework/inc/services/license.hxx6
-rw-r--r--framework/inc/uiconfiguration/moduleimagemanager.hxx6
3 files changed, 9 insertions, 9 deletions
diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx
index c5910ad1ac9f..1c13f14e50bf 100644
--- a/framework/inc/helper/uiconfigelementwrapperbase.hxx
+++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __FRAMEWORK_HELPER_UICONFIGELEMENTWRAPPERBASE_HXX_
-#define __FRAMEWORK_HELPER_UICONFIGELEMENTWRAPPERBASE_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_HELPER_UICONFIGELEMENTWRAPPERBASE_HXX
+#define INCLUDED_FRAMEWORK_INC_HELPER_UICONFIGELEMENTWRAPPERBASE_HXX
#include <threadhelp/threadhelpbase.hxx>
#include <macros/generic.hxx>
@@ -142,6 +142,6 @@ class UIConfigElementWrapperBase : protected ThreadHelpBase
} // namespace framework
-#endif // __FRAMEWORK_HELPER_UIELEMENTWRAPPERBASE_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_HELPER_UICONFIGELEMENTWRAPPERBASE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/license.hxx b/framework/inc/services/license.hxx
index 1095101cfd61..5652e30e2724 100644
--- a/framework/inc/services/license.hxx
+++ b/framework/inc/services/license.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __FRAMEWORK_SERVICES_LICENSE_HXX_
-#define __FRAMEWORK_SERVICES_LICENSE_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_LICENSE_HXX
+#define INCLUDED_FRAMEWORK_INC_SERVICES_LICENSE_HXX
/** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
with solaris headers ...
@@ -78,6 +78,6 @@ namespace framework
} // namespace framework
-#endif // __FRAMEWORK_SERVICES_LAYOUTMANAGER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_SERVICES_LICENSE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index 56924214da82..59ab58324ddc 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __FRAMEWORK_UICONFIGURATION_MODULEIMAGEMANAGER_HXX_
-#define __FRAMEWORK_UICONFIGURATION_MODULEIMAGEMANAGER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX
+#define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX
/** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
@@ -101,6 +101,6 @@ namespace framework
};
}
-#endif // __FRAMEWORK_UICONFIGURATION_MODULEUICONFIGMANAGER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */