don't crash when compiled with gcc3

one Contact in libqpe one Contact in addresslist.h a nice game of russian roulette gcc3 lost...
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 /noncore
parent: 694ff39fe4f0f4164edd7a2a80abe6be3a4fa2f9 (diff)
download: opie-3fb06f85a52b6fcbece50ed30c196efc2a91e8ce.zip
opie-3fb06f85a52b6fcbece50ed30c196efc2a91e8ce.tar.gz
opie-3fb06f85a52b6fcbece50ed30c196efc2a91e8ce.tar.bz2
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
@@ -40,13 +40,13 @@ void AddressList::addContact(const QString &email, const QString &name)
 {
  //skip if not a valid email address,
  if (email.find( '@') == -1)
    return;
    
  if ( ! containsEmail(email) ) {
-    Contact *in = new Contact;
+    AContact *in = new AContact;
    in->email = email;
    in->name = name;
    addresses.append(in);
    dirty = TRUE;
  }
 }
@@ -62,57 +62,57 @@ bool AddressList::containsName(const QString &name)
 }
 QString AddressList::getNameByEmail(const QString &email)
 {
  int pos = getEmailRef(email);
  if (pos != -1) {
-    Contact *ptr = addresses.at(pos);
+    AContact *ptr = addresses.at(pos);
    return ptr->name;
  }
  
-  return NULL;
+  return QString::null;
 }
 QString AddressList::getEmailByName(const QString &name)
 {
  int pos = getNameRef(name);
  if (pos != -1) {
-    Contact *ptr = addresses.at(pos);
+    AContact *ptr = addresses.at(pos);
    return ptr->email;
  }
  
-  return NULL;
+  return QString::null;
 }
 int AddressList::getEmailRef(const QString &email)
 {
  int pos = 0;
-  Contact *ptr;
+  AContact *ptr;
  
  for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) {
    if (ptr->email == email)
      return pos;
    pos++;
  }
  return -1;
 }
 int AddressList::getNameRef(const QString &name)
 {
  int pos = 0;
-  Contact *ptr;
+  AContact *ptr;
  
  for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) {
    if (ptr->name == name)
      return pos;
    pos++;
  }
  return -1;
 }
-QList<Contact>* AddressList::getContactList()
+QList<AContact>* AddressList::getContactList()
 {
  return &addresses;
 }
 void AddressList::read()
 {
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
@@ -20,13 +20,13 @@
 #ifndef ADDRESSLIST_H
 #define ADDRESSLIST_H
 #include <qobject.h>
 #include <qlist.h>
-struct Contact
+struct AContact
 {
  QString email;
  QString name;
 };
 class AddressList : public QObject
@@ -38,21 +38,21 @@ public:
  ~AddressList();
  void addContact(const QString &email, const QString &name);
  bool containsEmail(const QString &email);
  bool containsName(const QString &name);
  QString getNameByEmail(const QString &email);
  QString getEmailByName(const QString &name);
-  QList<Contact>* getContactList();
+  QList<AContact>* getContactList();
 private:
  int getEmailRef(const QString &email);
  int getNameRef(const QString &name);
  QString getRightString(const QString &in);
  void read();
 private:
-  QList<Contact> addresses;
+  QList<AContact> addresses;
  QString filename;
  bool dirty;
 };
 #endif
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
@@ -34,18 +34,18 @@ WriteMail::~WriteMail()
 {
        delete addAtt;
 }
 void WriteMail::setAddressList(AddressList *list)
 {
-        Contact *cPtr;
+        AContact *cPtr;
        
        addressList = list;
        
        addressView->clear();
-        QList<Contact> *cListPtr = addressList->getContactList();
+        QList<AContact> *cListPtr = addressList->getContactList();
        QListViewItem *item;
        for (cPtr = cListPtr->first(); cPtr != 0; cPtr = cListPtr->next() ) {
                item = new QListViewItem(addressView, cPtr->name, cPtr->email);
        }
 }
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
@@ -40,13 +40,13 @@ void AddressList::addContact(const QString &email, const QString &name)
 {
  //skip if not a valid email address,
  if (email.find( '@') == -1)
    return;
    
  if ( ! containsEmail(email) ) {
-    Contact *in = new Contact;
+    AContact *in = new AContact;
    in->email = email;
    in->name = name;
    addresses.append(in);
    dirty = TRUE;
  }
 }
