1 files changed, 24 insertions, 19 deletions

diff --git a/libopie2/opiepim/ocontact.h b/libopie2/opiepim/ocontact.h
index 34888dc..445fd7d 100644
--- a/libopie2/opiepim/ocontact.h
+++ b/libopie2/opiepim/ocontact.h
@@ -27,10 +27,13 @@
                              Boston, MA 02111-1307, USA.
 */
-#ifndef __OCONTACT_H__
-#define __OCONTACT_H__
 
+#ifndef OCONTACT_H
+#define OCONTACT_H
+
+/* OPIE */
 #include <opie2/opimrecord.h>
 #include <qpe/recordfields.h>
 
+/* QT */
 #include <qdatetime.h>
 #include <qstringlist.h>
@@ -42,5 +45,6 @@ QPC_TEMPLATEEXTERN template class QPC_EXPORT QMap<int, QString>;
 #endif
 
-namespace Opie {
+namespace Opie
+{
 class OContactPrivate;
 
@@ -55,5 +59,6 @@ class QPC_EXPORT OContact : public OPimRecord
 {
     friend class DataSet;
-public:
+
+  public:
     OContact();
     OContact( const QMap<int, QString> &fromMap );
@@ -61,6 +66,6 @@ public:
 
     enum DateFormat{
-            Zip_City_State = 0,
-            City_State_Zip
+        Zip_City_State = 0,
+        City_State_Zip
     };
 
@@ -125,11 +130,11 @@ public:
 
     // other
-    void setNotes( const QString &v ) { replace( Qtopia::Notes, v); }
+    void setNotes( const QString &v ) { replace( Qtopia::Notes, v ); }
 
     virtual bool match( const QRegExp &regexp ) const;
 
-//     // custom
-//     void setCustomField( const QString &key, const QString &v )
-//         { replace(Custom- + key, v ); }
+    //     // custom
+    //     void setCustomField( const QString &key, const QString &v )
+    //         { replace(Custom- + key, v ); }
 
     // name
@@ -186,5 +191,5 @@ public:
     QString assistant() const { return find( Qtopia::Assistant ); }
     QString manager() const { return find( Qtopia::Manager ); }
-     /** Multi line string containing all non-empty address info in the form
+    /** Multi line string containing all non-empty address info in the form
     * Street
     * City, State Zip
@@ -214,7 +219,7 @@ public:
     void setUid( int i );
 
-    QString toShortText()const;
-    QString type()const;
-    class QString recordField(int) const;
+    QString toShortText() const;
+    QString type() const;
+    class QString recordField( int ) const;
 
     // Why private ? (eilers,se)
@@ -226,5 +231,5 @@ public:
     static int rtti();
 
-private:
+  private:
     // The XML Backend needs some access to the private functions
     friend class OContactAccessBackend_XML;
@@ -238,8 +243,8 @@ private:
 
     QString displayAddress( const QString &street,
-                            const QString &city,
-                            const QString &state,
-                            const QString &zip,
-                            const QString &country ) const;
+                            const QString &city,
+                            const QString &state,
+                            const QString &zip,
+                            const QString &country ) const;
 
     QMap<int, QString> mMap;