Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-08-30 18:25:18 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-08-30 18:25:28 (GMT) |
| commit | b675400b6bc22d841ca5273939ab64be277adb32 (patch) | |
| tree | e566f2d035fd7f49ae79596c23dbc323b4d9c74c /Swift/QtUI/QtChatView.cpp | |
| parent | 2f3d74e471022d21477adccf013a0430956bddbf (diff) | |
| download | swift-b675400b6bc22d841ca5273939ab64be277adb32.zip swift-b675400b6bc22d841ca5273939ab64be277adb32.tar.bz2 | |
Assertion checks for adding messages etc.
Diffstat (limited to 'Swift/QtUI/QtChatView.cpp')
| -rw-r--r-- | Swift/QtUI/QtChatView.cpp | 44 |
1 files changed, 16 insertions, 28 deletions
diff --git a/Swift/QtUI/QtChatView.cpp b/Swift/QtUI/QtChatView.cpp index 1c4ed18..52b399b 100644 --- a/Swift/QtUI/QtChatView.cpp +++ b/Swift/QtUI/QtChatView.cpp @@ -63,11 +63,9 @@ QtChatView::QtChatView(QtChatTheme* theme, QWidget* parent) : QWidget(parent) { document_ = webPage_->mainFrame()->documentElement(); QWebElement chatElement = document_.findFirst("#Chat"); newInsertPoint_ = chatElement.clone(); - newInsertPoint_.setOuterXml("<div id='insert'/>"); + newInsertPoint_.setOuterXml("<div id='swift_insert'/>"); chatElement.appendInside(newInsertPoint_); - if (newInsertPoint_.isNull()) { - qWarning() << "Warning, initial insert point element is null!"; - } + Q_ASSERT(!newInsertPoint_.isNull()); } void QtChatView::handleKeyPressEvent(QKeyEvent* event) { @@ -80,35 +78,12 @@ void QtChatView::addMessage(boost::shared_ptr<ChatSnippet> snippet) { } else { queuedSnippets_.append(snippet); } -// QString content = snippet.getContent(); -// content.replace("\\", "\\\\"); -// content.replace("\"", "\\\""); -// content.replace("\n", "\\n"); -// content.replace("\r", ""); -// QString command; -// if (previousContinuationElementID_.isEmpty() || !snippet.getAppendToPrevious()) { -// command = "appendMessage(\"" + content + "\");"; -// } -// else { -// command = "appendNextMessage(\"" + content + "\");"; -// } -// if (viewReady_) { -// webPage_->mainFrame()->evaluateJavaScript(command); -// } -// else { -// queuedMessages_ += command; -// } -// -// previousContinuationElementID_ = snippet.getContinuationElementID(); - } QWebElement QtChatView::snippetToDOM(boost::shared_ptr<ChatSnippet> snippet) { QWebElement newElement = newInsertPoint_.clone(); newElement.setInnerXml(snippet->getContent()); /* FIXME: Outer, surely? */ - if (newElement.isNull()) { - qWarning() << "Warning, new element is null!"; - } + Q_ASSERT(!newElement.isNull()); return newElement; } @@ -116,6 +91,7 @@ void QtChatView::addToDOM(boost::shared_ptr<ChatSnippet> snippet) { QWebElement newElement = snippetToDOM(snippet); QWebElement continuationElement = lastElement_.findFirst("#insert"); if (snippet->getAppendToPrevious()) { + Q_ASSERT(!continuationElement.isNull()); continuationElement.replace(newElement); } else { continuationElement.removeFromDocument(); @@ -124,6 +100,18 @@ void QtChatView::addToDOM(boost::shared_ptr<ChatSnippet> snippet) { lastElement_ = newElement; } +void QtChatView::correctLastMessage(const QString& newMessage) { + /* FIXME: must be queued */ + lastElement_.findFirst("swift_message"); + lastElement_.setPlainText(ChatSnippet::escape(newMessage)); +} + +void QtChatView::correctLastMessage(const QString& newMessage, const QString& note) { + correctLastMessage(newMessage); + lastElement_.findFirst("swift_time"); + lastElement_.setPlainText(ChatSnippet::escape(note)); +} + void QtChatView::copySelectionToClipboard() { if (!webPage_->selectedText().isEmpty()) { webPage_->triggerAction(QWebPage::Copy); |