summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-11 05:06:45 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-11 05:06:45 (GMT)
commitb5fe99c0105a9791e34a8b959822430497a4aeb9 (patch)
tree4ac2a87862bd9f1360aff02b25945b01c697424e
parent3591386484957cc4c93aece442f673246700b3b2 (diff)
downloadQt-b5fe99c0105a9791e34a8b959822430497a4aeb9.zip
Qt-b5fe99c0105a9791e34a8b959822430497a4aeb9.tar.gz
Qt-b5fe99c0105a9791e34a8b959822430497a4aeb9.tar.bz2
Fix public includes.
-rw-r--r--src/network/bearer/bearer.pri2
-rw-r--r--src/network/bearer/qbearerplugin.cpp2
-rw-r--r--src/network/bearer/qbearerplugin_p.h (renamed from src/network/bearer/qbearerplugin.h)0
-rw-r--r--src/network/bearer/qnetworkconfigmanager.h2
-rw-r--r--src/network/bearer/qnetworkconfigmanager_p.cpp2
-rw-r--r--src/network/bearer/qnetworksession.h3
-rw-r--r--src/plugins/bearer/corewlan/main.cpp2
-rw-r--r--src/plugins/bearer/generic/main.cpp2
-rw-r--r--src/plugins/bearer/icd/main.cpp2
-rw-r--r--src/plugins/bearer/nativewifi/main.cpp2
-rw-r--r--src/plugins/bearer/networkmanager/main.cpp2
-rw-r--r--src/plugins/bearer/nla/main.cpp2
-rw-r--r--src/plugins/bearer/symbian/main.cpp2
13 files changed, 12 insertions, 13 deletions
diff --git a/src/network/bearer/bearer.pri b/src/network/bearer/bearer.pri
index c03c615..44e97fd 100644
--- a/src/network/bearer/bearer.pri
+++ b/src/network/bearer/bearer.pri
@@ -7,7 +7,7 @@ HEADERS += bearer/qnetworkconfiguration.h \
bearer/qnetworkconfiguration_p.h \
bearer/qnetworksession_p.h \
bearer/qbearerengine_p.h \
- bearer/qbearerplugin.h
+ bearer/qbearerplugin_p.h
SOURCES += bearer/qnetworksession.cpp \
bearer/qnetworkconfigmanager.cpp \
diff --git a/src/network/bearer/qbearerplugin.cpp b/src/network/bearer/qbearerplugin.cpp
index 2ee90d4..4509fd0 100644
--- a/src/network/bearer/qbearerplugin.cpp
+++ b/src/network/bearer/qbearerplugin.cpp
@@ -39,7 +39,7 @@
**
****************************************************************************/
-#include "qbearerplugin.h"
+#include "qbearerplugin_p.h"
#include <QtCore/qdebug.h>
diff --git a/src/network/bearer/qbearerplugin.h b/src/network/bearer/qbearerplugin_p.h
index 1958188..1958188 100644
--- a/src/network/bearer/qbearerplugin.h
+++ b/src/network/bearer/qbearerplugin_p.h
diff --git a/src/network/bearer/qnetworkconfigmanager.h b/src/network/bearer/qnetworkconfigmanager.h
index 83c4939..a34e456 100644
--- a/src/network/bearer/qnetworkconfigmanager.h
+++ b/src/network/bearer/qnetworkconfigmanager.h
@@ -43,7 +43,7 @@
#define QNETWORKCONFIGURATIONMANAGER_H
#include <QtCore/qobject.h>
-#include "qnetworkconfiguration.h"
+#include <QtNetwork/qnetworkconfiguration.h>
QT_BEGIN_HEADER
diff --git a/src/network/bearer/qnetworkconfigmanager_p.cpp b/src/network/bearer/qnetworkconfigmanager_p.cpp
index a624376..66d5982 100644
--- a/src/network/bearer/qnetworkconfigmanager_p.cpp
+++ b/src/network/bearer/qnetworkconfigmanager_p.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include "qnetworkconfigmanager_p.h"
-#include "qbearerplugin.h"
+#include "qbearerplugin_p.h"
#include <QtCore/private/qfactoryloader_p.h>
diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h
index 06d5eb7..3c8d913 100644
--- a/src/network/bearer/qnetworksession.h
+++ b/src/network/bearer/qnetworksession.h
@@ -47,8 +47,7 @@
#include <QtCore/qstring.h>
#include <QtNetwork/qnetworkinterface.h>
#include <QtCore/qvariant.h>
-#include "qnetworkconfiguration.h"
-
+#include <QtNetwork/qnetworkconfiguration.h>
QT_BEGIN_HEADER
diff --git a/src/plugins/bearer/corewlan/main.cpp b/src/plugins/bearer/corewlan/main.cpp
index 010976a..5be8c0e 100644
--- a/src/plugins/bearer/corewlan/main.cpp
+++ b/src/plugins/bearer/corewlan/main.cpp
@@ -41,7 +41,7 @@
#include "qcorewlanengine.h"
-#include <QtNetwork/qbearerplugin.h>
+#include <QtNetwork/private/qbearerplugin_p.h>
#include <QtCore/qdebug.h>
diff --git a/src/plugins/bearer/generic/main.cpp b/src/plugins/bearer/generic/main.cpp
index 8ba9f40..ba85d93 100644
--- a/src/plugins/bearer/generic/main.cpp
+++ b/src/plugins/bearer/generic/main.cpp
@@ -41,7 +41,7 @@
#include "qgenericengine.h"
-#include <QtNetwork/qbearerplugin.h>
+#include <QtNetwork/private/qbearerplugin_p.h>
#include <QtCore/qdebug.h>
diff --git a/src/plugins/bearer/icd/main.cpp b/src/plugins/bearer/icd/main.cpp
index 8984d2c..b131ccb 100644
--- a/src/plugins/bearer/icd/main.cpp
+++ b/src/plugins/bearer/icd/main.cpp
@@ -41,7 +41,7 @@
#include "qicdengine.h"
-#include <QtNetwork/qbearerplugin.h>
+#include <QtNetwork/private/qbearerengine_p.h>
#include <QtCore/qdebug.h>
diff --git a/src/plugins/bearer/nativewifi/main.cpp b/src/plugins/bearer/nativewifi/main.cpp
index 6bb2a2b..d77462e 100644
--- a/src/plugins/bearer/nativewifi/main.cpp
+++ b/src/plugins/bearer/nativewifi/main.cpp
@@ -46,7 +46,7 @@
#include <QtCore/private/qmutexpool_p.h>
#include <QtCore/qlibrary.h>
-#include <QtNetwork/qbearerplugin.h>
+#include <QtNetwork/private/qbearerplugin_p.h>
#include <QtCore/qdebug.h>
diff --git a/src/plugins/bearer/networkmanager/main.cpp b/src/plugins/bearer/networkmanager/main.cpp
index 6725252..f62b847 100644
--- a/src/plugins/bearer/networkmanager/main.cpp
+++ b/src/plugins/bearer/networkmanager/main.cpp
@@ -41,7 +41,7 @@
#include "qnetworkmanagerengine.h"
-#include <QtNetwork/qbearerplugin.h>
+#include <QtNetwork/private/qbearerplugin_p.h>
#include <QtCore/qdebug.h>
diff --git a/src/plugins/bearer/nla/main.cpp b/src/plugins/bearer/nla/main.cpp
index 54269a4..479a933 100644
--- a/src/plugins/bearer/nla/main.cpp
+++ b/src/plugins/bearer/nla/main.cpp
@@ -41,7 +41,7 @@
#include "qnlaengine.h"
-#include <QtNetwork/qbearerplugin.h>
+#include <QtNetwork/private/qbearerplugin_p.h>
#include <QtCore/qdebug.h>
diff --git a/src/plugins/bearer/symbian/main.cpp b/src/plugins/bearer/symbian/main.cpp
index 37eddee..0321451 100644
--- a/src/plugins/bearer/symbian/main.cpp
+++ b/src/plugins/bearer/symbian/main.cpp
@@ -41,7 +41,7 @@
#include "symbianengine.h"
-#include <QtNetwork/qbearerplugin.h>
+#include <QtNetwork/private/qbearerplugin_p.h>
#include <QtCore/qdebug.h>