diff --git a/libs/main/core/pistring.h b/libs/main/core/pistring.h index 3e2aae07..75e06b46 100644 --- a/libs/main/core/pistring.h +++ b/libs/main/core/pistring.h @@ -94,19 +94,6 @@ public: PIString & operator =(PIString && o) {swap(o); return *this;} - /*! \brief Return c-string representation of string - * \details Converts content of string to c-string and return - * pointer to first char. This buffer is valid until new convertion - * or execution \a data() or \a toByteArray().\n - * Example: \snippet pistring.cpp PIString::char* */ - operator const char*() {return data();} - - //! Return symbol at index "pos" - PIChar operator [](const int pos) const {return at(pos);} - - //! Return reference to symbol at index "pos" - PIChar & operator [](const int pos) {return PIDeque::operator[](pos);} - //! Compare operator bool operator ==(const PIString & str) const; diff --git a/utils/deploy_tool/main.cpp b/utils/deploy_tool/main.cpp index e250274f..7eacc6a1 100644 --- a/utils/deploy_tool/main.cpp +++ b/utils/deploy_tool/main.cpp @@ -316,7 +316,7 @@ void copyWildcard(const PIString & from, const PIString & to) { PIDir(to).make(); #ifdef WINDOWS PIFile::FileInfo fi; fi.path = from; - system("robocopy \"" + fi.dir() + "\" \"" + to + "\" \"" + fi.name() + "\" /NJH /NJS /NP /NDL /NS /NC /NFL 1> NUL"); + system(("robocopy \"" + fi.dir() + "\" \"" + to + "\" \"" + fi.name() + "\" /NJH /NJS /NP /NDL /NS /NC /NFL 1> NUL").data()); #else system(cmd_copy + from + " \"" + to + "/\"" + cmd_suffix); #endif @@ -644,8 +644,8 @@ int main(int argc, char * argv[]) { if (need_cp) { piCout << "copy" << l; if (!fake) { - system(cmd_copy + "\"" + l + "\" \"" + out_dir + "\"" + cmd_suffix); - system(strip + " --strip-unneeded \"" + out_dir + fi.name() + "\""); + system((cmd_copy + "\"" + l + "\" \"" + out_dir + "\"" + cmd_suffix).data()); + system((strip + " --strip-unneeded \"" + out_dir + fi.name() + "\"").data()); } } } @@ -655,7 +655,7 @@ int main(int argc, char * argv[]) { if (!fd.isEmpty()) { piCout << "copy framework" << f; if (!fake) - system(cmd_copydir + "\"" + fd + "\" \"" + out_dir + "\"" + cmd_suffix); + system((cmd_copydir + "\"" + fd + "\" \"" + out_dir + "\"" + cmd_suffix).data()); } else miss_frameworks << f; }