fixed compilation

plugins/FeedReader/gui/FeedReaderDialog.cpp

@@ -34,7 +34,7 @@
 #include "FeedReaderStringDefs.h"
 #include "gui/common/RSTreeWidgetItem.h"
 #include "gui/settings/rsharesettings.h"
-#include "gui/notifyqt.h"
+#include "gui/RsGUIEventManager.h"
 #include "FeedReaderUserNotify.h"
 #include "gui/Posted/PostedCreatePostDialog.h"
 #include "util/imageutil.h"

plugins/VOIP/gui/VOIPToasterItem.cpp

@@ -27,7 +27,7 @@
 
 /*Retroshare-Gui*/
 #include "gui/chat/ChatDialog.h"
-#include "gui/notifyqt.h"
+#include "gui/RsGUIEventManager.h"
 #include "util/HandleRichText.h"
 
 VOIPToasterItem::VOIPToasterItem(const RsPeerId &peer_id, const QString &msg, const voipToasterItem_Type type)

retroshare-gui/src/gui/ChatLobbyWidget.cpp

@@ -21,7 +21,6 @@
 
 #include "ChatLobbyWidget.h"
 
-#include "notifyqt.h"
 #include "RetroShareLink.h"
 #include "chat/ChatLobbyDialog.h"
 #include "chat/ChatLobbyUserNotify.h"

retroshare-gui/src/gui/FileTransfer/TransferUserNotify.cpp

@@ -20,7 +20,6 @@
 
 #include "retroshare/rsfiles.h"
 #include "TransferUserNotify.h"
-#include "gui/notifyqt.h"
 #include "gui/MainWindow.h"
 
 TransferUserNotify::TransferUserNotify(QObject *parent) :

retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp

@@ -20,7 +20,6 @@
 
 #include "TransfersDialog.h"
 
-#include "gui/notifyqt.h"
 #include "gui/SoundManager.h"
 #include "gui/RetroShareLink.h"
 #include "gui/common/FilesDefs.h"

retroshare-gui/src/gui/FriendsDialog.cpp

@@ -34,7 +34,6 @@
 #include "groups/CreateGroup.h"
 #include "MainWindow.h"
 #include "NewsFeed.h"
-#include "notifyqt.h"
 #include "profile/ProfileWidget.h"
 #include "profile/StatusMessage.h"
 #include "RetroShareLink.h"

retroshare-gui/src/gui/HomePage.cpp

@@ -26,7 +26,6 @@
 #include "util/qtthreadsutils.h"
 #include "util/misc.h"
 
-#include "gui/notifyqt.h"
 #include "gui/common/FilesDefs.h"
 #include "gui/msgs/MessageComposer.h"
 #include "gui/connect/ConnectFriendWizard.h"

retroshare-gui/src/gui/Identity/IdEditDialog.cpp

@@ -29,7 +29,6 @@
 #include "gui/gxs/GxsIdDetails.h"
 #include "util/qtthreadsutils.h"
 #include "util/misc.h"
-#include "gui/notifyqt.h"
 
 #include "retroshare/rsidentity.h"
 #include "retroshare/rspeers.h"

retroshare-gui/src/gui/MainWindow.cpp

@@ -67,7 +67,6 @@
 #include "chat/ChatDialog.h"
 #include "RetroShareLink.h"
 #include "SoundManager.h"
-#include "notifyqt.h"
 #include "common/UserNotify.h"
 #include "gui/ServicePermissionDialog.h"
 
@@ -122,11 +121,11 @@
 #include "gui/statistics/StatisticsWindow.h"
 
 #include "gui/connect/ConnectFriendWizard.h"
+#include "gui/RsGUIEventManager.h"
 #include "gui/common/RsCollectionDialog.h"
 #include "settings/rsettingswin.h"
 #include "settings/rsharesettings.h"
 #include "common/StatusDefs.h"
-#include "gui/notifyqt.h"
 
 #ifdef RS_WEBUI
 #	include "settings/WebuiPage.h"

retroshare-gui/src/gui/MessengerWindow.cpp

@@ -36,7 +36,6 @@
 
 #include "MainWindow.h"
 #include "ShareManager.h"
-#include "notifyqt.h"
 #include "connect/ConnectFriendWizard.h"
 #include "util/PixmapMerging.h"
 #include "util/qtthreadsutils.h"

retroshare-gui/src/gui/NewsFeed.cpp

