summaryrefslogtreecommitdiffstats
path: root/src/network/bearer
diff options
context:
space:
mode:
Diffstat (limited to 'src/network/bearer')
-rw-r--r--src/network/bearer/qnetworkconfigmanager.h6
-rw-r--r--src/network/bearer/qnetworkconfigmanager_p.h6
-rw-r--r--src/network/bearer/qnetworksession.cpp2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/network/bearer/qnetworkconfigmanager.h b/src/network/bearer/qnetworkconfigmanager.h
index 6c160404d1..81f5d44472 100644
--- a/src/network/bearer/qnetworkconfigmanager.h
+++ b/src/network/bearer/qnetworkconfigmanager.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QNETWORKCONFIGURATIONMANAGER_H
-#define QNETWORKCONFIGURATIONMANAGER_H
+#ifndef QNETWORKCONFIGMANAGER_H
+#define QNETWORKCONFIGMANAGER_H
#include <QtCore/qobject.h>
#include <QtNetwork/qnetworkconfiguration.h>
@@ -102,4 +102,4 @@ QT_END_HEADER
#endif // QT_NO_BEARERMANAGEMENT
-#endif // QNETWORKCONFIGURATIONMANAGER_H
+#endif // QNETWORKCONFIGMANAGER_H
diff --git a/src/network/bearer/qnetworkconfigmanager_p.h b/src/network/bearer/qnetworkconfigmanager_p.h
index 92406ae8f0..73458f131d 100644
--- a/src/network/bearer/qnetworkconfigmanager_p.h
+++ b/src/network/bearer/qnetworkconfigmanager_p.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QNETWORKCONFIGURATIONMANAGERPRIVATE_H
-#define QNETWORKCONFIGURATIONMANAGERPRIVATE_H
+#ifndef QNETWORKCONFIGMANAGER_P_H
+#define QNETWORKCONFIGMANAGER_P_H
//
// W A R N I N G
@@ -137,4 +137,4 @@ QT_END_NAMESPACE
#endif // QT_NO_BEARERMANAGEMENT
-#endif // QNETWORKCONFIGURATIONMANAGERPRIVATE_H
+#endif // QNETWORKCONFMANAGER_P_H
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp
index ee21dffc94..21535e700b 100644
--- a/src/network/bearer/qnetworksession.cpp
+++ b/src/network/bearer/qnetworksession.cpp
@@ -40,6 +40,7 @@
****************************************************************************/
#include "qnetworksession.h"
+#include "qnetworksession_p.h"
#include "qbearerengine_p.h"
#include <QEventLoop>
@@ -48,7 +49,6 @@
#include <QThread>
#include "qnetworkconfigmanager_p.h"
-#include "qnetworksession_p.h"
#ifndef QT_NO_BEARERMANAGEMENT