lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove use of ToQStr to convert rdctype::str to QString

Browse Source
This commit is contained in:
baldurk
2017-08-18 14:13:22 +01:00
parent b637fe78de
commit 4c24b0f28f
26 changed files with 381 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp
+7 -7
View File
@@ -160,7 +160,7 @@ public:
for(int i = 0; i < node->children.count(); i++)
{
if(ToQStr(node->children[i]->file.filename)
if(QString(node->children[i]->file.filename)
.compare(nextDir, NTPaths ? Qt::CaseInsensitive : Qt::CaseSensitive) == 0)
{
ret = index(i, 0, ret);
@@ -171,7 +171,7 @@ public:
// if we didn't move to a child, stop searching
if(node == getNode(ret))
{
qCritical() << "Couldn't find child" << nextDir << "at" << ToQStr(node->file.filename)
qCritical() << "Couldn't find child" << nextDir << "at" << QString(node->file.filename)
<< "from" << path;
return QModelIndex();
}
@@ -303,7 +303,7 @@ public:
{
switch(index.column())
{
case 0: { return ToQStr(node->file.filename);
case 0: { return node->file.filename;
}
case 1:
{
@@ -354,7 +354,7 @@ public:
case FileIsAccessDeniedRole:
return bool(node->file.flags & PathProperty::ErrorAccessDenied);
case FilePathRole: return makePath(node);
case FileNameRole: return ToQStr(node->file.filename);
case FileNameRole: return node->file.filename;
default: break;
}
}
@@ -420,19 +420,19 @@ private:
QString makePath(FSNode *node) const
{
QChar sep = NTPaths ? QLatin1Char('\\') : QLatin1Char('/');
QString ret = ToQStr(node->file.filename);
QString ret = node->file.filename;
FSNode *parent = node->parent;
// iterate through subdirs but stop before a root
while(parent && parent->parent)
{
ret = ToQStr(parent->file.filename) + sep + ret;
ret = parent->file.filename + sep + ret;
parent = parent->parent;
}
if(parent)
{
// parent is now a root
ret = ToQStr(parent->file.filename) + ret;
ret = parent->file.filename + ret;
}
ret.replace(QLatin1Char('/'), sep);
return ret;