@@ -57,7 +57,6 @@
 #include "msgs/MessageInterface.h"
 
 #include "common/FeedNotify.h"
-#include "notifyqt.h"
 
 #define ROLE_RECEIVED FEED_TREEWIDGET_SORTROLE
 

retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp

@@ -37,8 +37,8 @@
 #include "gui/common/UIStateHelper.h"
 #include "gui/common/RSTabWidget.h"
 #include "gui/settings/rsharesettings.h"
+#include "gui/RsGUIEventManager.h"
 #include "gui/feeds/SubFileItem.h"
-#include "gui/notifyqt.h"
 #include "gui/Identity/IdDialog.h"
 #include "gui/RetroShareLink.h"
 #include "util/HandleRichText.h"

retroshare-gui/src/gui/ShareManager.cpp

@@ -35,7 +35,6 @@
 #include "gui/common/GroupFlagsWidget.h"
 #include "gui/common/GroupSelectionBox.h"
 #include "gui/common/GroupDefs.h"
-#include "gui/notifyqt.h"
 #include "util/RsQtVersion.h"
 #include "util/misc.h"
 #include "util/qtthreadsutils.h"

retroshare-gui/src/gui/chat/ChatLobbyUserNotify.cpp

@@ -28,7 +28,6 @@
 
 #include "gui/ChatLobbyWidget.h"
 #include "gui/MainWindow.h"
-#include "gui/notifyqt.h"
 #include "gui/SoundManager.h"
 #include "gui/settings/rsharesettings.h"
 #include "util/DateTime.h"

retroshare-gui/src/gui/chat/ChatStyle.cpp

@@ -107,7 +107,7 @@
 
 #include "ChatStyle.h"
 #include "gui/settings/rsharesettings.h"
-#include "gui/notifyqt.h"
+#include "gui/RsGUIEventManager.h"
 #include "util/DateTime.h"
 #include "util/HandleRichText.h"
 

retroshare-gui/src/gui/chat/ChatUserNotify.cpp

@@ -22,7 +22,6 @@
 
 #include "gui/common/FilesDefs.h"
 #include "ChatUserNotify.h"
-#include "gui/notifyqt.h"
 #include "gui/MainWindow.h"
 #include "gui/chat/ChatDialog.h"
 #include "gui/settings/rsharesettings.h"

retroshare-gui/src/gui/chat/ChatWidget.cpp

@@ -23,7 +23,6 @@
 #include "ui_ChatWidget.h"
 
 #include "gui/MainWindow.h"
-#include "gui/notifyqt.h"
 #include "gui/RetroShareLink.h"
 #include "gui/settings/rsharesettings.h"
 #include "gui/settings/rsettingswin.h"
@@ -33,6 +32,7 @@
 #include "gui/common/Emoticons.h"
 #include "gui/chat/ChatLobbyDialog.h"
 #include "gui/gxs/GxsIdDetails.h"
+#include "gui/RsGUIEventManager.h"
 #include "util/misc.h"
 #include "util/qtthreadsutils.h"
 #include "util/HandleRichText.h"

retroshare-gui/src/gui/chat/PopupChatDialog.cpp

@@ -26,7 +26,6 @@
 #include "gui/common/FilesDefs.h"
 #include "gui/settings/rsharesettings.h"
 #include "gui/settings/RsharePeerSettings.h"
-#include "gui/notifyqt.h"
 #include "util/DateTime.h"
 #include "util/qtthreadsutils.h"
 

retroshare-gui/src/gui/common/AvatarWidget.cpp

@@ -25,7 +25,6 @@
 #include <retroshare/rspeers.h>
 #include <retroshare/rsmsgs.h>
 
-#include "gui/notifyqt.h"
 #include "util/misc.h"
 #include "util/qtthreadsutils.h"
 #include "gui/common/AvatarDefs.h"

retroshare-gui/src/gui/common/FriendSelectionWidget.cpp

@@ -25,7 +25,6 @@
 #include "ui_FriendSelectionWidget.h"
 #include "gui/gxs/GxsIdDetails.h"
 #include <retroshare-gui/RsAutoUpdatePage.h>
-#include "gui/notifyqt.h"
 #include "gui/common/RSTreeWidgetItem.h"
 #include "gui/common/StatusDefs.h"
 #include "util/qtthreadsutils.h"

retroshare-gui/src/gui/common/GroupSelectionBox.cpp

