summaryrefslogtreecommitdiffstats
path: root/lib/util
diff options
context:
space:
mode:
Diffstat (limited to 'lib/util')
-rw-r--r--lib/util/CMakeLists.txt2
-rw-r--r--lib/util/Makefile.am4
-rw-r--r--lib/util/blockingtdeprocess.cpp (renamed from lib/util/blockingkprocess.cpp)32
-rw-r--r--lib/util/blockingtdeprocess.h (renamed from lib/util/blockingkprocess.h)8
-rw-r--r--lib/util/configwidgetproxy.cpp18
-rw-r--r--lib/util/configwidgetproxy.h10
-rw-r--r--lib/util/domutil.cpp2
-rw-r--r--lib/util/domutil.h2
-rw-r--r--lib/util/execcommand.cpp18
-rw-r--r--lib/util/execcommand.h2
-rw-r--r--lib/util/filetemplate.cpp2
-rw-r--r--lib/util/kdevjobtimer.cpp4
-rw-r--r--lib/util/kdevjobtimer.h2
-rw-r--r--lib/util/kdevshellwidget.cpp16
-rw-r--r--lib/util/kdevshellwidget.h2
-rw-r--r--lib/util/settings.cpp2
-rw-r--r--lib/util/tdescriptactionmanager.cpp38
-rw-r--r--lib/util/tdescriptactionmanager.h4
18 files changed, 84 insertions, 84 deletions
diff --git a/lib/util/CMakeLists.txt b/lib/util/CMakeLists.txt
index 1eb17f35..121f85c2 100644
--- a/lib/util/CMakeLists.txt
+++ b/lib/util/CMakeLists.txt
@@ -30,7 +30,7 @@ install( FILES
tde_add_library( kdevutil STATIC_PIC AUTOMOC
SOURCES
- blockingkprocess.cpp configwidgetproxy.cpp
+ blockingtdeprocess.cpp configwidgetproxy.cpp
domutil.cpp execcommand.cpp filetemplate.cpp
kdeveditorutil.cpp kdevjobtimer.cpp
kdevshellwidget.cpp tdescriptactionmanager.cpp
diff --git a/lib/util/Makefile.am b/lib/util/Makefile.am
index 8bf28091..1f457040 100644
--- a/lib/util/Makefile.am
+++ b/lib/util/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces -I$(top_s
noinst_LTLIBRARIES = libkdevutil.la
-libkdevutil_la_SOURCES = blockingkprocess.cpp configwidgetproxy.cpp domutil.cpp \
+libkdevutil_la_SOURCES = blockingtdeprocess.cpp configwidgetproxy.cpp domutil.cpp \
execcommand.cpp filetemplate.cpp kdeveditorutil.cpp kdevjobtimer.cpp \
kdevshellwidget.cpp tdescriptactionmanager.cpp rurl.cpp settings.cpp urlutil.cpp
@@ -17,5 +17,5 @@ DOXYGEN_PROJECTNAME = KDevelop Utility Library
DOXYGEN_DOCDIRPREFIX = kdev
include ../../Doxyfile.am
-noinst_HEADERS = blockingkprocess.h kdeveditorutil.h kdevjobtimer.h \
+noinst_HEADERS = blockingtdeprocess.h kdeveditorutil.h kdevjobtimer.h \
kdevshellwidget.h settings.h
diff --git a/lib/util/blockingkprocess.cpp b/lib/util/blockingtdeprocess.cpp
index b88b0cad..f57ae77d 100644
--- a/lib/util/blockingkprocess.cpp
+++ b/lib/util/blockingtdeprocess.cpp
@@ -9,7 +9,7 @@
* *
***************************************************************************/
-#include "blockingkprocess.h"
+#include "blockingtdeprocess.h"
#include <tqapplication.h>
#include <tqtimer.h>
@@ -22,12 +22,12 @@ BlockingTDEProcess::BlockingTDEProcess(TQObject *parent, const char *name)
m_timeoutValue = 60;
m_timer = 0L;
- connect(this, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
- this, TQT_SLOT(slotReceivedStdOut(TDEProcess *, char *, int)));
- connect(this, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
- this, TQT_SLOT(slotReceivedStdErr(TDEProcess *, char *, int)));
- connect(this, TQT_SIGNAL(processExited(TDEProcess *)),
- this, TQT_SLOT(slotProcessExited(TDEProcess *)));
+ connect(this, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+ this, TQ_SLOT(slotReceivedStdOut(TDEProcess *, char *, int)));
+ connect(this, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+ this, TQ_SLOT(slotReceivedStdErr(TDEProcess *, char *, int)));
+ connect(this, TQ_SIGNAL(processExited(TDEProcess *)),
+ this, TQ_SLOT(slotProcessExited(TDEProcess *)));
}
BlockingTDEProcess::BlockingTDEProcess()
@@ -37,12 +37,12 @@ BlockingTDEProcess::BlockingTDEProcess()
m_stdErr = "";
m_timeoutValue = 60;
m_timer = 0L;
- connect(this, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
- this, TQT_SLOT(slotReceivedStdOut(TDEProcess *, char *, int)));
- connect(this, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
- this, TQT_SLOT(slotReceivedStdErr(TDEProcess *, char *, int)));
- connect(this, TQT_SIGNAL(processExited(TDEProcess *)),
- this, TQT_SLOT(slotProcessExited(TDEProcess *)));
+ connect(this, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+ this, TQ_SLOT(slotReceivedStdOut(TDEProcess *, char *, int)));
+ connect(this, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+ this, TQ_SLOT(slotReceivedStdErr(TDEProcess *, char *, int)));
+ connect(this, TQ_SIGNAL(processExited(TDEProcess *)),
+ this, TQ_SLOT(slotProcessExited(TDEProcess *)));
}
@@ -55,7 +55,7 @@ bool BlockingTDEProcess::start(RunMode runmode, Communication comm)
{
m_timeout = false;
m_timer = new TQTimer();
- connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeOut()));
+ connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeOut()));
m_timer->start(m_timeoutValue*1000, true);
enter_loop();
delete m_timer;
@@ -95,11 +95,11 @@ void tqt_leave_modal( TQWidget *widget );
void BlockingTDEProcess::enter_loop()
{
TQWidget dummy(0,0,WType_Dialog | WShowModal);
- dummy.setFocusPolicy( TQ_NoFocus );
+ dummy.setFocusPolicy( TQWidget::NoFocus );
tqt_enter_modal(&dummy);
tqApp->enter_loop();
tqt_leave_modal(&dummy);
}
-#include "blockingkprocess.moc"
+#include "blockingtdeprocess.moc"
diff --git a/lib/util/blockingkprocess.h b/lib/util/blockingtdeprocess.h
index 8d164bef..2252f59f 100644
--- a/lib/util/blockingkprocess.h
+++ b/lib/util/blockingtdeprocess.h
@@ -11,10 +11,10 @@
***************************************************************************/
-#ifndef BLOCKINGKPROCESS_H
-#define BLOCKINGKPROCESS_H
+#ifndef BLOCKINGTDEPROCESS_H
+#define BLOCKINGTDEPROCESS_H
-#include <kprocess.h>
+#include <tdeprocess.h>
/**
* Blocking version of TDEProcess, which stores the stdout.
@@ -30,7 +30,7 @@
class TQTimer;
class BlockingTDEProcess : public TDEProcess
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/lib/util/configwidgetproxy.cpp b/lib/util/configwidgetproxy.cpp
index 0047a3db..16f578f0 100644
--- a/lib/util/configwidgetproxy.cpp
+++ b/lib/util/configwidgetproxy.cpp
@@ -34,8 +34,8 @@
ConfigWidgetProxy::ConfigWidgetProxy( KDevCore * core )
{
- connect( core, TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(slotConfigWidget( KDialogBase*)) );
- connect( core, TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(slotProjectConfigWidget( KDialogBase*)) );
+ connect( core, TQ_SIGNAL(configWidget(KDialogBase*)), this, TQ_SLOT(slotConfigWidget( KDialogBase*)) );
+ connect( core, TQ_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQ_SLOT(slotProjectConfigWidget( KDialogBase*)) );
}
ConfigWidgetProxy::~ConfigWidgetProxy()
@@ -43,12 +43,12 @@ ConfigWidgetProxy::~ConfigWidgetProxy()
void ConfigWidgetProxy::createGlobalConfigPage( TQString const & title, unsigned int pagenumber, TQString const & icon )
{
- _globalTitleMap.insert( pagenumber, tqMakePair( title, icon ) );
+ _globalTitleMap.insert( pagenumber, qMakePair( title, icon ) );
}
void ConfigWidgetProxy::createProjectConfigPage( TQString const & title, unsigned int pagenumber, TQString const & icon )
{
- _projectTitleMap.insert( pagenumber, tqMakePair( title, icon ) );
+ _projectTitleMap.insert( pagenumber, qMakePair( title, icon ) );
}
void ConfigWidgetProxy::removeConfigPage( int pagenumber )
@@ -66,8 +66,8 @@ void ConfigWidgetProxy::slotConfigWidget( KDialogBase * dlg )
++it;
}
- connect( dlg, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT( slotAboutToShowPage(TQWidget*)) );
- connect( dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotConfigWidgetDestroyed()) );
+ connect( dlg, TQ_SIGNAL(aboutToShowPage(TQWidget*)), this, TQ_SLOT( slotAboutToShowPage(TQWidget*)) );
+ connect( dlg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotConfigWidgetDestroyed()) );
}
void ConfigWidgetProxy::slotProjectConfigWidget( KDialogBase * dlg )
@@ -79,8 +79,8 @@ void ConfigWidgetProxy::slotProjectConfigWidget( KDialogBase * dlg )
++it;
}
- connect( dlg, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT( slotAboutToShowPage(TQWidget*)) );
- connect( dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotConfigWidgetDestroyed()) );
+ connect( dlg, TQ_SIGNAL(aboutToShowPage(TQWidget*)), this, TQ_SLOT( slotAboutToShowPage(TQWidget*)) );
+ connect( dlg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotConfigWidgetDestroyed()) );
}
void ConfigWidgetProxy::slotConfigWidgetDestroyed( )
@@ -95,7 +95,7 @@ void ConfigWidgetProxy::slotAboutToShowPage( TQWidget * page )
PageMap::Iterator it = _pageMap.find( page );
if ( it != _pageMap.end() )
{
- emit insertConfigWidget( static_cast<KDialogBase*>(TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))), page, it.data() );
+ emit insertConfigWidget( static_cast<KDialogBase*>(const_cast<TQObject*>(sender())), page, it.data() );
_pageMap.remove( it );
}
}
diff --git a/lib/util/configwidgetproxy.h b/lib/util/configwidgetproxy.h
index ffbbca15..ee9a3fb0 100644
--- a/lib/util/configwidgetproxy.h
+++ b/lib/util/configwidgetproxy.h
@@ -47,8 +47,8 @@ A typical case looks like this:
_configProxy = new ConfigWidgetProxy( core() );
_configProxy->createGlobalConfigPage( i18n("My Part"), GLOBALDOC_OPTIONS, info()->icon() );
_configProxy->createProjectConfigPage( i18n("My Part"), PROJECTDOC_OPTIONS, info()->icon() );
-connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const TQObject*, TQWidget*, unsigned int )),
- this, TQT_SLOT(insertConfigWidget(const TQObject*, TQWidget*, unsigned int )) );
+connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const TQObject*, TQWidget*, unsigned int )),
+ this, TQ_SLOT(insertConfigWidget(const TQObject*, TQWidget*, unsigned int )) );
...
...
@@ -57,10 +57,10 @@ void MyPart::insertConfigWidget( TQObject const * dlg, TQWidget * page, unsigned
{
if ( pagenumber == PROJECTDOC_OPTIONS ) {
MyPartGlobalSettings * w = new MyPartGlobalSettings( this, page );
- connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) );
+ connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(slotAccept()) );
} else if ( pagenumber == PROJECTDOC_OPTIONS ) {
MyPartProjectSettings * w = new MyPartProjectSettings( this, page );
- connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) );
+ connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(slotAccept()) );
}
}
@endcode
@@ -70,7 +70,7 @@ KDevCore::projectConfigWidget() slots.
*/
class ConfigWidgetProxy : public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/lib/util/domutil.cpp b/lib/util/domutil.cpp
index 43f8d95a..7027bcfd 100644
--- a/lib/util/domutil.cpp
+++ b/lib/util/domutil.cpp
@@ -226,7 +226,7 @@ DomPath DomUtil::resolvPathStringExt(const TQString pathstring)
DomPath dompath;
for (i=0; i<pathParts.count(); i++)
{
- TQStringList pathElemParts = TQStringList::split('|',pathParts[i],TRUE);
+ TQStringList pathElemParts = TQStringList::split('|',pathParts[i],true);
DomPathElement dompathelem;
dompathelem.tagName = pathElemParts[0].simplifyWhiteSpace();
if (pathElemParts.count()>1)
diff --git a/lib/util/domutil.h b/lib/util/domutil.h
index e5614d49..9a0c24ad 100644
--- a/lib/util/domutil.h
+++ b/lib/util/domutil.h
@@ -174,7 +174,7 @@ public:
or "widget/property||2/string"
.
\verbatim
- <widget class=TQDIALOG_OBJECT_NAME_STRING>
+ <widget class="TQDialog">
<property name="name">
<cstring>KdevFormName</cstring>
</property>
diff --git a/lib/util/execcommand.cpp b/lib/util/execcommand.cpp
index 0e617762..0f6c7387 100644
--- a/lib/util/execcommand.cpp
+++ b/lib/util/execcommand.cpp
@@ -19,7 +19,7 @@
#include "execcommand.h"
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <kprogress.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
@@ -39,12 +39,12 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args,
*proc << executable;
*proc << args;
- connect( proc, TQT_SIGNAL(processExited(TDEProcess*)),
- this, TQT_SLOT(processExited()) );
- connect( proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
- this, TQT_SLOT(receivedStdout(TDEProcess*,char*,int)) );
- connect( proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
- this, TQT_SLOT(receivedStderr(TDEProcess*,char*,int)) );
+ connect( proc, TQ_SIGNAL(processExited(TDEProcess*)),
+ this, TQ_SLOT(processExited()) );
+ connect( proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+ this, TQ_SLOT(receivedStdout(TDEProcess*,char*,int)) );
+ connect( proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+ this, TQ_SLOT(receivedStderr(TDEProcess*,char*,int)) );
bool ok = proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput );
@@ -58,8 +58,8 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args,
} else {
progressDlg = new KProgressDialog( 0, 0, i18n("Command running..."),
i18n("Please wait until the \"%1\" command finishes.").arg( executable ), false );
- connect( progressDlg, TQT_SIGNAL(cancelClicked()),
- this, TQT_SLOT(cancelClicked()) );
+ connect( progressDlg, TQ_SIGNAL(cancelClicked()),
+ this, TQ_SLOT(cancelClicked()) );
}
}
diff --git a/lib/util/execcommand.h b/lib/util/execcommand.h
index 7ea1ef5c..cc546e11 100644
--- a/lib/util/execcommand.h
+++ b/lib/util/execcommand.h
@@ -44,7 +44,7 @@ Command execution facilities.
*/
class ExecCommand : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
ExecCommand( const TQString& executable, const TQStringList& args,
diff --git a/lib/util/filetemplate.cpp b/lib/util/filetemplate.cpp
index bb2cb7c6..f5c0e556 100644
--- a/lib/util/filetemplate.cpp
+++ b/lib/util/filetemplate.cpp
@@ -25,7 +25,7 @@
#include <tqregexp.h>
#include <tqtextstream.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "kdevplugin.h"
#include "kdevproject.h"
diff --git a/lib/util/kdevjobtimer.cpp b/lib/util/kdevjobtimer.cpp
index b0b78250..db095e55 100644
--- a/lib/util/kdevjobtimer.cpp
+++ b/lib/util/kdevjobtimer.cpp
@@ -15,7 +15,7 @@ KDevJobTimer::KDevJobTimer( void * payload, TQObject *parent, const char *name)
: TQTimer(parent, name)
{
m_payload = payload;
- connect( this, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()) );
+ connect( this, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout()) );
}
KDevJobTimer::~KDevJobTimer()
@@ -26,7 +26,7 @@ void KDevJobTimer::singleShot(int msec, TQObject * receiver, const char * member
{
KDevJobTimer * p = new KDevJobTimer( payload );
p->start( msec, true );
- connect( p, TQT_SIGNAL(timeout(void*)), receiver, member );
+ connect( p, TQ_SIGNAL(timeout(void*)), receiver, member );
}
void KDevJobTimer::slotTimeout()
diff --git a/lib/util/kdevjobtimer.h b/lib/util/kdevjobtimer.h
index b0fa829e..ed50e08d 100644
--- a/lib/util/kdevjobtimer.h
+++ b/lib/util/kdevjobtimer.h
@@ -16,7 +16,7 @@
class KDevJobTimer : public TQTimer
{
-Q_OBJECT
+TQ_OBJECT
public:
static void singleShot( int msec, TQObject * receiver, const char * member, void * payload );
diff --git a/lib/util/kdevshellwidget.cpp b/lib/util/kdevshellwidget.cpp
index 51d310bf..8cf5e265 100644
--- a/lib/util/kdevshellwidget.cpp
+++ b/lib/util/kdevshellwidget.cpp
@@ -16,7 +16,7 @@
#include <tdeparts/part.h>
#include <klibloader.h>
#include <kde_terminal_interface.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include "kdevshellwidget.h"
@@ -41,18 +41,18 @@ void KDevShellWidget::activate( )
KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart");
if ( !factory ) return;
- m_konsolePart = (KParts::ReadOnlyPart *) factory->create( TQT_TQOBJECT(this), "libkonsolepart", "KParts::ReadOnlyPart" );
+ m_konsolePart = (KParts::ReadOnlyPart *) factory->create( this, "libkonsolepart", "KParts::ReadOnlyPart" );
if ( !m_konsolePart ) return;
- connect( m_konsolePart, TQT_SIGNAL( processExited(TDEProcess *) ), this, TQT_SLOT( processExited(TDEProcess *) ) );
- connect( m_konsolePart, TQT_SIGNAL( receivedData( const TQString& ) ), this, TQT_SIGNAL( receivedData( const TQString& ) ) );
- connect( m_konsolePart, TQT_SIGNAL(destroyed()), this, TQT_SLOT(partDestroyed()) );
+ connect( m_konsolePart, TQ_SIGNAL( processExited(TDEProcess *) ), this, TQ_SLOT( processExited(TDEProcess *) ) );
+ connect( m_konsolePart, TQ_SIGNAL( receivedData( const TQString& ) ), this, TQ_SIGNAL( receivedData( const TQString& ) ) );
+ connect( m_konsolePart, TQ_SIGNAL(destroyed()), this, TQ_SLOT(partDestroyed()) );
- m_konsolePart->widget()->setFocusPolicy( TQ_WheelFocus );
+ m_konsolePart->widget()->setFocusPolicy( TQWidget::WheelFocus );
setFocusProxy( m_konsolePart->widget() );
m_konsolePart->widget()->setFocus();
- if ( m_konsolePart->widget()->inherits(TQFRAME_OBJECT_NAME_STRING) )
+ if ( m_konsolePart->widget()->inherits("TQFrame") )
((TQFrame*)m_konsolePart->widget())->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
m_konsolePart->widget()->show();
@@ -109,7 +109,7 @@ void KDevShellWidget::setAutoReactivateOnClose( bool doAutoActivate )
// reactivating with a non-working setting (the partDestroyed()
// slot will have ran before m_doAutoActivate is set)
if ( doAutoActivate )
- TQTimer::singleShot( 3000, this, TQT_SLOT(setAutoReactivateOnCloseDelayed()) );
+ TQTimer::singleShot( 3000, this, TQ_SLOT(setAutoReactivateOnCloseDelayed()) );
else
m_doAutoActivate = false;
}
diff --git a/lib/util/kdevshellwidget.h b/lib/util/kdevshellwidget.h
index 9ba21e2e..88a6c563 100644
--- a/lib/util/kdevshellwidget.h
+++ b/lib/util/kdevshellwidget.h
@@ -26,7 +26,7 @@ namespace KParts
class KDevShellWidget : public TQVBox
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/lib/util/settings.cpp b/lib/util/settings.cpp
index 8673b58d..8206d4b5 100644
--- a/lib/util/settings.cpp
+++ b/lib/util/settings.cpp
@@ -11,7 +11,7 @@
#include <tdeconfig.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "settings.h"
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;
diff --git a/lib/util/tdescriptactionmanager.h b/lib/util/tdescriptactionmanager.h
index 20133310..9a610845 100644
--- a/lib/util/tdescriptactionmanager.h
+++ b/lib/util/tdescriptactionmanager.h
@@ -36,7 +36,7 @@ class TQTimer;
* @author ian geiser geiseri@sourcextreme.com
*/
class KScriptAction : public TQObject, public KScriptClientInterface {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -92,7 +92,7 @@ private:
* @author ian geiser <geiseri@sourcextreme.com>
*/
class KScriptActionManager : public TQObject {
-Q_OBJECT
+TQ_OBJECT
public:
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-15 19:40:38 +0000