diff options
Diffstat (limited to 'src/libs/installer/globals.h')
-rw-r--r-- | src/libs/installer/globals.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/libs/installer/globals.h b/src/libs/installer/globals.h index b22331e2c..2d119048b 100644 --- a/src/libs/installer/globals.h +++ b/src/libs/installer/globals.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2020 The Qt Company Ltd. +** Copyright (C) 2023 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -30,7 +30,7 @@ #include "installer_global.h" -#include <QRegExp> +#include <QRegularExpression> #include <QLoggingCategory> namespace QInstaller { @@ -43,11 +43,24 @@ INSTALLER_EXPORT Q_DECLARE_LOGGING_CATEGORY(lcDeveloperBuild) QStringList INSTALLER_EXPORT loggingCategories(); -QRegExp INSTALLER_EXPORT commaRegExp(); +QRegularExpression INSTALLER_EXPORT commaRegExp(); +inline QStringList splitStringWithComma(const QString &value) { + if (!value.isEmpty()) + return value.split(QInstaller::commaRegExp(), Qt::SkipEmptyParts); + return QStringList(); +} QString htmlToString(const QString &html); QString enumToString(const QMetaObject& metaObject, const char *enumerator, int key); +template <typename T, template<typename> typename C> +QSet<T> toQSet(const C<T> &container) +{ + return QSet<T>(container.begin(), container.end()); +} + +void askForCredentials(QString *username, QString *password, const QString &usernameTitle, const QString &passwordTitle); + } // QInstaller #endif // GLOBALS_H |