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

Core: Merge Find and Locator into Core plugin

Browse Source 
Change-Id: I7053310272235d854c9f409670ff52a10a7add8b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
2014-01-13 16:17:34 +01:00
committed by Eike Ziller
parent 8b854270a6
commit 4d96fa7aba
239 changed files with 1625 additions and 1787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/plugins/macros/findmacrohandler.cpp
View File

@@ -32,11 +32,10 @@
#include "macro.h"
#include "macrotextfind.h"
#include <find/ifindsupport.h>
#include <coreplugin/icore.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/find/ifindsupport.h>
#include <aggregation/aggregate.h>
@@ -79,32 +78,32 @@ bool FindMacroHandler::executeEvent(const MacroEvent &macroEvent)
if (!aggregate)
return false;
Find::IFindSupport *currentFind = aggregate->component<Find::IFindSupport>();
Core::IFindSupport *currentFind = aggregate->component<Core::IFindSupport>();
if (!currentFind)
return false;
switch (macroEvent.value(TYPE).toInt()) {
case FINDINCREMENTAL:
currentFind->findIncremental(macroEvent.value(BEFORE).toString(),
(Find::FindFlags)macroEvent.value(FLAGS).toInt());
(Core::FindFlags)macroEvent.value(FLAGS).toInt());
break;
case FINDSTEP:
currentFind->findStep(macroEvent.value(BEFORE).toString(),
(Find::FindFlags)macroEvent.value(FLAGS).toInt());
(Core::FindFlags)macroEvent.value(FLAGS).toInt());
break;
case REPLACE:
currentFind->replace(macroEvent.value(BEFORE).toString(),
macroEvent.value(AFTER).toString(),
(Find::FindFlags)macroEvent.value(FLAGS).toInt());
(Core::FindFlags)macroEvent.value(FLAGS).toInt());
case REPLACESTEP:
currentFind->replaceStep(macroEvent.value(BEFORE).toString(),
macroEvent.value(AFTER).toString(),
(Find::FindFlags)macroEvent.value(FLAGS).toInt());
(Core::FindFlags)macroEvent.value(FLAGS).toInt());
break;
case REPLACEALL:
currentFind->replaceAll(macroEvent.value(BEFORE).toString(),
macroEvent.value(AFTER).toString(),
(Find::FindFlags)macroEvent.value(FLAGS).toInt());
(Core::FindFlags)macroEvent.value(FLAGS).toInt());
break;
case RESET:
currentFind->resetIncrementalSearch();
@@ -113,7 +112,7 @@ bool FindMacroHandler::executeEvent(const MacroEvent &macroEvent)
return true;
}
void FindMacroHandler::findIncremental(const QString &txt, Find::FindFlags findFlags)
void FindMacroHandler::findIncremental(const QString &txt, Core::FindFlags findFlags)
{
if (!isRecording())
return;
@@ -125,7 +124,7 @@ void FindMacroHandler::findIncremental(const QString &txt, Find::FindFlags findF
addMacroEvent(e);
}
void FindMacroHandler::findStep(const QString &txt, Find::FindFlags findFlags)
void FindMacroHandler::findStep(const QString &txt, Core::FindFlags findFlags)
{
if (!isRecording())
return;
@@ -137,7 +136,7 @@ void FindMacroHandler::findStep(const QString &txt, Find::FindFlags findFlags)
addMacroEvent(e);
}
void FindMacroHandler::replace(const QString &before, const QString &after, Find::FindFlags findFlags)
void FindMacroHandler::replace(const QString &before, const QString &after, Core::FindFlags findFlags)
{
if (!isRecording())
return;
@@ -150,7 +149,7 @@ void FindMacroHandler::replace(const QString &before, const QString &after, Find
addMacroEvent(e);
}
void FindMacroHandler::replaceStep(const QString &before, const QString &after, Find::FindFlags findFlags)
void FindMacroHandler::replaceStep(const QString &before, const QString &after, Core::FindFlags findFlags)
{
if (!isRecording())
return;
@@ -163,7 +162,7 @@ void FindMacroHandler::replaceStep(const QString &before, const QString &after,
addMacroEvent(e);
}
void FindMacroHandler::replaceAll(const QString &before, const QString &after, Find::FindFlags findFlags)
void FindMacroHandler::replaceAll(const QString &before, const QString &after, Core::FindFlags findFlags)
{
if (!isRecording())
return;
@@ -194,7 +193,7 @@ void FindMacroHandler::changeEditor(Core::IEditor *editor)
Aggregation::Aggregate *aggregate = Aggregation::Aggregate::parentAggregate(editor->widget());
if (aggregate) {
Find::IFindSupport *currentFind = aggregate->component<Find::IFindSupport>();
Core::IFindSupport *currentFind = aggregate->component<Core::IFindSupport>();
if (currentFind) {
MacroTextFind *macroFind = qobject_cast<MacroTextFind *>(currentFind);
if (macroFind)
@@ -205,18 +204,18 @@ void FindMacroHandler::changeEditor(Core::IEditor *editor)
aggregate->add(macroFind);
// Connect all signals
connect(macroFind, SIGNAL(allReplaced(QString,QString,Find::FindFlags)),
this, SLOT(replaceAll(QString,QString,Find::FindFlags)));
connect(macroFind, SIGNAL(incrementalFound(QString,Find::FindFlags)),
this, SLOT(findIncremental(QString,Find::FindFlags)));
connect(macroFind, SIGNAL(allReplaced(QString,QString,Core::FindFlags)),
this, SLOT(replaceAll(QString,QString,Core::FindFlags)));
connect(macroFind, SIGNAL(incrementalFound(QString,Core::FindFlags)),
this, SLOT(findIncremental(QString,Core::FindFlags)));
connect(macroFind, SIGNAL(incrementalSearchReseted()),
this, SLOT(resetIncrementalSearch()));
connect(macroFind, SIGNAL(replaced(QString,QString,Find::FindFlags)),
this, SLOT(replace(QString,QString,Find::FindFlags)));
connect(macroFind, SIGNAL(stepFound(QString,Find::FindFlags)),
this, SLOT(findStep(QString,Find::FindFlags)));
connect(macroFind, SIGNAL(stepReplaced(QString,QString,Find::FindFlags)),
this, SLOT(replaceStep(QString,QString,Find::FindFlags)));
connect(macroFind, SIGNAL(replaced(QString,QString,Core::FindFlags)),
this, SLOT(replace(QString,QString,Core::FindFlags)));
connect(macroFind, SIGNAL(stepFound(QString,Core::FindFlags)),
this, SLOT(findStep(QString,Core::FindFlags)));
connect(macroFind, SIGNAL(stepReplaced(QString,QString,Core::FindFlags)),
this, SLOT(replaceStep(QString,QString,Core::FindFlags)));
}
}
}