diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/libs/utils/treemodel.h | 6 | ||||
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmakesettingspage.cpp | 2 | ||||
-rw-r--r-- | src/plugins/debugger/breakhandler.h | 2 | ||||
-rw-r--r-- | src/plugins/debugger/debuggeroptionspage.cpp | 2 | ||||
-rw-r--r-- | src/plugins/debugger/threadshandler.h | 2 | ||||
-rw-r--r-- | src/plugins/projectexplorer/kitmodel.cpp | 2 | ||||
-rw-r--r-- | src/plugins/projectexplorer/kitmodel.h | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/src/libs/utils/treemodel.h b/src/libs/utils/treemodel.h index 815a3cb695..ed2515dee3 100644 --- a/src/libs/utils/treemodel.h +++ b/src/libs/utils/treemodel.h @@ -241,9 +241,9 @@ protected: // A multi-level model with uniform types per level. // All items below second level have to have identitical types. -template <class FirstLevelItem, - class SecondLevelItem = FirstLevelItem, - class RootItem = TreeItem> +template <class RootItem, + class FirstLevelItem, + class SecondLevelItem = FirstLevelItem> class LeveledTreeModel : public TreeModel { public: diff --git a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp index adeae906a5..23ff123df2 100644 --- a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp +++ b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp @@ -56,7 +56,7 @@ class CMakeToolTreeItem; // CMakeToolItemModel // -------------------------------------------------------------------------- -class CMakeToolItemModel : public LeveledTreeModel<TreeItem, CMakeToolTreeItem> +class CMakeToolItemModel : public LeveledTreeModel<TreeItem, TreeItem, CMakeToolTreeItem> { Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::CMakeSettingsPage) diff --git a/src/plugins/debugger/breakhandler.h b/src/plugins/debugger/breakhandler.h index ba1d3e844f..7fda24c4c1 100644 --- a/src/plugins/debugger/breakhandler.h +++ b/src/plugins/debugger/breakhandler.h @@ -157,7 +157,7 @@ inline uint qHash(const Debugger::Internal::Breakpoint &b) { return b.hash(); } typedef QList<Breakpoint> Breakpoints; -class BreakHandler : public Utils::LeveledTreeModel<BreakpointItem, LocationItem> +class BreakHandler : public Utils::LeveledTreeModel<Utils::TreeItem, BreakpointItem, LocationItem> { Q_OBJECT diff --git a/src/plugins/debugger/debuggeroptionspage.cpp b/src/plugins/debugger/debuggeroptionspage.cpp index e9a06c03eb..6026e444f5 100644 --- a/src/plugins/debugger/debuggeroptionspage.cpp +++ b/src/plugins/debugger/debuggeroptionspage.cpp @@ -99,7 +99,7 @@ public: // DebuggerItemModel // -------------------------------------------------------------------------- -class DebuggerItemModel : public LeveledTreeModel<StaticTreeItem, DebuggerTreeItem> +class DebuggerItemModel : public LeveledTreeModel<TreeItem, StaticTreeItem, DebuggerTreeItem> { Q_DECLARE_TR_FUNCTIONS(Debugger::DebuggerOptionsPage) diff --git a/src/plugins/debugger/threadshandler.h b/src/plugins/debugger/threadshandler.h index 83f20ccd9d..9a29b5314e 100644 --- a/src/plugins/debugger/threadshandler.h +++ b/src/plugins/debugger/threadshandler.h @@ -41,7 +41,7 @@ namespace Internal { class GdbMi; class ThreadItem; -class ThreadsHandler : public Utils::LeveledTreeModel<ThreadItem> +class ThreadsHandler : public Utils::LeveledTreeModel<Utils::TreeItem, ThreadItem> { Q_OBJECT diff --git a/src/plugins/projectexplorer/kitmodel.cpp b/src/plugins/projectexplorer/kitmodel.cpp index da5d8472b2..2a63f20c68 100644 --- a/src/plugins/projectexplorer/kitmodel.cpp +++ b/src/plugins/projectexplorer/kitmodel.cpp @@ -103,7 +103,7 @@ public: // -------------------------------------------------------------------------- KitModel::KitModel(QBoxLayout *parentLayout, QObject *parent) - : LeveledTreeModel<TreeItem, KitNode>(parent), + : LeveledTreeModel<TreeItem, TreeItem, KitNode>(parent), m_parentLayout(parentLayout) { setHeader(QStringList(tr("Name"))); diff --git a/src/plugins/projectexplorer/kitmodel.h b/src/plugins/projectexplorer/kitmodel.h index 0e06908d87..299f8f67b5 100644 --- a/src/plugins/projectexplorer/kitmodel.h +++ b/src/plugins/projectexplorer/kitmodel.h @@ -48,7 +48,7 @@ class KitNode; // KitModel: // -------------------------------------------------------------------------- -class KitModel : public Utils::LeveledTreeModel<Utils::TreeItem, KitNode> +class KitModel : public Utils::LeveledTreeModel<Utils::TreeItem, Utils::TreeItem, KitNode> { Q_OBJECT |