[Libreoffice-commits] core.git: include/LibreOfficeKit

[Tor Lillqvist]

 include/LibreOfficeKit/LibreOfficeKit.h     |    7 ++++---
 include/LibreOfficeKit/LibreOfficeKit.hxx   |    8 +++++---
 include/LibreOfficeKit/LibreOfficeKitGtk.h  |    8 +++++---
 include/LibreOfficeKit/LibreOfficeKitInit.h |    6 +++---
 4 files changed, 17 insertions(+), 12 deletions(-)

New commits:
commit d1ea457ddffcb1f382f9b0aa6d3b23dbefd958a0
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Feb 2 11:03:13 2015 +0100

    Use our standard include guard naming convention
    
    Change-Id: Ida8aed52b57ca27cd7af7c3dd117345127efeb3c

diff --git a/include/LibreOfficeKit/LibreOfficeKit.h b/include/LibreOfficeKit/LibreOfficeKit.h
index 991fae4..0ec30fb 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_DESKTOP_INC_LIBREOFFICEKIT_H
-#define INCLUDED_DESKTOP_INC_LIBREOFFICEKIT_H
+#ifndef INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKIT_H
+#define INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKIT_H
 
 #include <stddef.h>
 
@@ -177,5 +177,6 @@ struct _LibreOfficeKitDocumentClass
 }
 #endif
 
-#endif
+#endif // INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKIT_H
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx
index f3b3e88..9891d49 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_DESKTOP_INC_LIBREOFFICEKIT_HXX
-#define INCLUDED_DESKTOP_INC_LIBREOFFICEKIT_HXX
+#ifndef INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKIT_HXX
+#define INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKIT_HXX
 
 #include "LibreOfficeKit.h"
 
@@ -169,5 +169,7 @@ inline Office* lok_cpp_init(const char* pInstallPath)
 }
 
 }
-#endif
+
+#endif // INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKIT_HXX
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index b3cd304..dc1eab3 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_DESKTOP_INC_LIBREOFFICEKITGTK_H
-#define INCLUDED_DESKTOP_INC_LIBREOFFICEKITGTK_H
+#ifndef INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKITGTK_H
+#define INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKITGTK_H
 
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
@@ -73,4 +73,6 @@ void            lok_docview_set_edit        (LOKDocView* pDocView,
 }
 #endif
 
-#endif
+#endif // INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKITGTK_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h b/include/LibreOfficeKit/LibreOfficeKitInit.h
index 37a1fb5..8749e49 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_DESKTOP_INC_LIBREOFFICEKIT_INIT_H
-#define INCLUDED_DESKTOP_INC_LIBREOFFICEKIT_INIT_H
+#ifndef INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKITINIT_H
+#define INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKITINIT_H
 
 #include "LibreOfficeKit.h"
 
@@ -186,6 +186,6 @@ static LibreOfficeKit *lok_init( const char *install_path )
 }
 #endif
 
-#endif
+#endif // INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKITINIT_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */