summaryrefslogtreecommitdiffstats
path: root/src/xmlpatterns
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/xmlpatterns
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/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 21c6fe5..2c26143 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_PRIVATE(QAbstractMessageHandler)
+ Q_DECLARE_SCOPED_PRIVATE(QAbstractMessageHandler)
Q_DISABLE_COPY(QAbstractMessageHandler)
};
diff --git a/src/xmlpatterns/api/qabstracturiresolver.h b/src/xmlpatterns/api/qabstracturiresolver.h
index c341ac2c..db545ea 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_PRIVATE(QAbstractUriResolver)
+ Q_DECLARE_SCOPED_PRIVATE(QAbstractUriResolver)
};
QT_END_NAMESPACE
diff --git a/src/xmlpatterns/api/qsimplexmlnodemodel.h b/src/xmlpatterns/api/qsimplexmlnodemodel.h
index 1c70159..3098604 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_PRIVATE(QSimpleXmlNodeModel)
+ Q_DECLARE_SCOPED_PRIVATE(QSimpleXmlNodeModel)
};
QT_END_NAMESPACE
diff --git a/src/xmlpatterns/api/qxmlformatter.h b/src/xmlpatterns/api/qxmlformatter.h
index 9bec06d..ca65331 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_PRIVATE(QXmlFormatter)
+ Q_DECLARE_SCOPED_PRIVATE(QXmlFormatter)
};
QT_END_NAMESPACE
diff --git a/src/xmlpatterns/api/qxmlresultitems.h b/src/xmlpatterns/api/qxmlresultitems.h
index 6fc8d52..ad222ed 100644
--- a/src/xmlpatterns/api/qxmlresultitems.h
+++ b/src/xmlpatterns/api/qxmlresultitems.h
@@ -66,7 +66,7 @@ public:
private:
friend class QXmlQuery;
- Q_DECLARE_PRIVATE(QXmlResultItems)
+ Q_DECLARE_SCOPED_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 d46a566..2fcc454 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_PRIVATE(QXmlSerializer)
+ Q_DECLARE_SCOPED_PRIVATE(QXmlSerializer)
};
QT_END_NAMESPACE