diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-14 12:33:20 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-14 12:43:48 +0900 |
| commit | 3b3f9ec8f31978030c17309fae48335bea5c1587 (patch) | |
| tree | 0b493383a1501860371aacd792ec6fc08d595824 /libtdepim | |
| parent | 99e6e1d1f43610c3573e9824a2a8a38f69930cd0 (diff) | |
| download | tdepim-3b3f9ec8f31978030c17309fae48335bea5c1587.tar.gz tdepim-3b3f9ec8f31978030c17309fae48335bea5c1587.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'libtdepim')
38 files changed, 477 insertions, 477 deletions
diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp index 4060c451..77128b7a 100644 --- a/libtdepim/addresseelineedit.cpp +++ b/libtdepim/addresseelineedit.cpp @@ -151,8 +151,8 @@ void AddresseeLineEdit::init() completionSourceWeightsDeleter.setObject( s_completionSourceWeights, new TQMap<TQString,int> ); ldapClientToCompletionSourceMapDeleter.setObject( s_ldapClientToCompletionSourceMap, new TQMap<int,int> ); } -// connect( s_completion, TQT_SIGNAL( match( const TQString& ) ), -// this, TQT_SLOT( slotMatched( const TQString& ) ) ); +// connect( s_completion, TQ_SIGNAL( match( const TQString& ) ), +// this, TQ_SLOT( slotMatched( const TQString& ) ) ); if ( m_useCompletion ) { if ( !s_LDAPTimer ) { @@ -165,25 +165,25 @@ void AddresseeLineEdit::init() if ( !m_completionInitialized ) { setCompletionObject( s_completion, false ); - connect( this, TQT_SIGNAL( completion( const TQString& ) ), - this, TQT_SLOT( slotCompletion() ) ); - connect( this, TQT_SIGNAL( returnPressed( const TQString& ) ), - this, TQT_SLOT( slotReturnPressed( const TQString& ) ) ); + connect( this, TQ_SIGNAL( completion( const TQString& ) ), + this, TQ_SLOT( slotCompletion() ) ); + connect( this, TQ_SIGNAL( returnPressed( const TQString& ) ), + this, TQ_SLOT( slotReturnPressed( const TQString& ) ) ); TDECompletionBox *box = completionBox(); - connect( box, TQT_SIGNAL( highlighted( const TQString& ) ), - this, TQT_SLOT( slotPopupCompletion( const TQString& ) ) ); - connect( box, TQT_SIGNAL( userCancelled( const TQString& ) ), - TQT_SLOT( slotUserCancelled( const TQString& ) ) ); + connect( box, TQ_SIGNAL( highlighted( const TQString& ) ), + this, TQ_SLOT( slotPopupCompletion( const TQString& ) ) ); + connect( box, TQ_SIGNAL( userCancelled( const TQString& ) ), + TQ_SLOT( slotUserCancelled( const TQString& ) ) ); // The emitter is always called KPIM::IMAPCompletionOrder by contract if ( !connectDCOPSignal( 0, "KPIM::IMAPCompletionOrder", "orderChanged()", "slotIMAPCompletionOrderChanged()", false ) ) kdError() << "AddresseeLineEdit: connection to orderChanged() failed" << endl; - connect( s_LDAPTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotStartLDAPLookup() ) ); - connect( s_LDAPSearch, TQT_SIGNAL( searchData( const KPIM::LdapResultList& ) ), - TQT_SLOT( slotLDAPSearchData( const KPIM::LdapResultList& ) ) ); + connect( s_LDAPTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotStartLDAPLookup() ) ); + connect( s_LDAPSearch, TQ_SIGNAL( searchData( const KPIM::LdapResultList& ) ), + TQ_SLOT( slotLDAPSearchData( const KPIM::LdapResultList& ) ) ); m_completionInitialized = true; } @@ -607,7 +607,7 @@ void AddresseeLineEdit::loadContacts() TQApplication::restoreOverrideCursor(); if ( !m_addressBookConnected ) { - connect( addressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ), TQT_SLOT( loadContacts() ) ); + connect( addressBook, TQ_SIGNAL( addressBookChanged( AddressBook* ) ), TQ_SLOT( loadContacts() ) ); m_addressBookConnected = true; } } @@ -925,7 +925,7 @@ TQPopupMenu* AddresseeLineEdit::createPopupMenu() menu->setItemVisible( ShortAutoCompletion, false ); menu->setItemVisible( PopupAutoCompletion, false ); menu->insertItem( i18n( "Configure Completion Order..." ), - this, TQT_SLOT( slotEditCompletionOrder() ) ); + this, TQ_SLOT( slotEditCompletionOrder() ) ); } return menu; } diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp index e9a95be6..b89184e6 100644 --- a/libtdepim/addresseeselector.cpp +++ b/libtdepim/addresseeselector.cpp @@ -250,17 +250,17 @@ AddresseeSelector::~AddresseeSelector() void AddresseeSelector::init() { - connect( TDEABC::StdAddressBook::self( true ), TQT_SIGNAL( addressBookChanged( AddressBook* ) ), - this, TQT_SLOT( reloadAddressBook() ) ); - connect( mAddresseeFilter, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( updateAddresseeView() ) ); - connect( mAddressBookCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( updateAddresseeView() ) ); - - connect( mMoveMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( move( int ) ) ); - connect( mRemoveMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( remove( int ) ) ); + connect( TDEABC::StdAddressBook::self( true ), TQ_SIGNAL( addressBookChanged( AddressBook* ) ), + this, TQ_SLOT( reloadAddressBook() ) ); + connect( mAddresseeFilter, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( updateAddresseeView() ) ); + connect( mAddressBookCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( updateAddresseeView() ) ); + + connect( mMoveMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( move( int ) ) ); + connect( mRemoveMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( remove( int ) ) ); reloadAddressBook(); } @@ -298,8 +298,8 @@ void AddresseeSelector::initGUI() listView->setFullWidth( true ); mSelectionViews.append( listView ); - connect( listView, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), - mRemoveMapper, TQT_SLOT( map() ) ); + connect( listView, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), + mRemoveMapper, TQ_SLOT( map() ) ); mRemoveMapper->setMapping( listView, i ); TQVBoxLayout *buttonLayout = new TQVBoxLayout( this ); @@ -311,8 +311,8 @@ void AddresseeSelector::initGUI() moveButton->setIconSet( moveSet ); moveButton->setFixedSize( 30, 30 ); - connect( moveButton, TQT_SIGNAL( clicked() ), - mMoveMapper, TQT_SLOT( map() ) ); + connect( moveButton, TQ_SIGNAL( clicked() ), + mMoveMapper, TQ_SLOT( map() ) ); mMoveMapper->setMapping( moveButton, i ); // remove button @@ -320,8 +320,8 @@ void AddresseeSelector::initGUI() removeButton->setIconSet( removeSet ); removeButton->setFixedSize( 30, 30 ); - connect( removeButton, TQT_SIGNAL( clicked() ), - mRemoveMapper, TQT_SLOT( map() ) ); + connect( removeButton, TQ_SIGNAL( clicked() ), + mRemoveMapper, TQ_SLOT( map() ) ); mRemoveMapper->setMapping( removeButton, i ); buttonLayout->addWidget( moveButton ); diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp index 16c9bbf2..defdecfa 100644 --- a/libtdepim/addresseeview.cpp +++ b/libtdepim/addresseeview.cpp @@ -64,12 +64,12 @@ AddresseeView::AddresseeView( TQWidget *parent, const char *name, TQStyleSheetItem *link = sheet->item( "a" ); link->setColor( TDEGlobalSettings::linkColor() ); - connect( this, TQT_SIGNAL( mailClick( const TQString&, const TQString& ) ), - this, TQT_SLOT( slotMailClicked( const TQString&, const TQString& ) ) ); - connect( this, TQT_SIGNAL( urlClick( const TQString& ) ), - this, TQT_SLOT( slotUrlClicked( const TQString& ) ) ); - connect( this, TQT_SIGNAL( highlighted( const TQString& ) ), - this, TQT_SLOT( slotHighlighted( const TQString& ) ) ); + connect( this, TQ_SIGNAL( mailClick( const TQString&, const TQString& ) ), + this, TQ_SLOT( slotMailClicked( const TQString&, const TQString& ) ) ); + connect( this, TQ_SIGNAL( urlClick( const TQString& ) ), + this, TQ_SLOT( slotUrlClicked( const TQString& ) ) ); + connect( this, TQ_SIGNAL( highlighted( const TQString& ) ), + this, TQ_SLOT( slotHighlighted( const TQString& ) ) ); setNotifyClick( true ); @@ -88,13 +88,13 @@ AddresseeView::AddresseeView( TQWidget *parent, const char *name, mActionShowCustomFields = new TDEToggleAction( i18n( "Show Custom Fields" ) ); mActionShowCustomFields->setCheckedState( i18n( "Hide Custom Fields" ) ); - connect( mActionShowBirthday, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) ); - connect( mActionShowAddresses, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) ); - connect( mActionShowEmails, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) ); - connect( mActionShowPhones, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) ); - connect( mActionShowURLs, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) ); - connect( mActionShowIMAddresses, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) ); - connect( mActionShowCustomFields, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) ); + connect( mActionShowBirthday, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) ); + connect( mActionShowAddresses, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) ); + connect( mActionShowEmails, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) ); + connect( mActionShowPhones, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) ); + connect( mActionShowURLs, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) ); + connect( mActionShowIMAddresses, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) ); + connect( mActionShowCustomFields, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) ); if ( !config ) { mConfig = new TDEConfig( "kaddressbookrc" ); @@ -106,10 +106,10 @@ AddresseeView::AddresseeView( TQWidget *parent, const char *name, // set up IMProxy to display contacts' IM presence and make connections to keep the display live mKIMProxy = ::KIMProxy::instance( kapp->dcopClient() ); - connect( mKIMProxy, TQT_SIGNAL( sigContactPresenceChanged( const TQString& ) ), - this, TQT_SLOT( slotPresenceChanged( const TQString& ) ) ); - connect( mKIMProxy, TQT_SIGNAL( sigPresenceInfoExpired() ), - this, TQT_SLOT( slotPresenceInfoExpired() ) ); + connect( mKIMProxy, TQ_SIGNAL( sigContactPresenceChanged( const TQString& ) ), + this, TQ_SLOT( slotPresenceChanged( const TQString& ) ) ); + connect( mKIMProxy, TQ_SIGNAL( sigPresenceInfoExpired() ), + this, TQ_SLOT( slotPresenceInfoExpired() ) ); } AddresseeView::~AddresseeView() @@ -547,10 +547,10 @@ void AddresseeView::updateView() TQMimeSourceFactory::defaultFactory()->setImage( imageURL, TQImage(mImageData) ); else { mImageJob = TDEIO::get( KURL( picture.url() ), false, false ); - connect( mImageJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); - connect( mImageJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( result( TDEIO::Job* ) ) ); + connect( mImageJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( mImageJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( result( TDEIO::Job* ) ) ); } } else { TQMimeSourceFactory::defaultFactory()->setPixmap( imageURL, diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp index e0071ef0..deb9d1f2 100644 --- a/libtdepim/addressesdialog.cpp +++ b/libtdepim/addressesdialog.cpp @@ -241,8 +241,8 @@ AddresseeViewItem* AddressesDialog::selectedToItem() if ( !d->toItem ) { d->toItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("To"), AddresseeViewItem::To ); - connect(d->toItem, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(d->toItem, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } return d->toItem; } @@ -252,8 +252,8 @@ AddresseeViewItem* AddressesDialog::selectedCcItem() if ( !d->ccItem ) { d->ccItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("CC"), AddresseeViewItem::CC ); - connect(d->ccItem, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(d->ccItem, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } return d->ccItem; } @@ -263,8 +263,8 @@ AddresseeViewItem* AddressesDialog::selectedBccItem() if ( !d->bccItem ) { d->bccItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("BCC"), AddresseeViewItem::BCC ); - connect(d->bccItem, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(d->bccItem, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } return d->bccItem; } @@ -325,8 +325,8 @@ AddressesDialog::updateRecentAddresses() if ( !d->recent ) { d->recent = new AddresseeViewItem( d->ui->mAvailableView, recentGroup ); - connect(d->recent, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(availableAddressSelected(AddresseeViewItem*, bool))); + connect(d->recent, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(availableAddressSelected(AddresseeViewItem*, bool))); d->recent->setVisible( false ); d->groupDict.insert( recentGroup, d->recent ); } @@ -464,8 +464,8 @@ AddressesDialog::updateAvailableAddressees() static const TQString &personalGroup = TDEGlobal::staticQString( i18n( "Other Addresses" ) ); d->ui->mAvailableView->setRootIsDecorated( true ); d->personal = new AddresseeViewItem( d->ui->mAvailableView, personalGroup ); - //connect(d->personal, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - // this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + //connect(d->personal, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + // this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); d->personal->setVisible( false ); d->groupDict.insert( personalGroup, d->personal ); @@ -570,36 +570,36 @@ AddressesDialog::selectedAddressSelected( AddresseeViewItem* item, bool selected void AddressesDialog::initConnections() { - connect( d->ui->mFilterEdit, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(filterChanged(const TQString &)) ); - connect( d->ui->mToButton, TQT_SIGNAL(clicked()), - TQT_SLOT(addSelectedTo()) ); - connect( d->ui->mCCButton, TQT_SIGNAL(clicked()), - TQT_SLOT(addSelectedCC()) ); - connect( d->ui->mBCCButton, TQT_SIGNAL(clicked()), - TQT_SLOT(addSelectedBCC()) ); - connect( d->ui->mSaveAs, TQT_SIGNAL(clicked()), - TQT_SLOT(saveAs()) ); - connect( d->ui->mLdapSearch, TQT_SIGNAL(clicked()), - TQT_SLOT(searchLdap()) ); - connect( d->ui->mRemoveButton, TQT_SIGNAL(clicked()), - TQT_SLOT(removeEntry()) ); - connect( d->ui->mAvailableView, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(availableSelectionChanged()) ); - connect( d->ui->mAvailableView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(addSelectedTo()) ); - connect( d->ui->mSelectedView, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(selectedSelectionChanged()) ); - connect( d->ui->mSelectedView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(removeEntry()) ); + connect( d->ui->mFilterEdit, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(filterChanged(const TQString &)) ); + connect( d->ui->mToButton, TQ_SIGNAL(clicked()), + TQ_SLOT(addSelectedTo()) ); + connect( d->ui->mCCButton, TQ_SIGNAL(clicked()), + TQ_SLOT(addSelectedCC()) ); + connect( d->ui->mBCCButton, TQ_SIGNAL(clicked()), + TQ_SLOT(addSelectedBCC()) ); + connect( d->ui->mSaveAs, TQ_SIGNAL(clicked()), + TQ_SLOT(saveAs()) ); + connect( d->ui->mLdapSearch, TQ_SIGNAL(clicked()), + TQ_SLOT(searchLdap()) ); + connect( d->ui->mRemoveButton, TQ_SIGNAL(clicked()), + TQ_SLOT(removeEntry()) ); + connect( d->ui->mAvailableView, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(availableSelectionChanged()) ); + connect( d->ui->mAvailableView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(addSelectedTo()) ); + connect( d->ui->mSelectedView, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(selectedSelectionChanged()) ); + connect( d->ui->mSelectedView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(removeEntry()) ); #ifndef TDEPIM_NEW_DISTRLISTS - connect( TDEABC::DistributionListWatcher::self(), TQT_SIGNAL( changed() ), - this, TQT_SLOT( updateAvailableAddressees() ) ); + connect( TDEABC::DistributionListWatcher::self(), TQ_SIGNAL( changed() ), + this, TQ_SLOT( updateAvailableAddressees() ) ); #endif - connect( TDEABC::StdAddressBook::self( true ), TQT_SIGNAL( addressBookChanged(AddressBook*) ), - this, TQT_SLOT( updateAvailableAddressees() ) ); + connect( TDEABC::StdAddressBook::self( true ), TQ_SIGNAL( addressBookChanged(AddressBook*) ), + this, TQ_SLOT( updateAvailableAddressees() ) ); } void @@ -619,8 +619,8 @@ AddressesDialog::addAddresseeToAvailable( const TDEABC::Addressee& addr, Address for ( uint i = 0; i < addr.emails().count(); ++i ) { AddresseeViewItem* addressee = new AddresseeViewItem( d->groupDict[ *it ], addr, i ); - connect(addressee, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(availableAddressSelected(AddresseeViewItem*, bool))); + connect(addressee, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(availableAddressSelected(AddresseeViewItem*, bool))); } } } @@ -634,8 +634,8 @@ AddressesDialog::addAddresseeToAvailable( const TDEABC::Addressee& addr, Address if ( defaultParent && noCategory ) { // only non-categorized items here AddresseeViewItem* addressee = new AddresseeViewItem( defaultParent, addr ); - connect(addressee, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(availableAddressSelected(AddresseeViewItem*, bool))); + connect(addressee, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(availableAddressSelected(AddresseeViewItem*, bool))); } } @@ -653,8 +653,8 @@ AddressesDialog::addAddresseeToSelected( const TDEABC::Addressee& addr, Addresse myChild = static_cast<AddresseeViewItem*>( myChild->nextSibling() ); } AddresseeViewItem* addressee = new AddresseeViewItem( defaultParent, addr ); - connect(addressee, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(addressee, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); defaultParent->setOpen( true ); } @@ -701,8 +701,8 @@ AddressesDialog::addAddresseesToSelected( AddresseeViewItem *parent, address->setVisible( false ); selectedToAvailableMapping.insert(address, newItem); selectedToAvailableMapping.insert(newItem, address); - connect(newItem, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(newItem, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } parent->setOpen( true ); @@ -725,8 +725,8 @@ AddressesDialog::addSelectedTo() if ( !d->toItem ) { d->toItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("To"), AddresseeViewItem::To ); - connect(d->toItem, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(d->toItem, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } addAddresseesToSelected( d->toItem, selectedAvailableAddresses ); @@ -746,8 +746,8 @@ AddressesDialog::addSelectedCC() if ( !d->ccItem ) { d->ccItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("CC"), AddresseeViewItem::CC ); - connect(d->ccItem , TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(d->ccItem , TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } addAddresseesToSelected( d->ccItem, selectedAvailableAddresses ); @@ -767,8 +767,8 @@ AddressesDialog::addSelectedBCC() if ( !d->bccItem ) { d->bccItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("BCC"), AddresseeViewItem::BCC ); - connect(d->bccItem , TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(d->bccItem , TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } addAddresseesToSelected( d->bccItem, selectedAvailableAddresses ); @@ -946,8 +946,8 @@ AddressesDialog::searchLdap() { if ( !d->ldapSearchDialog ) { d->ldapSearchDialog = new LDAPSearchDialog( this ); - connect( d->ldapSearchDialog, TQT_SIGNAL( addresseesAdded() ), - TQT_SLOT(ldapSearchResult() ) ); + connect( d->ldapSearchDialog, TQ_SIGNAL( addresseesAdded() ), + TQ_SLOT(ldapSearchResult() ) ); } d->ldapSearchDialog->show(); } @@ -1169,8 +1169,8 @@ AddressesDialog::addDistributionLists() AddresseeViewItem *item = new AddresseeViewItem( d->topdist, dlist.name() ); d->dists.append( item ); - connect( item, TQT_SIGNAL( addressSelected( AddresseeViewItem*, bool ) ), - this, TQT_SLOT( availableAddressSelected( AddresseeViewItem*, bool ) ) ); + connect( item, TQ_SIGNAL( addressSelected( AddresseeViewItem*, bool ) ), + this, TQ_SLOT( availableAddressSelected( AddresseeViewItem*, bool ) ) ); #ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList::Entry::List::Iterator itemIt; diff --git a/libtdepim/categoryeditdialog.cpp b/libtdepim/categoryeditdialog.cpp index 26abbc07..d282596d 100644 --- a/libtdepim/categoryeditdialog.cpp +++ b/libtdepim/categoryeditdialog.cpp @@ -87,9 +87,9 @@ CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent, fillList(); - connect( d->mAddButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( add() ) ); - connect( d->mEditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( edit() ) ); - connect( d->mDeleteButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( remove() ) ); + connect( d->mAddButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( add() ) ); + connect( d->mEditButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( edit() ) ); + connect( d->mDeleteButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( remove() ) ); } /* diff --git a/libtdepim/categoryselectdialog.cpp b/libtdepim/categoryselectdialog.cpp index cf1b2ac6..d75948ad 100644 --- a/libtdepim/categoryselectdialog.cpp +++ b/libtdepim/categoryselectdialog.cpp @@ -44,10 +44,10 @@ CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, TQWidget* parent, setCategories(); - connect( mWidget->mButtonEdit, TQT_SIGNAL(clicked()), - TQT_SIGNAL(editCategories()) ); - connect( mWidget->mButtonClear, TQT_SIGNAL(clicked()), - TQT_SLOT(clear()) ); + connect( mWidget->mButtonEdit, TQ_SIGNAL(clicked()), + TQ_SIGNAL(editCategories()) ); + connect( mWidget->mButtonClear, TQ_SIGNAL(clicked()), + TQ_SLOT(clear()) ); } void CategorySelectDialog::setCategories( const TQStringList &categoryList ) diff --git a/libtdepim/collectingprocess.cpp b/libtdepim/collectingprocess.cpp index e9d640ce..da665464 100644 --- a/libtdepim/collectingprocess.cpp +++ b/libtdepim/collectingprocess.cpp @@ -61,18 +61,18 @@ CollectingProcess::~CollectingProcess() { bool CollectingProcess::start( RunMode runmode, Communication comm ) { // prevent duplicate connection - disconnect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); + disconnect( this, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); if ( comm & Stdout ) { - connect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); + connect( this, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); } // prevent duplicate connection - disconnect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); + disconnect( this, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); if ( comm & Stderr ) { - connect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); + connect( this, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); } return TDEProcess::start( runmode, comm ); } diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp index 152790c7..8a3a25eb 100644 --- a/libtdepim/completionordereditor.cpp +++ b/libtdepim/completionordereditor.cpp @@ -235,10 +235,10 @@ CompletionOrderEditor::CompletionOrderEditor( KPIM::LdapSearch* ldapSearch, TQWidget* spacer = new TQWidget( upDownBox ); upDownBox->setStretchFactor( spacer, 100 ); - connect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); - connect( mUpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveUp() ) ); - connect( mDownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveDown() ) ); + connect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + TQ_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); + connect( mUpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveUp() ) ); + connect( mDownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveDown() ) ); } CompletionOrderEditor::~CompletionOrderEditor() diff --git a/libtdepim/designerfields.cpp b/libtdepim/designerfields.cpp index da7068bb..c93ae6f3 100644 --- a/libtdepim/designerfields.cpp +++ b/libtdepim/designerfields.cpp @@ -88,29 +88,29 @@ void DesignerFields::initGUI( const TQString &uiFile ) mWidgets.insert( name, widget ); if ( it.current()->inherits( "TQLineEdit" ) ) - connect( it.current(), TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SIGNAL( modified() ) ); else if ( it.current()->inherits( "TQSpinBox" ) ) - connect( it.current(), TQT_SIGNAL( valueChanged( int ) ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( valueChanged( int ) ), + TQ_SIGNAL( modified() ) ); else if ( it.current()->inherits( "TQCheckBox" ) ) - connect( it.current(), TQT_SIGNAL( toggled( bool ) ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( toggled( bool ) ), + TQ_SIGNAL( modified() ) ); else if ( it.current()->inherits( "TQComboBox" ) ) - connect( it.current(), TQT_SIGNAL( activated( const TQString& ) ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( activated( const TQString& ) ), + TQ_SIGNAL( modified() ) ); else if ( it.current()->inherits( "TQDateTimeEdit" ) ) - connect( it.current(), TQT_SIGNAL( valueChanged( const TQDateTime& ) ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( valueChanged( const TQDateTime& ) ), + TQ_SIGNAL( modified() ) ); else if ( it.current()->inherits( "KDateTimeWidget" ) ) - connect( it.current(), TQT_SIGNAL( valueChanged( const TQDateTime& ) ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( valueChanged( const TQDateTime& ) ), + TQ_SIGNAL( modified() ) ); else if ( it.current()->inherits( "KDatePicker" ) ) - connect( it.current(), TQT_SIGNAL( dateChanged( TQDate ) ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( dateChanged( TQDate ) ), + TQ_SIGNAL( modified() ) ); else if ( it.current()->inherits( "TQTextEdit" ) ) - connect( it.current(), TQT_SIGNAL( textChanged() ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( textChanged() ), + TQ_SIGNAL( modified() ) ); if ( !widget->isEnabled() ) mDisabledWidgets.append( widget ); diff --git a/libtdepim/embeddedurlpage.cpp b/libtdepim/embeddedurlpage.cpp index 21838f50..4a3aed79 100644 --- a/libtdepim/embeddedurlpage.cpp +++ b/libtdepim/embeddedurlpage.cpp @@ -62,9 +62,9 @@ void EmbeddedURLPage::loadContents() } //void KParts::BrowserExtension::openURLRequestDelayed( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() ) KParts::BrowserExtension* be = KParts::BrowserExtension::childObject( mPart ); - connect( be, TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), -// mPart, TQT_SLOT( openURL( const KURL & ) ) ); - this, TQT_SIGNAL( openURL( const KURL & ) ) ); + connect( be, TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), +// mPart, TQ_SLOT( openURL( const KURL & ) ) ); + this, TQ_SIGNAL( openURL( const KURL & ) ) ); } } diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp index 03c2f161..dd5ab8bf 100644 --- a/libtdepim/kcmdesignerfields.cpp +++ b/libtdepim/kcmdesignerfields.cpp @@ -129,7 +129,7 @@ class PageItem : public TQCheckListItem KCMDesignerFields::KCMDesignerFields( TQWidget *parent, const char *name ) : TDECModule( parent, name ) { - TQTimer::singleShot( 0, this, TQT_SLOT( delayedInit() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( delayedInit() ) ); TDEAboutData *about = new TDEAboutData( I18N_NOOP( "KCMDesignerfields" ), I18N_NOOP( "TQt Designer Fields Dialog" ), @@ -147,17 +147,17 @@ void KCMDesignerFields::delayedInit() initGUI(); - connect( mPageView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( updatePreview( TQListViewItem* ) ) ); - connect( mPageView, TQT_SIGNAL( clicked( TQListViewItem* ) ), - this, TQT_SLOT( itemClicked( TQListViewItem* ) ) ); + connect( mPageView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( updatePreview( TQListViewItem* ) ) ); + connect( mPageView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + this, TQ_SLOT( itemClicked( TQListViewItem* ) ) ); - connect( mDeleteButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( deleteFile() ) ); - connect( mImportButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( importFile() ) ); - connect( mDesignerButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( startDesigner() ) ); + connect( mDeleteButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( deleteFile() ) ); + connect( mImportButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( importFile() ) ); + connect( mDesignerButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( startDesigner() ) ); load(); @@ -165,9 +165,9 @@ void KCMDesignerFields::delayedInit() KDirWatch *dw = new KDirWatch( this ); TDEStandardDirs::makeDir(localUiDir()); dw->addDir( localUiDir(), true ); - connect( dw, TQT_SIGNAL( created(const TQString&) ), TQT_SLOT( rebuildList() ) ); - connect( dw, TQT_SIGNAL( deleted(const TQString&) ), TQT_SLOT( rebuildList() ) ); - connect( dw, TQT_SIGNAL( dirty(const TQString&) ), TQT_SLOT( rebuildList() ) ); + connect( dw, TQ_SIGNAL( created(const TQString&) ), TQ_SLOT( rebuildList() ) ); + connect( dw, TQ_SIGNAL( deleted(const TQString&) ), TQ_SLOT( rebuildList() ) ); + connect( dw, TQ_SIGNAL( dirty(const TQString&) ), TQ_SLOT( rebuildList() ) ); } void KCMDesignerFields::deleteFile() diff --git a/libtdepim/kdateedit.cpp b/libtdepim/kdateedit.cpp index 52dbb26a..0f50f75b 100644 --- a/libtdepim/kdateedit.cpp +++ b/libtdepim/kdateedit.cpp @@ -80,17 +80,17 @@ KDateEdit::KDateEdit( TQWidget *parent, const char *name ) changeItem( today, 0 ); setMinimumSize( sizeHint() ); - connect( lineEdit(), TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( lineEnterPressed() ) ); - connect( this, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotTextChanged( const TQString& ) ) ); + connect( lineEdit(), TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( lineEnterPressed() ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotTextChanged( const TQString& ) ) ); mPopup = new KDatePickerPopup( KDatePickerPopup::DatePicker | KDatePickerPopup::Words ); mPopup->hide(); mPopup->installEventFilter( this ); - connect( mPopup, TQT_SIGNAL( dateChanged( TQDate ) ), - TQT_SLOT( dateSelected( TQDate ) ) ); + connect( mPopup, TQ_SIGNAL( dateChanged( TQDate ) ), + TQ_SLOT( dateSelected( TQDate ) ) ); // handle keyword entry setupKeywords(); diff --git a/libtdepim/kdatepickerpopup.cpp b/libtdepim/kdatepickerpopup.cpp index d9ffe8c3..4b544b6f 100644 --- a/libtdepim/kdatepickerpopup.cpp +++ b/libtdepim/kdatepickerpopup.cpp @@ -35,10 +35,10 @@ KDatePickerPopup::KDatePickerPopup( int items, const TQDate &date, TQWidget *par mDatePicker = new KDatePicker( this ); mDatePicker->setCloseButton( false ); - connect( mDatePicker, TQT_SIGNAL( dateEntered( TQDate ) ), - TQT_SLOT( slotDateChanged( TQDate ) ) ); - connect( mDatePicker, TQT_SIGNAL( dateSelected( TQDate ) ), - TQT_SLOT( slotDateChanged( TQDate ) ) ); + connect( mDatePicker, TQ_SIGNAL( dateEntered( TQDate ) ), + TQ_SLOT( slotDateChanged( TQDate ) ) ); + connect( mDatePicker, TQ_SIGNAL( dateSelected( TQDate ) ), + TQ_SLOT( slotDateChanged( TQDate ) ) ); mDatePicker->setDate( date ); @@ -58,17 +58,17 @@ void KDatePickerPopup::buildMenu() } if ( mItems & Words ) { - insertItem( i18n("&Today"), this, TQT_SLOT( slotToday() ) ); - insertItem( i18n("To&morrow"), this, TQT_SLOT( slotTomorrow() ) ); - insertItem( i18n("Next &Week"), this, TQT_SLOT( slotNextWeek() ) ); - insertItem( i18n("Next M&onth"), this, TQT_SLOT( slotNextMonth() ) ); + insertItem( i18n("&Today"), this, TQ_SLOT( slotToday() ) ); + insertItem( i18n("To&morrow"), this, TQ_SLOT( slotTomorrow() ) ); + insertItem( i18n("Next &Week"), this, TQ_SLOT( slotNextWeek() ) ); + insertItem( i18n("Next M&onth"), this, TQ_SLOT( slotNextMonth() ) ); if ( mItems & NoDate ) insertSeparator(); } if ( mItems & NoDate ) - insertItem( i18n("No Date"), this, TQT_SLOT( slotNoDate() ) ); + insertItem( i18n("No Date"), this, TQ_SLOT( slotNoDate() ) ); } KDatePicker *KDatePickerPopup::datePicker() const diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp index 58e35858..bccbc8aa 100644 --- a/libtdepim/kfoldertree.cpp +++ b/libtdepim/kfoldertree.cpp @@ -379,9 +379,9 @@ KFolderTree::KFolderTree( TQWidget *parent, const char* name ) disableAutoSelection(); setColumnWidth( 0, 120 ); //reasonable default size - disconnect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ) ); - connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ), - TQT_SLOT( slotSizeChanged( int, int, int ) ) ); + disconnect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ) ); + connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), + TQ_SLOT( slotSizeChanged( int, int, int ) ) ); } //----------------------------------------------------------------------------- diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp index 879b6156..44e7eddd 100644 --- a/libtdepim/kimportdialog.cpp +++ b/libtdepim/kimportdialog.cpp @@ -164,15 +164,15 @@ KImportDialog::KImportDialog(TQWidget* parent) new TQLabel(i18n("File to import:"),fileBox); KURLRequester *urlRequester = new KURLRequester(fileBox); urlRequester->setFilter( "*.csv" ); - connect(urlRequester,TQT_SIGNAL(returnPressed(const TQString &)), - TQT_SLOT(setFile(const TQString &))); - connect(urlRequester,TQT_SIGNAL(urlSelected(const TQString &)), - TQT_SLOT(setFile(const TQString &))); - connect(urlRequester->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )), - TQT_SLOT(slotUrlChanged(const TQString & ))); + connect(urlRequester,TQ_SIGNAL(returnPressed(const TQString &)), + TQ_SLOT(setFile(const TQString &))); + connect(urlRequester,TQ_SIGNAL(urlSelected(const TQString &)), + TQ_SLOT(setFile(const TQString &))); + connect(urlRequester->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )), + TQ_SLOT(slotUrlChanged(const TQString & ))); mTable = new TQTable(5,5,topBox); mTable->setMinimumHeight( 150 ); - connect(mTable,TQT_SIGNAL(selectionChanged()),TQT_SLOT(tableSelected())); + connect(mTable,TQ_SIGNAL(selectionChanged()),TQ_SLOT(tableSelected())); TQHBox *separatorBox = new TQHBox( topBox ); separatorBox->setSpacing( spacingHint() ); @@ -185,8 +185,8 @@ KImportDialog::KImportDialog(TQWidget* parent) mSeparatorCombo->insertItem( i18n( "Space" ) ); mSeparatorCombo->insertItem( "=" ); mSeparatorCombo->insertItem( ";" ); - connect(mSeparatorCombo, TQT_SIGNAL( activated(int) ), - this, TQT_SLOT( separatorClicked(int) ) ); + connect(mSeparatorCombo, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT( separatorClicked(int) ) ); mSeparatorCombo->setCurrentItem( 0 ); TQHBox *rowsBox = new TQHBox( topBox ); @@ -208,34 +208,34 @@ KImportDialog::KImportDialog(TQWidget* parent) mHeaderList = new TQListView(listsBox); mHeaderList->addColumn(i18n("Header")); - connect(mHeaderList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(headerSelected(TQListViewItem*))); - connect(mHeaderList,TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(assignColumn(TQListViewItem *))); + connect(mHeaderList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(headerSelected(TQListViewItem*))); + connect(mHeaderList,TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(assignColumn(TQListViewItem *))); mFormatCombo = new KComboBox( listsBox ); mFormatCombo->setDuplicatesEnabled( false ); TQPushButton *assignButton = new TQPushButton(i18n("Assign to Selected Column"), assignBox); - connect(assignButton,TQT_SIGNAL(clicked()),TQT_SLOT(assignColumn())); + connect(assignButton,TQ_SIGNAL(clicked()),TQ_SLOT(assignColumn())); TQPushButton *removeButton = new TQPushButton(i18n("Remove Assignment From Selected Column"), assignBox); - connect(removeButton,TQT_SIGNAL(clicked()),TQT_SLOT(removeColumn())); + connect(removeButton,TQ_SIGNAL(clicked()),TQ_SLOT(removeColumn())); TQPushButton *assignTemplateButton = new TQPushButton(i18n("Assign with Template..."), assignBox); - connect(assignTemplateButton,TQT_SIGNAL(clicked()),TQT_SLOT(assignTemplate())); + connect(assignTemplateButton,TQ_SIGNAL(clicked()),TQ_SLOT(assignTemplate())); TQPushButton *saveTemplateButton = new TQPushButton(i18n("Save Current Template"), assignBox); - connect(saveTemplateButton,TQT_SIGNAL(clicked()),TQT_SLOT(saveTemplate())); + connect(saveTemplateButton,TQ_SIGNAL(clicked()),TQ_SLOT(saveTemplate())); resize(500,300); - connect(this,TQT_SIGNAL(okClicked()),TQT_SLOT(applyConverter())); - connect(this,TQT_SIGNAL(applyClicked()),TQT_SLOT(applyConverter())); + connect(this,TQ_SIGNAL(okClicked()),TQ_SLOT(applyConverter())); + connect(this,TQ_SIGNAL(applyClicked()),TQ_SLOT(applyConverter())); enableButtonOK(!urlRequester->lineEdit()->text().isEmpty()); } diff --git a/libtdepim/kincidencechooser.cpp b/libtdepim/kincidencechooser.cpp index 1151d0cb..f11b0360 100644 --- a/libtdepim/kincidencechooser.cpp +++ b/libtdepim/kincidencechooser.cpp @@ -61,11 +61,11 @@ KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) : topLayout->addMultiCellWidget(b_box, iii,iii,0,2); ++iii; TQPushButton* button = new TQPushButton( i18n("Take Local"), b_box ); - connect ( button, TQT_SIGNAL( clicked()), this, TQT_SLOT (takeIncidence1() ) ); + connect ( button, TQ_SIGNAL( clicked()), this, TQ_SLOT (takeIncidence1() ) ); button = new TQPushButton( i18n("Take New"), b_box ); - connect ( button, TQT_SIGNAL( clicked()), this, TQT_SLOT (takeIncidence2() ) ); + connect ( button, TQ_SIGNAL( clicked()), this, TQ_SLOT (takeIncidence2() ) ); button = new TQPushButton( i18n("Take Both"), b_box ); - connect ( button, TQT_SIGNAL( clicked()), this, TQT_SLOT (takeBoth() ) ); + connect ( button, TQ_SIGNAL( clicked()), this, TQ_SLOT (takeBoth() ) ); topLayout->setSpacing(spacingHint()); topLayout->setMargin(marginHint()); // text is not translated, because text has to be set later @@ -78,7 +78,7 @@ KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) : mMod1lab = new TQLabel ( "Set Last modified", topFrame); topLayout->addWidget(mMod1lab,iii,1); mShowDetails1 = new TQPushButton( i18n("Show Details"),topFrame ); - connect ( mShowDetails1, TQT_SIGNAL( clicked()), this, TQT_SLOT (showIncidence1() ) ); + connect ( mShowDetails1, TQ_SIGNAL( clicked()), this, TQ_SLOT (showIncidence1() ) ); topLayout->addWidget(mShowDetails1,iii,2); ++iii; @@ -91,14 +91,14 @@ KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) : mMod2lab = new TQLabel ( "Set Last modified", topFrame); topLayout->addWidget(mMod2lab,iii,1); mShowDetails2 = new TQPushButton( i18n("Show Details"), topFrame); - connect ( mShowDetails2, TQT_SIGNAL( clicked()), this, TQT_SLOT (showIncidence2() ) ); + connect ( mShowDetails2, TQ_SIGNAL( clicked()), this, TQ_SLOT (showIncidence2() ) ); topLayout->addWidget(mShowDetails2,iii,2); ++iii; // #if 0 // commented out for now, because the diff code has too many bugs mDiffBut = new TQPushButton( i18n("Show Differences"), topFrame ); - connect ( mDiffBut, TQT_SIGNAL( clicked()), this, TQT_SLOT ( showDiff() ) ); + connect ( mDiffBut, TQ_SIGNAL( clicked()), this, TQ_SLOT ( showDiff() ) ); topLayout->addMultiCellWidget(mDiffBut, iii,iii,0,2); ++iii; #else @@ -118,7 +118,7 @@ KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) : mDisplayDiff = 0; mSelIncidence = 0; button = new TQPushButton( i18n("Apply This to All Conflicts of This Sync"), topFrame ); - connect ( button, TQT_SIGNAL( clicked()), this, TQT_SLOT ( setSyncMode() ) ); + connect ( button, TQ_SIGNAL( clicked()), this, TQ_SLOT ( setSyncMode() ) ); topLayout->addMultiCellWidget(button, iii,iii,0,2); } @@ -237,7 +237,7 @@ void KIncidenceChooser::showIncidence1() } mTbL = new KDialogBase( this, "", false /*not modal*/, mInc1lab->text(), KDialogBase::Ok ); mTbL->setEscapeButton( KDialogBase::Ok ); - connect( mTbL, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( detailsDialogClosed() ) ); + connect( mTbL, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( detailsDialogClosed() ) ); TQTextBrowser* textBrowser = new TQTextBrowser( mTbL ); mTbL->setMainWidget( textBrowser ); textBrowser->setText( KCal::IncidenceFormatter::extensiveDisplayString( mInc1 ) ); @@ -293,7 +293,7 @@ void KIncidenceChooser::showIncidence2() } mTbN = new KDialogBase( this, "", false /*not modal*/, mInc2lab->text(), KDialogBase::Ok ); mTbN->setEscapeButton( KDialogBase::Ok ); - connect( mTbN, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( detailsDialogClosed() ) ); + connect( mTbN, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( detailsDialogClosed() ) ); TQTextBrowser* textBrowser = new TQTextBrowser( mTbN ); mTbN->setMainWidget( textBrowser ); textBrowser->setText( KCal::IncidenceFormatter::extensiveDisplayString( mInc2 ) ); diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp index 2616f8e2..3549a314 100644 --- a/libtdepim/komposer/core/core.cpp +++ b/libtdepim/komposer/core/core.cpp @@ -225,10 +225,10 @@ void Core::initCore() { m_pluginManager = new PluginManager( this ); - connect( m_pluginManager, TQT_SIGNAL(pluginLoaded(Plugin*)), - TQT_SLOT(slotPluginLoaded(Plugin*)) ); - connect( m_pluginManager, TQT_SIGNAL(allPluginsLoaded()), - TQT_SLOT(slotAllPluginsLoaded()) ); + connect( m_pluginManager, TQ_SIGNAL(pluginLoaded(Plugin*)), + TQ_SLOT(slotPluginLoaded(Plugin*)) ); + connect( m_pluginManager, TQ_SIGNAL(allPluginsLoaded()), + TQ_SLOT(slotAllPluginsLoaded()) ); m_pluginManager->loadAllPlugins(); @@ -238,39 +238,39 @@ Core::initCore() void Core::initConnections() { - connect( kapp, TQT_SIGNAL(shutDown()), - TQT_SLOT(slotQuit()) ); + connect( kapp, TQ_SIGNAL(shutDown()), + TQ_SLOT(slotQuit()) ); } void Core::createActions() { - KStdAction::close( this, TQT_SLOT(slotClose()), actionCollection() ); + KStdAction::close( this, TQ_SLOT(slotClose()), actionCollection() ); (void) new TDEAction( i18n( "&Send" ), "mail-send", CTRL+Key_Return, - this, TQT_SLOT(slotSendNow()), actionCollection(), + this, TQ_SLOT(slotSendNow()), actionCollection(), "send_default" ); (void) new TDEAction( i18n( "&Queue" ), "queue", 0, - this, TQT_SLOT(slotSendLater()), + this, TQ_SLOT(slotSendLater()), actionCollection(), "send_alternative" ); (void) new TDEAction( i18n( "Save in &Drafts Folder" ), "document-save", 0, - this, TQT_SLOT(slotSaveDraft()), + this, TQ_SLOT(slotSaveDraft()), actionCollection(), "save_in_drafts" ); (void) new TDEAction( i18n( "&Insert File..." ), "document-open", 0, - this, TQT_SLOT(slotInsertFile()), + this, TQ_SLOT(slotInsertFile()), actionCollection(), "insert_file" ); (void) new TDEAction( i18n( "&Address Book" ), "contents",0, - this, TQT_SLOT(slotAddrBook()), + this, TQ_SLOT(slotAddrBook()), actionCollection(), "addressbook" ); (void) new TDEAction( i18n( "&New Composer" ), "mail-message-new", TDEStdAccel::shortcut( TDEStdAccel::New ), - this, TQT_SLOT(slotNewComposer()), + this, TQ_SLOT(slotNewComposer()), actionCollection(), "new_composer" ); (void) new TDEAction( i18n( "&Attach File..." ), "attach", - 0, this, TQT_SLOT(slotAttachFile()), + 0, this, TQ_SLOT(slotAttachFile()), actionCollection(), "attach_file" ); } diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp index 9a33b990..8c4e025d 100644 --- a/libtdepim/komposer/core/pluginmanager.cpp +++ b/libtdepim/komposer/core/pluginmanager.cpp @@ -78,7 +78,7 @@ PluginManager::PluginManager( TQObject *parent ) d->shutdownMode = Private::StartingUp; KSettings::Dispatcher::self()->registerInstance( TDEGlobal::instance(), - this, TQT_SLOT( loadAllPlugins() ) ); + this, TQ_SLOT( loadAllPlugins() ) ); d->plugins = KPluginInfo::fromServices( TDETrader::self()->query( TQString::fromLatin1( "Komposer/Plugin" ), @@ -168,7 +168,7 @@ PluginManager::shutdown() } } - TQTimer::singleShot( 3000, this, TQT_SLOT(slotShutdownTimeout()) ); + TQTimer::singleShot( 3000, this, TQ_SLOT(slotShutdownTimeout()) ); } void @@ -256,7 +256,7 @@ PluginManager::loadAllPlugins() } // Schedule the plugins to load - TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) ); } void PluginManager::slotLoadNextPlugin() @@ -278,7 +278,7 @@ void PluginManager::slotLoadNextPlugin() // allPluginsLoaded() signal's handling. This has the added benefit that // the signal is delayed one event loop, so the accounts are more likely // to be instantiated. - TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) ); } Plugin* @@ -289,7 +289,7 @@ PluginManager::loadPlugin( const TQString &pluginId, return loadPluginInternal( pluginId ); } else { d->pluginsToLoad.push( pluginId ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) ); return 0; } } @@ -317,10 +317,10 @@ PluginManager::loadPluginInternal( const TQString &pluginId ) d->loadedPlugins.insert( info, plugin ); info->setPluginEnabled( true ); - connect( plugin, TQT_SIGNAL(destroyed(TQObject*)), - this, TQT_SLOT(slotPluginDestroyed(TQObject*)) ); - connect( plugin, TQT_SIGNAL(readyForUnload()), - this, TQT_SLOT(slotPluginReadyForUnload()) ); + connect( plugin, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(slotPluginDestroyed(TQObject*)) ); + connect( plugin, TQ_SIGNAL(readyForUnload()), + this, TQ_SLOT(slotPluginReadyForUnload()) ); kdDebug() << k_funcinfo << "Successfully loaded plugin '" << pluginId << "'" << endl; @@ -396,7 +396,7 @@ PluginManager::slotPluginDestroyed( TQObject *plugin ) { // Use a timer to make sure any pending deleteLater() calls have // been handled first - TQTimer::singleShot( 0, this, TQT_SLOT(slotShutdownDone()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotShutdownDone()) ); } } diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp index abacd0eb..f8260c10 100644 --- a/libtdepim/komposer/core/prefsmodule.cpp +++ b/libtdepim/komposer/core/prefsmodule.cpp @@ -81,8 +81,8 @@ EditorSelection::EditorSelection( const TQString &text, TQString &reference, m_editorsCombo = new KComboBox( m_box ); boxLayout->addWidget( m_editorsCombo ); - connect( m_editorsCombo, TQT_SIGNAL(activated(const TQString&)), - TQT_SLOT(slotActivated(const TQString&)) ); + connect( m_editorsCombo, TQ_SIGNAL(activated(const TQString&)), + TQ_SLOT(slotActivated(const TQString&)) ); } EditorSelection::~EditorSelection() diff --git a/libtdepim/komposer/core/tests/testmanager.cpp b/libtdepim/komposer/core/tests/testmanager.cpp index a690c67c..40fe5181 100644 --- a/libtdepim/komposer/core/tests/testmanager.cpp +++ b/libtdepim/komposer/core/tests/testmanager.cpp @@ -15,10 +15,10 @@ TestManager::TestManager( TQObject *parent ) : TQObject( parent ) { m_manager = new PluginManager( this ); - connect( m_manager, TQT_SIGNAL(pluginLoaded(Plugin*)), - TQT_SLOT(slotPluginLoaded(Plugin*)) ); - connect( m_manager, TQT_SIGNAL(allPluginsLoaded()), - TQT_SLOT(slotAllPluginsLoaded()) ); + connect( m_manager, TQ_SIGNAL(pluginLoaded(Plugin*)), + TQ_SLOT(slotPluginLoaded(Plugin*)) ); + connect( m_manager, TQ_SIGNAL(allPluginsLoaded()), + TQ_SLOT(slotAllPluginsLoaded()) ); m_manager->loadAllPlugins(); TQValueList<KPluginInfo*> plugins = m_manager->availablePlugins(); diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp index fe059b9e..1aba9705 100644 --- a/libtdepim/komposer/plugins/default/defaulteditor.cpp +++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp @@ -98,71 +98,71 @@ DefaultEditor::createActions( TDEActionCollection *ac ) // // File Actions // - (void) KStdAction::open( this, TQT_SLOT(open()), ac ); - (void) KStdAction::openRecent( this, TQT_SLOT(openURL(const KURL &)), ac ); - (void) KStdAction::save( this, TQT_SLOT(save()), ac ); - (void) KStdAction::saveAs( this, TQT_SLOT(saveAs()), ac ); + (void) KStdAction::open( this, TQ_SLOT(open()), ac ); + (void) KStdAction::openRecent( this, TQ_SLOT(openURL(const KURL &)), ac ); + (void) KStdAction::save( this, TQ_SLOT(save()), ac ); + (void) KStdAction::saveAs( this, TQ_SLOT(saveAs()), ac ); // // Edit Actions // - TDEAction *actionUndo = KStdAction::undo( m_textEdit, TQT_SLOT(undo()), ac ); + TDEAction *actionUndo = KStdAction::undo( m_textEdit, TQ_SLOT(undo()), ac ); actionUndo->setEnabled( false ); - connect( m_textEdit, TQT_SIGNAL(undoAvailable(bool)), - actionUndo, TQT_SLOT(setEnabled(bool)) ); + connect( m_textEdit, TQ_SIGNAL(undoAvailable(bool)), + actionUndo, TQ_SLOT(setEnabled(bool)) ); - TDEAction *actionRedo = KStdAction::redo( m_textEdit, TQT_SLOT(redo()), ac ); + TDEAction *actionRedo = KStdAction::redo( m_textEdit, TQ_SLOT(redo()), ac ); actionRedo->setEnabled( false ); - connect( m_textEdit, TQT_SIGNAL(redoAvailable(bool)), - actionRedo, TQT_SLOT(setEnabled(bool)) ); + connect( m_textEdit, TQ_SIGNAL(redoAvailable(bool)), + actionRedo, TQ_SLOT(setEnabled(bool)) ); - TDEAction *action_cut = KStdAction::cut( m_textEdit, TQT_SLOT(cut()), ac ); + TDEAction *action_cut = KStdAction::cut( m_textEdit, TQ_SLOT(cut()), ac ); action_cut->setEnabled( false ); - connect( m_textEdit, TQT_SIGNAL(copyAvailable(bool)), - action_cut, TQT_SLOT(setEnabled(bool)) ); + connect( m_textEdit, TQ_SIGNAL(copyAvailable(bool)), + action_cut, TQ_SLOT(setEnabled(bool)) ); - TDEAction *action_copy = KStdAction::copy( m_textEdit, TQT_SLOT(copy()), ac ); + TDEAction *action_copy = KStdAction::copy( m_textEdit, TQ_SLOT(copy()), ac ); action_copy->setEnabled( false ); - connect( m_textEdit, TQT_SIGNAL(copyAvailable(bool)), - action_copy, TQT_SLOT(setEnabled(bool)) ); + connect( m_textEdit, TQ_SIGNAL(copyAvailable(bool)), + action_copy, TQ_SLOT(setEnabled(bool)) ); - (void) KStdAction::print( this, TQT_SLOT(print()), ac ); + (void) KStdAction::print( this, TQ_SLOT(print()), ac ); - (void) KStdAction::paste( m_textEdit, TQT_SLOT(paste()), ac ); + (void) KStdAction::paste( m_textEdit, TQ_SLOT(paste()), ac ); (void) new TDEAction( i18n( "C&lear" ), 0, - m_textEdit, TQT_SLOT(removeSelectedText()), + m_textEdit, TQ_SLOT(removeSelectedText()), ac, "edit_clear" ); - (void) KStdAction::selectAll( m_textEdit, TQT_SLOT(selectAll()), ac ); + (void) KStdAction::selectAll( m_textEdit, TQ_SLOT(selectAll()), ac ); // // View Actions // - (void) KStdAction::zoomIn( m_textEdit, TQT_SLOT(zoomIn()), ac ); - (void) KStdAction::zoomOut( m_textEdit, TQT_SLOT(zoomOut()), ac ); + (void) KStdAction::zoomIn( m_textEdit, TQ_SLOT(zoomIn()), ac ); + (void) KStdAction::zoomOut( m_textEdit, TQ_SLOT(zoomOut()), ac ); // // Character Formatting // m_actionBold = new TDEToggleAction( i18n("&Bold"), "format-text-bold", CTRL+Key_B, ac, "format_bold" ); - connect( m_actionBold, TQT_SIGNAL(toggled(bool)), - m_textEdit, TQT_SLOT(setBold(bool)) ); + connect( m_actionBold, TQ_SIGNAL(toggled(bool)), + m_textEdit, TQ_SLOT(setBold(bool)) ); m_actionItalic = new TDEToggleAction( i18n("&Italic"), "format-text-italic", CTRL+Key_I, ac, "format_italic" ); - connect( m_actionItalic, TQT_SIGNAL(toggled(bool)), - m_textEdit, TQT_SLOT(setItalic(bool) )); + connect( m_actionItalic, TQ_SIGNAL(toggled(bool)), + m_textEdit, TQ_SLOT(setItalic(bool) )); m_actionUnderline = new TDEToggleAction( i18n("&Underline"), "format-text-underline", CTRL+Key_U, ac, "format_underline" ); - connect( m_actionUnderline, TQT_SIGNAL(toggled(bool)), - m_textEdit, TQT_SLOT(setUnderline(bool)) ); + connect( m_actionUnderline, TQ_SIGNAL(toggled(bool)), + m_textEdit, TQ_SLOT(setUnderline(bool)) ); (void) new TDEAction( i18n("Text &Color..."), "colorpicker", 0, - this, TQT_SLOT(formatColor()), + this, TQ_SLOT(formatColor()), ac, "format_color" ); // @@ -170,37 +170,37 @@ DefaultEditor::createActions( TDEActionCollection *ac ) // m_actionFont = new TDEFontAction( i18n("&Font"), 0, ac, "format_font" ); - connect( m_actionFont, TQT_SIGNAL(activated(const TQString &)), - m_textEdit, TQT_SLOT(setFamily(const TQString &)) ); + connect( m_actionFont, TQ_SIGNAL(activated(const TQString &)), + m_textEdit, TQ_SLOT(setFamily(const TQString &)) ); m_actionFontSize = new TDEFontSizeAction( i18n("Font &Size"), 0, ac, "format_font_size" ); - connect( m_actionFontSize, TQT_SIGNAL(fontSizeChanged(int)), - m_textEdit, TQT_SLOT(setPointSize(int)) ); + connect( m_actionFontSize, TQ_SIGNAL(fontSizeChanged(int)), + m_textEdit, TQ_SLOT(setPointSize(int)) ); // // Alignment // m_actionAlignLeft = new TDEToggleAction( i18n("Align &Left"), "format-text-direction-ltr", 0, ac, "format_align_left" ); - connect( m_actionAlignLeft, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setAlignLeft(bool)) ); + connect( m_actionAlignLeft, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setAlignLeft(bool)) ); m_actionAlignCenter = new TDEToggleAction( i18n("Align &Center"), "text_center", 0, ac, "format_align_center" ); - connect( m_actionAlignCenter, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setAlignCenter(bool)) ); + connect( m_actionAlignCenter, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setAlignCenter(bool)) ); m_actionAlignRight = new TDEToggleAction( i18n("Align &Right"), "format-text-direction-rtl", 0, ac, "format_align_right" ); - connect( m_actionAlignRight, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setAlignRight(bool)) ); + connect( m_actionAlignRight, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setAlignRight(bool)) ); m_actionAlignJustify = new TDEToggleAction( i18n("&Justify"), "text_block", 0, ac, "format_align_justify" ); - connect( m_actionAlignJustify, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setAlignJustify(bool)) ); + connect( m_actionAlignJustify, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setAlignJustify(bool)) ); m_actionAlignLeft->setExclusiveGroup( "alignment" ); m_actionAlignCenter->setExclusiveGroup( "alignment" ); @@ -210,19 +210,19 @@ DefaultEditor::createActions( TDEActionCollection *ac ) // // Tools // - (void) KStdAction::spelling( this, TQT_SLOT(checkSpelling()), ac ); + (void) KStdAction::spelling( this, TQ_SLOT(checkSpelling()), ac ); // // Setup enable/disable // updateActions(); - connect( m_textEdit, TQT_SIGNAL(currentFontChanged(const TQFont &)), - this, TQT_SLOT( updateFont() ) ); - connect( m_textEdit, TQT_SIGNAL(currentFontChanged(const TQFont &)), - this, TQT_SLOT(updateCharFmt()) ); - connect( m_textEdit, TQT_SIGNAL(cursorPositionChanged(int, int)), - this, TQT_SLOT(updateAligment()) ); + connect( m_textEdit, TQ_SIGNAL(currentFontChanged(const TQFont &)), + this, TQ_SLOT( updateFont() ) ); + connect( m_textEdit, TQ_SIGNAL(currentFontChanged(const TQFont &)), + this, TQ_SLOT(updateCharFmt()) ); + connect( m_textEdit, TQ_SIGNAL(cursorPositionChanged(int, int)), + this, TQ_SLOT(updateAligment()) ); } void diff --git a/libtdepim/kpixmapregionselectorwidget.cpp b/libtdepim/kpixmapregionselectorwidget.cpp index 19e90741..9cfe8f00 100644 --- a/libtdepim/kpixmapregionselectorwidget.cpp +++ b/libtdepim/kpixmapregionselectorwidget.cpp @@ -144,12 +144,12 @@ TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu() popup->insertTitle(i18n("Image Operations")); TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right", - 0, this, TQT_SLOT(rotateClockwise()), + 0, this, TQ_SLOT(rotateClockwise()), popup, "rotateclockwise"); action->plug(popup); action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left", - 0, this, TQT_SLOT(rotateCounterclockwise()), + 0, this, TQ_SLOT(rotateCounterclockwise()), popup, "rotatecounterclockwise"); action->plug(popup); diff --git a/libtdepim/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp index 6c313a98..b910dc33 100644 --- a/libtdepim/kprefsdialog.cpp +++ b/libtdepim/kprefsdialog.cpp @@ -103,7 +103,7 @@ KPrefsWidBool::KPrefsWidBool( TDEConfigSkeleton::ItemBool *item, TQWidget *paren : mItem( item ) { mCheck = new TQCheckBox( item->label(), parent); - connect( mCheck, TQT_SIGNAL( clicked() ), TQT_SIGNAL( changed() ) ); + connect( mCheck, TQ_SIGNAL( clicked() ), TQ_SIGNAL( changed() ) ); if ( !item->whatsThis().isNull() ) { TQWhatsThis::add( mCheck, item->whatsThis() ); } @@ -144,7 +144,7 @@ KPrefsWidInt::KPrefsWidInt( TDEConfigSkeleton::ItemInt *item, if ( !item->maxValue().isNull() ) { mSpin->setMaxValue( item->maxValue().toInt() ); } - connect( mSpin, TQT_SIGNAL( valueChanged( int ) ), TQT_SIGNAL( changed() ) ); + connect( mSpin, TQ_SIGNAL( valueChanged( int ) ), TQ_SIGNAL( changed() ) ); mLabel->setBuddy( mSpin ); TQString whatsThis = mItem->whatsThis(); if ( !whatsThis.isEmpty() ) { @@ -187,7 +187,7 @@ KPrefsWidColor::KPrefsWidColor( TDEConfigSkeleton::ItemColor *item, : mItem( item ) { mButton = new KColorButton( parent ); - connect( mButton, TQT_SIGNAL( changed( const TQColor & ) ), TQT_SIGNAL( changed() ) ); + connect( mButton, TQ_SIGNAL( changed( const TQColor & ) ), TQ_SIGNAL( changed() ) ); mLabel = new TQLabel( mButton, mItem->label()+':', parent ); mLabel->setBuddy( mButton ); TQString whatsThis = mItem->whatsThis(); @@ -232,7 +232,7 @@ KPrefsWidFont::KPrefsWidFont( TDEConfigSkeleton::ItemFont *item, mPreview->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); mButton = new TQPushButton( i18n("Choose..."), parent ); - connect( mButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectFont() ) ); + connect( mButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectFont() ) ); TQString whatsThis = mItem->whatsThis(); if (!whatsThis.isNull()) { TQWhatsThis::add(mPreview, whatsThis); @@ -287,7 +287,7 @@ KPrefsWidTime::KPrefsWidTime( TDEConfigSkeleton::ItemDateTime *item, mLabel = new TQLabel( mItem->label()+':', parent ); mTimeEdit = new KTimeEdit( parent ); mLabel->setBuddy( mTimeEdit ); - connect( mTimeEdit, TQT_SIGNAL( timeChanged( TQTime ) ), TQT_SIGNAL( changed() ) ); + connect( mTimeEdit, TQ_SIGNAL( timeChanged( TQTime ) ), TQ_SIGNAL( changed() ) ); TQString whatsThis = mItem->whatsThis(); if ( !whatsThis.isNull() ) { TQWhatsThis::add( mTimeEdit, whatsThis ); @@ -330,7 +330,7 @@ KPrefsWidDuration::KPrefsWidDuration( TDEConfigSkeleton::ItemDateTime *item, mTimeEdit->setDisplay( TQTimeEdit::Hours | TQTimeEdit::Minutes ); mTimeEdit->setRange( TQTime( 0, 1 ), TQTime( 24, 0 ) ); // [1min, 24hr] connect( mTimeEdit, - TQT_SIGNAL( valueChanged( const TQTime & ) ), TQT_SIGNAL( changed() ) ); + TQ_SIGNAL( valueChanged( const TQTime & ) ), TQ_SIGNAL( changed() ) ); TQString whatsThis = mItem->whatsThis(); if ( !whatsThis.isNull() ) { TQWhatsThis::add( mTimeEdit, whatsThis ); @@ -367,7 +367,7 @@ KPrefsWidDate::KPrefsWidDate( TDEConfigSkeleton::ItemDateTime *item, mLabel = new TQLabel( mItem->label()+':', parent ); mDateEdit = new KDateEdit( parent ); mLabel->setBuddy( mDateEdit ); - connect( mDateEdit, TQT_SIGNAL( dateChanged( const TQDate& ) ), TQT_SIGNAL( changed() ) ); + connect( mDateEdit, TQ_SIGNAL( dateChanged( const TQDate& ) ), TQ_SIGNAL( changed() ) ); TQString whatsThis = mItem->whatsThis(); if ( !whatsThis.isNull() ) { TQWhatsThis::add( mDateEdit, whatsThis ); @@ -402,7 +402,7 @@ KPrefsWidRadios::KPrefsWidRadios( TDEConfigSkeleton::ItemEnum *item, : mItem( item ) { mBox = new TQButtonGroup( 1, TQt::Horizontal, mItem->label(), parent ); - connect( mBox, TQT_SIGNAL( clicked( int ) ), TQT_SIGNAL( changed() ) ); + connect( mBox, TQ_SIGNAL( clicked( int ) ), TQ_SIGNAL( changed() ) ); } KPrefsWidRadios::~KPrefsWidRadios() @@ -446,7 +446,7 @@ KPrefsWidCombo::KPrefsWidCombo( TDEConfigSkeleton::ItemEnum *item, TQHBox *hbox = new TQHBox(parent); new TQLabel( mItem->label(), hbox ); mCombo = new TQComboBox( hbox ); - connect( mCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) ); + connect( mCombo, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( changed() ) ); } KPrefsWidCombo::~KPrefsWidCombo() @@ -483,8 +483,8 @@ KPrefsWidString::KPrefsWidString( TDEConfigSkeleton::ItemString *item, mLabel = new TQLabel( mItem->label()+':', parent ); mEdit = new TQLineEdit( parent ); mLabel->setBuddy( mEdit ); - connect( mEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SIGNAL( changed() ) ); + connect( mEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SIGNAL( changed() ) ); mEdit->setEchoMode( echomode ); TQString whatsThis = mItem->whatsThis(); if ( !whatsThis.isNull() ) { @@ -534,8 +534,8 @@ KPrefsWidPath::KPrefsWidPath( TDEConfigSkeleton::ItemPath *item, TQWidget *paren mLabel->setBuddy( mURLRequester ); mURLRequester->setMode( mode ); mURLRequester->setFilter( filter ); - connect( mURLRequester, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SIGNAL( changed() ) ); + connect( mURLRequester, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SIGNAL( changed() ) ); TQString whatsThis = mItem->whatsThis(); if ( !whatsThis.isNull() ) { TQWhatsThis::add( mURLRequester, whatsThis ); @@ -742,8 +742,8 @@ KPrefsDialog::KPrefsDialog( TDEConfigSkeleton *prefs, TQWidget *parent, char *na // TODO: This seems to cause a crash on exit. Investigate later. // mPrefsWids.setAutoDelete(true); -// connect(this,TQT_SIGNAL(defaultClicked()),TQT_SLOT(setDefaults())); - connect(this,TQT_SIGNAL(cancelClicked()),TQT_SLOT(reject())); +// connect(this,TQ_SIGNAL(defaultClicked()),TQ_SLOT(setDefaults())); + connect(this,TQ_SIGNAL(cancelClicked()),TQ_SLOT(reject())); } KPrefsDialog::~KPrefsDialog() @@ -869,7 +869,7 @@ void KPrefsModule::addWid( KPrefsWid *wid ) { KPrefsWidManager::addWid( wid ); - connect( wid, TQT_SIGNAL( changed() ), TQT_SLOT( slotWidChanged() ) ); + connect( wid, TQ_SIGNAL( changed() ), TQ_SLOT( slotWidChanged() ) ); } void KPrefsModule::slotWidChanged() diff --git a/libtdepim/kscoring.cpp b/libtdepim/kscoring.cpp index 0213f082..b0ebf72d 100644 --- a/libtdepim/kscoring.cpp +++ b/libtdepim/kscoring.cpp @@ -84,7 +84,7 @@ NotifyDialog::NotifyDialog(TQWidget* p) TQCheckBox *check = new TQCheckBox(i18n("Do not show this message again"),f); check->setChecked(true); topL->addWidget(check); - connect(check,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowAgainToggled(bool))); + connect(check,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotShowAgainToggled(bool))); } void NotifyDialog::slotShowAgainToggled(bool flag) diff --git a/libtdepim/kscoringeditor.cpp b/libtdepim/kscoringeditor.cpp index 6d8aef90..1a536e82 100644 --- a/libtdepim/kscoringeditor.cpp +++ b/libtdepim/kscoringeditor.cpp @@ -76,7 +76,7 @@ SingleConditionWidget::SingleConditionWidget(KScoringManager *m,TQWidget *p, con matches->insertStringList(KScoringExpression::conditionNames()); TQToolTip::add(matches,i18n("Select the type of match")); firstRow->addWidget(matches,1); - connect( matches, TQT_SIGNAL( activated( int ) ), TQT_SLOT( toggleRegExpButton( int ) ) ); + connect( matches, TQ_SIGNAL( activated( int ) ), TQ_SLOT( toggleRegExpButton( int ) ) ); TQHBoxLayout *secondRow = new TQHBoxLayout( topL ); secondRow->setSpacing( 1 ); expr = new KLineEdit( this ); @@ -86,7 +86,7 @@ SingleConditionWidget::SingleConditionWidget(KScoringManager *m,TQWidget *p, con secondRow->addWidget( expr ); regExpButton = new TQPushButton( i18n("Edit..."), this ); secondRow->addWidget( regExpButton ); - connect( regExpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( showRegExpDialog() ) ); + connect( regExpButton, TQ_SIGNAL( clicked() ), TQ_SLOT( showRegExpDialog() ) ); // occupy at much width as possible setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed)); @@ -251,7 +251,7 @@ SingleActionWidget::SingleActionWidget(KScoringManager *m,TQWidget *p, const cha } } - connect(types,TQT_SIGNAL(activated(int)),stack,TQT_SLOT(raiseWidget(int))); + connect(types,TQ_SIGNAL(activated(int)),stack,TQ_SLOT(raiseWidget(int))); // raise the dummy label types->setCurrentItem(0); @@ -413,7 +413,7 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n) groupL->addWidget( groupsLabel, 2, 0 ); TQPushButton *groupsBtn = new TQPushButton(i18n("A&dd Group"), groupB); - connect(groupsBtn,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddGroup())); + connect(groupsBtn,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddGroup())); groupL->addWidget( groupsBtn, 3, 0 ); groupsBox = new KComboBox( false, groupB, "groupsBox" ); @@ -428,15 +428,15 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n) expireEdit = new KIntSpinBox(1,99999,1,30,10, groupB, "expireWidget"); //Init suffix slotExpireEditChanged(30); - connect(expireEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotExpireEditChanged(int))); + connect(expireEdit, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotExpireEditChanged(int))); groupL->addWidget( expireEdit, 5, 1 ); expireLabel = new TQLabel(expireEdit, i18n("&Rule is valid for:"), groupB, "expireLabel"); groupL->addWidget( expireLabel, 5, 0 ); expireLabel->setEnabled(false); expireEdit->setEnabled(false); - connect(expireCheck, TQT_SIGNAL(toggled(bool)), expireLabel, TQT_SLOT(setEnabled(bool))); - connect(expireCheck, TQT_SIGNAL(toggled(bool)), expireEdit, TQT_SLOT(setEnabled(bool))); + connect(expireCheck, TQ_SIGNAL(toggled(bool)), expireLabel, TQ_SLOT(setEnabled(bool))); + connect(expireCheck, TQ_SIGNAL(toggled(bool)), expireEdit, TQ_SLOT(setEnabled(bool))); //------------- Conditions --------------------- TQGroupBox *groupConds = new TQGroupBox(i18n("Conditions"), this); @@ -457,7 +457,7 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n) condEditor = new ConditionEditWidget(manager,groupConds); condL->addMultiCellWidget(condEditor, 2,2, 0,1); - connect(condEditor,TQT_SIGNAL(widgetRemoved()),this,TQT_SLOT(slotShrink())); + connect(condEditor,TQ_SIGNAL(widgetRemoved()),this,TQ_SLOT(slotShrink())); //------------- Actions --------------------- TQGroupBox *groupActions = new TQGroupBox(i18n("Actions"), this); @@ -466,7 +466,7 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n) actionL->addSpacing(fontMetrics().lineSpacing()-4); actionEditor = new ActionEditWidget(manager,groupActions); actionL->addWidget(actionEditor); - connect(actionEditor,TQT_SIGNAL(widgetRemoved()),this,TQT_SLOT(slotShrink())); + connect(actionEditor,TQ_SIGNAL(widgetRemoved()),this,TQ_SLOT(slotShrink())); topLayout->addStretch(1); @@ -600,13 +600,13 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p, TQVBoxLayout *topL = new TQVBoxLayout(this,standalone? 0:5,KDialog::spacingHint()); ruleList = new TDEListBox(this); if (standalone) { - connect(ruleList,TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - this,TQT_SLOT(slotEditRule(TQListBoxItem*))); - connect(ruleList,TQT_SIGNAL(returnPressed(TQListBoxItem*)), - this,TQT_SLOT(slotEditRule(TQListBoxItem*))); + connect(ruleList,TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + this,TQ_SLOT(slotEditRule(TQListBoxItem*))); + connect(ruleList,TQ_SIGNAL(returnPressed(TQListBoxItem*)), + this,TQ_SLOT(slotEditRule(TQListBoxItem*))); } - connect(ruleList, TQT_SIGNAL(currentChanged(TQListBoxItem*)), - this, TQT_SLOT(slotRuleSelected(TQListBoxItem*))); + connect(ruleList, TQ_SIGNAL(currentChanged(TQListBoxItem*)), + this, TQ_SLOT(slotRuleSelected(TQListBoxItem*))); topL->addWidget(ruleList); TQHBoxLayout *btnL = new TQHBoxLayout( topL, KDialog::spacingHint() ); @@ -614,12 +614,12 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p, mRuleUp->setPixmap( BarIcon( "go-up", TDEIcon::SizeSmall ) ); TQToolTip::add( mRuleUp, i18n("Move rule up") ); btnL->addWidget( mRuleUp ); - connect( mRuleUp, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRuleUp() ) ); + connect( mRuleUp, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRuleUp() ) ); mRuleDown = new TQPushButton( this ); mRuleDown->setPixmap( BarIcon( "go-down", TDEIcon::SizeSmall ) ); TQToolTip::add( mRuleDown, i18n("Move rule down") ); btnL->addWidget( mRuleDown ); - connect( mRuleDown, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRuleDown() ) ); + connect( mRuleDown, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRuleDown() ) ); btnL = new TQHBoxLayout( topL, KDialog::spacingHint() ); editRule=0L; @@ -627,25 +627,25 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p, newRule->setPixmap( BarIcon( "document-new", TDEIcon::SizeSmall ) ); TQToolTip::add(newRule,i18n("New rule")), btnL->addWidget(newRule); - connect(newRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewRule())); + connect(newRule, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewRule())); // if we're standalone, we need an additional edit button if (standalone) { editRule = new TQPushButton(this); editRule->setIconSet( BarIconSet("edit", TDEIcon::SizeSmall) ); TQToolTip::add(editRule,i18n("Edit rule")); btnL->addWidget(editRule); - connect(editRule,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotEditRule())); + connect(editRule,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotEditRule())); } delRule = new TQPushButton(this); delRule->setIconSet( BarIconSet( "edit-delete", TDEIcon::SizeSmall ) ); TQToolTip::add(delRule,i18n("Remove rule")); btnL->addWidget(delRule); - connect(delRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelRule())); + connect(delRule, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelRule())); copyRule = new TQPushButton(this); copyRule->setIconSet(BarIconSet("edit-copy", TDEIcon::SizeSmall)); TQToolTip::add(copyRule,i18n("Copy rule")); btnL->addWidget(copyRule); - connect(copyRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCopyRule())); + connect(copyRule, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCopyRule())); // the group filter TQBoxLayout *filterL = new TQVBoxLayout(topL,KDialog::spacingHint()); @@ -654,17 +654,17 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p, filterBox->insertItem(i18n("<all groups>")); filterBox->insertStringList(l); filterBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); - connect(filterBox,TQT_SIGNAL(activated(const TQString&)), - this,TQT_SLOT(slotGroupFilter(const TQString&))); + connect(filterBox,TQ_SIGNAL(activated(const TQString&)), + this,TQ_SLOT(slotGroupFilter(const TQString&))); slotGroupFilter(i18n("<all groups>")); TQLabel *lab = new TQLabel(filterBox,i18n("Sho&w only rules for group:"),this); filterL->addWidget(lab); filterL->addWidget(filterBox); - connect(manager,TQT_SIGNAL(changedRules()), - this,TQT_SLOT(updateRuleList())); - connect(manager,TQT_SIGNAL(changedRuleName(const TQString&,const TQString&)), - this,TQT_SLOT(slotRuleNameChanged(const TQString&,const TQString&))); + connect(manager,TQ_SIGNAL(changedRules()), + this,TQ_SLOT(updateRuleList())); + connect(manager,TQ_SIGNAL(changedRuleName(const TQString&,const TQString&)), + this,TQ_SLOT(slotRuleNameChanged(const TQString&,const TQString&))); updateRuleList(); updateButton(); @@ -872,12 +872,12 @@ KScoringEditor::KScoringEditor(KScoringManager* m, hbl->addWidget(ruleLister); ruleEditor = new RuleEditWidget(manager,w); hbl->addWidget(ruleEditor); - connect(ruleLister,TQT_SIGNAL(ruleSelected(const TQString&)), - ruleEditor, TQT_SLOT(slotEditRule(const TQString&))); - connect(ruleLister, TQT_SIGNAL(leavingRule()), - ruleEditor, TQT_SLOT(updateRule())); - connect(ruleEditor, TQT_SIGNAL(shrink()), TQT_SLOT(slotShrink())); - connect(this,TQT_SIGNAL(finished()),TQT_SLOT(slotFinished())); + connect(ruleLister,TQ_SIGNAL(ruleSelected(const TQString&)), + ruleEditor, TQ_SLOT(slotEditRule(const TQString&))); + connect(ruleLister, TQ_SIGNAL(leavingRule()), + ruleEditor, TQ_SLOT(updateRule())); + connect(ruleEditor, TQ_SIGNAL(shrink()), TQ_SLOT(slotShrink())); + connect(this,TQ_SIGNAL(finished()),TQ_SLOT(slotFinished())); ruleLister->slotRuleSelected(0); resize(550, sizeHint().height()); } @@ -909,7 +909,7 @@ void KScoringEditor::setRule(KScoringRule* r) void KScoringEditor::slotShrink() { - TQTimer::singleShot(5, this, TQT_SLOT(slotDoShrink())); + TQTimer::singleShot(5, this, TQ_SLOT(slotDoShrink())); } void KScoringEditor::slotDoShrink() @@ -964,7 +964,7 @@ KScoringEditorWidgetDialog::KScoringEditorWidgetDialog(KScoringManager *m, const TQFrame *f = makeMainWidget(); TQBoxLayout *topL = new TQVBoxLayout(f); ruleEditor = new RuleEditWidget(manager,f); - connect(ruleEditor, TQT_SIGNAL(shrink()), TQT_SLOT(slotShrink())); + connect(ruleEditor, TQ_SIGNAL(shrink()), TQ_SLOT(slotShrink())); topL->addWidget(ruleEditor); ruleEditor->slotEditRule(ruleName); resize(0,0); @@ -987,7 +987,7 @@ void KScoringEditorWidgetDialog::slotOk() void KScoringEditorWidgetDialog::slotShrink() { - TQTimer::singleShot(5, this, TQT_SLOT(slotDoShrink())); + TQTimer::singleShot(5, this, TQ_SLOT(slotDoShrink())); } void KScoringEditorWidgetDialog::slotDoShrink() @@ -1008,8 +1008,8 @@ KScoringEditorWidget::KScoringEditorWidget(KScoringManager *m,TQWidget *p, const TQBoxLayout *topL = new TQVBoxLayout(this); ruleLister = new RuleListWidget(manager,true,this); topL->addWidget(ruleLister); - connect(ruleLister,TQT_SIGNAL(ruleEdited(const TQString&)), - this,TQT_SLOT(slotRuleEdited(const TQString &))); + connect(ruleLister,TQ_SIGNAL(ruleEdited(const TQString&)), + this,TQ_SLOT(slotRuleEdited(const TQString &))); } KScoringEditorWidget::~KScoringEditorWidget() diff --git a/libtdepim/ksubscription.cpp b/libtdepim/ksubscription.cpp index d72776bc..7bb7179d 100644 --- a/libtdepim/ksubscription.cpp +++ b/libtdepim/ksubscription.cpp @@ -227,7 +227,7 @@ KSubscription::KSubscription( TQWidget *parent, const TQString &caption, TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", TDEIcon::Small, 0 ) ); filterEdit = new KLineEdit(page); TQLabel *l = new TQLabel(filterEdit,i18n("S&earch:"), page); - connect( clearButton, TQT_SIGNAL( clicked() ), filterEdit, TQT_SLOT( clear() ) ); + connect( clearButton, TQ_SIGNAL( clicked() ), filterEdit, TQ_SLOT( clear() ) ); // checkboxes noTreeCB = new TQCheckBox(i18n("Disable &tree view"), page); @@ -323,29 +323,29 @@ KSubscription::KSubscription( TQWidget *parent, const TQString &caption, filterEdit->setFocus(); // items clicked - connect(groupView, TQT_SIGNAL(clicked(TQListViewItem *)), - this, TQT_SLOT(slotChangeButtonState(TQListViewItem*))); - connect(subView, TQT_SIGNAL(clicked(TQListViewItem *)), - this, TQT_SLOT(slotChangeButtonState(TQListViewItem*))); - connect(unsubView, TQT_SIGNAL(clicked(TQListViewItem *)), - this, TQT_SLOT(slotChangeButtonState(TQListViewItem*))); + connect(groupView, TQ_SIGNAL(clicked(TQListViewItem *)), + this, TQ_SLOT(slotChangeButtonState(TQListViewItem*))); + connect(subView, TQ_SIGNAL(clicked(TQListViewItem *)), + this, TQ_SLOT(slotChangeButtonState(TQListViewItem*))); + connect(unsubView, TQ_SIGNAL(clicked(TQListViewItem *)), + this, TQ_SLOT(slotChangeButtonState(TQListViewItem*))); // connect buttons - connect(arrowBtn1, TQT_SIGNAL(clicked()), TQT_SLOT(slotButton1())); - connect(arrowBtn2, TQT_SIGNAL(clicked()), TQT_SLOT(slotButton2())); - connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotLoadFolders())); + connect(arrowBtn1, TQ_SIGNAL(clicked()), TQ_SLOT(slotButton1())); + connect(arrowBtn2, TQ_SIGNAL(clicked()), TQ_SLOT(slotButton2())); + connect(this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotLoadFolders())); // connect checkboxes - connect(subCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotCBToggled())); - connect(newCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotCBToggled())); - connect(noTreeCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotCBToggled())); + connect(subCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotCBToggled())); + connect(newCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotCBToggled())); + connect(noTreeCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotCBToggled())); // connect textfield - connect(filterEdit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotFilterTextChanged(const TQString&))); + connect(filterEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotFilterTextChanged(const TQString&))); // update status - connect(this, TQT_SIGNAL(listChanged()), TQT_SLOT(slotUpdateStatusLabel())); + connect(this, TQ_SIGNAL(listChanged()), TQ_SLOT(slotUpdateStatusLabel())); } //----------------------------------------------------------------------------- diff --git a/libtdepim/ktimeedit.cpp b/libtdepim/ktimeedit.cpp index 37783130..4dd66280 100644 --- a/libtdepim/ktimeedit.cpp +++ b/libtdepim/ktimeedit.cpp @@ -128,9 +128,9 @@ KTimeEdit::KTimeEdit( TQWidget *parent, TQTime qt, const char *name ) updateText(); setFocusPolicy(TQWidget::StrongFocus); - connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(active(int))); - connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(hilit(int))); - connect(this, TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(changedText())); + connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(active(int))); + connect(this, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(hilit(int))); + connect(this, TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(changedText())); } KTimeEdit::~KTimeEdit() diff --git a/libtdepim/kwidgetlister.cpp b/libtdepim/kwidgetlister.cpp index d279c8bc..0ad66de7 100644 --- a/libtdepim/kwidgetlister.cpp +++ b/libtdepim/kwidgetlister.cpp @@ -71,12 +71,12 @@ KWidgetLister::KWidgetLister( int minWidgets, int maxWidgets, TQWidget *parent, mButtonBox->setStretchFactor( mBtnClear, 0 ); //---------- connect everything - connect( mBtnMore, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotMore()) ); - connect( mBtnFewer, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotFewer()) ); - connect( mBtnClear, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClear()) ); + connect( mBtnMore, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotMore()) ); + connect( mBtnFewer, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotFewer()) ); + connect( mBtnClear, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClear()) ); enableControls(); } diff --git a/libtdepim/ldapclient.cpp b/libtdepim/ldapclient.cpp index 8e478388..55d8362b 100644 --- a/libtdepim/ldapclient.cpp +++ b/libtdepim/ldapclient.cpp @@ -137,12 +137,12 @@ void LdapClient::startQuery( const TQString& filter ) startParseLDIF(); mActive = true; mJob = TDEIO::get( url, false, false ); - connect( mJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( mJob, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); - connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotDone() ) ); + connect( mJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( mJob, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotDone() ) ); } void LdapClient::cancelQuery() @@ -345,8 +345,8 @@ LdapSearch::LdapSearch() } readConfig(); - connect(KDirWatch::self(), TQT_SIGNAL(dirty (const TQString&)),this, - TQT_SLOT(slotFileChanged(const TQString&))); + connect(KDirWatch::self(), TQ_SIGNAL(dirty (const TQString&)),this, + TQ_SLOT(slotFileChanged(const TQString&))); } void LdapSearch::readWeighForClient( LdapClient *client, TDEConfig *config, int clientNumber ) @@ -394,17 +394,17 @@ void LdapSearch::readConfig() attrs << "cn" << "mail" << "givenname" << "sn" << "objectClass"; ldapClient->setAttrs( attrs ); - connect( ldapClient, TQT_SIGNAL( result( const KPIM::LdapObject& ) ), - this, TQT_SLOT( slotLDAPResult( const KPIM::LdapObject& ) ) ); - connect( ldapClient, TQT_SIGNAL( done() ), - this, TQT_SLOT( slotLDAPDone() ) ); - connect( ldapClient, TQT_SIGNAL( error( const TQString& ) ), - this, TQT_SLOT( slotLDAPError( const TQString& ) ) ); + connect( ldapClient, TQ_SIGNAL( result( const KPIM::LdapObject& ) ), + this, TQ_SLOT( slotLDAPResult( const KPIM::LdapObject& ) ) ); + connect( ldapClient, TQ_SIGNAL( done() ), + this, TQ_SLOT( slotLDAPDone() ) ); + connect( ldapClient, TQ_SIGNAL( error( const TQString& ) ), + this, TQ_SLOT( slotLDAPError( const TQString& ) ) ); mClients.append( ldapClient ); } - connect( &mDataTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDataTimer() ) ); + connect( &mDataTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDataTimer() ) ); } mConfigFile = locateLocal( "config", "kabldaprc" ); KDirWatch::self()->addFile( mConfigFile ); diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp index d6b541f5..26cc3d24 100644 --- a/libtdepim/ldapsearchdialog.cpp +++ b/libtdepim/ldapsearchdialog.cpp @@ -195,10 +195,10 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name ) mNumHosts = 0; mIsOK = false; - connect( mRecursiveCheckbox, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotSetScope( bool ) ) ); - connect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStartSearch() ) ); + connect( mRecursiveCheckbox, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotSetScope( bool ) ) ); + connect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStartSearch() ) ); setTabOrder(mSearchEdit, mFilterCombo); setTabOrder(mFilterCombo, mSearchButton); @@ -268,12 +268,12 @@ void LDAPSearchDialog::restoreSettings() ldapClient->setAttrs( attrs ); - connect( ldapClient, TQT_SIGNAL( result( const KPIM::LdapObject& ) ), - this, TQT_SLOT( slotAddResult( const KPIM::LdapObject& ) ) ); - connect( ldapClient, TQT_SIGNAL( done() ), - this, TQT_SLOT( slotSearchDone() ) ); - connect( ldapClient, TQT_SIGNAL( error( const TQString& ) ), - this, TQT_SLOT( slotError( const TQString& ) ) ); + connect( ldapClient, TQ_SIGNAL( result( const KPIM::LdapObject& ) ), + this, TQ_SLOT( slotAddResult( const KPIM::LdapObject& ) ) ); + connect( ldapClient, TQ_SIGNAL( done() ), + this, TQ_SLOT( slotSearchDone() ) ); + connect( ldapClient, TQ_SIGNAL( error( const TQString& ) ), + this, TQ_SLOT( slotError( const TQString& ) ) ); mLdapClientList.append( ldapClient ); } @@ -378,10 +378,10 @@ void LDAPSearchDialog::slotStartSearch() TQApplication::setOverrideCursor( TQt::waitCursor ); mSearchButton->setText( i18n( "Stop" ) ); - disconnect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStartSearch() ) ); - connect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStopSearch() ) ); + disconnect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStartSearch() ) ); + connect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStopSearch() ) ); bool startsWith = (mSearchType->currentItem() == 1); @@ -410,10 +410,10 @@ void LDAPSearchDialog::slotSearchDone() return; } - disconnect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStopSearch() ) ); - connect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStartSearch() ) ); + disconnect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStopSearch() ) ); + connect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStartSearch() ) ); mSearchButton->setText( i18n( "Search" ) ); TQApplication::restoreOverrideCursor(); diff --git a/libtdepim/progressdialog.cpp b/libtdepim/progressdialog.cpp index d3a37003..e780c297 100644 --- a/libtdepim/progressdialog.cpp +++ b/libtdepim/progressdialog.cpp @@ -75,7 +75,7 @@ TransactionItem* TransactionItemView::addTransactionItem( ProgressItem* item, bo { TransactionItem *ti = new TransactionItem( mBigBox, item, first ); ti->hide(); - TQTimer::singleShot( 1000, ti, TQT_SLOT( show() ) ); + TQTimer::singleShot( 1000, ti, TQ_SLOT( show() ) ); return ti; } @@ -169,8 +169,8 @@ TransactionItem::TransactionItem( TQWidget* parent, if ( item->canBeCanceled() ) { mCancelButton = new TQPushButton( SmallIcon( "cancel" ), TQString(), h ); TQToolTip::add( mCancelButton, i18n("Cancel this operation.") ); - connect ( mCancelButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotItemCanceled() )); + connect ( mCancelButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotItemCanceled() )); } h = new TQHBox( this ); @@ -262,7 +262,7 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c pbClose->setFixedSize( 16, 16 ); pbClose->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "window-close", TDEIcon::Small, 14 ) ); TQToolTip::add( pbClose, i18n( "Hide detailed progress window" ) ); - connect(pbClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose())); + connect(pbClose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClose())); TQWidget* spacer = new TQWidget( rightBox ); // don't let the close button take up all the height rightBox->setStretchFactor( spacer, 100 ); */ @@ -272,22 +272,22 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c * appearing and vanishing items. */ ProgressManager *pm = ProgressManager::instance(); - connect ( pm, TQT_SIGNAL( progressItemAdded( KPIM::ProgressItem* ) ), - this, TQT_SLOT( slotTransactionAdded( KPIM::ProgressItem* ) ) ); - connect ( pm, TQT_SIGNAL( progressItemCompleted( KPIM::ProgressItem* ) ), - this, TQT_SLOT( slotTransactionCompleted( KPIM::ProgressItem* ) ) ); - connect ( pm, TQT_SIGNAL( progressItemProgress( KPIM::ProgressItem*, unsigned int ) ), - this, TQT_SLOT( slotTransactionProgress( KPIM::ProgressItem*, unsigned int ) ) ); - connect ( pm, TQT_SIGNAL( progressItemStatus( KPIM::ProgressItem*, const TQString& ) ), - this, TQT_SLOT( slotTransactionStatus( KPIM::ProgressItem*, const TQString& ) ) ); - connect ( pm, TQT_SIGNAL( progressItemLabel( KPIM::ProgressItem*, const TQString& ) ), - this, TQT_SLOT( slotTransactionLabel( KPIM::ProgressItem*, const TQString& ) ) ); - connect ( pm, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ), - this, TQT_SLOT( slotTransactionUsesCrypto( KPIM::ProgressItem*, bool ) ) ); - connect ( pm, TQT_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ), - this, TQT_SLOT( slotTransactionUsesBusyIndicator( KPIM::ProgressItem*, bool ) ) ); - connect ( pm, TQT_SIGNAL( showProgressDialog() ), - this, TQT_SLOT( slotShow() ) ); + connect ( pm, TQ_SIGNAL( progressItemAdded( KPIM::ProgressItem* ) ), + this, TQ_SLOT( slotTransactionAdded( KPIM::ProgressItem* ) ) ); + connect ( pm, TQ_SIGNAL( progressItemCompleted( KPIM::ProgressItem* ) ), + this, TQ_SLOT( slotTransactionCompleted( KPIM::ProgressItem* ) ) ); + connect ( pm, TQ_SIGNAL( progressItemProgress( KPIM::ProgressItem*, unsigned int ) ), + this, TQ_SLOT( slotTransactionProgress( KPIM::ProgressItem*, unsigned int ) ) ); + connect ( pm, TQ_SIGNAL( progressItemStatus( KPIM::ProgressItem*, const TQString& ) ), + this, TQ_SLOT( slotTransactionStatus( KPIM::ProgressItem*, const TQString& ) ) ); + connect ( pm, TQ_SIGNAL( progressItemLabel( KPIM::ProgressItem*, const TQString& ) ), + this, TQ_SLOT( slotTransactionLabel( KPIM::ProgressItem*, const TQString& ) ) ); + connect ( pm, TQ_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ), + this, TQ_SLOT( slotTransactionUsesCrypto( KPIM::ProgressItem*, bool ) ) ); + connect ( pm, TQ_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ), + this, TQ_SLOT( slotTransactionUsesBusyIndicator( KPIM::ProgressItem*, bool ) ) ); + connect ( pm, TQ_SIGNAL( showProgressDialog() ), + this, TQ_SLOT( slotShow() ) ); } void ProgressDialog::closeEvent( TQCloseEvent* e ) @@ -319,7 +319,7 @@ void ProgressDialog::slotTransactionAdded( ProgressItem *item ) if ( ti ) mTransactionsToListviewItems.replace( item, ti ); if ( first && mWasLastShown ) - TQTimer::singleShot( 1000, this, TQT_SLOT( slotShow() ) ); + TQTimer::singleShot( 1000, this, TQ_SLOT( slotShow() ) ); } } @@ -330,14 +330,14 @@ void ProgressDialog::slotTransactionCompleted( ProgressItem *item ) TransactionItem *ti = mTransactionsToListviewItems[ item ]; mTransactionsToListviewItems.remove( item ); ti->setItemComplete(); - TQTimer::singleShot( 3000, ti, TQT_SLOT( deleteLater() ) ); + TQTimer::singleShot( 3000, ti, TQ_SLOT( deleteLater() ) ); // see the slot for comments as to why that works - connect ( ti, TQT_SIGNAL( destroyed() ), - mScrollView, TQT_SLOT( slotLayoutFirstItem() ) ); + connect ( ti, TQ_SIGNAL( destroyed() ), + mScrollView, TQ_SLOT( slotLayoutFirstItem() ) ); } // This was the last item, hide. if ( mTransactionsToListviewItems.empty() ) - TQTimer::singleShot( 3000, this, TQT_SLOT( slotHide() ) ); + TQTimer::singleShot( 3000, this, TQ_SLOT( slotHide() ) ); } void ProgressDialog::slotTransactionCanceled( ProgressItem* ) diff --git a/libtdepim/progressmanager.cpp b/libtdepim/progressmanager.cpp index 37216e94..68e8ac28 100644 --- a/libtdepim/progressmanager.cpp +++ b/libtdepim/progressmanager.cpp @@ -162,22 +162,22 @@ ProgressItem* ProgressManager::createProgressItemImpl( } } // connect all signals - connect ( t, TQT_SIGNAL( progressItemCompleted(KPIM::ProgressItem*) ), - this, TQT_SLOT( slotTransactionCompleted(KPIM::ProgressItem*) ) ); - connect ( t, TQT_SIGNAL( progressItemProgress(KPIM::ProgressItem*, unsigned int) ), - this, TQT_SIGNAL( progressItemProgress(KPIM::ProgressItem*, unsigned int) ) ); - connect ( t, TQT_SIGNAL( progressItemAdded(KPIM::ProgressItem*) ), - this, TQT_SIGNAL( progressItemAdded(KPIM::ProgressItem*) ) ); - connect ( t, TQT_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ), - this, TQT_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ) ); - connect ( t, TQT_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ), - this, TQT_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ) ); - connect ( t, TQT_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ), - this, TQT_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ) ); - connect ( t, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ), - this, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ) ); - connect ( t, TQT_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ), - this, TQT_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ) ); + connect ( t, TQ_SIGNAL( progressItemCompleted(KPIM::ProgressItem*) ), + this, TQ_SLOT( slotTransactionCompleted(KPIM::ProgressItem*) ) ); + connect ( t, TQ_SIGNAL( progressItemProgress(KPIM::ProgressItem*, unsigned int) ), + this, TQ_SIGNAL( progressItemProgress(KPIM::ProgressItem*, unsigned int) ) ); + connect ( t, TQ_SIGNAL( progressItemAdded(KPIM::ProgressItem*) ), + this, TQ_SIGNAL( progressItemAdded(KPIM::ProgressItem*) ) ); + connect ( t, TQ_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ), + this, TQ_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ) ); + connect ( t, TQ_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ), + this, TQ_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ) ); + connect ( t, TQ_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ), + this, TQ_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ) ); + connect ( t, TQ_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ), + this, TQ_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ) ); + connect ( t, TQ_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ), + this, TQ_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ) ); emit progressItemAdded( t ); } else { diff --git a/libtdepim/sendsmsdialog.cpp b/libtdepim/sendsmsdialog.cpp index 2b658112..2f451d3a 100644 --- a/libtdepim/sendsmsdialog.cpp +++ b/libtdepim/sendsmsdialog.cpp @@ -48,10 +48,10 @@ SendSMSDialog::SendSMSDialog( const TQString &recipientName, TQWidget *parent, c setButtonText( Ok, i18n( "Send" ) ); - connect( mText, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( updateMessageLength() ) ); - connect( mText, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( updateButtons() ) ); + connect( mText, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( updateMessageLength() ) ); + connect( mText, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( updateButtons() ) ); updateButtons(); diff --git a/libtdepim/statusbarprogresswidget.cpp b/libtdepim/statusbarprogresswidget.cpp index e196bcf8..d0cd9d7d 100644 --- a/libtdepim/statusbarprogresswidget.cpp +++ b/libtdepim/statusbarprogresswidget.cpp @@ -98,22 +98,22 @@ StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog mode = None; setMode(); - connect( m_pButton, TQT_SIGNAL( clicked() ), - progressDialog, TQT_SLOT( slotToggleVisibility() ) ); + connect( m_pButton, TQ_SIGNAL( clicked() ), + progressDialog, TQ_SLOT( slotToggleVisibility() ) ); - connect ( ProgressManager::instance(), TQT_SIGNAL( progressItemAdded( KPIM::ProgressItem * ) ), - this, TQT_SLOT( slotProgressItemAdded( KPIM::ProgressItem * ) ) ); - connect ( ProgressManager::instance(), TQT_SIGNAL( progressItemCompleted( KPIM::ProgressItem * ) ), - this, TQT_SLOT( slotProgressItemCompleted( KPIM::ProgressItem * ) ) ); - connect ( ProgressManager::instance(), TQT_SIGNAL(progressItemUsesBusyIndicator(KPIM::ProgressItem*,bool)), - this, TQT_SLOT( updateBusyMode() ) ); + connect ( ProgressManager::instance(), TQ_SIGNAL( progressItemAdded( KPIM::ProgressItem * ) ), + this, TQ_SLOT( slotProgressItemAdded( KPIM::ProgressItem * ) ) ); + connect ( ProgressManager::instance(), TQ_SIGNAL( progressItemCompleted( KPIM::ProgressItem * ) ), + this, TQ_SLOT( slotProgressItemCompleted( KPIM::ProgressItem * ) ) ); + connect ( ProgressManager::instance(), TQ_SIGNAL(progressItemUsesBusyIndicator(KPIM::ProgressItem*,bool)), + this, TQ_SLOT( updateBusyMode() ) ); - connect ( progressDialog, TQT_SIGNAL( visibilityChanged( bool )), - this, TQT_SLOT( slotProgressDialogVisible( bool ) ) ); + connect ( progressDialog, TQ_SIGNAL( visibilityChanged( bool )), + this, TQ_SLOT( slotProgressDialogVisible( bool ) ) ); mDelayTimer = new TQTimer( this ); - connect ( mDelayTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotShowItemDelayed() ) ); + connect ( mDelayTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotShowItemDelayed() ) ); } // There are three cases: no progressitem, one progressitem (connect to it directly), @@ -132,8 +132,8 @@ void StatusbarProgressWidget::updateBusyMode() else { // N items if ( !mBusyTimer ) { mBusyTimer = new TQTimer( this ); - connect( mBusyTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotBusyIndicator() ) ); + connect( mBusyTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotBusyIndicator() ) ); mDelayTimer->start( 1000, true ); } } @@ -153,7 +153,7 @@ void StatusbarProgressWidget::slotProgressItemCompleted( ProgressItem *item ) connectSingleItem(); // if going back to 1 item if ( ProgressManager::instance()->isEmpty() ) { // No item // Done. In 5s the progress-widget will close, then we can clean up the statusbar - TQTimer::singleShot( 5000, this, TQT_SLOT( slotClean() ) ); + TQTimer::singleShot( 5000, this, TQ_SLOT( slotClean() ) ); } else if ( mCurrentItem ) { // Exactly one item delete mBusyTimer; mBusyTimer = 0; @@ -164,14 +164,14 @@ void StatusbarProgressWidget::slotProgressItemCompleted( ProgressItem *item ) void StatusbarProgressWidget::connectSingleItem() { if ( mCurrentItem ) { - disconnect ( mCurrentItem, TQT_SIGNAL( progressItemProgress( KPIM::ProgressItem *, unsigned int ) ), - this, TQT_SLOT( slotProgressItemProgress( KPIM::ProgressItem *, unsigned int ) ) ); + disconnect ( mCurrentItem, TQ_SIGNAL( progressItemProgress( KPIM::ProgressItem *, unsigned int ) ), + this, TQ_SLOT( slotProgressItemProgress( KPIM::ProgressItem *, unsigned int ) ) ); mCurrentItem = 0; } mCurrentItem = ProgressManager::instance()->singleItem(); if ( mCurrentItem ) { - connect ( mCurrentItem, TQT_SIGNAL( progressItemProgress( KPIM::ProgressItem *, unsigned int ) ), - this, TQT_SLOT( slotProgressItemProgress( KPIM::ProgressItem *, unsigned int ) ) ); + connect ( mCurrentItem, TQ_SIGNAL( progressItemProgress( KPIM::ProgressItem *, unsigned int ) ), + this, TQ_SLOT( slotProgressItemProgress( KPIM::ProgressItem *, unsigned int ) ) ); } } diff --git a/libtdepim/tdeabcresourcecached.cpp b/libtdepim/tdeabcresourcecached.cpp index 42a06e45..63eb2f75 100644 --- a/libtdepim/tdeabcresourcecached.cpp +++ b/libtdepim/tdeabcresourcecached.cpp @@ -36,8 +36,8 @@ ResourceCached::ResourceCached( const TDEConfig *config ) mSavePolicy( SaveDelayed ), mSaveInterval( 10 ), mKABCSaveTimer( 0, "mKABCSaveTimer" ) { - connect( &mKABCReloadTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotKABCReload() ) ); - connect( &mKABCSaveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotKABCSave() ) ); + connect( &mKABCReloadTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotKABCReload() ) ); + connect( &mKABCSaveTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotKABCSave() ) ); if (config) this->readConfig(const_cast<TDEConfig *>(config)); diff --git a/libtdepim/tdeconfigwizard.cpp b/libtdepim/tdeconfigwizard.cpp index 8c2620d1..7b982aea 100644 --- a/libtdepim/tdeconfigwizard.cpp +++ b/libtdepim/tdeconfigwizard.cpp @@ -56,10 +56,10 @@ TDEConfigWizard::~TDEConfigWizard() void TDEConfigWizard::init() { - connect( this, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), - TQT_SLOT( slotAboutToShowPage( TQWidget * ) ) ); + connect( this, TQ_SIGNAL( aboutToShowPage( TQWidget * ) ), + TQ_SLOT( slotAboutToShowPage( TQWidget * ) ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( readConfig() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( readConfig() ) ); } void TDEConfigWizard::setPropagator( TDEConfigPropagator *p ) diff --git a/libtdepim/tests/testdateedit.cpp b/libtdepim/tests/testdateedit.cpp index a87e950c..39c8447d 100644 --- a/libtdepim/tests/testdateedit.cpp +++ b/libtdepim/tests/testdateedit.cpp @@ -39,8 +39,8 @@ DateEdit::DateEdit( TQWidget *parent, const char *name ) KDateEdit *edit = new KDateEdit( this ); layout->addWidget( edit ); - connect( edit, TQT_SIGNAL( dateChanged( const TQDate& ) ), - this, TQT_SLOT( dateChanged( const TQDate& ) ) ); + connect( edit, TQ_SIGNAL( dateChanged( const TQDate& ) ), + this, TQ_SLOT( dateChanged( const TQDate& ) ) ); } void DateEdit::dateChanged( const TQDate &date ) diff --git a/libtdepim/weaverextensions.cpp b/libtdepim/weaverextensions.cpp index ad5b144c..01d68ff7 100644 --- a/libtdepim/weaverextensions.cpp +++ b/libtdepim/weaverextensions.cpp @@ -25,14 +25,14 @@ namespace ThreadWeaver { void WeaverExtension::attach (Weaver *w) { - connect (w, TQT_SIGNAL (threadCreated (Thread *) ), - TQT_SLOT (threadCreated (Thread *) ) ); - connect (w, TQT_SIGNAL (threadDestroyed (Thread *) ), - TQT_SLOT (threadDestroyed (Thread *) ) ); - connect (w, TQT_SIGNAL (threadBusy (Thread *) ), - TQT_SLOT (threadBusy (Thread *) ) ); - connect (w, TQT_SIGNAL (threadSuspended (Thread *) ), - TQT_SLOT (threadSuspended (Thread *) ) ); + connect (w, TQ_SIGNAL (threadCreated (Thread *) ), + TQ_SLOT (threadCreated (Thread *) ) ); + connect (w, TQ_SIGNAL (threadDestroyed (Thread *) ), + TQ_SLOT (threadDestroyed (Thread *) ) ); + connect (w, TQ_SIGNAL (threadBusy (Thread *) ), + TQ_SLOT (threadBusy (Thread *) ) ); + connect (w, TQ_SIGNAL (threadSuspended (Thread *) ), + TQ_SLOT (threadSuspended (Thread *) ) ); } WeaverExtension::~WeaverExtension() |