diff options
| author | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) | 
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) | 
| commit | cfbdb43d2cadd40aa87338d41548e4bf89e146e6 (patch) | |
| tree | 18d94153a302445196fc0c18586abf44a1ce4a38 /Swift/Controllers/UIInterfaces | |
| parent | 1d545a4a7fb877f021508094b88c1f17b30d8b4e (diff) | |
| download | swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.zip swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.tar.bz2 | |
Convert tabs to 4 spaces for all source files
Removed trailing spaces and whitespace on empty lines
in the process.
Changed CheckTabs.py tool to disallow hard tabs in source
files.
Test-Information:
Manually checked 30 random files that the conversion worked
as expected.
Change-Id: I874f99d617bd3d2bb55f02d58f22f58f9b094480
Diffstat (limited to 'Swift/Controllers/UIInterfaces')
37 files changed, 667 insertions, 667 deletions
| diff --git a/Swift/Controllers/UIInterfaces/AdHocCommandWindow.h b/Swift/Controllers/UIInterfaces/AdHocCommandWindow.h index e5d95fa..06d3988 100644 --- a/Swift/Controllers/UIInterfaces/AdHocCommandWindow.h +++ b/Swift/Controllers/UIInterfaces/AdHocCommandWindow.h @@ -9,10 +9,10 @@  #include <Swiften/Base/boost_bsignals.h>  namespace Swift { -	class AdHocCommandWindow { -		public: -			virtual ~AdHocCommandWindow() {} -			virtual void setOnline(bool /*online*/) {} -			boost::signal<void ()> onClosing; -	}; +    class AdHocCommandWindow { +        public: +            virtual ~AdHocCommandWindow() {} +            virtual void setOnline(bool /*online*/) {} +            boost::signal<void ()> onClosing; +    };  } diff --git a/Swift/Controllers/UIInterfaces/AdHocCommandWindowFactory.h b/Swift/Controllers/UIInterfaces/AdHocCommandWindowFactory.h index d7b456d..d3003f7 100644 --- a/Swift/Controllers/UIInterfaces/AdHocCommandWindowFactory.h +++ b/Swift/Controllers/UIInterfaces/AdHocCommandWindowFactory.h @@ -12,9 +12,9 @@  namespace Swift {  class AdHocCommandWindow; -	class AdHocCommandWindowFactory { -		public: -			virtual ~AdHocCommandWindowFactory() {} -			virtual AdHocCommandWindow* createAdHocCommandWindow(boost::shared_ptr<OutgoingAdHocCommandSession> command) = 0; -	}; +    class AdHocCommandWindowFactory { +        public: +            virtual ~AdHocCommandWindowFactory() {} +            virtual AdHocCommandWindow* createAdHocCommandWindow(boost::shared_ptr<OutgoingAdHocCommandSession> command) = 0; +    };  } diff --git a/Swift/Controllers/UIInterfaces/BlockListEditorWidget.h b/Swift/Controllers/UIInterfaces/BlockListEditorWidget.h index 201377d..ebfa0c4 100644 --- a/Swift/Controllers/UIInterfaces/BlockListEditorWidget.h +++ b/Swift/Controllers/UIInterfaces/BlockListEditorWidget.h @@ -19,22 +19,22 @@  namespace Swift { -	class ClientBlockListManager; +    class ClientBlockListManager; -	class BlockListEditorWidget { -		public: -			virtual ~BlockListEditorWidget() {} +    class BlockListEditorWidget { +        public: +            virtual ~BlockListEditorWidget() {} -			virtual void show() = 0; -			virtual void hide() = 0; +            virtual void show() = 0; +            virtual void hide() = 0; -			virtual void setCurrentBlockList(const std::vector<JID>& blockedJIDs) = 0; -			virtual void setBusy(bool isBusy) = 0; -			virtual void setError(const std::string&) = 0; +            virtual void setCurrentBlockList(const std::vector<JID>& blockedJIDs) = 0; +            virtual void setBusy(bool isBusy) = 0; +            virtual void setError(const std::string&) = 0; -			virtual std::vector<JID> getCurrentBlockList() const = 0; +            virtual std::vector<JID> getCurrentBlockList() const = 0; -			boost::signal<void (const std::vector<JID>& /* blockedJID */)> onSetNewBlockList; -	}; +            boost::signal<void (const std::vector<JID>& /* blockedJID */)> onSetNewBlockList; +    };  } diff --git a/Swift/Controllers/UIInterfaces/BlockListEditorWidgetFactory.h b/Swift/Controllers/UIInterfaces/BlockListEditorWidgetFactory.h index eb91ac1..05e7f3a 100644 --- a/Swift/Controllers/UIInterfaces/BlockListEditorWidgetFactory.h +++ b/Swift/Controllers/UIInterfaces/BlockListEditorWidgetFactory.h @@ -8,13 +8,13 @@  namespace Swift { -	class BlockListEditorWidget; +    class BlockListEditorWidget; -	class BlockListEditorWidgetFactory { -		public: -			virtual ~BlockListEditorWidgetFactory() {} +    class BlockListEditorWidgetFactory { +        public: +            virtual ~BlockListEditorWidgetFactory() {} -			virtual BlockListEditorWidget* createBlockListEditorWidget() = 0; -	}; +            virtual BlockListEditorWidget* createBlockListEditorWidget() = 0; +    };  } diff --git a/Swift/Controllers/UIInterfaces/ChatListWindow.h b/Swift/Controllers/UIInterfaces/ChatListWindow.h index 8b5036b..a94e14e 100644 --- a/Swift/Controllers/UIInterfaces/ChatListWindow.h +++ b/Swift/Controllers/UIInterfaces/ChatListWindow.h @@ -19,83 +19,83 @@  #include <Swiften/MUC/MUCBookmark.h>  namespace Swift { -	class ChatListWindow { -		public: -			class Chat { -				public: -					Chat() : statusType(StatusShow::None), isMUC(false), unreadCount(0), isPrivateMessage(false) {} -					Chat(const JID& jid, const std::string& chatName, const std::string& activity, int unreadCount, StatusShow::Type statusType, const boost::filesystem::path& avatarPath, bool isMUC, bool isPrivateMessage = false, const std::string& nick = "", const boost::optional<std::string> password = boost::optional<std::string>()) -					: jid(jid), chatName(chatName), activity(activity), statusType(statusType), isMUC(isMUC), nick(nick), password(password), unreadCount(unreadCount), avatarPath(avatarPath), isPrivateMessage(isPrivateMessage) {} -					/** Assume that nicks and other transient features aren't important for equality */ -					bool operator==(const Chat& other) const { -						if (impromptuJIDs.empty()) { -							return jid.toBare() == other.jid.toBare() -									&& isMUC == other.isMUC; -						} else { /* compare the chat occupant lists */ -							typedef std::map<std::string, JID> JIDMap; -							foreach (const JIDMap::value_type& jid, impromptuJIDs) { -								bool found = false; -								foreach (const JIDMap::value_type& otherJID, other.impromptuJIDs) { -									if (jid.second.toBare() == otherJID.second.toBare()) { -										found = true; -										break; -									} -								} -								if (!found) { -									return false; -								} -							} -							return true; -						} -					} -					void setUnreadCount(int unread) { -						unreadCount = unread; -					} -					void setStatusType(StatusShow::Type type) { -						statusType = type; -					} -					void setAvatarPath(const boost::filesystem::path& path) { -						avatarPath = path; -					} -					std::string getImpromptuTitle() const { -						typedef std::pair<std::string, JID> StringJIDPair; -						std::string title; -						foreach(StringJIDPair pair, impromptuJIDs) { -							if (title.empty()) { -								title += pair.first; -							} else { -								title += ", " + pair.first; -							} -						} -						return title; -					} -					JID jid; -					std::string chatName; -					std::string activity; -					StatusShow::Type statusType; -					bool isMUC; -					std::string nick; -					boost::optional<std::string> password; -					int unreadCount; -					boost::filesystem::path avatarPath; -					std::map<std::string, JID> impromptuJIDs; -					bool isPrivateMessage; -			}; -			virtual ~ChatListWindow(); +    class ChatListWindow { +        public: +            class Chat { +                public: +                    Chat() : statusType(StatusShow::None), isMUC(false), unreadCount(0), isPrivateMessage(false) {} +                    Chat(const JID& jid, const std::string& chatName, const std::string& activity, int unreadCount, StatusShow::Type statusType, const boost::filesystem::path& avatarPath, bool isMUC, bool isPrivateMessage = false, const std::string& nick = "", const boost::optional<std::string> password = boost::optional<std::string>()) +                    : jid(jid), chatName(chatName), activity(activity), statusType(statusType), isMUC(isMUC), nick(nick), password(password), unreadCount(unreadCount), avatarPath(avatarPath), isPrivateMessage(isPrivateMessage) {} +                    /** Assume that nicks and other transient features aren't important for equality */ +                    bool operator==(const Chat& other) const { +                        if (impromptuJIDs.empty()) { +                            return jid.toBare() == other.jid.toBare() +                                    && isMUC == other.isMUC; +                        } else { /* compare the chat occupant lists */ +                            typedef std::map<std::string, JID> JIDMap; +                            foreach (const JIDMap::value_type& jid, impromptuJIDs) { +                                bool found = false; +                                foreach (const JIDMap::value_type& otherJID, other.impromptuJIDs) { +                                    if (jid.second.toBare() == otherJID.second.toBare()) { +                                        found = true; +                                        break; +                                    } +                                } +                                if (!found) { +                                    return false; +                                } +                            } +                            return true; +                        } +                    } +                    void setUnreadCount(int unread) { +                        unreadCount = unread; +                    } +                    void setStatusType(StatusShow::Type type) { +                        statusType = type; +                    } +                    void setAvatarPath(const boost::filesystem::path& path) { +                        avatarPath = path; +                    } +                    std::string getImpromptuTitle() const { +                        typedef std::pair<std::string, JID> StringJIDPair; +                        std::string title; +                        foreach(StringJIDPair pair, impromptuJIDs) { +                            if (title.empty()) { +                                title += pair.first; +                            } else { +                                title += ", " + pair.first; +                            } +                        } +                        return title; +                    } +                    JID jid; +                    std::string chatName; +                    std::string activity; +                    StatusShow::Type statusType; +                    bool isMUC; +                    std::string nick; +                    boost::optional<std::string> password; +                    int unreadCount; +                    boost::filesystem::path avatarPath; +                    std::map<std::string, JID> impromptuJIDs; +                    bool isPrivateMessage; +            }; +            virtual ~ChatListWindow(); -			virtual void setBookmarksEnabled(bool enabled) = 0; -			virtual void addMUCBookmark(const MUCBookmark& bookmark) = 0; -			virtual void addWhiteboardSession(const ChatListWindow::Chat& chat) = 0; -			virtual void removeWhiteboardSession(const JID& jid) = 0; -			virtual void removeMUCBookmark(const MUCBookmark& bookmark) = 0; -			virtual void setRecents(const std::list<Chat>& recents) = 0; -			virtual void setUnreadCount(int unread) = 0; -			virtual void clearBookmarks() = 0; -			virtual void setOnline(bool isOnline) = 0; +            virtual void setBookmarksEnabled(bool enabled) = 0; +            virtual void addMUCBookmark(const MUCBookmark& bookmark) = 0; +            virtual void addWhiteboardSession(const ChatListWindow::Chat& chat) = 0; +            virtual void removeWhiteboardSession(const JID& jid) = 0; +            virtual void removeMUCBookmark(const MUCBookmark& bookmark) = 0; +            virtual void setRecents(const std::list<Chat>& recents) = 0; +            virtual void setUnreadCount(int unread) = 0; +            virtual void clearBookmarks() = 0; +            virtual void setOnline(bool isOnline) = 0; -			boost::signal<void (const MUCBookmark&)> onMUCBookmarkActivated; -			boost::signal<void (const Chat&)> onRecentActivated; -			boost::signal<void (const JID&)> onWhiteboardActivated; -			boost::signal<void ()> onClearRecentsRequested; -	}; +            boost::signal<void (const MUCBookmark&)> onMUCBookmarkActivated; +            boost::signal<void (const Chat&)> onRecentActivated; +            boost::signal<void (const JID&)> onWhiteboardActivated; +            boost::signal<void ()> onClearRecentsRequested; +    };  } diff --git a/Swift/Controllers/UIInterfaces/ChatListWindowFactory.h b/Swift/Controllers/UIInterfaces/ChatListWindowFactory.h index fcd979b..3ae1ec6 100644 --- a/Swift/Controllers/UIInterfaces/ChatListWindowFactory.h +++ b/Swift/Controllers/UIInterfaces/ChatListWindowFactory.h @@ -9,10 +9,10 @@  #include <Swift/Controllers/UIInterfaces/ChatListWindow.h>  namespace Swift { -	class UIEventStream; -	class ChatListWindowFactory { -		public: -			virtual ~ChatListWindowFactory() {} -			virtual ChatListWindow* createChatListWindow(UIEventStream* uiEventStream) = 0; -	}; +    class UIEventStream; +    class ChatListWindowFactory { +        public: +            virtual ~ChatListWindowFactory() {} +            virtual ChatListWindow* createChatListWindow(UIEventStream* uiEventStream) = 0; +    };  } diff --git a/Swift/Controllers/UIInterfaces/ChatWindow.h b/Swift/Controllers/UIInterfaces/ChatWindow.h index 05331bb..310c967 100644 --- a/Swift/Controllers/UIInterfaces/ChatWindow.h +++ b/Swift/Controllers/UIInterfaces/ChatWindow.h @@ -26,233 +26,233 @@  #include <Swift/Controllers/HighlightManager.h>  namespace Swift { -	class AvatarManager; -	class TreeWidget; -	class Roster; -	class TabComplete; -	class RosterItem; -	class ContactRosterItem; -	class FileTransferController; -	class UserSearchWindow; - - -	class ChatWindow { -		public: -			class ChatMessagePart { -				public: -					virtual ~ChatMessagePart() {} -			}; - -			class ChatMessage { -				public: -					ChatMessage() {} -					ChatMessage(const std::string& text) { -						append(boost::make_shared<ChatTextMessagePart>(text)); -					} -					void append(const boost::shared_ptr<ChatMessagePart>& part) { -						parts_.push_back(part); -					} - -					const std::vector<boost::shared_ptr<ChatMessagePart> >& getParts() const { -						return parts_; -					} - -					void setFullMessageHighlightAction(const HighlightAction& action) { -						fullMessageHighlightAction_ = action; -					} - -					const HighlightAction& getFullMessageHighlightAction() const { -						return fullMessageHighlightAction_; -					} - -					bool isMeCommand() const { -						bool isMeCommand = false; -						if (!parts_.empty()) { -							boost::shared_ptr<ChatTextMessagePart> textPart = boost::dynamic_pointer_cast<ChatTextMessagePart>(parts_[0]); -							if (textPart) { -								if (boost::starts_with(textPart->text, "/me ")) { -									isMeCommand = true; -								} -							} -						} -						return isMeCommand; -					} - -				private: -					std::vector<boost::shared_ptr<ChatMessagePart> > parts_; -					HighlightAction fullMessageHighlightAction_; -			}; - -			class ChatTextMessagePart : public ChatMessagePart { -				public: -					ChatTextMessagePart(const std::string& text) : text(text) {} -					std::string text; -			}; - -			class ChatURIMessagePart : public ChatMessagePart { -				public: -					ChatURIMessagePart(const std::string& target) : target(target) {} -					std::string target; -			}; - -			class ChatEmoticonMessagePart : public ChatMessagePart { -				public: -					std::string imagePath; -					std::string alternativeText; -			}; - -			class ChatHighlightingMessagePart : public ChatMessagePart { -				public: -					HighlightAction action; -					std::string text; -			}; - - -			enum AckState {Pending, Received, Failed}; -			enum ReceiptState {ReceiptRequested, ReceiptReceived, ReceiptFailed}; -			enum OccupantAction {Kick, Ban, MakeModerator, MakeParticipant, MakeVisitor, AddContact, ShowProfile}; -			enum RoomAction {ChangeSubject, Configure, Affiliations, Destroy, Invite}; -			enum FileTransferState { -				Initialisation,     ///< Collecting information required for sending the request out. -				WaitingForAccept,   ///< The file transfer request was send out. -				Negotiating,        ///< The other party accepted the file transfer request and a suitable transfer method is negotiated. -				Transferring,       ///< The negotiation was successful and the file is currently transferred. -				Canceled,           ///< Someone actively canceled the transfer. -				Finished,           ///< The file was transferred successfully. -				FTFailed            ///< The negotiation, the transfer itself or the verification failed. -			}; -			enum WhiteboardSessionState {WhiteboardAccepted, WhiteboardTerminated, WhiteboardRejected}; -			enum BlockingState {BlockingUnsupported, IsBlocked, IsUnblocked}; -			enum Direction { UnknownDirection, DefaultDirection }; -			enum MUCType { StandardMUC, ImpromptuMUC }; -			enum TimestampBehaviour { KeepTimestamp, UpdateTimestamp }; -			enum RoomBookmarkState { RoomNotBookmarked, RoomBookmarked, RoomAutoJoined }; - -			ChatWindow() {} -			virtual ~ChatWindow() {} - -			/** Add message to window. -			 * @return id of added message (for acks). -			 */ -			virtual std::string addMessage(const ChatMessage& message, const std::string& senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const boost::posix_time::ptime& time) = 0; -			/** Adds action to window. -			 * @return id of added message (for acks); -			 */ -			virtual std::string addAction(const ChatMessage& message, const std::string& senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const boost::posix_time::ptime& time) = 0; - -			/** Adds system message to window -			 * @return id of added message (for replacement) -			 */ -			virtual std::string addSystemMessage(const ChatMessage& message, Direction direction) = 0; -			virtual void addPresenceMessage(const ChatMessage& message, Direction direction) = 0; - -			virtual void addErrorMessage(const ChatMessage& message) = 0; -			virtual void replaceMessage(const ChatMessage& message, const std::string& id, const boost::posix_time::ptime& time) = 0; -			virtual void replaceSystemMessage(const ChatMessage& message, const std::string& id, const TimestampBehaviour timestampBehaviour) = 0; -			virtual void replaceWithAction(const ChatMessage& message, const std::string& id, const boost::posix_time::ptime& time) = 0; -			 -			// File transfer related stuff -			virtual std::string addFileTransfer(const std::string& senderName, bool senderIsSelf, const std::string& filename, const boost::uintmax_t sizeInBytes, const std::string& description) = 0; -			virtual void setFileTransferProgress(std::string, const int percentageDone) = 0; -			virtual void setFileTransferStatus(std::string, const FileTransferState state, const std::string& msg = "") = 0; -			virtual void addMUCInvitation(const std::string& senderName, const JID& jid, const std::string& reason, const std::string& password, bool direct = true, bool isImpromptu = false, bool isContinuation = false) = 0; - -			virtual std::string addWhiteboardRequest(bool senderIsSelf) = 0; -			virtual void setWhiteboardSessionStatus(std::string id, const ChatWindow::WhiteboardSessionState state) = 0; - -			// message receipts -			virtual void setMessageReceiptState(const std::string& id, ChatWindow::ReceiptState state) = 0; - -			virtual void setContactChatState(ChatState::ChatStateType state) = 0; -			virtual void setName(const std::string& name) = 0; -			virtual void show() = 0; -			virtual bool isVisible() const = 0; -			virtual void activate() = 0; -			virtual void setAvailableSecurityLabels(const std::vector<SecurityLabelsCatalog::Item>& labels) = 0; -			virtual void setSecurityLabelsEnabled(bool enabled) = 0; -			virtual void setCorrectionEnabled(Tristate enabled) = 0; -			virtual void setFileTransferEnabled(Tristate enabled) = 0; -			virtual void setUnreadMessageCount(int count) = 0; -			virtual void convertToMUC(MUCType mucType) = 0; -//			virtual TreeWidget *getTreeWidget() = 0; -			virtual void setSecurityLabelsError() = 0; -			virtual SecurityLabelsCatalog::Item getSelectedSecurityLabel() = 0; -			virtual void setOnline(bool online) = 0; -			virtual void setRosterModel(Roster* model) = 0; -			virtual void setTabComplete(TabComplete* completer) = 0; -			virtual void replaceLastMessage(const ChatMessage& message, const TimestampBehaviour timestampBehaviour) = 0; -			virtual void setAckState(const std::string& id, AckState state) = 0; -			virtual void flash() = 0; -			virtual void setSubject(const std::string& subject) = 0; -			virtual void setAffiliations(MUCOccupant::Affiliation, const std::vector<JID>&) = 0; -			virtual void setAvailableRoomActions(const std::vector<RoomAction> &actions) = 0; -			virtual void setBlockingState(BlockingState state) = 0; -			virtual void setCanInitiateImpromptuChats(bool supportsImpromptu) = 0; -			virtual void showBookmarkWindow(const MUCBookmark& bookmark) = 0; -			virtual void setBookmarkState(RoomBookmarkState bookmarkState) = 0; - -			/** -			 * A handle that uniquely identities an alert message. -			 */ -			typedef int AlertID; -			/** -			 * Set an alert on the window. -			 * @param alertText Description of alert (required). -			 * @param buttonText Button text to use (optional, no button is shown if empty). -			 * @return A handle to the alert message. -			 */ -			virtual AlertID addAlert(const std::string& alertText) = 0; -			/** -			 * Removes an alert. -			 * @param id An alert ID previously returned from setAlert -			 */ -			virtual void removeAlert(const AlertID id) = 0; - -			/** -			 * Actions that can be performed on the selected occupant. -			 */ -			virtual void setAvailableOccupantActions(const std::vector<OccupantAction>& actions) = 0; - -			/** -			 * A room configuration has been requested, show the form. -			 * If the form is cancelled, must emit onConfigurationFormCancelled(). -			 */ -			virtual void showRoomConfigurationForm(Form::ref) = 0; - -			boost::signal<void ()> onClosed; -			boost::signal<void ()> onAllMessagesRead; -			boost::signal<void (const std::string&, bool isCorrection)> onSendMessageRequest; -			boost::signal<void ()> onSendCorrectionMessageRequest; -			boost::signal<void ()> onUserTyping; -			boost::signal<void ()> onUserCancelsTyping; -			boost::signal<void ()> onAlertButtonClicked; -			boost::signal<void (ContactRosterItem*)> onOccupantSelectionChanged; -			boost::signal<void (ChatWindow::OccupantAction, ContactRosterItem*)> onOccupantActionSelected; -			boost::signal<void (const std::string&)> onChangeSubjectRequest; -			boost::signal<void ()> onBookmarkRequest; -			boost::signal<void (Form::ref)> onConfigureRequest; -			boost::signal<void ()> onDestroyRequest; -			boost::signal<void (const std::vector<JID>&)> onInviteToChat; -			boost::signal<void ()> onConfigurationFormCancelled; -			boost::signal<void ()> onGetAffiliationsRequest; -			boost::signal<void (MUCOccupant::Affiliation, const JID&)> onSetAffiliationRequest; -			boost::signal<void (const std::vector<std::pair<MUCOccupant::Affiliation, JID> >& changes)> onChangeAffiliationsRequest; -			boost::signal<void ()> onLogCleared; -			 -			// File transfer related -			boost::signal<void (std::string /* id */)> onFileTransferCancel; -			boost::signal<void (std::string /* id */, std::string /* description */)> onFileTransferStart; -			boost::signal<void (std::string /* id */, std::string /* path */)> onFileTransferAccept; -			boost::signal<void (std::string /* path */)> onSendFileRequest; - -			//Whiteboard related	 -			boost::signal<void ()> onWhiteboardSessionAccept; -			boost::signal<void ()> onWhiteboardSessionCancel; -			boost::signal<void ()> onWhiteboardWindowShow; - -			// Blocking Command related -			boost::signal<void ()> onBlockUserRequest; -			boost::signal<void ()> onUnblockUserRequest; -	}; +    class AvatarManager; +    class TreeWidget; +    class Roster; +    class TabComplete; +    class RosterItem; +    class ContactRosterItem; +    class FileTransferController; +    class UserSearchWindow; + + +    class ChatWindow { +        public: +            class ChatMessagePart { +                public: +                    virtual ~ChatMessagePart() {} +            }; + +            class ChatMessage { +                public: +                    ChatMessage() {} +                    ChatMessage(const std::string& text) { +                        append(boost::make_shared<ChatTextMessagePart>(text)); +                    } +                    void append(const boost::shared_ptr<ChatMessagePart>& part) { +                        parts_.push_back(part); +                    } + +                    const std::vector<boost::shared_ptr<ChatMessagePart> >& getParts() const { +                        return parts_; +                    } + +                    void setFullMessageHighlightAction(const HighlightAction& action) { +                        fullMessageHighlightAction_ = action; +                    } + +                    const HighlightAction& getFullMessageHighlightAction() const { +                        return fullMessageHighlightAction_; +                    } + +                    bool isMeCommand() const { +                        bool isMeCommand = false; +                        if (!parts_.empty()) { +                            boost::shared_ptr<ChatTextMessagePart> textPart = boost::dynamic_pointer_cast<ChatTextMessagePart>(parts_[0]); +                            if (textPart) { +                                if (boost::starts_with(textPart->text, "/me ")) { +                                    isMeCommand = true; +                                } +                            } +                        } +                        return isMeCommand; +                    } + +                private: +                    std::vector<boost::shared_ptr<ChatMessagePart> > parts_; +                    HighlightAction fullMessageHighlightAction_; +            }; + +            class ChatTextMessagePart : public ChatMessagePart { +                public: +                    ChatTextMessagePart(const std::string& text) : text(text) {} +                    std::string text; +            }; + +            class ChatURIMessagePart : public ChatMessagePart { +                public: +                    ChatURIMessagePart(const std::string& target) : target(target) {} +                    std::string target; +            }; + +            class ChatEmoticonMessagePart : public ChatMessagePart { +                public: +                    std::string imagePath; +                    std::string alternativeText; +            }; + +            class ChatHighlightingMessagePart : public ChatMessagePart { +                public: +                    HighlightAction action; +                    std::string text; +            }; + + +            enum AckState {Pending, Received, Failed}; +            enum ReceiptState {ReceiptRequested, ReceiptReceived, ReceiptFailed}; +            enum OccupantAction {Kick, Ban, MakeModerator, MakeParticipant, MakeVisitor, AddContact, ShowProfile}; +            enum RoomAction {ChangeSubject, Configure, Affiliations, Destroy, Invite}; +            enum FileTransferState { +                Initialisation,     ///< Collecting information required for sending the request out. +                WaitingForAccept,   ///< The file transfer request was send out. +                Negotiating,        ///< The other party accepted the file transfer request and a suitable transfer method is negotiated. +                Transferring,       ///< The negotiation was successful and the file is currently transferred. +                Canceled,           ///< Someone actively canceled the transfer. +                Finished,           ///< The file was transferred successfully. +                FTFailed            ///< The negotiation, the transfer itself or the verification failed. +            }; +            enum WhiteboardSessionState {WhiteboardAccepted, WhiteboardTerminated, WhiteboardRejected}; +            enum BlockingState {BlockingUnsupported, IsBlocked, IsUnblocked}; +            enum Direction { UnknownDirection, DefaultDirection }; +            enum MUCType { StandardMUC, ImpromptuMUC }; +            enum TimestampBehaviour { KeepTimestamp, UpdateTimestamp }; +            enum RoomBookmarkState { RoomNotBookmarked, RoomBookmarked, RoomAutoJoined }; + +            ChatWindow() {} +            virtual ~ChatWindow() {} + +            /** Add message to window. +             * @return id of added message (for acks). +             */ +            virtual std::string addMessage(const ChatMessage& message, const std::string& senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const boost::posix_time::ptime& time) = 0; +            /** Adds action to window. +             * @return id of added message (for acks); +             */ +            virtual std::string addAction(const ChatMessage& message, const std::string& senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const boost::posix_time::ptime& time) = 0; + +            /** Adds system message to window +             * @return id of added message (for replacement) +             */ +            virtual std::string addSystemMessage(const ChatMessage& message, Direction direction) = 0; +            virtual void addPresenceMessage(const ChatMessage& message, Direction direction) = 0; + +            virtual void addErrorMessage(const ChatMessage& message) = 0; +            virtual void replaceMessage(const ChatMessage& message, const std::string& id, const boost::posix_time::ptime& time) = 0; +            virtual void replaceSystemMessage(const ChatMessage& message, const std::string& id, const TimestampBehaviour timestampBehaviour) = 0; +            virtual void replaceWithAction(const ChatMessage& message, const std::string& id, const boost::posix_time::ptime& time) = 0; + +            // File transfer related stuff +            virtual std::string addFileTransfer(const std::string& senderName, bool senderIsSelf, const std::string& filename, const boost::uintmax_t sizeInBytes, const std::string& description) = 0; +            virtual void setFileTransferProgress(std::string, const int percentageDone) = 0; +            virtual void setFileTransferStatus(std::string, const FileTransferState state, const std::string& msg = "") = 0; +            virtual void addMUCInvitation(const std::string& senderName, const JID& jid, const std::string& reason, const std::string& password, bool direct = true, bool isImpromptu = false, bool isContinuation = false) = 0; + +            virtual std::string addWhiteboardRequest(bool senderIsSelf) = 0; +            virtual void setWhiteboardSessionStatus(std::string id, const ChatWindow::WhiteboardSessionState state) = 0; + +            // message receipts +            virtual void setMessageReceiptState(const std::string& id, ChatWindow::ReceiptState state) = 0; + +            virtual void setContactChatState(ChatState::ChatStateType state) = 0; +            virtual void setName(const std::string& name) = 0; +            virtual void show() = 0; +            virtual bool isVisible() const = 0; +            virtual void activate() = 0; +            virtual void setAvailableSecurityLabels(const std::vector<SecurityLabelsCatalog::Item>& labels) = 0; +            virtual void setSecurityLabelsEnabled(bool enabled) = 0; +            virtual void setCorrectionEnabled(Tristate enabled) = 0; +            virtual void setFileTransferEnabled(Tristate enabled) = 0; +            virtual void setUnreadMessageCount(int count) = 0; +            virtual void convertToMUC(MUCType mucType) = 0; +//            virtual TreeWidget *getTreeWidget() = 0; +            virtual void setSecurityLabelsError() = 0; +            virtual SecurityLabelsCatalog::Item getSelectedSecurityLabel() = 0; +            virtual void setOnline(bool online) = 0; +            virtual void setRosterModel(Roster* model) = 0; +            virtual void setTabComplete(TabComplete* completer) = 0; +            virtual void replaceLastMessage(const ChatMessage& message, const TimestampBehaviour timestampBehaviour) = 0; +            virtual void setAckState(const std::string& id, AckState state) = 0; +            virtual void flash() = 0; +            virtual void setSubject(const std::string& subject) = 0; +            virtual void setAffiliations(MUCOccupant::Affiliation, const std::vector<JID>&) = 0; +            virtual void setAvailableRoomActions(const std::vector<RoomAction> &actions) = 0; +            virtual void setBlockingState(BlockingState state) = 0; +            virtual void setCanInitiateImpromptuChats(bool supportsImpromptu) = 0; +            virtual void showBookmarkWindow(const MUCBookmark& bookmark) = 0; +            virtual void setBookmarkState(RoomBookmarkState bookmarkState) = 0; + +            /** +             * A handle that uniquely identities an alert message. +             */ +            typedef int AlertID; +            /** +             * Set an alert on the window. +             * @param alertText Description of alert (required). +             * @param buttonText Button text to use (optional, no button is shown if empty). +             * @return A handle to the alert message. +             */ +            virtual AlertID addAlert(const std::string& alertText) = 0; +            /** +             * Removes an alert. +             * @param id An alert ID previously returned from setAlert +             */ +            virtual void removeAlert(const AlertID id) = 0; + +            /** +             * Actions that can be performed on the selected occupant. +             */ +            virtual void setAvailableOccupantActions(const std::vector<OccupantAction>& actions) = 0; + +            /** +             * A room configuration has been requested, show the form. +             * If the form is cancelled, must emit onConfigurationFormCancelled(). +             */ +            virtual void showRoomConfigurationForm(Form::ref) = 0; + +            boost::signal<void ()> onClosed; +            boost::signal<void ()> onAllMessagesRead; +            boost::signal<void (const std::string&, bool isCorrection)> onSendMessageRequest; +            boost::signal<void ()> onSendCorrectionMessageRequest; +            boost::signal<void ()> onUserTyping; +            boost::signal<void ()> onUserCancelsTyping; +            boost::signal<void ()> onAlertButtonClicked; +            boost::signal<void (ContactRosterItem*)> onOccupantSelectionChanged; +            boost::signal<void (ChatWindow::OccupantAction, ContactRosterItem*)> onOccupantActionSelected; +            boost::signal<void (const std::string&)> onChangeSubjectRequest; +            boost::signal<void ()> onBookmarkRequest; +            boost::signal<void (Form::ref)> onConfigureRequest; +            boost::signal<void ()> onDestroyRequest; +            boost::signal<void (const std::vector<JID>&)> onInviteToChat; +            boost::signal<void ()> onConfigurationFormCancelled; +            boost::signal<void ()> onGetAffiliationsRequest; +            boost::signal<void (MUCOccupant::Affiliation, const JID&)> onSetAffiliationRequest; +            boost::signal<void (const std::vector<std::pair<MUCOccupant::Affiliation, JID> >& changes)> onChangeAffiliationsRequest; +            boost::signal<void ()> onLogCleared; + +            // File transfer related +            boost::signal<void (std::string /* id */)> onFileTransferCancel; +            boost::signal<void (std::string /* id */, std::string /* description */)> onFileTransferStart; +            boost::signal<void (std::string /* id */, std::string /* path */)> onFileTransferAccept; +            boost::signal<void (std::string /* path */)> onSendFileRequest; + +            //Whiteboard related +            boost::signal<void ()> onWhiteboardSessionAccept; +            boost::signal<void ()> onWhiteboardSessionCancel; +            boost::signal<void ()> onWhiteboardWindowShow; + +            // Blocking Command related +            boost::signal<void ()> onBlockUserRequest; +            boost::signal<void ()> onUnblockUserRequest; +    };  } diff --git a/Swift/Controllers/UIInterfaces/ChatWindowFactory.h b/Swift/Controllers/UIInterfaces/ChatWindowFactory.h index 7c47e2a..38706ab 100644 --- a/Swift/Controllers/UIInterfaces/ChatWindowFactory.h +++ b/Swift/Controllers/UIInterfaces/ChatWindowFactory.h @@ -10,17 +10,17 @@  #include "Swiften/JID/JID.h"  namespace Swift { -	class ChatWindow; -	class UIEventStream; -	class ChatWindowFactory { -		public: -			virtual ~ChatWindowFactory() {} -			/** -			 * Transfers ownership of result. -			 */ -			virtual ChatWindow* createChatWindow(const JID &contact, UIEventStream* eventStream) = 0; +    class ChatWindow; +    class UIEventStream; +    class ChatWindowFactory { +        public: +            virtual ~ChatWindowFactory() {} +            /** +             * Transfers ownership of result. +             */ +            virtual ChatWindow* createChatWindow(const JID &contact, UIEventStream* eventStream) = 0; -	}; +    };  }  #endif diff --git a/Swift/Controllers/UIInterfaces/ContactEditWindow.h b/Swift/Controllers/UIInterfaces/ContactEditWindow.h index 407959a..055c0f0 100644 --- a/Swift/Controllers/UIInterfaces/ContactEditWindow.h +++ b/Swift/Controllers/UIInterfaces/ContactEditWindow.h @@ -15,22 +15,22 @@  #include <Swiften/Base/boost_bsignals.h>  namespace Swift { -	class JID; -	class VCardManager; +    class JID; +    class VCardManager; -	class ContactEditWindow { -		public: -			virtual ~ContactEditWindow() {} +    class ContactEditWindow { +        public: +            virtual ~ContactEditWindow() {} -			virtual void setEnabled(bool b) = 0; +            virtual void setEnabled(bool b) = 0; -			virtual void setNameSuggestions(const std::vector<std::string>& suggestions) = 0; -			virtual void setContact(const JID& jid, const std::string& name, const std::vector<std::string>& groups, const std::set<std::string>& allGroups) = 0; +            virtual void setNameSuggestions(const std::vector<std::string>& suggestions) = 0; +            virtual void setContact(const JID& jid, const std::string& name, const std::vector<std::string>& groups, const std::set<std::string>& allGroups) = 0; -			virtual void show() = 0; -			virtual void hide() = 0; +            virtual void show() = 0; +            virtual void hide() = 0; -			boost::signal<void ()> onRemoveContactRequest; -			boost::signal<void (const std::string& /* name */, const std::set<std::string>& /* groups */)> onChangeContactRequest; -	}; +            boost::signal<void ()> onRemoveContactRequest; +            boost::signal<void (const std::string& /* name */, const std::set<std::string>& /* groups */)> onChangeContactRequest; +    };  } diff --git a/Swift/Controllers/UIInterfaces/ContactEditWindowFactory.h b/Swift/Controllers/UIInterfaces/ContactEditWindowFactory.h index 6955a69..f5a84d5 100644 --- a/Swift/Controllers/UIInterfaces/ContactEditWindowFactory.h +++ b/Swift/Controllers/UIInterfaces/ContactEditWindowFactory.h @@ -9,10 +9,10 @@  #include <Swift/Controllers/UIInterfaces/ContactEditWindow.h>  namespace Swift { -	class ContactEditWindowFactory { -		public: -			virtual ~ContactEditWindowFactory() {} +    class ContactEditWindowFactory { +        public: +            virtual ~ContactEditWindowFactory() {} -			virtual ContactEditWindow* createContactEditWindow() = 0; -	}; +            virtual ContactEditWindow* createContactEditWindow() = 0; +    };  } diff --git a/Swift/Controllers/UIInterfaces/EventWindow.h b/Swift/Controllers/UIInterfaces/EventWindow.h index 5ce99d8..1d254f4 100644 --- a/Swift/Controllers/UIInterfaces/EventWindow.h +++ b/Swift/Controllers/UIInterfaces/EventWindow.h @@ -11,19 +11,19 @@  #include <Swift/Controllers/XMPPEvents/StanzaEvent.h>  namespace Swift { -	class EventWindow { -		public: -			EventWindow(bool candelete = true) : canDelete_(candelete) {} +    class EventWindow { +        public: +            EventWindow(bool candelete = true) : canDelete_(candelete) {} -			bool canDelete() const { -				return canDelete_; -			} +            bool canDelete() const { +                return canDelete_; +            } -			virtual ~EventWindow() {}	 -			virtual void addEvent(boost::shared_ptr<StanzaEvent> event, bool active) = 0; -			virtual void removeEvent(boost::shared_ptr<StanzaEvent> event) = 0; +            virtual ~EventWindow() {} +            virtual void addEvent(boost::shared_ptr<StanzaEvent> event, bool active) = 0; +            virtual void removeEvent(boost::shared_ptr<StanzaEvent> event) = 0; -		private: -			bool canDelete_; -	}; +        private: +            bool canDelete_; +    };  } diff --git a/Swift/Controllers/UIInterfaces/EventWindowFactory.h b/Swift/Controllers/UIInterfaces/EventWindowFactory.h index 7c9c87d..76638da 100644 --- a/Swift/Controllers/UIInterfaces/EventWindowFactory.h +++ b/Swift/Controllers/UIInterfaces/EventWindowFactory.h @@ -7,17 +7,17 @@  #pragma once  namespace Swift { -	class EventWindow; +    class EventWindow; -	class EventWindowFactory { -		public: -			virtual ~EventWindowFactory() {} -			/** -			 * Transfers ownership of result. -			 */ -			virtual EventWindow* createEventWindow() = 0; +    class EventWindowFactory { +        public: +            virtual ~EventWindowFactory() {} +            /** +             * Transfers ownership of result. +             */ +            virtual EventWindow* createEventWindow() = 0; -	}; +    };  } diff --git a/Swift/Controllers/UIInterfaces/FileTransferListWidget.h b/Swift/Controllers/UIInterfaces/FileTransferListWidget.h index 01dcfd3..5a9eaeb 100644 --- a/Swift/Controllers/UIInterfaces/FileTransferListWidget.h +++ b/Swift/Controllers/UIInterfaces/FileTransferListWidget.h @@ -12,12 +12,12 @@ class FileTransferOverview;  class FileTransferListWidget {  public: -	virtual ~FileTransferListWidget() {} +    virtual ~FileTransferListWidget() {} -	virtual void show() = 0; -	virtual void activate() = 0; +    virtual void show() = 0; +    virtual void activate() = 0; -	virtual void setFileTransferOverview(FileTransferOverview*) = 0; +    virtual void setFileTransferOverview(FileTransferOverview*) = 0;  };  } diff --git a/Swift/Controllers/UIInterfaces/FileTransferListWidgetFactory.h b/Swift/Controllers/UIInterfaces/FileTransferListWidgetFactory.h index 6da2d07..da9fd37 100644 --- a/Swift/Controllers/UIInterfaces/FileTransferListWidgetFactory.h +++ b/Swift/Controllers/UIInterfaces/FileTransferListWidgetFactory.h @@ -18,9 +18,9 @@ namespace Swift {  class FileTransferListWidgetFactory {  public: -	virtual ~FileTransferListWidgetFactory() {} +    virtual ~FileTransferListWidgetFactory() {} -	virtual FileTransferListWidget* createFileTransferListWidget() = 0; +    virtual FileTransferListWidget* createFileTransferListWidget() = 0;  };  } diff --git a/Swift/Controllers/UIInterfaces/HighlightEditorWidget.h b/Swift/Controllers/UIInterfaces/HighlightEditorWidget.h index 4745035..ff888e6 100644 --- a/Swift/Controllers/UIInterfaces/HighlightEditorWidget.h +++ b/Swift/Controllers/UIInterfaces/HighlightEditorWidget.h @@ -8,15 +8,15 @@  namespace Swift { -	class HighlightManager; +    class HighlightManager; -	class HighlightEditorWidget { -		public: -			virtual ~HighlightEditorWidget() {} +    class HighlightEditorWidget { +        public: +            virtual ~HighlightEditorWidget() {} -			virtual void show() = 0; +            virtual void show() = 0; -			virtual void setHighlightManager(HighlightManager* highlightManager) = 0; -	}; +            virtual void setHighlightManager(HighlightManager* highlightManager) = 0; +    };  } diff --git a/Swift/Controllers/UIInterfaces/HighlightEditorWidgetFactory.h b/Swift/Controllers/UIInterfaces/HighlightEditorWidgetFactory.h index ade575b..363e666 100644 --- a/Swift/Controllers/UIInterfaces/HighlightEditorWidgetFactory.h +++ b/Swift/Controllers/UIInterfaces/HighlightEditorWidgetFactory.h @@ -8,13 +8,13 @@  namespace Swift { -	class HighlightEditorWidget; +    class HighlightEditorWidget; -	class HighlightEditorWidgetFactory { -		public: -			virtual ~HighlightEditorWidgetFactory() {} +    class HighlightEditorWidgetFactory { +        public: +            virtual ~HighlightEditorWidgetFactory() {} -			virtual HighlightEditorWidget* createHighlightEditorWidget() = 0; -	}; +            virtual HighlightEditorWidget* createHighlightEditorWidget() = 0; +    };  } diff --git a/Swift/Controllers/UIInterfaces/HighlightEditorWindow.h b/Swift/Controllers/UIInterfaces/HighlightEditorWindow.h index 12adb3d..8cca4f9 100644 --- a/Swift/Controllers/UIInterfaces/HighlightEditorWindow.h +++ b/Swift/Controllers/UIInterfaces/HighlightEditorWindow.h @@ -14,14 +14,14 @@ class HighlightManager;  class HighlightEditorWindow {  public: -	HighlightEditorWindow(); -	virtual ~HighlightEditorWindow(); -	virtual void show() = 0; -	virtual void setHighlightManager(HighlightManager *highlightManager) = 0; -	virtual void setContactSuggestions(const std::vector<Contact::ref>& suggestions) = 0; +    HighlightEditorWindow(); +    virtual ~HighlightEditorWindow(); +    virtual void show() = 0; +    virtual void setHighlightManager(HighlightManager *highlightManager) = 0; +    virtual void setContactSuggestions(const std::vector<Contact::ref>& suggestions) = 0;  public: -	boost::signal<void (const std::string&)> onContactSuggestionsRequested; +    boost::signal<void (const std::string&)> onContactSuggestionsRequested;  };  } diff --git a/Swift/Controllers/UIInterfaces/HighlightEditorWindowFactory.h b/Swift/Controllers/UIInterfaces/HighlightEditorWindowFactory.h index 18fbeb7..ea05425 100644 --- a/Swift/Controllers/UIInterfaces/HighlightEditorWindowFactory.h +++ b/Swift/Controllers/UIInterfaces/HighlightEditorWindowFactory.h @@ -13,12 +13,12 @@  #pragma once  namespace Swift { -	class HighlightEditorWindow; +    class HighlightEditorWindow; -	class HighlightEditorWindowFactory { -	public : -		virtual ~HighlightEditorWindowFactory() {} +    class HighlightEditorWindowFactory { +    public : +        virtual ~HighlightEditorWindowFactory() {} -		virtual HighlightEditorWindow* createHighlightEditorWindow() = 0; -	}; +        virtual HighlightEditorWindow* createHighlightEditorWindow() = 0; +    };  } diff --git a/Swift/Controllers/UIInterfaces/HistoryWindow.h b/Swift/Controllers/UIInterfaces/HistoryWindow.h index 6d50f4b..db1a4b1 100644 --- a/Swift/Controllers/UIInterfaces/HistoryWindow.h +++ b/Swift/Controllers/UIInterfaces/HistoryWindow.h @@ -9,26 +9,26 @@  #include <Swift/Controllers/Roster/Roster.h>  namespace Swift { -	class HistoryWindow { -		public: -			virtual ~HistoryWindow() {} +    class HistoryWindow { +        public: +            virtual ~HistoryWindow() {} -			virtual void activate() = 0; -			virtual void setRosterModel(Roster*) = 0; -			virtual void addMessage(const std::string &message, const std::string &senderName, bool senderIsSelf, const std::string& avatarPath, const boost::posix_time::ptime& time, bool addAtTheTop) = 0; -			virtual void resetConversationView() = 0; -			virtual void resetConversationViewTopInsertPoint() = 0; // this is a temporary fix used in adding messages at the top -			virtual void setDate(const boost::gregorian::date& date) = 0; +            virtual void activate() = 0; +            virtual void setRosterModel(Roster*) = 0; +            virtual void addMessage(const std::string &message, const std::string &senderName, bool senderIsSelf, const std::string& avatarPath, const boost::posix_time::ptime& time, bool addAtTheTop) = 0; +            virtual void resetConversationView() = 0; +            virtual void resetConversationViewTopInsertPoint() = 0; // this is a temporary fix used in adding messages at the top +            virtual void setDate(const boost::gregorian::date& date) = 0; -			virtual std::string getSearchBoxText() = 0; -			virtual boost::gregorian::date getLastVisibleDate() = 0; +            virtual std::string getSearchBoxText() = 0; +            virtual boost::gregorian::date getLastVisibleDate() = 0; -			boost::signal<void (RosterItem*)> onSelectedContactChanged; -			boost::signal<void (const std::string&)> onReturnPressed; -			boost::signal<void (const boost::gregorian::date&)> onScrollReachedTop; -			boost::signal<void (const boost::gregorian::date&)> onScrollReachedBottom; -			boost::signal<void ()> onPreviousButtonClicked; -			boost::signal<void ()> onNextButtonClicked; -			boost::signal<void (const boost::gregorian::date&)> onCalendarClicked; -	}; +            boost::signal<void (RosterItem*)> onSelectedContactChanged; +            boost::signal<void (const std::string&)> onReturnPressed; +            boost::signal<void (const boost::gregorian::date&)> onScrollReachedTop; +            boost::signal<void (const boost::gregorian::date&)> onScrollReachedBottom; +            boost::signal<void ()> onPreviousButtonClicked; +            boost::signal<void ()> onNextButtonClicked; +            boost::signal<void (const boost::gregorian::date&)> onCalendarClicked; +    };  } diff --git a/Swift/Controllers/UIInterfaces/HistoryWindowFactory.h b/Swift/Controllers/UIInterfaces/HistoryWindowFactory.h index 807fec5..ab4cf0d 100644 --- a/Swift/Controllers/UIInterfaces/HistoryWindowFactory.h +++ b/Swift/Controllers/UIInterfaces/HistoryWindowFactory.h @@ -9,10 +9,10 @@  #include <Swift/Controllers/UIInterfaces/HistoryWindow.h>  namespace Swift { -	class UIEventStream; -	class HistoryWindowFactory { -		public: -			virtual ~HistoryWindowFactory() {} -			virtual HistoryWindow* createHistoryWindow(UIEventStream* eventStream) = 0; -	}; +    class UIEventStream; +    class HistoryWindowFactory { +        public: +            virtual ~HistoryWindowFactory() {} +            virtual HistoryWindow* createHistoryWindow(UIEventStream* eventStream) = 0; +    };  } diff --git a/Swift/Controllers/UIInterfaces/JoinMUCWindow.h b/Swift/Controllers/UIInterfaces/JoinMUCWindow.h index 62818c5..4d6cea1 100644 --- a/Swift/Controllers/UIInterfaces/JoinMUCWindow.h +++ b/Swift/Controllers/UIInterfaces/JoinMUCWindow.h @@ -13,14 +13,14 @@  #include <Swiften/JID/JID.h>  namespace Swift { -	class JoinMUCWindow { -		public: -			virtual ~JoinMUCWindow() {} +    class JoinMUCWindow { +        public: +            virtual ~JoinMUCWindow() {} -			virtual void setNick(const std::string& nick) = 0; -			virtual void setMUC(const std::string& nick) = 0; -			virtual void show() = 0; +            virtual void setNick(const std::string& nick) = 0; +            virtual void setMUC(const std::string& nick) = 0; +            virtual void show() = 0; -			boost::signal<void ()> onSearchMUC; -	}; +            boost::signal<void ()> onSearchMUC; +    };  } diff --git a/Swift/Controllers/UIInterfaces/JoinMUCWindowFactory.h b/Swift/Controllers/UIInterfaces/JoinMUCWindowFactory.h index a711294..5e8b1d0 100644 --- a/Swift/Controllers/UIInterfaces/JoinMUCWindowFactory.h +++ b/Swift/Controllers/UIInterfaces/JoinMUCWindowFactory.h @@ -9,11 +9,11 @@  #include <Swift/Controllers/UIInterfaces/JoinMUCWindow.h>  namespace Swift { -	class UIEventStream; -	class JoinMUCWindowFactory { -		public: -			virtual ~JoinMUCWindowFactory() {} +    class UIEventStream; +    class JoinMUCWindowFactory { +        public: +            virtual ~JoinMUCWindowFactory() {} -			virtual JoinMUCWindow* createJoinMUCWindow(UIEventStream* uiEventStream) = 0; -	}; +            virtual JoinMUCWindow* createJoinMUCWindow(UIEventStream* uiEventStream) = 0; +    };  } diff --git a/Swift/Controllers/UIInterfaces/LoginWindow.h b/Swift/Controllers/UIInterfaces/LoginWindow.h index 5a7e178..cedc549 100644 --- a/Swift/Controllers/UIInterfaces/LoginWindow.h +++ b/Swift/Controllers/UIInterfaces/LoginWindow.h @@ -16,27 +16,27 @@  #include <Swiften/TLS/CertificateWithKey.h>  namespace Swift { -	class MainWindow; -	class LoginWindow { -		public: -			virtual ~LoginWindow() {} -			virtual void selectUser(const std::string&) = 0; -			virtual void morphInto(MainWindow *mainWindow) = 0; -			virtual void loggedOut() = 0; -			virtual void setShowNotificationToggle(bool) = 0; -			virtual void setMessage(const std::string&) = 0; -			virtual void setIsLoggingIn(bool loggingIn) = 0; -			virtual void addAvailableAccount(const std::string& defaultJID, const std::string& defaultPassword, const std::string& defaultCertificate, const ClientOptions& options) = 0; -			virtual void removeAvailableAccount(const std::string& jid) = 0; -			/** The certificate is what is used for login, the certificatePath is used for remembering paths to populate the loginwindow with*/ -			boost::signal<void (const std::string&, const std::string&, const std::string& /*CertificatePath*/, CertificateWithKey::ref /* clientCertificate */, const ClientOptions& /*options*/, bool /* remember password*/, bool /* login automatically */)> onLoginRequest; -			virtual void setLoginAutomatically(bool loginAutomatically) = 0; -			virtual void quit() = 0; -			/** Blocking request whether a cert should be permanently trusted.*/ -			virtual bool askUserToTrustCertificatePermanently(const std::string& message, const std::vector<Certificate::ref>& certificateChain) = 0; +    class MainWindow; +    class LoginWindow { +        public: +            virtual ~LoginWindow() {} +            virtual void selectUser(const std::string&) = 0; +            virtual void morphInto(MainWindow *mainWindow) = 0; +            virtual void loggedOut() = 0; +            virtual void setShowNotificationToggle(bool) = 0; +            virtual void setMessage(const std::string&) = 0; +            virtual void setIsLoggingIn(bool loggingIn) = 0; +            virtual void addAvailableAccount(const std::string& defaultJID, const std::string& defaultPassword, const std::string& defaultCertificate, const ClientOptions& options) = 0; +            virtual void removeAvailableAccount(const std::string& jid) = 0; +            /** The certificate is what is used for login, the certificatePath is used for remembering paths to populate the loginwindow with*/ +            boost::signal<void (const std::string&, const std::string&, const std::string& /*CertificatePath*/, CertificateWithKey::ref /* clientCertificate */, const ClientOptions& /*options*/, bool /* remember password*/, bool /* login automatically */)> onLoginRequest; +            virtual void setLoginAutomatically(bool loginAutomatically) = 0; +            virtual void quit() = 0; +            /** Blocking request whether a cert should be permanently trusted.*/ +            virtual bool askUserToTrustCertificatePermanently(const std::string& message, const std::vector<Certificate::ref>& certificateChain) = 0; -			boost::signal<void ()> onCancelLoginRequest; -			boost::signal<void ()> onQuitRequest; -			boost::signal<void (const std::string&)> onPurgeSavedLoginRequest; -	}; +            boost::signal<void ()> onCancelLoginRequest; +            boost::signal<void ()> onQuitRequest; +            boost::signal<void (const std::string&)> onPurgeSavedLoginRequest; +    };  } diff --git a/Swift/Controllers/UIInterfaces/LoginWindowFactory.h b/Swift/Controllers/UIInterfaces/LoginWindowFactory.h index c040833..485f975 100644 --- a/Swift/Controllers/UIInterfaces/LoginWindowFactory.h +++ b/Swift/Controllers/UIInterfaces/LoginWindowFactory.h @@ -10,20 +10,20 @@  namespace Swift { -	class LoginWindow; -	 -	class UIEventStream; -		 -	class LoginWindowFactory { -		public: -			virtual ~LoginWindowFactory() {} - -			/** -			 * Transfers ownership of result. -			 */ -			virtual LoginWindow* createLoginWindow(UIEventStream* uiEventStream) = 0; - -	}; +    class LoginWindow; + +    class UIEventStream; + +    class LoginWindowFactory { +        public: +            virtual ~LoginWindowFactory() {} + +            /** +             * Transfers ownership of result. +             */ +            virtual LoginWindow* createLoginWindow(UIEventStream* uiEventStream) = 0; + +    };  }  #endif diff --git a/Swift/Controllers/UIInterfaces/MUCSearchWindow.h b/Swift/Controllers/UIInterfaces/MUCSearchWindow.h index 10c6b38..d6c0065 100644 --- a/Swift/Controllers/UIInterfaces/MUCSearchWindow.h +++ b/Swift/Controllers/UIInterfaces/MUCSearchWindow.h @@ -18,18 +18,18 @@  namespace Swift { -	class MUCSearchWindow { -		public: -			virtual ~MUCSearchWindow() {} +    class MUCSearchWindow { +        public: +            virtual ~MUCSearchWindow() {} -			virtual void clearList() = 0; -			virtual void addService(const MUCService& service) = 0; -			virtual void addSavedServices(const std::list<JID>& services) = 0; -			virtual void setSearchInProgress(bool searching) = 0; +            virtual void clearList() = 0; +            virtual void addService(const MUCService& service) = 0; +            virtual void addSavedServices(const std::list<JID>& services) = 0; +            virtual void setSearchInProgress(bool searching) = 0; -			virtual void show() = 0; +            virtual void show() = 0; -			boost::signal<void (const JID&)> onSearchService; -			boost::signal<void (const boost::optional<JID>&)> onFinished; -	}; +            boost::signal<void (const JID&)> onSearchService; +            boost::signal<void (const boost::optional<JID>&)> onFinished; +    };  } diff --git a/Swift/Controllers/UIInterfaces/MUCSearchWindowFactory.h b/Swift/Controllers/UIInterfaces/MUCSearchWindowFactory.h index 38492cd..6e26ac3 100644 --- a/Swift/Controllers/UIInterfaces/MUCSearchWindowFactory.h +++ b/Swift/Controllers/UIInterfaces/MUCSearchWindowFactory.h @@ -9,11 +9,11 @@  #include <Swift/Controllers/UIInterfaces/MUCSearchWindow.h>  namespace Swift { -	class UIEventStream; -	class MUCSearchWindowFactory { -		public: -			virtual ~MUCSearchWindowFactory() {} +    class UIEventStream; +    class MUCSearchWindowFactory { +        public: +            virtual ~MUCSearchWindowFactory() {} -			virtual MUCSearchWindow* createMUCSearchWindow() = 0; -	}; +            virtual MUCSearchWindow* createMUCSearchWindow() = 0; +    };  } diff --git a/Swift/Controllers/UIInterfaces/MainWindow.h b/Swift/Controllers/UIInterfaces/MainWindow.h index aa8314d..d8bcb58 100644 --- a/Swift/Controllers/UIInterfaces/MainWindow.h +++ b/Swift/Controllers/UIInterfaces/MainWindow.h @@ -19,36 +19,36 @@  #include <Swift/Controllers/Roster/ContactRosterItem.h>  namespace Swift { -	class Roster; - -	class MainWindow { -		public: -			MainWindow(bool candelete = true) : canDelete_(candelete) {} -			virtual ~MainWindow() {} - -			bool canDelete() const { -				return canDelete_; -			} - -			virtual void setMyNick(const std::string& name) = 0; -			virtual void setMyJID(const JID& jid) = 0; -			virtual void setMyAvatarPath(const std::string& path) = 0; -			virtual void setMyStatusText(const std::string& status) = 0; -			virtual void setMyStatusType(StatusShow::Type type) = 0; -			virtual void setMyContactRosterItem(boost::shared_ptr<ContactRosterItem> contact) = 0; -			/** Must be able to cope with NULL to clear the roster */ -			virtual void setRosterModel(Roster* roster) = 0; -			virtual void setConnecting() = 0; -			virtual void setBlockingCommandAvailable(bool isAvailable) = 0; -			virtual void setAvailableAdHocCommands(const std::vector<DiscoItems::Item>& commands) = 0; -			virtual void setStreamEncryptionStatus(bool tlsInPlaceAndValid) = 0; -			virtual void openCertificateDialog(const std::vector<Certificate::ref>& chain) = 0; -			 -			boost::signal<void (StatusShow::Type, const std::string&)> onChangeStatusRequest; -			boost::signal<void ()> onSignOutRequest; -			boost::signal<void ()> onShowCertificateRequest; - -		private: -			bool canDelete_; -	}; +    class Roster; + +    class MainWindow { +        public: +            MainWindow(bool candelete = true) : canDelete_(candelete) {} +            virtual ~MainWindow() {} + +            bool canDelete() const { +                return canDelete_; +            } + +            virtual void setMyNick(const std::string& name) = 0; +            virtual void setMyJID(const JID& jid) = 0; +            virtual void setMyAvatarPath(const std::string& path) = 0; +            virtual void setMyStatusText(const std::string& status) = 0; +            virtual void setMyStatusType(StatusShow::Type type) = 0; +            virtual void setMyContactRosterItem(boost::shared_ptr<ContactRosterItem> contact) = 0; +            /** Must be able to cope with NULL to clear the roster */ +            virtual void setRosterModel(Roster* roster) = 0; +            virtual void setConnecting() = 0; +            virtual void setBlockingCommandAvailable(bool isAvailable) = 0; +            virtual void setAvailableAdHocCommands(const std::vector<DiscoItems::Item>& commands) = 0; +            virtual void setStreamEncryptionStatus(bool tlsInPlaceAndValid) = 0; +            virtual void openCertificateDialog(const std::vector<Certificate::ref>& chain) = 0; + +            boost::signal<void (StatusShow::Type, const std::string&)> onChangeStatusRequest; +            boost::signal<void ()> onSignOutRequest; +            boost::signal<void ()> onShowCertificateRequest; + +        private: +            bool canDelete_; +    };  } diff --git a/Swift/Controllers/UIInterfaces/MainWindowFactory.h b/Swift/Controllers/UIInterfaces/MainWindowFactory.h index 5c24187..c0110cf 100644 --- a/Swift/Controllers/UIInterfaces/MainWindowFactory.h +++ b/Swift/Controllers/UIInterfaces/MainWindowFactory.h @@ -11,17 +11,17 @@  #include "Swift/Controllers/UIEvents/UIEventStream.h"  namespace Swift { -	class MainWindow; +    class MainWindow; -	class MainWindowFactory { -		public: -			virtual ~MainWindowFactory() {} -			/** -			 * Transfers ownership of result. -			 */ -			virtual MainWindow* createMainWindow(UIEventStream* eventStream) = 0; +    class MainWindowFactory { +        public: +            virtual ~MainWindowFactory() {} +            /** +             * Transfers ownership of result. +             */ +            virtual MainWindow* createMainWindow(UIEventStream* eventStream) = 0; -	}; +    };  }  #endif diff --git a/Swift/Controllers/UIInterfaces/ProfileWindow.h b/Swift/Controllers/UIInterfaces/ProfileWindow.h index f396499..8aa620c 100644 --- a/Swift/Controllers/UIInterfaces/ProfileWindow.h +++ b/Swift/Controllers/UIInterfaces/ProfileWindow.h @@ -12,24 +12,24 @@  #include <Swiften/Elements/VCard.h>  namespace Swift { -	class JID; +    class JID; -	class ProfileWindow { -		public: -			virtual ~ProfileWindow() {} +    class ProfileWindow { +        public: +            virtual ~ProfileWindow() {} -			virtual void setJID(const JID& jid) = 0; -			virtual void setVCard(VCard::ref vcard) = 0; +            virtual void setJID(const JID& jid) = 0; +            virtual void setVCard(VCard::ref vcard) = 0; -			virtual void setEnabled(bool b) = 0; -			virtual void setProcessing(bool b) = 0; -			virtual void setError(const std::string&) = 0; -			virtual void setEditable(bool b) = 0; +            virtual void setEnabled(bool b) = 0; +            virtual void setProcessing(bool b) = 0; +            virtual void setError(const std::string&) = 0; +            virtual void setEditable(bool b) = 0; -			virtual void show() = 0; -			virtual void hide() = 0; +            virtual void show() = 0; +            virtual void hide() = 0; -			boost::signal<void (VCard::ref)> onVCardChangeRequest; -			boost::signal<void (const JID&)> onWindowAboutToBeClosed; -	}; +            boost::signal<void (VCard::ref)> onVCardChangeRequest; +            boost::signal<void (const JID&)> onWindowAboutToBeClosed; +    };  } diff --git a/Swift/Controllers/UIInterfaces/ProfileWindowFactory.h b/Swift/Controllers/UIInterfaces/ProfileWindowFactory.h index 5137151..6c2c6e5 100644 --- a/Swift/Controllers/UIInterfaces/ProfileWindowFactory.h +++ b/Swift/Controllers/UIInterfaces/ProfileWindowFactory.h @@ -9,10 +9,10 @@  #include <Swift/Controllers/UIInterfaces/ProfileWindow.h>  namespace Swift { -	class ProfileWindowFactory { -		public: -			virtual ~ProfileWindowFactory() {} +    class ProfileWindowFactory { +        public: +            virtual ~ProfileWindowFactory() {} -			virtual ProfileWindow* createProfileWindow() = 0; -	}; +            virtual ProfileWindow* createProfileWindow() = 0; +    };  } diff --git a/Swift/Controllers/UIInterfaces/UIFactory.h b/Swift/Controllers/UIInterfaces/UIFactory.h index dd9d0df..a0976dc 100644 --- a/Swift/Controllers/UIInterfaces/UIFactory.h +++ b/Swift/Controllers/UIInterfaces/UIFactory.h @@ -25,25 +25,25 @@  #include <Swift/Controllers/UIInterfaces/XMLConsoleWidgetFactory.h>  namespace Swift { -	class UIFactory :  -			public ChatListWindowFactory,  -			public ChatWindowFactory,  -			public HistoryWindowFactory, -			public EventWindowFactory,  -			public LoginWindowFactory,  -			public MainWindowFactory,  -			public MUCSearchWindowFactory,  -			public XMLConsoleWidgetFactory, -			public UserSearchWindowFactory,  -			public JoinMUCWindowFactory, -			public ProfileWindowFactory, -			public ContactEditWindowFactory, -			public AdHocCommandWindowFactory, -			public FileTransferListWidgetFactory, -			public WhiteboardWindowFactory, -			public HighlightEditorWindowFactory, -			public BlockListEditorWidgetFactory { -		public: -			virtual ~UIFactory() {} -	}; +    class UIFactory : +            public ChatListWindowFactory, +            public ChatWindowFactory, +            public HistoryWindowFactory, +            public EventWindowFactory, +            public LoginWindowFactory, +            public MainWindowFactory, +            public MUCSearchWindowFactory, +            public XMLConsoleWidgetFactory, +            public UserSearchWindowFactory, +            public JoinMUCWindowFactory, +            public ProfileWindowFactory, +            public ContactEditWindowFactory, +            public AdHocCommandWindowFactory, +            public FileTransferListWidgetFactory, +            public WhiteboardWindowFactory, +            public HighlightEditorWindowFactory, +            public BlockListEditorWidgetFactory { +        public: +            virtual ~UIFactory() {} +    };  } diff --git a/Swift/Controllers/UIInterfaces/UserSearchWindow.h b/Swift/Controllers/UIInterfaces/UserSearchWindow.h index da33db3..4ddc29b 100644 --- a/Swift/Controllers/UIInterfaces/UserSearchWindow.h +++ b/Swift/Controllers/UIInterfaces/UserSearchWindow.h @@ -17,40 +17,40 @@  namespace Swift { -	class UserSearchWindow { -		public: -			enum Type {AddContact, ChatToContact, InviteToChat}; -			virtual ~UserSearchWindow() {} - -			virtual void clear() = 0; -			virtual void setResults(const std::vector<UserSearchResult>& results) = 0; -			virtual void setResultsForm(const Form::ref results) = 0; -			virtual void addSavedServices(const std::vector<JID>& services) = 0; -			virtual void setSelectedService(const JID& service) = 0; -			virtual void setServerSupportsSearch(bool support) = 0; -			virtual void setSearchError(bool support) = 0; -			virtual void setSearchFields(boost::shared_ptr<SearchPayload> fields) = 0; -			virtual void setNameSuggestions(const std::vector<std::string>& suggestions) = 0; -			virtual void prepopulateJIDAndName(const JID& jid, const std::string& name) = 0; -			virtual void setContactSuggestions(const std::vector<Contact::ref>& suggestions) = 0; -			virtual void setJIDs(const std::vector<JID>&) = 0; -			virtual void setRoomJID(const JID& roomJID) = 0; -			virtual std::string getReason() const = 0; -			virtual std::vector<JID> getJIDs() const = 0; -			virtual void setCanStartImpromptuChats(bool supportsImpromptu) = 0; -			virtual void updateContacts(const std::vector<Contact::ref>& contacts) = 0; -			virtual void addContacts(const std::vector<Contact::ref>& contacts) = 0; -			virtual void setCanSupplyDescription(bool allowed) = 0; -			virtual void setWarning(const boost::optional<std::string>& message) = 0; - -			virtual void show() = 0; - -			boost::signal<void (const JID&)> onFormRequested; -			boost::signal<void (boost::shared_ptr<SearchPayload>, const JID&)> onSearchRequested; -			boost::signal<void (const JID&)> onNameSuggestionRequested; -			boost::signal<void (const std::string&)> onContactSuggestionsRequested; -			boost::signal<void (const std::vector<JID>&)> onJIDUpdateRequested; -			boost::signal<void (const std::vector<JID>&)> onJIDAddRequested; -			boost::signal<void (const JID&)> onJIDEditFieldChanged; -	}; +    class UserSearchWindow { +        public: +            enum Type {AddContact, ChatToContact, InviteToChat}; +            virtual ~UserSearchWindow() {} + +            virtual void clear() = 0; +            virtual void setResults(const std::vector<UserSearchResult>& results) = 0; +            virtual void setResultsForm(const Form::ref results) = 0; +            virtual void addSavedServices(const std::vector<JID>& services) = 0; +            virtual void setSelectedService(const JID& service) = 0; +            virtual void setServerSupportsSearch(bool support) = 0; +            virtual void setSearchError(bool support) = 0; +            virtual void setSearchFields(boost::shared_ptr<SearchPayload> fields) = 0; +            virtual void setNameSuggestions(const std::vector<std::string>& suggestions) = 0; +            virtual void prepopulateJIDAndName(const JID& jid, const std::string& name) = 0; +            virtual void setContactSuggestions(const std::vector<Contact::ref>& suggestions) = 0; +            virtual void setJIDs(const std::vector<JID>&) = 0; +            virtual void setRoomJID(const JID& roomJID) = 0; +            virtual std::string getReason() const = 0; +            virtual std::vector<JID> getJIDs() const = 0; +            virtual void setCanStartImpromptuChats(bool supportsImpromptu) = 0; +            virtual void updateContacts(const std::vector<Contact::ref>& contacts) = 0; +            virtual void addContacts(const std::vector<Contact::ref>& contacts) = 0; +            virtual void setCanSupplyDescription(bool allowed) = 0; +            virtual void setWarning(const boost::optional<std::string>& message) = 0; + +            virtual void show() = 0; + +            boost::signal<void (const JID&)> onFormRequested; +            boost::signal<void (boost::shared_ptr<SearchPayload>, const JID&)> onSearchRequested; +            boost::signal<void (const JID&)> onNameSuggestionRequested; +            boost::signal<void (const std::string&)> onContactSuggestionsRequested; +            boost::signal<void (const std::vector<JID>&)> onJIDUpdateRequested; +            boost::signal<void (const std::vector<JID>&)> onJIDAddRequested; +            boost::signal<void (const JID&)> onJIDEditFieldChanged; +    };  } diff --git a/Swift/Controllers/UIInterfaces/UserSearchWindowFactory.h b/Swift/Controllers/UIInterfaces/UserSearchWindowFactory.h index 4eee510..d5d6135 100644 --- a/Swift/Controllers/UIInterfaces/UserSearchWindowFactory.h +++ b/Swift/Controllers/UIInterfaces/UserSearchWindowFactory.h @@ -11,11 +11,11 @@  #include <Swift/Controllers/UIInterfaces/UserSearchWindow.h>  namespace Swift { -	class UIEventStream; -	class UserSearchWindowFactory { -		public: -			virtual ~UserSearchWindowFactory() {} +    class UIEventStream; +    class UserSearchWindowFactory { +        public: +            virtual ~UserSearchWindowFactory() {} -			virtual UserSearchWindow* createUserSearchWindow(UserSearchWindow::Type type, UIEventStream* eventStream, const std::set<std::string>& groups) = 0; -	}; +            virtual UserSearchWindow* createUserSearchWindow(UserSearchWindow::Type type, UIEventStream* eventStream, const std::set<std::string>& groups) = 0; +    };  } diff --git a/Swift/Controllers/UIInterfaces/WhiteboardWindow.h b/Swift/Controllers/UIInterfaces/WhiteboardWindow.h index 84aefde..f3b35db 100644 --- a/Swift/Controllers/UIInterfaces/WhiteboardWindow.h +++ b/Swift/Controllers/UIInterfaces/WhiteboardWindow.h @@ -17,16 +17,16 @@  #include <Swiften/Base/boost_bsignals.h>  namespace Swift { -	class WhiteboardSession; -	class WhiteboardElement; +    class WhiteboardSession; +    class WhiteboardElement; -	class WhiteboardWindow { -	public: -		virtual ~WhiteboardWindow() {} +    class WhiteboardWindow { +    public: +        virtual ~WhiteboardWindow() {} -		virtual void show() = 0; -		virtual void setSession(boost::shared_ptr<WhiteboardSession> session) = 0; -		virtual void activateWindow() = 0; -		virtual void setName(const std::string& name) = 0; -	}; +        virtual void show() = 0; +        virtual void setSession(boost::shared_ptr<WhiteboardSession> session) = 0; +        virtual void activateWindow() = 0; +        virtual void setName(const std::string& name) = 0; +    };  } diff --git a/Swift/Controllers/UIInterfaces/WhiteboardWindowFactory.h b/Swift/Controllers/UIInterfaces/WhiteboardWindowFactory.h index 2be0f9c..163368b 100644 --- a/Swift/Controllers/UIInterfaces/WhiteboardWindowFactory.h +++ b/Swift/Controllers/UIInterfaces/WhiteboardWindowFactory.h @@ -7,13 +7,13 @@  #pragma once  namespace Swift { -	class WhiteboardSession; -	class WhiteboardWindow; +    class WhiteboardSession; +    class WhiteboardWindow; -	class WhiteboardWindowFactory { -	public : -		virtual ~WhiteboardWindowFactory() {} +    class WhiteboardWindowFactory { +    public : +        virtual ~WhiteboardWindowFactory() {} -		virtual WhiteboardWindow* createWhiteboardWindow(boost::shared_ptr<WhiteboardSession> whiteboardSession) = 0; -	}; +        virtual WhiteboardWindow* createWhiteboardWindow(boost::shared_ptr<WhiteboardSession> whiteboardSession) = 0; +    };  } diff --git a/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h b/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h index 7e477a9..872b9de 100644 --- a/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h +++ b/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h @@ -9,14 +9,14 @@  #include <Swiften/Base/SafeByteArray.h>  namespace Swift { -	class XMLConsoleWidget { -		public: -			virtual ~XMLConsoleWidget(); +    class XMLConsoleWidget { +        public: +            virtual ~XMLConsoleWidget(); -			virtual void handleDataRead(const SafeByteArray& data) = 0; -			virtual void handleDataWritten(const SafeByteArray& data) = 0; +            virtual void handleDataRead(const SafeByteArray& data) = 0; +            virtual void handleDataWritten(const SafeByteArray& data) = 0; -			virtual void show() = 0; -			virtual void activate() = 0; -	}; +            virtual void show() = 0; +            virtual void activate() = 0; +    };  } diff --git a/Swift/Controllers/UIInterfaces/XMLConsoleWidgetFactory.h b/Swift/Controllers/UIInterfaces/XMLConsoleWidgetFactory.h index 69b3e16..bbc055e 100644 --- a/Swift/Controllers/UIInterfaces/XMLConsoleWidgetFactory.h +++ b/Swift/Controllers/UIInterfaces/XMLConsoleWidgetFactory.h @@ -9,11 +9,11 @@  #include <Swift/Controllers/UIInterfaces/XMLConsoleWidget.h>  namespace Swift { -	class UIEventStream; -	class XMLConsoleWidgetFactory { -		public: -			virtual ~XMLConsoleWidgetFactory() {} +    class UIEventStream; +    class XMLConsoleWidgetFactory { +        public: +            virtual ~XMLConsoleWidgetFactory() {} -			virtual XMLConsoleWidget* createXMLConsoleWidget() = 0; -	}; +            virtual XMLConsoleWidget* createXMLConsoleWidget() = 0; +    };  } | 
 Swift
 Swift