Utils: Drop unused headers [I-Z]

Round 2 - focus on sources.
For classes with initial in range [I-Z].
Try to keep the same separators between different kind of headers.

Change-Id: I8a7ab99bab8120ee72cda6433ee3dc6f260a4d76
Reviewed-by: hjk <hjk@qt.io>

src/libs/utils/infobar.cpp

@@ -30,13 +30,13 @@
 #include "qtcsettings.h"
 #include "utilsicons.h"
 
+#include <QComboBox>
 #include <QHBoxLayout>
-#include <QSettings>
-#include <QVBoxLayout>
 #include <QLabel>
 #include <QPainter>
+#include <QSettings>
 #include <QToolButton>
-#include <QComboBox>
+#include <QVBoxLayout>
 
 static const char C_SUPPRESSED_WARNINGS[] = "SuppressedWarnings";
 

src/libs/utils/json.cpp

@@ -25,8 +25,8 @@
 
 #include "json.h"
 
-#include <utils/qtcassert.h>
+#include "fileutils.h"
-#include <utils/fileutils.h>
+#include "qtcassert.h"
 
 #include <QDir>
 #include <QJsonDocument>

src/libs/utils/layoutbuilder.cpp

@@ -25,9 +25,9 @@
 
 #include "layoutbuilder.h"
 
-#include <utils/algorithm.h>
+#include "algorithm.h"
-#include <utils/aspects.h>
+#include "aspects.h"
-#include <utils/qtcassert.h>
+#include "qtcassert.h"
 
 #include <QFormLayout>
 #include <QGridLayout>

src/libs/utils/namevaluesdialog.cpp

@@ -25,8 +25,8 @@
 
 #include "namevaluesdialog.h"
 
-#include <utils/environment.h>
+#include "environment.h"
-#include <utils/hostosinfo.h>
+#include "hostosinfo.h"
 
 #include <QDialogButtonBox>
 #include <QLabel>

src/libs/utils/persistentsettings.cpp

@@ -26,6 +26,7 @@
 #include "persistentsettings.h"
 
 #include "fileutils.h"
+#include "qtcassert.h"
 
 #include <QCoreApplication>
 #include <QDateTime>
@@ -43,8 +44,6 @@
 #include <QMessageBox>
 #endif
 
