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

VcsBase: More FilePath use

Browse Source 
Change-Id: I070c356306e19375cd871b7b4525f5d2de33b2a0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2023-07-10 12:39:24 +02:00
parent 2c512625c5
commit dcca810fdc
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/vcsbase/vcsbasesubmiteditor.cpp
View File

@@ -193,8 +193,8 @@ void VcsBaseSubmitEditor::setParameters(const VcsBaseSubmitEditorParameters &par
}
}
// Do we have user fields?
if (!settings.nickNameFieldListFile.value().isEmpty())
createUserFields(settings.nickNameFieldListFile.value());
if (!settings.nickNameFieldListFile().isEmpty())
createUserFields(settings.nickNameFieldListFile());
// wrapping. etc
slotUpdateEditorSettings();
@@ -241,14 +241,12 @@ static inline QStringList fieldTexts(const QString &fileContents)
return rc;
}
void VcsBaseSubmitEditor::createUserFields(const QString &fieldConfigFile)
void VcsBaseSubmitEditor::createUserFields(const FilePath &fieldConfigFile)
{
FileReader reader;
if (!reader.fetch(FilePath::fromString(fieldConfigFile),
QIODevice::Text,
Core::ICore::dialogParent())) {
if (!reader.fetch(fieldConfigFile, QIODevice::Text, Core::ICore::dialogParent()))
return;
}
// Parse into fields
const QStringList fields = fieldTexts(QString::fromUtf8(reader.data()));
if (fields.empty())

2
src/plugins/vcsbase/vcsbasesubmiteditor.h
View File

@@ -114,7 +114,7 @@ private:
void slotSetFieldNickName(int);
void slotUpdateEditorSettings();
void createUserFields(const QString &fieldConfigFile);
void createUserFields(const Utils::FilePath &fieldConfigFile);
bool checkSubmitMessage(QString *errorMessage) const;
bool runSubmitMessageCheckScript(const Utils::FilePath &script, QString *errorMessage) const;
QString promptForNickName();