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

Python: De-macrofy

Browse Source 
Change-Id: I5a0b2406d1ba8ad3a168c2635cbaec9711c4474f
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
This commit is contained in:
hjk
2019-03-14 08:11:31 +01:00
parent b503ea7f06
commit a6fc9a5812
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/pythoneditor/pythoneditorplugin.cpp
View File

@@ -334,7 +334,7 @@ static QStringList readLines(const Utils::FileName &projectFile)
if (file.open(QFile::ReadOnly)) { if (file.open(QFile::ReadOnly)) {
QTextStream stream(&file); QTextStream stream(&file);
forever { while (true) {
QString line = stream.readLine(); QString line = stream.readLine();
if (line.isNull()) if (line.isNull())
break; break;
@@ -465,7 +465,7 @@ bool PythonProject::addFiles(const QStringList &filePaths)
QStringList newList = m_rawFileList; QStringList newList = m_rawFileList;
QDir baseDir(projectDirectory().toString()); QDir baseDir(projectDirectory().toString());
foreach (const QString &filePath, filePaths) for (const QString &filePath : filePaths)
newList.append(baseDir.relativeFilePath(filePath)); newList.append(baseDir.relativeFilePath(filePath));
return saveRawFileList(newList); return saveRawFileList(newList);
@@ -475,7 +475,7 @@ bool PythonProject::removeFiles(const QStringList &filePaths)
{ {
QStringList newList = m_rawFileList; QStringList newList = m_rawFileList;
foreach (const QString &filePath, filePaths) { for (const QString &filePath : filePaths) {
QHash<QString, QString>::iterator i = m_rawListEntries.find(filePath); QHash<QString, QString>::iterator i = m_rawListEntries.find(filePath);
if (i != m_rawListEntries.end()) if (i != m_rawListEntries.end())
newList.removeOne(i.value()); newList.removeOne(i.value());
@@ -488,7 +488,7 @@ bool PythonProject::setFiles(const QStringList &filePaths)
{ {
QStringList newList; QStringList newList;
QDir baseDir(projectDirectory().toString()); QDir baseDir(projectDirectory().toString());
foreach (const QString &filePath, filePaths) for (const QString &filePath : filePaths)
newList.append(baseDir.relativeFilePath(filePath)); newList.append(baseDir.relativeFilePath(filePath));
return saveRawFileList(newList); return saveRawFileList(newList);
@@ -611,7 +611,7 @@ QStringList PythonProject::processEntries(const QStringList &paths,
QFileInfo fileInfo; QFileInfo fileInfo;
QStringList absolutePaths; QStringList absolutePaths;
foreach (const QString &path, paths) { for (const QString &path : paths) {
QString trimmedPath = path.trimmed(); QString trimmedPath = path.trimmed();
if (trimmedPath.isEmpty()) if (trimmedPath.isEmpty())
continue; continue;
@@ -659,7 +659,7 @@ QHash<QString, QStringList> sortFilesIntoPaths(const QString &base, const QSet<Q
QHash<QString, QStringList> filesInPath; QHash<QString, QStringList> filesInPath;
const QDir baseDir(base); const QDir baseDir(base);
foreach (const QString &absoluteFileName, files) { for (const QString &absoluteFileName : files) {
QFileInfo fileInfo(absoluteFileName); QFileInfo fileInfo(absoluteFileName);
FileName absoluteFilePath = FileName::fromString(fileInfo.path()); FileName absoluteFilePath = FileName::fromString(fileInfo.path());
QString relativeFilePath; QString relativeFilePath;