Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2014-10-28 23:15:59 (GMT)
committerSwift Review <review@swift.im>2014-10-30 14:55:11 (GMT)
commit4041cc4dd4f0abc6641fed5890120efa691a27ca (patch)
tree8c9eb101469f453556314c23bcec57f680419c4e
parent6e87ef3a842094483105df4e6333c90964a69a47 (diff)
downloadswift-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
-rw-r--r--Sluift/EditlineTerminal.h2
-rw-r--r--Sluift/StandardTerminal.h2
-rw-r--r--Swift/QtUI/QtWebKitChatView.h12
-rw-r--r--Swiften/Crypto/CommonCryptoCryptoProvider.cpp4
-rw-r--r--Swiften/Crypto/OpenSSLCryptoProvider.cpp4
-rw-r--r--Swiften/FileTransfer/DefaultFileTransferTransporter.h4
-rw-r--r--Swiften/FileTransfer/IncomingJingleFileTransfer.h6
-rw-r--r--Swiften/FileTransfer/OutgoingJingleFileTransfer.h8
8 files changed, 21 insertions, 21 deletions
diff --git a/Sluift/EditlineTerminal.h b/Sluift/EditlineTerminal.h
index 2f671b7..6e24630 100644
--- a/Sluift/EditlineTerminal.h
+++ b/Sluift/EditlineTerminal.h
@@ -17,9 +17,9 @@ namespace Swift {
private:
EditlineTerminal();
virtual ~EditlineTerminal();
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
@@ -14,9 +14,9 @@ namespace Swift {
public:
StandardTerminal();
virtual ~StandardTerminal();
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
@@ -58,14 +58,14 @@ namespace Swift {
virtual void addSystemMessage(const ChatWindow::ChatMessage& message, ChatWindow::Direction direction) SWIFTEN_OVERRIDE;
virtual void addPresenceMessage(const ChatWindow::ChatMessage& message, ChatWindow::Direction direction) SWIFTEN_OVERRIDE;
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;
virtual void setFileTransferStatus(std::string, const ChatWindow::FileTransferState state, const std::string& msg = "") SWIFTEN_OVERRIDE;
virtual void addMUCInvitation(const std::string& senderName, const JID& jid, const std::string& reason, const std::string& password, bool direct, bool isImpromptu, bool isContinuation) SWIFTEN_OVERRIDE;
virtual std::string addWhiteboardRequest(const QString& contact, bool senderIsSelf) SWIFTEN_OVERRIDE;
@@ -74,13 +74,13 @@ namespace Swift {
virtual void showEmoticons(bool show) SWIFTEN_OVERRIDE;
void addMessageTop(boost::shared_ptr<ChatSnippet> snippet);
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);
void replaceLastMessage(const QString& newMessage, const QString& note);
void replaceMessage(const QString& newMessage, const QString& id, const QDateTime& time);
void rememberScrolledToBottom();
@@ -107,15 +107,15 @@ namespace Swift {
void copySelectionToClipboard();
void handleLinkClicked(const QUrl&);
void resetView();
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);
void handleFrameSizeChanged();
void handleClearRequested();
void handleScrollRequested(int dx, int dy, const QRect& rectToScroll);
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
@@ -33,13 +33,13 @@ namespace {
}
virtual Hash& update(const SafeByteArray& data) SWIFTEN_OVERRIDE {
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);
return result;
}
@@ -74,13 +74,13 @@ namespace {
}
virtual Hash& update(const SafeByteArray& data) SWIFTEN_OVERRIDE {
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);
return result;
}
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
@@ -36,13 +36,13 @@ namespace {
}
virtual Hash& update(const SafeByteArray& data) SWIFTEN_OVERRIDE {
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);
return result;
}
@@ -77,13 +77,13 @@ namespace {
}
virtual Hash& update(const SafeByteArray& data) SWIFTEN_OVERRIDE {
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);
return result;
}
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
@@ -56,14 +56,14 @@ namespace Swift {
virtual void addRemoteCandidates(
const std::vector<JingleS5BTransportPayload::Candidate>&) SWIFTEN_OVERRIDE;
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;
virtual boost::shared_ptr<TransportSession> createIBBReceiveSession(
const std::string& sessionID, unsigned long long size, boost::shared_ptr<WriteBytestream>) SWIFTEN_OVERRIDE;
virtual boost::shared_ptr<TransportSession> createRemoteCandidateSession(
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
@@ -41,13 +41,13 @@ namespace Swift {
FileTransferTransporterFactory*,
TimerFactory*,
CryptoProvider*);
~IncomingJingleFileTransfer();
virtual void accept(boost::shared_ptr<WriteBytestream>, const FileTransferOptions&) SWIFTEN_OVERRIDE;
- void cancel();
+ virtual void cancel() SWIFTEN_OVERRIDE;
private:
enum State {
Initial,
GeneratingInitialLocalCandidates,
TryingCandidates,
@@ -76,14 +76,14 @@ namespace Swift {
void checkIfAllDataReceived();
bool verifyData();
void handleWaitOnHashTimerTicked();
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);
void setFinishedState(FileTransfer::State::Type, const boost::optional<FileTransferError>& error);
const JID& getSender() const SWIFTEN_OVERRIDE;
const JID& getRecipient() const SWIFTEN_OVERRIDE;
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
@@ -42,14 +42,14 @@ namespace Swift {
IDGenerator*,
const StreamInitiationFileInfo&,
const FileTransferOptions&,
CryptoProvider*);
virtual ~OutgoingJingleFileTransfer();
- void start();
- void cancel();
+ virtual void start() SWIFTEN_OVERRIDE;
+ virtual void cancel() SWIFTEN_OVERRIDE;
private:
enum State {
Initial,
GeneratingInitialLocalCandidates,
WaitingForAccept,
@@ -62,14 +62,14 @@ namespace Swift {
Finished
};
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;
virtual void handleTransportInfoAcknowledged(const std::string& id) SWIFTEN_OVERRIDE;
virtual JingleContentID getContentID() const SWIFTEN_OVERRIDE;