summaryrefslogtreecommitdiffstats
path: root/src/scripttools/debugging
diff options
context:
space:
mode:
authorHarald Fernengel <harald@trolltech.com>2009-08-06 10:04:36 (GMT)
committerHarald Fernengel <harald@trolltech.com>2009-08-06 10:04:36 (GMT)
commite5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7 (patch)
treec01e05d0ea5a42fa1ab5f2f5e686806bcd8e5280 /src/scripttools/debugging
parent7588eaee83776b510eabdb9206e3cabcb3ee9dc2 (diff)
downloadQt-e5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7.zip
Qt-e5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7.tar.gz
Qt-e5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7.tar.bz2
Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATE
Rationale: We're using template magic now to get the private pointer in qglobal.h, so no need to have two macros. Also keeps backward compatibility with outside (KDE) code.
Diffstat (limited to 'src/scripttools/debugging')
-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 4f6d7b9..6fcb3f3 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_SCOPED_PRIVATE(QScriptBreakpointData)
+ Q_DECLARE_PRIVATE(QScriptBreakpointData)
};
typedef QMap<int, QScriptBreakpointData> QScriptBreakpointMap;
diff --git a/src/scripttools/debugging/qscriptbreakpointsmodel_p.h b/src/scripttools/debugging/qscriptbreakpointsmodel_p.h
index 7c0ba01..b6e11e5 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_SCOPED_PRIVATE(QScriptBreakpointsModel)
+ Q_DECLARE_PRIVATE(QScriptBreakpointsModel)
Q_DISABLE_COPY(QScriptBreakpointsModel)
};
diff --git a/src/scripttools/debugging/qscriptbreakpointswidget_p.h b/src/scripttools/debugging/qscriptbreakpointswidget_p.h
index e0bb25c..0717351 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_SCOPED_PRIVATE(QScriptBreakpointsWidget)
+ Q_DECLARE_PRIVATE(QScriptBreakpointsWidget)
Q_DISABLE_COPY(QScriptBreakpointsWidget)
};
diff --git a/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h b/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h
index 74e775b..c2b6418 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_SCOPED_PRIVATE(QScriptBreakpointsWidgetInterface)
+ Q_DECLARE_PRIVATE(QScriptBreakpointsWidgetInterface)
Q_DISABLE_COPY(QScriptBreakpointsWidgetInterface)
};
diff --git a/src/scripttools/debugging/qscriptcompletiontask_p.h b/src/scripttools/debugging/qscriptcompletiontask_p.h
index 95afa88..1dd80c0 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_SCOPED_PRIVATE(QScriptCompletionTask)
+ Q_DECLARE_PRIVATE(QScriptCompletionTask)
Q_DISABLE_COPY(QScriptCompletionTask)
};
diff --git a/src/scripttools/debugging/qscriptcompletiontaskinterface_p.h b/src/scripttools/debugging/qscriptcompletiontaskinterface_p.h
index abe908c..6a47bed 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_SCOPED_PRIVATE(QScriptCompletionTaskInterface)
+ Q_DECLARE_PRIVATE(QScriptCompletionTaskInterface)
Q_DISABLE_COPY(QScriptCompletionTaskInterface)
};
diff --git a/src/scripttools/debugging/qscriptdebugger_p.h b/src/scripttools/debugging/qscriptdebugger_p.h
index f9cbf74..ba27200 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_SCOPED_PRIVATE(QScriptDebugger)
+ Q_DECLARE_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 769ed53..ca4ab2e 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_SCOPED_PRIVATE(QScriptDebuggerAgent)
+ Q_DECLARE_PRIVATE(QScriptDebuggerAgent)
Q_DISABLE_COPY(QScriptDebuggerAgent)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerbackend_p.h b/src/scripttools/debugging/qscriptdebuggerbackend_p.h
index 64c6ef3..759a304 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_SCOPED_PRIVATE(QScriptDebuggerBackend)
+ Q_DECLARE_PRIVATE(QScriptDebuggerBackend)
Q_DISABLE_COPY(QScriptDebuggerBackend)
};
diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidget_p.h b/src/scripttools/debugging/qscriptdebuggercodefinderwidget_p.h
index b7d9392..f6d000d 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_SCOPED_PRIVATE(QScriptDebuggerCodeFinderWidget)
+ Q_DECLARE_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 e73be00..5848e34 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_SCOPED_PRIVATE(QScriptDebuggerCodeFinderWidgetInterface)
+ Q_DECLARE_PRIVATE(QScriptDebuggerCodeFinderWidgetInterface)
Q_DISABLE_COPY(QScriptDebuggerCodeFinderWidgetInterface)
};
diff --git a/src/scripttools/debugging/qscriptdebuggercodeview_p.h b/src/scripttools/debugging/qscriptdebuggercodeview_p.h
index 5945382..1748102 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_SCOPED_PRIVATE(QScriptDebuggerCodeView)
+ Q_DECLARE_PRIVATE(QScriptDebuggerCodeView)
Q_DISABLE_COPY(QScriptDebuggerCodeView)
};
diff --git a/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h b/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h
index 9bb4017..ea9eb62 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_SCOPED_PRIVATE(QScriptDebuggerCodeViewInterface)
+ Q_DECLARE_PRIVATE(QScriptDebuggerCodeViewInterface)
Q_DISABLE_COPY(QScriptDebuggerCodeViewInterface)
};
diff --git a/src/scripttools/debugging/qscriptdebuggercodewidget_p.h b/src/scripttools/debugging/qscriptdebuggercodewidget_p.h
index f9a1b82..e072a3d 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_SCOPED_PRIVATE(QScriptDebuggerCodeWidget)
+ Q_DECLARE_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 d27af3d..03b813a 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_SCOPED_PRIVATE(QScriptDebuggerCodeWidgetInterface)
+ Q_DECLARE_PRIVATE(QScriptDebuggerCodeWidgetInterface)
Q_DISABLE_COPY(QScriptDebuggerCodeWidgetInterface)
};
diff --git a/src/scripttools/debugging/qscriptdebuggercommand_p.h b/src/scripttools/debugging/qscriptdebuggercommand_p.h
index ffdb107..8e44fcf 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_SCOPED_PRIVATE(QScriptDebuggerCommand)
+ Q_DECLARE_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 d303d66..0da0d87 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_SCOPED_PRIVATE(QScriptDebuggerCommandExecutor)
+ Q_DECLARE_PRIVATE(QScriptDebuggerCommandExecutor)
Q_DISABLE_COPY(QScriptDebuggerCommandExecutor)
};
diff --git a/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p.h b/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p.h
index 3c80173..db9c503 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_SCOPED_PRIVATE(QScriptDebuggerCommandSchedulerJob)
+ Q_DECLARE_PRIVATE(QScriptDebuggerCommandSchedulerJob)
Q_DISABLE_COPY(QScriptDebuggerCommandSchedulerJob)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerconsole_p.h b/src/scripttools/debugging/qscriptdebuggerconsole_p.h
index 5b88291..2e4a726 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_SCOPED_PRIVATE(QScriptDebuggerConsole)
+ Q_DECLARE_PRIVATE(QScriptDebuggerConsole)
Q_DISABLE_COPY(QScriptDebuggerConsole)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h
index a335e56..c380150 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_SCOPED_PRIVATE(QScriptDebuggerConsoleCommand)
+ Q_DECLARE_PRIVATE(QScriptDebuggerConsoleCommand)
Q_DISABLE_COPY(QScriptDebuggerConsoleCommand)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h
index b1dfecb..5e23628 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_SCOPED_PRIVATE(QScriptDebuggerConsoleCommandGroupData)
+ Q_DECLARE_PRIVATE(QScriptDebuggerConsoleCommandGroupData)
};
typedef QMap<QString, QScriptDebuggerConsoleCommandGroupData> QScriptDebuggerConsoleCommandGroupMap;
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p.h
index 65b2a4c..ce35157 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_SCOPED_PRIVATE(QScriptDebuggerConsoleCommandJob)
+ Q_DECLARE_PRIVATE(QScriptDebuggerConsoleCommandJob)
Q_DISABLE_COPY(QScriptDebuggerConsoleCommandJob)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h
index 0ffd61e..c6de5b1 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_SCOPED_PRIVATE(QScriptDebuggerConsoleCommandManager)
+ Q_DECLARE_PRIVATE(QScriptDebuggerConsoleCommandManager)
};
QT_END_NAMESPACE
diff --git a/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_p.h b/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_p.h
index 1145162..0200a32 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_SCOPED_PRIVATE(QScriptDebuggerConsoleGlobalObject)
+ Q_DECLARE_PRIVATE(QScriptDebuggerConsoleGlobalObject)
Q_DISABLE_COPY(QScriptDebuggerConsoleGlobalObject)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolewidget_p.h b/src/scripttools/debugging/qscriptdebuggerconsolewidget_p.h
index 02e9e94..462d445 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_SCOPED_PRIVATE(QScriptDebuggerConsoleWidget)
+ Q_DECLARE_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 a3b5b5f..486a19a 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_SCOPED_PRIVATE(QScriptDebuggerConsoleWidgetInterface)
+ Q_DECLARE_PRIVATE(QScriptDebuggerConsoleWidgetInterface)
Q_DISABLE_COPY(QScriptDebuggerConsoleWidgetInterface)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerevent_p.h b/src/scripttools/debugging/qscriptdebuggerevent_p.h
index c6067d5..8c4e460 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_SCOPED_PRIVATE(QScriptDebuggerEvent)
+ Q_DECLARE_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 04ebb5c..1f7b2ef 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_SCOPED_PRIVATE(QScriptDebuggerFrontend)
+ Q_DECLARE_PRIVATE(QScriptDebuggerFrontend)
Q_DISABLE_COPY(QScriptDebuggerFrontend)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerjob_p.h b/src/scripttools/debugging/qscriptdebuggerjob_p.h
index 0b723c7..099ad16 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_SCOPED_PRIVATE(QScriptDebuggerJob)
+ Q_DECLARE_PRIVATE(QScriptDebuggerJob)
Q_DISABLE_COPY(QScriptDebuggerJob)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerlocalsmodel_p.h b/src/scripttools/debugging/qscriptdebuggerlocalsmodel_p.h
index b93e490..172fb7e 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_SCOPED_PRIVATE(QScriptDebuggerLocalsModel)
+ Q_DECLARE_PRIVATE(QScriptDebuggerLocalsModel)
Q_DISABLE_COPY(QScriptDebuggerLocalsModel)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidget_p.h b/src/scripttools/debugging/qscriptdebuggerlocalswidget_p.h
index 6ef9b37..e68ce53 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_SCOPED_PRIVATE(QScriptDebuggerLocalsWidget)
+ Q_DECLARE_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 fd6ebae..45936de 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_SCOPED_PRIVATE(QScriptDebuggerLocalsWidgetInterface)
+ Q_DECLARE_PRIVATE(QScriptDebuggerLocalsWidgetInterface)
Q_DISABLE_COPY(QScriptDebuggerLocalsWidgetInterface)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerresponse_p.h b/src/scripttools/debugging/qscriptdebuggerresponse_p.h
index f372994..645cab0 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_SCOPED_PRIVATE(QScriptDebuggerResponse)
+ Q_DECLARE_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 76f3a38..92fa36c 100644
--- a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp
@@ -359,7 +359,7 @@ public:
int commandId);
private:
- Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerScriptedConsoleCommandJob)
+ Q_DECLARE_PRIVATE(QScriptDebuggerScriptedConsoleCommandJob)
Q_DISABLE_COPY(QScriptDebuggerScriptedConsoleCommandJob)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_p.h b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_p.h
index cea8ec9..0fefea6 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_SCOPED_PRIVATE(QScriptDebuggerScriptedConsoleCommand)
+ Q_DECLARE_PRIVATE(QScriptDebuggerScriptedConsoleCommand)
Q_DISABLE_COPY(QScriptDebuggerScriptedConsoleCommand)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerscriptsmodel_p.h b/src/scripttools/debugging/qscriptdebuggerscriptsmodel_p.h
index 0e05d7e..1988ace 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_SCOPED_PRIVATE(QScriptDebuggerScriptsModel)
+ Q_DECLARE_PRIVATE(QScriptDebuggerScriptsModel)
Q_DISABLE_COPY(QScriptDebuggerScriptsModel)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerscriptswidget_p.h b/src/scripttools/debugging/qscriptdebuggerscriptswidget_p.h
index 4c17eda..4359ec1 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_SCOPED_PRIVATE(QScriptDebuggerScriptsWidget)
+ Q_DECLARE_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 8aa3203..eff08dc 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_SCOPED_PRIVATE(QScriptDebuggerScriptsWidgetInterface)
+ Q_DECLARE_PRIVATE(QScriptDebuggerScriptsWidgetInterface)
Q_DISABLE_COPY(QScriptDebuggerScriptsWidgetInterface)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerstackmodel_p.h b/src/scripttools/debugging/qscriptdebuggerstackmodel_p.h
index 3075594..ff493f2 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_SCOPED_PRIVATE(QScriptDebuggerStackModel)
+ Q_DECLARE_PRIVATE(QScriptDebuggerStackModel)
Q_DISABLE_COPY(QScriptDebuggerStackModel)
};
diff --git a/src/scripttools/debugging/qscriptdebuggerstackwidget_p.h b/src/scripttools/debugging/qscriptdebuggerstackwidget_p.h
index 4d8e6bc..eaa04f3 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_SCOPED_PRIVATE(QScriptDebuggerStackWidget)
+ Q_DECLARE_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 bf1b698..d3c466c 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_SCOPED_PRIVATE(QScriptDebuggerStackWidgetInterface)
+ Q_DECLARE_PRIVATE(QScriptDebuggerStackWidgetInterface)
Q_DISABLE_COPY(QScriptDebuggerStackWidgetInterface)
};
diff --git a/src/scripttools/debugging/qscriptdebuggervalue_p.h b/src/scripttools/debugging/qscriptdebuggervalue_p.h
index 522f601..e701313 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_SCOPED_PRIVATE(QScriptDebuggerValue)
+ Q_DECLARE_PRIVATE(QScriptDebuggerValue)
};
typedef QList<QScriptDebuggerValue> QScriptDebuggerValueList;
diff --git a/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h b/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h
index af8b2d6..5e8f72a 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_SCOPED_PRIVATE(QScriptDebuggerValueProperty)
+ Q_DECLARE_PRIVATE(QScriptDebuggerValueProperty)
};
typedef QList<QScriptDebuggerValueProperty> QScriptDebuggerValuePropertyList;
diff --git a/src/scripttools/debugging/qscriptdebugoutputwidget_p.h b/src/scripttools/debugging/qscriptdebugoutputwidget_p.h
index e9fe112..21c7eb2 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_SCOPED_PRIVATE(QScriptDebugOutputWidget)
+ Q_DECLARE_PRIVATE(QScriptDebugOutputWidget)
Q_DISABLE_COPY(QScriptDebugOutputWidget)
};
diff --git a/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h b/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h
index 22f9443..6a124e4 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_SCOPED_PRIVATE(QScriptDebugOutputWidgetInterface)
+ Q_DECLARE_PRIVATE(QScriptDebugOutputWidgetInterface)
Q_DISABLE_COPY(QScriptDebugOutputWidgetInterface)
};
diff --git a/src/scripttools/debugging/qscriptenginedebugger.h b/src/scripttools/debugging/qscriptenginedebugger.h
index f5fa5fc..b9061a2 100644
--- a/src/scripttools/debugging/qscriptenginedebugger.h
+++ b/src/scripttools/debugging/qscriptenginedebugger.h
@@ -120,7 +120,7 @@ Q_SIGNALS:
void evaluationResumed();
private:
- Q_DECLARE_SCOPED_PRIVATE(QScriptEngineDebugger)
+ Q_DECLARE_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 6faad96..5b58c52 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_SCOPED_PRIVATE(QScriptEngineDebuggerBackend)
+ Q_DECLARE_PRIVATE(QScriptEngineDebuggerBackend)
Q_DISABLE_COPY(QScriptEngineDebuggerBackend)
};
diff --git a/src/scripttools/debugging/qscriptenginedebuggerfrontend_p.h b/src/scripttools/debugging/qscriptenginedebuggerfrontend_p.h
index 9320461..226fecc 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_SCOPED_PRIVATE(QScriptEngineDebuggerFrontend)
+ Q_DECLARE_PRIVATE(QScriptEngineDebuggerFrontend)
Q_DISABLE_COPY(QScriptEngineDebuggerFrontend)
};
diff --git a/src/scripttools/debugging/qscripterrorlogwidget_p.h b/src/scripttools/debugging/qscripterrorlogwidget_p.h
index f05b5fb..75d3e57 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_SCOPED_PRIVATE(QScriptErrorLogWidget)
+ Q_DECLARE_PRIVATE(QScriptErrorLogWidget)
Q_DISABLE_COPY(QScriptErrorLogWidget)
};
diff --git a/src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h b/src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h
index 903bc21..0ce86ff 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_SCOPED_PRIVATE(QScriptErrorLogWidgetInterface)
+ Q_DECLARE_PRIVATE(QScriptErrorLogWidgetInterface)
Q_DISABLE_COPY(QScriptErrorLogWidgetInterface)
};
diff --git a/src/scripttools/debugging/qscriptscriptdata_p.h b/src/scripttools/debugging/qscriptscriptdata_p.h
index 750bd2a..d5ef52d 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_SCOPED_PRIVATE(QScriptScriptData)
+ Q_DECLARE_PRIVATE(QScriptScriptData)
};
typedef QMap<qint64, QScriptScriptData> QScriptScriptMap;
diff --git a/src/scripttools/debugging/qscriptstdmessagehandler_p.h b/src/scripttools/debugging/qscriptstdmessagehandler_p.h
index 10accc2..6242c94 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_SCOPED_PRIVATE(QScriptStdMessageHandler)
+ Q_DECLARE_PRIVATE(QScriptStdMessageHandler)
Q_DISABLE_COPY(QScriptStdMessageHandler)
};
diff --git a/src/scripttools/debugging/qscriptvalueproperty_p.h b/src/scripttools/debugging/qscriptvalueproperty_p.h
index 545047d..b752272 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_SCOPED_PRIVATE(QScriptValueProperty)
+ Q_DECLARE_PRIVATE(QScriptValueProperty)
};
typedef QList<QScriptValueProperty> QScriptValuePropertyList;