From 3ed7c09d22a5f310a97516f5bab6068e5688a813 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:12:07 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kjsembed/xmlactionclient.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'kjsembed/xmlactionclient.cpp') diff --git a/kjsembed/xmlactionclient.cpp b/kjsembed/xmlactionclient.cpp index 390d5fd2..982061b8 100644 --- a/kjsembed/xmlactionclient.cpp +++ b/kjsembed/xmlactionclient.cpp @@ -117,7 +117,7 @@ bool XMLActionClient::bind( const TQString &name, const XMLActionScript &s ) return true; } -bool XMLActionClient::bind( KAction *act, const XMLActionScript &s ) +bool XMLActionClient::bind( TDEAction *act, const XMLActionScript &s ) { if ( !act ) return false; @@ -251,14 +251,14 @@ bool XMLActionHandler::endElement( const TQString &, const TQString &, const TQS void XMLActionHandler::defineAction() { if ( ad.name.isEmpty() ) { - kdWarning() << "Attempt to create a KAction without setting a name" << endl; + kdWarning() << "Attempt to create a TDEAction without setting a name" << endl; return; } if ( ad.text.isEmpty() ) ad.text = ad.name; - KAction *act = createAction( actclient->actionCollection() ); + TDEAction *act = createAction( actclient->actionCollection() ); if ( act && ad.script.isValid() ) actclient->bind( act, ad.script ); @@ -266,7 +266,7 @@ void XMLActionHandler::defineAction() cdata = TQString::null; } -KAction *XMLActionHandler::createAction( KActionCollection *parent ) +TDEAction *XMLActionHandler::createAction( TDEActionCollection *parent ) { // kdDebug(80001) << "Creating Action, type is " << type << endl; // kdDebug(80001) << "text=" << text << ", icons=" << icons << endl; @@ -277,16 +277,16 @@ KAction *XMLActionHandler::createAction( KActionCollection *parent ) return 0; } - KAction *act=0; + TDEAction *act=0; - if ( ad.type.isEmpty() || (ad.type == "KAction") ) { - act = new KAction( ad.text, ad.icons, ad.keys, 0, 0, parent, ad.name.latin1() ); + if ( ad.type.isEmpty() || (ad.type == "TDEAction") ) { + act = new TDEAction( ad.text, ad.icons, ad.keys, 0, 0, parent, ad.name.latin1() ); } - else if ( ad.type == "KToggleAction" ) { - act = new KToggleAction( ad.text, ad.icons, ad.keys, 0, 0, parent, ad.name.latin1() ); + else if ( ad.type == "TDEToggleAction" ) { + act = new TDEToggleAction( ad.text, ad.icons, ad.keys, 0, 0, parent, ad.name.latin1() ); } - else if ( ad.type == "KRadioAction" ) { - KRadioAction *ra = new KRadioAction( ad.text, ad.icons, ad.keys, 0, 0, parent, ad.name.latin1() ); + else if ( ad.type == "TDERadioAction" ) { + TDERadioAction *ra = new TDERadioAction( ad.text, ad.icons, ad.keys, 0, 0, parent, ad.name.latin1() ); if ( ad.exclusive ) ra->setExclusiveGroup( ad.group ); @@ -298,17 +298,17 @@ KAction *XMLActionHandler::createAction( KActionCollection *parent ) act = KStdAction::create( (KStdAction::StdAction)i, 0, 0, parent ); } } - else if ( ad.type == "KListAction" ) { - KListAction *la = new KListAction( ad.text, ad.icons, ad.keys, 0, 0, parent, ad.name.latin1() ); + else if ( ad.type == "TDEListAction" ) { + TDEListAction *la = new TDEListAction( ad.text, ad.icons, ad.keys, 0, 0, parent, ad.name.latin1() ); la->setItems( ad.items ); ad.items.clear(); act = la; } - else if ( ad.type == "KActionMenu" ) { - KActionMenu *am = new KActionMenu( ad.text, ad.icons, parent, ad.name.latin1() ); + else if ( ad.type == "TDEActionMenu" ) { + TDEActionMenu *am = new TDEActionMenu( ad.text, ad.icons, parent, ad.name.latin1() ); for ( TQStringList::Iterator it = ad.items.begin() ; it != ad.items.end() ; ++it ) { - KAction *a = parent->action( (*it).latin1() ); + TDEAction *a = parent->action( (*it).latin1() ); if ( a ) am->insert( a ); } -- cgit v1.2.3