Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <[email protected]>

15 files changed, 48 insertions, 48 deletions

diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp
index 128b77bff..a6ed43f03 100644
--- a/tdeio/misc/uiserver.cpp
+++ b/tdeio/misc/uiserver.cpp
@@ -98,7 +98,7 @@ class UIServerSystemTray:public KSystemTray
          pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon()));
          setPixmap(loadIcon("document-save"));
          //actionCollection()->action("file_quit")->setEnabled(true);
-         KStdAction::quit(TQT_TQOBJECT(uis), TQT_SLOT(slotQuit()), actionCollection());
+         KStdAction::quit(uis, TQT_SLOT(slotQuit()), actionCollection());
       }
 };
 
@@ -595,10 +595,10 @@ UIServer::UIServer()
 
   // setup toolbar
   toolBar()->insertButton("edit-delete", TOOL_CANCEL,
-                          TQT_SIGNAL(clicked()), TQT_TQOBJECT(this),
+                          TQT_SIGNAL(clicked()), this,
                           TQT_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel"));
   toolBar()->insertButton("configure", TOOL_CONFIGURE,
-                          TQT_SIGNAL(clicked()), TQT_TQOBJECT(this),
+                          TQT_SIGNAL(clicked()), this,
                           TQT_SLOT(slotConfigure()), true, i18n("Settings..."));
 
   toolBar()->setBarPos( TDEToolBar::Left );
diff --git a/tdeio/tdefile/kcustommenueditor.cpp b/tdeio/tdefile/kcustommenueditor.cpp
index 3e6056edd..802acf739 100644
--- a/tdeio/tdefile/kcustommenueditor.cpp
+++ b/tdeio/tdefile/kcustommenueditor.cpp
@@ -95,10 +95,10 @@ KCustomMenuEditor::KCustomMenuEditor(TQWidget *parent)
    m_listView->setFullWidth(true);
    m_listView->setSorting(-1);
    KButtonBox *buttonBox = new KButtonBox(page, TQt::Vertical);
-   buttonBox->addButton(i18n("New..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewItem()));
-   d->pbRemove=buttonBox->addButton(i18n("Remove"), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()));
-   d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), TQT_TQOBJECT(this), TQT_SLOT(slotMoveUp()));
-   d->pbMoveDown=buttonBox->addButton(i18n("Move Down"), TQT_TQOBJECT(this), TQT_SLOT(slotMoveDown()));
+   buttonBox->addButton(i18n("New..."), this, TQT_SLOT(slotNewItem()));
+   d->pbRemove=buttonBox->addButton(i18n("Remove"), this, TQT_SLOT(slotRemoveItem()));
+   d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), this, TQT_SLOT(slotMoveUp()));
+   d->pbMoveDown=buttonBox->addButton(i18n("Move Down"), this, TQT_SLOT(slotMoveDown()));
    buttonBox->layout();
    connect( m_listView, TQT_SIGNAL( selectionChanged () ), this, TQT_SLOT( refreshButton() ) );
    refreshButton();
diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp
index 8087f206d..cae383742 100644
--- a/tdeio/tdefile/kdirselectdialog.cpp
+++ b/tdeio/tdefile/kdirselectdialog.cpp
@@ -122,11 +122,11 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly,
              TQT_SLOT( slotComboTextChanged( const TQString& ) ));
 
     m_contextMenu = new TQPopupMenu( this );
-    TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this));
+    TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder-new", 0, this, TQT_SLOT( slotMkdir() ), this);
     newFolder->plug(m_contextMenu);
     m_contextMenu->insertSeparator();
-    m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, TQT_TQOBJECT(this),
-                                        TQT_SLOT( slotShowHiddenFoldersToggled() ), TQT_TQOBJECT(this));
+    m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, this,
+                                        TQT_SLOT( slotShowHiddenFoldersToggled() ), this);
     m_showHiddenFolders->plug(m_contextMenu);
 
     d->startURL = KFileDialog::getStartURL( startDir, d->recentDirClass );
diff --git a/tdeio/tdefile/kpreviewprops.cpp b/tdeio/tdefile/kpreviewprops.cpp
index c45330893..069746fac 100644
--- a/tdeio/tdefile/kpreviewprops.cpp
+++ b/tdeio/tdefile/kpreviewprops.cpp
@@ -79,7 +79,7 @@ bool KPreviewPropsPlugin::supports( KFileItemList _items )
 
 void KPreviewPropsPlugin::aboutToShowPage( TQWidget* widget )
 {
-    if ( TQT_TQOBJECT(widget) != TQT_TQOBJECT(preview->parent()) )
+    if ( widget != preview->parent() )
         return;
 
     disconnect( properties, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), this, TQT_SLOT( aboutToShowPage( TQWidget* ) ) );
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index c478058b7..c4be31d02 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -529,7 +529,7 @@ void KPropertiesDialog::insertPages()
   {
     KPropsDlgPlugin *plugin = KParts::ComponentFactory
         ::createInstanceFromLibrary<KPropsDlgPlugin>( (*it)->library().local8Bit().data(),
-                                                      TQT_TQOBJECT(this),
+                                                      this,
                                                       (*it)->name().latin1() );
     if ( !plugin )
         continue;
diff --git a/tdeio/tdefile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp
index 3d54b9c95..a28512c13 100644
--- a/tdeio/tdefile/kurlrequester.cpp
+++ b/tdeio/tdefile/kurlrequester.cpp
@@ -112,9 +112,9 @@ public:
     void connectSignals( TQObject *receiver ) {
 	TQObject *sender;
 	if ( combo )
-	    sender = TQT_TQOBJECT(combo);
+	    sender = combo;
 	else
-	    sender = TQT_TQOBJECT(edit);
+	    sender = edit;
 
 	connect( sender, TQT_SIGNAL( textChanged( const TQString& )),
 		 receiver, TQT_SIGNAL( textChanged( const TQString& )));
@@ -220,14 +220,14 @@ void KURLRequester::init()
     widget->installEventFilter( this );
     setFocusProxy( widget );
 
-    d->connectSignals( TQT_TQOBJECT(this) );
+    d->connectSignals( this );
     connect( myButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOpenDialog() ));
 
     myCompletion = new KURLCompletion();
     d->setCompletionObject( myCompletion );
 
     TDEAccel *accel = new TDEAccel( this );
-    accel->insert( TDEStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( slotOpenDialog() ));
+    accel->insert( TDEStdAccel::Open, this, TQT_SLOT( slotOpenDialog() ));
     accel->readSettings();
 }
 
diff --git a/tdeio/tdefile/tdediroperator.cpp b/tdeio/tdefile/tdediroperator.cpp
index c59a6ebff..8d9a27962 100644
--- a/tdeio/tdefile/tdediroperator.cpp
+++ b/tdeio/tdefile/tdediroperator.cpp
@@ -1253,25 +1253,25 @@ void KDirOperator::slotCompletionMatch(const TQString& match)
 
 void KDirOperator::setupActions()
 {
-    myActionCollection = new TDEActionCollection( topLevelWidget(), TQT_TQOBJECT(this), "KDirOperator::myActionCollection" );
+    myActionCollection = new TDEActionCollection( topLevelWidget(), this, "KDirOperator::myActionCollection" );
 
     actionMenu = new TDEActionMenu( i18n("Menu"), myActionCollection, "popupMenu" );
-    upAction = KStdAction::up( TQT_TQOBJECT(this), TQT_SLOT( cdUp() ), myActionCollection, "up" );
+    upAction = KStdAction::up( this, TQT_SLOT( cdUp() ), myActionCollection, "up" );
     upAction->setText( i18n("Parent Folder") );
-    backAction = KStdAction::back( TQT_TQOBJECT(this), TQT_SLOT( back() ), myActionCollection, "back" );
-    forwardAction = KStdAction::forward( TQT_TQOBJECT(this), TQT_SLOT(forward()), myActionCollection, "forward" );
-    homeAction = KStdAction::home( TQT_TQOBJECT(this), TQT_SLOT( home() ), myActionCollection, "home" );
+    backAction = KStdAction::back( this, TQT_SLOT( back() ), myActionCollection, "back" );
+    forwardAction = KStdAction::forward( this, TQT_SLOT(forward()), myActionCollection, "forward" );
+    homeAction = KStdAction::home( this, TQT_SLOT( home() ), myActionCollection, "home" );
     homeAction->setText(i18n("Home Folder"));
-    reloadAction = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(rereadDir()), myActionCollection, "reload" );
+    reloadAction = KStdAction::redisplay( this, TQT_SLOT(rereadDir()), myActionCollection, "reload" );
     actionSeparator = new TDEActionSeparator( myActionCollection, "separator" );
     d->viewActionSeparator = new TDEActionSeparator( myActionCollection,
                                                    "viewActionSeparator" );
     mkdirAction = new TDEAction( i18n("New Folder..."), 0,
-                                 TQT_TQOBJECT(this), TQT_SLOT( mkdir() ), myActionCollection, "mkdir" );
+                                 this, TQT_SLOT( mkdir() ), myActionCollection, "mkdir" );
     TDEAction* trash = new TDEAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" );
     connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
 	     this, TQT_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) );
