diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp index 23550f4c8c7..10bc34d3ab0 100644 --- a/src/plugins/debugger/debuggerkitinformation.cpp +++ b/src/plugins/debugger/debuggerkitinformation.cpp @@ -280,7 +280,7 @@ QString DebuggerKitInformation::userOutput(const DebuggerItem &item) return binary.isEmpty() ? tr("%1 ").arg(name) : tr("%1 using \"%2\"").arg(name, binary); } -KitInformation::ItemList DebuggerKitInformation::toUserOutput(Kit *k) const +KitInformation::ItemList DebuggerKitInformation::toUserOutput(const Kit *k) const { return ItemList() << qMakePair(tr("Debugger"), DebuggerKitInformation::userOutput(DebuggerKitInformation::debuggerItem(k))); } diff --git a/src/plugins/debugger/debuggerkitinformation.h b/src/plugins/debugger/debuggerkitinformation.h index d4ecc33e4a5..eff4f385a6f 100644 --- a/src/plugins/debugger/debuggerkitinformation.h +++ b/src/plugins/debugger/debuggerkitinformation.h @@ -72,7 +72,7 @@ public: ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *k) const; - ItemList toUserOutput(ProjectExplorer::Kit *k) const; + ItemList toUserOutput(const ProjectExplorer::Kit *k) const; static QString userOutput(const DebuggerItem &item); static DebuggerItem debuggerItem(const ProjectExplorer::Kit *k); diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp index 9929e8427ed..1f97cf0eed4 100644 --- a/src/plugins/projectexplorer/kit.cpp +++ b/src/plugins/projectexplorer/kit.cpp @@ -403,7 +403,7 @@ IOutputParser *Kit::createOutputParser() const return first; } -QString Kit::toHtml() +QString Kit::toHtml() const { QString rc; QTextStream str(&rc); diff --git a/src/plugins/projectexplorer/kit.h b/src/plugins/projectexplorer/kit.h index 031a0521a2d..c0fd94738cf 100644 --- a/src/plugins/projectexplorer/kit.h +++ b/src/plugins/projectexplorer/kit.h @@ -93,7 +93,7 @@ public: void addToEnvironment(Utils::Environment &env) const; IOutputParser *createOutputParser() const; - QString toHtml(); + QString toHtml() const; Kit *clone(bool keepName = false) const; void copyFrom(const Kit *k); diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp index 3f7028c3d7e..c2098601eec 100644 --- a/src/plugins/projectexplorer/kitinformation.cpp +++ b/src/plugins/projectexplorer/kitinformation.cpp @@ -92,7 +92,7 @@ KitConfigWidget *SysRootKitInformation::createConfigWidget(Kit *k) const return new Internal::SysRootInformationConfigWidget(k); } -KitInformation::ItemList SysRootKitInformation::toUserOutput(Kit *k) const +KitInformation::ItemList SysRootKitInformation::toUserOutput(const Kit *k) const { return ItemList() << qMakePair(tr("Sys Root"), sysRoot(k).toUserOutput()); } @@ -209,7 +209,7 @@ QString ToolChainKitInformation::displayNamePostfix(const Kit *k) const return tc ? tc->displayName() : QString(); } -KitInformation::ItemList ToolChainKitInformation::toUserOutput(Kit *k) const +KitInformation::ItemList ToolChainKitInformation::toUserOutput(const Kit *k) const { ToolChain *tc = toolChain(k); return ItemList() << qMakePair(tr("Compiler"), tc ? tc->displayName() : tr("None")); @@ -294,7 +294,7 @@ KitConfigWidget *DeviceTypeKitInformation::createConfigWidget(Kit *k) const return new Internal::DeviceTypeInformationConfigWidget(k); } -KitInformation::ItemList DeviceTypeKitInformation::toUserOutput(Kit *k) const +KitInformation::ItemList DeviceTypeKitInformation::toUserOutput(const Kit *k) const { Core::Id type = deviceTypeId(k); QString typeDisplayName = tr("Unknown device type"); @@ -392,7 +392,7 @@ QString DeviceKitInformation::displayNamePostfix(const Kit *k) const return dev.isNull() ? QString() : dev->displayName(); } -KitInformation::ItemList DeviceKitInformation::toUserOutput(Kit *k) const +KitInformation::ItemList DeviceKitInformation::toUserOutput(const Kit *k) const { IDevice::ConstPtr dev = device(k); return ItemList() << qMakePair(tr("Device"), dev.isNull() ? tr("Unconfigured") : dev->displayName()); diff --git a/src/plugins/projectexplorer/kitinformation.h b/src/plugins/projectexplorer/kitinformation.h index c206b0d4dd6..aa121fce558 100644 --- a/src/plugins/projectexplorer/kitinformation.h +++ b/src/plugins/projectexplorer/kitinformation.h @@ -64,7 +64,7 @@ public: KitConfigWidget *createConfigWidget(Kit *k) const; - ItemList toUserOutput(Kit *k) const; + ItemList toUserOutput(const Kit *k) const; static bool hasSysRoot(const Kit *k); static Utils::FileName sysRoot(const Kit *k); @@ -110,7 +110,7 @@ public: QString displayNamePostfix(const Kit *k) const; - ItemList toUserOutput(Kit *k) const; + ItemList toUserOutput(const Kit *k) const; void addToEnvironment(const Kit *k, Utils::Environment &env) const; IOutputParser *createOutputParser(const Kit *k) const; @@ -158,7 +158,7 @@ public: KitConfigWidget *createConfigWidget(Kit *k) const; - ItemList toUserOutput(Kit *k) const; + ItemList toUserOutput(const Kit *k) const; static const Core::Id deviceTypeId(const Kit *k); static void setDeviceTypeId(Kit *k, Core::Id type); @@ -205,7 +205,7 @@ public: QString displayNamePostfix(const Kit *k) const; - ItemList toUserOutput(Kit *k) const; + ItemList toUserOutput(const Kit *k) const; static IDevice::ConstPtr device(const Kit *k); static Core::Id deviceId(const Kit *k); diff --git a/src/plugins/projectexplorer/kitmanager.h b/src/plugins/projectexplorer/kitmanager.h index f9c080e448e..cdd39d00576 100644 --- a/src/plugins/projectexplorer/kitmanager.h +++ b/src/plugins/projectexplorer/kitmanager.h @@ -81,7 +81,7 @@ public: // called on initial setup of a kit. virtual void setup(Kit *) { return; } - virtual ItemList toUserOutput(Kit *) const = 0; + virtual ItemList toUserOutput(const Kit *) const = 0; virtual KitConfigWidget *createConfigWidget(Kit *) const = 0; diff --git a/src/plugins/qt4projectmanager/qmakekitinformation.cpp b/src/plugins/qt4projectmanager/qmakekitinformation.cpp index 692e18ab757..4bd05d102a2 100644 --- a/src/plugins/qt4projectmanager/qmakekitinformation.cpp +++ b/src/plugins/qt4projectmanager/qmakekitinformation.cpp @@ -114,7 +114,7 @@ QmakeKitInformation::createConfigWidget(ProjectExplorer::Kit *k) const return new Internal::QmakeKitConfigWidget(k); } -ProjectExplorer::KitInformation::ItemList QmakeKitInformation::toUserOutput(ProjectExplorer::Kit *k) const +ProjectExplorer::KitInformation::ItemList QmakeKitInformation::toUserOutput(const ProjectExplorer::Kit *k) const { return ItemList() << qMakePair(tr("mkspec"), mkspec(k).toUserOutput()); } diff --git a/src/plugins/qt4projectmanager/qmakekitinformation.h b/src/plugins/qt4projectmanager/qmakekitinformation.h index 62d836821ab..5450e0d6442 100644 --- a/src/plugins/qt4projectmanager/qmakekitinformation.h +++ b/src/plugins/qt4projectmanager/qmakekitinformation.h @@ -54,7 +54,7 @@ public: ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *k) const; - ItemList toUserOutput(ProjectExplorer::Kit *k) const; + ItemList toUserOutput(const ProjectExplorer::Kit *k) const; static void setMkspec(ProjectExplorer::Kit *k, const Utils::FileName &fn); static Utils::FileName mkspec(const ProjectExplorer::Kit *k); diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp index a4643a838f7..def3b7ccb3f 100644 --- a/src/plugins/qtsupport/qtkitinformation.cpp +++ b/src/plugins/qtsupport/qtkitinformation.cpp @@ -114,7 +114,7 @@ QString QtKitInformation::displayNamePostfix(const ProjectExplorer::Kit *k) cons } ProjectExplorer::KitInformation::ItemList -QtKitInformation::toUserOutput(ProjectExplorer::Kit *k) const +QtKitInformation::toUserOutput(const ProjectExplorer::Kit *k) const { BaseQtVersion *version = qtVersion(k); return ItemList() << qMakePair(tr("Qt version"), version ? version->displayName() : tr("None")); diff --git a/src/plugins/qtsupport/qtkitinformation.h b/src/plugins/qtsupport/qtkitinformation.h index 5efca50a591..f783789f4c2 100644 --- a/src/plugins/qtsupport/qtkitinformation.h +++ b/src/plugins/qtsupport/qtkitinformation.h @@ -58,7 +58,7 @@ public: QString displayNamePostfix(const ProjectExplorer::Kit *k) const; - ItemList toUserOutput(ProjectExplorer::Kit *k) const; + ItemList toUserOutput(const ProjectExplorer::Kit *k) const; void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const; ProjectExplorer::IOutputParser *createOutputParser(const ProjectExplorer::Kit *k) const;