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

Revert "ProjectExplorer: Enable devices to register extra macro expander variables"

Browse Source 
This reverts commit d763d70db9.

Reason for revert: I misunderstood how MacroExpander works, sorry.

Change-Id: Iff0fdb5fcc2a0e95be0b92fd2f9454894a98a738
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2019-08-28 07:51:56 +00:00
committed by hjk
parent 81c71fb261
commit 7855c9bb80
3 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/projectexplorer/devicesupport/idevice.cpp
View File

@@ -36,7 +36,6 @@
#include <ssh/sshconnection.h> #include <ssh/sshconnection.h>
#include <utils/displayname.h> #include <utils/displayname.h>
#include <utils/icon.h> #include <utils/icon.h>
#include <utils/macroexpander.h>
#include <utils/portlist.h> #include <utils/portlist.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/url.h> #include <utils/url.h>
@@ -331,28 +330,6 @@ DeviceEnvironmentFetcher::Ptr IDevice::environmentFetcher() const
return DeviceEnvironmentFetcher::Ptr(); return DeviceEnvironmentFetcher::Ptr();
} }
void IDevice::addToMacroExpander(Utils::MacroExpander *expander) const
{
expander->registerVariable("Device:HostAddress",
QCoreApplication::translate("ProjectExplorer::IDevice",
"Host address"),
[this]() { return sshParameters().host(); });
expander->registerVariable("Device:SshPort",
QCoreApplication::translate("ProjectExplorer::IDevice", "SSH port"),
[this]() { return QString::number(sshParameters().port()); });
expander->registerVariable("Device:UserName",
QCoreApplication::translate("ProjectExplorer::IDevice", "User name"),
[this]() { return sshParameters().userName(); });
expander->registerVariable("Device:KeyFile",
QCoreApplication::translate("ProjectExplorer::IDevice",
"Private key file"),
[this]() { return sshParameters().privateKeyFile; });
expander->registerVariable("Device:Name",
QCoreApplication::translate("ProjectExplorer::IDevice",
"Device name"),
[this]() { return displayName(); });
}
IDevice::DeviceState IDevice::deviceState() const IDevice::DeviceState IDevice::deviceState() const
{ {
return d->deviceState; return d->deviceState;

3
src/plugins/projectexplorer/devicesupport/idevice.h
View File

@@ -49,7 +49,6 @@ namespace QSsh { class SshConnectionParameters; }
namespace Utils { namespace Utils {
class Environment; class Environment;
class Icon; class Icon;
class MacroExpander;
class PortList; class PortList;
class Port; class Port;
} // Utils } // Utils
@@ -181,8 +180,6 @@ public:
virtual DeviceProcessSignalOperation::Ptr signalOperation() const = 0; virtual DeviceProcessSignalOperation::Ptr signalOperation() const = 0;
virtual DeviceEnvironmentFetcher::Ptr environmentFetcher() const; virtual DeviceEnvironmentFetcher::Ptr environmentFetcher() const;
virtual void addToMacroExpander(Utils::MacroExpander *expander) const;
enum DeviceState { DeviceReadyToUse, DeviceConnected, DeviceDisconnected, DeviceStateUnknown }; enum DeviceState { DeviceReadyToUse, DeviceConnected, DeviceDisconnected, DeviceStateUnknown };
DeviceState deviceState() const; DeviceState deviceState() const;
void setDeviceState(const DeviceState state); void setDeviceState(const DeviceState state);

28
src/plugins/projectexplorer/kitinformation.cpp
View File

@@ -1028,9 +1028,31 @@ KitAspect::ItemList DeviceKitAspect::toUserOutput(const Kit *k) const
void DeviceKitAspect::addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const void DeviceKitAspect::addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const
{ {
QTC_ASSERT(kit, return); QTC_ASSERT(kit, return);
const IDevice::ConstPtr device = DeviceKitAspect::device(kit); expander->registerVariable("Device:HostAddress", tr("Host address"),
if (device) [kit]() -> QString {
device->addToMacroExpander(expander); const IDevice::ConstPtr device = DeviceKitAspect::device(kit);
return device ? device->sshParameters().host() : QString();
});
expander->registerVariable("Device:SshPort", tr("SSH port"),
[kit]() -> QString {
const IDevice::ConstPtr device = DeviceKitAspect::device(kit);
return device ? QString::number(device->sshParameters().port()) : QString();
});
expander->registerVariable("Device:UserName", tr("User name"),
[kit]() -> QString {
const IDevice::ConstPtr device = DeviceKitAspect::device(kit);
return device ? device->sshParameters().userName() : QString();
});
expander->registerVariable("Device:KeyFile", tr("Private key file"),
[kit]() -> QString {
const IDevice::ConstPtr device = DeviceKitAspect::device(kit);
return device ? device->sshParameters().privateKeyFile : QString();
});
expander->registerVariable("Device:Name", tr("Device name"),
[kit]() -> QString {
const IDevice::ConstPtr device = DeviceKitAspect::device(kit);
return device ? device->displayName() : QString();
});
} }
Core::Id DeviceKitAspect::id() Core::Id DeviceKitAspect::id()