3 files changed, 57 insertions, 34 deletions
diff --git a/Swift/Controllers/UIEvents/RegroupRosterItemUIEvent.h b/Swift/Controllers/UIEvents/RegroupRosterItemUIEvent.h
deleted file mode 100644
index b8552b3..0000000
--- a/Swift/Controllers/UIEvents/RegroupRosterItemUIEvent.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2010 Kevin Smith
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
- */
-
-#pragma once
-
-#include <boost/shared_ptr.hpp>
-#include <vector>
-
-#include "Swift/Controllers/UIEvents/UIEvent.h"
-#include "Swiften/MUC/MUCBookmark.h"
-
-namespace Swift {
-	/**
-	 * An event for regrouping a roster item.
-	 * This doesn't need to cover all groups, so it's valid to have the
-	 * contact in several groups that are neither removedGroups or addedGroups.
-	 */
-	class RegroupRosterItemUIEvent : public UIEvent {
-		public:
-			RegroupRosterItemUIEvent(const JID& jid, const std::vector<String>& addedGroups, const std::vector<String>& removedGroups) : jid_(jid), addedGroups_(addedGroups), removedGroups_(removedGroups) {}
-
-			const JID& getJID() const {return jid_;}
-			const std::vector<String>& getAddedGroups() const {return addedGroups_;}
-			const std::vector<String>& getRemovedGroups() const {return removedGroups_;}
-
-		private:
-			JID jid_;
-			std::vector<String> addedGroups_;
-			std::vector<String> removedGroups_;
-	};
-}
diff --git a/Swift/Controllers/UIEvents/RenameGroupUIEvent.h b/Swift/Controllers/UIEvents/RenameGroupUIEvent.h
new file mode 100644
index 0000000..1825d77
--- /dev/null
+++ b/Swift/Controllers/UIEvents/RenameGroupUIEvent.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <Swift/Controllers/UIEvents/UIEvent.h>
+#include <Swiften/Base/String.h>
+
+namespace Swift {
+	class RenameGroupUIEvent : public UIEvent {
+		public:
+			RenameGroupUIEvent(const String& group, const String& newName) : group(group), newName(newName) {
+			}
+
+			const String& getGroup() const {
+				return group;
+			}
+
+			const String& getNewName() const {
+				return newName;
+			}
+
+		private:
+			String group;
+			String newName;
+	};
+}
diff --git a/Swift/Controllers/UIEvents/RequestContactEditorUIEvent.h b/Swift/Controllers/UIEvents/RequestContactEditorUIEvent.h
new file mode 100644
index 0000000..8d04525
--- /dev/null
+++ b/Swift/Controllers/UIEvents/RequestContactEditorUIEvent.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/JID/JID.h>
+#include <Swift/Controllers/UIEvents/UIEvent.h>
+
+namespace Swift {
+	class RequestContactEditorUIEvent : public UIEvent {
+		public:
+			typedef boost::shared_ptr<RequestContactEditorUIEvent> ref;
+
+			RequestContactEditorUIEvent(const JID& jid) : jid(jid) {
+			}
+
+			const JID& getJID() const {
+				return jid;
+			}
+
+		private:
+			JID jid;
+	};
+}