Replace various '#define' strings - part 6

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

11 files changed, 29 insertions, 29 deletions

diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index bfe471327..8918534f5 100644
--- a/kaddressbook/addresseditwidget.cpp
+++ b/kaddressbook/addresseditwidget.cpp
@@ -281,7 +281,7 @@ AddressEditDialog::AddressEditDialog( const TDEABC::Address::List &list,
   label->setBuddy( mStreetTextEdit );
   topLayout->addWidget( mStreetTextEdit, 1, 1 );
 
-  TabPressEater *eater = new TabPressEater( TQT_TQOBJECT(this) );
+  TabPressEater *eater = new TabPressEater( this );
   mStreetTextEdit->installEventFilter( eater );
 
   label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).arg( TDEABC::Address::postOfficeBoxLabel() ), page );
diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp
index f597c0658..18a10677a 100644
--- a/kaddressbook/customfieldswidget.cpp
+++ b/kaddressbook/customfieldswidget.cpp
@@ -54,7 +54,7 @@ AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name )
   layout->addWidget( label, 0, 0 );
 
   mTitle = new KLineEdit( page );
-  mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), TQT_TQOBJECT(mTitle) ) );
+  mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), mTitle ) );
   label->setBuddy( mTitle );
   layout->addWidget( mTitle, 0, 1 );
 
diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp
index 3f7b73531..6a046461b 100644
--- a/kaddressbook/distributionlisteditor.cpp
+++ b/kaddressbook/distributionlisteditor.cpp
@@ -159,7 +159,7 @@ KPIM::DistributionListEditor::EditorWidget::EditorWidget( TDEABC::AddressBook* b
     d->addressBook = book;
     Q_ASSERT( d->addressBook );
     d->lastLineId = 0;
-    d->mapper = new TQSignalMapper( TQT_TQOBJECT(this) );
+    d->mapper = new TQSignalMapper( this );
     connect( d->mapper, TQT_SIGNAL( mapped( int ) ),
              this, TQT_SLOT( lineTextChanged( int ) ) );
     setCaption( i18n( "Edit Distribution List" ) );
@@ -250,7 +250,7 @@ KPIM::DistributionListEditor::Line* KPIM::DistributionListEditor::EditorWidgetPr
     addressees.append( line );
     TQObject::connect( line, TQT_SIGNAL( textChanged() ),
                       mapper, TQT_SLOT( map() ) );
-    mapper->setMapping( TQT_TQOBJECT(line), ++lastLineId );
+    mapper->setMapping( line, ++lastLineId );
     line->setShown( true );
     return line;
 }
diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp
index a42cc94c6..2fc87246b 100644
--- a/kaddressbook/filtereditdialog.cpp
+++ b/kaddressbook/filtereditdialog.cpp
@@ -266,10 +266,10 @@ void FilterDialog::initGUI()
            TQT_SLOT( edit() ) );
 
   KButtonBox *buttonBox = new KButtonBox( page, TQt::Vertical );
-  buttonBox->addButton( i18n( "&Add..." ), TQT_TQOBJECT(this), TQT_SLOT( add() ) );
-  mEditButton = buttonBox->addButton( i18n( "&Edit..." ), TQT_TQOBJECT(this), TQT_SLOT( edit() ) );
+  buttonBox->addButton( i18n( "&Add..." ), this, TQT_SLOT( add() ) );
+  mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, TQT_SLOT( edit() ) );
   mEditButton->setEnabled( false );
-  mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), TQT_TQOBJECT(this), TQT_SLOT( remove() ) );
+  mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, TQT_SLOT( remove() ) );
   mRemoveButton->setEnabled( false );
 
   buttonBox->layout();
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index cdd0a7c75..634363150 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -94,7 +94,7 @@
 
 KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent,
                   const TQString &file, const char *name )
-  : KAB::Core( client, TQT_TQOBJECT(parent), name ), mStatusBar( 0 ), mViewManager( 0 ),
+  : KAB::Core( client, parent, name ), mStatusBar( 0 ), mViewManager( 0 ),
     mExtensionManager( 0 ), mJumpButtonBar( 0 ), mCategorySelectDialog( 0 ),
     mCategoryEditDialog( 0 ), mLdapSearchDialog( 0 ), mReadWrite( readWrite ),
     mModified( false )
