diff options
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.h')
| -rw-r--r-- | src/plugins/cpptools/cpptoolsplugin.h | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h index a36acac43e..b53fe75065 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -30,6 +30,8 @@ #ifndef CPPTOOLS_H #define CPPTOOLS_H +#include "cpptools_global.h" + #include <extensionsystem/iplugin.h> #include <projectexplorer/projectexplorer.h> #include <find/ifindfilter.h> @@ -69,14 +71,11 @@ public: bool initialize(const QStringList &arguments, QString *errorMessage); void extensionsInitialized(); ShutdownFlag aboutToShutdown(); - CppModelManager *cppModelManager() { return m_modelManager; } - static QString correspondingHeaderOrSource(const QString &fileName); private slots: void switchHeaderSource(); -#ifdef WITH_TESTS - // codegen tests +#ifdef WITH_TESTS void test_codegen_public_in_empty_class(); void test_codegen_public_in_nonempty_class(); void test_codegen_public_before_protected(); @@ -90,6 +89,8 @@ private slots: void test_codegen_definition_middle_member(); void test_completion_forward_declarations_present(); + void test_completion_inside_parentheses_c_style_conversion(); + void test_completion_inside_parentheses_cast_operator_conversion(); void test_completion_basic_1(); void test_completion_template_1(); void test_completion_template_2(); @@ -97,6 +98,9 @@ private slots: void test_completion_template_4(); void test_completion_template_5(); void test_completion_template_6(); + void test_completion_template_7(); + void test_completion_type_of_pointer_is_typedef(); + void test_completion_instantiate_full_specialization(); void test_completion_template_as_base(); void test_completion_template_as_base_data(); void test_completion_use_global_identifier_as_base_class(); @@ -105,18 +109,31 @@ private slots: void test_completion_base_class_has_name_the_same_as_derived_data(); void test_completion_cyclic_inheritance(); void test_completion_cyclic_inheritance_data(); + void test_completion_enclosing_template_class(); + void test_completion_enclosing_template_class_data(); + void test_completion_instantiate_nested_class_when_enclosing_is_template(); + void test_completion_instantiate_nested_of_nested_class_when_enclosing_is_template(); + void test_completion_member_access_operator_1(); + + void test_format_pointerdeclaration_in_simpledeclarations(); + void test_format_pointerdeclaration_in_simpledeclarations_data(); + void test_format_pointerdeclaration_in_controlflowstatements(); + void test_format_pointerdeclaration_in_controlflowstatements_data(); + void test_format_pointerdeclaration_multiple_declarators(); + void test_format_pointerdeclaration_multiple_declarators_data(); + void test_format_pointerdeclaration_multiple_matches(); + void test_format_pointerdeclaration_multiple_matches_data(); + + void test_modelmanager_paths(); + void test_modelmanager_framework_headers(); private: void test_completion(); #endif private: - QString correspondingHeaderOrSourceI(const QString &fileName) const; - - CppModelManager *m_modelManager; QSharedPointer<CppFileSettings> m_fileSettings; CppToolsSettings *m_settings; - mutable QHash<QString, QString> m_headerSourceMapping; }; } // namespace Internal |