::iterator iter = d->plugins.begin();
+ for (; iter != d->plugins.end(); ++iter) {
+ iter.value()->d_func()->client = 0;
+ iter.value()->statusChanged(QDeclarativeDebugClient::NotConnected);
+ }
+}
+
bool QDeclarativeDebugConnection::isConnected() const
{
return state() == ConnectedState;
}
-class QDeclarativeDebugClientPrivate
-{
-public:
- QDeclarativeDebugClientPrivate();
-
- QString name;
- QDeclarativeDebugConnection *client;
- bool enabled;
-};
-
QDeclarativeDebugClientPrivate::QDeclarativeDebugClientPrivate()
-: client(0), enabled(false)
+: client(0)
{
}
QDeclarativeDebugClient::QDeclarativeDebugClient(const QString &name,
QDeclarativeDebugConnection *parent)
- : QObject(parent), d(new QDeclarativeDebugClientPrivate)
+: QObject(parent), d(new QDeclarativeDebugClientPrivate())
{
d->name = name;
d->client = parent;
@@ -133,60 +229,49 @@ QDeclarativeDebugClient::QDeclarativeDebugClient(const QString &name,
d->client = 0;
} else {
d->client->d->plugins.insert(name, this);
+ d->client->d->advertisePlugins();
}
}
-QDeclarativeDebugClient::~QDeclarativeDebugClient() {}
+QDeclarativeDebugClient::~QDeclarativeDebugClient()
+{
+ if (d->client && d->client->d) {
+ d->client->d->plugins.remove(d->name);
+ d->client->d->advertisePlugins();
+ }
+}
QString QDeclarativeDebugClient::name() const
{
return d->name;
}
-bool QDeclarativeDebugClient::isEnabled() const
+QDeclarativeDebugClient::Status QDeclarativeDebugClient::status() const
{
- return d->enabled;
-}
+ if (!d->client
+ || !d->client->isConnected()
+ || !d->client->d->gotHello)
+ return NotConnected;
-void QDeclarativeDebugClient::setEnabled(bool e)
-{
- if (e == d->enabled)
- return;
+ if (d->client->d->serverPlugins.contains(d->name))
+ return Enabled;
- d->enabled = e;
-
- if (d->client) {
- if (e)
- d->client->d->enabled.append(d->name);
- else
- d->client->d->enabled.removeAll(d->name);
-
- if (d->client->state() == QTcpSocket::ConnectedState) {
- QPacket pack;
- pack << QString(QLatin1String("QDeclarativeDebugServer"));
- if (e) pack << (int)1;
- else pack << (int)2;
- pack << d->name;
- d->client->d->protocol->send(pack);
- }
- }
-}
-
-bool QDeclarativeDebugClient::isConnected() const
-{
- if (!d->client)
- return false;
- return d->client->isConnected();
+ return Unavailable;
}
void QDeclarativeDebugClient::sendMessage(const QByteArray &message)
{
- if (!d->client || !d->client->isConnected())
+ if (status() != Enabled)
return;
QPacket pack;
pack << d->name << message;
d->client->d->protocol->send(pack);
+ d->client->flush();
+}
+
+void QDeclarativeDebugClient::statusChanged(Status)
+{
}
void QDeclarativeDebugClient::messageReceived(const QByteArray &)
diff --git a/src/libs/qmljsdebugclient/qdeclarativedebugclient_p.h b/src/libs/qmljsdebugclient/qdeclarativedebugclient_p.h
index ffc3b0d8449..f29e58a1b25 100644
--- a/src/libs/qmljsdebugclient/qdeclarativedebugclient_p.h
+++ b/src/libs/qmljsdebugclient/qdeclarativedebugclient_p.h
@@ -55,6 +55,7 @@ class QDeclarativeDebugConnection : public QTcpSocket
Q_DISABLE_COPY(QDeclarativeDebugConnection)
public:
QDeclarativeDebugConnection(QObject * = 0);
+ ~QDeclarativeDebugConnection();
bool isConnected() const;
private:
@@ -71,19 +72,19 @@ class QDeclarativeDebugClient : public QObject
Q_DISABLE_COPY(QDeclarativeDebugClient)
public:
+ enum Status { NotConnected, Unavailable, Enabled };
+
QDeclarativeDebugClient(const QString &, QDeclarativeDebugConnection *parent);
~QDeclarativeDebugClient();
QString name() const;
- bool isEnabled() const;
- void setEnabled(bool);
-
- bool isConnected() const;
+ Status status() const;
void sendMessage(const QByteArray &);
protected:
+ virtual void statusChanged(Status);
virtual void messageReceived(const QByteArray &);
private:
diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp
index c23853d2272..e9fcdbce71d 100644
--- a/src/libs/utils/buildablehelperlibrary.cpp
+++ b/src/libs/utils/buildablehelperlibrary.cpp
@@ -101,6 +101,33 @@ QString BuildableHelperLibrary::qtVersionForQMake(const QString &qmakePath)
return QString();
}
+bool BuildableHelperLibrary::checkMinimumQtVersion(const QString &qtVersionString, int majorVersion, int minorVersion, int patchVersion)
+{
+ int major = -1;
+ int minor = -1;
+ int patch = -1;
+
+ // check format
+ QRegExp qtVersionRegex(QLatin1String("^\\d+\\.\\d+\\.\\d+$"));
+ if (!qtVersionRegex.exactMatch(qtVersionString))
+ return false;
+
+ QStringList parts = qtVersionString.split(QLatin1Char('.'));
+ major = parts.at(0).toInt();
+ minor = parts.at(1).toInt();
+ patch = parts.at(2).toInt();
+
+ if (major == majorVersion) {
+ if (minor == minorVersion) {
+ if (patch >= patchVersion)
+ return true;
+ } else if (minor > minorVersion)
+ return true;
+ }
+
+ return false;
+}
+
QStringList BuildableHelperLibrary::possibleQMakeCommands()
{
// On windows no one has renamed qmake, right?
diff --git a/src/libs/utils/buildablehelperlibrary.h b/src/libs/utils/buildablehelperlibrary.h
index e4d9eadbc68..fa8a85648c6 100644
--- a/src/libs/utils/buildablehelperlibrary.h
+++ b/src/libs/utils/buildablehelperlibrary.h
@@ -19,6 +19,7 @@ public:
static QString findSystemQt(const Utils::Environment &env);
// return true if the qmake at qmakePath is qt4 (used by QtVersion)
static QString qtVersionForQMake(const QString &qmakePath);
+ static bool checkMinimumQtVersion(const QString &qtversionString, int majorVersion, int minorVersion, int patchVersion);
// returns something like qmake4, qmake, qmake-qt4 or whatever distributions have chosen (used by QtVersion)
static QStringList possibleQMakeCommands();
diff --git a/src/libs/utils/htmldocextractor.cpp b/src/libs/utils/htmldocextractor.cpp
index 0877be15474..41fd38c1ee8 100644
--- a/src/libs/utils/htmldocextractor.cpp
+++ b/src/libs/utils/htmldocextractor.cpp
@@ -180,28 +180,32 @@ void HtmlDocExtractor::processOutput(QString *html) const
return;
if (m_mode == FirstParagraph) {
- int index = html->indexOf(QLatin1String(""));
- if (index > 0) {
- if (html->at(index - 1) == QLatin1Char('.')) {
- index += 4;
- html->truncate(index);
- } else {
- // Paragraphs similar to this. Example:
- index = html->lastIndexOf(QLatin1Char('.'), index);
- if (index > 0) {
- html->truncate(index);
- html->append(QLatin1String("."));
+ // Try to get the entire first paragraph, but if one is not found or if its opening
+ // tag is not in the very beginning (using an empirical value as the limit) the html
+ // is cleared to avoid too much content.
+ int index = html->indexOf(QLatin1String(""));
+ if (index != -1 && index < 400) {
+ index = html->indexOf(QLatin1String("
"), index + 2);
+ if (index != -1) {
+ if (html->at(index - 1) == QLatin1Char('.')) {
+ html->truncate(index + 4);
+ } else {
+ // Paragraphs similar to this. Example:
+ index = html->lastIndexOf(QLatin1Char('.'), index);
+ if (index != -1) {
+ html->truncate(index);
+ html->append(QLatin1String("."));
+ }
}
+ } else {
+ html->clear();
}
} else {
- // Some enumerations don't have paragraphs and just a table with the items. In such
- // cases the the html is cleared to avoid showing more that desired.
html->clear();
- return;
}
}
- if (m_formatContents) {
+ if (!html->isEmpty() && m_formatContents) {
stripBold(html);
replaceNonStyledHeadingsForBold(html);
replaceTablesForSimpleLines(html);
diff --git a/src/libs/utils/submiteditorwidget.cpp b/src/libs/utils/submiteditorwidget.cpp
index 0c8aa30a1c4..10cade5c2e1 100644
--- a/src/libs/utils/submiteditorwidget.cpp
+++ b/src/libs/utils/submiteditorwidget.cpp
@@ -139,7 +139,6 @@ struct SubmitEditorWidgetPrivate
Ui::SubmitEditorWidget m_ui;
bool m_filesSelected;
- bool m_filesChecked;
int m_fileNameColumn;
int m_activatedRow;
bool m_emptyFileListEnabled;
@@ -148,16 +147,18 @@ struct SubmitEditorWidgetPrivate
QVBoxLayout *m_fieldLayout;
QList m_fieldWidgets;
int m_lineWidth;
+
+ bool m_commitEnabled;
};
SubmitEditorWidgetPrivate::SubmitEditorWidgetPrivate() :
m_filesSelected(false),
- m_filesChecked(false),
m_fileNameColumn(1),
m_activatedRow(-1),
m_emptyFileListEnabled(false),
m_fieldLayout(0),
- m_lineWidth(defaultLineWidth)
+ m_lineWidth(defaultLineWidth),
+ m_commitEnabled(false)
{
}
@@ -209,10 +210,10 @@ void SubmitEditorWidget::registerActions(QAction *editorUndoAction, QAction *edi
int count = 0;
if (const QAbstractItemModel *model = m_d->m_ui.fileView->model())
count = model->rowCount();
- qDebug() << Q_FUNC_INFO << submitAction << count << "items" << m_d->m_filesChecked;
+ qDebug() << Q_FUNC_INFO << submitAction << count << "items";
}
- submitAction->setEnabled(m_d->m_filesChecked);
- connect(this, SIGNAL(fileCheckStateChanged(bool)), submitAction, SLOT(setEnabled(bool)));
+ m_d->m_commitEnabled = !canSubmit();
+ connect(this, SIGNAL(submitActionEnabledChanged(bool)), submitAction, SLOT(setEnabled(bool)));
// Wire setText via QActionSetTextSlotHelper.
QActionSetTextSlotHelper *actionSlotHelper = submitAction->findChild();
if (!actionSlotHelper)
@@ -243,7 +244,7 @@ void SubmitEditorWidget::unregisterActions(QAction *editorUndoAction, QAction *
}
if (submitAction) {
- disconnect(this, SIGNAL(fileCheckStateChanged(bool)), submitAction, SLOT(setEnabled(bool)));
+ disconnect(this, SIGNAL(submitActionEnabledChanged(bool)), submitAction, SLOT(setEnabled(bool)));
// Just deactivate the QActionSetTextSlotHelper on the action
disconnect(this, SIGNAL(submitActionTextChanged(QString)), 0, 0);
}
@@ -448,18 +449,20 @@ void SubmitEditorWidget::updateActions()
void SubmitEditorWidget::updateSubmitAction()
{
const unsigned checkedCount = checkedFilesCount();
- const bool newFilesCheckedState = m_d->m_emptyFileListEnabled || checkedCount > 0;
+ const bool newCommitState = canSubmit();
// Emit signal to update action
- if (m_d->m_filesChecked != newFilesCheckedState) {
- m_d->m_filesChecked = newFilesCheckedState;
- emit fileCheckStateChanged(m_d->m_filesChecked);
+ if (m_d->m_commitEnabled != newCommitState) {
+ m_d->m_commitEnabled = newCommitState;
+ emit submitActionEnabledChanged(m_d->m_commitEnabled);
+ }
+ if (m_d->m_ui.fileView && m_d->m_ui.fileView->model()) {
+ // Update button text.
+ const int fileCount = m_d->m_ui.fileView->model()->rowCount();
+ const QString msg = checkedCount ?
+ tr("Commit %1/%n Files", 0, fileCount).arg(checkedCount) :
+ tr("Commit");
+ emit submitActionTextChanged(msg);
}
- // Update button text.
- const int fileCount = m_d->m_ui.fileView->model()->rowCount();
- const QString msg = checkedCount ?
- tr("Commit %1/%n Files", 0, fileCount).arg(checkedCount) :
- tr("Commit");
- emit submitActionTextChanged(msg);
}
// Enable diff depending on selected files
@@ -509,6 +512,12 @@ void SubmitEditorWidget::insertTopWidget(QWidget *w)
m_d->m_ui.vboxLayout->insertWidget(0, w);
}
+bool SubmitEditorWidget::canSubmit() const
+{
+ const unsigned checkedCount = checkedFilesCount();
+ return m_d->m_emptyFileListEnabled || checkedCount > 0;
+}
+
void SubmitEditorWidget::addSubmitFieldWidget(SubmitFieldWidget *f)
{
if (!m_d->m_fieldLayout) {
diff --git a/src/libs/utils/submiteditorwidget.h b/src/libs/utils/submiteditorwidget.h
index 457783a9d7f..37d1c8b0bd9 100644
--- a/src/libs/utils/submiteditorwidget.h
+++ b/src/libs/utils/submiteditorwidget.h
@@ -129,8 +129,8 @@ public:
signals:
void diffSelected(const QStringList &);
void fileSelectionChanged(bool someFileSelected);
- void fileCheckStateChanged(bool someFileChecked);
void submitActionTextChanged(const QString &);
+ void submitActionEnabledChanged(const bool);
public slots:
void checkAll();
@@ -139,13 +139,16 @@ public slots:
protected:
virtual void changeEvent(QEvent *e);
void insertTopWidget(QWidget *w);
+ virtual bool canSubmit() const;
+
+protected slots:
+ void updateSubmitAction();
private slots:
void triggerDiffSelected();
void diffActivated(const QModelIndex &index);
void diffActivatedDelayed();
void updateActions();
- void updateSubmitAction();
void updateDiffAction();
void editorCustomContextMenuRequested(const QPoint &);
void fileListCustomContextMenuRequested(const QPoint & pos);
diff --git a/src/libs/utils/synchronousprocess.cpp b/src/libs/utils/synchronousprocess.cpp
index 7a8d5a007eb..c35b148d1bd 100644
--- a/src/libs/utils/synchronousprocess.cpp
+++ b/src/libs/utils/synchronousprocess.cpp
@@ -365,7 +365,7 @@ static inline bool askToKill(const QString &binary = QString())
SynchronousProcess::tr("The process is not responding.") :
SynchronousProcess::tr("The process '%1' is not responding.").arg(binary);
msg += QLatin1Char(' ');
- msg += SynchronousProcess::tr(" Would you like to terminate it?");
+ msg += SynchronousProcess::tr("Would you like to terminate it?");
// Restore the cursor that is set to wait while running.
const bool hasOverrideCursor = QApplication::overrideCursor() != 0;
if (hasOverrideCursor)
diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp
index 054e560bd8a..96dfcba38a0 100644
--- a/src/plugins/coreplugin/basefilewizard.cpp
+++ b/src/plugins/coreplugin/basefilewizard.cpp
@@ -72,7 +72,7 @@ public:
};
GeneratedFilePrivate::GeneratedFilePrivate(const QString &p) :
- path(p),
+ path(QDir::cleanPath(p)),
binary(false),
attributes(0)
{
@@ -111,7 +111,7 @@ QString GeneratedFile::path() const
void GeneratedFile::setPath(const QString &p)
{
- m_d->path = p;
+ m_d->path = QDir::cleanPath(p);
}
QString GeneratedFile::contents() const
@@ -628,7 +628,7 @@ bool BaseFileWizard::postGenerateOpenEditors(const GeneratedFiles &l, QString *e
if (file.attributes() & Core::GeneratedFile::OpenEditorAttribute) {
if (!em->openEditor(file.path(), file.editorId(), Core::EditorManager::ModeSwitch )) {
if (errorMessage)
- *errorMessage = tr("Failed to open an editor for '%1'.").arg(file.path());
+ *errorMessage = tr("Failed to open an editor for '%1'.").arg(QDir::toNativeSeparators(file.path()));
return false;
}
}
@@ -663,7 +663,7 @@ BaseFileWizard::OverwriteResult BaseFileWizard::promptOverwrite(const QStringLis
if (fi.exists()) {
if (!fileNamesMsgPart.isEmpty())
fileNamesMsgPart += QLatin1String(", ");
- fileNamesMsgPart += fileName.mid(commonExistingPath.size() + 1);
+ fileNamesMsgPart += QDir::toNativeSeparators(fileName.mid(commonExistingPath.size() + 1));
do {
if (fi.isDir()) {
oddStuffFound = true;
@@ -687,13 +687,14 @@ BaseFileWizard::OverwriteResult BaseFileWizard::promptOverwrite(const QStringLis
return OverwriteOk;
if (oddStuffFound) {
- *errorMessage = tr("The project directory %1 contains files which cannot be overwritten:\n%2.").arg(commonExistingPath).arg(fileNamesMsgPart);
+ *errorMessage = tr("The project directory %1 contains files which cannot be overwritten:\n%2.")
+ .arg(QDir::toNativeSeparators(commonExistingPath)).arg(fileNamesMsgPart);
return OverwriteError;
}
const QString messageFormat = tr("The following files already exist in the directory %1:\n"
"%2.\nWould you like to overwrite them?");
- const QString message = messageFormat.arg(commonExistingPath).arg(fileNamesMsgPart);
+ const QString message = messageFormat.arg(QDir::toNativeSeparators(commonExistingPath)).arg(fileNamesMsgPart);
const bool yes = (QMessageBox::question(Core::ICore::instance()->mainWindow(),
tr("Existing files"), message,
QMessageBox::Yes | QMessageBox::No,
diff --git a/src/plugins/coreplugin/iversioncontrol.h b/src/plugins/coreplugin/iversioncontrol.h
index c402c1fb77c..d0dd868b1a2 100644
--- a/src/plugins/coreplugin/iversioncontrol.h
+++ b/src/plugins/coreplugin/iversioncontrol.h
@@ -52,7 +52,9 @@ public:
AddOperation, DeleteOperation, OpenOperation, MoveOperation,
CreateRepositoryOperation,
SnapshotOperations,
- AnnotateOperation
+ AnnotateOperation,
+ CheckoutOperation,
+ GetRepositoryRootOperation
};
explicit IVersionControl(QObject *parent = 0) : QObject(parent) {}
@@ -116,6 +118,16 @@ public:
*/
virtual bool vcsCreateRepository(const QString &directory) = 0;
+ /*!
+ * Called to clone/checkout the version control system in a directory.
+ */
+ virtual bool vcsCheckout(const QString &directory, const QByteArray &url) = 0;
+
+ /*!
+ * Called to get the version control repository root.
+ */
+ virtual QString vcsGetRepositoryURL(const QString &director) = 0;
+
/*!
* Create a snapshot of the current state and return an identifier or
* an empty string in case of failure.
diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp
index 0221e29c9fa..da42a17bad4 100644
--- a/src/plugins/coreplugin/vcsmanager.cpp
+++ b/src/plugins/coreplugin/vcsmanager.cpp
@@ -167,6 +167,41 @@ bool VCSManager::promptToDelete(const QString &fileName)
return true;
}
+IVersionControl *VCSManager::checkout(const QString &versionControlType,
+ const QString &directory,
+ const QByteArray &url)
+{
+ foreach (IVersionControl *versionControl, allVersionControls()) {
+ if (versionControl->displayName() == versionControlType
+ && versionControl->supportsOperation(Core::IVersionControl::CheckoutOperation)) {
+ if (versionControl->vcsCheckout(directory, url)) {
+ m_d->m_cachedMatches.insert(directory, versionControl);
+ return versionControl;
+ }
+ return 0;
+ }
+ }
+ return 0;
+}
+
+bool VCSManager::findVersionControl(const QString &versionControlType)
+{
+ foreach (IVersionControl * versionControl, allVersionControls()) {
+ if (versionControl->displayName() == versionControlType)
+ return true;
+ }
+ return false;
+}
+
+QString VCSManager::getRepositoryURL(const QString &directory)
+{
+ IVersionControl *vc = findVersionControlForDirectory(directory);
+
+ if (vc && vc->supportsOperation(Core::IVersionControl::GetRepositoryRootOperation))
+ return vc->vcsGetRepositoryURL(directory);
+ return QString();
+}
+
bool VCSManager::promptToDelete(IVersionControl *vc, const QString &fileName)
{
QTC_ASSERT(vc, return true)
diff --git a/src/plugins/coreplugin/vcsmanager.h b/src/plugins/coreplugin/vcsmanager.h
index 71e9b3e9c34..6b2e374a883 100644
--- a/src/plugins/coreplugin/vcsmanager.h
+++ b/src/plugins/coreplugin/vcsmanager.h
@@ -68,6 +68,11 @@ public:
IVersionControl *findVersionControlForDirectory(const QString &directory,
QString *topLevelDirectory = 0);
+ IVersionControl *checkout(const QString &versionControlType,
+ const QString &directory,
+ const QByteArray &url);
+ bool findVersionControl(const QString &versionControl);
+ QString getRepositoryURL(const QString &directory);
// Shows a confirmation dialog, whether the file should also be deleted
// from revision control Calls sccDelete on the file. Returns false
diff --git a/src/plugins/cpaster/codepasterprotocol.cpp b/src/plugins/cpaster/codepasterprotocol.cpp
index bc8137abfd8..bd7657656c8 100644
--- a/src/plugins/cpaster/codepasterprotocol.cpp
+++ b/src/plugins/cpaster/codepasterprotocol.cpp
@@ -99,13 +99,24 @@ void CodePasterProtocol::fetch(const QString &id)
QTC_ASSERT(!m_fetchReply, return; )
QString hostName = m_page->hostName();
- QString link = "http://";
- link.append(hostName);
- link.append("/?format=raw&id=");
- link.append(id);
+ const QString httpPrefix = "http://";
+ QString link;
+ // Did the user enter a complete URL instead of an id?
+ if (id.startsWith(httpPrefix)) {
+ // Append 'raw' format option
+ link = id;
+ link += QLatin1String("&format=raw");
+ const int idPos = id.lastIndexOf(QLatin1Char('='));
+ m_fetchId = idPos != -1 ? id.mid(idPos + 1) : id;
+ } else {
+ link = httpPrefix;
+ link.append(hostName);
+ link.append("/?format=raw&id=");
+ link.append(id);
+ m_fetchId = id;
+ }
m_fetchReply = httpGet(link);
connect(m_fetchReply, SIGNAL(finished()), this, SLOT(fetchFinished()));
- m_fetchId = id;
}
void CodePasterProtocol::list()
diff --git a/src/plugins/cppeditor/CppEditor.mimetypes.xml b/src/plugins/cppeditor/CppEditor.mimetypes.xml
index 5dd9f0610ab..6305531764a 100644
--- a/src/plugins/cppeditor/CppEditor.mimetypes.xml
+++ b/src/plugins/cppeditor/CppEditor.mimetypes.xml
@@ -29,9 +29,12 @@
+ example, STL ones like . Those can have a big initial
+ comment exceeding 1000 chars, though. -->
-
+
+
+
diff --git a/src/plugins/cppeditor/cppeditor.pro b/src/plugins/cppeditor/cppeditor.pro
index 0e86ffeb8e8..57767721ec4 100644
--- a/src/plugins/cppeditor/cppeditor.pro
+++ b/src/plugins/cppeditor/cppeditor.pro
@@ -15,7 +15,6 @@ HEADERS += cppplugin.h \
cppeditor_global.h \
cppclasswizard.h \
cppquickfix.h \
- cpprefactoringchanges.h \
cppchecksymbols.h \
cppsemanticinfo.h \
cppoutline.h \
@@ -31,7 +30,6 @@ SOURCES += cppplugin.cpp \
cppclasswizard.cpp \
cppquickfix.cpp \
cppquickfixes.cpp \
- cpprefactoringchanges.cpp \
cppchecksymbols.cpp \
cppsemanticinfo.cpp \
cppoutline.cpp \
diff --git a/src/plugins/cppeditor/cppelementevaluator.cpp b/src/plugins/cppeditor/cppelementevaluator.cpp
index 4ed8a0b207a..cfb1fd77f50 100644
--- a/src/plugins/cppeditor/cppelementevaluator.cpp
+++ b/src/plugins/cppeditor/cppelementevaluator.cpp
@@ -66,6 +66,18 @@ namespace {
ch = doc->characterAt(tc->position());
}
}
+
+ QStringList stripName(const QString &name) {
+ QStringList all;
+ all << name;
+ int colonColon = 0;
+ const int size = name.size();
+ while ((colonColon = name.indexOf(QLatin1String("::"), colonColon)) != -1) {
+ all << name.right(size - colonColon - 2);
+ colonColon += 2;
+ }
+ return all;
+ }
}
CppElementEvaluator::CppElementEvaluator(CPPEditor *editor) :
@@ -314,16 +326,14 @@ CppDeclarableElement::CppDeclarableElement(Symbol *declaration) : CppElement()
declaration->enclosingScope()->isNamespace() ||
declaration->enclosingScope()->isEnum()) {
m_qualifiedName = overview.prettyName(LookupContext::fullyQualifiedName(declaration));
+ setHelpIdCandidates(stripName(m_qualifiedName));
} else {
m_qualifiedName = m_name;
+ setHelpIdCandidates(QStringList(m_name));
}
setTooltip(overview.prettyType(declaration->type(), m_qualifiedName));
setLink(CPPEditor::linkToSymbol(declaration));
-
- QStringList helpIds;
- helpIds << m_qualifiedName << m_name;
- setHelpIdCandidates(helpIds);
setHelpMark(m_name);
}
@@ -482,10 +492,15 @@ CppVariable::CppVariable(Symbol *declaration, const LookupContext &context, Scop
Symbol *symbol = clazz->symbols().at(0);
const QString &name =
overview.prettyName(LookupContext::fullyQualifiedName(symbol));
- setTooltip(name);
- setHelpCategory(TextEditor::HelpItem::ClassOrNamespace);
- setHelpMark(name);
- setHelpIdCandidates(QStringList(name));
+ if (!name.isEmpty()) {
+ setTooltip(name);
+ setHelpCategory(TextEditor::HelpItem::ClassOrNamespace);
+ const QStringList &allNames = stripName(name);
+ if (!allNames.isEmpty()) {
+ setHelpMark(allNames.last());
+ setHelpIdCandidates(allNames);
+ }
+ }
}
}
}
diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp
index 2168bc9e2d1..bd448ddafb9 100644
--- a/src/plugins/cppeditor/cpphoverhandler.cpp
+++ b/src/plugins/cppeditor/cpphoverhandler.cpp
@@ -46,16 +46,6 @@
using namespace CppEditor::Internal;
using namespace Core;
-namespace {
- QString removeClassNameQualification(const QString &name) {
- const int index = name.lastIndexOf(QLatin1Char(':'));
- if (index == -1)
- return name;
- else
- return name.right(name.length() - index - 1);
- }
-}
-
CppHoverHandler::CppHoverHandler(QObject *parent) : BaseHoverHandler(parent)
{}
@@ -87,16 +77,8 @@ void CppHoverHandler::identifyMatch(TextEditor::ITextEditor *editor, int pos)
QSharedPointer cppElement = evaluator.identifyCppElement();
if (!cppElement.isNull()) {
setToolTip(cppElement->tooltip());
- foreach (QString helpId, cppElement->helpIdCandidates()) {
- bool found = false;
+ foreach (const QString &helpId, cppElement->helpIdCandidates()) {
if (!Core::HelpManager::instance()->linksForIdentifier(helpId).isEmpty()) {
- found = true;
- } else {
- helpId = removeClassNameQualification(helpId);
- if (!Core::HelpManager::instance()->linksForIdentifier(helpId).isEmpty())
- found = true;
- }
- if (found) {
setLastHelpItemIdentified(TextEditor::HelpItem(helpId,
cppElement->helpMark(),
cppElement->helpCategory()));
@@ -114,14 +96,26 @@ void CppHoverHandler::decorateToolTip()
const TextEditor::HelpItem &help = lastHelpItemIdentified();
if (help.isValid()) {
+ // If Qt is built with a namespace, we still show the tip without it, as
+ // it is in the docs and for consistency with the doc extraction mechanism.
+ const TextEditor::HelpItem::Category category = help.category();
const QString &contents = help.extractContent(false);
if (!contents.isEmpty()) {
- if (help.category() == TextEditor::HelpItem::ClassOrNamespace) {
- setToolTip(Qt::escape(toolTip()));
- appendToolTip(contents);
- } else {
+ if (category == TextEditor::HelpItem::ClassOrNamespace)
+ setToolTip(help.helpId() + contents);
+ else
setToolTip(contents);
- }
+ } else if (category == TextEditor::HelpItem::Typedef ||
+ category == TextEditor::HelpItem::Enum ||
+ category == TextEditor::HelpItem::ClassOrNamespace) {
+ // This approach is a bit limited since it cannot be used for functions
+ // because the help id doesn't really help in that case.
+ QString prefix;
+ if (category == TextEditor::HelpItem::Typedef)
+ prefix = QLatin1String("typedef ");
+ else if (category == TextEditor::HelpItem::Enum)
+ prefix = QLatin1String("enum ");
+ setToolTip(prefix + help.helpId());
}
addF1ToToolTip();
}
diff --git a/src/plugins/cppeditor/cppinsertdecldef.cpp b/src/plugins/cppeditor/cppinsertdecldef.cpp
index 2d51b5849e5..66bbdfd6919 100644
--- a/src/plugins/cppeditor/cppinsertdecldef.cpp
+++ b/src/plugins/cppeditor/cppinsertdecldef.cpp
@@ -36,9 +36,10 @@
#include
#include
#include
-#include
+#include
#include
#include
+#include
#include
@@ -47,8 +48,6 @@ using namespace CppEditor;
using namespace CppEditor::Internal;
using namespace CppTools;
-using CppEditor::CppRefactoringChanges;
-
namespace {
class InsertDeclOperation: public CppQuickFixOperation
@@ -81,9 +80,7 @@ public:
void performChanges(CppRefactoringFile *, CppRefactoringChanges *refactoring)
{
- Snapshot snapshot = state().snapshot();
- snapshot.insert(refactoring->file(m_targetFileName).cppDocument());
- InsertionPointLocator locator(snapshot);
+ InsertionPointLocator locator(refactoring);
const InsertionLocation loc = locator.methodDeclarationInClass(
m_targetFileName, m_targetSymbol, m_xsSpec);
Q_ASSERT(loc.isValid());
@@ -211,170 +208,97 @@ QString DeclFromDef::generateDeclaration(const CppQuickFixState &,
namespace {
-static inline bool hasFunctionType(DeclarationAST *decl)
+class InsertDefOperation: public CppQuickFixOperation
{
- if (decl->asFunctionDefinition())
- return true;
-
- if (SimpleDeclarationAST *ast = decl->asSimpleDeclaration())
- if (ast->symbols && ast->symbols->value && !ast->symbols->next)
- if (Declaration *decl = ast->symbols->value->asDeclaration())
- if (FullySpecifiedType ty = decl->type())
- return ty->asFunctionType();
-
- return false;
-}
-
-static QPair findSurroundingDeclarations(
- DeclarationListAST *members,
- DeclarationAST *decl)
-{
- bool found = false;
- DeclarationAST *last = 0, *next = 0, *prev = 0;
- DeclarationListAST *iter = members;
- for (; iter; iter = iter->next) {
- DeclarationAST *value = iter->value;
- if (value == decl) {
- prev = last;
- found = true;
- } else if (hasFunctionType(value)) {
- if (found) {
- next = value;
- break;
- } else {
- last = value;
- }
- }
+public:
+ InsertDefOperation(const CppQuickFixState &state, int priority,
+ Declaration *decl, const InsertionLocation &loc)
+ : CppQuickFixOperation(state, priority)
+ , m_decl(decl)
+ , m_loc(loc)
+ {
+ setDescription(QCoreApplication::tr("Add definition in %1",
+ "CppEditor::DefFromDecl")
+ .arg(m_loc.fileName()));
}
- return qMakePair(prev, next);
-}
+ void performChanges(CppRefactoringFile *,
+ CppRefactoringChanges *refactoring)
+ {
+ Q_ASSERT(m_loc.isValid());
+
+ CppRefactoringFile targetFile = refactoring->file(m_loc.fileName());
+
+ Overview oo;
+ oo.setShowFunctionSignatures(true);
+ oo.setShowReturnTypes(true);
+ oo.setShowArgumentNames(true);
+
+ //--
+ SubstitutionEnvironment env;
+ env.setContext(state().context());
+ env.switchScope(m_decl->enclosingScope());
+ UseQualifiedNames q;
+ env.enter(&q);
+
+ Control *control = state().context().control().data();
+ FullySpecifiedType tn = rewriteType(m_decl->type(), &env, control);
+ QString name = oo(LookupContext::fullyQualifiedName(m_decl));
+ //--
+
+ QString defText = oo.prettyType(tn, name) + "\n{\n}";
+
+ int targetPos = targetFile.position(m_loc.line(), m_loc.column());
+ int targetPos2 = qMax(0, targetFile.position(m_loc.line(), 1) - 1);
+
+ Utils::ChangeSet target;
+ target.insert(targetPos, m_loc.prefix() + defText + m_loc.suffix());
+ targetFile.change(target);
+ targetFile.indent(Utils::ChangeSet::Range(targetPos2, targetPos));
+
+ const int prefixLineCount = m_loc.prefix().count(QLatin1Char('\n'));
+ refactoring->activateEditor(m_loc.fileName(),
+ m_loc.line() + prefixLineCount,
+ 0);
+ }
+
+private:
+ Declaration *m_decl;
+ InsertionLocation m_loc;
+};
} // anonymous namespace
QList DefFromDecl::match(const CppQuickFixState &state)
{
-#if 0
- qDebug() << Q_FUNC_INFO;
-
const QList &path = state.path();
const CppRefactoringFile &file = state.currentFile();
- DeclaratorAST *declAST = 0;
- ClassSpecifierAST *classSpec = 0;
int idx = path.size() - 1;
for (; idx >= 0; --idx) {
AST *node = path.at(idx);
- if (ClassSpecifierAST *clazz = node->asClassSpecifier()) {
- classSpec = clazz;
- continue;
+ if (SimpleDeclarationAST *simpleDecl = node->asSimpleDeclaration()) {
+ if (simpleDecl->symbols && ! simpleDecl->symbols->next) {
+ if (Symbol *symbol = simpleDecl->symbols->value) {
+ if (Declaration *decl = symbol->asDeclaration()) {
+ if (decl->type()->isFunctionType() && decl->enclosingScope() && decl->enclosingScope()->isClass()) {
+ DeclaratorAST *declarator = simpleDecl->declarator_list->value;
+ if (file.isCursorOn(declarator->core_declarator)) {
+ CppRefactoringChanges refactoring(state.snapshot());
+ InsertionPointLocator locator(&refactoring);
+ QList results;
+ foreach (const InsertionLocation &loc, locator.methodDefinition(decl))
+ results.append(CppQuickFixOperation::Ptr(new InsertDefOperation(state, idx, decl, loc)));
+ return results;
+ }
+ }
+ }
+ }
+ }
+
+ break;
}
-
- if (idx <= 1) continue;
- DeclaratorIdAST *declId = node->asDeclaratorId();
- if (!declId) continue;
-
- if (!file.isCursorOn(declId)) continue;
-
- DeclaratorAST *candidate = path.at(idx - 1)->asDeclarator();
- if (!candidate) continue;
- if (!candidate->postfix_declarator_list) continue;
- if (!candidate->postfix_declarator_list->value) continue;
- if (candidate->postfix_declarator_list->next) continue;
- FunctionDeclaratorAST *funDecl = candidate->postfix_declarator_list->value->asFunctionDeclarator();
- if (!funDecl) continue;
- if (funDecl->symbol->asFunctionType())
- declAST = candidate;
}
- if (!declAST || !classSpec || !classSpec->symbol)
- return noResult();
-
- if (!declAST->symbols || !declAST->symbols->value || declAST->symbols->next)
- return noResult();
-
- Declaration *decl = declAST->symbols->value->asDeclaration();
- if (!decl)
- return noResult();
-
- Function *funTy = decl->type()->asFunctionType();
- if (!funTy)
- return noResult();
-
- qDebug() << "-> Found funTy.";
-
- QPair surroundingNodes =
- findSurroundingDeclarations(classSpec->member_specifier_list, declAST);
- qDebug() << "->("<asSimpleDeclaration())
- qDebug()<<"-->prev@"<symbols->value->line()<symbols->value->column();
- if (surroundingNodes.second)
- if (SimpleDeclarationAST *sd=surroundingNodes.second->asSimpleDeclaration())
- qDebug()<<"-->next@"<symbols->value->line()<symbols->value->column();
-#endif
-// if (ClassOrNamespace *targetBinding = state.context().lookupParent(method)) {
-// foreach (Symbol *s, targetBinding->symbols()) {
-// if (Class *clazz = s->asClass()) {
-// QList results;
-// const QLatin1String fn(clazz->fileName());
-// const QString decl = generateDeclaration(state,
-// method,
-// targetBinding);
-// results.append(
-// singleResult(
-// new InsertDeclOperation(state, idx, fn, clazz,
-// InsertionPointLocator::Public,
-// decl)));
-// results.append(
-// singleResult(
-// new InsertDeclOperation(state, idx, fn, clazz,
-// InsertionPointLocator::Protected,
-// decl)));
-// results.append(
-// singleResult(
-// new InsertDeclOperation(state, idx, fn, clazz,
-// InsertionPointLocator::Private,
-// decl)));
-// results.append(
-// singleResult(
-// new InsertDeclOperation(state, idx, fn, clazz,
-// InsertionPointLocator::PublicSlot,
-// decl)));
-// results.append(
-// singleResult(
-// new InsertDeclOperation(state, idx, fn, clazz,
-// InsertionPointLocator::ProtectedSlot,
-// decl)));
-// results.append(
-// singleResult(
-// new InsertDeclOperation(state, idx, fn, clazz,
-// InsertionPointLocator::PrivateSlot,
-// decl)));
-// return results;
-// } //! \todo support insertion into namespaces
-// }
-// }
-
- Q_UNUSED(findSurroundingDeclarations)
- Q_UNUSED(state)
return noResult();
}
-
-QString DefFromDecl::generateDefinition(const CppQuickFixState &,
- Function *method,
- ClassOrNamespace *targetBinding)
-{
- Q_UNUSED(targetBinding);
-
- Overview oo;
- oo.setShowFunctionSignatures(true);
- oo.setShowReturnTypes(true);
- oo.setShowArgumentNames(true);
-
- QString decl;
- decl += oo(method->type(), method->unqualifiedName());
- decl += QLatin1String(";\n");
-
- return decl;
-}
diff --git a/src/plugins/cppeditor/cppinsertdecldef.h b/src/plugins/cppeditor/cppinsertdecldef.h
index c56c17331cb..0b7f2ff51c5 100644
--- a/src/plugins/cppeditor/cppinsertdecldef.h
+++ b/src/plugins/cppeditor/cppinsertdecldef.h
@@ -56,11 +56,6 @@ class DefFromDecl: public CppQuickFixFactory
{
public:
virtual QList match(const CppQuickFixState &state);
-
-protected:
- static QString generateDefinition(const CppQuickFixState &state,
- CPlusPlus::Function *method,
- CPlusPlus::ClassOrNamespace *targetBinding);
};
} // namespace Internal
diff --git a/src/plugins/cppeditor/cppquickfix.cpp b/src/plugins/cppeditor/cppquickfix.cpp
index eb5dce7a114..a0ce66a1ce9 100644
--- a/src/plugins/cppeditor/cppquickfix.cpp
+++ b/src/plugins/cppeditor/cppquickfix.cpp
@@ -43,7 +43,7 @@
#include
#include
-#include
+#include
#include
#include
#include
@@ -52,6 +52,7 @@
using namespace CppEditor;
using namespace CppEditor::Internal;
+using namespace CppTools;
using namespace TextEditor;
using namespace CPlusPlus;
using namespace Utils;
diff --git a/src/plugins/cppeditor/cppquickfix.h b/src/plugins/cppeditor/cppquickfix.h
index 45cf0e86ac6..a261297f5be 100644
--- a/src/plugins/cppeditor/cppquickfix.h
+++ b/src/plugins/cppeditor/cppquickfix.h
@@ -30,11 +30,12 @@
#ifndef CPPQUICKFIX_H
#define CPPQUICKFIX_H
-#include "cpprefactoringchanges.h"
+#include "cppeditor_global.h"
#include "cppsemanticinfo.h"
#include
#include
+#include
#include
#include
#include
@@ -69,7 +70,7 @@ public:
CppEditor::Internal::SemanticInfo semanticInfo() const;
const CPlusPlus::LookupContext &context() const;
- const CppRefactoringFile currentFile() const;
+ const CppTools::CppRefactoringFile currentFile() const;
bool isCursorOn(unsigned tokenIndex) const
{ return currentFile().isCursorOn(tokenIndex); }
@@ -94,7 +95,8 @@ public:
virtual void perform();
protected:
- virtual void performChanges(CppRefactoringFile *currentFile, CppRefactoringChanges *refactoring) = 0;
+ virtual void performChanges(CppTools::CppRefactoringFile *currentFile,
+ CppTools::CppRefactoringChanges *refactoring) = 0;
QString fileName() const;
diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
index c2f648a6cec..509fb1caa08 100644
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/src/plugins/cppeditor/cppquickfixes.cpp
@@ -58,6 +58,7 @@
using namespace CppEditor;
using namespace CppEditor::Internal;
+using namespace CppTools;
using namespace TextEditor;
using namespace CPlusPlus;
using namespace Utils;
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index d1415bb281b..ec71eb4ee6b 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -361,6 +361,12 @@ QString CppPreprocessor::tryIncludeFile(QString &fileName, IncludeType type, uns
return contents;
}
+static inline void appendDirSeparatorIfNeeded(QString &path)
+{
+ if (!path.endsWith(QLatin1Char('/'), Qt::CaseInsensitive))
+ path += QLatin1Char('/');
+}
+
QString CppPreprocessor::tryIncludeFile_helper(QString &fileName, IncludeType type, unsigned *revision)
{
QFileInfo fileInfo(fileName);
@@ -373,7 +379,7 @@ QString CppPreprocessor::tryIncludeFile_helper(QString &fileName, IncludeType ty
if (type == IncludeLocal && m_currentDoc) {
QFileInfo currentFileInfo(m_currentDoc->fileName());
QString path = currentFileInfo.absolutePath();
- path += QLatin1Char('/');
+ appendDirSeparatorIfNeeded(path);
path += fileName;
path = QDir::cleanPath(path);
QString contents;
@@ -385,7 +391,7 @@ QString CppPreprocessor::tryIncludeFile_helper(QString &fileName, IncludeType ty
foreach (const QString &includePath, m_includePaths) {
QString path = includePath;
- path += QLatin1Char('/');
+ appendDirSeparatorIfNeeded(path);
path += fileName;
path = QDir::cleanPath(path);
QString contents;
@@ -398,7 +404,7 @@ QString CppPreprocessor::tryIncludeFile_helper(QString &fileName, IncludeType ty
// look in the system include paths
foreach (const QString &includePath, m_systemIncludePaths) {
QString path = includePath;
- path += QLatin1Char('/');
+ appendDirSeparatorIfNeeded(path);
path += fileName;
path = QDir::cleanPath(path);
QString contents;
@@ -415,7 +421,7 @@ QString CppPreprocessor::tryIncludeFile_helper(QString &fileName, IncludeType ty
foreach (const QString &frameworkPath, m_frameworkPaths) {
QString path = frameworkPath;
- path += QLatin1Char('/');
+ appendDirSeparatorIfNeeded(path);
path += frameworkName;
path += QLatin1String(".framework/Headers/");
path += name;
@@ -1225,6 +1231,9 @@ void CppModelManager::updateIncludesInPaths(QFutureInterface &future,
const QString path = paths.takeFirst();
+ if (path == QLatin1String("/"))
+ continue;
+
// Skip non-existing paths
if (!QFile::exists(path))
continue;
diff --git a/src/plugins/cppeditor/cpprefactoringchanges.cpp b/src/plugins/cpptools/cpprefactoringchanges.cpp
similarity index 99%
rename from src/plugins/cppeditor/cpprefactoringchanges.cpp
rename to src/plugins/cpptools/cpprefactoringchanges.cpp
index cac384bf337..b320b578b52 100644
--- a/src/plugins/cppeditor/cpprefactoringchanges.cpp
+++ b/src/plugins/cpptools/cpprefactoringchanges.cpp
@@ -37,8 +37,8 @@
#include
-using namespace CppEditor;
using namespace CPlusPlus;
+using namespace CppTools;
using namespace Utils;
CppRefactoringChanges::CppRefactoringChanges(const Snapshot &snapshot)
diff --git a/src/plugins/cppeditor/cpprefactoringchanges.h b/src/plugins/cpptools/cpprefactoringchanges.h
similarity index 92%
rename from src/plugins/cppeditor/cpprefactoringchanges.h
rename to src/plugins/cpptools/cpprefactoringchanges.h
index cb2f83c7cc5..2a0e20bf787 100644
--- a/src/plugins/cppeditor/cpprefactoringchanges.h
+++ b/src/plugins/cpptools/cpprefactoringchanges.h
@@ -35,15 +35,15 @@
#include
#include
-#include
+#include
#include
-namespace CppEditor {
+namespace CppTools {
class CppRefactoringChanges;
-class CPPEDITOR_EXPORT CppRefactoringFile: public TextEditor::RefactoringFile
+class CPPTOOLS_EXPORT CppRefactoringFile: public TextEditor::RefactoringFile
{
public:
CppRefactoringFile();
@@ -79,7 +79,7 @@ private:
mutable CPlusPlus::Document::Ptr m_cppDocument;
};
-class CPPEDITOR_EXPORT CppRefactoringChanges: public TextEditor::RefactoringChanges
+class CPPTOOLS_EXPORT CppRefactoringChanges: public TextEditor::RefactoringChanges
{
public:
CppRefactoringChanges(const CPlusPlus::Snapshot &snapshot);
@@ -99,6 +99,6 @@ private:
CppTools::CppModelManagerInterface::WorkingCopy m_workingCopy;
};
-} // namespace CppEditor
+} // namespace CppTools
#endif // CPPREFACTORINGCHANGES_H
diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro
index 04d10bc11e5..be6a5cfde8a 100644
--- a/src/plugins/cpptools/cpptools.pro
+++ b/src/plugins/cpptools/cpptools.pro
@@ -26,7 +26,9 @@ HEADERS += completionsettingspage.h \
cppfindreferences.h \
cppcodeformatter.h \
symbolsfindfilter.h \
- uicodecompletionsupport.h
+ uicodecompletionsupport.h \
+ insertionpointlocator.h \
+ cpprefactoringchanges.h
SOURCES += completionsettingspage.cpp \
cppclassesfilter.cpp \
@@ -44,7 +46,9 @@ SOURCES += completionsettingspage.cpp \
cppfindreferences.cpp \
cppcodeformatter.cpp \
symbolsfindfilter.cpp \
- uicodecompletionsupport.cpp
+ uicodecompletionsupport.cpp \
+ insertionpointlocator.cpp \
+ cpprefactoringchanges.cpp
FORMS += completionsettingspage.ui \
cppfilesettingspage.ui
diff --git a/src/libs/cplusplus/InsertionPointLocator.cpp b/src/plugins/cpptools/insertionpointlocator.cpp
similarity index 85%
rename from src/libs/cplusplus/InsertionPointLocator.cpp
rename to src/plugins/cpptools/insertionpointlocator.cpp
index c031e9322d9..f1594b98604 100644
--- a/src/libs/cplusplus/InsertionPointLocator.cpp
+++ b/src/plugins/cpptools/insertionpointlocator.cpp
@@ -27,13 +27,16 @@
**
**************************************************************************/
-#include "InsertionPointLocator.h"
+#include "cpptoolsplugin.h"
+#include "cpprefactoringchanges.h"
+#include "insertionpointlocator.h"
#include
#include
#include
using namespace CPlusPlus;
+using namespace CppTools;
namespace {
@@ -150,7 +153,8 @@ protected:
if (needsSuffix)
suffix = QLatin1Char('\n');
- _result = InsertionLocation(prefix, suffix, line, column);
+ _result = InsertionLocation(_doc->fileName(), prefix, suffix,
+ line, column);
return false;
}
@@ -264,16 +268,19 @@ InsertionLocation::InsertionLocation()
, m_column(0)
{}
-InsertionLocation::InsertionLocation(const QString &prefix, const QString &suffix,
+InsertionLocation::InsertionLocation(const QString &fileName,
+ const QString &prefix,
+ const QString &suffix,
unsigned line, unsigned column)
- : m_prefix(prefix)
+ : m_fileName(fileName)
+ , m_prefix(prefix)
, m_suffix(suffix)
, m_line(line)
, m_column(column)
{}
-InsertionPointLocator::InsertionPointLocator(const Snapshot &snapshot)
- : m_snapshot(snapshot)
+InsertionPointLocator::InsertionPointLocator(CppRefactoringChanges *refactoringChanges)
+ : m_refactoringChanges(refactoringChanges)
{
}
@@ -282,7 +289,7 @@ InsertionLocation InsertionPointLocator::methodDeclarationInClass(
const Class *clazz,
AccessSpec xsSpec) const
{
- const Document::Ptr doc = m_snapshot.document(fileName);
+ const Document::Ptr doc = m_refactoringChanges->file(fileName).cppDocument();
if (doc) {
FindInClass find(doc, clazz, xsSpec);
return find();
@@ -293,11 +300,30 @@ InsertionLocation InsertionPointLocator::methodDeclarationInClass(
/// Currently, we return the end of fileName.cpp
QList InsertionPointLocator::methodDefinition(
- const QString &/*fileName*/) const
+ Declaration *declaration) const
{
QList result;
+ if (!declaration)
+ return result;
+ Internal::CppToolsPlugin *cpptools = Internal::CppToolsPlugin::instance();
+ const QString declFileName = QLatin1String(declaration->fileName());
+ QString target = cpptools->correspondingHeaderOrSource(declFileName);
+ Document::Ptr doc = m_refactoringChanges->file(target).cppDocument();
+ if (doc.isNull())
+ return result;
+
+ TranslationUnit *xUnit = doc->translationUnit();
+ unsigned tokenCount = xUnit->tokenCount();
+ if (tokenCount < 2) // no tokens available
+ return result;
+
+ unsigned line = 0, column = 0;
+ xUnit->getTokenEndPosition(xUnit->tokenCount() - 2, &line, &column);
+
+ const QLatin1String prefix("\n\n");
+ result.append(InsertionLocation(target, prefix, QString(), line, column));
return result;
}
diff --git a/src/libs/cplusplus/InsertionPointLocator.h b/src/plugins/cpptools/insertionpointlocator.h
similarity index 75%
rename from src/libs/cplusplus/InsertionPointLocator.h
rename to src/plugins/cpptools/insertionpointlocator.h
index 5436d36eb60..3124a528f92 100644
--- a/src/libs/cplusplus/InsertionPointLocator.h
+++ b/src/plugins/cpptools/insertionpointlocator.h
@@ -30,19 +30,27 @@
#ifndef INSERTIONPOINTLOCATOR_H
#define INSERTIONPOINTLOCATOR_H
+#include "cpptools_global.h"
+
#include
#include
#include
-#include "CppDocument.h"
+#include
-namespace CPlusPlus {
+namespace CppTools {
-class CPLUSPLUS_EXPORT InsertionLocation
+class CppRefactoringChanges;
+
+class CPPTOOLS_EXPORT InsertionLocation
{
public:
InsertionLocation();
- InsertionLocation(const QString &prefix, const QString &suffix, unsigned line, unsigned column);
+ InsertionLocation(const QString &fileName, const QString &prefix,
+ const QString &suffix, unsigned line, unsigned column);
+
+ QString fileName() const
+ { return m_fileName; }
/// \returns The prefix to insert before any other text.
QString prefix() const
@@ -61,16 +69,17 @@ public:
{ return m_column; }
bool isValid() const
- { return m_line > 0 && m_column > 0; }
+ { return !m_fileName.isEmpty() && m_line > 0 && m_column > 0; }
private:
+ QString m_fileName;
QString m_prefix;
QString m_suffix;
unsigned m_line;
unsigned m_column;
};
-class CPLUSPLUS_EXPORT InsertionPointLocator
+class CPPTOOLS_EXPORT InsertionPointLocator
{
public:
enum AccessSpec {
@@ -89,18 +98,18 @@ public:
};
public:
- InsertionPointLocator(const Snapshot &snapshot);
+ InsertionPointLocator(CppRefactoringChanges *refactoringChanges);
InsertionLocation methodDeclarationInClass(const QString &fileName,
- const Class *clazz,
+ const CPlusPlus::Class *clazz,
AccessSpec xsSpec) const;
- QList methodDefinition(const QString &fileName) const;
+ QList methodDefinition(CPlusPlus::Declaration *declaration) const;
private:
- Snapshot m_snapshot;
+ CppRefactoringChanges *m_refactoringChanges;
};
-} // namespace CPlusPlus
+} // namespace CppTools
#endif // INSERTIONPOINTLOCATOR_H
diff --git a/src/plugins/cvs/cvscontrol.cpp b/src/plugins/cvs/cvscontrol.cpp
index 41268e79f07..3ba45ffb297 100644
--- a/src/plugins/cvs/cvscontrol.cpp
+++ b/src/plugins/cvs/cvscontrol.cpp
@@ -58,6 +58,8 @@ bool CVSControl::supportsOperation(Operation operation) const
case MoveOperation:
case CreateRepositoryOperation:
case SnapshotOperations:
+ case CheckoutOperation:
+ case GetRepositoryRootOperation:
rc = false;
break;
}
@@ -94,6 +96,16 @@ bool CVSControl::vcsCreateRepository(const QString &)
return false;
}
+QString CVSControl::vcsGetRepositoryURL(const QString &)
+{
+ return QString();
+}
+
+bool CVSControl::vcsCheckout(const QString &, const QByteArray &)
+{
+ return false;
+}
+
QString CVSControl::vcsCreateSnapshot(const QString &)
{
return QString();
diff --git a/src/plugins/cvs/cvscontrol.h b/src/plugins/cvs/cvscontrol.h
index 4fd06c2de72..b5b882d4425 100644
--- a/src/plugins/cvs/cvscontrol.h
+++ b/src/plugins/cvs/cvscontrol.h
@@ -53,6 +53,8 @@ public:
virtual bool vcsDelete(const QString &filename);
virtual bool vcsMove(const QString &from, const QString &to);
virtual bool vcsCreateRepository(const QString &directory);
+ virtual bool vcsCheckout(const QString &directory, const QByteArray &url);
+ virtual QString vcsGetRepositoryURL(const QString &directory);
virtual QString vcsCreateSnapshot(const QString &topLevel);
virtual QStringList vcsSnapshots(const QString &topLevel);
virtual bool vcsRestoreSnapshot(const QString &topLevel, const QString &name);
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 363daa66d65..8fff78742c6 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -481,7 +481,7 @@ void CdbEngine::runEngine()
}
break;
case AttachCore:
- errorMessage = tr("Attaching to core files is not supported!");
+ errorMessage = tr("Attaching to core files is not supported.");
break;
}
if (rc) {
@@ -563,6 +563,8 @@ void CdbEngine::processTerminated(unsigned long exitCode)
bool CdbEnginePrivate::endInferior(bool detachOnly, QString *errorMessage)
{
+ if (debugCDBExecution)
+ qDebug("endInferior detach=%d, %s", detachOnly, DebuggerEngine::stateName(m_engine->state()));
// Are we running
switch (m_engine->state()) {
case InferiorRunRequested:
@@ -572,6 +574,7 @@ bool CdbEnginePrivate::endInferior(bool detachOnly, QString *errorMessage)
case InferiorStopOk:
case InferiorStopFailed:
case InferiorShutdownRequested:
+ case EngineShutdownRequested: // Forwarded when choosing 'Abort...' an attached process.
break;
default:
return true;
diff --git a/src/plugins/debugger/cdb/symbolgroupcontext.cpp b/src/plugins/debugger/cdb/symbolgroupcontext.cpp
index 569d20c5e44..72b8320c0ba 100644
--- a/src/plugins/debugger/cdb/symbolgroupcontext.cpp
+++ b/src/plugins/debugger/cdb/symbolgroupcontext.cpp
@@ -373,12 +373,23 @@ static inline QString msgExpandFailed(const QString &prefix, unsigned long index
return QString::fromLatin1("Unable to expand '%1' %2: %3").arg(prefix).arg(index).arg(why);
}
+bool SymbolGroupContext::expandSymbol(unsigned long index, QString *errorMessage)
+{
+ return expandSymbol(m_inameIndexMap.key(index), index, errorMessage);
+}
+
// Expand a symbol using the symbol group interface.
bool SymbolGroupContext::expandSymbol(const QString &prefix, unsigned long index, QString *errorMessage)
{
if (debug)
qDebug() << '>' << Q_FUNC_INFO << '\n' << prefix << index;
+ if (index >= unsigned(m_symbolParameters.size())) {
+ *errorMessage = QString::fromLatin1("Index %1 (%2) out of range 0..%3.").
+ arg(index).arg(prefix).arg(m_symbolParameters.size());
+ return false;
+ }
+
switch (symbolState(index)) {
case LeafSymbol:
*errorMessage = QString::fromLatin1("Attempt to expand leaf node '%1' %2!").arg(prefix).arg(index);
@@ -556,7 +567,7 @@ unsigned SymbolGroupContext::dumpValueRaw(unsigned long index,
name.truncate(shadowedPos);
}
// For class hierarchies, we get sometimes complicated std::template types here.
- // (std::map extends std::tree<>... Remove them for display only.
+ // (std::map extends std::tree<>... Remove them for display only.
*nameIn = formatShadowedName(removeInnerTemplateType(name), shadowedNumber);
*typeNameIn = getSymbolString(m_symbolGroup, &IDebugSymbolGroup2::GetSymbolTypeNameWide, index);
// Check for uninitialized variables at level 0 only.
@@ -616,7 +627,7 @@ unsigned SymbolGroupContext::dumpValue(unsigned long index,
ULONG *typeIdIn,
QString *typeNameIn,
QString *valueIn)
-{
+{
unsigned rc = dumpValueRaw(index, inameIn, nameIn, addrIn, typeIdIn,
typeNameIn, valueIn);
do {
@@ -714,7 +725,7 @@ int SymbolGroupContext::dumpQString(unsigned long index,
if (!expandSymbol(iname, index, &errorMessage))
return 2;
const unsigned long dIndex = index + 4;
- if (!expandSymbol(iname, dIndex, &errorMessage))
+ if (!expandSymbol(dIndex, &errorMessage))
return 3;
const unsigned long sizeIndex = dIndex + 3;
const unsigned long arrayIndex = dIndex + 4;
@@ -760,27 +771,49 @@ int SymbolGroupContext::dumpStdString(unsigned long index,
{
QString errorMessage;
-
// Expand string ->string_val->_bx.
if (!expandSymbol(inameIn, index, &errorMessage))
return 1;
- const unsigned long bxIndex = index + 3;
- if (!expandSymbol(inameIn, bxIndex, &errorMessage))
- return 2;
- // Check if size is something sane
- const int sizeIndex = index + 6;
+ int sizeIndex = -1;
+ int bufIndex = -1;
+ if (m_symbolParameters.at(index).SubElements >= 3
+ && m_inameIndexMap.key(index + 3).endsWith(QLatin1String("Bx"))) {
+ // Up to MSVC 2008
+ const int bxIndex = index + 3;
+ if (m_symbolParameters.at(bxIndex).SubElements < 2
+ || !expandSymbol(index + 3, &errorMessage))
+ return 2;
+ // Check if size is something sane
+ sizeIndex = index + 6;
+ bufIndex = index + 4;
+ } else {
+ // MSVC10 onwards: Large nested string_val structure containing Bx
+ if (m_symbolParameters.at(index + 1).SubElements < 5
+ || !expandSymbol(index + 1, &errorMessage))
+ return 3;
+ const int bxIndex = index + 3;
+ if (m_symbolParameters.at(bxIndex).SubElements < 3
+ || !m_inameIndexMap.key(bxIndex).endsWith(QLatin1String("Bx"))
+ || !expandSymbol(bxIndex, &errorMessage))
+ return 4;
+ sizeIndex = index + 7;
+ bufIndex = index + 4;
+ }
+ if (sizeIndex < 0 || bufIndex < 0
+ || sizeIndex >= m_symbolParameters.size() || bufIndex >= m_symbolParameters.size())
+ return 5;
+ // Extract size and buffer
qint64 size;
if (!getSG_DecimalIntValue(m_symbolGroup, sizeIndex, &size))
- return 3;
+ return 6;
if (size < 0)
return 1;
// Just copy over the value of the buf[]-array, which should be the string
- const QChar doubleQuote = QLatin1Char('"');
- const int bufIndex = index + 4;
*valueIn = getSymbolString(m_symbolGroup, &IDebugSymbolGroup2::GetSymbolValueTextWide, bufIndex);
+ const QChar doubleQuote = QLatin1Char('"');
const int quotePos = valueIn->indexOf(doubleQuote);
if (quotePos == -1)
- return 1;
+ return 7;
valueIn->remove(0, quotePos);
if (valueIn->size() > maxStringLength) {
valueIn->truncate(maxStringLength);
diff --git a/src/plugins/debugger/cdb/symbolgroupcontext.h b/src/plugins/debugger/cdb/symbolgroupcontext.h
index 214af95dfc0..559e64a6747 100644
--- a/src/plugins/debugger/cdb/symbolgroupcontext.h
+++ b/src/plugins/debugger/cdb/symbolgroupcontext.h
@@ -143,6 +143,7 @@ private:
void clear();
bool expandSymbol(const QString &prefix, unsigned long index, QString *errorMessage);
+ bool expandSymbol(unsigned long index, QString *errorMessage);
void populateINameIndexMap(const QString &prefix, unsigned long parentId, unsigned long end);
QString symbolINameAt(unsigned long index) const;
inline QString formatShadowedName(const QString &name, int n) const;
diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index 2c6dfe58b1d..0a5ded2ed5b 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -240,7 +240,7 @@ DebuggerSettings *DebuggerSettings::instance()
item->setCheckable(true);
item->setDefaultValue(true);
item->setSettingsKey(debugModeGroup, QLatin1String("AutoDerefPointers"));
- item->setToolTip(tr("This switches the Locals&Watchers view to "
+ item->setToolTip(tr("This switches the Locals&&Watchers view to "
"automatically dereference pointers. This saves a level in the "
"tree view, but also loses data for the now-missing intermediate "
"level."));
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 3092b6a64dd..cbb287f1099 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -322,7 +322,7 @@ void DebuggerEnginePrivate::breakpointSetRemoveMarginActionTriggered()
QAction *act = qobject_cast(sender());
QTC_ASSERT(act, return);
QList list = act->data().toList();
- QTC_ASSERT(list.size() >= 3, return);
+ QTC_ASSERT(list.size() >= 3, qDebug() << list; return);
const QString fileName = list.at(0).toString();
const int lineNumber = list.at(1).toInt();
const quint64 address = list.at(2).toULongLong();
@@ -334,7 +334,7 @@ void DebuggerEnginePrivate::breakpointEnableDisableMarginActionTriggered()
QAction *act = qobject_cast(sender());
QTC_ASSERT(act, return);
QList list = act->data().toList();
- QTC_ASSERT(list.size() == 2, return);
+ QTC_ASSERT(list.size() == 3, qDebug() << list; return);
const QString fileName = list.at(0).toString();
const int lineNumber = list.at(1).toInt();
m_breakHandler.toggleBreakpointEnabled(fileName, lineNumber);
@@ -343,7 +343,7 @@ void DebuggerEnginePrivate::breakpointEnableDisableMarginActionTriggered()
void DebuggerEnginePrivate::handleContextMenuRequest(const QVariant ¶meters)
{
const QList list = parameters.toList();
- QTC_ASSERT(list.size() == 3, return);
+ QTC_ASSERT(list.size() == 3, qDebug() << list; return);
TextEditor::ITextEditor *editor =
(TextEditor::ITextEditor *)(list.at(0).value());
int lineNumber = list.at(1).toInt();
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 7eea602ad8e..8c016620bbc 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -613,7 +613,7 @@ bool DebuggerRunControl::aboutToStop() const
{
QTC_ASSERT(isRunning(), return true;)
- const QString question = tr("A debugging session are still in progress. "
+ const QString question = tr("A debugging session is still in progress. "
"Terminating the session in the current"
" state can leave the target in an inconsistent state."
" Would you still like to terminate it?");
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 14b0400a893..61779d3c449 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -230,6 +230,7 @@ void GdbEngine::initializeVariables()
m_isMacGdb = false;
m_hasPython = false;
m_registerNamesListed = false;
+ m_hasInferiorThreadList = false;
m_fullToShortName.clear();
m_shortToFullName.clear();
diff --git a/src/plugins/debugger/gdb/symbian.cpp b/src/plugins/debugger/gdb/symbian.cpp
index f7d6b62f282..636c83da85e 100644
--- a/src/plugins/debugger/gdb/symbian.cpp
+++ b/src/plugins/debugger/gdb/symbian.cpp
@@ -418,9 +418,9 @@ static void gdbAppendRegister(QByteArray *ba, uint regno, uint value)
ba->append(';');
}
-QByteArray Snapshot::gdbStopMessage(uint threadId, bool reportThreadId) const
+QByteArray Snapshot::gdbStopMessage(uint threadId, int signalNumber, bool reportThreadId) const
{
- QByteArray ba = "T05";
+ QByteArray ba = ('T' + trk::hexNumber(signalNumber, 2));
if (reportThreadId) {
ba += "thread:";
ba += trk::hexNumber(threadId, 3);
@@ -548,7 +548,7 @@ QVector gdbStartupSequence()
} // namespace Symbian
// Generic gdb server helpers: Read address/length off a memory
-// command like 'm845,455','X845,455'
+// command like 'm845,455','X845,455:'
QPair parseGdbReadMemoryRequest(const QByteArray &cmd)
{
QPair rc(0, 0);
@@ -559,7 +559,11 @@ QPair parseGdbReadMemoryRequest(const QByteArray &cmd)
rc.first = cmd.mid(1, pos - 1).toULongLong(&ok, 16);
if (!ok)
return rc;
- rc.second = cmd.mid(pos + 1).toUInt(&ok, 16);
+ const int colonPos = cmd.indexOf(':');
+ if (colonPos == -1)
+ rc.second = cmd.mid(pos + 1).toUInt(&ok, 16);
+ else
+ rc.second = cmd.mid(pos + 1, colonPos - pos - 1 ).toUInt(&ok, 16);
if (!ok)
rc.first = 0;
return rc;
diff --git a/src/plugins/debugger/gdb/symbian.h b/src/plugins/debugger/gdb/symbian.h
index 30012183c53..ec34462e47a 100644
--- a/src/plugins/debugger/gdb/symbian.h
+++ b/src/plugins/debugger/gdb/symbian.h
@@ -73,6 +73,12 @@ struct MemoryRange
QDebug operator<<(QDebug d, const MemoryRange &range);
+// Signals to be passed to gdb server as stop reason (2 digit hex)
+enum GdbServerStopReason {
+ gdbServerSignalTrap = 5, // Trap/Breakpoint, etc.
+ gdbServerSignalSegfault = 11 // Segfault
+};
+
namespace Symbian {
enum CodeMode
@@ -135,7 +141,7 @@ struct Snapshot
QByteArray gdbQsThreadInfo() const;
QByteArray gdbQThreadExtraInfo(const QByteArray &cmd) const;
// Format a gdb T05 stop message with thread and register set
- QByteArray gdbStopMessage(uint threadId, bool reportThreadId) const;
+ QByteArray gdbStopMessage(uint threadId, int signalNumber, bool reportThreadId) const;
// Format a log message for memory access with some smartness about registers
QByteArray memoryReadLogMessage(uint addr, uint threadId, bool verbose, const QByteArray &ba) const;
// Gdb command parse helpers: 'salnext'
diff --git a/src/plugins/debugger/gdb/tcftrkgdbadapter.cpp b/src/plugins/debugger/gdb/tcftrkgdbadapter.cpp
index 6e54e60eb54..65e328725e0 100644
--- a/src/plugins/debugger/gdb/tcftrkgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/tcftrkgdbadapter.cpp
@@ -113,6 +113,7 @@ static inline QString startMsg(const trk::Session &session)
TcfTrkGdbAdapter::TcfTrkGdbAdapter(GdbEngine *engine) :
AbstractGdbAdapter(engine),
m_running(false),
+ m_stopReason(0),
m_trkDevice(new TcfTrkDevice(this)),
m_gdbAckMode(true),
m_uid(0),
@@ -326,6 +327,9 @@ void TcfTrkGdbAdapter::tcftrkEvent(const TcfTrkEvent &e)
m_snapshot.setThreadState(threadId, reason);
// Update registers first, then report stopped
m_running = false;
+ m_stopReason = reason.contains(QLatin1String("exception"), Qt::CaseInsensitive)
+ || reason.contains(QLatin1String("panic"), Qt::CaseInsensitive) ?
+ gdbServerSignalSegfault : gdbServerSignalTrap;
m_trkDevice->sendRegistersGetMRangeCommand(
TcfTrkCallback(this, &TcfTrkGdbAdapter::handleAndReportReadRegistersAfterStop),
currentThreadContextId(), 0,
@@ -689,7 +693,7 @@ void TcfTrkGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
} else {
//qDebug() << "Fetching single register";
m_trkDevice->sendRegistersGetMRangeCommand(
- TcfTrkCallback(this, &TcfTrkGdbAdapter::handleAndReportReadRegistersAfterStop),
+ TcfTrkCallback(this, &TcfTrkGdbAdapter::handleAndReportReadRegister),
currentThreadContextId(), registerNumber, 1);
}
}
@@ -1306,7 +1310,7 @@ void TcfTrkGdbAdapter::handleAndReportReadRegistersAfterStop(const TcfTrkCommand
handleReadRegisters(result);
handleReadRegisters(result);
const bool reportThread = m_session.tid != m_session.mainTid;
- sendGdbServerMessage(m_snapshot.gdbStopMessage(m_session.tid, reportThread), stopMessage());
+ sendGdbServerMessage(m_snapshot.gdbStopMessage(m_session.tid, m_stopReason, reportThread), stopMessage());
}
void TcfTrkGdbAdapter::handleAndReportSetBreakpoint(const TcfTrkCommandResult &result)
diff --git a/src/plugins/debugger/gdb/tcftrkgdbadapter.h b/src/plugins/debugger/gdb/tcftrkgdbadapter.h
index ab69c13f256..71becf8e248 100644
--- a/src/plugins/debugger/gdb/tcftrkgdbadapter.h
+++ b/src/plugins/debugger/gdb/tcftrkgdbadapter.h
@@ -137,6 +137,7 @@ private:
QString m_gdbServerName; // 127.0.0.1:(2222+uid)
bool m_running;
+ int m_stopReason;
tcftrk::TcfTrkDevice *m_trkDevice;
QSharedPointer m_trkIODevice;
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.cpp b/src/plugins/debugger/gdb/trkgdbadapter.cpp
index 1961ab61cf4..05d1ba6bc40 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/trkgdbadapter.cpp
@@ -829,6 +829,17 @@ void TrkGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
sendGdbServerMessage("E20", msg.toLatin1());
}
} // qPart/qXfer
+
+ else if (cmd.startsWith("X")) {
+ logMessage(msgGdbPacket(QLatin1String("Write memory")));
+ // X addr,length
+ sendGdbServerAck();
+ const QPair addrLength = parseGdbReadMemoryRequest(cmd);
+ int pos = cmd.indexOf(':');
+ m_snapshot.resetMemory();
+ writeMemory(addrLength.first, cmd.mid(pos + 1, addrLength.second));
+ }
+
else {
logMessage(msgGdbPacket(QLatin1String("FIXME unknown: ")
+ QString::fromAscii(cmd)), LogWarning);
@@ -963,10 +974,12 @@ void TrkGdbAdapter::handleTrkResult(const TrkResult &result)
# if 1
// We almost always need register values, so get them
// now before informing gdb about the stop.s
- //qDebug() << "Auto-fetching registers";
+ const int signalNumber = reason.contains(QLatin1String("exception"), Qt::CaseInsensitive)
+ || reason.contains(QLatin1String("panic"), Qt::CaseInsensitive) ?
+ gdbServerSignalSegfault : gdbServerSignalTrap;
sendTrkMessage(0x12,
TrkCB(handleAndReportReadRegistersAfterStop),
- Launcher::readRegistersMessage(m_session.pid, m_session.tid));
+ Launcher::readRegistersMessage(m_session.pid, m_session.tid), signalNumber);
# else
// As a source-line step typically consists of
// several instruction steps, better avoid the multiple
@@ -1181,7 +1194,8 @@ void TrkGdbAdapter::handleAndReportReadRegistersAfterStop(const TrkResult &resul
{
handleReadRegisters(result);
const bool reportThread = m_session.tid != m_session.mainTid;
- sendGdbServerMessage(m_snapshot.gdbStopMessage(m_session.tid, reportThread),
+ const int signalNumber = result.cookie.isValid() ? result.cookie.toInt() : int(gdbServerSignalTrap);
+ sendGdbServerMessage(m_snapshot.gdbStopMessage(m_session.tid, signalNumber, reportThread),
"Stopped with registers in thread " + QByteArray::number(m_session.tid, 16));
}
@@ -1441,6 +1455,29 @@ void TrkGdbAdapter::readMemory(uint addr, uint len, bool buffered)
tryAnswerGdbMemoryRequest(buffered);
}
+void TrkGdbAdapter::writeMemory(uint addr, const QByteArray &data)
+{
+ Q_ASSERT(data.size() < (2 << 16));
+ if (m_verbose > 2) {
+ logMessage(_("writeMemory %1 bytes from 0x%2 blocksize=%3 data=%4")
+ .arg(data.size()).arg(addr, 0, 16).arg(MemoryChunkSize).arg(QString::fromLatin1(data.toHex())));
+ }
+
+ sendTrkMessage(0x11, TrkCB(handleWriteMemory),
+ trkWriteMemoryMessage(addr, data));
+}
+
+void TrkGdbAdapter::handleWriteMemory(const TrkResult &result)
+{
+ logMessage(" RESULT: " + result.toString() + result.cookie.toString());
+ if (result.errorCode()) {
+ logMessage("ERROR: " + result.errorString(), LogError);
+ sendGdbServerMessage("E01");
+ return;
+ }
+ sendGdbServerMessage("OK");
+}
+
void TrkGdbAdapter::interruptInferior()
{
sendTrkMessage(0x1a, TrkCallback(), trkInterruptMessage(), "Interrupting...");
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.h b/src/plugins/debugger/gdb/trkgdbadapter.h
index 1e7873815e9..2ea7e1bcfab 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.h
+++ b/src/plugins/debugger/gdb/trkgdbadapter.h
@@ -162,12 +162,14 @@ private:
void handleStep(const TrkResult &result);
void handleReadRegisters(const TrkResult &result);
void handleWriteRegister(const TrkResult &result);
+ void handleWriteMemory(const TrkResult &result);
void reportToGdb(const TrkResult &result);
void gdbSetCurrentThread(const QByteArray &cmd, const char *why);
//void reportReadMemoryBuffered(const TrkResult &result);
//void reportReadMemoryUnbuffered(const TrkResult &result);
void readMemory(uint addr, uint len, bool buffered);
+ void writeMemory(uint addr, const QByteArray &data);
void handleDirectTrk(const TrkResult &response);
void directStep(uint addr);
diff --git a/src/plugins/debugger/qml/qmladapter.cpp b/src/plugins/debugger/qml/qmladapter.cpp
index fbea843d19e..4c32f3c68a8 100644
--- a/src/plugins/debugger/qml/qmladapter.cpp
+++ b/src/plugins/debugger/qml/qmladapter.cpp
@@ -36,6 +36,8 @@
#include
#include
+#include
+
namespace Debugger {
struct QmlAdapterPrivate {
@@ -49,6 +51,7 @@ struct QmlAdapterPrivate {
int m_connectionAttempts;
int m_maxConnectionAttempts;
QDeclarativeDebugConnection *m_conn;
+ QList sendBuffer;
};
QmlAdapterPrivate::QmlAdapterPrivate(DebuggerEngine *engine, QmlAdapter *q) :
@@ -133,6 +136,16 @@ bool QmlAdapter::connectToViewer()
return true;
}
+void QmlAdapter::sendMessage(const QByteArray &msg)
+{
+ if (d->m_qmlClient->status() == QDeclarativeDebugClient::Enabled) {
+ flushSendBuffer();
+ d->m_qmlClient->sendMessage(msg);
+ } else {
+ d->sendBuffer.append(msg);
+ }
+}
+
void QmlAdapter::connectionErrorOccurred(QAbstractSocket::SocketError socketError)
{
showConnectionErrorMessage(tr("Error: (%1) %2", "%1=error code, %2=error message")
@@ -143,6 +156,19 @@ void QmlAdapter::connectionErrorOccurred(QAbstractSocket::SocketError socketErro
emit connectionError(socketError);
}
+void QmlAdapter::clientStatusChanged(QDeclarativeDebugClient::Status status)
+{
+ QString serviceName;
+ if (QDeclarativeDebugClient *client = qobject_cast(sender())) {
+ serviceName = client->name();
+ }
+
+ logServiceStatusChange(serviceName, status);
+
+ if (status == QDeclarativeDebugClient::Enabled)
+ flushSendBuffer();
+}
+
void QmlAdapter::connectionStateChanged()
{
switch (d->m_conn->state()) {
@@ -165,6 +191,7 @@ void QmlAdapter::connectionStateChanged()
if (!d->m_mainClient) {
d->m_mainClient = new QDeclarativeEngineDebug(d->m_conn, this);
+ logServiceStatusChange(QLatin1String("QmlObserver"), static_cast(d->m_mainClient->status()));
}
createDebuggerClient();
@@ -185,11 +212,15 @@ void QmlAdapter::createDebuggerClient()
{
d->m_qmlClient = new Internal::QmlDebuggerClient(d->m_conn);
+ connect(d->m_qmlClient, SIGNAL(newStatus(QDeclarativeDebugClient::Status)),
+ this, SLOT(clientStatusChanged(QDeclarativeDebugClient::Status)));
connect(d->m_engine.data(), SIGNAL(sendMessage(QByteArray)),
- d->m_qmlClient, SLOT(slotSendMessage(QByteArray)));
+ this, SLOT(sendMessage(QByteArray)));
connect(d->m_qmlClient, SIGNAL(messageWasReceived(QByteArray)),
d->m_engine.data(), SLOT(messageReceived(QByteArray)));
+ logServiceStatusChange(d->m_qmlClient->name(), d->m_qmlClient->status());
+
//engine->startSuccessful(); // FIXME: AAA: port to new debugger states
}
@@ -237,4 +268,33 @@ void QmlAdapter::setConnectionAttemptInterval(int interval)
d->m_connectionTimer->setInterval(interval);
}
+void QmlAdapter::logServiceStatusChange(const QString &service, QDeclarativeDebugClient::Status newStatus)
+{
+ switch (newStatus) {
+ case QDeclarativeDebugClient::Unavailable: {
+ showConnectionErrorMessage(tr("Error: Cannot connect to debug service '%1'. Debugging functionality will be limited.").arg(service));
+ emit serviceConnectionError(service);
+ break;
+ }
+ case QDeclarativeDebugClient::Enabled: {
+ showConnectionStatusMessage(tr("Connected to debug service '%1'.").arg(service));
+ break;
+ }
+
+ case QDeclarativeDebugClient::NotConnected: {
+ showConnectionStatusMessage(tr("Not connected to debug service '%1'.").arg(service));
+ break;
+ }
+ }
+}
+
+void QmlAdapter::flushSendBuffer()
+{
+ QTC_ASSERT(d->m_qmlClient->status() == QDeclarativeDebugClient::Enabled, return);
+ foreach (const QByteArray &msg, d->sendBuffer) {
+ d->m_qmlClient->sendMessage(msg);
+ }
+ d->sendBuffer.clear();
+}
+
} // namespace Debugger
diff --git a/src/plugins/debugger/qml/qmladapter.h b/src/plugins/debugger/qml/qmladapter.h
index 6118a05543f..64478569d7b 100644
--- a/src/plugins/debugger/qml/qmladapter.h
+++ b/src/plugins/debugger/qml/qmladapter.h
@@ -36,6 +36,7 @@
#include "debugger_global.h"
#include
+#include "qmldebuggerclient.h"
namespace QmlJsDebugClient {
class QDeclarativeEngineDebug;
@@ -72,15 +73,19 @@ public:
void setMaxConnectionAttempts(int maxAttempts);
void setConnectionAttemptInterval(int interval);
+ void logServiceStatusChange(const QString &service, QDeclarativeDebugClient::Status newStatus);
+
signals:
- void aboutToDisconnect();
void connected();
void disconnected();
void connectionStartupFailed();
void connectionError(QAbstractSocket::SocketError socketError);
+ void serviceConnectionError(const QString serviceName);
private slots:
+ void sendMessage(const QByteArray &msg);
void connectionErrorOccurred(QAbstractSocket::SocketError socketError);
+ void clientStatusChanged(QDeclarativeDebugClient::Status status);
void connectionStateChanged();
void pollInferior();
@@ -89,6 +94,7 @@ private:
void createDebuggerClient();
void showConnectionStatusMessage(const QString &message);
void showConnectionErrorMessage(const QString &message);
+ void flushSendBuffer();
private:
QScopedPointer d;
diff --git a/src/plugins/debugger/qml/qmldebuggerclient.cpp b/src/plugins/debugger/qml/qmldebuggerclient.cpp
index a4d852fb93c..99ebc0019c4 100644
--- a/src/plugins/debugger/qml/qmldebuggerclient.cpp
+++ b/src/plugins/debugger/qml/qmldebuggerclient.cpp
@@ -37,22 +37,21 @@ namespace Internal {
QmlDebuggerClient::QmlDebuggerClient(QmlJsDebugClient::QDeclarativeDebugConnection* client)
: QDeclarativeDebugClient(QLatin1String("JSDebugger"), client)
{
- setEnabled(true);
}
QmlDebuggerClient::~QmlDebuggerClient()
{
}
+void QmlDebuggerClient::statusChanged(Status status)
+{
+ emit newStatus(status);
+}
+
void QmlDebuggerClient::messageReceived(const QByteArray &data)
{
emit messageWasReceived(data);
}
-void QmlDebuggerClient::slotSendMessage(const QByteArray &message)
-{
- QDeclarativeDebugClient::sendMessage(message);
-}
-
} // Internal
} // Debugger
diff --git a/src/plugins/debugger/qml/qmldebuggerclient.h b/src/plugins/debugger/qml/qmldebuggerclient.h
index 191e3570d52..2345a56d923 100644
--- a/src/plugins/debugger/qml/qmldebuggerclient.h
+++ b/src/plugins/debugger/qml/qmldebuggerclient.h
@@ -44,12 +44,11 @@ public:
virtual ~QmlDebuggerClient();
signals:
+ void newStatus(QDeclarativeDebugClient::Status status);
void messageWasReceived(const QByteArray &data);
-private Q_SLOTS:
- void slotSendMessage(const QByteArray &message);
-
protected:
+ virtual void statusChanged(Status status);
virtual void messageReceived(const QByteArray &data);
};
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index be920e5dc9d..9e1599aedc1 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -218,6 +218,12 @@ void QmlEngine::connectionError(QAbstractSocket::SocketError socketError)
plugin()->showMessage(tr("QML Debugger: Remote host closed connection."), StatusBar);
}
+
+void QmlEngine::serviceConnectionError(const QString &serviceName)
+{
+ plugin()->showMessage(tr("QML Debugger: Couldn't connect to service '%1'.").arg(serviceName), StatusBar);
+}
+
void QmlEngine::runEngine()
{
QTC_ASSERT(state() == EngineRunRequested, qDebug() << state());
@@ -327,6 +333,7 @@ void QmlEngine::setupEngine()
d->m_adapter->setConnectionAttemptInterval(ConnectionAttemptDefaultInterval);
connect(d->m_adapter, SIGNAL(connectionError(QAbstractSocket::SocketError)),
SLOT(connectionError(QAbstractSocket::SocketError)));
+ connect(d->m_adapter, SIGNAL(serviceConnectionError(QString)), SLOT(serviceConnectionError(QString)));
connect(d->m_adapter, SIGNAL(connected()), SLOT(connectionEstablished()));
connect(d->m_adapter, SIGNAL(connectionStartupFailed()), SLOT(connectionStartupFailed()));
@@ -659,9 +666,34 @@ void QmlEngine::messageReceived(const QByteArray &message)
tr("An Uncaught Exception occured in %1:
%2
")
.arg(stackFrames.value(0).file, Qt::escape(error));
showMessageBox(QMessageBox::Information, tr("Uncaught Exception"), msg);
+ } else {
+ //
+ // Make breakpoint non-pending
+ //
+ QString file;
+ int line = -1;
+
+ if (!stackFrames.isEmpty()) {
+ file = stackFrames.at(0).file;
+ line = stackFrames.at(0).line;
+
+ if (isShadowBuildProject()) {
+ file = fromShadowBuildFilename(file);
+ }
+ }
+
+ Internal::BreakHandler *handler = breakHandler();
+ for (int index = 0; index != handler->size(); ++index) {
+ Internal::BreakpointData *data = handler->at(index);
+ QString processedFilename = data->fileName;
+
+ if (processedFilename == file
+ && data->lineNumber == line) {
+ data->pending = false;
+ data->updateMarker();
+ }
+ }
}
-
-
} else if (command == "RESULT") {
Internal::WatchData data;
QByteArray iname;
diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h
index 6a4c9c639b2..d5087873cdd 100644
--- a/src/plugins/debugger/qml/qmlengine.h
+++ b/src/plugins/debugger/qml/qmlengine.h
@@ -118,6 +118,7 @@ private slots:
void connectionEstablished();
void connectionStartupFailed();
void connectionError(QAbstractSocket::SocketError error);
+ void serviceConnectionError(const QString &service);
private:
void expandObject(const QByteArray &iname, quint64 objectId);
diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp
index 4b741898ecb..d05f9b12226 100644
--- a/src/plugins/designer/qtcreatorintegration.cpp
+++ b/src/plugins/designer/qtcreatorintegration.cpp
@@ -37,8 +37,9 @@
#include
#include
+#include
#include
-#include
+#include
#include
#include
#include
@@ -282,9 +283,10 @@ static void addDeclaration(const Snapshot &snapshot,
declaration += functionName;
declaration += QLatin1String(";\n");
- InsertionPointLocator find(snapshot);
- const InsertionLocation loc = find.methodDeclarationInClass(
- fileName, cl, InsertionPointLocator::PrivateSlot);
+ CppTools::CppRefactoringChanges refactoring(snapshot);
+ CppTools::InsertionPointLocator find(&refactoring);
+ const CppTools::InsertionLocation loc = find.methodDeclarationInClass(
+ fileName, cl, CppTools::InsertionPointLocator::PrivateSlot);
//
//! \todo change this to use the Refactoring changes.
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index 8ff9e454c2d..e0bbf7df805 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -2657,6 +2657,8 @@ EventResult FakeVimHandler::Private::handleInsertMode(const Input &input)
enterCommandMode();
m_submode = NoSubMode;
m_ctrlVActive = false;
+ m_opcount.clear();
+ m_mvcount.clear();
} else if (m_ctrlVActive) {
insertInInsertMode(input.raw());
} else if (input.isControl('v')) {
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 48f5c5a893d..9837b7c35a7 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -50,6 +50,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1922,6 +1923,67 @@ QString GitClient::readConfigValue(const QString &workingDirectory, const QStrin
return readConfig(workingDirectory, QStringList(configVar)).remove(QLatin1Char('\n'));
}
+bool GitClient::cloneRepository(const QString &directory,const QByteArray &url)
+{
+ QDir workingDirectory(directory);
+ const unsigned flags = VCSBase::VCSBasePlugin::SshPasswordPrompt |
+ VCSBase::VCSBasePlugin::ShowStdOutInLogWindow|
+ VCSBase::VCSBasePlugin::ShowSuccessMessage;
+
+ if (workingDirectory.exists()) {
+ if (!synchronousInit(workingDirectory.path()))
+ return false;
+
+ QStringList arguments(QLatin1String("remote"));
+ arguments << QLatin1String("add") << QLatin1String("origin") << url;
+ if (!fullySynchronousGit(workingDirectory.path(), arguments, 0, 0, true))
+ return false;
+
+ arguments.clear();
+ arguments << QLatin1String("fetch");
+ const Utils::SynchronousProcessResponse resp =
+ synchronousGit(workingDirectory.path(), arguments, flags);
+ if (resp.result != Utils::SynchronousProcessResponse::Finished)
+ return false;
+
+ arguments.clear();
+ arguments << QLatin1String("config")
+ << QLatin1String("branch.master.remote")
+ << QLatin1String("origin");
+ if (!fullySynchronousGit(workingDirectory.path(), arguments, 0, 0, true))
+ return false;
+
+ arguments.clear();
+ arguments << QLatin1String("config")
+ << QLatin1String("branch.master.merge")
+ << QLatin1String("refs/heads/master");
+ if (!fullySynchronousGit(workingDirectory.path(), arguments, 0, 0, true))
+ return false;
+
+ return true;
+ } else {
+ QStringList arguments(QLatin1String("clone"));
+ arguments << url << workingDirectory.dirName();
+ workingDirectory.cdUp();
+ const Utils::SynchronousProcessResponse resp =
+ synchronousGit(workingDirectory.path(), arguments, flags);
+ return resp.result == Utils::SynchronousProcessResponse::Finished;
+ }
+}
+
+QString GitClient::vcsGetRepositoryURL(const QString &directory)
+{
+ QStringList arguments(QLatin1String("config"));
+ QByteArray outputText;
+
+ arguments << QLatin1String("remote.origin.url");
+
+ if (fullySynchronousGit(directory, arguments, &outputText, 0, false)) {
+ return commandOutputFromLocal8Bit(outputText);
+ }
+ return QString();
+}
+
GitSettings GitClient::settings() const
{
return m_settings;
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index 9de98447889..828a4e09094 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -158,6 +158,8 @@ public:
unsigned gitVersion(bool silent, QString *errorMessage = 0);
QString gitVersionString(bool silent, QString *errorMessage = 0);
+ bool cloneRepository(const QString &directory, const QByteArray &url);
+ QString vcsGetRepositoryURL(const QString &directory);
bool synchronousFetch(const QString &workingDirectory);
bool synchronousPull(const QString &workingDirectory);
bool synchronousPush(const QString &workingDirectory);
diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp
index 1a02f4a8a18..5014a8b20f8 100644
--- a/src/plugins/git/gitsubmiteditorwidget.cpp
+++ b/src/plugins/git/gitsubmiteditorwidget.cpp
@@ -34,10 +34,13 @@
#include
#include
+#include
+#include
#include
#include
#include
+#include
#include
namespace Git {
@@ -116,11 +119,19 @@ GitSubmitEditorWidget::GitSubmitEditorWidget(QWidget *parent) :
m_gitSubmitPanelUi.setupUi(m_gitSubmitPanel);
insertTopWidget(m_gitSubmitPanel);
new GitSubmitHighlighter(descriptionEdit());
+
+ m_emailValidator = new QRegExpValidator(QRegExp(QLatin1String("[^@ ]+@[^@ ]+\\.[a-zA-Z]+")), this);
+
+ m_gitSubmitPanelUi.emailLineEdit->setValidator(m_emailValidator);
+ connect(m_gitSubmitPanelUi.authorLineEdit, SIGNAL(textChanged(QString)),
+ this, SLOT(authorInformationChanged()));
+ connect(m_gitSubmitPanelUi.emailLineEdit, SIGNAL(textChanged(QString)),
+ this, SLOT(authorInformationChanged()));
}
void GitSubmitEditorWidget::setPanelInfo(const GitSubmitEditorPanelInfo &info)
{
- m_gitSubmitPanelUi.repositoryLabel->setText(info.repository);
+ m_gitSubmitPanelUi.repositoryLabel->setText(QDir::toNativeSeparators(info.repository));
m_gitSubmitPanelUi.branchLabel->setText(info.branch);
}
@@ -136,6 +147,32 @@ void GitSubmitEditorWidget::setPanelData(const GitSubmitEditorPanelData &data)
{
m_gitSubmitPanelUi.authorLineEdit->setText(data.author);
m_gitSubmitPanelUi.emailLineEdit->setText(data.email);
+ authorInformationChanged();
+}
+
+bool GitSubmitEditorWidget::canSubmit() const
+{
+ if (m_gitSubmitPanelUi.authorLineEdit->text().isEmpty()
+ || !emailIsValid())
+ return false;
+ return SubmitEditorWidget::canSubmit();
+}
+
+void GitSubmitEditorWidget::authorInformationChanged()
+{
+ m_gitSubmitPanelUi.invalidAuthorLabel->
+ setVisible(m_gitSubmitPanelUi.authorLineEdit->text().isEmpty());
+ m_gitSubmitPanelUi.invalidEmailLabel->
+ setVisible(!emailIsValid());
+
+ updateSubmitAction();
+}
+
+bool GitSubmitEditorWidget::emailIsValid() const
+{
+ int pos = m_gitSubmitPanelUi.emailLineEdit->cursorPosition();
+ return m_emailValidator->validate(m_gitSubmitPanelUi.emailLineEdit->text(), pos)
+ == QValidator::Acceptable;
}
} // namespace Internal
diff --git a/src/plugins/git/gitsubmiteditorwidget.h b/src/plugins/git/gitsubmiteditorwidget.h
index 40d744641fd..64e4c5aac3c 100644
--- a/src/plugins/git/gitsubmiteditorwidget.h
+++ b/src/plugins/git/gitsubmiteditorwidget.h
@@ -31,8 +31,13 @@
#define GITSUBMITEDITORWIDGET_H
#include "ui_gitsubmitpanel.h"
+
#include
+QT_BEGIN_NAMESPACE
+class QValidator;
+QT_END_NAMESPACE
+
namespace Git {
namespace Internal {
@@ -49,6 +54,7 @@ struct GitSubmitEditorPanelData;
class GitSubmitEditorWidget : public Utils::SubmitEditorWidget
{
+ Q_OBJECT
public:
explicit GitSubmitEditorWidget(QWidget *parent = 0);
@@ -59,9 +65,18 @@ public:
void setPanelInfo(const GitSubmitEditorPanelInfo &info);
+protected:
+ bool canSubmit() const;
+
+private slots:
+ void authorInformationChanged();
+
private:
+ bool emailIsValid() const;
+
QWidget *m_gitSubmitPanel;
Ui::GitSubmitPanel m_gitSubmitPanelUi;
+ QValidator *m_emailValidator;
};
} // namespace Internal
diff --git a/src/plugins/git/gitsubmitpanel.ui b/src/plugins/git/gitsubmitpanel.ui
index 7dfa9b3ba0f..c790299aa11 100644
--- a/src/plugins/git/gitsubmitpanel.ui
+++ b/src/plugins/git/gitsubmitpanel.ui
@@ -6,8 +6,8 @@
0
0
- 374
- 229
+ 364
+ 172
@@ -59,49 +59,96 @@
Commit Information
-
- -
-
-
-
-
-
- Author:
-
-
-
- -
-
-
- -
-
-
- Email:
-
-
-
- -
-
-
-
+
+ -
+
+
+ Author:
+
+
- -
+
-
+
+
+
+ 150
+ 0
+
+
+
+
+ -
+
+
+
+ 20
+ 20
+
+
+
+
+
+
+ :/projectexplorer/images/compile_error.png
+
+
+
+ -
Qt::Horizontal
+
+ QSizePolicy::MinimumExpanding
+
- 161
+ 5
20
+ -
+
+
+ Email:
+
+
+
+ -
+
+
+
+ 150
+ 0
+
+
+
+
+ -
+
+
+
+ 20
+ 20
+
+
+
+
+
+
+ :/projectexplorer/images/compile_error.png
+
+
+
-
+
+
+
diff --git a/src/plugins/git/gitversioncontrol.cpp b/src/plugins/git/gitversioncontrol.cpp
index 370e20bb270..ad6cc63c2da 100644
--- a/src/plugins/git/gitversioncontrol.cpp
+++ b/src/plugins/git/gitversioncontrol.cpp
@@ -87,6 +87,10 @@ bool GitVersionControl::supportsOperation(Operation operation) const
case AnnotateOperation:
rc = true;
break;
+ case CheckoutOperation:
+ case GetRepositoryRootOperation:
+ rc = true;
+ break;
}
return rc;
}
@@ -121,6 +125,17 @@ bool GitVersionControl::vcsCreateRepository(const QString &directory)
{
return gitClient()->synchronousInit(directory);
}
+
+bool GitVersionControl::vcsCheckout(const QString &directory, const QByteArray &url)
+{
+ return gitClient()->cloneRepository(directory,url);
+}
+
+QString GitVersionControl::vcsGetRepositoryURL(const QString &directory)
+{
+ return gitClient()->vcsGetRepositoryURL(directory);
+}
+
/* Snapshots are implement using stashes, relying on stash messages for
* naming as the actual stash names (stash{n}) are rotated as one adds stashes.
* Note that the snapshot interface does not care whether we have an unmodified
diff --git a/src/plugins/git/gitversioncontrol.h b/src/plugins/git/gitversioncontrol.h
index 35504747a7c..0d7276a392d 100644
--- a/src/plugins/git/gitversioncontrol.h
+++ b/src/plugins/git/gitversioncontrol.h
@@ -54,6 +54,8 @@ public:
virtual bool vcsDelete(const QString &filename);
virtual bool vcsMove(const QString &from, const QString &to);
virtual bool vcsCreateRepository(const QString &directory);
+ virtual bool vcsCheckout(const QString &directory, const QByteArray &url);
+ virtual QString vcsGetRepositoryURL(const QString &directory);
virtual QString vcsCreateSnapshot(const QString &topLevel);
virtual QStringList vcsSnapshots(const QString &topLevel);
virtual bool vcsRestoreSnapshot(const QString &topLevel, const QString &name);
diff --git a/src/plugins/help/generalsettingspage.ui b/src/plugins/help/generalsettingspage.ui
index 0bcd55ef5e7..2a49b659828 100644
--- a/src/plugins/help/generalsettingspage.ui
+++ b/src/plugins/help/generalsettingspage.ui
@@ -368,7 +368,7 @@
Switch to editor context after last help page is closed.
- Return to editor on closing the last page
+ Return to editor on closing the last page
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 55438fa64c1..043e3ed2d44 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -73,6 +73,7 @@
#include
#include
#include
+#include
#include
#include
@@ -839,19 +840,49 @@ void HelpPlugin::activateContext()
"available.