@@ -62,57 +62,57 @@ bool AddressList::containsName(const QString &name)
 }
 QString AddressList::getNameByEmail(const QString &email)
 {
  int pos = getEmailRef(email);
  if (pos != -1) {
-    Contact *ptr = addresses.at(pos);
+    AContact *ptr = addresses.at(pos);
    return ptr->name;
  }
  
-  return NULL;
+  return QString::null;
 }
 QString AddressList::getEmailByName(const QString &name)
 {
  int pos = getNameRef(name);
  if (pos != -1) {
-    Contact *ptr = addresses.at(pos);
+    AContact *ptr = addresses.at(pos);
    return ptr->email;
  }
  
-  return NULL;
+  return QString::null;
 }
 int AddressList::getEmailRef(const QString &email)
 {
  int pos = 0;
-  Contact *ptr;
+  AContact *ptr;
  
  for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) {
    if (ptr->email == email)
      return pos;
    pos++;
  }
  return -1;
 }
 int AddressList::getNameRef(const QString &name)
 {
  int pos = 0;
-  Contact *ptr;
+  AContact *ptr;
  
  for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) {
    if (ptr->name == name)
      return pos;
    pos++;
  }
  return -1;
 }
-QList<Contact>* AddressList::getContactList()
+QList<AContact>* AddressList::getContactList()
 {
  return &addresses;
 }
 void AddressList::read()
 {
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
@@ -20,13 +20,13 @@
 #ifndef ADDRESSLIST_H
 #define ADDRESSLIST_H
 #include <qobject.h>
 #include <qlist.h>
-struct Contact
+struct AContact
 {
  QString email;
  QString name;
 };
 class AddressList : public QObject
@@ -38,21 +38,21 @@ public:
  ~AddressList();
  void addContact(const QString &email, const QString &name);
  bool containsEmail(const QString &email);
  bool containsName(const QString &name);
  QString getNameByEmail(const QString &email);
  QString getEmailByName(const QString &name);
-  QList<Contact>* getContactList();
+  QList<AContact>* getContactList();
 private:
  int getEmailRef(const QString &email);
  int getNameRef(const QString &name);
  QString getRightString(const QString &in);
  void read();
 private:
-  QList<Contact> addresses;
+  QList<AContact> addresses;
  QString filename;
  bool dirty;
 };
 #endif
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
@@ -34,18 +34,18 @@ WriteMail::~WriteMail()
 {
        delete addAtt;
 }
 void WriteMail::setAddressList(AddressList *list)
 {
-        Contact *cPtr;
+        AContact *cPtr;
        
        addressList = list;
        
        addressView->clear();
-        QList<Contact> *cListPtr = addressList->getContactList();
+        QList<AContact> *cListPtr = addressList->getContactList();
        QListViewItem *item;
        for (cPtr = cListPtr->first(); cPtr != 0; cPtr = cListPtr->next() ) {
                item = new QListViewItem(addressView, cPtr->name, cPtr->email);
        }
 }
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 /noncore
parent	694ff39fe4f0f4164edd7a2a80abe6be3a4fa2f9 (diff)
download	opie-3fb06f85a52b6fcbece50ed30c196efc2a91e8ce.zip opie-3fb06f85a52b6fcbece50ed30c196efc2a91e8ce.tar.gz opie-3fb06f85a52b6fcbece50ed30c196efc2a91e8ce.tar.bz2

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
@@ -40,13 +40,13 @@ void AddressList::addContact(const QString &email, const QString &name)
40	{	40	{
41	//skip if not a valid email address,	41	//skip if not a valid email address,
42	if (email.find( '@') == -1)	42	if (email.find( '@') == -1)
43	return;	43	return;
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;
49	addresses.append(in);	49	addresses.append(in);
50	dirty = TRUE;	50	dirty = TRUE;
51	}	51	}
52	}	52	}
@@ -62,57 +62,57 @@ bool AddressList::containsName(const QString &name)
62	}	62	}
63		63
64	QString AddressList::getNameByEmail(const QString &email)	64	QString AddressList::getNameByEmail(const QString &email)
65	{	65	{
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
75	QString AddressList::getEmailByName(const QString &name)	75	QString AddressList::getEmailByName(const QString &name)
76	{	76	{
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
86	int AddressList::getEmailRef(const QString &email)	86	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() ) {
92	if (ptr->email == email)	92	if (ptr->email == email)
93	return pos;	93	return pos;
94	pos++;	94	pos++;
95	}	95	}
96	return -1;	96	return -1;
97	}	97	}
98		98
99	int AddressList::getNameRef(const QString &name)	99	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() ) {
105	if (ptr->name == name)	105	if (ptr->name == name)
106	return pos;	106	return pos;
107	pos++;	107	pos++;
108	}	108	}
109	return -1;	109	return -1;
110	}	110	}
111		111
112	QList<Contact>* AddressList::getContactList()	112	QList<AContact>* AddressList::getContactList()
113	{	113	{
114	return &addresses;	114	return &addresses;
115	}	115	}
116		116
117	void AddressList::read()	117	void AddressList::read()
118	{	118	{


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
@@ -20,13 +20,13 @@
20	#ifndef ADDRESSLIST_H	20	#ifndef ADDRESSLIST_H
21	#define ADDRESSLIST_H	21	#define ADDRESSLIST_H
22		22
23	#include <qobject.h>	23	#include <qobject.h>
24	#include <qlist.h>	24	#include <qlist.h>
25		25
26	struct Contact	26	struct AContact
27	{	27	{
28	QString email;	28	QString email;
29	QString name;	29	QString name;
30	};	30	};
31		31
32	class AddressList : public QObject	32	class AddressList : public QObject
@@ -38,21 +38,21 @@ public:
38	~AddressList();	38	~AddressList();
39	void addContact(const QString &email, const QString &name);	39	void addContact(const QString &email, const QString &name);
40	bool containsEmail(const QString &email);	40	bool containsEmail(const QString &email);
41	bool containsName(const QString &name);	41	bool containsName(const QString &name);
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:
47	int getEmailRef(const QString &email);	47	int getEmailRef(const QString &email);
48	int getNameRef(const QString &name);	48	int getNameRef(const QString &name);
49	QString getRightString(const QString &in);	49	QString getRightString(const QString &in);
50	void read();	50	void read();
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;
56	};	56	};
57		57
58	#endif	58	#endif


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
@@ -34,18 +34,18 @@ WriteMail::~WriteMail()
34	{	34	{
35	delete addAtt;	35	delete addAtt;
36	}	36	}
37		37
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() ) {
48	item = new QListViewItem(addressView, cPtr->name, cPtr->email);	48	item = new QListViewItem(addressView, cPtr->name, cPtr->email);
49	}	49	}
50	}	50	}
51		51


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
@@ -40,13 +40,13 @@ void AddressList::addContact(const QString &email, const QString &name)
40	{	40	{
41	//skip if not a valid email address,	41	//skip if not a valid email address,
42	if (email.find( '@') == -1)	42	if (email.find( '@') == -1)
43	return;	43	return;
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;
49	addresses.append(in);	49	addresses.append(in);
50	dirty = TRUE;	50	dirty = TRUE;
51	}	51	}
52	}	52	}
@@ -62,57 +62,57 @@ bool AddressList::containsName(const QString &name)
62	}	62	}
63		63
64	QString AddressList::getNameByEmail(const QString &email)	64	QString AddressList::getNameByEmail(const QString &email)
65	{	65	{
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
75	QString AddressList::getEmailByName(const QString &name)	75	QString AddressList::getEmailByName(const QString &name)
76	{	76	{
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
86	int AddressList::getEmailRef(const QString &email)	86	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() ) {
92	if (ptr->email == email)	92	if (ptr->email == email)
93	return pos;	93	return pos;
94	pos++;	94	pos++;
95	}	95	}
96	return -1;	96	return -1;
97	}	97	}
98		98
99	int AddressList::getNameRef(const QString &name)	99	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() ) {
105	if (ptr->name == name)	105	if (ptr->name == name)
106	return pos;	106	return pos;
107	pos++;	107	pos++;
108	}	108	}
109	return -1;	109	return -1;
110	}	110	}
111		111
112	QList<Contact>* AddressList::getContactList()	112	QList<AContact>* AddressList::getContactList()
113	{	113	{
114	return &addresses;	114	return &addresses;
115	}	115	}
116		116
117	void AddressList::read()	117	void AddressList::read()
118	{	118	{


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
@@ -20,13 +20,13 @@
20	#ifndef ADDRESSLIST_H	20	#ifndef ADDRESSLIST_H
21	#define ADDRESSLIST_H	21	#define ADDRESSLIST_H
22		22
23	#include <qobject.h>	23	#include <qobject.h>
24	#include <qlist.h>	24	#include <qlist.h>
25		25
26	struct Contact	26	struct AContact
27	{	27	{
28	QString email;	28	QString email;
29	QString name;	29	QString name;
30	};	30	};
31		31
32	class AddressList : public QObject	32	class AddressList : public QObject
@@ -38,21 +38,21 @@ public:
38	~AddressList();	38	~AddressList();
39	void addContact(const QString &email, const QString &name);	39	void addContact(const QString &email, const QString &name);
40	bool containsEmail(const QString &email);	40	bool containsEmail(const QString &email);
41	bool containsName(const QString &name);	41	bool containsName(const QString &name);
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:
47	int getEmailRef(const QString &email);	47	int getEmailRef(const QString &email);
48	int getNameRef(const QString &name);	48	int getNameRef(const QString &name);
49	QString getRightString(const QString &in);	49	QString getRightString(const QString &in);
50	void read();	50	void read();
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;
56	};	56	};
57		57
58	#endif	58	#endif


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
@@ -34,18 +34,18 @@ WriteMail::~WriteMail()
34	{	34	{
35	delete addAtt;	35	delete addAtt;
36	}	36	}
37		37
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() ) {
48	item = new QListViewItem(addressView, cPtr->name, cPtr->email);	48	item = new QListViewItem(addressView, cPtr->name, cPtr->email);
49	}	49	}
50	}	50	}
51		51