Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
5b97ddd3
Commit
5b97ddd3
authored
Jan 13, 2009
by
con
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes: - ScriptManagerInterface --> ScriptManager
parent
601471be
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
21 additions
and
21 deletions
+21
-21
src/plugins/coreplugin/coreimpl.cpp
src/plugins/coreplugin/coreimpl.cpp
+1
-1
src/plugins/coreplugin/coreimpl.h
src/plugins/coreplugin/coreimpl.h
+1
-1
src/plugins/coreplugin/coreplugin.pro
src/plugins/coreplugin/coreplugin.pro
+1
-1
src/plugins/coreplugin/icore.cpp
src/plugins/coreplugin/icore.cpp
+1
-1
src/plugins/coreplugin/icore.h
src/plugins/coreplugin/icore.h
+2
-2
src/plugins/coreplugin/mainwindow.cpp
src/plugins/coreplugin/mainwindow.cpp
+1
-1
src/plugins/coreplugin/mainwindow.h
src/plugins/coreplugin/mainwindow.h
+3
-3
src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
+1
-1
src/plugins/coreplugin/scriptmanager/scriptmanager.h
src/plugins/coreplugin/scriptmanager/scriptmanager.h
+6
-6
src/plugins/coreplugin/scriptmanager/scriptmanager_p.h
src/plugins/coreplugin/scriptmanager/scriptmanager_p.h
+2
-2
src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp
src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp
+2
-2
No files found.
src/plugins/coreplugin/coreimpl.cpp
View file @
5b97ddd3
...
...
@@ -99,7 +99,7 @@ ProgressManager *CoreImpl::progressManager() const
return
m_mainwindow
->
progressManager
();
}
ScriptManager
Interface
*
CoreImpl
::
scriptManager
()
const
ScriptManager
*
CoreImpl
::
scriptManager
()
const
{
return
m_mainwindow
->
scriptManager
();
}
...
...
src/plugins/coreplugin/coreimpl.h
View file @
5b97ddd3
...
...
@@ -63,7 +63,7 @@ public:
ExtensionSystem
::
PluginManager
*
pluginManager
()
const
;
EditorManager
*
editorManager
()
const
;
ProgressManager
*
progressManager
()
const
;
ScriptManager
Interface
*
scriptManager
()
const
;
ScriptManager
*
scriptManager
()
const
;
VariableManager
*
variableManager
()
const
;
VCSManager
*
vcsManager
()
const
;
ModeManager
*
modeManager
()
const
;
...
...
src/plugins/coreplugin/coreplugin.pro
View file @
5b97ddd3
...
...
@@ -132,7 +132,7 @@ HEADERS += mainwindow.h \
versiondialog
.
h
\
scriptmanager
/
metatypedeclarations
.
h
\
scriptmanager
/
qworkbench_wrapper
.
h
\
scriptmanager
/
scriptmanager
interface
.
h
\
scriptmanager
/
scriptmanager
.
h
\
scriptmanager
/
scriptmanager_p
.
h
\
core_global
.
h
\
basemode
.
h
\
...
...
src/plugins/coreplugin/icore.cpp
View file @
5b97ddd3
...
...
@@ -106,7 +106,7 @@
*/
/*!
\fn ScriptManager
Interface
*ICore::scriptManager() const
\fn ScriptManager *ICore::scriptManager() const
\internal
*/
...
...
src/plugins/coreplugin/icore.h
View file @
5b97ddd3
...
...
@@ -58,7 +58,7 @@ class IEditor;
class
UniqueIDManager
;
class
EditorManager
;
class
ProgressManager
;
class
ScriptManager
Interface
;
class
ScriptManager
;
class
VariableManager
;
class
IContext
;
class
VCSManager
;
...
...
@@ -88,7 +88,7 @@ public:
virtual
ExtensionSystem
::
PluginManager
*
pluginManager
()
const
=
0
;
virtual
EditorManager
*
editorManager
()
const
=
0
;
virtual
ProgressManager
*
progressManager
()
const
=
0
;
virtual
ScriptManager
Interface
*
scriptManager
()
const
=
0
;
virtual
ScriptManager
*
scriptManager
()
const
=
0
;
virtual
VariableManager
*
variableManager
()
const
=
0
;
virtual
VCSManager
*
vcsManager
()
const
=
0
;
virtual
ModeManager
*
modeManager
()
const
=
0
;
...
...
src/plugins/coreplugin/mainwindow.cpp
View file @
5b97ddd3
...
...
@@ -850,7 +850,7 @@ ProgressManager *MainWindow::progressManager() const
return
m_progressManager
;
}
ScriptManager
Interface
*
MainWindow
::
scriptManager
()
const
ScriptManager
*
MainWindow
::
scriptManager
()
const
{
return
m_scriptManager
;
}
...
...
src/plugins/coreplugin/mainwindow.h
View file @
5b97ddd3
...
...
@@ -66,7 +66,7 @@ class MimeDatabase;
class
ModeManager
;
class
ProgressManager
;
class
RightPaneWidget
;
class
ScriptManager
Interface
;
class
ScriptManager
;
class
UniqueIDManager
;
class
VariableManager
;
class
VCSManager
;
...
...
@@ -112,7 +112,7 @@ public:
ExtensionSystem
::
PluginManager
*
pluginManager
()
const
;
Core
::
EditorManager
*
editorManager
()
const
;
Core
::
ProgressManager
*
progressManager
()
const
;
Core
::
ScriptManager
Interface
*
scriptManager
()
const
;
Core
::
ScriptManager
*
scriptManager
()
const
;
Core
::
VariableManager
*
variableManager
()
const
;
Core
::
ModeManager
*
modeManager
()
const
;
Core
::
MimeDatabase
*
mimeDatabase
()
const
;
...
...
@@ -181,7 +181,7 @@ private:
FileManager
*
m_fileManager
;
MessageManager
*
m_messageManager
;
ProgressManagerPrivate
*
m_progressManager
;
ScriptManager
Interface
*
m_scriptManager
;
ScriptManager
*
m_scriptManager
;
VariableManager
*
m_variableManager
;
VCSManager
*
m_vcsManager
;
ViewManager
*
m_viewManager
;
...
...
src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
View file @
5b97ddd3
...
...
@@ -183,7 +183,7 @@ namespace Core {
namespace
Internal
{
ScriptManagerPrivate
::
ScriptManagerPrivate
(
QObject
*
parent
,
ICore
*
core
)
:
ScriptManager
Interface
(
parent
),
ScriptManager
(
parent
),
m_core
(
core
),
m_initialized
(
false
)
{
...
...
src/plugins/coreplugin/scriptmanager/scriptmanager
interface
.h
→
src/plugins/coreplugin/scriptmanager/scriptmanager.h
View file @
5b97ddd3
...
...
@@ -31,8 +31,8 @@
**
***************************************************************************/
#ifndef SCRIPTMANAGER
INTERFACE
_H
#define SCRIPTMANAGER
INTERFACE
_H
#ifndef SCRIPTMANAGER_H
#define SCRIPTMANAGER_H
#include <coreplugin/core_global.h>
...
...
@@ -47,7 +47,7 @@ namespace Core {
* Qt Creator's interfaces and allows for running scripts.
* @{todo} Should it actually manage script files, too? */
class
CORE_EXPORT
ScriptManager
Interface
:
public
QObject
class
CORE_EXPORT
ScriptManager
:
public
QObject
{
Q_OBJECT
public:
...
...
@@ -60,8 +60,8 @@ public:
};
typedef
QList
<
StackFrame
>
Stack
;
ScriptManager
Interface
(
QObject
*
parent
=
0
)
:
QObject
(
parent
)
{}
virtual
~
ScriptManager
Interface
()
{
}
ScriptManager
(
QObject
*
parent
=
0
)
:
QObject
(
parent
)
{}
virtual
~
ScriptManager
()
{
}
// Access the engine (for plugins to wrap additional interfaces).
virtual
QScriptEngine
&
scriptEngine
()
=
0
;
...
...
@@ -73,4 +73,4 @@ public:
}
// namespace Core
#endif // SCRIPTMANAGER
INTERFACE
_H
#endif // SCRIPTMANAGER_H
src/plugins/coreplugin/scriptmanager/scriptmanager_p.h
View file @
5b97ddd3
...
...
@@ -34,7 +34,7 @@
#ifndef SCRIPTMANAGER_P_H
#define SCRIPTMANAGER_P_H
#include <coreplugin/scriptmanager/scriptmanager
interface
.h>
#include <coreplugin/scriptmanager/scriptmanager.h>
#include <coreplugin/icore.h>
#include <QtCore/QObject>
...
...
@@ -44,7 +44,7 @@
namespace
Core
{
namespace
Internal
{
class
ScriptManagerPrivate
:
public
Core
::
ScriptManager
Interface
class
ScriptManagerPrivate
:
public
Core
::
ScriptManager
{
Q_OBJECT
...
...
src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp
View file @
5b97ddd3
...
...
@@ -36,7 +36,7 @@
#include "qtscripteditor.h"
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/scriptmanager/scriptmanager
interface
.h>
#include <coreplugin/scriptmanager/scriptmanager.h>
#include <QtGui/QAction>
#include <QtGui/QMessageBox>
...
...
@@ -79,7 +79,7 @@ void QtScriptEditorActionHandler::updateActions(UpdateMode um)
void
QtScriptEditorActionHandler
::
run
()
{
typedef
Core
::
ScriptManager
Interface
::
Stack
Stack
;
typedef
Core
::
ScriptManager
::
Stack
Stack
;
if
(
!
currentEditor
())
return
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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