@@ -23,7 +23,6 @@
 #include <retroshare/rspeers.h>
 #include "GroupSelectionBox.h"
 #include "GroupDefs.h"
-#include "gui/notifyqt.h"
 #include "util/qtthreadsutils.h"
 
 #include <algorithm>

retroshare-gui/src/gui/common/NewFriendList.cpp

@@ -54,7 +54,6 @@
 #include "gui/chat/ChatUserNotify.h"
 #include "gui/connect/ConnectProgressDialog.h"
 #include "gui/common/ElidedLabel.h"
-#include "gui/notifyqt.h"
 
 #include "NewFriendList.h"
 #include "ui_NewFriendList.h"

retroshare-gui/src/gui/connect/ConfCertDialog.cpp

@@ -31,6 +31,7 @@
 #include <retroshare/rspeers.h>
 #include <retroshare/rsdisc.h>
 #include <retroshare/rsmsgs.h>
+#include <retroshare/rsiface.h>
 
 #include <retroshare-gui/mainpage.h>
 
@@ -38,7 +39,6 @@
 #include "gui/common/PeerDefs.h"
 #include "gui/common/StatusDefs.h"
 #include "gui/RetroShareLink.h"
-#include "gui/notifyqt.h"
 #include "gui/common/AvatarDefs.h"
 #include "gui/common/FilesDefs.h"
 #include "gui/MainWindow.h"

retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp

@@ -41,7 +41,6 @@
 #include "ui_ConnectFriendWizard.h"
 #include "gui/common/PeerDefs.h"
 #include "gui/connect/ConfCertDialog.h"
-#include "gui/notifyqt.h"
 #include "gui/common/GroupDefs.h"
 #include "gui/msgs/MessageComposer.h"
 

retroshare-gui/src/gui/connect/PGPKeyDialog.cpp

@@ -40,7 +40,6 @@
 #include "gui/common/PeerDefs.h"
 #include "gui/common/StatusDefs.h"
 #include "gui/RetroShareLink.h"
-#include "gui/notifyqt.h"
 #include "gui/common/AvatarDefs.h"
 #include "gui/MainWindow.h"
 #include "util/DateTime.h"

retroshare-gui/src/gui/feeds/ChatMsgItem.cpp

@@ -30,7 +30,6 @@
 #include "gui/common/AvatarDefs.h"
 #include "gui/settings/rsharesettings.h"
 
-#include "gui/notifyqt.h"
 
 #include <retroshare/rsmsgs.h>
 #include <retroshare/rspeers.h>

retroshare-gui/src/gui/feeds/GxsCircleItem.cpp

@@ -22,7 +22,6 @@
 #include "ui_GxsCircleItem.h"
 
 #include "FeedHolder.h"
-#include "gui/notifyqt.h"
 #include "gui/Circles/CreateCircleDialog.h"
 #include "gui/gxs/GxsIdDetails.h"
 #include "gui/common/FilesDefs.h"

retroshare-gui/src/gui/feeds/MsgItem.cpp

@@ -30,7 +30,6 @@
 #include "util/DateTime.h"
 #include "gui/common/AvatarDefs.h"
 #include "gui/common/FilesDefs.h"
-#include "gui/notifyqt.h"
 #include "util/qtthreadsutils.h"
 
 #include <retroshare/rsmsgs.h>

retroshare-gui/src/gui/feeds/PeerItem.cpp

@@ -31,8 +31,6 @@
 #include "util/qtthreadsutils.h"
 #include "util/DateTime.h"
 
-#include "gui/notifyqt.h"
-
 #include <retroshare/rsmsgs.h>
 #include <retroshare/rspeers.h>
 #include <retroshare/rsrtt.h>

retroshare-gui/src/gui/feeds/SecurityItem.cpp

@@ -35,8 +35,6 @@
 #include "util/DateTime.h"
 #include "util/qtthreadsutils.h"
 
-#include "gui/notifyqt.h"
-
 #include <retroshare/rsmsgs.h>
 #include <retroshare/rspeers.h>
 

retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp

@@ -31,9 +31,9 @@
 #include "gui/gxs/GxsGroupShareKey.h"
 #include "gui/common/GroupTreeWidget.h"
 #include "gui/common/RSTreeWidget.h"
-#include "gui/notifyqt.h"
 #include "gui/common/UIStateHelper.h"
 #include "gui/common/UserNotify.h"
+#include "gui/RsGUIEventManager.h"
 #include "util/qtthreadsutils.h"
 #include "retroshare/rsgxsifacetypes.h"
 #include "GxsCommentDialog.h"

retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp

@@ -32,7 +32,6 @@
 #include "gui/gxs/GxsGroupShareKey.h"
 #include "gui/feeds/GxsChannelPostItem.h"
 #include "gui/settings/rsharesettings.h"
-#include "gui/notifyqt.h"
 #include "gui/common/GroupTreeWidget.h"
 #include "util/qtthreadsutils.h"
 #include "util/misc.h"

retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp

@@ -30,12 +30,12 @@
 #include "gui/feeds/GxsChannelPostItem.h"
 #include "gui/gxs/GxsIdDetails.h"
 #include "gui/gxs/GxsGroupFrameDialog.h"
+#include "gui/RsGUIEventManager.h"
 #include "util/misc.h"
 #include "gui/gxschannels/CreateGxsChannelMsg.h"
 #include "gui/common/UIStateHelper.h"
 #include "gui/settings/rsharesettings.h"
 #include "gui/feeds/SubFileItem.h"
-#include "gui/notifyqt.h"
 #include "gui/RetroShareLink.h"
 #include "util/HandleRichText.h"
 #include "util/DateTime.h"

retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp

@@ -23,7 +23,6 @@
 #include "GxsForumThreadWidget.h"
 #include "CreateGxsForumMsg.h"
 #include "GxsForumUserNotify.h"
-#include "gui/notifyqt.h"
 #include "gui/common/GroupTreeWidget.h"
 #include "gui/gxs/GxsGroupShareKey.h"
 #include "util/misc.h"

retroshare-gui/src/gui/im_history/ImHistoryBrowser.cpp

@@ -39,7 +39,6 @@
 #include <retroshare/rshistory.h>
 #include <retroshare/rsidentity.h>
 #include "gui/settings/rsharesettings.h"
-#include "gui/notifyqt.h"
 #include "util/DateTime.h"
 
 #define ROLE_MSGID     Qt::UserRole

retroshare-gui/src/gui/msgs/MessageComposer.cpp

@@ -51,7 +51,6 @@
 #include <retroshare/rsgxschannels.h>
 #include <retroshare/rsgxsforums.h>
 
-#include "gui/notifyqt.h"
 #include "gui/common/RSTreeWidgetItem.h"
 #include "gui/common/GroupDefs.h"
 #include "gui/common/StatusDefs.h"

retroshare-gui/src/gui/msgs/MessageUserNotify.cpp

@@ -20,7 +20,6 @@
 
 #include "gui/common/FilesDefs.h"
 #include "MessageUserNotify.h"
-#include "gui/notifyqt.h"
 #include "gui/MainWindow.h"
 #include "util/qtthreadsutils.h"
 #include "gui/settings/rsharesettings.h"

retroshare-gui/src/gui/msgs/MessageWidget.cpp

@@ -31,7 +31,6 @@
 #include <QPlainTextEdit>
 #include <QDialog>
 
-#include "gui/notifyqt.h"
 #include "gui/RetroShareLink.h"
 #include "gui/common/TagDefs.h"
 #include "gui/common/PeerDefs.h"

retroshare-gui/src/gui/msgs/MessagesDialog.cpp

@@ -27,7 +27,6 @@
 
 #include "MessagesDialog.h"
 
-#include "gui/notifyqt.h"
 #include "gui/common/TagDefs.h"
 #include "gui/common/PeerDefs.h"
 #include "gui/common/RSElidedItemDelegate.h"

retroshare-gui/src/gui/msgs/TagsMenu.cpp

@@ -29,7 +29,6 @@
 #include "TagsMenu.h"
 #include "gui/common/TagDefs.h"
 #include "gui/settings/NewTag.h"
-#include "gui/notifyqt.h"
 #include "util/qtthreadsutils.h"
 
 #include "gui/msgs/MessageInterface.h"

retroshare-gui/src/gui/settings/AppearancePage.cpp

@@ -22,7 +22,7 @@
 
 #include "rshare.h"
 #include "gui/MainWindow.h"
-#include "gui/notifyqt.h"
+#include "gui/RsGUIEventManager.h"
 #include "gui/common/FilesDefs.h"
 #include "gui/settings/rsharesettings.h"
 #include "gui/statusbar/peerstatus.h"

retroshare-gui/src/gui/settings/ChannelPage.cpp

@@ -21,7 +21,6 @@
 #include "ChannelPage.h"
 #include "rsharesettings.h"
 #include "util/misc.h"
