Core: Rename MimeTypeSettings to MimeTypeSettingsPage

More similar to the other classes.

Change-Id: Idb23cb5e43560132600158c5ba4d71e83a6a92ba
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2024-07-26 11:35:56 +02:00
parent 4c8398f7ef
commit a6908fa2d6

View File

@@ -252,10 +252,10 @@ bool MimeFilterModel::filterAcceptsRow(int source_row, const QModelIndex &source
const QChar kSemiColon(QLatin1Char(';')); const QChar kSemiColon(QLatin1Char(';'));
class MimeTypeSettings final : public QObject, public IOptionsPage class MimeTypeSettingsPage final : public QObject, public IOptionsPage
{ {
public: public:
MimeTypeSettings(); MimeTypeSettingsPage();
QStringList keywords() const final; QStringList keywords() const final;
@@ -275,7 +275,7 @@ public:
class MimeTypeSettingsWidget : public IOptionsPageWidget class MimeTypeSettingsWidget : public IOptionsPageWidget
{ {
public: public:
MimeTypeSettingsWidget(MimeTypeSettings *settings); MimeTypeSettingsWidget(MimeTypeSettingsPage *settings);
void apply() final void apply() final
{ {
@@ -304,7 +304,7 @@ public:
void ensurePendingMimeType(const Utils::MimeType &mimeType); void ensurePendingMimeType(const Utils::MimeType &mimeType);
MimeTypeSettings *d; MimeTypeSettingsPage *d;
QPointer<QWidget> m_widget; QPointer<QWidget> m_widget;
MimeEditorDelegate m_delegate; MimeEditorDelegate m_delegate;
@@ -317,7 +317,7 @@ public:
QPushButton *m_removeMagicButton; QPushButton *m_removeMagicButton;
}; };
MimeTypeSettingsWidget::MimeTypeSettingsWidget(MimeTypeSettings *settings) MimeTypeSettingsWidget::MimeTypeSettingsWidget(MimeTypeSettingsPage *settings)
: d(settings) : d(settings)
{ {
auto filterLineEdit = new FancyLineEdit; auto filterLineEdit = new FancyLineEdit;
@@ -602,7 +602,7 @@ void MimeTypeSettingsWidget::ensurePendingMimeType(const Utils::MimeType &mimeTy
} }
} }
void MimeTypeSettings::writeUserModifiedMimeTypes() void MimeTypeSettingsPage::writeUserModifiedMimeTypes()
{ {
static Utils::FilePath modifiedMimeTypesFile = ICore::userResourcePath(kModifiedMimeTypesFile); static Utils::FilePath modifiedMimeTypesFile = ICore::userResourcePath(kModifiedMimeTypesFile);
@@ -663,7 +663,7 @@ static QPair<int, int> rangeFromString(const QString &offset)
return range; return range;
} }
MimeTypeSettings::UserMimeTypeHash MimeTypeSettings::readUserModifiedMimeTypes() MimeTypeSettingsPage::UserMimeTypeHash MimeTypeSettingsPage::readUserModifiedMimeTypes()
{ {
static Utils::FilePath modifiedMimeTypesPath = ICore::userResourcePath(kModifiedMimeTypesFile); static Utils::FilePath modifiedMimeTypesPath = ICore::userResourcePath(kModifiedMimeTypesFile);
UserMimeTypeHash userMimeTypes; UserMimeTypeHash userMimeTypes;
@@ -719,7 +719,7 @@ MimeTypeSettings::UserMimeTypeHash MimeTypeSettings::readUserModifiedMimeTypes()
return userMimeTypes; return userMimeTypes;
} }
static void registerUserModifiedMimeTypes(const MimeTypeSettings::UserMimeTypeHash &mimeTypes) static void registerUserModifiedMimeTypes(const MimeTypeSettingsPage::UserMimeTypeHash &mimeTypes)
{ {
for (auto it = mimeTypes.constBegin(); it != mimeTypes.constEnd(); ++it) { for (auto it = mimeTypes.constBegin(); it != mimeTypes.constEnd(); ++it) {
Utils::MimeType mt = Utils::mimeTypeForName(it.key()); Utils::MimeType mt = Utils::mimeTypeForName(it.key());
@@ -730,7 +730,7 @@ static void registerUserModifiedMimeTypes(const MimeTypeSettings::UserMimeTypeHa
} }
} }
void MimeTypeSettings::applyUserModifiedMimeTypes(const UserMimeTypeHash &mimeTypes) void MimeTypeSettingsPage::applyUserModifiedMimeTypes(const UserMimeTypeHash &mimeTypes)
{ {
// register in mime data base, and remember for later // register in mime data base, and remember for later
for (auto it = mimeTypes.constBegin(); it != mimeTypes.constEnd(); ++it) for (auto it = mimeTypes.constBegin(); it != mimeTypes.constEnd(); ++it)
@@ -738,7 +738,7 @@ void MimeTypeSettings::applyUserModifiedMimeTypes(const UserMimeTypeHash &mimeTy
registerUserModifiedMimeTypes(mimeTypes); registerUserModifiedMimeTypes(mimeTypes);
} }
MimeTypeSettings::MimeTypeSettings() MimeTypeSettingsPage::MimeTypeSettingsPage()
{ {
setId(Constants::SETTINGS_ID_MIMETYPES); setId(Constants::SETTINGS_ID_MIMETYPES);
setDisplayName(Tr::tr("MIME Types")); setDisplayName(Tr::tr("MIME Types"));
@@ -749,13 +749,13 @@ MimeTypeSettings::MimeTypeSettings()
m_filterModel.setFilterKeyColumn(-1); m_filterModel.setFilterKeyColumn(-1);
m_filterModel.setFilterCaseSensitivity(Qt::CaseInsensitive); m_filterModel.setFilterCaseSensitivity(Qt::CaseInsensitive);
connect(ICore::instance(), &ICore::saveSettingsRequested, connect(ICore::instance(), &ICore::saveSettingsRequested,
this, &MimeTypeSettings::writeUserModifiedMimeTypes); this, &MimeTypeSettingsPage::writeUserModifiedMimeTypes);
m_userModifiedMimeTypes = readUserModifiedMimeTypes(); m_userModifiedMimeTypes = readUserModifiedMimeTypes();
Utils::addMimeInitializer([this] { registerUserModifiedMimeTypes(m_userModifiedMimeTypes); }); Utils::addMimeInitializer([this] { registerUserModifiedMimeTypes(m_userModifiedMimeTypes); });
} }
QStringList MimeTypeSettings::keywords() const QStringList MimeTypeSettingsPage::keywords() const
{ {
return { return {
Tr::tr("Reset MIME Types"), Tr::tr("Reset MIME Types"),
@@ -804,7 +804,7 @@ void MimeEditorDelegate::setModelData(QWidget *editor,
void setupMimeTypeSettings() void setupMimeTypeSettings()
{ {
static MimeTypeSettings theMimeTypeSettings; static MimeTypeSettingsPage theMimeTypeSettingsPage;
} }
} // Core::Internal } // Core::Internal