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

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

View File

@@ -20,6 +20,7 @@
#include <set>
using namespace Tasking;
using namespace Utils;
using namespace VcsBase;
@@ -413,7 +414,6 @@ void BranchModel::refresh(const FilePath &workingDirectory, ShowError showError)
return;
}
using namespace Tasking;
const ProcessTask topRevisionProc =
d->client->topRevision(workingDirectory,
[=](const QString &ref, const QDateTime &dateTime) {

View File

@@ -37,6 +37,7 @@
#include <QVBoxLayout>
using namespace Core;
using namespace Tasking;
using namespace Utils;
using namespace VcsBase;
@@ -527,8 +528,6 @@ bool BranchView::reset(const QByteArray &resetType)
TaskTree *BranchView::onFastForwardMerge(const std::function<void()> &callback)
{
using namespace Tasking;
const QModelIndex selected = selectedIndex();
QTC_CHECK(selected != m_model->currentBranch());

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();

View File

@@ -76,6 +76,7 @@ const char showFormatC[] =
using namespace Core;
using namespace DiffEditor;
using namespace Tasking;
using namespace Utils;
using namespace VcsBase;
@@ -1730,12 +1731,9 @@ bool GitClient::synchronousRevParseCmd(const FilePath &workingDirectory, const Q
}
// Retrieve head revision
Utils::Tasking::ProcessTask GitClient::topRevision(
const FilePath &workingDirectory,
ProcessTask GitClient::topRevision(const FilePath &workingDirectory,
const std::function<void(const QString &, const QDateTime &)> &callback)
{
using namespace Tasking;
const auto setupProcess = [=](Process &process) {
setupCommand(process, workingDirectory, {"show", "-s", "--pretty=format:%H:%ct", HEAD});
};

View File

@@ -242,8 +242,7 @@ public:
QString synchronousTopic(const Utils::FilePath &workingDirectory) const;
bool synchronousRevParseCmd(const Utils::FilePath &workingDirectory, const QString &ref,
QString *output, QString *errorMessage = nullptr) const;
Utils::Tasking::ProcessTask topRevision(
const Utils::FilePath &workingDirectory,
Tasking::ProcessTask topRevision(const Utils::FilePath &workingDirectory,
const std::function<void(const QString &, const QDateTime &)> &callback);
bool isRemoteCommit(const Utils::FilePath &workingDirectory, const QString &commit);