summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-01-30 16:32:15 -0600
committerTimothy Pearson <[email protected]>2012-01-30 16:32:15 -0600
commit3b3ad79f30303eb639ade3dffb4c4b22aae41fa4 (patch)
treeb3d5e70a1e0963c235e38069cc3efaff77d629b5
parent45e05d929b52017fdee87c7394eb87c9095ab5de (diff)
downloadtqtinterface-3b3ad79f30303eb639ade3dffb4c4b22aae41fa4.tar.gz
tqtinterface-3b3ad79f30303eb639ade3dffb4c4b22aae41fa4.zip
Back out bad changes from prior commit
-rw-r--r--qtinterface/qt4/Qt/QtNetwork4
-rw-r--r--qtinterface/qt4/Qt/qabstractnetworkcache.h4
-rw-r--r--qtinterface/qt4/Qt/qfeatures.h4
-rw-r--r--qtinterface/qt4/Qt/qnetworkdiskcache.h12
4 files changed, 12 insertions, 12 deletions
diff --git a/qtinterface/qt4/Qt/QtNetwork b/qtinterface/qt4/Qt/QtNetwork
index 8701f96..bb9e9ea 100644
--- a/qtinterface/qt4/Qt/QtNetwork
+++ b/qtinterface/qt4/Qt/QtNetwork
@@ -1,13 +1,13 @@
#ifndef QT_QTNETWORK_MODULE_H
#define QT_QTNETWORK_MODULE_H
#include <QtCore/QtCore>
-#include "qabstractnetwortdecache.h"
+#include "qabstractnetworkcache.h"
#include "qftp.h"
#include "qhttp.h"
#include "qnetworkaccessmanager.h"
#include "qnetworkcookie.h"
#include "qnetworkcookiejar.h"
-#include "qnetworkdistdecache.h"
+#include "qnetworkdiskcache.h"
#include "qnetworkreply.h"
#include "qnetworkrequest.h"
#include "qauthenticator.h"
diff --git a/qtinterface/qt4/Qt/qabstractnetworkcache.h b/qtinterface/qt4/Qt/qabstractnetworkcache.h
index 0735752..2f4b392 100644
--- a/qtinterface/qt4/Qt/qabstractnetworkcache.h
+++ b/qtinterface/qt4/Qt/qabstractnetworkcache.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QABSTRACTNETWORTDECACHE_H
-#define QABSTRACTNETWORTDECACHE_H
+#ifndef QABSTRACTETWORKCACHE_H
+#define QABSTRACTETWORKCACHE_H
#include <QtCore/qobject.h>
#include <QtCore/qshareddata.h>
diff --git a/qtinterface/qt4/Qt/qfeatures.h b/qtinterface/qt4/Qt/qfeatures.h
index 0f0a659..a66a10c 100644
--- a/qtinterface/qt4/Qt/qfeatures.h
+++ b/qtinterface/qt4/Qt/qfeatures.h
@@ -366,8 +366,8 @@
#endif
// QNetworkDiskCache
-#if !defined(QT_NO_NETWORKDISTDECACHE) && (defined(QT_NO_TEMPORARYFILE))
-#define QT_NO_NETWORKDISTDECACHE
+#if !defined(QT_NO_NETWORKDISKCACHE) && (defined(QT_NO_TEMPORARYFILE))
+#define QT_NO_NETWORKDISKCACHE
#endif
// Phonon::SeekSlider
diff --git a/qtinterface/qt4/Qt/qnetworkdiskcache.h b/qtinterface/qt4/Qt/qnetworkdiskcache.h
index df377cf..8a63ed1 100644
--- a/qtinterface/qt4/Qt/qnetworkdiskcache.h
+++ b/qtinterface/qt4/Qt/qnetworkdiskcache.h
@@ -39,10 +39,10 @@
**
****************************************************************************/
-#ifndef QNETWORKDISTDECACHE_H
-#define QNETWORKDISTDECACHE_H
+#ifndef QNETWORKDISKCACHE_H
+#define QNETWORKDISKCACHE_H
-#include <QtNetwork/qabstractnetwortdecache.h>
+#include <QtNetwork/qabstractnetworkcache.h>
QT_BEGIN_HEADER
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Network)
-#ifndef QT_NO_NETWORKDISTDECACHE
+#ifndef QT_NO_NETWORKDISKCACHE
class QNetworkDiskCachePrivate;
class Q_NETWORK_EXPORT QNetworkDiskCache : public QAbstractNetworkCache
@@ -88,10 +88,10 @@ private:
Q_DISABLE_COPY(QNetworkDiskCache)
};
-#endif // QT_NO_NETWORKDISTDECACHE
+#endif // QT_NO_NETWORKDISKCACHE
QT_END_NAMESPACE
QT_END_HEADER
-#endif // QNETWORKDISTDECACHE_H
+#endif // QNETWORKDISKCACHE_H