cleanup

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@400 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/OGoContentStore/ChangeLog b/OGoContentStore/ChangeLog
index 28fb309679f6e7dcfcf1a2e6a7521c034c806895..57eda4a15cb5917f074c019d782482d7341f40c4 100644 (file)
--- a/OGoContentStore/ChangeLog
+++ b/OGoContentStore/ChangeLog
@@ -1,5 +1,7 @@
 2004-10-15  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+       * OCSStringFormatter.[hm]: minor cleanup (v0.9.12)
+
        * v0.9.11
 
        * OCSStringFormatter.[hm]: new class to format strings according to

diff --git a/OGoContentStore/OCSStringFormatter.h b/OGoContentStore/OCSStringFormatter.h
index 2a25e49b842a393971d26e28bfb0443ad020b7af..0426d06a9abb878cb1d16f62071896afe8ad61b3 100644 (file)
--- a/OGoContentStore/OCSStringFormatter.h
+++ b/OGoContentStore/OCSStringFormatter.h
@@ -20,15 +20,11 @@
 */
 // $Id$
 
+#ifndef        __OGoContentStore_OCSStringFormatter_H__
+#define        __OGoContentStore_OCSStringFormatter_H__
 
-#ifndef        __OCSStringFormatter_H_
-#define        __OCSStringFormatter_H_
-
-
-#import <Foundation/Foundation.h>
 #include <NGExtensions/NSString+Escaping.h>
 
-
 @interface OCSStringFormatter : NSObject < NGStringEscaping >
 {
 }
@@ -38,4 +34,4 @@
 
 @end
 
-#endif /* __OCSStringFormatter_H_ */
+#endif /* __OGoContentStore_OCSStringFormatter_H__ */

diff --git a/OGoContentStore/OCSStringFormatter.m b/OGoContentStore/OCSStringFormatter.m
index ed43411dc139fccbc3abe6d2b51293b41776f386..d7c84a72f97ff30c1dfcfc8b6ed249adaaffbf64 100644 (file)
--- a/OGoContentStore/OCSStringFormatter.m
+++ b/OGoContentStore/OCSStringFormatter.m
@@ -20,9 +20,8 @@
 */
 // $Id$
 
-
-#import "OCSStringFormatter.h"
-
+#include "OCSStringFormatter.h"
+#include "common.h"
 
 @implementation OCSStringFormatter
 

diff --git a/OGoContentStore/Version b/OGoContentStore/Version
index 77dfcdc55efa4d681211b60854aa4c4eb3258c6a..7254d8b0fdf0b71b710f7a614642dafe4eabafe0 100644 (file)
--- a/OGoContentStore/Version
+++ b/OGoContentStore/Version
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION=0
 MINOR_VERSION=9
-SUBMINOR_VERSION:=11
+SUBMINOR_VERSION:=12
 
 # v0.9.11 requires libFoundation   v1.0.63
 # v0.9.11 requires libNGExtensions v4.3.125