1 files changed, 17 insertions, 11 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
@@ -27,12 +27,10 @@
                              Boston, MA 02111-1307, USA.
 */
-#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>
 /*
  * we need to get customMap which is private...
@@ -42,7 +40,12 @@
 #undef private
 
-#include <opie2/opimxrefmanager.h>
+/* QT */
+#include <qdatastream.h>
+#include <qmap.h>
+#include <qstring.h>
+#include <qstringlist.h>
 
-namespace Opie {
+namespace Opie
+{
 /**
  * This is the base class for
@@ -50,5 +53,6 @@ namespace Opie {
  *
  */
-class OPimRecord : public Qtopia::Record {
+class OPimRecord : public Qtopia::Record
+{
 public:
     /**
@@ -111,6 +115,8 @@ public:
      */
     virtual bool match( const QString &regexp ) const
-        {setLastHitField( -1 );
-            return Qtopia::Record::match(QRegExp(regexp));};
+    {
+        setLastHitField( -1 );
+        return Qtopia::Record::match( QRegExp( regexp ) );
+    };
 
     /**