diff options
Diffstat (limited to 'xparts')
-rw-r--r-- | xparts/mozilla/kmozillapart.cpp | 8 | ||||
-rw-r--r-- | xparts/mozilla/kshell.cpp | 10 | ||||
-rw-r--r-- | xparts/src/tde/xparthost_kpart.cpp | 6 | ||||
-rw-r--r-- | xparts/xpart_notepad/shell_xparthost.cpp | 14 | ||||
-rw-r--r-- | xparts/xpart_notepad/xp_notepad.cpp | 2 | ||||
-rw-r--r-- | xparts/xpart_notepad/xp_notepad_factory.cpp | 8 |
6 files changed, 24 insertions, 24 deletions
diff --git a/xparts/mozilla/kmozillapart.cpp b/xparts/mozilla/kmozillapart.cpp index d59c7e2c..3bea5587 100644 --- a/xparts/mozilla/kmozillapart.cpp +++ b/xparts/mozilla/kmozillapart.cpp @@ -6,7 +6,7 @@ #include <kstdaction.h> #include <tdeaction.h> #include <tdemainwindow.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeparts/mainwindow.h> #include <kdebug.h> #include <tdeaboutdata.h> @@ -23,11 +23,11 @@ KMozillaPart::KMozillaPart(TQWidget *parentWidget, const char *widgetName, m_partProcess = new TDEProcess; *m_partProcess << "kmozilla" - << kapp->dcopClient()->appId() << objId(); + << tdeApp->dcopClient()->appId() << objId(); m_partProcess->start(); tqDebug("---->>>>>> enter loop"); - kapp->enter_loop(); + tdeApp->enter_loop(); tqDebug("----<<<<<< left loop"); } @@ -40,7 +40,7 @@ void KMozillaPart::createActions( const TQCString &xmlActions ) { XPartHost_KPart::createActions( xmlActions ); tqDebug("----<<<<<< exit loop"); - kapp->exit_loop(); + tdeApp->exit_loop(); } TDEAboutData *KMozillaPart::createAboutData() diff --git a/xparts/mozilla/kshell.cpp b/xparts/mozilla/kshell.cpp index 6417973e..33825526 100644 --- a/xparts/mozilla/kshell.cpp +++ b/xparts/mozilla/kshell.cpp @@ -7,7 +7,7 @@ #include <kstdaction.h> #include <tdeaction.h> #include <tdemainwindow.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeparts/mainwindow.h> #include <kdebug.h> @@ -22,19 +22,19 @@ public: setCentralWidget( m_host->widget() ); - connect(m_host, TQT_SIGNAL( actionsInitialized() ), this, TQT_SLOT( mergeGUI() ) ); + connect(m_host, TQ_SIGNAL( actionsInitialized() ), this, TQ_SLOT( mergeGUI() ) ); #if 1 m_partProcess = new TDEProcess; *m_partProcess << "./kmozilla" - << kapp->dcopClient()->appId() << m_host->objId(); + << tdeApp->dcopClient()->appId() << m_host->objId(); m_partProcess->start(); #endif - KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); TDESelectAction *s = new TDESelectAction( "http://www.kde.org" , 0, actionCollection(), "location" ); - connect( s, TQT_SIGNAL(activated( const TQString& ) ), this, TQT_SLOT( slotOpenUrl( const TQString & ) ) ); + connect( s, TQ_SIGNAL(activated( const TQString& ) ), this, TQ_SLOT( slotOpenUrl( const TQString & ) ) ); s->setEditable(true); } virtual ~ShellWindow() diff --git a/xparts/src/tde/xparthost_kpart.cpp b/xparts/src/tde/xparthost_kpart.cpp index 54bcb804..56049523 100644 --- a/xparts/src/tde/xparthost_kpart.cpp +++ b/xparts/src/tde/xparthost_kpart.cpp @@ -53,7 +53,7 @@ DCOPRef XPartHost_KPart::registerXPart( const DCOPRef &part ) tqDebug(" found browser extension "); be = new KBrowserSignals( this, ref ); } - return DCOPRef( kapp->dcopClient()->appId(), objId() ); + return DCOPRef( tdeApp->dcopClient()->appId(), objId() ); } @@ -77,9 +77,9 @@ void XPartHost_KPart::createActions( const TQCString &xmlActions ) TQString type = e.attribute("type"); if(type.isEmpty()) - new TDEAction( name, 0, this, TQT_SLOT( actionActivated() ), actionCollection(), name.latin1() ); + new TDEAction( name, 0, this, TQ_SLOT( actionActivated() ), actionCollection(), name.latin1() ); else if( type == "toggle" ) - new TDEToggleAction( name, 0, this, TQT_SLOT( actionActivated() ), actionCollection(), name.latin1() ); + new TDEToggleAction( name, 0, this, TQ_SLOT( actionActivated() ), actionCollection(), name.latin1() ); kdDebug() << "action=" << name << " type=" << type << endl; } else if ( e.tagName() == "XMLFile" ) { TQString location = e.attribute("location"); diff --git a/xparts/xpart_notepad/shell_xparthost.cpp b/xparts/xpart_notepad/shell_xparthost.cpp index 666c16a6..c5eb937b 100644 --- a/xparts/xpart_notepad/shell_xparthost.cpp +++ b/xparts/xpart_notepad/shell_xparthost.cpp @@ -8,7 +8,7 @@ #include <kstdaction.h> #include <tdeaction.h> #include <tdemainwindow.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeparts/mainwindow.h> #include <kdebug.h> @@ -19,20 +19,20 @@ ShellWindow::ShellWindow() setCentralWidget( m_host->widget() ); - connect(m_host, TQT_SIGNAL( actionsInitialized() ), this, TQT_SLOT( mergeGUI() ) ); + connect(m_host, TQ_SIGNAL( actionsInitialized() ), this, TQ_SLOT( mergeGUI() ) ); // Launch our XPart child. m_partProcess = new TDEProcess; *m_partProcess << "./xp_notepad" - << kapp->dcopClient()->appId() << m_host->objId(); + << tdeApp->dcopClient()->appId() << m_host->objId(); m_partProcess->start(); // Init our Gui - (void) new TDEAction( "Hop", 0, this, TQT_SLOT(hop()), actionCollection(), "hop" ); - KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); + (void) new TDEAction( "Hop", 0, this, TQ_SLOT(hop()), actionCollection(), "hop" ); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); TDESelectAction *s = new TDESelectAction( "http://www.kde.org" , 0, actionCollection(), "location" ); - connect( s, TQT_SIGNAL(activated( const TQString& ) ), this, TQT_SLOT( slotOpenUrl( const TQString & ) ) ); + connect( s, TQ_SIGNAL(activated( const TQString& ) ), this, TQ_SLOT( slotOpenUrl( const TQString & ) ) ); s->setEditable(true); kdDebug() << "KShell window created" << endl; @@ -66,7 +66,7 @@ void ShellWindow::mergeGUI() int main( int argc, char **argv ) { - TDEApplication app( argc, argv, "xparthost_shell" ); + TDEApplication app( argc, argv, TQCString("xparthost_shell") ); app.dcopClient()->registerAs("xparthost_shell"); diff --git a/xparts/xpart_notepad/xp_notepad.cpp b/xparts/xpart_notepad/xp_notepad.cpp index 48c184e8..b5cfa5e8 100644 --- a/xparts/xpart_notepad/xp_notepad.cpp +++ b/xparts/xpart_notepad/xp_notepad.cpp @@ -80,7 +80,7 @@ int main( int argc, char **argv ) } printf("args: XPartHost appId = %s , XPartHost_KPart objId = %s\n", argv[1], argv[2] ); - TDEApplication app( argc, argv, "xp_notepad" ); + TDEApplication app( argc, argv, TQCString("xp_notepad") ); XPartNotepad * xpn = new XPartNotepad("xp_notepad"); app.setMainWidget( xpn ); app.dcopClient()->attach(); diff --git a/xparts/xpart_notepad/xp_notepad_factory.cpp b/xparts/xpart_notepad/xp_notepad_factory.cpp index cfb2019b..9e4c88a5 100644 --- a/xparts/xpart_notepad/xp_notepad_factory.cpp +++ b/xparts/xpart_notepad/xp_notepad_factory.cpp @@ -24,7 +24,7 @@ #include <kstdaction.h> #include <tdeaction.h> #include <tdemainwindow.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeparts/mainwindow.h> #include <kdebug.h> #include "xp_notepad_factory.h" @@ -49,11 +49,11 @@ XP_NotepadPart::XP_NotepadPart(TQWidget *parentWidget, const char *widgetName, { m_partProcess = new TDEProcess; *m_partProcess << "xnotepard" - << kapp->dcopClient()->appId() << objId(); + << tdeApp->dcopClient()->appId() << objId(); m_partProcess->start(); tqDebug("---->>>>>> enter loop"); - kapp->enter_loop(); + tdeApp->enter_loop(); tqDebug("----<<<<<< left loop"); } @@ -66,7 +66,7 @@ void XP_NotepadPart::createActions( const TQCString &xmlActions ) { XPartHost_KPart::createActions( xmlActions ); tqDebug("----<<<<<< exit loop"); - kapp->exit_loop(); + tdeApp->exit_loop(); } #include "xp_notepad_factory.moc" |