Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

5 files changed, 45 insertions, 45 deletions

diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp
index 4a19140b5..2df8ed163 100644
--- a/nsplugins/nspluginloader.cpp
+++ b/nsplugins/nspluginloader.cpp
@@ -69,7 +69,7 @@ void NSPluginInstance::init(const TQCString& app, const TQCString& obj)
     if (cfg.readBoolEntry("demandLoad", false)) {
         _button = new TQPushButton(i18n("Start Plugin"), dynamic_cast<EMBEDCLASS*>(this));
         _layout->addWidget(_button, 0, 0);
-        connect(_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadPlugin()));
+        connect(_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(loadPlugin()));
         show();
     } else {
         _button = 0L;
@@ -80,7 +80,7 @@ void NSPluginInstance::init(const TQCString& app, const TQCString& obj)
         // and use 'resize_count' to wait for that one more resize to come (plus a timer
         // for a possible timeout). Only then flash is actually initialized ('inited' is true).
         resize_count = 1;
-        TQTimer::singleShot( 1000, this, TQT_SLOT( doLoadPlugin()));
+        TQTimer::singleShot( 1000, this, TQ_SLOT( doLoadPlugin()));
     }
 }
 
@@ -203,8 +203,8 @@ NSPluginLoader::NSPluginLoader()
   // trap dcop register events
   kapp->dcopClient()->setNotifications(true);
   TQObject::connect(kapp->dcopClient(),
-                   TQT_SIGNAL(applicationRegistered(const TQCString&)),
-                   this, TQT_SLOT(applicationRegistered(const TQCString&)));
+                   TQ_SIGNAL(applicationRegistered(const TQCString&)),
+                   this, TQ_SLOT(applicationRegistered(const TQCString&)));
 
   // load configuration
   TDEConfig cfg("kcmnspluginrc", false);
@@ -337,8 +337,8 @@ bool NSPluginLoader::loadViewer(const TQString &mimeType)
    int pid = (int)getpid();
    _dcopid.sprintf("nspluginviewer-%d", pid);
 
-   connect( _process, TQT_SIGNAL(processExited(TDEProcess*)),
-            this, TQT_SLOT(processTerminated(TDEProcess*)) );
+   connect( _process, TQ_SIGNAL(processExited(TDEProcess*)),
+            this, TQ_SLOT(processTerminated(TDEProcess*)) );
 
    // find the external viewer process
    TQString viewer = TDEGlobal::dirs()->findExe("nspluginviewer");
diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp
index 93f4cac7d..3e5530f3a 100644
--- a/nsplugins/plugin_part.cpp
+++ b/nsplugins/plugin_part.cpp
@@ -217,7 +217,7 @@ PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject
     // Only create this if we have no parent since the parent part is
     // responsible for "Save As" then
     if (!parent || !parent->inherits("Part")) {
-        new TDEAction(i18n("&Save As..."), CTRL+Key_S, this, TQT_SLOT(saveAs()), actionCollection(), "saveDocument");
+        new TDEAction(i18n("&Save As..."), CTRL+Key_S, this, TQ_SLOT(saveAs()), actionCollection(), "saveDocument");
         setXMLFile("nspluginpart.rc");
     }
 
@@ -232,8 +232,8 @@ PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject
     _canvas->setBackgroundMode( TQWidget::NoBackground );
     setWidget(_canvas);
     _canvas->show();
-    TQObject::connect( _canvas, TQT_SIGNAL(resized(int,int)),
-                      this, TQT_SLOT(pluginResized(int,int)) );
+    TQObject::connect( _canvas, TQ_SIGNAL(resized(int,int)),
+                      this, TQ_SLOT(pluginResized(int,int)) );
 }
 
 
diff --git a/nsplugins/test/testnsplugin.cpp b/nsplugins/test/testnsplugin.cpp
index daccd1bcf..7ac24ee2c 100644
--- a/nsplugins/test/testnsplugin.cpp
+++ b/nsplugins/test/testnsplugin.cpp
@@ -44,9 +44,9 @@ TestNSPlugin::TestNSPlugin()
    m_layout = new TQHBoxLayout( m_client );
 
    // file menu
