summaryrefslogtreecommitdiffstats
path: root/kjsembed
diff options
context:
space:
mode:
Diffstat (limited to 'kjsembed')
-rw-r--r--kjsembed/Makefile.am2
-rw-r--r--kjsembed/bindings/bindingobject.h2
-rw-r--r--kjsembed/bindings/dcop_imp.h2
-rw-r--r--kjsembed/bindings/movie_imp.h2
-rw-r--r--kjsembed/bindings/netaccess_imp.h2
-rw-r--r--kjsembed/bindings/sql_imp.h4
-rw-r--r--kjsembed/bindings/tdeconfig_imp.h2
-rw-r--r--kjsembed/bindwizard/binding_wizard.ui17
-rw-r--r--kjsembed/docs/embedding/qtembed/posviewbase.ui6
-rw-r--r--kjsembed/docs/embedding/qtembed/posviewimp.h2
-rw-r--r--kjsembed/docs/embedding/simple-embed/embedview.ui15
-rw-r--r--kjsembed/docs/embedding/simple-embed/embedviewimp.h2
-rw-r--r--kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui28
-rw-r--r--kjsembed/docs/examples/connect/connect.ui10
-rw-r--r--kjsembed/docs/examples/docviewer/docviewer.ui8
-rw-r--r--kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui19
-rw-r--r--kjsembed/docs/examples/imagefun/bump.ui14
-rw-r--r--kjsembed/docs/examples/imunge/effectbrowser.ui6
-rw-r--r--kjsembed/docs/examples/imunge/resizeparams.ui15
-rw-r--r--kjsembed/docs/examples/madminute/configdialog.ui13
-rw-r--r--kjsembed/docs/examples/madminute/madminute.ui3
-rw-r--r--kjsembed/docs/examples/qdocviewer/docviewer.ui6
-rw-r--r--kjsembed/jsbindingplugin.h2
-rw-r--r--kjsembed/jsconsolewidget.cpp16
-rw-r--r--kjsembed/jsconsolewidget.h2
-rw-r--r--kjsembed/jsobjecteventproxy.h2
-rw-r--r--kjsembed/kjscmd.134
-rw-r--r--kjsembed/kjscmd.cpp2
-rw-r--r--kjsembed/kjsembedpart.h2
-rw-r--r--kjsembed/ksimpleprocess.cpp6
-rw-r--r--kjsembed/ksimpleprocess.h2
-rw-r--r--kjsembed/plugin/jsconsoleplugin.cpp2
-rw-r--r--kjsembed/plugin/jsconsoleplugin.h2
-rw-r--r--kjsembed/plugins/customqobject_plugin.h2
-rw-r--r--kjsembed/plugins/qprocess_plugin.h2
-rw-r--r--kjsembed/qjscmd.cpp2
-rw-r--r--kjsembed/qtbindings/qcanvasitem_imp.cpp2
-rw-r--r--kjsembed/qtstubs.h4
-rw-r--r--kjsembed/slotproxy.h2
-rw-r--r--kjsembed/tdescript/javascript.h2
-rw-r--r--kjsembed/tdescript/swaptabs.ui6
-rw-r--r--kjsembed/testkjsembed.cpp2
-rw-r--r--kjsembed/tests/test.ui6
-rw-r--r--kjsembed/tests/testkjsembed.cpp2
-rw-r--r--kjsembed/tools/headers/qbrush.h6
-rw-r--r--kjsembed/tools/headers/qcanvas.h16
-rw-r--r--kjsembed/tools/headers/qdir.h2
-rw-r--r--kjsembed/tools/headers/qpen.h8
-rw-r--r--kjsembed/tools/headers/qtimer.h4
-rw-r--r--kjsembed/xmlactionclient.cpp4
-rw-r--r--kjsembed/xmlactionclient.h2
51 files changed, 102 insertions, 224 deletions
diff --git a/kjsembed/Makefile.am b/kjsembed/Makefile.am
index 1c8b3477..f98ad856 100644
--- a/kjsembed/Makefile.am
+++ b/kjsembed/Makefile.am
@@ -61,8 +61,6 @@ kjscmd_SOURCES = kjscmd.cpp
kjscmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_KJS)
kjscmd_LDADD = libkjsembed.la
-man_MANS = kjscmd.1
-
xdg_apps_DATA = kjscmd.desktop
plugintypedir = $(kde_servicetypesdir)
diff --git a/kjsembed/bindings/bindingobject.h b/kjsembed/bindings/bindingobject.h
index bded72ac..17b51fa5 100644
--- a/kjsembed/bindings/bindingobject.h
+++ b/kjsembed/bindings/bindingobject.h
@@ -35,7 +35,7 @@ namespace Bindings {
*/
class BindingObject : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
BindingObject( TQObject *parent, const char *name=0 );
diff --git a/kjsembed/bindings/dcop_imp.h b/kjsembed/bindings/dcop_imp.h
index 19575e31..c843b2f1 100644
--- a/kjsembed/bindings/dcop_imp.h
+++ b/kjsembed/bindings/dcop_imp.h
@@ -50,7 +50,7 @@ class JSDCOPInterfacerLoader : public JSBindingBase
*/
class JSDCOPInterface : public BindingObject, public DCOPObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
JSDCOPInterface( KJS::Interpreter *js, TQObject *parent, const char *name=0 );
diff --git a/kjsembed/bindings/movie_imp.h b/kjsembed/bindings/movie_imp.h
index 9a76c51b..59c58463 100644
--- a/kjsembed/bindings/movie_imp.h
+++ b/kjsembed/bindings/movie_imp.h
@@ -35,7 +35,7 @@ namespace Bindings {
*/
class Movie : public BindingObject
{
- Q_OBJECT
+ TQ_OBJECT
TQ_PROPERTY( TQColor setBackgroundColor READ backgroundColor )
TQ_PROPERTY( int setSpeed READ speed )
diff --git a/kjsembed/bindings/netaccess_imp.h b/kjsembed/bindings/netaccess_imp.h
index 962572dd..9acd4bb0 100644
--- a/kjsembed/bindings/netaccess_imp.h
+++ b/kjsembed/bindings/netaccess_imp.h
@@ -34,7 +34,7 @@ namespace Bindings {
*/
class NetAccess : public BindingObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
NetAccess( TQObject *parent, const char *name=0 );
virtual ~NetAccess();
diff --git a/kjsembed/bindings/sql_imp.h b/kjsembed/bindings/sql_imp.h
index 08555e84..3f287a13 100644
--- a/kjsembed/bindings/sql_imp.h
+++ b/kjsembed/bindings/sql_imp.h
@@ -35,7 +35,7 @@ namespace Bindings {
*/
class SqlQuery : public BindingObject
{
- Q_OBJECT
+ TQ_OBJECT
TQ_PROPERTY( int size READ size)
TQ_PROPERTY( int at READ at)
TQ_PROPERTY( int numRowsAffected READ numRowsAffected )
@@ -88,7 +88,7 @@ private:
*/
class SqlDatabase : public BindingObject
{
- Q_OBJECT
+ TQ_OBJECT
TQ_PROPERTY( TQString databaseName READ databaseName WRITE setDatabaseName)
TQ_PROPERTY( TQString userName READ userName WRITE setUserName)
TQ_PROPERTY( TQString password READ password WRITE setPassword)
diff --git a/kjsembed/bindings/tdeconfig_imp.h b/kjsembed/bindings/tdeconfig_imp.h
index 4c954fbe..36ceec36 100644
--- a/kjsembed/bindings/tdeconfig_imp.h
+++ b/kjsembed/bindings/tdeconfig_imp.h
@@ -42,7 +42,7 @@ namespace Bindings {
class Config : public BindingObject
{
- Q_OBJECT
+ TQ_OBJECT
TQ_PROPERTY( bool forceGlobal READ forceGlobal WRITE setForceGlobal )
TQ_PROPERTY( bool dollarExpansion READ isDollarExpansion WRITE setDollarExpansion )
TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly )
diff --git a/kjsembed/bindwizard/binding_wizard.ui b/kjsembed/bindwizard/binding_wizard.ui
index baacdca5..352b68d8 100644
--- a/kjsembed/bindwizard/binding_wizard.ui
+++ b/kjsembed/bindwizard/binding_wizard.ui
@@ -476,15 +476,10 @@ files of the C++ classes you want to make available to Javascript are located.</
</widget>
</widget>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>kled.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>tdelistview.h</includehint>
- <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kled.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
</UI>
diff --git a/kjsembed/docs/embedding/qtembed/posviewbase.ui b/kjsembed/docs/embedding/qtembed/posviewbase.ui
index 4916d505..6c55b01e 100644
--- a/kjsembed/docs/embedding/qtembed/posviewbase.ui
+++ b/kjsembed/docs/embedding/qtembed/posviewbase.ui
@@ -137,9 +137,6 @@
<property name="text">
<string>&amp;OK</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
@@ -154,9 +151,6 @@
<property name="text">
<string>&amp;Cancel</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
diff --git a/kjsembed/docs/embedding/qtembed/posviewimp.h b/kjsembed/docs/embedding/qtembed/posviewimp.h
index 764ac813..cd629a0f 100644
--- a/kjsembed/docs/embedding/qtembed/posviewimp.h
+++ b/kjsembed/docs/embedding/qtembed/posviewimp.h
@@ -13,7 +13,7 @@ namespace KJSEmbed {
};
class POSViewImp: public POSViewBase {
- Q_OBJECT
+ TQ_OBJECT
public:
POSViewImp( TQWidget *parent = 0, const char *name = 0 );
diff --git a/kjsembed/docs/embedding/simple-embed/embedview.ui b/kjsembed/docs/embedding/simple-embed/embedview.ui
index 44985f72..58c75064 100644
--- a/kjsembed/docs/embedding/simple-embed/embedview.ui
+++ b/kjsembed/docs/embedding/simple-embed/embedview.ui
@@ -96,9 +96,6 @@
<property name="text">
<string>Console</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="stdItem" stdset="0">
<number>0</number>
</property>
@@ -172,12 +169,8 @@
<slot>consoleClicked()</slot>
</slots>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
</UI>
diff --git a/kjsembed/docs/embedding/simple-embed/embedviewimp.h b/kjsembed/docs/embedding/simple-embed/embedviewimp.h
index 7c678a32..d8b96572 100644
--- a/kjsembed/docs/embedding/simple-embed/embedviewimp.h
+++ b/kjsembed/docs/embedding/simple-embed/embedviewimp.h
@@ -13,7 +13,7 @@ namespace KJSEmbed {
}
class EmbedViewImp: public EmbedView {
- Q_OBJECT
+ TQ_OBJECT
public:
EmbedViewImp( TQWidget *parent = 0, const char *name = 0 );
diff --git a/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui b/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui
index 3af30e5e..7ffe890d 100644
--- a/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui
+++ b/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui
@@ -570,23 +570,13 @@
</connection>
</connections>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
- <includehint>kurlrequester.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>tdefontrequester.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>kdualcolorbutton.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+ <include location="global" impldecl="in implementation">kdualcolorbutton.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">knuminput.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">kurlrequester.h</include>
+ <include location="global" impldecl="in implementation">tdefontrequester.h</include>
+</includes>
</UI>
diff --git a/kjsembed/docs/examples/connect/connect.ui b/kjsembed/docs/examples/connect/connect.ui
index 5c33501e..153f264b 100644
--- a/kjsembed/docs/examples/connect/connect.ui
+++ b/kjsembed/docs/examples/connect/connect.ui
@@ -152,9 +152,9 @@
</grid>
</widget>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>ktextbrowser.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">knuminput.h</include>
+ <include location="global" impldecl="in implementation">ktextbrowser.h</include>
+</includes>
</UI>
diff --git a/kjsembed/docs/examples/docviewer/docviewer.ui b/kjsembed/docs/examples/docviewer/docviewer.ui
index b27ac94b..bcefe398 100644
--- a/kjsembed/docs/examples/docviewer/docviewer.ui
+++ b/kjsembed/docs/examples/docviewer/docviewer.ui
@@ -62,8 +62,8 @@
</grid>
</widget>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>tdelistbox.h</includehint>
- <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">tdelistbox.h</include>
+</includes>
</UI>
diff --git a/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui b/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui
index 14bf9f99..fb1e84ac 100644
--- a/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui
+++ b/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui
@@ -551,18 +551,9 @@
<customwidgets>
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>tdefontrequester.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">tdefontrequester.h</include>
+</includes>
</UI>
diff --git a/kjsembed/docs/examples/imagefun/bump.ui b/kjsembed/docs/examples/imagefun/bump.ui
index eb342eac..fb91050b 100644
--- a/kjsembed/docs/examples/imagefun/bump.ui
+++ b/kjsembed/docs/examples/imagefun/bump.ui
@@ -313,15 +313,7 @@
<customwidgets>
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
</UI>
diff --git a/kjsembed/docs/examples/imunge/effectbrowser.ui b/kjsembed/docs/examples/imunge/effectbrowser.ui
index 09dcac7b..95373c2c 100644
--- a/kjsembed/docs/examples/imunge/effectbrowser.ui
+++ b/kjsembed/docs/examples/imunge/effectbrowser.ui
@@ -145,7 +145,7 @@
</image>
</images>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
</UI>
diff --git a/kjsembed/docs/examples/imunge/resizeparams.ui b/kjsembed/docs/examples/imunge/resizeparams.ui
index a7dbfd0a..ec0cecf3 100644
--- a/kjsembed/docs/examples/imunge/resizeparams.ui
+++ b/kjsembed/docs/examples/imunge/resizeparams.ui
@@ -141,9 +141,6 @@
<property name="text">
<string>&amp;OK</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
@@ -158,9 +155,6 @@
<property name="text">
<string>&amp;Cancel</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
@@ -184,10 +178,7 @@
</connection>
</connections>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
</UI>
diff --git a/kjsembed/docs/examples/madminute/configdialog.ui b/kjsembed/docs/examples/madminute/configdialog.ui
index 968c9b1f..8e7e6de5 100644
--- a/kjsembed/docs/examples/madminute/configdialog.ui
+++ b/kjsembed/docs/examples/madminute/configdialog.ui
@@ -176,9 +176,6 @@
<property name="text">
<string>&amp;OK</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
@@ -193,9 +190,6 @@
<property name="text">
<string>&amp;Cancel</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
@@ -267,8 +261,7 @@
</connection>
</connections>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
</UI>
diff --git a/kjsembed/docs/examples/madminute/madminute.ui b/kjsembed/docs/examples/madminute/madminute.ui
index 1154312a..e9c84652 100644
--- a/kjsembed/docs/examples/madminute/madminute.ui
+++ b/kjsembed/docs/examples/madminute/madminute.ui
@@ -321,9 +321,6 @@
<property name="menuText">
<string>&amp;About</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</action>
<action>
<property name="name">
diff --git a/kjsembed/docs/examples/qdocviewer/docviewer.ui b/kjsembed/docs/examples/qdocviewer/docviewer.ui
index 94b7458b..b9bb38d7 100644
--- a/kjsembed/docs/examples/qdocviewer/docviewer.ui
+++ b/kjsembed/docs/examples/qdocviewer/docviewer.ui
@@ -414,9 +414,6 @@
<property name="menuText">
<string>E&amp;xit</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</action>
<action>
<property name="name">
@@ -479,9 +476,6 @@
<property name="menuText">
<string>&amp;About</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</action>
</actions>
<images>
diff --git a/kjsembed/jsbindingplugin.h b/kjsembed/jsbindingplugin.h
index 2c9998c2..eec80d6d 100644
--- a/kjsembed/jsbindingplugin.h
+++ b/kjsembed/jsbindingplugin.h
@@ -38,7 +38,7 @@ namespace KJSEmbed {
* @version $Id$
*/
class KJSEMBED_EXPORT JSBindingPlugin : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
JSBindingPlugin( TQObject *parent, const char *name, const TQStringList &args );
virtual ~JSBindingPlugin();
diff --git a/kjsembed/jsconsolewidget.cpp b/kjsembed/jsconsolewidget.cpp
index 594cfce8..e536fba5 100644
--- a/kjsembed/jsconsolewidget.cpp
+++ b/kjsembed/jsconsolewidget.cpp
@@ -94,12 +94,12 @@ void JSConsoleWidget::createView()
go = new TQPushButton( i18n("&Run"), cmdBox, "run_button" );
go->setFixedSize( go->sizeHint() );
- connect( cmd, TQT_SIGNAL(returnPressed(const TQString&)), go, TQT_SLOT( animateClick() ) );
- connect( go, TQT_SIGNAL( clicked() ), TQT_SLOT( invoke() ) );
+ connect( cmd, TQ_SIGNAL(returnPressed(const TQString&)), go, TQ_SLOT( animateClick() ) );
+ connect( go, TQ_SIGNAL( clicked() ), TQ_SLOT( invoke() ) );
// Setup completion
TDECompletion *comp = cmd->completionObject();
- connect( cmd, TQT_SIGNAL(returnPressed(const TQString&)), comp, TQT_SLOT(addItem(const TQString&)) );
+ connect( cmd, TQ_SIGNAL(returnPressed(const TQString&)), comp, TQ_SLOT(addItem(const TQString&)) );
// Layout
TQVBoxLayout *vert = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
@@ -192,11 +192,11 @@ bool JSConsoleWidget::run( const TQString &cmd )
proc = new KShellProcess("/bin/sh");
*proc << cmd;
- connect( proc, TQT_SIGNAL( processExited(TDEProcess *) ), TQT_SLOT( childExited() ) );
- connect( proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int) ),
- this, TQT_SLOT( receivedStdOutput(TDEProcess *, char *, int) ) );
- connect( proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int) ),
- this, TQT_SLOT( receivedStdError(TDEProcess *, char *, int) ) );
+ connect( proc, TQ_SIGNAL( processExited(TDEProcess *) ), TQ_SLOT( childExited() ) );
+ connect( proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int) ),
+ this, TQ_SLOT( receivedStdOutput(TDEProcess *, char *, int) ) );
+ connect( proc, TQ_SIGNAL( receivedStderr(TDEProcess *, char *, int) ),
+ this, TQ_SLOT( receivedStdError(TDEProcess *, char *, int) ) );
return proc->start( TDEProcess::NotifyOnExit,
TDEProcess::Communication( TDEProcess::Stdout|TDEProcess::Stderr ));
diff --git a/kjsembed/jsconsolewidget.h b/kjsembed/jsconsolewidget.h
index 6bb347ab..328fd43f 100644
--- a/kjsembed/jsconsolewidget.h
+++ b/kjsembed/jsconsolewidget.h
@@ -59,7 +59,7 @@ class KJSEmbedPart;
*/
class KJSEMBED_EXPORT JSConsoleWidget : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
JSConsoleWidget( KJSEmbedPart *js, TQWidget *parent=0, const char *name=0 );
diff --git a/kjsembed/jsobjecteventproxy.h b/kjsembed/jsobjecteventproxy.h
index f5d98528..c9613e79 100644
--- a/kjsembed/jsobjecteventproxy.h
+++ b/kjsembed/jsobjecteventproxy.h
@@ -37,7 +37,7 @@ class JSObjectProxy;
*/
class KJSEMBED_EXPORT JSObjectEventProxy : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
JSObjectEventProxy( JSObjectProxy *parent, const char *name=0 );
diff --git a/kjsembed/kjscmd.1 b/kjsembed/kjscmd.1
deleted file mode 100644
index c0765aeb..00000000
--- a/kjsembed/kjscmd.1
+++ /dev/null
@@ -1,34 +0,0 @@
-.TH "kjscmd" 1
-.SH NAME
-kjscmd \- A tool for running KJSEmbed scripts from the command line
-.SH SYNOPSIS
-.B kjscmd
-kjscmd [Qt-options] [TDE-options] [options] [file]
-.SH DESCRIPTION
-kjscmd is a tool for launching KJSEmbed scripts from the command line, and
-can also provide a console for running commands interactively. It will run
-the named file using KJSEmbed (or read a file from stdin if '-' is
-specified).
-.SH OPTIONS
-.TP
-.B \-\-console \-c
-Enables the graphical console. The console will not be visible unless the
-script enters the event loop or the --exec parameter is used. If no script
-was specified on the command line then the event loop is entered
-automatically.
-.TP
-.B \-\-interactive \-i
-Enables the interactive command line prompt.
-.TP
-.B \-\-exec
-Tells kjscmd to enter the event loop after executing the script. This option
-is rarely used, but it can be handy if you want to use the console to examine
-the state of the interpreter after a non-graphical script has executed.
-.TP
-.B \-\-nogui
-Tells kjscmd not to create an X connection. This allows you to use scripts
-without needing an X server (though with reduced functionality).
-.SH BUGS
-There are probably lots of bugs. Use http://bugs.trinitydesktop.org/ to report them.
-
-
diff --git a/kjsembed/kjscmd.cpp b/kjsembed/kjscmd.cpp
index 316944ed..d8ee0817 100644
--- a/kjsembed/kjscmd.cpp
+++ b/kjsembed/kjscmd.cpp
@@ -99,7 +99,7 @@ int main( int argc, char **argv )
}
else {
app = new TDEApplication;
- app->connect( app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) );
+ app->connect( app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) );
}
// Setup the rest
diff --git a/kjsembed/kjsembedpart.h b/kjsembed/kjsembedpart.h
index e04e1276..676e27c2 100644
--- a/kjsembed/kjsembedpart.h
+++ b/kjsembed/kjsembedpart.h
@@ -71,7 +71,7 @@ class JSBuiltIn;
*/
class KJSEMBED_EXPORT KJSEmbedPart : public KParts::ReadOnlyPart
{
- Q_OBJECT
+ TQ_OBJECT
TQ_PROPERTY( TQStringList constructorNames READ constructorNames )
TQ_PROPERTY( TQCString versionString READ versionString )
TQ_PROPERTY( int versionMajor READ versionMajor )
diff --git a/kjsembed/ksimpleprocess.cpp b/kjsembed/ksimpleprocess.cpp
index 96d3fea3..8777c2b9 100644
--- a/kjsembed/ksimpleprocess.cpp
+++ b/kjsembed/ksimpleprocess.cpp
@@ -34,10 +34,10 @@ TQString KSimpleProcess::exec( const TQString &args, bool addStdErr )
TQString KSimpleProcess::execInternal( const TQString &args, bool addStdError)
{
m_proc->setArguments( splitArgList( args ));
- connect(m_proc, TQT_SIGNAL(processExited()), this, TQT_SLOT(slotProcessExited()));
- connect(m_proc, TQT_SIGNAL(readyReadStdout()), this, TQT_SLOT(slotReceivedStdout()));
+ connect(m_proc, TQ_SIGNAL(processExited()), this, TQ_SLOT(slotProcessExited()));
+ connect(m_proc, TQ_SIGNAL(readyReadStdout()), this, TQ_SLOT(slotReceivedStdout()));
if( addStdError )
- connect(m_proc, TQT_SIGNAL(readyReadStderr()), this, TQT_SLOT(slotReceivedStderr()));
+ connect(m_proc, TQ_SIGNAL(readyReadStderr()), this, TQ_SLOT(slotReceivedStderr()));
if ( !m_proc->start() )
return i18n("Could not run command '%1'.").arg( args.latin1() );
diff --git a/kjsembed/ksimpleprocess.h b/kjsembed/ksimpleprocess.h
index e04d7b51..de11e24a 100644
--- a/kjsembed/ksimpleprocess.h
+++ b/kjsembed/ksimpleprocess.h
@@ -31,7 +31,7 @@
*/
class KSimpleProcess : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kjsembed/plugin/jsconsoleplugin.cpp b/kjsembed/plugin/jsconsoleplugin.cpp
index 3dc8d7cf..5f6a9e8f 100644
--- a/kjsembed/plugin/jsconsoleplugin.cpp
+++ b/kjsembed/plugin/jsconsoleplugin.cpp
@@ -51,7 +51,7 @@ JSConsolePlugin::JSConsolePlugin( TQObject *parent, const char *name, const TQSt
menu->setDelayed( false );
menu->insert( new TDEAction( i18n("&Console"), 0,
- this, TQT_SLOT( showConsole() ),
+ this, TQ_SLOT( showConsole() ),
actionCollection(), "jsconsole_show") );
}
diff --git a/kjsembed/plugin/jsconsoleplugin.h b/kjsembed/plugin/jsconsoleplugin.h
index 1c1e7138..17e0b6a9 100644
--- a/kjsembed/plugin/jsconsoleplugin.h
+++ b/kjsembed/plugin/jsconsoleplugin.h
@@ -34,7 +34,7 @@ namespace KJSEmbed {
*/
class JSConsolePlugin : public KParts::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
JSConsolePlugin( TQObject *parent, const char *name, const TQStringList & );
diff --git a/kjsembed/plugins/customqobject_plugin.h b/kjsembed/plugins/customqobject_plugin.h
index 03f57769..0d6f2aac 100644
--- a/kjsembed/plugins/customqobject_plugin.h
+++ b/kjsembed/plugins/customqobject_plugin.h
@@ -38,7 +38,7 @@ public:
class MyCustomTQObjectImp : public TQObject {
-Q_OBJECT
+TQ_OBJECT
/** Identifiers for the methods provided by this class. */
enum Mode { On, Off };
diff --git a/kjsembed/plugins/qprocess_plugin.h b/kjsembed/plugins/qprocess_plugin.h
index 2aecc188..5993e0f9 100644
--- a/kjsembed/plugins/qprocess_plugin.h
+++ b/kjsembed/plugins/qprocess_plugin.h
@@ -39,7 +39,7 @@ public:
class ProcessImp : public TQProcess {
-Q_OBJECT
+TQ_OBJECT
/** Identifiers for the methods provided by this class. */
enum Communication { Stdin = 0x01, Stdout = 0x02, Stderr = 0x04, DupStderr = 0x08 };
diff --git a/kjsembed/qjscmd.cpp b/kjsembed/qjscmd.cpp
index f621374e..ae4fe736 100644
--- a/kjsembed/qjscmd.cpp
+++ b/kjsembed/qjscmd.cpp
@@ -43,7 +43,7 @@ int main( int argc, char **argv )
// Setup TQApplication
TQApplication *app;
app = new TQApplication( argc, argv );
- app->connect( app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) );
+ app->connect( app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) );
// Setup Interpreter
KJSEmbed::JSSecurityPolicy::setDefaultPolicy( KJSEmbed::JSSecurityPolicy::CapabilityAll );
diff --git a/kjsembed/qtbindings/qcanvasitem_imp.cpp b/kjsembed/qtbindings/qcanvasitem_imp.cpp
index 278252eb..36105a92 100644
--- a/kjsembed/qtbindings/qcanvasitem_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasitem_imp.cpp
@@ -163,7 +163,7 @@ TQCanvasItem *TQCanvasItemImp::toTQCanvasItem( KJS::Object &self )
if ( !op )
return 0;
/*
- if ( !op->inherits(TQCANVASITEM_OBJECT_NAME_STRING) ) {
+ if ( !op->inherits("TQCanvasItem") ) {
kdDebug() << "Typename of opaque canvas item is " << op->typeName() << endl;
// Check superclasses
return 0;
diff --git a/kjsembed/qtstubs.h b/kjsembed/qtstubs.h
index 43c712ab..96c1f058 100644
--- a/kjsembed/qtstubs.h
+++ b/kjsembed/qtstubs.h
@@ -34,7 +34,7 @@ namespace KParts {
class KJSEMBED_EXPORT ReadOnlyPart : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
ReadOnlyPart( TQObject *parent, const char *name=0 );
@@ -48,7 +48,7 @@ private:
class KJSEMBED_EXPORT ReadWritePart : public ReadOnlyPart
{
- Q_OBJECT
+ TQ_OBJECT
public:
ReadWritePart( TQObject *parent, const char *name=0 );
diff --git a/kjsembed/slotproxy.h b/kjsembed/slotproxy.h
index 13469ba7..90cb57dd 100644
--- a/kjsembed/slotproxy.h
+++ b/kjsembed/slotproxy.h
@@ -49,7 +49,7 @@ class JSObjectProxy;
*/
class KJSEMBED_EXPORT JSSlotProxy : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
JSSlotProxy( TQObject *parent, const char *name=0 );
diff --git a/kjsembed/tdescript/javascript.h b/kjsembed/tdescript/javascript.h
index 9ca87f24..e1116a73 100644
--- a/kjsembed/tdescript/javascript.h
+++ b/kjsembed/tdescript/javascript.h
@@ -30,7 +30,7 @@ namespace KJSEmbed {
//using namespace KScriptInterface;
class JavaScript : public KScriptInterface
{
- Q_OBJECT
+ TQ_OBJECT
TQ_PROPERTY( TQString appID READ appID )
public:
diff --git a/kjsembed/tdescript/swaptabs.ui b/kjsembed/tdescript/swaptabs.ui
index f7f5e973..d9f9a4d8 100644
--- a/kjsembed/tdescript/swaptabs.ui
+++ b/kjsembed/tdescript/swaptabs.ui
@@ -126,9 +126,6 @@
<property name="text">
<string>&amp;OK</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
@@ -143,9 +140,6 @@
<property name="text">
<string>&amp;Cancel</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
diff --git a/kjsembed/testkjsembed.cpp b/kjsembed/testkjsembed.cpp
index 42f3ad07..4b138e8e 100644
--- a/kjsembed/testkjsembed.cpp
+++ b/kjsembed/testkjsembed.cpp
@@ -49,7 +49,7 @@ int main( int argc, char **argv )
// Setup Window
app.setMainWidget( console );
- app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) );
+ app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) );
console->resize( 600, 450 );
console->show();
diff --git a/kjsembed/tests/test.ui b/kjsembed/tests/test.ui
index 477d8c2d..4c031d9b 100644
--- a/kjsembed/tests/test.ui
+++ b/kjsembed/tests/test.ui
@@ -105,7 +105,7 @@
</connection>
</connections>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
</UI>
diff --git a/kjsembed/tests/testkjsembed.cpp b/kjsembed/tests/testkjsembed.cpp
index 1986cc2d..7018497f 100644
--- a/kjsembed/tests/testkjsembed.cpp
+++ b/kjsembed/tests/testkjsembed.cpp
@@ -52,7 +52,7 @@ int main( int argc, char **argv )
// Setup Window
app.setMainWidget( console );
- app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) );
+ app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) );
console->resize( 600, 450 );
console->show();
diff --git a/kjsembed/tools/headers/qbrush.h b/kjsembed/tools/headers/qbrush.h
index 6fc18ccf..5c5fb034 100644
--- a/kjsembed/tools/headers/qbrush.h
+++ b/kjsembed/tools/headers/qbrush.h
@@ -44,7 +44,7 @@
#endif // QT_H
-class Q_EXPORT TQBrush: public Qt
+class TQ_EXPORT TQBrush: public Qt
{
friend class TQPainter;
public:
@@ -84,8 +84,8 @@ private:
*****************************************************************************/
#ifndef TQT_NO_DATASTREAM
-Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBrush & );
-Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQBrush & );
+TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBrush & );
+TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQBrush & );
#endif
#endif // TQBRUSH_H
diff --git a/kjsembed/tools/headers/qcanvas.h b/kjsembed/tools/headers/qcanvas.h
index bbd97489..dbdd6548 100644
--- a/kjsembed/tools/headers/qcanvas.h
+++ b/kjsembed/tools/headers/qcanvas.h
@@ -52,7 +52,7 @@
#define TQM_EXPORT_CANVAS
#define TQM_TEMPLATE_EXTERN_CANVAS
#else
-#define TQM_EXPORT_CANVAS Q_EXPORT
+#define TQM_EXPORT_CANVAS TQ_EXPORT
#define TQM_TEMPLATE_EXTERN_CANVAS Q_TEMPLATE_EXTERN
#endif
@@ -133,16 +133,6 @@ public:
virtual void setActive(bool yes);
bool isActive() const
{ return (bool)act; }
-#ifndef TQT_NO_COMPAT
- bool visible() const
- { return (bool)vis; }
- bool selected() const
- { return (bool)sel; }
- bool enabled() const
- { return (bool)ena; }
- bool active() const
- { return (bool)act; }
-#endif
enum RttiValues {
Rtti_Item = 0,
@@ -208,7 +198,7 @@ class TQCanvasData;
class TQM_EXPORT_CANVAS TQCanvas : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
TQCanvas( TQObject* parent = 0, const char* name = 0 );
TQCanvas(int w, int h);
@@ -354,7 +344,7 @@ class TQCanvasViewData;
class TQM_EXPORT_CANVAS TQCanvasView : public TQScrollView
{
- Q_OBJECT
+ TQ_OBJECT
public:
TQCanvasView(TQWidget* parent=0, const char* name=0, WFlags f=0);
diff --git a/kjsembed/tools/headers/qdir.h b/kjsembed/tools/headers/qdir.h
index 7fda3222..88c42ce3 100644
--- a/kjsembed/tools/headers/qdir.h
+++ b/kjsembed/tools/headers/qdir.h
@@ -52,7 +52,7 @@ class TQStringList;
template <class T> class TQDeepCopy;
-class Q_EXPORT TQDir
+class TQ_EXPORT TQDir
{
public:
enum FilterSpec { Dirs = 0x001,
diff --git a/kjsembed/tools/headers/qpen.h b/kjsembed/tools/headers/qpen.h
index 40e9767e..17fc002c 100644
--- a/kjsembed/tools/headers/qpen.h
+++ b/kjsembed/tools/headers/qpen.h
@@ -44,7 +44,7 @@
#endif // QT_H
-class Q_EXPORT TQPen: public Qt
+class TQ_EXPORT TQPen: public Qt
{
public:
TQPen();
@@ -72,7 +72,7 @@ public:
private:
friend class TQPainter;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
friend class TQFontEngineWin;
#endif
@@ -92,8 +92,8 @@ private:
TQPen stream functions
*****************************************************************************/
#ifndef TQT_NO_DATASTREAM
-Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPen & );
-Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPen & );
+TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPen & );
+TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQPen & );
#endif
#endif // TQPEN_H
diff --git a/kjsembed/tools/headers/qtimer.h b/kjsembed/tools/headers/qtimer.h
index 1f7115f2..b1ce519e 100644
--- a/kjsembed/tools/headers/qtimer.h
+++ b/kjsembed/tools/headers/qtimer.h
@@ -43,9 +43,9 @@
#endif // QT_H
-class Q_EXPORT TQTimer : public TQObject
+class TQ_EXPORT TQTimer : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
TQTimer( TQObject *parent=0, const char *name=0 );
~TQTimer();
diff --git a/kjsembed/xmlactionclient.cpp b/kjsembed/xmlactionclient.cpp
index 88bfab97..43872b30 100644
--- a/kjsembed/xmlactionclient.cpp
+++ b/kjsembed/xmlactionclient.cpp
@@ -125,7 +125,7 @@ bool XMLActionClient::bind( TDEAction *act, const XMLActionScript &s )
// kdWarning() << "Runner:bind called, action=" << act->name() << " type=" << s.type
// << " text=" << s.text << " src=" << s.src << endl;
- connect( act, TQT_SIGNAL( activated() ), this, TQT_SLOT( action_activated() ) );
+ connect( act, TQ_SIGNAL( activated() ), this, TQ_SLOT( action_activated() ) );
return bind( act->name(), s );
}
@@ -331,7 +331,7 @@ TDEAction *XMLActionHandler::createAction( TDEActionCollection *parent )
act->setStatusText( ad.status );
act->setWhatsThis( ad.whatsthis );
- TQObject::connect( actclient, TQT_SIGNAL( destroyed() ), act, TQT_SLOT( deleteLater() ) );
+ TQObject::connect( actclient, TQ_SIGNAL( destroyed() ), act, TQ_SLOT( deleteLater() ) );
return act;
}
diff --git a/kjsembed/xmlactionclient.h b/kjsembed/xmlactionclient.h
index 30ae6c9e..4220403d 100644
--- a/kjsembed/xmlactionclient.h
+++ b/kjsembed/xmlactionclient.h
@@ -40,7 +40,7 @@ class XMLActionScript;
*/
class XMLActionClient : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**