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

TaskTree: Prepare for de-utils-ization - part 2

Browse Source 
Move TaskTree into Tasking namespace.
Move Tasking namespace out of Utils namespace.

Change-Id: Ib4c1d7f54f1808517e54768dfa27209c33517b61
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2023-05-10 19:54:52 +02:00
parent 5a73d07c72
commit 97a66067bb
63 changed files with 142 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/git/branchview.h
View File

@@ -17,10 +17,11 @@ class QToolButton;
class QTreeView;
QT_END_NAMESPACE;
namespace Tasking { class TaskTree; }
namespace Utils {
class ElidingLabel;
class NavigationTreeView;
class TaskTree;
} // Utils
namespace Git::Internal {
@@ -55,7 +56,7 @@ private:
bool remove();
bool rename();
bool reset(const QByteArray &resetType);
Utils::TaskTree *onFastForwardMerge(const std::function<void()> &callback);
Tasking::TaskTree *onFastForwardMerge(const std::function<void()> &callback);
bool merge(bool allowFastForward);
void rebase();
bool cherryPick();