Change tqaddAction -> addAction. There is no tqaddAction defined in tqt headers.

(cherry picked from commit a34c15dc83)
v3.5.13-sru
Darrell Anderson 12 years ago committed by Slávek Banko
parent 31a01e2e73
commit a5b5fa3462

@ -159,7 +159,7 @@ void NotifierModule::slotAdd()
if ( value == TQDialog::Accepted ) if ( value == TQDialog::Accepted )
{ {
m_settings.tqaddAction( action ); m_settings.addAction( action );
updateListBox(); updateListBox();
emit changed( true ); emit changed( true );
} }

@ -109,7 +109,7 @@ TQValueList<NotifierAction*> NotifierSettings::actionsForMimetype( const TQStrin
return result; return result;
} }
bool NotifierSettings::tqaddAction( NotifierServiceAction *action ) bool NotifierSettings::addAction( NotifierServiceAction *action )
{ {
if ( !m_idMap.contains( action->id() ) ) if ( !m_idMap.contains( action->id() ) )
{ {

@ -36,7 +36,7 @@ public:
TQValueList<NotifierAction*> actions(); TQValueList<NotifierAction*> actions();
TQValueList<NotifierAction*> actionsForMimetype( const TQString &mimetype ); TQValueList<NotifierAction*> actionsForMimetype( const TQString &mimetype );
bool tqaddAction( NotifierServiceAction *action ); bool addAction( NotifierServiceAction *action );
bool deleteAction( NotifierServiceAction *action ); bool deleteAction( NotifierServiceAction *action );
void setAutoAction( const TQString &mimetype, NotifierAction *action ); void setAutoAction( const TQString &mimetype, NotifierAction *action );

@ -291,7 +291,7 @@ int KonqPopupMenu::insertServices(const ServiceList& list,
act->setIconSet( pix ); act->setIconSet( pix );
} }
tqaddAction( act, menu ); // Add to toplevel menu addAction( act, menu ); // Add to toplevel menu
m_mapPopupServices[ id++ ] = *it; m_mapPopupServices[ id++ ] = *it;
++count; ++count;
@ -497,7 +497,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
m_pMenuNew->slotCheckUpToDate(); m_pMenuNew->slotCheckUpToDate();
m_pMenuNew->setPopupFiles( m_lstPopupURLs ); m_pMenuNew->setPopupFiles( m_lstPopupURLs );
tqaddAction( m_pMenuNew ); addAction( m_pMenuNew );
addSeparator(); addSeparator();
} }
@ -506,31 +506,31 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if (d->m_itemFlags & KParts::BrowserExtension::ShowCreateDirectory) 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" ); KAction *actNewDir = new KAction( i18n( "Create &Folder..." ), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" );
tqaddAction( actNewDir ); addAction( actNewDir );
addSeparator(); addSeparator();
} }
} }
} else if ( isIntoTrash ) { } else if ( isIntoTrash ) {
// Trashed item, offer restoring // Trashed item, offer restoring
act = new KAction( i18n( "&Restore" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" ); 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::ShowNavigationItems)
{ {
if (d->m_itemFlags & KParts::BrowserExtension::ShowUp) if (d->m_itemFlags & KParts::BrowserExtension::ShowUp)
tqaddAction( "up" ); addAction( "up" );
tqaddAction( "back" ); addAction( "back" );
tqaddAction( "forward" ); addAction( "forward" );
if (d->m_itemFlags & KParts::BrowserExtension::ShowReload) if (d->m_itemFlags & KParts::BrowserExtension::ShowReload)
tqaddAction( "reload" ); addAction( "reload" );
addSeparator(); addSeparator();
} }
// "open in new window" is either provided by us, or by the tabhandling group // "open in new window" is either provided by us, or by the tabhandling group
if (actNewWindow) if (actNewWindow)
{ {
tqaddAction( actNewWindow ); addAction( actNewWindow );
addSeparator(); addSeparator();
} }
addGroup( "tabhandling" ); // includes a separator addGroup( "tabhandling" ); // includes a separator
@ -539,21 +539,21 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
{ {
if ( !currentDir && sReading ) { if ( !currentDir && sReading ) {
if ( sDeleting ) { if ( sDeleting ) {
tqaddAction( "cut" ); addAction( "cut" );
} }
tqaddAction( "copy" ); addAction( "copy" );
} }
if ( S_ISDIR(mode) && sWriting ) { if ( S_ISDIR(mode) && sWriting ) {
if ( currentDir ) if ( currentDir )
tqaddAction( "paste" ); addAction( "paste" );
else else
tqaddAction( "pasteto" ); addAction( "pasteto" );
} }
if ( !currentDir ) if ( !currentDir )
{ {
if ( m_lstItems.count() == 1 && sMoving ) if ( m_lstItems.count() == 1 && sMoving )
tqaddAction( "rename" ); addAction( "rename" );
bool addTrash = false; bool addTrash = false;
bool addDel = false; bool addDel = false;
@ -576,9 +576,9 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
} }
if ( addTrash ) if ( addTrash )
tqaddAction( "trash" ); addAction( "trash" );
if ( addDel ) if ( addDel )
tqaddAction( "del" ); addAction( "del" );
} }
} }
if ( isCurrentTrash ) if ( isCurrentTrash )
@ -587,7 +587,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
KSimpleConfig trashConfig( "trashrc", true ); KSimpleConfig trashConfig( "trashrc", true );
trashConfig.setGroup( "Status" ); trashConfig.setGroup( "Status" );
act->setEnabled( !trashConfig.readBoolEntry( "Empty", true ) ); act->setEnabled( !trashConfig.readBoolEntry( "Empty", true ) );
tqaddAction( act ); addAction( act );
} }
addGroup( "editactions" ); addGroup( "editactions" );
@ -620,7 +620,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if (m_lstItems.count() > 1) if (m_lstItems.count() > 1)
act->setEnabled(false); act->setEnabled(false);
if (kapp->authorizeKAction("bookmarks")) if (kapp->authorizeKAction("bookmarks"))
tqaddAction( act ); addAction( act );
if (bIsLink) if (bIsLink)
addGroup( "linkactions" ); addGroup( "linkactions" );
} }
@ -903,7 +903,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
act = new KAction( actionName, (*it)->pixmap( KIcon::Small ), 0, act = new KAction( actionName, (*it)->pixmap( KIcon::Small ), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ), TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ),
&m_ownActions, nam.prepend( "appservice_" ) ); &m_ownActions, nam.prepend( "appservice_" ) );
tqaddAction( act, menu ); addAction( act, menu );
m_mapPopup[ id++ ] = *it; m_mapPopup[ id++ ] = *it;
} }
@ -919,12 +919,12 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
openWithActionName = i18n( "&Open With..." ); openWithActionName = i18n( "&Open With..." );
} }
KAction *openWithAct = new KAction( openWithActionName, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" ); 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... else // no app offers -> Open With...
{ {
act = new KAction( i18n( "&Open With..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" ); 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() ), act = new KAction( i18n( "&Properties" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupProperties() ),
&m_ownActions, "properties" ); &m_ownActions, "properties" );
tqaddAction( act ); addAction( act );
} }
while ( !m_menuElement.lastChild().isNull() && while ( !m_menuElement.lastChild().isNull() &&
@ -993,7 +993,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
addSeparator(); addSeparator();
act = new KAction( i18n("Share"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenShareFileDialog() ), act = new KAction( i18n("Share"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenShareFileDialog() ),
&m_ownActions, "sharefile" ); &m_ownActions, "sharefile" );
tqaddAction( act ); addAction( act );
} }
} }

