Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

moved StringUtil into StrUtil to avoid conflicts with another file with lower case name in gui/util

Browse Source
This commit is contained in:
csoler 2018-01-18 22:13:24 +01:00
parent 95e8fc4404
commit b6a2d75747
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/TorControl/AddOnionCommand.cpp
View File

@ -33,7 +33,7 @@
#include "AddOnionCommand.h"
#include "HiddenService.h"
#include "CryptoKey.h"
#include "StringUtil.h"
#include "StrUtil.h"
using namespace Tor;

2
retroshare-gui/src/TorControl/GetConfCommand.cpp
View File

@ -31,7 +31,7 @@
*/
#include "GetConfCommand.h"
#include "StringUtil.h"
#include "StrUtil.h"
#include <QDebug>
using namespace Tor;

2
retroshare-gui/src/TorControl/ProtocolInfoCommand.cpp
View File

@ -32,7 +32,7 @@
#include "ProtocolInfoCommand.h"
#include "TorControl.h"
#include "StringUtil.h"
#include "StrUtil.h"
#include <QList>
using namespace Tor;

2
retroshare-gui/src/TorControl/SetConfCommand.cpp
View File

@ -31,7 +31,7 @@
*/
#include "SetConfCommand.h"
#include "StringUtil.h"
#include "StrUtil.h"
using namespace Tor;

2
retroshare-gui/src/TorControl/StringUtil.cpp → retroshare-gui/src/TorControl/StrUtil.cpp
View File

@ -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)
{

0
retroshare-gui/src/TorControl/StringUtil.h → retroshare-gui/src/TorControl/StrUtil.h
View File

2
retroshare-gui/src/TorControl/TorControl.cpp
View File

@ -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>

4
retroshare-gui/src/retroshare-gui.pro
View File

@ -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