summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/libs/utils/crumblepath.cpp4
-rw-r--r--src/libs/utils/headerviewstretcher.h1
-rw-r--r--src/libs/utils/historycompleter.cpp1
-rw-r--r--src/libs/utils/hostosinfo.h2
-rw-r--r--src/libs/utils/htmldocextractor.h2
-rw-r--r--src/libs/utils/icon.cpp1
-rw-r--r--src/libs/utils/icon.h5
-rw-r--r--src/libs/utils/id.cpp14
-rw-r--r--src/libs/utils/id.h7
-rw-r--r--src/libs/utils/infobar.cpp12
-rw-r--r--src/libs/utils/infobar.h4
-rw-r--r--src/libs/utils/infolabel.cpp6
-rw-r--r--src/libs/utils/itemviews.h6
-rw-r--r--src/libs/utils/json.h4
-rw-r--r--src/libs/utils/jsontreeitem.cpp30
-rw-r--r--src/libs/utils/jsontreeitem.h2
-rw-r--r--src/libs/utils/utilsicons.h3
-rw-r--r--src/plugins/autotest/autotestplugin.cpp1
-rw-r--r--src/plugins/help/docsettingspage.cpp1
-rw-r--r--src/plugins/qmldesigner/components/formeditor/seekerslider.cpp1
-rw-r--r--src/plugins/scxmleditor/plugin_interface/actionhandler.cpp1
-rw-r--r--src/plugins/todo/todoicons.cpp5
22 files changed, 63 insertions, 50 deletions
diff --git a/src/libs/utils/crumblepath.cpp b/src/libs/utils/crumblepath.cpp
index a49e0c30ac..fbf7586575 100644
--- a/src/libs/utils/crumblepath.cpp
+++ b/src/libs/utils/crumblepath.cpp
@@ -27,8 +27,8 @@
#include "qtcassert.h"
#include "stylehelper.h"
-#include <utils/icon.h>
-#include <utils/theme/theme.h>
+#include "icon.h"
+#include "theme/theme.h"
#include <QHBoxLayout>
#include <QMenu>
diff --git a/src/libs/utils/headerviewstretcher.h b/src/libs/utils/headerviewstretcher.h
index ab874e734a..fef7302a47 100644
--- a/src/libs/utils/headerviewstretcher.h
+++ b/src/libs/utils/headerviewstretcher.h
@@ -26,6 +26,7 @@
#pragma once
#include "utils_global.h"
+
#include <QObject>
QT_BEGIN_NAMESPACE
diff --git a/src/libs/utils/historycompleter.cpp b/src/libs/utils/historycompleter.cpp
index a4dbc4c74b..1c25dfb2be 100644
--- a/src/libs/utils/historycompleter.cpp
+++ b/src/libs/utils/historycompleter.cpp
@@ -31,6 +31,7 @@
#include <QItemDelegate>
#include <QListView>
+#include <QMouseEvent>
#include <QPainter>
#include <QWindow>
diff --git a/src/libs/utils/hostosinfo.h b/src/libs/utils/hostosinfo.h
index db2d77074b..d80bcbaa61 100644
--- a/src/libs/utils/hostosinfo.h
+++ b/src/libs/utils/hostosinfo.h
@@ -29,7 +29,7 @@
#include "osspecificaspects.h"
-#include <QString>
+QT_FORWARD_DECLARE_CLASS(QString)
#ifdef Q_OS_WIN
#define QTC_HOST_EXE_SUFFIX QTC_WIN_EXE_SUFFIX
diff --git a/src/libs/utils/htmldocextractor.h b/src/libs/utils/htmldocextractor.h
index d4ede7d4ee..b71aed78a4 100644
--- a/src/libs/utils/htmldocextractor.h
+++ b/src/libs/utils/htmldocextractor.h
@@ -27,6 +27,8 @@
#include "utils_global.h"
+QT_FORWARD_DECLARE_CLASS(QString)
+
namespace Utils {
class QTCREATOR_UTILS_EXPORT HtmlDocExtractor
diff --git a/src/libs/utils/icon.cpp b/src/libs/utils/icon.cpp
index 204407a39e..ce9001b2ef 100644
--- a/src/libs/utils/icon.cpp
+++ b/src/libs/utils/icon.cpp
@@ -34,6 +34,7 @@
#include <QIcon>
#include <QImage>
#include <QPainter>
+#include <QWidget>
namespace Utils {
diff --git a/src/libs/utils/icon.h b/src/libs/utils/icon.h
index d784ea5e5e..8fdb51f2ac 100644
--- a/src/libs/utils/icon.h
+++ b/src/libs/utils/icon.h
@@ -25,10 +25,11 @@
#pragma once
-#include "fileutils.h"
-#include "theme/theme.h"
#include "utils_global.h"
+#include "filepath.h"
+#include "theme/theme.h"
+
#include <QIcon>
#include <QPair>
#include <QVector>
diff --git a/src/libs/utils/id.cpp b/src/libs/utils/id.cpp
index 5efd91fdf7..0ed6450906 100644
--- a/src/libs/utils/id.cpp
+++ b/src/libs/utils/id.cpp
@@ -241,14 +241,14 @@ Id Id::versionedId(const QByteArray &prefix, int major, int minor)
QSet<Id> Id::fromStringList(const QStringList &list)
{
- return Utils::transform<QSet<Id>>(list, &Id::fromString);
+ return transform<QSet<Id>>(list, &Id::fromString);
}
QStringList Id::toStringList(const QSet<Id> &ids)
{
- QList<Id> idList = Utils::toList(ids);
- Utils::sort(idList);
- return Utils::transform(idList, &Id::toString);
+ QList<Id> idList = toList(ids);
+ sort(idList);
+ return transform(idList, &Id::toString);
}
/*!
@@ -336,12 +336,12 @@ QString Id::suffixAfter(Id baseId) const
return n.startsWith(b) ? QString::fromUtf8(n.mid(b.size())) : QString();
}
-QDataStream &operator<<(QDataStream &ds, Utils::Id id)
+QDataStream &operator<<(QDataStream &ds, Id id)
{
return ds << id.name();
}
-QDataStream &operator>>(QDataStream &ds, Utils::Id &id)
+QDataStream &operator>>(QDataStream &ds, Id &id)
{
QByteArray ba;
ds >> ba;
@@ -349,7 +349,7 @@ QDataStream &operator>>(QDataStream &ds, Utils::Id &id)
return ds;
}
-QDebug operator<<(QDebug dbg, const Utils::Id &id)
+QDebug operator<<(QDebug dbg, const Id &id)
{
return dbg << id.name();
}
diff --git a/src/libs/utils/id.h b/src/libs/utils/id.h
index b1b49fe2a8..963bd46a55 100644
--- a/src/libs/utils/id.h
+++ b/src/libs/utils/id.h
@@ -26,6 +26,7 @@
#pragma once
#include "utils_global.h"
+
#include "porting.h"
#include <QList>
@@ -75,9 +76,9 @@ public:
static QStringList toStringList(const QSet<Id> &ids);
friend QHashValueType qHash(Id id) { return static_cast<QHashValueType>(id.uniqueIdentifier()); }
- friend QTCREATOR_UTILS_EXPORT QDataStream &operator<<(QDataStream &ds, Utils::Id id);
- friend QTCREATOR_UTILS_EXPORT QDataStream &operator>>(QDataStream &ds, Utils::Id &id);
- friend QTCREATOR_UTILS_EXPORT QDebug operator<<(QDebug dbg, const Utils::Id &id);
+ friend QTCREATOR_UTILS_EXPORT QDataStream &operator<<(QDataStream &ds, Id id);
+ friend QTCREATOR_UTILS_EXPORT QDataStream &operator>>(QDataStream &ds, Id &id);
+ friend QTCREATOR_UTILS_EXPORT QDebug operator<<(QDebug dbg, const Id &id);
private:
explicit Id(quintptr uid) : m_id(uid) {}
diff --git a/src/libs/utils/infobar.cpp b/src/libs/utils/infobar.cpp
index b85024ed9c..75a48eabfd 100644
--- a/src/libs/utils/infobar.cpp
+++ b/src/libs/utils/infobar.cpp
@@ -119,7 +119,7 @@ void InfoBarEntry::setComboInfo(const QStringList &list,
const QString &tooltip,
int currentIndex)
{
- auto comboInfos = Utils::transform(list, [](const QString &string) {
+ auto comboInfos = transform(list, [](const QString &string) {
return ComboInfo{string, string};
});
setComboInfo(comboInfos, callBack, tooltip, currentIndex);
@@ -157,14 +157,14 @@ void InfoBar::addInfo(const InfoBarEntry &info)
void InfoBar::removeInfo(Id id)
{
const int size = m_infoBarEntries.size();
- Utils::erase(m_infoBarEntries, Utils::equal(&InfoBarEntry::m_id, id));
+ Utils::erase(m_infoBarEntries, equal(&InfoBarEntry::m_id, id));
if (size != m_infoBarEntries.size())
emit changed();
}
bool InfoBar::containsInfo(Id id) const
{
- return Utils::anyOf(m_infoBarEntries, Utils::equal(&InfoBarEntry::m_id, id));
+ return anyOf(m_infoBarEntries, equal(&InfoBarEntry::m_id, id));
}
// Remove and suppress id
@@ -211,7 +211,7 @@ void InfoBar::initialize(QSettings *settings)
if (QTC_GUARD(m_settings)) {
const QStringList list = m_settings->value(QLatin1String(C_SUPPRESSED_WARNINGS)).toStringList();
- globallySuppressed = Utils::transform<QSet>(list, Id::fromString);
+ globallySuppressed = transform<QSet>(list, Id::fromString);
}
}
@@ -236,7 +236,7 @@ void InfoBar::writeGloballySuppressedToSettings()
{
if (!m_settings)
return;
- const QStringList list = Utils::transform<QList>(globallySuppressed, &Id::toString);
+ const QStringList list = transform<QList>(globallySuppressed, &Id::toString);
QtcSettings::setValueWithDefault(m_settings, C_SUPPRESSED_WARNINGS, list);
}
@@ -386,7 +386,7 @@ void InfoBarDisplay::update()
if (info.m_cancelButtonText.isEmpty()) {
if (infoWidgetCloseButton) {
infoWidgetCloseButton->setAutoRaise(true);
- infoWidgetCloseButton->setIcon(Utils::Icons::CLOSE_FOREGROUND.icon());
+ infoWidgetCloseButton->setIcon(Icons::CLOSE_FOREGROUND.icon());
infoWidgetCloseButton->setToolTip(tr("Close"));
}
diff --git a/src/libs/utils/infobar.h b/src/libs/utils/infobar.h
index b482298481..844a007c64 100644
--- a/src/libs/utils/infobar.h
+++ b/src/libs/utils/infobar.h
@@ -25,10 +25,10 @@
#pragma once
-#include "id.h"
#include "utils_global.h"
-#include <QFrame>
+#include "id.h"
+
#include <QObject>
#include <QSet>
diff --git a/src/libs/utils/infolabel.cpp b/src/libs/utils/infolabel.cpp
index 071f71f72a..dfacb4a6be 100644
--- a/src/libs/utils/infolabel.cpp
+++ b/src/libs/utils/infolabel.cpp
@@ -25,8 +25,8 @@
#include "infolabel.h"
-#include <utils/icon.h>
-#include <utils/utilsicons.h>
+#include "icon.h"
+#include "utilsicons.h"
#include <QPainter>
#include <QPaintEvent>
@@ -75,7 +75,7 @@ QSize InfoLabel::minimumSizeHint() const
return baseHint;
}
-static Utils::Theme::Color fillColorForType(InfoLabel::InfoType type)
+static Theme::Color fillColorForType(InfoLabel::InfoType type)
{
using namespace Utils;
switch (type) {
diff --git a/src/libs/utils/itemviews.h b/src/libs/utils/itemviews.h
index 92122a500d..d336cce5b1 100644
--- a/src/libs/utils/itemviews.h
+++ b/src/libs/utils/itemviews.h
@@ -27,15 +27,13 @@
#include "utils_global.h"
-static const char activationModeC[] = "ActivationMode";
-
+#include <QKeyEvent>
#include <QListView>
#include <QListWidget>
#include <QTreeView>
#include <QTreeWidget>
-#include <QKeyEvent>
-
+static const char activationModeC[] = "ActivationMode";
namespace Utils {
diff --git a/src/libs/utils/json.h b/src/libs/utils/json.h
index 1179a0c967..c1e5270311 100644
--- a/src/libs/utils/json.h
+++ b/src/libs/utils/json.h
@@ -27,10 +27,10 @@
#include "utils_global.h"
+#include <QDateTime>
#include <QHash>
-#include <QVector>
#include <QStringList>
-#include <QDateTime>
+#include <QVector>
QT_FORWARD_DECLARE_CLASS(QVariant)
diff --git a/src/libs/utils/jsontreeitem.cpp b/src/libs/utils/jsontreeitem.cpp
index 16da8e803e..899b6839e8 100644
--- a/src/libs/utils/jsontreeitem.cpp
+++ b/src/libs/utils/jsontreeitem.cpp
@@ -28,7 +28,9 @@
#include <QJsonArray>
#include <QJsonObject>
-Utils::JsonTreeItem::JsonTreeItem(const QString &displayName, const QJsonValue &value)
+namespace Utils {
+
+JsonTreeItem::JsonTreeItem(const QString &displayName, const QJsonValue &value)
: m_name(displayName)
, m_value(value)
{ }
@@ -37,24 +39,24 @@ static QString typeName(QJsonValue::Type type)
{
switch (type) {
case QJsonValue::Null:
- return Utils::JsonTreeItem::tr("Null");
+ return JsonTreeItem::tr("Null");
case QJsonValue::Bool:
- return Utils::JsonTreeItem::tr("Bool");
+ return JsonTreeItem::tr("Bool");
case QJsonValue::Double:
- return Utils::JsonTreeItem::tr("Double");
+ return JsonTreeItem::tr("Double");
case QJsonValue::String:
- return Utils::JsonTreeItem::tr("String");
+ return JsonTreeItem::tr("String");
case QJsonValue::Array:
- return Utils::JsonTreeItem::tr("Array");
+ return JsonTreeItem::tr("Array");
case QJsonValue::Object:
- return Utils::JsonTreeItem::tr("Object");
+ return JsonTreeItem::tr("Object");
case QJsonValue::Undefined:
- return Utils::JsonTreeItem::tr("Undefined");
+ return JsonTreeItem::tr("Undefined");
}
return {};
}
-QVariant Utils::JsonTreeItem::data(int column, int role) const
+QVariant JsonTreeItem::data(int column, int role) const
{
if (role != Qt::DisplayRole)
return {};
@@ -69,12 +71,12 @@ QVariant Utils::JsonTreeItem::data(int column, int role) const
return m_value.toVariant();
}
-bool Utils::JsonTreeItem::canFetchMore() const
+bool JsonTreeItem::canFetchMore() const
{
return canFetchObjectChildren() || canFetchArrayChildren();
}
-void Utils::JsonTreeItem::fetchMore()
+void JsonTreeItem::fetchMore()
{
if (canFetchObjectChildren()) {
const QJsonObject &object = m_value.toObject();
@@ -88,12 +90,14 @@ void Utils::JsonTreeItem::fetchMore()
}
}
-bool Utils::JsonTreeItem::canFetchObjectChildren() const
+bool JsonTreeItem::canFetchObjectChildren() const
{
return m_value.isObject() && m_value.toObject().size() > childCount();
}
-bool Utils::JsonTreeItem::canFetchArrayChildren() const
+bool JsonTreeItem::canFetchArrayChildren() const
{
return m_value.isArray() && m_value.toArray().size() > childCount();
}
+
+} // namespace Utils
diff --git a/src/libs/utils/jsontreeitem.h b/src/libs/utils/jsontreeitem.h
index 57eea36536..22e31fddcb 100644
--- a/src/libs/utils/jsontreeitem.h
+++ b/src/libs/utils/jsontreeitem.h
@@ -29,8 +29,8 @@
#include "utils_global.h"
-#include <QJsonValue>
#include <QCoreApplication>
+#include <QJsonValue>
namespace Utils {
diff --git a/src/libs/utils/utilsicons.h b/src/libs/utils/utilsicons.h
index 35a739c550..0c57bce95c 100644
--- a/src/libs/utils/utilsicons.h
+++ b/src/libs/utils/utilsicons.h
@@ -25,9 +25,10 @@
#pragma once
-#include "icon.h"
#include "utils_global.h"
+#include "icon.h"
+
namespace Utils {
namespace Icons {
diff --git a/src/plugins/autotest/autotestplugin.cpp b/src/plugins/autotest/autotestplugin.cpp
index a8090ddc66..7ac67a7780 100644
--- a/src/plugins/autotest/autotestplugin.cpp
+++ b/src/plugins/autotest/autotestplugin.cpp
@@ -38,7 +38,6 @@
#include "testsettingspage.h"
#include "testtreeitem.h"
#include "testtreemodel.h"
-#include "testtreeview.h"
#include "boost/boosttestframework.h"
#include "catch/catchframework.h"
diff --git a/src/plugins/help/docsettingspage.cpp b/src/plugins/help/docsettingspage.cpp
index 2aaada872b..71b52f27f4 100644
--- a/src/plugins/help/docsettingspage.cpp
+++ b/src/plugins/help/docsettingspage.cpp
@@ -30,6 +30,7 @@
#include "ui_docsettingspage.h"
#include <utils/algorithm.h>
+#include <utils/fileutils.h>
#include <QFileDialog>
#include <QKeyEvent>
diff --git a/src/plugins/qmldesigner/components/formeditor/seekerslider.cpp b/src/plugins/qmldesigner/components/formeditor/seekerslider.cpp
index c4659dcd65..e4fab1cde1 100644
--- a/src/plugins/qmldesigner/components/formeditor/seekerslider.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/seekerslider.cpp
@@ -24,6 +24,7 @@
****************************************************************************/
#include "seekerslider.h"
+
#include <utils/icon.h>
#include <QStyleOption>
diff --git a/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp b/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp
index 8a634a8c4c..f3f6ea5e60 100644
--- a/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp
@@ -24,6 +24,7 @@
****************************************************************************/
#include "actionhandler.h"
+
#include "mytypes.h"
#include <utils/utilsicons.h>
diff --git a/src/plugins/todo/todoicons.cpp b/src/plugins/todo/todoicons.cpp
index a159a87bca..4f8bf31d58 100644
--- a/src/plugins/todo/todoicons.cpp
+++ b/src/plugins/todo/todoicons.cpp
@@ -23,12 +23,13 @@
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
+
+#include "todoicons.h"
+
#include <utils/icon.h>
#include <utils/theme/theme.h>
#include <utils/utilsicons.h>
-#include "todoicons.h"
-
using namespace Utils;
namespace Todo {
View Lorry Controller Status