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

Fix warnings about QFileInfo being instantiated on empty string.

Browse Source 
Do not insert currentDocument variable for empty files.
Polish VariableManager, QLatin1String(), const-correctness.

Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
This commit is contained in:
Friedemann Kleint
2010-01-04 16:50:23 +01:00
parent 3dde364a38
commit cce26703ae
2 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/plugins/coreplugin/variablemanager.cpp
View File

@@ -54,65 +54,74 @@ void VariableManager::insert(const QString &variable, const QString &value)
void VariableManager::insertFileInfo(const QString &tag, const QFileInfo &file) void VariableManager::insertFileInfo(const QString &tag, const QFileInfo &file)
{ {
insert(tag, file.filePath()); insert(tag, file.filePath());
insert(tag+":absoluteFilePath", file.absoluteFilePath()); insert(tag + QLatin1String(":absoluteFilePath"), file.absoluteFilePath());
insert(tag+":absolutePath", file.absolutePath()); insert(tag + QLatin1String(":absolutePath"), file.absolutePath());
insert(tag+":baseName", file.baseName()); insert(tag + QLatin1String(":baseName"), file.baseName());
insert(tag+":canonicalPath", file.canonicalPath()); insert(tag + QLatin1String(":canonicalPath"), file.canonicalPath());
insert(tag+":canonicalFilePath", file.canonicalFilePath()); insert(tag + QLatin1String(":canonicalFilePath"), file.canonicalFilePath());
insert(tag+":completeBaseName", file.completeBaseName()); insert(tag + QLatin1String(":completeBaseName"), file.completeBaseName());
insert(tag+":completeSuffix", file.completeSuffix()); insert(tag + QLatin1String(":completeSuffix"), file.completeSuffix());
insert(tag+":fileName", file.fileName()); insert(tag + QLatin1String(":fileName"), file.fileName());
insert(tag+":filePath", file.filePath()); insert(tag + QLatin1String(":filePath"), file.filePath());
insert(tag+":path", file.path()); insert(tag + QLatin1String(":path"), file.path());
insert(tag+":suffix", file.suffix()); insert(tag + QLatin1String(":suffix"), file.suffix());
} }
void VariableManager::removeFileInfo(const QString &tag) void VariableManager::removeFileInfo(const QString &tag)
{ {
remove(tag); if (remove(tag)) {
remove(tag+":absoluteFilePath"); remove(tag + QLatin1String(":absoluteFilePath"));
remove(tag+":absolutePath"); remove(tag + QLatin1String(":absolutePath"));
remove(tag+":baseName"); remove(tag + QLatin1String(":baseName"));
remove(tag+":canonicalPath"); remove(tag + QLatin1String(":canonicalPath"));
remove(tag+":canonicalFilePath"); remove(tag + QLatin1String(":canonicalFilePath"));
remove(tag+":completeBaseName"); remove(tag + QLatin1String(":completeBaseName"));
remove(tag+":completeSuffix"); remove(tag + QLatin1String(":completeSuffix"));
remove(tag+":fileName"); remove(tag + QLatin1String(":fileName"));
remove(tag+":filePath"); remove(tag + QLatin1String(":filePath"));
remove(tag+":path"); remove(tag + QLatin1String(":path"));
remove(tag+":suffix"); remove(tag + QLatin1String(":suffix"));
}
} }
void VariableManager::updateCurrentDocument(Core::IEditor *editor) void VariableManager::updateCurrentDocument(Core::IEditor *editor)
{ {
removeFileInfo("CURRENT_DOCUMENT"); const QString currentDocumentTag = QLatin1String("CURRENT_DOCUMENT");
if (editor==NULL || editor->file()==NULL) removeFileInfo(currentDocumentTag);
return; if (editor) {
insertFileInfo("CURRENT_DOCUMENT", editor->file()->fileName()); if (const Core::IFile *file = editor->file()) {
const QString fileName = file->fileName();
if (!fileName.isEmpty())
insertFileInfo(currentDocumentTag, fileName);
}
}
} }
QString VariableManager::value(const QString &variable) QString VariableManager::value(const QString &variable) const
{ {
return m_map.value(variable); return m_map.value(variable);
} }
QString VariableManager::value(const QString &variable, const QString &defaultValue) QString VariableManager::value(const QString &variable, const QString &defaultValue) const
{ {
return m_map.value(variable, defaultValue); return m_map.value(variable, defaultValue);
} }
void VariableManager::remove(const QString &variable) bool VariableManager::remove(const QString &variable)
{ {
m_map.remove(variable); return m_map.remove(variable) > 0;
} }
QString VariableManager::resolve(const QString &stringWithVariables) QString VariableManager::resolve(const QString &stringWithVariables) const
{ {
QString result = stringWithVariables; QString result = stringWithVariables;
QMapIterator<QString, QString> i(m_map); QMapIterator<QString, QString> i(m_map);
while (i.hasNext()) { while (i.hasNext()) {
i.next(); i.next();
result.replace(QString("${%1}").arg(i.key()), i.value()); QString key = QLatin1String("${");
key += i.key();
key += QLatin1Char('}');
result.replace(key, i.value());
} }
return result; return result;
} }

8
src/plugins/coreplugin/variablemanager.h
View File

@@ -56,10 +56,10 @@ public:
void insert(const QString &variable, const QString &value); void insert(const QString &variable, const QString &value);
void insertFileInfo(const QString &tag, const QFileInfo &file); void insertFileInfo(const QString &tag, const QFileInfo &file);
void removeFileInfo(const QString &tag); void removeFileInfo(const QString &tag);
QString value(const QString &variable); QString value(const QString &variable) const;
QString value(const QString &variable, const QString &defaultValue); QString value(const QString &variable, const QString &defaultValue) const;
void remove(const QString &variable); bool remove(const QString &variable);
QString resolve(const QString &stringWithVariables); QString resolve(const QString &stringWithVariables) const;
private slots: private slots:
void updateCurrentDocument(Core::IEditor *editor); void updateCurrentDocument(Core::IEditor *editor);