author | zecke <zecke> | 2003-05-24 08:45:50 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-05-24 08:45:50 (UTC) |
commit | 3fb06f85a52b6fcbece50ed30c196efc2a91e8ce (patch) (unidiff) | |
tree | 618d3b21756a07fad10e1e1359bd12a0e7e15089 | |
parent | 694ff39fe4f0f4164edd7a2a80abe6be3a4fa2f9 (diff) | |
download | opie-3fb06f85a52b6fcbece50ed30c196efc2a91e8ce.zip opie-3fb06f85a52b6fcbece50ed30c196efc2a91e8ce.tar.gz opie-3fb06f85a52b6fcbece50ed30c196efc2a91e8ce.tar.bz2 |
don't crash when compiled with gcc3
one Contact in libqpe
one Contact in addresslist.h
a nice game of russian roulette gcc3 lost...
-rw-r--r-- | noncore/net/mailit/addresslist.cpp | 16 | ||||
-rw-r--r-- | noncore/net/mailit/addresslist.h | 6 | ||||
-rw-r--r-- | noncore/net/mailit/writemail.cpp | 4 | ||||
-rw-r--r-- | noncore/unsupported/mailit/addresslist.cpp | 16 | ||||
-rw-r--r-- | noncore/unsupported/mailit/addresslist.h | 6 | ||||
-rw-r--r-- | noncore/unsupported/mailit/writemail.cpp | 4 |
6 files changed, 26 insertions, 26 deletions
diff --git a/noncore/net/mailit/addresslist.cpp b/noncore/net/mailit/addresslist.cpp index 18d14bc..f2b027c 100644 --- a/noncore/net/mailit/addresslist.cpp +++ b/noncore/net/mailit/addresslist.cpp | |||
@@ -44,5 +44,5 @@ void AddressList::addContact(const QString &email, const QString &name) | |||
44 | 44 | ||
45 | if ( ! containsEmail(email) ) { | 45 | if ( ! containsEmail(email) ) { |
46 | Contact *in = new Contact; | 46 | AContact *in = new AContact; |
47 | in->email = email; | 47 | in->email = email; |
48 | in->name = name; | 48 | in->name = name; |
@@ -66,9 +66,9 @@ QString AddressList::getNameByEmail(const QString &email) | |||
66 | int pos = getEmailRef(email); | 66 | int pos = getEmailRef(email); |
67 | if (pos != -1) { | 67 | if (pos != -1) { |
68 | Contact *ptr = addresses.at(pos); | 68 | AContact *ptr = addresses.at(pos); |
69 | return ptr->name; | 69 | return ptr->name; |
70 | } | 70 | } |
71 | 71 | ||
72 | return NULL; | 72 | return QString::null; |
73 | } | 73 | } |
74 | 74 | ||
@@ -77,9 +77,9 @@ QString AddressList::getEmailByName(const QString &name) | |||
77 | int pos = getNameRef(name); | 77 | int pos = getNameRef(name); |
78 | if (pos != -1) { | 78 | if (pos != -1) { |
79 | Contact *ptr = addresses.at(pos); | 79 | AContact *ptr = addresses.at(pos); |
80 | return ptr->email; | 80 | return ptr->email; |
81 | } | 81 | } |
82 | 82 | ||
83 | return NULL; | 83 | return QString::null; |
84 | } | 84 | } |
85 | 85 | ||
@@ -87,5 +87,5 @@ int AddressList::getEmailRef(const QString &email) | |||
87 | { | 87 | { |
88 | int pos = 0; | 88 | int pos = 0; |
89 | Contact *ptr; | 89 | AContact *ptr; |
90 | 90 | ||
91 | for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) { | 91 | for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) { |
@@ -100,5 +100,5 @@ int AddressList::getNameRef(const QString &name) | |||
100 | { | 100 | { |
101 | int pos = 0; | 101 | int pos = 0; |
102 | Contact *ptr; | 102 | AContact *ptr; |
103 | 103 | ||
104 | for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) { | 104 | for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) { |
@@ -110,5 +110,5 @@ int AddressList::getNameRef(const QString &name) | |||
110 | } | 110 | } |
111 | 111 | ||
112 | QList<Contact>* AddressList::getContactList() | 112 | QList<AContact>* AddressList::getContactList() |
113 | { | 113 | { |
114 | return &addresses; | 114 | return &addresses; |
diff --git a/noncore/net/mailit/addresslist.h b/noncore/net/mailit/addresslist.h index b46d467..763b6d4 100644 --- a/noncore/net/mailit/addresslist.h +++ b/noncore/net/mailit/addresslist.h | |||
@@ -24,5 +24,5 @@ | |||
24 | #include <qlist.h> | 24 | #include <qlist.h> |
25 | 25 | ||
26 | struct Contact | 26 | struct AContact |
27 | { | 27 | { |
28 | QString email; | 28 | QString email; |
@@ -42,5 +42,5 @@ public: | |||
42 | QString getNameByEmail(const QString &email); | 42 | QString getNameByEmail(const QString &email); |
43 | QString getEmailByName(const QString &name); | 43 | QString getEmailByName(const QString &name); |
44 | QList<Contact>* getContactList(); | 44 | QList<AContact>* getContactList(); |
45 | 45 | ||
46 | private: | 46 | private: |
@@ -51,5 +51,5 @@ private: | |||
51 | 51 | ||
52 | private: | 52 | private: |
53 | QList<Contact> addresses; | 53 | QList<AContact> addresses; |
54 | QString filename; | 54 | QString filename; |
55 | bool dirty; | 55 | bool dirty; |
diff --git a/noncore/net/mailit/writemail.cpp b/noncore/net/mailit/writemail.cpp index c75494e..0298cb3 100644 --- a/noncore/net/mailit/writemail.cpp +++ b/noncore/net/mailit/writemail.cpp | |||
@@ -38,10 +38,10 @@ WriteMail::~WriteMail() | |||
38 | void WriteMail::setAddressList(AddressList *list) | 38 | void WriteMail::setAddressList(AddressList *list) |
39 | { | 39 | { |
40 | Contact *cPtr; | 40 | AContact *cPtr; |
41 | 41 | ||
42 | addressList = list; | 42 | addressList = list; |
43 | 43 | ||
44 | addressView->clear(); | 44 | addressView->clear(); |
45 | QList<Contact> *cListPtr = addressList->getContactList(); | 45 | QList<AContact> *cListPtr = addressList->getContactList(); |
46 | QListViewItem *item; | 46 | QListViewItem *item; |
47 | for (cPtr = cListPtr->first(); cPtr != 0; cPtr = cListPtr->next() ) { | 47 | for (cPtr = cListPtr->first(); cPtr != 0; cPtr = cListPtr->next() ) { |
diff --git a/noncore/unsupported/mailit/addresslist.cpp b/noncore/unsupported/mailit/addresslist.cpp index 18d14bc..f2b027c 100644 --- a/noncore/unsupported/mailit/addresslist.cpp +++ b/noncore/unsupported/mailit/addresslist.cpp | |||
@@ -44,5 +44,5 @@ void AddressList::addContact(const QString &email, const QString &name) | |||
44 | 44 | ||
45 | if ( ! containsEmail(email) ) { | 45 | if ( ! containsEmail(email) ) { |
46 | Contact *in = new Contact; | 46 | AContact *in = new AContact; |
47 | in->email = email; | 47 | in->email = email; |
48 | in->name = name; | 48 | in->name = name; |
@@ -66,9 +66,9 @@ QString AddressList::getNameByEmail(const QString &email) | |||
66 | int pos = getEmailRef(email); | 66 | int pos = getEmailRef(email); |
67 | if (pos != -1) { | 67 | if (pos != -1) { |
68 | Contact *ptr = addresses.at(pos); | 68 | AContact *ptr = addresses.at(pos); |
69 | return ptr->name; | 69 | return ptr->name; |
70 | } | 70 | } |
71 | 71 | ||
72 | return NULL; | 72 | return QString::null; |
73 | } | 73 | } |
74 | 74 | ||
@@ -77,9 +77,9 @@ QString AddressList::getEmailByName(const QString &name) | |||
77 | int pos = getNameRef(name); | 77 | int pos = getNameRef(name); |
78 | if (pos != -1) { | 78 | if (pos != -1) { |
79 | Contact *ptr = addresses.at(pos); | 79 | AContact *ptr = addresses.at(pos); |
80 | return ptr->email; | 80 | return ptr->email; |
81 | } | 81 | } |
82 | 82 | ||
83 | return NULL; | 83 | return QString::null; |
84 | } | 84 | } |
85 | 85 | ||
@@ -87,5 +87,5 @@ int AddressList::getEmailRef(const QString &email) | |||
87 | { | 87 | { |
88 | int pos = 0; | 88 | int pos = 0; |
89 | Contact *ptr; | 89 | AContact *ptr; |
90 | 90 | ||
91 | for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) { | 91 | for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) { |
@@ -100,5 +100,5 @@ int AddressList::getNameRef(const QString &name) | |||
100 | { | 100 | { |
101 | int pos = 0; | 101 | int pos = 0; |
102 | Contact *ptr; | 102 | AContact *ptr; |
103 | 103 | ||
104 | for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) { | 104 | for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) { |
@@ -110,5 +110,5 @@ int AddressList::getNameRef(const QString &name) | |||
110 | } | 110 | } |
111 | 111 | ||
112 | QList<Contact>* AddressList::getContactList() | 112 | QList<AContact>* AddressList::getContactList() |
113 | { | 113 | { |
114 | return &addresses; | 114 | return &addresses; |
diff --git a/noncore/unsupported/mailit/addresslist.h b/noncore/unsupported/mailit/addresslist.h index b46d467..763b6d4 100644 --- a/noncore/unsupported/mailit/addresslist.h +++ b/noncore/unsupported/mailit/addresslist.h | |||
@@ -24,5 +24,5 @@ | |||
24 | #include <qlist.h> | 24 | #include <qlist.h> |
25 | 25 | ||
26 | struct Contact | 26 | struct AContact |
27 | { | 27 | { |
28 | QString email; | 28 | QString email; |
@@ -42,5 +42,5 @@ public: | |||
42 | QString getNameByEmail(const QString &email); | 42 | QString getNameByEmail(const QString &email); |
43 | QString getEmailByName(const QString &name); | 43 | QString getEmailByName(const QString &name); |
44 | QList<Contact>* getContactList(); | 44 | QList<AContact>* getContactList(); |
45 | 45 | ||
46 | private: | 46 | private: |
@@ -51,5 +51,5 @@ private: | |||
51 | 51 | ||
52 | private: | 52 | private: |
53 | QList<Contact> addresses; | 53 | QList<AContact> addresses; |
54 | QString filename; | 54 | QString filename; |
55 | bool dirty; | 55 | bool dirty; |
diff --git a/noncore/unsupported/mailit/writemail.cpp b/noncore/unsupported/mailit/writemail.cpp index c75494e..0298cb3 100644 --- a/noncore/unsupported/mailit/writemail.cpp +++ b/noncore/unsupported/mailit/writemail.cpp | |||
@@ -38,10 +38,10 @@ WriteMail::~WriteMail() | |||
38 | void WriteMail::setAddressList(AddressList *list) | 38 | void WriteMail::setAddressList(AddressList *list) |
39 | { | 39 | { |
40 | Contact *cPtr; | 40 | AContact *cPtr; |
41 | 41 | ||
42 | addressList = list; | 42 | addressList = list; |
43 | 43 | ||
44 | addressView->clear(); | 44 | addressView->clear(); |
45 | QList<Contact> *cListPtr = addressList->getContactList(); | 45 | QList<AContact> *cListPtr = addressList->getContactList(); |
46 | QListViewItem *item; | 46 | QListViewItem *item; |
47 | for (cPtr = cListPtr->first(); cPtr != 0; cPtr = cListPtr->next() ) { | 47 | for (cPtr = cListPtr->first(); cPtr != 0; cPtr = cListPtr->next() ) { |