Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
89d75814
Commit
89d75814
authored
Oct 16, 2009
by
con
Browse files
CppQuickOpenFilter --> CppLocatorFilter
parent
c47b3db7
Changes
8
Hide whitespace changes
Inline
Side-by-side
src/plugins/cpptools/cppclassesfilter.cpp
View file @
89d75814
...
...
@@ -32,7 +32,7 @@
using
namespace
CppTools
::
Internal
;
CppClassesFilter
::
CppClassesFilter
(
CppModelManager
*
manager
,
Core
::
EditorManager
*
editorManager
)
:
Cpp
QuickOpen
Filter
(
manager
,
editorManager
)
:
Cpp
Locator
Filter
(
manager
,
editorManager
)
{
setShortcutString
(
"c"
);
setIncludedByDefault
(
false
);
...
...
src/plugins/cpptools/cppclassesfilter.h
View file @
89d75814
...
...
@@ -30,12 +30,12 @@
#ifndef CPPCLASSESFILTER_H
#define CPPCLASSESFILTER_H
#include <cpp
quickopen
filter.h>
#include <cpp
locator
filter.h>
namespace
CppTools
{
namespace
Internal
{
class
CppClassesFilter
:
public
Cpp
QuickOpen
Filter
class
CppClassesFilter
:
public
Cpp
Locator
Filter
{
Q_OBJECT
...
...
src/plugins/cpptools/cppfunctionsfilter.cpp
View file @
89d75814
...
...
@@ -32,7 +32,7 @@
using
namespace
CppTools
::
Internal
;
CppFunctionsFilter
::
CppFunctionsFilter
(
CppModelManager
*
manager
,
Core
::
EditorManager
*
editorManager
)
:
Cpp
QuickOpen
Filter
(
manager
,
editorManager
)
:
Cpp
Locator
Filter
(
manager
,
editorManager
)
{
setShortcutString
(
"m"
);
setIncludedByDefault
(
false
);
...
...
src/plugins/cpptools/cppfunctionsfilter.h
View file @
89d75814
...
...
@@ -30,12 +30,12 @@
#ifndef CPPFUNCTIONSFILTER_H
#define CPPFUNCTIONSFILTER_H
#include <cpp
quickopen
filter.h>
#include <cpp
locator
filter.h>
namespace
CppTools
{
namespace
Internal
{
class
CppFunctionsFilter
:
public
Cpp
QuickOpen
Filter
class
CppFunctionsFilter
:
public
Cpp
Locator
Filter
{
Q_OBJECT
...
...
src/plugins/cpptools/cpp
quickopen
filter.cpp
→
src/plugins/cpptools/cpp
locator
filter.cpp
View file @
89d75814
...
...
@@ -27,7 +27,7 @@
**
**************************************************************************/
#include "cpp
quickopen
filter.h"
#include "cpp
locator
filter.h"
#include "cppmodelmanager.h"
#include <coreplugin/editormanager/editormanager.h>
...
...
@@ -39,7 +39,7 @@
using
namespace
CppTools
::
Internal
;
Cpp
QuickOpen
Filter
::
Cpp
QuickOpen
Filter
(
CppModelManager
*
manager
,
Core
::
EditorManager
*
editorManager
)
Cpp
Locator
Filter
::
Cpp
Locator
Filter
(
CppModelManager
*
manager
,
Core
::
EditorManager
*
editorManager
)
:
m_manager
(
manager
),
m_editorManager
(
editorManager
),
m_forceNewSearchList
(
true
)
...
...
@@ -54,21 +54,21 @@ CppQuickOpenFilter::CppQuickOpenFilter(CppModelManager *manager, Core::EditorMan
this
,
SLOT
(
onAboutToRemoveFiles
(
QStringList
)));
}
Cpp
QuickOpen
Filter
::~
Cpp
QuickOpen
Filter
()
Cpp
Locator
Filter
::~
Cpp
Locator
Filter
()
{
}
void
Cpp
QuickOpen
Filter
::
onDocumentUpdated
(
CPlusPlus
::
Document
::
Ptr
doc
)
void
Cpp
Locator
Filter
::
onDocumentUpdated
(
CPlusPlus
::
Document
::
Ptr
doc
)
{
m_searchList
[
doc
->
fileName
()]
=
Info
(
doc
);
}
void
Cpp
QuickOpen
Filter
::
onAboutToRemoveFiles
(
const
QStringList
&
files
)
void
Cpp
Locator
Filter
::
onAboutToRemoveFiles
(
const
QStringList
&
files
)
{
foreach
(
const
QString
&
file
,
files
)
m_searchList
.
remove
(
file
);
}
void
Cpp
QuickOpen
Filter
::
refresh
(
QFutureInterface
<
void
>
&
future
)
void
Cpp
Locator
Filter
::
refresh
(
QFutureInterface
<
void
>
&
future
)
{
Q_UNUSED
(
future
)
}
...
...
@@ -79,7 +79,7 @@ static bool compareLexigraphically(const QuickOpen::FilterEntry &a,
return
a
.
displayName
<
b
.
displayName
;
}
QList
<
QuickOpen
::
FilterEntry
>
Cpp
QuickOpen
Filter
::
matchesFor
(
const
QString
&
origEntry
)
QList
<
QuickOpen
::
FilterEntry
>
Cpp
Locator
Filter
::
matchesFor
(
const
QString
&
origEntry
)
{
QString
entry
=
trimWildcards
(
origEntry
);
QList
<
QuickOpen
::
FilterEntry
>
goodEntries
;
...
...
@@ -131,7 +131,7 @@ QList<QuickOpen::FilterEntry> CppQuickOpenFilter::matchesFor(const QString &orig
return
betterEntries
;
}
void
Cpp
QuickOpen
Filter
::
accept
(
QuickOpen
::
FilterEntry
selection
)
const
void
Cpp
Locator
Filter
::
accept
(
QuickOpen
::
FilterEntry
selection
)
const
{
ModelItemInfo
info
=
qvariant_cast
<
CppTools
::
Internal
::
ModelItemInfo
>
(
selection
.
internalData
);
TextEditor
::
BaseTextEditor
::
openEditorAt
(
info
.
fileName
,
info
.
line
);
...
...
src/plugins/cpptools/cpp
quickopen
filter.h
→
src/plugins/cpptools/cpp
locator
filter.h
View file @
89d75814
...
...
@@ -27,8 +27,8 @@
**
**************************************************************************/
#ifndef CPP
QUICKOPEN
FILTER_H
#define CPP
QUICKOPEN
FILTER_H
#ifndef CPP
LOCATOR
FILTER_H
#define CPP
LOCATOR
FILTER_H
#include "searchsymbols.h"
...
...
@@ -43,12 +43,12 @@ namespace Internal {
class
CppModelManager
;
class
Cpp
QuickOpen
Filter
:
public
QuickOpen
::
ILocatorFilter
class
Cpp
Locator
Filter
:
public
QuickOpen
::
ILocatorFilter
{
Q_OBJECT
public:
Cpp
QuickOpen
Filter
(
CppModelManager
*
manager
,
Core
::
EditorManager
*
editorManager
);
~
Cpp
QuickOpen
Filter
();
Cpp
Locator
Filter
(
CppModelManager
*
manager
,
Core
::
EditorManager
*
editorManager
);
~
Cpp
Locator
Filter
();
QString
trName
()
const
{
return
tr
(
"Classes and Methods"
);
}
QString
name
()
const
{
return
QLatin1String
(
"Classes and Methods"
);
}
...
...
@@ -86,4 +86,4 @@ private:
}
// namespace Internal
}
// namespace CppTools
#endif // CPP
QUICKOPEN
FILTER_H
#endif // CPP
LOCATOR
FILTER_H
src/plugins/cpptools/cpptools.pro
View file @
89d75814
...
...
@@ -15,7 +15,7 @@ HEADERS += completionsettingspage.h \
cppfunctionsfilter
.
h
\
cppmodelmanager
.
h
\
cppmodelmanagerinterface
.
h
\
cpp
quickopen
filter
.
h
\
cpp
locator
filter
.
h
\
cpptools_global
.
h
\
cpptoolsconstants
.
h
\
cpptoolseditorsupport
.
h
\
...
...
@@ -31,7 +31,7 @@ SOURCES += completionsettingspage.cpp \
cppcurrentdocumentfilter
.
cpp
\
cppfunctionsfilter
.
cpp
\
cppmodelmanager
.
cpp
\
cpp
quickopen
filter
.
cpp
\
cpp
locator
filter
.
cpp
\
cpptoolseditorsupport
.
cpp
\
cpptoolsplugin
.
cpp
\
searchsymbols
.
cpp
\
...
...
src/plugins/cpptools/cpptoolsplugin.cpp
View file @
89d75814
...
...
@@ -36,7 +36,7 @@
#include "cppcurrentdocumentfilter.h"
#include "cppmodelmanager.h"
#include "cpptoolsconstants.h"
#include "cpp
quickopen
filter.h"
#include "cpp
locator
filter.h"
#include <extensionsystem/pluginmanager.h>
...
...
@@ -104,7 +104,7 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error)
addAutoReleasedObject
(
new
CppQuickFixCollector
(
m_modelManager
));
Cpp
QuickOpen
Filter
*
quickOpenFilter
=
new
Cpp
QuickOpen
Filter
(
m_modelManager
,
Cpp
Locator
Filter
*
quickOpenFilter
=
new
Cpp
Locator
Filter
(
m_modelManager
,
core
->
editorManager
());
addAutoReleasedObject
(
quickOpenFilter
);
addAutoReleasedObject
(
new
CppClassesFilter
(
m_modelManager
,
core
->
editorManager
()));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment