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 --- xparts/mozilla/kshell.cpp | 2 +- xparts/src/kde/xparthost_kpart.cpp | 12 ++++++------ xparts/xpart_notepad/shell_xparthost.cpp | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'xparts') diff --git a/xparts/mozilla/kshell.cpp b/xparts/mozilla/kshell.cpp index b6935b47..31103418 100644 --- a/xparts/mozilla/kshell.cpp +++ b/xparts/mozilla/kshell.cpp @@ -32,7 +32,7 @@ public: #endif KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); - KSelectAction *s = new KSelectAction( "http://www.kde.org" , 0, + TDESelectAction *s = new TDESelectAction( "http://www.kde.org" , 0, actionCollection(), "location" ); connect( s, TQT_SIGNAL(activated( const TQString& ) ), this, TQT_SLOT( slotOpenUrl( const TQString & ) ) ); s->setEditable(true); diff --git a/xparts/src/kde/xparthost_kpart.cpp b/xparts/src/kde/xparthost_kpart.cpp index 8610c4c5..9195a278 100644 --- a/xparts/src/kde/xparthost_kpart.cpp +++ b/xparts/src/kde/xparthost_kpart.cpp @@ -77,9 +77,9 @@ void XPartHost_KPart::createActions( const TQCString &xmlActions ) TQString type = e.attribute("type"); if(type.isEmpty()) - new KAction( name, 0, this, TQT_SLOT( actionActivated() ), actionCollection(), name.latin1() ); + new TDEAction( name, 0, this, TQT_SLOT( actionActivated() ), actionCollection(), name.latin1() ); else if( type == "toggle" ) - new KToggleAction( name, 0, this, TQT_SLOT( actionActivated() ), actionCollection(), name.latin1() ); + new TDEToggleAction( name, 0, this, TQT_SLOT( actionActivated() ), actionCollection(), name.latin1() ); kdDebug() << "action=" << name << " type=" << type << endl; } else if ( e.tagName() == "XMLFile" ) { TQString location = e.attribute("location"); @@ -133,14 +133,14 @@ void XPartHost_KPart::actionActivated() { const TQObject *o = sender(); - if( !o->inherits("KAction") ) return; + if( !o->inherits("TDEAction") ) return; - const KAction *action = static_cast(o); + const TDEAction *action = static_cast(o); TQString name = action->text(); int state = 0; - if(action->inherits("KToggleAction")) { - const KToggleAction *t = static_cast(action); + if(action->inherits("TDEToggleAction")) { + const TDEToggleAction *t = static_cast(action); state = t->isChecked(); } diff --git a/xparts/xpart_notepad/shell_xparthost.cpp b/xparts/xpart_notepad/shell_xparthost.cpp index 8ea38f75..16f23b62 100644 --- a/xparts/xpart_notepad/shell_xparthost.cpp +++ b/xparts/xpart_notepad/shell_xparthost.cpp @@ -28,9 +28,9 @@ ShellWindow::ShellWindow() m_partProcess->start(); // Init our Gui - (void) new KAction( "Hop", 0, this, TQT_SLOT(hop()), actionCollection(), "hop" ); + (void) new TDEAction( "Hop", 0, this, TQT_SLOT(hop()), actionCollection(), "hop" ); KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); - KSelectAction *s = new KSelectAction( "http://www.kde.org" , 0, + TDESelectAction *s = new TDESelectAction( "http://www.kde.org" , 0, actionCollection(), "location" ); connect( s, TQT_SIGNAL(activated( const TQString& ) ), this, TQT_SLOT( slotOpenUrl( const TQString & ) ) ); s->setEditable(true); -- cgit v1.2.1