diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2020-06-11 12:34:54 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-06-11 12:54:10 +0200 |
| commit | 3acdb7891b900158ca62f3c9d673757aa8688f74 (patch) | |
| tree | 17fbaa3f21b302f11020d10c9851d8b88afb9707 /src/plugins/clangrefactoring | |
| parent | 8114a588476445f5611e415b245be4c50b653e54 (diff) | |
| parent | ad4c5e02589dbe8f0c2adcebbc24d7242cb0de4f (diff) | |
Merge remote-tracking branch 'origin/qds-1.59'
Change-Id: I8891e7490a7fd51997a3b57561961f6134be3252
Diffstat (limited to 'src/plugins/clangrefactoring')
| -rw-r--r-- | src/plugins/clangrefactoring/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/clangrefactoring/clangrefactoring-source.pri | 4 | ||||
| -rw-r--r-- | src/plugins/clangrefactoring/clangrefactoring.qbs | 4 | ||||
| -rw-r--r-- | src/plugins/clangrefactoring/clangsymbolsfindfilter.cpp (renamed from src/plugins/clangrefactoring/symbolsfindfilter.cpp) | 2 | ||||
| -rw-r--r-- | src/plugins/clangrefactoring/clangsymbolsfindfilter.h (renamed from src/plugins/clangrefactoring/symbolsfindfilter.h) | 0 | ||||
| -rw-r--r-- | src/plugins/clangrefactoring/qtcreatorsymbolsfindfilter.h | 2 | ||||
| -rw-r--r-- | src/plugins/clangrefactoring/symbolsfindfilterconfigwidget.cpp | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/clangrefactoring/CMakeLists.txt b/src/plugins/clangrefactoring/CMakeLists.txt index 53930f13de..95c926dc2d 100644 --- a/src/plugins/clangrefactoring/CMakeLists.txt +++ b/src/plugins/clangrefactoring/CMakeLists.txt @@ -36,6 +36,6 @@ add_qtc_plugin(ClangRefactoring symbol.h symbolquery.h symbolqueryinterface.h - symbolsfindfilter.cpp symbolsfindfilter.h + clangsymbolsfindfilter.cpp clangsymbolsfindfilter.h symbolsfindfilterconfigwidget.cpp symbolsfindfilterconfigwidget.h ) diff --git a/src/plugins/clangrefactoring/clangrefactoring-source.pri b/src/plugins/clangrefactoring/clangrefactoring-source.pri index b12d4a9b98..273e6fe834 100644 --- a/src/plugins/clangrefactoring/clangrefactoring-source.pri +++ b/src/plugins/clangrefactoring/clangrefactoring-source.pri @@ -6,6 +6,7 @@ HEADERS += \ $$PWD/clangqueryhighlighter.h \ $$PWD/clangqueryhighlightmarker.h \ $$PWD/clangqueryprojectsfindfilter.h \ + $$PWD/clangsymbolsfindfilter.h \ $$PWD/projectpartutilities.h \ $$PWD/refactoringclient.h \ $$PWD/refactoringconnectionclient.h \ @@ -13,7 +14,6 @@ HEADERS += \ $$PWD/refactoringprojectupdater.h \ $$PWD/searchinterface.h \ $$PWD/searchhandle.h \ - $$PWD/symbolsfindfilter.h \ $$PWD/symbolqueryinterface.h \ $$PWD/symbol.h \ $$PWD/projectpartproviderinterface.h \ @@ -24,11 +24,11 @@ SOURCES += \ $$PWD/clangqueryexamplehighlighter.cpp \ $$PWD/clangqueryhighlighter.cpp \ $$PWD/clangqueryprojectsfindfilter.cpp \ + $$PWD/clangsymbolsfindfilter.cpp \ $$PWD/projectpartutilities.cpp \ $$PWD/refactoringclient.cpp \ $$PWD/refactoringconnectionclient.cpp \ $$PWD/refactoringengine.cpp \ $$PWD/refactoringprojectupdater.cpp \ $$PWD/searchhandle.cpp \ - $$PWD/symbolsfindfilter.cpp \ $$PWD/locatorfilter.cpp diff --git a/src/plugins/clangrefactoring/clangrefactoring.qbs b/src/plugins/clangrefactoring/clangrefactoring.qbs index ec8c4c6a24..b440d6e08e 100644 --- a/src/plugins/clangrefactoring/clangrefactoring.qbs +++ b/src/plugins/clangrefactoring/clangrefactoring.qbs @@ -73,8 +73,8 @@ QtcPlugin { "symbol.h", "symbolquery.h", "symbolqueryinterface.h", - "symbolsfindfilter.cpp", - "symbolsfindfilter.h", + "clangsymbolsfindfilter.cpp", + "clangsymbolsfindfilter.h", "symbolsfindfilterconfigwidget.cpp", "symbolsfindfilterconfigwidget.h", ] diff --git a/src/plugins/clangrefactoring/symbolsfindfilter.cpp b/src/plugins/clangrefactoring/clangsymbolsfindfilter.cpp index f043c612bc..c255558634 100644 --- a/src/plugins/clangrefactoring/symbolsfindfilter.cpp +++ b/src/plugins/clangrefactoring/clangsymbolsfindfilter.cpp @@ -23,7 +23,7 @@ ** ****************************************************************************/ -#include "symbolsfindfilter.h" +#include "clangsymbolsfindfilter.h" #include <cpptools/cpptoolsconstants.h> diff --git a/src/plugins/clangrefactoring/symbolsfindfilter.h b/src/plugins/clangrefactoring/clangsymbolsfindfilter.h index 1693a19602..1693a19602 100644 --- a/src/plugins/clangrefactoring/symbolsfindfilter.h +++ b/src/plugins/clangrefactoring/clangsymbolsfindfilter.h diff --git a/src/plugins/clangrefactoring/qtcreatorsymbolsfindfilter.h b/src/plugins/clangrefactoring/qtcreatorsymbolsfindfilter.h index cd09463088..60a6d1d7a9 100644 --- a/src/plugins/clangrefactoring/qtcreatorsymbolsfindfilter.h +++ b/src/plugins/clangrefactoring/qtcreatorsymbolsfindfilter.h @@ -25,7 +25,7 @@ #pragma once -#include "symbolsfindfilter.h" +#include "clangsymbolsfindfilter.h" namespace ClangRefactoring { diff --git a/src/plugins/clangrefactoring/symbolsfindfilterconfigwidget.cpp b/src/plugins/clangrefactoring/symbolsfindfilterconfigwidget.cpp index 9c391676e1..abe3013c7d 100644 --- a/src/plugins/clangrefactoring/symbolsfindfilterconfigwidget.cpp +++ b/src/plugins/clangrefactoring/symbolsfindfilterconfigwidget.cpp @@ -26,7 +26,7 @@ #include "symbolsfindfilterconfigwidget.h" -#include "symbolsfindfilter.h" +#include "clangsymbolsfindfilter.h" namespace ClangRefactoring { |