TreeModel: Re-order template arguments for tree levels

More natural and easier to extend to use parameter packs later.

Adjust users.

Change-Id: Ic167196cc969d18bb1615084397e884f769d1e85
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2016-06-22 16:17:10 +02:00
parent 075a6f6805
commit 2536c2bfc7
7 changed files with 9 additions and 9 deletions

View File

@@ -241,9 +241,9 @@ protected:
// A multi-level model with uniform types per level. // A multi-level model with uniform types per level.
// All items below second level have to have identitical types. // All items below second level have to have identitical types.
template <class FirstLevelItem, template <class RootItem,
class SecondLevelItem = FirstLevelItem, class FirstLevelItem,
class RootItem = TreeItem> class SecondLevelItem = FirstLevelItem>
class LeveledTreeModel : public TreeModel class LeveledTreeModel : public TreeModel
{ {
public: public:

View File

@@ -56,7 +56,7 @@ class CMakeToolTreeItem;
// CMakeToolItemModel // CMakeToolItemModel
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
class CMakeToolItemModel : public LeveledTreeModel<TreeItem, CMakeToolTreeItem> class CMakeToolItemModel : public LeveledTreeModel<TreeItem, TreeItem, CMakeToolTreeItem>
{ {
Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::CMakeSettingsPage) Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::CMakeSettingsPage)

View File

@@ -157,7 +157,7 @@ inline uint qHash(const Debugger::Internal::Breakpoint &b) { return b.hash(); }
typedef QList<Breakpoint> Breakpoints; typedef QList<Breakpoint> Breakpoints;
class BreakHandler : public Utils::LeveledTreeModel<BreakpointItem, LocationItem> class BreakHandler : public Utils::LeveledTreeModel<Utils::TreeItem, BreakpointItem, LocationItem>
{ {
Q_OBJECT Q_OBJECT

View File

@@ -99,7 +99,7 @@ public:
// DebuggerItemModel // DebuggerItemModel
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
class DebuggerItemModel : public LeveledTreeModel<StaticTreeItem, DebuggerTreeItem> class DebuggerItemModel : public LeveledTreeModel<TreeItem, StaticTreeItem, DebuggerTreeItem>
{ {
Q_DECLARE_TR_FUNCTIONS(Debugger::DebuggerOptionsPage) Q_DECLARE_TR_FUNCTIONS(Debugger::DebuggerOptionsPage)

View File

@@ -41,7 +41,7 @@ namespace Internal {
class GdbMi; class GdbMi;
class ThreadItem; class ThreadItem;
class ThreadsHandler : public Utils::LeveledTreeModel<ThreadItem> class ThreadsHandler : public Utils::LeveledTreeModel<Utils::TreeItem, ThreadItem>
{ {
Q_OBJECT Q_OBJECT

View File

@@ -103,7 +103,7 @@ public:
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
KitModel::KitModel(QBoxLayout *parentLayout, QObject *parent) KitModel::KitModel(QBoxLayout *parentLayout, QObject *parent)
: LeveledTreeModel<TreeItem, KitNode>(parent), : LeveledTreeModel<TreeItem, TreeItem, KitNode>(parent),
m_parentLayout(parentLayout) m_parentLayout(parentLayout)
{ {
setHeader(QStringList(tr("Name"))); setHeader(QStringList(tr("Name")));

View File

@@ -48,7 +48,7 @@ class KitNode;
// KitModel: // KitModel:
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
class KitModel : public Utils::LeveledTreeModel<Utils::TreeItem, KitNode> class KitModel : public Utils::LeveledTreeModel<Utils::TreeItem, Utils::TreeItem, KitNode>
{ {
Q_OBJECT Q_OBJECT