forked from qt-creator/qt-creator
Perforce: Remove dead ends
Detected by Axivion plugin. Change-Id: I8be6968d8f485528f936526b676b2ff8e8c0f0ba Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
@@ -16,8 +16,7 @@
|
|||||||
|
|
||||||
using namespace Utils;
|
using namespace Utils;
|
||||||
|
|
||||||
namespace Perforce {
|
namespace Perforce::Internal {
|
||||||
namespace Internal {
|
|
||||||
|
|
||||||
PerforceChecker::PerforceChecker(QObject *parent) : QObject(parent)
|
PerforceChecker::PerforceChecker(QObject *parent) : QObject(parent)
|
||||||
{
|
{
|
||||||
@@ -186,16 +185,9 @@ void PerforceChecker::emitSucceeded(const QString &m)
|
|||||||
emit succeeded(FilePath::fromString(m));
|
emit succeeded(FilePath::fromString(m));
|
||||||
}
|
}
|
||||||
|
|
||||||
bool PerforceChecker::useOverideCursor() const
|
|
||||||
{
|
|
||||||
return m_useOverideCursor;
|
|
||||||
}
|
|
||||||
|
|
||||||
void PerforceChecker::setUseOverideCursor(bool v)
|
void PerforceChecker::setUseOverideCursor(bool v)
|
||||||
{
|
{
|
||||||
m_useOverideCursor = v;
|
m_useOverideCursor = v;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
} // Perforce::Internal
|
||||||
}
|
|
||||||
|
|
||||||
|
@@ -28,7 +28,6 @@ public:
|
|||||||
|
|
||||||
bool waitForFinished();
|
bool waitForFinished();
|
||||||
|
|
||||||
bool useOverideCursor() const;
|
|
||||||
void setUseOverideCursor(bool v);
|
void setUseOverideCursor(bool v);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
|
@@ -255,7 +255,6 @@ public:
|
|||||||
const QByteArray &stdInput,
|
const QByteArray &stdInput,
|
||||||
QTextCodec *outputCodec) const;
|
QTextCodec *outputCodec) const;
|
||||||
|
|
||||||
QString clientFilePath(const QString &serverFilePath);
|
|
||||||
void annotate(const FilePath &workingDir, const QString &fileName,
|
void annotate(const FilePath &workingDir, const QString &fileName,
|
||||||
const QString &changeList = QString(), int lineNumber = -1);
|
const QString &changeList = QString(), int lineNumber = -1);
|
||||||
void filelog(const FilePath &workingDir, const QString &fileName = QString(),
|
void filelog(const FilePath &workingDir, const QString &fileName = QString(),
|
||||||
@@ -1437,22 +1436,6 @@ bool PerforcePluginPrivate::activateCommit()
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString PerforcePluginPrivate::clientFilePath(const QString &serverFilePath)
|
|
||||||
{
|
|
||||||
QTC_ASSERT(settings().isValid(), return QString());
|
|
||||||
|
|
||||||
QStringList args;
|
|
||||||
args << QLatin1String("fstat") << serverFilePath;
|
|
||||||
const PerforceResponse response = runP4Cmd(settings().topLevelSymLinkTarget(), args,
|
|
||||||
ShowBusyCursor|RunFullySynchronous|CommandToWindow|StdErrToWindow|ErrorToWindow);
|
|
||||||
if (response.error)
|
|
||||||
return {};
|
|
||||||
|
|
||||||
static const QRegularExpression r("\\.\\.\\.\\sclientFile\\s(.+?)\n");
|
|
||||||
const QRegularExpressionMatch match = r.match(response.stdOut);
|
|
||||||
return match.hasMatch() ? match.captured(1).trimmed() : QString();
|
|
||||||
}
|
|
||||||
|
|
||||||
QString PerforcePluginPrivate::pendingChangesData()
|
QString PerforcePluginPrivate::pendingChangesData()
|
||||||
{
|
{
|
||||||
QTC_ASSERT(settings().isValid(), return QString());
|
QTC_ASSERT(settings().isValid(), return QString());
|
||||||
|
@@ -42,7 +42,6 @@ public:
|
|||||||
QString *errorMessage);
|
QString *errorMessage);
|
||||||
|
|
||||||
int longTimeOutS() const { return timeOutS() * 10; }
|
int longTimeOutS() const { return timeOutS() * 10; }
|
||||||
int timeOutMS() const { return timeOutS() * 1000; }
|
|
||||||
|
|
||||||
Utils::FilePath topLevel() const;
|
Utils::FilePath topLevel() const;
|
||||||
Utils::FilePath topLevelSymLinkTarget() const;
|
Utils::FilePath topLevelSymLinkTarget() const;
|
||||||
|
Reference in New Issue
Block a user