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

Script engine: Fix locals/QT_NO_CAST_FROM_ASCII

Browse Source
This commit is contained in:
Friedemann Kleint
2010-01-18 12:34:59 +01:00
committed by Tim Jenssen
parent f717f51bac
commit a704b974b5
5 changed files with 108 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
View File

@@ -123,6 +123,20 @@ void MessageManagerPrototype::printToOutputPane(const QString &text, bool bringT
mm->printToOutputPane(text, bringToForeground);
}
void MessageManagerPrototype::printToOutputPanePopup(const QString &text)
{
MessageManager *mm = qscriptvalue_cast<MessageManager *>(thisObject());
QTC_ASSERT(mm, return);
mm->printToOutputPanePopup(text);
}
void MessageManagerPrototype::printToOutputPane(const QString &text)
{
MessageManager *mm = qscriptvalue_cast<MessageManager *>(thisObject());
QTC_ASSERT(mm, return);
mm->printToOutputPane(text);
}
QString MessageManagerPrototype::toString() const
{
return QLatin1String("MessageManager");

5
src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
View File

@@ -87,7 +87,10 @@ public:
public slots:
void displayStatusBarMessage(const QString &text, int ms = 0);
void printToOutputPane(const QString &text, bool bringToForeground = true);
void printToOutputPane(const QString &text, bool bringToForeground);
void printToOutputPanePopup(const QString &text); // pops up
void printToOutputPane(const QString &text);
QString toString() const;
};

4
src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
View File

@@ -235,13 +235,13 @@ ScriptManager::QScriptEnginePtr ScriptManagerPrivate::ensureEngineInitialized()
{
if (!m_engine.isNull())
return m_engine;
m_engine = QScriptEnginePtr(new QScriptEngine(this));
m_engine = QScriptEnginePtr(new QScriptEngine);
// register QObjects that occur as properties
SharedTools::registerQObject<QMainWindow>(m_engine.data());
SharedTools::registerQObject<QStatusBar>(m_engine.data());
SharedTools::registerQObject<QSettings>(m_engine.data());
// WB interfaces
// SharedTools::registerQObjectInterface<Core::MessageManager, MessageManagerPrototype>(m_engine);
SharedTools::registerQObjectInterface<Core::MessageManager, MessageManagerPrototype>(m_engine.data());
// SharedTools::registerQObjectInterface<Core::IFile, FilePrototype>(m_engine);
// qScriptRegisterSequenceMetaType<QList<Core::IFile *> >(m_engine);