aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/perforce
diff options
context:
space:
mode:
authorcon <qtc-committer@nokia.com>2009-11-10 18:02:42 +0100
committercon <qtc-committer@nokia.com>2009-11-10 18:19:37 +0100
commite4b1a25dd2bb8233a02c7ae5a5476e88ac4f0451 (patch)
tree01bc276d22f11b8196f6e64c86cd62887a8f9459 /src/plugins/perforce
parent3cd7f49e71f263a5cc80cac90d5b15a2bbde0b56 (diff)
Revert "Code model: Update on changes from the versioning system."
This reverts commit 7aa24116935249a840e1350a6f8de73bc794fb09. It breaks the code model updates completely. So reverting this change until we have the right thing. Reviewed-by: Roberto Raggi
Diffstat (limited to 'src/plugins/perforce')
-rw-r--r--src/plugins/perforce/perforceplugin.cpp7
-rw-r--r--src/plugins/perforce/perforceversioncontrol.cpp10
-rw-r--r--src/plugins/perforce/perforceversioncontrol.h3
3 files changed, 1 insertions, 19 deletions
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index a80d8f5597..7039798b09 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -454,8 +454,6 @@ void PerforcePlugin::revertCurrentFile()
Core::FileChangeBlocker fcb(fileName);
fcb.setModifiedReload(true);
PerforceResponse result2 = runP4Cmd(QStringList() << QLatin1String("revert") << fileName, QStringList(), CommandToWindow|StdOutToWindow|StdErrToWindow|ErrorToWindow);
- if (!result2.error)
- m_versionControl->emitFilesChanged(QStringList(fileName));
}
void PerforcePlugin::diffCurrentFile()
@@ -516,10 +514,7 @@ void PerforcePlugin::updateCheckout(const QStringList &dirs)
{
QStringList args(QLatin1String("sync"));
args.append(dirs);
- const PerforceResponse resp = runP4Cmd(args, QStringList(), CommandToWindow|StdOutToWindow|StdErrToWindow|ErrorToWindow);
- if (!dirs.empty())
- foreach(const QString &dir, dirs)
- m_versionControl->emitRepositoryChanged(dir);
+ runP4Cmd(args, QStringList(), CommandToWindow|StdOutToWindow|StdErrToWindow|ErrorToWindow);
}
void PerforcePlugin::printOpenedFileList()
diff --git a/src/plugins/perforce/perforceversioncontrol.cpp b/src/plugins/perforce/perforceversioncontrol.cpp
index ad915b2a20..040692428d 100644
--- a/src/plugins/perforce/perforceversioncontrol.cpp
+++ b/src/plugins/perforce/perforceversioncontrol.cpp
@@ -94,15 +94,5 @@ QString PerforceVersionControl::findTopLevelForDirectory(const QString &director
return m_plugin->findTopLevelForDirectory(directory);
}
-void PerforceVersionControl::emitRepositoryChanged(const QString &s)
-{
- emit repositoryChanged(s);
-}
-
-void PerforceVersionControl::emitFilesChanged(const QStringList &l)
-{
- emit filesChanged(l);
-}
-
} // Internal
} // Perforce
diff --git a/src/plugins/perforce/perforceversioncontrol.h b/src/plugins/perforce/perforceversioncontrol.h
index dd385061cb..2992e5518b 100644
--- a/src/plugins/perforce/perforceversioncontrol.h
+++ b/src/plugins/perforce/perforceversioncontrol.h
@@ -56,9 +56,6 @@ public:
virtual bool vcsAdd(const QString &fileName);
virtual bool vcsDelete(const QString &filename);
- void emitRepositoryChanged(const QString &s);
- void emitFilesChanged(const QStringList &l);
-
signals:
void enabledChanged(bool);