-#include "gui/notifyqt.h"
 #include "retroshare/rsgxschannels.h"
 
 ChannelPage::ChannelPage(QWidget * parent, Qt::WindowFlags flags)

retroshare-gui/src/gui/settings/ChatPage.cpp

@@ -22,7 +22,7 @@
 
 #include "rsharesettings.h"
 #include "gui/MainWindow.h"
-#include "gui/notifyqt.h"
+#include "gui/RsGUIEventManager.h"
 #include "gui/RetroShareLink.h"
 #include "gui/chat/ChatDialog.h"
 #include "util/misc.h"

retroshare-gui/src/gui/settings/GroupFrameSettingsWidget.cpp

@@ -20,8 +20,8 @@
 
 #include <iostream>
 
-#include "gui/notifyqt.h"
 #include "util/misc.h"
+#include "gui/RsGUIEventManager.h"
 #include "GroupFrameSettingsWidget.h"
 #include "ui_GroupFrameSettingsWidget.h"
 

retroshare-gui/src/gui/settings/MessagePage.cpp

@@ -27,10 +27,10 @@
 #include "MessagePage.h"
 #include "util/misc.h"
 #include "gui/common/TagDefs.h"
+#include "gui/RsGUIEventManager.h"
 #include <algorithm>
 #include "NewTag.h"
 #include "util/qtthreadsutils.h"
-#include "gui/notifyqt.h"
 
 MessagePage::MessagePage(QWidget * parent, Qt::WindowFlags flags)
     : ConfigPage(parent, flags)

retroshare-gui/src/gui/settings/NotifyPage.cpp

@@ -25,11 +25,11 @@
 #include "rsharesettings.h"
 
 #include "gui/MainWindow.h"
+#include "gui/RsGUIEventManager.h"
 #include "gui/common/UserNotify.h"
 #include "gui/common/FeedNotify.h"
 #include "gui/common/ToasterNotify.h"
 #include "gui/feeds/FeedItem.h"
-#include "gui/notifyqt.h"
 #include "gui/NewsFeed.h"
 #include "util/misc.h"
 

retroshare-gui/src/gui/settings/ServerPage.cpp

@@ -20,7 +20,6 @@
 
 #include "ServerPage.h"
 
-#include <gui/notifyqt.h>
 #include "gui/MainWindow.h"
 #include "rshare.h"
 #include "rsharesettings.h"

retroshare-gui/src/gui/settings/rsettingswin.cpp

@@ -40,7 +40,7 @@
 #include "PluginsPage.h"
 #include "ServicePermissionsPage.h"
 #include "rsharesettings.h"
-#include "gui/notifyqt.h"
+#include "gui/RsGUIEventManager.h"
 #include "gui/common/FloatingHelpBrowser.h"
 #include "gui/common/RSElidedItemDelegate.h"
 

retroshare-gui/src/gui/statusbar/ToasterDisable.cpp

@@ -22,7 +22,7 @@
 #include <QPushButton>
 
 #include "ToasterDisable.h"
-#include "gui/notifyqt.h"
+#include "gui/RsGUIEventManager.h"
 #include "gui/common/FilesDefs.h"
 
 #define IMAGE_TOASTERDISABLE   ":/images/toasterDisable.png"

retroshare-gui/src/gui/statusbar/hashingstatus.cpp

@@ -28,7 +28,6 @@
 #include "gui/common/ElidedLabel.h"
 #include "util/qtthreadsutils.h"
 #include "util/misc.h"
-#include "gui/notifyqt.h"
 #include "gui/common/FilesDefs.h"
 
 //#define DEBUG_HASHING_STATUS 1

retroshare-gui/src/util/FontSizeHandler.cpp

@@ -25,7 +25,7 @@
 #include "rshare.h"
 #include "FontSizeHandler.h"
 #include "gui/settings/rsharesettings.h"
-#include "gui/notifyqt.h"
+#include "gui/RsGUIEventManager.h"
 
 // Data for QAbstractItemView
 struct FontSizeHandlerWidgetData

retroshare-gui/src/util/RsGxsUpdateBroadcast.cpp

@@ -21,7 +21,6 @@
 #include <QMap>
 
 #include "RsGxsUpdateBroadcast.h"
-#include "gui/notifyqt.h"
 #include "util/qtthreadsutils.h"
 
 #include <retroshare/rsgxsifacehelper.h>