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

6
src/plugins/git/gitplugin.h
View File

@@ -49,6 +49,7 @@ namespace Core {
class IEditor;
class IEditorFactory;
class Command;
class CommandLocator;
class Context;
class ActionManager;
class ActionContainer;
@@ -56,9 +57,6 @@ class ActionContainer;
namespace Utils {
class ParameterAction;
}
namespace Locator {
class CommandLocator;
}
namespace Gerrit {
namespace Internal {
class GerritPlugin;
@@ -206,7 +204,7 @@ private:
void updateVersionWarning();
static GitPlugin *m_instance;
Locator::CommandLocator *m_commandLocator;
Core::CommandLocator *m_commandLocator;
QAction *m_submitCurrentAction;
QAction *m_diffSelectedFilesAction;