mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-23 18:32:49 +00:00
generic: remove QT_KATIE definition checks
only Katie is supported now Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
a05e71695c
commit
871151e83c
6 changed files with 0 additions and 29 deletions
|
@ -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));
|
||||
}
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
|
@ -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() )
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue