From e68f885dff2fc975e0a0f8c1e7eae23bc7978293 Mon Sep 17 00:00:00 2001 From: fourtf Date: Thu, 5 Jan 2017 16:22:55 +0100 Subject: [PATCH] ddddddddddddddddddddddddddddd --- message.cpp | 11 +++++++---- word.cpp | 1 + word.h | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/message.cpp b/message.cpp index ce844197..e9f93a34 100644 --- a/message.cpp +++ b/message.cpp @@ -23,7 +23,7 @@ Message::Message(const IrcPrivateMessage& ircMessage, const Channel& Channel) auto words = new QList(); // timestamps - iterator = ircMessage.tags().find("tmi-sent-ts"); + auto iterator = ircMessage.tags().find("tmi-sent-ts"); time_t time = std::time(NULL); if (iterator != ircMessage.tags().end()) @@ -39,8 +39,11 @@ Message::Message(const IrcPrivateMessage& ircMessage, const Channel& Channel) strftime(timeStampBuffer, 69, "%H:%M:%S", localtime(&time)); QString timestampWithSeconds = QString(timeStampBuffer); - words->append(new Word(timestamp, Word::TimestampNoSeconds)); - words->append(new Word(timestampWithSeconds, Word::TimestampWithSeconds)); + QString copytext(""); + QString tooltip(""); + +// words->append(*new Word(timestamp, Word::TimestampNoSeconds, copytext, tooltip)); +// words->append(*new Word(timestampWithSeconds, Word::TimestampWithSeconds, copytext, tooltip)); // username m_userName = ircMessage.account(); @@ -58,7 +61,7 @@ Message::Message(const IrcPrivateMessage& ircMessage, const Channel& Channel) // display name QString displayName; - auto iterator = ircMessage.tags().find("display-name"); + iterator = ircMessage.tags().find("display-name"); if (iterator == ircMessage.tags().end()) { displayName = m_userName; } diff --git a/word.cpp b/word.cpp index 95c940bf..b6905aad 100644 --- a/word.cpp +++ b/word.cpp @@ -22,6 +22,7 @@ Word::Word(const QString& text, Type type, const QString& copytext, const QStrin Word::~Word() { + delete text; delete m_copyText; delete m_tooltip; } diff --git a/word.h b/word.h index 428a2e82..bfea206f 100644 --- a/word.h +++ b/word.h @@ -77,8 +77,8 @@ public: return m_isImage; } - QString* copyText() { - return m_copyText; + QString& copyText() { + return *m_copyText; } bool hasTrailingSpace() {