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

Kits: Simplify handling of sticky kit information

Browse Source 
Change-Id: Iff01445d1251487bd44c227de36f1b47ba4c3d42
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Tobias Hunger
2013-09-09 17:10:41 +02:00
committed by hjk
parent 6e11e56290
commit f1f1f65f7c
25 changed files with 178 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/android/androidgdbserverkitinformation.cpp
View File

@@ -51,11 +51,9 @@ using namespace Utils;
namespace Android {
namespace Internal {
static const char ANDROID_GDBSERVER_INFORMATION[] = "Android.GdbServer.Information";
AndroidGdbServerKitInformation::AndroidGdbServerKitInformation()
{
setDataId(ANDROID_GDBSERVER_INFORMATION);
setId(AndroidGdbServerKitInformation::id());
setPriority(27999); // Just one less than Debugger!
}
@@ -77,7 +75,12 @@ KitInformation::ItemList AndroidGdbServerKitInformation::toUserOutput(const Kit
KitConfigWidget *AndroidGdbServerKitInformation::createConfigWidget(Kit *kit) const
{
return new AndroidGdbServerKitInformationWidget(kit, isSticky(kit));
return new AndroidGdbServerKitInformationWidget(kit, this);
}
Core::Id AndroidGdbServerKitInformation::id()
{
return "Android.GdbServer.Information";
}
bool AndroidGdbServerKitInformation::isAndroidKit(const Kit *kit)
@@ -93,12 +96,12 @@ bool AndroidGdbServerKitInformation::isAndroidKit(const Kit *kit)
FileName AndroidGdbServerKitInformation::gdbServer(const Kit *kit)
{
return FileName::fromString(kit->value(ANDROID_GDBSERVER_INFORMATION).toString());
return FileName::fromString(kit->value(AndroidGdbServerKitInformation::id()).toString());
}
void AndroidGdbServerKitInformation::setGdbSever(Kit *kit, const FileName &gdbServerCommand)
{
kit->setValue(ANDROID_GDBSERVER_INFORMATION, gdbServerCommand.toString());
kit->setValue(AndroidGdbServerKitInformation::id(), gdbServerCommand.toString());
}
FileName AndroidGdbServerKitInformation::autoDetect(Kit *kit)
@@ -110,18 +113,13 @@ FileName AndroidGdbServerKitInformation::autoDetect(Kit *kit)
return atc->suggestedGdbServer();
}
void AndroidGdbServerKitInformation::setSticky(Kit *k, bool b)
{
k->setSticky(ANDROID_GDBSERVER_INFORMATION, b);
}
///////////////
// AndroidGdbServerKitInformationWidget
///////////////
AndroidGdbServerKitInformationWidget::AndroidGdbServerKitInformationWidget(Kit *kit, bool sticky)
: KitConfigWidget(kit, sticky),
AndroidGdbServerKitInformationWidget::AndroidGdbServerKitInformationWidget(Kit *kit, const KitInformation *ki)
: KitConfigWidget(kit, ki),
m_label(new ElidingLabel),
m_button(new QPushButton(tr("Manage...")))
{

5
src/plugins/android/androidgdbserverkitinformation.h
View File

@@ -45,7 +45,8 @@ class AndroidGdbServerKitInformationWidget : public ProjectExplorer::KitConfigWi
{
Q_OBJECT
public:
AndroidGdbServerKitInformationWidget(ProjectExplorer::Kit *kit, bool sticky);
AndroidGdbServerKitInformationWidget(ProjectExplorer::Kit *kit,
const ProjectExplorer::KitInformation *ki);
QString displayName() const;
QString toolTip() const;
@@ -78,11 +79,11 @@ public:
ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *) const;
static Core::Id id();
static bool isAndroidKit(const ProjectExplorer::Kit *kit);
static Utils::FileName gdbServer(const ProjectExplorer::Kit *kit);
static void setGdbSever(ProjectExplorer::Kit *kit, const Utils::FileName &gdbServerCommand);
static Utils::FileName autoDetect(ProjectExplorer::Kit *kit);
static void setSticky(ProjectExplorer::Kit *k, bool b);
};
} // namespace Internal