-   KStdAction::openNew( this, TQT_SLOT(newView()), actionCollection());
-   KStdAction::close( this, TQT_SLOT(closeView()), actionCollection());
-   KStdAction::quit( kapp, TQT_SLOT(quit()), actionCollection());
+   KStdAction::openNew( this, TQ_SLOT(newView()), actionCollection());
+   KStdAction::close( this, TQ_SLOT(closeView()), actionCollection());
+   KStdAction::quit( kapp, TQ_SLOT(quit()), actionCollection());
 
    createGUI( "testnspluginui.rc" );
 }
@@ -88,8 +88,8 @@ void TestNSPlugin::newView()
    if ( win )
    {
       m_plugins.append( win );
-      connect( win, TQT_SIGNAL(destroyed(NSPluginInstance *)),
-               this, TQT_SLOT(viewDestroyed(NSPluginInstance *)) );
+      connect( win, TQ_SIGNAL(destroyed(NSPluginInstance *)),
+               this, TQ_SLOT(viewDestroyed(NSPluginInstance *)) );
       m_layout->addWidget( win );
       win->show();
    } else
diff --git a/nsplugins/viewer/glibevents.cpp b/nsplugins/viewer/glibevents.cpp
index fe059d1ee..e8bc766a1 100644
--- a/nsplugins/viewer/glibevents.cpp
+++ b/nsplugins/viewer/glibevents.cpp
@@ -24,7 +24,7 @@
 GlibEvents::GlibEvents()
     {
     g_main_context_ref( g_main_context_default());
-    connect( &timer, TQT_SIGNAL( timeout()), TQT_SLOT( process()));
+    connect( &timer, TQ_SIGNAL( timeout()), TQ_SLOT( process()));
     // TODO Poll for now
     timer.start( 10 );
     }
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index 5b6b9267f..2495556e4 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -616,7 +616,7 @@ NSPluginInstance::NSPluginInstance(NPP privateData, NPPluginFuncs *pluginFuncs,
    memcpy(&_pluginFuncs, pluginFuncs, sizeof(_pluginFuncs));
 
    _timer = new TQTimer( this );
-   connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(timer()) );
+   connect( _timer, TQ_SIGNAL(timeout()), TQ_SLOT(timer()) );
 
    kdDebug(1431) << "NSPluginInstance::NSPluginInstance" << endl;
    kdDebug(1431) << "pdata = " << _npp->pdata << endl;
@@ -809,8 +809,8 @@ void NSPluginInstance::timer()
                 if (req.post) {
                     // create stream
                     NSPluginStream *s = new NSPluginStream( this );
-                    connect( s, TQT_SIGNAL(finished(NSPluginStreamBase*)),
-                             TQT_SLOT(streamFinished(NSPluginStreamBase*)) );
+                    connect( s, TQ_SIGNAL(finished(NSPluginStreamBase*)),
+                             TQ_SLOT(streamFinished(NSPluginStreamBase*)) );
                     _streams.append( s );
 
                     kdDebug() << "posting to " << url << endl;
@@ -828,8 +828,8 @@ void NSPluginInstance::timer()
                 } else {
                     // create stream
                     NSPluginStream *s = new NSPluginStream( this );
-                    connect( s, TQT_SIGNAL(finished(NSPluginStreamBase*)),
-                             TQT_SLOT(streamFinished(NSPluginStreamBase*)) );
+                    connect( s, TQ_SIGNAL(finished(NSPluginStreamBase*)),
+                             TQ_SLOT(streamFinished(NSPluginStreamBase*)) );
                     _streams.append( s );
 
                     kdDebug() << "getting " << url << endl;
@@ -1026,8 +1026,8 @@ void NSPluginInstance::javascriptResult(TQ_INT32 id, TQString result) {
         Request *req = i.data();
         _jsrequests.remove( i );
         NSPluginStream *s = new NSPluginStream( this );
-        connect( s, TQT_SIGNAL(finished(NSPluginStreamBase*)),
-                 TQT_SLOT(streamFinished(NSPluginStreamBase*)) );
+        connect( s, TQ_SIGNAL(finished(NSPluginStreamBase*)),
+                 TQ_SLOT(streamFinished(NSPluginStreamBase*)) );
         _streams.append( s );
 
         int len = result.length();
@@ -1254,9 +1254,9 @@ NSPluginViewer::NSPluginViewer( TQCString dcopId,
 {
     _classes.setAutoDelete( true );
     connect(TDEApplication::dcopClient(),
-            TQT_SIGNAL(applicationRemoved(const TQCString&)),
+            TQ_SIGNAL(applicationRemoved(const TQCString&)),
             this,
-            TQT_SLOT(appUnregistered(const TQCString&)));
+            TQ_SLOT(appUnregistered(const TQCString&)));
 }
 
 
@@ -1348,7 +1348,7 @@ NSPluginClass::NSPluginClass( const TQString &library,
     _NP_Shutdown = 0;
 
     _timer = new TQTimer( this );
-    connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(timer()) );
+    connect( _timer, TQ_SIGNAL(timeout()), TQ_SLOT(timer()) );
 
     // check lib handle
     if (!_handle) {
@@ -1832,7 +1832,7 @@ NSPluginBufStream::NSPluginBufStream( class NSPluginInstance *instance )
     : NSPluginStreamBase( instance )
 {
     _timer = new TQTimer( this );
-    connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timer()) );
+    connect( _timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timer()) );
 }
 
 
