Core: Merge Find and Locator into Core plugin

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

View File

@@ -42,6 +42,7 @@ QT_END_NAMESPACE
namespace Core {
class ActionManager;
class ActionContainer;
class CommandLocator;
class Id;
class IVersionControl;
class IEditorFactory;
@@ -56,10 +57,6 @@ namespace VcsBase {
class VcsBaseSubmitEditor;
}
namespace Locator {
class CommandLocator;
}
namespace Bazaar {
namespace Internal {
@@ -132,7 +129,7 @@ private:
OptionsPage *m_optionsPage;
BazaarClient *m_client;
Locator::CommandLocator *m_commandLocator;
Core::CommandLocator *m_commandLocator;
Core::ActionContainer *m_bazaarContainer;
QList<QAction *> m_repositoryActionList;