diff options
author | hjk <qthjk@ovi.com> | 2012-11-07 18:36:52 +0100 |
---|---|---|
committer | hjk <qthjk@ovi.com> | 2012-11-08 08:43:42 +0100 |
commit | 3fba291b7b53010f580bb6b42c8b30af04bc83fe (patch) | |
tree | bfcba5dce732d8df289341f2d49de24e2f5c3db6 /src/plugins/cppeditor | |
parent | 88814c64b5d33968159c36d2d5049011f1cb49c5 (diff) |
cppquickfixes: compile fix for msvc2008
Change-Id: I287c76372d2c50c408b9ef74e292a36d8e278449
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/plugins/cppeditor')
-rw-r--r-- | src/plugins/cppeditor/cppcompleteswitch.cpp | 1 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppcompleteswitch.h | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppfunctiondecldeflink.cpp | 1 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppfunctiondecldeflink.h | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppinsertdecldef.cpp | 1 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppinsertdecldef.h | 6 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppinsertqtpropertymembers.h | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppquickfix.h | 8 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppquickfixes.cpp | 2 |
9 files changed, 14 insertions, 11 deletions
diff --git a/src/plugins/cppeditor/cppcompleteswitch.cpp b/src/plugins/cppeditor/cppcompleteswitch.cpp index 2805761d245..687538c457b 100644 --- a/src/plugins/cppeditor/cppcompleteswitch.cpp +++ b/src/plugins/cppeditor/cppcompleteswitch.cpp @@ -46,6 +46,7 @@ using namespace CPlusPlus; using namespace CppEditor; using namespace CppEditor::Internal; using namespace CppTools; +using namespace TextEditor; using namespace Utils; namespace { diff --git a/src/plugins/cppeditor/cppcompleteswitch.h b/src/plugins/cppeditor/cppcompleteswitch.h index 192a8652358..5158987989c 100644 --- a/src/plugins/cppeditor/cppcompleteswitch.h +++ b/src/plugins/cppeditor/cppcompleteswitch.h @@ -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 diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp index cbb9c248ee5..b55f6a3c7a6 100644 --- a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp +++ b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp @@ -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) diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.h b/src/plugins/cppeditor/cppfunctiondecldeflink.h index dc090b75fb8..152edcf6c16 100644 --- a/src/plugins/cppeditor/cppfunctiondecldeflink.h +++ b/src/plugins/cppeditor/cppfunctiondecldeflink.h @@ -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 diff --git a/src/plugins/cppeditor/cppinsertdecldef.cpp b/src/plugins/cppeditor/cppinsertdecldef.cpp index cdf165b40a3..b715f5b2db9 100644 --- a/src/plugins/cppeditor/cppinsertdecldef.cpp +++ b/src/plugins/cppeditor/cppinsertdecldef.cpp @@ -55,6 +55,7 @@ using namespace CPlusPlus; using namespace CppEditor; using namespace CppEditor::Internal; using namespace CppTools; +using namespace TextEditor; namespace { diff --git a/src/plugins/cppeditor/cppinsertdecldef.h b/src/plugins/cppeditor/cppinsertdecldef.h index 90176c72eee..950e20d294e 100644 --- a/src/plugins/cppeditor/cppinsertdecldef.h +++ b/src/plugins/cppeditor/cppinsertdecldef.h @@ -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 diff --git a/src/plugins/cppeditor/cppinsertqtpropertymembers.h b/src/plugins/cppeditor/cppinsertqtpropertymembers.h index 6b6e4bf47c1..5400c32b53f 100644 --- a/src/plugins/cppeditor/cppinsertqtpropertymembers.h +++ b/src/plugins/cppeditor/cppinsertqtpropertymembers.h @@ -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 { diff --git a/src/plugins/cppeditor/cppquickfix.h b/src/plugins/cppeditor/cppquickfix.h index ed64a849815..53c57e09d08 100644 --- a/src/plugins/cppeditor/cppquickfix.h +++ b/src/plugins/cppeditor/cppquickfix.h @@ -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 diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index 0502032bb63..9128e37d97b 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -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) |