summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorme_desk <me_desk@fb96df88-216d-11de-830c-f3023f12d8ac>2013-01-20 17:16:26 +0000
committerme_desk <me_desk@fb96df88-216d-11de-830c-f3023f12d8ac>2013-01-20 17:16:26 +0000
commit8f8cd5d5b65d3e15d12881e87fe7d8b94be9353b (patch)
treec0396ca1537684ac3c03ea51498791e5f1be00f4
parent5be6897adb9f5b1ec2f2ed316944c8231b56872b (diff)
downloadpica-pica-8f8cd5d5b65d3e15d12881e87fe7d8b94be9353b.tar.gz
pica-pica-8f8cd5d5b65d3e15d12881e87fe7d8b94be9353b.zip
removed commented out code
git-svn-id: svn://localhost/project_picapica/trunk@224 fb96df88-216d-11de-830c-f3023f12d8ac
-rw-r--r--pica-client/chatwindow.cpp20
-rw-r--r--pica-client/skynet.cpp5
2 files changed, 0 insertions, 25 deletions
diff --git a/pica-client/chatwindow.cpp b/pica-client/chatwindow.cpp
index 946e355..0366c86 100644
--- a/pica-client/chatwindow.cpp
+++ b/pica-client/chatwindow.cpp
@@ -63,7 +63,6 @@ ChatWindow::ChatWindow(quint32 peer_id) :
Contacts ct(config_dbname, account_id);
peer_name_ = ct.GetContactName(peer_id_);
- qDebug()<<"peer_name ="<<peer_name_;
if (peer_name_.isEmpty())
peer_name_ = QString::number(peer_id_);
@@ -103,25 +102,6 @@ void ChatWindow::put_message(QString msg, quint32 id, bool is_me)
if (is_me)
undelivered_msgs.append(pos);
-
-// QTextCursor c(chatw->document());
-// c.movePosition(QTextCursor::End, QTextCursor::MoveAnchor);
-// if (is_me)
-// undelivered_msgs.append(c.position());
-
-// chatw->moveCursor(QTextCursor::End, QTextCursor::MoveAnchor);
-// fmt = chatw->currentCharFormat();
-// chatw->insertHtml(
-// QString("<b><font color=%1>&nbsp;(%2) %3 : </font></b>").
-// arg(color).
-// arg(QDateTime::currentDateTime().toString()).
-// arg(QString::number(id))
-// );
-// chatw->setCurrentCharFormat(fmt);
-// chatw->insertPlainText(msg + '\n');
-
-// chatw->moveCursor(QTextCursor::End, QTextCursor::MoveAnchor);
-
}
int ChatWindow::draw_message(QString msg, QString nickname, QString datetime, QString color, bool is_delivered)
diff --git a/pica-client/skynet.cpp b/pica-client/skynet.cpp
index 942cdd0..76b86a0 100644
--- a/pica-client/skynet.cpp
+++ b/pica-client/skynet.cpp
@@ -136,11 +136,6 @@ void SkyNet::verify_peer_cert(quint32 peer_id, QString cert_pem, bool *verified)
if (stored_DER.size() != received_DER.size() ||
memcmp(stored_DER.constData(), received_DER.constData(), stored_DER.size()) != 0)
{//put scary message here
- //QMessageBox mbx;
- //mbx.setText(tr("Certificate is forged!!!"));
- //mbx.exec();
- //ForgedCertDialog fcd(peer_id, cert_pem, stored_cert);
- //fcd.exec();
*verified = false;
emit CertificateForged(peer_id, cert_pem, stored_cert);
}