feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Conform to Creator's include style

Browse Source 
Get rid of <QtModule/qclass.h> style and use <QClass> directly,
like in all other places in Creator. Remove some unneeded
declarations.

Change-Id: I1b5630850c570e5d86df01a341f7352bc1971e48
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2021-08-19 16:39:21 +02:00
parent f8ff5d0652
commit a09bedf1cb
8 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/utils/launcherinterface.cpp
View File

@@ -28,11 +28,11 @@
#include "launcherpackets.h" #include "launcherpackets.h"
#include "launchersocket.h" #include "launchersocket.h"
#include <QtCore/qcoreapplication.h> #include <QCoreApplication>
#include <QtCore/qdebug.h> #include <QDebug>
#include <QtCore/qdir.h> #include <QDir>
#include <QtCore/qprocess.h> #include <QLocalServer>
#include <QtNetwork/qlocalserver.h> #include <QProcess>
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
#include <unistd.h> #include <unistd.h>

5
src/libs/utils/launcherinterface.h
View File

@@ -30,13 +30,8 @@
#include <QObject> #include <QObject>
#include <QThread> #include <QThread>
QT_BEGIN_NAMESPACE
class QLocalServer;
QT_END_NAMESPACE
namespace Utils { namespace Utils {
namespace Internal { namespace Internal {
class LauncherProcess;
class LauncherSocket; class LauncherSocket;
class LauncherInterfacePrivate; class LauncherInterfacePrivate;
} }

4
src/libs/utils/launcherpackets.cpp
View File

@@ -25,8 +25,8 @@
#include "launcherpackets.h" #include "launcherpackets.h"
#include <QtCore/qbytearray.h> #include <QByteArray>
#include <QtCore/qcoreapplication.h> #include <QCoreApplication>
namespace Utils { namespace Utils {
namespace Internal { namespace Internal {

6
src/libs/utils/launcherpackets.h
View File

@@ -27,9 +27,9 @@
#include "processutils.h" #include "processutils.h"
#include <QtCore/qdatastream.h> #include <QDataStream>
#include <QtCore/qprocess.h> #include <QProcess>
#include <QtCore/qstringlist.h> #include <QStringList>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QByteArray; class QByteArray;

7
src/libs/utils/launchersocket.cpp
View File

@@ -28,9 +28,10 @@
#include "qtcassert.h" #include "qtcassert.h"
#include <QtCore/qcoreapplication.h> #include <QCoreApplication>
#include <QtCore/qelapsedtimer.h> #include <QElapsedTimer>
#include <QtNetwork/qlocalsocket.h> #include <QLocalSocket>
#include <QMutexLocker>
namespace Utils { namespace Utils {
namespace Internal { namespace Internal {

7
src/libs/utils/launchersocket.h
View File

@@ -28,11 +28,9 @@
#include "launcherpackets.h" #include "launcherpackets.h"
#include "processutils.h" #include "processutils.h"
#include <QtCore/qobject.h>
#include <QHash> #include <QHash>
#include <QMutex> #include <QMutex>
#include <QMutexLocker> #include <QObject>
#include <QProcess> #include <QProcess>
#include <QWaitCondition> #include <QWaitCondition>
@@ -44,8 +42,6 @@ class QLocalSocket;
QT_END_NAMESPACE QT_END_NAMESPACE
namespace Utils { namespace Utils {
class LauncherInterface;
namespace Internal { namespace Internal {
class LauncherInterfacePrivate; class LauncherInterfacePrivate;
@@ -198,7 +194,6 @@ private:
bool m_unixTerminalDisabled = false; bool m_unixTerminalDisabled = false;
friend class LauncherSocket; friend class LauncherSocket;
friend class CallerHandle;
}; };
class LauncherSocket : public QObject class LauncherSocket : public QObject

8
src/tools/processlauncher/launchersockethandler.cpp
View File

@@ -28,10 +28,10 @@
#include "launcherlogging.h" #include "launcherlogging.h"
#include "processutils.h" #include "processutils.h"
#include <QtCore/qcoreapplication.h> #include <QCoreApplication>
#include <QtCore/qprocess.h> #include <QLocalSocket>
#include <QtCore/qtimer.h> #include <QProcess>
#include <QtNetwork/qlocalsocket.h> #include <QTimer>
namespace Utils { namespace Utils {
namespace Internal { namespace Internal {

6
src/tools/processlauncher/launchersockethandler.h
View File

@@ -27,9 +27,9 @@
#include <launcherpackets.h> #include <launcherpackets.h>
#include <QtCore/qbytearray.h> #include <QByteArray>
#include <QtCore/qhash.h> #include <QHash>
#include <QtCore/qobject.h> #include <QObject>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QLocalSocket; class QLocalSocket;