aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/vcsbase/vcsjobrunner.h
diff options
context:
space:
mode:
authorcerf <[email protected]>2011-10-05 15:32:16 +0000
committerTobias Hunger <[email protected]>2011-10-05 17:33:28 +0200
commit6a72edb28aae97c01d787b10f2b6b8d44d7c43fa (patch)
tree6abacbad4fbab2cb37716d7de58f5afc1b609d33 /src/plugins/vcsbase/vcsjobrunner.h
parentd74a866bc64f511daf604846af9f94a79d3bb52d (diff)
vcsbase: throw away VCSJobRunner, replaced by GitCommand
VCSBase::Command was created from GitCommand, it replaces VCSJobRunner. VCSBase::Command is simpler to use (in VCSBaseClient) and commands can show up in the progress manager. From now on, the git plugin can easily rely on vcsbase. Change-Id: I40593f354249cd94a4c79e90f9bf1362ff3bf5ec Merge-request: 394 Reviewed-by: Tobias Hunger <[email protected]> Reviewed-on: http://codereview.qt-project.org/6078
Diffstat (limited to 'src/plugins/vcsbase/vcsjobrunner.h')
-rw-r--r--src/plugins/vcsbase/vcsjobrunner.h134
1 files changed, 0 insertions, 134 deletions
diff --git a/src/plugins/vcsbase/vcsjobrunner.h b/src/plugins/vcsbase/vcsjobrunner.h
deleted file mode 100644
index ece94fa7dd0..00000000000
--- a/src/plugins/vcsbase/vcsjobrunner.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2010 Brian McGillion & Hugues Delorme
-**
-** Contact: Nokia Corporation ([email protected])
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at [email protected].
-**
-**************************************************************************/
-
-#ifndef VCSJOBRUNNER_H
-#define VCSJOBRUNNER_H
-
-#include "vcsbase_global.h"
-
-#include <QtCore/QThread>
-#include <QtCore/QStringList>
-#include <QtCore/QString>
-#include <QtCore/QPointer>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QVariant>
-
-QT_BEGIN_NAMESPACE
-class QProcess;
-QT_END_NAMESPACE
-
-namespace VCSBase {
-class VCSBaseEditorWidget;
-class VCSJobRunnerPrivate;
-
-class VCSBASE_EXPORT VCSJob : public QObject
-{
- Q_OBJECT
-
-public:
- enum DataEmitMode {
- NoDataEmitMode,
- RawDataEmitMode,
- EditorDataEmitMode
- };
-
- VCSJob(const QString &workingDir, const QStringList &args,
- DataEmitMode emitMode = NoDataEmitMode);
- VCSJob(const QString &workingDir, const QStringList &args,
- VCSBase::VCSBaseEditorWidget *editor);
-
- DataEmitMode dataEmitMode() const;
- VCSBase::VCSBaseEditorWidget *displayEditor() const;
- QStringList arguments() const;
- QString workingDirectory() const;
- const QVariant &cookie() const;
- bool unixTerminalDisabled() const;
-
- void setDisplayEditor(VCSBase::VCSBaseEditorWidget *editor);
- void setCookie(const QVariant &cookie);
- // Disable terminal to suppress SSH prompting
- void setUnixTerminalDisabled(bool v);
-
-signals:
- void succeeded(const QVariant &cookie); // Use a queued connection
- void rawData(const QByteArray &data);
-
-private:
- friend class VCSJobRunner;
- const QString m_workingDir;
- const QStringList m_arguments;
- bool m_emitRaw;
- QVariant m_cookie;
- QPointer<VCSBase::VCSBaseEditorWidget> m_editor; // User might close it
- bool m_unixTerminalDisabled;
-};
-
-class VCSBASE_EXPORT VCSJobRunner : public QThread
-{
- Q_OBJECT
-
-public:
- VCSJobRunner();
- ~VCSJobRunner();
- void enqueueJob(const QSharedPointer<VCSJob> &job);
- void restart();
-
- static QString msgStartFailed(const QString &binary, const QString &why);
- static QString msgTimeout(const QString &binary, int timeoutSeconds);
-
- // Set environment for a VCS process to run in locale "C"
- static void setProcessEnvironment(QProcess *p);
-
- const QString &binary() const;
- void setBinary(const QString &bin);
-
- int timeoutMs() const;
- void setTimeoutMs(int msec);
-
-protected:
- void run();
-
-signals:
- void commandStarted(const QString &notice);
- void error(const QString &error);
- void output(const QByteArray &output);
-
-private:
- void task(const QSharedPointer<VCSJob> &job);
- void stop();
-
- VCSJobRunnerPrivate *d;
-};
-
-} //namespace VCSBase
-
-#endif // VCSJOBRUNNER_H