started separating rsMsgs into rsMail and rsChats

Author: csoler

retroshare-gui/src/gui/ChatLobbyWidget.cpp

@@ -37,7 +37,7 @@
 #include "util/qtthreadsutils.h"
 #include "util/RsQtVersion.h"
 
-#include "retroshare/rsmsgs.h"
+#include "retroshare/rschats.h"
 #include "retroshare/rspeers.h"
 #include "retroshare/rsidentity.h"
 

retroshare-gui/src/gui/ChatLobbyWidget.h

@@ -28,7 +28,7 @@
 #include "util/FontSizeHandler.h"
 
 
-#include <retroshare/rsmsgs.h>
+#include <retroshare/rschats.h>
 
 #include <QAbstractButton>
 #include <QTreeWidget>

retroshare-gui/src/gui/FriendsDialog.cpp

@@ -28,6 +28,7 @@
 #include <retroshare/rspeers.h>
 #include <retroshare/rshistory.h>
 #include <retroshare/rsinit.h>
+#include <retroshare/rschats.h>
 
 #include "chat/ChatUserNotify.h"
 #include "connect/ConnectFriendWizard.h"
@@ -283,14 +284,14 @@ void FriendsDialog::getAvatar()
 		std::cerr << "Avatar image size = " << ba.size() << std::endl ;
 #endif
 
-		rsMsgs->setOwnAvatarData((unsigned char *)(ba.data()), ba.size()) ;	// last char 0 included.
+        rsChats->setOwnAvatarData((unsigned char *)(ba.data()), ba.size()) ;	// last char 0 included.
 	}
 }
 
 /** Loads own personal status */
 void FriendsDialog::loadmypersonalstatus()
 {
-	QString statustring =  QString::fromUtf8(rsMsgs->getCustomStateString().c_str());
+    QString statustring =  QString::fromUtf8(rsChats->getCustomStateString().c_str());
 
 	if (statustring.isEmpty())
 		ui.mypersonalstatusLabel->setText(tr("Set your status message here."));

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

@@ -53,7 +53,7 @@
 #include "util/DateTime.h"
 
 #include "retroshare/rsgxsflags.h"
-#include "retroshare/rsmsgs.h"
+#include "retroshare/rschats.h"
 #include "retroshare/rspeers.h"
 #include "retroshare/rsservicecontrol.h"
 

retroshare-gui/src/gui/Identity/IdentityListModel.h

@@ -24,7 +24,8 @@
 #include <QColor>
 
 #include "retroshare/rsstatus.h"
-#include "retroshare/rsmsgs.h"
+#include "retroshare/rschats.h"
+#include "retroshare/rsmail.h"
 #include "retroshare/rspeers.h"
 #include "retroshare/rsidentity.h"
 

retroshare-gui/src/gui/MessengerWindow.cpp

@@ -27,7 +27,7 @@
 #include "common/StatusDefs.h"
 
 #include <retroshare/rspeers.h>
-#include <retroshare/rsmsgs.h>
+#include <retroshare/rschats.h>
 #include <retroshare/rsstatus.h>
 
 #include "rshare.h"

retroshare-gui/src/gui/NetworkDialog.cpp

@@ -28,7 +28,6 @@
 #include <retroshare/rsiface.h>
 #include <retroshare/rspeers.h>
 #include <retroshare/rsdisc.h>
-#include <retroshare/rsmsgs.h>
 
 #include "common/vmessagebox.h"
 #include "common/RSTreeWidgetItem.h"

retroshare-gui/src/gui/NetworkDialog/pgpid_item_proxy.cpp

@@ -24,7 +24,6 @@
 #include <retroshare/rsiface.h>
 #include <retroshare/rspeers.h>
 #include <retroshare/rsdisc.h>
-#include <retroshare/rsmsgs.h>
 
 bool pgpid_item_proxy::lessThan(const QModelIndex &left, const QModelIndex &right) const 
 {

retroshare-gui/src/gui/NewsFeed.cpp

@@ -26,7 +26,8 @@
 #include <retroshare/rsbanlist.h>
 #include <retroshare/rsgxschannels.h>
 #include <retroshare/rsgxsforums.h>
-#include <retroshare/rsmsgs.h>
+#include <retroshare/rschats.h>
+#include <retroshare/rsmail.h>
 #include <retroshare/rspeers.h>
 #include <retroshare/rsplugin.h>
 #include <retroshare/rsposted.h>

retroshare-gui/src/gui/RetroShareLink.cpp

@@ -40,7 +40,6 @@
 #include <retroshare/rsfiles.h>
 #include <retroshare/rsgxsforums.h>
 #include <retroshare/rsidentity.h>
-#include <retroshare/rsmsgs.h>
 #include <retroshare/rspeers.h>
 
 #include <QApplication>