Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-04-28 12:28:02 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2015-04-28 19:26:00 (GMT) |
| commit | 68263f7cb360ae52915017df202775665c4eeeb6 (patch) | |
| tree | 59dd2f8cece17d46e585fb00111fbc026fc1e9ce /Swift/QtUI/ChatList/QtChatListWindow.h | |
| parent | 4ac05ebaf6c913b4bfcc7c4e7abeb6ace9efe5c8 (diff) | |
| download | swift-68263f7cb360ae52915017df202775665c4eeeb6.zip swift-68263f7cb360ae52915017df202775665c4eeeb6.tar.bz2 | |
Allow editing bookmarks of MUC chats in the "Recent Chats"
Test-Information:
Tested with online and offline account. Tested with not bookmarked
and already bookmarked chats. Works as expected.
Change-Id: Ib8851a70a7a82a198ee5b7a207816f03ad9df61e
Diffstat (limited to 'Swift/QtUI/ChatList/QtChatListWindow.h')
| -rw-r--r-- | Swift/QtUI/ChatList/QtChatListWindow.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Swift/QtUI/ChatList/QtChatListWindow.h b/Swift/QtUI/ChatList/QtChatListWindow.h index 9738413..627dcd4 100644 --- a/Swift/QtUI/ChatList/QtChatListWindow.h +++ b/Swift/QtUI/ChatList/QtChatListWindow.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2014 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -8,10 +8,11 @@ #include <QTreeView> -#include "Swift/Controllers/UIInterfaces/ChatListWindow.h" -#include "Swift/Controllers/UIEvents/UIEventStream.h" -#include "Swift/QtUI/ChatList/ChatListModel.h" -#include "Swift/QtUI/ChatList/ChatListDelegate.h" +#include <Swift/Controllers/UIEvents/UIEventStream.h> +#include <Swift/Controllers/UIInterfaces/ChatListWindow.h> + +#include <Swift/QtUI/ChatList/ChatListDelegate.h> +#include <Swift/QtUI/ChatList/ChatListModel.h> namespace Swift { class SettingsProvider; @@ -54,8 +55,7 @@ namespace Swift { ChatListDelegate* delegate_; QMenu* mucMenu_; QMenu* emptyMenu_; - QMenu* mucRecentsMenu_; - ChatListItem* contextMenuItem_; + const ChatListItem* contextMenuItem_; SettingsProvider* settings_; QList<QAction*> onlineOnlyActions_; bool isOnline_; |