-rw-r--r-- | noncore/net/mailit/addresslist.cpp | 2 | ||||
-rw-r--r-- | noncore/net/mailit/emailclient.cpp | 8 | ||||
-rw-r--r-- | noncore/net/mailit/emailhandler.cpp | 2 | ||||
-rw-r--r-- | noncore/net/mailit/mailitwindow.cpp | 3 | ||||
-rw-r--r-- | noncore/net/mailit/popclient.cpp | 8 | ||||
-rw-r--r-- | noncore/net/mailit/readmail.cpp | 1 | ||||
-rw-r--r-- | noncore/net/mailit/smtpclient.cpp | 20 | ||||
-rw-r--r-- | noncore/unsupported/mailit/addresslist.cpp | 2 | ||||
-rw-r--r-- | noncore/unsupported/mailit/emailclient.cpp | 8 | ||||
-rw-r--r-- | noncore/unsupported/mailit/emailhandler.cpp | 2 | ||||
-rw-r--r-- | noncore/unsupported/mailit/mailitwindow.cpp | 3 | ||||
-rw-r--r-- | noncore/unsupported/mailit/popclient.cpp | 8 | ||||
-rw-r--r-- | noncore/unsupported/mailit/readmail.cpp | 1 | ||||
-rw-r--r-- | noncore/unsupported/mailit/smtpclient.cpp | 20 |
14 files changed, 40 insertions, 48 deletions
diff --git a/noncore/net/mailit/addresslist.cpp b/noncore/net/mailit/addresslist.cpp index 9fe558a..8d9ab91 100644 --- a/noncore/net/mailit/addresslist.cpp +++ b/noncore/net/mailit/addresslist.cpp @@ -129,3 +129,3 @@ void AddressList::read() if ((*it).defaultEmail().length()!=0) - addContact((*it).defaultEmail(),(*it).fullName()); + addContact((*it).defaultEmail(),(*it).fileAs()); } diff --git a/noncore/net/mailit/emailclient.cpp b/noncore/net/mailit/emailclient.cpp index 6612541..0d82a9a 100644 --- a/noncore/net/mailit/emailclient.cpp +++ b/noncore/net/mailit/emailclient.cpp @@ -534,3 +534,3 @@ void EmailClient::readMail() // QFileInfo fi(f); - qDebug( f.name()); + //qDebug( f.name()); @@ -588,3 +588,3 @@ void EmailClient::saveMail(QString fileName, QListView *view) item = (EmailListItem *) view->firstChild(); - qDebug (QString("Write : ") ); + //qDebug (QString("Write : ") ); QTextStream t(&f); @@ -592,4 +592,4 @@ void EmailClient::saveMail(QString fileName, QListView *view) mail = item->getMail(); - qDebug(mail->rawMail); - qDebug(mail->recipients.first()); + //qDebug(mail->rawMail); + //qDebug(mail->recipients.first()); t << mail->rawMail; diff --git a/noncore/net/mailit/emailhandler.cpp b/noncore/net/mailit/emailhandler.cpp index 9c1c814..03f8a28 100644 --- a/noncore/net/mailit/emailhandler.cpp +++ b/noncore/net/mailit/emailhandler.cpp @@ -165,4 +165,2 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail) if (in.right(temp.length()) != temp) { - qWarning(in.right(temp.length())); - qWarning(" . added at end of email as separator"); mail->rawMail += temp; diff --git a/noncore/net/mailit/mailitwindow.cpp b/noncore/net/mailit/mailitwindow.cpp index fd49c1f..2bf1dcb 100644 --- a/noncore/net/mailit/mailitwindow.cpp +++ b/noncore/net/mailit/mailitwindow.cpp @@ -29,3 +29,2 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) - qWarning("***Starting writeMail"); emailClient = new EmailClient(views, "client"); @@ -33,3 +32,2 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) readMail = new ReadMail(views, "reading"); - qWarning("***Finished readMail"); @@ -62,3 +60,2 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) - qWarning("***Finished MailitWindow"); } diff --git a/noncore/net/mailit/popclient.cpp b/noncore/net/mailit/popclient.cpp index 2f14ed2..f9cc337 100644 --- a/noncore/net/mailit/popclient.cpp +++ b/noncore/net/mailit/popclient.cpp @@ -121,3 +121,3 @@ void PopClient::incomingData() response = socket->readLine(); - qDebug(response +" %d", status); + //qDebug(response +" %d", status); @@ -133,3 +133,3 @@ void PopClient::incomingData() md5Source = timeStamp + popPassword; - qDebug( md5Source); + //qDebug( md5Source); // for( int i = 0; i < md5Source.length(); i++) { @@ -194,3 +194,3 @@ void PopClient::incomingData() lastSync = 0; - messageCount = lastSync + 1; + messageCount = 1; } @@ -242,3 +242,3 @@ void PopClient::incomingData() } else { - qWarning(response); + //qWarning(response); errorHandling(ErrUnknownResponse); diff --git a/noncore/net/mailit/readmail.cpp b/noncore/net/mailit/readmail.cpp index a5e7147..7cd3e09 100644 --- a/noncore/net/mailit/readmail.cpp +++ b/noncore/net/mailit/readmail.cpp @@ -91,2 +91,3 @@ void ReadMail::init() emailView = new QTextView( this, "emailView" ); + setCentralWidget(emailView); diff --git a/noncore/net/mailit/smtpclient.cpp b/noncore/net/mailit/smtpclient.cpp index 6699a90..b2e38e5 100644 --- a/noncore/net/mailit/smtpclient.cpp +++ b/noncore/net/mailit/smtpclient.cpp @@ -89,3 +89,3 @@ void SmtpClient::incomingData() response = socket->readLine(); - qDebug(response); + //qDebug(response); @@ -97,3 +97,3 @@ void SmtpClient::incomingData() *stream << "HELO there\r\n"; - qDebug("HELO"); + //qDebug("HELO"); } else errorHandling(ErrUnknownResponse); @@ -103,5 +103,5 @@ void SmtpClient::incomingData() if (response[0] == '2') { - *stream << "MAIL FROM: <" << mailPtr->from << ">\r\n"; + *stream << "MAIL FROM: " << mailPtr->from << "\r\n"; status = Recv; - qDebug("MAIL FROM: "+mailPtr->from); + //qDebug("MAIL FROM: "+mailPtr->from); } else errorHandling(ErrUnknownResponse); @@ -114,4 +114,4 @@ void SmtpClient::incomingData() errorHandling(ErrUnknownResponse); - *stream << "RCPT TO: <" << *it << ">\r\n"; - qDebug("RCPT TO: "+ *it); + *stream << "RCPT TO: " << *it << ">\r\n"; + //qDebug("RCPT TO: "+ *it); status = MRcv; @@ -125,3 +125,3 @@ void SmtpClient::incomingData() *stream << "RCPT TO: <" << *it << ">\r\n"; - qDebug("RCPT TO: "+ *it); + //qDebug("RCPT TO: "+ *it); break; @@ -136,3 +136,3 @@ void SmtpClient::incomingData() status = Body; - qDebug("DATA"); + //qDebug("DATA"); emit updateStatus(tr("Sending: ") + mailPtr->subject); @@ -150,3 +150,3 @@ void SmtpClient::incomingData() } - qDebug("BODY"); + //qDebug("BODY"); } else errorHandling(ErrUnknownResponse); @@ -165,3 +165,3 @@ void SmtpClient::incomingData() socket->close(); - qDebug("QUIT"); + //qDebug("QUIT"); } else errorHandling(ErrUnknownResponse); diff --git a/noncore/unsupported/mailit/addresslist.cpp b/noncore/unsupported/mailit/addresslist.cpp index 9fe558a..8d9ab91 100644 --- a/noncore/unsupported/mailit/addresslist.cpp +++ b/noncore/unsupported/mailit/addresslist.cpp @@ -129,3 +129,3 @@ void AddressList::read() if ((*it).defaultEmail().length()!=0) - addContact((*it).defaultEmail(),(*it).fullName()); + addContact((*it).defaultEmail(),(*it).fileAs()); } diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp index 6612541..0d82a9a 100644 --- a/noncore/unsupported/mailit/emailclient.cpp +++ b/noncore/unsupported/mailit/emailclient.cpp @@ -534,3 +534,3 @@ void EmailClient::readMail() // QFileInfo fi(f); - qDebug( f.name()); + //qDebug( f.name()); @@ -588,3 +588,3 @@ void EmailClient::saveMail(QString fileName, QListView *view) item = (EmailListItem *) view->firstChild(); - qDebug (QString("Write : ") ); + //qDebug (QString("Write : ") ); QTextStream t(&f); @@ -592,4 +592,4 @@ void EmailClient::saveMail(QString fileName, QListView *view) mail = item->getMail(); - qDebug(mail->rawMail); - qDebug(mail->recipients.first()); + //qDebug(mail->rawMail); + //qDebug(mail->recipients.first()); t << mail->rawMail; diff --git a/noncore/unsupported/mailit/emailhandler.cpp b/noncore/unsupported/mailit/emailhandler.cpp index 9c1c814..03f8a28 100644 --- a/noncore/unsupported/mailit/emailhandler.cpp +++ b/noncore/unsupported/mailit/emailhandler.cpp @@ -165,4 +165,2 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail) if (in.right(temp.length()) != temp) { - qWarning(in.right(temp.length())); - qWarning(" . added at end of email as separator"); mail->rawMail += temp; diff --git a/noncore/unsupported/mailit/mailitwindow.cpp b/noncore/unsupported/mailit/mailitwindow.cpp index fd49c1f..2bf1dcb 100644 --- a/noncore/unsupported/mailit/mailitwindow.cpp +++ b/noncore/unsupported/mailit/mailitwindow.cpp @@ -29,3 +29,2 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) - qWarning("***Starting writeMail"); emailClient = new EmailClient(views, "client"); @@ -33,3 +32,2 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) readMail = new ReadMail(views, "reading"); - qWarning("***Finished readMail"); @@ -62,3 +60,2 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) - qWarning("***Finished MailitWindow"); } diff --git a/noncore/unsupported/mailit/popclient.cpp b/noncore/unsupported/mailit/popclient.cpp index 2f14ed2..f9cc337 100644 --- a/noncore/unsupported/mailit/popclient.cpp +++ b/noncore/unsupported/mailit/popclient.cpp @@ -121,3 +121,3 @@ void PopClient::incomingData() response = socket->readLine(); - qDebug(response +" %d", status); + //qDebug(response +" %d", status); @@ -133,3 +133,3 @@ void PopClient::incomingData() md5Source = timeStamp + popPassword; - qDebug( md5Source); + //qDebug( md5Source); // for( int i = 0; i < md5Source.length(); i++) { @@ -194,3 +194,3 @@ void PopClient::incomingData() lastSync = 0; - messageCount = lastSync + 1; + messageCount = 1; } @@ -242,3 +242,3 @@ void PopClient::incomingData() } else { - qWarning(response); + //qWarning(response); errorHandling(ErrUnknownResponse); diff --git a/noncore/unsupported/mailit/readmail.cpp b/noncore/unsupported/mailit/readmail.cpp index a5e7147..7cd3e09 100644 --- a/noncore/unsupported/mailit/readmail.cpp +++ b/noncore/unsupported/mailit/readmail.cpp @@ -91,2 +91,3 @@ void ReadMail::init() emailView = new QTextView( this, "emailView" ); + setCentralWidget(emailView); diff --git a/noncore/unsupported/mailit/smtpclient.cpp b/noncore/unsupported/mailit/smtpclient.cpp index 6699a90..b2e38e5 100644 --- a/noncore/unsupported/mailit/smtpclient.cpp +++ b/noncore/unsupported/mailit/smtpclient.cpp @@ -89,3 +89,3 @@ void SmtpClient::incomingData() response = socket->readLine(); - qDebug(response); + //qDebug(response); @@ -97,3 +97,3 @@ void SmtpClient::incomingData() *stream << "HELO there\r\n"; - qDebug("HELO"); + //qDebug("HELO"); } else errorHandling(ErrUnknownResponse); @@ -103,5 +103,5 @@ void SmtpClient::incomingData() if (response[0] == '2') { - *stream << "MAIL FROM: <" << mailPtr->from << ">\r\n"; + *stream << "MAIL FROM: " << mailPtr->from << "\r\n"; status = Recv; - qDebug("MAIL FROM: "+mailPtr->from); + //qDebug("MAIL FROM: "+mailPtr->from); } else errorHandling(ErrUnknownResponse); @@ -114,4 +114,4 @@ void SmtpClient::incomingData() errorHandling(ErrUnknownResponse); - *stream << "RCPT TO: <" << *it << ">\r\n"; - qDebug("RCPT TO: "+ *it); + *stream << "RCPT TO: " << *it << ">\r\n"; + //qDebug("RCPT TO: "+ *it); status = MRcv; @@ -125,3 +125,3 @@ void SmtpClient::incomingData() *stream << "RCPT TO: <" << *it << ">\r\n"; - qDebug("RCPT TO: "+ *it); + //qDebug("RCPT TO: "+ *it); break; @@ -136,3 +136,3 @@ void SmtpClient::incomingData() status = Body; - qDebug("DATA"); + //qDebug("DATA"); emit updateStatus(tr("Sending: ") + mailPtr->subject); @@ -150,3 +150,3 @@ void SmtpClient::incomingData() } - qDebug("BODY"); + //qDebug("BODY"); } else errorHandling(ErrUnknownResponse); @@ -165,3 +165,3 @@ void SmtpClient::incomingData() socket->close(); - qDebug("QUIT"); + //qDebug("QUIT"); } else errorHandling(ErrUnknownResponse); |