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

Yet another s/profile/kit change

Browse Source 
Mostly variable names, one string

Change-Id: I9d44cba8ade9266303fe7695b8bc93647710b71d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2012-09-27 22:30:29 +02:00
committed by Tobias Hunger
parent 6dad4586c6
commit e834d75b04
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/debuggerkitconfigwidget.h
View File

@@ -62,7 +62,7 @@ class DebuggerKitConfigWidget : public ProjectExplorer::KitConfigWidget
Q_OBJECT Q_OBJECT
public: public:
DebuggerKitConfigWidget(ProjectExplorer::Kit *p, DebuggerKitConfigWidget(ProjectExplorer::Kit *k,
const DebuggerKitInformation *ki, const DebuggerKitInformation *ki,
QWidget *parent = 0); QWidget *parent = 0);

10
src/plugins/debugger/debuggerkitinformation.h
View File

@@ -77,13 +77,13 @@ public:
static DebuggerItem debuggerItem(const ProjectExplorer::Kit *k); static DebuggerItem debuggerItem(const ProjectExplorer::Kit *k);
static void setDebuggerItem(ProjectExplorer::Kit *k, const DebuggerItem &item); static void setDebuggerItem(ProjectExplorer::Kit *k, const DebuggerItem &item);
static Utils::FileName debuggerCommand(const ProjectExplorer::Kit *p) static Utils::FileName debuggerCommand(const ProjectExplorer::Kit *k)
{ return debuggerItem(p).binary; } { 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) static DebuggerEngineType engineType(const ProjectExplorer::Kit *k)
{ return debuggerItem(p).engineType; } { return debuggerItem(k).engineType; }
static void setEngineType(ProjectExplorer::Kit *k, DebuggerEngineType type); static void setEngineType(ProjectExplorer::Kit *k, DebuggerEngineType type);

16
src/plugins/projectexplorer/kitinformation.h
View File

@@ -78,9 +78,9 @@ public:
SysRootMatcher(const Utils::FileName &fn) : m_sysroot(fn) 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: private:
@@ -125,9 +125,9 @@ public:
ToolChainMatcher(const ToolChain *tc) : m_tc(tc) 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: private:
@@ -166,9 +166,9 @@ public:
DeviceTypeMatcher(const Core::Id t) : m_type(t) 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()) if (!deviceType.isValid())
return false; return false;
return deviceType == m_type; return deviceType == m_type;
@@ -214,9 +214,9 @@ public:
DeviceMatcher(Core::Id id) : m_devId(id) 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: private:

2
src/plugins/projectexplorer/project.cpp
View File

@@ -266,7 +266,7 @@ Target *Project::restoreTarget(const QVariantMap &data)
Kit *k = KitManager::instance()->find(id); Kit *k = KitManager::instance()->find(id);
if (!k) { if (!k) {
qWarning("Warning: No profile '%s' found. Continuing.", qPrintable(id.toString())); qWarning("Warning: No kit '%s' found. Continuing.", qPrintable(id.toString()));
return 0; return 0;
} }

2
src/plugins/projectexplorer/target.h
View File

@@ -59,7 +59,7 @@ class PROJECTEXPLORER_EXPORT Target : public ProjectConfiguration
Q_OBJECT Q_OBJECT
public: public:
Target(Project *parent, Kit *p); Target(Project *parent, Kit *k);
~Target(); ~Target();
Project *project() const; Project *project() const;