summaryrefslogtreecommitdiff
path: root/noncore/net/mailit
Side-by-side diff
Diffstat (limited to 'noncore/net/mailit') (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/mailit/addresslist.cpp16
-rw-r--r--noncore/net/mailit/addresslist.h16
-rw-r--r--noncore/net/mailit/emailclient.cpp7
-rw-r--r--noncore/net/mailit/emailclient.h2
-rw-r--r--noncore/net/mailit/emailhandler.cpp4
-rw-r--r--noncore/net/mailit/emailhandler.h4
-rw-r--r--noncore/net/mailit/emaillistitem.cpp0
-rw-r--r--noncore/net/mailit/popclient.cpp4
-rw-r--r--noncore/net/mailit/popclient.h4
-rw-r--r--noncore/net/mailit/smtpclient.cpp4
-rw-r--r--noncore/net/mailit/smtpclient.h4
-rw-r--r--noncore/net/mailit/textparser.cpp14
-rw-r--r--noncore/net/mailit/textparser.h6
13 files changed, 43 insertions, 42 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
@@ -33,13 +33,13 @@ AddressList::AddressList()
AddressList::~AddressList()
{
addresses.clear();
}
-void AddressList::addContact(QString email, QString name)
+void AddressList::addContact(const QString &email, const QString &name)
{
//skip if not a valid email address,
if (email.find( '@') == -1)
return;
if ( ! containsEmail(email) ) {
@@ -48,58 +48,58 @@ void AddressList::addContact(QString email, QString name)
in->name = name;
addresses.append(in);
dirty = TRUE;
}
}
-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);
if (pos != -1) {
Contact *ptr = addresses.at(pos);
return ptr->name;
}
return NULL;
}
-QString AddressList::getEmailByName(QString name)
+QString AddressList::getEmailByName(const QString &name)
{
int pos = getNameRef(name);
if (pos != -1) {
Contact *ptr = addresses.at(pos);
return ptr->email;
}
return NULL;
}
-int AddressList::getEmailRef(QString email)
+int AddressList::getEmailRef(const QString &email)
{
int pos = 0;
Contact *ptr;
for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) {
if (ptr->email == email)
return pos;
pos++;
}
return -1;
}
-int AddressList::getNameRef(QString name)
+int AddressList::getNameRef(const QString &name)
{
int pos = 0;
Contact *ptr;
for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) {
if (ptr->name == name)
@@ -145,13 +145,13 @@ void AddressList::read()
name = getRightString(lineName);
addContact(email, name);
}
f.close();*/
}
-QString AddressList::getRightString(QString in)
+QString AddressList::getRightString(const QString &in)
{
QString out = "";
int pos = in.find('=');
if (pos != -1) {
out = in.mid(pos+1).stripWhiteSpace();
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
@@ -33,23 +33,23 @@ class AddressList : public QObject
{
Q_OBJECT
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();
private:
QList<Contact> addresses;
QString filename;
bool dirty;
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
@@ -463,14 +463,15 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
emit mailUpdated(item->getMail());
found = true;
}
item = (EmailListItem *) item->nextSibling();
}
}
- if ((!found)||(fromDisk)) item = new EmailListItem(inboxView, newMail, TRUE);
-
+ if ((!found)||(fromDisk)) {
+ item = new EmailListItem(inboxView, newMail, TRUE);
+ }
if (item->getMail()->files.count()>0)
{
item->setPixmap(0, Resource::loadPixmap("mailit/attach"));
}
/*if (!newMail.downloaded)
mailDownloadList.sizeInsert(newMail.serverId, newMail.size);*/
@@ -639,13 +640,13 @@ void EmailClient::readMail()
enqueMail(mail);
}
}
}
-void EmailClient::saveMail(QString fileName, QListView *view)
+void EmailClient::saveMail(const QString &fileName, QListView *view)
{
QFile f(fileName);
Email *mail;
if (! f.open(IO_WriteOnly) ) {
qWarning("could not open file");
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
@@ -103,13 +103,13 @@ public slots:
void inboxItemSelected();
void outboxItemSelected();
void inboxItemPressed();
void inboxItemReleased();
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);
void updateAccounts();
void deleteAccount(int);
void deleteMail(EmailListItem *mailItem, bool &inbox);
void setTotalSize(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
@@ -145,13 +145,13 @@ void EmailHandler::messageArrived(const QString &message, int id, uint size, boo
mail.size = size;
mail.downloaded = complete;
emit mailArrived(mail, FALSE);
}
-bool EmailHandler::parse(QString in, QString lineShift, Email *mail)
+bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mail)
{
QString temp, boundary;
int pos;
QString delimiter, header, body, mimeHeader, mimeBody;
QString content, contentType, contentAttribute, id, encoding;
QString fileName, storedName;
@@ -507,13 +507,13 @@ int EmailHandler::encodeMime(Email *mail)
newBody += "\r\n\r\n--" + boundary + "--";
mail->rawMail = newBody;
return 0;
}
-int EmailHandler::encodeFile(QString fileName, QString *toBody)
+int EmailHandler::encodeFile(const QString &fileName, QString *toBody)
{
char *fileData;
char *dataPtr;
QString temp;
uint dataSize, count;
QFile f(fileName);
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
@@ -114,17 +114,17 @@ public:
void setAccount(MailAccount account);
MailAccount* getAccount(){return &mailAccount;}
void sendMail(QList<Email> *mailList);
void getMail();
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();
signals:
void mailSent();
void smtpError(int);
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
@@ -47,13 +47,13 @@ PopClient::PopClient()
PopClient::~PopClient()
{
delete socket;
delete stream;
}
-void PopClient::newConnection(QString target, int port)
+void PopClient::newConnection(const QString &target, int port)
{
if (receiving) {
qWarning("socket in use, connection refused");
return;
}
@@ -63,13 +63,13 @@ void PopClient::newConnection(QString target, int port)
receiving = TRUE;
//selected = FALSE;
emit updateStatus("DNS lookup");
}
-void PopClient::setAccount(QString popUser, QString popPasswd)
+void PopClient::setAccount(const QString &popUser, const QString &popPasswd)
{
popUserName = popUser;
popPassword = popPasswd;
}
void PopClient::setSynchronize(int lastCount)
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
@@ -32,14 +32,14 @@ class PopClient: public QObject
{
Q_OBJECT
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();
void headersOnly(bool headers, int limit);
void setSelectedMails(MailList *list);
signals:
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
@@ -36,13 +36,13 @@ SmtpClient::SmtpClient()
SmtpClient::~SmtpClient()
{
delete socket;
delete stream;
}
-void SmtpClient::newConnection(QString target, int port)
+void SmtpClient::newConnection(const QString &target, int port)
{
if (sending) {
qWarning("socket in use, connection refused");
return;
}
@@ -50,13 +50,13 @@ void SmtpClient::newConnection(QString target, int port)
sending = TRUE;
socket->connectToHost(target, port);
emit updateStatus(tr("DNS lookup"));
}
-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;
mail->from = from;
mail->subject = subject;
mail->to = to;
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
@@ -40,14 +40,14 @@ class SmtpClient: public QObject
{
Q_OBJECT
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:
void errorOccurred(int);
void updateStatus(const QString &);
void mailSent();
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
@@ -16,23 +16,23 @@
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#include "textparser.h"
-TextParser::TextParser(QString in, QString lineBreak)
+TextParser::TextParser(const QString &in, const QString &lineBreak)
{
data = in;
lineSep = lineBreak;
init();
createSeparators();
split();
}
-TextParser::TextParser(QString in, QString lineBreak, QString sep)
+TextParser::TextParser(const QString &in, const QString &lineBreak, const QString &sep)
{
data = in;
lineSep = lineBreak;
init();
separators = sep;
@@ -57,36 +57,36 @@ void TextParser::init()
void TextParser::createSeparators()
{
separators = " @#,.:;<>*/(){}|'?-+=_";
}
/* 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;
getLineReference(pos,&atLine,&atPosElm);
for (int x = pos; x < totalElmCount; x++)
{
parsstr=splitDone[atLine].elm[atPosElm++];
if (upperCase)
{
pString=parsstr.str.upper();
- target=target.upper();
+ pTarget=pTarget.upper();
}
else
{
pString=parsstr.str;
}
- if ((pString == target) && (parsstr.separator == sep))
+ if ((pString == pTarget) && (parsstr.separator == sep))
{
return x;
}
if (atPosElm >= splitDone[atLine].elmCount)
{ //new Line
atLine++;
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
@@ -46,15 +46,15 @@ struct t_splitLine
class TextParser: public QObject
{
Q_OBJECT
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);
QChar nextSeparator();
bool hasNextSeparator();
QString wordAt(int pos);
QString nextWord();