feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.2'

Browse Source 
Change-Id: I05f76a4f5134c4edd91a79b757bcce9d6e7c258b
This commit is contained in:
Eike Ziller
2014-07-07 09:18:40 +02:00
parent 45fa5f9ccb b435f7bfe8
commit 62aea4728f
363 changed files with 1501 additions and 1321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cpptools/cppcompletionassistprovider.cpp
View File

@@ -41,7 +41,7 @@ using namespace CppTools;
// ---------------------------
// CppCompletionAssistProvider
// ---------------------------
bool CppCompletionAssistProvider::supportsEditor(const Core::Id &editorId) const
bool CppCompletionAssistProvider::supportsEditor(Core::Id editorId) const
{
return editorId == CppEditor::Constants::CPPEDITOR_ID;
}

2
src/plugins/cpptools/cppcompletionassistprovider.h
View File

@@ -55,7 +55,7 @@ class CPPTOOLS_EXPORT CppCompletionAssistProvider : public TextEditor::Completio
Q_OBJECT
public:
bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
int activationCharSequenceLength() const QTC_OVERRIDE;
bool isActivationCharSequence(const QString &sequence) const QTC_OVERRIDE;
bool isContinuationChar(const QChar &c) const QTC_OVERRIDE;