Replace various '#define' strings - part 6

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

5 files changed, 10 insertions, 10 deletions

diff --git a/tdeio/tdeio/kscan.cpp b/tdeio/tdeio/kscan.cpp
index b49459771..3ca269da9 100644
--- a/tdeio/tdeio/kscan.cpp
+++ b/tdeio/tdeio/kscan.cpp
@@ -41,7 +41,7 @@ KScanDialog * KScanDialog::getScanDialog( TQWidget *parent, const char *name,
     TQStringList args;
     args << TQString::number( (int)modal );
 
-    TQObject *res = factory->create( TQT_TQOBJECT(parent), name, "KScanDialog", args );
+    TQObject *res = factory->create( parent, name, "KScanDialog", args );
 
     return dynamic_cast<KScanDialog *>( res );
 }
@@ -84,7 +84,7 @@ KOCRDialog * KOCRDialog::getOCRDialog( TQWidget *parent, const char *name,
     TQStringList args;
     args << TQString::number( (int)modal );
 
-    TQObject *res = factory->create( TQT_TQOBJECT(parent), name, "KOCRDialog", args );
+    TQObject *res = factory->create( parent, name, "KOCRDialog", args );
 
     return dynamic_cast<KOCRDialog *>( res );
 }
@@ -133,7 +133,7 @@ TQObject *KScanDialogFactory::createObject( TQObject *parent, const char *name,
     if ( args.count() == 1 )
         modal = (bool)args[ 0 ].toInt();
 
-    return TQT_TQOBJECT(createDialog( TQT_TQWIDGET( parent ), name, modal ));
+    return createDialog( static_cast<TQWidget*>( parent ), name, modal );
 }
 
 
@@ -166,7 +166,7 @@ TQObject *KOCRDialogFactory::createObject( TQObject *parent, const char *name,
     if ( args.count() == 1 )
         modal = (bool)args[ 0 ].toInt();
 
-    return TQT_TQOBJECT(createDialog( TQT_TQWIDGET( parent ), name, modal ));
+    return createDialog( static_cast<TQWidget*>( parent ), name, modal );
 }
 
 void KScanDialog::virtual_hook( int id, void* data )
diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp
index 05cf554c0..3f431cb2c 100644
--- a/tdeio/tdeio/kservice.cpp
+++ b/tdeio/tdeio/kservice.cpp
@@ -927,7 +927,7 @@ void KService::rebuildKSycoca(TQWidget *parent)
   DCOPClient *client = kapp->dcopClient();
 
   int result = client->callAsync("kded", "tdebuildsycoca", "recreate()",
-               data, TQT_TQOBJECT(&dlg), TQT_SLOT(slotFinished()));
+               data, &dlg, TQT_SLOT(slotFinished()));
 
   if (result)
   {
diff --git a/tdeio/tdeio/renamedlg.cpp b/tdeio/tdeio/renamedlg.cpp
index 9b1959110..c41c94a00 100644
--- a/tdeio/tdeio/renamedlg.cpp
+++ b/tdeio/tdeio/renamedlg.cpp
@@ -194,12 +194,12 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
                     lib->unload();
                     continue;
                 }
-                TQObject *obj = factory->create( TQT_TQOBJECT(this), (*it)->name().latin1() );
+                TQObject *obj = factory->create( this, (*it)->name().latin1() );
                 if(!obj) {
                     lib->unload();
                     continue;
                 }
-                RenameDlgPlugin *plugin = static_cast<RenameDlgPlugin *>(TQT_TQWIDGET(obj));
+                RenameDlgPlugin *plugin = static_cast<RenameDlgPlugin *>(static_cast<TQWidget*>(obj));
                 if(!plugin ){
                     delete obj;
                     continue;
diff --git a/tdeio/tdeio/scheduler.cpp b/tdeio/tdeio/scheduler.cpp
index 3935a91cf..77e6eed99 100644
--- a/tdeio/tdeio/scheduler.cpp
+++ b/tdeio/tdeio/scheduler.cpp
@@ -865,7 +865,7 @@ Scheduler::_registerWindow(TQWidget *wid)
    if (!wid)
       return;
 
-   TQObject *obj = TQT_TQOBJECT(wid);
+   TQObject *obj = wid;
    if (!m_windowList.contains(obj))
    {
       // We must store the window Id because by the time
@@ -873,7 +873,7 @@ Scheduler::_registerWindow(TQWidget *wid)
       // access TQWidget::winId() (already destructed)
       WId windowId = wid->winId();
       m_windowList.insert(obj, windowId);
-      connect(TQT_TQOBJECT(wid), TQT_SIGNAL(destroyed(TQObject *)),
+      connect(wid, TQT_SIGNAL(destroyed(TQObject *)),
               this, TQT_SLOT(slotUnregisterWindow(TQObject*)));
       TQByteArray params;
       TQDataStream stream(params, IO_WriteOnly);
diff --git a/tdeio/tdeio/tdefilemetainfo.cpp b/tdeio/tdeio/tdefilemetainfo.cpp
index c1389695d..d6be6e17c 100644
--- a/tdeio/tdeio/tdefilemetainfo.cpp
+++ b/tdeio/tdeio/tdefilemetainfo.cpp
@@ -951,7 +951,7 @@ KFilePlugin* KFileMetaInfoProvider::loadPlugin( const TQString& mimeType, const
         return 0;
 
     KFilePlugin* plugin = KParts::ComponentFactory::createInstanceFromService<KFilePlugin>
-                          ( service, TQT_TQOBJECT(this), mimeType.local8Bit() );
+                          ( service, this, mimeType.local8Bit() );
     if (!plugin)
         kdWarning(7033) << "error loading the plugin from " << service->desktopEntryPath() << endl;