Rename ksocket and kcache

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"

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>

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

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