diff options
Diffstat (limited to 'kaddressbook')
146 files changed, 861 insertions, 861 deletions
diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index 83f278748..97b01d08b 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/kaddressbook/addresseditwidget.cpp @@ -86,8 +86,8 @@ AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name ) layout->setSpacing( KDialog::spacingHint() ); mTypeCombo = new AddressTypeCombo( mAddressList, this ); - connect( mTypeCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( updateAddressEdit() ) ); + connect( mTypeCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( updateAddressEdit() ) ); layout->addWidget( mTypeCombo ); mAddressField = new KActiveLabel( this ); @@ -98,7 +98,7 @@ AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name ) layout->addWidget( mAddressField ); mEditButton = new TQPushButton( i18n( "street/postal", "&Edit Addresses..." ), this ); - connect( mEditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( edit() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( edit() ) ); layout->addWidget( mEditButton ); } @@ -281,7 +281,7 @@ AddressEditDialog::AddressEditDialog( const TDEABC::Address::List &list, label->setBuddy( mStreetTextEdit ); topLayout->addWidget( mStreetTextEdit, 1, 1 ); - TabPressEater *eater = new TabPressEater( TQT_TQOBJECT(this) ); + TabPressEater *eater = new TabPressEater( this ); mStreetTextEdit->installEventFilter( eater ); label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).arg( TDEABC::Address::postOfficeBoxLabel() ), page ); @@ -317,7 +317,7 @@ AddressEditDialog::AddressEditDialog( const TDEABC::Address::List &list, #if KDE_IS_VERSION(3,3,0) TQPushButton *labelButton = new TQPushButton( i18n( "Edit Label..." ), page ); topLayout->addMultiCellWidget( labelButton, 7, 7, 0, 1 ); - connect( labelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editLabel() ) ); + connect( labelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editLabel() ) ); #endif fillCountryCombo(); @@ -335,28 +335,28 @@ AddressEditDialog::AddressEditDialog( const TDEABC::Address::List &list, topLayout->addMultiCellWidget( buttonBox, 10, 10, 0, 1 ); TQPushButton *addButton = new TQPushButton( i18n( "New..." ), buttonBox ); - connect( addButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addAddress() ) ); + connect( addButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addAddress() ) ); mRemoveButton = new TQPushButton( i18n( "Remove" ), buttonBox ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeAddress() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeAddress() ) ); mChangeTypeButton = new TQPushButton( i18n( "Change Type..." ), buttonBox ); - connect( mChangeTypeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( changeType() ) ); + connect( mChangeTypeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( changeType() ) ); mTypeCombo->updateTypes(); mTypeCombo->setCurrentItem( selected ); updateAddressEdits(); - connect( mTypeCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( updateAddressEdits() ) ); - connect( mStreetTextEdit, TQT_SIGNAL( textChanged() ), TQT_SLOT( modified() ) ); - connect( mPOBoxEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mLocalityEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mRegionEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mPostalCodeEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mCountryCombo, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mPreferredCheckBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); + connect( mTypeCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( updateAddressEdits() ) ); + connect( mStreetTextEdit, TQ_SIGNAL( textChanged() ), TQ_SLOT( modified() ) ); + connect( mPOBoxEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mLocalityEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mRegionEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mPostalCodeEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mCountryCombo, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mPreferredCheckBox, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) ); TDEAcceleratorManager::manage( this ); @@ -606,7 +606,7 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *parent ) TQWidget *page = plainPage(); TQVBoxLayout *layout = new TQVBoxLayout( page ); - mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "street/postal", "Address Types" ), page ); + mGroup = new TQButtonGroup( 2, TQt::Horizontal, i18n( "street/postal", "Address Types" ), page ); layout->addWidget( mGroup ); mTypeList = TDEABC::Address::typeList(); diff --git a/kaddressbook/addresseditwidget.h b/kaddressbook/addresseditwidget.h index e52e5960e..b90228e58 100644 --- a/kaddressbook/addresseditwidget.h +++ b/kaddressbook/addresseditwidget.h @@ -51,7 +51,7 @@ typedef TypeCombo<TDEABC::Address> AddressTypeCombo; */ class AddressEditWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -92,7 +92,7 @@ class AddressEditWidget : public TQWidget */ class AddressEditDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/addresseeeditorbase.h b/kaddressbook/addresseeeditorbase.h index 036e47e36..7295ae2c6 100644 --- a/kaddressbook/addresseeeditorbase.h +++ b/kaddressbook/addresseeeditorbase.h @@ -30,7 +30,7 @@ class AddresseeEditorBase : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp index 77d7bcbed..202dd9f17 100644 --- a/kaddressbook/addresseeeditordialog.cpp +++ b/kaddressbook/addresseeeditordialog.cpp @@ -55,7 +55,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core, } else { mEditorWidget = new AddresseeEditorWidget( page ); } - connect( mEditorWidget, TQT_SIGNAL( modified() ), TQT_SLOT( widgetModified() ) ); + connect( mEditorWidget, TQ_SIGNAL( modified() ), TQ_SLOT( widgetModified() ) ); layout->addWidget( mEditorWidget ); enableButton( KDialogBase::Apply, false ); diff --git a/kaddressbook/addresseeeditordialog.h b/kaddressbook/addresseeeditordialog.h index bfdb3ca9d..b9a9d3491 100644 --- a/kaddressbook/addresseeeditordialog.h +++ b/kaddressbook/addresseeeditordialog.h @@ -34,7 +34,7 @@ namespace KAB { class Core; } class AddresseeEditorDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/addresseeeditorextension.cpp b/kaddressbook/addresseeeditorextension.cpp index 5ff8a3f13..d271399d9 100644 --- a/kaddressbook/addresseeeditorextension.cpp +++ b/kaddressbook/addresseeeditorextension.cpp @@ -58,7 +58,7 @@ void AddresseeEditorExtension::contactsSelectionChanged() mAddresseeEditor->save(); addressees.append( mAddresseeEditor->addressee() ); modifiedAddress = addressees; - TQTimer::singleShot(0, this, TQT_SLOT(emitModifiedAddresses())); + TQTimer::singleShot(0, this, TQ_SLOT(emitModifiedAddresses())); } mAddresseeEditor->setAddressee( selectedAddressees[ 0 ] ); diff --git a/kaddressbook/addresseeeditorextension.h b/kaddressbook/addresseeeditorextension.h index 949fe0b62..5099cfbc9 100644 --- a/kaddressbook/addresseeeditorextension.h +++ b/kaddressbook/addresseeeditorextension.h @@ -29,7 +29,7 @@ class AddresseeEditorExtension : public KAB::ExtensionWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index c3e2e6fb5..16489cf2e 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -135,8 +135,8 @@ void AddresseeEditorWidget::initGUI() setupAdditionalTabs(); setupCustomFieldsTabs(); - connect( mTabWidget, TQT_SIGNAL( currentChanged(TQWidget*) ), - TQT_SLOT( pageChanged(TQWidget*) ) ); + connect( mTabWidget, TQ_SIGNAL( currentChanged(TQWidget*) ), + TQ_SLOT( pageChanged(TQWidget*) ) ); } void AddresseeEditorWidget::setupTab1() @@ -165,9 +165,9 @@ void AddresseeEditorWidget::setupTab1() button = new TQPushButton( i18n( "Edit Name..." ), tab1 ); TQToolTip::add( button, i18n( "Edit the contact's name" ) ); mNameEdit = new KLineEdit( tab1, "mNameEdit" ); - connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( nameTextChanged( const TQString& ) ) ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( nameButtonClicked() ) ); + connect( mNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( nameTextChanged( const TQString& ) ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( nameButtonClicked() ) ); mNameLabel = new KSqueezedTextLabel( tab1 ); if ( KABPrefs::instance()->automaticNameParsing() ) { @@ -183,8 +183,8 @@ void AddresseeEditorWidget::setupTab1() layout->addWidget( mNameLabel, 0, 2 ); label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).arg( TDEABC::Addressee::roleLabel() ), tab1 ); mRoleEdit = new KLineEdit( tab1 ); - connect( mRoleEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mRoleEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mRoleEdit ); layout->addWidget( label, 1, 1 ); layout->addWidget( mRoleEdit, 1, 2 ); @@ -193,8 +193,8 @@ void AddresseeEditorWidget::setupTab1() label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).arg( TDEABC::Addressee::organizationLabel() ), tab1 ); mOrgEdit = new KLineEdit( tab1 ); label->setBuddy( mOrgEdit ); - connect( mOrgEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( organizationTextChanged( const TQString& ) ) ); + connect( mOrgEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( organizationTextChanged( const TQString& ) ) ); layout->addWidget( label, 2, 1 ); layout->addWidget( mOrgEdit, 2, 2 ); @@ -217,7 +217,7 @@ void AddresseeEditorWidget::setupTab1() layout->addMultiCellWidget( label, 0, 1, 3, 3 ); mPhoneEditWidget = new PhoneEditWidget( tab1 ); - connect( mPhoneEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); + connect( mPhoneEditWidget, TQ_SIGNAL( modified() ), TQ_SLOT( emitModified() ) ); layout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 ); bar = new KSeparator( KSeparator::HLine, tab1 ); @@ -231,7 +231,7 @@ void AddresseeEditorWidget::setupTab1() layout->addMultiCellWidget( label, 5, 6, 0, 0 ); mAddressEditWidget = new AddressEditWidget( tab1 ); - connect( mAddressEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); + connect( mAddressEditWidget, TQ_SIGNAL( modified() ), TQ_SLOT( emitModified() ) ); layout->addMultiCellWidget( mAddressEditWidget, 5, 10, 1, 2 ); ////////////////////////////////////// @@ -242,7 +242,7 @@ void AddresseeEditorWidget::setupTab1() layout->addMultiCellWidget( label, 5, 6, 3, 3 ); mEmailWidget = new EmailEditWidget( tab1 ); - connect( mEmailWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); + connect( mEmailWidget, TQ_SIGNAL( modified() ), TQ_SLOT( emitModified() ) ); layout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 ); // add the separator @@ -258,8 +258,8 @@ void AddresseeEditorWidget::setupTab1() label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).arg( TDEABC::Addressee::urlLabel() ), tab1 ); mURLEdit = new KLineEdit( tab1 ); - connect( mURLEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mURLEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mURLEdit ); homePageLayout->addWidget( label ); homePageLayout->addWidget( mURLEdit ); @@ -270,13 +270,13 @@ void AddresseeEditorWidget::setupTab1() blogLayout->addWidget( label ); mBlogEdit = new KLineEdit( tab1 ); blogLayout->addWidget( mBlogEdit ); - connect( mBlogEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( textChanged( const TQString & ) ) ); + connect( mBlogEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( textChanged( const TQString & ) ) ); label->setBuddy( mBlogEdit ); layout->addMultiCellLayout( blogLayout, 9, 9, 4, 6 ); mIMWidget = new IMEditWidget( tab1, mAddressee ); - connect( mIMWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); + connect( mIMWidget, TQ_SIGNAL( modified() ), TQ_SLOT( emitModified() ) ); layout->addMultiCellWidget( mIMWidget, 10, 10, 4, 6 ); layout->addColSpacing( 6, 50 ); @@ -290,15 +290,15 @@ void AddresseeEditorWidget::setupTab1() // Categories mCategoryButton = new TQPushButton( i18n( "Select Categories..." ), categoryBox ); - connect( mCategoryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectCategories() ) ); + connect( mCategoryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectCategories() ) ); mCategoryEdit = new KLineEdit( categoryBox ); mCategoryEdit->setReadOnly( true ); - connect( mCategoryEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mCategoryEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); mSecrecyWidget = new SecrecyWidget( categoryBox ); - connect( mSecrecyWidget, TQT_SIGNAL( changed() ), TQT_SLOT( emitModified() ) ); + connect( mSecrecyWidget, TQ_SIGNAL( changed() ), TQ_SLOT( emitModified() ) ); layout->addMultiCellWidget( categoryBox, 12, 12, 0, 6 ); @@ -332,48 +332,48 @@ void AddresseeEditorWidget::setupTab2() label = new TQLabel( i18n( "Department:" ), tab2 ); layout->addWidget( label, 0, 1 ); mDepartmentEdit = new KLineEdit( tab2 ); - connect( mDepartmentEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mDepartmentEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mDepartmentEdit ); layout->addWidget( mDepartmentEdit, 0, 2 ); label = new TQLabel( i18n( "Office:" ), tab2 ); layout->addWidget( label, 1, 1 ); mOfficeEdit = new KLineEdit( tab2 ); - connect( mOfficeEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mOfficeEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mOfficeEdit ); layout->addWidget( mOfficeEdit, 1, 2 ); label = new TQLabel( i18n( "Profession:" ), tab2 ); layout->addWidget( label, 2, 1 ); mProfessionEdit = new KLineEdit( tab2 ); - connect( mProfessionEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mProfessionEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mProfessionEdit ); layout->addWidget( mProfessionEdit, 2, 2 ); label = new TQLabel( i18n( "Manager\'s name:" ), tab2 ); layout->addWidget( label, 0, 3 ); mManagerEdit = new KPIM::AddresseeLineEdit( tab2 ); - connect( mManagerEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mManagerEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mManagerEdit ); layout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 ); label = new TQLabel( i18n( "Assistant's name:" ), tab2 ); layout->addWidget( label, 1, 3 ); mAssistantEdit = new KPIM::AddresseeLineEdit( tab2 ); - connect( mAssistantEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mAssistantEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mAssistantEdit ); layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 ); label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).arg( TDEABC::Addressee::titleLabel() ), tab2 ); layout->addWidget( label, 2, 3 ); mTitleEdit = new KLineEdit( tab2 ); - connect( mTitleEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mTitleEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mTitleEdit ); layout->addMultiCellWidget( mTitleEdit, 2, 2, 4, 5 ); @@ -391,36 +391,36 @@ void AddresseeEditorWidget::setupTab2() label = new TQLabel( i18n( "Nickname:" ), tab2 ); layout->addWidget( label, 4, 1 ); mNicknameEdit = new KLineEdit( tab2 ); - connect( mNicknameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mNicknameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mNicknameEdit ); layout->addWidget( mNicknameEdit, 4, 2 ); label = new TQLabel( i18n( "Partner's name:" ), tab2 ); layout->addWidget( label, 5, 1 ); mSpouseEdit = new KPIM::AddresseeLineEdit( tab2 ); - connect( mSpouseEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mSpouseEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mSpouseEdit ); layout->addWidget( mSpouseEdit, 5, 2 ); label = new TQLabel( i18n( "Birthdate:" ), tab2 ); layout->addWidget( label, 4, 3 ); mBirthdayPicker = new KDateEdit( tab2 ); - connect( mBirthdayPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ), - TQT_SLOT( dateChanged( const TQDate& ) ) ); - connect( mBirthdayPicker, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( emitModified() ) ); + connect( mBirthdayPicker, TQ_SIGNAL( dateChanged( const TQDate& ) ), + TQ_SLOT( dateChanged( const TQDate& ) ) ); + connect( mBirthdayPicker, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( emitModified() ) ); label->setBuddy( mBirthdayPicker ); layout->addWidget( mBirthdayPicker, 4, 4 ); label = new TQLabel( i18n( "Anniversary:" ), tab2 ); layout->addWidget( label, 5, 3 ); mAnniversaryPicker = new KDateEdit( tab2 ); - connect( mAnniversaryPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ), - TQT_SLOT( dateChanged( const TQDate& ) ) ); - connect( mAnniversaryPicker, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( emitModified() ) ); + connect( mAnniversaryPicker, TQ_SIGNAL( dateChanged( const TQDate& ) ), + TQ_SLOT( dateChanged( const TQDate& ) ) ); + connect( mAnniversaryPicker, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( emitModified() ) ); label->setBuddy( mAnniversaryPicker ); layout->addWidget( mAnniversaryPicker, 5, 4 ); @@ -435,7 +435,7 @@ void AddresseeEditorWidget::setupTab2() mNoteEdit = new TQTextEdit( tab2 ); mNoteEdit->setWordWrap( TQTextEdit::WidgetWidth ); mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() ); - connect( mNoteEdit, TQT_SIGNAL( textChanged() ), TQT_SLOT( emitModified() ) ); + connect( mNoteEdit, TQ_SIGNAL( textChanged() ), TQ_SLOT( emitModified() ) ); label->setBuddy( mNoteEdit ); layout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 ); @@ -464,7 +464,7 @@ void AddresseeEditorWidget::setupAdditionalTabs() mTabWidget->addTab( page, pageTitle ); - connect( page, TQT_SIGNAL( changed() ), TQT_SLOT( emitModified() ) ); + connect( page, TQ_SIGNAL( changed() ), TQ_SLOT( emitModified() ) ); } KAB::ContactEditorWidget *widget @@ -498,7 +498,7 @@ void AddresseeEditorWidget::setupCustomFieldsTabs() page->addWidget( wdg ); page->updateLayout(); - connect( page, TQT_SIGNAL( changed() ), TQT_SLOT( emitModified() ) ); + connect( page, TQ_SIGNAL( changed() ), TQ_SLOT( emitModified() ) ); } else delete page; } @@ -558,7 +558,7 @@ void AddresseeEditorWidget::load() mBirthdayPicker->setDate( mAddressee.birthday().date() ); TQString anniversaryStr = mAddressee.custom( "KADDRESSBOOK", "X-Anniversary" ); - TQDate anniversary = (anniversaryStr.isEmpty() ? TQDate() : TQDate::fromString( anniversaryStr, Qt::ISODate )); + TQDate anniversary = (anniversaryStr.isEmpty() ? TQDate() : TQDate::fromString( anniversaryStr, TQt::ISODate )); mAnniversaryPicker->setDate( anniversary ); mNicknameEdit->setText( mAddressee.nickName() ); mCategoryEdit->setText( mAddressee.categories().join( "," ) ); @@ -652,7 +652,7 @@ void AddresseeEditorWidget::save() if ( mAnniversaryPicker->date().isValid() ) mAddressee.insertCustom( "KADDRESSBOOK", "X-Anniversary", - mAnniversaryPicker->date().toString( Qt::ISODate ) ); + mAnniversaryPicker->date().toString( TQt::ISODate ) ); else mAddressee.removeCustom( "KADDRESSBOOK", "X-Anniversary" ); @@ -798,10 +798,10 @@ void AddresseeEditorWidget::selectCategories() // Show the category dialog if ( mCategorySelectDialog == 0 ) { mCategorySelectDialog = new KPIM::CategorySelectDialog( KABPrefs::instance(), this ); - connect( mCategorySelectDialog, TQT_SIGNAL( categoriesSelected( const TQStringList& ) ), - this, TQT_SLOT( categoriesSelected( const TQStringList& ) ) ); - connect( mCategorySelectDialog, TQT_SIGNAL( editCategories() ), - this, TQT_SLOT( editCategories() ) ); + connect( mCategorySelectDialog, TQ_SIGNAL( categoriesSelected( const TQStringList& ) ), + this, TQ_SLOT( categoriesSelected( const TQStringList& ) ) ); + connect( mCategorySelectDialog, TQ_SIGNAL( editCategories() ), + this, TQ_SLOT( editCategories() ) ); } mCategorySelectDialog->setSelected( TQStringList::split( ",", mCategoryEdit->text() ) ); @@ -817,8 +817,8 @@ void AddresseeEditorWidget::editCategories() { if ( mCategoryEditDialog == 0 ) { mCategoryEditDialog = new KPIM::CategoryEditDialog( KABPrefs::instance(), this ); - connect( mCategoryEditDialog, TQT_SIGNAL( categoryConfigChanged() ), - mCategorySelectDialog, TQT_SLOT( updateCategoryConfig() ) ); + connect( mCategoryEditDialog, TQ_SIGNAL( categoryConfigChanged() ), + mCategorySelectDialog, TQ_SLOT( updateCategoryConfig() ) ); } mCategoryEditDialog->exec(); diff --git a/kaddressbook/addresseeeditorwidget.h b/kaddressbook/addresseeeditorwidget.h index 918070bb5..f2110f75a 100644 --- a/kaddressbook/addresseeeditorwidget.h +++ b/kaddressbook/addresseeeditorwidget.h @@ -65,7 +65,7 @@ namespace TDEABC { class AddressBook; } class AddresseeEditorWidget : public AddresseeEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp index dbec842d6..708418344 100644 --- a/kaddressbook/addviewdialog.cpp +++ b/kaddressbook/addviewdialog.cpp @@ -53,12 +53,12 @@ AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict, layout->addWidget( label, 0, 0 ); mViewNameEdit = new TQLineEdit( page ); - connect( mViewNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mViewNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); layout->addWidget( mViewNameEdit, 0, 1 ); - mTypeGroup = new TQButtonGroup( 0, Qt::Horizontal, i18n( "View Type" ), page ); - connect( mTypeGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( clicked( int ) ) ); + mTypeGroup = new TQButtonGroup( 0, TQt::Horizontal, i18n( "View Type" ), page ); + connect( mTypeGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( clicked( int ) ) ); layout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 ); TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->layout(), 3, 2 ); groupLayout->setSpacing( spacingHint() ); diff --git a/kaddressbook/addviewdialog.h b/kaddressbook/addviewdialog.h index 2e5707a3f..15084d668 100644 --- a/kaddressbook/addviewdialog.h +++ b/kaddressbook/addviewdialog.h @@ -40,7 +40,7 @@ class ViewFactory; */ class AddViewDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/advancedcustomfields.cpp b/kaddressbook/advancedcustomfields.cpp index d5b534791..3f4a477db 100644 --- a/kaddressbook/advancedcustomfields.cpp +++ b/kaddressbook/advancedcustomfields.cpp @@ -132,7 +132,7 @@ void AdvancedCustomFields::initGUI( const TQString &uiFile ) mFields = new KPIM::DesignerFields( uiFile, this ); layout->addWidget( mFields ); - connect( mFields, TQT_SIGNAL( modified() ), TQT_SLOT( setModified() ) ); + connect( mFields, TQ_SIGNAL( modified() ), TQ_SLOT( setModified() ) ); } TQString AdvancedCustomFields::pageIdentifier() const diff --git a/kaddressbook/advancedcustomfields.h b/kaddressbook/advancedcustomfields.h index 5d4b27584..f2d2afff0 100644 --- a/kaddressbook/advancedcustomfields.h +++ b/kaddressbook/advancedcustomfields.h @@ -38,7 +38,7 @@ class AdvancedCustomFields : public KAB::ContactEditorWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/common/locationmap.h b/kaddressbook/common/locationmap.h index be625f579..2ba39aa17 100644 --- a/kaddressbook/common/locationmap.h +++ b/kaddressbook/common/locationmap.h @@ -30,7 +30,7 @@ class LocationMap : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp index a88a95545..beedc3b6e 100644 --- a/kaddressbook/contacteditorwidgetmanager.cpp +++ b/kaddressbook/contacteditorwidgetmanager.cpp @@ -118,7 +118,7 @@ void ContactEditorTabPage::addWidget( KAB::ContactEditorWidget *widget ) { if ( widget->logicalWidth() == 2 ) { mWidgets.prepend( widget ); - connect( widget, TQT_SIGNAL( changed() ), TQT_SIGNAL( changed() ) ); + connect( widget, TQ_SIGNAL( changed() ), TQ_SIGNAL( changed() ) ); return; } @@ -133,7 +133,7 @@ void ContactEditorTabPage::addWidget( KAB::ContactEditorWidget *widget ) } mWidgets.insert( ++it, widget ); - connect( widget, TQT_SIGNAL( changed() ), TQT_SIGNAL( changed() ) ); + connect( widget, TQ_SIGNAL( changed() ), TQ_SIGNAL( changed() ) ); } void ContactEditorTabPage::loadContact( TDEABC::Addressee *addr ) diff --git a/kaddressbook/contacteditorwidgetmanager.h b/kaddressbook/contacteditorwidgetmanager.h index 27a4fc62c..c4aaf5d7c 100644 --- a/kaddressbook/contacteditorwidgetmanager.h +++ b/kaddressbook/contacteditorwidgetmanager.h @@ -36,7 +36,7 @@ class TQGridLayout; class ContactEditorWidgetManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -66,7 +66,7 @@ class ContactEditorWidgetManager : public TQObject class ContactEditorTabPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp index b267eddc9..39867b0ec 100644 --- a/kaddressbook/customfieldswidget.cpp +++ b/kaddressbook/customfieldswidget.cpp @@ -54,7 +54,7 @@ AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name ) layout->addWidget( label, 0, 0 ); mTitle = new KLineEdit( page ); - mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), TQT_TQOBJECT(mTitle) ) ); + mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), mTitle ) ); label->setBuddy( mTitle ); layout->addWidget( mTitle, 0, 1 ); @@ -69,8 +69,8 @@ AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name ) mGlobal->setChecked( true ); layout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 ); - connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( nameChanged( const TQString& ) ) ); + connect( mTitle, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( nameChanged( const TQString& ) ) ); TDEAcceleratorManager::manage( this ); @@ -151,33 +151,33 @@ void FieldWidget::addField( const TQString &identifier, const TQString &title, if ( type == "integer" ) { TQSpinBox *wdg = new TQSpinBox( 0, 1000, 1, this ); record.mWidget = wdg; - connect( wdg, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SIGNAL( changed() ) ); + connect( wdg, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SIGNAL( changed() ) ); } else if ( type == "boolean" ) { TQCheckBox *wdg = new TQCheckBox( this ); record.mWidget = wdg; - connect( wdg, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); + connect( wdg, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); } else if ( type == "date" ) { TQDateEdit *wdg = new TQDateEdit( this ); record.mWidget = wdg; - connect( wdg, TQT_SIGNAL( valueChanged( const TQDate& ) ), - this, TQT_SIGNAL( changed() ) ); + connect( wdg, TQ_SIGNAL( valueChanged( const TQDate& ) ), + this, TQ_SIGNAL( changed() ) ); } else if ( type == "time" ) { TQTimeEdit *wdg = new TQTimeEdit( this ); record.mWidget = wdg; - connect( wdg, TQT_SIGNAL( valueChanged( const TQTime& ) ), - this, TQT_SIGNAL( changed() ) ); + connect( wdg, TQ_SIGNAL( valueChanged( const TQTime& ) ), + this, TQ_SIGNAL( changed() ) ); } else if ( type == "datetime" ) { TQDateTimeEdit *wdg = new TQDateTimeEdit( this ); record.mWidget = wdg; - connect( wdg, TQT_SIGNAL( valueChanged( const TQDateTime& ) ), - this, TQT_SIGNAL( changed() ) ); + connect( wdg, TQ_SIGNAL( valueChanged( const TQDateTime& ) ), + this, TQ_SIGNAL( changed() ) ); } else if ( type == "text" ) { TQLineEdit *wdg = new TQLineEdit( this ); record.mWidget = wdg; - connect( wdg, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SIGNAL( changed() ) ); + connect( wdg, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SIGNAL( changed() ) ); } record.mLabel->show(); @@ -227,22 +227,22 @@ void FieldWidget::clearFields() { FieldRecordList::ConstIterator fieldIt; for ( fieldIt = mFieldList.begin(); fieldIt != mFieldList.end(); ++fieldIt ) { - if ( (*fieldIt).mWidget->isA( TQLINEEDIT_OBJECT_NAME_STRING ) ) { + if ( (*fieldIt).mWidget->isA( "TQLineEdit" ) ) { TQLineEdit *wdg = static_cast<TQLineEdit*>( (*fieldIt).mWidget ); wdg->setText( TQString() ); - } else if ( (*fieldIt).mWidget->isA( TQSPINBOX_OBJECT_NAME_STRING ) ) { + } else if ( (*fieldIt).mWidget->isA( "TQSpinBox" ) ) { TQSpinBox *wdg = static_cast<TQSpinBox*>( (*fieldIt).mWidget ); wdg->setValue( 0 ); - } else if ( (*fieldIt).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) { + } else if ( (*fieldIt).mWidget->isA( "TQCheckBox" ) ) { TQCheckBox *wdg = static_cast<TQCheckBox*>( (*fieldIt).mWidget ); wdg->setChecked( true ); - } else if ( (*fieldIt).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) { + } else if ( (*fieldIt).mWidget->isA( "TQDateEdit" ) ) { TQDateEdit *wdg = static_cast<TQDateEdit*>( (*fieldIt).mWidget ); wdg->setDate( TQDate::currentDate() ); - } else if ( (*fieldIt).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) { + } else if ( (*fieldIt).mWidget->isA( "TQTimeEdit" ) ) { TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*fieldIt).mWidget ); wdg->setTime( TQTime::currentTime() ); - } else if ( (*fieldIt).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { + } else if ( (*fieldIt).mWidget->isA( "TQDateTimeEdit" ) ) { TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*fieldIt).mWidget ); wdg->setDateTime( TQDateTime::currentDateTime() ); } @@ -265,24 +265,24 @@ void FieldWidget::loadContact( TDEABC::Addressee *addr ) FieldRecordList::ConstIterator fieldIt; for ( fieldIt = mFieldList.begin(); fieldIt != mFieldList.end(); ++fieldIt ) { if ( (*fieldIt).mIdentifier == name ) { - if ( (*fieldIt).mWidget->isA( TQLINEEDIT_OBJECT_NAME_STRING ) ) { + if ( (*fieldIt).mWidget->isA( "TQLineEdit" ) ) { TQLineEdit *wdg = static_cast<TQLineEdit*>( (*fieldIt).mWidget ); wdg->setText( value ); - } else if ( (*fieldIt).mWidget->isA( TQSPINBOX_OBJECT_NAME_STRING ) ) { + } else if ( (*fieldIt).mWidget->isA( "TQSpinBox" ) ) { TQSpinBox *wdg = static_cast<TQSpinBox*>( (*fieldIt).mWidget ); wdg->setValue( value.toInt() ); - } else if ( (*fieldIt).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) { + } else if ( (*fieldIt).mWidget->isA( "TQCheckBox" ) ) { TQCheckBox *wdg = static_cast<TQCheckBox*>( (*fieldIt).mWidget ); wdg->setChecked( value == "true" || value == "1" ); - } else if ( (*fieldIt).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) { + } else if ( (*fieldIt).mWidget->isA( "TQDateEdit" ) ) { TQDateEdit *wdg = static_cast<TQDateEdit*>( (*fieldIt).mWidget ); - wdg->setDate( TQDate::fromString( value, Qt::ISODate ) ); - } else if ( (*fieldIt).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) { + wdg->setDate( TQDate::fromString( value, TQt::ISODate ) ); + } else if ( (*fieldIt).mWidget->isA( "TQTimeEdit" ) ) { TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*fieldIt).mWidget ); - wdg->setTime( TQTime::fromString( value, Qt::ISODate ) ); - } else if ( (*fieldIt).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { + wdg->setTime( TQTime::fromString( value, TQt::ISODate ) ); + } else if ( (*fieldIt).mWidget->isA( "TQDateTimeEdit" ) ) { TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*fieldIt).mWidget ); - wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) ); + wdg->setDateTime( TQDateTime::fromString( value, TQt::ISODate ) ); } } } @@ -294,22 +294,22 @@ void FieldWidget::setReadOnly( bool readOnly ) FieldRecordList::ConstIterator it; for ( it = mFieldList.begin(); it != mFieldList.end(); ++it ) { TQString value; - if ( (*it).mWidget->isA( TQLINEEDIT_OBJECT_NAME_STRING ) ) { + if ( (*it).mWidget->isA( "TQLineEdit" ) ) { TQLineEdit *wdg = static_cast<TQLineEdit*>( (*it).mWidget ); wdg->setReadOnly(readOnly); - } else if ( (*it).mWidget->isA( TQSPINBOX_OBJECT_NAME_STRING ) ) { + } else if ( (*it).mWidget->isA( "TQSpinBox" ) ) { TQSpinBox *wdg = static_cast<TQSpinBox*>( (*it).mWidget ); wdg->setEnabled( !readOnly ); - } else if ( (*it).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) { + } else if ( (*it).mWidget->isA( "TQCheckBox" ) ) { TQCheckBox *wdg = static_cast<TQCheckBox*>( (*it).mWidget ); wdg->setEnabled( !readOnly ); - } else if ( (*it).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) { + } else if ( (*it).mWidget->isA( "TQDateEdit" ) ) { TQDateEdit *wdg = static_cast<TQDateEdit*>( (*it).mWidget ); wdg->setEnabled( !readOnly ); - } else if ( (*it).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) { + } else if ( (*it).mWidget->isA( "TQTimeEdit" ) ) { TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*it).mWidget ); wdg->setEnabled( !readOnly ); - } else if ( (*it).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { + } else if ( (*it).mWidget->isA( "TQDateTimeEdit" ) ) { TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*it).mWidget ); wdg->setEnabled( !readOnly ); } @@ -321,24 +321,24 @@ void FieldWidget::storeContact( TDEABC::Addressee *addr ) FieldRecordList::ConstIterator it; for ( it = mFieldList.begin(); it != mFieldList.end(); ++it ) { TQString value; - if ( (*it).mWidget->isA( TQLINEEDIT_OBJECT_NAME_STRING ) ) { + if ( (*it).mWidget->isA( "TQLineEdit" ) ) { TQLineEdit *wdg = static_cast<TQLineEdit*>( (*it).mWidget ); value = wdg->text(); - } else if ( (*it).mWidget->isA( TQSPINBOX_OBJECT_NAME_STRING ) ) { + } else if ( (*it).mWidget->isA( "TQSpinBox" ) ) { TQSpinBox *wdg = static_cast<TQSpinBox*>( (*it).mWidget ); value = TQString::number( wdg->value() ); - } else if ( (*it).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) { + } else if ( (*it).mWidget->isA( "TQCheckBox" ) ) { TQCheckBox *wdg = static_cast<TQCheckBox*>( (*it).mWidget ); value = ( wdg->isChecked() ? "true" : "false" ); - } else if ( (*it).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) { + } else if ( (*it).mWidget->isA( "TQDateEdit" ) ) { TQDateEdit *wdg = static_cast<TQDateEdit*>( (*it).mWidget ); - value = wdg->date().toString( Qt::ISODate ); - } else if ( (*it).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) { + value = wdg->date().toString( TQt::ISODate ); + } else if ( (*it).mWidget->isA( "TQTimeEdit" ) ) { TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*it).mWidget ); - value = wdg->time().toString( Qt::ISODate ); - } else if ( (*it).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { + value = wdg->time().toString( TQt::ISODate ); + } else if ( (*it).mWidget->isA( "TQDateTimeEdit" ) ) { TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*it).mWidget ); - value = wdg->dateTime().toString( Qt::ISODate ); + value = wdg->dateTime().toString( TQt::ISODate ); } if ( value.isEmpty() ) @@ -382,10 +382,10 @@ CustomFieldsWidget::CustomFieldsWidget( TDEABC::AddressBook *ab, { initGUI(); - connect( mAddButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addField() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeField() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addField() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeField() ) ); - connect( mFieldWidget, TQT_SIGNAL( changed() ), this, TQT_SLOT( setModified() ) ); + connect( mFieldWidget, TQ_SIGNAL( changed() ), this, TQ_SLOT( setModified() ) ); } void CustomFieldsWidget::loadContact( TDEABC::Addressee *addr ) @@ -523,17 +523,17 @@ TQStringList CustomFieldsWidget::marshallFields( bool global ) const retval.append( (*it).mTitle ); TQString type = "text"; - if ( (*it).mWidget->isA( TQSPINBOX_OBJECT_NAME_STRING ) ) { + if ( (*it).mWidget->isA( "TQSpinBox" ) ) { type = "integer"; - } else if ( (*it).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) { + } else if ( (*it).mWidget->isA( "TQCheckBox" ) ) { type = "boolean"; - } else if ( (*it).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) { + } else if ( (*it).mWidget->isA( "TQDateEdit" ) ) { type = "date"; - } else if ( (*it).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) { + } else if ( (*it).mWidget->isA( "TQTimeEdit" ) ) { type = "time"; - } else if ( (*it).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { + } else if ( (*it).mWidget->isA( "TQDateTimeEdit" ) ) { type = "datetime"; - } else if ( (*it).mWidget->isA( TQLINEEDIT_OBJECT_NAME_STRING ) ) { + } else if ( (*it).mWidget->isA( "TQLineEdit" ) ) { type = "text"; } diff --git a/kaddressbook/customfieldswidget.h b/kaddressbook/customfieldswidget.h index e584833a3..da8def76b 100644 --- a/kaddressbook/customfieldswidget.h +++ b/kaddressbook/customfieldswidget.h @@ -60,7 +60,7 @@ typedef TQValueList<FieldRecord> FieldRecordList; class AddFieldDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -85,7 +85,7 @@ class AddFieldDialog : public KDialogBase class FieldWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -120,7 +120,7 @@ class FieldWidget : public TQWidget class CustomFieldsWidget : public KAB::ContactEditorWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp index 3f7b73531..e0711b64f 100644 --- a/kaddressbook/distributionlisteditor.cpp +++ b/kaddressbook/distributionlisteditor.cpp @@ -70,14 +70,14 @@ KPIM::DistributionListEditor::Line::Line( TDEABC::AddressBook* book, TQWidget* p TQBoxLayout* layout = new TQHBoxLayout( this ); layout->setSpacing( KDialog::spacingHint() ); m_lineEdit = new KPIM::DistributionListEditor::LineEdit( this ); - connect( m_lineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( textChanged( const TQString& ) ) ); + connect( m_lineEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( textChanged( const TQString& ) ) ); layout->addWidget( m_lineEdit ); m_clearButton = new TQToolButton( this ); m_clearButton->setIconSet( TDEApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) ); m_clearButton->setEnabled( false ); layout->addWidget( m_clearButton ); - connect( m_clearButton, TQT_SIGNAL( clicked() ), m_lineEdit, TQT_SLOT( clear() ) ); + connect( m_clearButton, TQ_SIGNAL( clicked() ), m_lineEdit, TQ_SLOT( clear() ) ); } void KPIM::DistributionListEditor::Line::textChanged( const TQString& text ) @@ -159,9 +159,9 @@ KPIM::DistributionListEditor::EditorWidget::EditorWidget( TDEABC::AddressBook* b d->addressBook = book; Q_ASSERT( d->addressBook ); d->lastLineId = 0; - d->mapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - connect( d->mapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( lineTextChanged( int ) ) ); + d->mapper = new TQSignalMapper( this ); + connect( d->mapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( lineTextChanged( int ) ) ); setCaption( i18n( "Edit Distribution List" ) ); TQWidget* main = new TQWidget( this ); TQVBoxLayout* mainLayout = new TQVBoxLayout( main ); @@ -248,9 +248,9 @@ KPIM::DistributionListEditor::Line* KPIM::DistributionListEditor::EditorWidgetPr line->setEntry( entry ); addresseeLayout->addWidget( line ); addressees.append( line ); - TQObject::connect( line, TQT_SIGNAL( textChanged() ), - mapper, TQT_SLOT( map() ) ); - mapper->setMapping( TQT_TQOBJECT(line), ++lastLineId ); + TQObject::connect( line, TQ_SIGNAL( textChanged() ), + mapper, TQ_SLOT( map() ) ); + mapper->setMapping( line, ++lastLineId ); line->setShown( true ); return line; } diff --git a/kaddressbook/distributionlisteditor.h b/kaddressbook/distributionlisteditor.h index d1ec2e112..986b92c23 100644 --- a/kaddressbook/distributionlisteditor.h +++ b/kaddressbook/distributionlisteditor.h @@ -38,7 +38,7 @@ namespace DistributionListEditor { class EditorWidgetPrivate; class EditorWidget : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: explicit EditorWidget( TDEABC::AddressBook* book, TQWidget* parent = 0 ); diff --git a/kaddressbook/distributionlisteditor_p.h b/kaddressbook/distributionlisteditor_p.h index 9d3ed7552..45670f928 100644 --- a/kaddressbook/distributionlisteditor_p.h +++ b/kaddressbook/distributionlisteditor_p.h @@ -41,7 +41,7 @@ namespace DistributionListEditor { class LineEdit : public KPIM::AddresseeLineEdit { - Q_OBJECT + TQ_OBJECT public: explicit LineEdit( TQWidget* parent = 0 ); @@ -50,7 +50,7 @@ public: class Line : public TQWidget { - Q_OBJECT + TQ_OBJECT public: explicit Line( TDEABC::AddressBook* book, TQWidget* parent = 0 ); diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp index b09d8c97c..811e5167f 100644 --- a/kaddressbook/distributionlistentryview.cpp +++ b/kaddressbook/distributionlistentryview.cpp @@ -49,8 +49,8 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi m_distListLabel = new KURLLabel( this ); distLabel->setBuddy( m_distListLabel ); - connect( m_distListLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - this, TQT_SIGNAL( distributionListClicked( const TQString& ) ) ); + connect( m_distListLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQ_SIGNAL( distributionListClicked( const TQString& ) ) ); distLayout->addWidget( m_distListLabel ); distLayout->addStretch(); m_mainLayout->addItem( distLayout ); @@ -129,8 +129,8 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis button->setChecked( true ); button->setShown( true ); } - connect( m_emailGroup, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( emailButtonClicked( int ) ) ); + connect( m_emailGroup, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( emailButtonClicked( int ) ) ); m_radioLayout->addWidget( m_emailGroup, 0, 0 ); m_emailGroup->setShown( true ); m_mainLayout->invalidate(); diff --git a/kaddressbook/distributionlistentryview.h b/kaddressbook/distributionlistentryview.h index 6bd9d2c33..13a9a8523 100644 --- a/kaddressbook/distributionlistentryview.h +++ b/kaddressbook/distributionlistentryview.h @@ -23,7 +23,7 @@ class Core; class DistributionListEntryView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp index 272a62005..b7295ad81 100644 --- a/kaddressbook/distributionlistpicker.cpp +++ b/kaddressbook/distributionlistpicker.cpp @@ -54,10 +54,10 @@ KPIM::DistributionListPickerDialog::DistributionListPickerDialog( TDEABC::Addres layout->addWidget( m_label, 0, 0 ); m_listBox = new TDEListBox( main ); layout->addWidget( m_listBox, 1, 0 ); - connect( m_listBox, TQT_SIGNAL( highlighted( const TQString& ) ), - this, TQT_SLOT( entrySelected( const TQString& ) ) ); - connect( m_listBox, TQT_SIGNAL( selected( const TQString& ) ), - this, TQT_SLOT( entrySelected( const TQString& ) ) ); + connect( m_listBox, TQ_SIGNAL( highlighted( const TQString& ) ), + this, TQ_SLOT( entrySelected( const TQString& ) ) ); + connect( m_listBox, TQ_SIGNAL( selected( const TQString& ) ), + this, TQ_SLOT( entrySelected( const TQString& ) ) ); setMainWidget( main ); #ifdef TDEPIM_NEW_DISTRLISTS typedef TQValueList<KPIM::DistributionList> DistListList; diff --git a/kaddressbook/distributionlistpicker.h b/kaddressbook/distributionlistpicker.h index bc4c0f650..9a2d9f7d5 100644 --- a/kaddressbook/distributionlistpicker.h +++ b/kaddressbook/distributionlistpicker.h @@ -37,7 +37,7 @@ namespace KPIM { class DistributionListPickerDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: explicit DistributionListPickerDialog( TDEABC::AddressBook* book, TQWidget* parent = 0 ); diff --git a/kaddressbook/editors/cryptowidget.cpp b/kaddressbook/editors/cryptowidget.cpp index fc7bef17d..f7849d7c6 100644 --- a/kaddressbook/editors/cryptowidget.cpp +++ b/kaddressbook/editors/cryptowidget.cpp @@ -83,7 +83,7 @@ CryptoWidget::CryptoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const cha for ( uint i = 0 ; i < NumberOfProtocols ; ++i ) { Kleo::CryptoMessageFormat f = static_cast<Kleo::CryptoMessageFormat>( msgFormat ); mProtocolCB[ i ] = new TQCheckBox( Kleo::cryptoMessageFormatToLabel( f ), protGB ); - connect( mProtocolCB[i], TQT_SIGNAL( clicked() ), this, TQT_SLOT( setModified() ) ); + connect( mProtocolCB[i], TQ_SIGNAL( clicked() ), this, TQ_SLOT( setModified() ) ); // Iterating over a bitfield means *2 every time msgFormat *= 2; @@ -126,13 +126,13 @@ CryptoWidget::CryptoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const cha static_cast<Kleo::EncryptionPreference>( i ) ) ); // Emit "changed()" signal - connect( mSignPref, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( setModified() ) ); - connect( mCryptPref, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( setModified() ) ); + connect( mSignPref, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( setModified() ) ); + connect( mCryptPref, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( setModified() ) ); // Not optimal, but KeyRequester doesn't emit any signals when the key changes - connect( mPgpKey->eraseButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( setModified() ) ); - connect( mPgpKey->dialogButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( setModified() ) ); - connect( mSmimeCert->eraseButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( setModified() ) ); - connect( mSmimeCert->dialogButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( setModified() ) ); + connect( mPgpKey->eraseButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( setModified() ) ); + connect( mPgpKey->dialogButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( setModified() ) ); + connect( mSmimeCert->eraseButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( setModified() ) ); + connect( mSmimeCert->dialogButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( setModified() ) ); } CryptoWidget::~CryptoWidget() diff --git a/kaddressbook/editors/cryptowidget.h b/kaddressbook/editors/cryptowidget.h index 1d8794ba4..101b00341 100644 --- a/kaddressbook/editors/cryptowidget.h +++ b/kaddressbook/editors/cryptowidget.h @@ -35,7 +35,7 @@ class TQCheckBox; class CryptoWidget : public KAB::ContactEditorWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/editors/imaddressbase.ui b/kaddressbook/editors/imaddressbase.ui index 77988764e..f87bdff93 100644 --- a/kaddressbook/editors/imaddressbase.ui +++ b/kaddressbook/editors/imaddressbase.ui @@ -81,9 +81,9 @@ <tabstop>cmbProtocol</tabstop> <tabstop>edtAddress</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotProtocolChanged( const TQString & )</slot> <slot>slotProtocolChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaddressbook/editors/imaddresswidget.cpp b/kaddressbook/editors/imaddresswidget.cpp index 0a3336d6a..4cd7813db 100644 --- a/kaddressbook/editors/imaddresswidget.cpp +++ b/kaddressbook/editors/imaddresswidget.cpp @@ -60,10 +60,10 @@ IMAddressWidget::IMAddressWidget( TQWidget *parent, TQValueList<KPluginInfo *> p void IMAddressWidget::init() { - connect( cmbProtocol, TQT_SIGNAL( activated( const TQString& ) ), - this, TQT_SLOT( slotProtocolChanged() ) ); - connect( edtAddress, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotAddressChanged( const TQString& ) ) ); + connect( cmbProtocol, TQ_SIGNAL( activated( const TQString& ) ), + this, TQ_SLOT( slotProtocolChanged() ) ); + connect( edtAddress, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotAddressChanged( const TQString& ) ) ); slotProtocolChanged(); } diff --git a/kaddressbook/editors/imaddresswidget.h b/kaddressbook/editors/imaddresswidget.h index 9724ce775..a44f69f71 100644 --- a/kaddressbook/editors/imaddresswidget.h +++ b/kaddressbook/editors/imaddresswidget.h @@ -41,7 +41,7 @@ class KPluginInfo; */ class IMAddressWidget : public IMAddressBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp index 38d641c4c..9db30d9cc 100644 --- a/kaddressbook/editors/imeditorwidget.cpp +++ b/kaddressbook/editors/imeditorwidget.cpp @@ -148,14 +148,14 @@ IMEditorWidget::IMEditorWidget( TQWidget *parent, const TQString &preferredIM, c mWidget = new IMEditorBase( this ); setMainWidget( mWidget ); - connect( mWidget->btnAdd, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdd() ) ); - connect( mWidget->btnEdit, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEdit() ) ); - connect( mWidget->btnDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDelete() ) ); - connect( mWidget->btnSetStandard, TQT_SIGNAL( clicked()), TQT_SLOT( slotSetStandard() ) ); - connect( mWidget->lvAddresses, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotUpdateButtons() ) ); + connect( mWidget->btnAdd, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdd() ) ); + connect( mWidget->btnEdit, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEdit() ) ); + connect( mWidget->btnDelete, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDelete() ) ); + connect( mWidget->btnSetStandard, TQ_SIGNAL( clicked()), TQ_SLOT( slotSetStandard() ) ); + connect( mWidget->lvAddresses, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotUpdateButtons() ) ); - connect( mWidget->lvAddresses, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), - TQT_SLOT( slotEdit() ) ); + connect( mWidget->lvAddresses, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), + TQ_SLOT( slotEdit() ) ); setHelp( "managing-contacts-im-addresses" ); @@ -336,8 +336,8 @@ void IMEditorWidget::slotAdd() IMAddressWidget *addressWid = new IMAddressWidget( &addDialog, mProtocols ); addDialog.enableButtonOK( false ); - connect( addressWid, TQT_SIGNAL( inValidState( bool ) ), - &addDialog, TQT_SLOT( enableButtonOK( bool ) ) ); + connect( addressWid, TQ_SIGNAL( inValidState( bool ) ), + &addDialog, TQ_SLOT( enableButtonOK( bool ) ) ); addDialog.setMainWidget( addressWid ); if ( addDialog.exec() == TQDialog::Accepted ) { @@ -372,8 +372,8 @@ void IMEditorWidget::slotEdit() KDialogBase::Ok | KDialogBase::Cancel ); IMAddressWidget *addressWid = new IMAddressWidget( &editDialog, mProtocols, current->protocol(), current->address(), current->context() ) ; - connect( addressWid, TQT_SIGNAL( inValidState( bool ) ), - &editDialog, TQT_SLOT( enableButtonOK( bool ) ) ); + connect( addressWid, TQ_SIGNAL( inValidState( bool ) ), + &editDialog, TQ_SLOT( enableButtonOK( bool ) ) ); editDialog.setMainWidget( addressWid ); if ( editDialog.exec() == TQDialog::Accepted ) { diff --git a/kaddressbook/editors/imeditorwidget.h b/kaddressbook/editors/imeditorwidget.h index 1119144ce..4f347ca02 100644 --- a/kaddressbook/editors/imeditorwidget.h +++ b/kaddressbook/editors/imeditorwidget.h @@ -48,7 +48,7 @@ enum IMContext { Any, Home, Work }; */ class IMEditorWidget : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp index d517f0b62..ead36a0c7 100644 --- a/kaddressbook/emaileditwidget.cpp +++ b/kaddressbook/emaileditwidget.cpp @@ -97,15 +97,15 @@ EmailEditWidget::EmailEditWidget( TQWidget *parent, const char *name ) mEmailEdit = new KLineEdit( this ); mEmailEdit->setValidator( new EmailValidator ); - connect( mEmailEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); - connect( mEmailEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SIGNAL( modified() ) ); + connect( mEmailEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); + connect( mEmailEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SIGNAL( modified() ) ); label->setBuddy( mEmailEdit ); topLayout->addWidget( mEmailEdit, 0, 1 ); mEditButton = new TQPushButton( i18n( "Edit Email Addresses..." ), this); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) ); topLayout->addMultiCellWidget( mEditButton, 1, 1, 0, 1 ); topLayout->activate(); @@ -185,26 +185,26 @@ EmailEditDialog::EmailEditDialog( const TQStringList &list, TQWidget *parent, // Make sure there is room for the scrollbar mEmailListBox->setMinimumHeight( mEmailListBox->sizeHint().height() + 30 ); - connect( mEmailListBox, TQT_SIGNAL( highlighted( int ) ), - TQT_SLOT( selectionChanged( int ) ) ); - connect( mEmailListBox, TQT_SIGNAL( selected( int ) ), - TQT_SLOT( edit() ) ); + connect( mEmailListBox, TQ_SIGNAL( highlighted( int ) ), + TQ_SLOT( selectionChanged( int ) ) ); + connect( mEmailListBox, TQ_SIGNAL( selected( int ) ), + TQ_SLOT( edit() ) ); topLayout->addMultiCellWidget( mEmailListBox, 0, 3, 0, 1 ); mAddButton = new TQPushButton( i18n( "Add..." ), page ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( add() ) ); topLayout->addWidget( mAddButton, 0, 2 ); mEditButton = new TQPushButton( i18n( "Edit..." ), page ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) ); topLayout->addWidget( mEditButton, 1, 2 ); mRemoveButton = new TQPushButton( i18n( "Remove" ), page ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( remove() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( remove() ) ); topLayout->addWidget( mRemoveButton, 2, 2 ); mStandardButton = new TQPushButton( i18n( "Set Standard" ), page ); - connect( mStandardButton, TQT_SIGNAL( clicked() ), TQT_SLOT( standard() ) ); + connect( mStandardButton, TQ_SIGNAL( clicked() ), TQ_SLOT( standard() ) ); topLayout->addWidget( mStandardButton, 3, 2 ); topLayout->activate(); diff --git a/kaddressbook/emaileditwidget.h b/kaddressbook/emaileditwidget.h index 46d259a42..3f5d0a8de 100644 --- a/kaddressbook/emaileditwidget.h +++ b/kaddressbook/emaileditwidget.h @@ -43,7 +43,7 @@ class TDEListView; */ class EmailEditWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -70,7 +70,7 @@ class EmailEditWidget : public TQWidget class EmailEditDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp index 0e88486cd..bdc0801d2 100644 --- a/kaddressbook/extensionmanager.cpp +++ b/kaddressbook/extensionmanager.cpp @@ -52,7 +52,7 @@ ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detai Q_ASSERT( mExtensionBar ); TQVBoxLayout* layout = new TQVBoxLayout( mExtensionBar ); mSplitter = new TQSplitter( mExtensionBar ); - mSplitter->setOrientation( Qt::Vertical ); + mSplitter->setOrientation( TQt::Vertical ); layout->addWidget( mSplitter ); createExtensionWidgets(); @@ -60,7 +60,7 @@ ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detai mActionCollection = new TDEActionCollection( this, "ActionCollection" ); extensionBar->setShown( false ); - TQTimer::singleShot( 0, this, TQT_SLOT( createActions() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( createActions() ) ); } ExtensionManager::~ExtensionManager() @@ -162,13 +162,13 @@ void ExtensionManager::createActions() delete mMapper; mMapper = new TQSignalMapper( this, "SignalMapper" ); - connect( mMapper, TQT_SIGNAL( mapped( const TQString& ) ), - this, TQT_SLOT( activationToggled( const TQString& ) ) ); + connect( mMapper, TQ_SIGNAL( mapped( const TQString& ) ), + this, TQ_SLOT( activationToggled( const TQString& ) ) ); ExtensionData::List::ConstIterator it; for ( TQMap<TQString, ExtensionData>::Iterator it = mExtensionMap.begin(), end = mExtensionMap.end(); it != end; ++it ) { ExtensionData& data = it.data(); - data.action = new TDEToggleAction( data.title, 0, mMapper, TQT_SLOT( map() ), + data.action = new TDEToggleAction( data.title, 0, mMapper, TQ_SLOT( map() ), mActionCollection, TQString( data.identifier + "_extension" ).latin1() ); mMapper->setMapping( data.action, data.identifier ); @@ -202,10 +202,10 @@ void ExtensionManager::createExtensionWidgets() wdg = new AddresseeEditorExtension( mCore, mDetailsStack ); wdg->hide(); - connect( wdg, TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ), - TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ) ); - connect( wdg, TQT_SIGNAL( deleted( const TQStringList& ) ), - TQT_SIGNAL( deleted( const TQStringList& ) ) ); + connect( wdg, TQ_SIGNAL( modified( const TDEABC::Addressee::List& ) ), + TQ_SIGNAL( modified( const TDEABC::Addressee::List& ) ) ); + connect( wdg, TQ_SIGNAL( deleted( const TQStringList& ) ), + TQ_SIGNAL( deleted( const TQStringList& ) ) ); ExtensionData data; data.identifier = wdg->identifier(); @@ -239,10 +239,10 @@ void ExtensionManager::createExtensionWidgets() if ( wdg->identifier() == "distribution_list_editor_ng" ) mSplitter->moveToFirst( wdg ); wdg->hide(); - connect( wdg, TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ), - TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ) ); - connect( wdg, TQT_SIGNAL( deleted( const TQStringList& ) ), - TQT_SIGNAL( deleted( const TQStringList& ) ) ); + connect( wdg, TQ_SIGNAL( modified( const TDEABC::Addressee::List& ) ), + TQ_SIGNAL( modified( const TDEABC::Addressee::List& ) ) ); + connect( wdg, TQ_SIGNAL( deleted( const TQStringList& ) ), + TQ_SIGNAL( deleted( const TQStringList& ) ) ); ExtensionData data; data.identifier = wdg->identifier(); diff --git a/kaddressbook/extensionmanager.h b/kaddressbook/extensionmanager.h index fafa2e3b3..a44983aca 100644 --- a/kaddressbook/extensionmanager.h +++ b/kaddressbook/extensionmanager.h @@ -55,7 +55,7 @@ class ExtensionData class ExtensionManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp index 4a4a20a28..181744ad7 100644 --- a/kaddressbook/features/distributionlistngwidget.cpp +++ b/kaddressbook/features/distributionlistngwidget.cpp @@ -131,51 +131,51 @@ KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *pare mAddButton = new TQPushButton( this ); mAddButton->setIconSet( SmallIconSet( "add" ) ); TQToolTip::add( mAddButton, i18n( "Add distribution list" ) ); - connect( mAddButton, TQT_SIGNAL(clicked()), core, TQT_SLOT(newDistributionList()) ); + connect( mAddButton, TQ_SIGNAL(clicked()), core, TQ_SLOT(newDistributionList()) ); buttonLayout->addWidget( mAddButton ); mEditButton = new TQPushButton( this ); mEditButton->setIconSet( SmallIconSet( "edit" ) ); TQToolTip::add( mEditButton, i18n( "Edit distribution list" ) ); - connect( mEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editSelectedDistributionList()) ); + connect( mEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editSelectedDistributionList()) ); buttonLayout->addWidget( mEditButton ); mRemoveButton = new TQPushButton( this ); mRemoveButton->setIconSet( SmallIconSet( "remove" ) ); TQToolTip::add( mRemoveButton, i18n( "Remove distribution list" ) ); - connect( mRemoveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSelectedDistributionList()) ); + connect( mRemoveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSelectedDistributionList()) ); buttonLayout->addWidget( mRemoveButton ); mListBox = new ListBox( this ); - connect( mListBox, TQT_SIGNAL( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ), - this, TQT_SLOT( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ) ); - connect( mListBox, TQT_SIGNAL( dropped( const TQString &, const TDEABC::Addressee::List & ) ), - this, TQT_SLOT( contactsDropped( const TQString &, const TDEABC::Addressee::List & ) ) ); - connect( mListBox, TQT_SIGNAL( highlighted( int ) ), - this, TQT_SLOT( itemSelected( int ) ) ); - connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(editSelectedDistributionList()) ); + connect( mListBox, TQ_SIGNAL( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ), + this, TQ_SLOT( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ) ); + connect( mListBox, TQ_SIGNAL( dropped( const TQString &, const TDEABC::Addressee::List & ) ), + this, TQ_SLOT( contactsDropped( const TQString &, const TDEABC::Addressee::List & ) ) ); + connect( mListBox, TQ_SIGNAL( highlighted( int ) ), + this, TQ_SLOT( itemSelected( int ) ) ); + connect( mListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), TQ_SLOT(editSelectedDistributionList()) ); layout->addWidget( mListBox ); - connect( core, TQT_SIGNAL( contactsUpdated() ), - this, TQT_SLOT( updateEntries() ) ); - connect( core->addressBook(), TQT_SIGNAL( addressBookChanged( AddressBook* ) ), - this, TQT_SLOT( updateEntries() ) ); + connect( core, TQ_SIGNAL( contactsUpdated() ), + this, TQ_SLOT( updateEntries() ) ); + connect( core->addressBook(), TQ_SIGNAL( addressBookChanged( AddressBook* ) ), + this, TQ_SLOT( updateEntries() ) ); // When contacts are changed, update both distr list combo and contents of displayed distr list - connect( core, TQT_SIGNAL( contactsUpdated() ), - this, TQT_SLOT( updateEntries() ) ); + connect( core, TQ_SIGNAL( contactsUpdated() ), + this, TQ_SLOT( updateEntries() ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( updateEntries() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateEntries() ) ); } void KAB::DistributionListNg::MainWidget::contextMenuRequested( TQListBoxItem *item, const TQPoint &point ) { TQGuardedPtr<TDEPopupMenu> menu = new TDEPopupMenu( this ); - menu->insertItem( i18n( "New Distribution List..." ), core(), TQT_SLOT( newDistributionList() ) ); + menu->insertItem( i18n( "New Distribution List..." ), core(), TQ_SLOT( newDistributionList() ) ); if ( item && ( item->text() !=i18n( "All Contacts" ) ) ) { - menu->insertItem( i18n( "Edit..." ), this, TQT_SLOT( editSelectedDistributionList() ) ); - menu->insertItem( i18n( "Delete" ), this, TQT_SLOT( deleteSelectedDistributionList() ) ); + menu->insertItem( i18n( "Edit..." ), this, TQ_SLOT( editSelectedDistributionList() ) ); + menu->insertItem( i18n( "Delete" ), this, TQ_SLOT( deleteSelectedDistributionList() ) ); } menu->exec( point ); delete menu; diff --git a/kaddressbook/features/distributionlistngwidget.h b/kaddressbook/features/distributionlistngwidget.h index c8cf84d31..75cd50ced 100644 --- a/kaddressbook/features/distributionlistngwidget.h +++ b/kaddressbook/features/distributionlistngwidget.h @@ -46,7 +46,7 @@ namespace DistributionListNg { class ListBox : public TDEListBox { - Q_OBJECT + TQ_OBJECT public: ListBox( TQWidget* parent = 0 ); @@ -66,7 +66,7 @@ protected: class MainWidget : public KAB::ExtensionWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp index 28a6f8ff7..763248533 100644 --- a/kaddressbook/features/distributionlistwidget.cpp +++ b/kaddressbook/features/distributionlistwidget.cpp @@ -158,19 +158,19 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren mNameCombo = new TQComboBox( this ); topLayout->addWidget( mNameCombo, 0, 0 ); - connect( mNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateContactView() ) ); + connect( mNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( updateContactView() ) ); mCreateListButton = new TQPushButton( i18n( "New List..." ), this ); topLayout->addWidget( mCreateListButton, 0, 1 ); - connect( mCreateListButton, TQT_SIGNAL( clicked() ), TQT_SLOT( createList() ) ); + connect( mCreateListButton, TQ_SIGNAL( clicked() ), TQ_SLOT( createList() ) ); mEditListButton = new TQPushButton( i18n( "Rename List..." ), this ); topLayout->addWidget( mEditListButton, 0, 2 ); - connect( mEditListButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editList() ) ); + connect( mEditListButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editList() ) ); mRemoveListButton = new TQPushButton( i18n( "Remove List" ), this ); topLayout->addWidget( mRemoveListButton, 0, 3 ); - connect( mRemoveListButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeList() ) ); + connect( mRemoveListButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeList() ) ); mContactView = new DistributionListView( this ); mContactView->addColumn( i18n( "Name" ) ); @@ -180,40 +180,40 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren mContactView->setAllColumnsShowFocus( true ); mContactView->setFullWidth( true ); topLayout->addMultiCellWidget( mContactView, 1, 1, 0, 3 ); - connect( mContactView, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( selectionContactViewChanged() ) ); - connect( mContactView, TQT_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), - TQT_SLOT( dropped( TQDropEvent*, TQListViewItem* ) ) ); + connect( mContactView, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( selectionContactViewChanged() ) ); + connect( mContactView, TQ_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), + TQ_SLOT( dropped( TQDropEvent*, TQListViewItem* ) ) ); mAddContactButton = new TQPushButton( i18n( "Add Contact" ), this ); mAddContactButton->setEnabled( false ); topLayout->addWidget( mAddContactButton, 2, 0 ); - connect( mAddContactButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addContact() ) ); + connect( mAddContactButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addContact() ) ); mEntryCountLabel = new TQLabel( this ); topLayout->addWidget( mEntryCountLabel, 2, 1 ); mChangeEmailButton = new TQPushButton( i18n( "Change Email..." ), this ); topLayout->addWidget( mChangeEmailButton, 2, 2 ); - connect( mChangeEmailButton, TQT_SIGNAL( clicked() ), TQT_SLOT( changeEmail() ) ); + connect( mChangeEmailButton, TQ_SIGNAL( clicked() ), TQ_SLOT( changeEmail() ) ); mRemoveContactButton = new TQPushButton( i18n( "Remove Contact" ), this ); topLayout->addWidget( mRemoveContactButton, 2, 3 ); - connect( mRemoveContactButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeContact() ) ); + connect( mRemoveContactButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeContact() ) ); #ifdef TDEPIM_NEW_DISTRLISTS // When contacts are changed, update both distr list combo and contents of displayed distr list - connect( core, TQT_SIGNAL( contactsUpdated() ), - this, TQT_SLOT( updateNameCombo() ) ); + connect( core, TQ_SIGNAL( contactsUpdated() ), + this, TQ_SLOT( updateNameCombo() ) ); #else mManager = new TDEABC::DistributionListManager( core->addressBook() ); - connect( TDEABC::DistributionListWatcher::self(), TQT_SIGNAL( changed() ), - this, TQT_SLOT( updateNameCombo() ) ); + connect( TDEABC::DistributionListWatcher::self(), TQ_SIGNAL( changed() ), + this, TQ_SLOT( updateNameCombo() ) ); #endif - connect( core->addressBook(), TQT_SIGNAL( addressBookChanged( AddressBook* ) ), - this, TQT_SLOT( updateNameCombo() ) ); + connect( core->addressBook(), TQ_SIGNAL( addressBookChanged( AddressBook* ) ), + this, TQ_SLOT( updateNameCombo() ) ); updateNameCombo(); diff --git a/kaddressbook/features/distributionlistwidget.h b/kaddressbook/features/distributionlistwidget.h index e502dda1c..0b7e032c1 100644 --- a/kaddressbook/features/distributionlistwidget.h +++ b/kaddressbook/features/distributionlistwidget.h @@ -47,7 +47,7 @@ class DistributionListManager; class DistributionListWidget : public KAB::ExtensionWidget { - Q_OBJECT + TQ_OBJECT public: @@ -107,7 +107,7 @@ class DistributionListWidget : public KAB::ExtensionWidget */ class DistributionListView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp index 1d80c915a..4a16c5988 100644 --- a/kaddressbook/features/resourceselection.cpp +++ b/kaddressbook/features/resourceselection.cpp @@ -142,19 +142,19 @@ ResourceSelection::ResourceSelection( KAB::Core *core, TQWidget *parent, const c AddressBookWrapper *wrapper = static_cast<AddressBookWrapper*>( core->addressBook() ); mManager = wrapper->getResourceManager(); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( remove() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( add() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( remove() ) ); - connect( mListView, TQT_SIGNAL( clicked( TQListViewItem* ) ), - TQT_SLOT( currentChanged( TQListViewItem* ) ) ); + connect( mListView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + TQ_SLOT( currentChanged( TQListViewItem* ) ) ); - connect( mListView, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, + connect( mListView, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( contextMenuRequested( TQListViewItem *, const TQPoint &, + TQ_SLOT( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( updateView() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateView() ) ); } ResourceSelection::~ResourceSelection() @@ -167,24 +167,24 @@ void ResourceSelection::contextMenuRequested ( TQListViewItem *i, ResourceItem *item = static_cast<ResourceItem *>( i ); TQPopupMenu *menu = new TQPopupMenu( this ); - connect( menu, TQT_SIGNAL( aboutToHide() ), menu, TQT_SLOT( deleteLater() ) ); + connect( menu, TQ_SIGNAL( aboutToHide() ), menu, TQ_SLOT( deleteLater() ) ); if ( item ) { int reloadId = menu->insertItem( i18n("Re&load"), this, - TQT_SLOT( reloadResource() ) ); + TQ_SLOT( reloadResource() ) ); menu->setItemEnabled( reloadId, item->resource()->isActive() ); int saveId = menu->insertItem( i18n("&Save"), this, - TQT_SLOT( saveResource() ) ); + TQ_SLOT( saveResource() ) ); menu->setItemEnabled( saveId, item->resource()->isActive() ); menu->insertSeparator(); -// menu->insertItem( i18n("Show &Info"), this, TQT_SLOT( showInfo() ) ); +// menu->insertItem( i18n("Show &Info"), this, TQ_SLOT( showInfo() ) ); - menu->insertItem( i18n("&Edit..."), this, TQT_SLOT( edit() ) ); - menu->insertItem( i18n("&Remove"), this, TQT_SLOT( remove() ) ); + menu->insertItem( i18n("&Edit..."), this, TQ_SLOT( edit() ) ); + menu->insertItem( i18n("&Remove"), this, TQ_SLOT( remove() ) ); menu->insertSeparator(); } - menu->insertItem( i18n("&Add..."), this, TQT_SLOT( add() ) ); + menu->insertItem( i18n("&Add..."), this, TQ_SLOT( add() ) ); menu->popup( pos ); } @@ -368,23 +368,23 @@ void ResourceSelection::updateView() KPIM::ResourceABC* resource = dynamic_cast<KPIM::ResourceABC *>( *it ); if ( resource ) { disconnect( resource, 0, this, 0 ); - connect( resource, TQT_SIGNAL( signalSubresourceAdded( KPIM::ResourceABC *, + connect( resource, TQ_SIGNAL( signalSubresourceAdded( KPIM::ResourceABC *, const TQString &, const TQString & ) ), - TQT_SLOT( slotSubresourceAdded( KPIM::ResourceABC *, + TQ_SLOT( slotSubresourceAdded( KPIM::ResourceABC *, const TQString &, const TQString & ) ) ); - connect( resource, TQT_SIGNAL( signalSubresourceRemoved( KPIM::ResourceABC *, + connect( resource, TQ_SIGNAL( signalSubresourceRemoved( KPIM::ResourceABC *, const TQString &, const TQString & ) ), - TQT_SLOT( slotSubresourceRemoved( KPIM::ResourceABC *, + TQ_SLOT( slotSubresourceRemoved( KPIM::ResourceABC *, const TQString &, const TQString & ) ) ); - connect( resource, TQT_SIGNAL( signalSubresourceChanged( KPIM::ResourceABC *, + connect( resource, TQ_SIGNAL( signalSubresourceChanged( KPIM::ResourceABC *, const TQString &, const TQString & ) ), - TQT_SLOT( slotSubresourceChanged( KPIM::ResourceABC *, + TQ_SLOT( slotSubresourceChanged( KPIM::ResourceABC *, const TQString &, const TQString & ) ) ); - //connect( resource, TQT_SIGNAL( resourceSaved( KPIM::ResourceABC * ) ), - // TQT_SLOT( closeResource( KPIM::ResourceABC * ) ) ); + //connect( resource, TQ_SIGNAL( resourceSaved( KPIM::ResourceABC * ) ), + // TQ_SLOT( closeResource( KPIM::ResourceABC * ) ) ); item->createSubresourceItems(); } } diff --git a/kaddressbook/features/resourceselection.h b/kaddressbook/features/resourceselection.h index a627fb512..f4914742a 100644 --- a/kaddressbook/features/resourceselection.h +++ b/kaddressbook/features/resourceselection.h @@ -37,7 +37,7 @@ class ResourceItem; class ResourceSelection : public KAB::ExtensionWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp index 09c06ae48..684fe1e69 100644 --- a/kaddressbook/filtereditdialog.cpp +++ b/kaddressbook/filtereditdialog.cpp @@ -124,8 +124,8 @@ void FilterEditDialog::initGUI() mNameEdit->setFocus(); topLayout->addWidget( label, 0, 0 ); topLayout->addWidget( mNameEdit, 0, 1 ); - connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( filterNameTextChanged( const TQString&) ) ); + connect( mNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( filterNameTextChanged( const TQString&) ) ); mCategoriesView = new TDEListView( page ); mCategoriesView->addColumn( i18n( "Category" ) ); @@ -260,16 +260,16 @@ void FilterDialog::initGUI() mFilterListBox = new TDEListBox( page ); topLayout->addWidget( mFilterListBox, 0, 0 ); - connect( mFilterListBox, TQT_SIGNAL( selectionChanged( TQListBoxItem * ) ), - TQT_SLOT( selectionChanged( TQListBoxItem * ) ) ); - connect( mFilterListBox, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ), - TQT_SLOT( edit() ) ); - - KButtonBox *buttonBox = new KButtonBox( page, Qt::Vertical ); - buttonBox->addButton( i18n( "&Add..." ), TQT_TQOBJECT(this), TQT_SLOT( add() ) ); - mEditButton = buttonBox->addButton( i18n( "&Edit..." ), TQT_TQOBJECT(this), TQT_SLOT( edit() ) ); + connect( mFilterListBox, TQ_SIGNAL( selectionChanged( TQListBoxItem * ) ), + TQ_SLOT( selectionChanged( TQListBoxItem * ) ) ); + connect( mFilterListBox, TQ_SIGNAL( doubleClicked ( TQListBoxItem * ) ), + TQ_SLOT( edit() ) ); + + KButtonBox *buttonBox = new KButtonBox( page, TQt::Vertical ); + buttonBox->addButton( i18n( "&Add..." ), this, TQ_SLOT( add() ) ); + mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, TQ_SLOT( edit() ) ); mEditButton->setEnabled( false ); - mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), TQT_TQOBJECT(this), TQT_SLOT( remove() ) ); + mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, TQ_SLOT( remove() ) ); mRemoveButton->setEnabled( false ); buttonBox->layout(); diff --git a/kaddressbook/filtereditdialog.h b/kaddressbook/filtereditdialog.h index 3e2c9acf3..39698ad7e 100644 --- a/kaddressbook/filtereditdialog.h +++ b/kaddressbook/filtereditdialog.h @@ -39,7 +39,7 @@ class TDEListView; class FilterDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -70,7 +70,7 @@ class FilterDialog : public KDialogBase class FilterEditDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: FilterEditDialog( TQWidget *parent, const char *name = 0 ); diff --git a/kaddressbook/filterselectionwidget.cpp b/kaddressbook/filterselectionwidget.cpp index 7daca0a49..41619cc5b 100644 --- a/kaddressbook/filterselectionwidget.cpp +++ b/kaddressbook/filterselectionwidget.cpp @@ -38,8 +38,8 @@ FilterSelectionWidget::FilterSelectionWidget( TQWidget *parent, const char *name mFilterCombo = new KComboBox( this ); label->setBuddy( mFilterCombo ); - connect( mFilterCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SIGNAL( filterActivated( int ) ) ); + connect( mFilterCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SIGNAL( filterActivated( int ) ) ); } FilterSelectionWidget::~FilterSelectionWidget() diff --git a/kaddressbook/filterselectionwidget.h b/kaddressbook/filterselectionwidget.h index 4e0c67283..f0ebba2a9 100644 --- a/kaddressbook/filterselectionwidget.h +++ b/kaddressbook/filterselectionwidget.h @@ -35,7 +35,7 @@ class KComboBox; */ class FilterSelectionWidget : public TQHBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/freebusywidget.cpp b/kaddressbook/freebusywidget.cpp index 491a94658..f1d11f0b3 100644 --- a/kaddressbook/freebusywidget.cpp +++ b/kaddressbook/freebusywidget.cpp @@ -45,8 +45,8 @@ FreeBusyWidget::FreeBusyWidget( TDEABC::AddressBook *ab, TQWidget *parent, const label->setBuddy( mURL ); layout->addWidget( mURL ); - connect( mURL, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( setModified() ) ); + connect( mURL, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( setModified() ) ); } FreeBusyWidget::~FreeBusyWidget() diff --git a/kaddressbook/freebusywidget.h b/kaddressbook/freebusywidget.h index d9c9ba501..1098b9af9 100644 --- a/kaddressbook/freebusywidget.h +++ b/kaddressbook/freebusywidget.h @@ -30,7 +30,7 @@ class FreeBusyWidget : public KAB::ContactEditorWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp index 8e9726c58..b364202e1 100644 --- a/kaddressbook/geowidget.cpp +++ b/kaddressbook/geowidget.cpp @@ -84,21 +84,21 @@ GeoWidget::GeoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *nam mExtendedButton->setEnabled( false ); topLayout->addMultiCellWidget( mExtendedButton, 3, 3, 1, 2 ); - connect( mLatitudeBox, TQT_SIGNAL( valueChanged( double ) ), - TQT_SLOT( setModified() ) ); - connect( mLongitudeBox, TQT_SIGNAL( valueChanged( double ) ), - TQT_SLOT( setModified() ) ); - connect( mExtendedButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( editGeoData() ) ); - - connect( mGeoIsValid, TQT_SIGNAL( toggled( bool ) ), - mLatitudeBox, TQT_SLOT( setEnabled( bool ) ) ); - connect( mGeoIsValid, TQT_SIGNAL( toggled( bool ) ), - mLongitudeBox, TQT_SLOT( setEnabled( bool ) ) ); - connect( mGeoIsValid, TQT_SIGNAL( toggled( bool ) ), - mExtendedButton, TQT_SLOT( setEnabled( bool ) ) ); - connect( mGeoIsValid, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( setModified() ) ); + connect( mLatitudeBox, TQ_SIGNAL( valueChanged( double ) ), + TQ_SLOT( setModified() ) ); + connect( mLongitudeBox, TQ_SIGNAL( valueChanged( double ) ), + TQ_SLOT( setModified() ) ); + connect( mExtendedButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( editGeoData() ) ); + + connect( mGeoIsValid, TQ_SIGNAL( toggled( bool ) ), + mLatitudeBox, TQ_SLOT( setEnabled( bool ) ) ); + connect( mGeoIsValid, TQ_SIGNAL( toggled( bool ) ), + mLongitudeBox, TQ_SLOT( setEnabled( bool ) ) ); + connect( mGeoIsValid, TQ_SIGNAL( toggled( bool ) ), + mExtendedButton, TQ_SLOT( setEnabled( bool ) ) ); + connect( mGeoIsValid, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( setModified() ) ); } GeoWidget::~GeoWidget() @@ -174,7 +174,7 @@ GeoDialog::GeoDialog( TQWidget *parent, const char *name ) mCityCombo = new KComboBox( page ); topLayout->addWidget( mCityCombo, 0, 1 ); - TQGroupBox *sexagesimalGroup = new TQGroupBox( 0, Qt::Vertical, i18n( "Sexagesimal" ), page ); + TQGroupBox *sexagesimalGroup = new TQGroupBox( 0, TQt::Vertical, i18n( "Sexagesimal" ), page ); TQGridLayout *sexagesimalLayout = new TQGridLayout( sexagesimalGroup->layout(), 2, 5, spacingHint() ); @@ -225,26 +225,26 @@ GeoDialog::GeoDialog( TQWidget *parent, const char *name ) loadCityList(); - connect( mMapWidget, TQT_SIGNAL( changed() ), - TQT_SLOT( geoMapChanged() ) ); - connect( mCityCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( cityInputChanged() ) ); - connect( mLatDegrees, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); - connect( mLatMinutes, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); - connect( mLatSeconds, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); - connect( mLatDirection, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); - connect( mLongDegrees, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); - connect( mLongMinutes, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); - connect( mLongSeconds, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); - connect( mLongDirection, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); + connect( mMapWidget, TQ_SIGNAL( changed() ), + TQ_SLOT( geoMapChanged() ) ); + connect( mCityCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( cityInputChanged() ) ); + connect( mLatDegrees, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); + connect( mLatMinutes, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); + connect( mLatSeconds, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); + connect( mLatDirection, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); + connect( mLongDegrees, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); + connect( mLongMinutes, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); + connect( mLongSeconds, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); + connect( mLongDirection, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); TDEAcceleratorManager::manage( this ); } diff --git a/kaddressbook/geowidget.h b/kaddressbook/geowidget.h index 9694edcce..62742bb63 100644 --- a/kaddressbook/geowidget.h +++ b/kaddressbook/geowidget.h @@ -50,7 +50,7 @@ typedef struct { class GeoWidget : public KAB::ContactEditorWidget { - Q_OBJECT + TQ_OBJECT public: @@ -77,7 +77,7 @@ class GeoWidget : public KAB::ContactEditorWidget class GeoDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -123,7 +123,7 @@ class GeoDialog : public KDialogBase class GeoMapWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp index f10bf7b20..2ff5bdef4 100644 --- a/kaddressbook/imagewidget.cpp +++ b/kaddressbook/imagewidget.cpp @@ -109,7 +109,7 @@ ImageButton::ImageButton( const TQString &title, TQWidget *parent ) { setAcceptDrops( true ); - connect( this, TQT_SIGNAL( clicked() ), TQT_SLOT( load() ) ); + connect( this, TQ_SIGNAL( clicked() ), TQ_SLOT( load() ) ); } void ImageButton::setReadOnly( bool readOnly ) @@ -206,7 +206,7 @@ void ImageButton::mousePressEvent( TQMouseEvent *event ) void ImageButton::mouseMoveEvent( TQMouseEvent *event ) { - if ( (event->state() & Qt::LeftButton) && + if ( (event->state() & TQt::LeftButton) && (event->pos() - mDragStartPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { startDrag(); @@ -216,7 +216,7 @@ void ImageButton::mouseMoveEvent( TQMouseEvent *event ) void ImageButton::contextMenuEvent( TQContextMenuEvent *event ) { TQPopupMenu menu( this ); - menu.insertItem( i18n( "Reset" ), this, TQT_SLOT( clear() ) ); + menu.insertItem( i18n( "Reset" ), this, TQ_SLOT( clear() ) ); menu.exec( event->globalPos() ); } @@ -254,7 +254,7 @@ ImageBaseWidget::ImageBaseWidget( const TQString &title, TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical, title, this ); + TQGroupBox *box = new TQGroupBox( 0, TQt::Vertical, title, this ); TQVBoxLayout *layout = new TQVBoxLayout( box->layout(), KDialog::spacingHint() ); mImageButton = new ImageButton( i18n( "Picture" ), box ); @@ -264,7 +264,7 @@ ImageBaseWidget::ImageBaseWidget( const TQString &title, topLayout->addWidget( box ); - connect( mImageButton, TQT_SIGNAL( changed() ), TQT_SIGNAL( changed() ) ); + connect( mImageButton, TQ_SIGNAL( changed() ), TQ_SIGNAL( changed() ) ); } ImageBaseWidget::~ImageBaseWidget() @@ -302,8 +302,8 @@ ImageWidget::ImageWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char mLogoWidget = new ImageBaseWidget( TDEABC::Addressee::logoLabel(), this ); layout->addWidget( mLogoWidget ); - connect( mPhotoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) ); - connect( mLogoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) ); + connect( mPhotoWidget, TQ_SIGNAL( changed() ), TQ_SLOT( setModified() ) ); + connect( mLogoWidget, TQ_SIGNAL( changed() ), TQ_SLOT( setModified() ) ); } void ImageWidget::loadContact( TDEABC::Addressee *addr ) diff --git a/kaddressbook/imagewidget.h b/kaddressbook/imagewidget.h index 77c26478e..1cfcdd2df 100644 --- a/kaddressbook/imagewidget.h +++ b/kaddressbook/imagewidget.h @@ -37,7 +37,7 @@ */ class ImageLoader : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -55,7 +55,7 @@ class ImageLoader : public TQObject */ class ImageButton : public TQPushButton { - Q_OBJECT + TQ_OBJECT public: @@ -97,7 +97,7 @@ class ImageButton : public TQPushButton class ImageBaseWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/imeditwidget.cpp b/kaddressbook/imeditwidget.cpp index b7f812dbf..6f7ebf29e 100644 --- a/kaddressbook/imeditwidget.cpp +++ b/kaddressbook/imeditwidget.cpp @@ -53,15 +53,15 @@ IMEditWidget::IMEditWidget( TQWidget *parent, TDEABC::Addressee &addr, const cha topLayout->addWidget( label, 0, 0 ); mIMEdit = new KLineEdit( this ); - connect( mIMEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); - connect( mIMEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SIGNAL( modified() ) ); + connect( mIMEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); + connect( mIMEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SIGNAL( modified() ) ); label->setBuddy( mIMEdit ); topLayout->addWidget( mIMEdit, 0, 1 ); mEditButton = new TQPushButton( i18n( "Edit IM Addresses..." ), this); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) ); topLayout->addMultiCellWidget( mEditButton, 1, 1, 0, 1 ); topLayout->activate(); diff --git a/kaddressbook/imeditwidget.h b/kaddressbook/imeditwidget.h index ce6b1a943..571ca64d8 100644 --- a/kaddressbook/imeditwidget.h +++ b/kaddressbook/imeditwidget.h @@ -43,7 +43,7 @@ class TDEListView; */ class IMEditWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp index efd68ebdf..96b655b45 100644 --- a/kaddressbook/incsearchwidget.cpp +++ b/kaddressbook/incsearchwidget.cpp @@ -73,18 +73,18 @@ IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name ) mInputTimer = new TQTimer( this ); - connect( mInputTimer, TQT_SIGNAL( timeout() ), - TQT_SLOT( timeout() ) ); - connect( mSearchText, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( announceDoSearch() ) ); - connect( mSearchText, TQT_SIGNAL( returnPressed() ), - TQT_SLOT( announceDoSearch() ) ); - connect( mFieldCombo, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( announceDoSearch() ) ); - connect( button, TQT_SIGNAL( clicked() ), - mSearchText, TQT_SLOT( clear() ) ); - connect( button, TQT_SIGNAL( clicked() ), - TQT_SLOT( announceDoSearch() ) ); + connect( mInputTimer, TQ_SIGNAL( timeout() ), + TQ_SLOT( timeout() ) ); + connect( mSearchText, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( announceDoSearch() ) ); + connect( mSearchText, TQ_SIGNAL( returnPressed() ), + TQ_SLOT( announceDoSearch() ) ); + connect( mFieldCombo, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( announceDoSearch() ) ); + connect( button, TQ_SIGNAL( clicked() ), + mSearchText, TQ_SLOT( clear() ) ); + connect( button, TQ_SIGNAL( clicked() ), + TQ_SLOT( announceDoSearch() ) ); initFields(); diff --git a/kaddressbook/incsearchwidget.h b/kaddressbook/incsearchwidget.h index 3d5732027..6f3c666db 100644 --- a/kaddressbook/incsearchwidget.h +++ b/kaddressbook/incsearchwidget.h @@ -34,7 +34,7 @@ class KLineEdit; class IncSearchWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h index 6927c7a82..5c44e3ecc 100644 --- a/kaddressbook/interfaces/contacteditorwidget.h +++ b/kaddressbook/interfaces/contacteditorwidget.h @@ -36,7 +36,7 @@ namespace KAB { class KDE_EXPORT ContactEditorWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h index 6632984d7..1c578e23b 100644 --- a/kaddressbook/interfaces/core.h +++ b/kaddressbook/interfaces/core.h @@ -54,7 +54,7 @@ class SearchManager; class KDE_EXPORT Core : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -155,32 +155,32 @@ class KDE_EXPORT Core : public TQObject virtual void setContactSelected( const TQString &uid ) = 0; /** - DCOP METHOD: Adds the given email address to address book. + DCOP method: Adds the given email address to address book. */ virtual void addEmail( const TQString& addr ) = 0; /** - DCOP METHOD: Imports the vCard, located at the given url. + DCOP method: Imports the vCard, located at the given url. */ virtual void importVCard( const KURL& url ) = 0; /** - DCOP METHOD: Imports the given vCard. + DCOP method: Imports the given vCard. */ virtual void importVCardFromData( const TQString& vCard ) = 0; /** - DCOP METHOD: Opens contact editor to input a new contact. + DCOP method: Opens contact editor to input a new contact. */ virtual void newContact() = 0; /** - DCOP METHOD: Opens distribution list editor to input a new distribution list. + DCOP method: Opens distribution list editor to input a new distribution list. */ virtual void newDistributionList() = 0; /** - DCOP METHOD: Returns the name of the contact, that matches the given + DCOP method: Returns the name of the contact, that matches the given phone number. */ virtual TQString getNameByPhone( const TQString& phone ) = 0; diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h index bcffc9b8b..8422a3c27 100644 --- a/kaddressbook/interfaces/extensionwidget.h +++ b/kaddressbook/interfaces/extensionwidget.h @@ -38,7 +38,7 @@ class ConfigureWidget; class KDE_EXPORT ExtensionWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp index a2874e8c6..ca7da285f 100644 --- a/kaddressbook/interfaces/xxport.cpp +++ b/kaddressbook/interfaces/xxport.cpp @@ -50,10 +50,10 @@ XXPort::XXPort( TDEABC::AddressBook *ab, TQWidget *parent, d->mExportMapper = new TQSignalMapper( this ); d->mImportMapper = new TQSignalMapper( this ); - connect( d->mExportMapper, TQT_SIGNAL( mapped( const TQString& ) ), - TQT_SLOT( slotExportActivated( const TQString& ) ) ); - connect( d->mImportMapper, TQT_SIGNAL( mapped( const TQString& ) ), - TQT_SLOT( slotImportActivated( const TQString& ) ) ); + connect( d->mExportMapper, TQ_SIGNAL( mapped( const TQString& ) ), + TQ_SLOT( slotExportActivated( const TQString& ) ) ); + connect( d->mImportMapper, TQ_SIGNAL( mapped( const TQString& ) ), + TQ_SLOT( slotImportActivated( const TQString& ) ) ); } XXPort::~XXPort() @@ -77,7 +77,7 @@ TDEABC::AddresseeList XXPort::importContacts( const TQString& ) const void XXPort::createImportAction( const TQString &label, const TQString &data ) { TQString id = "file_import_" + identifier() + ( data.isEmpty() ? TQString( "" ) : "_" + data ); - TDEAction *action = new TDEAction( label, 0, d->mImportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() ); + TDEAction *action = new TDEAction( label, 0, d->mImportMapper, TQ_SLOT( map() ), actionCollection(), id.latin1() ); d->mImportMapper->setMapping( action, ( data.isEmpty() ? TQString( "<empty>" ) : data ) ); @@ -87,7 +87,7 @@ void XXPort::createImportAction( const TQString &label, const TQString &data ) void XXPort::createExportAction( const TQString &label, const TQString &data ) { TQString id = "file_export_" + identifier() + ( data.isEmpty() ? TQString( "" ) : "_" + data ); - TDEAction *action = new TDEAction( label, 0, d->mExportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() ); + TDEAction *action = new TDEAction( label, 0, d->mExportMapper, TQ_SLOT( map() ), actionCollection(), id.latin1() ); d->mExportMapper->setMapping( action, ( data.isEmpty() ? TQString( "<empty>" ) : data ) ); diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h index a22205957..bed5b0577 100644 --- a/kaddressbook/interfaces/xxport.h +++ b/kaddressbook/interfaces/xxport.h @@ -67,7 +67,7 @@ namespace KAB { class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index 878fff5d7..f58546cac 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -72,7 +72,7 @@ JumpButtonBar::JumpButtonBar( KAB::Core *core, TQWidget *parent, const char *nam layout->setAutoAdd( true ); layout->setResizeMode( TQLayout::FreeResize ); - mGroupBox = new TQButtonGroup( 1, Qt::Horizontal, this ); + mGroupBox = new TQButtonGroup( 1, TQt::Horizontal, this ); mGroupBox->setExclusive( true ); mGroupBox->layout()->setSpacing( 0 ); mGroupBox->layout()->setMargin( 0 ); @@ -98,7 +98,7 @@ void JumpButtonBar::updateButtons() TQFontMetrics fm = fontMetrics(); TQPushButton *btn = new TQPushButton( "", this ); btn->hide(); - TQSize buttonSize = style().tqsizeFromContents( TQStyle::CT_PushButton, btn, + TQSize buttonSize = style().sizeFromContents( TQStyle::CT_PushButton, btn, fm.size( ShowPrefix, "X - X") ). expandedTo( TQApplication::globalStrut() ); delete btn; @@ -132,7 +132,7 @@ void JumpButtonBar::updateButtons() for ( uint i = 0; i < characters.count(); ++i ) { JumpButton *button = new JumpButton( characters[ i ], TQString(), mGroupBox ); - connect( button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( letterClicked() ) ); + connect( button, TQ_SIGNAL( clicked() ), this, TQ_SLOT( letterClicked() ) ); mButtons.append( button ); button->show(); } @@ -151,7 +151,7 @@ void JumpButtonBar::updateButtons() if ( characters.count() - current <= possibleButtons - i ) { JumpButton *button = new JumpButton( characters[ current ], TQString(), mGroupBox ); - connect( button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( letterClicked() ) ); + connect( button, TQ_SIGNAL( clicked() ), this, TQ_SLOT( letterClicked() ) ); mButtons.append( button ); button->show(); current++; @@ -163,7 +163,7 @@ void JumpButtonBar::updateButtons() range.append( characters[ j ] ); JumpButton *button = new JumpButton( characters[ current ], characters[ pos ], mGroupBox ); - connect( button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( letterClicked() ) ); + connect( button, TQ_SIGNAL( clicked() ), this, TQ_SLOT( letterClicked() ) ); mButtons.append( button ); button->show(); current = ( i + 1 ) * offset; diff --git a/kaddressbook/jumpbuttonbar.h b/kaddressbook/jumpbuttonbar.h index 48a520184..4be2fafc3 100644 --- a/kaddressbook/jumpbuttonbar.h +++ b/kaddressbook/jumpbuttonbar.h @@ -46,7 +46,7 @@ class Field; */ class JumpButtonBar : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 2f60f0468..85b08976b 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -94,7 +94,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, const TQString &file, const char *name ) - : KAB::Core( client, TQT_TQOBJECT(parent), name ), mStatusBar( 0 ), mViewManager( 0 ), + : KAB::Core( client, parent, name ), mStatusBar( 0 ), mViewManager( 0 ), mExtensionManager( 0 ), mJumpButtonBar( 0 ), mCategorySelectDialog( 0 ), mCategoryEditDialog( 0 ), mLdapSearchDialog( 0 ), mReadWrite( readWrite ), mModified( false ) @@ -104,8 +104,8 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, mIsPart = !parent->isA( "KAddressBookMain" ); mAddressBookChangedTimer = new TQTimer( this ); - connect( mAddressBookChangedTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( addressBookChanged() ) ); + connect( mAddressBookChangedTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( addressBookChanged() ) ); if ( file.isEmpty() ) { mAddressBook = TDEABC::StdAddressBook::self( true ); @@ -140,51 +140,51 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, mAddressBook->addCustomField( i18n( "Blog" ), TDEABC::Field::Personal, "BlogFeed", "KADDRESSBOOK" ); - mSearchManager = new KAB::SearchManager( mAddressBook, TQT_TQOBJECT(parent) ); + mSearchManager = new KAB::SearchManager( mAddressBook, parent ); - connect( mSearchManager, TQT_SIGNAL( contactsUpdated() ), - this, TQT_SLOT( slotContactsUpdated() ) ); + connect( mSearchManager, TQ_SIGNAL( contactsUpdated() ), + this, TQ_SLOT( slotContactsUpdated() ) ); initGUI(); - connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ), - TQT_SLOT( delayedAddressBookChanged() ) ); - connect( mAddressBook, TQT_SIGNAL( loadingFinished( Resource* ) ), - TQT_SLOT( delayedAddressBookChanged() ) ); + connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook* ) ), + TQ_SLOT( delayedAddressBookChanged() ) ); + connect( mAddressBook, TQ_SIGNAL( loadingFinished( Resource* ) ), + TQ_SLOT( delayedAddressBookChanged() ) ); mIncSearchWidget->setFocus(); - connect( mViewManager, TQT_SIGNAL( selected( const TQString& ) ), - TQT_SLOT( setContactSelected( const TQString& ) ) ); - connect( mViewManager, TQT_SIGNAL( executed( const TQString& ) ), - TQT_SLOT( editContact( const TQString& ) ) ); - connect( mViewManager, TQT_SIGNAL( modified() ), - TQT_SLOT( setModified() ) ); - connect( mViewManager, TQT_SIGNAL( urlDropped( const KURL& ) ), - mXXPortManager, TQT_SLOT( importVCard( const KURL& ) ) ); - connect( mViewManager, TQT_SIGNAL( viewFieldsChanged() ), - TQT_SLOT( updateIncSearchWidget() ) ); - connect( mExtensionManager, TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ), - this, TQT_SLOT( extensionModified( const TDEABC::Addressee::List& ) ) ); - connect( mExtensionManager, TQT_SIGNAL( deleted( const TQStringList& ) ), - this, TQT_SLOT( extensionDeleted( const TQStringList& ) ) ); - - connect( mXXPortManager, TQT_SIGNAL( modified() ), - TQT_SLOT( setModified() ) ); - - connect( mDetailsViewer, TQT_SIGNAL( highlightedMessage( const TQString& ) ), - TQT_SLOT( detailsHighlighted( const TQString& ) ) ); - - connect( mIncSearchWidget, TQT_SIGNAL( scrollUp() ), - mViewManager, TQT_SLOT( scrollUp() ) ); - connect( mIncSearchWidget, TQT_SIGNAL( scrollDown() ), - mViewManager, TQT_SLOT( scrollDown() ) ); + connect( mViewManager, TQ_SIGNAL( selected( const TQString& ) ), + TQ_SLOT( setContactSelected( const TQString& ) ) ); + connect( mViewManager, TQ_SIGNAL( executed( const TQString& ) ), + TQ_SLOT( editContact( const TQString& ) ) ); + connect( mViewManager, TQ_SIGNAL( modified() ), + TQ_SLOT( setModified() ) ); + connect( mViewManager, TQ_SIGNAL( urlDropped( const KURL& ) ), + mXXPortManager, TQ_SLOT( importVCard( const KURL& ) ) ); + connect( mViewManager, TQ_SIGNAL( viewFieldsChanged() ), + TQ_SLOT( updateIncSearchWidget() ) ); + connect( mExtensionManager, TQ_SIGNAL( modified( const TDEABC::Addressee::List& ) ), + this, TQ_SLOT( extensionModified( const TDEABC::Addressee::List& ) ) ); + connect( mExtensionManager, TQ_SIGNAL( deleted( const TQStringList& ) ), + this, TQ_SLOT( extensionDeleted( const TQStringList& ) ) ); + + connect( mXXPortManager, TQ_SIGNAL( modified() ), + TQ_SLOT( setModified() ) ); + + connect( mDetailsViewer, TQ_SIGNAL( highlightedMessage( const TQString& ) ), + TQ_SLOT( detailsHighlighted( const TQString& ) ) ); + + connect( mIncSearchWidget, TQ_SIGNAL( scrollUp() ), + mViewManager, TQ_SLOT( scrollUp() ) ); + connect( mIncSearchWidget, TQ_SIGNAL( scrollDown() ), + mViewManager, TQ_SLOT( scrollDown() ) ); mAddressBookService = new KAddressBookService( this ); mCommandHistory = new KCommandHistory( actionCollection(), true ); - connect( mCommandHistory, TQT_SIGNAL( commandExecuted() ), - mSearchManager, TQT_SLOT( reload() ) ); + connect( mCommandHistory, TQ_SIGNAL( commandExecuted() ), + mSearchManager, TQ_SLOT( reload() ) ); mSearchManager->reload(); @@ -1026,10 +1026,10 @@ void KABCore::openLDAPDialog() if ( !mLdapSearchDialog ) { mLdapSearchDialog = new LDAPSearchDialog( mAddressBook, this, mWidget ); - connect( mLdapSearchDialog, TQT_SIGNAL( addresseesAdded() ), - TQT_SLOT( addressBookChanged() ) ); - connect( mLdapSearchDialog, TQT_SIGNAL( addresseesAdded() ), - TQT_SLOT( setModified() ) ); + connect( mLdapSearchDialog, TQ_SIGNAL( addresseesAdded() ), + TQ_SLOT( addressBookChanged() ) ); + connect( mLdapSearchDialog, TQ_SIGNAL( addresseesAdded() ), + TQ_SLOT( setModified() ) ); } else mLdapSearchDialog->restoreSettings(); @@ -1043,8 +1043,8 @@ void KABCore::configure() saveSettings(); KCMultiDialog dlg( mWidget, "", true ); - connect( &dlg, TQT_SIGNAL( configCommitted() ), - this, TQT_SLOT( configurationChanged() ) ); + connect( &dlg, TQ_SIGNAL( configCommitted() ), + this, TQ_SLOT( configurationChanged() ) ); dlg.addModule( "kabconfig.desktop" ); dlg.addModule( "kabldapconfig.desktop" ); @@ -1157,10 +1157,10 @@ AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( TQWidget *parent, { AddresseeEditorDialog *dialog = new AddresseeEditorDialog( this, parent, name ? name : "editorDialog" ); - connect( dialog, TQT_SIGNAL( contactModified( const TDEABC::Addressee& ) ), - TQT_SLOT( contactModified( const TDEABC::Addressee& ) ) ); - connect( dialog, TQT_SIGNAL( editorDestroyed( const TQString& ) ), - TQT_SLOT( slotEditorDestroyed( const TQString& ) ) ); + connect( dialog, TQ_SIGNAL( contactModified( const TDEABC::Addressee& ) ), + TQ_SLOT( contactModified( const TDEABC::Addressee& ) ) ); + connect( dialog, TQ_SIGNAL( editorDestroyed( const TQString& ) ), + TQ_SLOT( slotEditorDestroyed( const TQString& ) ) ); return dialog; } @@ -1199,23 +1199,23 @@ void KABCore::initGUI() searchTB->boxLayout()->setSpacing( KDialog::spacingHint() ); mIncSearchWidget = new IncSearchWidget( searchTB, "tde toolbar widget"); searchTB->setStretchableWidget( mIncSearchWidget ); - connect( mIncSearchWidget, TQT_SIGNAL( doSearch( const TQString& ) ), - TQT_SLOT( incrementalTextSearch( const TQString& ) ) ); + connect( mIncSearchWidget, TQ_SIGNAL( doSearch( const TQString& ) ), + TQ_SLOT( incrementalTextSearch( const TQString& ) ) ); mDetailsSplitter = new TQSplitter( mWidget ); mLeftSplitter = new TQSplitter( mDetailsSplitter ); - mLeftSplitter->setOrientation( KABPrefs::instance()->contactListAboveExtensions() ? Qt::Vertical : Qt::Horizontal ); + mLeftSplitter->setOrientation( KABPrefs::instance()->contactListAboveExtensions() ? TQt::Vertical : TQt::Horizontal ); topLayout->addWidget( searchTB ); topLayout->addWidget( mDetailsSplitter ); mDetailsStack = new TQWidgetStack( mDetailsSplitter ); mExtensionManager = new ExtensionManager( new TQWidget( mLeftSplitter ), mDetailsStack, this, this ); - connect( mExtensionManager, TQT_SIGNAL( detailsWidgetDeactivated( TQWidget* ) ), - this, TQT_SLOT( deactivateDetailsWidget( TQWidget* ) ) ); - connect( mExtensionManager, TQT_SIGNAL( detailsWidgetActivated( TQWidget* ) ), - this, TQT_SLOT( activateDetailsWidget( TQWidget* ) ) ); + connect( mExtensionManager, TQ_SIGNAL( detailsWidgetDeactivated( TQWidget* ) ), + this, TQ_SLOT( deactivateDetailsWidget( TQWidget* ) ) ); + connect( mExtensionManager, TQ_SIGNAL( detailsWidgetActivated( TQWidget* ) ), + this, TQ_SLOT( activateDetailsWidget( TQWidget* ) ) ); TQWidget *viewWidget = new TQWidget( mLeftSplitter ); if ( KABPrefs::instance()->contactListAboveExtensions() ) @@ -1244,8 +1244,8 @@ void KABCore::initGUI() i18n( "Click this button if you want to add more contacts to " "the current distribution list. You will be shown a dialog that allows " "to enter a list of existing contacts to this distribution list." ) ); - connect( mAddDistListButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( editSelectedDistributionList() ) ); + connect( mAddDistListButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( editSelectedDistributionList() ) ); buttonLayout->addWidget( mAddDistListButton ); mDistListButtonWidget->setShown( false ); viewLayout->addWidget( mDistListButtonWidget ); @@ -1257,16 +1257,16 @@ void KABCore::initGUI() TQWhatsThis::add( mRemoveDistListButton, i18n( "Click this button if you want to remove the selected contacts from " "the current distribution list." ) ); - connect( mRemoveDistListButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( removeSelectedContactsFromDistList() ) ); + connect( mRemoveDistListButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( removeSelectedContactsFromDistList() ) ); buttonLayout->addWidget( mRemoveDistListButton ); #endif mFilterSelectionWidget = new FilterSelectionWidget( searchTB , "tde toolbar widget" ); mViewManager->setFilterSelectionWidget( mFilterSelectionWidget ); - connect( mFilterSelectionWidget, TQT_SIGNAL( filterActivated( int ) ), - mViewManager, TQT_SLOT( setActiveFilter( int ) ) ); + connect( mFilterSelectionWidget, TQ_SIGNAL( filterActivated( int ) ), + mViewManager, TQ_SLOT( setActiveFilter( int ) ) ); mDetailsWidget = new TQWidget( mDetailsSplitter ); mDetailsLayout = new TQHBoxLayout( mDetailsWidget ); @@ -1280,19 +1280,19 @@ void KABCore::initGUI() detailsPageLayout->addWidget( mDetailsViewer ); mDistListEntryView = new KAB::DistributionListEntryView( this, mWidget ); - connect( mDistListEntryView, TQT_SIGNAL( distributionListClicked( const TQString& ) ), - this, TQT_SLOT( sendMailToDistributionList( const TQString& ) ) ); + connect( mDistListEntryView, TQ_SIGNAL( distributionListClicked( const TQString& ) ), + this, TQ_SLOT( sendMailToDistributionList( const TQString& ) ) ); mDetailsStack->addWidget( mDistListEntryView ); mDetailsStack->addWidget( mDetailsWidget ); mDetailsStack->raiseWidget( mDetailsWidget ); mDetailsSplitter->moveToLast( mDetailsStack ); - connect( mDetailsViewer, TQT_SIGNAL( addressClicked( const TQString&) ), - this, TQT_SLOT( showContactsAddress( const TQString& ) ) ); + connect( mDetailsViewer, TQ_SIGNAL( addressClicked( const TQString&) ), + this, TQ_SLOT( showContactsAddress( const TQString& ) ) ); topLayout->setStretchFactor( mDetailsSplitter, 1 ); - mXXPortManager = new XXPortManager( this, TQT_TQOBJECT(mWidget) ); + mXXPortManager = new XXPortManager( this, mWidget ); initActions(); } @@ -1303,62 +1303,62 @@ void KABCore::createJumpButtonBar() mDetailsLayout->addWidget( mJumpButtonBar ); mDetailsLayout->setStretchFactor( mJumpButtonBar, 1 ); - connect( mJumpButtonBar, TQT_SIGNAL( jumpToLetter( const TQString& ) ), - TQT_SLOT( incrementalJumpButtonSearch( const TQString& ) ) ); - connect( mViewManager, TQT_SIGNAL( sortFieldChanged() ), - mJumpButtonBar, TQT_SLOT( updateButtons() ) ); + connect( mJumpButtonBar, TQ_SIGNAL( jumpToLetter( const TQString& ) ), + TQ_SLOT( incrementalJumpButtonSearch( const TQString& ) ) ); + connect( mViewManager, TQ_SIGNAL( sortFieldChanged() ), + mJumpButtonBar, TQ_SLOT( updateButtons() ) ); } void KABCore::initActions() { - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - TQT_SLOT( clipboardDataChanged() ) ); + connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + TQ_SLOT( clipboardDataChanged() ) ); TDEAction *action; // file menu mActionMail = new TDEAction( i18n( "&Send Email to Contact..." ), "mail-send", 0, - this, TQT_SLOT( sendMail() ), actionCollection(), "file_mail" ); - action = KStdAction::print( this, TQT_SLOT( print() ), actionCollection() ); + this, TQ_SLOT( sendMail() ), actionCollection(), "file_mail" ); + action = KStdAction::print( this, TQ_SLOT( print() ), actionCollection() ); mActionMail->setWhatsThis( i18n( "Send a mail to all selected contacts." ) ); action->setWhatsThis( i18n( "Print a special number of contacts." ) ); mActionSave = KStdAction::save( this, - TQT_SLOT( save() ), actionCollection(), "file_sync" ); + TQ_SLOT( save() ), actionCollection(), "file_sync" ); mActionSave->setWhatsThis( i18n( "Save all changes of the address book to the storage backend." ) ); action = new TDEAction( i18n( "&New Contact..." ), "identity", CTRL+Key_N, this, - TQT_SLOT( newContact() ), actionCollection(), "file_new_contact" ); + TQ_SLOT( newContact() ), actionCollection(), "file_new_contact" ); action->setWhatsThis( i18n( "Create a new contact<p>You will be presented with a dialog where you can add all data about a person, including addresses and phone numbers." ) ); action = new TDEAction( i18n( "&New Distribution List..." ), "kontact_contacts", 0, this, - TQT_SLOT( newDistributionList() ), actionCollection(), "file_new_distributionlist" ); + TQ_SLOT( newDistributionList() ), actionCollection(), "file_new_distributionlist" ); action->setWhatsThis( i18n( "Create a new distribution list<p>You will be presented with a dialog where you can create a new distribution list." ) ); mActionMailVCard = new TDEAction( i18n("Send &Contact..."), "mail_post_to", 0, - this, TQT_SLOT( mailVCard() ), + this, TQ_SLOT( mailVCard() ), actionCollection(), "file_mail_vcard" ); mActionMailVCard->setWhatsThis( i18n( "Send a mail with the selected contact as attachment." ) ); mActionChat = new TDEAction( i18n("Chat &With..."), 0, - this, TQT_SLOT( startChat() ), + this, TQ_SLOT( startChat() ), actionCollection(), "file_chat" ); mActionChat->setWhatsThis( i18n( "Start a chat with the selected contact." ) ); mActionEditAddressee = new TDEAction( i18n( "&Edit Contact..." ), "edit", 0, - this, TQT_SLOT( editContact() ), + this, TQ_SLOT( editContact() ), actionCollection(), "file_properties" ); mActionEditAddressee->setWhatsThis( i18n( "Edit a contact<p>You will be presented with a dialog where you can change all data about a person, including addresses and phone numbers." ) ); mActionMerge = new TDEAction( i18n( "&Merge Contacts" ), "", 0, - this, TQT_SLOT( mergeContacts() ), + this, TQ_SLOT( mergeContacts() ), actionCollection(), "edit_merge" ); // edit menu - mActionCopy = KStdAction::copy( this, TQT_SLOT( copyContacts() ), actionCollection() ); - mActionCut = KStdAction::cut( this, TQT_SLOT( cutContacts() ), actionCollection() ); - mActionPaste = KStdAction::paste( this, TQT_SLOT( pasteContacts() ), actionCollection() ); - action = KStdAction::selectAll( this, TQT_SLOT( selectAllContacts() ), actionCollection() ); + mActionCopy = KStdAction::copy( this, TQ_SLOT( copyContacts() ), actionCollection() ); + mActionCut = KStdAction::cut( this, TQ_SLOT( cutContacts() ), actionCollection() ); + mActionPaste = KStdAction::paste( this, TQ_SLOT( pasteContacts() ), actionCollection() ); + action = KStdAction::selectAll( this, TQ_SLOT( selectAllContacts() ), actionCollection() ); mActionCopy->setWhatsThis( i18n( "Copy the currently selected contact(s) to system clipboard in vCard format." ) ); mActionCut->setWhatsThis( i18n( "Cuts the currently selected contact(s) to system clipboard in vCard format." ) ); mActionPaste->setWhatsThis( i18n( "Paste the previously cut or copied contacts from clipboard." ) ); @@ -1367,19 +1367,19 @@ void KABCore::initActions() // mActionRedo->setWhatsThis( i18n( "Redoes the last <b>Cut</b>, <b>Copy</b> or <b>Paste</b>." ) ); mActionDelete = new TDEAction( i18n( "&Delete Contact" ), "edit-delete", - Key_Delete, this, TQT_SLOT( deleteContacts() ), + Key_Delete, this, TQ_SLOT( deleteContacts() ), actionCollection(), "edit_delete" ); mActionDelete->setWhatsThis( i18n( "Delete all selected contacts." ) ); mActionCopyAddresseeTo = new TDEAction( i18n( "&Copy Contact To..." ), "", 0, - this, TQT_SLOT( copySelectedContactToResource() ), + this, TQ_SLOT( copySelectedContactToResource() ), actionCollection(), "copy_contact_to" ); const TQString copyMoveWhatsThis = i18n( "Store a contact in a different Addressbook<p>You will be presented with a dialog where you can select a new storage place for this contact." ); mActionCopyAddresseeTo->setWhatsThis( copyMoveWhatsThis ); mActionMoveAddresseeTo = new TDEAction( i18n( "M&ove Contact To..." ), "", 0, - this, TQT_SLOT( moveSelectedContactToResource() ), + this, TQ_SLOT( moveSelectedContactToResource() ), actionCollection(), "move_contact_to" ); mActionMoveAddresseeTo->setWhatsThis( copyMoveWhatsThis ); @@ -1388,41 +1388,41 @@ void KABCore::initActions() actionCollection(), "options_show_jump_bar" ); mActionJumpBar->setWhatsThis( i18n( "Toggle whether the jump button bar shall be visible." ) ); mActionJumpBar->setCheckedState( i18n( "Hide Jump Bar") ); - connect( mActionJumpBar, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( setJumpButtonBarVisible( bool ) ) ); + connect( mActionJumpBar, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( setJumpButtonBarVisible( bool ) ) ); mActionDetails = new TDEToggleAction( i18n( "Show Details" ), 0, 0, actionCollection(), "options_show_details" ); mActionDetails->setWhatsThis( i18n( "Toggle whether the details page shall be visible." ) ); mActionDetails->setCheckedState( i18n( "Hide Details") ); - connect( mActionDetails, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( setDetailsVisible( bool ) ) ); + connect( mActionDetails, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( setDetailsVisible( bool ) ) ); if ( mIsPart ) action = new TDEAction( i18n( "&Configure Address Book..." ), "configure", 0, - this, TQT_SLOT( configure() ), actionCollection(), + this, TQ_SLOT( configure() ), actionCollection(), "kaddressbook_configure" ); else - action = KStdAction::preferences( this, TQT_SLOT( configure() ), actionCollection() ); + action = KStdAction::preferences( this, TQ_SLOT( configure() ), actionCollection() ); action->setWhatsThis( i18n( "You will be presented with a dialog, that offers you all possibilities to configure KAddressBook." ) ); // misc action = new TDEAction( i18n( "&Lookup Addresses in LDAP Directory..." ), "edit-find", 0, - this, TQT_SLOT( openLDAPDialog() ), actionCollection(), "ldap_lookup" ); + this, TQ_SLOT( openLDAPDialog() ), actionCollection(), "ldap_lookup" ); action->setWhatsThis( i18n( "Search for contacts on a LDAP server<p>You will be presented with a dialog, where you can search for contacts and select the ones you want to add to your local address book." ) ); mActionWhoAmI = new TDEAction( i18n( "Set as Personal Contact Data" ), "preferences-desktop-personal", 0, this, - TQT_SLOT( setWhoAmI() ), actionCollection(), + TQ_SLOT( setWhoAmI() ), actionCollection(), "edit_set_personal" ); mActionWhoAmI->setWhatsThis( i18n( "Set the personal contact<p>The data of this contact will be used in many other TDE applications, so you do not have to input your personal data several times." ) ); mActionCategories = new TDEAction( i18n( "Select Categories..." ), 0, this, - TQT_SLOT( setCategories() ), actionCollection(), + TQ_SLOT( setCategories() ), actionCollection(), "edit_set_categories" ); mActionCategories->setWhatsThis( i18n( "Set the categories for all selected contacts." ) ); TDEAction *clearLocation = new TDEAction( i18n( "Clear Search Bar" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", - CTRL+Key_L, this, TQT_SLOT( slotClearSearchBar() ), actionCollection(), "clear_search" ); + CTRL+Key_L, this, TQ_SLOT( slotClearSearchBar() ), actionCollection(), "clear_search" ); clearLocation->setWhatsThis( i18n( "Clear Search Bar<p>" "Clears the content of the quick search bar." ) ); @@ -1490,9 +1490,9 @@ void KABCore::setCategories() // Show the category dialog if ( mCategorySelectDialog == 0 ) { mCategorySelectDialog = new KPIM::CategorySelectDialog( KABPrefs::instance(), mWidget ); - connect( mCategorySelectDialog, TQT_SIGNAL( categoriesSelected( const TQStringList& ) ), - TQT_SLOT( categoriesSelected( const TQStringList& ) ) ); - connect( mCategorySelectDialog, TQT_SIGNAL( editCategories() ), TQT_SLOT( editCategories() ) ); + connect( mCategorySelectDialog, TQ_SIGNAL( categoriesSelected( const TQStringList& ) ), + TQ_SLOT( categoriesSelected( const TQStringList& ) ) ); + connect( mCategorySelectDialog, TQ_SIGNAL( editCategories() ), TQ_SLOT( editCategories() ) ); } mCategorySelectDialog->show(); @@ -1537,8 +1537,8 @@ void KABCore::editCategories() { if ( mCategoryEditDialog == 0 ) { mCategoryEditDialog = new KPIM::CategoryEditDialog( KABPrefs::instance(), mWidget ); - connect( mCategoryEditDialog, TQT_SIGNAL( categoryConfigChanged() ), - mCategorySelectDialog, TQT_SLOT( updateCategoryConfig() ) ); + connect( mCategoryEditDialog, TQ_SIGNAL( categoryConfigChanged() ), + mCategorySelectDialog, TQ_SLOT( updateCategoryConfig() ) ); } mCategoryEditDialog->show(); diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index 40ce444e1..43ce8bb3a 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -82,7 +82,7 @@ typedef struct { class KDE_EXPORT KABCore : public KAB::Core { - Q_OBJECT + TQ_OBJECT public: @@ -293,38 +293,38 @@ class KDE_EXPORT KABCore : public KAB::Core void contactModified( const TDEABC::Addressee &addr ); /** - DCOP METHOD: Adds the given email address to address book. + DCOP method: Adds the given email address to address book. */ virtual void addEmail( const TQString& addr ); /** - DCOP METHOD: Imports the vCard, located at the given url. + DCOP method: Imports the vCard, located at the given url. */ virtual void importVCard( const KURL& url ); /** - DCOP METHOD: Imports the given vCard. + DCOP method: Imports the given vCard. */ virtual void importVCardFromData( const TQString& vCard ); /** - DCOP METHOD: Opens contact editor to input a new contact. + DCOP method: Opens contact editor to input a new contact. */ virtual void newContact(); /** - DCOP METHOD: Opens distribution list editor to create a new distribution list + DCOP method: Opens distribution list editor to create a new distribution list */ virtual void newDistributionList(); /** - DCOP METHOD: Returns the name of the contact, that matches the given + DCOP method: Returns the name of the contact, that matches the given phone number. */ virtual TQString getNameByPhone( const TQString& phone ); /** - DCOP METHOD: Handle command line arguments, return true if handled + DCOP method: Handle command line arguments, return true if handled and false if no args was given. The iface is either the mainwin or the part. */ bool handleCommandLine( KAddressBookIface* iface ); diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp index 566ffd713..ec815ff67 100644 --- a/kaddressbook/kaddressbook_part.cpp +++ b/kaddressbook/kaddressbook_part.cpp @@ -51,7 +51,7 @@ KAddressbookPart::KAddressbookPart( TQWidget *parentWidget, const char *widgetNa // create a canvas to insert our widget TQWidget *canvas = new TQWidget( parentWidget, widgetName ); - canvas->setFocusPolicy( TQ_ClickFocus ); + canvas->setFocusPolicy( TQWidget::ClickFocus ); setWidget( canvas ); TQVBoxLayout *topLayout = new TQVBoxLayout( canvas ); diff --git a/kaddressbook/kaddressbook_part.h b/kaddressbook/kaddressbook_part.h index 1a161c114..7bac322ac 100644 --- a/kaddressbook/kaddressbook_part.h +++ b/kaddressbook/kaddressbook_part.h @@ -36,7 +36,7 @@ class KABCore; class KAddressbookPart: public KParts::ReadOnlyPart, virtual public KAddressBookIface { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp index bfcea2b66..ca6df18bd 100644 --- a/kaddressbook/kaddressbookmain.cpp +++ b/kaddressbook/kaddressbookmain.cpp @@ -150,13 +150,13 @@ bool KAddressBookMain::queryClose() void KAddressBookMain::initActions() { - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); TDEAction *action; - action = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( configureKeyBindings() ), actionCollection() ); + action = KStdAction::keyBindings( this, TQ_SLOT( configureKeyBindings() ), actionCollection() ); action->setWhatsThis( i18n( "You will be presented with a dialog, where you can configure the application wide shortcuts." ) ); - KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( configureToolbars() ), actionCollection() ); + KStdAction::configureToolbars( this, TQ_SLOT( configureToolbars() ), actionCollection() ); } void KAddressBookMain::configureKeyBindings() @@ -177,8 +177,8 @@ void KAddressBookMain::configureToolbars() saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); KEditToolbar edit( factory() ); - connect( &edit, TQT_SIGNAL( newToolbarConfig() ), - this, TQT_SLOT( newToolbarConfig() ) ); + connect( &edit, TQ_SIGNAL( newToolbarConfig() ), + this, TQ_SLOT( newToolbarConfig() ) ); edit.exec(); } diff --git a/kaddressbook/kaddressbookmain.h b/kaddressbook/kaddressbookmain.h index 904206596..0bc2aa395 100644 --- a/kaddressbook/kaddressbookmain.h +++ b/kaddressbook/kaddressbookmain.h @@ -44,7 +44,7 @@ class KABCore; */ class KAddressBookMain : public TDEMainWindow, virtual public KAddressBookIface { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp index d86103db8..07df33b60 100644 --- a/kaddressbook/kaddressbookview.cpp +++ b/kaddressbook/kaddressbookview.cpp @@ -43,8 +43,8 @@ KAddressBookView::KAddressBookView( KAB::Core *core, TQWidget *parent, { initGUI(); - connect( mCore->searchManager(), TQT_SIGNAL( contactsUpdated() ), - TQT_SLOT( updateView() ) ); + connect( mCore->searchManager(), TQ_SIGNAL( contactsUpdated() ), + TQ_SLOT( updateView() ) ); } KAddressBookView::~KAddressBookView() diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h index 8071b8af2..668c5a1d9 100644 --- a/kaddressbook/kaddressbookview.h +++ b/kaddressbook/kaddressbookview.h @@ -55,7 +55,7 @@ namespace TDEABC { class AddressBook; } */ class KDE_EXPORT KAddressBookView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/kcmconfigs/addhostdialog.h b/kaddressbook/kcmconfigs/addhostdialog.h index 5c900c07b..301b9f9f6 100644 --- a/kaddressbook/kcmconfigs/addhostdialog.h +++ b/kaddressbook/kcmconfigs/addhostdialog.h @@ -34,7 +34,7 @@ class TQSpinBox; class AddHostDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp index ad1364f50..35bc17a17 100644 --- a/kaddressbook/kcmconfigs/addresseewidget.cpp +++ b/kaddressbook/kcmconfigs/addresseewidget.cpp @@ -46,20 +46,20 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label, { TQHBoxLayout *layout = new TQHBoxLayout( this ); - TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, title, this ); + TQGroupBox *group = new TQGroupBox( 0, TQt::Vertical, title, this ); TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() ); mBox = new TQListBox( group ); - connect( mBox, TQT_SIGNAL( selectionChanged( TQListBoxItem* ) ), - TQT_SLOT( selectionChanged( TQListBoxItem* ) ) ); + connect( mBox, TQ_SIGNAL( selectionChanged( TQListBoxItem* ) ), + TQ_SLOT( selectionChanged( TQListBoxItem* ) ) ); groupLayout->addWidget( mBox, 0, 0 ); - KButtonBox *bbox = new KButtonBox( group, Qt::Vertical ); - mAddButton = bbox->addButton( i18n( "Add..." ), TQT_TQOBJECT(this), TQT_SLOT( add() ) ); - mEditButton = bbox->addButton( i18n( "Edit..." ), TQT_TQOBJECT(this), TQT_SLOT( edit() ) ); + KButtonBox *bbox = new KButtonBox( group, TQt::Vertical ); + mAddButton = bbox->addButton( i18n( "Add..." ), this, TQ_SLOT( add() ) ); + mEditButton = bbox->addButton( i18n( "Edit..." ), this, TQ_SLOT( edit() ) ); mEditButton->setEnabled( false ); - mRemoveButton = bbox->addButton( i18n( "Remove" ), TQT_TQOBJECT(this), TQT_SLOT( remove() ) ); + mRemoveButton = bbox->addButton( i18n( "Remove" ), this, TQ_SLOT( remove() ) ); mRemoveButton->setEnabled( false ); bbox->layout(); groupLayout->addWidget( bbox, 0, 1 ); @@ -157,10 +157,10 @@ AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name ) mFormattedNameCombo->insertItem( i18n( "Reverse Name" ) ); layout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 ); - connect( mPrefix, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); - connect( mInclusion, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); - connect( mSuffix, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); - connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( modified() ) ); + connect( mPrefix, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) ); + connect( mInclusion, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) ); + connect( mSuffix, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) ); + connect( mFormattedNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( modified() ) ); } AddresseeWidget::~AddresseeWidget() diff --git a/kaddressbook/kcmconfigs/addresseewidget.h b/kaddressbook/kcmconfigs/addresseewidget.h index ec4760968..46651903a 100644 --- a/kaddressbook/kcmconfigs/addresseewidget.h +++ b/kaddressbook/kcmconfigs/addresseewidget.h @@ -35,7 +35,7 @@ class TQPushButton; class NamePartWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -68,7 +68,7 @@ class NamePartWidget : public TQWidget class AddresseeWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.h b/kaddressbook/kcmconfigs/extensionconfigdialog.h index 0aa97f74f..5c3ae856c 100644 --- a/kaddressbook/kcmconfigs/extensionconfigdialog.h +++ b/kaddressbook/kcmconfigs/extensionconfigdialog.h @@ -34,7 +34,7 @@ class ConfigureWidget; class ExtensionConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index b41bdf843..07574e567 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -59,7 +59,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) TQVBoxLayout *layout = new TQVBoxLayout( generalPage, KDialog::marginHint(), KDialog::spacingHint() ); - TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage ); + TQGroupBox *groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "General" ), generalPage ); TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->layout() ); boxLayout->setAlignment( TQt::AlignTop ); @@ -96,7 +96,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) layout->addWidget( groupBox ); - groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Script-Hooks" ), generalPage ); + groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Script-Hooks" ), generalPage ); TQGridLayout *grid = new TQGridLayout( groupBox->layout(), 3, 2, KDialog::spacingHint() ); label = new TQLabel( i18n( "Phone:" ), groupBox ); @@ -126,7 +126,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) layout->addWidget( groupBox ); - groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Location Map" ), generalPage ); + groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Location Map" ), generalPage ); boxLayout = new TQVBoxLayout( groupBox->layout(), KDialog::spacingHint() ); boxLayout->setAlignment( TQt::AlignTop ); @@ -141,22 +141,22 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) boxLayout->addWidget( mLocationMapURL ); layout->addWidget( groupBox ); - connect( mNameParsing, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); - connect( mViewsSingleClickBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); - connect( mTradeAsFamilyName, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); - connect( mLimitContactDisplay, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); - connect( mPhoneHook, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mSMSHook, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mFaxHook, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mLocationMapURL, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mEditorCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( modified() ) ); + connect( mNameParsing, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) ); + connect( mViewsSingleClickBox, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) ); + connect( mTradeAsFamilyName, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) ); + connect( mLimitContactDisplay, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) ); + connect( mPhoneHook, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mSMSHook, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mFaxHook, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mLocationMapURL, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mEditorCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( modified() ) ); tabWidget->addTab( generalPage, i18n( "General" ) ); // Addressee page mAddresseeWidget = new AddresseeWidget( this ); tabWidget->addTab( mAddresseeWidget, i18n( "Contact" ) ); - connect( mAddresseeWidget, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); + connect( mAddresseeWidget, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); } void KABConfigWidget::restoreSettings() diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h index 5ee3c7890..5d6c0506e 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.h +++ b/kaddressbook/kcmconfigs/kabconfigwidget.h @@ -38,7 +38,7 @@ class AddresseeWidget; class KABConfigWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp index ce2c99730..7bc6abd60 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp @@ -47,7 +47,7 @@ KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name ) mConfigWidget = new KABConfigWidget( this, "mConfigWidget" ); layout->addWidget( mConfigWidget ); - connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); + connect( mConfigWidget, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) ); load(); diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.h b/kaddressbook/kcmconfigs/kcmkabconfig.h index b4b18b0e5..d97eb1d8d 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.h +++ b/kaddressbook/kcmconfigs/kcmkabconfig.h @@ -30,7 +30,7 @@ class KABConfigWidget; class KCMKabConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp index 0731ae577..da6bf49b3 100644 --- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp @@ -48,7 +48,7 @@ KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name ) mConfigWidget = new LDAPOptionsWidget( this ); layout->addWidget( mConfigWidget ); - connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); + connect( mConfigWidget, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) ); load(); diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.h b/kaddressbook/kcmconfigs/kcmkabldapconfig.h index 2e8238146..9ea25e83a 100644 --- a/kaddressbook/kcmconfigs/kcmkabldapconfig.h +++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.h @@ -32,7 +32,7 @@ class LDAPOptionsWidget; class KCMKabLdapConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp index 4e4b15a93..f8bcfdb92 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp +++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp @@ -80,14 +80,14 @@ LDAPOptionsWidget::LDAPOptionsWidget( TQWidget* parent, const char* name ) mHostListView->addColumn( TQString() ); mHostListView->header()->hide(); - connect( mHostListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); - connect( mHostListView, TQT_SIGNAL(doubleClicked( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(slotEditHost())); - connect( mHostListView, TQT_SIGNAL( clicked( TQListViewItem* ) ), - TQT_SLOT( slotItemClicked( TQListViewItem* ) ) ); - - connect( mUpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveUp() ) ); - connect( mDownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveDown() ) ); + connect( mHostListView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + TQ_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); + connect( mHostListView, TQ_SIGNAL(doubleClicked( TQListViewItem *, const TQPoint &, int )), this, TQ_SLOT(slotEditHost())); + connect( mHostListView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + TQ_SLOT( slotItemClicked( TQListViewItem* ) ) ); + + connect( mUpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveUp() ) ); + connect( mDownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveDown() ) ); } LDAPOptionsWidget::~LDAPOptionsWidget() @@ -288,10 +288,10 @@ void LDAPOptionsWidget::initGUI() layout->addWidget( groupBox ); KButtonBox *buttons = new KButtonBox( this ); - buttons->addButton( i18n( "&Add Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotAddHost() ) ); - mEditButton = buttons->addButton( i18n( "&Edit Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotEditHost() ) ); + buttons->addButton( i18n( "&Add Host..." ), this, TQ_SLOT( slotAddHost() ) ); + mEditButton = buttons->addButton( i18n( "&Edit Host..." ), this, TQ_SLOT( slotEditHost() ) ); mEditButton->setEnabled( false ); - mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), TQT_TQOBJECT(this), TQT_SLOT( slotRemoveHost() ) ); + mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), this, TQ_SLOT( slotRemoveHost() ) ); mRemoveButton->setEnabled( false ); buttons->layout(); diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.h b/kaddressbook/kcmconfigs/ldapoptionswidget.h index 5471b0b6e..fbb32a1fb 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.h +++ b/kaddressbook/kcmconfigs/ldapoptionswidget.h @@ -33,7 +33,7 @@ class TQPushButton; class LDAPOptionsWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp index c0417b7ec..890bf6446 100644 --- a/kaddressbook/keywidget.cpp +++ b/kaddressbook/keywidget.cpp @@ -61,9 +61,9 @@ KeyWidget::KeyWidget( TQWidget *parent, const char *name ) mExportButton->setEnabled( false ); layout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addKey() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeKey() ) ); - connect( mExportButton, TQT_SIGNAL( clicked() ), TQT_SLOT( exportKey() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addKey() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeKey() ) ); + connect( mExportButton, TQ_SIGNAL( clicked() ), TQ_SLOT( exportKey() ) ); } KeyWidget::~KeyWidget() diff --git a/kaddressbook/keywidget.h b/kaddressbook/keywidget.h index 3507af804..b317eef67 100644 --- a/kaddressbook/keywidget.h +++ b/kaddressbook/keywidget.h @@ -33,7 +33,7 @@ class TQPushButton; class KeyWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index 4b01cf6fb..07668b710 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/kaddressbook/ldapsearchdialog.cpp @@ -152,7 +152,7 @@ LDAPSearchDialog::LDAPSearchDialog( TDEABC::AddressBook *ab, KABCore *core, 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 ); @@ -202,9 +202,9 @@ LDAPSearchDialog::LDAPSearchDialog( TDEABC::AddressBook *ab, KABCore *core, mResultListView->setShowSortIndicator( true ); topLayout->addWidget( mResultListView ); - KButtonBox *buttons = new KButtonBox( page, Qt::Horizontal ); - buttons->addButton( i18n( "Select All" ), TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ) ); - buttons->addButton( i18n( "Unselect All" ), TQT_TQOBJECT(this), TQT_SLOT( slotUnselectAll() ) ); + KButtonBox *buttons = new KButtonBox( page, TQt::Horizontal ); + buttons->addButton( i18n( "Select All" ), this, TQ_SLOT( slotSelectAll() ) ); + buttons->addButton( i18n( "Unselect All" ), this, TQ_SLOT( slotUnselectAll() ) ); topLayout->addWidget( buttons ); @@ -222,10 +222,10 @@ LDAPSearchDialog::LDAPSearchDialog( TDEABC::AddressBook *ab, KABCore *core, 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); @@ -264,7 +264,7 @@ void LDAPSearchDialog::restoreSettings() } else { mIsOK = true; for ( int j = 0; j < mNumHosts; ++j ) { - KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, TQT_TQOBJECT(this), "ldapclient" ); + KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, this, "ldapclient" ); KPIM::LdapServer ldapServer; KPIM::LdapSearch::readConfig( ldapServer, config, j, true ); ldapClient->setServer( ldapServer ); @@ -275,12 +275,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 ); } @@ -387,10 +387,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); @@ -419,10 +419,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/kaddressbook/ldapsearchdialog.h b/kaddressbook/ldapsearchdialog.h index 1d38c88ae..a10bbfdea 100644 --- a/kaddressbook/ldapsearchdialog.h +++ b/kaddressbook/ldapsearchdialog.h @@ -49,7 +49,7 @@ namespace TDEABC { class LDAPSearchDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp index 0d350ae70..6d90324ac 100644 --- a/kaddressbook/nameeditdialog.cpp +++ b/kaddressbook/nameeditdialog.cpp @@ -105,7 +105,7 @@ NameEditDialog::NameEditDialog( const TDEABC::Addressee &addr, int type, mFormattedNameCombo = new KComboBox( page ); mFormattedNameCombo->setEnabled( !readOnly ); layout->addWidget( mFormattedNameCombo, 5, 1 ); - connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( typeChanged( int ) ) ); + connect( mFormattedNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( typeChanged( int ) ) ); mFormattedNameEdit = new KLineEdit( page ); mFormattedNameEdit->setEnabled( type == CustomName && !readOnly ); @@ -113,8 +113,8 @@ NameEditDialog::NameEditDialog( const TDEABC::Addressee &addr, int type, mParseBox = new TQCheckBox( i18n( "Parse name automatically" ), page ); mParseBox->setEnabled( !readOnly ); - connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( parseBoxChanged(bool) ) ); - connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( modified() ) ); + connect( mParseBox, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( parseBoxChanged(bool) ) ); + connect( mParseBox, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( modified() ) ); layout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 ); // Fill in the values @@ -159,24 +159,24 @@ NameEditDialog::NameEditDialog( const TDEABC::Addressee &addr, int type, TDEAcceleratorManager::manage( this ); - connect( mPrefixCombo, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( modified() ) ); - connect( mGivenNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( modified() ) ); - connect( mAdditionalNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( modified() ) ); - connect( mFamilyNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( modified() ) ); - connect( mSuffixCombo, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( modified() ) ); - connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( modified() ) ); - connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( formattedNameTypeChanged() ) ); - connect( mFormattedNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( modified() ) ); - connect( mFormattedNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( formattedNameChanged( const TQString& ) ) ); + connect( mPrefixCombo, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( modified() ) ); + connect( mGivenNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( modified() ) ); + connect( mAdditionalNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( modified() ) ); + connect( mFamilyNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( modified() ) ); + connect( mSuffixCombo, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( modified() ) ); + connect( mFormattedNameCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( modified() ) ); + connect( mFormattedNameCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( formattedNameTypeChanged() ) ); + connect( mFormattedNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( modified() ) ); + connect( mFormattedNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( formattedNameChanged( const TQString& ) ) ); initTypeCombo(); mFormattedNameCombo->setCurrentItem( type ); diff --git a/kaddressbook/nameeditdialog.h b/kaddressbook/nameeditdialog.h index 277031d97..12b749399 100644 --- a/kaddressbook/nameeditdialog.h +++ b/kaddressbook/nameeditdialog.h @@ -39,7 +39,7 @@ class KComboBox; */ class NameEditDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp index 80f45cff5..e4857ae7b 100644 --- a/kaddressbook/phoneeditwidget.cpp +++ b/kaddressbook/phoneeditwidget.cpp @@ -56,10 +56,10 @@ PhoneTypeCombo::PhoneTypeCombo( TQWidget *parent ) update(); - connect( this, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( selected( int ) ) ); - connect( this, TQT_SIGNAL( activated( int ) ), - this, TQT_SIGNAL( modified() ) ); + connect( this, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( selected( int ) ) ); + connect( this, TQ_SIGNAL( activated( int ) ), + this, TQ_SIGNAL( modified() ) ); } PhoneTypeCombo::~PhoneTypeCombo() @@ -137,8 +137,8 @@ PhoneNumberWidget::PhoneNumberWidget( TQWidget *parent ) layout->addWidget( mTypeCombo ); layout->addWidget( mNumberEdit ); - connect( mTypeCombo, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); - connect( mNumberEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SIGNAL( modified() ) ); + connect( mTypeCombo, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) ); + connect( mNumberEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SIGNAL( modified() ) ); } void PhoneNumberWidget::setNumber( const TDEABC::PhoneNumber &number ) @@ -183,11 +183,11 @@ PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name ) mRemoveButton->setMaximumSize( mRemoveButton->sizeHint() ); layout->addWidget( mRemoveButton, 1, 1 ); - mMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( changed( int ) ) ); + mMapper = new TQSignalMapper( this ); + connect( mMapper, TQ_SIGNAL( mapped( int ) ), TQ_SLOT( changed( int ) ) ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( remove() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( add() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( remove() ) ); } PhoneEditWidget::~PhoneEditWidget() @@ -271,8 +271,8 @@ void PhoneEditWidget::recreateNumberWidgets() PhoneNumberWidget *wdg = new PhoneNumberWidget( this ); wdg->setNumber( *it ); - mMapper->setMapping( TQT_TQOBJECT(wdg), counter ); - connect( wdg, TQT_SIGNAL( modified() ), mMapper, TQT_SLOT( map() ) ); + mMapper->setMapping( wdg, counter ); + connect( wdg, TQ_SIGNAL( modified() ), mMapper, TQ_SLOT( map() ) ); mWidgetLayout->addWidget( wdg ); mWidgets.append( wdg ); @@ -303,7 +303,7 @@ PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *parent ) mPreferredBox = new TQCheckBox( i18n( "This is the preferred phone number" ), page ); layout->addWidget( mPreferredBox ); - mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "Types" ), page ); + mGroup = new TQButtonGroup( 2, TQt::Horizontal, i18n( "Types" ), page ); layout->addWidget( mGroup ); // fill widgets diff --git a/kaddressbook/phoneeditwidget.h b/kaddressbook/phoneeditwidget.h index 13c088916..eb1fbf0a5 100644 --- a/kaddressbook/phoneeditwidget.h +++ b/kaddressbook/phoneeditwidget.h @@ -38,7 +38,7 @@ class KComboBox; class PhoneTypeCombo : public KComboBox { - Q_OBJECT + TQ_OBJECT public: @@ -65,7 +65,7 @@ class PhoneTypeCombo : public KComboBox class PhoneNumberWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -90,7 +90,7 @@ class PhoneNumberWidget : public TQWidget */ class PhoneEditWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -130,7 +130,7 @@ class PhoneEditWidget : public TQWidget */ class PhoneTypeDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PhoneTypeDialog( int type, TQWidget *parent ); diff --git a/kaddressbook/printing/detailledstyle.h b/kaddressbook/printing/detailledstyle.h index 05f30bae4..4197755e9 100644 --- a/kaddressbook/printing/detailledstyle.h +++ b/kaddressbook/printing/detailledstyle.h @@ -35,7 +35,7 @@ namespace KABPrinting { class DetailledPrintStyle : public PrintStyle { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/printing/mikesstyle.h b/kaddressbook/printing/mikesstyle.h index fe1be4224..ccaf4a664 100644 --- a/kaddressbook/printing/mikesstyle.h +++ b/kaddressbook/printing/mikesstyle.h @@ -35,7 +35,7 @@ class PrintProgress; class MikesStyle : public PrintStyle { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp index eecf434c3..a9375e3cb 100644 --- a/kaddressbook/printing/printingwizard.cpp +++ b/kaddressbook/printing/printingwizard.cpp @@ -75,7 +75,7 @@ PrintingWizard::PrintingWizard( KPrinter *printer, TDEABC::AddressBook* ab, mStylePage = new StylePage( mAddressBook, this ); - connect( mStylePage, TQT_SIGNAL( styleChanged(int) ), TQT_SLOT( slotStyleSelected(int) ) ); + connect( mStylePage, TQ_SIGNAL( styleChanged(int) ), TQ_SLOT( slotStyleSelected(int) ) ); insertPage( mStylePage, i18n("Choose Printing Style"), -1 ); registerStyles(); diff --git a/kaddressbook/printing/printingwizard.h b/kaddressbook/printing/printingwizard.h index 3d2d0b27e..bd26b2c1e 100644 --- a/kaddressbook/printing/printingwizard.h +++ b/kaddressbook/printing/printingwizard.h @@ -49,7 +49,7 @@ namespace KABPrinting { */ class PrintingWizard : public KWizard { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/printing/printprogress.h b/kaddressbook/printing/printprogress.h index 481543a2a..b23f069a5 100644 --- a/kaddressbook/printing/printprogress.h +++ b/kaddressbook/printing/printprogress.h @@ -39,7 +39,7 @@ namespace KABPrinting { */ class PrintProgress : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/printing/printstyle.h b/kaddressbook/printing/printstyle.h index 9eeca876f..6984a7f50 100644 --- a/kaddressbook/printing/printstyle.h +++ b/kaddressbook/printing/printstyle.h @@ -59,7 +59,7 @@ class PrintProgress; class PrintStyle : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp index 39b1c4a8e..5a42444ba 100644 --- a/kaddressbook/printing/selectionpage.cpp +++ b/kaddressbook/printing/selectionpage.cpp @@ -51,7 +51,7 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name ) mButtonGroup = new TQButtonGroup( this ); mButtonGroup->setFrameShape( TQButtonGroup::NoFrame ); - mButtonGroup->setColumnLayout( 0, Qt::Vertical ); + mButtonGroup->setColumnLayout( 0, TQt::Vertical ); mButtonGroup->layout()->setSpacing( KDialog::spacingHint() ); mButtonGroup->layout()->setMargin( KDialog::marginHint() ); @@ -90,8 +90,8 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name ) topLayout->addWidget( mButtonGroup ); - connect( mFiltersCombo, TQT_SIGNAL( activated(int) ), TQT_SLOT( filterChanged(int) ) ); - connect( mCategoriesView, TQT_SIGNAL( clicked(TQListViewItem*) ), TQT_SLOT( categoryClicked(TQListViewItem*) ) ); + connect( mFiltersCombo, TQ_SIGNAL( activated(int) ), TQ_SLOT( filterChanged(int) ) ); + connect( mCategoriesView, TQ_SIGNAL( clicked(TQListViewItem*) ), TQ_SLOT( categoryClicked(TQListViewItem*) ) ); } SelectionPage::~SelectionPage() diff --git a/kaddressbook/printing/selectionpage.h b/kaddressbook/printing/selectionpage.h index a7b10d264..06a6f3a54 100644 --- a/kaddressbook/printing/selectionpage.h +++ b/kaddressbook/printing/selectionpage.h @@ -34,7 +34,7 @@ class TQRadioButton; class SelectionPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp index 0df149315..2278b6b4e 100644 --- a/kaddressbook/printing/stylepage.cpp +++ b/kaddressbook/printing/stylepage.cpp @@ -44,7 +44,7 @@ StylePage::StylePage( TDEABC::AddressBook *ab, TQWidget* parent, const char* na mSortTypeCombo->insertItem( i18n( "Ascending" ) ); mSortTypeCombo->insertItem( i18n( "Descending" ) ); - connect( mStyleCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( styleChanged( int ) ) ); + connect( mStyleCombo, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( styleChanged( int ) ) ); } StylePage::~StylePage() @@ -121,7 +121,7 @@ void StylePage::initGUI() topLayout->addMultiCellWidget( label, 0, 0, 0, 1 ); TQButtonGroup *group = new TQButtonGroup( i18n( "Sorting" ), this ); - group->setColumnLayout( 0, Qt::Vertical ); + group->setColumnLayout( 0, TQt::Vertical ); TQGridLayout *sortLayout = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() ); sortLayout->setAlignment( TQt::AlignTop ); @@ -141,7 +141,7 @@ void StylePage::initGUI() topLayout->addWidget( group, 1, 0 ); group = new TQButtonGroup( i18n( "Print Style" ), this ); - group->setColumnLayout( 0, Qt::Vertical ); + group->setColumnLayout( 0, TQt::Vertical ); TQVBoxLayout *styleLayout = new TQVBoxLayout( group->layout(), KDialog::spacingHint() ); diff --git a/kaddressbook/printing/stylepage.h b/kaddressbook/printing/stylepage.h index 9b6958f71..6bccdda0c 100644 --- a/kaddressbook/printing/stylepage.h +++ b/kaddressbook/printing/stylepage.h @@ -37,7 +37,7 @@ class KComboBox; class StylePage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/searchmanager.h b/kaddressbook/searchmanager.h index 3972110c3..4646f90b6 100644 --- a/kaddressbook/searchmanager.h +++ b/kaddressbook/searchmanager.h @@ -36,7 +36,7 @@ namespace KAB { class SearchManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/secrecywidget.cpp b/kaddressbook/secrecywidget.cpp index ae2b9c498..56b888cae 100644 --- a/kaddressbook/secrecywidget.cpp +++ b/kaddressbook/secrecywidget.cpp @@ -42,8 +42,8 @@ SecrecyWidget::SecrecyWidget( TQWidget *parent, const char *name ) for ( it = list.begin(); it != list.end(); ++it ) mSecrecyCombo->insertItem( TDEABC::Secrecy::typeLabel( *it ), *it ); - connect( mSecrecyCombo, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SIGNAL( changed() ) ); + connect( mSecrecyCombo, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SIGNAL( changed() ) ); } SecrecyWidget::~SecrecyWidget() diff --git a/kaddressbook/secrecywidget.h b/kaddressbook/secrecywidget.h index 1424d5e55..0d43bc5b9 100644 --- a/kaddressbook/secrecywidget.h +++ b/kaddressbook/secrecywidget.h @@ -31,7 +31,7 @@ class KComboBox; class SecrecyWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/simpleaddresseeeditor.cpp b/kaddressbook/simpleaddresseeeditor.cpp index 7d7914b98..3cfce3f8a 100644 --- a/kaddressbook/simpleaddresseeeditor.cpp +++ b/kaddressbook/simpleaddresseeeditor.cpp @@ -72,16 +72,16 @@ void SimpleAddresseeEditor::initGui() mNameEdit = new KLineEdit( this ); topLayout->addWidget( mNameEdit, 0, 1 ); - connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( emitModified() ) ); + connect( mNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( emitModified() ) ); label = new TQLabel( i18n( "Email:" ), this ); topLayout->addWidget( label, 1, 0 ); mEmailEdit = new KLineEdit( this ); topLayout->addWidget( mEmailEdit, 1, 1 ); - connect( mEmailEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( emitModified() ) ); + connect( mEmailEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( emitModified() ) ); } void SimpleAddresseeEditor::load() diff --git a/kaddressbook/simpleaddresseeeditor.h b/kaddressbook/simpleaddresseeeditor.h index 6f297edcf..1efda9e89 100644 --- a/kaddressbook/simpleaddresseeeditor.h +++ b/kaddressbook/simpleaddresseeeditor.h @@ -31,7 +31,7 @@ class KLineEdit; class SimpleAddresseeEditor : public AddresseeEditorBase { - Q_OBJECT + TQ_OBJECT public: SimpleAddresseeEditor( TQWidget *parent, const char *name = 0 ); diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp index dd10e2118..ff2c2b38a 100644 --- a/kaddressbook/soundwidget.cpp +++ b/kaddressbook/soundwidget.cpp @@ -62,20 +62,20 @@ SoundWidget::SoundWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char mUseSoundUrl->setEnabled( false ); topLayout->addWidget( mUseSoundUrl, 1, 2 ); - connect( mSoundUrl, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( setModified() ) ); - connect( mSoundUrl, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( urlChanged( const TQString& ) ) ); - connect( mUseSoundUrl, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( setModified() ) ); - connect( mUseSoundUrl, TQT_SIGNAL( toggled( bool ) ), - mPlayButton, TQT_SLOT( setDisabled( bool ) ) ); - connect( mSoundUrl, TQT_SIGNAL( urlSelected( const TQString& ) ), - TQT_SLOT( loadSound() ) ); - connect( mSoundUrl, TQT_SIGNAL( urlSelected( const TQString& ) ), - TQT_SLOT( updateGUI() ) ); - connect( mPlayButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( playSound() ) ); + connect( mSoundUrl, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( setModified() ) ); + connect( mSoundUrl, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( urlChanged( const TQString& ) ) ); + connect( mUseSoundUrl, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( setModified() ) ); + connect( mUseSoundUrl, TQ_SIGNAL( toggled( bool ) ), + mPlayButton, TQ_SLOT( setDisabled( bool ) ) ); + connect( mSoundUrl, TQ_SIGNAL( urlSelected( const TQString& ) ), + TQ_SLOT( loadSound() ) ); + connect( mSoundUrl, TQ_SIGNAL( urlSelected( const TQString& ) ), + TQ_SLOT( updateGUI() ) ); + connect( mPlayButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( playSound() ) ); TQWhatsThis::add( this, i18n( "This field stores a sound file which contains the name of the contact to clarify the pronunciation." ) ); TQWhatsThis::add( mUseSoundUrl, i18n( "Save only the URL to the sound file, not the whole object." ) ); diff --git a/kaddressbook/soundwidget.h b/kaddressbook/soundwidget.h index 12283b4a3..530da0982 100644 --- a/kaddressbook/soundwidget.h +++ b/kaddressbook/soundwidget.h @@ -35,7 +35,7 @@ class TQPushButton; class SoundWidget : public KAB::ContactEditorWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp index 828825fad..537e2ced8 100644 --- a/kaddressbook/viewconfigurefieldspage.cpp +++ b/kaddressbook/viewconfigurefieldspage.cpp @@ -214,7 +214,7 @@ void ViewConfigureFieldsPage::initGUI() mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::Personal ) ); mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::Organization ) ); mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::CustomCategory ) ); - connect( mCategoryCombo, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotShowFields(int) ) ); + connect( mCategoryCombo, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotShowFields(int) ) ); gl->addWidget( mCategoryCombo, 0, 0 ); TQLabel *label = new TQLabel( i18n( "&Selected fields:" ), this ); @@ -235,12 +235,12 @@ void ViewConfigureFieldsPage::initGUI() mAddButton = new TQToolButton( this ); mAddButton->setIconSet( TQApplication::reverseLayout() ? SmallIconSet( "1leftarrow" ) : SmallIconSet( "1rightarrow" ) ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSelect() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSelect() ) ); vb1->addWidget( mAddButton ); mRemoveButton = new TQToolButton( this ); mRemoveButton->setIconSet( TQApplication::reverseLayout() ? SmallIconSet( "1rightarrow" ) : SmallIconSet( "1leftarrow" ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotUnSelect() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotUnSelect() ) ); vb1->addWidget( mRemoveButton ); vb1->addStretch(); @@ -251,12 +251,12 @@ void ViewConfigureFieldsPage::initGUI() mUpButton = new TQToolButton( this ); mUpButton->setIconSet( SmallIconSet( "1uparrow" ) ); - connect( mUpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotMoveUp() ) ); + connect( mUpButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotMoveUp() ) ); vb2->addWidget( mUpButton ); mDownButton = new TQToolButton( this ); mDownButton->setIconSet( SmallIconSet( "1downarrow" ) ); - connect( mDownButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotMoveDown() ) ); + connect( mDownButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotMoveDown() ) ); vb2->addWidget( mDownButton ); vb2->addStretch(); @@ -275,9 +275,9 @@ void ViewConfigureFieldsPage::initGUI() gl->activate(); - connect( mUnSelectedBox, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotButtonsEnabled() ) ); - connect( mSelectedBox, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotButtonsEnabled() ) ); - connect( mSelectedBox, TQT_SIGNAL( currentChanged( TQListBoxItem * ) ), TQT_SLOT( slotButtonsEnabled() ) ); + connect( mUnSelectedBox, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotButtonsEnabled() ) ); + connect( mSelectedBox, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotButtonsEnabled() ) ); + connect( mSelectedBox, TQ_SIGNAL( currentChanged( TQListBoxItem * ) ), TQ_SLOT( slotButtonsEnabled() ) ); slotButtonsEnabled(); } diff --git a/kaddressbook/viewconfigurefieldspage.h b/kaddressbook/viewconfigurefieldspage.h index 9b66b1599..f1718bd0f 100644 --- a/kaddressbook/viewconfigurefieldspage.h +++ b/kaddressbook/viewconfigurefieldspage.h @@ -37,7 +37,7 @@ class TQToolButton; class ViewConfigureFieldsPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp index c0d7fa7c2..76a355eed 100644 --- a/kaddressbook/viewconfigurefilterpage.cpp +++ b/kaddressbook/viewconfigurefilterpage.cpp @@ -41,7 +41,7 @@ ViewConfigureFilterPage::ViewConfigureFilterPage( TQWidget *parent, TQBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); mFilterGroup = new TQButtonGroup(); - connect( mFilterGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( buttonClicked( int ) ) ); + connect( mFilterGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( buttonClicked( int ) ) ); TQLabel *label = new TQLabel( i18n( "The default filter will be activated whenever" " this view is displayed. This feature allows you to configure views that only" diff --git a/kaddressbook/viewconfigurefilterpage.h b/kaddressbook/viewconfigurefilterpage.h index a29bf8808..a879337fc 100644 --- a/kaddressbook/viewconfigurefilterpage.h +++ b/kaddressbook/viewconfigurefilterpage.h @@ -33,7 +33,7 @@ class TDEConfig; class ViewConfigureFilterPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h index 11957a01c..ad6c8e338 100644 --- a/kaddressbook/viewconfigurewidget.h +++ b/kaddressbook/viewconfigurewidget.h @@ -47,7 +47,7 @@ class ViewConfigureFilterPage; */ class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget { - Q_OBJECT + TQ_OBJECT public: @@ -87,7 +87,7 @@ class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget class ViewConfigureDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index 47ef542e6..125b95c79 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -216,15 +216,15 @@ void ViewManager::setActiveView( const TQString &name ) view->readConfig( config ); // The manager just relays the signals - connect( view, TQT_SIGNAL( selected( const TQString& ) ), - TQT_SIGNAL( selected( const TQString & ) ) ); - connect( view, TQT_SIGNAL( executed( const TQString& ) ), - TQT_SIGNAL( executed( const TQString& ) ) ); - connect( view, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); - connect( view, TQT_SIGNAL( dropped( TQDropEvent* ) ), - TQT_SLOT( dropped( TQDropEvent* ) ) ); - connect( view, TQT_SIGNAL( startDrag() ), TQT_SLOT( startDrag() ) ); - connect( view, TQT_SIGNAL( sortFieldChanged() ), TQT_SIGNAL( sortFieldChanged() ) ); + connect( view, TQ_SIGNAL( selected( const TQString& ) ), + TQ_SIGNAL( selected( const TQString & ) ) ); + connect( view, TQ_SIGNAL( executed( const TQString& ) ), + TQ_SIGNAL( executed( const TQString& ) ) ); + connect( view, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) ); + connect( view, TQ_SIGNAL( dropped( TQDropEvent* ) ), + TQ_SLOT( dropped( TQDropEvent* ) ) ); + connect( view, TQ_SIGNAL( startDrag() ), TQ_SLOT( startDrag() ) ); + connect( view, TQ_SIGNAL( sortFieldChanged() ), TQ_SIGNAL( sortFieldChanged() ) ); } } @@ -568,33 +568,33 @@ void ViewManager::initActions() #if TDE_VERSION >= 309 mActionSelectView->setMenuAccelsEnabled( false ); #endif - connect( mActionSelectView, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( setActiveView( const TQString& ) ) ); + connect( mActionSelectView, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( setActiveView( const TQString& ) ) ); TDEAction *action; - action = new TDEAction( i18n( "Modify View..." ), "configure", 0, TQT_TQOBJECT(this), - TQT_SLOT( editView() ), mCore->actionCollection(), + action = new TDEAction( i18n( "Modify View..." ), "configure", 0, this, + TQ_SLOT( editView() ), mCore->actionCollection(), "view_modify" ); action->setWhatsThis( i18n( "By pressing this button a dialog opens that allows you to modify the view of the addressbook. There you can add or remove fields that you want to be shown or hidden in the addressbook like the name for example." ) ); - action = new TDEAction( i18n( "Add View..." ), "window-new", 0, TQT_TQOBJECT(this), - TQT_SLOT( addView() ), mCore->actionCollection(), + action = new TDEAction( i18n( "Add View..." ), "window-new", 0, this, + TQ_SLOT( addView() ), mCore->actionCollection(), "view_add" ); action->setWhatsThis( i18n( "You can add a new view by choosing one from the dialog that appears after pressing the button. You have to give the view a name, so that you can distinguish between the different views." ) ); mActionDeleteView = new TDEAction( i18n( "Delete View" ), "view_remove", 0, - TQT_TQOBJECT(this), TQT_SLOT( deleteView() ), + this, TQ_SLOT( deleteView() ), mCore->actionCollection(), "view_delete" ); mActionDeleteView->setWhatsThis( i18n( "By pressing this button you can delete the actual view, which you have added before." ) ); - action = new TDEAction( i18n( "Refresh View" ), "reload", 0, TQT_TQOBJECT(this), - TQT_SLOT( refreshView() ), mCore->actionCollection(), + action = new TDEAction( i18n( "Refresh View" ), "reload", 0, this, + TQ_SLOT( refreshView() ), mCore->actionCollection(), "view_refresh" ); action->setWhatsThis( i18n( "The view will be refreshed by pressing this button." ) ); - action = new TDEAction( i18n( "Edit &Filters..." ), "filter", 0, TQT_TQOBJECT(this), - TQT_SLOT( configureFilters() ), mCore->actionCollection(), + action = new TDEAction( i18n( "Edit &Filters..." ), "filter", 0, this, + TQ_SLOT( configureFilters() ), mCore->actionCollection(), "options_edit_filters" ); action->setWhatsThis( i18n( "Edit the contact filters<p>You will be presented with a dialog, where you can add, remove and edit filters." ) ); } diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h index 9820607e0..ce9abbc23 100644 --- a/kaddressbook/viewmanager.h +++ b/kaddressbook/viewmanager.h @@ -49,7 +49,7 @@ namespace TDEABC { class AddressBook; } */ class ViewManager : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index 9b1ef52a6..749dc13f6 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -316,7 +316,7 @@ void CardViewItem::paintCard( TQPainter *p, TQColorGroup &cg ) // if we are the current item and the view has focus, draw focus rect if ( mView->currentItem() == this && mView->hasFocus() ) { - mView->style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, + mView->style().drawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 0, 0, mView->itemWidth(), h + (2 * mg) ), cg, TQStyle::Style_FocusAtBorder, TQStyleOption( isSelected() ? cg.highlight() : cg.base() ) ); @@ -587,10 +587,10 @@ CardView::CardView( TQWidget *parent, const char *name ) viewport()->setMouseTracking( true ); viewport()->setFocusProxy( this ); - viewport()->setFocusPolicy(TQ_WheelFocus ); + viewport()->setFocusPolicy(TQWidget::WheelFocus ); viewport()->setBackgroundMode( PaletteBase ); - connect( d->mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( tryShowFullText() ) ); + connect( d->mTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( tryShowFullText() ) ); setBackgroundMode( PaletteBackground, PaletteBase ); @@ -1022,7 +1022,7 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e ) emit clicked( item ); // The RMB click - if ( e->button() & Qt::RightButton ) { + if ( e->button() & TQt::RightButton ) { // clear previous selection bool blocked = signalsBlocked(); blockSignals( true ); @@ -1056,7 +1056,7 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e ) item->repaintCard(); emit selectionChanged(); } else if ( d->mSelectionMode == CardView::Extended ) { - if ( (e->button() & Qt::LeftButton) && (e->state() & TQt::ShiftButton) ) { + if ( (e->button() & TQt::LeftButton) && (e->state() & TQt::ShiftButton) ) { if ( item == other ) return; @@ -1083,11 +1083,11 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e ) } emit selectionChanged(); - } else if ( (e->button() & Qt::LeftButton) && (e->state() & TQt::ControlButton) ) { + } else if ( (e->button() & TQt::LeftButton) && (e->state() & TQt::ControlButton) ) { item->setSelected( !item->isSelected() ); item->repaintCard(); emit selectionChanged(); - } else if ( e->button() & Qt::LeftButton ) { + } else if ( e->button() & TQt::LeftButton ) { bool b = signalsBlocked(); blockSignals( true ); selectAll( false ); @@ -1158,7 +1158,7 @@ void CardView::contentsMouseMoveEvent( TQMouseEvent *e ) return; } - if ( d->mLastClickOnItem && (e->state() & Qt::LeftButton) && + if ( d->mLastClickOnItem && (e->state() & TQt::LeftButton) && ((e->pos() - d->mLastClickPos).manhattanLength() > 4)) { startDrag(); diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h index d064e03d4..92c7f8f23 100644 --- a/kaddressbook/views/cardview.h +++ b/kaddressbook/views/cardview.h @@ -195,7 +195,7 @@ class CardView : public TQScrollView { friend class CardViewItem; - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/views/colorlistbox.cpp b/kaddressbook/views/colorlistbox.cpp index 54ad38b34..a72a644b8 100644 --- a/kaddressbook/views/colorlistbox.cpp +++ b/kaddressbook/views/colorlistbox.cpp @@ -28,7 +28,7 @@ ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f ) :TDEListBox( parent, name, f ), mCurrentOnDragEnter(-1) { - connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) ); + connect( this, TQ_SIGNAL(selected(int)), this, TQ_SLOT(newColor(int)) ); setAcceptDrops( true); } diff --git a/kaddressbook/views/colorlistbox.h b/kaddressbook/views/colorlistbox.h index 62b7e5a8f..f860bf823 100644 --- a/kaddressbook/views/colorlistbox.h +++ b/kaddressbook/views/colorlistbox.h @@ -25,7 +25,7 @@ class ColorListBox : public TDEListBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index 2fe22f8ca..cbe70109f 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -201,7 +201,7 @@ void CardViewLookNFeelPage::initGUI() loTab->setSpacing( spacing ); loTab->setMargin( margin ); - TQGroupBox *gbGeneral = new TQGroupBox( 1, Qt::Horizontal, i18n("General"), loTab ); + TQGroupBox *gbGeneral = new TQGroupBox( 1, TQt::Horizontal, i18n("General"), loTab ); cbDrawSeps = new TQCheckBox( i18n("Draw &separators"), gbGeneral ); @@ -215,7 +215,7 @@ void CardViewLookNFeelPage::initGUI() sbSpacing = new TQSpinBox( 0, 100, 1, hbPadding ); lSpacing->setBuddy( sbSpacing ); - TQGroupBox *gbCards = new TQGroupBox( 1, Qt::Horizontal, i18n("Cards"), loTab ); + TQGroupBox *gbCards = new TQGroupBox( 1, TQt::Horizontal, i18n("Cards"), loTab ); TQHBox *hbMargin = new TQHBox( gbCards ); TQLabel *lMargin = new TQLabel( i18n("&Margin:"), hbMargin ); @@ -246,7 +246,7 @@ void CardViewLookNFeelPage::initGUI() colorTab->setSpacing( spacing ); colorTab->setMargin( spacing ); cbEnableCustomColors = new TQCheckBox( i18n("&Enable custom colors"), colorTab ); - connect( cbEnableCustomColors, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableColors()) ); + connect( cbEnableCustomColors, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableColors()) ); lbColors = new ColorListBox( colorTab ); tabs->addTab( colorTab, i18n("&Colors") ); @@ -265,7 +265,7 @@ void CardViewLookNFeelPage::initGUI() fntTab->setMargin( spacing ); cbEnableCustomFonts = new TQCheckBox( i18n("&Enable custom fonts"), fntTab ); - connect( cbEnableCustomFonts, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableFonts()) ); + connect( cbEnableCustomFonts, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableFonts()) ); vbFonts = new TQWidget( fntTab ); TQGridLayout *gFnts = new TQGridLayout( vbFonts, 2, 3 ); @@ -277,14 +277,14 @@ void CardViewLookNFeelPage::initGUI() lTextFont->setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); btnFont = new KPushButton( i18n("Choose..."), vbFonts ); lTFnt->setBuddy( btnFont ); - connect( btnFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(setTextFont()) ); + connect( btnFont, TQ_SIGNAL(clicked()), this, TQ_SLOT(setTextFont()) ); TQLabel *lHFnt = new TQLabel( i18n("&Header font:"), vbFonts ); lHeaderFont = new TQLabel( vbFonts ); lHeaderFont->setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); btnHeaderFont = new KPushButton( i18n("Choose..."), vbFonts ); lHFnt->setBuddy( btnHeaderFont ); - connect( btnHeaderFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(setHeaderFont()) ); + connect( btnHeaderFont, TQ_SIGNAL(clicked()), this, TQ_SLOT(setHeaderFont()) ); fntTab->setStretchFactor( new TQWidget( fntTab ), 1 ); diff --git a/kaddressbook/views/configurecardviewdialog.h b/kaddressbook/views/configurecardviewdialog.h index afb938a61..c57594cb6 100644 --- a/kaddressbook/views/configurecardviewdialog.h +++ b/kaddressbook/views/configurecardviewdialog.h @@ -79,7 +79,7 @@ class ConfigureCardViewWidget : public ViewConfigureWidget class CardViewLookNFeelPage : public TQVBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index 1bd70c29d..eb508b3d6 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/kaddressbook/views/configuretableviewdialog.cpp @@ -113,7 +113,7 @@ void LookAndFeelPage::initGUI() { TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint()); - TQButtonGroup *group = new TQButtonGroup(1, Qt::Horizontal, + TQButtonGroup *group = new TQButtonGroup(1, TQt::Horizontal, i18n("Row Separator"), this); layout->addWidget(group); @@ -128,8 +128,8 @@ void LookAndFeelPage::initGUI() mBackgroundBox = new TQCheckBox(i18n("Enable background image:"), this, "mBackgroundBox"); - connect(mBackgroundBox, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(enableBackgroundToggled(bool))); + connect(mBackgroundBox, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(enableBackgroundToggled(bool))); backgroundLayout->addWidget(mBackgroundBox); mBackgroundName = new KURLRequester(this, "mBackgroundName"); diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h index fc38d0da5..fdc644be5 100644 --- a/kaddressbook/views/configuretableviewdialog.h +++ b/kaddressbook/views/configuretableviewdialog.h @@ -62,7 +62,7 @@ class ConfigureTableViewWidget : public ViewConfigureWidget */ class LookAndFeelPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index 3a01974bc..b23f415c8 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -278,8 +278,8 @@ ContactListView::ContactListView(KAddressBookTableView *view, setSelectionModeExt( TDEListView::Extended ); setDropVisualizer(false); - connect(this, TQT_SIGNAL(dropped(TQDropEvent*)), - this, TQT_SLOT(itemDropped(TQDropEvent*))); + connect(this, TQ_SIGNAL(dropped(TQDropEvent*)), + this, TQ_SLOT(itemDropped(TQDropEvent*))); new DynamicTip( this ); } @@ -314,7 +314,7 @@ void ContactListView::contentsMousePressEvent(TQMouseEvent* e) // To initiate a drag operation void ContactListView::contentsMouseMoveEvent( TQMouseEvent *e ) { - if ((e->state() & Qt::LeftButton) && (e->pos() - presspos).manhattanLength() > 4 ) { + if ((e->state() & TQt::LeftButton) && (e->pos() - presspos).manhattanLength() > 4 ) { emit startAddresseeDrag(); } else diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h index 138830b60..a2d70aa26 100644 --- a/kaddressbook/views/contactlistview.h +++ b/kaddressbook/views/contactlistview.h @@ -84,7 +84,7 @@ private: class ContactListView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index 9c6b55e10..a61ba3a92 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp @@ -156,16 +156,16 @@ KAddressBookCardView::KAddressBookCardView( KAB::Core *core, layout->addWidget( mCardView ); // Connect up the signals - connect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) ); - connect( mCardView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( addresseeSelected() ) ); - connect( mCardView, TQT_SIGNAL( addresseeDropped( TQDropEvent* ) ), - this, TQT_SIGNAL( dropped( TQDropEvent* ) ) ); - connect( mCardView, TQT_SIGNAL( startAddresseeDrag() ), - this, TQT_SIGNAL( startDrag() ) ); - connect( mCardView, TQT_SIGNAL( contextMenuRequested( CardViewItem*, const TQPoint& ) ), - this, TQT_SLOT( rmbClicked( CardViewItem*, const TQPoint& ) ) ); + connect( mCardView, TQ_SIGNAL( executed( CardViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( CardViewItem* ) ) ); + connect( mCardView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( addresseeSelected() ) ); + connect( mCardView, TQ_SIGNAL( addresseeDropped( TQDropEvent* ) ), + this, TQ_SIGNAL( dropped( TQDropEvent* ) ) ); + connect( mCardView, TQ_SIGNAL( startAddresseeDrag() ), + this, TQ_SIGNAL( startDrag() ) ); + connect( mCardView, TQ_SIGNAL( contextMenuRequested( CardViewItem*, const TQPoint& ) ), + this, TQ_SLOT( rmbClicked( CardViewItem*, const TQPoint& ) ) ); } KAddressBookCardView::~KAddressBookCardView() @@ -185,18 +185,18 @@ void KAddressBookCardView::readConfig( TDEConfig *config ) // costum colors? if ( config->readBoolEntry( "EnableCustomColors", false ) ) { TQPalette p( mCardView->palette() ); - TQColor c = p.color( TQPalette::Normal, TQColorGroup::Base ); - p.setColor( TQPalette::Normal, TQColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) ); - c = p.color( TQPalette::Normal, TQColorGroup::Text ); - p.setColor( TQPalette::Normal, TQColorGroup::Text, config->readColorEntry( "TextColor", &c ) ); - c = p.color( TQPalette::Normal, TQColorGroup::Button ); - p.setColor( TQPalette::Normal, TQColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) ); - c = p.color( TQPalette::Normal, TQColorGroup::ButtonText ); - p.setColor( TQPalette::Normal, TQColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) ); - c = p.color( TQPalette::Normal, TQColorGroup::Highlight ); - p.setColor( TQPalette::Normal, TQColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) ); - c = p.color( TQPalette::Normal, TQColorGroup::HighlightedText ); - p.setColor( TQPalette::Normal, TQColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) ); + TQColor c = p.color( TQPalette::Active, TQColorGroup::Base ); + p.setColor( TQPalette::Active, TQColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) ); + c = p.color( TQPalette::Active, TQColorGroup::Text ); + p.setColor( TQPalette::Active, TQColorGroup::Text, config->readColorEntry( "TextColor", &c ) ); + c = p.color( TQPalette::Active, TQColorGroup::Button ); + p.setColor( TQPalette::Active, TQColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) ); + c = p.color( TQPalette::Active, TQColorGroup::ButtonText ); + p.setColor( TQPalette::Active, TQColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) ); + c = p.color( TQPalette::Active, TQColorGroup::Highlight ); + p.setColor( TQPalette::Active, TQColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) ); + c = p.color( TQPalette::Active, TQColorGroup::HighlightedText ); + p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) ); mCardView->viewport()->setPalette( p ); } else { // needed if turned off during a session. @@ -227,15 +227,15 @@ void KAddressBookCardView::readConfig( TDEConfig *config ) mCardView->setItemSpacing( config->readNumEntry( "ItemSpacing", 10 ) ); mCardView->setSeparatorWidth( config->readNumEntry( "SeparatorWidth", 2 ) ); - disconnect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) ); + disconnect( mCardView, TQ_SIGNAL( executed( CardViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( CardViewItem* ) ) ); if ( KABPrefs::instance()->honorSingleClick() ) - connect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) ); + connect( mCardView, TQ_SIGNAL( executed( CardViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( CardViewItem* ) ) ); else - connect( mCardView, TQT_SIGNAL( doubleClicked( CardViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) ); + connect( mCardView, TQ_SIGNAL( doubleClicked( CardViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( CardViewItem* ) ) ); } void KAddressBookCardView::writeConfig( TDEConfig *config ) diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h index 15c77a7c9..447614ad3 100644 --- a/kaddressbook/views/kaddressbookcardview.h +++ b/kaddressbook/views/kaddressbookcardview.h @@ -42,7 +42,7 @@ class AddresseeCardView; */ class KAddressBookCardView : public KAddressBookView { - Q_OBJECT + TQ_OBJECT public: @@ -77,7 +77,7 @@ class KAddressBookCardView : public KAddressBookView class AddresseeCardView : public CardView { - Q_OBJECT + TQ_OBJECT public: AddresseeCardView( TQWidget *parent, const char *name = 0 ); diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index 3021f6921..66aff6d12 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp @@ -70,8 +70,8 @@ AddresseeIconView::AddresseeIconView( TQWidget *parent, const char *name ) setSorting( true, true ); setMode( TDEIconView::Select ); - connect( this, TQT_SIGNAL( dropped( TQDropEvent*, const TQValueList<TQIconDragItem>& ) ), - this, TQT_SLOT( itemDropped( TQDropEvent*, const TQValueList<TQIconDragItem>& ) ) ); + connect( this, TQ_SIGNAL( dropped( TQDropEvent*, const TQValueList<TQIconDragItem>& ) ), + this, TQ_SLOT( itemDropped( TQDropEvent*, const TQValueList<TQIconDragItem>& ) ) ); } AddresseeIconView::~AddresseeIconView() @@ -145,16 +145,16 @@ KAddressBookIconView::KAddressBookIconView( KAB::Core *core, layout->addWidget( mIconView ); // Connect up the signals - connect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); - connect( mIconView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( addresseeSelected() ) ); - connect( mIconView, TQT_SIGNAL( addresseeDropped( TQDropEvent* ) ), - this, TQT_SIGNAL( dropped( TQDropEvent* ) ) ); - connect( mIconView, TQT_SIGNAL( startAddresseeDrag() ), - this, TQT_SIGNAL( startDrag() ) ); - connect( mIconView, TQT_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ), - this, TQT_SLOT( rmbClicked( TQIconViewItem*, const TQPoint& ) ) ); + connect( mIconView, TQ_SIGNAL( executed( TQIconViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); + connect( mIconView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( addresseeSelected() ) ); + connect( mIconView, TQ_SIGNAL( addresseeDropped( TQDropEvent* ) ), + this, TQ_SIGNAL( dropped( TQDropEvent* ) ) ); + connect( mIconView, TQ_SIGNAL( startAddresseeDrag() ), + this, TQ_SIGNAL( startDrag() ) ); + connect( mIconView, TQ_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ), + this, TQ_SLOT( rmbClicked( TQIconViewItem*, const TQPoint& ) ) ); } KAddressBookIconView::~KAddressBookIconView() @@ -171,15 +171,15 @@ void KAddressBookIconView::readConfig( TDEConfig *config ) { KAddressBookView::readConfig( config ); - disconnect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); + disconnect( mIconView, TQ_SIGNAL( executed( TQIconViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); if ( KABPrefs::instance()->honorSingleClick() ) - connect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); + connect( mIconView, TQ_SIGNAL( executed( TQIconViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); else - connect( mIconView, TQT_SIGNAL( doubleClicked( TQIconViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); + connect( mIconView, TQ_SIGNAL( doubleClicked( TQIconViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); } TQStringList KAddressBookIconView::selectedUids() diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h index feb9edf3c..d4d7bf932 100644 --- a/kaddressbook/views/kaddressbookiconview.h +++ b/kaddressbook/views/kaddressbookiconview.h @@ -41,7 +41,7 @@ namespace TDEABC { class AddressBook; } */ class KAddressBookIconView : public KAddressBookView { - Q_OBJECT + TQ_OBJECT public: @@ -75,7 +75,7 @@ class KAddressBookIconView : public KAddressBookView class AddresseeIconView : public TDEIconView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index ad39eb644..6b6333035 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp @@ -103,16 +103,16 @@ KAddressBookTableView::~KAddressBookTableView() void KAddressBookTableView::reconstructListView() { if ( mListView ) { - disconnect( mListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( addresseeSelected() ) ); - disconnect( mListView, TQT_SIGNAL( executed( TQListViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQListViewItem* ) ) ); - disconnect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQListViewItem* ) ) ); - disconnect( mListView, TQT_SIGNAL( startAddresseeDrag() ), - this, TQT_SIGNAL( startDrag() ) ); - disconnect( mListView, TQT_SIGNAL( addresseeDropped( TQDropEvent* ) ), - this, TQT_SIGNAL( dropped( TQDropEvent* ) ) ); + disconnect( mListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( addresseeSelected() ) ); + disconnect( mListView, TQ_SIGNAL( executed( TQListViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQListViewItem* ) ) ); + disconnect( mListView, TQ_SIGNAL( doubleClicked( TQListViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQListViewItem* ) ) ); + disconnect( mListView, TQ_SIGNAL( startAddresseeDrag() ), + this, TQ_SIGNAL( startDrag() ) ); + disconnect( mListView, TQ_SIGNAL( addresseeDropped( TQDropEvent* ) ), + this, TQ_SIGNAL( dropped( TQDropEvent* ) ) ); delete mListView; } @@ -141,23 +141,23 @@ void KAddressBookTableView::reconstructListView() mListView->setFullWidth( true ); - connect( mListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( addresseeSelected() ) ); - connect( mListView, TQT_SIGNAL( startAddresseeDrag() ), - this, TQT_SIGNAL( startDrag() ) ); - connect( mListView, TQT_SIGNAL( addresseeDropped( TQDropEvent* ) ), - this, TQT_SIGNAL( dropped( TQDropEvent* ) ) ); - connect( mListView, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( rmbClicked( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); - connect( mListView->header(), TQT_SIGNAL( clicked( int ) ), - this, TQT_SIGNAL( sortFieldChanged() ) ); + connect( mListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( addresseeSelected() ) ); + connect( mListView, TQ_SIGNAL( startAddresseeDrag() ), + this, TQ_SIGNAL( startDrag() ) ); + connect( mListView, TQ_SIGNAL( addresseeDropped( TQDropEvent* ) ), + this, TQ_SIGNAL( dropped( TQDropEvent* ) ) ); + connect( mListView, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQ_SLOT( rmbClicked( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( mListView->header(), TQ_SIGNAL( clicked( int ) ), + this, TQ_SIGNAL( sortFieldChanged() ) ); if ( KABPrefs::instance()->honorSingleClick() ) - connect( mListView, TQT_SIGNAL( executed( TQListViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQListViewItem* ) ) ); + connect( mListView, TQ_SIGNAL( executed( TQListViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQListViewItem* ) ) ); else - connect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQListViewItem* ) ) ); + connect( mListView, TQ_SIGNAL( doubleClicked( TQListViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQListViewItem* ) ) ); refresh(); @@ -187,13 +187,13 @@ void KAddressBookTableView::readConfig( TDEConfig *config ) if ( config->readBoolEntry( "InstantMessagingPresence", false ) ) { if ( !mIMProxy ) { mIMProxy = KIMProxy::instance( kapp->dcopClient() ); - connect( mIMProxy, TQT_SIGNAL( sigContactPresenceChanged( const TQString& ) ), - this, TQT_SLOT( updatePresence( const TQString& ) ) ); + connect( mIMProxy, TQ_SIGNAL( sigContactPresenceChanged( const TQString& ) ), + this, TQ_SLOT( updatePresence( const TQString& ) ) ); } } else { if ( mIMProxy ) { - disconnect( mIMProxy, TQT_SIGNAL( sigContactPresenceChanged( const TQString& ) ), - this, TQT_SLOT( updatePresence( const TQString& ) ) ); + disconnect( mIMProxy, TQ_SIGNAL( sigContactPresenceChanged( const TQString& ) ), + this, TQ_SLOT( updatePresence( const TQString& ) ) ); mIMProxy = 0; } } diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h index 7d258d2a7..432a2164b 100644 --- a/kaddressbook/views/kaddressbooktableview.h +++ b/kaddressbook/views/kaddressbooktableview.h @@ -61,7 +61,7 @@ class KAddressBookTableView : public KAddressBookView { friend class ContactListView; - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/xxport/bookmark_xxport.h b/kaddressbook/xxport/bookmark_xxport.h index fde6fe4dc..03fe7d0df 100644 --- a/kaddressbook/xxport/bookmark_xxport.h +++ b/kaddressbook/xxport/bookmark_xxport.h @@ -29,7 +29,7 @@ class BookmarkXXPort : public KAB::XXPort { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/xxport/csv_xxport.h b/kaddressbook/xxport/csv_xxport.h index f0a28fdec..473507b65 100644 --- a/kaddressbook/xxport/csv_xxport.h +++ b/kaddressbook/xxport/csv_xxport.h @@ -28,7 +28,7 @@ class CSVXXPort : public KAB::XXPort { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 091d277f9..589bfb243 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -121,33 +121,33 @@ CSVImportDialog::CSVImportDialog( TDEABC::AddressBook *ab, TQWidget *parent, reloadCodecs(); - connect( mDelimiterBox, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( delimiterClicked( int ) ) ); - connect( mDelimiterEdit, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( returnPressed() ) ); - connect( mDelimiterEdit, TQT_SIGNAL( textChanged ( const TQString& ) ), - this, TQT_SLOT( textChanged ( const TQString& ) ) ); - connect( mComboLine, TQT_SIGNAL( activated( const TQString& ) ), - this, TQT_SLOT( lineSelected( const TQString& ) ) ); - connect( mComboQuote, TQT_SIGNAL( activated( const TQString& ) ), - this, TQT_SLOT( textquoteSelected( const TQString& ) ) ); - connect( mIgnoreDuplicates, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( ignoreDuplicatesChanged( int ) ) ); - connect( mCodecCombo, TQT_SIGNAL( activated( const TQString& ) ), - this, TQT_SLOT( codecChanged() ) ); - - connect( mUrlRequester, TQT_SIGNAL( returnPressed( const TQString& ) ), - this, TQT_SLOT( setFile( const TQString& ) ) ); - connect( mUrlRequester, TQT_SIGNAL( urlSelected( const TQString& ) ), - this, TQT_SLOT( setFile( const TQString& ) ) ); - connect( mUrlRequester->lineEdit(), TQT_SIGNAL( textChanged ( const TQString& ) ), - this, TQT_SLOT( urlChanged( const TQString& ) ) ); - - connect( this, TQT_SIGNAL( user1Clicked() ), - this, TQT_SLOT( applyTemplate() ) ); - - connect( this, TQT_SIGNAL( user2Clicked() ), - this, TQT_SLOT( saveTemplate() ) ); + connect( mDelimiterBox, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( delimiterClicked( int ) ) ); + connect( mDelimiterEdit, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( returnPressed() ) ); + connect( mDelimiterEdit, TQ_SIGNAL( textChanged ( const TQString& ) ), + this, TQ_SLOT( textChanged ( const TQString& ) ) ); + connect( mComboLine, TQ_SIGNAL( activated( const TQString& ) ), + this, TQ_SLOT( lineSelected( const TQString& ) ) ); + connect( mComboQuote, TQ_SIGNAL( activated( const TQString& ) ), + this, TQ_SLOT( textquoteSelected( const TQString& ) ) ); + connect( mIgnoreDuplicates, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( ignoreDuplicatesChanged( int ) ) ); + connect( mCodecCombo, TQ_SIGNAL( activated( const TQString& ) ), + this, TQ_SLOT( codecChanged() ) ); + + connect( mUrlRequester, TQ_SIGNAL( returnPressed( const TQString& ) ), + this, TQ_SLOT( setFile( const TQString& ) ) ); + connect( mUrlRequester, TQ_SIGNAL( urlSelected( const TQString& ) ), + this, TQ_SLOT( setFile( const TQString& ) ) ); + connect( mUrlRequester->lineEdit(), TQ_SIGNAL( textChanged ( const TQString& ) ), + this, TQ_SLOT( urlChanged( const TQString& ) ) ); + + connect( this, TQ_SIGNAL( user1Clicked() ), + this, TQ_SLOT( applyTemplate() ) ); + + connect( this, TQ_SIGNAL( user2Clicked() ), + this, TQ_SLOT( saveTemplate() ) ); } CSVImportDialog::~CSVImportDialog() @@ -383,7 +383,7 @@ void CSVImportDialog::initGUI() // Delimiter: comma, semicolon, tab, space, other mDelimiterBox = new TQButtonGroup( i18n( "Delimiter" ), mPage ); - mDelimiterBox->setColumnLayout( 0, Qt::Vertical ); + mDelimiterBox->setColumnLayout( 0, TQt::Vertical ); mDelimiterBox->layout()->setSpacing( spacingHint() ); mDelimiterBox->layout()->setMargin( marginHint() ); TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->layout() ); diff --git a/kaddressbook/xxport/csvimportdialog.h b/kaddressbook/xxport/csvimportdialog.h index da91c019a..2dce71f49 100644 --- a/kaddressbook/xxport/csvimportdialog.h +++ b/kaddressbook/xxport/csvimportdialog.h @@ -40,7 +40,7 @@ class TQTable; class CSVImportDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/xxport/eudora_xxport.h b/kaddressbook/xxport/eudora_xxport.h index b6b346022..1f6007f51 100644 --- a/kaddressbook/xxport/eudora_xxport.h +++ b/kaddressbook/xxport/eudora_xxport.h @@ -28,7 +28,7 @@ class EudoraXXPort : public KAB::XXPort { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/xxport/gnokii_xxport.h b/kaddressbook/xxport/gnokii_xxport.h index b41aace12..c24c4b14a 100644 --- a/kaddressbook/xxport/gnokii_xxport.h +++ b/kaddressbook/xxport/gnokii_xxport.h @@ -28,7 +28,7 @@ class GNOKIIXXPort : public KAB::XXPort { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/xxport/kde2_xxport.h b/kaddressbook/xxport/kde2_xxport.h index 694b0b1ba..146fa1179 100644 --- a/kaddressbook/xxport/kde2_xxport.h +++ b/kaddressbook/xxport/kde2_xxport.h @@ -28,7 +28,7 @@ class KDE2XXPort : public KAB::XXPort { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/xxport/ldif_xxport.h b/kaddressbook/xxport/ldif_xxport.h index 1e8282a83..11cbd40b3 100644 --- a/kaddressbook/xxport/ldif_xxport.h +++ b/kaddressbook/xxport/ldif_xxport.h @@ -29,7 +29,7 @@ class LDIFXXPort : public KAB::XXPort { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/xxport/opera_xxport.h b/kaddressbook/xxport/opera_xxport.h index ce0a33ec4..e0723c58d 100644 --- a/kaddressbook/xxport/opera_xxport.h +++ b/kaddressbook/xxport/opera_xxport.h @@ -29,7 +29,7 @@ class OperaXXPort : public KAB::XXPort { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/xxport/pab_xxport.h b/kaddressbook/xxport/pab_xxport.h index 796894a06..b3b6fb299 100644 --- a/kaddressbook/xxport/pab_xxport.h +++ b/kaddressbook/xxport/pab_xxport.h @@ -29,7 +29,7 @@ class PABXXPort : public KAB::XXPort { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/xxport/vcard_xxport.h b/kaddressbook/xxport/vcard_xxport.h index c5f66f930..780d7ccc0 100644 --- a/kaddressbook/xxport/vcard_xxport.h +++ b/kaddressbook/xxport/vcard_xxport.h @@ -29,7 +29,7 @@ class VCardXXPort : public KAB::XXPort { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp index bdc48f6b6..3424e98ea 100644 --- a/kaddressbook/xxportmanager.cpp +++ b/kaddressbook/xxportmanager.cpp @@ -146,10 +146,10 @@ void XXPortManager::loadPlugins() mCore->guiClient()->insertChildClient( obj ); mXXPortObjects.insert( obj->identifier(), obj ); - connect( obj, TQT_SIGNAL( exportActivated( const TQString&, const TQString& ) ), - this, TQT_SLOT( slotExport( const TQString&, const TQString& ) ) ); - connect( obj, TQT_SIGNAL( importActivated( const TQString&, const TQString& ) ), - this, TQT_SLOT( slotImport( const TQString&, const TQString& ) ) ); + connect( obj, TQ_SIGNAL( exportActivated( const TQString&, const TQString& ) ), + this, TQ_SLOT( slotExport( const TQString&, const TQString& ) ) ); + connect( obj, TQ_SIGNAL( importActivated( const TQString&, const TQString& ) ), + this, TQ_SLOT( slotImport( const TQString&, const TQString& ) ) ); obj->setTDEApplication( kapp ); } diff --git a/kaddressbook/xxportmanager.h b/kaddressbook/xxportmanager.h index 04323636b..02057213b 100644 --- a/kaddressbook/xxportmanager.h +++ b/kaddressbook/xxportmanager.h @@ -39,7 +39,7 @@ class Core; class KDE_EXPORT XXPortManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp index b6849aaca..449ea60df 100644 --- a/kaddressbook/xxportselectdialog.cpp +++ b/kaddressbook/xxportselectdialog.cpp @@ -51,10 +51,10 @@ XXPortSelectDialog::XXPortSelectDialog( KAB::Core *core, bool sort, { initGUI(); - connect( mFiltersCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( filterChanged( int ) ) ); - connect( mCategoriesView, TQT_SIGNAL( clicked( TQListViewItem* ) ), - TQT_SLOT( categoryClicked( TQListViewItem* ) ) ); + connect( mFiltersCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( filterChanged( int ) ) ); + connect( mCategoriesView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + TQ_SLOT( categoryClicked( TQListViewItem* ) ) ); // setup filters mFilters = Filter::restore( kapp->config(), "Filter" ); @@ -186,7 +186,7 @@ void XXPortSelectDialog::initGUI() topLayout->addWidget( label ); mButtonGroup = new TQButtonGroup( i18n( "Selection" ), page ); - mButtonGroup->setColumnLayout( 0, Qt::Vertical ); + mButtonGroup->setColumnLayout( 0, TQt::Vertical ); mButtonGroup->layout()->setSpacing( KDialog::spacingHint() ); mButtonGroup->layout()->setMargin( KDialog::marginHint() ); @@ -225,7 +225,7 @@ void XXPortSelectDialog::initGUI() topLayout->addWidget( mButtonGroup ); TQButtonGroup *sortingGroup = new TQButtonGroup( i18n( "Sorting" ), page ); - sortingGroup->setColumnLayout( 0, Qt::Vertical ); + sortingGroup->setColumnLayout( 0, TQt::Vertical ); TQGridLayout *sortLayout = new TQGridLayout( sortingGroup->layout(), 2, 2, KDialog::spacingHint() ); sortLayout->setAlignment( TQt::AlignTop ); diff --git a/kaddressbook/xxportselectdialog.h b/kaddressbook/xxportselectdialog.h index d9355e5b5..725dfd22b 100644 --- a/kaddressbook/xxportselectdialog.h +++ b/kaddressbook/xxportselectdialog.h @@ -44,7 +44,7 @@ class KComboBox; class XXPortSelectDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: |