From 4041cc4dd4f0abc6641fed5890120efa691a27ca Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Wed, 29 Oct 2014 00:15:59 +0100
Subject: Add missing virtual and SWIFTEN_OVERRIDE annotations to reduce
 warnings with C++11.

Test-Information:

Tested with Clang 3.6.0.

Change-Id: I1f9ae8ae535d90f92b7263e86b51fe64b15524b4

diff --git a/Sluift/EditlineTerminal.h b/Sluift/EditlineTerminal.h
index 2f671b7..6e24630 100644
--- a/Sluift/EditlineTerminal.h
+++ b/Sluift/EditlineTerminal.h
@@ -20,6 +20,6 @@ namespace Swift {
 
 			virtual boost::optional<std::string> readLine(const std::string& prompt) SWIFTEN_OVERRIDE;
 			virtual void printError(const std::string& message) SWIFTEN_OVERRIDE;
-			virtual void addToHistory(const std::string& command);
+			virtual void addToHistory(const std::string& command) SWIFTEN_OVERRIDE;
 	};
 }
diff --git a/Sluift/StandardTerminal.h b/Sluift/StandardTerminal.h
index 420df6b..af65532 100644
--- a/Sluift/StandardTerminal.h
+++ b/Sluift/StandardTerminal.h
@@ -17,6 +17,6 @@ namespace Swift {
 
 			virtual boost::optional<std::string> readLine(const std::string& prompt) SWIFTEN_OVERRIDE;
 			virtual void printError(const std::string& message) SWIFTEN_OVERRIDE;
-			virtual void addToHistory(const std::string& command);
+			virtual void addToHistory(const std::string& command) SWIFTEN_OVERRIDE;
 	};
 }
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);
diff --git a/Swiften/Crypto/CommonCryptoCryptoProvider.cpp b/Swiften/Crypto/CommonCryptoCryptoProvider.cpp
index 14f9284..4cb746f 100644
--- a/Swiften/Crypto/CommonCryptoCryptoProvider.cpp
+++ b/Swiften/Crypto/CommonCryptoCryptoProvider.cpp
@@ -36,7 +36,7 @@ namespace {
 				return updateInternal(data);
 			}
 
