Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 762dc98fa6b143629c75b3bbe277228fb04e8324)

10 files changed, 18 insertions, 18 deletions

diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp
index 77f2be029..e9a95be6d 100644
--- a/libtdepim/addresseeselector.cpp
+++ b/libtdepim/addresseeselector.cpp
@@ -227,8 +227,8 @@ class SelectionViewItem : public TQListViewItem
 AddresseeSelector::AddresseeSelector( Selection *selection, TQWidget *parent, const char *name )
   : TQWidget( parent, name ), mSelection( selection ), mManager( 0 )
 {
-  mMoveMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
-  mRemoveMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
+  mMoveMapper = new TQSignalMapper( this );
+  mRemoveMapper = new TQSignalMapper( this );
 
   mAddressBookManager = new AddressBookManager();
 
@@ -300,7 +300,7 @@ void AddresseeSelector::initGUI()
 
     connect( listView, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ),
              mRemoveMapper, TQT_SLOT( map() ) );
-    mRemoveMapper->setMapping( TQT_TQOBJECT(listView), i );
+    mRemoveMapper->setMapping( listView, i );
 
     TQVBoxLayout *buttonLayout = new TQVBoxLayout( this );
     buttonLayout->setAlignment( TQt::AlignBottom );
@@ -313,7 +313,7 @@ void AddresseeSelector::initGUI()
 
     connect( moveButton, TQT_SIGNAL( clicked() ),
              mMoveMapper, TQT_SLOT( map() ) );
-    mMoveMapper->setMapping( TQT_TQOBJECT(moveButton), i );
+    mMoveMapper->setMapping( moveButton, i );
 
     // remove button
     TQToolButton *removeButton = new TQToolButton( this );
@@ -322,7 +322,7 @@ void AddresseeSelector::initGUI()
 
     connect( removeButton, TQT_SIGNAL( clicked() ),
              mRemoveMapper, TQT_SLOT( map() ) );
-    mRemoveMapper->setMapping( TQT_TQOBJECT(removeButton), i );
+    mRemoveMapper->setMapping( removeButton, i );
 
     buttonLayout->addWidget( moveButton );
     buttonLayout->addWidget( removeButton );
diff --git a/libtdepim/designerfields.cpp b/libtdepim/designerfields.cpp
index 8e67e55d0..da7068bb7 100644
--- a/libtdepim/designerfields.cpp
+++ b/libtdepim/designerfields.cpp
@@ -83,7 +83,7 @@ void DesignerFields::initGUI( const TQString &uiFile )
       if ( name.startsWith( "X_" ) ) {
         name = name.mid( 2 );
 
-        TQWidget *widget = TQT_TQWIDGET( it.current() );
+        TQWidget *widget = static_cast<TQWidget*>( it.current() );
         if ( !name.isEmpty() )
           mWidgets.insert( name, widget );
 
diff --git a/libtdepim/embeddedurlpage.cpp b/libtdepim/embeddedurlpage.cpp
index 79bf58637..21838f506 100644
--- a/libtdepim/embeddedurlpage.cpp
+++ b/libtdepim/embeddedurlpage.cpp
@@ -55,7 +55,7 @@ void EmbeddedURLPage::loadContents()
     if ( mimetype == "auto" )
         mimetype == KMimeType::findByURL( mUri )->name();
     // "this" is both the parent widget and the parent object
-    mPart = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0 );
+    mPart = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), this, 0, this, 0 );
     if ( mPart ) {
         mPart->openURL( mUri );
         mPart->widget()->show();
diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp
index 64ef02db3..03c2f161d 100644
--- a/libtdepim/kcmdesignerfields.cpp
+++ b/libtdepim/kcmdesignerfields.cpp
@@ -91,7 +91,7 @@ class PageItem : public TQCheckListItem
               new TQListViewItem( this, name,
                                  allowedTypes[ it.current()->className() ],
                                  it.current()->className(),
-                                 TQWhatsThis::textFor( TQT_TQWIDGET( it.current() ) ) );
+                                 TQWhatsThis::textFor( static_cast<TQWidget*>( it.current() ) ) );
             }
           }
 
@@ -162,7 +162,7 @@ void KCMDesignerFields::delayedInit()
   load();
 
   // Install a dirwatcher that will detect newly created or removed designer files
