This intimidating patch renames libretroshare/src/rsiface/ to

libretroshare/src/retroshare/

All the relevant headers have been modified to reflect that change.

This allows installation of libretroshare on a system, headers will
be put in $WHEREVER/retroshare/ and we keep the ability to compile
against them, be it on the system or in the SVN tree.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3342 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/dbase/fimonitor.cc

@@ -28,8 +28,8 @@
 #include "dbase/fimonitor.h"
 #include "util/rsdir.h"
 #include "serialiser/rsserviceids.h"
-#include "rsiface/rsiface.h"
-#include "rsiface/rsnotify.h"
+#include "retroshare/rsiface.h"
+#include "retroshare/rsnotify.h"
 #include "util/folderiterator.h"
 #include <errno.h>
 

libretroshare/src/dbase/fimonitor.h

@@ -27,7 +27,7 @@
 #include "dbase/cachestrapper.h"
 #include "dbase/findex.h"
 #include "util/rsthreads.h"
-#include "rsiface/rsfiles.h"
+#include "retroshare/rsfiles.h"
 
 /******************************************************************************************
  * The Local Monitoring Class: FileIndexMonitor.

libretroshare/src/dbase/findex.cc

@@ -23,7 +23,7 @@
 
 #include <util/rswin.h>
 #include "dbase/findex.h"
-#include "rsiface/rsexpr.h"
+#include "retroshare/rsexpr.h"
 #include "util/rsdir.h"
 
 #include <assert.h>

libretroshare/src/dbase/findex.h

@@ -30,7 +30,7 @@
 #include <list>
 #include <vector>
 #include <stdint.h>
-#include <rsiface/rstypes.h>
+#include "retroshare/rstypes.h"
 
 class ostream;
 

libretroshare/src/dbase/fistore.cc

@@ -22,7 +22,7 @@
  */
 
 #include "dbase/fistore.h"
-#include "rsiface/rsexpr.h"
+#include "retroshare/rsexpr.h"
 #include "serialiser/rsserviceids.h"
 #include "pqi/p3connmgr.h"
 

libretroshare/src/dbase/fistore.h

@@ -38,7 +38,7 @@ class p3ConnectMgr ;
 
 #include "dbase/findex.h"
 #include "dbase/cachestrapper.h"