@ -210,7 +210,7 @@ public:
* Constructor * Constructor
* If you want to insert a dynamic item or menu to konqpopupmenu * If you want to insert a dynamic item or menu to konqpopupmenu
* this class is the right choice. * 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( ); * If you want to create a submenu use _popup->addGroup( );
*/ */
KonqPopupMenuPlugin( KonqPopupMenu *_popup, const char *name ); // this should also be the parent KonqPopupMenuPlugin( KonqPopupMenu *_popup, const char *name ); // this should also be the parent

@ -70,12 +70,12 @@ TQDomDocument KonqXMLGUIClient::domDocument() const
return m_doc; 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" ); static const TQString& tagAction = KGlobal::staticQString( "action" );

@ -45,8 +45,8 @@ public:
TQDomElement DomElement( ) const; // KDE4: s/D/d/ TQDomElement DomElement( ) const; // KDE4: s/D/d/
protected: protected:
void tqaddAction( KAction *action, const TQDomElement &menu = TQDomElement() ); void addAction( KAction *action, const TQDomElement &menu = TQDomElement() );
void tqaddAction( const char *name, const TQDomElement &menu = TQDomElement() ); void addAction( const char *name, const TQDomElement &menu = TQDomElement() );
void addSeparator( const TQDomElement &menu = TQDomElement() ); void addSeparator( const TQDomElement &menu = TQDomElement() );
/// only add a separator if an action is added afterwards /// only add a separator if an action is added afterwards
void addPendingSeparator(); void addPendingSeparator();

Loading…
Cancel
Save