Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
726c3345
Commit
726c3345
authored
Jun 09, 2010
by
Roberto Raggi
Browse files
Moved qmljsmodelmanagerinterface.h
parent
373bfb05
Changes
18
Hide whitespace changes
Inline
Side-by-side
src/libs/qmljs/qmljs-lib.pri
View file @
726c3345
...
...
@@ -21,7 +21,8 @@ HEADERS += \
$$PWD/qmljsscopebuilder.h \
$$PWD/qmljslineinfo.h \
$$PWD/qmljscompletioncontextfinder.h \
$$PWD/qmljscomponentversion.h
$$PWD/qmljscomponentversion.h \
$$PWD/qmljsmodelmanagerinterface.h \
SOURCES += \
$$PWD/qmljsbind.cpp \
...
...
@@ -34,7 +35,8 @@ SOURCES += \
$$PWD/qmljsscopebuilder.cpp \
$$PWD/qmljslineinfo.cpp \
$$PWD/qmljscompletioncontextfinder.cpp \
$$PWD/qmljscomponentversion.cpp
$$PWD/qmljscomponentversion.cpp \
$$PWD/qmljsmodelmanagerinterface.cpp
OTHER_FILES += \
$$PWD/parser/qmljs.g
...
...
src/libs/qmljs/qmljsmodelmanagerinterface.cpp
0 → 100644
View file @
726c3345
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** Commercial Usage
**
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial License Agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Nokia.
**
** GNU Lesser General Public License Usage
**
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://qt.nokia.com/contact.
**
**************************************************************************/
#include
"qmljsmodelmanagerinterface.h"
using
namespace
QmlJS
;
ModelManagerInterface
::
ModelManagerInterface
(
QObject
*
parent
)
:
QObject
(
parent
)
{
}
ModelManagerInterface
::~
ModelManagerInterface
()
{
}
src/
plugin
s/qmljs
editor
/qmljsmodelmanagerinterface.h
→
src/
lib
s/qmljs/qmljsmodelmanagerinterface.h
View file @
726c3345
...
...
@@ -30,21 +30,18 @@
#ifndef QMLJSMODELMANAGERINTERFACE_H
#define QMLJSMODELMANAGERINTERFACE_H
#include
"qmljseditor_global.h"
#include
<qmljs/qmljsdocument.h>
#include
"qmljs_global.h"
#include
"qmljsdocument.h"
#include
<QObject>
#include
<QStringList>
#include
<QSharedPointer>
namespace
QmlJS
{
class
Snapshot
;
}
namespace
QmlJSEditor
{
class
Snapshot
;
class
QMLJS
EDITOR
_EXPORT
ModelManagerInterface
:
public
QObject
class
QMLJS_EXPORT
ModelManagerInterface
:
public
QObject
{
Q_OBJECT
...
...
@@ -67,6 +64,6 @@ signals:
void
aboutToRemoveFiles
(
const
QStringList
&
files
);
};
}
// namespace QmlJS
Editor
}
// namespace QmlJS
#endif // QMLJSMODELMANAGERINTERFACE_H
src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp
View file @
726c3345
...
...
@@ -31,11 +31,10 @@
#include
<extensionsystem/pluginmanager.h>
#include
<qmljs/qmljsdocument.h>
#include
<qmljs
editor
/qmljsmodelmanagerinterface.h>
#include
<qmljs/qmljsmodelmanagerinterface.h>
#include
<texteditor/tabsettings.h>
using
namespace
QmlDesigner
;
using
namespace
QmlJSEditor
;
BaseTextEditModifier
::
BaseTextEditModifier
(
TextEditor
::
BaseTextEditor
*
textEdit
)
:
PlainTextEditModifier
(
textEdit
)
...
...
@@ -69,16 +68,16 @@ int BaseTextEditModifier::indentDepth() const
}
namespace
{
static
inline
QmlJS
Editor
::
ModelManagerInterface
*
getModelManager
()
static
inline
QmlJS
::
ModelManagerInterface
*
getModelManager
()
{
ExtensionSystem
::
PluginManager
*
pluginManager
=
ExtensionSystem
::
PluginManager
::
instance
();
return
pluginManager
->
getObject
<
QmlJS
Editor
::
ModelManagerInterface
>
();
return
pluginManager
->
getObject
<
QmlJS
::
ModelManagerInterface
>
();
}
}
QmlJS
::
Snapshot
BaseTextEditModifier
::
getSnapshot
()
const
{
QmlJS
Editor
::
ModelManagerInterface
*
modelManager
=
getModelManager
();
QmlJS
::
ModelManagerInterface
*
modelManager
=
getModelManager
();
if
(
modelManager
)
return
modelManager
->
snapshot
();
else
...
...
@@ -87,7 +86,7 @@ QmlJS::Snapshot BaseTextEditModifier::getSnapshot() const
QStringList
BaseTextEditModifier
::
importPaths
()
const
{
QmlJS
Editor
::
ModelManagerInterface
*
modelManager
=
getModelManager
();
QmlJS
::
ModelManagerInterface
*
modelManager
=
getModelManager
();
if
(
modelManager
)
return
modelManager
->
importPaths
();
else
...
...
src/plugins/qmlinspector/components/objectpropertiesview.cpp
View file @
726c3345
...
...
@@ -34,7 +34,7 @@
#include
"propertytypefinder.h"
#include
<extensionsystem/pluginmanager.h>
#include
<qmljs
editor
/qmljsmodelmanagerinterface.h>
#include
<qmljs/qmljsmodelmanagerinterface.h>
#include
<qmljs/qmljsdocument.h>
#include
<QtGui/QApplication>
...
...
@@ -224,7 +224,7 @@ void ObjectPropertiesView::setPropertyValue(PropertiesViewItem *item, const QVar
QString
ObjectPropertiesView
::
propertyBaseClass
(
const
QDeclarativeDebugObjectReference
&
object
,
const
QDeclarativeDebugPropertyReference
&
property
,
int
&
depth
)
{
ExtensionSystem
::
PluginManager
*
pluginManager
=
ExtensionSystem
::
PluginManager
::
instance
();
QmlJS
Editor
::
ModelManagerInterface
*
modelManager
=
pluginManager
->
getObject
<
QmlJS
Editor
::
ModelManagerInterface
>
();
QmlJS
::
ModelManagerInterface
*
modelManager
=
pluginManager
->
getObject
<
QmlJS
::
ModelManagerInterface
>
();
QmlJS
::
Snapshot
snapshot
=
modelManager
->
snapshot
();
QmlJS
::
Document
::
Ptr
document
=
snapshot
.
document
(
object
.
source
().
url
().
path
());
...
...
src/plugins/qmljseditor/qmljscodecompletion.cpp
View file @
726c3345
...
...
@@ -30,8 +30,8 @@
#include
"qmljscodecompletion.h"
#include
"qmlexpressionundercursor.h"
#include
"qmljseditor.h"
#include
"qmljsmodelmanagerinterface.h"
#include
<qmljs/qmljsmodelmanagerinterface.h>
#include
<qmljs/parser/qmljsast_p.h>
#include
<qmljs/qmljsbind.h>
#include
<qmljs/qmljsinterpreter.h>
...
...
src/plugins/qmljseditor/qmljscodecompletion.h
View file @
726c3345
...
...
@@ -40,6 +40,8 @@ class ITextEditable;
}
namespace
QmlJS
{
class
ModelManagerInterface
;
namespace
Interpreter
{
class
Value
;
}
...
...
@@ -47,8 +49,6 @@ namespace QmlJS {
namespace
QmlJSEditor
{
class
ModelManagerInterface
;
namespace
Internal
{
class
FunctionArgumentWidget
;
...
...
@@ -58,7 +58,7 @@ class CodeCompletion: public TextEditor::ICompletionCollector
Q_OBJECT
public:
CodeCompletion
(
ModelManagerInterface
*
modelManager
,
QObject
*
parent
=
0
);
CodeCompletion
(
QmlJS
::
ModelManagerInterface
*
modelManager
,
QObject
*
parent
=
0
);
virtual
~
CodeCompletion
();
virtual
TextEditor
::
ITextEditable
*
editor
()
const
;
...
...
@@ -88,7 +88,7 @@ private:
const
QHash
<
QString
,
const
QmlJS
::
Interpreter
::
Value
*>
&
newCompletions
,
const
QIcon
&
icon
,
int
relevance
);
ModelManagerInterface
*
m_modelManager
;
QmlJS
::
ModelManagerInterface
*
m_modelManager
;
TextEditor
::
ITextEditable
*
m_editor
;
int
m_startPosition
;
QList
<
TextEditor
::
CompletionItem
>
m_completions
;
...
...
src/plugins/qmljseditor/qmljseditor.cpp
View file @
726c3345
...
...
@@ -1430,7 +1430,7 @@ SemanticInfo SemanticHighlighter::semanticInfo(const Source &source)
return
semanticInfo
;
}
void
SemanticHighlighter
::
setModelManager
(
QmlJS
Editor
::
ModelManagerInterface
*
modelManager
)
void
SemanticHighlighter
::
setModelManager
(
QmlJS
::
ModelManagerInterface
*
modelManager
)
{
m_modelManager
=
modelManager
;
}
src/plugins/qmljseditor/qmljseditor.h
View file @
726c3345
...
...
@@ -47,9 +47,11 @@ namespace Core {
class
ICore
;
}
namespace
QmlJSEditor
{
namespace
QmlJS
{
class
ModelManagerInterface
;
}
class
ModelManagerInterface
;
namespace
QmlJSEditor
{
class
Highlighter
;
namespace
Internal
{
...
...
@@ -176,7 +178,7 @@ public:
};
void
rehighlight
(
const
Source
&
source
);
void
setModelManager
(
ModelManagerInterface
*
modelManager
);
void
setModelManager
(
QmlJS
::
ModelManagerInterface
*
modelManager
);
Q_SIGNALS:
void
changed
(
const
QmlJSEditor
::
Internal
::
SemanticInfo
&
semanticInfo
);
...
...
@@ -194,7 +196,7 @@ private:
bool
m_done
;
Source
m_source
;
SemanticInfo
m_lastSemanticInfo
;
ModelManagerInterface
*
m_modelManager
;
QmlJS
::
ModelManagerInterface
*
m_modelManager
;
};
class
QmlJSTextEditor
:
public
TextEditor
::
BaseTextEditor
...
...
@@ -265,7 +267,7 @@ private:
QTimer
*
m_updateUsesTimer
;
QTimer
*
m_semanticRehighlightTimer
;
QComboBox
*
m_methodCombo
;
ModelManagerInterface
*
m_modelManager
;
QmlJS
::
ModelManagerInterface
*
m_modelManager
;
QTextCharFormat
m_occurrencesFormat
;
QTextCharFormat
m_occurrencesUnusedFormat
;
QTextCharFormat
m_occurrenceRenameFormat
;
...
...
src/plugins/qmljseditor/qmljseditor.pro
View file @
726c3345
...
...
@@ -21,7 +21,6 @@ HEADERS += \
qmljshighlighter
.
h
\
qmljshoverhandler
.
h
\
qmljsmodelmanager
.
h
\
qmljsmodelmanagerinterface
.
h
\
qmljspreviewrunner
.
h
\
qmljsquickfix
.
h
...
...
@@ -36,7 +35,6 @@ SOURCES += \
qmljshighlighter
.
cpp
\
qmljshoverhandler
.
cpp
\
qmljsmodelmanager
.
cpp
\
qmljsmodelmanagerinterface
.
cpp
\
qmljspreviewrunner
.
cpp
\
qmljsquickfix
.
cpp
...
...
src/plugins/qmljseditor/qmljseditorplugin.h
View file @
726c3345
...
...
@@ -50,9 +50,12 @@ namespace TextEditor {
class
ITextEditable
;
}
namespace
QmlJS
{
class
ModelManagerInterface
;
}
namespace
QmlJSEditor
{
class
ModelManagerInterface
;
class
QmlFileWizard
;
namespace
Internal
{
...
...
@@ -98,7 +101,7 @@ private:
QAction
*
m_actionPreview
;
QmlJSPreviewRunner
*
m_previewRunner
;
ModelManagerInterface
*
m_modelManager
;
QmlJS
::
ModelManagerInterface
*
m_modelManager
;
QmlFileWizard
*
m_wizard
;
QmlJSEditorFactory
*
m_editor
;
TextEditor
::
TextEditorActionHandler
*
m_actionHandler
;
...
...
src/plugins/qmljseditor/qmljshoverhandler.cpp
View file @
726c3345
...
...
@@ -63,7 +63,7 @@ HoverHandler::HoverHandler(QObject *parent)
:
QObject
(
parent
)
,
m_helpEngineNeedsSetup
(
false
)
{
m_modelManager
=
ExtensionSystem
::
PluginManager
::
instance
()
->
getObject
<
ModelManagerInterface
>
();
m_modelManager
=
ExtensionSystem
::
PluginManager
::
instance
()
->
getObject
<
QmlJS
::
ModelManagerInterface
>
();
ICore
*
core
=
ICore
::
instance
();
QFileInfo
fi
(
core
->
settings
()
->
fileName
());
...
...
src/plugins/qmljseditor/qmljshoverhandler.h
View file @
726c3345
...
...
@@ -30,8 +30,7 @@
#ifndef QMLJSHOVERHANDLER_H
#define QMLJSHOVERHANDLER_H
#include
"qmljsmodelmanagerinterface.h"
#include
<qmljs/qmljsmodelmanagerinterface.h>
#include
<QtCore/QObject>
QT_BEGIN_NAMESPACE
...
...
@@ -79,7 +78,7 @@ private:
QStringList
*
baseClasses
)
const
;
private:
ModelManagerInterface
*
m_modelManager
;
QmlJS
::
ModelManagerInterface
*
m_modelManager
;
QHelpEngineCore
*
m_helpEngine
;
QString
m_helpId
;
QString
m_toolTip
;
...
...
src/plugins/qmljseditor/qmljsmodelmanager.h
View file @
726c3345
...
...
@@ -30,8 +30,7 @@
#ifndef QMLJSMODELMANAGER_H
#define QMLJSMODELMANAGER_H
#include
"qmljsmodelmanagerinterface.h"
#include
<qmljs/qmljsmodelmanagerinterface.h>
#include
<qmljs/qmljsdocument.h>
#include
<QFuture>
...
...
@@ -47,7 +46,7 @@ class MimeType;
namespace
QmlJSEditor
{
namespace
Internal
{
class
ModelManager
:
public
ModelManagerInterface
class
ModelManager
:
public
QmlJS
::
ModelManagerInterface
{
Q_OBJECT
...
...
src/plugins/qmljseditor/qmljsquickfix.h
View file @
726c3345
...
...
@@ -35,9 +35,11 @@
#include
<qmljs/parser/qmljsastfwd_p.h>
#include
<qmljs/qmljsdocument.h>
namespace
QmlJSEditor
{
namespace
QmlJS
{
class
ModelManagerInterface
;
}
class
ModelManagerInterface
;
namespace
QmlJSEditor
{
namespace
Internal
{
...
...
src/plugins/qmlprojectmanager/qmlproject.cpp
View file @
726c3345
...
...
@@ -37,7 +37,7 @@
#include
<coreplugin/messagemanager.h>
#include
<extensionsystem/pluginmanager.h>
#include
<projectexplorer/filewatcher.h>
#include
<qmljs
editor
/qmljsmodelmanagerinterface.h>
#include
<qmljs/qmljsmodelmanagerinterface.h>
#include
<QTextStream>
#include
<QDeclarativeComponent>
...
...
@@ -48,7 +48,7 @@ namespace QmlProjectManager {
QmlProject
::
QmlProject
(
Internal
::
Manager
*
manager
,
const
QString
&
fileName
)
:
m_manager
(
manager
),
m_fileName
(
fileName
),
m_modelManager
(
ExtensionSystem
::
PluginManager
::
instance
()
->
getObject
<
QmlJS
Editor
::
ModelManagerInterface
>
()),
m_modelManager
(
ExtensionSystem
::
PluginManager
::
instance
()
->
getObject
<
QmlJS
::
ModelManagerInterface
>
()),
m_fileWatcher
(
new
ProjectExplorer
::
FileWatcher
(
this
)),
m_targetFactory
(
new
Internal
::
QmlProjectTargetFactory
(
this
))
{
...
...
src/plugins/qmlprojectmanager/qmlproject.h
View file @
726c3345
...
...
@@ -39,7 +39,7 @@
#include
<QtDeclarative/QDeclarativeEngine>
namespace
QmlJS
Editor
{
namespace
QmlJS
{
class
ModelManagerInterface
;
}
...
...
@@ -118,7 +118,7 @@ private:
QString
m_fileName
;
Internal
::
QmlProjectFile
*
m_file
;
QString
m_projectName
;
QmlJS
Editor
::
ModelManagerInterface
*
m_modelManager
;
QmlJS
::
ModelManagerInterface
*
m_modelManager
;
// plain format
QStringList
m_files
;
...
...
src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
View file @
726c3345
...
...
@@ -47,7 +47,7 @@
#include
<texteditor/texteditoractionhandler.h>
#include
<projectexplorer/taskwindow.h>
#include
<qmljs
editor
/qmljsmodelmanagerinterface.h>
#include
<qmljs/qmljsmodelmanagerinterface.h>
#include
<QtCore/QtPlugin>
...
...
@@ -99,7 +99,7 @@ void QmlProjectPlugin::extensionsInitialized()
ProjectExplorer
::
TaskWindow
*
taskWindow
=
pluginManager
->
getObject
<
ProjectExplorer
::
TaskWindow
>
();
m_qmlTaskManager
->
setTaskWindow
(
taskWindow
);
QmlJS
Editor
::
ModelManagerInterface
*
modelManager
=
pluginManager
->
getObject
<
QmlJS
Editor
::
ModelManagerInterface
>
();
QmlJS
::
ModelManagerInterface
*
modelManager
=
pluginManager
->
getObject
<
QmlJS
::
ModelManagerInterface
>
();
Q_ASSERT
(
modelManager
);
connect
(
modelManager
,
SIGNAL
(
documentChangedOnDisk
(
QmlJS
::
Document
::
Ptr
)),
m_qmlTaskManager
,
SLOT
(
documentChangedOnDisk
(
QmlJS
::
Document
::
Ptr
)));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment