feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Rename FileName to FilePath

Browse Source 
More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.

Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-05-28 13:49:26 +02:00
parent 4704f49fbb
commit 473a741c9f
688 changed files with 3487 additions and 3484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/tasklist/tasklistplugin.cpp
View File

@@ -107,7 +107,7 @@ static QString unescape(const QString &input)
return result;
}
static bool parseTaskFile(QString *errorString, const FileName &name)
static bool parseTaskFile(QString *errorString, const FilePath &name)
{
QFile tf(name.toString());
if (!tf.open(QIODevice::ReadOnly)) {
@@ -116,7 +116,7 @@ static bool parseTaskFile(QString *errorString, const FileName &name)
return false;
}
const FileName parentDir = name.parentDir();
const FilePath parentDir = name.parentDir();
while (!tf.atEnd()) {
QStringList chunks = parseRawLine(tf.readLine());
if (chunks.isEmpty())
@@ -154,7 +154,7 @@ static bool parseTaskFile(QString *errorString, const FileName &name)
description = unescape(description);
TaskHub::addTask(type, description, Constants::TASKLISTTASK_ID,
FileName::fromUserInput(file), line);
FilePath::fromUserInput(file), line);
}
return true;
}
@@ -163,7 +163,7 @@ static bool parseTaskFile(QString *errorString, const FileName &name)
// TaskListPlugin
// --------------------------------------------------------------------------
IDocument *TaskListPlugin::openTasks(const FileName &fileName)
IDocument *TaskListPlugin::openTasks(const FilePath &fileName)
{
foreach (TaskFile *doc, d->m_openFiles) {
if (doc->filePath() == fileName)
@@ -210,7 +210,7 @@ bool TaskListPlugin::initialize(const QStringList &arguments, QString *errorMess
d->m_fileFactory.addMimeType(QLatin1String("text/x-tasklist"));
d->m_fileFactory.setOpener([this](const QString &fileName) {
return openTasks(FileName::fromString(fileName));
return openTasks(FilePath::fromString(fileName));
});
connect(SessionManager::instance(), &SessionManager::sessionLoaded,
@@ -219,7 +219,7 @@ bool TaskListPlugin::initialize(const QStringList &arguments, QString *errorMess
return true;
}
bool TaskListPlugin::loadFile(QString *errorString, const FileName &fileName)
bool TaskListPlugin::loadFile(QString *errorString, const FilePath &fileName)
{
clearTasks();
@@ -248,7 +248,7 @@ void TaskListPlugin::clearTasks()
void TaskListPlugin::loadDataFromSession()
{
const FileName fileName = FileName::fromString(
const FilePath fileName = FilePath::fromString(
SessionManager::value(QLatin1String(SESSION_FILE_KEY)).toString());
if (!fileName.isEmpty())
openTasks(fileName);