feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/10.0'

Browse Source 
Change-Id: Iff4973fc4116122bcaa7aa9434294dba875ef56a
This commit is contained in:
Orgad Shaneh
2023-02-14 13:08:27 +02:00
parent 6383146b0e b4f665f8ac
commit 6a0a4ac5e4
303 changed files with 5518 additions and 6428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangcodemodel/clangcodemodeltr.h
View File

@@ -9,7 +9,7 @@ namespace ClangCodeModel {
struct Tr
{
Q_DECLARE_TR_FUNCTIONS(::ClangCodeModel)
Q_DECLARE_TR_FUNCTIONS(QtC::ClangCodeModel)
};
} // namespace ClangCodeModel

6
src/plugins/clangcodemodel/clangdclient.cpp
View File

@@ -440,9 +440,9 @@ ClangdClient::ClangdClient(Project *project, const Utils::FilePath &jsonDbDir, c
setClientCapabilities(caps);
setLocatorsEnabled(false);
setAutoRequestCodeActions(false); // clangd sends code actions inside diagnostics
progressManager()->setTitleForToken(indexingToken(),
project ? tr("Indexing %1 with clangd").arg(project->displayName())
: tr("Indexing session with clangd"));
progressManager()->setTitleForToken(
indexingToken(), project ? Tr::tr("Indexing %1 with clangd").arg(project->displayName())
: Tr::tr("Indexing session with clangd"));
progressManager()->setCancelHandlerForToken(indexingToken(), [this, project]() {
CppEditor::ClangdProjectSettings projectSettings(project);
projectSettings.blockIndexing();

14
src/plugins/clangcodemodel/clangdlocatorfilters.cpp
View File

@@ -7,6 +7,7 @@
#include "clangmodelmanagersupport.h"
#include <cppeditor/cppeditorconstants.h>
#include <cppeditor/cppeditortr.h>
#include <cppeditor/cpplocatorfilter.h>
#include <cppeditor/cppmodelmanager.h>
#include <cppeditor/indexitem.h>
@@ -124,8 +125,7 @@ ClangGlobalSymbolFilter::ClangGlobalSymbolFilter(ILocatorFilter *cppFilter,
: m_cppFilter(cppFilter), m_lspFilter(lspFilter)
{
setId(CppEditor::Constants::LOCATOR_FILTER_ID);
setDisplayName(QCoreApplication::translate("::CppEditor",
CppEditor::Constants::LOCATOR_FILTER_DISPLAY_NAME));
setDisplayName(::CppEditor::Tr::tr(CppEditor::Constants::LOCATOR_FILTER_DISPLAY_NAME));
setDefaultShortcutString(":");
setDefaultIncludedByDefault(false);
}
@@ -188,8 +188,7 @@ ClangClassesFilter::ClangClassesFilter()
: ClangGlobalSymbolFilter(new CppClassesFilter, new LspClassesFilter)
{
setId(CppEditor::Constants::CLASSES_FILTER_ID);
setDisplayName(QCoreApplication::translate("::CppEditor",
CppEditor::Constants::CLASSES_FILTER_DISPLAY_NAME));
setDisplayName(::CppEditor::Tr::tr(CppEditor::Constants::CLASSES_FILTER_DISPLAY_NAME));
setDefaultShortcutString("c");
setDefaultIncludedByDefault(false);
}
@@ -198,8 +197,7 @@ ClangFunctionsFilter::ClangFunctionsFilter()
: ClangGlobalSymbolFilter(new CppFunctionsFilter, new LspFunctionsFilter)
{
setId(CppEditor::Constants::FUNCTIONS_FILTER_ID);
setDisplayName(QCoreApplication::translate("::CppEditor",
CppEditor::Constants::FUNCTIONS_FILTER_DISPLAY_NAME));
setDisplayName(::CppEditor::Tr::tr(CppEditor::Constants::FUNCTIONS_FILTER_DISPLAY_NAME));
setDefaultShortcutString("m");
setDefaultIncludedByDefault(false);
}
@@ -319,9 +317,7 @@ public:
ClangdCurrentDocumentFilter::ClangdCurrentDocumentFilter() : d(new Private)
{
setId(CppEditor::Constants::CURRENT_DOCUMENT_FILTER_ID);
setDisplayName(
QCoreApplication::translate("::CppEditor",
CppEditor::Constants::CURRENT_DOCUMENT_FILTER_DISPLAY_NAME));
setDisplayName(::CppEditor::Tr::tr(CppEditor::Constants::CURRENT_DOCUMENT_FILTER_DISPLAY_NAME));
setDefaultShortcutString(".");
setPriority(High);
setDefaultIncludedByDefault(false);