summaryrefslogtreecommitdiffstats
path: root/src/xmlpatterns
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/xmlpatterns
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/xmlpatterns')
-rw-r--r--src/xmlpatterns/api/qabstractmessagehandler.h2
-rw-r--r--src/xmlpatterns/api/qabstracturiresolver.h2
-rw-r--r--src/xmlpatterns/api/qsimplexmlnodemodel.h2
-rw-r--r--src/xmlpatterns/api/qxmlformatter.h2
-rw-r--r--src/xmlpatterns/api/qxmlresultitems.h2
-rw-r--r--src/xmlpatterns/api/qxmlserializer.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/xmlpatterns/api/qabstractmessagehandler.h b/src/xmlpatterns/api/qabstractmessagehandler.h
index 2c26143..21c6fe5 100644
--- a/src/xmlpatterns/api/qabstractmessagehandler.h
+++ b/src/xmlpatterns/api/qabstractmessagehandler.h
@@ -70,7 +70,7 @@ protected:
const QUrl &identifier,
const QSourceLocation &sourceLocation) = 0;
private:
- Q_DECLARE_SCOPED_PRIVATE(QAbstractMessageHandler)
+ Q_DECLARE_PRIVATE(QAbstractMessageHandler)
Q_DISABLE_COPY(QAbstractMessageHandler)
};
diff --git a/src/xmlpatterns/api/qabstracturiresolver.h b/src/xmlpatterns/api/qabstracturiresolver.h
index db545ea..c341ac2c 100644
--- a/src/xmlpatterns/api/qabstracturiresolver.h
+++ b/src/xmlpatterns/api/qabstracturiresolver.h
@@ -64,7 +64,7 @@ public:
private:
Q_DISABLE_COPY(QAbstractUriResolver)
- Q_DECLARE_SCOPED_PRIVATE(QAbstractUriResolver)
+ Q_DECLARE_PRIVATE(QAbstractUriResolver)
};
QT_END_NAMESPACE
diff --git a/src/xmlpatterns/api/qsimplexmlnodemodel.h b/src/xmlpatterns/api/qsimplexmlnodemodel.h
index 3098604..1c70159 100644
--- a/src/xmlpatterns/api/qsimplexmlnodemodel.h
+++ b/src/xmlpatterns/api/qsimplexmlnodemodel.h
@@ -67,7 +67,7 @@ public:
virtual QVector<QXmlNodeModelIndex> nodesByIdref(const QXmlName &idref) const;
private:
- Q_DECLARE_SCOPED_PRIVATE(QSimpleXmlNodeModel)
+ Q_DECLARE_PRIVATE(QSimpleXmlNodeModel)
};
QT_END_NAMESPACE
diff --git a/src/xmlpatterns/api/qxmlformatter.h b/src/xmlpatterns/api/qxmlformatter.h
index ca65331..9bec06d 100644
--- a/src/xmlpatterns/api/qxmlformatter.h
+++ b/src/xmlpatterns/api/qxmlformatter.h
@@ -84,7 +84,7 @@ public:
virtual void item(const QPatternist::Item &item);
private:
inline void startFormattingContent();
- Q_DECLARE_SCOPED_PRIVATE(QXmlFormatter)
+ Q_DECLARE_PRIVATE(QXmlFormatter)
};
QT_END_NAMESPACE
diff --git a/src/xmlpatterns/api/qxmlresultitems.h b/src/xmlpatterns/api/qxmlresultitems.h
index ad222ed..6fc8d52 100644
--- a/src/xmlpatterns/api/qxmlresultitems.h
+++ b/src/xmlpatterns/api/qxmlresultitems.h
@@ -66,7 +66,7 @@ public:
private:
friend class QXmlQuery;
- Q_DECLARE_SCOPED_PRIVATE(QXmlResultItems)
+ Q_DECLARE_PRIVATE(QXmlResultItems)
QScopedPointer<QXmlResultItemsPrivate> d_ptr;
Q_DISABLE_COPY(QXmlResultItems)
};
diff --git a/src/xmlpatterns/api/qxmlserializer.h b/src/xmlpatterns/api/qxmlserializer.h
index 2fcc454..d46a566 100644
--- a/src/xmlpatterns/api/qxmlserializer.h
+++ b/src/xmlpatterns/api/qxmlserializer.h
@@ -148,7 +148,7 @@ private:
*/
inline void write(const QString &content);
- Q_DECLARE_SCOPED_PRIVATE(QXmlSerializer)
+ Q_DECLARE_PRIVATE(QXmlSerializer)
};
QT_END_NAMESPACE