Fixing categoryNames in opimrecord which was just checking for Todo List

Now we get the categories in addressbook, too !

8 files changed, 12 insertions, 12 deletions

diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index 178559b..9cccfc8 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -629,5 +629,5 @@ QString OContact::toRichText() const
 
-    if ( categoryNames().count() ){
+    if ( categoryNames("Contacts").count() ){
             text += "<b>" + QObject::tr( "Category:") + "</b> ";
-            text += categoryNames().join(", ");
+            text += categoryNames("Contacts").join(", ");
             text += "<br>";
diff --git a/libopie/pim/opimrecord.cpp b/libopie/pim/opimrecord.cpp
index ac0f4a9..d45417a 100644
--- a/libopie/pim/opimrecord.cpp
+++ b/libopie/pim/opimrecord.cpp
@@ -32,3 +32,3 @@ OPimRecord &OPimRecord::operator=( const OPimRecord& rec) {
  */
-QStringList OPimRecord::categoryNames()const {
+QStringList OPimRecord::categoryNames( const QString& appname ) const {
     QStringList list;
@@ -39,3 +39,3 @@ QStringList OPimRecord::categoryNames()const {
     for (uint i = 0; i < cats.count(); i++ ) {
-        list << catDB.label("Todo List", cats[i] );
+        list << catDB.label( appname, cats[i] );
     }
diff --git a/libopie/pim/opimrecord.h b/libopie/pim/opimrecord.h
index 665530f..c7f9460 100644
--- a/libopie/pim/opimrecord.h
+++ b/libopie/pim/opimrecord.h
@@ -40,3 +40,3 @@ public:
      */
-    QStringList categoryNames()const;
+    QStringList categoryNames( const QString& appname )const;
 
diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp
index cde2b3d..b4d4aa9 100644
--- a/libopie/pim/otodo.cpp
+++ b/libopie/pim/otodo.cpp
@@ -257,3 +257,3 @@ QString OTodo::toRichText() const
   text += "<b>" + QObject::tr( "Category:") + "</b> ";
-  text += categoryNames().join(", ");
+  text += categoryNames( "Todo List" ).join(", ");
   text += "<br>";
diff --git a/libopie2/opiepim/core/opimrecord.cpp b/libopie2/opiepim/core/opimrecord.cpp
index ac0f4a9..d45417a 100644
--- a/libopie2/opiepim/core/opimrecord.cpp
+++ b/libopie2/opiepim/core/opimrecord.cpp
@@ -32,3 +32,3 @@ OPimRecord &OPimRecord::operator=( const OPimRecord& rec) {
  */
-QStringList OPimRecord::categoryNames()const {
+QStringList OPimRecord::categoryNames( const QString& appname ) const {
     QStringList list;
@@ -39,3 +39,3 @@ QStringList OPimRecord::categoryNames()const {
     for (uint i = 0; i < cats.count(); i++ ) {
-        list << catDB.label("Todo List", cats[i] );
+        list << catDB.label( appname, cats[i] );
     }
diff --git a/libopie2/opiepim/core/opimrecord.h b/libopie2/opiepim/core/opimrecord.h
index 665530f..c7f9460 100644
--- a/libopie2/opiepim/core/opimrecord.h
+++ b/libopie2/opiepim/core/opimrecord.h
@@ -40,3 +40,3 @@ public:
      */
-    QStringList categoryNames()const;
+    QStringList categoryNames( const QString& appname )const;
 
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index 178559b..9cccfc8 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -629,5 +629,5 @@ QString OContact::toRichText() const
 
-    if ( categoryNames().count() ){
+    if ( categoryNames("Contacts").count() ){
             text += "<b>" + QObject::tr( "Category:") + "</b> ";
-            text += categoryNames().join(", ");
+            text += categoryNames("Contacts").join(", ");
             text += "<br>";
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp
index cde2b3d..b4d4aa9 100644
--- a/libopie2/opiepim/otodo.cpp
+++ b/libopie2/opiepim/otodo.cpp
@@ -257,3 +257,3 @@ QString OTodo::toRichText() const
   text += "<b>" + QObject::tr( "Category:") + "</b> ";
-  text += categoryNames().join(", ");
+  text += categoryNames( "Todo List" ).join(", ");
   text += "<br>";