diff options
Diffstat (limited to 'src/plugins/mercurial/mercurialjobrunner.h')
-rw-r--r-- | src/plugins/mercurial/mercurialjobrunner.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/mercurial/mercurialjobrunner.h b/src/plugins/mercurial/mercurialjobrunner.h index ef9c7856c8..77f332b919 100644 --- a/src/plugins/mercurial/mercurialjobrunner.h +++ b/src/plugins/mercurial/mercurialjobrunner.h @@ -38,6 +38,7 @@ #include <QtCore/QSharedPointer> #include <QtCore/QVariant> #include <QtCore/QString> +#include <QtCore/QPointer> QT_BEGIN_NAMESPACE class QProcess; @@ -64,10 +65,10 @@ public: VCSBase::VCSBaseEditor *editor, const QVariant &cookie = QVariant()); - bool shouldEmit() { return emitRaw; } - VCSBase::VCSBaseEditor* displayEditor() { return editor; } - QStringList args() { return arguments; } - QString repositoryRoot() { return m_repositoryRoot; } + bool shouldEmit() const { return emitRaw; } + VCSBase::VCSBaseEditor* displayEditor() const; + QStringList args() const { return arguments; } + QString repositoryRoot() const { return m_repositoryRoot; } signals: void succeeded(const QVariant &cookie); // Use a queued connection @@ -81,7 +82,7 @@ private: const QStringList arguments; const bool emitRaw; const QVariant m_cookie; - VCSBase::VCSBaseEditor *editor; + QPointer<VCSBase::VCSBaseEditor> editor; // User might close it. }; /* A job queue running in a separate thread, executing commands |