1 files changed, 36 insertions, 30 deletions

diff --git a/libopie2/opiepim/core/opimrecord.h b/libopie2/opiepim/core/opimrecord.h
index 63a3a98..4981a41 100644
--- a/libopie2/opiepim/core/opimrecord.h
+++ b/libopie2/opiepim/core/opimrecord.h
@@ -28,10 +28,8 @@
 */
-#ifndef OPIE_PIM_RECORD_H
-#define OPIE_PIM_RECORD_H
 
-#include <qdatastream.h>
-#include <qmap.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#ifndef OPIMRECORD_H
+#define OPIMRECORD_H
 
+/* OPIE */
+#include <opie2/opimxrefmanager.h>
 /*
@@ -43,5 +41,10 @@
 
-#include <opie2/opimxrefmanager.h>
+/* QT */
+#include <qdatastream.h>
+#include <qmap.h>
+#include <qstring.h>
+#include <qstringlist.h>
 
-namespace Opie {
+namespace Opie
+{
 /**
@@ -51,4 +54,5 @@ namespace Opie {
  */
-class OPimRecord : public Qtopia::Record {
-public:
+class OPimRecord : public Qtopia::Record
+{
+  public:
     /**
@@ -58,3 +62,3 @@ public:
      */
-    OPimRecord(int uid = 0);
+    OPimRecord( int uid = 0 );
     ~OPimRecord();
@@ -74,3 +78,3 @@ public:
      */
-    QStringList categoryNames( const QString& appname )const;
+    QStringList categoryNames( const QString& appname ) const;
 
@@ -91,3 +95,3 @@ public:
      */
-    virtual bool isEmpty()const;
+    virtual bool isEmpty() const;
 
@@ -96,3 +100,3 @@ public:
      */
-    virtual QString toRichText()const = 0;
+    virtual QString toRichText() const = 0;
 
@@ -101,3 +105,3 @@ public:
      */
-    virtual QString toShortText()const = 0;
+    virtual QString toShortText() const = 0;
 
@@ -106,3 +110,3 @@ public:
      */
-    virtual QString type()const = 0;
+    virtual QString type() const = 0;
 
@@ -112,4 +116,6 @@ public:
     virtual bool match( const QString &regexp ) const
-        {setLastHitField( -1 );
-            return Qtopia::Record::match(QRegExp(regexp));};
+    {
+        setLastHitField( -1 );
+        return Qtopia::Record::match( QRegExp( regexp ) );
+    };
 
@@ -120,3 +126,3 @@ public:
      */
-    int lastHitField()const;
+    int lastHitField() const;
 
@@ -125,3 +131,3 @@ public:
      */
-    virtual QMap<int, QString> toMap()const = 0;
+    virtual QMap<int, QString> toMap() const = 0;
     // virtual fromMap( const <int, QString>& map ) = 0; // Should be added in the future (eilers)
@@ -131,3 +137,3 @@ public:
      */
-    QMap<QString, QString> toExtraMap()const;
+    QMap<QString, QString> toExtraMap() const;
     void setExtraMap( const QMap<QString, QString>& );
@@ -137,3 +143,3 @@ public:
      */
-    virtual QString recordField(int)const = 0;
+    virtual QString recordField( int ) const = 0;
 
@@ -163,13 +169,13 @@ public:
      */
-    virtual bool loadFromStream(QDataStream& );
-    virtual bool saveToStream( QDataStream& stream )const;
+    virtual bool loadFromStream( QDataStream& );
+    virtual bool saveToStream( QDataStream& stream ) const;
 
-protected:
+  protected:
     // need to be const cause it is called from const methods
     mutable int m_lastHit;
-    void setLastHitField( int lastHit )const;
+    void setLastHitField( int lastHit ) const;
     Qtopia::UidGen &uidGen();
-//    QString crossToString()const;
+    //    QString crossToString()const;
 
-private:
+  private:
     class OPimRecordPrivate;
@@ -179,4 +185,4 @@ private:
 
-private:
-    void flush( const OPimXRefPartner&, QDataStream& stream )const;
+  private:
+    void flush( const OPimXRefPartner&, QDataStream& stream ) const;
     OPimXRefPartner partner( QDataStream& );