[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdev-embedded] launcher: Adapt to API change: EnvironmentGroupList -> EnvironmentProfileList
From:       Alexander Zhigalin <null () kde ! org>
Date:       2017-02-27 16:57:11
Message-ID: E1ciObn-0004hg-V8 () code ! kde ! org
[Download RAW message or body]

Git commit 4dad4ec75ad0bb8493ae45ecde66635be7e25e35 by Alexander Zhigalin.
Committed on 27/02/2017 at 16:47.
Pushed by zhigalin into branch 'master'.

Adapt to API change: EnvironmentGroupList -> EnvironmentProfileList

Reviewers: #kdevelop

Subscribers: kdevelop-devel

Differential Revision: https://phabricator.kde.org/D4822

M  +0    -1    launcher/embeddedlauncher.cpp
M  +3    -4    launcher/executeplugin.cpp
M  +2    -2    launcher/executeplugin.h
M  +9    -9    launcher/launcherjob.cpp

https://commits.kde.org/kdev-embedded/4dad4ec75ad0bb8493ae45ecde66635be7e25e35

diff --git a/launcher/embeddedlauncher.cpp b/launcher/embeddedlauncher.cpp
index 9294a90..5a70ba0 100644
--- a/launcher/embeddedlauncher.cpp
+++ b/launcher/embeddedlauncher.cpp
@@ -46,7 +46,6 @@
 #include "board.h"
 
 #include <util/kdevstringhandler.h>
-#include <util/environmentgrouplist.h>
 #include <project/projectitemlineedit.h>
 #include "projecttargetscombobox.h"
 
diff --git a/launcher/executeplugin.cpp b/launcher/executeplugin.cpp
index de03fdf..846e432 100644
--- a/launcher/executeplugin.cpp
+++ b/launcher/executeplugin.cpp
@@ -38,7 +38,6 @@
 #include <interfaces/ilaunchconfiguration.h>
 #include <interfaces/iprojectcontroller.h>
 #include <interfaces/iuicontroller.h>
-#include <util/environmentgrouplist.h>
 
 #include "debug.h"
 #include "toolkit.h"
@@ -52,7 +51,7 @@ QString ExecutePlugin::workingDirEntry = QStringLiteral("Working \
Directory");  QString ExecutePlugin::executableEntry = QStringLiteral("Executable");
 QString ExecutePlugin::argumentsEntry = QStringLiteral("Arguments");
 QString ExecutePlugin::isExecutableEntry = QStringLiteral("isExecutable");
-QString ExecutePlugin::environmentGroupEntry = QStringLiteral("EnvironmentGroup");
+QString ExecutePlugin::environmentProfileEntry = QStringLiteral("EnvironmentGroup");
 QString ExecutePlugin::useTerminalEntry = QStringLiteral("Use External Terminal");
 QString ExecutePlugin::commandEntry = QStringLiteral("Command");
 QString ExecutePlugin::boardEntry = QStringLiteral("Board Index");
@@ -187,14 +186,14 @@ KJob* \
ExecutePlugin::dependencyJob(KDevelop::ILaunchConfiguration* cfg) const  }
 
 
-QString ExecutePlugin::environmentGroup(KDevelop::ILaunchConfiguration* cfg) const
+QString ExecutePlugin::environmentProfileName(KDevelop::ILaunchConfiguration* cfg) \
const  {
     if (!cfg)
     {
         return QString();
     }
 
-    return cfg->config().readEntry(ExecutePlugin::environmentGroupEntry, "");
+    return cfg->config().readEntry(ExecutePlugin::environmentProfileEntry, "");
 }
 
 
diff --git a/launcher/executeplugin.h b/launcher/executeplugin.h
index e1f112c..56e2ede 100644
--- a/launcher/executeplugin.h
+++ b/launcher/executeplugin.h
@@ -45,7 +45,7 @@ public:
     static QString executableEntry;
     static QString argumentsEntry;
     static QString isExecutableEntry;
-    static QString environmentGroupEntry;
+    static QString environmentProfileEntry;
     static QString useTerminalEntry;
     static QString commandEntry;
     static QString userIdToRunEntry;
@@ -66,7 +66,7 @@ public:
     QStringList arguments(KDevelop::ILaunchConfiguration*, QString& err) const \
                override;
     QUrl workingDirectory(KDevelop::ILaunchConfiguration*) const override;
     KJob* dependencyJob(KDevelop::ILaunchConfiguration*) const override;
-    QString environmentGroup(KDevelop::ILaunchConfiguration*) const override;
+	QString environmentProfileName(KDevelop::ILaunchConfiguration* cfg) const override;
     bool useTerminal(KDevelop::ILaunchConfiguration*) const override;
     QString terminal(KDevelop::ILaunchConfiguration*) const override;
     QString nativeAppConfigTypeId() const override;
diff --git a/launcher/launcherjob.cpp b/launcher/launcherjob.cpp
index bc5ef7c..60e3c6d 100644
--- a/launcher/launcherjob.cpp
+++ b/launcher/launcherjob.cpp
@@ -35,7 +35,7 @@
 #include <interfaces/ilaunchconfiguration.h>
 #include <interfaces/iruncontroller.h>
 #include <outputview/outputmodel.h>
-#include <util/environmentgrouplist.h>
+#include <util/environmentprofilelist.h>
 
 #include <interfaces/icore.h>
 #include <interfaces/isession.h>
@@ -65,9 +65,9 @@ LauncherJob::LauncherJob(QObject* parent, \
KDevelop::ILaunchConfiguration* cfg)  IExecutePlugin* iface = \
KDevelop::ICore::self()->pluginController()->pluginForExtension(QStringLiteral("org.kdevelop.IExecutePlugin"), \
QStringLiteral("kdevembedded-launcher"))->extension<IExecutePlugin>();  \
Q_ASSERT(iface);  
-    KDevelop::EnvironmentGroupList l(KSharedConfig::openConfig());
-    QString envgrp = iface->environmentGroup(cfg);
-    qCDebug(LaMsg) << "LauncherJob::LauncherJob envgrp" << envgrp;
+    KDevelop::EnvironmentProfileList l(KSharedConfig::openConfig());
+    QString envProfileName = iface->environmentProfileName(cfg);
+    qCDebug(LaMsg) << "LauncherJob::LauncherJob envProfileName" << envProfileName;
 
     QString err;
     QUrl executable = iface->executable(cfg, err);
@@ -80,14 +80,14 @@ LauncherJob::LauncherJob(QObject* parent, \
KDevelop::ILaunchConfiguration* cfg)  return;
     }
 
-    if (envgrp.isEmpty())
+    if (envProfileName.isEmpty())
     {
-        qWarning() << "Launch Configuration:" << cfg->name() << "no environment \
group specified, looks like a broken " +        qWarning() << "Launch Configuration:" \
                << cfg->name() << "no environment profile specified, looks like a \
                broken "
                    "configuration, please check run configuration" << cfg->name()
-                   << "Using default environment group.";
-        envgrp = l.defaultGroup();
+                   << "Using default environment profile.";
+        envProfileName = l.defaultProfileName();
     }
-    setEnvironmentProfile(envgrp);
+    setEnvironmentProfile(envProfileName);
 
     QStringList arguments = iface->arguments(cfg, err);
     qCDebug(LaMsg) << "LauncherJob::LauncherJob arguments" << arguments;


[prev in list] [next in list] [prev in thread] [next in thread]