diff --git a/src/Chat/Chat.cpp b/src/Chat/Chat.cpp index cdc3814..672808c 100644 --- a/src/Chat/Chat.cpp +++ b/src/Chat/Chat.cpp @@ -66,7 +66,7 @@ void Chat::renderChatBox(Ui::MainWindow *ui, QListView *view, QLabel *label) Items->setData(OUTGOING, Qt::UserRole + 1); chat->appendRow(Items); - ui->listChat->setModel(chat); + ui->listChat->setModel(chat); } diff --git a/src/Chat/Chat.h b/src/Chat/Chat.h index efe5b56..6d8b01a 100644 --- a/src/Chat/Chat.h +++ b/src/Chat/Chat.h @@ -27,21 +27,7 @@ class Chat // Chat Controller std::map requestZaddrMap; public: Chat(); - //QString zaddr(); void renderChatBox(Ui::MainWindow* ui, QListView *view, QLabel *label); // action - // void renderContactRequest(); - /*void triggerRequest(); - void showMessages(); - void clear(); - //void renderContactRequest(Ui::MainWindow* ui, QListView *view); - void addMessage(ChatItem item); - void addMessage(QString timestamp, ChatItem item); - void addCid(QString tx, QString cid); - void addrequestZaddr(QString tx, QString requestZaddr); - QString getCidByTx(QString tx); - QString getrequestZaddrByTx(QString tx); - void killCidCache(); - void killrequestZaddrCache();*/ }; diff --git a/src/Model/ChatItem.cpp b/src/Model/ChatItem.cpp index 6a30f56..722d2f6 100644 --- a/src/Model/ChatItem.cpp +++ b/src/Model/ChatItem.cpp @@ -179,7 +179,7 @@ QString ChatItem::toChatLine() qDebug()<<_notarize; - QString line = QString("") + myDateTime.toString("dd.MM.yyyy hh:mm"); + QString line = QString("") + myDateTime.toString("yyyy-MM-dd hh:mm"); line += QString(lock) + QString(""); line += QString("

") + _memo.toHtmlEscaped() + QString("

"); return line;