-			virtual std::vector<unsigned char> getHash() {
+			virtual std::vector<unsigned char> getHash() SWIFTEN_OVERRIDE {
 				assert(!finalized);
 				std::vector<unsigned char> result(CC_SHA1_DIGEST_LENGTH);
 				CC_SHA1_Final(vecptr(result), &context);
@@ -77,7 +77,7 @@ namespace {
 				return updateInternal(data);
 			}
 
-			virtual std::vector<unsigned char> getHash() {
+			virtual std::vector<unsigned char> getHash() SWIFTEN_OVERRIDE {
 				assert(!finalized);
 				std::vector<unsigned char> result(CC_MD5_DIGEST_LENGTH);
 				CC_MD5_Final(vecptr(result), &context);
diff --git a/Swiften/Crypto/OpenSSLCryptoProvider.cpp b/Swiften/Crypto/OpenSSLCryptoProvider.cpp
index 9b1d544..41b4564 100644
--- a/Swiften/Crypto/OpenSSLCryptoProvider.cpp
+++ b/Swiften/Crypto/OpenSSLCryptoProvider.cpp
@@ -39,7 +39,7 @@ namespace {
 				return updateInternal(data);
 			}
 
-			virtual std::vector<unsigned char> getHash() {
+			virtual std::vector<unsigned char> getHash() SWIFTEN_OVERRIDE {
 				assert(!finalized);
 				std::vector<unsigned char> result(SHA_DIGEST_LENGTH);
 				SHA1_Final(vecptr(result), &context);
@@ -80,7 +80,7 @@ namespace {
 				return updateInternal(data);
 			}
 
-			virtual std::vector<unsigned char> getHash() {
+			virtual std::vector<unsigned char> getHash() SWIFTEN_OVERRIDE {
 				assert(!finalized);
 				std::vector<unsigned char> result(MD5_DIGEST_LENGTH);
 				MD5_Final(vecptr(result), &context);
diff --git a/Swiften/FileTransfer/DefaultFileTransferTransporter.h b/Swiften/FileTransfer/DefaultFileTransferTransporter.h
index ef982c0..80f8bee 100644
--- a/Swiften/FileTransfer/DefaultFileTransferTransporter.h
+++ b/Swiften/FileTransfer/DefaultFileTransferTransporter.h
@@ -59,8 +59,8 @@ namespace Swift {
 			virtual void startTryingRemoteCandidates() SWIFTEN_OVERRIDE;
 			virtual void stopTryingRemoteCandidates() SWIFTEN_OVERRIDE;
 
-			virtual void startActivatingProxy(const JID& jid);
-			virtual void stopActivatingProxy();
+			virtual void startActivatingProxy(const JID& jid) SWIFTEN_OVERRIDE;
+			virtual void stopActivatingProxy() SWIFTEN_OVERRIDE;
 
 			virtual boost::shared_ptr<TransportSession> createIBBSendSession(
 					const std::string& sessionID, unsigned int blockSize, boost::shared_ptr<ReadBytestream>) SWIFTEN_OVERRIDE;
diff --git a/Swiften/FileTransfer/IncomingJingleFileTransfer.h b/Swiften/FileTransfer/IncomingJingleFileTransfer.h
index a691d5b..66dade7 100644
--- a/Swiften/FileTransfer/IncomingJingleFileTransfer.h
+++ b/Swiften/FileTransfer/IncomingJingleFileTransfer.h
@@ -44,7 +44,7 @@ namespace Swift {
 			~IncomingJingleFileTransfer();
 
 			virtual void accept(boost::shared_ptr<WriteBytestream>, const FileTransferOptions&) SWIFTEN_OVERRIDE;
-			void cancel();
+			virtual void cancel() SWIFTEN_OVERRIDE;
 
 		private:
 			enum State {
@@ -79,8 +79,8 @@ namespace Swift {
 			void handleTransferFinished(boost::optional<FileTransferError>);
 
 		private:
-			void startTransferViaRemoteCandidate();
-			void startTransferViaLocalCandidate();
+			virtual void startTransferViaRemoteCandidate() SWIFTEN_OVERRIDE;
+			virtual void startTransferViaLocalCandidate() SWIFTEN_OVERRIDE;
 			void checkHashAndTerminate();
 			void stopAll();
 			void setState(State state);
diff --git a/Swiften/FileTransfer/OutgoingJingleFileTransfer.h b/Swiften/FileTransfer/OutgoingJingleFileTransfer.h
index d1f4dc4..98b585e 100644
--- a/Swiften/FileTransfer/OutgoingJingleFileTransfer.h
+++ b/Swiften/FileTransfer/OutgoingJingleFileTransfer.h
@@ -45,8 +45,8 @@ namespace Swift {
 				CryptoProvider*);
 			virtual ~OutgoingJingleFileTransfer();
 			
-			void start();
-			void cancel();
+			virtual void start() SWIFTEN_OVERRIDE;
+			virtual void cancel() SWIFTEN_OVERRIDE;
 
 		private:
 			enum State {
@@ -65,8 +65,8 @@ namespace Swift {
 			virtual void handleSessionAcceptReceived(const JingleContentID&, boost::shared_ptr<JingleDescription>, boost::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
 			virtual void handleSessionTerminateReceived(boost::optional<JinglePayload::Reason> reason) SWIFTEN_OVERRIDE;
 			virtual void handleTransportAcceptReceived(const JingleContentID&, boost::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
-			void startTransferViaRemoteCandidate();
-			void startTransferViaLocalCandidate();
+			virtual void startTransferViaRemoteCandidate() SWIFTEN_OVERRIDE;
+			virtual void startTransferViaLocalCandidate() SWIFTEN_OVERRIDE;
 			void startTransferringIfCandidateAcknowledged();
 
 			virtual void handleLocalTransportCandidatesGenerated(const std::string& s5bSessionID, const std::vector<JingleS5BTransportPayload::Candidate>&) SWIFTEN_OVERRIDE;
-- 
cgit v0.10.2-6-g49f6