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

2
src/plugins/cvs/cvs.qbs
View File

@@ -8,9 +8,7 @@ QtcPlugin {
Depends { name: "Qt.widgets" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "Find" }
Depends { name: "VcsBase" }
Depends { name: "Locator" }
files: [
"annotationhighlighter.cpp",

1
src/plugins/cvs/cvs_dependencies.pri
View File

@@ -2,7 +2,6 @@ QTC_PLUGIN_NAME = CVS
QTC_LIB_DEPENDS += \
utils
QTC_PLUGIN_DEPENDS += \
locator \
texteditor \
coreplugin \
vcsbase

4
src/plugins/cvs/cvsplugin.cpp
View File

@@ -41,7 +41,6 @@
#include <vcsbase/basevcssubmiteditorfactory.h>
#include <vcsbase/vcsbaseoutputwindow.h>
#include <vcsbase/vcsbaseeditorparameterwidget.h>
#include <locator/commandlocator.h>
#include <utils/synchronousprocess.h>
#include <utils/parameteraction.h>
#include <utils/qtcassert.h>
@@ -56,6 +55,7 @@
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/id.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/locator/commandlocator.h>
#include <coreplugin/vcsmanager.h>
#include <utils/stringutils.h>
#include <utils/fileutils.h>
@@ -251,7 +251,7 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
addAutoReleasedObject(new CheckoutWizard);
const QString prefix = QLatin1String("cvs");
m_commandLocator = new Locator::CommandLocator("CVS", prefix, prefix);
m_commandLocator = new Core::CommandLocator("CVS", prefix, prefix);
addAutoReleasedObject(m_commandLocator);
// Register actions

4
src/plugins/cvs/cvsplugin.h
View File

@@ -42,13 +42,13 @@ class QTextCodec;
QT_END_NAMESPACE
namespace Core {
class CommandLocator;
class IEditorFactory;
class IVersionControl;
}
namespace Utils { class ParameterAction; }
namespace VcsBase { class VcsBaseSubmitEditor; }
namespace Locator { class CommandLocator; }
namespace Cvs {
namespace Internal {
@@ -171,7 +171,7 @@ private:
QString m_commitMessageFileName;
QString m_commitRepository;
Locator::CommandLocator *m_commandLocator;
Core::CommandLocator *m_commandLocator;
Utils::ParameterAction *m_addAction;
Utils::ParameterAction *m_deleteAction;
Utils::ParameterAction *m_revertAction;