@@ -1878,7 +1878,7 @@ NSPluginStream::NSPluginStream( NSPluginInstance *instance )
     : NSPluginStreamBase( instance ), _job(0)
 {
    _resumeTimer = new TQTimer( this );
-   connect(_resumeTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(resume()));
+   connect(_resumeTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(resume()));
 }
 
 
@@ -1902,15 +1902,15 @@ bool NSPluginStream::get( const TQString& url, const TQString& mimeType,
         if (reload) {
             _job->addMetaData("cache", "reload");
         }
-        connect(_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-                TQT_SLOT(data(TDEIO::Job *, const TQByteArray &)));
-        connect(_job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(result(TDEIO::Job *)));
-        connect(_job, TQT_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )),
-                TQT_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t)));
-        connect(_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
-                TQT_SLOT(mimetype(TDEIO::Job *, const TQString &)));
-        connect(_job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)),
-                TQT_SLOT(redirection(TDEIO::Job *, const KURL&)));
+        connect(_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+                TQ_SLOT(data(TDEIO::Job *, const TQByteArray &)));
+        connect(_job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(result(TDEIO::Job *)));
+        connect(_job, TQ_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )),
+                TQ_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t)));
+        connect(_job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
+                TQ_SLOT(mimetype(TDEIO::Job *, const TQString &)));
+        connect(_job, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL&)),
+                TQ_SLOT(redirection(TDEIO::Job *, const KURL&)));
     }
 
     return false;
@@ -1928,15 +1928,15 @@ bool NSPluginStream::post( const TQString& url, const TQByteArray& data,
         _job->addMetaData("errorPage", "false");
         _job->addMetaData("PropagateHttpHeader", "true");
         _job->addMetaData("AllowCompressedPage", "false");
-        connect(_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-                TQT_SLOT(data(TDEIO::Job *, const TQByteArray &)));
-        connect(_job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(result(TDEIO::Job *)));
-        connect(_job, TQT_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )),
-                TQT_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t)));
-        connect(_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
-                TQT_SLOT(mimetype(TDEIO::Job *, const TQString &)));
-        connect(_job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)),
-                TQT_SLOT(redirection(TDEIO::Job *, const KURL&)));
+        connect(_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+                TQ_SLOT(data(TDEIO::Job *, const TQByteArray &)));
+        connect(_job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(result(TDEIO::Job *)));
+        connect(_job, TQ_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )),
+                TQ_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t)));
+        connect(_job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
+                TQ_SLOT(mimetype(TDEIO::Job *, const TQString &)));
+        connect(_job, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL&)),
+                TQ_SLOT(redirection(TDEIO::Job *, const KURL&)));
     }
 
     return false;