author | llornkcor <llornkcor> | 2003-05-24 01:20:33 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-05-24 01:20:33 (UTC) |
commit | 62d2ddfb5cd77e2637cdf7fe16d76aac04975984 (patch) (side-by-side diff) | |
tree | 2157d57bab2d6e491226f5bc8468a4c2527e1456 /noncore | |
parent | 0c4b5288ccd4bcd1668816a0c4e12ce0a76b4e6e (diff) | |
download | opie-62d2ddfb5cd77e2637cdf7fe16d76aac04975984.zip opie-62d2ddfb5cd77e2637cdf7fe16d76aac04975984.tar.gz opie-62d2ddfb5cd77e2637cdf7fe16d76aac04975984.tar.bz2 |
QString to const QString
26 files changed, 86 insertions, 84 deletions
diff --git a/noncore/net/mailit/addresslist.cpp b/noncore/net/mailit/addresslist.cpp index 7d60ebf..18d14bc 100644 --- a/noncore/net/mailit/addresslist.cpp +++ b/noncore/net/mailit/addresslist.cpp @@ -37,5 +37,5 @@ AddressList::~AddressList() } -void AddressList::addContact(QString email, QString name) +void AddressList::addContact(const QString &email, const QString &name) { //skip if not a valid email address, @@ -52,15 +52,15 @@ void AddressList::addContact(QString email, QString name) } -bool AddressList::containsEmail(QString email) +bool AddressList::containsEmail(const QString &email) { return ( getEmailRef(email) != -1 ); } -bool AddressList::containsName(QString name) +bool AddressList::containsName(const QString &name) { return ( getNameRef(name) != -1 ); } -QString AddressList::getNameByEmail(QString email) +QString AddressList::getNameByEmail(const QString &email) { int pos = getEmailRef(email); @@ -73,5 +73,5 @@ QString AddressList::getNameByEmail(QString email) } -QString AddressList::getEmailByName(QString name) +QString AddressList::getEmailByName(const QString &name) { int pos = getNameRef(name); @@ -84,5 +84,5 @@ QString AddressList::getEmailByName(QString name) } -int AddressList::getEmailRef(QString email) +int AddressList::getEmailRef(const QString &email) { int pos = 0; @@ -97,5 +97,5 @@ int AddressList::getEmailRef(QString email) } -int AddressList::getNameRef(QString name) +int AddressList::getNameRef(const QString &name) { int pos = 0; @@ -149,5 +149,5 @@ void AddressList::read() } -QString AddressList::getRightString(QString in) +QString AddressList::getRightString(const QString &in) { QString out = ""; diff --git a/noncore/net/mailit/addresslist.h b/noncore/net/mailit/addresslist.h index 99cef9a..b46d467 100644 --- a/noncore/net/mailit/addresslist.h +++ b/noncore/net/mailit/addresslist.h @@ -37,15 +37,15 @@ public: AddressList(); ~AddressList(); - void addContact(QString email, QString name); - bool containsEmail(QString email); - bool containsName(QString name); - QString getNameByEmail(QString email); - QString getEmailByName(QString name); + 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(); private: - int getEmailRef(QString email); - int getNameRef(QString name); - QString getRightString(QString in); + int getEmailRef(const QString &email); + int getNameRef(const QString &name); + QString getRightString(const QString &in); void read(); diff --git a/noncore/net/mailit/emailclient.cpp b/noncore/net/mailit/emailclient.cpp index b039cc4..2102ba7 100644 --- a/noncore/net/mailit/emailclient.cpp +++ b/noncore/net/mailit/emailclient.cpp @@ -467,6 +467,7 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk) } } - if ((!found)||(fromDisk)) item = new EmailListItem(inboxView, newMail, TRUE); - + if ((!found)||(fromDisk)) { + item = new EmailListItem(inboxView, newMail, TRUE); + } if (item->getMail()->files.count()>0) { @@ -643,5 +644,5 @@ void EmailClient::readMail() } -void EmailClient::saveMail(QString fileName, QListView *view) +void EmailClient::saveMail(const QString &fileName, QListView *view) { QFile f(fileName); diff --git a/noncore/net/mailit/emailclient.h b/noncore/net/mailit/emailclient.h index 994fec5..c98cfce 100644 --- a/noncore/net/mailit/emailclient.h +++ b/noncore/net/mailit/emailclient.h @@ -107,5 +107,5 @@ public slots: void mailArrived(const Email &mail, bool fromDisk); void allMailArrived(int); - void saveMail(QString fileName, QListView *view); + void saveMail(const QString &fileName, QListView *view); void selectAccount(int); void editAccount(int); diff --git a/noncore/net/mailit/emailhandler.cpp b/noncore/net/mailit/emailhandler.cpp index 62fa64f..59ccd90 100644 --- a/noncore/net/mailit/emailhandler.cpp +++ b/noncore/net/mailit/emailhandler.cpp @@ -149,5 +149,5 @@ void EmailHandler::messageArrived(const QString &message, int id, uint size, boo } -bool EmailHandler::parse(QString in, QString lineShift, Email *mail) +bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mail) { QString temp, boundary; @@ -511,5 +511,5 @@ int EmailHandler::encodeMime(Email *mail) } -int EmailHandler::encodeFile(QString fileName, QString *toBody) +int EmailHandler::encodeFile(const QString &fileName, QString *toBody) { char *fileData; diff --git a/noncore/net/mailit/emailhandler.h b/noncore/net/mailit/emailhandler.h index 5b59f65..e4e7f46 100644 --- a/noncore/net/mailit/emailhandler.h +++ b/noncore/net/mailit/emailhandler.h @@ -118,9 +118,9 @@ public: void getMailHeaders(); void getMailByList(MailList *mailList); - bool parse(QString in, QString lineShift, Email *mail); + bool parse(const QString &in, const QString &lineShift, Email *mail); bool getEnclosure(Enclosure *ePtr); int parse64base(char *src, char *dest); int encodeMime(Email *mail); - int encodeFile(QString fileName, QString *toBody); + int encodeFile(const QString &fileName, QString *toBody); void encode64base(char *src, QString *dest, int len); void cancel(); diff --git a/noncore/net/mailit/emaillistitem.cpp b/noncore/net/mailit/emaillistitem.cpp index b925a1c..fc9f766 100644 --- a/noncore/net/mailit/emaillistitem.cpp +++ b/noncore/net/mailit/emaillistitem.cpp diff --git a/noncore/net/mailit/popclient.cpp b/noncore/net/mailit/popclient.cpp index fedc4e2..dc0116d 100644 --- a/noncore/net/mailit/popclient.cpp +++ b/noncore/net/mailit/popclient.cpp @@ -51,5 +51,5 @@ PopClient::~PopClient() } -void PopClient::newConnection(QString target, int port) +void PopClient::newConnection(const QString &target, int port) { if (receiving) { @@ -67,5 +67,5 @@ void PopClient::newConnection(QString target, int port) } -void PopClient::setAccount(QString popUser, QString popPasswd) +void PopClient::setAccount(const QString &popUser, const QString &popPasswd) { popUserName = popUser; diff --git a/noncore/net/mailit/popclient.h b/noncore/net/mailit/popclient.h index 10b71ab..c58bc48 100644 --- a/noncore/net/mailit/popclient.h +++ b/noncore/net/mailit/popclient.h @@ -36,6 +36,6 @@ public: PopClient(); ~PopClient(); - void newConnection(QString target, int port); - void setAccount(QString popUser, QString popPasswd); + void newConnection(const QString &target, int port); + void setAccount(const QString &popUser, const QString &popPasswd); void setSynchronize(int lastCount); void removeSynchronize(); diff --git a/noncore/net/mailit/smtpclient.cpp b/noncore/net/mailit/smtpclient.cpp index 8a51a5b..2916f45 100644 --- a/noncore/net/mailit/smtpclient.cpp +++ b/noncore/net/mailit/smtpclient.cpp @@ -40,5 +40,5 @@ SmtpClient::~SmtpClient() } -void SmtpClient::newConnection(QString target, int port) +void SmtpClient::newConnection(const QString &target, int port) { if (sending) { @@ -54,5 +54,5 @@ void SmtpClient::newConnection(QString target, int port) } -void SmtpClient::addMail(QString from, QString subject, QStringList to, QString body) +void SmtpClient::addMail(const QString &from, const QString &subject, const QStringList &to, const QString &body) { RawEmail *mail = new RawEmail; diff --git a/noncore/net/mailit/smtpclient.h b/noncore/net/mailit/smtpclient.h index ca65af4..45c0703 100644 --- a/noncore/net/mailit/smtpclient.h +++ b/noncore/net/mailit/smtpclient.h @@ -44,6 +44,6 @@ public: SmtpClient(); ~SmtpClient(); - void newConnection(QString target, int port); - void addMail(QString from, QString subject, QStringList to, QString body); + void newConnection(const QString &target, int port); + void addMail(const QString &from, const QString &subject, const QStringList &to, const QString &body); signals: diff --git a/noncore/net/mailit/textparser.cpp b/noncore/net/mailit/textparser.cpp index 3fa5f6e..e5c9f7c 100644 --- a/noncore/net/mailit/textparser.cpp +++ b/noncore/net/mailit/textparser.cpp @@ -20,5 +20,5 @@ #include "textparser.h" -TextParser::TextParser(QString in, QString lineBreak) +TextParser::TextParser(const QString &in, const QString &lineBreak) { data = in; @@ -30,5 +30,5 @@ TextParser::TextParser(QString in, QString lineBreak) } -TextParser::TextParser(QString in, QString lineBreak, QString sep) +TextParser::TextParser(const QString &in, const QString &lineBreak, const QString &sep) { data = in; @@ -61,10 +61,10 @@ void TextParser::createSeparators() /* Returns pos of given search criteria, -1 if not found */ -int TextParser::find(QString target, QChar sep, int pos, bool upperCase) +int TextParser::find(const QString &target, QChar sep, int pos, bool upperCase) { t_splitElm parsstr; - QString pString; - + QString pString, pTarget; + pTarget = target; int atLine = 0, atPosElm = 0; @@ -78,5 +78,5 @@ int TextParser::find(QString target, QChar sep, int pos, bool upperCase) { pString=parsstr.str.upper(); - target=target.upper(); + pTarget=pTarget.upper(); } else @@ -84,5 +84,5 @@ int TextParser::find(QString target, QChar sep, int pos, bool upperCase) pString=parsstr.str; } - if ((pString == target) && (parsstr.separator == sep)) + if ((pString == pTarget) && (parsstr.separator == sep)) { return x; diff --git a/noncore/net/mailit/textparser.h b/noncore/net/mailit/textparser.h index c5e88a0..03bb6d5 100644 --- a/noncore/net/mailit/textparser.h +++ b/noncore/net/mailit/textparser.h @@ -50,7 +50,7 @@ class TextParser: public QObject public: - TextParser(QString in, QString lineBreak); - TextParser(QString in, QString lineBreak, QString sep); - int find(QString target, QChar sep, int pos, bool upperCase); + TextParser(const QString &in, const QString &lineBreak); + TextParser(const QString &in, const QString &lineBreak, const QString &sep); + int find(const QString &target, QChar sep, int pos, bool upperCase); int elmCount(); QChar separatorAt(int pos); diff --git a/noncore/unsupported/mailit/addresslist.cpp b/noncore/unsupported/mailit/addresslist.cpp index 7d60ebf..18d14bc 100644 --- a/noncore/unsupported/mailit/addresslist.cpp +++ b/noncore/unsupported/mailit/addresslist.cpp @@ -37,5 +37,5 @@ AddressList::~AddressList() } -void AddressList::addContact(QString email, QString name) +void AddressList::addContact(const QString &email, const QString &name) { //skip if not a valid email address, @@ -52,15 +52,15 @@ void AddressList::addContact(QString email, QString name) } -bool AddressList::containsEmail(QString email) +bool AddressList::containsEmail(const QString &email) { return ( getEmailRef(email) != -1 ); } -bool AddressList::containsName(QString name) +bool AddressList::containsName(const QString &name) { return ( getNameRef(name) != -1 ); } -QString AddressList::getNameByEmail(QString email) +QString AddressList::getNameByEmail(const QString &email) { int pos = getEmailRef(email); @@ -73,5 +73,5 @@ QString AddressList::getNameByEmail(QString email) } -QString AddressList::getEmailByName(QString name) +QString AddressList::getEmailByName(const QString &name) { int pos = getNameRef(name); @@ -84,5 +84,5 @@ QString AddressList::getEmailByName(QString name) } -int AddressList::getEmailRef(QString email) +int AddressList::getEmailRef(const QString &email) { int pos = 0; @@ -97,5 +97,5 @@ int AddressList::getEmailRef(QString email) } -int AddressList::getNameRef(QString name) +int AddressList::getNameRef(const QString &name) { int pos = 0; @@ -149,5 +149,5 @@ void AddressList::read() } -QString AddressList::getRightString(QString in) +QString AddressList::getRightString(const QString &in) { QString out = ""; diff --git a/noncore/unsupported/mailit/addresslist.h b/noncore/unsupported/mailit/addresslist.h index 99cef9a..b46d467 100644 --- a/noncore/unsupported/mailit/addresslist.h +++ b/noncore/unsupported/mailit/addresslist.h @@ -37,15 +37,15 @@ public: AddressList(); ~AddressList(); - void addContact(QString email, QString name); - bool containsEmail(QString email); - bool containsName(QString name); - QString getNameByEmail(QString email); - QString getEmailByName(QString name); + 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(); private: - int getEmailRef(QString email); - int getNameRef(QString name); - QString getRightString(QString in); + int getEmailRef(const QString &email); + int getNameRef(const QString &name); + QString getRightString(const QString &in); void read(); diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp index b039cc4..2102ba7 100644 --- a/noncore/unsupported/mailit/emailclient.cpp +++ b/noncore/unsupported/mailit/emailclient.cpp @@ -467,6 +467,7 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk) } } - if ((!found)||(fromDisk)) item = new EmailListItem(inboxView, newMail, TRUE); - + if ((!found)||(fromDisk)) { + item = new EmailListItem(inboxView, newMail, TRUE); + } if (item->getMail()->files.count()>0) { @@ -643,5 +644,5 @@ void EmailClient::readMail() } -void EmailClient::saveMail(QString fileName, QListView *view) +void EmailClient::saveMail(const QString &fileName, QListView *view) { QFile f(fileName); diff --git a/noncore/unsupported/mailit/emailclient.h b/noncore/unsupported/mailit/emailclient.h index 994fec5..c98cfce 100644 --- a/noncore/unsupported/mailit/emailclient.h +++ b/noncore/unsupported/mailit/emailclient.h @@ -107,5 +107,5 @@ public slots: void mailArrived(const Email &mail, bool fromDisk); void allMailArrived(int); - void saveMail(QString fileName, QListView *view); + void saveMail(const QString &fileName, QListView *view); void selectAccount(int); void editAccount(int); diff --git a/noncore/unsupported/mailit/emailhandler.cpp b/noncore/unsupported/mailit/emailhandler.cpp index 62fa64f..59ccd90 100644 --- a/noncore/unsupported/mailit/emailhandler.cpp +++ b/noncore/unsupported/mailit/emailhandler.cpp @@ -149,5 +149,5 @@ void EmailHandler::messageArrived(const QString &message, int id, uint size, boo } -bool EmailHandler::parse(QString in, QString lineShift, Email *mail) +bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mail) { QString temp, boundary; @@ -511,5 +511,5 @@ int EmailHandler::encodeMime(Email *mail) } -int EmailHandler::encodeFile(QString fileName, QString *toBody) +int EmailHandler::encodeFile(const QString &fileName, QString *toBody) { char *fileData; diff --git a/noncore/unsupported/mailit/emailhandler.h b/noncore/unsupported/mailit/emailhandler.h index 5b59f65..e4e7f46 100644 --- a/noncore/unsupported/mailit/emailhandler.h +++ b/noncore/unsupported/mailit/emailhandler.h @@ -118,9 +118,9 @@ public: void getMailHeaders(); void getMailByList(MailList *mailList); - bool parse(QString in, QString lineShift, Email *mail); + bool parse(const QString &in, const QString &lineShift, Email *mail); bool getEnclosure(Enclosure *ePtr); int parse64base(char *src, char *dest); int encodeMime(Email *mail); - int encodeFile(QString fileName, QString *toBody); + int encodeFile(const QString &fileName, QString *toBody); void encode64base(char *src, QString *dest, int len); void cancel(); diff --git a/noncore/unsupported/mailit/emaillistitem.cpp b/noncore/unsupported/mailit/emaillistitem.cpp index b925a1c..fc9f766 100644 --- a/noncore/unsupported/mailit/emaillistitem.cpp +++ b/noncore/unsupported/mailit/emaillistitem.cpp diff --git a/noncore/unsupported/mailit/popclient.cpp b/noncore/unsupported/mailit/popclient.cpp index fedc4e2..dc0116d 100644 --- a/noncore/unsupported/mailit/popclient.cpp +++ b/noncore/unsupported/mailit/popclient.cpp @@ -51,5 +51,5 @@ PopClient::~PopClient() } -void PopClient::newConnection(QString target, int port) +void PopClient::newConnection(const QString &target, int port) { if (receiving) { @@ -67,5 +67,5 @@ void PopClient::newConnection(QString target, int port) } -void PopClient::setAccount(QString popUser, QString popPasswd) +void PopClient::setAccount(const QString &popUser, const QString &popPasswd) { popUserName = popUser; diff --git a/noncore/unsupported/mailit/popclient.h b/noncore/unsupported/mailit/popclient.h index 10b71ab..c58bc48 100644 --- a/noncore/unsupported/mailit/popclient.h +++ b/noncore/unsupported/mailit/popclient.h @@ -36,6 +36,6 @@ public: PopClient(); ~PopClient(); - void newConnection(QString target, int port); - void setAccount(QString popUser, QString popPasswd); + void newConnection(const QString &target, int port); + void setAccount(const QString &popUser, const QString &popPasswd); void setSynchronize(int lastCount); void removeSynchronize(); diff --git a/noncore/unsupported/mailit/smtpclient.cpp b/noncore/unsupported/mailit/smtpclient.cpp index 8a51a5b..2916f45 100644 --- a/noncore/unsupported/mailit/smtpclient.cpp +++ b/noncore/unsupported/mailit/smtpclient.cpp @@ -40,5 +40,5 @@ SmtpClient::~SmtpClient() } -void SmtpClient::newConnection(QString target, int port) +void SmtpClient::newConnection(const QString &target, int port) { if (sending) { @@ -54,5 +54,5 @@ void SmtpClient::newConnection(QString target, int port) } -void SmtpClient::addMail(QString from, QString subject, QStringList to, QString body) +void SmtpClient::addMail(const QString &from, const QString &subject, const QStringList &to, const QString &body) { RawEmail *mail = new RawEmail; diff --git a/noncore/unsupported/mailit/smtpclient.h b/noncore/unsupported/mailit/smtpclient.h index ca65af4..45c0703 100644 --- a/noncore/unsupported/mailit/smtpclient.h +++ b/noncore/unsupported/mailit/smtpclient.h @@ -44,6 +44,6 @@ public: SmtpClient(); ~SmtpClient(); - void newConnection(QString target, int port); - void addMail(QString from, QString subject, QStringList to, QString body); + void newConnection(const QString &target, int port); + void addMail(const QString &from, const QString &subject, const QStringList &to, const QString &body); signals: diff --git a/noncore/unsupported/mailit/textparser.cpp b/noncore/unsupported/mailit/textparser.cpp index 3fa5f6e..e5c9f7c 100644 --- a/noncore/unsupported/mailit/textparser.cpp +++ b/noncore/unsupported/mailit/textparser.cpp @@ -20,5 +20,5 @@ #include "textparser.h" -TextParser::TextParser(QString in, QString lineBreak) +TextParser::TextParser(const QString &in, const QString &lineBreak) { data = in; @@ -30,5 +30,5 @@ TextParser::TextParser(QString in, QString lineBreak) } -TextParser::TextParser(QString in, QString lineBreak, QString sep) +TextParser::TextParser(const QString &in, const QString &lineBreak, const QString &sep) { data = in; @@ -61,10 +61,10 @@ void TextParser::createSeparators() /* Returns pos of given search criteria, -1 if not found */ -int TextParser::find(QString target, QChar sep, int pos, bool upperCase) +int TextParser::find(const QString &target, QChar sep, int pos, bool upperCase) { t_splitElm parsstr; - QString pString; - + QString pString, pTarget; + pTarget = target; int atLine = 0, atPosElm = 0; @@ -78,5 +78,5 @@ int TextParser::find(QString target, QChar sep, int pos, bool upperCase) { pString=parsstr.str.upper(); - target=target.upper(); + pTarget=pTarget.upper(); } else @@ -84,5 +84,5 @@ int TextParser::find(QString target, QChar sep, int pos, bool upperCase) pString=parsstr.str; } - if ((pString == target) && (parsstr.separator == sep)) + if ((pString == pTarget) && (parsstr.separator == sep)) { return x; diff --git a/noncore/unsupported/mailit/textparser.h b/noncore/unsupported/mailit/textparser.h index c5e88a0..03bb6d5 100644 --- a/noncore/unsupported/mailit/textparser.h +++ b/noncore/unsupported/mailit/textparser.h @@ -50,7 +50,7 @@ class TextParser: public QObject public: - TextParser(QString in, QString lineBreak); - TextParser(QString in, QString lineBreak, QString sep); - int find(QString target, QChar sep, int pos, bool upperCase); + TextParser(const QString &in, const QString &lineBreak); + TextParser(const QString &in, const QString &lineBreak, const QString &sep); + int find(const QString &target, QChar sep, int pos, bool upperCase); int elmCount(); QChar separatorAt(int pos); |