Remove various '#define' strings - part 6

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

5 files changed, 14 insertions, 14 deletions

diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp
index b530a93c..2db2bd31 100644
--- a/lib/kofficeui/KoContextCelp.cpp
+++ b/lib/kofficeui/KoContextCelp.cpp
@@ -364,7 +364,7 @@ void KoHelpWidget::timerEvent( TQTimerEvent* )
 
 void KoHelpWidget::stopScrolling()
 {
-	TQT_TQOBJECT(this)->killTimers();
+	this->killTimers();
 } // KoHelpWidget::stopScrolling
 
 KoContextHelpPopup::KoContextHelpPopup( TQWidget* parent )
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index bbe4145a..f202177c 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -75,7 +75,7 @@ TQPopupMenu* KoColorPanel::createColorPopup( KoColorPanel::MenuStyle style, cons
         TQPainter p( &pixmap );
         p.fillRect( 0, 0, 12, 12, defaultColor );
         p.end();
-        proxy = new KoColorPopupProxy( defaultColor, 0, TQT_TQOBJECT(menu), "color proxy" );
+        proxy = new KoColorPopupProxy( defaultColor, 0, menu, "color proxy" );
         connect( proxy, TQT_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot );
         menu->insertItem( TQIconSet( pixmap ), i18n( "Default Color" ), proxy, TQT_SLOT( slotDefaultColor() ) );
         menu->insertSeparator();
@@ -92,7 +92,7 @@ TQPopupMenu* KoColorPanel::createColorPopup( KoColorPanel::MenuStyle style, cons
         connect( panel, TQT_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot );
         menu->insertItem( panel );
         if ( !proxy ) {
-            proxy = new KoColorPopupProxy( TQColor(), panel, TQT_TQOBJECT(menu), "color proxy" );
+            proxy = new KoColorPopupProxy( TQColor(), panel, menu, "color proxy" );
             connect( proxy, TQT_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot );
         }
         else
@@ -636,7 +636,7 @@ void KoColorPopupProxy::slotMoreColors()
     TQColor newColor;
     TQWidget* p = 0;
     if ( parent() && parent()->isWidgetType() )
-        p = TQT_TQWIDGET( parent() );
+        p = static_cast<TQWidget*>( parent() );
 
     if ( KColorDialog::getColor( newColor, p ) == TQDialog::Accepted ) {
         m_recentColors->insertColor( newColor );
@@ -832,7 +832,7 @@ bool KoToolButton::eventFilter( TQObject* o, TQEvent* e )
 
 void KoToolButton::init()
 {
-    m_popup = KoColorPanel::createColorPopup( KoColorPanel::CustomColors, TQt::yellow, TQT_TQOBJECT(this),
+    m_popup = KoColorPanel::createColorPopup( KoColorPanel::CustomColors, TQt::yellow, this,
                                               TQT_SLOT( colorSelected( const TQColor& ) ),
                                               this, "no-name" );
     // We are interested in the mouse clicks on the arrow button
diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp
index 4c4a5c45..5c5bdbd9 100644
--- a/lib/kofficeui/KoUnitWidgets.cpp
+++ b/lib/kofficeui/KoUnitWidgets.cpp
@@ -124,7 +124,7 @@ KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *parent, const char *name )
     , m_stepInPoints( 1 )
 {
     KDoubleSpinBox::setPrecision( 2 );
-    m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) );
+    m_validator = new KoUnitDoubleValidator( this, this );
     TQSpinBox::setValidator( m_validator );
     setAcceptLocalizedNumbers( true );
     setUnit( KoUnit::U_PT );
@@ -145,7 +145,7 @@ KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *parent,
     m_lowerInPoints( lower ), m_upperInPoints( upper ), m_stepInPoints( step )
 {
     m_unit = KoUnit::U_PT;
-    m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) );
+    m_validator = new KoUnitDoubleValidator( this, this );
     TQSpinBox::setValidator( m_validator );
     setAcceptLocalizedNumbers( true );
     setUnit( unit );
@@ -224,7 +224,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, const char *name )
     m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 )
 {
     setAlignment( TQt::AlignRight );
-    m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) );
+    m_validator = new KoUnitDoubleValidator( this, this );
     setValidator( m_validator );
     setUnit( KoUnit::U_PT );
     changeValue(  KoUnit::ptToUnit( 0.0, KoUnit::U_PT ) );
@@ -236,7 +236,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, double lower, doub
     m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
     setAlignment( TQt::AlignRight );
-    m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) );
+    m_validator = new KoUnitDoubleValidator( this, this );
     setValidator( m_validator );
     setUnit( unit );
     changeValue(  KoUnit::ptToUnit( value, unit ) );
@@ -288,7 +288,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, const char *name )
      : KComboBox( true, parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 )
 {
     lineEdit()->setAlignment( TQt::AlignRight );
-    m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) );
+    m_validator = new KoUnitDoubleValidator( this, this );
     lineEdit()->setValidator( m_validator );
     setUnit( KoUnit::U_PT );
     changeValue(  KoUnit::ptToUnit( 0.0, KoUnit::U_PT ) );
@@ -301,7 +301,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, doub
      m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
     lineEdit()->setAlignment( TQt::AlignRight );
-    m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) );
+    m_validator = new KoUnitDoubleValidator( this, this );
     lineEdit()->setValidator( m_validator );
     setUnit( unit );
     changeValue(  KoUnit::ptToUnit( value, unit ) );
diff --git a/lib/kofficeui/Kolinewidthaction.cpp b/lib/kofficeui/Kolinewidthaction.cpp
index b9ff452a..a000ca56 100644
--- a/lib/kofficeui/Kolinewidthaction.cpp
+++ b/lib/kofficeui/Kolinewidthaction.cpp
@@ -109,7 +109,7 @@ void KoLineWidthAction::execute(int index)
     d->m_currentWidth = (double) index + 1.0;
     ok = true;
   } if(index == 11) { // Custom width dialog...
-    KoLineWidthChooser dlg(TQT_TQWIDGET(tqApp->activeWindow()));
+    KoLineWidthChooser dlg(tqApp->activeWindow());
     dlg.setUnit(d->m_unit);
     dlg.setWidth(d->m_currentWidth);
 
diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp
index cf55a84a..8eaf1d9d 100644
--- a/lib/kofficeui/tkcoloractions.cpp
+++ b/lib/kofficeui/tkcoloractions.cpp
@@ -240,7 +240,7 @@ void TTDESelectColorAction::selectColorDialog()
 
     if ( d->defaultColorMenu )
     {
-        if ( KColorDialog::getColor(c,d->defaultColor, TQT_TQWIDGET(tqApp->activeWindow())) == TQDialog::Accepted )
+        if ( KColorDialog::getColor(c,d->defaultColor, tqApp->activeWindow()) == TQDialog::Accepted )
         {
             setCurrentColor(c);
             m_pRecentColor->insertColor(m_pCurrentColor);
@@ -250,7 +250,7 @@ void TTDESelectColorAction::selectColorDialog()
     }
     else
     {
-        if ( KColorDialog::getColor(c, TQT_TQWIDGET(tqApp->activeWindow())) == TQDialog::Accepted )
+        if ( KColorDialog::getColor(c, tqApp->activeWindow()) == TQDialog::Accepted )
         {
             setCurrentColor(c);
             m_pRecentColor->insertColor(m_pCurrentColor);