3 files changed, 3 insertions, 3 deletions
diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp
index 52cd262..775d7a2 100644
--- a/Swift/Controllers/Chat/MUCController.cpp
+++ b/Swift/Controllers/Chat/MUCController.cpp
@@ -448,7 +448,7 @@ void MUCController::handleOccupantRoleChanged(const std::string& nick, const MUC
 	}
 }
 
-void MUCController::handleOccupantAffiliationChanged(const std::string& nick, const MUCOccupant::Affiliation& affiliation, const MUCOccupant::Affiliation& oldAffiliation)
+void MUCController::handleOccupantAffiliationChanged(const std::string& nick, const MUCOccupant::Affiliation& affiliation, const MUCOccupant::Affiliation& /*oldAffiliation*/)
 {
 	if (nick == nick_) {
 		setAvailableRoomActions(affiliation, muc_->getOccupant(nick_).getRole());
diff --git a/Swift/Controllers/UnitTest/MockChatWindow.h b/Swift/Controllers/UnitTest/MockChatWindow.h
index 800a5dd..e0e18a0 100644
--- a/Swift/Controllers/UnitTest/MockChatWindow.h
+++ b/Swift/Controllers/UnitTest/MockChatWindow.h
@@ -42,7 +42,7 @@ namespace Swift {
 			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) {};
+			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*/) {};
diff --git a/Swift/QtUI/QtUIFactory.h b/Swift/QtUI/QtUIFactory.h
index 8b8e3ce..29d9d1c 100644
--- a/Swift/QtUI/QtUIFactory.h
+++ b/Swift/QtUI/QtUIFactory.h
@@ -55,10 +55,10 @@ namespace Swift {
 			QSplitter* netbookSplitter;
 			QtSystemTray* systemTray;
 			QtChatWindowFactory* chatWindowFactory;
+			TimerFactory* timerFactory_;
 			QtMainWindow* lastMainWindow;
 			QtLoginWindow* loginWindow;
 			std::vector<QPointer<QtChatWindow> > chatWindows;
-			TimerFactory* timerFactory_;
 			bool startMinimized;
 			int chatFontSize;
 	};