-rw-r--r-- | libopie/pim/ocontact.cpp | 4 | ||||
-rw-r--r-- | libopie/pim/opimrecord.cpp | 4 | ||||
-rw-r--r-- | libopie/pim/opimrecord.h | 2 | ||||
-rw-r--r-- | libopie/pim/otodo.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiepim/core/opimrecord.cpp | 4 | ||||
-rw-r--r-- | libopie2/opiepim/core/opimrecord.h | 2 | ||||
-rw-r--r-- | libopie2/opiepim/ocontact.cpp | 4 | ||||
-rw-r--r-- | libopie2/opiepim/otodo.cpp | 2 |
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 | |||
@@ -628,7 +628,7 @@ QString OContact::toRichText() const | |||
628 | + Qtopia::escapeString(str) + "<br>"; | 628 | + Qtopia::escapeString(str) + "<br>"; |
629 | 629 | ||
630 | if ( categoryNames().count() ){ | 630 | if ( categoryNames("Contacts").count() ){ |
631 | text += "<b>" + QObject::tr( "Category:") + "</b> "; | 631 | text += "<b>" + QObject::tr( "Category:") + "</b> "; |
632 | text += categoryNames().join(", "); | 632 | text += categoryNames("Contacts").join(", "); |
633 | text += "<br>"; | 633 | text += "<br>"; |
634 | } | 634 | } |
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 | |||
@@ -31,5 +31,5 @@ OPimRecord &OPimRecord::operator=( const OPimRecord& rec) { | |||
31 | * category names | 31 | * category names |
32 | */ | 32 | */ |
33 | QStringList OPimRecord::categoryNames()const { | 33 | QStringList OPimRecord::categoryNames( const QString& appname ) const { |
34 | QStringList list; | 34 | QStringList list; |
35 | QArray<int> cats = categories(); | 35 | QArray<int> cats = categories(); |
@@ -38,5 +38,5 @@ QStringList OPimRecord::categoryNames()const { | |||
38 | 38 | ||
39 | for (uint i = 0; i < cats.count(); i++ ) { | 39 | for (uint i = 0; i < cats.count(); i++ ) { |
40 | list << catDB.label("Todo List", cats[i] ); | 40 | list << catDB.label( appname, cats[i] ); |
41 | } | 41 | } |
42 | 42 | ||
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 | |||
@@ -39,5 +39,5 @@ public: | |||
39 | * category names resolved | 39 | * category names resolved |
40 | */ | 40 | */ |
41 | QStringList categoryNames()const; | 41 | QStringList categoryNames( const QString& appname )const; |
42 | 42 | ||
43 | /** | 43 | /** |
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 | |||
@@ -256,5 +256,5 @@ QString OTodo::toRichText() const | |||
256 | 256 | ||
257 | text += "<b>" + QObject::tr( "Category:") + "</b> "; | 257 | text += "<b>" + QObject::tr( "Category:") + "</b> "; |
258 | text += categoryNames().join(", "); | 258 | text += categoryNames( "Todo List" ).join(", "); |
259 | text += "<br>"; | 259 | text += "<br>"; |
260 | 260 | ||
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 | |||
@@ -31,5 +31,5 @@ OPimRecord &OPimRecord::operator=( const OPimRecord& rec) { | |||
31 | * category names | 31 | * category names |
32 | */ | 32 | */ |
33 | QStringList OPimRecord::categoryNames()const { | 33 | QStringList OPimRecord::categoryNames( const QString& appname ) const { |
34 | QStringList list; | 34 | QStringList list; |
35 | QArray<int> cats = categories(); | 35 | QArray<int> cats = categories(); |
@@ -38,5 +38,5 @@ QStringList OPimRecord::categoryNames()const { | |||
38 | 38 | ||
39 | for (uint i = 0; i < cats.count(); i++ ) { | 39 | for (uint i = 0; i < cats.count(); i++ ) { |
40 | list << catDB.label("Todo List", cats[i] ); | 40 | list << catDB.label( appname, cats[i] ); |
41 | } | 41 | } |
42 | 42 | ||
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 | |||
@@ -39,5 +39,5 @@ public: | |||
39 | * category names resolved | 39 | * category names resolved |
40 | */ | 40 | */ |
41 | QStringList categoryNames()const; | 41 | QStringList categoryNames( const QString& appname )const; |
42 | 42 | ||
43 | /** | 43 | /** |
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 | |||
@@ -628,7 +628,7 @@ QString OContact::toRichText() const | |||
628 | + Qtopia::escapeString(str) + "<br>"; | 628 | + Qtopia::escapeString(str) + "<br>"; |
629 | 629 | ||
630 | if ( categoryNames().count() ){ | 630 | if ( categoryNames("Contacts").count() ){ |
631 | text += "<b>" + QObject::tr( "Category:") + "</b> "; | 631 | text += "<b>" + QObject::tr( "Category:") + "</b> "; |
632 | text += categoryNames().join(", "); | 632 | text += categoryNames("Contacts").join(", "); |
633 | text += "<br>"; | 633 | text += "<br>"; |
634 | } | 634 | } |
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 | |||
@@ -256,5 +256,5 @@ QString OTodo::toRichText() const | |||
256 | 256 | ||
257 | text += "<b>" + QObject::tr( "Category:") + "</b> "; | 257 | text += "<b>" + QObject::tr( "Category:") + "</b> "; |
258 | text += categoryNames().join(", "); | 258 | text += categoryNames( "Todo List" ).join(", "); |
259 | text += "<br>"; | 259 | text += "<br>"; |
260 | 260 | ||