diff options
Diffstat (limited to 'lib/util/tdescriptactionmanager.cpp')
| -rw-r--r-- | lib/util/tdescriptactionmanager.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/lib/util/tdescriptactionmanager.cpp b/lib/util/tdescriptactionmanager.cpp index c4b44894..f67a289c 100644 --- a/lib/util/tdescriptactionmanager.cpp +++ b/lib/util/tdescriptactionmanager.cpp @@ -21,8 +21,8 @@ #include <tdeparts/part.h> #include <tdeparts/componentfactory.h> #include <tdeapplication.h> -#include <kdesktopfile.h> -#include <kstandarddirs.h> +#include <tdedesktopfile.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdemessagebox.h> @@ -40,9 +40,9 @@ KScriptAction::KScriptAction( const TQString &scriptDesktopFile, TQObject *inter m_isValid = false; m_refs = 0; // Read the desktop file - if(KDesktopFile::isDesktopFile(scriptDesktopFile)) + if(TDEDesktopFile::isDesktopFile(scriptDesktopFile)) { - KDesktopFile desktop(scriptDesktopFile, true); + TDEDesktopFile desktop(scriptDesktopFile, true); TQFileInfo scriptPath(scriptDesktopFile); m_scriptFile = scriptPath.dirPath(true) + "/" + desktop.readEntry("X-TDE-ScriptName", ""); @@ -52,7 +52,7 @@ KScriptAction::KScriptAction( const TQString &scriptDesktopFile, TQObject *inter TDETrader::OfferList offers = TDETrader::self()->query( "KScriptRunner/KScriptRunner", scriptTypeQuery ); if ( !offers.isEmpty() ) { - m_action = new TDEAction(m_scriptName, TDEShortcut(), this, TQT_SLOT(activate()), ac, "script"); + m_action = new TDEAction(m_scriptName, TDEShortcut(), this, TQ_SLOT(activate()), ac, "script"); m_isValid = true; m_timeout = new TQTimer(this); TQString icon = desktop.readIcon(); @@ -60,7 +60,7 @@ KScriptAction::KScriptAction( const TQString &scriptDesktopFile, TQObject *inter if( !icon.isEmpty() ) m_action->setIcon(icon); m_action->setShortcutConfigurable(true); - connect( m_timeout, TQT_SIGNAL(timeout()), TQT_SLOT(cleanup()) ); + connect( m_timeout, TQ_SIGNAL(timeout()), TQ_SLOT(cleanup()) ); } } } @@ -91,7 +91,7 @@ void KScriptAction::activate( ) m_interface->setScript(m_scriptFile); else m_interface->setScript(m_scriptFile, m_scriptMethod); - connect(this, TQT_SIGNAL(done(KScriptClientInterface::Result, const TQVariant &)), this, TQT_SLOT(scriptFinished())); + connect(this, TQ_SIGNAL(done(KScriptClientInterface::Result, const TQVariant &)), this, TQ_SLOT(scriptFinished())); } else { @@ -101,7 +101,7 @@ void KScriptAction::activate( ) } } m_interface->run(parent(), TQVariant()); - m_timeout->start(60000,FALSE); // after 1 minute unload + m_timeout->start(60000,false); // after 1 minute unload m_refs++; } @@ -136,7 +136,7 @@ TQPtrList< TDEAction > KScriptActionManager::scripts( TQObject * interface , con TQStringList scripts; scripts += TDEGlobal::dirs()->findAllResources("data", - TQString(kapp->name())+"/scripts/*.desktop", false, true ); + TQString(tdeApp->name())+"/scripts/*.desktop", false, true ); for( TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) { @@ -152,16 +152,16 @@ TQPtrList< TDEAction > KScriptActionManager::scripts( TQObject * interface , con { actions.append(script->action()); m_actions.append(script); - connect(script, TQT_SIGNAL(error( const TQString&)), this, - TQT_SIGNAL(scriptError( const TQString&))); - connect(script, TQT_SIGNAL(warning( const TQString&)), this, - TQT_SIGNAL(scriptWarning( const TQString&))); - connect(script, TQT_SIGNAL(output( const TQString&)), this, - TQT_SIGNAL(scriptOutput( const TQString&))); - connect(script, TQT_SIGNAL(progress( int )), this, - TQT_SIGNAL(scriptProgress(int))); - connect(script, TQT_SIGNAL(done( KScriptClientInterface::Result, const TQVariant &)),this, - TQT_SIGNAL(scriptDone( KScriptClientInterface::Result, const TQVariant &))); + connect(script, TQ_SIGNAL(error( const TQString&)), this, + TQ_SIGNAL(scriptError( const TQString&))); + connect(script, TQ_SIGNAL(warning( const TQString&)), this, + TQ_SIGNAL(scriptWarning( const TQString&))); + connect(script, TQ_SIGNAL(output( const TQString&)), this, + TQ_SIGNAL(scriptOutput( const TQString&))); + connect(script, TQ_SIGNAL(progress( int )), this, + TQ_SIGNAL(scriptProgress(int))); + connect(script, TQ_SIGNAL(done( KScriptClientInterface::Result, const TQVariant &)),this, + TQ_SIGNAL(scriptDone( KScriptClientInterface::Result, const TQVariant &))); } else delete script; |