Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-28 23:15:59 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2014-10-30 14:55:11 (GMT) |
| commit | 4041cc4dd4f0abc6641fed5890120efa691a27ca (patch) | |
| tree | 8c9eb101469f453556314c23bcec57f680419c4e /Swift | |
| parent | 6e87ef3a842094483105df4e6333c90964a69a47 (diff) | |
| download | swift-4041cc4dd4f0abc6641fed5890120efa691a27ca.zip swift-4041cc4dd4f0abc6641fed5890120efa691a27ca.tar.bz2 | |
Add missing virtual and SWIFTEN_OVERRIDE annotations to reduce warnings with C++11.
Test-Information:
Tested with Clang 3.6.0.
Change-Id: I1f9ae8ae535d90f92b7263e86b51fe64b15524b4
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/QtUI/QtWebKitChatView.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Swift/QtUI/QtWebKitChatView.h b/Swift/QtUI/QtWebKitChatView.h index 925ceeb..3715db1 100644 --- a/Swift/QtUI/QtWebKitChatView.h +++ b/Swift/QtUI/QtWebKitChatView.h @@ -61,8 +61,8 @@ namespace Swift { virtual void addErrorMessage(const ChatWindow::ChatMessage& message) SWIFTEN_OVERRIDE; virtual void replaceMessage(const ChatWindow::ChatMessage& message, const std::string& id, const boost::posix_time::ptime& time, const HighlightAction& highlight) SWIFTEN_OVERRIDE; virtual void replaceWithAction(const ChatWindow::ChatMessage& message, const std::string& id, const boost::posix_time::ptime& time, const HighlightAction& highlight) SWIFTEN_OVERRIDE; - void replaceLastMessage(const ChatWindow::ChatMessage& message, const ChatWindow::TimestampBehaviour timestampBehaviour); - void setAckState(const std::string& id, ChatWindow::AckState state); + virtual void replaceLastMessage(const ChatWindow::ChatMessage& message, const ChatWindow::TimestampBehaviour timestampBehaviour) SWIFTEN_OVERRIDE; + virtual void setAckState(const std::string& id, ChatWindow::AckState state) SWIFTEN_OVERRIDE; virtual std::string addFileTransfer(const std::string& senderName, bool senderIsSelf, const std::string& filename, const boost::uintmax_t sizeInBytes) SWIFTEN_OVERRIDE; virtual void setFileTransferProgress(std::string, const int percentageDone) SWIFTEN_OVERRIDE; @@ -77,7 +77,7 @@ namespace Swift { void addMessageBottom(boost::shared_ptr<ChatSnippet> snippet); int getSnippetPositionByDate(const QDate& date); // FIXME : This probably shouldn't have been public - void addLastSeenLine(); + virtual void addLastSeenLine() SWIFTEN_OVERRIDE; private: // previously public, now private void replaceLastMessage(const QString& newMessage, const ChatWindow::TimestampBehaviour timestampBehaviour); @@ -110,9 +110,9 @@ namespace Swift { void resetTopInsertPoint(); void increaseFontSize(int numSteps = 1); void decreaseFontSize(); - void resizeFont(int fontSizeSteps); - void scrollToBottom(); - void handleKeyPressEvent(QKeyEvent* event); + virtual void resizeFont(int fontSizeSteps) SWIFTEN_OVERRIDE; + virtual void scrollToBottom() SWIFTEN_OVERRIDE; + virtual void handleKeyPressEvent(QKeyEvent* event) SWIFTEN_OVERRIDE; private slots: void handleViewLoadFinished(bool); |