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

Nim: Move unusual plugin private ctor content to its only user

Browse Source 
Also, drop an unused Q_OBEJCT

Change-Id: I0c9188fd09268ca6b6daa94124219a6f9a2fefa8
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2023-07-21 10:20:34 +02:00
parent 465d20fb15
commit 5f38ac700c
3 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/nim/nimplugin.cpp
View File

@@ -19,8 +19,6 @@
#include "project/nimbletaskstep.h" #include "project/nimbletaskstep.h"
#include "settings/nimcodestylepreferencesfactory.h" #include "settings/nimcodestylepreferencesfactory.h"
#include "settings/nimcodestylesettingspage.h" #include "settings/nimcodestylesettingspage.h"
#include "settings/nimsettings.h"
#include "suggest/nimsuggestcache.h"
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/runcontrol.h> #include <projectexplorer/runcontrol.h>
@@ -39,15 +37,6 @@ namespace Nim {
class NimPluginPrivate class NimPluginPrivate
{ {
public: public:
NimPluginPrivate()
{
Suggest::NimSuggestCache::instance().setExecutablePath(settings().nimSuggestPath());
QObject::connect(&settings().nimSuggestPath, &StringAspect::changed,
&Suggest::NimSuggestCache::instance(), [this] {
Suggest::NimSuggestCache::instance().setExecutablePath(settings().nimSuggestPath());
});
}
NimEditorFactory editorFactory; NimEditorFactory editorFactory;
NimBuildConfigurationFactory buildConfigFactory; NimBuildConfigurationFactory buildConfigFactory;
NimbleBuildConfigurationFactory nimbleBuildConfigFactory; NimbleBuildConfigurationFactory nimbleBuildConfigFactory;

12
src/plugins/nim/suggest/nimsuggestcache.cpp
View File

@@ -36,6 +36,11 @@ NimSuggest *NimSuggestCache::get(const FilePath &filename)
NimSuggestCache::NimSuggestCache() NimSuggestCache::NimSuggestCache()
{ {
setExecutablePath(settings().nimSuggestPath());
QObject::connect(&settings().nimSuggestPath, &StringAspect::changed, [this] {
setExecutablePath(settings().nimSuggestPath());
});
Core::EditorManager *editorManager = Core::EditorManager::instance(); Core::EditorManager *editorManager = Core::EditorManager::instance();
connect(editorManager, &Core::EditorManager::editorOpened, connect(editorManager, &Core::EditorManager::editorOpened,
this, &NimSuggestCache::onEditorOpened); this, &NimSuggestCache::onEditorOpened);
@@ -60,14 +65,13 @@ void NimSuggestCache::setExecutablePath(const FilePath &path)
} }
} }
void Nim::Suggest::NimSuggestCache::onEditorOpened(Core::IEditor *editor) void NimSuggestCache::onEditorOpened(Core::IEditor *editor)
{ {
if (editor->document()->mimeType() == Constants::C_NIM_MIMETYPE) { if (editor->document()->mimeType() == Constants::C_NIM_MIMETYPE)
get(editor->document()->filePath()); get(editor->document()->filePath());
}
} }
void Nim::Suggest::NimSuggestCache::onEditorClosed(Core::IEditor *editor) void NimSuggestCache::onEditorClosed(Core::IEditor *editor)
{ {
auto it = m_nimSuggestInstances.find(editor->document()->filePath()); auto it = m_nimSuggestInstances.find(editor->document()->filePath());
if (it != m_nimSuggestInstances.end()) if (it != m_nimSuggestInstances.end())

6
src/plugins/nim/suggest/nimsuggestcache.h
View File

@@ -3,7 +3,7 @@
#pragma once #pragma once
#include <utils/fileutils.h> #include <utils/filepath.h>
#include <QObject> #include <QObject>
@@ -15,10 +15,8 @@ namespace Nim::Suggest {
class NimSuggest; class NimSuggest;
class NimSuggestCache : public QObject class NimSuggestCache final : public QObject
{ {
Q_OBJECT
public: public:
static NimSuggestCache &instance(); static NimSuggestCache &instance();