summaryrefslogtreecommitdiff
path: root/libopie2
authoreilers <eilers>2003-02-18 11:55:59 (UTC)
committer eilers <eilers>2003-02-18 11:55:59 (UTC)
commit00e9f7731c19604a8e79df9e935ec833fc1937f8 (patch) (unidiff)
tree7bf9b8230832e2138af7e73740b28eafc4c33101 /libopie2
parent065f26b161f6df269cfbf9c75751c09453350995 (diff)
downloadopie-00e9f7731c19604a8e79df9e935ec833fc1937f8.zip
opie-00e9f7731c19604a8e79df9e935ec833fc1937f8.tar.gz
opie-00e9f7731c19604a8e79df9e935ec833fc1937f8.tar.bz2
Fixing categoryNames in opimrecord which was just checking for Todo List
Now we get the categories in addressbook, too !
Diffstat (limited to 'libopie2') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiepim/core/opimrecord.cpp4
-rw-r--r--libopie2/opiepim/core/opimrecord.h2
-rw-r--r--libopie2/opiepim/ocontact.cpp4
-rw-r--r--libopie2/opiepim/otodo.cpp2
4 files changed, 6 insertions, 6 deletions
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) {
30/* 30/*
31 * category names 31 * category names
32 */ 32 */
33QStringList OPimRecord::categoryNames()const { 33QStringList OPimRecord::categoryNames( const QString& appname ) const {
34 QStringList list; 34 QStringList list;
35 QArray<int> cats = categories(); 35 QArray<int> cats = categories();
36 Categories catDB; 36 Categories catDB;
37 catDB.load( categoryFileName() ); 37 catDB.load( categoryFileName() );
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
43 return list; 43 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:
38 /** 38 /**
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 /**
44 * set category names they will be resolved 44 * 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
627 text += "<b>" + QObject::tr("Nickname: ") + "</b>" 627 text += "<b>" + QObject::tr("Nickname: ") + "</b>"
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 }
635 635
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
255 } 255 }
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
261 return text; 261 return text;