← Back to branch summary

~ubuntu-branches/ubuntu/utopic/kdevelop-php/utopic

« back to all changes in this revision

Viewing changes to phplanguagesupport.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-12-20 14:59:02 UTC
  • mfrom: (1.2.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20101220145902-a6cmovse1qmue52p
Tags: 1.1.80-0ubuntu1
* New upstream release
* Build-dep on kdevplatform >= 1.1.80
* Get rid of l10n packages, not relevant in Ubuntu, put locale files into main package

Show diffs side-by-side

added added

removed removed

Lines of Context:
phplanguagesupport.cpp
26
26
#include <kcomponentdata.h>
27
27
#include <kpluginfactory.h>
28
28
#include <kpluginloader.h>
29
 
#include <ktexteditor/smartinterface.h>
30
29
#include <KTextEditor/Document>
31
30
 
32
31
#include <interfaces/icore.h>
35
34
#include <interfaces/ilanguage.h>
36
35
#include <interfaces/idocument.h>
37
36
#include <interfaces/iproject.h>
38
 
#include <language/editor/editorintegrator.h>
39
37
#include <language/backgroundparser/backgroundparser.h>
40
38
#include <language/duchain/duchain.h>
41
39
#include <language/duchain/duchainlock.h>
59
57
using namespace KDevelop;
60
58
 
61
59
K_PLUGIN_FACTORY(KDevPhpSupportFactory, registerPlugin<Php::LanguageSupport>();)
62
 
K_EXPORT_PLUGIN(KDevPhpSupportFactory(KAboutData("kdevphpsupport","kdevphp", ki18n("Php Support"), "1.1.1", ki18n("Support for Php Language"), KAboutData::License_GPL)
 
60
K_EXPORT_PLUGIN(KDevPhpSupportFactory(KAboutData("kdevphpsupport","kdevphp", ki18n("Php Support"), "1.1.80", ki18n("Support for Php Language"), KAboutData::License_GPL)
63
61
    .addAuthor(ki18n("Milian Wolff"), ki18n("Author"), "mail@milianw.de", "http://milianw.de")
64
62
    .addAuthor(ki18n("Niko Sams"), ki18n("Author"), "niko.sams@gmail.com", "http://nikosams.blogspot.com")
65
63
))
142
140
    return core()->languageController()->language(name());
143
141
}
144
142
 
145
 
const KDevelop::ICodeHighlighting* LanguageSupport::codeHighlighting() const
 
143
KDevelop::ICodeHighlighting* LanguageSupport::codeHighlighting() const
146
144
{
147
145
    return m_highlighting;
148
146
}
205
203
{
206
204
    QPair<QString, SimpleRange> word = wordUnderCursor(url, position);
207
205
    if ( isMagicConstant(word) ) {
 
206
        DUChainReadLocker lock;
208
207
        return new NavigationWidget(TopDUContextPointer(standardContext(url)), position, word.first);
209
208
    }
210
209
    return ILanguageSupport::specialLanguageObjectNavigationWidget(url, position);