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

Merge remote branch 'origin/1.3'

Browse Source 
Conflicts:
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
This commit is contained in:
con
2009-10-16 14:40:40 +02:00
parent 82ea24d790 77efc921c2
commit 525ef4cc85
107 changed files with 16684 additions and 1559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/help/Help.pluginspec
View File

@@ -21,6 +21,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<dependencyList>
<dependency name="Core" version="1.3.80"/>
<dependency name="Find" version="1.3.80"/>
<dependency name="QuickOpen" version="1.3.80"/>
<dependency name="Locator" version="1.3.80"/>
</dependencyList>
</plugin>

2
src/plugins/help/help_dependencies.pri
View File

@@ -1,4 +1,4 @@
include(../../plugins/coreplugin/coreplugin.pri)
include(../../plugins/find/find.pri)
include(../../plugins/quickopen/quickopen.pri)
include(../../plugins/locator/locator.pri)

6
src/plugins/help/helpindexfilter.cpp
View File

@@ -37,11 +37,11 @@
#include <QtHelp/QHelpEngine>
#include <QtHelp/QHelpIndexModel>
using namespace QuickOpen;
using namespace Locator;
using namespace Help;
using namespace Help::Internal;
Q_DECLARE_METATYPE(IQuickOpenFilter*);
Q_DECLARE_METATYPE(ILocatorFilter*);
HelpIndexFilter::HelpIndexFilter(HelpPlugin *plugin, QHelpEngine *helpEngine):
m_plugin(plugin),
@@ -77,7 +77,7 @@ QString HelpIndexFilter::name() const
return QLatin1String("HelpIndexFilter");
}
IQuickOpenFilter::Priority HelpIndexFilter::priority() const
ILocatorFilter::Priority HelpIndexFilter::priority() const
{
return Medium;
}

10
src/plugins/help/helpindexfilter.h
View File

@@ -30,7 +30,7 @@
#ifndef HELPINDEXFILTER_H
#define HELPINDEXFILTER_H
#include <quickopen/iquickopenfilter.h>
#include <locator/ilocatorfilter.h>
#include <QtGui/QIcon>
@@ -44,19 +44,19 @@ namespace Internal {
class HelpPlugin;
class HelpIndexFilter : public QuickOpen::IQuickOpenFilter
class HelpIndexFilter : public Locator::ILocatorFilter
{
Q_OBJECT
public:
HelpIndexFilter(HelpPlugin *plugin, QHelpEngine *helpEngine);
// IQuickOpenFilter
// ILocatorFilter
QString trName() const;
QString name() const;
Priority priority() const;
QList<QuickOpen::FilterEntry> matchesFor(const QString &entry);
void accept(QuickOpen::FilterEntry selection) const;
QList<Locator::FilterEntry> matchesFor(const QString &entry);
void accept(Locator::FilterEntry selection) const;
void refresh(QFutureInterface<void> &future);
signals: