From 871151e83c4e546a759ae3b238cae01963fa31c1 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Thu, 8 Jun 2023 14:38:36 +0300
Subject: [PATCH] generic: remove QT_KATIE definition checks

only Katie is supported now

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 kdecore/config/ksettings.cpp           | 4 ----
 kdeui/dialogs/kedittoolbar.cpp         | 5 -----
 kdeui/shortcuts/kshortcut.h            | 5 -----
 kdeui/xmlgui/kxmlguibuilder.cpp        | 5 -----
 kdeui/xmlgui/kxmlguifactory.cpp        | 5 -----
 kdeui/xmlgui/kxmlguiversionhandler.cpp | 5 -----
 6 files changed, 29 deletions(-)

diff --git a/kdecore/config/ksettings.cpp b/kdecore/config/ksettings.cpp
index db8a9a0a..1d3269e9 100644
--- a/kdecore/config/ksettings.cpp
+++ b/kdecore/config/ksettings.cpp
@@ -53,11 +53,7 @@ KSettings::~KSettings()
 void KSettings::addSource(const QString &source)
 {
     QSettings settings(source, defaultformat);
-#ifndef QT_KATIE
-    foreach (const QString &key, settings.allKeys()) {
-#else
     foreach (const QString &key, settings.keys()) {
-#endif
         if (!QSettings::contains(key)) {
             QSettings::setValue(key, settings.value(key));
         }
diff --git a/kdeui/dialogs/kedittoolbar.cpp b/kdeui/dialogs/kedittoolbar.cpp
index b9a17bc6..3ce50812 100644
--- a/kdeui/dialogs/kedittoolbar.cpp
+++ b/kdeui/dialogs/kedittoolbar.cpp
@@ -822,12 +822,7 @@ bool KEditToolBarWidget::save()
 
     // Add noMerge="1" to all the menus since we are saving the merged data
     QDomNodeList menuNodes = (*it).domDocument().elementsByTagName( "Menu" );
-    // the lenght() method had a TODO which is done in Katie
-#ifdef QT_KATIE
     for (int i = 0; i < menuNodes.length(); ++i)
-#else
-    for (uint i = 0; i < menuNodes.length(); ++i)
-#endif
     {
         QDomNode menuNode = menuNodes.item(i);
         QDomElement menuElement = menuNode.toElement();
diff --git a/kdeui/shortcuts/kshortcut.h b/kdeui/shortcuts/kshortcut.h
index 0de1a3f6..6c13be04 100644
--- a/kdeui/shortcuts/kshortcut.h
+++ b/kdeui/shortcuts/kshortcut.h
@@ -250,12 +250,7 @@ inline uint qHash(const KShortcut &key)
 inline uint qHash(const QKeySequence &key)
 {
     uint hash = 0;
-    // the count() method had a TODO which is done in Katie
-#ifdef QT_KATIE
     for(int i = 0; i < key.count(); i++) {
-#else
-    for(uint i = 0; i < key.count(); i++) {
-#endif
        hash += qHash(key[i]);
     }
     return hash;
diff --git a/kdeui/xmlgui/kxmlguibuilder.cpp b/kdeui/xmlgui/kxmlguibuilder.cpp
index 65f6cae6..9536a0e8 100644
--- a/kdeui/xmlgui/kxmlguibuilder.cpp
+++ b/kdeui/xmlgui/kxmlguibuilder.cpp
@@ -308,12 +308,7 @@ QAction* KXMLGUIBuilder::createCustomElement( QWidget *parent, int index, const
       bool isLineSep = true;
 
       QDomNamedNodeMap attributes = element.attributes();
-      // the lenght() method had a TODO which is done in Katie
-#ifdef QT_KATIE
       for (int i = 0; i < attributes.length(); i++ )
-#else
-      for (uint i = 0; i < attributes.length(); i++ )
-#endif
       {
         QDomAttr attr = attributes.item( i ).toAttr();
 
diff --git a/kdeui/xmlgui/kxmlguifactory.cpp b/kdeui/xmlgui/kxmlguifactory.cpp
index c2d0697b..468e13bd 100644
--- a/kdeui/xmlgui/kxmlguifactory.cpp
+++ b/kdeui/xmlgui/kxmlguifactory.cpp
@@ -589,12 +589,7 @@ void KXMLGUIFactoryPrivate::applyActionProperties( const QDomElement &actionProp
 void KXMLGUIFactoryPrivate::configureAction( QAction *action, const QDomNamedNodeMap &attributes,
         ShortcutOption shortcutOption )
 {
-      // the lenght() method had a TODO which is done in Katie
-#ifdef QT_KATIE
       for (int i = 0; i < attributes.length(); i++ )
-#else
-      for (uint i = 0; i < attributes.length(); i++ )
-#endif
     {
         QDomAttr attr = attributes.item( i ).toAttr();
         if ( attr.isNull() )
diff --git a/kdeui/xmlgui/kxmlguiversionhandler.cpp b/kdeui/xmlgui/kxmlguiversionhandler.cpp
index 597a5fd9..497eb43c 100644
--- a/kdeui/xmlgui/kxmlguiversionhandler.cpp
+++ b/kdeui/xmlgui/kxmlguiversionhandler.cpp
@@ -102,12 +102,7 @@ static ActionPropertiesMap extractActionProperties(const QDomDocument &doc)
 
     const QDomNamedNodeMap attributes = e.attributes();
 
-      // the lenght() method had a TODO which is done in Katie
-#ifdef QT_KATIE
       for (int i = 0; i < attributes.length(); i++ )
-#else
-      for (uint i = 0; i < attributes.length(); i++ )
-#endif
     {
       const QDomAttr attr = attributes.item( i ).toAttr();