diff --git a/kioslave/media/kcmodule/notifiermodule.cpp b/kioslave/media/kcmodule/notifiermodule.cpp index d5e36cc50..c7871c953 100644 --- a/kioslave/media/kcmodule/notifiermodule.cpp +++ b/kioslave/media/kcmodule/notifiermodule.cpp @@ -159,7 +159,7 @@ void NotifierModule::slotAdd() if ( value == TQDialog::Accepted ) { - m_settings.tqaddAction( action ); + m_settings.addAction( action ); updateListBox(); emit changed( true ); } diff --git a/kioslave/media/libmediacommon/notifiersettings.cpp b/kioslave/media/libmediacommon/notifiersettings.cpp index cc8261b8b..d1ab55d87 100644 --- a/kioslave/media/libmediacommon/notifiersettings.cpp +++ b/kioslave/media/libmediacommon/notifiersettings.cpp @@ -109,7 +109,7 @@ TQValueList NotifierSettings::actionsForMimetype( const TQStrin return result; } -bool NotifierSettings::tqaddAction( NotifierServiceAction *action ) +bool NotifierSettings::addAction( NotifierServiceAction *action ) { if ( !m_idMap.contains( action->id() ) ) { diff --git a/kioslave/media/libmediacommon/notifiersettings.h b/kioslave/media/libmediacommon/notifiersettings.h index a1f46f961..dee5c440b 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 tqaddAction( NotifierServiceAction *action ); + bool addAction( NotifierServiceAction *action ); bool deleteAction( NotifierServiceAction *action ); void setAutoAction( const TQString &mimetype, NotifierAction *action ); diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc index 82906a857..6cd19e56e 100644 --- a/libkonq/konq_popupmenu.cc +++ b/libkonq/konq_popupmenu.cc @@ -291,7 +291,7 @@ int KonqPopupMenu::insertServices(const ServiceList& list, act->setIconSet( pix ); } - tqaddAction( act, menu ); // Add to toplevel menu + addAction( act, menu ); // Add to toplevel menu m_mapPopupServices[ id++ ] = *it; ++count; @@ -497,7 +497,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) m_pMenuNew->slotCheckUpToDate(); m_pMenuNew->setPopupFiles( m_lstPopupURLs ); - tqaddAction( m_pMenuNew ); + addAction( m_pMenuNew ); addSeparator(); } @@ -506,31 +506,31 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if (d->m_itemFlags & KParts::BrowserExtension::ShowCreateDirectory) { KAction *actNewDir = new KAction( i18n( "Create &Folder..." ), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" ); - tqaddAction( actNewDir ); + addAction( actNewDir ); addSeparator(); } } } else if ( isIntoTrash ) { // Trashed item, offer restoring act = new KAction( i18n( "&Restore" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" ); - tqaddAction( act ); + addAction( act ); } if (d->m_itemFlags & KParts::BrowserExtension::ShowNavigationItems) { if (d->m_itemFlags & KParts::BrowserExtension::ShowUp) - tqaddAction( "up" ); - tqaddAction( "back" ); - tqaddAction( "forward" ); + addAction( "up" ); + addAction( "back" ); + addAction( "forward" ); if (d->m_itemFlags & KParts::BrowserExtension::ShowReload) - tqaddAction( "reload" ); + addAction( "reload" ); addSeparator(); } // "open in new window" is either provided by us, or by the tabhandling group if (actNewWindow) { - tqaddAction( actNewWindow ); + addAction( actNewWindow ); addSeparator(); } addGroup( "tabhandling" ); // includes a separator @@ -539,21 +539,21 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) { if ( !currentDir && sReading ) { if ( sDeleting ) { - tqaddAction( "cut" ); + addAction( "cut" ); } - tqaddAction( "copy" ); + addAction( "copy" ); } if ( S_ISDIR(mode) && sWriting ) { if ( currentDir ) - tqaddAction( "paste" ); + addAction( "paste" ); else - tqaddAction( "pasteto" ); + addAction( "pasteto" ); } if ( !currentDir ) { if ( m_lstItems.count() == 1 && sMoving ) - tqaddAction( "rename" ); + addAction( "rename" ); bool addTrash = false; bool addDel = false; @@ -576,9 +576,9 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) } if ( addTrash ) - tqaddAction( "trash" ); + addAction( "trash" ); if ( addDel ) - tqaddAction( "del" ); + addAction( "del" ); } } if ( isCurrentTrash ) @@ -587,7 +587,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) KSimpleConfig trashConfig( "trashrc", true ); trashConfig.setGroup( "Status" ); act->setEnabled( !trashConfig.readBoolEntry( "Empty", true ) ); - tqaddAction( act ); + addAction( act ); } addGroup( "editactions" ); @@ -620,7 +620,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if (m_lstItems.count() > 1) act->setEnabled(false); if (kapp->authorizeKAction("bookmarks")) - tqaddAction( act ); + addAction( act ); if (bIsLink) addGroup( "linkactions" ); } @@ -903,7 +903,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) act = new KAction( actionName, (*it)->pixmap( KIcon::Small ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ), &m_ownActions, nam.prepend( "appservice_" ) ); - tqaddAction( act, menu ); + addAction( act, menu ); m_mapPopup[ id++ ] = *it; } @@ -919,12 +919,12 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) openWithActionName = i18n( "&Open With..." ); } KAction *openWithAct = new KAction( openWithActionName, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" ); - tqaddAction( openWithAct, menu ); + addAction( openWithAct, menu ); } else // no app offers -> Open With... { act = new KAction( i18n( "&Open With..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" ); - tqaddAction( act ); + addAction( act ); } } @@ -979,7 +979,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) { act = new KAction( i18n( "&Properties" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupProperties() ), &m_ownActions, "properties" ); - tqaddAction( act ); + addAction( act ); } while ( !m_menuElement.lastChild().isNull() && @@ -993,7 +993,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) addSeparator(); act = new KAction( i18n("Share"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenShareFileDialog() ), &m_ownActions, "sharefile" ); - tqaddAction( act ); + addAction( act ); } } diff --git a/libkonq/konq_popupmenu.h b/libkonq/konq_popupmenu.h index e64a721d7..ee528bc9e 100644 --- a/libkonq/konq_popupmenu.h +++ b/libkonq/konq_popupmenu.h @@ -210,7 +210,7 @@ public: * Constructor * If you want to insert a dynamic item or menu to konqpopupmenu * this class is the right choice. - * Create a KAction and use _popup->tqaddAction(new KAction ); + * Create a KAction and use _popup->addAction(new KAction ); * If you want to create a submenu use _popup->addGroup( ); */ KonqPopupMenuPlugin( KonqPopupMenu *_popup, const char *name ); // this should also be the parent diff --git a/libkonq/konq_xmlguiclient.cc b/libkonq/konq_xmlguiclient.cc index 1f4d6a13b..5561ced8e 100644 --- a/libkonq/konq_xmlguiclient.cc +++ b/libkonq/konq_xmlguiclient.cc @@ -70,12 +70,12 @@ TQDomDocument KonqXMLGUIClient::domDocument() const return m_doc; } -void KonqXMLGUIClient::tqaddAction( KAction *act, const TQDomElement &menu ) +void KonqXMLGUIClient::addAction( KAction *act, const TQDomElement &menu ) { - tqaddAction( act->name(), menu ); + addAction( act->name(), menu ); } -void KonqXMLGUIClient::tqaddAction( const char *name, const TQDomElement &menu ) +void KonqXMLGUIClient::addAction( const char *name, const TQDomElement &menu ) { static const TQString& tagAction = KGlobal::staticQString( "action" ); diff --git a/libkonq/konq_xmlguiclient.h b/libkonq/konq_xmlguiclient.h index 596615872..772554dd2 100644 --- a/libkonq/konq_xmlguiclient.h +++ b/libkonq/konq_xmlguiclient.h @@ -45,8 +45,8 @@ public: TQDomElement DomElement( ) const; // KDE4: s/D/d/ protected: - void tqaddAction( KAction *action, const TQDomElement &menu = TQDomElement() ); - void tqaddAction( const char *name, const TQDomElement &menu = TQDomElement() ); + void addAction( KAction *action, const TQDomElement &menu = TQDomElement() ); + void addAction( const char *name, const TQDomElement &menu = TQDomElement() ); void addSeparator( const TQDomElement &menu = TQDomElement() ); /// only add a separator if an action is added afterwards void addPendingSeparator();