Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit d5688771d8a6837975be512ee37f61bad7dbd345)

7 files changed, 24 insertions, 24 deletions

diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index 2b6cef798..1a75709f8 100644
--- a/tdehtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -445,18 +445,18 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
   // Venkman use F12, KDevelop F10
   TDEShortcut scNext = TDEShortcut(KKeySequence(KKey(TQt::Key_F12)));
   scNext.append(KKeySequence(KKey(TQt::Key_F10)));
-  m_nextAction       = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,TQT_TQOBJECT(this),TQT_SLOT(slotNext()),
+  m_nextAction       = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,this,TQT_SLOT(slotNext()),
 				   m_actionCollection,"next");
-  m_stepAction       = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(TQt::Key_F11),TQT_TQOBJECT(this),TQT_SLOT(slotStep()),
+  m_stepAction       = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(TQt::Key_F11),this,TQT_SLOT(slotStep()),
 				   m_actionCollection,"step");
   // Venkman use F5, Kdevelop F9
   TDEShortcut scCont = TDEShortcut(KKeySequence(KKey(TQt::Key_F5)));
   scCont.append(KKeySequence(KKey(TQt::Key_F9)));
-  m_continueAction   = new TDEAction(i18n("&Continue"),"dbgrun",scCont,TQT_TQOBJECT(this),TQT_SLOT(slotContinue()),
+  m_continueAction   = new TDEAction(i18n("&Continue"),"dbgrun",scCont,this,TQT_SLOT(slotContinue()),
 				   m_actionCollection,"cont");
-  m_stopAction       = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(TQt::Key_F4),TQT_TQOBJECT(this),TQT_SLOT(slotStop()),
+  m_stopAction       = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(TQt::Key_F4),this,TQT_SLOT(slotStop()),
 				   m_actionCollection,"stop");
-  m_breakAction      = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(TQt::Key_F8),TQT_TQOBJECT(this),TQT_SLOT(slotBreakNext()),
+  m_breakAction      = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(TQt::Key_F8),this,TQT_SLOT(slotBreakNext()),
 				   m_actionCollection,"breaknext");
 
 
@@ -677,7 +677,7 @@ bool KJSDebugWin::eventFilter(TQObject *o, TQEvent *e)
   case TQEvent::Close:
   case TQEvent::Quit:
     while (o->parent())
-      o = TQT_TQOBJECT(o->parent());
+      o = o->parent();
     if (o == this)
       return TQWidget::eventFilter(o,e);
     else
diff --git a/tdehtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp
index 64e87c5e5..a83dad118 100644
--- a/tdehtml/java/kjavaappletserver.cpp
+++ b/tdehtml/java/kjavaappletserver.cpp
@@ -680,7 +680,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
                     KSSLCertChain chain;
                     chain.setChain( certs );
                     if ( chain.isValid() )
-                        answer = PermissionDialog( TQT_TQWIDGET(tqApp->activeWindow()) ).exec( text, args[0] );
+                        answer = PermissionDialog( tqApp->activeWindow() ).exec( text, args[0] );
                 }
             }
             sl.push_front( TQString(answer) );
@@ -777,7 +777,7 @@ PermissionDialog::PermissionDialog( TQWidget* parent )
 {}
 
 TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm ) {
-    TQGuardedPtr<TQDialog> dialog = new TQDialog( TQT_TQWIDGET(parent()), "PermissionDialog");
+    TQGuardedPtr<TQDialog> dialog = new TQDialog( static_cast<TQWidget*>(parent()), "PermissionDialog");
 
     dialog->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, dialog->sizePolicy().hasHeightForWidth() ) );
     dialog->setModal( true );
