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

FakeVim: Delay settings creation until actual use

Browse Source 
Task-number: QTCREATORBUG-29167
Change-Id: I3a6f1330922f3840cb7e99d8adb60a728d36eb4b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2023-07-07 12:13:07 +02:00
parent 6a068a6509
commit 2c512625c5
3 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/fakevim/fakevimplugin.cpp
View File

@@ -683,6 +683,8 @@ public:
}
};
const FakeVimExCommandsPage exCommandPage;
///////////////////////////////////////////////////////////////////////
//
// FakeVimUserCommandsPage
@@ -752,11 +754,10 @@ public:
class FakeVimUserCommandsPageWidget : public IOptionsPageWidget
{
public:
FakeVimUserCommandsPageWidget(FakeVimUserCommandsModel *model)
: m_model(model)
FakeVimUserCommandsPageWidget()
{
auto widget = new QTreeView;
widget->setModel(m_model);
widget->setModel(&m_model);
widget->resizeColumnToContents(0);
auto delegate = new FakeVimUserCommandsDelegate(widget);
@@ -771,7 +772,7 @@ private:
void apply() final
{
// now save the mappings if necessary
const UserCommandMap &current = m_model->commandMap();
const UserCommandMap &current = m_model.commandMap();
UserCommandMap &userMap = dd->m_userCommandMap;
if (current != userMap) {
@@ -800,7 +801,7 @@ private:
}
}
FakeVimUserCommandsModel *m_model;
FakeVimUserCommandsModel m_model;
};
class FakeVimUserCommandsPage : public IOptionsPage
@@ -811,13 +812,11 @@ public:
setId(SETTINGS_USER_CMDS_ID);
setDisplayName(Tr::tr("User Command Mapping"));
setCategory(SETTINGS_CATEGORY);
setWidgetCreator([this] { return new FakeVimUserCommandsPageWidget(&m_model); });
setWidgetCreator([this] { return new FakeVimUserCommandsPageWidget; });
}
private:
FakeVimUserCommandsModel m_model;
};
const FakeVimUserCommandsPage userCommandsPage;
///////////////////////////////////////////////////////////////////////
//
@@ -978,10 +977,6 @@ IAssistProcessor *FakeVimCompletionAssistProvider::createProcessor(const AssistI
class FakeVimPluginRunData
{
public:
FakeVimSettings settings;
FakeVimExCommandsPage exCommandsPage;
FakeVimUserCommandsPage userCommandsPage;
FakeVimCompletionAssistProvider wordProvider;
};