-    new TDEAction( i18n( "Delete" ), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
+    new TDEAction( i18n( "Delete" ), "edit-delete", SHIFT+Key_Delete, this,
                   TQT_SLOT( deleteSelected() ), myActionCollection, "delete" );
     mkdirAction->setIcon( TQString::fromLatin1("folder-new") );
     reloadAction->setText( i18n("Reload") );
@@ -1281,16 +1281,16 @@ void KDirOperator::setupActions()
     // the sort menu actions
     sortActionMenu = new TDEActionMenu( i18n("Sorting"), myActionCollection, "sorting menu");
     byNameAction = new TDERadioAction( i18n("By Name"), 0,
-                                     TQT_TQOBJECT(this), TQT_SLOT( slotSortByName() ),
+                                     this, TQT_SLOT( slotSortByName() ),
                                      myActionCollection, "by name" );
     byDateAction = new TDERadioAction( i18n("By Date"), 0,
-                                     TQT_TQOBJECT(this), TQT_SLOT( slotSortByDate() ),
+                                     this, TQT_SLOT( slotSortByDate() ),
                                      myActionCollection, "by date" );
     bySizeAction = new TDERadioAction( i18n("By Size"), 0,
-                                     TQT_TQOBJECT(this), TQT_SLOT( slotSortBySize() ),
+                                     this, TQT_SLOT( slotSortBySize() ),
                                      myActionCollection, "by size" );
     reverseAction = new TDEToggleAction( i18n("Reverse"), 0,
-                                       TQT_TQOBJECT(this), TQT_SLOT( slotSortReversed() ),
+                                       this, TQT_SLOT( slotSortReversed() ),
                                        myActionCollection, "reversed" );
 
     TQString sortGroup = TQString::fromLatin1("sort");
@@ -1325,7 +1325,7 @@ void KDirOperator::setupActions()
                                           myActionCollection, "show hidden" );
 //    showHiddenAction->setCheckedState( i18n("Hide Hidden Files") );
     separateDirsAction = new TDEToggleAction( i18n("Separate Folders"), TDEShortcut(),
-                                            TQT_TQOBJECT(this),
+                                            this,
                                             TQT_SLOT(slotSeparateDirs()),
                                             myActionCollection, "separate dirs" );
     TDEToggleAction *previewAction = new TDEToggleAction(i18n("Show Preview"),
@@ -1348,7 +1348,7 @@ void KDirOperator::setupActions()
     connect( showHiddenAction, TQT_SIGNAL( toggled( bool ) ),
              TQT_SLOT( slotToggleHidden( bool ) ));
 
-    new TDEAction( i18n("Properties"), TDEShortcut(ALT+Key_Return), TQT_TQOBJECT(this),
+    new TDEAction( i18n("Properties"), TDEShortcut(ALT+Key_Return), this,
                  TQT_SLOT(slotProperties()), myActionCollection, "properties" );
 }
 
diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index 5150d18c1..1b12e8a5b 100644
--- a/tdeio/tdefile/tdefiledialog.cpp
+++ b/tdeio/tdefile/tdefiledialog.cpp
@@ -937,7 +937,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
     connect( showBookmarksAction, TQT_SIGNAL( toggled( bool ) ),
              TQT_SLOT( toggleBookmarks( bool )) );
 
-    TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", TQT_TQOBJECT(this), "extra menu" );
+    TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", this, "extra menu" );
     menu->setWhatsThis(i18n("<qt>This is the configuration menu for the file dialog. "
                             "Various options can be accessed from this menu including: <ul>"
                             "<li>how files are sorted in the list</li>"
@@ -1336,7 +1336,7 @@ TQString KFileDialog::getOpenFileNameWId(const TQString& startDir,
                                         const TQString& filter,
                                         WId parent_id, const TQString& caption)
 {
-    TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id ));
+    TQWidget* parent = TQWidget::find( parent_id );
     KFileDialog dlg(startDir, filter, parent, "filedialog", true);
 #ifdef Q_WS_X11
     if( parent == NULL && parent_id != 0 )
@@ -1618,7 +1618,7 @@ TQString KFileDialog::getSaveFileNameWId(const TQString& dir, const TQString& fi
                                      const TQString& caption)
 {
     bool specialDir = dir.at(0) == ':';
-    TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id ));
+    TQWidget* parent = TQWidget::find( parent_id );
     KFileDialog dlg( specialDir ? dir : TQString::null, filter, parent, "filedialog", true);
 #ifdef Q_WS_X11
     if( parent == NULL && parent_id != 0 )
diff --git a/tdeio/tdefile/tdefileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp
index 4d1fb8a1c..01e14b014 100644
--- a/tdeio/tdefile/tdefileiconview.cpp
+++ b/tdeio/tdefile/tdefileiconview.cpp
@@ -59,12 +59,12 @@ public:
 
         noArrangement = false;
 	ignoreMaximumSize = false;
-	smallColumns = new TDERadioAction( i18n("Small Icons"), 0, TQT_TQOBJECT(parent),
+	smallColumns = new TDERadioAction( i18n("Small Icons"), 0, parent,
 					 TQT_SLOT( slotSmallColumns() ),
 					 parent->actionCollection(),
 					 "small columns" );
 
-	largeRows = new TDERadioAction( i18n("Large Icons"), 0, TQT_TQOBJECT(parent),
+	largeRows = new TDERadioAction( i18n("Large Icons"), 0, parent,
 				      TQT_SLOT( slotLargeRows() ),
 				      parent->actionCollection(),
 				      "large rows" );
@@ -75,9 +75,9 @@ public:
         previews = new TDEToggleAction( i18n("Thumbnail Previews"), 0,
                                       parent->actionCollection(),
                                       "show previews" );
-        zoomIn = KStdAction::zoomIn( TQT_TQOBJECT(parent), TQT_SLOT( zoomIn() ),
+        zoomIn = KStdAction::zoomIn( parent, TQT_SLOT( zoomIn() ),
                                      parent->actionCollection(), "zoomIn" );
-        zoomOut = KStdAction::zoomOut( TQT_TQOBJECT(parent), TQT_SLOT( zoomOut() ),
+        zoomOut = KStdAction::zoomOut( parent, TQT_SLOT( zoomOut() ),
                                      parent->actionCollection(), "zoomOut" );
 
         previews->setGroup("previews");
diff --git a/tdeio/tdefile/tdefilemetapreview.cpp b/tdeio/tdefile/tdefilemetapreview.cpp
index d587511e4..42f40ef9b 100644
--- a/tdeio/tdefile/tdefilemetapreview.cpp
+++ b/tdeio/tdefile/tdefilemetapreview.cpp
@@ -188,7 +188,7 @@ KPreviewWidgetBase * KFileMetaPreview::createAudioPreview( TQWidget *parent )
         return 0L;
     }
 
-    return dynamic_cast<KPreviewWidgetBase*>( factory->create( TQT_TQOBJECT(parent), "tdefileaudiopreview" ));
+    return dynamic_cast<KPreviewWidgetBase*>( factory->create( parent, "tdefileaudiopreview" ));
 }
 
 void KFileMetaPreview::virtual_hook( int, void* ) {}
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;