forked from qt-creator/qt-creator
Removed unused source files that mentioned "Workbench". While at it,
also removed all code inside USE_P4_API. Gits history be our backup, if we ever want to use the P4 Api directly in the future.
This commit is contained in:
@@ -30,7 +30,6 @@
|
||||
#include "perforceplugin.h"
|
||||
|
||||
#include "changenumberdialog.h"
|
||||
#include "p4.h"
|
||||
#include "pendingchangesdialog.h"
|
||||
#include "perforceconstants.h"
|
||||
#include "perforceeditor.h"
|
||||
@@ -188,9 +187,6 @@ PerforcePlugin::PerforcePlugin() :
|
||||
m_undoAction(0),
|
||||
m_redoAction(0),
|
||||
m_changeTmpFile(0),
|
||||
#ifdef USE_P4_API
|
||||
m_workbenchClientUser(0),
|
||||
#endif
|
||||
m_coreListener(0),
|
||||
m_submitEditorFactory(0),
|
||||
m_versionControl(0)
|
||||
@@ -334,13 +330,6 @@ bool PerforcePlugin::initialize(const QStringList &arguments, QString *errorMess
|
||||
connect(m_openedAction, SIGNAL(triggered()), this, SLOT(printOpenedFileList()));
|
||||
mperforce->addAction(command);
|
||||
|
||||
#ifdef USE_P4_API
|
||||
m_resolveAction = new QAction(tr("Resolve"), this);
|
||||
command = am->registerAction(m_resolveAction, PerforcePlugin::RESOLVE, globalcontext);
|
||||
connect(m_resolveAction, SIGNAL(triggered()), this, SLOT(resolve()));
|
||||
mperforce->addAction(command);
|
||||
#endif
|
||||
|
||||
m_submitAction = new QAction(tr("Submit Project"), this);
|
||||
command = am->registerAction(m_submitAction, PerforcePlugin::SUBMIT, globalcontext);
|
||||
command->setDefaultKeySequence(QKeySequence(tr("Alt+P,Alt+S")));
|
||||
@@ -493,14 +482,6 @@ void PerforcePlugin::printOpenedFileList()
|
||||
PerforceResponse result = runP4Cmd(QStringList() << QLatin1String("opened"), QStringList(), CommandToWindow|StdOutToWindow|StdErrToWindow|ErrorToWindow);
|
||||
}
|
||||
|
||||
#ifdef USE_P4_API
|
||||
void PerforcePlugin::resolve()
|
||||
{
|
||||
m_workbenchClientUser->setMode(WorkbenchClientUser::Resolve);
|
||||
runP4APICmd(QLatin1String("resolve"));
|
||||
}
|
||||
#endif
|
||||
|
||||
void PerforcePlugin::submit()
|
||||
{
|
||||
if (!checkP4Command()) {
|
||||
@@ -689,11 +670,6 @@ void PerforcePlugin::updateActions()
|
||||
m_annotateAction->setEnabled(true);
|
||||
m_filelogAction->setEnabled(true);
|
||||
m_pendingAction->setEnabled(true);
|
||||
|
||||
|
||||
#ifdef USE_P4_API
|
||||
m_resolveAction->setEnabled(m_enableP4APIActions);
|
||||
#endif
|
||||
}
|
||||
|
||||
bool PerforcePlugin::managesDirectory(const QString &directory) const
|
||||
|
Reference in New Issue
Block a user