@@ -140,7 +140,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent,
   mAddressBook->addCustomField( i18n( "Blog" ), TDEABC::Field::Personal,
                                 "BlogFeed", "KADDRESSBOOK" );
 
-  mSearchManager = new KAB::SearchManager( mAddressBook, TQT_TQOBJECT(parent) );
+  mSearchManager = new KAB::SearchManager( mAddressBook, parent );
 
   connect( mSearchManager, TQT_SIGNAL( contactsUpdated() ),
            this, TQT_SLOT( slotContactsUpdated() ) );
@@ -1292,7 +1292,7 @@ void KABCore::initGUI()
 
   topLayout->setStretchFactor( mDetailsSplitter, 1 );
 
-  mXXPortManager = new XXPortManager( this, TQT_TQOBJECT(mWidget) );
+  mXXPortManager = new XXPortManager( this, mWidget );
 
   initActions();
 }
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp
index bfcea2b66..fce5fd8c1 100644
--- a/kaddressbook/kaddressbookmain.cpp
+++ b/kaddressbook/kaddressbookmain.cpp
@@ -150,13 +150,13 @@ bool KAddressBookMain::queryClose()
 
 void KAddressBookMain::initActions()
 {
-  KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
+  KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() );
 
   TDEAction *action;
-  action = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( configureKeyBindings() ), actionCollection() );
+  action = KStdAction::keyBindings( this, TQT_SLOT( configureKeyBindings() ), actionCollection() );
   action->setWhatsThis( i18n( "You will be presented with a dialog, where you can configure the application wide shortcuts." ) );
 
-  KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( configureToolbars() ), actionCollection() );
+  KStdAction::configureToolbars( this, TQT_SLOT( configureToolbars() ), actionCollection() );
 }
 
 void KAddressBookMain::configureKeyBindings()
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index b446d56eb..c083a029f 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -56,10 +56,10 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
   groupLayout->addWidget( mBox, 0, 0 );
 
   KButtonBox *bbox = new KButtonBox( group, TQt::Vertical );
-  mAddButton = bbox->addButton( i18n( "Add..." ), TQT_TQOBJECT(this),  TQT_SLOT( add() ) );
-  mEditButton = bbox->addButton( i18n( "Edit..." ), TQT_TQOBJECT(this),  TQT_SLOT( edit() ) );
+  mAddButton = bbox->addButton( i18n( "Add..." ), this,  TQT_SLOT( add() ) );
+  mEditButton = bbox->addButton( i18n( "Edit..." ), this,  TQT_SLOT( edit() ) );
   mEditButton->setEnabled( false );
-  mRemoveButton = bbox->addButton( i18n( "Remove" ), TQT_TQOBJECT(this),  TQT_SLOT( remove() ) );
+  mRemoveButton = bbox->addButton( i18n( "Remove" ), this,  TQT_SLOT( remove() ) );
   mRemoveButton->setEnabled( false );
   bbox->layout();
   groupLayout->addWidget( bbox, 0, 1 );
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
index 4e4b15a93..db8bbef7b 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
@@ -288,10 +288,10 @@ void LDAPOptionsWidget::initGUI()
   layout->addWidget( groupBox );
 
   KButtonBox *buttons = new KButtonBox( this );
-  buttons->addButton( i18n( "&Add Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotAddHost() ) );
-  mEditButton = buttons->addButton( i18n( "&Edit Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotEditHost() ) );
+  buttons->addButton( i18n( "&Add Host..." ), this, TQT_SLOT( slotAddHost() ) );
+  mEditButton = buttons->addButton( i18n( "&Edit Host..." ), this, TQT_SLOT( slotEditHost() ) );
   mEditButton->setEnabled( false );
-  mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), TQT_TQOBJECT(this), TQT_SLOT( slotRemoveHost() ) );
+  mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), this, TQT_SLOT( slotRemoveHost() ) );
   mRemoveButton->setEnabled( false );
   buttons->layout();
 
diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index 8c2c7c6b9..7e5c1a6c3 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -203,8 +203,8 @@ LDAPSearchDialog::LDAPSearchDialog( TDEABC::AddressBook *ab, KABCore *core,
   topLayout->addWidget( mResultListView );
 
   KButtonBox *buttons = new KButtonBox( page, TQt::Horizontal );
-  buttons->addButton( i18n( "Select All" ), TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ) );
-  buttons->addButton( i18n( "Unselect All" ), TQT_TQOBJECT(this), TQT_SLOT( slotUnselectAll() ) );
+  buttons->addButton( i18n( "Select All" ), this, TQT_SLOT( slotSelectAll() ) );
+  buttons->addButton( i18n( "Unselect All" ), this, TQT_SLOT( slotUnselectAll() ) );
 
   topLayout->addWidget( buttons );
 
@@ -264,7 +264,7 @@ void LDAPSearchDialog::restoreSettings()
   } else {
     mIsOK = true;
     for ( int j = 0; j < mNumHosts; ++j ) {
-      KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, TQT_TQOBJECT(this), "ldapclient" );
+      KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, this, "ldapclient" );
       KPIM::LdapServer ldapServer;
       KPIM::LdapSearch::readConfig( ldapServer, config, j, true );
       ldapClient->setServer( ldapServer );
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index 963af05ac..b1d87f41f 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -183,7 +183,7 @@ PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name )
   mRemoveButton->setMaximumSize( mRemoveButton->sizeHint() );
   layout->addWidget( mRemoveButton, 1, 1 );
 
-  mMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
+  mMapper = new TQSignalMapper( this );
   connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( changed( int ) ) );
 
   connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) );
@@ -271,7 +271,7 @@ void PhoneEditWidget::recreateNumberWidgets()
     PhoneNumberWidget *wdg = new PhoneNumberWidget( this );
     wdg->setNumber( *it );
 
-    mMapper->setMapping( TQT_TQOBJECT(wdg), counter );
+    mMapper->setMapping( wdg, counter );
     connect( wdg, TQT_SIGNAL( modified() ), mMapper, TQT_SLOT( map() ) );
 
     mWidgetLayout->addWidget( wdg );
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 47ef542e6..bbda53419 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -573,27 +573,27 @@ void ViewManager::initActions()
 
   TDEAction *action;
 
-  action = new TDEAction( i18n( "Modify View..." ), "configure", 0, TQT_TQOBJECT(this),
+  action = new TDEAction( i18n( "Modify View..." ), "configure", 0, this,
                         TQT_SLOT( editView() ), mCore->actionCollection(),
                         "view_modify" );
   action->setWhatsThis( i18n( "By pressing this button a dialog opens that allows you to modify the view of the addressbook. There you can add or remove fields that you want to be shown or hidden in the addressbook like the name for example." ) );
 
-  action = new TDEAction( i18n( "Add View..." ), "window-new", 0, TQT_TQOBJECT(this),
+  action = new TDEAction( i18n( "Add View..." ), "window-new", 0, this,
                         TQT_SLOT( addView() ), mCore->actionCollection(),
                         "view_add" );
   action->setWhatsThis( i18n( "You can add a new view by choosing one from the dialog that appears after pressing the button. You have to give the view a name, so that you can distinguish between the different views." ) );
 
   mActionDeleteView = new TDEAction( i18n( "Delete View" ), "view_remove", 0,
-                                   TQT_TQOBJECT(this), TQT_SLOT( deleteView() ),
+                                   this, TQT_SLOT( deleteView() ),
                                    mCore->actionCollection(), "view_delete" );
   mActionDeleteView->setWhatsThis( i18n( "By pressing this button you can delete the actual view, which you have added before." ) );
 
-  action = new TDEAction( i18n( "Refresh View" ), "reload", 0, TQT_TQOBJECT(this),
+  action = new TDEAction( i18n( "Refresh View" ), "reload", 0, this,
                TQT_SLOT( refreshView() ), mCore->actionCollection(),
                "view_refresh" );
   action->setWhatsThis( i18n( "The view will be refreshed by pressing this button." ) );
 
-  action = new TDEAction( i18n( "Edit &Filters..." ), "filter", 0, TQT_TQOBJECT(this),
+  action = new TDEAction( i18n( "Edit &Filters..." ), "filter", 0, this,
                TQT_SLOT( configureFilters() ), mCore->actionCollection(),
                "options_edit_filters" );
   action->setWhatsThis( i18n( "Edit the contact filters<p>You will be presented with a dialog, where you can add, remove and edit filters." ) );