[utilities/krusader] app: Dissolve no longer needed compat helper macro QCOMBOBOX_HIGHLIGHTED
Toni Asensi Esteve <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 8e6faf62e39e8817086b76248c45be37a83b9d5b by Toni Asensi Esteve, on behalf of Friedrich W. H. Kossebau.
Committed on 19/07/2026 at 23:02.
Pushed by asensi into branch 'master'.
Dissolve no longer needed compat helper macro QCOMBOBOX_HIGHLIGHTED
M +1 -2 app/Dialogs/packguibase.cpp
M +0 -14 app/compat.h
https://invent.kde.org/utilities/krusader/-/commit/8e6faf62e39e8817086b76248c45be37a83b9d5b
diff --git a/app/Dialogs/packguibase.cpp b/app/Dialogs/packguibase.cpp
index 920653882..64390fd9b 100644
--- a/app/Dialogs/packguibase.cpp
+++ b/app/Dialogs/packguibase.cpp
@@ -38,7 +38,6 @@
#include <KStandardGuiItem>
#include "../GUI/krhistorycombobox.h"
-#include "../compat.h"
#include "../defaults.h"
#include "../icon.h"
#include "../krglobal.h"
@@ -77,7 +76,7 @@ PackGUIBase::PackGUIBase(QWidget *parent)
typeData = new QComboBox(this);
typeData->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed));
connect(typeData, &QComboBox::textActivated, this, &PackGUIBase::checkConsistency);
- connect(typeData, QOverload<const QString &>::of(&QComboBox::QCOMBOBOX_HIGHLIGHTED), this, &PackGUIBase::checkConsistency);
+ connect(typeData, &QComboBox::textHighlighted, this, &PackGUIBase::checkConsistency);
hbox->addWidget(typeData);
grid->addLayout(hbox, 1, 0);
diff --git a/app/compat.h b/app/compat.h
index fdeb23b31..4b9fb3d67 100644
--- a/app/compat.h
+++ b/app/compat.h
@@ -7,18 +7,4 @@
#ifndef _COMPAT_H_
#define _COMPAT_H_
-/**
- * QComboBox::highlighted(const QString &text) was made obsoleted in QT 5.15 in
- * favor of QComboBox::textHighlighted(const QString &text)
- *
- * https://doc.qt.io/qt-5.15/qcombobox-obsolete.html#highlighted-1
- *
- * This can be removed when the qt minimum version required will be >= 5.15
- */
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
-#define QCOMBOBOX_HIGHLIGHTED textHighlighted
-#else
-#define QCOMBOBOX_HIGHLIGHTED highlighted
-#endif
-
#endif