summaryrefslogtreecommitdiffstats
path: root/src/scripttools
diff options
context:
space:
mode:
authorHarald Fernengel <harald@trolltech.com>2009-08-03 13:12:46 (GMT)
committerHarald Fernengel <harald@trolltech.com>2009-08-03 13:12:46 (GMT)
commit41a83e1ff19ad1396e6001e6b0ac003c701ba55a (patch)
tree609e40eda10418bbf925002c36552074796b96b6 /src/scripttools
parentd1f3b9df2bc5c57d414da73a7d4f9ed7b25df3db (diff)
downloadQt-41a83e1ff19ad1396e6001e6b0ac003c701ba55a.zip
Qt-41a83e1ff19ad1396e6001e6b0ac003c701ba55a.tar.gz
Qt-41a83e1ff19ad1396e6001e6b0ac003c701ba55a.tar.bz2
Squashed commit of the topic/exceptions branch.
Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
Diffstat (limited to 'src/scripttools')
-rw-r--r--src/scripttools/debugging/qscriptbreakpointdata_p.h2
-rw-r--r--src/scripttools/debugging/qscriptbreakpointsmodel_p.h2
-rw-r--r--src/scripttools/debugging/qscriptbreakpointswidget_p.h2
-rw-r--r--src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h2
-rw-r--r--src/scripttools/debugging/qscriptcompletiontask_p.h2
-rw-r--r--src/scripttools/debugging/qscriptcompletiontaskinterface_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebugger_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggeragent_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerbackend_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggercodefinderwidget_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggercodeview_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggercodewidget_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggercommand_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerconsole_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerconsolewidget_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerevent_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerfrontend_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerjob_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerlocalsmodel_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerlocalswidget_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerresponse_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerscriptsmodel_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerscriptswidget_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerstackmodel_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerstackwidget_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggervalue_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebuggervalueproperty_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebugoutputwidget_p.h2
-rw-r--r--src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h2
-rw-r--r--src/scripttools/debugging/qscriptenginedebugger.h2
-rw-r--r--src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp2
-rw-r--r--src/scripttools/debugging/qscriptenginedebuggerfrontend_p.h2
-rw-r--r--src/scripttools/debugging/qscripterrorlogwidget_p.h2
-rw-r--r--src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h2
-rw-r--r--src/scripttools/debugging/qscriptscriptdata_p.h2
-rw-r--r--src/scripttools/debugging/qscriptstdmessagehandler_p.h2
-rw-r--r--src/scripttools/debugging/qscriptvalueproperty_p.h2
53 files changed, 53 insertions, 53 deletions
diff --git a/src/scripttools/debugging/qscriptbreakpointdata_p.h b/src/scripttools/debugging/qscriptbreakpointdata_p.h
index 6fcb3f3..4f6d7b9 100644
--- a/src/scripttools/debugging/qscriptbreakpointdata_p.h
+++ b/src/scripttools/debugging/qscriptbreakpointdata_p.h
@@ -116,7 +116,7 @@ public:
private:
QScopedPointer<QScriptBreakpointDataPrivate> d_ptr;
- Q_DECLARE_PRIVATE(QScriptBreakpointData)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptBreakpointData)
};
typedef QMap<int, QScriptBreakpointData> QScriptBreakpointMap;
diff --git a/src/scripttools/debugging/qscriptbreakpointsmodel_p.h b/src/scripttools/debugging/qscriptbreakpointsmodel_p.h
index b6e11e5..7c0ba01 100644
--- a/src/scripttools/debugging/qscriptbreakpointsmodel_p.h
+++ b/src/scripttools/debugging/qscriptbreakpointsmodel_p.h
@@ -98,7 +98,7 @@ public:
Qt::ItemFlags flags(const QModelIndex &index) const;
private:
- Q_DECLARE_PRIVATE(QScriptBreakpointsModel)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptBreakpointsModel)
Q_DISABLE_COPY(QScriptBreakpointsModel)
};
diff --git a/src/scripttools/debugging/qscriptbreakpointswidget_p.h b/src/scripttools/debugging/qscriptbreakpointswidget_p.h
index 0717351..e0bb25c 100644
--- a/src/scripttools/debugging/qscriptbreakpointswidget_p.h
+++ b/src/scripttools/debugging/qscriptbreakpointswidget_p.h
@@ -81,7 +81,7 @@ private:
Q_PRIVATE_SLOT(d_func(), void _q_onCurrentChanged(const QModelIndex &))
Q_PRIVATE_SLOT(d_func(), void _q_onNewBreakpointRequest(const QString &, int))
- Q_DECLARE_PRIVATE(QScriptBreakpointsWidget)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptBreakpointsWidget)
Q_DISABLE_COPY(QScriptBreakpointsWidget)
};
diff --git a/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h b/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h
index c2b6418..74e775b 100644
--- a/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h
+++ b/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h
@@ -83,7 +83,7 @@ protected:
QWidget *parent, Qt::WindowFlags flags);
private:
- Q_DECLARE_PRIVATE(QScriptBreakpointsWidgetInterface)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptBreakpointsWidgetInterface)
Q_DISABLE_COPY(QScriptBreakpointsWidgetInterface)
};
diff --git a/src/scripttools/debugging/qscriptcompletiontask_p.h b/src/scripttools/debugging/qscriptcompletiontask_p.h
index 1dd80c0..95afa88 100644
--- a/src/scripttools/debugging/qscriptcompletiontask_p.h
+++ b/src/scripttools/debugging/qscriptcompletiontask_p.h
@@ -81,7 +81,7 @@ public:
void start();
private:
- Q_DECLARE_PRIVATE(QScriptCompletionTask)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptCompletionTask)
Q_DISABLE_COPY(QScriptCompletionTask)
};
diff --git a/src/scripttools/debugging/qscriptcompletiontaskinterface_p.h b/src/scripttools/debugging/qscriptcompletiontaskinterface_p.h
index 6a47bed..abe908c 100644
--- a/src/scripttools/debugging/qscriptcompletiontaskinterface_p.h
+++ b/src/scripttools/debugging/qscriptcompletiontaskinterface_p.h
@@ -97,7 +97,7 @@ protected:
QScriptCompletionTaskInterfacePrivate &dd, QObject *parent);
private:
- Q_DECLARE_PRIVATE(QScriptCompletionTaskInterface)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptCompletionTaskInterface)
Q_DISABLE_COPY(QScriptCompletionTaskInterface)
};
diff --git a/src/scripttools/debugging/qscriptdebugger_p.h b/src/scripttools/debugging/qscriptdebugger_p.h
index ba27200..f9cbf74 100644
--- a/src/scripttools/debugging/qscriptdebugger_p.h
+++ b/src/scripttools/debugging/qscriptdebugger_p.h
@@ -185,7 +185,7 @@ protected:
QScriptDebugger(QScriptDebuggerPrivate &dd, QObject *parent);
private:
- Q_DECLARE_PRIVATE(QScriptDebugger)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebugger)
Q_DISABLE_COPY(QScriptDebugger)
Q_PRIVATE_SLOT(d_func(), void _q_onLineEntered(const QString &))
diff --git a/src/scripttools/debugging/qscriptdebuggeragent_p.h b/src/scripttools/debugging/qscriptdebuggeragent_p.h
index ca4ab2e..769ed53 100644
--- a/src/scripttools/debugging/qscriptdebuggeragent_p.h
+++ b/src/scripttools/debugging/qscriptdebuggeragent_p.h
@@ -125,7 +125,7 @@ public:
const QVariant &argument = QVariant());
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerAgent)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerAgent)
Q_DISABLE_COPY(QScriptDebuggerAgent)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerbackend_p.h b/src/scripttools/debugging/qscriptdebuggerbackend_p.h
index 759a304..64c6ef3 100644
--- a/src/scripttools/debugging/qscriptdebuggerbackend_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerbackend_p.h
@@ -147,7 +147,7 @@ protected:
QScopedPointer<QScriptDebuggerBackendPrivate> d_ptr;
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerBackend)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerBackend)
Q_DISABLE_COPY(QScriptDebuggerBackend)
};
diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidget_p.h b/src/scripttools/debugging/qscriptdebuggercodefinderwidget_p.h
index f6d000d..b7d9392 100644
--- a/src/scripttools/debugging/qscriptdebuggercodefinderwidget_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidget_p.h
@@ -78,7 +78,7 @@ protected:
void keyPressEvent(QKeyEvent *e);
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerCodeFinderWidget)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerCodeFinderWidget)
Q_DISABLE_COPY(QScriptDebuggerCodeFinderWidget)
Q_PRIVATE_SLOT(d_func(), void _q_updateButtons())
diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h
index 5848e34..e73be00 100644
--- a/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h
@@ -84,7 +84,7 @@ protected:
QWidget *parent, Qt::WindowFlags flags);
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerCodeFinderWidgetInterface)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerCodeFinderWidgetInterface)
Q_DISABLE_COPY(QScriptDebuggerCodeFinderWidgetInterface)
};
diff --git a/src/scripttools/debugging/qscriptdebuggercodeview_p.h b/src/scripttools/debugging/qscriptdebuggercodeview_p.h
index 1748102..5945382 100644
--- a/src/scripttools/debugging/qscriptdebuggercodeview_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercodeview_p.h
@@ -87,7 +87,7 @@ public:
bool event(QEvent *e);
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerCodeView)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerCodeView)
Q_DISABLE_COPY(QScriptDebuggerCodeView)
};
diff --git a/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h b/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h
index ea9eb62..9bb4017 100644
--- a/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h
@@ -97,7 +97,7 @@ protected:
QWidget *parent, Qt::WindowFlags flags);
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerCodeViewInterface)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerCodeViewInterface)
Q_DISABLE_COPY(QScriptDebuggerCodeViewInterface)
};
diff --git a/src/scripttools/debugging/qscriptdebuggercodewidget_p.h b/src/scripttools/debugging/qscriptdebuggercodewidget_p.h
index e072a3d..f9a1b82 100644
--- a/src/scripttools/debugging/qscriptdebuggercodewidget_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercodewidget_p.h
@@ -82,7 +82,7 @@ public:
QScriptDebuggerCodeViewInterface *currentView() const;
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerCodeWidget)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerCodeWidget)
Q_DISABLE_COPY(QScriptDebuggerCodeWidget)
Q_PRIVATE_SLOT(d_func(), void _q_onBreakpointToggleRequest(int,bool))
diff --git a/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h
index 03b813a..d27af3d 100644
--- a/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h
@@ -92,7 +92,7 @@ protected:
QWidget *parent, Qt::WindowFlags flags);
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerCodeWidgetInterface)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerCodeWidgetInterface)
Q_DISABLE_COPY(QScriptDebuggerCodeWidgetInterface)
};
diff --git a/src/scripttools/debugging/qscriptdebuggercommand_p.h b/src/scripttools/debugging/qscriptdebuggercommand_p.h
index 8e44fcf..ffdb107 100644
--- a/src/scripttools/debugging/qscriptdebuggercommand_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercommand_p.h
@@ -257,7 +257,7 @@ public:
private:
QScopedPointer<QScriptDebuggerCommandPrivate> d_ptr;
- Q_DECLARE_PRIVATE(QScriptDebuggerCommand)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerCommand)
};
Q_AUTOTEST_EXPORT QDataStream &operator<<(QDataStream &, const QScriptDebuggerCommand &);
diff --git a/src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h b/src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h
index 0da0d87..d303d66 100644
--- a/src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h
@@ -78,7 +78,7 @@ protected:
QScopedPointer<QScriptDebuggerCommandExecutorPrivate> d_ptr;
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerCommandExecutor)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerCommandExecutor)
Q_DISABLE_COPY(QScriptDebuggerCommandExecutor)
};
diff --git a/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p.h b/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p.h
index db9c503..3c80173 100644
--- a/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p.h
+++ b/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p.h
@@ -78,7 +78,7 @@ protected:
QScriptDebuggerCommandSchedulerInterface *commandScheduler);
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerCommandSchedulerJob)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerCommandSchedulerJob)
Q_DISABLE_COPY(QScriptDebuggerCommandSchedulerJob)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerconsole_p.h b/src/scripttools/debugging/qscriptdebuggerconsole_p.h
index 2e4a726..5b88291 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsole_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsole_p.h
@@ -112,7 +112,7 @@ public:
private:
QScopedPointer<QScriptDebuggerConsolePrivate> d_ptr;
- Q_DECLARE_PRIVATE(QScriptDebuggerConsole)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerConsole)
Q_DISABLE_COPY(QScriptDebuggerConsole)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h
index c380150..a335e56 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h
@@ -94,7 +94,7 @@ protected:
QScopedPointer<QScriptDebuggerConsoleCommandPrivate> d_ptr;
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerConsoleCommand)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerConsoleCommand)
Q_DISABLE_COPY(QScriptDebuggerConsoleCommand)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h
index 5e23628..b1dfecb 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h
@@ -85,7 +85,7 @@ private:
QScopedSharedPointer<QScriptDebuggerConsoleCommandGroupDataPrivate> d_ptr;
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerConsoleCommandGroupData)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerConsoleCommandGroupData)
};
typedef QMap<QString, QScriptDebuggerConsoleCommandGroupData> QScriptDebuggerConsoleCommandGroupMap;
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p.h
index ce35157..65b2a4c 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p.h
@@ -77,7 +77,7 @@ protected:
QScriptDebuggerCommandSchedulerInterface *scheduler);
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerConsoleCommandJob)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerConsoleCommandJob)
Q_DISABLE_COPY(QScriptDebuggerConsoleCommandJob)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h
index c6de5b1..0ffd61e 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h
@@ -88,7 +88,7 @@ public:
private:
QScopedPointer<QScriptDebuggerConsoleCommandManagerPrivate> d_ptr;
- Q_DECLARE_PRIVATE(QScriptDebuggerConsoleCommandManager)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerConsoleCommandManager)
};
QT_END_NAMESPACE
diff --git a/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_p.h b/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_p.h
index 0200a32..1145162 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_p.h
@@ -163,7 +163,7 @@ public Q_SLOTS:
void setEvaluateAction(int action);
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerConsoleGlobalObject)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerConsoleGlobalObject)
Q_DISABLE_COPY(QScriptDebuggerConsoleGlobalObject)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolewidget_p.h b/src/scripttools/debugging/qscriptdebuggerconsolewidget_p.h
index 462d445..02e9e94 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolewidget_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsolewidget_p.h
@@ -85,7 +85,7 @@ protected:
QWidget *parent);
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerConsoleWidget)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerConsoleWidget)
Q_DISABLE_COPY(QScriptDebuggerConsoleWidget)
Q_PRIVATE_SLOT(d_func(), void _q_onLineEntered(const QString &))
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h
index 486a19a..a3b5b5f 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h
@@ -94,7 +94,7 @@ protected:
QWidget *parent, Qt::WindowFlags flags);
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerConsoleWidgetInterface)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerConsoleWidgetInterface)
Q_DISABLE_COPY(QScriptDebuggerConsoleWidgetInterface)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerevent_p.h b/src/scripttools/debugging/qscriptdebuggerevent_p.h
index 8c4e460..c6067d5 100644
--- a/src/scripttools/debugging/qscriptdebuggerevent_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerevent_p.h
@@ -140,7 +140,7 @@ public:
private:
QScopedPointer<QScriptDebuggerEventPrivate> d_ptr;
- Q_DECLARE_PRIVATE(QScriptDebuggerEvent)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerEvent)
};
Q_AUTOTEST_EXPORT QDataStream &operator<<(QDataStream &, const QScriptDebuggerEvent &);
diff --git a/src/scripttools/debugging/qscriptdebuggerfrontend_p.h b/src/scripttools/debugging/qscriptdebuggerfrontend_p.h
index 1f7b2ef..04ebb5c 100644
--- a/src/scripttools/debugging/qscriptdebuggerfrontend_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerfrontend_p.h
@@ -93,7 +93,7 @@ protected:
QScopedPointer<QScriptDebuggerFrontendPrivate> d_ptr;
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerFrontend)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerFrontend)
Q_DISABLE_COPY(QScriptDebuggerFrontend)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerjob_p.h b/src/scripttools/debugging/qscriptdebuggerjob_p.h
index 099ad16..0b723c7 100644
--- a/src/scripttools/debugging/qscriptdebuggerjob_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerjob_p.h
@@ -80,7 +80,7 @@ protected:
QScopedPointer<QScriptDebuggerJobPrivate> d_ptr;
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerJob)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerJob)
Q_DISABLE_COPY(QScriptDebuggerJob)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerlocalsmodel_p.h b/src/scripttools/debugging/qscriptdebuggerlocalsmodel_p.h
index 172fb7e..b93e490 100644
--- a/src/scripttools/debugging/qscriptdebuggerlocalsmodel_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerlocalsmodel_p.h
@@ -93,7 +93,7 @@ Q_SIGNALS:
void scopeObjectAvailable(const QModelIndex &index);
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerLocalsModel)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerLocalsModel)
Q_DISABLE_COPY(QScriptDebuggerLocalsModel)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidget_p.h b/src/scripttools/debugging/qscriptdebuggerlocalswidget_p.h
index e68ce53..6ef9b37 100644
--- a/src/scripttools/debugging/qscriptdebuggerlocalswidget_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerlocalswidget_p.h
@@ -72,7 +72,7 @@ public:
void expand(const QModelIndex &index);
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerLocalsWidget)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerLocalsWidget)
Q_DISABLE_COPY(QScriptDebuggerLocalsWidget)
Q_PRIVATE_SLOT(d_func(), void _q_onCompletionTaskFinished())
diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h
index 45936de..fd6ebae 100644
--- a/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h
@@ -83,7 +83,7 @@ protected:
QWidget *parent, Qt::WindowFlags flags);
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerLocalsWidgetInterface)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerLocalsWidgetInterface)
Q_DISABLE_COPY(QScriptDebuggerLocalsWidgetInterface)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerresponse_p.h b/src/scripttools/debugging/qscriptdebuggerresponse_p.h
index 645cab0..f372994 100644
--- a/src/scripttools/debugging/qscriptdebuggerresponse_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerresponse_p.h
@@ -129,7 +129,7 @@ public:
private:
QScopedPointer<QScriptDebuggerResponsePrivate> d_ptr;
- Q_DECLARE_PRIVATE(QScriptDebuggerResponse)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerResponse)
};
Q_AUTOTEST_EXPORT QDataStream &operator<<(QDataStream &, const QScriptDebuggerResponse &);
diff --git a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp
index 1324c01..4944411 100644
--- a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp
@@ -359,7 +359,7 @@ public:
int commandId);
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerScriptedConsoleCommandJob)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerScriptedConsoleCommandJob)
Q_DISABLE_COPY(QScriptDebuggerScriptedConsoleCommandJob)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_p.h b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_p.h
index 0fefea6..cea8ec9 100644
--- a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_p.h
@@ -97,7 +97,7 @@ public:
QScriptDebuggerCommandSchedulerInterface *commandScheduler);
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerScriptedConsoleCommand)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerScriptedConsoleCommand)
Q_DISABLE_COPY(QScriptDebuggerScriptedConsoleCommand)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerscriptsmodel_p.h b/src/scripttools/debugging/qscriptdebuggerscriptsmodel_p.h
index 1988ace..0e05d7e 100644
--- a/src/scripttools/debugging/qscriptdebuggerscriptsmodel_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerscriptsmodel_p.h
@@ -92,7 +92,7 @@ public:
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerScriptsModel)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerScriptsModel)
Q_DISABLE_COPY(QScriptDebuggerScriptsModel)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerscriptswidget_p.h b/src/scripttools/debugging/qscriptdebuggerscriptswidget_p.h
index 4359ec1..4c17eda 100644
--- a/src/scripttools/debugging/qscriptdebuggerscriptswidget_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerscriptswidget_p.h
@@ -73,7 +73,7 @@ public:
void setCurrentScript(qint64 id);
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerScriptsWidget)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerScriptsWidget)
Q_DISABLE_COPY(QScriptDebuggerScriptsWidget)
Q_PRIVATE_SLOT(d_func(), void _q_onCurrentChanged(const QModelIndex &))
diff --git a/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h
index eff08dc..8aa3203 100644
--- a/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h
@@ -83,7 +83,7 @@ protected:
QWidget *parent, Qt::WindowFlags flags);
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerScriptsWidgetInterface)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerScriptsWidgetInterface)
Q_DISABLE_COPY(QScriptDebuggerScriptsWidgetInterface)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerstackmodel_p.h b/src/scripttools/debugging/qscriptdebuggerstackmodel_p.h
index ff493f2..3075594 100644
--- a/src/scripttools/debugging/qscriptdebuggerstackmodel_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerstackmodel_p.h
@@ -78,7 +78,7 @@ public:
QVariant headerData(int section, Qt::Orientation, int role) const;
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerStackModel)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerStackModel)
Q_DISABLE_COPY(QScriptDebuggerStackModel)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerstackwidget_p.h b/src/scripttools/debugging/qscriptdebuggerstackwidget_p.h
index eaa04f3..4d8e6bc 100644
--- a/src/scripttools/debugging/qscriptdebuggerstackwidget_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerstackwidget_p.h
@@ -73,7 +73,7 @@ public:
void setCurrentFrameIndex(int frameIndex);
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerStackWidget)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerStackWidget)
Q_DISABLE_COPY(QScriptDebuggerStackWidget)
Q_PRIVATE_SLOT(d_func(), void _q_onCurrentChanged(const QModelIndex &))
diff --git a/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h
index d3c466c..bf1b698 100644
--- a/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h
+++ b/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h
@@ -82,7 +82,7 @@ protected:
QWidget *parent, Qt::WindowFlags flags);
private:
- Q_DECLARE_PRIVATE(QScriptDebuggerStackWidgetInterface)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerStackWidgetInterface)
Q_DISABLE_COPY(QScriptDebuggerStackWidgetInterface)
};
diff --git a/src/scripttools/debugging/qscriptdebuggervalue_p.h b/src/scripttools/debugging/qscriptdebuggervalue_p.h
index e701313..522f601 100644
--- a/src/scripttools/debugging/qscriptdebuggervalue_p.h
+++ b/src/scripttools/debugging/qscriptdebuggervalue_p.h
@@ -105,7 +105,7 @@ public:
private:
QScopedSharedPointer<QScriptDebuggerValuePrivate> d_ptr;
- Q_DECLARE_PRIVATE(QScriptDebuggerValue)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerValue)
};
typedef QList<QScriptDebuggerValue> QScriptDebuggerValueList;
diff --git a/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h b/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h
index 5e8f72a..af8b2d6 100644
--- a/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h
+++ b/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h
@@ -88,7 +88,7 @@ public:
private:
QScopedSharedPointer<QScriptDebuggerValuePropertyPrivate> d_ptr;
- Q_DECLARE_PRIVATE(QScriptDebuggerValueProperty)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerValueProperty)
};
typedef QList<QScriptDebuggerValueProperty> QScriptDebuggerValuePropertyList;
diff --git a/src/scripttools/debugging/qscriptdebugoutputwidget_p.h b/src/scripttools/debugging/qscriptdebugoutputwidget_p.h
index 21c7eb2..e9fe112 100644
--- a/src/scripttools/debugging/qscriptdebugoutputwidget_p.h
+++ b/src/scripttools/debugging/qscriptdebugoutputwidget_p.h
@@ -74,7 +74,7 @@ public:
void clear();
private:
- Q_DECLARE_PRIVATE(QScriptDebugOutputWidget)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebugOutputWidget)
Q_DISABLE_COPY(QScriptDebugOutputWidget)
};
diff --git a/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h b/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h
index 6a124e4..22f9443 100644
--- a/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h
+++ b/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h
@@ -75,7 +75,7 @@ protected:
QWidget *parent, Qt::WindowFlags flags);
private:
- Q_DECLARE_PRIVATE(QScriptDebugOutputWidgetInterface)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptDebugOutputWidgetInterface)
Q_DISABLE_COPY(QScriptDebugOutputWidgetInterface)
};
diff --git a/src/scripttools/debugging/qscriptenginedebugger.h b/src/scripttools/debugging/qscriptenginedebugger.h
index b9061a2..f5fa5fc 100644
--- a/src/scripttools/debugging/qscriptenginedebugger.h
+++ b/src/scripttools/debugging/qscriptenginedebugger.h
@@ -120,7 +120,7 @@ Q_SIGNALS:
void evaluationResumed();
private:
- Q_DECLARE_PRIVATE(QScriptEngineDebugger)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptEngineDebugger)
Q_DISABLE_COPY(QScriptEngineDebugger)
Q_PRIVATE_SLOT(d_func(), void _q_showStandardWindow())
diff --git a/src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp b/src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp
index c5e21ef..0a2886a 100644
--- a/src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp
+++ b/src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp
@@ -111,7 +111,7 @@ protected:
void event(const QScriptDebuggerEvent &event);
private:
- Q_DECLARE_PRIVATE(QScriptEngineDebuggerBackend)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptEngineDebuggerBackend)
Q_DISABLE_COPY(QScriptEngineDebuggerBackend)
};
diff --git a/src/scripttools/debugging/qscriptenginedebuggerfrontend_p.h b/src/scripttools/debugging/qscriptenginedebuggerfrontend_p.h
index 226fecc..9320461 100644
--- a/src/scripttools/debugging/qscriptenginedebuggerfrontend_p.h
+++ b/src/scripttools/debugging/qscriptenginedebuggerfrontend_p.h
@@ -80,7 +80,7 @@ protected:
void processCommand(int id, const QScriptDebuggerCommand &command);
private:
- Q_DECLARE_PRIVATE(QScriptEngineDebuggerFrontend)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptEngineDebuggerFrontend)
Q_DISABLE_COPY(QScriptEngineDebuggerFrontend)
};
diff --git a/src/scripttools/debugging/qscripterrorlogwidget_p.h b/src/scripttools/debugging/qscripterrorlogwidget_p.h
index 75d3e57..f05b5fb 100644
--- a/src/scripttools/debugging/qscripterrorlogwidget_p.h
+++ b/src/scripttools/debugging/qscripterrorlogwidget_p.h
@@ -74,7 +74,7 @@ public:
void clear();
private:
- Q_DECLARE_PRIVATE(QScriptErrorLogWidget)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptErrorLogWidget)
Q_DISABLE_COPY(QScriptErrorLogWidget)
};
diff --git a/src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h b/src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h
index 0ce86ff..903bc21 100644
--- a/src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h
+++ b/src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h
@@ -75,7 +75,7 @@ protected:
QWidget *parent, Qt::WindowFlags flags);
private:
- Q_DECLARE_PRIVATE(QScriptErrorLogWidgetInterface)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptErrorLogWidgetInterface)
Q_DISABLE_COPY(QScriptErrorLogWidgetInterface)
};
diff --git a/src/scripttools/debugging/qscriptscriptdata_p.h b/src/scripttools/debugging/qscriptscriptdata_p.h
index d5ef52d..750bd2a 100644
--- a/src/scripttools/debugging/qscriptscriptdata_p.h
+++ b/src/scripttools/debugging/qscriptscriptdata_p.h
@@ -93,7 +93,7 @@ public:
private:
QScopedSharedPointer<QScriptScriptDataPrivate> d_ptr;
- Q_DECLARE_PRIVATE(QScriptScriptData)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptScriptData)
};
typedef QMap<qint64, QScriptScriptData> QScriptScriptMap;
diff --git a/src/scripttools/debugging/qscriptstdmessagehandler_p.h b/src/scripttools/debugging/qscriptstdmessagehandler_p.h
index 6242c94..10accc2 100644
--- a/src/scripttools/debugging/qscriptstdmessagehandler_p.h
+++ b/src/scripttools/debugging/qscriptstdmessagehandler_p.h
@@ -76,7 +76,7 @@ private:
QScopedPointer<QScriptStdMessageHandlerPrivate> d_ptr;
private:
- Q_DECLARE_PRIVATE(QScriptStdMessageHandler)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptStdMessageHandler)
Q_DISABLE_COPY(QScriptStdMessageHandler)
};
diff --git a/src/scripttools/debugging/qscriptvalueproperty_p.h b/src/scripttools/debugging/qscriptvalueproperty_p.h
index b752272..545047d 100644
--- a/src/scripttools/debugging/qscriptvalueproperty_p.h
+++ b/src/scripttools/debugging/qscriptvalueproperty_p.h
@@ -84,7 +84,7 @@ public:
private:
QScopedSharedPointer<QScriptValuePropertyPrivate> d_ptr;
- Q_DECLARE_PRIVATE(QScriptValueProperty)
+ Q_DECLARE_SCOPED_PRIVATE(QScriptValueProperty)
};
typedef QList<QScriptValueProperty> QScriptValuePropertyList;