diff --git a/tdehtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp
index 6c3f13ace..6145470bf 100644
--- a/tdehtml/java/kjavaappletviewer.cpp
+++ b/tdehtml/java/kjavaappletviewer.cpp
@@ -369,7 +369,7 @@ bool KJavaAppletViewer::eventFilter (TQObject *o, TQEvent *e) {
 
 KJavaAppletViewer::~KJavaAppletViewer () {
     m_view = 0L;
-    serverMaintainer->releaseContext (TQT_TQOBJECT(parent()), baseurl);
+    serverMaintainer->releaseContext (parent(), baseurl);
     if (m_statusbar_icon) {
         m_statusbar->removeStatusBarItem (m_statusbar_icon);
         delete m_statusbar_icon;
diff --git a/tdehtml/java/kjavaappletwidget.cpp b/tdehtml/java/kjavaappletwidget.cpp
index 2537abed7..7f1d7f00f 100644
--- a/tdehtml/java/kjavaappletwidget.cpp
+++ b/tdehtml/java/kjavaappletwidget.cpp
@@ -46,7 +46,7 @@ KJavaAppletWidget::KJavaAppletWidget( TQWidget* parent, const char* name )
 
     m_applet = new KJavaApplet( this );
     d        = new KJavaAppletWidgetPrivate;
-    m_kwm    = new KWinModule( TQT_TQOBJECT(this) );
+    m_kwm    = new KWinModule( this );
 
     d->tmplabel = new TQLabel( this );
     d->tmplabel->setText( KJavaAppletServer::getAppletLabel() );
diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp
index 8462f711b..0fd9029db 100644
--- a/tdehtml/rendering/render_form.cpp
+++ b/tdehtml/rendering/render_form.cpp
@@ -312,7 +312,7 @@ LineEditWidget::LineEditWidget(DOM::HTMLInputElementImpl* input, TDEHTMLView* vi
 {
     setMouseTracking(true);
     TDEActionCollection *ac = new TDEActionCollection(this);
-    m_spellAction = KStdAction::spelling( TQT_TQOBJECT(this), TQT_SLOT( slotCheckSpelling() ), ac );
+    m_spellAction = KStdAction::spelling( this, TQT_SLOT( slotCheckSpelling() ), ac );
 }
 
 LineEditWidget::~LineEditWidget()
@@ -328,7 +328,7 @@ void LineEditWidget::slotCheckSpelling()
     }
 
     delete m_spell;
-    m_spell = new KSpell( this, i18n( "Spell Checking" ), TQT_TQOBJECT(this), TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true);
+    m_spell = new KSpell( this, i18n( "Spell Checking" ), this, TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true);
 
     connect( m_spell, TQT_SIGNAL( death() ),this, TQT_SLOT( spellCheckerFinished() ) );
     connect( m_spell, TQT_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ),this, TQT_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) );
@@ -1295,9 +1295,9 @@ TextAreaWidget::TextAreaWidget(int wrap, TQWidget* parent)
     setMouseTracking(true);
 
     TDEActionCollection *ac = new TDEActionCollection(this);
-    m_findAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotFind() ), ac );
-    m_findNextAction = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( slotFindNext() ), ac );
-    m_replaceAction = KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( slotReplace() ), ac );
+    m_findAction = KStdAction::find( this, TQT_SLOT( slotFind() ), ac );
+    m_findNextAction = KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), ac );
+    m_replaceAction = KStdAction::replace( this, TQT_SLOT( slotReplace() ), ac );
 }
 
 
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index df8ad1403..6e9d77619 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -4684,7 +4684,7 @@ KParts::ReadOnlyPart *TDEHTMLPart::createPart( TQWidget *parentWidget, const cha
       if ( factory->inherits( "KParts::Factory" ) )
         res = static_cast<KParts::ReadOnlyPart *>(static_cast<KParts::Factory *>( factory )->createPart( parentWidget, widgetName, parent, name, className, params ));
       else
-        res = static_cast<KParts::ReadOnlyPart *>(factory->create( TQT_TQOBJECT(parentWidget), widgetName, className ));
+        res = static_cast<KParts::ReadOnlyPart *>(factory->create( parentWidget, widgetName, className ));
 
       if ( res ) {
         serviceTypes = service->serviceTypes();
diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp
index 5a3e1ffc1..12087e4a3 100644
--- a/tdehtml/tdehtmlview.cpp
+++ b/tdehtml/tdehtmlview.cpp
@@ -499,7 +499,7 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name)
     // initialize QScrollView
     enableClipper(true);
     // hack to get unclipped painting on the viewport.
-    static_cast<TDEHTMLView *>(TQT_TQWIDGET(viewport()))->setWFlags(WPaintUnclipped);
+    static_cast<TDEHTMLView *>(viewport())->setWFlags(WPaintUnclipped);
 
     setResizePolicy(Manual);
     viewport()->setMouseTracking(true);
@@ -579,7 +579,7 @@ void TDEHTMLView::clear()
     if ( d->cursor_icon_widget )
         d->cursor_icon_widget->hide();
     d->reset();
-    TQT_TQOBJECT(this)->killTimers();
+    this->killTimers();
     emit cleared();
 
     TQScrollView::setHScrollBarMode(d->hmode);
@@ -911,8 +911,8 @@ void TDEHTMLView::closeChildDialogs()
         }
         else
         {
-            kdWarning() << "closeChildDialogs: not a KDialogBase! Don't use QDialogs in KDE! " << TQT_TQWIDGET(dlg) << endl;
-            TQT_TQWIDGET(dlg)->hide();
+            kdWarning() << "closeChildDialogs: not a KDialogBase! Don't use QDialogs in KDE! " << static_cast<TQWidget*>(dlg) << endl;
+            static_cast<TQWidget*>(dlg)->hide();
         }
     }
     delete dlgs;
@@ -1899,9 +1899,9 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
 	// we need to install an event filter on all children of the viewport to
 	// be able to get correct stacking of children within the document.
 	if(e->type() == TQEvent::ChildInserted) {
-	    TQObject *c = TQT_TQOBJECT(static_cast<TQChildEvent*>(e)->child());
+	    TQObject *c = static_cast<TQChildEvent*>(e)->child();
 	    if (c->isWidgetType()) {
-		TQWidget *w = TQT_TQWIDGET(c);
+		TQWidget *w = static_cast<TQWidget*>(c);
 		// don't install the event filter on toplevels
 		if (w->parentWidget(true) == view) {
 		    if (!strcmp(w->name(), "__tdehtml")) {
@@ -1927,7 +1927,7 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
 	    }
 	}
     } else if (o->isWidgetType()) {
-	TQWidget *v = TQT_TQWIDGET(o);
+	TQWidget *v = static_cast<TQWidget*>(o);
         TQWidget *c = v;
 	while (v && v != view) {
             c = v;
@@ -1936,7 +1936,7 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
 
 	if (v && !strcmp(c->name(), "__tdehtml")) {
 	    bool block = false;
-	    TQWidget *w = TQT_TQWIDGET(o);
+	    TQWidget *w = static_cast<TQWidget*>(o);
 	    switch(e->type()) {
 	    case TQEvent::Paint:
 		if (!allowWidgetPaintEvents) {