From db9e6104cd6bd0d159d9baa32917ac67879b348b Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Fri, 25 Jun 2010 13:12:50 +0200
Subject: [PATCH] Core::Context: missed one connect()
---
src/plugins/coreplugin/filemanager.cpp | 2 +-
src/plugins/vcsbase/vcsbasesubmiteditor.h | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/plugins/coreplugin/filemanager.cpp b/src/plugins/coreplugin/filemanager.cpp
index 5fe93bcb651..ccad6c2e108 100644
--- a/src/plugins/coreplugin/filemanager.cpp
+++ b/src/plugins/coreplugin/filemanager.cpp
@@ -155,7 +155,7 @@ FileManager::FileManager(QMainWindow *mw)
this, SLOT(changedFile(QString)));
connect(d->m_mainWindow, SIGNAL(windowActivated()),
this, SLOT(mainWindowActivated()));
- connect(core, SIGNAL(contextChanged(Core::IContext*,QList<int>)),
+ connect(core, SIGNAL(contextChanged(Core::IContext*,Core::Context)),
this, SLOT(syncWithEditor(Core::IContext*)));
const QSettings *s = core->settings();
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.h b/src/plugins/vcsbase/vcsbasesubmiteditor.h
index 545e213836c..414aa4bdb14 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.h
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.h
@@ -34,7 +34,6 @@
#include <coreplugin/editormanager/ieditor.h>
-#include <QtCore/QList>
#include <QtGui/QAbstractItemView>
QT_BEGIN_NAMESPACE
@@ -91,8 +90,6 @@ class VCSBASE_EXPORT VCSBaseSubmitEditor : public Core::IEditor
Q_PROPERTY(bool lineWrap READ lineWrap WRITE setLineWrap DESIGNABLE true)
Q_PROPERTY(int lineWrapWidth READ lineWrapWidth WRITE setLineWrapWidth DESIGNABLE true)
Q_PROPERTY(QString checkScriptWorkingDirectory READ checkScriptWorkingDirectory WRITE setCheckScriptWorkingDirectory DESIGNABLE true)
-public:
- typedef QList<int> Context;
protected:
explicit VCSBaseSubmitEditor(const VCSBaseSubmitEditorParameters *parameters,
--
GitLab