Commit 0ad9a722 authored by Ben Boeckel's avatar Ben Boeckel

vtksys: avoid vtksys::String usage

parent bf664130
......@@ -246,7 +246,7 @@ vtkPVPluginLoader::vtkPVPluginLoader()
this->Loaded = false;
this->SetErrorString("No plugin loaded yet.");
vtksys::String paths;
std::string paths;
const char* env = vtksys::SystemTools::GetEnv("PV_PLUGIN_PATH");
if (env)
{
......
......@@ -85,7 +85,7 @@ vtkMultiProcessController* vtkTCPNetworkAccessManager::NewConnection(const char*
// there some issue with RegularExpression that I cannot extract parameters.
// hence we do this:
std::vector<vtksys::String> param_vals =
std::vector<std::string> param_vals =
vtksys::SystemTools::SplitString(re_connect.match(3).c_str(), '&');
for (size_t cc = 0; cc < param_vals.size(); cc++)
{
......
......@@ -159,7 +159,7 @@ static bool getNetworkSubdirs(const std::string& path, std::vector<std::string>&
static const int MaxTokens = 4;
std::vector<vtksys::String> pathtokens;
std::vector<std::string> pathtokens;
pathtokens = vtksys::SystemTools::SplitString(path.c_str() + 1, '\\');
static DWORD DisplayType[MaxTokens] = { RESOURCEDISPLAYTYPE_NETWORK, RESOURCEDISPLAYTYPE_DOMAIN,
......@@ -231,7 +231,7 @@ static int vtkPVFileInformationGetType(const char* path)
// this code doesn't give out anything with
// "Windows Network\..." unless its a directory.
// that may change
std::vector<vtksys::String> pathtokens;
std::vector<std::string> pathtokens;
pathtokens = vtksys::SystemTools::SplitString(realpath.c_str(), '\\');
if (pathtokens.size() == 1)
{
......@@ -254,7 +254,7 @@ static int vtkPVFileInformationGetType(const char* path)
// is it the root of a shared folder?
if (IsUncPath(realpath))
{
std::vector<vtksys::String> parts =
std::vector<std::string> parts =
vtksys::SystemTools::SplitString(realpath.c_str() + 2, '\\', true);
if (parts.empty())
{
......@@ -670,7 +670,7 @@ void vtkPVFileInformation::GetWindowsDirectoryListing()
if (IsUncPath(lfullPath))
{
bool didListing = false;
std::vector<vtksys::String> parts =
std::vector<std::string> parts =
vtksys::SystemTools::SplitString(this->FullPath + 2, '\\', true);
if (parts.size() == 1)
......
......@@ -270,7 +270,7 @@ int vtkSMInputArrayDomain::ReadXMLAttributes(vtkSMProperty* prop, vtkPVXMLElemen
const char* numComponents = element->GetAttribute("number_of_components");
if (numComponents)
{
typedef std::vector<vtksys::String> VStrings;
typedef std::vector<std::string> VStrings;
const VStrings numbers = vtksys::SystemTools::SplitString(numComponents, ',');
this->AcceptableNumbersOfComponents.clear();
......
......@@ -225,7 +225,7 @@ int vtkSMRangeDomainTemplate<T>::ReadXMLAttributes(vtkSMProperty* prop, vtkPVXML
const char* default_mode = element->GetAttribute("default_mode");
if (default_mode)
{
typedef std::vector<vtksys::String> VStrings;
typedef std::vector<std::string> VStrings;
const VStrings modes = vtksys::SystemTools::SplitString(default_mode, ',');
this->DefaultModeVector.clear();
......
......@@ -65,7 +65,7 @@ public:
double* values = NULL;
if (str != NULL && *str != 0)
{
std::vector<vtksys::String> parts = vtksys::SystemTools::SplitString(str, ',');
std::vector<std::string> parts = vtksys::SystemTools::SplitString(str, ',');
if (static_cast<unsigned int>(parts.size()) == this->NumberOfValues)
{
values = new double[this->NumberOfValues];
......
......@@ -741,9 +741,9 @@ vtkSmartPointer<vtkImageData> vtkSMSaveScreenshotProxy::CaptureImage(
namespace detail
{
std::pair<std::string, std::vector<vtksys::String> > GetFormatOptions(vtkSMProxy* proxy)
std::pair<std::string, std::vector<std::string> > GetFormatOptions(vtkSMProxy* proxy)
{
using pair_type = std::pair<std::string, std::vector<vtksys::String> >;
using pair_type = std::pair<std::string, std::vector<std::string> >;
vtkPVXMLElement* hints =
proxy->GetHints() ? proxy->GetHints()->FindNestedElementByName("FormatOptions") : nullptr;
if (hints && hints->GetAttribute("extensions") && hints->GetAttribute("file_description"))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment