summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-04-04 13:24:01 (GMT)
committerTobias Markmann <tm@ayena.de>2016-04-04 13:24:39 (GMT)
commit4f3821a090931499b9c68b3b3ad785a98ea9d742 (patch)
treed73db72ce5dc3c547ceb56fa9522ce8f6f3e1336 /Swift/QtUI
parent741c45b74d5f634622eb5f757c49323274fb8937 (diff)
downloadswift-4f3821a090931499b9c68b3b3ad785a98ea9d742.zip
swift-4f3821a090931499b9c68b3b3ad785a98ea9d742.tar.bz2
Apply automated clang-tidy fixes and add missing includes
Test-Information: Builds on OS X 10.11.4 and unit tests pass. Change-Id: I8775e8d1e3addbc88b220c1cc618637f706daca2
Diffstat (limited to 'Swift/QtUI')
-rw-r--r--Swift/QtUI/QtPlainChatView.h14
-rw-r--r--Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h1
2 files changed, 8 insertions, 7 deletions
diff --git a/Swift/QtUI/QtPlainChatView.h b/Swift/QtUI/QtPlainChatView.h
index 2a9b3e1..d65672c 100644
--- a/Swift/QtUI/QtPlainChatView.h
+++ b/Swift/QtUI/QtPlainChatView.h
@@ -55,17 +55,17 @@ namespace Swift {
virtual void setFileTransferProgress(std::string, const int /*percentageDone*/);
virtual void setFileTransferStatus(std::string, const ChatWindow::FileTransferState /*state*/, const std::string& /*msg*/ = "");
virtual void addMUCInvitation(const std::string& /*senderName*/, const JID& /*jid*/, const std::string& /*reason*/, const std::string& /*password*/, bool /*direct*/, bool /*isImpromptu*/, bool /*isContinuation*/);
- virtual std::string addWhiteboardRequest(const QString& /*contact*/, bool /*senderIsSelf*/) {return "";};
- virtual void setWhiteboardSessionStatus(const std::string& /*id*/, const ChatWindow::WhiteboardSessionState /*state*/) {};
- virtual void setMessageReceiptState(const std::string& /*id*/, ChatWindow::ReceiptState /*state*/) {};
+ virtual std::string addWhiteboardRequest(const QString& /*contact*/, bool /*senderIsSelf*/) {return "";}
+ virtual void setWhiteboardSessionStatus(const std::string& /*id*/, const ChatWindow::WhiteboardSessionState /*state*/) {}
+ virtual void setMessageReceiptState(const std::string& /*id*/, ChatWindow::ReceiptState /*state*/) {}
- virtual void showEmoticons(bool /*show*/) {};
- virtual void addLastSeenLine() {};
+ virtual void showEmoticons(bool /*show*/) {}
+ virtual void addLastSeenLine() {}
public slots:
- virtual void resizeFont(int /*fontSizeSteps*/) {};
+ virtual void resizeFont(int /*fontSizeSteps*/) {}
virtual void scrollToBottom();
- virtual void handleKeyPressEvent(QKeyEvent* /*event*/) {};
+ virtual void handleKeyPressEvent(QKeyEvent* /*event*/) {}
virtual void fileTransferAccept();
virtual void fileTransferReject();
virtual void fileTransferFinish();
diff --git a/Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h b/Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h
index 8182bcb..24bf6fa 100644
--- a/Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h
+++ b/Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h
@@ -12,6 +12,7 @@
#pragma once
+#include <Swiften/ELements/Whiteboard/WhiteboardRectElement.h>
#include <Swiften/Elements/Whiteboard/WhiteboardElementVisitor.h>
#include <Swiften/Elements/Whiteboard/WhiteboardEllipseElement.h>
#include <Swiften/Elements/Whiteboard/WhiteboardFreehandPathElement.h>