1 files changed, 43 insertions, 9 deletions

diff --git a/libopie2/opiepim/core/opimresolver.h b/libopie2/opiepim/core/opimresolver.h
index 86ae3eb..1ce1619 100644
--- a/libopie2/opiepim/core/opimresolver.h
+++ b/libopie2/opiepim/core/opimresolver.h
@@ -5,4 +5,6 @@
 #include <qvaluelist.h>
 
+#include <opie/otemplatebase.h>
+
 /**
  * OPimResolver is a MetaClass to access
@@ -16,5 +18,5 @@
  * USING XML is a waste of memory!!!!!
  */
-class OPimResolver : public QObject {
+class OPimResolver {
 public:
     enum BuiltIn { TodoList = 0,
@@ -25,9 +27,10 @@ public:
 
 
-    /*
+    /**
      * return a record for a uid
-     * and an app
+     * and an service
+     * You've THE OWNERSHIP NOW!
      */
-    OPimRecord &record( const QString& service, int uid );
+    OPimRecord *record( const QString& service, int uid );
 
     /**
@@ -35,6 +38,12 @@ public:
      * When we will use Qtopia Services it will be used here
      */
-    QString qcopChannel( enum BuiltIn& )const;
-    QString qcopChannel( const QString& service );
+    QCString qcopChannel( enum BuiltIn& )const;
+    QCString qcopChannel( const QString& service )const;
+
+    /**
+     * The Application channel (QPE/Application/name)
+     */
+    QCString applicationChannel( enum BuiltIn& )const;
+    QCString applicationChannel( const QString& service )const;
 
     /**
@@ -42,5 +51,6 @@ public:
      */
     QStringList services()const;
-
+    inline QString serviceName(int rrti )const;
+    int serviceId( const QString& Service);
     /**
      * add a record to a service... ;)
@@ -48,9 +58,33 @@ public:
     bool add( const QString& service, const OPimRecord& );
 
+
+    /**
+     *  record returns an empty record for a given service.
+     *  Be sure to delete it!!!
+     *
+     */
+    OPimRecord* record( const QString& service );
+    OPimRecord* record( int rtti );
+
+    /**
+     * you can cast to your
+     */
+    OPimBase* backend( const QString& service );
+    OPimBase* backend( int rtti );
 private:
     OPimResolver();
-    OPimRecord *m_last;
+    void loadData();
+    inline bool isBuiltIn( const QString& )const;
+    OPimRecord* recordExtern( const QString&, int );
+    OPimRecord* recordExtern( const QString& );
+
+    static OPimResolver* m_self;
+    struct Data;
+    class Private;
 
-}:
+    Data* data;
+    Private* d;
+    QStringList m_builtIns;
+};
 
 #endif