ProjectTreeWidget: Use constants and get rid of QLatin1

Change-Id: Iaf155cf01ab502d411b0b5467abe4eff65c798ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Eike Ziller
2020-12-16 10:27:49 +01:00
parent eaefcbd8f0
commit a052f1f715

View File

@@ -466,7 +466,7 @@ void ProjectTreeWidget::editCurrentItem()
return; return;
const QString text = editor->text(); const QString text = editor->text();
const int dotIndex = text.lastIndexOf(QLatin1Char('.')); const int dotIndex = text.lastIndexOf('.');
if (dotIndex > 0) if (dotIndex > 0)
editor->setSelection(0, dotIndex); editor->setSelection(0, dotIndex);
} }
@@ -640,44 +640,45 @@ const bool kHideGeneratedFilesDefault = true;
const bool kHideDisabledFilesDefault = false; const bool kHideDisabledFilesDefault = false;
const bool kTrimEmptyDirsDefault = true; const bool kTrimEmptyDirsDefault = true;
const bool kSyncDefault = true; const bool kSyncDefault = true;
const char kBaseKey[] = "ProjectTreeWidget.";
const char kProjectFilterKey[] = ".ProjectFilter";
const char kHideGeneratedFilesKey[] = ".GeneratedFilter";
const char kHideDisabledFilesKey[] = ".DisabledFilesFilter";
const char kTrimEmptyDirsKey[] = ".TrimEmptyDirsFilter";
const char kSyncKey[] = ".SyncWithEditor";
void ProjectTreeWidgetFactory::saveSettings(QtcSettings *settings, int position, QWidget *widget) void ProjectTreeWidgetFactory::saveSettings(QtcSettings *settings, int position, QWidget *widget)
{ {
auto ptw = qobject_cast<ProjectTreeWidget *>(widget); auto ptw = qobject_cast<ProjectTreeWidget *>(widget);
Q_ASSERT(ptw); Q_ASSERT(ptw);
const QString baseKey = QLatin1String("ProjectTreeWidget.") + QString::number(position); const QString baseKey = kBaseKey + QString::number(position);
settings->setValueWithDefault(baseKey + ".ProjectFilter", settings->setValueWithDefault(baseKey + kProjectFilterKey,
ptw->projectFilter(), ptw->projectFilter(),
kProjectFilterDefault); kProjectFilterDefault);
settings->setValueWithDefault(baseKey + ".GeneratedFilter", settings->setValueWithDefault(baseKey + kHideGeneratedFilesKey,
ptw->generatedFilesFilter(), ptw->generatedFilesFilter(),
kHideGeneratedFilesDefault); kHideGeneratedFilesDefault);
settings->setValueWithDefault(baseKey + ".DisabledFilesFilter", settings->setValueWithDefault(baseKey + kHideDisabledFilesKey,
ptw->disabledFilesFilter(), ptw->disabledFilesFilter(),
kHideDisabledFilesDefault); kHideDisabledFilesDefault);
settings->setValueWithDefault(baseKey + ".TrimEmptyDirsFilter", settings->setValueWithDefault(baseKey + kTrimEmptyDirsKey,
ptw->trimEmptyDirectoriesFilter(), ptw->trimEmptyDirectoriesFilter(),
kTrimEmptyDirsDefault); kTrimEmptyDirsDefault);
settings->setValueWithDefault(baseKey + ".SyncWithEditor", settings->setValueWithDefault(baseKey + kSyncKey, ptw->autoSynchronization(), kSyncDefault);
ptw->autoSynchronization(),
kSyncDefault);
} }
void ProjectTreeWidgetFactory::restoreSettings(QSettings *settings, int position, QWidget *widget) void ProjectTreeWidgetFactory::restoreSettings(QSettings *settings, int position, QWidget *widget)
{ {
auto ptw = qobject_cast<ProjectTreeWidget *>(widget); auto ptw = qobject_cast<ProjectTreeWidget *>(widget);
Q_ASSERT(ptw); Q_ASSERT(ptw);
const QString baseKey = QLatin1String("ProjectTreeWidget.") + QString::number(position); const QString baseKey = kBaseKey + QString::number(position);
ptw->setProjectFilter( ptw->setProjectFilter(
settings->value(baseKey + QLatin1String(".ProjectFilter"), kProjectFilterDefault).toBool()); settings->value(baseKey + kProjectFilterKey, kProjectFilterDefault).toBool());
ptw->setGeneratedFilesFilter( ptw->setGeneratedFilesFilter(
settings->value(baseKey + QLatin1String(".GeneratedFilter"), kHideGeneratedFilesDefault) settings->value(baseKey + kHideGeneratedFilesKey, kHideGeneratedFilesDefault).toBool());
.toBool());
ptw->setDisabledFilesFilter( ptw->setDisabledFilesFilter(
settings->value(baseKey + ".DisabledFilesFilter", kHideDisabledFilesDefault).toBool()); settings->value(baseKey + kHideDisabledFilesKey, kHideDisabledFilesDefault).toBool());
ptw->setTrimEmptyDirectories( ptw->setTrimEmptyDirectories(
settings->value(baseKey + QLatin1String(".TrimEmptyDirsFilter"), kTrimEmptyDirsDefault) settings->value(baseKey + kTrimEmptyDirsKey, kTrimEmptyDirsDefault).toBool());
.toBool()); ptw->setAutoSynchronization(settings->value(baseKey + kSyncKey, kSyncDefault).toBool());
ptw->setAutoSynchronization(
settings->value(baseKey + QLatin1String(".SyncWithEditor"), kSyncDefault).toBool());
} }