From 7e9913f0f540e196ca7e53217d2edf19a9e8ef29 Mon Sep 17 00:00:00 2001 From: Przemyslaw Gorszkowski Date: Sat, 22 Sep 2012 14:24:43 +0200 Subject: Fix crashes when typing code Problem was with cyclic recurrence. To solve it we need to check if derived class is different class than its base class. Keep completion corrected. Include some unit tests when base class has the same name as derived. Task-number: QTCREATORBUG-7887 Change-Id: I7973c0b06e3b62d2da3d06048f4327d18a0b8011 Reviewed-by: hjk --- src/plugins/cpptools/cpptoolsplugin.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/plugins/cpptools/cpptoolsplugin.h') diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h index ba88d11896..554a187783 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -77,6 +77,7 @@ private slots: void switchHeaderSource(); #ifdef WITH_TESTS + // codegen tests void test_codegen_public_in_empty_class(); void test_codegen_public_in_nonempty_class(); @@ -95,6 +96,13 @@ private slots: void test_completion_template_1(); void test_completion_template_as_base(); void test_completion_template_as_base_data(); + void test_completion_use_global_identifier_as_base_class(); + void test_completion_use_global_identifier_as_base_class_data(); + void test_completion_base_class_has_name_the_same_as_derived(); + void test_completion_base_class_has_name_the_same_as_derived_data(); + +private: + void test_completion(); #endif private: -- cgit v1.2.1