-#include "rsiface/rsiface.h"
+#include "retroshare/rsiface.h"
 
 class FileStoreResult
 {

libretroshare/src/dbase/rsexpr.cc

@@ -25,7 +25,7 @@
 
 
 #include "dbase/findex.h"
-#include "rsiface/rsexpr.h"
+#include "retroshare/rsexpr.h"
 #include <algorithm>
 #include <functional>
 

libretroshare/src/ft/ftchunkmap.cc

@@ -3,8 +3,8 @@
 #endif
 #include <math.h>
 #include <stdlib.h>
-#include <rsiface/rspeers.h>
-#include <rsiface/rsturtle.h>
+#include "retroshare/rspeers.h"
+#include "retroshare/rsturtle.h"
 #include "ftchunkmap.h"
 #include <time.h>
 

libretroshare/src/ft/ftchunkmap.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <map>
-#include <rsiface/rstypes.h>
+#include "retroshare/rstypes.h"
 
 // ftChunkMap: 
 // 	- handles chunk map over a complete file

libretroshare/src/ft/ftcontroller.h

@@ -51,7 +51,7 @@ class p3turtle ;
 #include "pqi/pqimonitor.h"
 #include "pqi/p3cfgmgr.h"
 
-#include "rsiface/rsfiles.h"
+#include "retroshare/rsfiles.h"
 #include "serialiser/rsconfigitems.h"
 
 #include <map>

libretroshare/src/ft/ftdatamultiplex.h

@@ -45,7 +45,7 @@ class ftSearch;
 #include "util/rsthreads.h"
 
 #include "ft/ftdata.h"
-#include "rsiface/rsfiles.h"
+#include "retroshare/rsfiles.h"
 
 
 class ftClient

libretroshare/src/ft/ftextralist.h

@@ -59,7 +59,7 @@
 
 #include "ft/ftsearch.h"
 #include "util/rsthreads.h"
-#include "rsiface/rsfiles.h"
+#include "retroshare/rsfiles.h"
 #include "pqi/p3cfgmgr.h"
 
 class FileDetails

libretroshare/src/ft/ftfileprovider.h

@@ -33,7 +33,7 @@
 #include <iostream>
 #include <stdint.h>
 #include "util/rsthreads.h"
-#include "rsiface/rsfiles.h"
+#include "retroshare/rsfiles.h"
 
 class ftFileProvider
 {

libretroshare/src/ft/ftsearch.h

@@ -34,7 +34,7 @@
  *
  */
 
-#include "rsiface/rsfiles.h" // includes rsiface/rstypes.h too!
+#include "retroshare/rsfiles.h" // includes retroshare/rstypes.h too!
 
 class ftSearch
 {

libretroshare/src/ft/ftserver.cc

@@ -26,7 +26,7 @@
 #include <sstream>
 #include "util/rsdebug.h"
 #include "util/rsdir.h"
-#include "rsiface/rstypes.h"
+#include "retroshare/rstypes.h"
 const int ftserverzone = 29539;
 
 #include "ft/ftserver.h"

libretroshare/src/ft/ftserver.h

@@ -44,7 +44,7 @@
 #include <iostream>
 
 #include "ft/ftdata.h"
-#include "rsiface/rsfiles.h"
+#include "retroshare/rsfiles.h"
 //#include "dbase/cachestrapper.h"
 
 #include "pqi/pqi.h"

libretroshare/src/ft/fttransfermodule.cc

@@ -27,7 +27,7 @@
  * #define FT_DEBUG 1
  *****/
 
-#include <rsiface/rsturtle.h>
+#include "retroshare/rsturtle.h"
 #include "fttransfermodule.h"
 
 /*************************************************************************

libretroshare/src/libretroshare.pro

@@ -92,29 +92,33 @@ use_blogs {
 	DEFINES *= RS_USE_BLOGS
 }
 
-PUBLIC_HEADERS =	rsiface/rsblogs.h \
-					rsiface/rschannels.h \
-					rsiface/rsdisc.h \
-					rsiface/rsdistrib.h \
-					rsiface/rsexpr.h \
-					rsiface/rsfiles.h \
-					rsiface/rsforums.h \
-					rsiface/rsgame.h \
-					rsiface/rsiface.h \
-					rsiface/rsmsgs.h \
-					rsiface/rsnotify.h \
-					rsiface/rspeers.h \
-					rsiface/rsphoto.h \
-					rsiface/rsrank.h \
-					rsiface/rsstatus.h \
-					rsiface/rstypes.h
+PUBLIC_HEADERS =	retroshare/rsblogs.h \
+					retroshare/rschannels.h \
+					retroshare/rsdisc.h \
+					retroshare/rsdistrib.h \
+					retroshare/rsexpr.h \
+					retroshare/rsfiles.h \
+					retroshare/rsforums.h \
+					retroshare/rsiface.h \
+					retroshare/rsinit.h \
+					retroshare/rsmsgs.h \
+					retroshare/rsnotify.h \
+					retroshare/rspeers.h \
+					retroshare/rsrank.h \
+					retroshare/rsstatus.h \
+					retroshare/rsturtle.h \
+					retroshare/rstypes.h
 
 HEADERS += $$PUBLIC_HEADERS
 
+# public headers to be...
+HEADERS +=		retroshare/rsgame.h \
+					retroshare/rsphoto.h
+
 ################################# Linux ##########################################
 linux-* {
 	isEmpty(PREFIX)  { PREFIX = /usr }
-	isEmpty(INC_DIR) { INC_DIR = $${PREFIX}/include/libretroshare/ }
+	isEmpty(INC_DIR) { INC_DIR = $${PREFIX}/include/retroshare/ }
 	isEmpty(LIB_DIR) { LIB_DIR = $${PREFIX}/lib/ }
 
 	DESTDIR = lib
@@ -146,7 +150,7 @@ linux-* {
 	INSTALLS *= target
 
 	# where to put the library's interface
-	include_rsiface.path = $${INC_DIR}/rsiface
+	include_rsiface.path = $${INC_DIR}
 	include_rsiface.files = $$PUBLIC_HEADERS
 	INSTALLS += include_rsiface
 

libretroshare/src/pqi/authgpg.cc

@@ -25,8 +25,8 @@
  */
 
 #include "authgpg.h"
-#include <rsiface/rsiface.h>
-#include <rsiface/rsinit.h>
+#include "retroshare/rsiface.h"
+#include "retroshare/rsinit.h"
 #include <util/rsdir.h>
 #include <iostream>
 #include <sstream>

libretroshare/src/pqi/authgpg.h

@@ -43,7 +43,7 @@
 #include <openssl/ssl.h>
 #include <openssl/evp.h>
 #include "util/rsthreads.h"
-#include "rsiface/rspeers.h"
+#include "retroshare/rspeers.h"
 #include <string>
 #include <list>
 #include <set>

libretroshare/src/pqi/p3cfgmgr.cc

@@ -24,7 +24,7 @@
  */
 
 #include "util/rsdir.h"
-#include "rsiface/rspeers.h"
+#include "retroshare/rspeers.h"
 #include "pqi/p3cfgmgr.h"
 #include "pqi/authssl.h"
 #include "pqi/pqibin.h"

libretroshare/src/pqi/p3notify.h

@@ -26,7 +26,7 @@
  *
  */
 
-#include "rsiface/rsnotify.h"
+#include "retroshare/rsnotify.h"
 #include "pqi/pqinotify.h"
 
 #include "util/rsthreads.h"

libretroshare/src/pqi/pqinotify.h

@@ -26,7 +26,7 @@
  *
  */
 
-#include "rsiface/rsnotify.h"  /* for ids */
+#include "retroshare/rsnotify.h"  /* for ids */
 
 	/* Interface for System Notification: Implemented in rsserver */
 	/* Global Access -> so we don't need everyone to have a pointer to this! */

libretroshare/src/retroshare/rsblogs.h

@@ -31,8 +31,8 @@
 #include <iostream>
 #include <string>
 
-#include "rsiface/rstypes.h"
-#include "rsiface/rsdistrib.h" /* For FLAGS */
+#include "rstypes.h"
+#include "rsdistrib.h" /* For FLAGS */
 
 class BlogInfo 
 {

libretroshare/src/retroshare/rschannels.h

@@ -31,8 +31,8 @@
 #include <iostream>
 #include <string>
 
-#include "rsiface/rstypes.h"
-#include "rsiface/rsdistrib.h" /* For FLAGS */
+#include "rstypes.h"
+#include "rsdistrib.h" /* For FLAGS */
 
 //! Stores information for a give channel id
 /*!

libretroshare/src/retroshare/rsfiles.h

@@ -31,7 +31,7 @@
 #include <iostream>
 #include <string>
 
-#include "rsiface/rstypes.h"
+#include "rstypes.h"
 
 class RsFiles;
 extern RsFiles  *rsFiles;

libretroshare/src/retroshare/rsforums.h

@@ -31,8 +31,8 @@
 #include <iostream>
 #include <string>
 
-#include "rsiface/rstypes.h"
-#include "rsiface/rsdistrib.h" /* For FLAGS */
+#include "rstypes.h"
+#include "rsdistrib.h" /* For FLAGS */
 
 #define RS_FORUMMSG_NEW       0x0010 
 

libretroshare/src/retroshare/rsmsgs.h

@@ -31,7 +31,7 @@
 #include <iostream>
 #include <string>
 
-#include "rsiface/rstypes.h"
+#include "rstypes.h"
 
 /********************** For Messages and Channels *****************/
 

libretroshare/src/rsserver/p3discovery.h

@@ -26,7 +26,7 @@
  *
  */
 
-#include "rsiface/rsdisc.h"
+#include "retroshare/rsdisc.h"
 #include "services/p3disc.h"
 
 class p3Discovery: public RsDisc

libretroshare/src/rsserver/p3face-config.cc

@@ -31,7 +31,7 @@
 #include <sstream>
 #include "pqi/authssl.h"
 #include "pqi/authgpg.h"
-#include "rsiface/rsinit.h"
+#include "retroshare/rsinit.h"
 #include "util/rsdebug.h"
 const int p3facemsgzone = 11453;
 

libretroshare/src/rsserver/p3face.h

@@ -34,8 +34,8 @@
 #include "pqi/p3connmgr.h"
 #include "pqi/pqipersongrp.h"
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rstypes.h"
+#include "retroshare/rsiface.h"
+#include "retroshare/rstypes.h"
 #include "util/rsthreads.h"
 
 #include "services/p3disc.h"

libretroshare/src/rsserver/p3msgs.cc

@@ -36,7 +36,7 @@ const int p3facemsgzone = 11453;
 #include <sys/time.h>
 #include <time.h>
 
-#include "rsiface/rstypes.h"
+#include "retroshare/rstypes.h"
 #include "rsserver/p3msgs.h"
 
 #include "services/p3msgservice.h"

libretroshare/src/rsserver/p3msgs.h

@@ -26,7 +26,7 @@
  *
  */
 
-#include "rsiface/rsmsgs.h"
+#include "retroshare/rsmsgs.h"
 
 class p3MsgService;
 class p3ChatService;

libretroshare/src/rsserver/p3peers.cc

@@ -28,7 +28,7 @@
 #include "pqi/p3connmgr.h"
 #include "pqi/authssl.h"
 #include "pqi/authgpg.h"
-#include <rsiface/rsinit.h>
+#include "retroshare/rsinit.h"
 #include "pqi/cleanupxpgp.h"
 
 

libretroshare/src/rsserver/p3peers.h

@@ -26,7 +26,7 @@
  *
  */
 
-#include "rsiface/rspeers.h"
+#include "retroshare/rspeers.h"
 #include "pqi/p3connmgr.h"
 
 class p3Peers: public RsPeers 

libretroshare/src/rsserver/p3photo.h

@@ -26,7 +26,7 @@
  *
  */
 
-#include "rsiface/rsphoto.h"
+#include "retroshare/rsphoto.h"
 #include "services/p3photoservice.h"
 
 class p3Photo: public RsPhoto

libretroshare/src/rsserver/p3rank.h

@@ -26,7 +26,7 @@
  *
  */
 
-#include "rsiface/rsrank.h"
+#include "retroshare/rsrank.h"
 #include "services/p3ranking.h"
 
 class p3Rank: public RsRanks

libretroshare/src/rsserver/p3status.h

@@ -26,7 +26,7 @@
  *
  */
 
-#include "rsiface/rsstatus.h"
+#include "retroshare/rsstatus.h"
 
 
 class p3StatusService;

libretroshare/src/rsserver/rsiface.cc

@@ -26,7 +26,7 @@
 
 
 
-#include "rsiface/rsiface.h"
+#include "retroshare/rsiface.h"
 #include "util/rsdir.h"
 
 /* global variable */			

libretroshare/src/rsserver/rsinit.cc

@@ -35,7 +35,7 @@
 
 #include "util/rsdebug.h"
 #include "util/rsdir.h"
-#include "rsiface/rsinit.h"
+#include "retroshare/rsinit.h"
 
 #include <list>
 #include <string>
@@ -1980,8 +1980,8 @@ void RsInit::setAutoLogin(bool autoLogin){
 #include "ft/ftserver.h"
 #include "ft/ftcontroller.h"
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rsturtle.h"
+#include "retroshare/rsiface.h"
+#include "retroshare/rsturtle.h"
 
 /* global variable now points straight to 
  * ft/ code so variable defined here.
@@ -2033,7 +2033,7 @@ RsTurtle *rsTurtle = NULL ;
 #include "rsserver/p3discovery.h"
 #include "rsserver/p3photo.h"
 #include "rsserver/p3status.h"
-#include "rsiface/rsgame.h"
+#include "retroshare/rsgame.h"
 
 #include "pqi/p3notify.h" // HACK - moved to pqi for compilation order.
 

libretroshare/src/rsserver/rstypes.cc

@@ -29,7 +29,7 @@
  * only prints stuff out at the moment
  */
 
-#include "rsiface/rstypes.h"
+#include "retroshare/rstypes.h"
 #include <iostream>
 #include <sstream>
 #include <iomanip>

libretroshare/src/serialiser/rsbaseitems.h

@@ -28,7 +28,7 @@
 
 #include <map>
 
-#include <rsiface/rstypes.h>
+#include "retroshare/rstypes.h"
 #include "serialiser/rsserial.h"
 #include "serialiser/rstlvtypes.h"
 

libretroshare/src/serialiser/rsconfigitems.h

@@ -29,7 +29,7 @@
 #include <map>
 #include <vector>
 
-#include <rsiface/rstypes.h>
+#include "retroshare/rstypes.h"
 #include "serialiser/rsserial.h"
 #include "serialiser/rstlvbase.h"
 #include "serialiser/rstlvtypes.h"

libretroshare/src/services/p3blogs.h

@@ -26,8 +26,8 @@
  *
  */
 
-#include "rsiface/rsblogs.h"
-#include "rsiface/rsfiles.h"
+#include "retroshare/rsblogs.h"
+#include "retroshare/rsfiles.h"
 #include "services/p3distrib.h"
 
 #include "serialiser/rstlvtypes.h"

libretroshare/src/services/p3channels.h

@@ -26,8 +26,8 @@
  *
  */
 
-#include "rsiface/rschannels.h"
-#include "rsiface/rsfiles.h"
+#include "retroshare/rschannels.h"
+#include "retroshare/rsfiles.h"
 #include "services/p3distrib.h"
 
 #include "serialiser/rstlvtypes.h"

libretroshare/src/services/p3chatservice.cc

@@ -24,7 +24,7 @@
  */
 
 #include "util/rsdir.h"
-#include "rsiface/rsiface.h"
+#include "retroshare/rsiface.h"
 #include "pqi/pqibin.h"
 #include "pqi/pqinotify.h"
 #include "pqi/pqistore.h"

libretroshare/src/services/p3disc.cc

@@ -24,9 +24,9 @@
  */
 
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rsinit.h" /* for PGPSSL flag */
-#include "rsiface/rspeers.h"
+#include "retroshare/rsiface.h"
+#include "retroshare/rsinit.h" /* for PGPSSL flag */
+#include "retroshare/rspeers.h"
 #include "services/p3disc.h"
 
 #include "pqi/authssl.h"

libretroshare/src/services/p3distrib.cc

@@ -33,7 +33,7 @@
 #include <openssl/rand.h>
 #include <algorithm>
 
-#include "rsiface/rsdistrib.h"
+#include "retroshare/rsdistrib.h"
 #include "services/p3distrib.h"
 #include "serialiser/rsdistribitems.h"
 

libretroshare/src/services/p3forums.h

@@ -26,7 +26,7 @@
  *
  */
 
-#include "rsiface/rsforums.h"
+#include "retroshare/rsforums.h"
 #include "services/p3distrib.h"
 #include "serialiser/rsforumitems.h"
 

libretroshare/src/services/p3gamelauncher.h

@@ -37,7 +37,7 @@
 
 #include "services/p3service.h"
 #include "serialiser/rsgameitems.h"
-#include "rsiface/rsgame.h"
+#include "retroshare/rsgame.h"
 
 class p3ConnectMgr;
 

libretroshare/src/services/p3msgservice.cc

@@ -24,7 +24,7 @@
  */
 
 
-#include "rsiface/rsiface.h"
+#include "retroshare/rsiface.h"
 
 #include "pqi/pqibin.h"
 #include "pqi/pqiarchive.h"

libretroshare/src/services/p3msgservice.h

@@ -31,7 +31,7 @@
 #include <map>
 #include <iostream>
 
-#include "rsiface/rsmsgs.h"
+#include "retroshare/rsmsgs.h"
 
 #include "pqi/pqi.h"
 #include "pqi/pqiindic.h"

libretroshare/src/services/p3photoservice.h

@@ -33,7 +33,7 @@
 #include "serialiser/rsserial.h"
 #include "serialiser/rsphotoitems.h"
 
-#include "rsiface/rsphoto.h"
+#include "retroshare/rsphoto.h"
 
 /* 
  * Photo Service

libretroshare/src/services/p3ranking.h

@@ -34,7 +34,7 @@
 
 #include "serialiser/rsserial.h"
 
-#include "rsiface/rsrank.h"
+#include "retroshare/rsrank.h"
 
 /* 
  * A Generic Ranking system.

libretroshare/src/services/p3statusservice.h

@@ -30,7 +30,7 @@
 #include <list>
 
 #include "serialiser/rsstatusitems.h"
-#include "rsiface/rsstatus.h"
+#include "retroshare/rsstatus.h"
 #include "services/p3service.h"
 #include "pqi/p3connmgr.h"
 

libretroshare/src/services/p3tunnel.cc

@@ -24,9 +24,9 @@
  */
 
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rsinit.h" /* for PGPSSL flag */
-#include "rsiface/rspeers.h"
+#include "retroshare/rsiface.h"
+#include "retroshare/rsinit.h" /* for PGPSSL flag */
+#include "retroshare/rspeers.h"
 #include "services/p3tunnel.h"
 #include "pqi/pqissltunnel.h"
 #include <sstream>

libretroshare/src/tests/ft/ftcrc32test.cc

@@ -24,7 +24,7 @@
  */
 
 #include <iostream>
-#include <rsiface/rstypes.h>
+#include "retroshare/rstypes.h"
 #include <util/rsdir.h>
 #include <ft/ftchunkmap.h>
 

libretroshare/src/tests/ft/ftserver3test.cc

@@ -37,7 +37,7 @@
 #include "util/rswin.h"
 #endif
 
-#include "rsiface/rsexpr.h"
+#include "retroshare/rsexpr.h"
 
 #include "ft/ftserver.h"
 

libretroshare/src/tests/serialiser/distribitem_test.cc

@@ -29,7 +29,7 @@
 #include "serialiser/rschannelitems.h"
 #include "serialiser/rsforumitems.h"
 #include "serialiser/rsblogitems.h"
-#include "rsiface/rsdistrib.h"
+#include "retroshare/rsdistrib.h"
 #include "serialiser/rstlvutil.h"
 #include "util/utest.h"
 #include "support.h"

libretroshare/src/turtle/p3turtle.cc

@@ -32,9 +32,9 @@
 #include <assert.h>
 #endif
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsfiles.h"
+#include "retroshare/rsiface.h"
+#include "retroshare/rspeers.h"
+#include "retroshare/rsfiles.h"
 
 #include "pqi/authssl.h"
 #include "pqi/p3connmgr.h"

libretroshare/src/turtle/p3turtle.h

@@ -145,7 +145,7 @@
 #include "pqi/pqimonitor.h"
 #include "services/p3service.h"
 #include "ft/ftsearch.h"
-#include "rsiface/rsturtle.h"
+#include "retroshare/rsturtle.h"
 #include "rsturtleitem.h"
 
 class ftServer ;

libretroshare/src/turtle/rsturtleitem.h

@@ -3,9 +3,9 @@
 #include "serialiser/rsserial.h"
 #include "serialiser/rstlvbase.h"
 #include "serialiser/rsbaseserial.h"
-#include "rsiface/rsturtle.h"
-#include "rsiface/rsexpr.h"
-#include "rsiface/rstypes.h"
+#include "retroshare/rsturtle.h"
+#include "retroshare/rsexpr.h"
+#include "retroshare/rstypes.h"
 #include "serialiser/rsserviceids.h"
 #include "turtle/turtletypes.h"
 

libretroshare/src/turtle/turtletypes.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "rsiface/rsturtle.h"
+#include "retroshare/rsturtle.h"
 
 typedef std::string 	TurtlePeerId ;
 typedef std::string 	TurtleVirtualPeerId ;

libretroshare/src/util/rsdir.cc

@@ -31,7 +31,7 @@
 
 #include "util/rsdir.h"
 #include "pqi/pqinotify.h"
-#include <rsiface/rstypes.h>
+#include "retroshare/rstypes.h"
 #include <string>
 #include <iostream>
 #include <algorithm>

libretroshare/src/util/rsdiscspace.cc

@@ -24,9 +24,9 @@
  */
 
 #include <iostream>
-#include <rsiface/rsfiles.h>
-#include <rsiface/rsiface.h>
-#include <rsiface/rsinit.h>
+#include "retroshare/rsfiles.h"
+#include "retroshare/rsiface.h"
+#include "retroshare/rsinit.h"
 #include "rsdiscspace.h"
 #include <util/rsthreads.h>
 #ifndef WIN32

retroshare-gui/src/gui/AboutDialog.cpp

@@ -23,8 +23,8 @@
 #include "AboutDialog.h"
 #include "HelpDialog.h"
 
-#include "rsiface/rsdisc.h"
-#include "rsiface/rsiface.h"
+#include <retroshare/rsdisc.h>
+#include <retroshare/rsiface.h>
 #include "settings/rsharesettings.h"
 
 #include <QtGui/QHBoxLayout>

retroshare-gui/src/gui/AddLinksDialog.cpp

@@ -23,7 +23,7 @@
 
 #include "AddLinksDialog.h"
 #include "RetroShareLink.h"
-#include "rsiface/rsrank.h"
+#include <retroshare/rsrank.h>
 
 /* Images for context menu icons */
 #define IMAGE_EXPORTFRIEND      ":/images/exportpeers_16x16.png"

retroshare-gui/src/gui/ChannelFeed.cpp

@@ -26,7 +26,7 @@
 #include <iostream>
 #include <algorithm>
 
-#include "rsiface/rschannels.h"
+#include <retroshare/rschannels.h>
 
 #include "ChannelFeed.h"
 

retroshare-gui/src/gui/DLListDelegate.cpp

@@ -19,7 +19,7 @@
  *  Boston, MA  02110-1301, USA.
  ****************************************************************/
 
-#include <rsiface/rstypes.h>
+#include <retroshare/rstypes.h>
 #include <QModelIndex>
 #include <QPainter>
 #include <QStyleOptionProgressBarV2>

retroshare-gui/src/gui/FileTransferInfoWidget.cpp

@@ -23,8 +23,8 @@
 #include <math.h>
 #include <QStylePainter>
 #include <QDebug>
-#include <rsiface/rsfiles.h>
-#include <rsiface/rstypes.h>
+#include <retroshare/rsfiles.h>
+#include <retroshare/rstypes.h>
 #include "util/misc.h"
 #include "FileTransferInfoWidget.h"
 

retroshare-gui/src/gui/ForumsDialog.cpp

@@ -32,8 +32,8 @@
 #include "msgs/MessageComposer.h"
 #include "gui/settings/rsharesettings.h"
 
-#include "rsiface/rspeers.h"
-#include "rsiface/rsforums.h"
+#include <retroshare/rspeers.h>
+#include <retroshare/rsforums.h>
 
 #include <sstream>
 #include <algorithm>

retroshare-gui/src/gui/GenCertDialog.cpp

@@ -20,7 +20,7 @@
  ****************************************************************/
 
 #include <rshare.h>
-#include <rsiface/rsinit.h>
+#include <retroshare/rsinit.h>
 #include "GenCertDialog.h"
 #include "InfoDialog.h"
 #include <QAbstractEventDispatcher>

retroshare-gui/src/gui/HelpDialog.cpp

@@ -21,8 +21,8 @@
 
 
 #include "HelpDialog.h"
-#include "rsiface/rsiface.h"
-#include "rsiface/rsdisc.h"
+#include <retroshare/rsiface.h>
+#include <retroshare/rsdisc.h>
 
 #include <iostream>
 #include <sstream>

retroshare-gui/src/gui/HelpDialog.h

@@ -28,7 +28,7 @@
 //#include "mainpage.h"
 #include "ui_HelpDialog.h"
 
-#include "rsiface/rstypes.h"
+#include <retroshare/rstypes.h>
 
 class HelpDialog : public QDialog 
 {

retroshare-gui/src/gui/InfoDialog.cpp

@@ -21,7 +21,7 @@
 
 
 #include "InfoDialog.h"
-#include "rsiface/rsiface.h"
+#include <retroshare/rsiface.h>
 
 #include <iostream>
 #include <sstream>

retroshare-gui/src/gui/InfoDialog.h

@@ -26,7 +26,7 @@
 
 #include "ui_InfoDialog.h"
 
-#include "rsiface/rstypes.h"
+#include <retroshare/rstypes.h>
 
 class InfoDialog : public QDialog 
 {

retroshare-gui/src/gui/LinksDialog.cpp

@@ -27,9 +27,9 @@
 
 #include "LinksDialog.h"
 #include "RetroShareLink.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsrank.h"
-#include "rsiface/rsfiles.h"
+#include <retroshare/rspeers.h>
+#include <retroshare/rsrank.h>
+#include <retroshare/rsfiles.h>
 
 #include <sstream>
 

retroshare-gui/src/gui/MainWindow.cpp

@@ -62,11 +62,11 @@
 #include "statusbar/peerstatus.h"
 #include "statusbar/natstatus.h"
 #include "statusbar/ratesstatus.h"
-#include "rsiface/rsstatus.h"
+#include <retroshare/rsstatus.h>
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsfiles.h"
+#include <retroshare/rsiface.h>
+#include <retroshare/rspeers.h>
+#include <retroshare/rsfiles.h>
 
 #include "gui/connect/ConnectFriendWizard.h"
 #include "util/rsversion.h"

retroshare-gui/src/gui/MessagesDialog.cpp

@@ -38,9 +38,9 @@
 #include "settings/rsharesettings.h"
 #include "util/misc.h"
 
-#include "rsiface/rsinit.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsfiles.h"
+#include <retroshare/rsinit.h>
+#include <retroshare/rspeers.h>
+#include <retroshare/rsfiles.h>
 
 
 /* Images for context menu icons */

retroshare-gui/src/gui/MessagesDialog.h

@@ -29,7 +29,7 @@
 
 #include <QVariant>
 
-#include "rsiface/rsmsgs.h"
+#include <retroshare/rsmsgs.h>
 #include "mainpage.h"
 #include "ui_MessagesDialog.h"
 

retroshare-gui/src/gui/MessengerWindow.cpp

@@ -24,11 +24,11 @@
 #include <QWidgetAction>
 #include "common/vmessagebox.h"
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsmsgs.h"
-#include "rsiface/rsstatus.h"
-#include "rsiface/rsnotify.h"
+#include <retroshare/rsiface.h>
+#include <retroshare/rspeers.h>
+#include <retroshare/rsmsgs.h>
+#include <retroshare/rsstatus.h>
+#include <retroshare/rsnotify.h>
 
 #include "rshare.h"
 #include "MessengerWindow.h"

retroshare-gui/src/gui/NetworkDialog.cpp

@@ -26,9 +26,9 @@
 #include <QTime>
 #include <QMenu>
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsdisc.h"
+#include <retroshare/rsiface.h>
+#include <retroshare/rspeers.h>
+#include <retroshare/rsdisc.h>
 
 #include "common/vmessagebox.h"
 #include "NetworkDialog.h"

retroshare-gui/src/gui/NetworkView.cpp

@@ -20,7 +20,7 @@
  ****************************************************************/
 
 #include "NetworkView.h"
-#include "rsiface/rspeers.h"
+#include <retroshare/rspeers.h>
 
 #include <gpgme.h>
 

retroshare-gui/src/gui/NewsFeed.cpp

@@ -23,7 +23,7 @@
 
 #include "NewsFeed.h"
 
-#include "rsiface/rsnotify.h"
+#include <retroshare/rsnotify.h>
 
 #include "feeds/ChanNewItem.h"
 #include "feeds/ChanMsgItem.h"

retroshare-gui/src/gui/PeersDialog.cpp

@@ -33,11 +33,11 @@
 
 #include "rshare.h"
 #include "PeersDialog.h"
-#include "rsiface/rsiface.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsstatus.h"
-#include "rsiface/rsmsgs.h"
-#include "rsiface/rsnotify.h"
+#include <retroshare/rsiface.h>
+#include <retroshare/rspeers.h>
+#include <retroshare/rsstatus.h>
+#include <retroshare/rsmsgs.h>
+#include <retroshare/rsnotify.h>
 #include "settings/rsharesettings.h"
 
 #include "chat/PopupChatDialog.h"

retroshare-gui/src/gui/QuickStartWizard.cpp

@@ -28,9 +28,9 @@
 #include <QComboBox>
 #include <QHeaderView>
 
-#include "rsiface/rsfiles.h"
-#include "rsiface/rsiface.h"
-#include "rsiface/rspeers.h"
+#include <retroshare/rsfiles.h>
+#include <retroshare/rsiface.h>
+#include <retroshare/rspeers.h>
 #include "settings/rsharesettings.h"