| -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 @@ -627,9 +627,9 @@ QString OContact::toRichText() const text += "<b>" + QObject::tr("Nickname: ") + "</b>" + Qtopia::escapeString(str) + "<br>"; - 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 @@ -30,14 +30,14 @@ OPimRecord &OPimRecord::operator=( const OPimRecord& rec) { /* * category names */ -QStringList OPimRecord::categoryNames()const { +QStringList OPimRecord::categoryNames( const QString& appname ) const { QStringList list; QArray<int> cats = categories(); Categories catDB; catDB.load( categoryFileName() ); for (uint i = 0; i < cats.count(); i++ ) { - list << catDB.label("Todo List", cats[i] ); + list << catDB.label( appname, cats[i] ); } return list; 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 @@ -38,7 +38,7 @@ public: /** * category names resolved */ - QStringList categoryNames()const; + QStringList categoryNames( const QString& appname )const; /** * set category names they will be resolved 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 @@ -255,7 +255,7 @@ QString OTodo::toRichText() const } text += "<b>" + QObject::tr( "Category:") + "</b> "; - text += categoryNames().join(", "); + text += categoryNames( "Todo List" ).join(", "); text += "<br>"; return text; 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 @@ -30,14 +30,14 @@ OPimRecord &OPimRecord::operator=( const OPimRecord& rec) { /* * category names */ -QStringList OPimRecord::categoryNames()const { +QStringList OPimRecord::categoryNames( const QString& appname ) const { QStringList list; QArray<int> cats = categories(); Categories catDB; catDB.load( categoryFileName() ); for (uint i = 0; i < cats.count(); i++ ) { - list << catDB.label("Todo List", cats[i] ); + list << catDB.label( appname, cats[i] ); } return list; 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 @@ -38,7 +38,7 @@ public: /** * category names resolved */ - QStringList categoryNames()const; + QStringList categoryNames( const QString& appname )const; /** * set category names they will be resolved 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 @@ -627,9 +627,9 @@ QString OContact::toRichText() const text += "<b>" + QObject::tr("Nickname: ") + "</b>" + Qtopia::escapeString(str) + "<br>"; - 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 @@ -255,7 +255,7 @@ QString OTodo::toRichText() const } text += "<b>" + QObject::tr( "Category:") + "</b> "; - text += categoryNames().join(", "); + text += categoryNames( "Todo List" ).join(", "); text += "<br>"; return text; |