summaryrefslogtreecommitdiff
path: root/src/libs/zeroconf
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@nokia.com>2012-02-15 10:42:41 +0100
committerErik Verbruggen <erik.verbruggen@nokia.com>2012-02-15 16:24:46 +0100
commit3fa55b7ab9b1d6ae10fac1c9bcc653e9000157f8 (patch)
treee31dbd1b4605530e59c9864166f155b4edabc721 /src/libs/zeroconf
parent9a9ba12028ab0a6b1a248be612d5c576d39f69d6 (diff)
downloadqt-creator-3fa55b7ab9b1d6ae10fac1c9bcc653e9000157f8.tar.gz
Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/libs/zeroconf')
-rw-r--r--src/libs/zeroconf/dnsSdLib.cpp10
-rw-r--r--src/libs/zeroconf/embeddedLib.cpp10
-rw-r--r--src/libs/zeroconf/servicebrowser.cpp20
-rw-r--r--src/libs/zeroconf/servicebrowser.h8
-rw-r--r--src/libs/zeroconf/servicebrowser_p.h18
-rw-r--r--src/libs/zeroconf/zeroconf_global.h2
6 files changed, 34 insertions, 34 deletions
diff --git a/src/libs/zeroconf/dnsSdLib.cpp b/src/libs/zeroconf/dnsSdLib.cpp
index 9db26d6cf4..603e291740 100644
--- a/src/libs/zeroconf/dnsSdLib.cpp
+++ b/src/libs/zeroconf/dnsSdLib.cpp
@@ -35,11 +35,11 @@
#include "servicebrowser.h"
#include "servicebrowser_p.h"
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-#include <QtCore/QLibrary>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QLibrary>
+#include <QString>
+#include <QStringList>
#include <errno.h>
diff --git a/src/libs/zeroconf/embeddedLib.cpp b/src/libs/zeroconf/embeddedLib.cpp
index 6dc5ad508d..8ce4be55df 100644
--- a/src/libs/zeroconf/embeddedLib.cpp
+++ b/src/libs/zeroconf/embeddedLib.cpp
@@ -34,11 +34,11 @@
#include "servicebrowser_p.h"
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QProcess>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
+#include <QString>
+#include <QStringList>
+#include <QProcess>
+#include <QCoreApplication>
+#include <QDebug>
#ifdef Q_OS_LINUX
#define EMBEDDED_LIB
diff --git a/src/libs/zeroconf/servicebrowser.cpp b/src/libs/zeroconf/servicebrowser.cpp
index 70d74f7416..a80356637d 100644
--- a/src/libs/zeroconf/servicebrowser.cpp
+++ b/src/libs/zeroconf/servicebrowser.cpp
@@ -46,16 +46,16 @@
#include <errno.h>
#include <limits>
-#include <QtCore/QAtomicPointer>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDateTime>
-#include <QtCore/QGlobalStatic>
-#include <QtCore/QMetaType>
-#include <QtCore/QMutexLocker>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QtEndian>
-#include <QtNetwork/QHostInfo>
+#include <QAtomicPointer>
+#include <QCoreApplication>
+#include <QDateTime>
+#include <QGlobalStatic>
+#include <QMetaType>
+#include <QMutexLocker>
+#include <QString>
+#include <QStringList>
+#include <QtEndian>
+#include <QHostInfo>
//the timeval struct under windows uses long instead of suseconds_t
#ifdef Q_OS_WIN
diff --git a/src/libs/zeroconf/servicebrowser.h b/src/libs/zeroconf/servicebrowser.h
index f637194773..88f01ab4b2 100644
--- a/src/libs/zeroconf/servicebrowser.h
+++ b/src/libs/zeroconf/servicebrowser.h
@@ -35,10 +35,10 @@
#include "zeroconf_global.h"
-#include <QtCore/QHash>
-#include <QtCore/QObject>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QStringList>
+#include <QHash>
+#include <QObject>
+#include <QSharedPointer>
+#include <QStringList>
QT_FORWARD_DECLARE_CLASS(QHostInfo)
diff --git a/src/libs/zeroconf/servicebrowser_p.h b/src/libs/zeroconf/servicebrowser_p.h
index c2867fa189..8cd880d18a 100644
--- a/src/libs/zeroconf/servicebrowser_p.h
+++ b/src/libs/zeroconf/servicebrowser_p.h
@@ -36,15 +36,15 @@
#include "dns_sd_types.h"
#include "servicebrowser.h"
-#include <QtCore/QCoreApplication>
-#include <QtCore/QAtomicInt>
-#include <QtCore/QHash>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QMutex>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QStringList>
-#include <QtCore/QThread>
+#include <QCoreApplication>
+#include <QAtomicInt>
+#include <QHash>
+#include <QList>
+#include <QMap>
+#include <QMutex>
+#include <QSharedPointer>
+#include <QStringList>
+#include <QThread>
class QHostInfo;
diff --git a/src/libs/zeroconf/zeroconf_global.h b/src/libs/zeroconf/zeroconf_global.h
index 76341da395..7e0b7c251d 100644
--- a/src/libs/zeroconf/zeroconf_global.h
+++ b/src/libs/zeroconf/zeroconf_global.h
@@ -33,7 +33,7 @@
#ifndef ZEROCONF_GLOBAL_H
#define ZEROCONF_GLOBAL_H
-#include <QtCore/qglobal.h>
+#include <qglobal.h>
#if defined(ZEROCONF_LIBRARY)
# define ZEROCONFSHARED_EXPORT Q_DECL_EXPORT