summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/Controllers')
-rw-r--r--Swift/Controllers/RosterController.cpp2
-rw-r--r--Swift/Controllers/SoundEventController.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/RosterController.cpp b/Swift/Controllers/RosterController.cpp
index 063d2a7..807fc19 100644
--- a/Swift/Controllers/RosterController.cpp
+++ b/Swift/Controllers/RosterController.cpp
@@ -92,65 +92,65 @@ void RosterController::handleUserAction(boost::shared_ptr<UserRosterAction> acti
onStartChatRequest(contactItem->getJID().toBare());
}
}
void RosterController::handleOnJIDAdded(const JID& jid) {
std::vector<String> groups = xmppRoster_->getGroupsForJID(jid);
String name = xmppRoster_->getNameForJID(jid);
if (!groups.empty()) {
foreach(const String& group, groups) {
roster_->addContact(jid, name, group);
}
} else {
roster_->addContact(jid, name, "Contacts");
}
}
void RosterController::handleOnJIDRemoved(const JID& jid) {
roster_->removeContact(jid);
}
void RosterController::handleOnJIDUpdated(const JID& jid, const String& oldName, const std::vector<String> oldGroups) {
if (oldName != xmppRoster_->getNameForJID(jid)) {
handleOnJIDAdded(jid);
return;
}
std::vector<String> groups = xmppRoster_->getGroupsForJID(jid);
String name = xmppRoster_->getNameForJID(jid);
String contactsGroup = "Contacts";
if (groups.empty()) {
groups.push_back(contactsGroup);
}
foreach(const String& group, groups) {
if (std::find(oldGroups.begin(), oldGroups.end(), jid) == oldGroups.end()) {
roster_->addContact(jid, xmppRoster_->getNameForJID(jid), group);
}
}
foreach(const String& group, oldGroups) {
if (std::find(groups.begin(), groups.end(), group) == groups.end()) {
roster_->removeContactFromGroup(jid, group);
}
}
}
void RosterController::handleIncomingPresence(boost::shared_ptr<Presence> presence) {
roster_->applyOnItems(SetPresence(presence));
}
-void RosterController::handleAvatarChanged(const JID& jid, const String& hash) {
+void RosterController::handleAvatarChanged(const JID& jid, const String&) {
String path = avatarManager_->getAvatarPath(jid).string();
roster_->applyOnItems(SetAvatar(jid, path));
if (jid.equals(myJID_, JID::WithoutResource)) {
mainWindow_->setMyAvatarPath(path);
}
}
void RosterController::handleStartChatRequest(const JID& contact) {
onStartChatRequest(contact);
}
void RosterController::handleJoinMUCRequest(const JID &muc, const String &nick) {
onJoinMUCRequest(JID(muc), nick);
}
}
diff --git a/Swift/Controllers/SoundEventController.cpp b/Swift/Controllers/SoundEventController.cpp
index 133becf..d466842 100644
--- a/Swift/Controllers/SoundEventController.cpp
+++ b/Swift/Controllers/SoundEventController.cpp
@@ -1,25 +1,25 @@
#include "Swift/Controllers/SoundEventController.h"
#include <boost/bind.hpp>
#include "Swift/Controllers/EventController.h"
#include "Swift/Controllers/SoundPlayer.h"
namespace Swift {
SoundEventController::SoundEventController(EventController* eventController, SoundPlayer* soundPlayer, bool playSounds) {
eventController_ = eventController;
soundPlayer_ = soundPlayer;
playSounds_ = playSounds;
eventController_->onEventQueueEventAdded.connect(boost::bind(&SoundEventController::handleEventQueueEventAdded, this, _1));
}
-void SoundEventController::handleEventQueueEventAdded(boost::shared_ptr<MessageEvent> event) {
+void SoundEventController::handleEventQueueEventAdded(boost::shared_ptr<MessageEvent>) {
if (playSounds_) soundPlayer_->playSound(SoundPlayer::MessageReceived);
}
void SoundEventController::setPlaySounds(bool playSounds) {
playSounds_ = playSounds;
}
}