-  KDirWatch *dw = new KDirWatch( TQT_TQOBJECT(this) );
+  KDirWatch *dw = new KDirWatch( this );
   TDEStandardDirs::makeDir(localUiDir());
   dw->addDir( localUiDir(), true );
   connect( dw, TQT_SIGNAL( created(const TQString&) ), TQT_SLOT( rebuildList() ) );
diff --git a/libtdepim/kdateedit.cpp b/libtdepim/kdateedit.cpp
index 16c5e9f89..52dbb26af 100644
--- a/libtdepim/kdateedit.cpp
+++ b/libtdepim/kdateedit.cpp
@@ -38,7 +38,7 @@ class DateValidator : public TQValidator
 {
   public:
     DateValidator( const TQStringList &keywords, TQWidget* parent, const char* name = 0 )
-      : TQValidator( TQT_TQOBJECT(parent), name ), mKeywords( keywords )
+      : TQValidator( parent, name ), mKeywords( keywords )
     {}
 
     virtual State validate( TQString &str, int& ) const
diff --git a/libtdepim/kincidencechooser.cpp b/libtdepim/kincidencechooser.cpp
index 84fede01f..1151d0cb1 100644
--- a/libtdepim/kincidencechooser.cpp
+++ b/libtdepim/kincidencechooser.cpp
@@ -249,7 +249,7 @@ void KIncidenceChooser::showIncidence1()
 
 void KIncidenceChooser::detailsDialogClosed()
 {
-    KDialogBase* dialog =  static_cast<KDialogBase *>(TQT_TQWIDGET(const_cast<TQObject*>(sender()))) ;
+    KDialogBase* dialog =  static_cast<KDialogBase *>(const_cast<TQObject*>(sender())) ;
     if ( dialog == mTbL )
         mShowDetails1->setText( i18n( "Show details..." ) );
     else
diff --git a/libtdepim/kpixmapregionselectorwidget.cpp b/libtdepim/kpixmapregionselectorwidget.cpp
index c83003a5a..19e90741c 100644
--- a/libtdepim/kpixmapregionselectorwidget.cpp
+++ b/libtdepim/kpixmapregionselectorwidget.cpp
@@ -144,13 +144,13 @@ TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu()
    popup->insertTitle(i18n("Image Operations"));
 
    TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right",
-                                0, TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()),
-                                TQT_TQOBJECT(popup), "rotateclockwise");
+                                0, this, TQT_SLOT(rotateClockwise()),
+                                popup, "rotateclockwise");
    action->plug(popup);
 
    action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left",
-                                0, TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()),
-                                TQT_TQOBJECT(popup), "rotatecounterclockwise");
+                                0, this, TQT_SLOT(rotateCounterclockwise()),
+                                popup, "rotatecounterclockwise");
    action->plug(popup);
 
 /*
diff --git a/libtdepim/ktimeedit.cpp b/libtdepim/ktimeedit.cpp
index 6451c65b9..377831304 100644
--- a/libtdepim/ktimeedit.cpp
+++ b/libtdepim/ktimeedit.cpp
@@ -43,7 +43,7 @@
 class KOTimeValidator : public TQValidator
 {
 public:
-    KOTimeValidator(TQWidget* parent, const char* name=0) : TQValidator(TQT_TQOBJECT(parent), name) {}
+    KOTimeValidator(TQWidget* parent, const char* name=0) : TQValidator(parent, name) {}
 
     virtual State validate(TQString& str, int& /*cursorPos*/) const
     {
diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp
index c06da514f..d6b541f5e 100644
--- a/libtdepim/ldapsearchdialog.cpp
+++ b/libtdepim/ldapsearchdialog.cpp
@@ -258,7 +258,7 @@ void LDAPSearchDialog::restoreSettings()
       if ( !pwdBindDN.isEmpty() )
         ldapServer.setPwdBindDN( pwdBindDN );
 
-      KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, TQT_TQOBJECT(this), "ldapclient" );
+      KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, this, "ldapclient" );
       ldapClient->setServer( ldapServer );
 
       TQStringList attrs;
diff --git a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
index 74d7329b1..18952fe15 100644
--- a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
+++ b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
@@ -48,7 +48,7 @@ void KPartsGenericPart::load()
         delete m_part;
     }
     // "this" is both the parent widget and the parent object
-    m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0 );
+    m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), this, 0, this, 0 );
     if ( m_part ) {
         m_part->openURL( m_url );
         m_part->widget()->show();