summaryrefslogtreecommitdiffstats
path: root/interfaces/tdescript
diff options
context:
space:
mode:
Diffstat (limited to 'interfaces/tdescript')
-rw-r--r--interfaces/tdescript/sample/shellscript.cpp8
-rw-r--r--interfaces/tdescript/sample/shellscript.h4
-rw-r--r--interfaces/tdescript/scriptclientinterface.h2
-rw-r--r--interfaces/tdescript/scriptinterface.h6
-rw-r--r--interfaces/tdescript/scriptloader.cpp10
-rw-r--r--interfaces/tdescript/scriptloader.h4
-rw-r--r--interfaces/tdescript/scriptmanager.cpp10
-rw-r--r--interfaces/tdescript/scriptmanager.h4
8 files changed, 24 insertions, 24 deletions
diff --git a/interfaces/tdescript/sample/shellscript.cpp b/interfaces/tdescript/sample/shellscript.cpp
index 766613551..13b634cc6 100644
--- a/interfaces/tdescript/sample/shellscript.cpp
+++ b/interfaces/tdescript/sample/shellscript.cpp
@@ -31,9 +31,9 @@ K_EXPORT_COMPONENT_FACTORY( libshellscript, ShellScriptFactory( "ShellScript" )
ShellScript::ShellScript(KScriptClientInterface *parent, const char *, const TQStringList & ) : ScriptClientInterface(parent)
{
m_script = new TDEProcess();
- connect ( m_script, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(Exit(TDEProcess *)));
- connect ( m_script, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(stdOut(TDEProcess *, char *, int )));
- connect ( m_script, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(stdErr(TDEProcess *, char *, int )));
+ connect ( m_script, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(Exit(TDEProcess *)));
+ connect ( m_script, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(stdOut(TDEProcess *, char *, int )));
+ connect ( m_script, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQ_SLOT(stdErr(TDEProcess *, char *, int )));
// Connect feedback signals and slots
//kdDebug() << "Building new script engine" << endl;
}
@@ -50,7 +50,7 @@ TQString ShellScript::script() const
void ShellScript::setScript( const TQString &scriptFile )
{
m_scriptName = scriptFile;
- *m_script << "sh" << m_scriptName << kapp->dcopClient()->appId();
+ *m_script << "sh" << m_scriptName << tdeApp->dcopClient()->appId();
}
void ShellScript::setScript( const TQString &, const TQString & )
diff --git a/interfaces/tdescript/sample/shellscript.h b/interfaces/tdescript/sample/shellscript.h
index 2cdaf7e5a..dc62dde33 100644
--- a/interfaces/tdescript/sample/shellscript.h
+++ b/interfaces/tdescript/sample/shellscript.h
@@ -22,11 +22,11 @@
#include <scriptinterface.h>
#include <tqvariant.h>
#include <tqobject.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
//using namespace KScriptInterface;
class ShellScript : public KScriptInterface
{
- Q_OBJECT
+ TQ_OBJECT
public:
ShellScript(KScriptClientInterface *parent, const char *name, const TQStringList &args);
virtual ~ShellScript();
diff --git a/interfaces/tdescript/scriptclientinterface.h b/interfaces/tdescript/scriptclientinterface.h
index 0f07d34b2..e1c345e10 100644
--- a/interfaces/tdescript/scriptclientinterface.h
+++ b/interfaces/tdescript/scriptclientinterface.h
@@ -33,7 +33,7 @@ class TQString;
* interfaces with this class.
* @code
* class MyScript : public TQObject, public KScriptClientInterface {
- * Q_OBJECT
+ * TQ_OBJECT
* public:
*
* MyScript(TQObject *parent)
diff --git a/interfaces/tdescript/scriptinterface.h b/interfaces/tdescript/scriptinterface.h
index 1c37b7f71..d52c0f85a 100644
--- a/interfaces/tdescript/scriptinterface.h
+++ b/interfaces/tdescript/scriptinterface.h
@@ -29,7 +29,7 @@
#define __scriptinterface_h__
#include <tqvariant.h>
#include <tqobject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
//#include <scripclientinterface.h>
class TQString;
@@ -44,9 +44,9 @@ class KScriptClientInterface;
* @author Ian Reinhart Geiser <geiseri@kde.org>
*
**/
- class KDE_EXPORT KScriptInterface : public TQObject
+ class TDE_EXPORT KScriptInterface : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
* Return the current script code data
diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp
index c21f1f794..916ad2c74 100644
--- a/interfaces/tdescript/scriptloader.cpp
+++ b/interfaces/tdescript/scriptloader.cpp
@@ -24,7 +24,7 @@
#include <tdeglobal.h>
#include <tdelocale.h>
#include <tdeconfig.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
#include <kstandarsdirs.h>
#include <tdestdaccel.h>
#include <kdebug.h>
@@ -40,7 +40,7 @@ ScriptLoader::ScriptLoader(TDEMainWindow *parent) : TQObject (parent)
m_theAction = new TDESelectAction ( i18n("TDE Scripts"),
0,
this,
- TQT_SLOT(runAction()),
+ TQ_SLOT(runAction()),
m_parent->actionCollection(),
"scripts");
}
@@ -56,7 +56,7 @@ TDESelectAction * ScriptLoader::getScripts()
// Get the available scripts for this application.
TQStringList pluginList = "";
// Find plugins
- TQString searchPath = kapp->name();
+ TQString searchPath = tdeApp->name();
searchPath += "/scripts/";
TQDir d(locate( "data", searchPath));
kdDebug() << "loading plugin from " << locate( "data", searchPath) << endl;
@@ -67,9 +67,9 @@ TDESelectAction * ScriptLoader::getScripts()
while( (fi=it.current()))
{
// Query each desktop file
- if(KDesktopFile::isDesktopFile(fi->absFilePath()))
+ if(TDEDesktopFile::isDesktopFile(fi->absFilePath()))
{
- KDesktopFile desktop((fi->absFilePath()), true);
+ TDEDesktopFile desktop((fi->absFilePath()), true);
kdDebug () << "Trying to load script type: " << desktop.readType() << endl;
KScriptInterface *tmpIface = KParts::ComponentFactory::createInstanceFromQuery<KScriptInterface>(desktop.readType() );
if( tmpIface != 0 )
diff --git a/interfaces/tdescript/scriptloader.h b/interfaces/tdescript/scriptloader.h
index 7fa4fa93f..ece776c6d 100644
--- a/interfaces/tdescript/scriptloader.h
+++ b/interfaces/tdescript/scriptloader.h
@@ -26,9 +26,9 @@
/**
* Script loader
*/
-class ScriptLoader : virtual public QObject
+class ScriptLoader : virtual public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
* Default Constructor
diff --git a/interfaces/tdescript/scriptmanager.cpp b/interfaces/tdescript/scriptmanager.cpp
index a0dfbe921..1f546485a 100644
--- a/interfaces/tdescript/scriptmanager.cpp
+++ b/interfaces/tdescript/scriptmanager.cpp
@@ -2,8 +2,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>
@@ -46,12 +46,12 @@ bool KScriptManager::addScript( const TQString &scriptDesktopFile)
TQString tmpScriptMethod = "";
// Read the desktop file
- if(KDesktopFile::isDesktopFile(scriptDesktopFile))
+ if(TDEDesktopFile::isDesktopFile(scriptDesktopFile))
{
- KDesktopFile desktop(scriptDesktopFile, true);
+ TDEDesktopFile desktop(scriptDesktopFile, true);
m_scripts.insert(desktop.readName(), new ScriptInfo());
m_scripts[desktop.readName()]->scriptType = desktop.readType();
- TQString localpath = TQString(kapp->name()) + "/scripts/" + desktop.readEntry("X-TDE-ScriptName", "");
+ TQString localpath = TQString(tdeApp->name()) + "/scripts/" + desktop.readEntry("X-TDE-ScriptName", "");
m_scripts[desktop.readName()]->scriptFile = locate("data", localpath);
// m_scripts[desktop.readName()]->scriptMethod = tmpScriptMethod;
success = true;
diff --git a/interfaces/tdescript/scriptmanager.h b/interfaces/tdescript/scriptmanager.h
index d21219901..82ca96dc7 100644
--- a/interfaces/tdescript/scriptmanager.h
+++ b/interfaces/tdescript/scriptmanager.h
@@ -36,9 +36,9 @@ class ScriptInfo;
* @author Ian Reinhart Geiser <geiseri@kde.org>
*
**/
- class KDE_EXPORT KScriptManager : public TQObject, public KScriptClientInterface
+ class TDE_EXPORT KScriptManager : public TQObject, public KScriptClientInterface
{
- Q_OBJECT
+ TQ_OBJECT
friend class KScriptInterface;
public:
/**