File gcc13-fix-errors.patch of Package kdelibs4
--- kdecore/localization/klocale_kde.cpp 2017-11-05 02:51:22.000000000 +0100
+++ kdecore/localization/klocale_kde.cpp 2025-10-17 19:20:49.218569182 +0200
@@ -64,6 +64,8 @@
#include "common_helpers_p.h"
#include "kdayperiod_p.h"
+#include <algorithm>
+
class KLocaleStaticData
{
public:
@@ -1048,7 +1050,7 @@
digitSets.append(KLocale::TamilDigits);
digitSets.append(KLocale::TeluguDigits);
digitSets.append(KLocale::ThaiDigits);
- qSort(digitSets);
+ std::sort(digitSets.begin(), digitSets.end());
return digitSets;
}
@@ -1735,7 +1737,7 @@
// If a specific unit conversion is given, use it directly. Otherwise
// search until the result is in [0, multiplier) (or out of our range).
if (specificUnit == KLocale::DefaultBinaryUnits) {
- while (qAbs(size) >= multiplier && unit < (int) KLocale::UnitYottaByte) {
+ while (std::abs(size) >= multiplier && unit < (int) KLocale::UnitYottaByte) {
size /= multiplier;
unit++;
}
@@ -2143,7 +2145,7 @@
curPos--;
}
- remPos = qMax(curPos + 1, 0);
+ remPos = std::max(curPos + 1, 0);
inout.remove(remPos, endPos - remPos);
}
@@ -2438,8 +2440,8 @@
bool KLocalePrivate::use12Clock() const
{
- if ((timeFormat().contains(QString::fromLatin1("%I")) > 0) ||
- (timeFormat().contains(QString::fromLatin1("%l")) > 0)) {
+ if ((timeFormat().contains(QString::fromLatin1("%I")) != 0) ||
+ (timeFormat().contains(QString::fromLatin1("%l")) != 0)) {
return true;
} else {
return false;
--- dnssd/servicemodel.cpp 2017-11-05 02:51:22.000000000 +0100
+++ dnssd/servicemodel.cpp 2025-10-17 19:25:14.189592984 +0200
@@ -87,7 +87,8 @@
case Host: return srv[index.row()]->hostName();
case Port: return srv[index.row()]->port();
}
- case ServicePtrRole: QVariant ret;
+ // fall through
+ case static_cast<int>(ServicePtrRole): QVariant ret;
ret.setValue(srv[index.row()]);
return ret;
}
--- kio/kfile/kopenwithdialog.cpp 2017-11-05 02:51:22.000000000 +0100
+++ kio/kfile/kopenwithdialog.cpp 2025-10-17 19:30:28.038194602 +0200
@@ -54,6 +54,8 @@
#include <kbuildsycocaprogressdialog.h>
#include <kconfiggroup.h>
+#include <algorithm>
+
inline void writeEntry( KConfigGroup& group, const char* key,
const KGlobalSettings::Completion& aValue,
KConfigBase::WriteConfigFlags flags = KConfigBase::Normal )
@@ -182,7 +184,7 @@
newnode->parent = node;
node->children.append(newnode);
}
- qStableSort(node->children.begin(), node->children.end(), KDEPrivate::AppNodeLessThan);
+ std::stable_sort(node->children.begin(), node->children.end(), KDEPrivate::AppNodeLessThan);
}
@@ -713,7 +715,7 @@
// ### indicate that default value was restored
d->terminal->setChecked(d->curService->terminal());
QString terminalOptions = d->curService->terminalOptions();
- d->nocloseonexit->setChecked((terminalOptions.contains(QLatin1String("--noclose")) > 0));
+ d->nocloseonexit->setChecked((terminalOptions.contains(QLatin1String("--noclose")) != 0));
d->m_terminaldirty = false; // slotTerminalToggled changed it
}
}
--- kio/kfile/kpropertiesdialog.cpp 2017-11-05 02:51:22.000000000 +0100
+++ kio/kfile/kpropertiesdialog.cpp 2025-10-17 19:30:51.110055851 +0200
@@ -65,7 +65,7 @@
#include <QtGui/QPushButton>
#include <QtGui/QCheckBox>
#include <QtCore/QMutableStringListIterator>
-#include <QtCore/QTextIStream>
+#include <QtCore/QTextStream>
#include <QtGui/QPainter>
#include <QtGui/QLayout>
#include <QtGui/QStyle>
@@ -623,13 +623,6 @@
delete d;
}
-#ifndef KDE_NO_DEPRECATED
-bool KPropertiesDialogPlugin::isDesktopFile( const KFileItem& _item )
-{
- return _item.isDesktopFile();
-}
-#endif
-
void KPropertiesDialogPlugin::setDirty( bool b )
{
d->m_bDirty = b;
@@ -3306,7 +3299,7 @@
if (preferredTerminal == "konsole")
{
- terminalCloseBool = (d->m_terminalOptionStr.contains( "--noclose" ) > 0);
+ terminalCloseBool = (d->m_terminalOptionStr.contains( "--noclose" ) != 0);
w.terminalCloseCheck->setChecked(terminalCloseBool);
d->m_terminalOptionStr.remove( "--noclose");
}