diff --git a/src/plugins/silversearcher/CMakeLists.txt b/src/plugins/silversearcher/CMakeLists.txt index 2af582d4a3e..ad6542613bd 100644 --- a/src/plugins/silversearcher/CMakeLists.txt +++ b/src/plugins/silversearcher/CMakeLists.txt @@ -3,7 +3,7 @@ add_qtc_plugin(SilverSearcher SOURCES findinfilessilversearcher.cpp findinfilessilversearcher.h silversearcherparser.cpp silversearcherparser.h - silversearcherplugin.cpp silversearcherplugin.h + silversearcherplugin.cpp silversearchertr.h ) diff --git a/src/plugins/silversearcher/silversearcher.qbs b/src/plugins/silversearcher/silversearcher.qbs index 08a25367aad..e591ac80a54 100644 --- a/src/plugins/silversearcher/silversearcher.qbs +++ b/src/plugins/silversearcher/silversearcher.qbs @@ -10,7 +10,7 @@ QtcPlugin { files: [ "findinfilessilversearcher.cpp", "findinfilessilversearcher.h", "silversearcherparser.cpp", "silversearcherparser.h", - "silversearcherplugin.cpp", "silversearcherplugin.h", + "silversearcherplugin.cpp", ] QtcTestFiles { diff --git a/src/plugins/silversearcher/silversearcherplugin.cpp b/src/plugins/silversearcher/silversearcherplugin.cpp index 1f143407d78..fd3b3ae877d 100644 --- a/src/plugins/silversearcher/silversearcherplugin.cpp +++ b/src/plugins/silversearcher/silversearcherplugin.cpp @@ -3,17 +3,26 @@ #include "findinfilessilversearcher.h" #include "silversearcherparser_test.h" -#include "silversearcherplugin.h" + +#include namespace SilverSearcher::Internal { -void SilverSearcherPlugin::initialize() +class SilverSearcherPlugin final : public ExtensionSystem::IPlugin { - new FindInFilesSilverSearcher(this); + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "SilverSearcher.json") + + void initialize() final + { + new FindInFilesSilverSearcher(this); #ifdef WITH_TESTS - addTest(); + addTest(); #endif -} + } +}; } // SilverSearcher::Internal + +#include "silversearcherplugin.moc" diff --git a/src/plugins/silversearcher/silversearcherplugin.h b/src/plugins/silversearcher/silversearcherplugin.h deleted file mode 100644 index 8471d6f64a3..00000000000 --- a/src/plugins/silversearcher/silversearcherplugin.h +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (C) 2017 Przemyslaw Gorszkowski . -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#pragma once - -#include - -namespace SilverSearcher::Internal { - -class SilverSearcherPlugin : public ExtensionSystem::IPlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "SilverSearcher.json") - -public: - void initialize() override; -}; - -} // SilverSearcher::Internal