Replace various '#define' strings - part 6

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

9 files changed, 19 insertions, 19 deletions

diff --git a/kregexpeditor/KMultiFormListBox/ccp.cpp b/kregexpeditor/KMultiFormListBox/ccp.cpp
index 7b21f51..4f0d4b3 100644
--- a/kregexpeditor/KMultiFormListBox/ccp.cpp
+++ b/kregexpeditor/KMultiFormListBox/ccp.cpp
@@ -32,7 +32,7 @@
 CCP::CCP(KMultiFormListBoxMultiVisible *ee_, KMultiFormListBoxEntry *eee_) : TQObject() {
   ee = ee_;
   eee = eee_;
-  install(TQT_TQOBJECT(eee));
+  install(eee);
 }
 
 void CCP::install(TQObject *elm)
diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp
index 09c5052..02941a2 100644
--- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp
@@ -266,14 +266,14 @@ void KMultiFormListBoxMultiVisible::cut(KMultiFormListBoxEntry *elm)
 	}
 
   TQDataStream stream(clipboard, IO_WriteOnly);
-  factory->toStream( TQT_TQOBJECT(elm), stream );
+  factory->toStream( elm, stream );
   delElement(elm);
 }
 
 void KMultiFormListBoxMultiVisible::copy(KMultiFormListBoxEntry *elm)
 {
   TQDataStream stream(clipboard, IO_WriteOnly);
-  factory->toStream(TQT_TQOBJECT(elm), stream);
+  factory->toStream(elm, stream);
 }
 
 void KMultiFormListBoxMultiVisible::paste(KMultiFormListBoxEntry *oldElm)
@@ -285,7 +285,7 @@ void KMultiFormListBoxMultiVisible::paste(KMultiFormListBoxEntry *oldElm)
 
   KMultiFormListBoxEntry *newElm = factory->create(viewport());
   TQDataStream stream( clipboard, IO_ReadOnly );
-  factory->fromStream(stream, TQT_TQOBJECT(newElm));
+  factory->fromStream(stream, newElm);
   insertElmIntoWidget(newElm,oldElm);
 }
 
diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.cpp
index 33eda27..2b22ee5 100644
--- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.cpp
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.cpp
@@ -77,7 +77,7 @@ void KMultiFormListBox::toStream( TQDataStream& stream ) const
   const KMultiFormListBoxEntryList elms = elements();
   stream << elms.count();
   for ( TQPtrListIterator<KMultiFormListBoxEntry> it(elms); *it; ++it)
-    _factory->toStream( TQT_TQOBJECT(*it), stream );
+    _factory->toStream( *it, stream );
 }
 
 void KMultiFormListBox::fromStream( TQDataStream& stream )
@@ -97,7 +97,7 @@ void KMultiFormListBox::fromStream( TQDataStream& stream )
 
   KMultiFormListBoxEntryList elms = elements();
   for (TQPtrListIterator<KMultiFormListBoxEntry> it(elms); *it; ++it)
-    _factory->fromStream( stream, TQT_TQOBJECT(*it) );
+    _factory->fromStream( stream, *it );
 }
 
 
diff --git a/kregexpeditor/KMultiFormListBox/widgetwindow.cpp b/kregexpeditor/KMultiFormListBox/widgetwindow.cpp
index 9b055a3..6d101a0 100644
--- a/kregexpeditor/KMultiFormListBox/widgetwindow.cpp
+++ b/kregexpeditor/KMultiFormListBox/widgetwindow.cpp
@@ -47,7 +47,7 @@ void WidgetWindow::init(KMultiFormListBoxFactory *factory, TDEListBox *lb, KMult
     myWidget = factory->create(frame);
   }
   TQDataStream stream( _backup, IO_WriteOnly );
-  myFact->toStream( TQT_TQOBJECT(myWidget), stream );
+  myFact->toStream( myWidget, stream );
 
   lay->addWidget(myWidget);
 
@@ -86,7 +86,7 @@ void WidgetWindow::slotCancel()
   }
   else {
     TQDataStream stream( _backup, IO_ReadOnly );
-    myFact->fromStream( stream, TQT_TQOBJECT(myWidget) );
+    myFact->fromStream( stream, myWidget );
   }
   KDialogBase::slotCancel();
 }
@@ -96,9 +96,9 @@ WidgetWindow *WidgetWindow::clone()
   WidgetWindow *item = new WidgetWindow(myFact, listbox);
   TQByteArray data;
   TQDataStream ws( data, IO_WriteOnly );
-  myFact->toStream( TQT_TQOBJECT(myWidget), ws );
+  myFact->toStream( myWidget, ws );
   TQDataStream rs( data, IO_ReadOnly );
-  myFact->fromStream( rs, TQT_TQOBJECT(item->myWidget) );
+  myFact->fromStream( rs, item->myWidget );
 
   item->slotOk();
   return item;
@@ -107,7 +107,7 @@ WidgetWindow *WidgetWindow::clone()
 void WidgetWindow::display()
 {
   TQDataStream stream( _backup, IO_WriteOnly);
-  myFact->toStream( TQT_TQOBJECT(myWidget), stream );
+  myFact->toStream( myWidget, stream );
   show();
 }
 
diff --git a/kregexpeditor/compoundwidget.cpp b/kregexpeditor/compoundwidget.cpp
index c65e598..56b3226 100644
--- a/kregexpeditor/compoundwidget.cpp
+++ b/kregexpeditor/compoundwidget.cpp
@@ -246,7 +246,7 @@ void CompoundWidget::slotConfigCanceled()
 {
   TQDataStream stream( _backup, IO_ReadOnly );
   KWidgetStreamer streamer;
-  streamer.fromStream( stream, TQT_TQOBJECT(_content) );
+  streamer.fromStream( stream, _content );
   repaint();
 }
 
@@ -300,7 +300,7 @@ int CompoundWidget::edit()
                                               _configWindow->sizeHint().height()/2)  );
   TQDataStream stream( _backup, IO_WriteOnly );
   KWidgetStreamer streamer;
-  streamer.toStream( TQT_TQOBJECT(_content), stream );
+  streamer.toStream( _content, stream );
   return _configWindow->exec();
 }
 
diff --git a/kregexpeditor/limitedcharlineedit.cpp b/kregexpeditor/limitedcharlineedit.cpp
index 5e494d8..f311ebe 100644
--- a/kregexpeditor/limitedcharlineedit.cpp
+++ b/kregexpeditor/limitedcharlineedit.cpp
@@ -26,7 +26,7 @@ class Validator :public TQValidator
 {
 public:
   Validator( LimitedCharLineEdit::Mode mode, TQWidget* parent )
-    :TQValidator( TQT_TQOBJECT(parent), "Validator" ), _mode(mode)
+    :TQValidator( parent, "Validator" ), _mode(mode)
   {
   }
 
diff --git a/kregexpeditor/regexpbuttons.cpp b/kregexpeditor/regexpbuttons.cpp
index a6bb121..1974534 100644
--- a/kregexpeditor/regexpbuttons.cpp
+++ b/kregexpeditor/regexpbuttons.cpp
@@ -43,7 +43,7 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name )
   _grp->hide();
   _grp->setExclusive( true );
 
-  _mapper = new TQSignalMapper( TQT_TQOBJECT(this), "RegExpButtons::_mapper" );
+  _mapper = new TQSignalMapper( this, "RegExpButtons::_mapper" );
   connect( _mapper, TQT_SIGNAL( mapped(int) ), this, TQT_SIGNAL( clicked(int) ) );
 
   // The "select" button.
@@ -164,7 +164,7 @@ DoubleClickButton* RegExpButtons::insert(RegExpType tp, const char* name, TQStri
 
   DoubleClickButton* but = new DoubleClickButton( pix, this, "RegExpButtons::but");
 
-  _mapper->setMapping( TQT_TQOBJECT(but), tp );
+  _mapper->setMapping( but, tp );
 
   connect( but, TQT_SIGNAL( clicked() ), _mapper, TQT_SLOT( map() ) );
   connect( but, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSetNonKeepMode() ) );
diff --git a/kregexpeditor/repeatwidget.cpp b/kregexpeditor/repeatwidget.cpp
index 085c36b..b46cade 100644
--- a/kregexpeditor/repeatwidget.cpp
+++ b/kregexpeditor/repeatwidget.cpp
@@ -151,7 +151,7 @@ void RepeatWidget::slotConfigCanceled()
 {
   TQDataStream stream( _backup, IO_ReadOnly );
   KWidgetStreamer streamer;
-  streamer.fromStream( stream, TQT_TQOBJECT(_content) );
+  streamer.fromStream( stream, _content );
   repaint();
 }
 
@@ -161,7 +161,7 @@ int RepeatWidget::edit()
                                               _configWindow->sizeHint().height()/2)  );
   TQDataStream stream( _backup, IO_WriteOnly );
   KWidgetStreamer streamer;
-  streamer.toStream( TQT_TQOBJECT(_content), stream );
+  streamer.toStream( _content, stream );
 
   return _configWindow->exec();
 }
diff --git a/kregexpeditor/textwidget.cpp b/kregexpeditor/textwidget.cpp
index 35af60b..121dad4 100644
--- a/kregexpeditor/textwidget.cpp
+++ b/kregexpeditor/textwidget.cpp
@@ -60,7 +60,7 @@ void TextWidget::slotUpdate()
   // widget may not be enough for the parent to change size, and in that
   // case the parent would not repaint, and the text widget would not be
   // resized.
-  TQWidget *p = TQT_TQWIDGET(parent());
+  TQWidget *p = static_cast<TQWidget*>(parent());
   if (p)
     p->repaint();
   _editorWindow->updateContent( this );