-#include <utils/qtcassert.h>
-
 // Read and write rectangle in X11 resource syntax "12x12+4+3"
 static QString rectangleToString(const QRect &r)
 {

src/libs/utils/processinfo.cpp

@@ -34,8 +34,8 @@
 #include <string.h>
 #include <unistd.h>
 #elif defined(Q_OS_WIN)
+#include "winutils.h"
 #include <windows.h>
-#include <utils/winutils.h>
 #include <tlhelp32.h>
 #include <psapi.h>
 #endif

src/libs/utils/qrcparser.cpp

@@ -25,7 +25,7 @@
 
 #include "qrcparser.h"
 
-#include <utils/qtcassert.h>
+#include "qtcassert.h"
 
 #include <QCoreApplication>
 #include <QDir>

src/libs/utils/qtcprocess.cpp

@@ -26,7 +26,6 @@
 #include "qtcprocess.h"
 
 #include "algorithm.h"
-#include "commandline.h"
 #include "guard.h"
 #include "hostosinfo.h"
 #include "launcherinterface.h"

src/libs/utils/reloadpromptutils.cpp

@@ -23,9 +23,10 @@
 **
 ****************************************************************************/
 
-#include "fileutils.h"
 #include "reloadpromptutils.h"
 
+#include "fileutils.h"
+
 #include <QCoreApplication>
 #include <QDir>
 #include <QMessageBox>

src/libs/utils/removefiledialog.cpp

@@ -26,7 +26,7 @@
 #include "removefiledialog.h"
 #include "ui_removefiledialog.h"
 
-#include <utils/filepath.h>
+#include "filepath.h"
 
 namespace Utils {
 

src/libs/utils/savefile.cpp

@@ -24,8 +24,12 @@
 ****************************************************************************/
 
 #include "savefile.h"
-#include "qtcassert.h"
+
 #include "filepath.h"
+#include "qtcassert.h"
+
+#include <QTemporaryFile>
+
 #ifdef Q_OS_WIN
 #  include <windows.h>
 #  include <io.h>
@@ -34,8 +38,6 @@
 #  include <sys/stat.h>
 #endif
 
-#include <QTemporaryFile>
-
 namespace Utils {
 
 static QFile::Permissions m_umask;

src/libs/utils/shellcommand.cpp

@@ -26,7 +26,6 @@
 #include "shellcommand.h"
 
 #include "environment.h"
-#include "fileutils.h"
 #include "qtcassert.h"
 #include "qtcprocess.h"
 #include "runextensions.h"

src/libs/utils/stringutils.cpp

@@ -25,10 +25,9 @@
 
 #include "stringutils.h"
 
+#include "algorithm.h"
 #include "hostosinfo.h"
-
+#include "qtcassert.h"
-#include <utils/algorithm.h>
-#include <utils/qtcassert.h>
 
 #include <QCoreApplication>
 #include <QDir>

src/libs/utils/stylehelper.cpp

@@ -27,8 +27,7 @@
 
 #include "theme/theme.h"
 #include "hostosinfo.h"
-
+#include "qtcassert.h"
-#include <utils/qtcassert.h>
 
 #include <QApplication>
 #include <QCommonStyle>

src/libs/utils/terminalcommand.cpp

@@ -25,11 +25,11 @@
 
 #include "terminalcommand.h"
 
-#include <utils/algorithm.h>
+#include "algorithm.h"
-#include <utils/commandline.h>
+#include "commandline.h"
-#include <utils/environment.h>
+#include "environment.h"
-#include <utils/hostosinfo.h>
+#include "hostosinfo.h"
-#include <utils/qtcassert.h>
+#include "qtcassert.h"
 
 #include <QCoreApplication>
 #include <QFileInfo>

src/libs/utils/terminalprocess.cpp

@@ -25,13 +25,13 @@
 
 #include "terminalprocess_p.h"
 
-#include <utils/environment.h>
+#include "commandline.h"
-#include <utils/hostosinfo.h>
+#include "environment.h"
-#include <utils/commandline.h>
+#include "hostosinfo.h"
-#include <utils/qtcassert.h>
+#include "qtcassert.h"
-#include <utils/qtcprocess.h>
+#include "qtcprocess.h"
-#include <utils/terminalcommand.h>
+#include "terminalcommand.h"
-#include <utils/winutils.h>
+#include "winutils.h"
 
 #include <QCoreApplication>
 #include <QLocalServer>

src/libs/utils/textfileformat.cpp

@@ -24,11 +24,12 @@
 ****************************************************************************/
 
 #include "textfileformat.h"
+
 #include "fileutils.h"
 #include "qtcassert.h"
 
-#include <QTextCodec>
 #include <QDebug>
+#include <QTextCodec>
 
 enum { debug = 0 };
 

src/libs/utils/tooltip/tooltip.cpp

@@ -27,9 +27,9 @@
 #include "tips.h"
 #include "effects.h"
 
-#include <utils/faketooltip.h>
+#include "faketooltip.h"
-#include <utils/hostosinfo.h>
+#include "hostosinfo.h"
-#include <utils/qtcassert.h>
+#include "qtcassert.h"
 
 #include <QApplication>
 #include <QColor>

src/libs/utils/treemodel.cpp

@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "treemodel.h"
+
 #include "qtcassert.h"
 
 #include <QStack>

src/libs/utils/uncommentselection.cpp

@@ -26,7 +26,7 @@
 #include "uncommentselection.h"
 
 #include "qtcassert.h"
-#include "utils/multitextcursor.h"
+#include "multitextcursor.h"
 
 #include <QTextBlock>
 #include <QTextCursor>

src/libs/utils/unixutils.cpp

@@ -25,12 +25,12 @@
 
 #include "unixutils.h"
 
-#include "fileutils.h"
+#include "filepath.h"
 #include "qtcsettings.h"
 
-#include <QSettings>
-#include <QFileInfo>
 #include <QCoreApplication>
+#include <QFileInfo>
+#include <QSettings>
 
 using namespace Utils;
 

src/libs/utils/url.cpp

@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "url.h"
+
 #include "temporaryfile.h"
 
 #include <QHostAddress>

src/libs/utils/variablechooser.cpp

@@ -36,7 +36,6 @@
 #include <QHeaderView>
 #include <QLabel>
 #include <QLineEdit>
-#include <QListWidgetItem>
 #include <QMenu>
 #include <QPlainTextEdit>
 #include <QPointer>

src/libs/utils/wizard.cpp

@@ -28,10 +28,9 @@
 #include "algorithm.h"
 #include "hostosinfo.h"
 #include "qtcassert.h"
+#include "theme/theme.h"
 #include "wizardpage.h"
 
-#include <utils/theme/theme.h>
-
 #include <QDebug>
 #include <QDialog>
 #include <QDialogButtonBox>
@@ -41,8 +40,8 @@
 #include <QLabel>
 #include <QMap>
 #include <QScrollArea>
-#include <QVBoxLayout>
 #include <QVariant>
+#include <QVBoxLayout>
 
 
 /*! \class Utils::Wizard