Remove 'using std::string'

* This will make it easier to replace std::string with rdcstr in future
This commit is contained in:
baldurk
2019-05-16 09:45:17 +01:00
parent 6d47b35cd9
commit a965a3a703
104 changed files with 803 additions and 869 deletions
+4 -5
View File
@@ -41,7 +41,6 @@ extern "C" {
#include <android/log.h>
#define ANDROID_LOG(...) __android_log_print(ANDROID_LOG_INFO, "renderdoccmd", __VA_ARGS__);
using std::string;
using std::vector;
using std::istringstream;
@@ -378,7 +377,7 @@ void DisplayRendererPreview(IReplayController *renderer, TextureDisplay &display
// Returns the renderdoccmd arguments passed via am start
// Examples: am start ... -e renderdoccmd "remoteserver"
// -e renderdoccmd "replay /sdcard/capture.rdc"
vector<string> getRenderdoccmdArgs()
vector<std::string> getRenderdoccmdArgs()
{
JNIEnv *env;
android_state->activity->vm->AttachCurrentThread(&env, 0);
@@ -396,7 +395,7 @@ vector<string> getRenderdoccmdArgs()
jstring jsParam1 =
(jstring)env->CallObjectMethod(intent, gseid, env->NewStringUTF("renderdoccmd"));
vector<string> ret;
vector<std::string> ret;
if(jsParam1) // Check if arg value found
{
ret.push_back("renderdoccmd");
@@ -404,7 +403,7 @@ vector<string> getRenderdoccmdArgs()
istringstream iss(param1);
while(iss)
{
string sub;
std::string sub;
iss >> sub;
ret.push_back(sub);
}
@@ -416,7 +415,7 @@ vector<string> getRenderdoccmdArgs()
void *cmdthread(void *)
{
vector<string> args = getRenderdoccmdArgs();
vector<std::string> args = getRenderdoccmdArgs();
if(args.size())
{
ANDROID_LOG("Entering cmd thread");