From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 19 Jan 2011 01:42:14 +0000 Subject: Enable compilation with TQt for Qt4 3.4.0 TP2 This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kioslave/media/libmediacommon/actionlistboxitem.cpp | 2 +- kioslave/media/libmediacommon/actionlistboxitem.h | 4 ++-- kioslave/media/libmediacommon/medium.cpp | 2 +- kioslave/media/libmediacommon/medium.h | 4 ++-- kioslave/media/libmediacommon/notifieraction.cpp | 2 +- kioslave/media/libmediacommon/notifieropenaction.cpp | 2 +- kioslave/media/libmediacommon/notifierserviceaction.cpp | 4 ++-- kioslave/media/libmediacommon/notifiersettings.cpp | 12 ++++++------ kioslave/media/libmediacommon/notifiersettings.h | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) (limited to 'kioslave/media/libmediacommon') diff --git a/kioslave/media/libmediacommon/actionlistboxitem.cpp b/kioslave/media/libmediacommon/actionlistboxitem.cpp index 271d2e487..42a724c75 100644 --- a/kioslave/media/libmediacommon/actionlistboxitem.cpp +++ b/kioslave/media/libmediacommon/actionlistboxitem.cpp @@ -29,7 +29,7 @@ ActionListBoxItem::ActionListBoxItem(NotifierAction *action, TQString mimetype, { TQString text = m_action->label(); - if ( m_action->autoMimetypes().contains( mimetype ) ) + if ( m_action->autoMimetypes().tqcontains( mimetype ) ) { text += " (" + i18n( "Auto Action" ) + ")"; } diff --git a/kioslave/media/libmediacommon/actionlistboxitem.h b/kioslave/media/libmediacommon/actionlistboxitem.h index 0378e1d6f..254f065de 100644 --- a/kioslave/media/libmediacommon/actionlistboxitem.h +++ b/kioslave/media/libmediacommon/actionlistboxitem.h @@ -1,6 +1,6 @@ /* This file is part of the KDE Project Copyright (c) 2005 Jean-Remy Falleri - Copyright (c) 2005 Kévin Ottens + Copyright (c) 2005 K�vin Ottens This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -25,7 +25,7 @@ #include "notifieraction.h" -class ActionListBoxItem : public QListBoxPixmap +class ActionListBoxItem : public TQListBoxPixmap { public: ActionListBoxItem(NotifierAction *action, TQString mimetype, TQListBox *parent); diff --git a/kioslave/media/libmediacommon/medium.cpp b/kioslave/media/libmediacommon/medium.cpp index e7e91dd54..2aa7359ad 100644 --- a/kioslave/media/libmediacommon/medium.cpp +++ b/kioslave/media/libmediacommon/medium.cpp @@ -109,7 +109,7 @@ Medium::List Medium::createList(const TQStringList &properties) l.append(m); TQStringList::iterator first = props.begin(); - TQStringList::iterator last = props.find(SEPARATOR); + TQStringList::iterator last = props.tqfind(SEPARATOR); ++last; props.erase(first, last); } diff --git a/kioslave/media/libmediacommon/medium.h b/kioslave/media/libmediacommon/medium.h index 54e1556dc..eeef12eb2 100644 --- a/kioslave/media/libmediacommon/medium.h +++ b/kioslave/media/libmediacommon/medium.h @@ -109,8 +109,8 @@ namespace MediaManagerUtils { for (TQStringList::ConstIterator it = options.begin(); it != options.end(); ++it) { - TQString key = (*it).left((*it).find('=')); - TQString value = (*it).mid((*it).find('=') + 1); + TQString key = (*it).left((*it).tqfind('=')); + TQString value = (*it).mid((*it).tqfind('=') + 1); valids[key] = value; } return valids; diff --git a/kioslave/media/libmediacommon/notifieraction.cpp b/kioslave/media/libmediacommon/notifieraction.cpp index d10314701..9a6572150 100644 --- a/kioslave/media/libmediacommon/notifieraction.cpp +++ b/kioslave/media/libmediacommon/notifieraction.cpp @@ -69,7 +69,7 @@ TQString NotifierAction::label() const void NotifierAction::addAutoMimetype( const TQString &mimetype ) { - if ( !m_autoMimetypes.contains( mimetype ) ) + if ( !m_autoMimetypes.tqcontains( mimetype ) ) { m_autoMimetypes.append( mimetype ); } diff --git a/kioslave/media/libmediacommon/notifieropenaction.cpp b/kioslave/media/libmediacommon/notifieropenaction.cpp index 4d6d8025c..01c8b010f 100644 --- a/kioslave/media/libmediacommon/notifieropenaction.cpp +++ b/kioslave/media/libmediacommon/notifieropenaction.cpp @@ -40,6 +40,6 @@ void NotifierOpenAction::execute(KFileItem &medium) bool NotifierOpenAction::supportsMimetype( const TQString &mimetype ) const { - return !mimetype.contains( "blank" ) && !mimetype.contains( "encrypted" ); + return !mimetype.tqcontains( "blank" ) && !mimetype.tqcontains( "encrypted" ); } diff --git a/kioslave/media/libmediacommon/notifierserviceaction.cpp b/kioslave/media/libmediacommon/notifierserviceaction.cpp index c7bece4f8..8cf916848 100644 --- a/kioslave/media/libmediacommon/notifierserviceaction.cpp +++ b/kioslave/media/libmediacommon/notifierserviceaction.cpp @@ -99,7 +99,7 @@ void NotifierServiceAction::updateFilePath() if ( !m_filePath.isEmpty() ) return; TQString action_name = m_service.m_strName; - action_name.replace( " ", "_" ); + action_name.tqreplace( " ", "_" ); TQDir actions_dir( locateLocal( "data", "konqueror/servicemenus/", true ) ); @@ -144,7 +144,7 @@ bool NotifierServiceAction::isWritable() const bool NotifierServiceAction::supportsMimetype(const TQString &mimetype) const { - return m_mimetypes.contains(mimetype); + return m_mimetypes.tqcontains(mimetype); } void NotifierServiceAction::save() const diff --git a/kioslave/media/libmediacommon/notifiersettings.cpp b/kioslave/media/libmediacommon/notifiersettings.cpp index d1ab55d87..fd0aefc67 100644 --- a/kioslave/media/libmediacommon/notifiersettings.cpp +++ b/kioslave/media/libmediacommon/notifiersettings.cpp @@ -109,9 +109,9 @@ TQValueList NotifierSettings::actionsForMimetype( const TQStrin return result; } -bool NotifierSettings::addAction( NotifierServiceAction *action ) +bool NotifierSettings::tqaddAction( NotifierServiceAction *action ) { - if ( !m_idMap.contains( action->id() ) ) + if ( !m_idMap.tqcontains( action->id() ) ) { m_actions.insert( --m_actions.end(), action ); m_idMap[ action->id() ] = action; @@ -153,7 +153,7 @@ void NotifierSettings::setAutoAction( const TQString &mimetype, NotifierAction * void NotifierSettings::resetAutoAction( const TQString &mimetype ) { - if ( m_autoMimetypesMap.contains( mimetype ) ) + if ( m_autoMimetypesMap.tqcontains( mimetype ) ) { NotifierAction *action = m_autoMimetypesMap[mimetype]; action->removeAutoMimetype( mimetype ); @@ -179,7 +179,7 @@ void NotifierSettings::clearAutoActions() NotifierAction *NotifierSettings::autoActionForMimetype( const TQString &mimetype ) { - if ( m_autoMimetypesMap.contains( mimetype ) ) + if ( m_autoMimetypesMap.tqcontains( mimetype ) ) { return m_autoMimetypesMap[mimetype]; } @@ -238,7 +238,7 @@ void NotifierSettings::reload() TQString mime = auto_it.key(); TQString action_id = auto_it.data(); - if ( m_idMap.contains( action_id ) ) + if ( m_idMap.tqcontains( action_id ) ) { setAutoAction( mime, m_idMap[action_id] ); } @@ -349,7 +349,7 @@ bool NotifierSettings::shouldLoadActions( KDesktopFile &desktop, const TQString } } } - else if ( types.contains(mimetype) ) + else if ( types.tqcontains(mimetype) ) { return true; } diff --git a/kioslave/media/libmediacommon/notifiersettings.h b/kioslave/media/libmediacommon/notifiersettings.h index dee5c440b..a1f46f961 100644 --- a/kioslave/media/libmediacommon/notifiersettings.h +++ b/kioslave/media/libmediacommon/notifiersettings.h @@ -36,7 +36,7 @@ public: TQValueList actions(); TQValueList actionsForMimetype( const TQString &mimetype ); - bool addAction( NotifierServiceAction *action ); + bool tqaddAction( NotifierServiceAction *action ); bool deleteAction( NotifierServiceAction *action ); void setAutoAction( const TQString &mimetype, NotifierAction *action ); -- cgit v1.2.3