diff options
Diffstat (limited to 'Swift/Controllers/UnitTest')
| -rw-r--r-- | Swift/Controllers/UnitTest/ChatMessageSummarizerTest.cpp | 2 | ||||
| -rw-r--r-- | Swift/Controllers/UnitTest/MockChatWindow.h | 64 | ||||
| -rw-r--r-- | Swift/Controllers/UnitTest/MockMainWindowFactory.h | 6 | 
3 files changed, 36 insertions, 36 deletions
diff --git a/Swift/Controllers/UnitTest/ChatMessageSummarizerTest.cpp b/Swift/Controllers/UnitTest/ChatMessageSummarizerTest.cpp index ee0ee9f..985352a 100644 --- a/Swift/Controllers/UnitTest/ChatMessageSummarizerTest.cpp +++ b/Swift/Controllers/UnitTest/ChatMessageSummarizerTest.cpp @@ -26,7 +26,7 @@ class ChatMessageSummarizerTest : public CppUnit::TestFixture {  	CPPUNIT_TEST_SUITE_END();  public: -	ChatMessageSummarizerTest() {}; +	ChatMessageSummarizerTest() {}  	void setUp() { diff --git a/Swift/Controllers/UnitTest/MockChatWindow.h b/Swift/Controllers/UnitTest/MockChatWindow.h index 998a4eb..ac3f21b 100644 --- a/Swift/Controllers/UnitTest/MockChatWindow.h +++ b/Swift/Controllers/UnitTest/MockChatWindow.h @@ -11,53 +11,53 @@  namespace Swift {  	class MockChatWindow : public ChatWindow {  		public: -			MockChatWindow() : labelsEnabled_(false) {}; +			MockChatWindow() : labelsEnabled_(false) {}  			virtual ~MockChatWindow(); -			virtual std::string addMessage(const std::string& message, const std::string& /*senderName*/, bool /*senderIsSelf*/, boost::shared_ptr<SecurityLabel> /*label*/, const std::string& /*avatarPath*/, const boost::posix_time::ptime&) {lastMessageBody_ = message; return "";}; -			virtual std::string addAction(const std::string& message, const std::string& /*senderName*/, bool /*senderIsSelf*/, boost::shared_ptr<SecurityLabel> /*label*/, const std::string& /*avatarPath*/, const boost::posix_time::ptime&) {lastMessageBody_ = message; return "";}; -			virtual void addSystemMessage(const std::string& /*message*/) {}; -			virtual void addErrorMessage(const std::string& /*message*/) {}; -			virtual void addPresenceMessage(const std::string& /*message*/) {}; +			virtual std::string addMessage(const std::string& message, const std::string& /*senderName*/, bool /*senderIsSelf*/, boost::shared_ptr<SecurityLabel> /*label*/, const std::string& /*avatarPath*/, const boost::posix_time::ptime&) {lastMessageBody_ = message; return "";} +			virtual std::string addAction(const std::string& message, const std::string& /*senderName*/, bool /*senderIsSelf*/, boost::shared_ptr<SecurityLabel> /*label*/, const std::string& /*avatarPath*/, const boost::posix_time::ptime&) {lastMessageBody_ = message; return "";} +			virtual void addSystemMessage(const std::string& /*message*/) {} +			virtual void addErrorMessage(const std::string& /*message*/) {} +			virtual void addPresenceMessage(const std::string& /*message*/) {}  			// File transfer related stuff -			virtual std::string addFileTransfer(const std::string& /*senderName*/, bool /*senderIsSelf*/,const std::string& /*filename*/, const boost::uintmax_t /*sizeInBytes*/) { return 0; }; -			virtual void setFileTransferProgress(std::string /*id*/, const int /*alreadyTransferedBytes*/) { }; -			virtual void setFileTransferStatus(std::string /*id*/, const FileTransferState /*state*/, const std::string& /*msg*/) { }; +			virtual std::string addFileTransfer(const std::string& /*senderName*/, bool /*senderIsSelf*/,const std::string& /*filename*/, const boost::uintmax_t /*sizeInBytes*/) { return 0; } +			virtual void setFileTransferProgress(std::string /*id*/, const int /*alreadyTransferedBytes*/) { } +			virtual void setFileTransferStatus(std::string /*id*/, const FileTransferState /*state*/, const std::string& /*msg*/) { }  			virtual void setMessageReceiptState(const std::string &/* id */, ReceiptState /* state */) { } -			virtual void setContactChatState(ChatState::ChatStateType /*state*/) {}; -			virtual void setName(const std::string& name) {name_ = name;}; -			virtual void show() {}; -			virtual void activate() {}; -			virtual void setAvailableSecurityLabels(const std::vector<SecurityLabelsCatalog::Item>& labels) {labels_ = labels;}; -			virtual void setSecurityLabelsEnabled(bool enabled) {labelsEnabled_ = enabled;}; -			virtual void setUnreadMessageCount(int /*count*/) {}; -			virtual void convertToMUC() {}; -			virtual void setSecurityLabelsError() {}; +			virtual void setContactChatState(ChatState::ChatStateType /*state*/) {} +			virtual void setName(const std::string& name) {name_ = name;} +			virtual void show() {} +			virtual void activate() {} +			virtual void setAvailableSecurityLabels(const std::vector<SecurityLabelsCatalog::Item>& labels) {labels_ = labels;} +			virtual void setSecurityLabelsEnabled(bool enabled) {labelsEnabled_ = enabled;} +			virtual void setUnreadMessageCount(int /*count*/) {} +			virtual void convertToMUC() {} +			virtual void setSecurityLabelsError() {}  			virtual SecurityLabelsCatalog::Item getSelectedSecurityLabel() {return label_;} -			virtual void setInputEnabled(bool /*enabled*/) {}; -			virtual void setRosterModel(Roster* /*roster*/) {}; -			virtual void setTabComplete(TabComplete*) {}; -			virtual void replaceLastMessage(const std::string&) {}; -			virtual void replaceMessage(const std::string&, const std::string&, const boost::posix_time::ptime&) {}; -			virtual void replaceWithAction(const std::string& /*message*/, const std::string& /*id*/, const boost::posix_time::ptime& /*time*/) {}; -			void setAckState(const std::string& /*id*/, AckState /*state*/) {}; -			virtual void flash() {}; -			virtual void setAlert(const std::string& /*alertText*/, const std::string& /*buttonText*/) {}; -			virtual void cancelAlert() {}; +			virtual void setInputEnabled(bool /*enabled*/) {} +			virtual void setRosterModel(Roster* /*roster*/) {} +			virtual void setTabComplete(TabComplete*) {} +			virtual void replaceLastMessage(const std::string&) {} +			virtual void replaceMessage(const std::string&, const std::string&, const boost::posix_time::ptime&) {} +			virtual void replaceWithAction(const std::string& /*message*/, const std::string& /*id*/, const boost::posix_time::ptime& /*time*/) {} +			void setAckState(const std::string& /*id*/, AckState /*state*/) {} +			virtual void flash() {} +			virtual void setAlert(const std::string& /*alertText*/, const std::string& /*buttonText*/) {} +			virtual void cancelAlert() {}  			virtual void setCorrectionEnabled(Tristate /*enabled*/) {}  			void setAvailableOccupantActions(const std::vector<OccupantAction>&/* actions*/) {}  			void setSubject(const std::string& /*subject*/) {}  			virtual void showRoomConfigurationForm(Form::ref) {} -			virtual void addMUCInvitation(const std::string& /*senderName*/, const JID& /*jid*/, const std::string& /*reason*/, const std::string& /*password*/, bool = true) {}; +			virtual void addMUCInvitation(const std::string& /*senderName*/, const JID& /*jid*/, const std::string& /*reason*/, const std::string& /*password*/, bool = true) {} -			virtual std::string addWhiteboardRequest(bool) {return "";}; -			virtual void setWhiteboardSessionStatus(std::string, const ChatWindow::WhiteboardSessionState){}; +			virtual std::string addWhiteboardRequest(bool) {return "";} +			virtual void setWhiteboardSessionStatus(std::string, const ChatWindow::WhiteboardSessionState){}  			virtual void setAffiliations(MUCOccupant::Affiliation, const std::vector<JID>&) {} -			virtual void setAvailableRoomActions(const std::vector<RoomAction> &) {}; +			virtual void setAvailableRoomActions(const std::vector<RoomAction> &) {}  			virtual InviteToChatWindow* createInviteToChatWindow() {return NULL;}  			std::string name_; diff --git a/Swift/Controllers/UnitTest/MockMainWindowFactory.h b/Swift/Controllers/UnitTest/MockMainWindowFactory.h index d130b39..279a6dd 100644 --- a/Swift/Controllers/UnitTest/MockMainWindowFactory.h +++ b/Swift/Controllers/UnitTest/MockMainWindowFactory.h @@ -13,14 +13,14 @@ namespace Swift {  	class MockMainWindowFactory : public MainWindowFactory {  		public: -			MockMainWindowFactory() : last(NULL) {}; +			MockMainWindowFactory() : last(NULL) {} -			virtual ~MockMainWindowFactory() {}; +			virtual ~MockMainWindowFactory() {}  			/**  			 * Transfers ownership of result.  			 */ -			virtual MainWindow* createMainWindow(UIEventStream*) {last = new MockMainWindow();return last;}; +			virtual MainWindow* createMainWindow(UIEventStream*) {last = new MockMainWindow();return last;}  			MockMainWindow* last;  	};  }  | 
 Swift