summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-30 12:06:26 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-30 12:06:26 -0600
commit45e05d929b52017fdee87c7394eb87c9095ab5de (patch)
tree3499f3e4f75b59594ab375a53649d9c82f3f8730
parent505255701c2ed85e05da60fb6dbf8eb29ddfb793 (diff)
downloadtqtinterface-45e05d92.tar.gz
tqtinterface-45e05d92.zip
Rename ksocket and kcache
-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 bb9e9ea..8701f96 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 "qabstractnetworkcache.h"
+#include "qabstractnetwortdecache.h"
#include "qftp.h"
#include "qhttp.h"
#include "qnetworkaccessmanager.h"
#include "qnetworkcookie.h"
#include "qnetworkcookiejar.h"
-#include "qnetworkdiskcache.h"
+#include "qnetworkdistdecache.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 2960aba..0735752 100644
--- a/qtinterface/qt4/Qt/qabstractnetworkcache.h
+++ b/qtinterface/qt4/Qt/qabstractnetworkcache.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QABSTRACTNETWORKCACHE_H
-#define QABSTRACTNETWORKCACHE_H
+#ifndef QABSTRACTNETWORTDECACHE_H
+#define QABSTRACTNETWORTDECACHE_H
#include <QtCore/qobject.h>
#include <QtCore/qshareddata.h>
diff --git a/qtinterface/qt4/Qt/qfeatures.h b/qtinterface/qt4/Qt/qfeatures.h
index a66a10c..0f0a659 100644
--- a/qtinterface/qt4/Qt/qfeatures.h
+++ b/qtinterface/qt4/Qt/qfeatures.h
@@ -366,8 +366,8 @@
#endif
// QNetworkDiskCache
-#if !defined(QT_NO_NETWORKDISKCACHE) && (defined(QT_NO_TEMPORARYFILE))
-#define QT_NO_NETWORKDISKCACHE
+#if !defined(QT_NO_NETWORKDISTDECACHE) && (defined(QT_NO_TEMPORARYFILE))
+#define QT_NO_NETWORKDISTDECACHE
#endif
// Phonon::SeekSlider
diff --git a/qtinterface/qt4/Qt/qnetworkdiskcache.h b/qtinterface/qt4/Qt/qnetworkdiskcache.h
index 8a63ed1..df377cf 100644
--- a/qtinterface/qt4/Qt/qnetworkdiskcache.h
+++ b/qtinterface/qt4/Qt/qnetworkdiskcache.h
@@ -39,10 +39,10 @@
**
****************************************************************************/
-#ifndef QNETWORKDISKCACHE_H
-#define QNETWORKDISKCACHE_H
+#ifndef QNETWORKDISTDECACHE_H
+#define QNETWORKDISTDECACHE_H
-#include <QtNetwork/qabstractnetworkcache.h>
+#include <QtNetwork/qabstractnetwortdecache.h>
QT_BEGIN_HEADER
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Network)
-#ifndef QT_NO_NETWORKDISKCACHE
+#ifndef QT_NO_NETWORKDISTDECACHE
class QNetworkDiskCachePrivate;
class Q_NETWORK_EXPORT QNetworkDiskCache : public QAbstractNetworkCache
@@ -88,10 +88,10 @@ private:
Q_DISABLE_COPY(QNetworkDiskCache)
};
-#endif // QT_NO_NETWORKDISKCACHE
+#endif // QT_NO_NETWORKDISTDECACHE
QT_END_NAMESPACE
QT_END_HEADER
-#endif // QNETWORKDISKCACHE_H
+#endif // QNETWORKDISTDECACHE_H