diff options
Diffstat (limited to 'src/plugins/cppeditor/cpptoolsreuse.cpp')
| -rw-r--r-- | src/plugins/cppeditor/cpptoolsreuse.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/cppeditor/cpptoolsreuse.cpp b/src/plugins/cppeditor/cpptoolsreuse.cpp index 947ecdd4c6..7be177c2c1 100644 --- a/src/plugins/cppeditor/cpptoolsreuse.cpp +++ b/src/plugins/cppeditor/cpptoolsreuse.cpp @@ -15,9 +15,9 @@ #include "cppfilesettingspage.h" #include "cpphighlighter.h" #include "cppqtstyleindenter.h" -#include "cppquickfixassistant.h" #include "cpprefactoringchanges.h" #include "projectinfo.h" +#include "quickfixes/cppquickfixassistant.h" #include <coreplugin/documentmanager.h> #include <coreplugin/editormanager/editormanager.h> @@ -358,6 +358,11 @@ CppCompletionAssistProcessor *getCppCompletionAssistProcessor() return new Internal::InternalCppCompletionAssistProcessor(); } +QString deriveHeaderGuard(const Utils::FilePath &filePath, ProjectExplorer::Project *project) +{ + return Internal::cppFileSettingsForProject(project).headerGuard(filePath); +} + bool fileSizeExceedsLimit(const FilePath &filePath, int sizeLimitInMb) { if (sizeLimitInMb <= 0) @@ -365,15 +370,10 @@ bool fileSizeExceedsLimit(const FilePath &filePath, int sizeLimitInMb) const qint64 fileSizeInMB = filePath.fileSize() / (1000 * 1000); if (fileSizeInMB > sizeLimitInMb) { - const QString msg = Tr::tr("C++ Indexer: Skipping file \"%1\" because it is too big.") - .arg(filePath.displayName()); - - QMetaObject::invokeMethod(Core::MessageManager::instance(), - [msg]() { Core::MessageManager::writeSilently(msg); }); - + Core::MessageManager::writeSilently(Tr::tr("C++ Indexer: Skipping file \"%1\" because " + "it is too big.").arg(filePath.displayName())); return true; } - return false; } |