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

cppquickfixes: compile fix for msvc2008

Browse Source 
Change-Id: I287c76372d2c50c408b9ef74e292a36d8e278449
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-11-07 18:36:52 +01:00
parent 88814c64b5
commit 3fba291b7b
9 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/cppeditor/cppcompleteswitch.cpp
View File

@@ -46,6 +46,7 @@ using namespace CPlusPlus;
using namespace CppEditor;
using namespace CppEditor::Internal;
using namespace CppTools;
using namespace TextEditor;
using namespace Utils;
namespace {

2
src/plugins/cppeditor/cppcompleteswitch.h
View File

@@ -41,7 +41,7 @@ namespace Internal {
class CompleteSwitchCaseStatement: public CppQuickFixFactory
{
public:
void match(const CppQuickFixInterface &interface, QuickFixOperations &result);
void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result);
};
} // namespace Internal

1
src/plugins/cppeditor/cppfunctiondecldeflink.cpp
View File

@@ -59,6 +59,7 @@ using namespace CPlusPlus;
using namespace CppEditor;
using namespace CppEditor::Internal;
using namespace CppTools;
using namespace TextEditor;
FunctionDeclDefLinkFinder::FunctionDeclDefLinkFinder(QObject *parent)
: QObject(parent)

2
src/plugins/cppeditor/cppfunctiondecldeflink.h
View File

@@ -127,7 +127,7 @@ private:
class ApplyDeclDefLinkChanges: public CppQuickFixFactory
{
public:
void match(const CppQuickFixInterface &interface, QuickFixOperations &result);
void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result);
};
} // namespace Internal

1
src/plugins/cppeditor/cppinsertdecldef.cpp
View File

@@ -55,6 +55,7 @@ using namespace CPlusPlus;
using namespace CppEditor;
using namespace CppEditor::Internal;
using namespace CppTools;
using namespace TextEditor;
namespace {

6
src/plugins/cppeditor/cppinsertdecldef.h
View File

@@ -38,18 +38,18 @@ namespace Internal {
class DeclFromDef: public CppQuickFixFactory
{
public:
void match(const CppQuickFixInterface &interface, QuickFixOperations &result);
void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result);
};
class DefFromDecl: public CppQuickFixFactory
{
public:
void match(const CppQuickFixInterface &interface, QuickFixOperations &result);
void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result);
};
class ExtractFunction : public CppQuickFixFactory
{
void match(const CppQuickFixInterface &interface, QuickFixOperations &result);
void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result);
};
} // namespace Internal

2
src/plugins/cppeditor/cppinsertqtpropertymembers.h
View File

@@ -60,7 +60,7 @@ class InsertQtPropertyMembers : public CppQuickFixFactory
Q_OBJECT
public:
void match(const CppQuickFixInterface &interface, QuickFixOperations &result);
void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result);
private:
enum GenerateFlag {

8
src/plugins/cppeditor/cppquickfix.h
View File

@@ -42,8 +42,6 @@ namespace CppEditor {
namespace Internal { class CppQuickFixAssistInterface; }
typedef QSharedPointer<const Internal::CppQuickFixAssistInterface> CppQuickFixInterface;
typedef TextEditor::QuickFixInterface QuickFixInterface;
typedef TextEditor::QuickFixOperations QuickFixOperations;
class CPPEDITOR_EXPORT CppQuickFixOperation: public TextEditor::QuickFixOperation
{
@@ -66,13 +64,15 @@ class CPPEDITOR_EXPORT CppQuickFixFactory: public TextEditor::QuickFixFactory
public:
CppQuickFixFactory() {}
void matchingOperations(const QuickFixInterface &interface, QuickFixOperations &result);
void matchingOperations(const TextEditor::QuickFixInterface &interface,
TextEditor::QuickFixOperations &result);
/*!
Implement this method to match and create the appropriate
CppQuickFixOperation objects.
*/
virtual void match(const CppQuickFixInterface &interface, QuickFixOperations &result) = 0;
virtual void match(const CppQuickFixInterface &interface,
TextEditor::QuickFixOperations &result) = 0;
};
} // namespace CppEditor

2
src/plugins/cppeditor/cppquickfixes.cpp
View File

@@ -76,8 +76,8 @@
using namespace CppEditor;
using namespace CppEditor::Internal;
using namespace CppTools;
using namespace TextEditor;
using namespace CPlusPlus;
using namespace TextEditor;
using namespace Utils;
static inline bool isQtStringLiteral(const QByteArray &id)