[Libreoffice-commits] core.git: bin/fixincludeguards.sh odk/examples

[Thomas Arnhold]

 bin/fixincludeguards.sh                                     |    2 +-
 odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h    |    5 +++++
 odk/examples/cpp/complextoolbarcontrols/MyJob.h             |    4 ++--
 odk/examples/cpp/complextoolbarcontrols/MyListener.h        |    6 +++---
 odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h |    4 ++--
 5 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit e0f08c06aa49e9c3d63f57ffb643d0eba561096e
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Sun May 18 14:05:42 2014 +0200

    fixincludeguards.pl: handle odk/examples
    
    Now we have nice example header guards ;)
    
    Change-Id: I1a5f8031cf267abf67dc4fbb20880d23e3640867

diff --git a/bin/fixincludeguards.sh b/bin/fixincludeguards.sh
index 4c3e409..6bdb59e 100755
--- a/bin/fixincludeguards.sh
+++ b/bin/fixincludeguards.sh
@@ -28,7 +28,7 @@ for fn in "$@"; do
 
     # global header in include/ top level dir:
     # drop the project dir
-    fnfixed=`echo $fn | sed 's/include\///g'`
+    fnfixed=`echo $fn | sed 's/\(include\|odk\/examples\/cpp\)\///g'`
 
     # convert file path to header guard
     guard=`echo "$fnfixed" | sed 's/[\/\.-]/_/g' | tr 'a-z' 'A-Z'`
diff --git a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h
index 0fe4bd0..c529a0a 100644
--- a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h
+++ b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#ifndef INCLUDED_COMPLEXTOOLBARCONTROLS_LISTENERHELPER_H
+#define INCLUDED_COMPLEXTOOLBARCONTROLS_LISTENERHELPER_H
+
 #include <map>
 #include <vector>
 
@@ -77,4 +80,6 @@ public:
     virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aEvent ) throw (com::sun::star::uno::RuntimeException);
 };
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyJob.h b/odk/examples/cpp/complextoolbarcontrols/MyJob.h
index b6ac4be..4c02cc6 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyJob.h
+++ b/odk/examples/cpp/complextoolbarcontrols/MyJob.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MyJob_HXX
-#define _MyJob_HXX
+#ifndef INCLUDED_COMPLEXTOOLBARCONTROLS_MYJOB_H
+#define INCLUDED_COMPLEXTOOLBARCONTROLS_MYJOB_H
 
 #include <com/sun/star/task/XJob.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyListener.h b/odk/examples/cpp/complextoolbarcontrols/MyListener.h
index 12d485c..6a6c7e1 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyListener.h
+++ b/odk/examples/cpp/complextoolbarcontrols/MyListener.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MyListener_HXX
-#define _MyListener_HXX
+#ifndef INCLUDED_COMPLEXTOOLBARCONTROLS_MYLISTENER_H
+#define INCLUDED_COMPLEXTOOLBARCONTROLS_MYLISTENER_H
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/task/XJob.hpp>
@@ -108,6 +108,6 @@ class WriterListener : public cppu::WeakImplHelper1< css::document::XEventListen
         throw (css::uno::RuntimeException);
 };
 
-#endif // _MyListener_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
index 026cf42..830cded 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
+++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MyProtocolHandler_HXX
-#define _MyProtocolHandler_HXX
+#ifndef INCLUDED_COMPLEXTOOLBARCONTROLS_MYPROTOCOLHANDLER_H
+#define INCLUDED_COMPLEXTOOLBARCONTROLS_MYPROTOCOLHANDLER_H
 
 #include <com/sun/star/awt/XToolkit2.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>