aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/platform
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/platform')
-rw-r--r--src/imports/platform/qquickplatformfiledialog.cpp17
-rw-r--r--src/imports/platform/qquickplatformfolderdialog.cpp1
-rw-r--r--src/imports/platform/qquickplatformmenu.cpp48
-rw-r--r--src/imports/platform/qquickplatformmenu_p.h10
-rw-r--r--src/imports/platform/qquickplatformmenuitem.cpp42
-rw-r--r--src/imports/platform/qquickplatformmenuitem_p.h10
-rw-r--r--src/imports/platform/qquickplatformmenuitemgroup_p.h4
-rw-r--r--src/imports/platform/qquickplatformmessagedialog.cpp1
-rw-r--r--src/imports/platform/qquickplatformsystemtrayicon.cpp42
-rw-r--r--src/imports/platform/qquickplatformsystemtrayicon_p.h10
-rw-r--r--src/imports/platform/widgets/qwidgetplatform_p.h4
-rw-r--r--src/imports/platform/widgets/qwidgetplatformmenu_p.h2
12 files changed, 15 insertions, 176 deletions
diff --git a/src/imports/platform/qquickplatformfiledialog.cpp b/src/imports/platform/qquickplatformfiledialog.cpp
index 2ef08ef6..3b9ceab2 100644
--- a/src/imports/platform/qquickplatformfiledialog.cpp
+++ b/src/imports/platform/qquickplatformfiledialog.cpp
@@ -36,7 +36,7 @@
#include "qquickplatformfiledialog_p.h"
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
QT_BEGIN_NAMESPACE
@@ -86,7 +86,6 @@ QT_BEGIN_NAMESPACE
\li Linux (when running with the GTK+ platform theme)
\li macOS
\li Windows
- \li WinRT
\endlist
\input includes/widgets.qdocinc 1
@@ -611,21 +610,21 @@ static QString extractName(const QString &filter)
return filter.left(filter.indexOf(QLatin1Char('(')) - 1);
}
-static QString extractExtension(const QString &filter)
+static QString extractExtension(QStringView filter)
{
- return filter.mid(filter.indexOf(QLatin1Char('.')) + 1);
+ return filter.mid(filter.indexOf(QLatin1Char('.')) + 1).toString();
}
-static QStringList extractExtensions(const QString &filter)
+static QStringList extractExtensions(QStringView filter)
{
QStringList extensions;
const int from = filter.indexOf(QLatin1Char('('));
const int to = filter.lastIndexOf(QLatin1Char(')')) - 1;
if (from >= 0 && from < to) {
- const QStringRef ref = filter.midRef(from + 1, to - from);
- const QVector<QStringRef> exts = ref.split(QLatin1Char(' '), Qt::SkipEmptyParts);
- for (const QStringRef &ref : exts)
- extensions += extractExtension(ref.toString());
+ const QStringView ref = filter.mid(from + 1, to - from);
+ const QList<QStringView> exts = ref.split(QLatin1Char(' '), Qt::SkipEmptyParts);
+ for (const QStringView &ref : exts)
+ extensions += extractExtension(ref);
}
return extensions;
diff --git a/src/imports/platform/qquickplatformfolderdialog.cpp b/src/imports/platform/qquickplatformfolderdialog.cpp
index 4ae6341e..a28dc828 100644
--- a/src/imports/platform/qquickplatformfolderdialog.cpp
+++ b/src/imports/platform/qquickplatformfolderdialog.cpp
@@ -83,7 +83,6 @@ QT_BEGIN_NAMESPACE
\li Linux (when running with the GTK+ platform theme)
\li macOS
\li Windows
- \li WinRT
\endlist
\input includes/widgets.qdocinc 1
diff --git a/src/imports/platform/qquickplatformmenu.cpp b/src/imports/platform/qquickplatformmenu.cpp
index 8954d439..7219ef54 100644
--- a/src/imports/platform/qquickplatformmenu.cpp
+++ b/src/imports/platform/qquickplatformmenu.cpp
@@ -419,8 +419,7 @@ QQuickPlatformMenuItem *QQuickPlatformMenu::menuItem() const
m_menuItem = new QQuickPlatformMenuItem(that);
m_menuItem->setSubMenu(that);
m_menuItem->setText(m_title);
- m_menuItem->setIconName(iconName());
- m_menuItem->setIconSource(iconSource());
+ m_menuItem->setIcon(icon());
m_menuItem->setVisible(m_visible);
m_menuItem->setEnabled(m_enabled);
m_menuItem->componentComplete();
@@ -542,51 +541,6 @@ void QQuickPlatformMenu::setTitle(const QString &title)
}
/*!
- \qmlproperty url Qt.labs.platform::Menu::iconSource
- \deprecated Use icon.source instead
-*/
-QUrl QQuickPlatformMenu::iconSource() const
-{
- return icon().source();
-}
-
-void QQuickPlatformMenu::setIconSource(const QUrl& source)
-{
- QQuickPlatformIcon newIcon = icon();
- if (source == newIcon.source())
- return;
-
- if (m_menuItem)
- m_menuItem->setIconSource(source);
-
- newIcon.setSource(source);
- iconLoader()->setIcon(newIcon);
- emit iconSourceChanged();
-}
-
-/*!
- \qmlproperty string Qt.labs.platform::Menu::iconName
- \deprecated Use icon.name instead
-*/
-QString QQuickPlatformMenu::iconName() const
-{
- return icon().name();
-}
-
-void QQuickPlatformMenu::setIconName(const QString& name)
-{
- QQuickPlatformIcon newIcon = icon();
- if (name == newIcon.name())
- return;
-
- if (m_menuItem)
- m_menuItem->setIconName(name);
-
- newIcon.setName(name);
- iconLoader()->setIcon(newIcon);
- emit iconNameChanged();}
-
-/*!
\qmlproperty font Qt.labs.platform::Menu::font
This property holds the menu's font.
diff --git a/src/imports/platform/qquickplatformmenu_p.h b/src/imports/platform/qquickplatformmenu_p.h
index eb18f66b..089e1f89 100644
--- a/src/imports/platform/qquickplatformmenu_p.h
+++ b/src/imports/platform/qquickplatformmenu_p.h
@@ -85,8 +85,6 @@ class QQuickPlatformMenu : public QObject, public QQmlParserStatus
Q_PROPERTY(int minimumWidth READ minimumWidth WRITE setMinimumWidth NOTIFY minimumWidthChanged FINAL)
Q_PROPERTY(QPlatformMenu::MenuType type READ type WRITE setType NOTIFY typeChanged FINAL)
Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL)
- Q_PROPERTY(QUrl iconSource READ iconSource WRITE setIconSource NOTIFY iconSourceChanged FINAL)
- Q_PROPERTY(QString iconName READ iconName WRITE setIconName NOTIFY iconNameChanged FINAL)
Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged FINAL)
Q_PROPERTY(QQuickPlatformIcon icon READ icon WRITE setIcon NOTIFY iconChanged FINAL REVISION 1)
Q_ENUMS(QPlatformMenu::MenuType)
@@ -130,12 +128,6 @@ public:
QString title() const;
void setTitle(const QString &title);
- QUrl iconSource() const;
- void setIconSource(const QUrl &source);
-
- QString iconName() const;
- void setIconName(const QString &name);
-
QFont font() const;
void setFont(const QFont &font);
@@ -165,8 +157,6 @@ Q_SIGNALS:
void parentMenuChanged();
void systemTrayIconChanged();
void titleChanged();
- void iconSourceChanged();
- void iconNameChanged();
void enabledChanged();
void visibleChanged();
void minimumWidthChanged();
diff --git a/src/imports/platform/qquickplatformmenuitem.cpp b/src/imports/platform/qquickplatformmenuitem.cpp
index b63f7202..11cf98b4 100644
--- a/src/imports/platform/qquickplatformmenuitem.cpp
+++ b/src/imports/platform/qquickplatformmenuitem.cpp
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
\image qtlabsplatform-menu.png
- A menu item consists of an \l {iconSource}{icon}, \l text, and \l shortcut.
+ A menu item consists of an \l icon, \l text, and \l shortcut.
\code
Menu {
@@ -458,46 +458,6 @@ void QQuickPlatformMenuItem::setText(const QString &text)
}
/*!
- \qmlproperty url Qt.labs.platform::MenuItem::iconSource
- \deprecated Use icon.source instead
-*/
-QUrl QQuickPlatformMenuItem::iconSource() const
-{
- return icon().source();
-}
-
-void QQuickPlatformMenuItem::setIconSource(const QUrl& source)
-{
- QQuickPlatformIcon newIcon = icon();
- if (source == newIcon.source())
- return;
-
- newIcon.setSource(source);
- iconLoader()->setIcon(newIcon);
- emit iconSourceChanged();
-}
-
-/*!
- \qmlproperty string Qt.labs.platform::MenuItem::iconName
- \deprecated Use icon.name instead
-*/
-QString QQuickPlatformMenuItem::iconName() const
-{
- return icon().name();
-}
-
-void QQuickPlatformMenuItem::setIconName(const QString& name)
-{
- QQuickPlatformIcon newIcon = icon();
- if (name == newIcon.name())
- return;
-
- newIcon.setName(name);
- iconLoader()->setIcon(newIcon);
- emit iconNameChanged();
-}
-
-/*!
\qmlproperty keysequence Qt.labs.platform::MenuItem::shortcut
This property holds the menu item's shortcut.
diff --git a/src/imports/platform/qquickplatformmenuitem_p.h b/src/imports/platform/qquickplatformmenuitem_p.h
index e3d5258a..c1e6cc30 100644
--- a/src/imports/platform/qquickplatformmenuitem_p.h
+++ b/src/imports/platform/qquickplatformmenuitem_p.h
@@ -78,8 +78,6 @@ class QQuickPlatformMenuItem : public QObject, public QQmlParserStatus
Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY checkedChanged FINAL)
Q_PROPERTY(QPlatformMenuItem::MenuRole role READ role WRITE setRole NOTIFY roleChanged FINAL)
Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged FINAL)
- Q_PROPERTY(QUrl iconSource READ iconSource WRITE setIconSource NOTIFY iconSourceChanged FINAL)
- Q_PROPERTY(QString iconName READ iconName WRITE setIconName NOTIFY iconNameChanged FINAL)
Q_PROPERTY(QVariant shortcut READ shortcut WRITE setShortcut NOTIFY shortcutChanged FINAL)
Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged FINAL)
Q_PROPERTY(QQuickPlatformIcon icon READ icon WRITE setIcon NOTIFY iconChanged FINAL REVISION 1)
@@ -123,12 +121,6 @@ public:
QString text() const;
void setText(const QString &text);
- QUrl iconSource() const;
- void setIconSource(const QUrl &source);
-
- QString iconName() const;
- void setIconName(const QString &name);
-
QVariant shortcut() const;
void setShortcut(const QVariant& shortcut);
@@ -155,8 +147,6 @@ Q_SIGNALS:
void checkedChanged();
void roleChanged();
void textChanged();
- void iconSourceChanged();
- void iconNameChanged();
void shortcutChanged();
void fontChanged();
Q_REVISION(1) void iconChanged();
diff --git a/src/imports/platform/qquickplatformmenuitemgroup_p.h b/src/imports/platform/qquickplatformmenuitemgroup_p.h
index 8b3531d9..57499347 100644
--- a/src/imports/platform/qquickplatformmenuitemgroup_p.h
+++ b/src/imports/platform/qquickplatformmenuitemgroup_p.h
@@ -49,7 +49,7 @@
//
#include <QtCore/qobject.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
#include <QtQml/qqml.h>
QT_BEGIN_NAMESPACE
@@ -113,7 +113,7 @@ private:
bool m_visible;
bool m_exclusive;
QQuickPlatformMenuItem *m_checkedItem;
- QVector<QQuickPlatformMenuItem*> m_items;
+ QList<QQuickPlatformMenuItem*> m_items;
};
QT_END_NAMESPACE
diff --git a/src/imports/platform/qquickplatformmessagedialog.cpp b/src/imports/platform/qquickplatformmessagedialog.cpp
index 075b4d62..f2e0970c 100644
--- a/src/imports/platform/qquickplatformmessagedialog.cpp
+++ b/src/imports/platform/qquickplatformmessagedialog.cpp
@@ -99,7 +99,6 @@ QT_BEGIN_NAMESPACE
\list
\li iOS
\li Android
- \li WinRT
\endlist
\input includes/widgets.qdocinc 1
diff --git a/src/imports/platform/qquickplatformsystemtrayicon.cpp b/src/imports/platform/qquickplatformsystemtrayicon.cpp
index 4a96b38f..1631e449 100644
--- a/src/imports/platform/qquickplatformsystemtrayicon.cpp
+++ b/src/imports/platform/qquickplatformsystemtrayicon.cpp
@@ -253,48 +253,6 @@ void QQuickPlatformSystemTrayIcon::setVisible(bool visible)
}
/*!
- \qmlproperty url Qt.labs.platform::SystemTrayIcon::iconSource
- \deprecated Use icon.source instead.
- \sa icon
-*/
-QUrl QQuickPlatformSystemTrayIcon::iconSource() const
-{
- return icon().source();
-}
-
-void QQuickPlatformSystemTrayIcon::setIconSource(const QUrl& source)
-{
- QQuickPlatformIcon newIcon = icon();
- if (source == newIcon.source())
- return;
-
- newIcon.setSource(source);
- iconLoader()->setIcon(newIcon);
- emit iconSourceChanged();
-}
-
-/*!
- \qmlproperty string Qt.labs.platform::SystemTrayIcon::iconName
- \deprecated Use icon.name instead.
- \sa icon
-*/
-QString QQuickPlatformSystemTrayIcon::iconName() const
-{
- return icon().name();
-}
-
-void QQuickPlatformSystemTrayIcon::setIconName(const QString& name)
-{
- QQuickPlatformIcon newIcon = icon();
- if (name == newIcon.name())
- return;
-
- newIcon.setName(name);
- iconLoader()->setIcon(newIcon);
- emit iconNameChanged();
-}
-
-/*!
\qmlproperty string Qt.labs.platform::SystemTrayIcon::tooltip
This property holds the tooltip of the system tray icon.
diff --git a/src/imports/platform/qquickplatformsystemtrayicon_p.h b/src/imports/platform/qquickplatformsystemtrayicon_p.h
index e43366cb..0216aee3 100644
--- a/src/imports/platform/qquickplatformsystemtrayicon_p.h
+++ b/src/imports/platform/qquickplatformsystemtrayicon_p.h
@@ -70,8 +70,6 @@ class QQuickPlatformSystemTrayIcon : public QObject, public QQmlParserStatus
Q_PROPERTY(bool available READ isAvailable CONSTANT FINAL)
Q_PROPERTY(bool supportsMessages READ supportsMessages CONSTANT FINAL)
Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged FINAL)
- Q_PROPERTY(QUrl iconSource READ iconSource WRITE setIconSource NOTIFY iconSourceChanged FINAL)
- Q_PROPERTY(QString iconName READ iconName WRITE setIconName NOTIFY iconNameChanged FINAL)
Q_PROPERTY(QString tooltip READ tooltip WRITE setTooltip NOTIFY tooltipChanged FINAL)
Q_PROPERTY(QQuickPlatformMenu *menu READ menu WRITE setMenu NOTIFY menuChanged FINAL)
Q_PROPERTY(QRect geometry READ geometry NOTIFY geometryChanged FINAL REVISION 1)
@@ -90,12 +88,6 @@ public:
bool isVisible() const;
void setVisible(bool visible);
- QUrl iconSource() const;
- void setIconSource(const QUrl &source);
-
- QString iconName() const;
- void setIconName(const QString &name);
-
QString tooltip() const;
void setTooltip(const QString &tooltip);
@@ -118,8 +110,6 @@ Q_SIGNALS:
void activated(QPlatformSystemTrayIcon::ActivationReason reason);
void messageClicked();
void visibleChanged();
- void iconSourceChanged();
- void iconNameChanged();
void tooltipChanged();
void menuChanged();
Q_REVISION(1) void geometryChanged();
diff --git a/src/imports/platform/widgets/qwidgetplatform_p.h b/src/imports/platform/widgets/qwidgetplatform_p.h
index c203406c..cbdaa24a 100644
--- a/src/imports/platform/widgets/qwidgetplatform_p.h
+++ b/src/imports/platform/widgets/qwidgetplatform_p.h
@@ -111,8 +111,8 @@ namespace QWidgetPlatform
if (available)
return new T(parent);
#else
- Q_UNUSED(parent)
- Q_UNUSED(available)
+ Q_UNUSED(parent);
+ Q_UNUSED(available);
#endif
return nullptr;
}
diff --git a/src/imports/platform/widgets/qwidgetplatformmenu_p.h b/src/imports/platform/widgets/qwidgetplatformmenu_p.h
index 4d58f528..9d1ef57e 100644
--- a/src/imports/platform/widgets/qwidgetplatformmenu_p.h
+++ b/src/imports/platform/widgets/qwidgetplatformmenu_p.h
@@ -90,7 +90,7 @@ public:
private:
QScopedPointer<QMenu> m_menu;
- QVector<QWidgetPlatformMenuItem *> m_items;
+ QList<QWidgetPlatformMenuItem *> m_items;
};
QT_END_NAMESPACE
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 06:59:33 +0000