forked from qt-creator/qt-creator
Yet another s/profile/kit change
Mostly variable names, one string Change-Id: I9d44cba8ade9266303fe7695b8bc93647710b71d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
committed by
Tobias Hunger
parent
6dad4586c6
commit
e834d75b04
@@ -62,7 +62,7 @@ class DebuggerKitConfigWidget : public ProjectExplorer::KitConfigWidget
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
DebuggerKitConfigWidget(ProjectExplorer::Kit *p,
|
||||
DebuggerKitConfigWidget(ProjectExplorer::Kit *k,
|
||||
const DebuggerKitInformation *ki,
|
||||
QWidget *parent = 0);
|
||||
|
||||
|
@@ -77,13 +77,13 @@ public:
|
||||
static DebuggerItem debuggerItem(const ProjectExplorer::Kit *k);
|
||||
static void setDebuggerItem(ProjectExplorer::Kit *k, const DebuggerItem &item);
|
||||
|
||||
static Utils::FileName debuggerCommand(const ProjectExplorer::Kit *p)
|
||||
{ return debuggerItem(p).binary; }
|
||||
static Utils::FileName debuggerCommand(const ProjectExplorer::Kit *k)
|
||||
{ return debuggerItem(k).binary; }
|
||||
|
||||
static void setDebuggerCommand(ProjectExplorer::Kit *p, const Utils::FileName &command);
|
||||
static void setDebuggerCommand(ProjectExplorer::Kit *k, const Utils::FileName &command);
|
||||
|
||||
static DebuggerEngineType engineType(const ProjectExplorer::Kit *p)
|
||||
{ return debuggerItem(p).engineType; }
|
||||
static DebuggerEngineType engineType(const ProjectExplorer::Kit *k)
|
||||
{ return debuggerItem(k).engineType; }
|
||||
|
||||
static void setEngineType(ProjectExplorer::Kit *k, DebuggerEngineType type);
|
||||
|
||||
|
@@ -78,9 +78,9 @@ public:
|
||||
SysRootMatcher(const Utils::FileName &fn) : m_sysroot(fn)
|
||||
{ }
|
||||
|
||||
bool matches(const Kit *p) const
|
||||
bool matches(const Kit *k) const
|
||||
{
|
||||
return SysRootKitInformation::sysRoot(p) == m_sysroot;
|
||||
return SysRootKitInformation::sysRoot(k) == m_sysroot;
|
||||
}
|
||||
|
||||
private:
|
||||
@@ -125,9 +125,9 @@ public:
|
||||
ToolChainMatcher(const ToolChain *tc) : m_tc(tc)
|
||||
{ }
|
||||
|
||||
bool matches(const Kit *p) const
|
||||
bool matches(const Kit *k) const
|
||||
{
|
||||
return ToolChainKitInformation::toolChain(p) == m_tc;
|
||||
return ToolChainKitInformation::toolChain(k) == m_tc;
|
||||
}
|
||||
|
||||
private:
|
||||
@@ -166,9 +166,9 @@ public:
|
||||
DeviceTypeMatcher(const Core::Id t) : m_type(t)
|
||||
{ }
|
||||
|
||||
bool matches(const Kit *p) const
|
||||
bool matches(const Kit *k) const
|
||||
{
|
||||
Core::Id deviceType = DeviceTypeKitInformation::deviceTypeId(p);
|
||||
Core::Id deviceType = DeviceTypeKitInformation::deviceTypeId(k);
|
||||
if (!deviceType.isValid())
|
||||
return false;
|
||||
return deviceType == m_type;
|
||||
@@ -214,9 +214,9 @@ public:
|
||||
DeviceMatcher(Core::Id id) : m_devId(id)
|
||||
{ }
|
||||
|
||||
bool matches(const Kit *p) const
|
||||
bool matches(const Kit *k) const
|
||||
{
|
||||
return DeviceKitInformation::deviceId(p) == m_devId;
|
||||
return DeviceKitInformation::deviceId(k) == m_devId;
|
||||
}
|
||||
|
||||
private:
|
||||
|
@@ -266,7 +266,7 @@ Target *Project::restoreTarget(const QVariantMap &data)
|
||||
|
||||
Kit *k = KitManager::instance()->find(id);
|
||||
if (!k) {
|
||||
qWarning("Warning: No profile '%s' found. Continuing.", qPrintable(id.toString()));
|
||||
qWarning("Warning: No kit '%s' found. Continuing.", qPrintable(id.toString()));
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@@ -59,7 +59,7 @@ class PROJECTEXPLORER_EXPORT Target : public ProjectConfiguration
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
Target(Project *parent, Kit *p);
|
||||
Target(Project *parent, Kit *k);
|
||||
~Target();
|
||||
|
||||
Project *project() const;
|
||||
|
Reference in New Issue
Block a user