From 7125406305a97c46fc64664819211e53ff242ceb Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 1 Oct 2020 11:13:17 +0200 Subject: CppTools: Consider .cu files ... when switching via F4 from a .h file and vice versa. Fixes: QTCREATORBUG-24418 Change-Id: I121967dbec90125b3feed0a9d2aceb9826f925f3 Reviewed-by: Christian Stenger --- src/plugins/cpptools/cpptoolsplugin.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/plugins/cpptools/cpptoolsplugin.cpp') diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index babbd5eacb..a2b73f4340 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/src/plugins/cpptools/cpptoolsplugin.cpp @@ -277,18 +277,19 @@ static QStringList matchingCandidateSuffixes(ProjectFile::Kind kind) case ProjectFile::CXXHeader: case ProjectFile::ObjCHeader: case ProjectFile::ObjCXXHeader: - return Utils::mimeTypeForName(QLatin1String(Constants::C_SOURCE_MIMETYPE)).suffixes() - + Utils::mimeTypeForName(QLatin1String(Constants::CPP_SOURCE_MIMETYPE)).suffixes() - + Utils::mimeTypeForName(QLatin1String(Constants::OBJECTIVE_C_SOURCE_MIMETYPE)).suffixes() - + Utils::mimeTypeForName(QLatin1String(Constants::OBJECTIVE_CPP_SOURCE_MIMETYPE)).suffixes(); + return mimeTypeForName(Constants::C_SOURCE_MIMETYPE).suffixes() + + mimeTypeForName(Constants::CPP_SOURCE_MIMETYPE).suffixes() + + mimeTypeForName(Constants::OBJECTIVE_C_SOURCE_MIMETYPE).suffixes() + + mimeTypeForName(Constants::OBJECTIVE_CPP_SOURCE_MIMETYPE).suffixes() + + mimeTypeForName(Constants::CUDA_SOURCE_MIMETYPE).suffixes(); case ProjectFile::CSource: case ProjectFile::ObjCSource: - return Utils::mimeTypeForName(QLatin1String(Constants::C_HEADER_MIMETYPE)).suffixes(); + return mimeTypeForName(Constants::C_HEADER_MIMETYPE).suffixes(); case ProjectFile::CXXSource: case ProjectFile::ObjCXXSource: case ProjectFile::CudaSource: case ProjectFile::OpenCLSource: - return Utils::mimeTypeForName(QLatin1String(Constants::CPP_HEADER_MIMETYPE)).suffixes(); + return mimeTypeForName(Constants::CPP_HEADER_MIMETYPE).suffixes(); default: return QStringList(); } -- cgit v1.2.1