From 1581f5a96ed3772a2db8250a76b8360c56754dcf Mon Sep 17 00:00:00 2001
From: csoler <retroshare.project@gmail.com>
Date: Wed, 12 Sep 2012 13:11:04 +0000
Subject: [PATCH] moved file rsversion.h to rsguiversion.h, since it caused a
 conflict with libretroshare/src/util/rsversion.h when included as
 util/rsversion.h. Updated version detail script.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5539 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/MainWindow.cpp                       | 2 +-
 retroshare-gui/src/retroshare-gui.pro                       | 4 ++--
 retroshare-gui/src/util/{rsversion.cpp => rsguiversion.cpp} | 4 ++--
 retroshare-gui/src/util/{rsversion.h => rsguiversion.h}     | 0
 retroshare-gui/src/util/{rsversion.in => rsguiversion.in}   | 0
 retroshare-gui/src/version_detail.sh                        | 6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename retroshare-gui/src/util/{rsversion.cpp => rsguiversion.cpp} (97%)
 rename retroshare-gui/src/util/{rsversion.h => rsguiversion.h} (100%)
 rename retroshare-gui/src/util/{rsversion.in => rsguiversion.in} (100%)

diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 441916f1e..654729449 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -89,7 +89,7 @@
 #include <retroshare/rsnotify.h>
 
 #include "gui/connect/ConnectFriendWizard.h"
-#include "util/rsversion.h"
+#include "util/rsguiversion.h"
 #include "settings/rsettingswin.h"
 #include "settings/rsharesettings.h"
 #include "common/StatusDefs.h"
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index e9bddd3c5..4f0ca2bde 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -283,7 +283,7 @@ HEADERS +=  rshare.h \
             util/EventFilter.h \
             util/EventReceiver.h \
             util/Widget.h \
-            util/rsversion.h \
+            util/rsguiversion.h \
             util/RsAction.h \
             util/printpreview.h \
             util/log.h \
@@ -576,7 +576,7 @@ SOURCES +=  main.cpp \
             util/EventReceiver.cpp \
             util/Widget.cpp \
             util/RsAction.cpp \
-            util/rsversion.cpp \
+            util/rsguiversion.cpp \
             util/printpreview.cpp \
             util/log.cpp \
             util/misc.cpp \
diff --git a/retroshare-gui/src/util/rsversion.cpp b/retroshare-gui/src/util/rsguiversion.cpp
similarity index 97%
rename from retroshare-gui/src/util/rsversion.cpp
rename to retroshare-gui/src/util/rsguiversion.cpp
index 428180a24..7d6edbdf1 100644
--- a/retroshare-gui/src/util/rsversion.cpp
+++ b/retroshare-gui/src/util/rsguiversion.cpp
@@ -19,7 +19,7 @@
  *  Boston, MA  02110-1301, USA.
  ****************************************************************/
 
-#include "rsversion.h"
+#include "rsguiversion.h"
 
 QString retroshareVersion() {
 	return QString(GUI_VERSION);
@@ -27,4 +27,4 @@ QString retroshareVersion() {
 
 QString retroshareRevision() {
 	return QString(GUI_REVISION);
-}
\ No newline at end of file
+}
diff --git a/retroshare-gui/src/util/rsversion.h b/retroshare-gui/src/util/rsguiversion.h
similarity index 100%
rename from retroshare-gui/src/util/rsversion.h
rename to retroshare-gui/src/util/rsguiversion.h
diff --git a/retroshare-gui/src/util/rsversion.in b/retroshare-gui/src/util/rsguiversion.in
similarity index 100%
rename from retroshare-gui/src/util/rsversion.in
rename to retroshare-gui/src/util/rsguiversion.in
diff --git a/retroshare-gui/src/version_detail.sh b/retroshare-gui/src/version_detail.sh
index 86df6822e..71e8634d7 100755
--- a/retroshare-gui/src/version_detail.sh
+++ b/retroshare-gui/src/version_detail.sh
@@ -27,7 +27,7 @@ if (ls &> /dev/null); then
 	echo "" >> gui/help/version.html
 fi
 
-#write the rsversion.h file
+#write the rsguiversion.h file
 if ( git log -n 1 &> /dev/null); then
 	#retrieve git information
 	version="git : $(git status | grep branch | cut -c 6-) $(git log -n 1 | grep commit)"
@@ -46,8 +46,8 @@ if ( svn info &> /dev/null); then
 fi
 if [[ $version != '' ]]; then
 	version="$version  date : $(date +'%T %m.%d.%y')"
-	echo "Writing version to util/rsversion.h : $version "
-	sed -i "s/GUI_REVISION .*/GUI_REVISION \"$version\"/g" util/rsversion.h
+	echo "Writing version to util/rsguiversion.h : $version "
+	sed -i "s/GUI_REVISION .*/GUI_REVISION \"$version\"/g" util/rsguiversion.h
 fi
 echo "version_detail.sh scripts finished"
 exit 0