diff options
author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-04-23 11:46:55 +0200 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-04-23 12:36:06 +0200 |
commit | 849534ec6fd20ef8f2c5821e96a5e0e3cfbd32b5 (patch) | |
tree | 8f7e939dbfcfb153b9416baac45f324251d1892e /src/plugins/cpptools/cppcompletion_test.cpp | |
parent | e8c23e1d713733a47d2eb169f0c7dc0f9508a2b9 (diff) | |
download | qt-creator-849534ec6fd20ef8f2c5821e96a5e0e3cfbd32b5.tar.gz |
Revert "C++: fix support for typedef of templated typedefs"
Still crashes when opening the Qt Creator project,
g++ (Ubuntu/Linaro 4.7.2-2ubuntu1) 4.7.2 (Ubuntu 12.10).
This reverts commit 564c9b2842663062658a0febdcc5787098d871b2.
Change-Id: Ief5c0aad463d245f68805f747d277ac298796c3d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppcompletion_test.cpp')
-rw-r--r-- | src/plugins/cpptools/cppcompletion_test.cpp | 135 |
1 files changed, 0 insertions, 135 deletions
diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp index b5cd103374..b8ee95f7c0 100644 --- a/src/plugins/cpptools/cppcompletion_test.cpp +++ b/src/plugins/cpptools/cppcompletion_test.cpp @@ -1882,138 +1882,3 @@ void CppToolsPlugin::test_completion_QTCREATORBUG9098() QVERIFY(completions.contains(QLatin1String("c"))); QVERIFY(completions.contains(QLatin1String("B"))); } - -void CppToolsPlugin::test_completion_typedef_of_templated_typedef_QTCREATORBUG8375() -{ - TestData data; - data.srcText = - "struct Foo\n" - "{ void bar(); };\n" - "struct A\n" - "{ typedef Foo AFoo; };\n" - "template <class T>\n" - "struct B\n" - "{ typedef typename T::AFoo BFoo; };\n" - "struct C : public B<A>\n" - "{\n" - " void test()\n" - " {\n" - " BFoo foo;\n" - " @\n" - " // padding so we get the scope right\n" - " }\n" - "};\n" - ; - setup(&data); - - Utils::ChangeSet change; - QString txt = QLatin1String("foo."); - change.insert(data.pos, txt); - QTextCursor cursor(data.doc); - change.apply(&cursor); - data.pos += txt.length(); - - QStringList completions = getCompletions(data); - - QCOMPARE(completions.size(), 2); - QVERIFY(completions.contains(QLatin1String("Foo"))); - QVERIFY(completions.contains(QLatin1String("bar"))); -} - -void CppToolsPlugin::test_completion_typedef_with_the_same_base_name_and_new_type_name() -{ - TestData data; - data.srcText = - "namespace A\n" - "{\n" - "struct A { int aa; };\n" - "}\n" - "struct S\n" - "{\n" - " typedef A::A A;\n" - " A a;\n" - "};\n" - "void fun()\n" - "{\n" - " S s;\n" - " @\n" - " // padding so we get the scope right\n" - "};\n" - ; - setup(&data); - - Utils::ChangeSet change; - QString txt = QLatin1String("s.a."); - change.insert(data.pos, txt); - QTextCursor cursor(data.doc); - change.apply(&cursor); - data.pos += txt.length(); - - QStringList completions = getCompletions(data); - - QCOMPARE(completions.size(), 2); - QVERIFY(completions.contains(QLatin1String("A"))); - QVERIFY(completions.contains(QLatin1String("aa"))); -} - -void CppToolsPlugin::test_completion_qualified_typedef_1() -{ - TestData data; - data.srcText = - "struct S\n" - "{\n" - " typedef S::type type;\n" - "};\n" - "void fun()\n" - "{\n" - " @\n" - " // padding so we get the scope right\n" - "};\n" - ; - setup(&data); - - Utils::ChangeSet change; - QString txt = QLatin1String("S::"); - change.insert(data.pos, txt); - QTextCursor cursor(data.doc); - change.apply(&cursor); - data.pos += txt.length(); - - QStringList completions = getCompletions(data); - - QCOMPARE(completions.size(), 2); - QVERIFY(completions.contains(QLatin1String("S"))); - QVERIFY(completions.contains(QLatin1String("type"))); -} - -void CppToolsPlugin::test_completion_qualified_typedef_2() -{ - TestData data; - data.srcText = - "template <typename T>\n" - "struct S\n" - "{\n" - " typedef S<T>::type type;\n" - "};\n" - "void fun()\n" - "{\n" - " @\n" - " // padding so we get the scope right\n" - "};\n" - ; - setup(&data); - - Utils::ChangeSet change; - QString txt = QLatin1String("S<int>::"); - change.insert(data.pos, txt); - QTextCursor cursor(data.doc); - change.apply(&cursor); - data.pos += txt.length(); - - QStringList completions = getCompletions(data); - - QCOMPARE(completions.size(), 2); - QVERIFY(completions.contains(QLatin1String("S"))); - QVERIFY(completions.contains(QLatin1String("type"))); -} - |