From 2f30ee6b1da6aaeb079988d4caffaeb083a8b22d Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Fri, 15 Aug 2008 19:03:50 +0000
Subject: [PATCH] removed not more avaible header fixed some lines which not
 more usen

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@687 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/Preferences/rsharesettings.cpp |  1 -
 retroshare-gui/src/main.cpp                           | 10 ++++++----
 retroshare-gui/src/rshare.h                           |  3 +--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/retroshare-gui/src/gui/Preferences/rsharesettings.cpp b/retroshare-gui/src/gui/Preferences/rsharesettings.cpp
index a858c0d23..9c3208589 100644
--- a/retroshare-gui/src/gui/Preferences/rsharesettings.cpp
+++ b/retroshare-gui/src/gui/Preferences/rsharesettings.cpp
@@ -34,7 +34,6 @@
 #include <QMainWindow>
 
 #if defined(Q_WS_WIN)
-#include <util/registry.h>
 #include <util/win32.h>
 #endif
 
diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp
index 68ec028c0..2df0e6a7c 100644
--- a/retroshare-gui/src/main.cpp
+++ b/retroshare-gui/src/main.cpp
@@ -31,8 +31,8 @@
 #include <gui/qskinobject/qskinobject.h>
 ****/
 
-#include <util/process.h>
-#include <util/string.h>
+//#include <util/process.h>
+#include <util/stringutil.h>
 #include "rsiface/rsiface.h"
 
 #include "rsiface/notifyqt.h"
@@ -154,7 +154,7 @@ int main(int argc, char *argv[])
 		
 	}*/
    /* Run Retroshare */
-  int ret = rshare.run();
+   //int ret = rshare.run();
 
 	/* Startup a Timer to keep the gui's updated */
 	QTimer *timer = new QTimer(w);
@@ -162,7 +162,9 @@ int main(int argc, char *argv[])
         timer->start(1000);
 	
   /* dive into the endless loop */
-  return ret;
+  // return ret;
+  return rshare.exec();
+
 }
 
 
diff --git a/retroshare-gui/src/rshare.h b/retroshare-gui/src/rshare.h
index 3e43468e7..ea0264015 100644
--- a/retroshare-gui/src/rshare.h
+++ b/retroshare-gui/src/rshare.h
@@ -77,8 +77,7 @@ public:
   static bool setStyle(QString styleKey = QString());
     /** Sets the current GUI stylesheet. */
   static bool setSheet(QString sheet = QString());
-  /** Shows the specified help topic, or the default if empty. */
-  //static void help(QString topic = QString());
+
 
   /** Returns the current language. */
   static QString language() { return _language; }