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

Task/ProcessProgress: Delete private data on destruction

Browse Source 
Change-Id: I81787984ff8dbb541f88922c90e51a68184c392b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Jarek Kobus
2023-01-04 16:12:55 +01:00
parent 2f39b51bdc
commit 4e58ffcd13
4 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/coreplugin/progressmanager/processprogress.cpp
View File

@@ -107,6 +107,8 @@ ProcessProgress::ProcessProgress(QtcProcess *process)
}); });
} }
ProcessProgress::~ProcessProgress() = default;
void ProcessProgress::setDisplayName(const QString &name) void ProcessProgress::setDisplayName(const QString &name)
{ {
d->m_displayName = name; d->m_displayName = name;
@@ -123,9 +125,9 @@ void ProcessProgress::setProgressParser(const ProgressParser &parser)
{ {
if (d->m_parser) { if (d->m_parser) {
disconnect(d->m_process, &QtcProcess::textOnStandardOutput, disconnect(d->m_process, &QtcProcess::textOnStandardOutput,
d, &ProcessProgressPrivate::parseProgress); d.get(), &ProcessProgressPrivate::parseProgress);
disconnect(d->m_process, &QtcProcess::textOnStandardError, disconnect(d->m_process, &QtcProcess::textOnStandardError,
d, &ProcessProgressPrivate::parseProgress); d.get(), &ProcessProgressPrivate::parseProgress);
} }
d->m_parser = parser; d->m_parser = parser;
if (!d->m_parser) if (!d->m_parser)
@@ -136,9 +138,9 @@ void ProcessProgress::setProgressParser(const ProgressParser &parser)
"text channel mode is no-op."); "text channel mode is no-op.");
connect(d->m_process, &QtcProcess::textOnStandardOutput, connect(d->m_process, &QtcProcess::textOnStandardOutput,
d, &ProcessProgressPrivate::parseProgress); d.get(), &ProcessProgressPrivate::parseProgress);
connect(d->m_process, &QtcProcess::textOnStandardError, connect(d->m_process, &QtcProcess::textOnStandardError,
d, &ProcessProgressPrivate::parseProgress); d.get(), &ProcessProgressPrivate::parseProgress);
} }
} // namespace Core } // namespace Core

12
src/plugins/coreplugin/progressmanager/processprogress.h
View File

@@ -3,15 +3,12 @@
#pragma once #pragma once
#include <coreplugin/core_global.h> #include "../core_global.h"
#include "futureprogress.h"
#include <QObject> #include <QObject>
QT_BEGIN_NAMESPACE
template <typename T>
class QFutureInterface;
QT_END_NAMESPACE
namespace Utils { class QtcProcess; } namespace Utils { class QtcProcess; }
namespace Core { namespace Core {
@@ -24,13 +21,14 @@ class CORE_EXPORT ProcessProgress : public QObject
{ {
public: public:
ProcessProgress(Utils::QtcProcess *process); // Makes ProcessProgress a child of process ProcessProgress(Utils::QtcProcess *process); // Makes ProcessProgress a child of process
~ProcessProgress() override;
void setDisplayName(const QString &name); void setDisplayName(const QString &name);
void setKeepOnFinish(FutureProgress::KeepOnFinishType keepType); void setKeepOnFinish(FutureProgress::KeepOnFinishType keepType);
void setProgressParser(const ProgressParser &parser); void setProgressParser(const ProgressParser &parser);
private: private:
ProcessProgressPrivate *d; std::unique_ptr<ProcessProgressPrivate> d;
}; };
} // namespace Core } // namespace Core

2
src/plugins/coreplugin/progressmanager/taskprogress.cpp
View File

@@ -131,6 +131,8 @@ TaskProgress::TaskProgress(TaskTree *taskTree)
}); });
} }
TaskProgress::~TaskProgress() = default;
void TaskProgress::setHalfLifeTimePerTask(int msecs) void TaskProgress::setHalfLifeTimePerTask(int msecs)
{ {
d->m_halfLifeTimePerTask = msecs; d->m_halfLifeTimePerTask = msecs;

7
src/plugins/coreplugin/progressmanager/taskprogress.h
View File

@@ -3,9 +3,9 @@
#pragma once #pragma once
#include <coreplugin/core_global.h> #include "../core_global.h"
#include "futureprogress.h" // TODO: just because of KeepOnFinishType enum - move it outside #include "futureprogress.h"
#include <QObject> #include <QObject>
@@ -19,6 +19,7 @@ class CORE_EXPORT TaskProgress : public QObject
{ {
public: public:
TaskProgress(Utils::TaskTree *taskTree); // Makes TaskProgress a child of task tree TaskProgress(Utils::TaskTree *taskTree); // Makes TaskProgress a child of task tree
~TaskProgress() override;
void setHalfLifeTimePerTask(int msecs); // Default is 1000 ms void setHalfLifeTimePerTask(int msecs); // Default is 1000 ms
void setDisplayName(const QString &name); void setDisplayName(const QString &name);
@@ -27,7 +28,7 @@ public:
void setSubtitle(const QString &subtitle); void setSubtitle(const QString &subtitle);
private: private:
TaskProgressPrivate *d; std::unique_ptr<TaskProgressPrivate> d;
}; };
} // namespace Core } // namespace Core