diff options
Diffstat (limited to 'libtdepim')
124 files changed, 768 insertions, 775 deletions
diff --git a/libtdepim/addresseediffalgo.h b/libtdepim/addresseediffalgo.h index 7b133823..2cda4ef5 100644 --- a/libtdepim/addresseediffalgo.h +++ b/libtdepim/addresseediffalgo.h @@ -27,7 +27,7 @@ namespace KPIM { -class KDE_EXPORT AddresseeDiffAlgo : public DiffAlgo +class TDE_EXPORT AddresseeDiffAlgo : public DiffAlgo { public: AddresseeDiffAlgo( const TDEABC::Addressee &leftAddressee, const TDEABC::Addressee &rightAddressee ); diff --git a/libtdepim/addresseeemailselection.h b/libtdepim/addresseeemailselection.h index f4394a93..d3464b18 100644 --- a/libtdepim/addresseeemailselection.h +++ b/libtdepim/addresseeemailselection.h @@ -26,7 +26,7 @@ namespace KPIM { -class KDE_EXPORT AddresseeEmailSelection : public Selection +class TDE_EXPORT AddresseeEmailSelection : public Selection { public: AddresseeEmailSelection(); diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp index 1af06c84..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; } @@ -346,7 +346,7 @@ void AddresseeLineEdit::mouseReleaseEvent( TQMouseEvent *e ) if ( m_useCompletion && TQApplication::clipboard()->supportsSelection() && !isReadOnly() - && e->button() == Qt::MidButton ) { + && e->button() == TQt::MidButton ) { m_smartPaste = 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; } } @@ -763,7 +763,7 @@ void AddresseeLineEdit::addCompletionItem( const TQString& string, int weight, i weight = TQMAX( ( *it ).first, weight ); ( *it ).first = weight; } else { - s_completionItemMap->insert( string, tqMakePair( weight, completionItemSource ) ); + s_completionItemMap->insert( string, qMakePair( weight, completionItemSource ) ); } if ( keyWords == 0 ) s_completion->addItem( string, weight ); @@ -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; } @@ -1037,12 +1037,12 @@ int KPIM::AddresseeLineEdit::addCompletionSource( const TQString &source, int we bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(completionBox()) ) { + if ( obj == completionBox() ) { if ( e->type() == TQEvent::MouseButtonPress || e->type() == TQEvent::MouseMove || e->type() == TQEvent::MouseButtonRelease || e->type() == TQEvent::MouseButtonDblClick ) { - TQMouseEvent* me = TQT_TQMOUSEEVENT( e ); + TQMouseEvent* me = static_cast<TQMouseEvent*>( e ); // find list box item at the event position TQListBoxItem *item = completionBox()->itemAt( me->pos() ); if ( !item ) { @@ -1054,8 +1054,8 @@ bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e) // avoid selection of headers on button press, or move or release while // a button is pressed if ( e->type() == TQEvent::MouseButtonPress - || me->state() & Qt::LeftButton || me->state() & Qt::MidButton - || me->state() & Qt::RightButton ) { + || me->state() & TQt::LeftButton || me->state() & TQt::MidButton + || me->state() & TQt::RightButton ) { if ( itemIsHeader(item) ) { return true; // eat the event, we don't want anything to happen } else { @@ -1070,18 +1070,18 @@ bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e) } } } - if ( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this) ) && + if ( ( obj == this ) && ( e->type() == TQEvent::AccelOverride ) ) { - TQKeyEvent *ke = TQT_TQKEYEVENT( e ); + TQKeyEvent *ke = static_cast<TQKeyEvent*>( e ); if ( ke->key() == Key_Up || ke->key() == Key_Down || ke->key() == Key_Tab ) { ke->accept(); return true; } } - if ( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this) ) && + if ( ( obj == this ) && ( e->type() == TQEvent::KeyPress || e->type() == TQEvent::KeyRelease ) && completionBox()->isVisible() ) { - TQKeyEvent *ke = TQT_TQKEYEVENT( e ); + TQKeyEvent *ke = static_cast<TQKeyEvent*>( e ); int currentIndex = completionBox()->currentItem(); if ( currentIndex < 0 ) { return true; diff --git a/libtdepim/addresseelineedit.h b/libtdepim/addresseelineedit.h index 34439202..17ad5f05 100644 --- a/libtdepim/addresseelineedit.h +++ b/libtdepim/addresseelineedit.h @@ -50,10 +50,10 @@ typedef TQMap< TQString, TQPair<int,int> > CompletionItemsMap; namespace KPIM { -class KDE_EXPORT AddresseeLineEdit : public ClickLineEdit, public DCOPObject +class TDE_EXPORT AddresseeLineEdit : public ClickLineEdit, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp index 77f2be02..b89184e6 100644 --- a/libtdepim/addresseeselector.cpp +++ b/libtdepim/addresseeselector.cpp @@ -227,8 +227,8 @@ class SelectionViewItem : public TQListViewItem AddresseeSelector::AddresseeSelector( Selection *selection, TQWidget *parent, const char *name ) : TQWidget( parent, name ), mSelection( selection ), mManager( 0 ) { - mMoveMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - mRemoveMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); + mMoveMapper = new TQSignalMapper( this ); + mRemoveMapper = new TQSignalMapper( this ); mAddressBookManager = new AddressBookManager(); @@ -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,9 +298,9 @@ void AddresseeSelector::initGUI() listView->setFullWidth( true ); mSelectionViews.append( listView ); - connect( listView, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), - mRemoveMapper, TQT_SLOT( map() ) ); - mRemoveMapper->setMapping( TQT_TQOBJECT(listView), i ); + connect( listView, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), + mRemoveMapper, TQ_SLOT( map() ) ); + mRemoveMapper->setMapping( listView, i ); TQVBoxLayout *buttonLayout = new TQVBoxLayout( this ); buttonLayout->setAlignment( TQt::AlignBottom ); @@ -311,18 +311,18 @@ void AddresseeSelector::initGUI() moveButton->setIconSet( moveSet ); moveButton->setFixedSize( 30, 30 ); - connect( moveButton, TQT_SIGNAL( clicked() ), - mMoveMapper, TQT_SLOT( map() ) ); - mMoveMapper->setMapping( TQT_TQOBJECT(moveButton), i ); + connect( moveButton, TQ_SIGNAL( clicked() ), + mMoveMapper, TQ_SLOT( map() ) ); + mMoveMapper->setMapping( moveButton, i ); // remove button TQToolButton *removeButton = new TQToolButton( this ); removeButton->setIconSet( removeSet ); removeButton->setFixedSize( 30, 30 ); - connect( removeButton, TQT_SIGNAL( clicked() ), - mRemoveMapper, TQT_SLOT( map() ) ); - mRemoveMapper->setMapping( TQT_TQOBJECT(removeButton), i ); + connect( removeButton, TQ_SIGNAL( clicked() ), + mRemoveMapper, TQ_SLOT( map() ) ); + mRemoveMapper->setMapping( removeButton, i ); buttonLayout->addWidget( moveButton ); buttonLayout->addWidget( removeButton ); diff --git a/libtdepim/addresseeselector.h b/libtdepim/addresseeselector.h index 101cc6e6..bfe3e4ae 100644 --- a/libtdepim/addresseeselector.h +++ b/libtdepim/addresseeselector.h @@ -41,7 +41,7 @@ namespace KPIM { class AddresseeSelector; -class KDE_EXPORT Selection +class TDE_EXPORT Selection { friend class AddresseeSelector; @@ -163,9 +163,9 @@ class SelectionItem TQBitArray mField; }; -class KDE_EXPORT AddresseeSelector : public TQWidget +class TDE_EXPORT AddresseeSelector : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -213,9 +213,9 @@ class KDE_EXPORT AddresseeSelector : public TQWidget AddressBookManager *mAddressBookManager; }; -class KDE_EXPORT AddresseeSelectorDialog : public KDialogBase +class TDE_EXPORT AddresseeSelectorDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: 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/addresseeview.h b/libtdepim/addresseeview.h index 6ee83268..43e442f3 100644 --- a/libtdepim/addresseeview.h +++ b/libtdepim/addresseeview.h @@ -40,9 +40,9 @@ class TQPopupMenu; namespace KPIM { -class KDE_EXPORT AddresseeView : public KTextBrowser +class TDE_EXPORT AddresseeView : public KTextBrowser { - Q_OBJECT + TQ_OBJECT public: /** 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/addressesdialog.h b/libtdepim/addressesdialog.h index 55b29231..dcfee200 100644 --- a/libtdepim/addressesdialog.h +++ b/libtdepim/addressesdialog.h @@ -37,7 +37,7 @@ namespace KPIM { class AddresseeViewItem : public TQObject, public TDEListViewItem { - Q_OBJECT + TQ_OBJECT public: @@ -76,9 +76,9 @@ namespace KPIM { AddresseeViewItemPrivate *d; }; - class KDE_EXPORT AddressesDialog : public KDialogBase + class TDE_EXPORT AddressesDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: AddressesDialog( TQWidget *widget=0, const char *name=0 ); diff --git a/libtdepim/addresspicker.ui b/libtdepim/addresspicker.ui index 704b3d58..a37369aa 100644 --- a/libtdepim/addresspicker.ui +++ b/libtdepim/addresspicker.ui @@ -299,9 +299,6 @@ <property name="text"> <string>Save as &Distribution List...</string> </property> - <property name="accel"> - <string>Alt+D</string> - </property> </widget> <widget class="TQPushButton" row="3" column="0"> <property name="name"> diff --git a/libtdepim/broadcaststatus.h b/libtdepim/broadcaststatus.h index af8b383c..8cfc2e2e 100644 --- a/libtdepim/broadcaststatus.h +++ b/libtdepim/broadcaststatus.h @@ -29,10 +29,10 @@ class ProgressItem; */ -class KDE_EXPORT BroadcastStatus : public TQObject +class TDE_EXPORT BroadcastStatus : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdepim/calendardiffalgo.h b/libtdepim/calendardiffalgo.h index 9ccd6c8c..c83f3aab 100644 --- a/libtdepim/calendardiffalgo.h +++ b/libtdepim/calendardiffalgo.h @@ -29,7 +29,7 @@ namespace KPIM { -class KDE_EXPORT CalendarDiffAlgo : public DiffAlgo +class TDE_EXPORT CalendarDiffAlgo : public DiffAlgo { public: CalendarDiffAlgo( KCal::Incidence *leftIncidence, KCal::Incidence *rightIncidence ); 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/categoryeditdialog.h b/libtdepim/categoryeditdialog.h index 67d8aa15..3f45ca8f 100644 --- a/libtdepim/categoryeditdialog.h +++ b/libtdepim/categoryeditdialog.h @@ -29,9 +29,9 @@ class KPimPrefs; namespace KPIM { -class KDE_EXPORT CategoryEditDialog : public KDialogBase +class TDE_EXPORT CategoryEditDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent = 0, 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/categoryselectdialog.h b/libtdepim/categoryselectdialog.h index 6a4bfb40..ec0af3dc 100644 --- a/libtdepim/categoryselectdialog.h +++ b/libtdepim/categoryselectdialog.h @@ -30,9 +30,9 @@ class CategorySelectDialog_base; namespace KPIM { -class KDE_EXPORT CategorySelectDialog : public KDialogBase +class TDE_EXPORT CategorySelectDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: CategorySelectDialog( KPimPrefs *prefs, TQWidget *parent = 0, diff --git a/libtdepim/cfgc/example.cfg b/libtdepim/cfgc/example.cfg index 18c7b8b1..6b07152a 100644 --- a/libtdepim/cfgc/example.cfg +++ b/libtdepim/cfgc/example.cfg @@ -27,12 +27,12 @@ </entry> </group> <group name="MyOptions"> - <entry type=TQSTRING_OBJECT_NAME_STRING> + <entry type="TQString"> <name>MyString</name> <label>This is a string</label> <default>Default String</default> </entry> - <entry type=TQSTRINGLIST_OBJECT_NAME_STRING> + <entry type="TQStringList"> <name>MyStringList</name> <default>up,down</default> </entry> diff --git a/libtdepim/clicklineedit.h b/libtdepim/clicklineedit.h index e8c181ce..a570e44e 100644 --- a/libtdepim/clicklineedit.h +++ b/libtdepim/clicklineedit.h @@ -33,9 +33,9 @@ namespace KPIM { @short LineEdit with customizable "Click here" text @author Daniel Molkentin */ -class KDE_EXPORT ClickLineEdit : public KLineEdit +class TDE_EXPORT ClickLineEdit : public KLineEdit { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString clickMessage READ clickMessage WRITE setClickMessage ) public: 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/collectingprocess.h b/libtdepim/collectingprocess.h index 5aad3f07..5de4960c 100644 --- a/libtdepim/collectingprocess.h +++ b/libtdepim/collectingprocess.h @@ -46,8 +46,8 @@ namespace KPIM { * * @author Ingo Kloecker <kloecker@kde.org> */ -class KDE_EXPORT CollectingProcess : public TDEProcess { - Q_OBJECT +class TDE_EXPORT CollectingProcess : public TDEProcess { + TQ_OBJECT public: CollectingProcess( TQObject * parent = 0, const char * name = 0 ); diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp index bc6f8839..8a3a25eb 100644 --- a/libtdepim/completionordereditor.cpp +++ b/libtdepim/completionordereditor.cpp @@ -225,20 +225,20 @@ CompletionOrderEditor::CompletionOrderEditor( KPIM::LdapSearch* ldapSearch, mUpButton = new KPushButton( upDownBox, "mUpButton" ); mUpButton->setIconSet( BarIconSet( "go-up", TDEIcon::SizeSmall ) ); mUpButton->setEnabled( false ); // b/c no item is selected yet - mUpButton->setFocusPolicy( TQ_StrongFocus ); + mUpButton->setFocusPolicy( TQWidget::StrongFocus ); mDownButton = new KPushButton( upDownBox, "mDownButton" ); mDownButton->setIconSet( BarIconSet( "go-down", TDEIcon::SizeSmall ) ); mDownButton->setEnabled( false ); // b/c no item is selected yet - mDownButton->setFocusPolicy( TQ_StrongFocus ); + mDownButton->setFocusPolicy( TQWidget::StrongFocus ); 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/completionordereditor.h b/libtdepim/completionordereditor.h index f7ac8044..e4485a81 100644 --- a/libtdepim/completionordereditor.h +++ b/libtdepim/completionordereditor.h @@ -62,7 +62,7 @@ public: }; class CompletionOrderEditor : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdepim/configmanager.h b/libtdepim/configmanager.h index b00fb7e5..c3d93b16 100644 --- a/libtdepim/configmanager.h +++ b/libtdepim/configmanager.h @@ -29,8 +29,8 @@ namespace KPIM { * @short Class for managing a set of config options. * @author Marc Mutz <mutz@kde.org> **/ -class KDE_EXPORT ConfigManager : public TQObject { - Q_OBJECT +class TDE_EXPORT ConfigManager : public TQObject { + TQ_OBJECT public: /** Commit changes to disk and emit changed() if necessary. */ diff --git a/libtdepim/designerfields.cpp b/libtdepim/designerfields.cpp index c30d1986..c93ae6f3 100644 --- a/libtdepim/designerfields.cpp +++ b/libtdepim/designerfields.cpp @@ -63,16 +63,16 @@ void DesignerFields::initGUI( const TQString &uiFile ) layout->addWidget( wdg ); - TQObjectList *list = wdg->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *list = wdg->queryList( "TQWidget" ); TQObjectListIt it( *list ); TQStringList allowedTypes; - allowedTypes << TQLINEEDIT_OBJECT_NAME_STRING - << TQTEXTEDIT_OBJECT_NAME_STRING - << TQSPINBOX_OBJECT_NAME_STRING - << TQCHECKBOX_OBJECT_NAME_STRING - << TQCOMBOBOX_OBJECT_NAME_STRING - << TQDATETIMEEDIT_OBJECT_NAME_STRING + allowedTypes << "TQLineEdit" + << "TQTextEdit" + << "TQSpinBox" + << "TQCheckBox" + << "TQComboBox" + << "TQDateTimeEdit" << "KLineEdit" << "KDateTimeWidget" << "KDatePicker"; @@ -83,34 +83,34 @@ void DesignerFields::initGUI( const TQString &uiFile ) if ( name.startsWith( "X_" ) ) { name = name.mid( 2 ); - TQWidget *widget = TQT_TQWIDGET( it.current() ); + TQWidget *widget = static_cast<TQWidget*>( it.current() ); if ( !name.isEmpty() ) mWidgets.insert( name, widget ); - if ( it.current()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) - connect( it.current(), TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SIGNAL( modified() ) ); - else if ( it.current()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ) - connect( it.current(), TQT_SIGNAL( valueChanged( int ) ), - TQT_SIGNAL( modified() ) ); - else if ( it.current()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) - connect( it.current(), TQT_SIGNAL( toggled( bool ) ), - TQT_SIGNAL( modified() ) ); - else if ( it.current()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) - connect( it.current(), TQT_SIGNAL( activated( const TQString& ) ), - TQT_SIGNAL( modified() ) ); - else if ( it.current()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) - connect( it.current(), TQT_SIGNAL( valueChanged( const TQDateTime& ) ), - TQT_SIGNAL( modified() ) ); + if ( it.current()->inherits( "TQLineEdit" ) ) + connect( it.current(), TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SIGNAL( modified() ) ); + else if ( it.current()->inherits( "TQSpinBox" ) ) + connect( it.current(), TQ_SIGNAL( valueChanged( int ) ), + TQ_SIGNAL( modified() ) ); + else if ( it.current()->inherits( "TQCheckBox" ) ) + connect( it.current(), TQ_SIGNAL( toggled( bool ) ), + TQ_SIGNAL( modified() ) ); + else if ( it.current()->inherits( "TQComboBox" ) ) + connect( it.current(), TQ_SIGNAL( activated( const TQString& ) ), + TQ_SIGNAL( modified() ) ); + else if ( it.current()->inherits( "TQDateTimeEdit" ) ) + 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() ) ); - else if ( it.current()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) - connect( it.current(), TQT_SIGNAL( textChanged() ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( dateChanged( TQDate ) ), + TQ_SIGNAL( modified() ) ); + else if ( it.current()->inherits( "TQTextEdit" ) ) + connect( it.current(), TQ_SIGNAL( textChanged() ), + TQ_SIGNAL( modified() ) ); if ( !widget->isEnabled() ) mDisabledWidgets.append( widget ); @@ -143,16 +143,16 @@ void DesignerFields::load( DesignerFields::Storage *storage ) TQMap<TQString, TQWidget *>::ConstIterator widIt; for ( widIt = mWidgets.begin(); widIt != mWidgets.end(); ++widIt ) { TQString value; - if ( widIt.data()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) { + if ( widIt.data()->inherits( "TQLineEdit" ) ) { TQLineEdit *wdg = static_cast<TQLineEdit*>( widIt.data() ); wdg->setText( TQString() ); - } else if ( widIt.data()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ) { + } else if ( widIt.data()->inherits( "TQSpinBox" ) ) { TQSpinBox *wdg = static_cast<TQSpinBox*>( widIt.data() ); wdg->setValue( wdg->minValue() ); - } else if ( widIt.data()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) { + } else if ( widIt.data()->inherits( "TQCheckBox" ) ) { TQCheckBox *wdg = static_cast<TQCheckBox*>( widIt.data() ); wdg->setChecked( false ); - } else if ( widIt.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { + } else if ( widIt.data()->inherits( "TQDateTimeEdit" ) ) { TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( widIt.data() ); wdg->setDateTime( TQDateTime::currentDateTime() ); } else if ( widIt.data()->inherits( "KDateTimeWidget" ) ) { @@ -161,10 +161,10 @@ void DesignerFields::load( DesignerFields::Storage *storage ) } else if ( widIt.data()->inherits( "KDatePicker" ) ) { KDatePicker *wdg = static_cast<KDatePicker*>( widIt.data() ); wdg->setDate( TQDate::currentDate() ); - } else if ( widIt.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { + } else if ( widIt.data()->inherits( "TQComboBox" ) ) { TQComboBox *wdg = static_cast<TQComboBox*>( widIt.data() ); wdg->setCurrentItem( 0 ); - } else if ( widIt.data()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) { + } else if ( widIt.data()->inherits( "TQTextEdit" ) ) { TQTextEdit *wdg = static_cast<TQTextEdit*>( widIt.data() ); wdg->setText( TQString() ); } @@ -176,28 +176,28 @@ void DesignerFields::load( DesignerFields::Storage *storage ) TQMap<TQString, TQWidget *>::ConstIterator it = mWidgets.find( *it2 ); if ( it != mWidgets.end() ) { - if ( it.data()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) { + if ( it.data()->inherits( "TQLineEdit" ) ) { TQLineEdit *wdg = static_cast<TQLineEdit*>( it.data() ); wdg->setText( value ); - } else if ( it.data()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ) { + } else if ( it.data()->inherits( "TQSpinBox" ) ) { TQSpinBox *wdg = static_cast<TQSpinBox*>( it.data() ); wdg->setValue( value.toInt() ); - } else if ( it.data()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) { + } else if ( it.data()->inherits( "TQCheckBox" ) ) { TQCheckBox *wdg = static_cast<TQCheckBox*>( it.data() ); wdg->setChecked( value == "true" || value == "1" ); - } else if ( it.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { + } else if ( it.data()->inherits( "TQDateTimeEdit" ) ) { TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( it.data() ); - wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) ); + wdg->setDateTime( TQDateTime::fromString( value, TQt::ISODate ) ); } else if ( it.data()->inherits( "KDateTimeWidget" ) ) { KDateTimeWidget *wdg = static_cast<KDateTimeWidget*>( it.data() ); - wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) ); + wdg->setDateTime( TQDateTime::fromString( value, TQt::ISODate ) ); } else if ( it.data()->inherits( "KDatePicker" ) ) { KDatePicker *wdg = static_cast<KDatePicker*>( it.data() ); - wdg->setDate( TQDate::fromString( value, Qt::ISODate ) ); - } else if ( it.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { + wdg->setDate( TQDate::fromString( value, TQt::ISODate ) ); + } else if ( it.data()->inherits( "TQComboBox" ) ) { TQComboBox *wdg = static_cast<TQComboBox*>( it.data() ); wdg->setCurrentText( value ); - } else if ( it.data()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) { + } else if ( it.data()->inherits( "TQTextEdit" ) ) { TQTextEdit *wdg = static_cast<TQTextEdit*>( it.data() ); wdg->setText( value ); } @@ -210,28 +210,28 @@ void DesignerFields::save( DesignerFields::Storage *storage ) TQMap<TQString, TQWidget*>::Iterator it; for ( it = mWidgets.begin(); it != mWidgets.end(); ++it ) { TQString value; - if ( it.data()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) { + if ( it.data()->inherits( "TQLineEdit" ) ) { TQLineEdit *wdg = static_cast<TQLineEdit*>( it.data() ); value = wdg->text(); - } else if ( it.data()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ) { + } else if ( it.data()->inherits( "TQSpinBox" ) ) { TQSpinBox *wdg = static_cast<TQSpinBox*>( it.data() ); value = TQString::number( wdg->value() ); - } else if ( it.data()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) { + } else if ( it.data()->inherits( "TQCheckBox" ) ) { TQCheckBox *wdg = static_cast<TQCheckBox*>( it.data() ); value = ( wdg->isChecked() ? "true" : "false" ); - } else if ( it.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { + } else if ( it.data()->inherits( "TQDateTimeEdit" ) ) { TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( it.data() ); - value = wdg->dateTime().toString( Qt::ISODate ); + value = wdg->dateTime().toString( TQt::ISODate ); } else if ( it.data()->inherits( "KDateTimeWidget" ) ) { KDateTimeWidget *wdg = static_cast<KDateTimeWidget*>( it.data() ); - value = wdg->dateTime().toString( Qt::ISODate ); + value = wdg->dateTime().toString( TQt::ISODate ); } else if ( it.data()->inherits( "KDatePicker" ) ) { KDatePicker *wdg = static_cast<KDatePicker*>( it.data() ); - value = wdg->date().toString( Qt::ISODate ); - } else if ( it.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { + value = wdg->date().toString( TQt::ISODate ); + } else if ( it.data()->inherits( "TQComboBox" ) ) { TQComboBox *wdg = static_cast<TQComboBox*>( it.data() ); value = wdg->currentText(); - } else if ( it.data()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) { + } else if ( it.data()->inherits( "TQTextEdit" ) ) { TQTextEdit *wdg = static_cast<TQTextEdit*>( it.data() ); value = wdg->text(); } diff --git a/libtdepim/designerfields.h b/libtdepim/designerfields.h index ab709621..ee50c8db 100644 --- a/libtdepim/designerfields.h +++ b/libtdepim/designerfields.h @@ -32,9 +32,9 @@ namespace KPIM { -class KDE_EXPORT DesignerFields : public TQWidget +class TDE_EXPORT DesignerFields : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DesignerFields( const TQString &uiFile, TQWidget *parent, diff --git a/libtdepim/diffalgo.h b/libtdepim/diffalgo.h index a437d9d5..2bb6a2b9 100644 --- a/libtdepim/diffalgo.h +++ b/libtdepim/diffalgo.h @@ -76,7 +76,7 @@ class DiffAlgoDisplay }; -class KDE_EXPORT DiffAlgo +class TDE_EXPORT DiffAlgo { public: /** diff --git a/libtdepim/distributionlist.cpp b/libtdepim/distributionlist.cpp index 2fd50f5a..74cb99ca 100644 --- a/libtdepim/distributionlist.cpp +++ b/libtdepim/distributionlist.cpp @@ -44,7 +44,7 @@ static ParseList parseCustom( const TQString& str ) Q_ASSERT( helpList.count() < 3 ); // 1 or 2 items, but not more const TQString uid = helpList.first(); const TQString email = helpList.last(); - res.append( tqMakePair( uid, email ) ); + res.append( qMakePair( uid, email ) ); } return res; } diff --git a/libtdepim/embeddedurlpage.cpp b/libtdepim/embeddedurlpage.cpp index 79bf5863..4a3aed79 100644 --- a/libtdepim/embeddedurlpage.cpp +++ b/libtdepim/embeddedurlpage.cpp @@ -55,16 +55,16 @@ void EmbeddedURLPage::loadContents() if ( mimetype == "auto" ) mimetype == KMimeType::findByURL( mUri )->name(); // "this" is both the parent widget and the parent object - mPart = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0 ); + mPart = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), this, 0, this, 0 ); if ( mPart ) { mPart->openURL( mUri ); mPart->widget()->show(); } //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/embeddedurlpage.h b/libtdepim/embeddedurlpage.h index bb302d9e..d8e0e003 100644 --- a/libtdepim/embeddedurlpage.h +++ b/libtdepim/embeddedurlpage.h @@ -29,9 +29,9 @@ namespace KParts { class ReadOnlyPart; } namespace KPIM { -class KDE_EXPORT EmbeddedURLPage : public TQWidget +class TDE_EXPORT EmbeddedURLPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: EmbeddedURLPage( const TQString &url, const TQString &mimetype, diff --git a/libtdepim/htmldiffalgodisplay.h b/libtdepim/htmldiffalgodisplay.h index e38b7a60..5eccc00c 100644 --- a/libtdepim/htmldiffalgodisplay.h +++ b/libtdepim/htmldiffalgodisplay.h @@ -29,7 +29,7 @@ namespace KPIM { -class KDE_EXPORT HTMLDiffAlgoDisplay : virtual public DiffAlgoDisplay, public KTextBrowser +class TDE_EXPORT HTMLDiffAlgoDisplay : virtual public DiffAlgoDisplay, public KTextBrowser { public: HTMLDiffAlgoDisplay( TQWidget *parent ); diff --git a/libtdepim/infoextension.h b/libtdepim/infoextension.h index 6ee5efe4..16da9143 100644 --- a/libtdepim/infoextension.h +++ b/libtdepim/infoextension.h @@ -35,9 +35,9 @@ namespace KParts /** * Provides a way to get information out of a PIM-Part **/ - class KDE_EXPORT InfoExtension : public TQObject + class TDE_EXPORT InfoExtension : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdepim/interfaces/AddressBookServiceIface.h b/libtdepim/interfaces/AddressBookServiceIface.h index e39b8fc7..d14a7e68 100644 --- a/libtdepim/interfaces/AddressBookServiceIface.h +++ b/libtdepim/interfaces/AddressBookServiceIface.h @@ -31,7 +31,7 @@ namespace KPIM { -#define AddressBookServiceIface KDE_EXPORT AddressBookServiceIface +#define AddressBookServiceIface TDE_EXPORT AddressBookServiceIface class AddressBookServiceIface : virtual public DCOPObject #undef AddressBookServiceIface { diff --git a/libtdepim/interfaces/MailTransportServiceIface.h b/libtdepim/interfaces/MailTransportServiceIface.h index 3a69f83b..3dfbf300 100644 --- a/libtdepim/interfaces/MailTransportServiceIface.h +++ b/libtdepim/interfaces/MailTransportServiceIface.h @@ -32,7 +32,7 @@ namespace KPim { -#define MailTransportServiceIface KDE_EXPORT MailTransportServiceIface +#define MailTransportServiceIface TDE_EXPORT MailTransportServiceIface class MailTransportServiceIface : virtual public DCOPObject #undef MailTransportServiceIface { diff --git a/libtdepim/kaccount.h b/libtdepim/kaccount.h index e5ec2d79..8fd64522 100644 --- a/libtdepim/kaccount.h +++ b/libtdepim/kaccount.h @@ -37,7 +37,7 @@ class TDEConfig; -class KDE_EXPORT KAccount +class TDE_EXPORT KAccount { public: /** Type information */ diff --git a/libtdepim/kaddrbook.h b/libtdepim/kaddrbook.h index bd44e25a..c68266b2 100644 --- a/libtdepim/kaddrbook.h +++ b/libtdepim/kaddrbook.h @@ -17,7 +17,7 @@ namespace TDEABC { class TQWidget; -class KDE_EXPORT KAddrBookExternal { +class TDE_EXPORT KAddrBookExternal { public: static void addEmail( const TQString &addr, TQWidget *parent ); static void addNewAddressee( TQWidget* ); diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp index 9156452c..dd5ab8bf 100644 --- a/libtdepim/kcmdesignerfields.cpp +++ b/libtdepim/kcmdesignerfields.cpp @@ -67,19 +67,19 @@ class PageItem : public TQCheckListItem setText( 0, wdg->caption() ); TQPixmap pm = TQPixmap::grabWidget( wdg ); - TQImage img = pm.convertToImage().smoothScale( 300, 300, TQ_ScaleMin ); + TQImage img = pm.convertToImage().smoothScale( 300, 300, TQImage::ScaleMin ); mPreview = img; - TQObjectList *list = wdg->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *list = wdg->queryList( "TQWidget" ); TQObjectListIt it( *list ); TQMap<TQString, TQString> allowedTypes; - allowedTypes.insert( TQLINEEDIT_OBJECT_NAME_STRING, i18n( "Text" ) ); - allowedTypes.insert( TQTEXTEDIT_OBJECT_NAME_STRING, i18n( "Text" ) ); - allowedTypes.insert( TQSPINBOX_OBJECT_NAME_STRING, i18n( "Numeric Value" ) ); - allowedTypes.insert( TQCHECKBOX_OBJECT_NAME_STRING, i18n( "Boolean" ) ); - allowedTypes.insert( TQCOMBOBOX_OBJECT_NAME_STRING, i18n( "Selection" ) ); - allowedTypes.insert( TQDATETIMEEDIT_OBJECT_NAME_STRING, i18n( "Date & Time" ) ); + allowedTypes.insert( "TQLineEdit", i18n( "Text" ) ); + allowedTypes.insert( "TQTextEdit", i18n( "Text" ) ); + allowedTypes.insert( "TQSpinBox", i18n( "Numeric Value" ) ); + allowedTypes.insert( "TQCheckBox", i18n( "Boolean" ) ); + allowedTypes.insert( "TQComboBox", i18n( "Selection" ) ); + allowedTypes.insert( "TQDateTimeEdit", i18n( "Date & Time" ) ); allowedTypes.insert( "KLineEdit", i18n( "Text" ) ); allowedTypes.insert( "KDateTimeWidget", i18n( "Date & Time" ) ); allowedTypes.insert( "KDatePicker", i18n( "Date" ) ); @@ -91,7 +91,7 @@ class PageItem : public TQCheckListItem new TQListViewItem( this, name, allowedTypes[ it.current()->className() ], it.current()->className(), - TQWhatsThis::textFor( TQT_TQWIDGET( it.current() ) ) ); + TQWhatsThis::textFor( static_cast<TQWidget*>( it.current() ) ) ); } } @@ -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,27 +147,27 @@ 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(); // Install a dirwatcher that will detect newly created or removed designer files - KDirWatch *dw = new KDirWatch( TQT_TQOBJECT(this) ); + KDirWatch *dw = new KDirWatch( this ); TDEStandardDirs::makeDir(localUiDir()); dw->addDir( localUiDir(), true ); - connect( dw, TQT_SIGNAL( created(const TQString&) ), TQT_SLOT( rebuildList() ) ); - 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() @@ -284,7 +284,7 @@ void KCMDesignerFields::initGUI() mPageView->setFullWidth( true ); hbox->addWidget( mPageView ); - TQGroupBox *box = new TQGroupBox(1, Qt::Horizontal, i18n("Preview of Selected Page"), this ); + TQGroupBox *box = new TQGroupBox(1, TQt::Horizontal, i18n("Preview of Selected Page"), this ); mPagePreview = new TQLabel( box ); mPagePreview->setMinimumWidth( 300 ); diff --git a/libtdepim/kcmdesignerfields.h b/libtdepim/kcmdesignerfields.h index abf3c183..dc1f344e 100644 --- a/libtdepim/kcmdesignerfields.h +++ b/libtdepim/kcmdesignerfields.h @@ -33,9 +33,9 @@ class TQPushButton; namespace KPIM { -class KDE_EXPORT KCMDesignerFields : public TDECModule +class TDE_EXPORT KCMDesignerFields : public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdepim/kdateedit.cpp b/libtdepim/kdateedit.cpp index dd6b4e48..0f50f75b 100644 --- a/libtdepim/kdateedit.cpp +++ b/libtdepim/kdateedit.cpp @@ -38,7 +38,7 @@ class DateValidator : public TQValidator { public: DateValidator( const TQStringList &keywords, TQWidget* parent, const char* name = 0 ) - : TQValidator( TQT_TQOBJECT(parent), name ), mKeywords( keywords ) + : TQValidator( parent, name ), mKeywords( keywords ) {} virtual State validate( TQString &str, int& ) const @@ -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(); @@ -246,7 +246,7 @@ TQDate KDateEdit::parseDate( bool *replaced ) const bool KDateEdit::eventFilter( TQObject *object, TQEvent *event ) { - if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(lineEdit()) ) { + if ( object == lineEdit() ) { // We only process the focus out event if the text has changed // since we got focus if ( (event->type() == TQEvent::FocusOut) && mTextChanged ) { @@ -286,7 +286,7 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event ) case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonPress: { TQMouseEvent *mouseEvent = (TQMouseEvent*)event; - if ( !TQT_TQRECT_OBJECT(mPopup->rect()).contains( mouseEvent->pos() ) ) { + if ( !mPopup->rect().contains( mouseEvent->pos() ) ) { TQPoint globalPos = mPopup->mapToGlobal( mouseEvent->pos() ); if ( TQApplication::widgetAt( globalPos, true ) == this ) { // The date picker is being closed by a click on the @@ -307,7 +307,7 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event ) void KDateEdit::mousePressEvent( TQMouseEvent *event ) { - if ( event->button() == Qt::LeftButton && mDiscardNextMousePress ) { + if ( event->button() == TQt::LeftButton && mDiscardNextMousePress ) { mDiscardNextMousePress = false; return; } diff --git a/libtdepim/kdateedit.h b/libtdepim/kdateedit.h index 3cab1fe4..e031751b 100644 --- a/libtdepim/kdateedit.h +++ b/libtdepim/kdateedit.h @@ -51,9 +51,9 @@ class TQEvent; @author David Jarvie <software@astrojar.org.uk> @author Tobias Koenig <tokoe@kde.org> */ -class KDE_EXPORT KDateEdit : public TQComboBox +class TDE_EXPORT KDateEdit : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: 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/kdatepickerpopup.h b/libtdepim/kdatepickerpopup.h index ba9d551f..6b3de635 100644 --- a/libtdepim/kdatepickerpopup.h +++ b/libtdepim/kdatepickerpopup.h @@ -42,9 +42,9 @@ @author Bram Schoenmakers <bram_s@softhome.net> */ -class KDE_EXPORT KDatePickerPopup: public TQPopupMenu +class TDE_EXPORT KDatePickerPopup: public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: enum { NoDate = 1, DatePicker = 2, Words = 4 }; 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/kfoldertree.h b/libtdepim/kfoldertree.h index a69e80d5..536118f9 100644 --- a/libtdepim/kfoldertree.h +++ b/libtdepim/kfoldertree.h @@ -139,7 +139,7 @@ struct KPaintInfo { //========================================================================== -class KDE_EXPORT KFolderTreeItem : public TDEListViewItem +class TDE_EXPORT KFolderTreeItem : public TDEListViewItem { public: /** Protocol information */ @@ -238,9 +238,9 @@ class KDE_EXPORT KFolderTreeItem : public TDEListViewItem //========================================================================== -class KDE_EXPORT KFolderTree : public TDEListView +class TDE_EXPORT KFolderTree : public TDEListView { - Q_OBJECT + TQ_OBJECT public: 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/kimportdialog.h b/libtdepim/kimportdialog.h index b21cbc83..0828a782 100644 --- a/libtdepim/kimportdialog.h +++ b/libtdepim/kimportdialog.h @@ -75,7 +75,7 @@ class KImportColumn class KImportDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KImportDialog(TQWidget* parent); diff --git a/libtdepim/kincidencechooser.cpp b/libtdepim/kincidencechooser.cpp index 8bb72d5c..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,20 +91,20 @@ 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 mDiffBut = 0; #endif - mBg = new TQButtonGroup ( 1, Qt::Horizontal, i18n("Sync Preferences"), topFrame); + mBg = new TQButtonGroup ( 1, TQt::Horizontal, i18n("Sync Preferences"), topFrame); topLayout->addMultiCellWidget(mBg, iii,iii,0,2); ++iii; mBg->insert( new TQRadioButton ( i18n("Take local entry on conflict"), mBg ), KIncidenceChooser::local); @@ -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 ) ); @@ -249,7 +249,7 @@ void KIncidenceChooser::showIncidence1() void KIncidenceChooser::detailsDialogClosed() { - KDialogBase* dialog = static_cast<KDialogBase *>( TQT_TQWIDGET( const_cast<TQT_BASE_OBJECT_NAME*>(sender()) ) ); + KDialogBase* dialog = static_cast<KDialogBase *>(const_cast<TQObject*>(sender())) ; if ( dialog == mTbL ) mShowDetails1->setText( i18n( "Show details..." ) ); else @@ -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/kincidencechooser.h b/libtdepim/kincidencechooser.h index 51deb7a1..ceffc0b0 100644 --- a/libtdepim/kincidencechooser.h +++ b/libtdepim/kincidencechooser.h @@ -39,9 +39,9 @@ class TQButtonGroup; /** Dialog to change the korganizer configuration. */ -class KDE_EXPORT KIncidenceChooser : public KDialog +class TDE_EXPORT KIncidenceChooser : public KDialog { - Q_OBJECT + TQ_OBJECT public: enum mode { diff --git a/libtdepim/kmailcompletion.h b/libtdepim/kmailcompletion.h index 00db2b8c..0e8772ea 100644 --- a/libtdepim/kmailcompletion.h +++ b/libtdepim/kmailcompletion.h @@ -35,7 +35,7 @@ namespace KPIM { */ class KMailCompletion : public TDECompletion { - Q_OBJECT + TQ_OBJECT public: 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/core.h b/libtdepim/komposer/core/core.h index 482ee1db..dcf1427f 100644 --- a/libtdepim/komposer/core/core.h +++ b/libtdepim/komposer/core/core.h @@ -43,7 +43,7 @@ namespace Komposer */ class Core : public TDEMainWindow, virtual public KomposerIface { - Q_OBJECT + TQ_OBJECT public: Core( TQWidget *parentWidget = 0, const char *name = 0 ); diff --git a/libtdepim/komposer/core/corewidget.h b/libtdepim/komposer/core/corewidget.h index c2a6a0e7..c0e93b14 100644 --- a/libtdepim/komposer/core/corewidget.h +++ b/libtdepim/komposer/core/corewidget.h @@ -30,7 +30,7 @@ namespace Komposer class CoreWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: CoreWidget( TQWidget *parent, const char *name=0 ); diff --git a/libtdepim/komposer/core/editor.h b/libtdepim/komposer/core/editor.h index 4e595b3f..41667af9 100644 --- a/libtdepim/komposer/core/editor.h +++ b/libtdepim/komposer/core/editor.h @@ -36,7 +36,7 @@ namespace Komposer { class Editor : public Plugin { - Q_OBJECT + TQ_OBJECT public: enum TextType { diff --git a/libtdepim/komposer/core/plugin.h b/libtdepim/komposer/core/plugin.h index ac0b5498..a462fd90 100644 --- a/libtdepim/komposer/core/plugin.h +++ b/libtdepim/komposer/core/plugin.h @@ -31,7 +31,7 @@ namespace Komposer class Plugin : public TQObject, virtual public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: virtual ~Plugin(); 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/pluginmanager.h b/libtdepim/komposer/core/pluginmanager.h index d9366b3f..b4a16f8e 100644 --- a/libtdepim/komposer/core/pluginmanager.h +++ b/libtdepim/komposer/core/pluginmanager.h @@ -38,7 +38,7 @@ namespace Komposer class PluginManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp index abacd0eb..ce21e222 100644 --- a/libtdepim/komposer/core/prefsmodule.cpp +++ b/libtdepim/komposer/core/prefsmodule.cpp @@ -35,7 +35,7 @@ extern "C" { - KDE_EXPORT TDECModule *create_komposerconfig( TQWidget *parent, const char * ) { + TDE_EXPORT TDECModule *create_komposerconfig( TQWidget *parent, const char * ) { return new Komposer::PrefsModule( parent, "komposerprefs" ); } } @@ -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/prefsmodule.h b/libtdepim/komposer/core/prefsmodule.h index a7733019..5be0ec34 100644 --- a/libtdepim/komposer/core/prefsmodule.h +++ b/libtdepim/komposer/core/prefsmodule.h @@ -34,7 +34,7 @@ namespace Komposer { class PrefsModule : public KPrefsModule { - Q_OBJECT + TQ_OBJECT public: PrefsModule( TQWidget *parent=0, const char *name=0 ); @@ -43,7 +43,7 @@ namespace Komposer { class EditorSelection : public KPrefsWid { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdepim/komposer/core/tests/managertest.h b/libtdepim/komposer/core/tests/managertest.h index d131f830..76de80d2 100644 --- a/libtdepim/komposer/core/tests/managertest.h +++ b/libtdepim/komposer/core/tests/managertest.h @@ -31,7 +31,7 @@ namespace Komposer { class ManagerTest : public TQObject, public Tester { - Q_OBJECT + TQ_OBJECT public: ManagerTest( TQObject* parent = 0 ); 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/core/tests/testmanager.h b/libtdepim/komposer/core/tests/testmanager.h index 67c04414..73b0471b 100644 --- a/libtdepim/komposer/core/tests/testmanager.h +++ b/libtdepim/komposer/core/tests/testmanager.h @@ -11,7 +11,7 @@ using Komposer::Plugin; class TestManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: TestManager( TQObject *parent ); 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/komposer/plugins/default/defaulteditor.h b/libtdepim/komposer/plugins/default/defaulteditor.h index 5763b554..3c55a792 100644 --- a/libtdepim/komposer/plugins/default/defaulteditor.h +++ b/libtdepim/komposer/plugins/default/defaulteditor.h @@ -33,7 +33,7 @@ class TDEActionCollection; class DefaultEditor : public Komposer::Editor { - Q_OBJECT + TQ_OBJECT public: DefaultEditor( TQObject *parent, const char *name, const TQStringList &args ); diff --git a/libtdepim/kpimprefs.h b/libtdepim/kpimprefs.h index b67d2491..fad92a08 100644 --- a/libtdepim/kpimprefs.h +++ b/libtdepim/kpimprefs.h @@ -28,7 +28,7 @@ class TQString; -class KDE_EXPORT KPimPrefs : public TDEConfigSkeleton +class TDE_EXPORT KPimPrefs : public TDEConfigSkeleton { public: KPimPrefs( const TQString &name = TQString() ); diff --git a/libtdepim/kpimurlrequesterdlg.h b/libtdepim/kpimurlrequesterdlg.h index 8679923d..a0954ab1 100644 --- a/libtdepim/kpimurlrequesterdlg.h +++ b/libtdepim/kpimurlrequesterdlg.h @@ -26,7 +26,7 @@ class TQWidget; -class KDE_EXPORT KPimURLRequesterDlg +class TDE_EXPORT KPimURLRequesterDlg { public: /** diff --git a/libtdepim/kpixmapregionselectordialog.h b/libtdepim/kpixmapregionselectordialog.h index 2f77ab89..c02d6b02 100644 --- a/libtdepim/kpixmapregionselectordialog.h +++ b/libtdepim/kpixmapregionselectordialog.h @@ -43,7 +43,7 @@ namespace KPIM { * @author Antonio Larrosa <larrosa@kde.org> * @since 3.4 */ -class KDE_EXPORT KPixmapRegionSelectorDialog : public KDialogBase +class TDE_EXPORT KPixmapRegionSelectorDialog : public KDialogBase { public: /** diff --git a/libtdepim/kpixmapregionselectorwidget.cpp b/libtdepim/kpixmapregionselectorwidget.cpp index fa93fe3d..9cfe8f00 100644 --- a/libtdepim/kpixmapregionselectorwidget.cpp +++ b/libtdepim/kpixmapregionselectorwidget.cpp @@ -144,13 +144,13 @@ TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu() popup->insertTitle(i18n("Image Operations")); TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right", - 0, TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()), - TQT_TQOBJECT(popup), "rotateclockwise"); + 0, this, TQ_SLOT(rotateClockwise()), + popup, "rotateclockwise"); action->plug(popup); action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left", - 0, TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()), - TQT_TQOBJECT(popup), "rotatecounterclockwise"); + 0, this, TQ_SLOT(rotateCounterclockwise()), + popup, "rotatecounterclockwise"); action->plug(popup); /* @@ -218,7 +218,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) TQMouseEvent *mev= (TQMouseEvent *)(ev); //kdDebug() << TQString("click at %1,%2").arg( mev->x() ).arg( mev->y() ) << endl; - if ( mev->button() == Qt::RightButton ) + if ( mev->button() == TQt::RightButton ) { TDEPopupMenu *popup = createPopupMenu( ); popup->exec( mev->globalPos() ); @@ -429,7 +429,7 @@ void KPixmapRegionSelectorWidget::setMaximumWidgetSize(int width, int height) { /* We have to resize the pixmap to get it complete on the screen */ TQImage image=m_originalPixmap.convertToImage(); - m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQ_ScaleMin ) ); + m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQImage::ScaleMin ) ); //m_originalPixmap.convertFromImage( KImageEffect::sample( image, width, height ) ); double oldZoomFactor = m_zoomFactor; m_zoomFactor=m_originalPixmap.width()/(double)m_unzoomedPixmap.width(); diff --git a/libtdepim/kpixmapregionselectorwidget.h b/libtdepim/kpixmapregionselectorwidget.h index 9af02c2c..7a90e2ac 100644 --- a/libtdepim/kpixmapregionselectorwidget.h +++ b/libtdepim/kpixmapregionselectorwidget.h @@ -46,7 +46,7 @@ namespace KPIM { */ class KPixmapRegionSelectorWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdepim/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp index ae24bc22..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 ); @@ -401,8 +401,8 @@ KPrefsWidRadios::KPrefsWidRadios( TDEConfigSkeleton::ItemEnum *item, TQWidget *parent ) : mItem( item ) { - mBox = new TQButtonGroup( 1, Qt::Horizontal, mItem->label(), parent ); - connect( mBox, TQT_SIGNAL( clicked( int ) ), TQT_SIGNAL( changed() ) ); + mBox = new TQButtonGroup( 1, TQt::Horizontal, mItem->label(), parent ); + 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/kprefsdialog.h b/libtdepim/kprefsdialog.h index 86c7b81f..85125382 100644 --- a/libtdepim/kprefsdialog.h +++ b/libtdepim/kprefsdialog.h @@ -55,9 +55,9 @@ class KURLRequester; KPrefsDialog. The control element consists of a set of widgets for handling a certain type of configuration information. */ -class KDE_EXPORT KPrefsWid : public TQObject +class TDE_EXPORT KPrefsWid : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @@ -89,7 +89,7 @@ class KDE_EXPORT KPrefsWid : public TQObject This class provides a control element for configuring bool values. It is meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidBool : public KPrefsWid +class TDE_EXPORT KPrefsWidBool : public KPrefsWid { public: /** @@ -123,7 +123,7 @@ class KDE_EXPORT KPrefsWidBool : public KPrefsWid meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidInt : public KPrefsWid +class TDE_EXPORT KPrefsWidInt : public KPrefsWid { public: /** @@ -164,7 +164,7 @@ class KDE_EXPORT KPrefsWidInt : public KPrefsWid meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidTime : public KPrefsWid +class TDE_EXPORT KPrefsWidTime : public KPrefsWid { public: /** @@ -201,7 +201,7 @@ class KDE_EXPORT KPrefsWidTime : public KPrefsWid meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidDuration : public KPrefsWid +class TDE_EXPORT KPrefsWidDuration : public KPrefsWid { public: /** @@ -239,7 +239,7 @@ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidDate : public KPrefsWid +class TDE_EXPORT KPrefsWidDate : public KPrefsWid { public: /** @@ -276,9 +276,9 @@ class KDE_EXPORT KPrefsWidDate : public KPrefsWid meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidColor : public KPrefsWid +class TDE_EXPORT KPrefsWidColor : public KPrefsWid { - Q_OBJECT + TQ_OBJECT public: /** @@ -319,9 +319,9 @@ class KDE_EXPORT KPrefsWidColor : public KPrefsWid This class provides a control element for configuring font values. It is meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidFont : public KPrefsWid +class TDE_EXPORT KPrefsWidFont : public KPrefsWid { - Q_OBJECT + TQ_OBJECT public: /** @@ -377,7 +377,7 @@ class KDE_EXPORT KPrefsWidFont : public KPrefsWid the radio button. The position of the button is defined by the sequence of @ref addRadio() calls, starting with 0. */ -class KDE_EXPORT KPrefsWidRadios : public KPrefsWid +class TDE_EXPORT KPrefsWidRadios : public KPrefsWid { public: /** @@ -425,7 +425,7 @@ class KDE_EXPORT KPrefsWidRadios : public KPrefsWid The setting is interpreted as an int value, corresponding to the index in the combo box. */ -class KDE_EXPORT KPrefsWidCombo : public KPrefsWid +class TDE_EXPORT KPrefsWidCombo : public KPrefsWid { public: /** @@ -458,7 +458,7 @@ class KDE_EXPORT KPrefsWidCombo : public KPrefsWid meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidString : public KPrefsWid +class TDE_EXPORT KPrefsWidString : public KPrefsWid { public: /** @@ -505,7 +505,7 @@ class KDE_EXPORT KPrefsWidString : public KPrefsWid meant to be used by KPrefsDialog. The user is responsible for the layout management. */ -class KDE_EXPORT KPrefsWidPath : public KPrefsWid +class TDE_EXPORT KPrefsWidPath : public KPrefsWid { public: /** @@ -554,7 +554,7 @@ class KDE_EXPORT KPrefsWidPath : public KPrefsWid transparent way. The user has to add the widgets by the corresponding addWid functions and KPrefsWidManager handles the rest automatically. */ -class KDE_EXPORT KPrefsWidManager +class TDE_EXPORT KPrefsWidManager { public: /** @@ -718,9 +718,9 @@ class KDE_EXPORT KPrefsWidManager default values is handled automatically. Custom widgets have to be handled in the functions @ref usrReadConfig() and @ref usrWriteConfig(). */ -class KDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager +class TDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager { - Q_OBJECT + TQ_OBJECT public: /** @@ -772,9 +772,9 @@ class KDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager }; -class KDE_EXPORT KPrefsModule : public TDECModule, public KPrefsWidManager +class TDE_EXPORT KPrefsModule : public TDECModule, public KPrefsWidManager { - Q_OBJECT + TQ_OBJECT public: KPrefsModule( TDEConfigSkeleton *, TQWidget *parent = 0, const char *name = 0 ); diff --git a/libtdepim/kregexp3.h b/libtdepim/kregexp3.h index 909e6bfa..da30ddfa 100644 --- a/libtdepim/kregexp3.h +++ b/libtdepim/kregexp3.h @@ -76,7 +76,7 @@ @see TQRegExp */ -class KDE_EXPORT KRegExp3 : public TQRegExp +class TDE_EXPORT KRegExp3 : public TQRegExp { public: KRegExp3() diff --git a/libtdepim/kresourceprefs.h b/libtdepim/kresourceprefs.h index 398490a1..102d5c5a 100644 --- a/libtdepim/kresourceprefs.h +++ b/libtdepim/kresourceprefs.h @@ -35,7 +35,7 @@ class TQString; The prefix should be an unique identifier to avoid name clashes and the method has to be called before readConfig(), otherwise the wrong entries are read. */ -class KDE_EXPORT KResourcePrefs : public TDEConfigSkeleton +class TDE_EXPORT KResourcePrefs : public TDEConfigSkeleton { public: KResourcePrefs( const TQString &name = TQString() ); diff --git a/libtdepim/krsqueezedtextlabel.h b/libtdepim/krsqueezedtextlabel.h index 877c2c8f..7262b2cd 100644 --- a/libtdepim/krsqueezedtextlabel.h +++ b/libtdepim/krsqueezedtextlabel.h @@ -38,8 +38,8 @@ /* * TQLabel */ -class KDE_EXPORT KRSqueezedTextLabel : public TQLabel { - Q_OBJECT +class TDE_EXPORT KRSqueezedTextLabel : public TQLabel { + TQ_OBJECT public: diff --git a/libtdepim/kscoring.cpp b/libtdepim/kscoring.cpp index e447ac7e..b0ebf72d 100644 --- a/libtdepim/kscoring.cpp +++ b/libtdepim/kscoring.cpp @@ -18,8 +18,6 @@ #undef TQT_NO_ASCII_CAST #endif -#undef TQT_NO_COMPAT - #include <iostream> #include <tqfile.h> @@ -86,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/kscoring.h b/libtdepim/kscoring.h index d901d0bf..93c76e3c 100644 --- a/libtdepim/kscoring.h +++ b/libtdepim/kscoring.h @@ -55,13 +55,13 @@ class TQLabel; */ //---------------------------------------------------------------------------- -class KDE_EXPORT ScorableGroup +class TDE_EXPORT ScorableGroup { public: virtual ~ScorableGroup(); }; -class KDE_EXPORT ScorableArticle +class TDE_EXPORT ScorableArticle { public: virtual ~ScorableArticle(); @@ -81,7 +81,7 @@ public: /** Base class for other Action classes. */ -class KDE_EXPORT ActionBase { +class TDE_EXPORT ActionBase { public: ActionBase(); virtual ~ActionBase(); @@ -100,7 +100,7 @@ class KDE_EXPORT ActionBase { enum ActionTypes { SETSCORE, NOTIFY, COLOR, MARKASREAD }; }; -class KDE_EXPORT ActionColor : public ActionBase { +class TDE_EXPORT ActionColor : public ActionBase { public: ActionColor(const TQColor&); ActionColor(const TQString&); @@ -118,7 +118,7 @@ private: TQColor color; }; -class KDE_EXPORT ActionSetScore : public ActionBase { +class TDE_EXPORT ActionSetScore : public ActionBase { public: ActionSetScore(short); ActionSetScore(const ActionSetScore&); @@ -136,7 +136,7 @@ class KDE_EXPORT ActionSetScore : public ActionBase { short val; }; -class KDE_EXPORT ActionNotify : public ActionBase { +class TDE_EXPORT ActionNotify : public ActionBase { public: ActionNotify(const TQString&); ActionNotify(const ActionNotify&); @@ -151,7 +151,7 @@ class KDE_EXPORT ActionNotify : public ActionBase { TQString note; }; -class KDE_EXPORT ActionMarkAsRead : public ActionBase { +class TDE_EXPORT ActionMarkAsRead : public ActionBase { public: ActionMarkAsRead(); ActionMarkAsRead( const ActionMarkAsRead& ); @@ -162,7 +162,7 @@ class KDE_EXPORT ActionMarkAsRead : public ActionBase { virtual ActionMarkAsRead* clone() const; }; -class KDE_EXPORT NotifyCollection +class TDE_EXPORT NotifyCollection { public: NotifyCollection(); @@ -182,7 +182,7 @@ private: //---------------------------------------------------------------------------- -class KDE_EXPORT KScoringExpression +class TDE_EXPORT KScoringExpression { friend class KScoringRule; public: @@ -217,7 +217,7 @@ class KDE_EXPORT KScoringExpression }; //---------------------------------------------------------------------------- -class KDE_EXPORT KScoringRule +class TDE_EXPORT KScoringRule { friend class KScoringManager; public: @@ -280,7 +280,7 @@ private: With the help of this class its very easy for the KScoringManager to temporary drop lists of rules and restore them afterwards */ -class KDE_EXPORT RuleStack +class TDE_EXPORT RuleStack { public: RuleStack(); @@ -300,9 +300,9 @@ private: //---------------------------------------------------------------------------- // Manages the score rules. -class KDE_EXPORT KScoringManager : public TQObject +class TDE_EXPORT KScoringManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -407,9 +407,9 @@ class KDE_EXPORT KScoringManager : public TQObject //---------------------------------------------------------------------------- -class KDE_EXPORT NotifyDialog : public KDialogBase +class TDE_EXPORT NotifyDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: static void display(ScorableArticle&,const TQString&); diff --git a/libtdepim/kscoringeditor.cpp b/libtdepim/kscoringeditor.cpp index 7942e4ef..1a536e82 100644 --- a/libtdepim/kscoringeditor.cpp +++ b/libtdepim/kscoringeditor.cpp @@ -15,8 +15,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#undef TQT_NO_COMPAT - #include "kscoring.h" #include "kscoringeditor.h" @@ -78,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 ); @@ -88,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)); @@ -253,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); @@ -415,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" ); @@ -430,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); @@ -459,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); @@ -468,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); @@ -602,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() ); @@ -616,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; @@ -629,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()); @@ -656,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(); @@ -874,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()); } @@ -911,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() @@ -966,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); @@ -989,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() @@ -1010,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/kscoringeditor.h b/libtdepim/kscoringeditor.h index 33677662..81e7a21f 100644 --- a/libtdepim/kscoringeditor.h +++ b/libtdepim/kscoringeditor.h @@ -49,9 +49,9 @@ class KColorCombo; /** this widget implements an editor for one condition. It is used in ExpressionEditWidget */ -class KDE_EXPORT SingleConditionWidget : public TQFrame +class TDE_EXPORT SingleConditionWidget : public TQFrame { - Q_OBJECT + TQ_OBJECT friend class ConditionEditWidget; public: @@ -84,7 +84,7 @@ private: */ class ConditionEditWidget: public KWidgetLister { - Q_OBJECT + TQ_OBJECT public: ConditionEditWidget(KScoringManager *,TQWidget *p =0, const char *n =0); @@ -103,7 +103,7 @@ private: */ class SingleActionWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT friend class ActionEditWidget; public: @@ -131,9 +131,9 @@ private: /** this widget implements the action editor */ -class KDE_EXPORT ActionEditWidget : public KWidgetLister +class TDE_EXPORT ActionEditWidget : public KWidgetLister { - Q_OBJECT + TQ_OBJECT public: ActionEditWidget(KScoringManager *m,TQWidget *p =0, const char *n =0); @@ -151,7 +151,7 @@ private: */ class RuleEditWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: RuleEditWidget(KScoringManager *m,TQWidget *p =0, const char *n =0); @@ -200,9 +200,9 @@ private: /** This widget shows a list of rules with buttons for copy, delete aso. */ -class KDE_EXPORT RuleListWidget : public TQWidget +class TDE_EXPORT RuleListWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: RuleListWidget(KScoringManager *m, bool =false, TQWidget *p =0, const char *n =0); @@ -251,9 +251,9 @@ private: TQPushButton *mRuleDown; }; -class KDE_EXPORT KScoringEditor : public KDialogBase +class TDE_EXPORT KScoringEditor : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ~KScoringEditor(); @@ -284,7 +284,7 @@ private: class KScoringEditorWidgetDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KScoringEditorWidgetDialog(KScoringManager *m, const TQString& rName, TQWidget *parent=0, const char *name=0); @@ -299,9 +299,9 @@ private: TQString ruleName; }; -class KDE_EXPORT KScoringEditorWidget : public TQWidget +class TDE_EXPORT KScoringEditorWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KScoringEditorWidget(KScoringManager *m,TQWidget *p =0, const char *n =0); 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/ksubscription.h b/libtdepim/ksubscription.h index 27b5695c..97488fde 100644 --- a/libtdepim/ksubscription.h +++ b/libtdepim/ksubscription.h @@ -42,7 +42,7 @@ class KAccount; //========================================================================== -class KDE_EXPORT KGroupInfo +class TDE_EXPORT KGroupInfo { public: enum Status { @@ -69,7 +69,7 @@ class KDE_EXPORT KGroupInfo //========================================================================== /** A class representing a single group item (what's that?) */ -class KDE_EXPORT GroupItem : public TQCheckListItem +class TDE_EXPORT GroupItem : public TQCheckListItem { public: GroupItem( TQListView *v, const KGroupInfo &gi, KSubscription* browser, @@ -185,9 +185,9 @@ class KDE_EXPORT GroupItem : public TQCheckListItem * */ -class KDE_EXPORT KSubscription : public KDialogBase +class TDE_EXPORT KSubscription : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdepim/ktimeedit.cpp b/libtdepim/ktimeedit.cpp index edb871e8..4dd66280 100644 --- a/libtdepim/ktimeedit.cpp +++ b/libtdepim/ktimeedit.cpp @@ -43,7 +43,7 @@ class KOTimeValidator : public TQValidator { public: - KOTimeValidator(TQWidget* parent, const char* name=0) : TQValidator(TQT_TQOBJECT(parent), name) {} + KOTimeValidator(TQWidget* parent, const char* name=0) : TQValidator(parent, name) {} virtual State validate(TQString& str, int& /*cursorPos*/) const { @@ -126,11 +126,11 @@ KTimeEdit::KTimeEdit( TQWidget *parent, TQTime qt, const char *name ) insertItem( TDEGlobal::locale()->formatTime( TQTime( 23, 59, 59 ) ) ); updateText(); - setFocusPolicy(TQ_StrongFocus); + 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/ktimeedit.h b/libtdepim/ktimeedit.h index 554128b6..7669295b 100644 --- a/libtdepim/ktimeedit.h +++ b/libtdepim/ktimeedit.h @@ -41,9 +41,9 @@ @short Provides a way to edit times in a user-friendly manner. @author Preston Brown, Ian Dawes */ -class KDE_EXPORT KTimeEdit : public TQComboBox +class TDE_EXPORT KTimeEdit : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: /** constructs a new time edit. */ diff --git a/libtdepim/kvcarddrag.h b/libtdepim/kvcarddrag.h index 8ac98042..d6e21cde 100644 --- a/libtdepim/kvcarddrag.h +++ b/libtdepim/kvcarddrag.h @@ -37,9 +37,9 @@ class KVCardDragPrivate; * * See the TQt drag'n'drop documentation. */ -class KDE_EXPORT KVCardDrag : public TQStoredDrag +class TDE_EXPORT KVCardDrag : public TQStoredDrag { - Q_OBJECT + TQ_OBJECT public: 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/kwidgetlister.h b/libtdepim/kwidgetlister.h index 95716430..1af5b010 100644 --- a/libtdepim/kwidgetlister.h +++ b/libtdepim/kwidgetlister.h @@ -62,9 +62,9 @@ class TQHBox; */ -class KDE_EXPORT KWidgetLister : public TQWidget +class TDE_EXPORT KWidgetLister : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KWidgetLister( int minWidgets=1, int maxWidgets=8, TQWidget* parent=0, const char* name=0 ); diff --git a/libtdepim/kxface.h b/libtdepim/kxface.h index a78f411d..f0a036be 100644 --- a/libtdepim/kxface.h +++ b/libtdepim/kxface.h @@ -519,9 +519,9 @@ class TQString; namespace KPIM { - class KDE_EXPORT KXFace : public TQObject + class TDE_EXPORT KXFace : public TQObject { - Q_OBJECT + TQ_OBJECT public: 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/ldapclient.h b/libtdepim/ldapclient.h index b1d8814c..8f1e3c2a 100644 --- a/libtdepim/ldapclient.h +++ b/libtdepim/ldapclient.h @@ -139,9 +139,9 @@ class LdapObject * We mean it! * */ -class KDE_EXPORT LdapClient : public TQObject +class TDE_EXPORT LdapClient : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -243,9 +243,9 @@ typedef TQValueList<LdapResult> LdapResultList; * We mean it! * */ -class KDE_EXPORT LdapSearch : public TQObject +class TDE_EXPORT LdapSearch : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp index 17f1d984..26cc3d24 100644 --- a/libtdepim/ldapsearchdialog.cpp +++ b/libtdepim/ldapsearchdialog.cpp @@ -136,7 +136,7 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name ) page ); groupBox->setFrameShape( TQGroupBox::Box ); groupBox->setFrameShadow( TQGroupBox::Sunken ); - groupBox->setColumnLayout( 0, Qt::Vertical ); + groupBox->setColumnLayout( 0, TQt::Vertical ); TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 1, 1 ); @@ -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); @@ -258,7 +258,7 @@ void LDAPSearchDialog::restoreSettings() if ( !pwdBindDN.isEmpty() ) ldapServer.setPwdBindDN( pwdBindDN ); - KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, TQT_TQOBJECT(this), "ldapclient" ); + KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, this, "ldapclient" ); ldapClient->setServer( ldapServer ); TQStringList attrs; @@ -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/ldapsearchdialog.h b/libtdepim/ldapsearchdialog.h index 3d8c3bc2..cf33cb8a 100644 --- a/libtdepim/ldapsearchdialog.h +++ b/libtdepim/ldapsearchdialog.h @@ -37,7 +37,7 @@ namespace KPIM { class LDAPSearchDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdepim/linklocator.h b/libtdepim/linklocator.h index 3fb3330b..ce5bba1c 100644 --- a/libtdepim/linklocator.h +++ b/libtdepim/linklocator.h @@ -38,7 +38,7 @@ * @short Identifies URLs and email addresses embedded in plaintext. * @author Dave Corrie <kde@davecorrie.com> */ -class KDE_EXPORT LinkLocator +class TDE_EXPORT LinkLocator { public: /** diff --git a/libtdepim/maillistdrag.h b/libtdepim/maillistdrag.h index c0a95c8a..d83aaebf 100644 --- a/libtdepim/maillistdrag.h +++ b/libtdepim/maillistdrag.h @@ -44,7 +44,7 @@ namespace KPIM { -class KDE_EXPORT MailSummary +class TDE_EXPORT MailSummary { public: MailSummary( TQ_UINT32 serialNumber, TQString messageId, TQString subject, @@ -83,7 +83,7 @@ private: typedef TQValueList<MailSummary> MailList; // Object for the drag object to call-back for message fulltext -class KDE_EXPORT MailTextSource { +class TDE_EXPORT MailTextSource { public: MailTextSource() {} virtual ~MailTextSource() {} @@ -92,7 +92,7 @@ public: }; // Drag and drop object for mails -class KDE_EXPORT MailListDrag : public TQStoredDrag +class TDE_EXPORT MailListDrag : public TQStoredDrag { public: // Takes ownership of "src" and deletes it when done diff --git a/libtdepim/overlaywidget.cpp b/libtdepim/overlaywidget.cpp index 7c72883c..067e2d71 100644 --- a/libtdepim/overlaywidget.cpp +++ b/libtdepim/overlaywidget.cpp @@ -76,7 +76,7 @@ void OverlayWidget::setAlignWidget( TQWidget * w ) bool OverlayWidget::eventFilter( TQObject* o, TQEvent* e) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mAlignWidget) && + if ( o == mAlignWidget && ( e->type() == TQEvent::Move || e->type() == TQEvent::Resize ) ) { reposition(); } diff --git a/libtdepim/overlaywidget.h b/libtdepim/overlaywidget.h index 7ba8d4d8..acc7fe97 100644 --- a/libtdepim/overlaywidget.h +++ b/libtdepim/overlaywidget.h @@ -43,7 +43,7 @@ namespace KPIM { */ class OverlayWidget : public TQHBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdepim/pluginloader.h b/libtdepim/pluginloader.h index 1ec8dc6f..5e69c265 100644 --- a/libtdepim/pluginloader.h +++ b/libtdepim/pluginloader.h @@ -76,7 +76,7 @@ namespace KPIM { * **/ template< typename T, typename T_config > - class KDE_EXPORT PluginLoader : public PluginLoaderBase { + class TDE_EXPORT PluginLoader : public PluginLoaderBase { protected: PluginLoader() : PluginLoaderBase() {} @@ -122,7 +122,7 @@ namespace KPIM { #define KPIM_DEFINE_PLUGIN_LOADER( pl, t, mf, p ) \ namespace { /* don't pollute namespaces */ \ - struct KDE_EXPORT pl##Config { \ + struct TDE_EXPORT pl##Config { \ static const char * const mainfunc; \ static const char * const path; \ }; \ diff --git a/libtdepim/pluginloaderbase.h b/libtdepim/pluginloaderbase.h index 6edc61be..d622ea44 100644 --- a/libtdepim/pluginloaderbase.h +++ b/libtdepim/pluginloaderbase.h @@ -32,7 +32,7 @@ class TQStringList; namespace KPIM { - class KDE_EXPORT PluginMetaData { + class TDE_EXPORT PluginMetaData { public: PluginMetaData() {} PluginMetaData( const TQString & lib, const TQString & name, @@ -45,7 +45,7 @@ namespace KPIM { mutable bool loaded; }; - class KDE_EXPORT PluginLoaderBase { + class TDE_EXPORT PluginLoaderBase { protected: PluginLoaderBase(); virtual ~PluginLoaderBase(); 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/progressdialog.h b/libtdepim/progressdialog.h index 051d12b3..090bfde2 100644 --- a/libtdepim/progressdialog.h +++ b/libtdepim/progressdialog.h @@ -51,7 +51,7 @@ class TransactionItem; class SSLLabel; class TransactionItemView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: TransactionItemView( TQWidget * parent = 0, @@ -77,7 +77,7 @@ private: class TransactionItem : public TQVBox { - Q_OBJECT + TQ_OBJECT public: @@ -115,9 +115,9 @@ protected: ProgressItem* mItem; }; -class KDE_EXPORT ProgressDialog : public OverlayWidget +class TDE_EXPORT ProgressDialog : public OverlayWidget { - Q_OBJECT + TQ_OBJECT public: 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/progressmanager.h b/libtdepim/progressmanager.h index 4ec17567..8610f9c9 100644 --- a/libtdepim/progressmanager.h +++ b/libtdepim/progressmanager.h @@ -36,9 +36,9 @@ class ProgressItem; class ProgressManager; typedef TQMap<ProgressItem*, bool> ProgressItemMap; -class KDE_EXPORT ProgressItem : public TQObject +class TDE_EXPORT ProgressItem : public TQObject { - Q_OBJECT + TQ_OBJECT friend class ProgressManager; friend class TQDict< ProgressItem >; // so it can be deleted from dicts @@ -263,10 +263,10 @@ signals: * items to parents by id. */ -class KDE_EXPORT ProgressManager : public TQObject +class TDE_EXPORT ProgressManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdepim/qutf7codec.h b/libtdepim/qutf7codec.h index 01e97494..6fe3a473 100644 --- a/libtdepim/qutf7codec.h +++ b/libtdepim/qutf7codec.h @@ -45,7 +45,7 @@ @author Marc Mutz <mutz@kde.org> */ -class KDE_EXPORT TQUtf7Codec : public TQTextCodec { +class TDE_EXPORT TQUtf7Codec : public TQTextCodec { bool encOpt, encLwsp; public: TQUtf7Codec() : TQTextCodec() {} @@ -81,7 +81,7 @@ public: @short A variant of @ref TQUtf7Codec, which protectes certain characters in MIME transport @author Marc Mutz <mutz@kde.org> */ -class KDE_EXPORT TQStrictUtf7Codec : public TQUtf7Codec { +class TDE_EXPORT TQStrictUtf7Codec : public TQUtf7Codec { public: TQStrictUtf7Codec() : TQUtf7Codec() {} diff --git a/libtdepim/recentaddresses.h b/libtdepim/recentaddresses.h index f9f6a6ce..c0d2fc2d 100644 --- a/libtdepim/recentaddresses.h +++ b/libtdepim/recentaddresses.h @@ -41,7 +41,7 @@ class TDEConfig; class KEditListBox; namespace TDERecentAddress { -class KDE_EXPORT RecentAddressDialog : public KDialogBase +class TDE_EXPORT RecentAddressDialog : public KDialogBase { public: RecentAddressDialog( TQWidget *parent, const char *name = 0 ); @@ -58,7 +58,7 @@ class KDE_EXPORT RecentAddressDialog : public KDialogBase * @author Carsten Pfeiffer <pfeiffer@kde.org> */ -class KDE_EXPORT RecentAddresses +class TDE_EXPORT RecentAddresses { public: ~RecentAddresses(); diff --git a/libtdepim/resourceabc.h b/libtdepim/resourceabc.h index e1213e3e..9b7c942c 100644 --- a/libtdepim/resourceabc.h +++ b/libtdepim/resourceabc.h @@ -41,9 +41,9 @@ namespace KPIM { * handle subresources. */ -class KDE_EXPORT ResourceABC : public TDEABC::Resource +class TDE_EXPORT ResourceABC : public TDEABC::Resource { - Q_OBJECT + TQ_OBJECT public: 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/sendsmsdialog.h b/libtdepim/sendsmsdialog.h index 5dec286b..fd9d1b6b 100644 --- a/libtdepim/sendsmsdialog.h +++ b/libtdepim/sendsmsdialog.h @@ -29,7 +29,7 @@ class TQTextEdit; class SendSMSDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdepim/sidebarextension.h b/libtdepim/sidebarextension.h index 67211499..eead6af6 100644 --- a/libtdepim/sidebarextension.h +++ b/libtdepim/sidebarextension.h @@ -35,9 +35,9 @@ namespace KParts * Provides a way to export a widget which will be displayed in Kontacts * stackview at the left **/ - class KDE_EXPORT SideBarExtension : public TQObject + class TDE_EXPORT SideBarExtension : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdepim/spellingfilter.h b/libtdepim/spellingfilter.h index d0a8d884..23a43ef1 100644 --- a/libtdepim/spellingfilter.h +++ b/libtdepim/spellingfilter.h @@ -29,7 +29,7 @@ #include <kdemacros.h> -class KDE_EXPORT SpellingFilter +class TDE_EXPORT SpellingFilter { public: enum UrlFiltering { DontFilterUrls, FilterUrls }; diff --git a/libtdepim/statusbarprogresswidget.cpp b/libtdepim/statusbarprogresswidget.cpp index 34f68703..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 ) ) ); } } @@ -268,7 +268,7 @@ bool StatusbarProgressWidget::eventFilter( TQObject *, TQEvent *ev ) if ( ev->type() == TQEvent::MouseButtonPress ) { TQMouseEvent *e = (TQMouseEvent*)ev; - if ( e->button() == Qt::LeftButton && mode != None ) { // toggle view on left mouse button + if ( e->button() == TQt::LeftButton && mode != None ) { // toggle view on left mouse button // Consensus seems to be that we should show/hide the fancy dialog when the user // clicks anywhere in the small one. mProgressDialog->slotToggleVisibility(); diff --git a/libtdepim/statusbarprogresswidget.h b/libtdepim/statusbarprogresswidget.h index f09c14b5..caee1172 100644 --- a/libtdepim/statusbarprogresswidget.h +++ b/libtdepim/statusbarprogresswidget.h @@ -51,9 +51,9 @@ class SSLLabel; class ProgressItem; class ProgressDialog; -class KDE_EXPORT StatusbarProgressWidget : public TQFrame { +class TDE_EXPORT StatusbarProgressWidget : public TQFrame { - Q_OBJECT + TQ_OBJECT public: 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/tdeabcresourcecached.h b/libtdepim/tdeabcresourcecached.h index f67abc61..6960b25b 100644 --- a/libtdepim/tdeabcresourcecached.h +++ b/libtdepim/tdeabcresourcecached.h @@ -31,9 +31,9 @@ namespace TDEABC { -class KDE_EXPORT ResourceCached : public Resource +class TDE_EXPORT ResourceCached : public Resource { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdepim/tdeconfigpropagator.h b/libtdepim/tdeconfigpropagator.h index 94a0bff8..7a24384c 100644 --- a/libtdepim/tdeconfigpropagator.h +++ b/libtdepim/tdeconfigpropagator.h @@ -31,7 +31,7 @@ class TDEConfigSkeleton; class TDEConfigSkeletonItem; -class KDE_EXPORT TDEConfigPropagator +class TDE_EXPORT TDEConfigPropagator { public: @@ -55,7 +55,7 @@ class KDE_EXPORT TDEConfigPropagator */ void commit(); - class KDE_EXPORT Condition + class TDE_EXPORT Condition { public: Condition() : isValid( false ) {} @@ -68,7 +68,7 @@ class KDE_EXPORT TDEConfigPropagator bool isValid; }; - class KDE_EXPORT Rule + class TDE_EXPORT Rule { public: typedef TQValueList<Rule> List; @@ -88,7 +88,7 @@ class KDE_EXPORT TDEConfigPropagator bool hideValue; }; - class KDE_EXPORT Change + class TDE_EXPORT Change { public: typedef TQPtrList<Change> List; @@ -108,7 +108,7 @@ class KDE_EXPORT TDEConfigPropagator TQString mTitle; }; - class KDE_EXPORT ChangeConfig : public Change + class TDE_EXPORT ChangeConfig : public Change { public: ChangeConfig(); 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/tdeconfigwizard.h b/libtdepim/tdeconfigwizard.h index 93221a85..e9922d61 100644 --- a/libtdepim/tdeconfigwizard.h +++ b/libtdepim/tdeconfigwizard.h @@ -30,9 +30,9 @@ class TQListView; /** @short Configuration wizard base class */ -class KDE_EXPORT TDEConfigWizard : public KDialogBase +class TDE_EXPORT TDEConfigWizard : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/libtdepim/tdefileio.cpp b/libtdepim/tdefileio.cpp index ec798a72..95eb7728 100644 --- a/libtdepim/tdefileio.cpp +++ b/libtdepim/tdefileio.cpp @@ -33,7 +33,7 @@ static void msgDialog(const TQString &msg) //----------------------------------------------------------------------------- -KDE_EXPORT TQCString kFileToString(const TQString &aFileName, bool aEnsureNL, bool aVerbose) +TDE_EXPORT TQCString kFileToString(const TQString &aFileName, bool aEnsureNL, bool aVerbose) { TQCString result; TQFileInfo info(aFileName); @@ -173,7 +173,7 @@ TQByteArray kFileToBytes(const TQString &aFileName, bool aVerbose) #endif //----------------------------------------------------------------------------- -KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, +TDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, const TQString &aFileName, bool aAskIfExists, bool aBackup, bool aVerbose) { @@ -253,14 +253,14 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, return TRUE; } -KDE_EXPORT bool kCStringToFile(const TQCString& aBuffer, const TQString &aFileName, +TDE_EXPORT bool kCStringToFile(const TQCString& aBuffer, const TQString &aFileName, bool aAskIfExists, bool aBackup, bool aVerbose) { return kBytesToFile(aBuffer, aBuffer.length(), aFileName, aAskIfExists, aBackup, aVerbose); } -KDE_EXPORT bool kByteArrayToFile(const TQByteArray& aBuffer, const TQString &aFileName, +TDE_EXPORT bool kByteArrayToFile(const TQByteArray& aBuffer, const TQString &aFileName, bool aAskIfExists, bool aBackup, bool aVerbose) { return kBytesToFile(aBuffer, aBuffer.size(), aFileName, aAskIfExists, diff --git a/libtdepim/tdefileio.h b/libtdepim/tdefileio.h index f0cd8d8d..2f2e0453 100644 --- a/libtdepim/tdefileio.h +++ b/libtdepim/tdefileio.h @@ -26,7 +26,7 @@ namespace KPIM { * If ensureNewline is TRUE the string will always have a trailing newline. */ TQCString kFileToString(const TQString &fileName, bool ensureNewline=true, - bool withDialogs=true) KDE_EXPORT; + bool withDialogs=true) TDE_EXPORT; // unused //TQByteArray kFileToBytes(const TQString &fileName, bool withDialogs=true); @@ -39,15 +39,15 @@ TQCString kFileToString(const TQString &fileName, bool ensureNewline=true, */ bool kBytesToFile(const char* aBuffer, int len, const TQString &aFileName, - bool aAskIfExists, bool aBackup, bool aVerbose) KDE_EXPORT; + bool aAskIfExists, bool aBackup, bool aVerbose) TDE_EXPORT; bool kCStringToFile(const TQCString& buffer, const TQString &fileName, bool askIfExists=false, bool createBackup=true, - bool withDialogs=true) KDE_EXPORT; + bool withDialogs=true) TDE_EXPORT; /** Does not stop at NUL */ -KDE_EXPORT bool kByteArrayToFile(const TQByteArray& buffer, const TQString &fileName, +bool kByteArrayToFile(const TQByteArray& buffer, const TQString &fileName, bool askIfExists=false, bool createBackup=true, - bool withDialogs=true) KDE_EXPORT; + bool withDialogs=true) TDE_EXPORT; /** diff --git a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp index 74d7329b..58b247b8 100644 --- a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp +++ b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp @@ -48,7 +48,7 @@ void KPartsGenericPart::load() delete m_part; } // "this" is both the parent widget and the parent object - m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0 ); + m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), this, 0, this, 0 ); if ( m_part ) { m_part->openURL( m_url ); m_part->widget()->show(); @@ -106,8 +106,8 @@ bool KPartsWidgetPlugin::isContainer( const TQString & /*key*/ ) const { /// Duplicated from tdelibs/tdecore/kdemacros.h.in for those with tdelibs < 3.4 #ifndef KDE_TQ_EXPORT_PLUGIN #define KDE_TQ_EXPORT_PLUGIN(PLUGIN) \ - TQ_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \ - TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \ + TQ_EXTERN_C TDE_EXPORT const char* qt_ucm_query_verification_data(); \ + TQ_EXTERN_C TDE_EXPORT TQUnknownInterface* ucm_instantiate(); \ TQ_EXPORT_PLUGIN(PLUGIN) #endif diff --git a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.h b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.h index 91c96d2f..bb4514c1 100644 --- a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.h +++ b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.h @@ -30,7 +30,7 @@ namespace KParts { class ReadOnlyPart; } * a KParts::ReadOnlyPart is available */ class KPartsGenericPart : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString url READ url WRITE setURL ) TQ_PROPERTY( TQString mimetype READ mimetype WRITE setMimetype ) 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/tests/testdateedit.h b/libtdepim/tests/testdateedit.h index 73c9ec91..82fbddb9 100644 --- a/libtdepim/tests/testdateedit.h +++ b/libtdepim/tests/testdateedit.h @@ -26,7 +26,7 @@ class DateEdit : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdepim/tests/testdistrlist.h b/libtdepim/tests/testdistrlist.h index 1e602a33..62375ffc 100644 --- a/libtdepim/tests/testdistrlist.h +++ b/libtdepim/tests/testdistrlist.h @@ -23,7 +23,7 @@ class TestDistrList : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdepim/weaver.h b/libtdepim/weaver.h index 20e076f4..6f38b870 100644 --- a/libtdepim/weaver.h +++ b/libtdepim/weaver.h @@ -50,22 +50,22 @@ namespace ThreadWeaver { Use setDebugLevel () to integrate adapt debug () to your platform. */ - KDE_EXPORT extern bool Debug; - KDE_EXPORT extern int DebugLevel; + TDE_EXPORT extern bool Debug; + TDE_EXPORT extern int DebugLevel; - KDE_EXPORT inline void setDebugLevel (bool debug, int level) + TDE_EXPORT inline void setDebugLevel (bool debug, int level) { Debug = debug; DebugLevel = level; } - KDE_EXPORT inline void debug(int severity, const char * cformat, ...) + TDE_EXPORT inline void debug(int severity, const char * cformat, ...) #ifdef __GNUC__ __attribute__ ( (format (printf, 2, 3 ) ) ) #endif ; - KDE_EXPORT inline void debug(int severity, const char * cformat, ...) + TDE_EXPORT inline void debug(int severity, const char * cformat, ...) { if ( Debug == true && ( severity<=DebugLevel || severity == 0) ) { @@ -96,7 +96,7 @@ namespace ThreadWeaver { Note: Do not create and use SPR/APR events, use Job::triggerSPR or Job::triggerAPR to create the requests. */ - class KDE_EXPORT Event : public TQCustomEvent + class TDE_EXPORT Event : public TQCustomEvent { public: enum Action { @@ -160,9 +160,9 @@ namespace ThreadWeaver { Note: When using an APR, you better make sure to receive the signal with some object, otherwise the calling thread will block forever! */ - class KDE_EXPORT Job : public TQObject + class TDE_EXPORT Job : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** Construct a Job object. */ @@ -246,7 +246,7 @@ namespace ThreadWeaver { /** The class Thread is used to represent the worker threads in the weaver's inventory. It is not meant to be overloaded. */ - class KDE_EXPORT Thread : public TQThread + class TDE_EXPORT Thread : public TQThread { public: /** Create a thread. @@ -293,9 +293,9 @@ namespace ThreadWeaver { /** A weaver is the manager of worker threads (Thread objects) to which it assigns jobs from it's queue. */ - class KDE_EXPORT Weaver : public TQObject + class TDE_EXPORT Weaver : public TQObject { - Q_OBJECT + TQ_OBJECT public: Weaver (TQObject* parent=0, const char* name=0, 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() diff --git a/libtdepim/weaverextensions.h b/libtdepim/weaverextensions.h index b107378e..52984a29 100644 --- a/libtdepim/weaverextensions.h +++ b/libtdepim/weaverextensions.h @@ -31,7 +31,7 @@ namespace ThreadWeaver { programs. Derive from it to actually create an extension. */ class WeaverExtension : public TQObject { - Q_OBJECT + TQ_OBJECT public: WeaverExtension ( TQObject *parent = 0, const char *name = 0); diff --git a/libtdepim/weaverlogger.h b/libtdepim/weaverlogger.h index 54e7e010..889f080e 100644 --- a/libtdepim/weaverlogger.h +++ b/libtdepim/weaverlogger.h @@ -24,7 +24,7 @@ namespace ThreadWeaver { information about thread execution. */ class WeaverThreadLogger : public WeaverExtension { - Q_OBJECT + TQ_OBJECT public: WeaverThreadLogger( TQObject *parent = 0, const char *name = 0); |