feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ADS: Integrate newest base repository commits

Browse Source 
* Update to newest version of ADS
* Remove native window and title bar support on linux

Base repository was merged until commit
8d4507e9d83434be976ff8c7bc9f59733937a08d

Task-number: QDS-10242
Change-Id: If74b6b50421be3b759c61b0f76f4a330991f71fa
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
This commit is contained in:
Henning Gruendl
2023-06-23 19:58:25 +02:00
committed by Henning Gründl
parent 21983a8377
commit 16ef838f23
47 changed files with 10507 additions and 5668 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/libs/advanceddockingsystem/iconprovider.cpp
View File

@@ -6,44 +6,45 @@
#include <QVector>
namespace ADS {
/**
* Private data class (pimpl)
*/
struct IconProviderPrivate
{
IconProvider *q;
QVector<QIcon> m_userIcons{IconCount, QIcon()};
/**
* Private data class (pimpl)
* Private data constructor
*/
struct IconProviderPrivate
{
IconProvider *q;
QVector<QIcon> m_userIcons{IconCount, QIcon()};
IconProviderPrivate(IconProvider *parent);
};
// struct IconProviderPrivate
/**
* Private data constructor
*/
IconProviderPrivate(IconProvider *parent);
};
// struct IconProviderPrivate
IconProviderPrivate::IconProviderPrivate(IconProvider *parent)
: q(parent)
{}
IconProviderPrivate::IconProviderPrivate(IconProvider *parent)
: q(parent)
{}
IconProvider::IconProvider()
: d(new IconProviderPrivate(this))
{}
IconProvider::IconProvider()
: d(new IconProviderPrivate(this))
{}
IconProvider::~IconProvider()
{
delete d;
}
IconProvider::~IconProvider()
{
delete d;
}
QIcon IconProvider::customIcon(eIcon iconId) const
{
Q_ASSERT(iconId < d->m_userIcons.size());
return d->m_userIcons[iconId];
}
QIcon IconProvider::customIcon(eIcon iconId) const
{
Q_ASSERT(iconId < d->m_userIcons.size());
return d->m_userIcons[iconId];
}
void IconProvider::registerCustomIcon(eIcon iconId, const QIcon &icon)
{
Q_ASSERT(iconId < d->m_userIcons.size());
d->m_userIcons[iconId] = icon;
}
void IconProvider::registerCustomIcon(eIcon iconId, const QIcon &icon)
{
Q_ASSERT(iconId < d->m_userIcons.size());
d->m_userIcons[iconId] = icon;
}
} // namespace ADS