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

4
src/plugins/mercurial/mercurialplugin.h
View File

@@ -43,6 +43,7 @@ QT_END_NAMESPACE
namespace Core {
class ActionContainer;
class ActionManager;
class CommandLocator;
class ICore;
class Id;
class IEditor;
@@ -50,7 +51,6 @@ class IEditor;
namespace Utils { class ParameterAction; }
namespace VcsBase { class VcsBaseSubmitEditor; }
namespace Locator { class CommandLocator; }
namespace Mercurial {
namespace Internal {
@@ -143,7 +143,7 @@ private:
MercurialClient *m_client;
Core::ICore *core;
Locator::CommandLocator *m_commandLocator;
Core::CommandLocator *m_commandLocator;
Core::ActionContainer *mercurialContainer;
QList<QAction *> m_repositoryActionList;