-rw-r--r-- | libopie/pim/opimrecord.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiepim/core/opimrecord.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libopie/pim/opimrecord.cpp b/libopie/pim/opimrecord.cpp index 9510357..0c9734d 100644 --- a/libopie/pim/opimrecord.cpp +++ b/libopie/pim/opimrecord.cpp | |||
@@ -2,48 +2,50 @@ | |||
2 | 2 | ||
3 | #include <qpe/categories.h> | 3 | #include <qpe/categories.h> |
4 | #include <qpe/categoryselect.h> | 4 | #include <qpe/categoryselect.h> |
5 | 5 | ||
6 | #include "opimrecord.h" | 6 | #include "opimrecord.h" |
7 | 7 | ||
8 | Qtopia::UidGen OPimRecord::m_uidGen( Qtopia::UidGen::Qtopia ); | 8 | Qtopia::UidGen OPimRecord::m_uidGen( Qtopia::UidGen::Qtopia ); |
9 | 9 | ||
10 | 10 | ||
11 | OPimRecord::OPimRecord( int uid ) | 11 | OPimRecord::OPimRecord( int uid ) |
12 | : Qtopia::Record() { | 12 | : Qtopia::Record() { |
13 | 13 | ||
14 | m_lastHit = -1; | 14 | m_lastHit = -1; |
15 | setUid( uid ); | 15 | setUid( uid ); |
16 | } | 16 | } |
17 | OPimRecord::~OPimRecord() { | 17 | OPimRecord::~OPimRecord() { |
18 | } | 18 | } |
19 | OPimRecord::OPimRecord( const OPimRecord& rec ) | 19 | OPimRecord::OPimRecord( const OPimRecord& rec ) |
20 | : Qtopia::Record( rec ) | 20 | : Qtopia::Record( rec ) |
21 | { | 21 | { |
22 | (*this) = rec; | 22 | (*this) = rec; |
23 | } | 23 | } |
24 | 24 | ||
25 | OPimRecord &OPimRecord::operator=( const OPimRecord& rec) { | 25 | OPimRecord &OPimRecord::operator=( const OPimRecord& rec) { |
26 | if ( this == &rec ) return *this; | ||
27 | |||
26 | Qtopia::Record::operator=( rec ); | 28 | Qtopia::Record::operator=( rec ); |
27 | m_xrefman = rec.m_xrefman; | 29 | m_xrefman = rec.m_xrefman; |
28 | m_lastHit = rec.m_lastHit; | 30 | m_lastHit = rec.m_lastHit; |
29 | 31 | ||
30 | return *this; | 32 | return *this; |
31 | } | 33 | } |
32 | /* | 34 | /* |
33 | * category names | 35 | * category names |
34 | */ | 36 | */ |
35 | QStringList OPimRecord::categoryNames( const QString& appname ) const { | 37 | QStringList OPimRecord::categoryNames( const QString& appname ) const { |
36 | QStringList list; | 38 | QStringList list; |
37 | QArray<int> cats = categories(); | 39 | QArray<int> cats = categories(); |
38 | Categories catDB; | 40 | Categories catDB; |
39 | catDB.load( categoryFileName() ); | 41 | catDB.load( categoryFileName() ); |
40 | 42 | ||
41 | for (uint i = 0; i < cats.count(); i++ ) { | 43 | for (uint i = 0; i < cats.count(); i++ ) { |
42 | list << catDB.label( appname, cats[i] ); | 44 | list << catDB.label( appname, cats[i] ); |
43 | } | 45 | } |
44 | 46 | ||
45 | return list; | 47 | return list; |
46 | } | 48 | } |
47 | void OPimRecord::setCategoryNames( const QStringList& ) { | 49 | void OPimRecord::setCategoryNames( const QStringList& ) { |
48 | 50 | ||
49 | } | 51 | } |
diff --git a/libopie2/opiepim/core/opimrecord.cpp b/libopie2/opiepim/core/opimrecord.cpp index 9510357..0c9734d 100644 --- a/libopie2/opiepim/core/opimrecord.cpp +++ b/libopie2/opiepim/core/opimrecord.cpp | |||
@@ -2,48 +2,50 @@ | |||
2 | 2 | ||
3 | #include <qpe/categories.h> | 3 | #include <qpe/categories.h> |
4 | #include <qpe/categoryselect.h> | 4 | #include <qpe/categoryselect.h> |
5 | 5 | ||
6 | #include "opimrecord.h" | 6 | #include "opimrecord.h" |
7 | 7 | ||
8 | Qtopia::UidGen OPimRecord::m_uidGen( Qtopia::UidGen::Qtopia ); | 8 | Qtopia::UidGen OPimRecord::m_uidGen( Qtopia::UidGen::Qtopia ); |
9 | 9 | ||
10 | 10 | ||
11 | OPimRecord::OPimRecord( int uid ) | 11 | OPimRecord::OPimRecord( int uid ) |
12 | : Qtopia::Record() { | 12 | : Qtopia::Record() { |
13 | 13 | ||
14 | m_lastHit = -1; | 14 | m_lastHit = -1; |
15 | setUid( uid ); | 15 | setUid( uid ); |
16 | } | 16 | } |
17 | OPimRecord::~OPimRecord() { | 17 | OPimRecord::~OPimRecord() { |
18 | } | 18 | } |
19 | OPimRecord::OPimRecord( const OPimRecord& rec ) | 19 | OPimRecord::OPimRecord( const OPimRecord& rec ) |
20 | : Qtopia::Record( rec ) | 20 | : Qtopia::Record( rec ) |
21 | { | 21 | { |
22 | (*this) = rec; | 22 | (*this) = rec; |
23 | } | 23 | } |
24 | 24 | ||
25 | OPimRecord &OPimRecord::operator=( const OPimRecord& rec) { | 25 | OPimRecord &OPimRecord::operator=( const OPimRecord& rec) { |
26 | if ( this == &rec ) return *this; | ||
27 | |||
26 | Qtopia::Record::operator=( rec ); | 28 | Qtopia::Record::operator=( rec ); |
27 | m_xrefman = rec.m_xrefman; | 29 | m_xrefman = rec.m_xrefman; |
28 | m_lastHit = rec.m_lastHit; | 30 | m_lastHit = rec.m_lastHit; |
29 | 31 | ||
30 | return *this; | 32 | return *this; |
31 | } | 33 | } |
32 | /* | 34 | /* |
33 | * category names | 35 | * category names |
34 | */ | 36 | */ |
35 | QStringList OPimRecord::categoryNames( const QString& appname ) const { | 37 | QStringList OPimRecord::categoryNames( const QString& appname ) const { |
36 | QStringList list; | 38 | QStringList list; |
37 | QArray<int> cats = categories(); | 39 | QArray<int> cats = categories(); |
38 | Categories catDB; | 40 | Categories catDB; |
39 | catDB.load( categoryFileName() ); | 41 | catDB.load( categoryFileName() ); |
40 | 42 | ||
41 | for (uint i = 0; i < cats.count(); i++ ) { | 43 | for (uint i = 0; i < cats.count(); i++ ) { |
42 | list << catDB.label( appname, cats[i] ); | 44 | list << catDB.label( appname, cats[i] ); |
43 | } | 45 | } |
44 | 46 | ||
45 | return list; | 47 | return list; |
46 | } | 48 | } |
47 | void OPimRecord::setCategoryNames( const QStringList& ) { | 49 | void OPimRecord::setCategoryNames( const QStringList& ) { |
48 | 50 | ||
49 | } | 51 | } |