From b6a2d757478398cc24d8f850590886bbcfb56d0f Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 18 Jan 2018 22:13:24 +0100
Subject: [PATCH] moved StringUtil into StrUtil to avoid conflicts with another
 file with lower case name in gui/util

---
 retroshare-gui/src/TorControl/AddOnionCommand.cpp             | 2 +-
 retroshare-gui/src/TorControl/GetConfCommand.cpp              | 2 +-
 retroshare-gui/src/TorControl/ProtocolInfoCommand.cpp         | 2 +-
 retroshare-gui/src/TorControl/SetConfCommand.cpp              | 2 +-
 retroshare-gui/src/TorControl/{StringUtil.cpp => StrUtil.cpp} | 2 +-
 retroshare-gui/src/TorControl/{StringUtil.h => StrUtil.h}     | 0
 retroshare-gui/src/TorControl/TorControl.cpp                  | 2 +-
 retroshare-gui/src/retroshare-gui.pro                         | 4 ++--
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename retroshare-gui/src/TorControl/{StringUtil.cpp => StrUtil.cpp} (99%)
 rename retroshare-gui/src/TorControl/{StringUtil.h => StrUtil.h} (100%)

diff --git a/retroshare-gui/src/TorControl/AddOnionCommand.cpp b/retroshare-gui/src/TorControl/AddOnionCommand.cpp
index 88ae232fd..f454b690b 100644
--- a/retroshare-gui/src/TorControl/AddOnionCommand.cpp
+++ b/retroshare-gui/src/TorControl/AddOnionCommand.cpp
@@ -33,7 +33,7 @@
 #include "AddOnionCommand.h"
 #include "HiddenService.h"
 #include "CryptoKey.h"
-#include "StringUtil.h"
+#include "StrUtil.h"
 
 using namespace Tor;
 
diff --git a/retroshare-gui/src/TorControl/GetConfCommand.cpp b/retroshare-gui/src/TorControl/GetConfCommand.cpp
index f7574f7fd..933def562 100644
--- a/retroshare-gui/src/TorControl/GetConfCommand.cpp
+++ b/retroshare-gui/src/TorControl/GetConfCommand.cpp
@@ -31,7 +31,7 @@
  */
 
 #include "GetConfCommand.h"
-#include "StringUtil.h"
+#include "StrUtil.h"
 #include <QDebug>
 
 using namespace Tor;
diff --git a/retroshare-gui/src/TorControl/ProtocolInfoCommand.cpp b/retroshare-gui/src/TorControl/ProtocolInfoCommand.cpp
index ad8c9e3e6..a365a5c4d 100644
--- a/retroshare-gui/src/TorControl/ProtocolInfoCommand.cpp
+++ b/retroshare-gui/src/TorControl/ProtocolInfoCommand.cpp
@@ -32,7 +32,7 @@
 
 #include "ProtocolInfoCommand.h"
 #include "TorControl.h"
-#include "StringUtil.h"
+#include "StrUtil.h"
 #include <QList>
 
 using namespace Tor;
diff --git a/retroshare-gui/src/TorControl/SetConfCommand.cpp b/retroshare-gui/src/TorControl/SetConfCommand.cpp
index fa4fd5b27..f13a9fdef 100644
--- a/retroshare-gui/src/TorControl/SetConfCommand.cpp
+++ b/retroshare-gui/src/TorControl/SetConfCommand.cpp
@@ -31,7 +31,7 @@
  */
 
 #include "SetConfCommand.h"
-#include "StringUtil.h"
+#include "StrUtil.h"
 
 using namespace Tor;
 
diff --git a/retroshare-gui/src/TorControl/StringUtil.cpp b/retroshare-gui/src/TorControl/StrUtil.cpp
similarity index 99%
rename from retroshare-gui/src/TorControl/StringUtil.cpp
rename to retroshare-gui/src/TorControl/StrUtil.cpp
index 8215d1351..81de151b0 100644
--- a/retroshare-gui/src/TorControl/StringUtil.cpp
+++ b/retroshare-gui/src/TorControl/StrUtil.cpp
@@ -30,7 +30,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "StringUtil.h"
+#include "StrUtil.h"
 
 QByteArray quotedString(const QByteArray &string)
 {
diff --git a/retroshare-gui/src/TorControl/StringUtil.h b/retroshare-gui/src/TorControl/StrUtil.h
similarity index 100%
rename from retroshare-gui/src/TorControl/StringUtil.h
rename to retroshare-gui/src/TorControl/StrUtil.h
diff --git a/retroshare-gui/src/TorControl/TorControl.cpp b/retroshare-gui/src/TorControl/TorControl.cpp
index d8ab0149c..7f2f7b744 100644
--- a/retroshare-gui/src/TorControl/TorControl.cpp
+++ b/retroshare-gui/src/TorControl/TorControl.cpp
@@ -38,7 +38,7 @@
 #include "SetConfCommand.h"
 #include "GetConfCommand.h"
 #include "AddOnionCommand.h"
-#include "StringUtil.h"
+#include "StrUtil.h"
 #include "Settings.h"
 #include "PendingOperation.h"
 #include <QHostAddress>
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index 6e12665dc..a6ed430d2 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -352,7 +352,7 @@ HEADERS += 	TorControl/AddOnionCommand.h \
 				TorControl/PendingOperation.h  \
 				TorControl/SecureRNG.h         \
 				TorControl/Settings.h          \
-				TorControl/StringUtil.h        \
+				TorControl/StrUtil.h        \
 				TorControl/TorProcess_p.h        
 
 SOURCES += 	TorControl/AddOnionCommand.cpp \
@@ -371,7 +371,7 @@ SOURCES += 	TorControl/AddOnionCommand.cpp \
 				TorControl/PendingOperation.cpp  \
 				TorControl/SecureRNG.cpp         \
 				TorControl/Settings.cpp          \
-				TorControl/StringUtil.cpp        
+				TorControl/StrUtil.cpp        
 }
 
 # Input