aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/utils')
-rw-r--r--src/libs/utils/launcherinterface.cpp4
-rw-r--r--src/libs/utils/launcherinterface.h8
-rw-r--r--src/libs/utils/launchersocket.h2
-rw-r--r--src/libs/utils/link.h10
-rw-r--r--src/libs/utils/listmodel.h1
-rw-r--r--src/libs/utils/macroexpander.h6
-rw-r--r--src/libs/utils/mapreduce.h1
-rw-r--r--src/libs/utils/mimeutils.h4
-rw-r--r--src/libs/utils/minimizableinfobars.cpp2
-rw-r--r--src/libs/utils/minimizableinfobars.h31
-rw-r--r--src/libs/utils/namevaluedictionary.h2
-rw-r--r--src/libs/utils/namevalueitem.h2
-rw-r--r--src/libs/utils/namevaluemodel.h3
-rw-r--r--src/libs/utils/namevaluesdialog.h8
-rw-r--r--src/libs/utils/namevaluevalidator.cpp10
-rw-r--r--src/libs/utils/namevaluevalidator.h12
-rw-r--r--src/libs/utils/outputformatter.h3
-rw-r--r--src/libs/utils/templateengine.h2
18 files changed, 61 insertions, 50 deletions
diff --git a/src/libs/utils/launcherinterface.cpp b/src/libs/utils/launcherinterface.cpp
index 28e9cd52b9..8e402f51c8 100644
--- a/src/libs/utils/launcherinterface.cpp
+++ b/src/libs/utils/launcherinterface.cpp
@@ -72,7 +72,7 @@ private:
static QString launcherSocketName()
{
- return Utils::TemporaryDirectory::masterDirectoryPath()
+ return TemporaryDirectory::masterDirectoryPath()
+ QStringLiteral("/launcher-%1").arg(QString::number(qApp->applicationPid()));
}
@@ -232,7 +232,7 @@ void LauncherInterface::sendData(const QByteArray &data)
instance()->m_private->socket()->sendData(data);
}
-Utils::Internal::CallerHandle *LauncherInterface::registerHandle(QObject *parent, quintptr token)
+Internal::CallerHandle *LauncherInterface::registerHandle(QObject *parent, quintptr token)
{
QMutexLocker locker(&s_instanceMutex);
return instance()->m_private->socket()->registerHandle(parent, token);
diff --git a/src/libs/utils/launcherinterface.h b/src/libs/utils/launcherinterface.h
index b2e8ac6711..6686f1d3d4 100644
--- a/src/libs/utils/launcherinterface.h
+++ b/src/libs/utils/launcherinterface.h
@@ -47,13 +47,13 @@ public:
static void setPathToLauncher(const QString &pathToLauncher);
private:
- friend class Utils::Internal::CallerHandle;
- friend class Utils::Internal::LauncherHandle;
- friend class Utils::Internal::ProcessLauncherImpl;
+ friend class Internal::CallerHandle;
+ friend class Internal::LauncherHandle;
+ friend class Internal::ProcessLauncherImpl;
static bool isStarted();
static void sendData(const QByteArray &data);
- static Utils::Internal::CallerHandle *registerHandle(QObject *parent, quintptr token);
+ static Internal::CallerHandle *registerHandle(QObject *parent, quintptr token);
static void unregisterHandle(quintptr token);
LauncherInterface();
diff --git a/src/libs/utils/launchersocket.h b/src/libs/utils/launchersocket.h
index 6364dc85a8..1de0585d49 100644
--- a/src/libs/utils/launchersocket.h
+++ b/src/libs/utils/launchersocket.h
@@ -25,8 +25,6 @@
#pragma once
-#include "environment.h"
-#include "filepath.h"
#include "launcherpackets.h"
#include "processinterface.h"
diff --git a/src/libs/utils/link.h b/src/libs/utils/link.h
index 8535f767ab..adcac29a6d 100644
--- a/src/libs/utils/link.h
+++ b/src/libs/utils/link.h
@@ -25,21 +25,21 @@
#pragma once
+#include "utils_global.h"
+
#include "filepath.h"
-#include "porting.h"
+#include <QMetaType>
#include <QString>
-#include <qmetatype.h>
#include <functional>
-
namespace Utils {
class QTCREATOR_UTILS_EXPORT Link
{
public:
- Link(const Utils::FilePath &filePath = Utils::FilePath(), int line = 0, int column = 0)
+ Link(const FilePath &filePath = FilePath(), int line = 0, int column = 0)
: targetFilePath(filePath)
, targetLine(line)
, targetColumn(column)
@@ -71,7 +71,7 @@ public:
int linkTextStart = -1;
int linkTextEnd = -1;
- Utils::FilePath targetFilePath;
+ FilePath targetFilePath;
int targetLine;
int targetColumn;
};
diff --git a/src/libs/utils/listmodel.h b/src/libs/utils/listmodel.h
index e260b675b6..8eb742e0f1 100644
--- a/src/libs/utils/listmodel.h
+++ b/src/libs/utils/listmodel.h
@@ -25,7 +25,6 @@
#pragma once
-#include "utils_global.h"
#include "treemodel.h"
namespace Utils {
diff --git a/src/libs/utils/macroexpander.h b/src/libs/utils/macroexpander.h
index de24e44c1f..19e2c02fd0 100644
--- a/src/libs/utils/macroexpander.h
+++ b/src/libs/utils/macroexpander.h
@@ -27,11 +27,11 @@
#include "utils_global.h"
-#include <functional>
-
+#include <QCoreApplication>
#include <QList>
#include <QVector>
-#include <QCoreApplication>
+
+#include <functional>
namespace Utils {
diff --git a/src/libs/utils/mapreduce.h b/src/libs/utils/mapreduce.h
index 963694a131..0705229444 100644
--- a/src/libs/utils/mapreduce.h
+++ b/src/libs/utils/mapreduce.h
@@ -26,6 +26,7 @@
#pragma once
#include "utils_global.h"
+
#include "algorithm.h"
#include "runextensions.h"
diff --git a/src/libs/utils/mimeutils.h b/src/libs/utils/mimeutils.h
index ceb05180c4..e334258c73 100644
--- a/src/libs/utils/mimeutils.h
+++ b/src/libs/utils/mimeutils.h
@@ -39,11 +39,11 @@
#pragma once
+#include "utils_global.h"
+
#include <mimemagicrule_p.h>
#include <mimetype.h>
-#include <utils/utils_global.h>
-
QT_BEGIN_NAMESPACE
class QFileInfo;
QT_END_NAMESPACE
diff --git a/src/libs/utils/minimizableinfobars.cpp b/src/libs/utils/minimizableinfobars.cpp
index 15c9ad76cb..0b8b0ac631 100644
--- a/src/libs/utils/minimizableinfobars.cpp
+++ b/src/libs/utils/minimizableinfobars.cpp
@@ -25,10 +25,12 @@
#include "minimizableinfobars.h"
+#include "infobar.h"
#include "qtcassert.h"
#include "qtcsettings.h"
#include "utilsicons.h"
+#include <QAction>
#include <QToolButton>
const char SETTINGS_PREFIX[] = "ShowInfoBarFor";
diff --git a/src/libs/utils/minimizableinfobars.h b/src/libs/utils/minimizableinfobars.h
index 2087343d66..1150e5b4cb 100644
--- a/src/libs/utils/minimizableinfobars.h
+++ b/src/libs/utils/minimizableinfobars.h
@@ -28,16 +28,19 @@
#include "utils_global.h"
#include "id.h"
-#include "infobar.h"
-#include <QAction>
#include <QHash>
#include <QObject>
#include <functional>
+QT_FORWARD_DECLARE_CLASS(QAction)
+
namespace Utils {
+class InfoBar;
+class InfoBarEntry;
+
class QTCREATOR_UTILS_EXPORT MinimizableInfoBars : public QObject
{
Q_OBJECT
@@ -46,32 +49,32 @@ public:
using ActionCreator = std::function<QAction *(QWidget *widget)>;
public:
- explicit MinimizableInfoBars(Utils::InfoBar &infoBar);
+ explicit MinimizableInfoBars(InfoBar &infoBar);
void setSettingsGroup(const QString &settingsGroup);
- void setPossibleInfoBarEntries(const QList<Utils::InfoBarEntry> &entries);
+ void setPossibleInfoBarEntries(const QList<InfoBarEntry> &entries);
void createShowInfoBarActions(const ActionCreator &actionCreator) const;
- void setInfoVisible(const Utils::Id &id, bool visible);
+ void setInfoVisible(const Id &id, bool visible);
private:
void createActions();
- QString settingsKey(const Utils::Id &id) const;
- bool showInInfoBar(const Utils::Id &id) const;
- void setShowInInfoBar(const Utils::Id &id, bool show);
+ QString settingsKey(const Id &id) const;
+ bool showInInfoBar(const Id &id) const;
+ void setShowInInfoBar(const Id &id, bool show);
- void updateInfo(const Utils::Id &id);
+ void updateInfo(const Id &id);
- void showInfoBar(const Utils::Id &id);
+ void showInfoBar(const Id &id);
private:
- Utils::InfoBar &m_infoBar;
+ InfoBar &m_infoBar;
QString m_settingsGroup;
- QHash<Utils::Id, QAction *> m_actions;
- QHash<Utils::Id, bool> m_isInfoVisible;
- QHash<Utils::Id, Utils::InfoBarEntry> m_infoEntries;
+ QHash<Id, QAction *> m_actions;
+ QHash<Id, bool> m_isInfoVisible;
+ QHash<Id, InfoBarEntry> m_infoEntries;
};
} // namespace Utils
diff --git a/src/libs/utils/namevaluedictionary.h b/src/libs/utils/namevaluedictionary.h
index 3d371ede86..30721915c6 100644
--- a/src/libs/utils/namevaluedictionary.h
+++ b/src/libs/utils/namevaluedictionary.h
@@ -25,6 +25,8 @@
#pragma once
+#include "utils_global.h"
+
#include "hostosinfo.h"
#include "namevalueitem.h"
diff --git a/src/libs/utils/namevalueitem.h b/src/libs/utils/namevalueitem.h
index 654b4be5bf..e6c669c373 100644
--- a/src/libs/utils/namevalueitem.h
+++ b/src/libs/utils/namevalueitem.h
@@ -25,6 +25,8 @@
#pragma once
+#include "utils_global.h"
+
#include "environmentfwd.h"
#include "utils_global.h"
diff --git a/src/libs/utils/namevaluemodel.h b/src/libs/utils/namevaluemodel.h
index 6e6ddfc177..9efe30f243 100644
--- a/src/libs/utils/namevaluemodel.h
+++ b/src/libs/utils/namevaluemodel.h
@@ -25,9 +25,10 @@
#pragma once
-#include "environmentfwd.h"
#include "utils_global.h"
+#include "environmentfwd.h"
+
#include <QAbstractTableModel>
#include <memory>
diff --git a/src/libs/utils/namevaluesdialog.h b/src/libs/utils/namevaluesdialog.h
index e690c717d7..2341838d2a 100644
--- a/src/libs/utils/namevaluesdialog.h
+++ b/src/libs/utils/namevaluesdialog.h
@@ -25,19 +25,17 @@
#pragma once
+#include "utils_global.h"
+
#include "environmentfwd.h"
-#include "namevalueitem.h"
#include "optional.h"
-#include "utils_global.h"
#include <QDialog>
#include <functional>
#include <memory>
-QT_BEGIN_NAMESPACE
-class QPlainTextEdit;
-QT_END_NAMESPACE
+QT_FORWARD_DECLARE_CLASS(QPlainTextEdit)
namespace Utils {
diff --git a/src/libs/utils/namevaluevalidator.cpp b/src/libs/utils/namevaluevalidator.cpp
index be4506b28d..57f3f569ab 100644
--- a/src/libs/utils/namevaluevalidator.cpp
+++ b/src/libs/utils/namevaluevalidator.cpp
@@ -32,7 +32,7 @@
namespace Utils {
NameValueValidator::NameValueValidator(QWidget *parent,
- Utils::NameValueModel *model,
+ NameValueModel *model,
QTreeView *view,
const QModelIndex &index,
const QString &toolTipText)
@@ -44,7 +44,7 @@ NameValueValidator::NameValueValidator(QWidget *parent,
{
m_hideTipTimer.setInterval(2000);
m_hideTipTimer.setSingleShot(true);
- connect(&m_hideTipTimer, &QTimer::timeout, this, []() { Utils::ToolTip::hide(); });
+ connect(&m_hideTipTimer, &QTimer::timeout, this, []() { ToolTip::hide(); });
}
QValidator::State NameValueValidator::validate(QString &in, int &pos) const
@@ -53,7 +53,7 @@ QValidator::State NameValueValidator::validate(QString &in, int &pos) const
QModelIndex idx = m_model->variableToIndex(in);
if (idx.isValid() && idx != m_index)
return QValidator::Intermediate;
- Utils::ToolTip::hide();
+ ToolTip::hide();
m_hideTipTimer.stop();
return QValidator::Acceptable;
}
@@ -65,8 +65,8 @@ void NameValueValidator::fixup(QString &input) const
if (!m_index.isValid())
return;
QPoint pos = m_view->mapToGlobal(m_view->visualRect(m_index).topLeft());
- pos -= Utils::ToolTip::offsetFromPosition();
- Utils::ToolTip::show(pos, m_toolTipText);
+ pos -= ToolTip::offsetFromPosition();
+ ToolTip::show(pos, m_toolTipText);
m_hideTipTimer.start();
// do nothing
}
diff --git a/src/libs/utils/namevaluevalidator.h b/src/libs/utils/namevaluevalidator.h
index c81dbe2e5b..dc4952569d 100644
--- a/src/libs/utils/namevaluevalidator.h
+++ b/src/libs/utils/namevaluevalidator.h
@@ -25,22 +25,26 @@
#pragma once
-#include "environmentfwd.h"
#include "utils_global.h"
-#include <QModelIndex>
+#include "environmentfwd.h"
+
#include <QPersistentModelIndex>
#include <QTimer>
#include <QValidator>
+QT_FORWARD_DECLARE_CLASS(QModelIndex)
+
namespace Utils {
+class NameValueModel;
+
class QTCREATOR_UTILS_EXPORT NameValueValidator : public QValidator
{
Q_OBJECT
public:
NameValueValidator(QWidget *parent,
- Utils::NameValueModel *model,
+ NameValueModel *model,
QTreeView *view,
const QModelIndex &index,
const QString &toolTipText);
@@ -51,7 +55,7 @@ public:
private:
const QString m_toolTipText;
- Utils::NameValueModel *m_model;
+ NameValueModel *m_model;
QTreeView *m_view;
QPersistentModelIndex m_index;
mutable QTimer m_hideTipTimer;
diff --git a/src/libs/utils/outputformatter.h b/src/libs/utils/outputformatter.h
index d0e13156ba..256e45bf4c 100644
--- a/src/libs/utils/outputformatter.h
+++ b/src/libs/utils/outputformatter.h
@@ -26,7 +26,8 @@
#pragma once
#include "utils_global.h"
-#include "fileutils.h"
+
+#include "filepath.h"
#include "optional.h"
#include "outputformat.h"
diff --git a/src/libs/utils/templateengine.h b/src/libs/utils/templateengine.h
index 5073992347..c96ebc322f 100644
--- a/src/libs/utils/templateengine.h
+++ b/src/libs/utils/templateengine.h
@@ -31,7 +31,7 @@
#include <QString>
-QT_FORWARD_DECLARE_CLASS(QJSEngine);
+QT_FORWARD_DECLARE_CLASS(QJSEngine)
namespace Utils {
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 23:33:24 +0000