diff options
| author | Ted Gould <ted@gould.cx> | 2008-11-21 05:24:08 +0000 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2008-11-21 05:24:08 +0000 |
| commit | 44a3a78fb6a3863c0c7f3c1193837337e68a67e4 (patch) | |
| tree | 1722ee5ec6f88c881cd4124923354b3c1311501b /src/bind | |
| parent | Merge from trunk (diff) | |
| download | inkscape-44a3a78fb6a3863c0c7f3c1193837337e68a67e4.tar.gz inkscape-44a3a78fb6a3863c0c7f3c1193837337e68a67e4.zip | |
Merge from fe-moved
(bzr r6891)
Diffstat (limited to 'src/bind')
| -rw-r--r-- | src/bind/dobinding.cpp | 5 | ||||
| -rw-r--r-- | src/bind/javabind-private.h | 11 | ||||
| -rw-r--r-- | src/bind/javabind.cpp | 3 | ||||
| -rw-r--r-- | src/bind/javabind.h | 8 |
4 files changed, 15 insertions, 12 deletions
diff --git a/src/bind/dobinding.cpp b/src/bind/dobinding.cpp index 6f9010533..1ba708ed7 100644 --- a/src/bind/dobinding.cpp +++ b/src/bind/dobinding.cpp @@ -1,6 +1,7 @@ /** - * This is a simple mechanism to bind Inkscape to Java, and thence - * to all of the nice things that can be layered upon that. + * @file + * @brief This is a simple mechanism to bind Inkscape to Java, and thence + * to all of the nice things that can be layered upon that. * * Authors: * Bob Jamison diff --git a/src/bind/javabind-private.h b/src/bind/javabind-private.h index 2530bd735..a03f0c1a2 100644 --- a/src/bind/javabind-private.h +++ b/src/bind/javabind-private.h @@ -1,7 +1,6 @@ -#ifndef __JAVABIND_PRIVATE_H__ -#define __JAVABIND_PRIVATE_H__ /** - * This is a simple mechanism to bind Inkscape to Java, and thence + * @file + * @brief This is a simple mechanism to bind Inkscape to Java, and thence * to all of the nice things that can be layered upon that. * * Authors: @@ -24,12 +23,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <jni.h> +#ifndef __JAVABIND_PRIVATE_H__ +#define __JAVABIND_PRIVATE_H__ +#include <jni.h> #include "javabind.h" - - namespace Inkscape { diff --git a/src/bind/javabind.cpp b/src/bind/javabind.cpp index e0e246d48..cb8c778b1 100644 --- a/src/bind/javabind.cpp +++ b/src/bind/javabind.cpp @@ -1,5 +1,6 @@ /** - * This is a simple mechanism to bind Inkscape to Java, and thence + * @file + * @brief This is a simple mechanism to bind Inkscape to Java, and thence * to all of the nice things that can be layered upon that. * * Authors: diff --git a/src/bind/javabind.h b/src/bind/javabind.h index 6ea896a2c..894f52d5d 100644 --- a/src/bind/javabind.h +++ b/src/bind/javabind.h @@ -1,7 +1,6 @@ -#ifndef __JAVABIND_H__ -#define __JAVABIND_H__ /** - * This is a simple mechanism to bind Inkscape to Java, and thence + * @file + * @brief This is a simple mechanism to bind Inkscape to Java, and thence * to all of the nice things that can be layered upon that. * * Authors: @@ -24,6 +23,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef __JAVABIND_H__ +#define __JAVABIND_H__ + #include <glibmm.h> #include <vector> |