Changeset 561 for trunk/src/scripttools/debugging/qscriptdebugger_p.h

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/scripttools/debugging/qscriptdebugger_p.h (modified) (7 diffs)

trunk/src/scripttools/debugging/qscriptdebugger_p.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtSCriptTools module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -71 +71 @@
 class QAction;
 class QEvent;
+class QMenu;
+#ifndef QT_NO_TOOLBAR
+class QToolBar;
+#endif
 
 class QScriptDebuggerPrivate;
@@ -77 +81 @@
     Q_OBJECT
 public:
+    // mirrors QScriptEngineDebugger::DebuggerWidget
+    enum DebuggerWidget {
+        ConsoleWidget,
+        StackWidget,
+        ScriptsWidget,
+        LocalsWidget,
+        CodeWidget,
+        CodeFinderWidget,
+        BreakpointsWidget,
+        DebugOutputWidget,
+        ErrorLogWidget
+    };
+    // mirrors QScriptEngineDebugger::DebuggerAction
+    enum DebuggerAction {
+        InterruptAction,
+        ContinueAction,
+        StepIntoAction,
+        StepOverAction,
+        StepOutAction,
+        RunToCursorAction,
+        RunToNewScriptAction,
+        ToggleBreakpointAction,
+        ClearDebugOutputAction,
+        ClearErrorLogAction,
+        ClearConsoleAction,
+        FindInScriptAction,
+        FindNextInScriptAction,
+        FindPreviousInScriptAction,
+        GoToLineAction
+    };
+
     QScriptDebugger(QObject *parent = 0);
     ~QScriptDebugger();
@@ -82 +117 @@
     QScriptDebuggerFrontend *frontend() const;
     void setFrontend(QScriptDebuggerFrontend *frontend);
+
+    QWidget *widget(DebuggerWidget widget);
+    QAction *action(DebuggerAction action, QObject *parent);
 
     QScriptDebuggerConsoleWidgetInterface *consoleWidget() const;
@@ -132 +170 @@
     QAction *clearErrorLogAction(QObject *parent) const;
 
+    QMenu *createStandardMenu(QWidget *widgetParent, QObject *actionParent);
+#ifndef QT_NO_TOOLBAR
+    QToolBar *createStandardToolBar(QWidget *widgetParent, QObject *actionParent);
+#endif
     bool eventFilter(QObject *, QEvent *e);
+
+    bool isInteractive() const;
 
 Q_SIGNALS: