summaryrefslogtreecommitdiffstats
path: root/src/network/access/qhttp.h
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/network/access/qhttp.h
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/network/access/qhttp.h')
-rw-r--r--src/network/access/qhttp.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/access/qhttp.h b/src/network/access/qhttp.h
index e524350..c1fda0e 100644
--- a/src/network/access/qhttp.h
+++ b/src/network/access/qhttp.h
@@ -112,7 +112,7 @@ protected:
QScopedPointer<QHttpHeaderPrivate> d_ptr;
private:
- Q_DECLARE_PRIVATE(QHttpHeader)
+ Q_DECLARE_SCOPED_PRIVATE(QHttpHeader)
};
class QHttpResponseHeaderPrivate;
@@ -139,7 +139,7 @@ protected:
bool parseLine(const QString &line, int number);
private:
- Q_DECLARE_PRIVATE(QHttpResponseHeader)
+ Q_DECLARE_SCOPED_PRIVATE(QHttpResponseHeader)
friend class QHttpPrivate;
};
@@ -167,7 +167,7 @@ protected:
bool parseLine(const QString &line, int number);
private:
- Q_DECLARE_PRIVATE(QHttpRequestHeader)
+ Q_DECLARE_SCOPED_PRIVATE(QHttpRequestHeader)
};
class Q_NETWORK_EXPORT QHttp : public QObject
@@ -282,7 +282,7 @@ Q_SIGNALS:
private:
Q_DISABLE_COPY(QHttp)
- Q_DECLARE_PRIVATE(QHttp)
+ Q_DECLARE_SCOPED_PRIVATE(QHttp)
Q_PRIVATE_SLOT(d_func(), void _q_startNextRequest())
Q_PRIVATE_SLOT(d_func(), void _q_slotReadyRead())