Merge pull request #40 from blu-base/coretoutils

Adapt to v4.13 API change: Id from Core to Utils

Author: fpoussin

.github/workflows/build_qmake.yml

@@ -3,8 +3,8 @@ name: QMake Build Matrix
 on: [push]
 
 env:
-  QT_VERSION: 5.14.2
-  QT_CREATOR_VERSION: 4.12.0
+  QT_VERSION: 5.15.1
+  QT_CREATOR_VERSION: 4.13.0
   PLUGIN_PRO: doxygen.pro
   PLUGIN_NAME: Doxygen
 

doxygen.cpp

@@ -577,7 +577,7 @@ uint Doxygen::documentProject(ProjectExplorer::Project* p, const DoxygenSettings
                     && fileExtension == "qml"
                     )
                 ) {*/
-            Core::IEditor* editor = editorManager->openEditor(files[i], Core::Id(),
+            Core::IEditor* editor = editorManager->openEditor(files[i], Utils::Id(),
                 Core::EditorManager::DoNotChangeCurrentEditor
                     | Core::EditorManager::IgnoreNavigationHistory
                     | Core::EditorManager::DoNotMakeVisible);

doxygenplugin.cpp

@@ -111,7 +111,7 @@ bool DoxygenPlugin::initialize(const QStringList& arguments, QString* errorStrin
     Core::Context globalcontext(C_GLOBAL);
     //Core::Context context(CMD_ID_DOXYGEN_MAINVIEW);
     Core::ActionContainer* toolsContainer = am->actionContainer(Core::Constants::M_TOOLS);
-    Core::ActionContainer* doxygenMenu = am->createMenu(Core::Id(CMD_ID_DOXYGEN_MENU));
+    Core::ActionContainer* doxygenMenu = am->createMenu(Utils::Id(CMD_ID_DOXYGEN_MENU));
     doxygenMenu->menu()->setTitle(tr("&Doxygen"));
     toolsContainer->addMenu(doxygenMenu);
 

doxygensettings.cpp

@@ -39,7 +39,7 @@ namespace Internal {
             m_settings.fromSettings(settings);
         setId("A.General");
         setDisplayName(tr("Doxygen"));
-        setCategory(Core::Id::fromString(QString(Constants::DOXYGEN_SETTINGS_CATEGORY)));
+        setCategory(Utils::Id::fromString(QString(Constants::DOXYGEN_SETTINGS_CATEGORY)));
         setDisplayCategory("Doxygen");
         setCategoryIcon(Utils::Icon(":/doxygen.png"));
     }