diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-16 20:17:18 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-16 20:17:18 +0000 |
| commit | f4fae92b6768541e2952173c3d4b09040f95bf7e (patch) | |
| tree | d8c5d93232235cd635f3310b4d95490df181ba2d /kaddressbook | |
| parent | 125c0a08265b75a133644d3b55f47e37c919f45d (diff) | |
| download | tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip | |
Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kaddressbook')
89 files changed, 605 insertions, 605 deletions
diff --git a/kaddressbook/Makefile.am b/kaddressbook/Makefile.am index fe39a1084..05cdddb09 100644 --- a/kaddressbook/Makefile.am +++ b/kaddressbook/Makefile.am @@ -24,7 +24,7 @@ kde_module_LTLIBRARIES = libkaddressbookpart.la libkaddressbookpart_la_SOURCES = kaddressbook_part.cpp libkaddressbookpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -libkaddressbookpart_la_LIBADD = libkaddressbook.la +libkaddressbookpart_la_LIBADD = libkaddressbook.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) -lDCOP lib_LTLIBRARIES = libkaddressbook.la libkaddressbook_la_SOURCES = addresseeconfig.cpp addresseeeditordialog.cpp \ diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index 26924ef8f..ac70cbaa9 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/kaddressbook/addresseditwidget.cpp @@ -82,25 +82,25 @@ class TabPressEater : public QObject AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQBoxLayout *layout = new TQVBoxLayout( this, 4, 2 ); - layout->setSpacing( KDialog::spacingHint() ); + TQBoxLayout *tqlayout = new TQVBoxLayout( this, 4, 2 ); + tqlayout->setSpacing( KDialog::spacingHint() ); mTypeCombo = new AddressTypeCombo( mAddressList, this ); connect( mTypeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateAddressEdit() ) ); - layout->addWidget( mTypeCombo ); + tqlayout->addWidget( mTypeCombo ); mAddressField = new KActiveLabel( this ); mAddressField->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); mAddressField->setMinimumHeight( 20 ); - mAddressField->setAlignment( Qt::AlignTop ); + mAddressField->tqsetAlignment( Qt::AlignTop ); mAddressField->setTextFormat( Qt::PlainText ); - layout->addWidget( mAddressField ); + tqlayout->addWidget( mAddressField ); mEditButton = new TQPushButton( i18n( "street/postal", "&Edit Addresses..." ), this ); connect( mEditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( edit() ) ); - layout->addWidget( mEditButton ); + tqlayout->addWidget( mEditButton ); } AddressEditWidget::~AddressEditWidget() @@ -274,7 +274,7 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list, topLayout->addMultiCellWidget( mTypeCombo, 0, 0, 0, 1 ); TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).arg( KABC::Address::streetLabel() ), page ); - label->setAlignment( Qt::AlignTop | Qt::AlignLeft ); + label->tqsetAlignment( Qt::AlignTop | Qt::AlignLeft ); topLayout->addWidget( label, 1, 0 ); mStreetTextEdit = new TQTextEdit( page ); mStreetTextEdit->setTextFormat( Qt::PlainText ); @@ -604,10 +604,10 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *parent ) parent, "AddressTypeDialog" ) { TQWidget *page = plainPage(); - TQVBoxLayout *layout = new TQVBoxLayout( page ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( page ); mGroup = new TQButtonGroup( 2, Horizontal, i18n( "street/postal", "Address Types" ), page ); - layout->addWidget( mGroup ); + tqlayout->addWidget( mGroup ); mTypeList = KABC::Address::typeList(); mTypeList.remove( KABC::Address::Pref ); diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp index 429d6b90e..7e6bab403 100644 --- a/kaddressbook/addresseeeditordialog.cpp +++ b/kaddressbook/addresseeeditordialog.cpp @@ -48,7 +48,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core, TQWidget *page = plainPage(); - TQVBoxLayout *layout = new TQVBoxLayout( page ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( page ); if ( KABPrefs::instance()->editorType() == KABPrefs::SimpleEditor ) { mEditorWidget = new SimpleAddresseeEditor( page ); @@ -56,7 +56,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core, mEditorWidget = new AddresseeEditorWidget( page ); } connect( mEditorWidget, TQT_SIGNAL( modified() ), TQT_SLOT( widgetModified() ) ); - layout->addWidget( mEditorWidget ); + tqlayout->addWidget( mEditorWidget ); enableButton( KDialogBase::Apply, false ); diff --git a/kaddressbook/addresseeeditorextension.cpp b/kaddressbook/addresseeeditorextension.cpp index 5c1ddcec6..ab8572ce8 100644 --- a/kaddressbook/addresseeeditorextension.cpp +++ b/kaddressbook/addresseeeditorextension.cpp @@ -36,14 +36,14 @@ AddresseeEditorExtension::AddresseeEditorExtension( KAB::Core *core, TQWidget *parent, const char *name ) : KAB::ExtensionWidget( core, parent, name ) { - TQVBoxLayout *layout = new TQVBoxLayout( this ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); if ( KABPrefs::instance()->editorType() == KABPrefs::SimpleEditor ) mAddresseeEditor = new SimpleAddresseeEditor( this ); else mAddresseeEditor = new AddresseeEditorWidget( this ); - layout->addWidget( mAddresseeEditor ); + tqlayout->addWidget( mAddresseeEditor ); } AddresseeEditorExtension::~AddresseeEditorExtension() diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index 631d1a3ac..519a817f1 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -125,10 +125,10 @@ void AddresseeEditorWidget::textChanged( const TQString& ) void AddresseeEditorWidget::initGUI() { - TQVBoxLayout *layout = new TQVBoxLayout( this ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); mTabWidget = new TQTabWidget( this ); - layout->addWidget( mTabWidget ); + tqlayout->addWidget( mTabWidget ); setupTab1(); setupTab2(); @@ -144,9 +144,9 @@ void AddresseeEditorWidget::setupTab1() // This is the General tab TQWidget *tab1 = new TQWidget( mTabWidget ); - TQGridLayout *layout = new TQGridLayout( tab1, 11, 7 ); - layout->setMargin( KDialogBase::marginHint() ); - layout->setSpacing( KDialogBase::spacingHint() ); + TQGridLayout *tqlayout = new TQGridLayout( tab1, 11, 7 ); + tqlayout->setMargin( KDialogBase::marginHint() ); + tqlayout->setSpacing( KDialogBase::spacingHint() ); TQLabel *label; KSeparator* bar; @@ -159,7 +159,7 @@ void AddresseeEditorWidget::setupTab1() label = new TQLabel( tab1 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, KIcon::SizeMedium ) ); - layout->addMultiCellWidget( label, 0, 1, 0, 0 ); + tqlayout->addMultiCellWidget( label, 0, 1, 0, 0 ); // First name button = new TQPushButton( i18n( "Edit Name..." ), tab1 ); @@ -178,16 +178,16 @@ void AddresseeEditorWidget::setupTab1() mNameLabel->show(); } - layout->addWidget( button, 0, 1 ); - layout->addWidget( mNameEdit, 0, 2 ); - layout->addWidget( mNameLabel, 0, 2 ); + tqlayout->addWidget( button, 0, 1 ); + tqlayout->addWidget( mNameEdit, 0, 2 ); + tqlayout->addWidget( mNameLabel, 0, 2 ); label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).arg( KABC::Addressee::roleLabel() ), tab1 ); mRoleEdit = new KLineEdit( tab1 ); connect( mRoleEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mRoleEdit ); - layout->addWidget( label, 1, 1 ); - layout->addWidget( mRoleEdit, 1, 2 ); + tqlayout->addWidget( label, 1, 1 ); + tqlayout->addWidget( mRoleEdit, 1, 2 ); // Organization label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).arg( KABC::Addressee::organizationLabel() ), tab1 ); @@ -195,59 +195,59 @@ void AddresseeEditorWidget::setupTab1() label->setBuddy( mOrgEdit ); connect( mOrgEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( organizationTextChanged( const TQString& ) ) ); - layout->addWidget( label, 2, 1 ); - layout->addWidget( mOrgEdit, 2, 2 ); + tqlayout->addWidget( label, 2, 1 ); + tqlayout->addWidget( mOrgEdit, 2, 2 ); // File as (formatted name) label = new TQLabel( i18n( "Formatted name:" ), tab1 ); mFormattedNameLabel = new KSqueezedTextLabel( tab1 ); - layout->addWidget( label, 3, 1 ); - layout->addWidget( mFormattedNameLabel, 3, 2 ); + tqlayout->addWidget( label, 3, 1 ); + tqlayout->addWidget( mFormattedNameLabel, 3, 2 ); // Left hand separator. This separator doesn't go all the way // across so the dialog still flows from top to bottom bar = new KSeparator( KSeparator::HLine, tab1 ); - layout->addMultiCellWidget( bar, 4, 4, 0, 2 ); + tqlayout->addMultiCellWidget( bar, 4, 4, 0, 2 ); ////////////////////////////////////// // Phone numbers (upper right) label = new TQLabel( tab1 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop, KIcon::SizeMedium ) ); - layout->addMultiCellWidget( label, 0, 1, 3, 3 ); + tqlayout->addMultiCellWidget( label, 0, 1, 3, 3 ); mPhoneEditWidget = new PhoneEditWidget( tab1 ); connect( mPhoneEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); - layout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 ); + tqlayout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 ); bar = new KSeparator( KSeparator::HLine, tab1 ); - layout->addMultiCellWidget( bar, 4, 4, 3, 6 ); + tqlayout->addMultiCellWidget( bar, 4, 4, 3, 6 ); ////////////////////////////////////// // Addresses (lower left) label = new TQLabel( tab1 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "kfm_home", KIcon::Desktop, KIcon::SizeMedium ) ); - layout->addMultiCellWidget( label, 5, 6, 0, 0 ); + tqlayout->addMultiCellWidget( label, 5, 6, 0, 0 ); mAddressEditWidget = new AddressEditWidget( tab1 ); connect( mAddressEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); - layout->addMultiCellWidget( mAddressEditWidget, 5, 10, 1, 2 ); + tqlayout->addMultiCellWidget( mAddressEditWidget, 5, 10, 1, 2 ); ////////////////////////////////////// // Email / Web (lower right) label = new TQLabel( tab1 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop, KIcon::SizeMedium ) ); - layout->addMultiCellWidget( label, 5, 6, 3, 3 ); + tqlayout->addMultiCellWidget( label, 5, 6, 3, 3 ); mEmailWidget = new EmailEditWidget( tab1 ); connect( mEmailWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); - layout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 ); + tqlayout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 ); // add the separator bar = new KSeparator( KSeparator::HLine, tab1 ); - layout->addMultiCellWidget( bar, 7, 7, 3, 6 ); + tqlayout->addMultiCellWidget( bar, 7, 7, 3, 6 ); TQHBoxLayout *homePageLayout = new TQHBoxLayout( 0, 11, 7 ); @@ -263,7 +263,7 @@ void AddresseeEditorWidget::setupTab1() label->setBuddy( mURLEdit ); homePageLayout->addWidget( label ); homePageLayout->addWidget( mURLEdit ); - layout->addMultiCellLayout( homePageLayout, 8, 8, 3, 6 ); + tqlayout->addMultiCellLayout( homePageLayout, 8, 8, 3, 6 ); TQHBoxLayout *blogLayout = new TQHBoxLayout( 0, 11, 7 ); label = new TQLabel( i18n("Blog feed:"), tab1 ); @@ -273,16 +273,16 @@ void AddresseeEditorWidget::setupTab1() connect( mBlogEdit, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( textChanged( const TQString & ) ) ); label->setBuddy( mBlogEdit ); - layout->addMultiCellLayout( blogLayout, 9, 9, 4, 6 ); + tqlayout->addMultiCellLayout( blogLayout, 9, 9, 4, 6 ); mIMWidget = new IMEditWidget( tab1, mAddressee ); connect( mIMWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); - layout->addMultiCellWidget( mIMWidget, 10, 10, 4, 6 ); + tqlayout->addMultiCellWidget( mIMWidget, 10, 10, 4, 6 ); - layout->addColSpacing( 6, 50 ); + tqlayout->addColSpacing( 6, 50 ); bar = new KSeparator( KSeparator::HLine, tab1 ); - layout->addMultiCellWidget( bar, 11, 11, 0, 6 ); + tqlayout->addMultiCellWidget( bar, 11, 11, 0, 6 ); /////////////////////////////////////// TQHBox *categoryBox = new TQHBox( tab1 ); @@ -300,10 +300,10 @@ void AddresseeEditorWidget::setupTab1() mSecrecyWidget = new SecrecyWidget( categoryBox ); connect( mSecrecyWidget, TQT_SIGNAL( changed() ), TQT_SLOT( emitModified() ) ); - layout->addMultiCellWidget( categoryBox, 12, 12, 0, 6 ); + tqlayout->addMultiCellWidget( categoryBox, 12, 12, 0, 6 ); - // Build the layout and add to the tab widget - layout->activate(); // required + // Build the tqlayout and add to the tab widget + tqlayout->activate(); // required mTabWidget->addTab( tab1, i18n( "&General" ) ); } @@ -313,9 +313,9 @@ void AddresseeEditorWidget::setupTab2() // This is the Details tab TQWidget *tab2 = new TQWidget( mTabWidget ); - TQGridLayout *layout = new TQGridLayout( tab2, 6, 6 ); - layout->setMargin( KDialogBase::marginHint() ); - layout->setSpacing( KDialogBase::spacingHint() ); + TQGridLayout *tqlayout = new TQGridLayout( tab2, 6, 6 ); + tqlayout->setMargin( KDialogBase::marginHint() ); + tqlayout->setSpacing( KDialogBase::spacingHint() ); TQLabel *label; KSeparator* bar; @@ -327,58 +327,58 @@ void AddresseeEditorWidget::setupTab2() label = new TQLabel( tab2 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop, KIcon::SizeMedium ) ); - layout->addMultiCellWidget( label, 0, 1, 0, 0 ); + tqlayout->addMultiCellWidget( label, 0, 1, 0, 0 ); label = new TQLabel( i18n( "Department:" ), tab2 ); - layout->addWidget( label, 0, 1 ); + tqlayout->addWidget( label, 0, 1 ); mDepartmentEdit = new KLineEdit( tab2 ); connect( mDepartmentEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mDepartmentEdit ); - layout->addWidget( mDepartmentEdit, 0, 2 ); + tqlayout->addWidget( mDepartmentEdit, 0, 2 ); label = new TQLabel( i18n( "Office:" ), tab2 ); - layout->addWidget( label, 1, 1 ); + tqlayout->addWidget( label, 1, 1 ); mOfficeEdit = new KLineEdit( tab2 ); connect( mOfficeEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mOfficeEdit ); - layout->addWidget( mOfficeEdit, 1, 2 ); + tqlayout->addWidget( mOfficeEdit, 1, 2 ); label = new TQLabel( i18n( "Profession:" ), tab2 ); - layout->addWidget( label, 2, 1 ); + tqlayout->addWidget( label, 2, 1 ); mProfessionEdit = new KLineEdit( tab2 ); connect( mProfessionEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mProfessionEdit ); - layout->addWidget( mProfessionEdit, 2, 2 ); + tqlayout->addWidget( mProfessionEdit, 2, 2 ); label = new TQLabel( i18n( "Manager\'s name:" ), tab2 ); - layout->addWidget( label, 0, 3 ); + tqlayout->addWidget( label, 0, 3 ); mManagerEdit = new KPIM::AddresseeLineEdit( tab2 ); connect( mManagerEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mManagerEdit ); - layout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 ); + tqlayout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 ); label = new TQLabel( i18n( "Assistant's name:" ), tab2 ); - layout->addWidget( label, 1, 3 ); + tqlayout->addWidget( label, 1, 3 ); mAssistantEdit = new KPIM::AddresseeLineEdit( tab2 ); connect( mAssistantEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mAssistantEdit ); - layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 ); + tqlayout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 ); label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).arg( KABC::Addressee::titleLabel() ), tab2 ); - layout->addWidget( label, 2, 3 ); + tqlayout->addWidget( label, 2, 3 ); mTitleEdit = new KLineEdit( tab2 ); connect( mTitleEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mTitleEdit ); - layout->addMultiCellWidget( mTitleEdit, 2, 2, 4, 5 ); + tqlayout->addMultiCellWidget( mTitleEdit, 2, 2, 4, 5 ); bar = new KSeparator( KSeparator::HLine, tab2 ); - layout->addMultiCellWidget( bar, 3, 3, 0, 5 ); + tqlayout->addMultiCellWidget( bar, 3, 3, 0, 5 ); ///////////////////////////////////////////////// // Personal info @@ -386,61 +386,61 @@ void AddresseeEditorWidget::setupTab2() label = new TQLabel( tab2 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, KIcon::SizeMedium ) ); - layout->addMultiCellWidget( label, 4, 5, 0, 0 ); + tqlayout->addMultiCellWidget( label, 4, 5, 0, 0 ); label = new TQLabel( i18n( "Nickname:" ), tab2 ); - layout->addWidget( label, 4, 1 ); + tqlayout->addWidget( label, 4, 1 ); mNicknameEdit = new KLineEdit( tab2 ); connect( mNicknameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mNicknameEdit ); - layout->addWidget( mNicknameEdit, 4, 2 ); + tqlayout->addWidget( mNicknameEdit, 4, 2 ); label = new TQLabel( i18n( "Partner's name:" ), tab2 ); - layout->addWidget( label, 5, 1 ); + tqlayout->addWidget( label, 5, 1 ); mSpouseEdit = new KPIM::AddresseeLineEdit( tab2 ); connect( mSpouseEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mSpouseEdit ); - layout->addWidget( mSpouseEdit, 5, 2 ); + tqlayout->addWidget( mSpouseEdit, 5, 2 ); label = new TQLabel( i18n( "Birthdate:" ), tab2 ); - layout->addWidget( label, 4, 3 ); + tqlayout->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() ) ); label->setBuddy( mBirthdayPicker ); - layout->addWidget( mBirthdayPicker, 4, 4 ); + tqlayout->addWidget( mBirthdayPicker, 4, 4 ); label = new TQLabel( i18n( "Anniversary:" ), tab2 ); - layout->addWidget( label, 5, 3 ); + tqlayout->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() ) ); label->setBuddy( mAnniversaryPicker ); - layout->addWidget( mAnniversaryPicker, 5, 4 ); + tqlayout->addWidget( mAnniversaryPicker, 5, 4 ); bar = new KSeparator( KSeparator::HLine, tab2 ); - layout->addMultiCellWidget( bar, 6, 6, 0, 5 ); + tqlayout->addMultiCellWidget( bar, 6, 6, 0, 5 ); ////////////////////////////////////// // Notes label = new TQLabel( i18n( "Note:" ), tab2 ); - label->setAlignment( Qt::AlignTop | Qt::AlignLeft ); - layout->addWidget( label, 7, 0 ); + label->tqsetAlignment( Qt::AlignTop | Qt::AlignLeft ); + tqlayout->addWidget( label, 7, 0 ); mNoteEdit = new TQTextEdit( tab2 ); mNoteEdit->setWordWrap( TQTextEdit::WidgetWidth ); - mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() ); + mNoteEdit->setMinimumSize( mNoteEdit->tqsizeHint() ); connect( mNoteEdit, TQT_SIGNAL( textChanged() ), TQT_SLOT( emitModified() ) ); label->setBuddy( mNoteEdit ); - layout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 ); + tqlayout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 ); - // Build the layout and add to the tab widget - layout->activate(); // required + // Build the tqlayout and add to the tab widget + tqlayout->activate(); // required mTabWidget->addTab( tab2, i18n( "&Details" ) ); } @@ -474,7 +474,7 @@ void AddresseeEditorWidget::setupAdditionalTabs() page->addWidget( widget ); } - // query the layout update + // query the tqlayout update TQDictIterator<ContactEditorTabPage> it( mTabPages ); for ( ; it.current(); ++it ) it.current()->updateLayout(); diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp index b42729e34..c936e5fa8 100644 --- a/kaddressbook/addviewdialog.cpp +++ b/kaddressbook/addviewdialog.cpp @@ -44,23 +44,23 @@ AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict, TQWidget *page = plainPage(); - TQGridLayout *layout = new TQGridLayout( page, 2, 2 ); - layout->setSpacing( spacingHint() ); - layout->setRowStretch( 1, 1 ); - layout->setColStretch( 1, 1 ); + TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2 ); + tqlayout->setSpacing( spacingHint() ); + tqlayout->setRowStretch( 1, 1 ); + tqlayout->setColStretch( 1, 1 ); TQLabel *label = new TQLabel( i18n( "View name:" ), page ); - layout->addWidget( label, 0, 0 ); + tqlayout->addWidget( label, 0, 0 ); mViewNameEdit = new TQLineEdit( page ); connect( mViewNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); - layout->addWidget( mViewNameEdit, 0, 1 ); + tqlayout->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 ) ) ); - layout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 ); - TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->layout(), 3, 2 ); + tqlayout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 ); + TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->tqlayout(), 3, 2 ); groupLayout->setSpacing( spacingHint() ); int row = 0; @@ -69,7 +69,7 @@ AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict, TQRadioButton *button = new TQRadioButton( i18n((*iter)->type().utf8()), mTypeGroup, (*iter)->type().latin1() ); label = new TQLabel( (*iter)->description(), mTypeGroup ); - label->setAlignment( Qt::WordBreak ); + label->tqsetAlignment( Qt::WordBreak ); groupLayout->addWidget( button, row, 0, Qt::AlignTop ); groupLayout->addWidget( label, row, 1, Qt::AlignTop ); diff --git a/kaddressbook/advancedcustomfields.cpp b/kaddressbook/advancedcustomfields.cpp index b1788c509..c2f5dc404 100644 --- a/kaddressbook/advancedcustomfields.cpp +++ b/kaddressbook/advancedcustomfields.cpp @@ -126,11 +126,11 @@ void AdvancedCustomFields::setReadOnly( bool readOnly ) void AdvancedCustomFields::initGUI( const TQString &uiFile ) { - TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(), + TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); mFields = new KPIM::DesignerFields( uiFile, this ); - layout->addWidget( mFields ); + tqlayout->addWidget( mFields ); connect( mFields, TQT_SIGNAL( modified() ), TQT_SLOT( setModified() ) ); } diff --git a/kaddressbook/common/kabprefs.h b/kaddressbook/common/kabprefs.h index 688cab99f..5c7c8c0c7 100644 --- a/kaddressbook/common/kabprefs.h +++ b/kaddressbook/common/kabprefs.h @@ -42,7 +42,7 @@ class KDE_EXPORT KABPrefs : public KABPrefsBase void setLocationMapURL( const TQString &locationMapURL ) { - if ( !isImmutable( TQString::fromLatin1( "LocationMapURL" ) ) ) + if ( !isImmutable( TQString::tqfromLatin1( "LocationMapURL" ) ) ) mLocationMapURL = locationMapURL; } @@ -53,7 +53,7 @@ class KDE_EXPORT KABPrefs : public KABPrefsBase void setLocationMapURLs( const TQStringList &locationMapURLs ) { - if ( !isImmutable( TQString::fromLatin1( "LocationMapURLs" ) ) ) + if ( !isImmutable( TQString::tqfromLatin1( "LocationMapURLs" ) ) ) mLocationMapURLs = locationMapURLs; } diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp index efae019c3..5788e6fcd 100644 --- a/kaddressbook/common/locationmap.cpp +++ b/kaddressbook/common/locationmap.cpp @@ -79,17 +79,17 @@ TQString LocationMap::createUrl( const KABC::Address &addr ) } #if KDE_VERSION >= 319 - return urlTemplate.replace( "%s", addr.street() ). - replace( "%r", addr.region() ). - replace( "%l", addr.locality() ). - replace( "%z", addr.postalCode() ). - replace( "%c", addr.countryToISO( addr.country() ) ); + return urlTemplate.tqreplace( "%s", addr.street() ). + tqreplace( "%r", addr.region() ). + tqreplace( "%l", addr.locality() ). + tqreplace( "%z", addr.postalCode() ). + tqreplace( "%c", addr.countryToISO( addr.country() ) ); #else - return urlTemplate.replace( "%s", addr.street() ). - replace( "%r", addr.region() ). - replace( "%l", addr.locality() ). - replace( "%z", addr.postalCode() ). - replace( "%c", "" ); + return urlTemplate.tqreplace( "%s", addr.street() ). + tqreplace( "%r", addr.region() ). + tqreplace( "%l", addr.locality() ). + tqreplace( "%z", addr.postalCode() ). + tqreplace( "%c", "" ); #endif } diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp index 6a6a68d99..d48be3d93 100644 --- a/kaddressbook/contacteditorwidgetmanager.cpp +++ b/kaddressbook/contacteditorwidgetmanager.cpp @@ -41,7 +41,7 @@ ContactEditorWidgetManager *ContactEditorWidgetManager::mSelf = 0; ContactEditorWidgetManager::ContactEditorWidgetManager() - : TQObject( qApp ) + : TQObject( tqApp ) { reload(); } diff --git a/kaddressbook/contacteditorwidgetmanager.h b/kaddressbook/contacteditorwidgetmanager.h index d0b03ddf5..4b78b17f3 100644 --- a/kaddressbook/contacteditorwidgetmanager.h +++ b/kaddressbook/contacteditorwidgetmanager.h @@ -94,7 +94,7 @@ class ContactEditorTabPage : public QWidget void setReadOnly( bool readOnly ); /** - Calculates the layout of the widgets and moves them to the + Calculates the tqlayout of the widgets and moves them to the correct position. */ void updateLayout(); diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp index c9f4d8610..3d992be1e 100644 --- a/kaddressbook/customfieldswidget.cpp +++ b/kaddressbook/customfieldswidget.cpp @@ -48,26 +48,26 @@ AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name ) { TQWidget *page = plainPage(); - TQGridLayout *layout = new TQGridLayout( page, 3, 2, marginHint(), spacingHint() ); + TQGridLayout *tqlayout = new TQGridLayout( page, 3, 2, marginHint(), spacingHint() ); TQLabel *label = new TQLabel( i18n( "Title:" ), page ); - layout->addWidget( label, 0, 0 ); + tqlayout->addWidget( label, 0, 0 ); mTitle = new KLineEdit( page ); mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), mTitle ) ); label->setBuddy( mTitle ); - layout->addWidget( mTitle, 0, 1 ); + tqlayout->addWidget( mTitle, 0, 1 ); label = new TQLabel( i18n( "Type:" ), page ); - layout->addWidget( label, 1, 0 ); + tqlayout->addWidget( label, 1, 0 ); mType = new KComboBox( page ); label->setBuddy( mType ); - layout->addWidget( mType, 1, 1 ); + tqlayout->addWidget( mType, 1, 1 ); mGlobal = new TQCheckBox( i18n( "Is available for all contacts" ), page ); mGlobal->setChecked( true ); - layout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 ); + tqlayout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 ); connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( nameChanged( const TQString& ) ) ); @@ -103,7 +103,7 @@ TQString AddFieldDialog::title() const TQString AddFieldDialog::identifier() const { TQString id = mTitle->text().lower(); - return id.replace( ",", "_" ).replace( " ", "_" ); + return id.tqreplace( ",", "_" ).tqreplace( " ", "_" ); } TQString AddFieldDialog::type() const @@ -124,19 +124,19 @@ void AddFieldDialog::nameChanged( const TQString &name ) FieldWidget::FieldWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(), + TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - mGlobalLayout = new TQVBoxLayout( layout, KDialog::spacingHint() ); - mGlobalLayout->setAlignment( Qt::AlignTop ); + mGlobalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); + mGlobalLayout->tqsetAlignment( Qt::AlignTop ); mSeparator = new TQFrame( this ); mSeparator->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); mSeparator->hide(); - layout->addWidget( mSeparator ); + tqlayout->addWidget( mSeparator ); - mLocalLayout = new TQVBoxLayout( layout, KDialog::spacingHint() ); - mLocalLayout->setAlignment( Qt::AlignTop ); + mLocalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); + mLocalLayout->tqsetAlignment( Qt::AlignTop ); } void FieldWidget::addField( const TQString &identifier, const TQString &title, @@ -238,13 +238,13 @@ void FieldWidget::clearFields() wdg->setChecked( true ); } else if ( (*fieldIt).mWidget->isA( "QDateEdit" ) ) { QDateEdit *wdg = static_cast<QDateEdit*>( (*fieldIt).mWidget ); - wdg->setDate( TQDate::currentDate() ); + wdg->setDate( TQDate::tqcurrentDate() ); } else if ( (*fieldIt).mWidget->isA( "QTimeEdit" ) ) { QTimeEdit *wdg = static_cast<QTimeEdit*>( (*fieldIt).mWidget ); wdg->setTime( TQTime::currentTime() ); } else if ( (*fieldIt).mWidget->isA( "QDateTimeEdit" ) ) { QDateTimeEdit *wdg = static_cast<QDateTimeEdit*>( (*fieldIt).mWidget ); - wdg->setDateTime( TQDateTime::currentDateTime() ); + wdg->setDateTime( TQDateTime::tqcurrentDateTime() ); } } } @@ -370,7 +370,7 @@ void FieldWidget::recalculateLayout() FieldRecordList::ConstIterator it; for ( it = mFieldList.begin(); it != mFieldList.end(); ++it ) - maxWidth = QMAX( maxWidth, (*it).mLabel->minimumSizeHint().width() ); + maxWidth = QMAX( maxWidth, (*it).mLabel->tqminimumSizeHint().width() ); for ( it = mFieldList.begin(); it != mFieldList.end(); ++it ) (*it).mLabel->setMinimumWidth( maxWidth ); @@ -485,18 +485,18 @@ void CustomFieldsWidget::removeField() void CustomFieldsWidget::initGUI() { - TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), + TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); mFieldWidget = new FieldWidget( this ); - layout->addMultiCellWidget( mFieldWidget, 0, 0, 0, 2 ); + tqlayout->addMultiCellWidget( mFieldWidget, 0, 0, 0, 2 ); mAddButton = new TQPushButton( i18n( "Add Field..." ), this ); - layout->addWidget( mAddButton, 1, 1, Qt::AlignRight ); + tqlayout->addWidget( mAddButton, 1, 1, Qt::AlignRight ); mRemoveButton = new TQPushButton( i18n( "Remove Field..." ), this ); mRemoveButton->setEnabled( false ); - layout->addWidget( mRemoveButton, 1, 2, Qt::AlignRight ); + tqlayout->addWidget( mRemoveButton, 1, 2, Qt::AlignRight ); // load global fields TQStringList globalFields = KABPrefs::instance()->globalCustomFields(); diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp index c088978f3..ac0115fe4 100644 --- a/kaddressbook/distributionlisteditor.cpp +++ b/kaddressbook/distributionlisteditor.cpp @@ -67,16 +67,16 @@ public: KPIM::DistributionListEditor::Line::Line( KABC::AddressBook* book, TQWidget* parent ) : TQWidget( parent ), m_addressBook( book ) { Q_ASSERT( m_addressBook ); - TQBoxLayout* layout = new TQHBoxLayout( this ); - layout->setSpacing( KDialog::spacingHint() ); + TQBoxLayout* tqlayout = new TQHBoxLayout( this ); + tqlayout->setSpacing( KDialog::spacingHint() ); m_lineEdit = new KPIM::DistributionListEditor::LineEdit( this ); connect( m_lineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged( const TQString& ) ) ); - layout->addWidget( m_lineEdit ); + tqlayout->addWidget( m_lineEdit ); m_clearButton = new TQToolButton( this ); m_clearButton->setIconSet( KApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) ); m_clearButton->setEnabled( false ); - layout->addWidget( m_clearButton ); + tqlayout->addWidget( m_clearButton ); connect( m_clearButton, TQT_SIGNAL( clicked() ), m_lineEdit, TQT_SLOT( clear() ) ); } @@ -106,7 +106,7 @@ KABC::Addressee KPIM::DistributionListEditor::Line::findAddressee( const TQStrin return KABC::Addressee(); typedef KABC::Addressee::List List; - const List byEmail = m_addressBook->findByEmail( email ); + const List byEmail = m_addressBook->tqfindByEmail( email ); if ( !byEmail.isEmpty() ) { const List::ConstIterator end = byEmail.end(); @@ -136,7 +136,7 @@ KPIM::DistributionList::Entry KPIM::DistributionListEditor::Line::entry() const KPIM::DistributionList::Entry res; if ( !m_uid.isNull() ) { - const KABC::Addressee addr = m_addressBook->findByUid( m_uid ); + const KABC::Addressee addr = m_addressBook->tqfindByUid( m_uid ); if ( m_initialText == text || addr.formattedName() == name ) res.addressee = addr; } @@ -188,7 +188,7 @@ KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* boo d->scrollView->setFrameShape( TQFrame::NoFrame ); mainLayout->addWidget( d->scrollView ); d->memberListWidget = new TQWidget( d->scrollView->viewport() ); - d->memberListWidget->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); + d->memberListWidget->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); TQVBoxLayout* memberLayout = new TQVBoxLayout( d->memberListWidget ); d->addresseeLayout = new TQVBoxLayout; d->addresseeLayout->setSpacing( KDialog::spacingHint() ); @@ -200,7 +200,7 @@ KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* boo setMainWidget( main ); KPIM::DistributionListEditor::Line* const last = d->addLineForEntry( KPIM::DistributionList::Entry() ); - const TQSize hint = sizeHint(); + const TQSize hint = tqsizeHint(); resize( hint.width() * 3L/2, hint.height() ); } diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp index c28cbec2b..42e90a3b2 100644 --- a/kaddressbook/distributionlistentryview.cpp +++ b/kaddressbook/distributionlistentryview.cpp @@ -44,7 +44,7 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi TQLabel* distLabel = new TQLabel( this ); distLabel->setText( i18n( "<b>Distribution list:</b>" ) ); - distLabel->setAlignment( Qt::SingleLine ); + distLabel->tqsetAlignment( Qt::SingleLine ); distLayout->addWidget( distLabel ); m_distListLabel = new KURLLabel( this ); @@ -57,7 +57,7 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi TQLabel* emailLabel = new TQLabel( this ); emailLabel->setText( i18n( "<b>Email address to use in this list:</b>" ) ); - emailLabel->setAlignment( Qt::SingleLine ); + emailLabel->tqsetAlignment( Qt::SingleLine ); m_mainLayout->addWidget( emailLabel ); TQBoxLayout* emailLayout = new TQHBoxLayout; @@ -110,7 +110,7 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis m_distListLabel->setURL( m_list.name() ); m_distListLabel->setText( m_list.name() ); m_resourceLabel->setText( i18n( "<b>Address book:</b> %1" ).arg( m_entry.addressee.resource() ? m_entry.addressee.resource()->resourceName() : TQString() ) ); - m_resourceLabel->setAlignment( Qt::SingleLine ); + m_resourceLabel->tqsetAlignment( Qt::SingleLine ); m_emailGroup = new TQVButtonGroup( this ); m_emailGroup->setFlat( true ); @@ -133,7 +133,7 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis this, TQT_SLOT( emailButtonClicked( int ) ) ); m_radioLayout->addWidget( m_emailGroup, 0, 0 ); m_emailGroup->setShown( true ); - m_mainLayout->invalidate(); + m_mainLayout->tqinvalidate(); } diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp index a43c76d0a..7858e2957 100644 --- a/kaddressbook/distributionlistpicker.cpp +++ b/kaddressbook/distributionlistpicker.cpp @@ -48,12 +48,12 @@ KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressB enableButton( Ok, false ); setButtonText( User1, i18n( "Add New Distribution List" ) ); TQWidget* main = new TQWidget( this ); - TQGridLayout* layout = new TQGridLayout( main ); - layout->setSpacing( KDialog::spacingHint() ); + TQGridLayout* tqlayout = new TQGridLayout( main ); + tqlayout->setSpacing( KDialog::spacingHint() ); m_label = new TQLabel( main ); - layout->addWidget( m_label, 0, 0 ); + tqlayout->addWidget( m_label, 0, 0 ); m_listBox = new KListBox( main ); - layout->addWidget( m_listBox, 1, 0 ); + tqlayout->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& ) ), @@ -97,7 +97,7 @@ void KPIM::DistributionListPickerDialog::slotUser1() if ( name.isEmpty() ) return; - validName = !listNames.contains( name ); + validName = !listNames.tqcontains( name ); if ( validName ) { diff --git a/kaddressbook/editors/Makefile.am b/kaddressbook/editors/Makefile.am index e611bb5ea..bb39762bd 100644 --- a/kaddressbook/editors/Makefile.am +++ b/kaddressbook/editors/Makefile.am @@ -13,7 +13,7 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \ libkaddrbk_cryptosettings_la_SOURCES = cryptowidget.cpp libkaddrbk_cryptosettings_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) # -no-undefined -libkaddrbk_cryptosettings_la_LIBADD = $(XXLIBS) +libkaddrbk_cryptosettings_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) noinst_HEADERS = cryptowidget.h imeditorwidget.h imaddresswidget.h diff --git a/kaddressbook/editors/imaddressbase.ui b/kaddressbook/editors/imaddressbase.ui index f62ac00d7..2f608a083 100644 --- a/kaddressbook/editors/imaddressbase.ui +++ b/kaddressbook/editors/imaddressbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>IMAddressBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -85,5 +85,5 @@ <slot>slotProtocolChanged( const QString & )</slot> <slot>slotProtocolChanged()</slot> </slots> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaddressbook/editors/imeditorbase.ui b/kaddressbook/editors/imeditorbase.ui index 24a5696a9..3c8e36010 100644 --- a/kaddressbook/editors/imeditorbase.ui +++ b/kaddressbook/editors/imeditorbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>IMEditorBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -116,7 +116,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>28</height> @@ -152,8 +152,8 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="0"/> -<layoutfunctions spacing="KDialog::spacingHint"/> +<tqlayoutdefaults spacing="6" margin="0"/> +<tqlayoutfunctions spacing="KDialog::spacingHint"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp index ad84505c2..30c3ca981 100644 --- a/kaddressbook/editors/imeditorwidget.cpp +++ b/kaddressbook/editors/imeditorwidget.cpp @@ -64,7 +64,7 @@ bool IMAddressLVI::preferred() const } void IMAddressLVI::paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int alignment ) + int column, int width, int tqalignment ) { if ( mPreferred ) { TQFont font = p->font(); @@ -72,7 +72,7 @@ void IMAddressLVI::paintCell( TQPainter *p, const TQColorGroup &cg, p->setFont( font ); } - KListViewItem::paintCell( p, cg, column, width, alignment ); + KListViewItem::paintCell( p, cg, column, width, tqalignment ); } void IMAddressLVI::setAddress( const TQString &address ) @@ -166,8 +166,8 @@ IMEditorWidget::IMEditorWidget( TQWidget *parent, const TQString &preferredIM, c //mWidget->btnUp->setEnabled( false ); //mWidget->btnDown->setEnabled( false ); mPreferred = preferredIM; - mPreferred = mPreferred.replace( " on ", TQString( TQChar( 0xE120 ) ), true ); - mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::fromLatin1( "KABC/IMProtocol" ) ) ); + mPreferred = mPreferred.tqreplace( " on ", TQString( TQChar( 0xE120 ) ), true ); + mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::tqfromLatin1( "KABC/IMProtocol" ) ) ); // order the protocols by putting them in a qmap, then sorting the set of keys and recreating the list TQMap<TQString, KPluginInfo *> protocolMap; @@ -204,8 +204,8 @@ void IMEditorWidget::loadContact( KABC::Addressee *addr ) TQString app, name, value; splitField( *it, app, name, value ); - if ( app.startsWith( TQString::fromLatin1( "messaging/" ) ) ) { - if ( name == TQString::fromLatin1( "All" ) ) { + if ( app.startsWith( TQString::tqfromLatin1( "messaging/" ) ) ) { + if ( name == TQString::tqfromLatin1( "All" ) ) { KPluginInfo *protocol = protocolFromString( app ); if ( protocol ) { TQStringList addresses = TQStringList::split( TQChar( 0xE000 ), value ); @@ -244,9 +244,9 @@ void IMEditorWidget::storeContact( KABC::Addressee *addr ) TQString addrBookField = (*protocolIt)->property( "X-KDE-InstantMessagingKABCField" ).toString(); if ( !lst.isEmpty() ) - addr->insertCustom( addrBookField, TQString::fromLatin1( "All" ), lst.join( TQChar( 0xE000 ) ) ); + addr->insertCustom( addrBookField, TQString::tqfromLatin1( "All" ), lst.join( TQChar( 0xE000 ) ) ); else - addr->removeCustom( addrBookField, TQString::fromLatin1( "All" ) ); + addr->removeCustom( addrBookField, TQString::tqfromLatin1( "All" ) ); } } @@ -271,7 +271,7 @@ void IMEditorWidget::slotSetStandard() return; //Selected is already preferred else { item->setPreferred( false ); - mWidget->lvAddresses->repaintItem( item ); + mWidget->lvAddresses->tqrepaintItem( item ); break; } } @@ -282,7 +282,7 @@ void IMEditorWidget::slotSetStandard() mPreferred = current->address(); current->setPreferred( true ); setModified( true ); - mWidget->lvAddresses->repaintItem( current ); + mWidget->lvAddresses->tqrepaintItem( current ); } } @@ -457,7 +457,7 @@ void IMEditorWidget::slotDelete() TQString IMEditorWidget::preferred() const { TQString retval( mPreferred ); - return retval.replace( TQChar( 0xE120 ), " on " ); + return retval.tqreplace( TQChar( 0xE120 ), " on " ); } diff --git a/kaddressbook/editors/imeditorwidget.h b/kaddressbook/editors/imeditorwidget.h index 0184ccca4..25fd9804d 100644 --- a/kaddressbook/editors/imeditorwidget.h +++ b/kaddressbook/editors/imeditorwidget.h @@ -115,7 +115,7 @@ class IMAddressLVI : public KListViewItem bool preferred() const; protected: - virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ); + virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ); private: KPluginInfo * mProtocol; diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp index 6d52c90ba..3cc2de14f 100644 --- a/kaddressbook/emaileditwidget.cpp +++ b/kaddressbook/emaileditwidget.cpp @@ -184,7 +184,7 @@ EmailEditDialog::EmailEditDialog( const TQStringList &list, TQWidget *parent, mEmailListBox = new TQListBox( page ); // Make sure there is room for the scrollbar - mEmailListBox->setMinimumHeight( mEmailListBox->sizeHint().height() + 30 ); + mEmailListBox->setMinimumHeight( mEmailListBox->tqsizeHint().height() + 30 ); connect( mEmailListBox, TQT_SIGNAL( highlighted( int ) ), TQT_SLOT( selectionChanged( int ) ) ); connect( mEmailListBox, TQT_SIGNAL( selected( int ) ), diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp index 93da52d0e..aa4a5c009 100644 --- a/kaddressbook/extensionmanager.cpp +++ b/kaddressbook/extensionmanager.cpp @@ -50,10 +50,10 @@ ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detai mMapper( 0 ), mDetailsStack( detailsStack ), mActiveDetailsWidget( 0 ) { Q_ASSERT( mExtensionBar ); - TQVBoxLayout* layout = new TQVBoxLayout( mExtensionBar ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( mExtensionBar ); mSplitter = new TQSplitter( mExtensionBar ); mSplitter->setOrientation( TQSplitter::Vertical ); - layout->addWidget( mSplitter ); + tqlayout->addWidget( mSplitter ); createExtensionWidgets(); @@ -74,7 +74,7 @@ void ExtensionManager::restoreSettings() typedef TQMap<TQString, ExtensionData>::ConstIterator ConstIterator; for ( ConstIterator it = mExtensionMap.begin(), end = mExtensionMap.end(); it != end; ++it ) { - if ( activeExtensions.contains( it.data().identifier ) ) { + if ( activeExtensions.tqcontains( it.data().identifier ) ) { KToggleAction *action = static_cast<KToggleAction*>( it.data().action ); if ( action ) action->setChecked( true ); @@ -102,20 +102,20 @@ void ExtensionManager::reconfigure() bool ExtensionManager::isQuickEditVisible() const { - return mActiveExtensions.contains( "contact_editor" ); + return mActiveExtensions.tqcontains( "contact_editor" ); } void ExtensionManager::setSelectionChanged() { for ( TQStringList::ConstIterator it = mActiveExtensions.begin(), end = mActiveExtensions.end(); it != end; ++it ) { - if ( mExtensionMap.contains( *it ) && mExtensionMap[*it].widget ) + if ( mExtensionMap.tqcontains( *it ) && mExtensionMap[*it].widget ) mExtensionMap[*it].widget->contactsSelectionChanged(); } } void ExtensionManager::activationToggled( const TQString &extid ) { - if ( !mExtensionMap.contains( extid ) ) + if ( !mExtensionMap.tqcontains( extid ) ) return; const ExtensionData data = mExtensionMap[ extid ]; const bool activated = data.action->isChecked(); @@ -124,9 +124,9 @@ void ExtensionManager::activationToggled( const TQString &extid ) void ExtensionManager::setExtensionActive( const TQString& extid, bool active ) { - if ( !mExtensionMap.contains( extid ) ) + if ( !mExtensionMap.tqcontains( extid ) ) return; - if ( mActiveExtensions.contains( extid ) == active ) + if ( mActiveExtensions.tqcontains( extid ) == active ) return; const ExtensionData data = mExtensionMap[ extid ]; if ( active ) { @@ -174,7 +174,7 @@ void ExtensionManager::createActions() mMapper->setMapping( data.action, data.identifier ); mActionList.append( data.action ); - if ( mActiveExtensions.contains( data.identifier ) ) + if ( mActiveExtensions.tqcontains( data.identifier ) ) data.action->setChecked( true ); } diff --git a/kaddressbook/features/Makefile.am b/kaddressbook/features/Makefile.am index d3311c77b..a2b5db399 100644 --- a/kaddressbook/features/Makefile.am +++ b/kaddressbook/features/Makefile.am @@ -17,16 +17,16 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \ if compile_newdistrlists libkaddrbk_distributionlistng_la_SOURCES = distributionlistngwidget.cpp libkaddrbk_distributionlistng_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS) +libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) else libkaddrbk_distributionlist_la_SOURCES = distributionlistwidget.cpp libkaddrbk_distributionlist_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS) +libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) endif libkaddrbk_resourceselection_la_SOURCES = resourceselection.cpp libkaddrbk_resourceselection_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) +libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) -lkresources noinst_HEADERS = distributionlistwidget.h distributionlistngwidget.h resourceselection.h diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp index 4ca4e365e..d6b1d7d96 100644 --- a/kaddressbook/features/distributionlistngwidget.cpp +++ b/kaddressbook/features/distributionlistngwidget.cpp @@ -56,7 +56,7 @@ void KAB::DistributionListNg::ListBox::dragMoveEvent( TQDragMoveEvent *event ) event->ignore(); } else { - event->accept( itemRect( item ) ); + event->accept( tqitemRect( item ) ); } } @@ -117,11 +117,11 @@ TQString KAB::DistributionListNg::MainWidget::identifier() const KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *parent, const char *name ) : KAB::ExtensionWidget( core, parent, name ) { - TQVBoxLayout *layout = new TQVBoxLayout( this ); - layout->setSpacing( KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + tqlayout->setSpacing( KDialog::spacingHint() ); TQHBoxLayout *buttonLayout = new TQHBoxLayout(); - layout->addLayout( buttonLayout ); + tqlayout->addLayout( buttonLayout ); TQLabel *label = new TQLabel( this ); label->setText( i18n( "Distribution Lists" ) ); @@ -154,7 +154,7 @@ KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *pare connect( mListBox, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( itemSelected( int ) ) ); connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(editSelectedDistributionList()) ); - layout->addWidget( mListBox ); + tqlayout->addWidget( mListBox ); connect( core, TQT_SIGNAL( contactsUpdated() ), this, TQT_SLOT( updateEntries() ) ); diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp index 93a00bdfa..878ede7aa 100644 --- a/kaddressbook/features/distributionlistwidget.cpp +++ b/kaddressbook/features/distributionlistwidget.cpp @@ -255,9 +255,9 @@ void DistributionListWidget::selectionContactViewChanged() bool DistributionListWidget::alreadyExists( const TQString& distrListName ) const { #ifdef KDEPIM_NEW_DISTRLISTS - return core()->distributionListNames().contains( distrListName ); + return core()->distributionListNames().tqcontains( distrListName ); #else - return mManager->listNames().contains( distrListName ); + return mManager->listNames().tqcontains( distrListName ); #endif } diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp index 2b6607376..a6ccd462c 100644 --- a/kaddressbook/filtereditdialog.cpp +++ b/kaddressbook/filtereditdialog.cpp @@ -71,7 +71,7 @@ void FilterEditDialog::setFilter( const Filter &filter ) TQStringList categories = filter.categories(); TQListViewItem *item = mCategoriesView->firstChild(); while ( item != 0 ) { - if ( categories.contains( item->text( 0 ) ) ) { + if ( categories.tqcontains( item->text( 0 ) ) ) { TQCheckListItem *checkItem = static_cast<TQCheckListItem*>( item ); checkItem->setOn( true ); } @@ -272,7 +272,7 @@ void FilterDialog::initGUI() mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, TQT_SLOT( remove() ) ); mRemoveButton->setEnabled( false ); - buttonBox->layout(); + buttonBox->tqlayout(); topLayout->addWidget( buttonBox, 0, 1 ); } diff --git a/kaddressbook/freebusywidget.cpp b/kaddressbook/freebusywidget.cpp index 096c1d583..5b588fcfc 100644 --- a/kaddressbook/freebusywidget.cpp +++ b/kaddressbook/freebusywidget.cpp @@ -35,15 +35,15 @@ FreeBusyWidget::FreeBusyWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::ContactEditorWidget( ab, parent, name ) { - TQHBoxLayout *layout = new TQHBoxLayout( this, KDialog::marginHint(), + TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Location of Free/Busy information:" ), this ); - layout->addWidget( label ); + tqlayout->addWidget( label ); mURL = new KURLRequester( this ); label->setBuddy( mURL ); - layout->addWidget( mURL ); + tqlayout->addWidget( mURL ); connect( mURL, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( setModified() ) ); diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp index 40631147b..ec8c92f9b 100644 --- a/kaddressbook/geowidget.cpp +++ b/kaddressbook/geowidget.cpp @@ -56,7 +56,7 @@ GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name label = new TQLabel( this ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "package_network", KIcon::Desktop, KIcon::SizeMedium ) ); - label->setAlignment( Qt::AlignTop ); + label->tqsetAlignment( Qt::AlignTop ); topLayout->addMultiCellWidget( label, 0, 3, 0, 0 ); mGeoIsValid = new TQCheckBox( i18n( "Use geo data" ), this ); @@ -175,7 +175,7 @@ GeoDialog::GeoDialog( TQWidget *parent, const char *name ) topLayout->addWidget( mCityCombo, 0, 1 ); TQGroupBox *sexagesimalGroup = new TQGroupBox( 0, Vertical, i18n( "Sexagesimal" ), page ); - TQGridLayout *sexagesimalLayout = new TQGridLayout( sexagesimalGroup->layout(), + TQGridLayout *sexagesimalLayout = new TQGridLayout( sexagesimalGroup->tqlayout(), 2, 5, spacingHint() ); TQLabel *label = new TQLabel( i18n( "Latitude:" ), sexagesimalGroup ); @@ -404,7 +404,7 @@ void GeoDialog::loadCityList() pos = name.search(line, pos); if ( pos > 0 ) { n = line.mid( pos, name.matchedLength() ).stripWhiteSpace(); - n.replace( '_', " " ); + n.tqreplace( '_', " " ); } if ( !c.isEmpty() && !n.isEmpty() ) { diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp index 7d8ac8f51..4a8ab340a 100644 --- a/kaddressbook/imagewidget.cpp +++ b/kaddressbook/imagewidget.cpp @@ -255,12 +255,12 @@ ImageBaseWidget::ImageBaseWidget( const TQString &title, TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical, title, this ); - TQVBoxLayout *layout = new TQVBoxLayout( box->layout(), KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( box->tqlayout(), KDialog::spacingHint() ); mImageButton = new ImageButton( i18n( "Picture" ), box ); mImageButton->setFixedSize( 100, 140 ); mImageButton->setImageLoader( mImageLoader ); - layout->addWidget( mImageButton ); + tqlayout->addWidget( mImageButton ); topLayout->addWidget( box ); @@ -293,14 +293,14 @@ KABC::Picture ImageBaseWidget::image() const ImageWidget::ImageWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::ContactEditorWidget( ab, parent, name ) { - TQHBoxLayout *layout = new TQHBoxLayout( this, KDialog::marginHint(), + TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); mPhotoWidget = new ImageBaseWidget( KABC::Addressee::photoLabel(), this ); - layout->addWidget( mPhotoWidget ); + tqlayout->addWidget( mPhotoWidget ); mLogoWidget = new ImageBaseWidget( KABC::Addressee::logoLabel(), this ); - layout->addWidget( mLogoWidget ); + tqlayout->addWidget( mLogoWidget ); connect( mPhotoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) ); connect( mLogoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) ); diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp index 479f79c73..74349bd72 100644 --- a/kaddressbook/incsearchwidget.cpp +++ b/kaddressbook/incsearchwidget.cpp @@ -40,32 +40,32 @@ IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQHBoxLayout *layout = new TQHBoxLayout( this, 2, KDialog::spacingHint() ); + TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 2, KDialog::spacingHint() ); TQToolButton *button = new TQToolButton( this ); - button->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); + button->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); button->setPixmap( SmallIcon( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase" ) ); button->setAccel( TQKeySequence( CTRL+ALT+Key_S ) ); button->setAutoRaise( true ); TQToolTip::add( button, i18n( "Reset" ) ); - layout->addWidget( button ); + tqlayout->addWidget( button ); TQLabel *label = new TQLabel( i18n( "Search:" ), this, "kde toolbar widget" ); - label->setAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); - layout->addWidget( label ); + label->tqsetAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); + tqlayout->addWidget( label ); mSearchText = new KLineEdit( this ); - mSearchText->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); + mSearchText->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); TQWhatsThis::add( mSearchText, i18n( "The incremental search<p>Enter some text here will start the search for the contact, which matches the search pattern best. The part of the contact, which will be used for matching, depends on the field selection." ) ); label->setBuddy( mSearchText ); - layout->addWidget( mSearchText ); + tqlayout->addWidget( mSearchText ); label = new TQLabel( i18n( "as in 'Search in:'", "&in:" ), this, "kde toolbar widget" ); - label->setAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); - layout->addWidget( label ); + label->tqsetAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); + tqlayout->addWidget( label ); mFieldCombo = new TQComboBox( false, this ); - layout->addWidget( mFieldCombo ); + tqlayout->addWidget( mFieldCombo ); label->setBuddy(mFieldCombo); TQToolTip::add( mFieldCombo, i18n( "Select incremental search field" ) ); diff --git a/kaddressbook/interfaces/extensionwidget.cpp b/kaddressbook/interfaces/extensionwidget.cpp index 8c98e5e0f..75622935c 100644 --- a/kaddressbook/interfaces/extensionwidget.cpp +++ b/kaddressbook/interfaces/extensionwidget.cpp @@ -55,7 +55,7 @@ KABC::Addressee::List ExtensionWidget::selectedContacts() TQStringList::ConstIterator it; const TQStringList::ConstIterator endIt = uids.end(); for ( it = uids.begin(); it != endIt; ++it ) - list.append( mCore->addressBook()->findByUid( *it ) ); + list.append( mCore->addressBook()->tqfindByUid( *it ) ); return list; } diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp index 53be55197..798ebf559 100644 --- a/kaddressbook/interfaces/xxport.cpp +++ b/kaddressbook/interfaces/xxport.cpp @@ -99,7 +99,7 @@ KABC::AddressBook *XXPort::addressBook() const return mAddressBook; } -TQWidget *XXPort::parentWidget() const +TQWidget *XXPort::tqparentWidget() const { return mParentWidget; } diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h index 29b54acc1..d8b83c401 100644 --- a/kaddressbook/interfaces/xxport.h +++ b/kaddressbook/interfaces/xxport.h @@ -113,14 +113,14 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient signals: /** Emitted whenever the export action is activated. - The parameter contains the @ref identifier() for + The parameter tqcontains the @ref identifier() for unique identification. */ void exportActivated( const TQString&, const TQString& ); /** Emitted whenever the import action is activated. - The parameter contains the @ref identifier() for + The parameter tqcontains the @ref identifier() for unique identification. */ void importActivated( const TQString&, const TQString& ); @@ -145,7 +145,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient Returns a pointer to the parent widget. It can be used as parent for message boxes. */ - TQWidget *parentWidget() const; + TQWidget *tqparentWidget() const; private slots: void slotImportActivated( const TQString& ); diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index baa84ce23..aa7cb891c 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -67,15 +67,15 @@ JumpButtonBar::JumpButtonBar( KAB::Core *core, TQWidget *parent, const char *nam { setMinimumSize( 1, 1 ); - TQVBoxLayout *layout = new TQVBoxLayout( this, 0, 0 ); - layout->setAlignment( Qt::AlignTop ); - layout->setAutoAdd( true ); - layout->setResizeMode( TQLayout::FreeResize ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, 0 ); + tqlayout->tqsetAlignment( Qt::AlignTop ); + tqlayout->setAutoAdd( true ); + tqlayout->setResizeMode( TQLayout::FreeResize ); mGroupBox = new TQButtonGroup( 1, Qt::Horizontal, this ); mGroupBox->setExclusive( true ); - mGroupBox->layout()->setSpacing( 0 ); - mGroupBox->layout()->setMargin( 0 ); + mGroupBox->tqlayout()->setSpacing( 0 ); + mGroupBox->tqlayout()->setMargin( 0 ); mGroupBox->setFrameStyle( TQFrame::NoFrame ); } @@ -121,7 +121,7 @@ void JumpButtonBar::updateButtons() return; } - if ( !character.isEmpty() && !characters.contains( character ) ) + if ( !character.isEmpty() && !characters.tqcontains( character ) ) characters.append( character ); } @@ -179,7 +179,7 @@ void JumpButtonBar::updateButtons() int maxWidth = 0; TQPushButton *button; for ( button = mButtons.first(); button; button = mButtons.next() ) - maxWidth = QMAX( maxWidth, button->sizeHint().width() ); + maxWidth = QMAX( maxWidth, button->tqsizeHint().width() ); setFixedWidth( maxWidth ); } diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 7951cded0..66b0bb81e 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -334,7 +334,7 @@ KAboutData *KABCore::createAboutData() return about; } -void KABCore::setStatusBar( KStatusBar *statusBar ) +void KABCore::seStatusBar( KStatusBar *statusBar ) { mStatusBar = statusBar; } @@ -351,7 +351,7 @@ void KABCore::setContactSelected( const TQString &uid ) return; } - KABC::Addressee addr = mAddressBook->findByUid( uid ); + KABC::Addressee addr = mAddressBook->tqfindByUid( uid ); if ( !mDetailsViewer->isHidden() ) mDetailsViewer->setAddressee( addr ); #ifdef KDEPIM_NEW_DISTRLISTS @@ -433,7 +433,7 @@ void KABCore::setContactSelected( const TQString &uid ) QClipboard *cb = TQApplication::clipboard(); #if defined(KABC_VCARD_ENCODING_FIX) const TQMimeSource *data = cb->data( QClipboard::Clipboard ); - list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) ); + list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) ); #else list = AddresseeUtil::clipboardToAddressees( cb->text() ); #endif @@ -517,7 +517,7 @@ void KABCore::deleteContacts( const TQStringList &uids ) TQStringList::ConstIterator it = uids.begin(); const TQStringList::ConstIterator endIt( uids.end() ); while ( it != endIt ) { - KABC::Addressee addr = mAddressBook->findByUid( *it ); + KABC::Addressee addr = mAddressBook->tqfindByUid( *it ); names.append( addr.realName().isEmpty() ? addr.preferredEmail() : addr.realName() ); ++it; } @@ -578,7 +578,7 @@ void KABCore::pasteContacts() QClipboard *cb = TQApplication::clipboard(); #if defined(KABC_VCARD_ENCODING_FIX) const TQMimeSource *data = cb->data( QClipboard::Clipboard ); - KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) ); + KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) ); #else KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( cb->text() ); #endif @@ -692,7 +692,7 @@ void KABCore::contactModified( const KABC::Addressee &addr ) Command *command = 0; // check if it exists already - KABC::Addressee origAddr = mAddressBook->findByUid( addr.uid() ); + KABC::Addressee origAddr = mAddressBook->tqfindByUid( addr.uid() ); if ( origAddr.isEmpty() ) { KABC::Addressee::List addressees; addressees.append( addr ); @@ -778,7 +778,7 @@ void KABCore::addEmail( const TQString &aStr ) const KABC::AddressBook::Iterator endIt( mAddressBook->end() ); for ( it = mAddressBook->begin(); !found && (it != endIt); ++it ) { emailList = (*it).emails(); - if ( emailList.contains( email ) > 0 ) { + if ( emailList.tqcontains( email ) > 0 ) { found = true; (*it).setNameFromString( fullName ); editContact( (*it).uid() ); @@ -829,7 +829,7 @@ void KABCore::editContact( const TQString &uid ) } #endif - KABC::Addressee addr = mAddressBook->findByUid( localUID ); + KABC::Addressee addr = mAddressBook->tqfindByUid( localUID ); if ( !addr.isEmpty() ) { AddresseeEditorDialog *dialog = mEditorDict.find( addr.uid() ); if ( !dialog ) { @@ -950,7 +950,7 @@ void KABCore::extensionModified( const KABC::Addressee::List &list ) Command *command = 0; // check if it exists already - KABC::Addressee origAddr = mAddressBook->findByUid( (*it).uid() ); + KABC::Addressee origAddr = mAddressBook->tqfindByUid( (*it).uid() ); if ( origAddr.isEmpty() ) { KABC::Addressee::List addressees; addressees.append( *it ); @@ -1005,7 +1005,7 @@ TQString KABCore::getNameByPhone( const TQString &phone ) const KABC::PhoneNumber::List::Iterator phoneEndIter( phoneList.end() ); for ( ; !found && ( phoneIter != phoneEndIter ); ++phoneIter) { // Get rid of separator chars so just the numbers are compared. - if ( (*phoneIter).number().replace( r, "" ) == localPhone.replace( r, "" ) ) { + if ( (*phoneIter).number().tqreplace( r, "" ) == localPhone.tqreplace( r, "" ) ) { ownerName = (*iter).realName(); found = true; } @@ -1084,7 +1084,7 @@ void KABCore::showContactsAddress( const TQString &addrUid ) if ( uidList.isEmpty() ) return; - KABC::Addressee addr = mAddressBook->findByUid( uidList.first() ); + KABC::Addressee addr = mAddressBook->tqfindByUid( uidList.first() ); if ( addr.isEmpty() ) return; @@ -1224,7 +1224,7 @@ void KABCore::initGUI() viewLayout->setSpacing( KDialog::spacingHint() ); mViewHeaderLabel = new TQLabel( viewWidget ); -// mViewHeaderLabel->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); +// mViewHeaderLabel->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); mViewHeaderLabel->setText( i18n( "Contacts" ) ); viewLayout->addWidget( mViewHeaderLabel ); mViewManager = new ViewManager( this, viewWidget ); @@ -1477,7 +1477,7 @@ TQStringList KABCore::allCategories() const categories = (*it).categories(); const TQStringList::ConstIterator catEndIt( categories.end() ); for ( catIt = categories.begin(); catIt != catEndIt; ++catIt ) { - if ( !allCategories.contains( *catIt ) ) + if ( !allCategories.tqcontains( *catIt ) ) allCategories.append( *catIt ); } } @@ -1510,7 +1510,7 @@ void KABCore::categoriesSelected( const TQStringList &categories ) TQStringList::ConstIterator it; const TQStringList::ConstIterator endIt( uids.end() ); for ( it = uids.begin(); it != endIt; ++it ) { - KABC::Addressee addr = mAddressBook->findByUid( *it ); + KABC::Addressee addr = mAddressBook->tqfindByUid( *it ); if ( !addr.isEmpty() ) { if ( !merge ) addr.setCategories( categories ); @@ -1519,7 +1519,7 @@ void KABCore::categoriesSelected( const TQStringList &categories ) TQStringList::ConstIterator catIt; const TQStringList::ConstIterator catEndIt( categories.end() ); for ( catIt = categories.begin(); catIt != catEndIt; ++catIt ) { - if ( !addrCategories.contains( *catIt ) ) + if ( !addrCategories.tqcontains( *catIt ) ) addrCategories.append( *catIt ); } addr.setCategories( addrCategories ); @@ -1617,7 +1617,7 @@ void KABCore::removeSelectedContactsFromDistList() TQStringList::ConstIterator it = uids.begin(); const TQStringList::ConstIterator endIt( uids.end() ); while ( it != endIt ) { - KABC::Addressee addr = mAddressBook->findByUid( *it ); + KABC::Addressee addr = mAddressBook->tqfindByUid( *it ); names.append( addr.realName().isEmpty() ? addr.preferredEmail() : addr.realName() ); ++it; } diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index 2e6fded32..d1c275751 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -139,7 +139,7 @@ class KDE_EXPORT KABCore : public KAB::Core static KAboutData *createAboutData(); - void setStatusBar( KStatusBar *statusBar ); + void seStatusBar( KStatusBar *statusBar ); KStatusBar *statusBar() const; diff --git a/kaddressbook/kabtools.cpp b/kaddressbook/kabtools.cpp index 7e6b5c9cd..83571a7a9 100644 --- a/kaddressbook/kabtools.cpp +++ b/kaddressbook/kabtools.cpp @@ -39,12 +39,12 @@ static TQString uniqueFileName( const KABC::Addressee &addressee, TQStringList & uint number = 0; do { name = addressee.givenName() + "_" + addressee.familyName() + uniquePart + ".vcf"; - name.replace( ' ', '_' ); - name.replace( '/', '_' ); + name.tqreplace( ' ', '_' ); + name.tqreplace( '/', '_' ); ++number; uniquePart = TQString( "_%1" ).arg( number ); - } while ( existingFiles.contains( name ) ); + } while ( existingFiles.tqcontains( name ) ); existingFiles.append( name ); @@ -65,7 +65,7 @@ void KABTools::mailVCards( const TQStringList &uids, KABC::AddressBook *ab ) TQStringList::ConstIterator it( uids.begin() ); const TQStringList::ConstIterator endIt( uids.end() ); for ( ; it != endIt; ++it ) { - KABC::Addressee addressee = ab->findByUid( *it ); + KABC::Addressee addressee = ab->tqfindByUid( *it ); if ( addressee.isEmpty() ) continue; @@ -141,7 +141,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list ) KABC::Address::List::ConstIterator addrIt( addresses.begin() ); const KABC::Address::List::ConstIterator addrEndIt( addresses.end() ); for ( ; addrIt != addrEndIt; ++addrIt ) { - if ( !masterAddresses.contains( *addrIt ) ) + if ( !masterAddresses.tqcontains( *addrIt ) ) masterAddressee.insertAddress( *addrIt ); } @@ -156,7 +156,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list ) TQStringList::ConstIterator it( categories.begin() ); TQStringList::ConstIterator endIt( categories.end() ); for ( it = categories.begin(); it != endIt; ++it ) - if ( !masterCategories.contains( *it ) ) + if ( !masterCategories.tqcontains( *it ) ) newCategories.append( *it ); masterAddressee.setCategories( newCategories ); @@ -169,7 +169,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list ) const TQStringList masterEmails = masterAddressee.emails(); endIt = emails.end(); for ( it = emails.begin(); it != endIt; ++it ) - if ( !masterEmails.contains( *it ) ) + if ( !masterEmails.tqcontains( *it ) ) masterAddressee.insertEmail( *it, false ); // FN @@ -239,7 +239,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list ) KABC::PhoneNumber::List::ConstIterator phoneIt( phones.begin() ); const KABC::PhoneNumber::List::ConstIterator phoneEndIt( phones.end() ); for ( ; phoneIt != phoneEndIt; ++phoneIt ) - if ( !masterPhones.contains( *phoneIt ) ) + if ( !masterPhones.tqcontains( *phoneIt ) ) masterAddressee.insertPhoneNumber( *phoneIt ); // TITLE @@ -262,7 +262,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list ) TQStringList newCustoms( masterCustoms ); endIt = customs.end(); for ( it = customs.begin(); it != endIt; ++it ) - if ( !masterCustoms.contains( *it ) ) + if ( !masterCustoms.tqcontains( *it ) ) newCustoms.append( *it ); masterAddressee.setCustoms( newCustoms ); } diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp index 34e651846..39216b8f4 100644 --- a/kaddressbook/kaddressbook_part.cpp +++ b/kaddressbook/kaddressbook_part.cpp @@ -42,7 +42,7 @@ typedef KParts::GenericFactory< KAddressbookPart > KAddressbookFactory; K_EXPORT_COMPONENT_FACTORY( libkaddressbookpart, KAddressbookFactory ) -KAddressbookPart::KAddressbookPart( TQWidget *parentWidget, const char *widgetName, +KAddressbookPart::KAddressbookPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList & ) : DCOPObject( "KAddressBookIface" ), KParts::ReadOnlyPart( parent, name ) @@ -50,7 +50,7 @@ KAddressbookPart::KAddressbookPart( TQWidget *parentWidget, const char *widgetNa setInstance( KAddressbookFactory::instance() ); // create a canvas to insert our widget - TQWidget *canvas = new TQWidget( parentWidget, widgetName ); + TQWidget *canvas = new TQWidget( tqparentWidget, widgetName ); canvas->setFocusPolicy( TQWidget::ClickFocus ); setWidget( canvas ); @@ -63,7 +63,7 @@ KAddressbookPart::KAddressbookPart( TQWidget *parentWidget, const char *widgetNa topLayout->addWidget( mCore->widget() ); KParts::StatusBarExtension *statusBar = new KParts::StatusBarExtension( this ); - mCore->setStatusBar( statusBar->statusBar() ); + mCore->seStatusBar( statusBar->statusBar() ); setXMLFile( "kaddressbook_part.rc" ); } diff --git a/kaddressbook/kaddressbook_part.h b/kaddressbook/kaddressbook_part.h index b0a2c391c..c2e6b10fc 100644 --- a/kaddressbook/kaddressbook_part.h +++ b/kaddressbook/kaddressbook_part.h @@ -39,7 +39,7 @@ class KAddressbookPart: public KParts::ReadOnlyPart, virtual public KAddressBook Q_OBJECT public: - KAddressbookPart( TQWidget *parentWidget, const char *widgetName, + KAddressbookPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& ); virtual ~KAddressbookPart(); diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp index f54c18828..cf67d2eef 100644 --- a/kaddressbook/kaddressbookmain.cpp +++ b/kaddressbook/kaddressbookmain.cpp @@ -64,7 +64,7 @@ KAddressBookMain::KAddressBookMain( const TQString &file ) statusBar()->addWidget( progressWidget, 0, true ); - mCore->setStatusBar( statusBar() ); + mCore->seStatusBar( statusBar() ); setStandardToolBarMenuEnabled( true ); diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp index 28fd81afd..2059fbb35 100644 --- a/kaddressbook/kaddressbookview.cpp +++ b/kaddressbook/kaddressbookview.cpp @@ -79,7 +79,7 @@ TQString KAddressBookView::selectedEmails() TQStringList::ConstIterator it; for ( it = uidList.begin(); it != uidList.end(); ++it ) { - addr = mCore->addressBook()->findByUid( *it ); + addr = mCore->addressBook()->tqfindByUid( *it ); if ( !addr.isEmpty() ) { TQString m = TQString::null; @@ -121,12 +121,12 @@ KABC::Addressee::List KAddressBookView::addressees() void KAddressBookView::initGUI() { - // Create the layout - TQVBoxLayout *layout = new TQVBoxLayout( this ); + // Create the tqlayout + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); // Add the view widget mViewWidget = new TQWidget( this ); - layout->addWidget( mViewWidget ); + tqlayout->addWidget( mViewWidget ); } KABC::Field::List KAddressBookView::fields() const diff --git a/kaddressbook/kcmconfigs/addhostdialog.cpp b/kaddressbook/kcmconfigs/addhostdialog.cpp index 14abca147..c09e5b945 100644 --- a/kaddressbook/kcmconfigs/addhostdialog.cpp +++ b/kaddressbook/kcmconfigs/addhostdialog.cpp @@ -39,7 +39,7 @@ AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent, const mServer = server; TQWidget *page = plainPage(); - TQHBoxLayout *layout = new TQHBoxLayout( page, marginHint(), spacingHint() ); + TQHBoxLayout *tqlayout = new TQHBoxLayout( page, marginHint(), spacingHint() ); mCfg = new KABC::LdapConfigWidget( KABC::LdapConfigWidget::W_USER | @@ -56,7 +56,7 @@ AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent, const KABC::LdapConfigWidget::W_AUTHBOX, page ); - layout->addWidget( mCfg ); + tqlayout->addWidget( mCfg ); mCfg->setHost( mServer->host() ); mCfg->setPort( mServer->port() ); mCfg->setDn( mServer->baseDN() ); diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp index 1c074d397..a7d9ebe6f 100644 --- a/kaddressbook/kcmconfigs/addresseewidget.cpp +++ b/kaddressbook/kcmconfigs/addresseewidget.cpp @@ -44,10 +44,10 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label, TQWidget *parent, const char *name ) : TQWidget( parent, name ), mTitle( title ), mLabel( label ) { - TQHBoxLayout *layout = new TQHBoxLayout( this ); + TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, title, this ); - TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 2, 2, + TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 2, 2, KDialog::spacingHint() ); mBox = new TQListBox( group ); @@ -61,10 +61,10 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label, mEditButton->setEnabled( false ); mRemoveButton = bbox->addButton( i18n( "Remove" ), this, TQT_SLOT( remove() ) ); mRemoveButton->setEnabled( false ); - bbox->layout(); + bbox->tqlayout(); groupLayout->addWidget( bbox, 0, 1 ); - layout->addWidget( group ); + tqlayout->addWidget( group ); } NamePartWidget::~NamePartWidget() @@ -134,20 +134,20 @@ void NamePartWidget::selectionChanged( TQListBoxItem *item ) AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), + TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); mPrefix = new NamePartWidget( i18n( "Prefixes"), i18n( "Enter prefix:" ), this ); - layout->addWidget( mPrefix, 0, 0 ); + tqlayout->addWidget( mPrefix, 0, 0 ); mInclusion = new NamePartWidget( i18n( "Inclusions"), i18n( "Enter inclusion:" ), this ); - layout->addWidget( mInclusion, 0, 1 ); + tqlayout->addWidget( mInclusion, 0, 1 ); mSuffix = new NamePartWidget( i18n( "Suffixes" ), i18n( "Enter suffix:" ), this ); - layout->addWidget( mSuffix, 0, 2 ); + tqlayout->addWidget( mSuffix, 0, 2 ); TQLabel *label = new TQLabel( i18n( "Default formatted name:" ), this ); - layout->addWidget( label, 1, 0 ); + tqlayout->addWidget( label, 1, 0 ); mFormattedNameCombo = new KComboBox( this ); mFormattedNameCombo->insertItem( i18n( "Empty" ) ); @@ -155,7 +155,7 @@ AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name ) mFormattedNameCombo->insertItem( i18n( "Full Name" ) ); mFormattedNameCombo->insertItem( i18n( "Reverse Name with Comma" ) ); mFormattedNameCombo->insertItem( i18n( "Reverse Name" ) ); - layout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 ); + tqlayout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 ); connect( mPrefix, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); connect( mInclusion, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp index 80f73f469..0758f320c 100644 --- a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp +++ b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp @@ -35,10 +35,10 @@ ExtensionConfigDialog::ExtensionConfigDialog( KAB::ExtensionFactory *factory, KC name, true, true ), mWidget( 0 ), mConfig( config ) { TQFrame *page = plainPage(); - TQGridLayout *layout = new TQGridLayout( page, 1, 1, marginHint(), spacingHint() ); + TQGridLayout *tqlayout = new TQGridLayout( page, 1, 1, marginHint(), spacingHint() ); mWidget = factory->configureWidget( page, "ExtensionConfigWidget" ); - layout->addWidget( mWidget, 0, 0 ); + tqlayout->addWidget( mWidget, 0, 0 ); mWidget->restoreSettings( mConfig ); } diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index e4fea7409..d1888624e 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -56,12 +56,12 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) // General page TQWidget *generalPage = new TQWidget( this ); - TQVBoxLayout *layout = new TQVBoxLayout( generalPage, KDialog::marginHint(), + TQVBoxLayout *tqlayout = new TQVBoxLayout( generalPage, KDialog::marginHint(), KDialog::spacingHint() ); TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage ); - TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->layout() ); - boxLayout->setAlignment( Qt::AlignTop ); + TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->tqlayout() ); + boxLayout->tqsetAlignment( Qt::AlignTop ); mViewsSingleClickBox = new TQCheckBox( i18n( "Honor KDE single click" ), groupBox, "msingle" ); boxLayout->addWidget( mViewsSingleClickBox ); @@ -94,10 +94,10 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) editorLayout->addStretch( 1 ); - layout->addWidget( groupBox ); + tqlayout->addWidget( groupBox ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Script-Hooks" ), generalPage ); - TQGridLayout *grid = new TQGridLayout( groupBox->layout(), 3, 2, + TQGridLayout *grid = new TQGridLayout( groupBox->tqlayout(), 3, 2, KDialog::spacingHint() ); label = new TQLabel( i18n( "Phone:" ), groupBox ); grid->addWidget( label, 0, 0 ); @@ -124,14 +124,14 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) grid->setColStretch( 1, 1 ); - layout->addWidget( groupBox ); + tqlayout->addWidget( groupBox ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Location Map" ), generalPage ); - boxLayout = new TQVBoxLayout( groupBox->layout(), KDialog::spacingHint() ); - boxLayout->setAlignment( Qt::AlignTop ); + boxLayout = new TQVBoxLayout( groupBox->tqlayout(), KDialog::spacingHint() ); + boxLayout->tqsetAlignment( Qt::AlignTop ); mLocationMapURL = new TQComboBox( true, groupBox ); - mLocationMapURL->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + mLocationMapURL->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); TQToolTip::add( mLocationMapURL, i18n( "<ul> <li>%s: Street</li>" "<li>%r: Region</li>" "<li>%l: Location</li>" @@ -139,7 +139,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) "<li>%c: Country ISO Code</li> </ul>" ) ); mLocationMapURL->insertStringList( KABPrefs::instance()->locationMapURLs() ); boxLayout->addWidget( mLocationMapURL ); - layout->addWidget( groupBox ); + tqlayout->addWidget( groupBox ); connect( mNameParsing, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); connect( mViewsSingleClickBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp index 6b516249a..f112c4c89 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp @@ -43,9 +43,9 @@ extern "C" KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name ) : KCModule( parent, name ) { - TQVBoxLayout *layout = new TQVBoxLayout( this ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); mConfigWidget = new KABConfigWidget( this, "mConfigWidget" ); - layout->addWidget( mConfigWidget ); + tqlayout->addWidget( mConfigWidget ); connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp index e899198b5..4cadf2633 100644 --- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp @@ -44,9 +44,9 @@ extern "C" KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name ) : KCModule( parent, name ) { - TQVBoxLayout *layout = new TQVBoxLayout( this ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); mConfigWidget = new LDAPOptionsWidget( this ); - layout->addWidget( mConfigWidget ); + tqlayout->addWidget( mConfigWidget ); connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp index 3825ac1d8..639cec027 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp +++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp @@ -258,7 +258,7 @@ void LDAPOptionsWidget::defaults() void LDAPOptionsWidget::initGUI() { - TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); TQVGroupBox *groupBox = new TQVGroupBox( i18n( "LDAP Servers" ), this ); groupBox->setInsideSpacing( KDialog::spacingHint() ); @@ -285,7 +285,7 @@ void LDAPOptionsWidget::initGUI() TQWidget* spacer = new TQWidget( upDownBox ); upDownBox->setStretchFactor( spacer, 100 ); - layout->addWidget( groupBox ); + tqlayout->addWidget( groupBox ); KButtonBox *buttons = new KButtonBox( this ); buttons->addButton( i18n( "&Add Host..." ), this, TQT_SLOT( slotAddHost() ) ); @@ -293,11 +293,11 @@ void LDAPOptionsWidget::initGUI() mEditButton->setEnabled( false ); mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), this, TQT_SLOT( slotRemoveHost() ) ); mRemoveButton->setEnabled( false ); - buttons->layout(); + buttons->tqlayout(); - layout->addWidget( buttons ); + tqlayout->addWidget( buttons ); - resize( TQSize( 460, 300 ).expandedTo( sizeHint() ) ); + resize( TQSize( 460, 300 ).expandedTo( tqsizeHint() ) ); } #include "ldapoptionswidget.moc" diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp index 57558cb46..0e3094521 100644 --- a/kaddressbook/keywidget.cpp +++ b/kaddressbook/keywidget.cpp @@ -41,25 +41,25 @@ KeyWidget::KeyWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQGridLayout *layout = new TQGridLayout( this, 4, 2, KDialog::marginHint(), + TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Keys:" ), this ); - layout->addWidget( label, 0, 0 ); + tqlayout->addWidget( label, 0, 0 ); mKeyCombo = new KComboBox( this ); - layout->addWidget( mKeyCombo, 0, 1 ); + tqlayout->addWidget( mKeyCombo, 0, 1 ); mAddButton = new TQPushButton( i18n( "Add..." ), this ); - layout->addMultiCellWidget( mAddButton, 1, 1, 0, 1 ); + tqlayout->addMultiCellWidget( mAddButton, 1, 1, 0, 1 ); mRemoveButton = new TQPushButton( i18n( "Remove" ), this ); mRemoveButton->setEnabled( false ); - layout->addMultiCellWidget( mRemoveButton, 2, 2, 0, 1 ); + tqlayout->addMultiCellWidget( mRemoveButton, 2, 2, 0, 1 ); mExportButton = new TQPushButton( i18n( "Export..." ), this ); mExportButton->setEnabled( false ); - layout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 ); + tqlayout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 ); connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addKey() ) ); connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeKey() ) ); @@ -98,7 +98,7 @@ void KeyWidget::addKey() KABC::Key::TypeList::ConstIterator it; for ( it = typeList.begin(); it != typeList.end(); ++it ) { if ( (*it) != KABC::Key::Custom && - !existingKeyTypes.contains( KABC::Key::typeLabel( *it ) ) ) { + !existingKeyTypes.tqcontains( KABC::Key::typeLabel( *it ) ) ) { keyMap.insert( KABC::Key::typeLabel( *it ), *it ); keyTypeNames.append( KABC::Key::typeLabel( *it ) ); } @@ -110,7 +110,7 @@ void KeyWidget::addKey() return; int type = keyMap[ name ]; - if ( !keyTypeNames.contains( name ) ) + if ( !keyTypeNames.tqcontains( name ) ) type = KABC::Key::Custom; KURL url = KFileDialog::getOpenURL(); diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index c42ff6693..7074a5966 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/kaddressbook/ldapsearchdialog.cpp @@ -153,7 +153,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, groupBox->setFrameShape( TQGroupBox::Box ); groupBox->setFrameShadow( TQGroupBox::Sunken ); groupBox->setColumnLayout( 0, Qt::Vertical ); - TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 2, + TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 1, 1 ); @@ -176,10 +176,10 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, TQSize buttonSize; mSearchButton = new TQPushButton( i18n( "Stop" ), groupBox ); - buttonSize = mSearchButton->sizeHint(); + buttonSize = mSearchButton->tqsizeHint(); mSearchButton->setText( i18n( "&Search" ) ); - if ( buttonSize.width() < mSearchButton->sizeHint().width() ) - buttonSize = mSearchButton->sizeHint(); + if ( buttonSize.width() < mSearchButton->tqsizeHint().width() ) + buttonSize = mSearchButton->tqsizeHint(); mSearchButton->setFixedWidth( buttonSize.width() ); mSearchButton->setDefault( true ); @@ -208,7 +208,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, topLayout->addWidget( buttons ); - resize( TQSize( 600, 400).expandedTo( minimumSizeHint() ) ); + resize( TQSize( 600, 400).expandedTo( tqminimumSizeHint() ) ); setButtonText( User1, i18n( "Add Selected" ) ); @@ -560,7 +560,7 @@ KPIM::DistributionList LDAPSearchDialog::selectDistributionList() KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQValueList<ContactListItem*>& selectedItems, KABC::Resource * const resource ) { - const TQDateTime now = TQDateTime::currentDateTime(); + const TQDateTime now = TQDateTime::tqcurrentDateTime(); TQStringList importedAddrs; KABC::Addressee::List localAddrs; @@ -569,7 +569,7 @@ KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQV for ( TQValueList<ContactListItem*>::ConstIterator it = selectedItems.begin(); it != selectedItems.end(); ++it ) { const ContactListItem * const cli = *it; KABC::Addressee addr = convertLdapAttributesToAddressee( cli->mAttrs ); - const KABC::Addressee::List existing = mCore->addressBook()->findByEmail( addr.preferredEmail() ); + const KABC::Addressee::List existing = mCore->addressBook()->tqfindByEmail( addr.preferredEmail() ); if ( existing.isEmpty() ) { addr.setUid( KApplication::randomString( 10 ) ); diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp index 3e2191ff9..f713ef4e2 100644 --- a/kaddressbook/nameeditdialog.cpp +++ b/kaddressbook/nameeditdialog.cpp @@ -51,71 +51,71 @@ NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type, Ok, parent, name, true ), mAddressee( addr ) { TQWidget *page = plainPage(); - TQGridLayout *layout = new TQGridLayout( page ); - layout->setSpacing( spacingHint() ); - layout->addColSpacing( 2, 100 ); + TQGridLayout *tqlayout = new TQGridLayout( page ); + tqlayout->setSpacing( spacingHint() ); + tqlayout->addColSpacing( 2, 100 ); TQLabel *label; label = new TQLabel( i18n( "Honorific prefixes:" ), page ); - layout->addWidget( label, 0, 0 ); + tqlayout->addWidget( label, 0, 0 ); mPrefixCombo = new KComboBox( page ); mPrefixCombo->setDuplicatesEnabled( false ); mPrefixCombo->setEditable( true ); mPrefixCombo->setEnabled( !readOnly ); label->setBuddy( mPrefixCombo ); - layout->addMultiCellWidget( mPrefixCombo, 0, 0, 1, 2 ); + tqlayout->addMultiCellWidget( mPrefixCombo, 0, 0, 1, 2 ); TQWhatsThis::add( mPrefixCombo, i18n( "The predefined honorific prefixes can be extended in the settings dialog." ) ); label = new TQLabel( i18n( "Given name:" ), page ); - layout->addWidget( label, 1, 0 ); + tqlayout->addWidget( label, 1, 0 ); mGivenNameEdit = new KLineEdit( page ); mGivenNameEdit->setReadOnly( readOnly ); label->setBuddy( mGivenNameEdit ); - layout->addMultiCellWidget( mGivenNameEdit, 1, 1, 1, 2 ); + tqlayout->addMultiCellWidget( mGivenNameEdit, 1, 1, 1, 2 ); label = new TQLabel( i18n( "Additional names:" ), page ); - layout->addWidget( label, 2, 0 ); + tqlayout->addWidget( label, 2, 0 ); mAdditionalNameEdit = new KLineEdit( page ); mAdditionalNameEdit->setReadOnly( readOnly ); label->setBuddy( mAdditionalNameEdit ); - layout->addMultiCellWidget( mAdditionalNameEdit, 2, 2, 1, 2 ); + tqlayout->addMultiCellWidget( mAdditionalNameEdit, 2, 2, 1, 2 ); label = new TQLabel( i18n( "Family names:" ), page ); - layout->addWidget( label, 3, 0 ); + tqlayout->addWidget( label, 3, 0 ); mFamilyNameEdit = new KLineEdit( page ); mFamilyNameEdit->setReadOnly( readOnly ); label->setBuddy( mFamilyNameEdit ); - layout->addMultiCellWidget( mFamilyNameEdit, 3, 3, 1, 2 ); + tqlayout->addMultiCellWidget( mFamilyNameEdit, 3, 3, 1, 2 ); label = new TQLabel( i18n( "Honorific suffixes:" ), page ); - layout->addWidget( label, 4, 0 ); + tqlayout->addWidget( label, 4, 0 ); mSuffixCombo = new KComboBox( page ); mSuffixCombo->setDuplicatesEnabled( false ); mSuffixCombo->setEditable( true ); mSuffixCombo->setEnabled( !readOnly ); label->setBuddy( mSuffixCombo ); - layout->addMultiCellWidget( mSuffixCombo, 4, 4, 1, 2 ); + tqlayout->addMultiCellWidget( mSuffixCombo, 4, 4, 1, 2 ); TQWhatsThis::add( mSuffixCombo, i18n( "The predefined honorific suffixes can be extended in the settings dialog." ) ); label = new TQLabel( i18n( "Formatted name:" ), page ); - layout->addWidget( label, 5, 0 ); + tqlayout->addWidget( label, 5, 0 ); mFormattedNameCombo = new KComboBox( page ); mFormattedNameCombo->setEnabled( !readOnly ); - layout->addWidget( mFormattedNameCombo, 5, 1 ); + tqlayout->addWidget( mFormattedNameCombo, 5, 1 ); connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( typeChanged( int ) ) ); mFormattedNameEdit = new KLineEdit( page ); mFormattedNameEdit->setEnabled( type == CustomName && !readOnly ); - layout->addWidget( mFormattedNameEdit, 5, 2 ); + tqlayout->addWidget( mFormattedNameEdit, 5, 2 ); 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() ) ); - layout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 ); + tqlayout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 ); // Fill in the values mFamilyNameEdit->setText( addr.familyName() ); diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp index 71a9f504f..46efcba98 100644 --- a/kaddressbook/phoneeditwidget.cpp +++ b/kaddressbook/phoneeditwidget.cpp @@ -68,7 +68,7 @@ PhoneTypeCombo::~PhoneTypeCombo() void PhoneTypeCombo::setType( int type ) { - if ( !mTypeList.contains( type ) ) + if ( !mTypeList.tqcontains( type ) ) mTypeList.insert( mTypeList.at( mTypeList.count() - 1 ), type ); mType = type; @@ -117,7 +117,7 @@ void PhoneTypeCombo::otherSelected() PhoneTypeDialog dlg( mType, this ); if ( dlg.exec() ) { mType = dlg.type(); - if ( !mTypeList.contains( mType ) ) + if ( !mTypeList.tqcontains( mType ) ) mTypeList.insert( mTypeList.at( mTypeList.count() - 1 ), mType ); } else { setType( mTypeList[ mLastSelected ] ); @@ -129,13 +129,13 @@ void PhoneTypeCombo::otherSelected() PhoneNumberWidget::PhoneNumberWidget( TQWidget *parent ) : TQWidget( parent ) { - TQHBoxLayout *layout = new TQHBoxLayout( this, 6, 11 ); + TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 6, 11 ); mTypeCombo = new PhoneTypeCombo( this ); mNumberEdit = new KLineEdit( this ); - layout->addWidget( mTypeCombo ); - layout->addWidget( mNumberEdit ); + tqlayout->addWidget( mTypeCombo ); + tqlayout->addWidget( mNumberEdit ); connect( mTypeCombo, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); connect( mNumberEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SIGNAL( modified() ) ); @@ -169,19 +169,19 @@ void PhoneNumberWidget::setReadOnly( bool readOnly ) PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ), mReadOnly( false ) { - TQGridLayout *layout = new TQGridLayout( this, 2, 2 ); - layout->setSpacing( KDialog::spacingHint() ); + TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2 ); + tqlayout->setSpacing( KDialog::spacingHint() ); - mWidgetLayout = new TQVBoxLayout( layout ); - layout->addMultiCellLayout( mWidgetLayout, 0, 0, 0, 1 ); + mWidgetLayout = new TQVBoxLayout( tqlayout ); + tqlayout->addMultiCellLayout( mWidgetLayout, 0, 0, 0, 1 ); mAddButton = new TQPushButton( i18n( "Add" ), this ); - mAddButton->setMaximumSize( mAddButton->sizeHint() ); - layout->addWidget( mAddButton, 1, 0, Qt::AlignRight ); + mAddButton->setMaximumSize( mAddButton->tqsizeHint() ); + tqlayout->addWidget( mAddButton, 1, 0, Qt::AlignRight ); mRemoveButton = new TQPushButton( i18n( "Remove" ), this ); - mRemoveButton->setMaximumSize( mRemoveButton->sizeHint() ); - layout->addWidget( mRemoveButton, 1, 1 ); + mRemoveButton->setMaximumSize( mRemoveButton->tqsizeHint() ); + tqlayout->addWidget( mRemoveButton, 1, 1 ); mMapper = new TQSignalMapper( this ); connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( changed( int ) ) ); @@ -298,13 +298,13 @@ PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *parent ) { TQWidget *page = plainPage(); - TQVBoxLayout *layout = new TQVBoxLayout( page, spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( page, spacingHint() ); mPreferredBox = new TQCheckBox( i18n( "This is the preferred phone number" ), page ); - layout->addWidget( mPreferredBox ); + tqlayout->addWidget( mPreferredBox ); mGroup = new TQButtonGroup( 2, Horizontal, i18n( "Types" ), page ); - layout->addWidget( mGroup ); + tqlayout->addWidget( mGroup ); // fill widgets mTypeList = KABC::PhoneNumber::typeList(); diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp index 39046481c..4cd597801 100644 --- a/kaddressbook/printing/detailledstyle.cpp +++ b/kaddressbook/printing/detailledstyle.cpp @@ -112,8 +112,8 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na mPageAppearance->kcbHeaderTextColor->setColor( config->readColorEntry( ContactHeaderForeColor, &Qt::white ) ); - mPageAppearance->layout()->setMargin( KDialog::marginHint() ); - mPageAppearance->layout()->setSpacing( KDialog::spacingHint() ); + mPageAppearance->tqlayout()->setMargin( KDialog::marginHint() ); + mPageAppearance->tqlayout()->setSpacing( KDialog::spacingHint() ); } DetailledPrintStyle::~DetailledPrintStyle() diff --git a/kaddressbook/printing/ds_appearance.ui b/kaddressbook/printing/ds_appearance.ui index 2fe5ce208..03ca4b58a 100644 --- a/kaddressbook/printing/ds_appearance.ui +++ b/kaddressbook/printing/ds_appearance.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AppearancePage</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -68,7 +68,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> @@ -138,7 +138,7 @@ <property name="text"> <string>Details font:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -149,7 +149,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -160,7 +160,7 @@ <property name="text"> <string>Body font:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -171,7 +171,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -182,7 +182,7 @@ <property name="text"> <string>Fixed font:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -203,7 +203,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -245,7 +245,7 @@ <property name="text"> <string>Contact header font:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -274,7 +274,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -285,7 +285,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -301,7 +301,7 @@ <property name="text"> <string>Headlines:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -400,7 +400,7 @@ <property name="text"> <string>Headline background color:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -411,7 +411,7 @@ <property name="text"> <string>Headline text color:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -475,5 +475,5 @@ <slot>setDisabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp index c7432d5d0..c74e4e410 100644 --- a/kaddressbook/printing/kabentrypainter.cpp +++ b/kaddressbook/printing/kabentrypainter.cpp @@ -139,7 +139,7 @@ int KABEntryPainter::hits( const QRectList& list, const TQPoint &p ) int count = 0; for ( pos = list.begin(); pos != list.end(); ++pos ) { - if ( (*pos).contains( p ) ) + if ( (*pos).tqcontains( p ) ) return count; ++count; @@ -172,7 +172,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, KABC::Address address; // this is used to prepare some fields for printing and decide about - // the layout later: + // the tqlayout later: TQValueList<TQStringList> parts; TQValueList<QRectList*> contents; @@ -189,7 +189,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, painter->setPen( mBackgroundColor ); text = addr.realName(); - // replacement for: api->addressbook()->literalName(entry, text); + // tqreplacement for: api->addressbook()->literalName(entry, text); rect = painter->boundingRect( Ruler1, y, Width, Height, Qt::AlignVCenter | Qt::AlignLeft, text ); rect.setHeight( (int)( 1.25 * rect.height() ) ); @@ -241,7 +241,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, if ( !( addr.prefix().isEmpty() ) ) y += fmBody.lineSpacing() / 2; - // fill the parts stringlist, it contains "parts" (printable areas) + // fill the parts stringlist, it tqcontains "parts" (printable areas) // that will be combined to fill the page as effectively as possible: // Email addresses: if ( !addr.emails().isEmpty() && mShowEmails ) { @@ -399,27 +399,27 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, line1 = i18n( "Preferred Address" ); } - line1 += TQString::fromLatin1( ":" ); + line1 += TQString::tqfromLatin1( ":" ); text = TQString::null; if ( !address.extended().isEmpty() ) text = address.extended().stripWhiteSpace(); if ( !text.isEmpty() ) { - line1 = line1 + TQString::fromLatin1( " (" ) + text + - TQString::fromLatin1( ")" ); + line1 = line1 + TQString::tqfromLatin1( " (" ) + text + + TQString::tqfromLatin1( ")" ); } line1 = line1.stripWhiteSpace(); line2 = address.street(); if ( !address.postOfficeBox().isEmpty() ) - line2 += TQString::fromLatin1( " - " ) + address.postOfficeBox(); + line2 += TQString::tqfromLatin1( " - " ) + address.postOfficeBox(); // print address in american style, this will need localisation: line3 = address.locality() + ( address.region().isEmpty() ? - TQString::fromLatin1( "" ) : TQString::fromLatin1( ", " ) + + TQString::tqfromLatin1( "" ) : TQString::tqfromLatin1( ", " ) + address.region() ) + ( address.postalCode().isEmpty() - ? TQString::fromLatin1( "" ) : TQString::fromLatin1( " " ) + ? TQString::tqfromLatin1( "" ) : TQString::tqfromLatin1( " " ) + address.postalCode() ); line4 = address.country(); diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp index 9ecc57f56..26312ee1c 100644 --- a/kaddressbook/printing/mikesstyle.cpp +++ b/kaddressbook/printing/mikesstyle.cpp @@ -205,7 +205,7 @@ void MikesStyle::paintTagLine( TQPainter &p, const TQFont &font ) TQFontMetrics fm( font ); TQString text = i18n( "Printed on %1 by KAddressBook (http://www.kde.org)" ) - .arg( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); + .arg( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) ); p.setPen( Qt::black ); p.drawText( 0, fm.height(), text ); @@ -226,14 +226,14 @@ int MikesStyle::calcHeight( const KABC::Addressee &addr, // Determine which half of the fields is higher for ( int i = 0; i < numFields / 2; i++ ) - halfHeight += fm.height() * (fieldList[ i ]->value( addr ).contains( '\n' ) + 1); + halfHeight += fm.height() * (fieldList[ i ]->value( addr ).tqcontains( '\n' ) + 1); height = halfHeight; // now the second half halfHeight = 0; for ( int i = numFields / 2; i < numFields; i++ ) - halfHeight += fm.height() * (fieldList[ i ]->value( addr ).contains( '\n' ) + 1); + halfHeight += fm.height() * (fieldList[ i ]->value( addr ).tqcontains( '\n' ) + 1); height = QMAX( height, halfHeight ); diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp index 2bf6deaf8..8f2e98f20 100644 --- a/kaddressbook/printing/printingwizard.cpp +++ b/kaddressbook/printing/printingwizard.cpp @@ -162,7 +162,7 @@ void PrintingWizard::print() if ( mSelectionPage->useSelection() ) { TQStringList::ConstIterator it; for ( it = mSelection.begin(); it != mSelection.end(); ++it ) { - KABC::Addressee addr = addressBook()->findByUid( *it ); + KABC::Addressee addr = addressBook()->tqfindByUid( *it ); if ( !addr.isEmpty() ) list.append( addr ); } @@ -186,7 +186,7 @@ void PrintingWizard::print() const TQStringList tmp( (*it).categories() ); TQStringList::ConstIterator tmpIt; for ( tmpIt = tmp.begin(); tmpIt != tmp.end(); ++tmpIt ) - if ( categories.contains( *tmpIt ) ) { + if ( categories.tqcontains( *tmpIt ) ) { list.append( *it ); break; } diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp index 43aec8cf7..a66ca960e 100644 --- a/kaddressbook/printing/printprogress.cpp +++ b/kaddressbook/printing/printprogress.cpp @@ -49,7 +49,7 @@ PrintProgress::PrintProgress( TQWidget *parent, const char *name ) mProgressBar->setProgress( 0 ); topLayout->addWidget( mProgressBar, 1, 0 ); - resize( TQSize( 370, 220 ).expandedTo( minimumSizeHint() ) ); + resize( TQSize( 370, 220 ).expandedTo( tqminimumSizeHint() ) ); } PrintProgress::~PrintProgress() diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp index 3e8bde5f8..e926d0dba 100644 --- a/kaddressbook/printing/selectionpage.cpp +++ b/kaddressbook/printing/selectionpage.cpp @@ -52,11 +52,11 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name ) mButtonGroup = new TQButtonGroup( this ); mButtonGroup->setFrameShape( TQButtonGroup::NoFrame ); mButtonGroup->setColumnLayout( 0, Qt::Vertical ); - mButtonGroup->layout()->setSpacing( KDialog::spacingHint() ); - mButtonGroup->layout()->setMargin( KDialog::marginHint() ); + mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); + mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() ); - TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->layout() ); - groupLayout->setAlignment( Qt::AlignTop ); + TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() ); + groupLayout->tqsetAlignment( Qt::AlignTop ); mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup ); mUseWholeBook->setChecked( true ); diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp index 88e2e71cf..172e7df7c 100644 --- a/kaddressbook/printing/stylepage.cpp +++ b/kaddressbook/printing/stylepage.cpp @@ -122,9 +122,9 @@ void StylePage::initGUI() TQButtonGroup *group = new TQButtonGroup( i18n( "Sorting" ), this ); group->setColumnLayout( 0, Qt::Vertical ); - TQGridLayout *sortLayout = new TQGridLayout( group->layout(), 2, 2, + TQGridLayout *sortLayout = new TQGridLayout( group->tqlayout(), 2, 2, KDialog::spacingHint() ); - sortLayout->setAlignment( Qt::AlignTop ); + sortLayout->tqsetAlignment( Qt::AlignTop ); label = new TQLabel( i18n( "Criterion:" ), group ); sortLayout->addWidget( label, 0, 0 ); @@ -142,7 +142,7 @@ void StylePage::initGUI() group = new TQButtonGroup( i18n( "Print Style" ), this ); group->setColumnLayout( 0, Qt::Vertical ); - TQVBoxLayout *styleLayout = new TQVBoxLayout( group->layout(), + TQVBoxLayout *styleLayout = new TQVBoxLayout( group->tqlayout(), KDialog::spacingHint() ); mStyleCombo = new KComboBox( false, group ); @@ -153,7 +153,7 @@ void StylePage::initGUI() font.setPointSize( 20 ); mPreview->setFont( font ); mPreview->setScaledContents( true ); - mPreview->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) ); + mPreview->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) ); styleLayout->addWidget( mPreview ); topLayout->addWidget( group, 1, 1 ); diff --git a/kaddressbook/secrecywidget.cpp b/kaddressbook/secrecywidget.cpp index 5a39ddfa7..4db7197a1 100644 --- a/kaddressbook/secrecywidget.cpp +++ b/kaddressbook/secrecywidget.cpp @@ -32,10 +32,10 @@ SecrecyWidget::SecrecyWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(), + TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); mSecrecyCombo = new KComboBox( this ); - layout->addWidget( mSecrecyCombo ); + tqlayout->addWidget( mSecrecyCombo ); const KABC::Secrecy::TypeList list = KABC::Secrecy::typeList(); KABC::Secrecy::TypeList::ConstIterator it; diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp index ca0a9bfde..f94a72d24 100644 --- a/kaddressbook/soundwidget.cpp +++ b/kaddressbook/soundwidget.cpp @@ -48,7 +48,7 @@ SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *n TQLabel *label = new TQLabel( this ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "multimedia", KIcon::Desktop, KIcon::SizeMedium ) ); - label->setAlignment( Qt::AlignTop ); + label->tqsetAlignment( Qt::AlignTop ); topLayout->addMultiCellWidget( label, 0, 1, 0, 0 ); mPlayButton = new TQPushButton( i18n( "Play" ), this ); @@ -77,7 +77,7 @@ SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *n connect( mPlayButton, TQT_SIGNAL( clicked() ), TQT_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( this, i18n( "This field stores a sound file which tqcontains 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/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp index 3de0220f0..6a8e495d5 100644 --- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp +++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp @@ -130,7 +130,7 @@ bool VCard_LDIFCreator::readContents( const TQString &path ) TQStringList phoneNumbers; for (unsigned int no=0; no<pnList.count(); ++no) { TQString pn = pnList[no].number().simplifyWhiteSpace(); - if (!pn.isEmpty() && !phoneNumbers.contains(pn)) + if (!pn.isEmpty() && !phoneNumbers.tqcontains(pn)) phoneNumbers.append(pn); } if ( !phoneNumbers.isEmpty() ) diff --git a/kaddressbook/typecombo.h b/kaddressbook/typecombo.h index 90a000110..a8bbb4ca3 100644 --- a/kaddressbook/typecombo.h +++ b/kaddressbook/typecombo.h @@ -86,7 +86,7 @@ void TypeCombo<T>::updateTypes() int type = ( mTypeList[ i ].type() & ~( T::Pref ) ); TQString label = mTypeList[ i ].typeLabel( type ); int count = 1; - if ( labelCount.contains( type ) ) { + if ( labelCount.tqcontains( type ) ) { count = labelCount[ type ] + 1; } labelCount[ type ] = count; diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp index 0f6e555d4..bd26270fa 100644 --- a/kaddressbook/undocmds.cpp +++ b/kaddressbook/undocmds.cpp @@ -84,7 +84,7 @@ void DeleteCommand::execute() TQStringList::ConstIterator it; const TQStringList::ConstIterator endIt( mUIDList.end() ); for ( it = mUIDList.begin(); it != endIt; ++it ) { - addr = addressBook()->findByUid( *it ); + addr = addressBook()->tqfindByUid( *it ); lock()->lock( addr.resource() ); mAddresseeList.append( addr ); AddresseeConfig cfg( addr ); @@ -273,7 +273,7 @@ void CutCommand::execute() TQStringList::ConstIterator it; const TQStringList::ConstIterator endIt( mUIDList.end() ); for ( it = mUIDList.begin(); it != endIt; ++it ) { - addr = addressBook()->findByUid( *it ); + addr = addressBook()->tqfindByUid( *it ); mAddresseeList.append( addr ); lock()->lock( addr.resource() ); } @@ -332,7 +332,7 @@ void CopyToCommand::execute() TQStringList::Iterator it( mUIDList.begin() ); const TQStringList::Iterator endIt( mUIDList.end() ); while ( it != endIt ) { - KABC::Addressee addr = addressBook()->findByUid( *it++ ); + KABC::Addressee addr = addressBook()->tqfindByUid( *it++ ); if ( !addr.isEmpty() ) { KABC::Addressee newAddr( addr ); // We need to set a new uid, otherwise the insert below is @@ -379,7 +379,7 @@ void MoveToCommand::moveContactTo( KABC::Resource *resource ) TQStringList::Iterator it( mUIDList.begin() ); const TQStringList::Iterator endIt( mUIDList.end() ); while ( it != endIt ) { - KABC::Addressee addr = addressBook()->findByUid( *it++ ); + KABC::Addressee addr = addressBook()->tqfindByUid( *it++ ); if ( !addr.isEmpty() ) { KABC::Addressee newAddr( addr ); // We need to set a new uid, otherwise the insert below is diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp index f83a8c925..453f47587 100644 --- a/kaddressbook/viewconfigurefieldspage.cpp +++ b/kaddressbook/viewconfigurefieldspage.cpp @@ -262,16 +262,16 @@ void ViewConfigureFieldsPage::initGUI() vb2->addStretch(); gl->addLayout( vb2, 1, 3 ); - TQSize sizeHint = mUnSelectedBox->sizeHint(); + TQSize tqsizeHint = mUnSelectedBox->tqsizeHint(); // make sure we fill the list with all items, so that we can // get the maxItemWidth we need to not truncate the view slotShowFields( 0 ); - sizeHint = sizeHint.expandedTo( mSelectedBox->sizeHint() ); - sizeHint.setWidth( mUnSelectedBox->maxItemWidth() ); - mUnSelectedBox->setMinimumSize( sizeHint ); - mSelectedBox->setMinimumSize( sizeHint ); + tqsizeHint = tqsizeHint.expandedTo( mSelectedBox->tqsizeHint() ); + tqsizeHint.setWidth( mUnSelectedBox->maxItemWidth() ); + mUnSelectedBox->setMinimumSize( tqsizeHint ); + mSelectedBox->setMinimumSize( tqsizeHint ); gl->activate(); diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp index 7a07b050b..923743f85 100644 --- a/kaddressbook/viewconfigurefilterpage.cpp +++ b/kaddressbook/viewconfigurefilterpage.cpp @@ -47,7 +47,7 @@ ViewConfigureFilterPage::ViewConfigureFilterPage( TQWidget *parent, " this view is displayed. This feature allows you to configure views that only" " interact with certain types of information based on the filter. Once the view" " is activated, the filter can be changed at anytime." ), this ); - label->setAlignment( Qt::AlignLeft | Qt::AlignTop | Qt::WordBreak ); + label->tqsetAlignment( Qt::AlignLeft | Qt::AlignTop | Qt::WordBreak ); topLayout->addWidget( label ); TQWidget *spacer = new TQWidget( this ); diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index 5dab74e25..46eb653b5 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -133,7 +133,7 @@ KABC::Addressee::List ViewManager::selectedAddressees() const const TQStringList uids = selectedUids(); TQStringList::ConstIterator it; for ( it = uids.begin(); it != uids.end(); ++it ) { - KABC::Addressee addr = mCore->addressBook()->findByUid( *it ); + KABC::Addressee addr = mCore->addressBook()->tqfindByUid( *it ); if ( !addr.isEmpty() ) list.append( addr ); } @@ -342,7 +342,7 @@ void ViewManager::addView() // Check for name conflicts bool firstConflict = true; int numTries = 1; - while ( mViewNameList.contains( newName ) > 0 ) { + while ( mViewNameList.tqcontains( newName ) > 0 ) { if ( !firstConflict ) { newName = newName.left( newName.length() - 4 ); firstConflict = false; @@ -436,7 +436,7 @@ void ViewManager::dropped( TQDropEvent *e ) } else if ( KVCardDrag::decode( e, list ) ) { KABC::Addressee::List::ConstIterator it; for ( it = list.begin(); it != list.end(); ++it ) { - KABC::Addressee a = mCore->addressBook()->findByUid( (*it).uid() ); + KABC::Addressee a = mCore->addressBook()->tqfindByUid( (*it).uid() ); if ( a.isEmpty() ) { // not yet in address book mCore->addressBook()->insertAddressee( *it ); emit modified(); @@ -459,7 +459,7 @@ void ViewManager::startDrag() TQStringList::ConstIterator it; for ( it = uidList.begin(); it != uidList.end(); ++it ) - addrList.append( mCore->addressBook()->findByUid( *it ) ); + addrList.append( mCore->addressBook()->tqfindByUid( *it ) ); KMultipleDrag *drag = new KMultipleDrag( this ); @@ -601,9 +601,9 @@ void ViewManager::initActions() void ViewManager::initGUI() { - TQHBoxLayout *layout = new TQHBoxLayout( this ); + TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); mViewWidgetStack = new TQWidgetStack( this ); - layout->addWidget( mViewWidgetStack ); + tqlayout->addWidget( mViewWidgetStack ); } #include "viewmanager.moc" diff --git a/kaddressbook/views/Makefile.am b/kaddressbook/views/Makefile.am index 39db0f589..98cf458ad 100644 --- a/kaddressbook/views/Makefile.am +++ b/kaddressbook/views/Makefile.am @@ -12,17 +12,17 @@ libkaddrbk_cardview_la_SOURCES = cardview.cpp colorlistbox.cpp \ configurecardviewdialog.cpp \ kaddressbookcardview.cpp libkaddrbk_cardview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -libkaddrbk_cardview_la_LIBADD = $(XXLIBS) +libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KABC) libkaddrbk_iconview_la_SOURCES = kaddressbookiconview.cpp libkaddrbk_iconview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -libkaddrbk_iconview_la_LIBADD = $(XXLIBS) +libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KABC) libkaddrbk_tableview_la_SOURCES = configuretableviewdialog.cpp \ contactlistview.cpp \ kaddressbooktableview.cpp libkaddrbk_tableview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -libkaddrbk_tableview_la_LIBADD = $(XXLIBS) +libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KABC) $(LIB_KIO) $(LIB_KIMPROXY) noinst_HEADERS = cardview.h colorlistbox.h configurecardviewdialog.h \ configuretableviewdialog.h contactlistview.h \ diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index 6e7d71d67..5c8ccf827 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -107,9 +107,9 @@ class CardViewSeparator cg.brush(TQColorGroup::Button) ); } - void repaintSeparator() + void tqrepaintSeparator() { - mView->repaintContents( mRect ); + mView->tqrepaintContents( mRect ); } private: @@ -355,7 +355,7 @@ int CardViewItem::height( bool allowCache ) const for ( iter.toFirst(); iter.current(); ++iter ) { if ( !sef && (*iter)->second.isEmpty() ) continue; - lines = QMIN( (*iter)->second.contains( '\n' ) + 1, maxLines ); + lines = QMIN( (*iter)->second.tqcontains( '\n' ) + 1, maxLines ); fieldHeight += ( lines * fh ) + 2; } @@ -448,16 +448,16 @@ CardViewItem *CardViewItem::nextItem() const return item; } -void CardViewItem::repaintCard() +void CardViewItem::tqrepaintCard() { if ( mView ) - mView->repaintItem( this ); + mView->tqrepaintItem( this ); } void CardViewItem::setCaption( const TQString &caption ) { d->mCaption = caption; - repaintCard(); + tqrepaintCard(); } TQString CardViewItem::fieldValue( const TQString &label ) const @@ -507,7 +507,7 @@ void CardViewItem::showFullString( const TQPoint &itempos, CardViewTip *tip ) Field *_f; for ( _f = d->mFieldList.first(); _f != f; _f = d->mFieldList.next() ) if ( se || ! _f->second.isEmpty() ) - y += ( QMIN( _f->second.contains( '\n' ) + 1, maxLines ) * fh ) + 2; + y += ( QMIN( _f->second.tqcontains( '\n' ) + 1, maxLines ) * fh ) + 2; if ( isLabel && itempos.y() > y + fh ) return; @@ -521,7 +521,7 @@ void CardViewItem::showFullString( const TQPoint &itempos, CardViewTip *tip ) trimmed = mView->d->mFm->width( s ) > mw - colonWidth; } else { TQRect r( mView->d->mFm->boundingRect( 0, 0, INT_MAX, INT_MAX, Qt::AlignTop|Qt::AlignLeft, s ) ); - trimmed = r.width() > mw || r.height() / fh > QMIN( s.contains( '\n' ) + 1, maxLines ); + trimmed = r.width() > mw || r.height() / fh > QMIN( s.tqcontains( '\n' ) + 1, maxLines ); } } @@ -560,7 +560,7 @@ CardViewItem::Field *CardViewItem::fieldAt( const TQPoint & itempos ) const Field *f; for ( f = d->mFieldList.first(); f; f = d->mFieldList.next() ) { if ( showEmpty || !f->second.isEmpty() ) - ypos += (QMIN( f->second.contains( '\n' )+1, maxLines ) * fh) + 2; + ypos += (QMIN( f->second.tqcontains( '\n' )+1, maxLines ) * fh) + 2; if ( iy <= ypos ) break; } @@ -653,9 +653,9 @@ void CardView::setCurrentItem( CardViewItem *item ) CardViewItem *it = d->mCurrentItem; d->mCurrentItem = item; if ( it ) - it->repaintCard(); + it->tqrepaintCard(); - item->repaintCard(); + item->tqrepaintCard(); } if ( ! d->mOnSeparator ) @@ -671,7 +671,7 @@ CardViewItem *CardView::itemAt( const TQPoint &viewPos ) const bool found = false; for ( iter.toFirst(); iter.current() && !found; ++iter ) { item = *iter; - if ( TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ).contains( viewPos ) ) + if ( TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ).tqcontains( viewPos ) ) found = true; } @@ -681,7 +681,7 @@ CardViewItem *CardView::itemAt( const TQPoint &viewPos ) const return 0; } -TQRect CardView::itemRect( const CardViewItem *item ) const +TQRect CardView::tqitemRect( const CardViewItem *item ) const { return TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ); } @@ -692,9 +692,9 @@ void CardView::ensureItemVisible( const CardViewItem *item ) ensureVisible( item->d->x + d->mItemWidth, item->d->y, d->mItemSpacing, 0 ); } -void CardView::repaintItem( const CardViewItem *item ) +void CardView::tqrepaintItem( const CardViewItem *item ) { - repaintContents( TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ) ); + tqrepaintContents( TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ) ); } void CardView::setSelectionMode( CardView::SelectionMode mode ) @@ -716,7 +716,7 @@ void CardView::selectAll( bool state ) for ( iter.toFirst(); iter.current(); ++iter ) { if ( (*iter)->isSelected() ) { (*iter)->setSelected( false ); - (*iter)->repaintCard(); + (*iter)->tqrepaintCard(); } } @@ -743,7 +743,7 @@ void CardView::setSelected( CardViewItem *item, bool selected ) CardViewItem *it = d->mCurrentItem; d->mCurrentItem = item; if ( it ) - it->repaintCard(); + it->tqrepaintCard(); } if ( d->mSelectionMode == CardView::Single ) { @@ -754,7 +754,7 @@ void CardView::setSelected( CardViewItem *item, bool selected ) if ( selected ) { item->setSelected( selected ); - item->repaintCard(); + item->tqrepaintCard(); emit selectionChanged(); emit selectionChanged( item ); } else { @@ -763,7 +763,7 @@ void CardView::setSelected( CardViewItem *item, bool selected ) } } else if ( d->mSelectionMode == CardView::Multi ) { item->setSelected( selected ); - item->repaintCard(); + item->tqrepaintCard(); emit selectionChanged(); } else if ( d->mSelectionMode == CardView::Extended ) { bool b = signalsBlocked(); @@ -772,7 +772,7 @@ void CardView::setSelected( CardViewItem *item, bool selected ) blockSignals( b ); item->setSelected( selected ); - item->repaintCard(); + item->tqrepaintCard(); emit selectionChanged(); } } @@ -860,7 +860,7 @@ void CardView::drawContents( TQPainter *p, int clipx, int clipy, item = *iter; cardRect.setRect( item->d->x, item->d->y, d->mItemWidth, item->height() ); - if ( clipRect.intersects( cardRect ) || clipRect.contains( cardRect ) ) { + if ( clipRect.intersects( cardRect ) || clipRect.tqcontains( cardRect ) ) { // Tell the card to paint p->save(); p->translate( cardRect.x(), cardRect.y() ); @@ -875,7 +875,7 @@ void CardView::drawContents( TQPainter *p, int clipx, int clipy, sep = *sepIter; sepRect = sep->mRect; - if ( clipRect.intersects( sepRect ) || clipRect.contains( sepRect ) ) { + if ( clipRect.intersects( sepRect ) || clipRect.tqcontains( sepRect ) ) { p->save(); p->translate( sepRect.x(), sepRect.y() ); sep->paintSeparator( p, cg ); @@ -893,7 +893,7 @@ void CardView::resizeEvent( TQResizeEvent *event ) void CardView::calcLayout() { - // Start in the upper left corner and layout all the + // Start in the upper left corner and tqlayout all the // cars using their height and width int maxWidth = 0; int maxHeight = 0; @@ -1048,12 +1048,12 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e ) blockSignals( b ); item->setSelected( true ); - item->repaintCard(); + item->tqrepaintCard(); emit selectionChanged( item ); } else if ( d->mSelectionMode == CardView::Multi ) { // toggle the selection item->setSelected( !item->isSelected() ); - item->repaintCard(); + item->tqrepaintCard(); emit selectionChanged(); } else if ( d->mSelectionMode == CardView::Extended ) { if ( (e->button() & Qt::LeftButton) && (e->state() & Qt::ShiftButton) ) { @@ -1079,13 +1079,13 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e ) for ( ; from <= to; from++ ) { aItem = d->mItemList.at( from ); aItem->setSelected( s ); - repaintItem( aItem ); + tqrepaintItem( aItem ); } emit selectionChanged(); } else if ( (e->button() & Qt::LeftButton) && (e->state() & Qt::ControlButton) ) { item->setSelected( !item->isSelected() ); - item->repaintCard(); + item->tqrepaintCard(); emit selectionChanged(); } else if ( e->button() & Qt::LeftButton ) { bool b = signalsBlocked(); @@ -1094,7 +1094,7 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e ) blockSignals( b ); item->setSelected( true ); - item->repaintCard(); + item->tqrepaintCard(); emit selectionChanged(); } } @@ -1202,13 +1202,13 @@ void CardView::focusInEvent( TQFocusEvent* ) if ( !d->mCurrentItem && d->mItemList.count() ) setCurrentItem( d->mItemList.first() ); else if ( d->mCurrentItem ) - d->mCurrentItem->repaintCard(); + d->mCurrentItem->tqrepaintCard(); } void CardView::focusOutEvent( TQFocusEvent* ) { if ( d->mCurrentItem ) - d->mCurrentItem->repaintCard(); + d->mCurrentItem->tqrepaintCard(); } void CardView::keyPressEvent( TQKeyEvent *e ) @@ -1324,7 +1324,7 @@ void CardView::keyPressEvent( TQKeyEvent *e ) break; case Key_Menu: emit contextMenuRequested( d->mCurrentItem, viewport()->mapToGlobal( - itemRect(d->mCurrentItem).center() ) ); + tqitemRect(d->mCurrentItem).center() ) ); break; default: if ( (e->state() & ControlButton) && e->key() == Key_A ) { @@ -1363,7 +1363,7 @@ void CardView::keyPressEvent( TQKeyEvent *e ) for ( ; from <= to; from++ ) { item = d->mItemList.at( from ); item->setSelected( s ); - repaintItem( item ); + tqrepaintItem( item ); } emit selectionChanged(); @@ -1392,7 +1392,7 @@ void CardView::setLayoutDirty( bool dirty ) { if ( d->mLayoutDirty != dirty ) { d->mLayoutDirty = dirty; - repaint(); + tqrepaint(); } } @@ -1400,7 +1400,7 @@ void CardView::setDrawCardBorder( bool enabled ) { if ( enabled != d->mDrawCardBorder ) { d->mDrawCardBorder = enabled; - repaint(); + tqrepaint(); } } @@ -1426,7 +1426,7 @@ void CardView::setDrawFieldLabels( bool enabled ) { if ( enabled != d->mDrawFieldLabels ) { d->mDrawFieldLabels = enabled; - repaint(); + tqrepaint(); } } @@ -1462,7 +1462,7 @@ void CardView::tryShowFullText() CardViewItem *item = itemAt( cpos ); if ( item ) { // query it for a value to display - TQPoint ipos = cpos - itemRect( item ).topLeft(); + TQPoint ipos = cpos - tqitemRect( item ).topLeft(); item->showFullString( ipos, d->mTip ); } } diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h index 5ab75e6ca..a5410419a 100644 --- a/kaddressbook/views/cardview.h +++ b/kaddressbook/views/cardview.h @@ -87,10 +87,10 @@ class CardViewItem virtual void paintCard( TQPainter *p, TQColorGroup &cg ); /** - Repaints the card. This is done by sending a repaint event to the + Repaints the card. This is done by sending a tqrepaint event to the view with the clip rect defined as this card. */ - virtual void repaintCard(); + virtual void tqrepaintCard(); /** Adds a field to the card. @@ -244,7 +244,7 @@ class CardView : public QScrollView /** @return The bounding rect of the given item. */ - TQRect itemRect( const CardViewItem *item ) const; + TQRect tqitemRect( const CardViewItem *item ) const; /** Ensures that the given item is in the viewable area of the widget @@ -254,7 +254,7 @@ class CardView : public QScrollView /** Repaints the given item. */ - void repaintItem( const CardViewItem *item ); + void tqrepaintItem( const CardViewItem *item ); enum SelectionMode { Single, Multi, Extended, NoSelection }; @@ -515,7 +515,7 @@ class CardView : public QScrollView void drawContents( TQPainter *p, int clipx, int clipy, int clipw, int cliph ); /** - Sets the layout to dirty and repaints. + Sets the tqlayout to dirty and tqrepaints. */ void resizeEvent( TQResizeEvent* ); @@ -525,13 +525,13 @@ class CardView : public QScrollView void contentsWheelEvent( TQWheelEvent* ); /** - Sets the layout to dirty and calls for a repaint. + Sets the tqlayout to dirty and calls for a tqrepaint. */ void setLayoutDirty( bool dirty ); /** Does the math based on the bounding rect of the cards to properly - lay the cards out on the screen. This is only done if the layout is + lay the cards out on the screen. This is only done if the tqlayout is marked as dirty. */ void calcLayout(); diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index ed7cfda1f..919e49878 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -94,19 +94,19 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config ) c = KGlobalSettings::baseColor(); lbColors->insertItem( new ColorListItem( i18n("Background Color"), config->readColorEntry( "BackgroundColor", &c ) ) ); - c = colorGroup().foreground(); + c = tqcolorGroup().foreground(); lbColors->insertItem( new ColorListItem( i18n("Text Color"), config->readColorEntry( "TextColor", &c ) ) ); - c = colorGroup().button(); + c = tqcolorGroup().button(); lbColors->insertItem( new ColorListItem( i18n("Header, Border & Separator Color"), config->readColorEntry( "HeaderColor", &c ) ) ); - c = colorGroup().buttonText(); + c = tqcolorGroup().buttonText(); lbColors->insertItem( new ColorListItem( i18n("Header Text Color"), config->readColorEntry( "HeaderTextColor", &c ) ) ); - c = colorGroup().highlight(); + c = tqcolorGroup().highlight(); lbColors->insertItem( new ColorListItem( i18n("Highlight Color"), config->readColorEntry( "HighlightColor", &c ) ) ); - c = colorGroup().highlightedText(); + c = tqcolorGroup().highlightedText(); lbColors->insertItem( new ColorListItem( i18n("Highlighted Text Color"), config->readColorEntry( "HighlightedTextColor", &c ) ) ); @@ -120,7 +120,7 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config ) cbEnableCustomFonts->setChecked( config->readBoolEntry( "EnableCustomFonts", false ) ); enableFonts(); - // layout + // tqlayout sbMargin->setValue( config->readNumEntry( "ItemMargin", 0 ) ); sbSpacing->setValue( config->readNumEntry( "ItemSpacing", 10 ) ); sbSepWidth->setValue( config->readNumEntry( "SeparatorWidth", 2 ) ); @@ -152,7 +152,7 @@ void CardViewLookNFeelPage::saveSettings( KConfig *config ) config->writeEntry( "TextFont", lTextFont->font() ); config->writeEntry( "HeaderFont", lHeaderFont->font() ); } - // layout + // tqlayout config->writeEntry( "ItemMargin", sbMargin->value() ); config->writeEntry( "ItemSpacing", sbSpacing->value() ); config->writeEntry( "SeparatorWidth", sbSepWidth->value() ); @@ -196,7 +196,7 @@ void CardViewLookNFeelPage::initGUI() TQTabWidget *tabs = new TQTabWidget( this ); // Layout - TQVBox *loTab = new TQVBox( this, "layouttab" ); + TQVBox *loTab = new TQVBox( this, "tqlayouttab" ); loTab->setSpacing( spacing ); loTab->setMargin( margin ); diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index c79ef5244..d65f42d38 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/kaddressbook/views/configuretableviewdialog.cpp @@ -111,11 +111,11 @@ void LookAndFeelPage::saveSettings( KConfig *config ) void LookAndFeelPage::initGUI() { - TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint()); TQButtonGroup *group = new TQButtonGroup(1, Qt::Horizontal, i18n("Row Separator"), this); - layout->addWidget(group); + tqlayout->addWidget(group); mAlternateButton = new TQRadioButton(i18n("Alternating backgrounds"), group, "mAlternateButton"); @@ -124,7 +124,7 @@ void LookAndFeelPage::initGUI() // Background Checkbox/Selector TQHBoxLayout *backgroundLayout = new TQHBoxLayout(); - layout->addLayout(backgroundLayout); + tqlayout->addLayout(backgroundLayout); mBackgroundBox = new TQCheckBox(i18n("Enable background image:"), this, "mBackgroundBox"); @@ -141,10 +141,10 @@ void LookAndFeelPage::initGUI() // ToolTip Checkbox mToolTipBox = new TQCheckBox(i18n("Enable contact tooltips"), this, "mToolTipBox"); - layout->addWidget(mToolTipBox); + tqlayout->addWidget(mToolTipBox); #if KDE_IS_VERSION(3,2,90) mIMPresenceBox = new TQCheckBox( i18n( "Show instant messaging presence" ), this, "mIMPresenceBox" ); - layout->addWidget( mIMPresenceBox ); + tqlayout->addWidget( mIMPresenceBox ); #endif } diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h index 58bac86d3..2e3378b4c 100644 --- a/kaddressbook/views/configuretableviewdialog.h +++ b/kaddressbook/views/configuretableviewdialog.h @@ -58,7 +58,7 @@ class ConfigureTableViewWidget : public ViewConfigureWidget }; /** - Internal class. It is only defined here for moc + Internal class. It is only defined here for tqmoc */ class LookAndFeelPage : public QWidget { diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index 0bc7c041d..5b9ecbf11 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -54,10 +54,10 @@ DynamicTip::DynamicTip( ContactListView *parent) void DynamicTip::maybeTip( const TQPoint &pos ) { - if (!parentWidget()->inherits( "ContactListView" )) + if (!tqparentWidget()->inherits( "ContactListView" )) return; - ContactListView *plv = (ContactListView*)parentWidget(); + ContactListView *plv = (ContactListView*)tqparentWidget(); if (!plv->tooltips()) return; @@ -72,7 +72,7 @@ void DynamicTip::maybeTip( const TQPoint &pos ) return; TQString s; - TQRect r = plv->itemRect( lvi ); + TQRect r = plv->tqitemRect( lvi ); r.moveBy( posVp.x(), posVp.y() ); //kdDebug(5720) << "Tip rec: " << r.x() << "," << r.y() << "," << r.width() @@ -109,7 +109,7 @@ void DynamicTip::maybeTip( const TQPoint &pos ) linew += fm.width( notes[i] ); if ( lastSpace >= a && notes[i] != '\n' ) - if (linew >= parentWidget()->width()) { + if (linew >= tqparentWidget()->width()) { doBreak = true; if ( lastSpace > a ) { i = lastSpace; @@ -222,7 +222,7 @@ void ContactListViewItem::refresh() } // Update our addressee, since it may have changed elsewhere - mAddressee = mDocument->findByUid(mAddressee.uid()); + mAddressee = mDocument->tqfindByUid(mAddressee.uid()); if (mAddressee.isEmpty()) return; diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index 7ba89a0ed..2f0c859c5 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp @@ -87,7 +87,7 @@ class AddresseeCardViewItem : public CardViewItem void refresh() { - mAddressee = mDocument->findByUid( mAddressee.uid() ); + mAddressee = mDocument->tqfindByUid( mAddressee.uid() ); if ( !mAddressee.isEmpty() ) { clearFields(); @@ -96,7 +96,7 @@ class AddresseeCardViewItem : public CardViewItem const KABC::Field::List::ConstIterator endIt( mFields.end() ); for ( ; it != endIt; ++it ) { // insert empty fields or not? not doing so saves a bit of memory and CPU - // (during geometry calculations), but prevents having equally + // (during tqgeometry calculations), but prevents having equally // wide label columns in all cards, unless CardViewItem/CardView search // globally for the widest label. (anders) @@ -149,11 +149,11 @@ KAddressBookCardView::KAddressBookCardView( KAB::Core *core, { mShowEmptyFields = false; - TQVBoxLayout *layout = new TQVBoxLayout( viewWidget() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() ); mCardView = new AddresseeCardView( viewWidget(), "mCardView" ); mCardView->setSelectionMode( CardView::Extended ); - layout->addWidget( mCardView ); + tqlayout->addWidget( mCardView ); // Connect up the signals connect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ), diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index 6d02acf73..58b4a3409 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp @@ -106,7 +106,7 @@ class AddresseeIconViewItem : public KIconViewItem void refresh() { - mAddressee = mDocument->findByUid( mAddressee.uid() ); + mAddressee = mDocument->tqfindByUid( mAddressee.uid() ); if ( !mAddressee.isEmpty() ) setText( mAddressee.givenName() + " " + mAddressee.familyName() ); @@ -139,10 +139,10 @@ KAddressBookIconView::KAddressBookIconView( KAB::Core *core, TQWidget *parent, const char *name) : KAddressBookView( core, parent, name ) { - TQVBoxLayout *layout = new TQVBoxLayout( viewWidget() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() ); mIconView = new AddresseeIconView( viewWidget(), "mIconView" ); - layout->addWidget( mIconView ); + tqlayout->addWidget( mIconView ); // Connect up the signals connect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ), diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index 7f822ae4d..89caa0455 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp @@ -210,7 +210,7 @@ void KAddressBookTableView::readConfig( KConfig *config ) if ( config->readBoolEntry( "Background", false ) ) mListView->setBackgroundPixmap( config->readPathEntry( "BackgroundName" ) ); - // Restore the layout of the listview + // Restore the tqlayout of the listview mListView->restoreLayout( config, config->group() ); } @@ -244,7 +244,7 @@ void KAddressBookTableView::refresh( const TQString &uid ) // Sometimes the background pixmap gets messed up when we add lots // of items. - mListView->repaint(); + mListView->tqrepaint(); if ( currentItem ) { mListView->setCurrentItem( currentItem ); diff --git a/kaddressbook/xxport/Makefile.am b/kaddressbook/xxport/Makefile.am index 5aebc23f2..f88d91d19 100644 --- a/kaddressbook/xxport/Makefile.am +++ b/kaddressbook/xxport/Makefile.am @@ -21,33 +21,33 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \ $(top_builddir)/libkdepim/libkdepim.la libkaddrbk_csv_xxport_la_SOURCES = csv_xxport.cpp csvimportdialog.cpp dateparser.cpp -libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) +libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO) libkaddrbk_vcard_xxport_la_SOURCES = vcard_xxport.cpp -libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) \ +libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO) \ $(top_builddir)/kaddressbook/libkaddressbook.la \ $(top_builddir)/libkdenetwork/qgpgme/libqgpgme.la libkaddrbk_kde2_xxport_la_SOURCES = kde2_xxport.cpp -libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) +libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO) libkaddrbk_bookmark_xxport_la_SOURCES = bookmark_xxport.cpp -libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) +libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO) libkaddrbk_eudora_xxport_la_SOURCES = eudora_xxport.cpp -libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) +libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO) libkaddrbk_ldif_xxport_la_SOURCES = ldif_xxport.cpp -libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) +libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO) libkaddrbk_gnokii_xxport_la_SOURCES = gnokii_xxport.cpp -libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) +libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO) libkaddrbk_opera_xxport_la_SOURCES = opera_xxport.cpp -libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) +libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO) libkaddrbk_pab_xxport_la_SOURCES = pab_xxport.cpp pab_mapihd.cpp pab_pablib.cpp -libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) +libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO) noinst_HEADERS = csvimportdialog.h diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp index b1ee94047..52286d3b7 100644 --- a/kaddressbook/xxport/csv_xxport.cpp +++ b/kaddressbook/xxport/csv_xxport.cpp @@ -50,7 +50,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& return true; if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) return false; } @@ -58,7 +58,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& KTempFile tmpFile; if ( tmpFile.status() != 0 ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" ); - KMessageBox::error( parentWidget(), txt.arg( url.url() ) + KMessageBox::error( tqparentWidget(), txt.arg( url.url() ) .arg( strerror( tmpFile.status() ) ) ); return false; } @@ -66,19 +66,19 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& doExport( tmpFile.file(), list ); tmpFile.close(); - return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() ); + return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() ); } else { TQFile file( url.path() ); if ( !file.open( IO_WriteOnly ) ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ); - KMessageBox::error( parentWidget(), txt.arg( url.path() ) ); + KMessageBox::error( tqparentWidget(), txt.arg( url.path() ) ); return false; } doExport( &file, list ); file.close(); - KMessageBox::information( parentWidget(), i18n( "The contacts have been exported successfully." ) ); + KMessageBox::information( tqparentWidget(), i18n( "The contacts have been exported successfully." ) ); return true; } @@ -86,7 +86,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& KABC::AddresseeList CSVXXPort::importContacts( const TQString& ) const { - CSVImportDialog dlg( addressBook(), parentWidget() ); + CSVImportDialog dlg( addressBook(), tqparentWidget() ); if ( dlg.exec() ) return dlg.contacts(); else @@ -123,7 +123,7 @@ void CSVXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list ) if ( !first ) t << ","; - t << "\"" << (*fieldIter)->value( addr ).replace( "\n", "\\n" ) << "\""; + t << "\"" << (*fieldIter)->value( addr ).tqreplace( "\n", "\\n" ) << "\""; first = false; } diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index bbcd74d2a..36f760540 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -367,7 +367,7 @@ void CSVImportDialog::initGUI() { mPage = plainPage(); - TQGridLayout *layout = new TQGridLayout( mPage, 1, 1, marginHint(), + TQGridLayout *tqlayout = new TQGridLayout( mPage, 1, 1, marginHint(), spacingHint() ); TQHBoxLayout *hbox = new TQHBoxLayout(); hbox->setSpacing( spacingHint() ); @@ -379,16 +379,16 @@ void CSVImportDialog::initGUI() mUrlRequester->setFilter( "*.csv" ); hbox->addWidget( mUrlRequester ); - layout->addMultiCellLayout( hbox, 0, 0, 0, 4 ); + tqlayout->addMultiCellLayout( hbox, 0, 0, 0, 4 ); // Delimiter: comma, semicolon, tab, space, other mDelimiterBox = new TQButtonGroup( i18n( "Delimiter" ), mPage ); mDelimiterBox->setColumnLayout( 0, Qt::Vertical ); - mDelimiterBox->layout()->setSpacing( spacingHint() ); - mDelimiterBox->layout()->setMargin( marginHint() ); - TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->layout() ); - delimiterLayout->setAlignment( Qt::AlignTop ); - layout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 ); + mDelimiterBox->tqlayout()->setSpacing( spacingHint() ); + mDelimiterBox->tqlayout()->setMargin( marginHint() ); + TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->tqlayout() ); + delimiterLayout->tqsetAlignment( Qt::AlignTop ); + tqlayout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 ); mRadioComma = new TQRadioButton( i18n( "Comma" ), mDelimiterBox ); mRadioComma->setChecked( true ); @@ -411,13 +411,13 @@ void CSVImportDialog::initGUI() mComboLine = new TQComboBox( false, mPage ); mComboLine->insertItem( i18n( "1" ) ); - layout->addWidget( mComboLine, 2, 3 ); + tqlayout->addWidget( mComboLine, 2, 3 ); mComboQuote = new TQComboBox( false, mPage ); mComboQuote->insertItem( i18n( "\"" ), 0 ); mComboQuote->insertItem( i18n( "'" ), 1 ); mComboQuote->insertItem( i18n( "None" ), 2 ); - layout->addWidget( mComboQuote, 2, 2 ); + tqlayout->addWidget( mComboQuote, 2, 2 ); mDatePatternEdit = new TQLineEdit( mPage ); mDatePatternEdit->setText( "Y-M-D" ); // ISO 8601 format as default @@ -427,28 +427,28 @@ void CSVImportDialog::initGUI() "<li>M: month with 2 digits</li>" "<li>d: day with 1 or 2 digits</li>" "<li>D: day with 2 digits</li></ul>" ) ); - layout->addWidget( mDatePatternEdit, 2, 4 ); + tqlayout->addWidget( mDatePatternEdit, 2, 4 ); label = new TQLabel( i18n( "Start at line:" ), mPage ); - layout->addWidget( label, 1, 3 ); + tqlayout->addWidget( label, 1, 3 ); label = new TQLabel( i18n( "Textquote:" ), mPage ); - layout->addWidget( label, 1, 2 ); + tqlayout->addWidget( label, 1, 2 ); label = new TQLabel( i18n( "Date format:" ), mPage ); - layout->addWidget( label, 1, 4 ); + tqlayout->addWidget( label, 1, 4 ); mIgnoreDuplicates = new TQCheckBox( mPage ); mIgnoreDuplicates->setText( i18n( "Ignore duplicate delimiters" ) ); - layout->addMultiCellWidget( mIgnoreDuplicates, 3, 3, 2, 4 ); + tqlayout->addMultiCellWidget( mIgnoreDuplicates, 3, 3, 2, 4 ); mCodecCombo = new TQComboBox( mPage ); - layout->addMultiCellWidget( mCodecCombo, 4, 4, 2, 4 ); + tqlayout->addMultiCellWidget( mCodecCombo, 4, 4, 2, 4 ); mTable = new TQTable( 0, 0, mPage ); mTable->setSelectionMode( TQTable::NoSelection ); mTable->horizontalHeader()->hide(); - layout->addMultiCellWidget( mTable, 5, 5, 0, 4 ); + tqlayout->addMultiCellWidget( mTable, 5, 5, 0, 4 ); setButtonText( User1, i18n( "Apply Template..." ) ); setButtonText( User2, i18n( "Save Template..." ) ); @@ -854,7 +854,7 @@ void CSVImportDialog::saveTemplate() if ( fileName.isEmpty() ) return; - if ( !fileName.contains( ".desktop" ) ) + if ( !fileName.tqcontains( ".desktop" ) ) fileName += ".desktop"; if( TQFileInfo(fileName).exists() ) { diff --git a/kaddressbook/xxport/dateparser.h b/kaddressbook/xxport/dateparser.h index 3087d339a..569969515 100644 --- a/kaddressbook/xxport/dateparser.h +++ b/kaddressbook/xxport/dateparser.h @@ -29,7 +29,7 @@ /** This class parses the date out of a given string with the help of a pattern. - The pattern can contains the following key characters: + The pattern can tqcontains the following key characters: y = year (e.g. 82) Y = year (e.g. 1982) m = month (e.g. 7, 07 or 12) diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp index c6bd0917d..faf527073 100644 --- a/kaddressbook/xxport/gnokii_xxport.cpp +++ b/kaddressbook/xxport/gnokii_xxport.cpp @@ -173,9 +173,9 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat static TQString buildPhoneInfoString( const gn_memory_status &memstat ) { - TQString format = TQString::fromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>"); + TQString format = TQString::tqfromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>"); - return TQString::fromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>") + return TQString::tqfromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>") .arg(i18n("Mobile Phone information:")) .arg(format.arg(i18n("Manufacturer")).arg(GN_FROM(manufacturer))) .arg(format.arg(i18n("Phone model")).arg(GN_FROM(model))) @@ -272,7 +272,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty TQDateTime datetime; gn_timestamp ts = gn_lib_get_pb_date(state); if (ts.year<1998) - datetime = TQDateTime::currentDateTime(); + datetime = TQDateTime::tqcurrentDateTime(); else datetime = TQDateTime( TQDate(ts.year, ts.month, ts.day), TQTime(ts.hour, ts.minute, ts.second) ); @@ -481,14 +481,14 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem if (Addr->isEmpty()) continue; TQStringList a; TQChar sem(';'); - TQString sem_repl(TQString::fromLatin1(",")); - a.append( Addr->postOfficeBox().replace( sem, sem_repl ) ); - a.append( Addr->extended() .replace( sem, sem_repl ) ); - a.append( Addr->street() .replace( sem, sem_repl ) ); - a.append( Addr->locality() .replace( sem, sem_repl ) ); - a.append( Addr->region() .replace( sem, sem_repl ) ); - a.append( Addr->postalCode() .replace( sem, sem_repl ) ); - a.append( Addr->country() .replace( sem, sem_repl ) ); + TQString sem_repl(TQString::tqfromLatin1(",")); + a.append( Addr->postOfficeBox().tqreplace( sem, sem_repl ) ); + a.append( Addr->extended() .tqreplace( sem, sem_repl ) ); + a.append( Addr->street() .tqreplace( sem, sem_repl ) ); + a.append( Addr->locality() .tqreplace( sem, sem_repl ) ); + a.append( Addr->region() .tqreplace( sem, sem_repl ) ); + a.append( Addr->postalCode() .tqreplace( sem, sem_repl ) ); + a.append( Addr->country() .tqreplace( sem, sem_repl ) ); s = a.join(sem); gn_lib_set_pb_subentry(state, -1 /* index to append entry */, GN_PHONEBOOK_ENTRY_Postal, GN_PHONEBOOK_NUMBER_General, GN_TO(s)); @@ -528,7 +528,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const { KABC::AddresseeList addrList; - if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(), + if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(), i18n("<qt>Please connect your Mobile Phone to your computer and press " "<b>Continue</b> to start importing the personal contacts.<br><br>" "Please note that if your Mobile Phone is not properly connected " @@ -536,7 +536,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const "KAddressbook will behave unresponsively.</qt>") )) return addrList; - m_progressDlg = new KProgressDialog( parentWidget(), "importwidget", + m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget", i18n("Mobile Phone Import"), i18n("<qt><center>Establishing connection to the Mobile Phone.<br><br>" "Please wait...</center></qt>") ); @@ -555,7 +555,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const m_progressDlg->unsetCursor(); if (!errStr.isEmpty()) { - KMessageBox::error(parentWidget(), errStr); + KMessageBox::error(tqparentWidget(), errStr); delete m_progressDlg; return addrList; } @@ -577,7 +577,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & ) { - if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(), + if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(), i18n("<qt>Please connect your Mobile Phone to your computer and press " "<b>Continue</b> to start exporting the selected personal contacts.<br><br>" "Please note that if your Mobile Phone is not properly connected " @@ -585,7 +585,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri "KAddressbook will behave unresponsively.</qt>") )) return false; - m_progressDlg = new KProgressDialog( parentWidget(), "importwidget", + m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget", i18n("Mobile Phone Export"), i18n("<qt><center>Establishing connection to the Mobile Phone.<br><br>" "Please wait...</center></qt>") ); @@ -612,7 +612,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri m_progressDlg->unsetCursor(); if (!errStr.isEmpty()) { - KMessageBox::error(parentWidget(), errStr); + KMessageBox::error(tqparentWidget(), errStr); delete m_progressDlg; return false; } @@ -641,11 +641,11 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri phone_count = memstat.used; if (memstat.free >= (int) list.count()) { - if (KMessageBox::No == KMessageBox::questionYesNo(parentWidget(), + if (KMessageBox::No == KMessageBox::questionYesNo(tqparentWidget(), i18n("<qt>Do you want the selected contacts to be <b>appended</b> to " - "the current mobile phonebook or should they <b>replace</b> all " + "the current mobile phonebook or should they <b>tqreplace</b> all " "currently existing phonebook entries ?<br><br>" - "Please note, that in case you choose to replace the phonebook " + "Please note, that in case you choose to tqreplace the phonebook " "entries, every contact in your phone will be deleted and only " "the newly exported contacts will be available from inside your phone.</qt>"), i18n("Export to Mobile Phone"), @@ -760,7 +760,7 @@ finish: if (!failedList.isEmpty()) { GNOKII_DEBUG(TQString("Failed to export: %1\n").arg(failedList.join(", "))); - KMessageBox::informationList(parentWidget(), + KMessageBox::informationList(tqparentWidget(), i18n("<qt>The following contacts could not be exported to the Mobile Phone. " "Possible Reasons for this problem could be:<br><ul>" "<li>The contacts contain more information per entry than the phone can store.</li>" @@ -827,7 +827,7 @@ static TQString businit(void) return i18n("Gnokii is not yet configured."); // uncomment to debug all gnokii communication on stderr. - // gn_log_debug_mask = GN_LOG_T_STDERR; + // gn_log_debug_tqmask = GN_LOG_T_STDERR; gn_data_clear(&data); @@ -947,9 +947,9 @@ static bool phone_entry_empty( const int index, const gn_memory_type memtype ) static TQString buildPhoneInfoString( const gn_memory_status &memstat ) { - TQString format = TQString::fromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>"); + TQString format = TQString::tqfromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>"); - return TQString::fromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>") + return TQString::tqfromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>") .arg(i18n("Mobile Phone information:")) .arg(format.arg(i18n("Manufacturer")).arg(GN_FROM(manufacturer))) .arg(format.arg(i18n("Phone model")).arg(GN_FROM(model))) @@ -1048,7 +1048,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty // evaluate timestamp (ignore timezone) TQDateTime datetime; if (entry.date.year<1998) - datetime = TQDateTime::currentDateTime(); + datetime = TQDateTime::tqcurrentDateTime(); else datetime = TQDateTime( TQDate(entry.date.year, entry.date.month, entry.date.day), TQTime(entry.date.hour, entry.date.minute, entry.date.second) ); @@ -1267,14 +1267,14 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem subentry->entry_type = GN_PHONEBOOK_ENTRY_Postal; TQStringList a; TQChar sem(';'); - TQString sem_repl(TQString::fromLatin1(",")); - a.append( Addr->postOfficeBox().replace( sem, sem_repl ) ); - a.append( Addr->extended() .replace( sem, sem_repl ) ); - a.append( Addr->street() .replace( sem, sem_repl ) ); - a.append( Addr->locality() .replace( sem, sem_repl ) ); - a.append( Addr->region() .replace( sem, sem_repl ) ); - a.append( Addr->postalCode() .replace( sem, sem_repl ) ); - a.append( Addr->country() .replace( sem, sem_repl ) ); + TQString sem_repl(TQString::tqfromLatin1(",")); + a.append( Addr->postOfficeBox().tqreplace( sem, sem_repl ) ); + a.append( Addr->extended() .tqreplace( sem, sem_repl ) ); + a.append( Addr->street() .tqreplace( sem, sem_repl ) ); + a.append( Addr->locality() .tqreplace( sem, sem_repl ) ); + a.append( Addr->region() .tqreplace( sem, sem_repl ) ); + a.append( Addr->postalCode() .tqreplace( sem, sem_repl ) ); + a.append( Addr->country() .tqreplace( sem, sem_repl ) ); s = a.join(sem); strncpy(subentry->data.number, GN_TO(s), sizeof(subentry->data.number)-1); entry.subentries_count++; @@ -1323,7 +1323,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const { KABC::AddresseeList addrList; - if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(), + if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(), i18n("<qt>Please connect your Mobile Phone to your computer and press " "<b>Continue</b> to start importing the personal contacts.<br><br>" "Please note that if your Mobile Phone is not properly connected " @@ -1331,7 +1331,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const "KAddressbook will behave unresponsively.</qt>") )) return addrList; - m_progressDlg = new KProgressDialog( parentWidget(), "importwidget", + m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget", i18n("Mobile Phone Import"), i18n("<qt><center>Establishing connection to the Mobile Phone.<br><br>" "Please wait...</center></qt>") ); @@ -1350,7 +1350,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const m_progressDlg->unsetCursor(); if (!errStr.isEmpty()) { - KMessageBox::error(parentWidget(), errStr); + KMessageBox::error(tqparentWidget(), errStr); delete m_progressDlg; return addrList; } @@ -1372,7 +1372,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & ) { - if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(), + if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(), i18n("<qt>Please connect your Mobile Phone to your computer and press " "<b>Continue</b> to start exporting the selected personal contacts.<br><br>" "Please note that if your Mobile Phone is not properly connected " @@ -1380,7 +1380,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri "KAddressbook will behave unresponsively.</qt>") )) return false; - m_progressDlg = new KProgressDialog( parentWidget(), "importwidget", + m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget", i18n("Mobile Phone Export"), i18n("<qt><center>Establishing connection to the Mobile Phone.<br><br>" "Please wait...</center></qt>") ); @@ -1407,7 +1407,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri m_progressDlg->unsetCursor(); if (!errStr.isEmpty()) { - KMessageBox::error(parentWidget(), errStr); + KMessageBox::error(tqparentWidget(), errStr); delete m_progressDlg; return false; } @@ -1436,11 +1436,11 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri phone_count = memstat.used; if (memstat.free >= (int) list.count()) { - if (KMessageBox::No == KMessageBox::questionYesNo(parentWidget(), + if (KMessageBox::No == KMessageBox::questionYesNo(tqparentWidget(), i18n("<qt>Do you want the selected contacts to be <b>appended</b> to " - "the current mobile phonebook or should they <b>replace</b> all " + "the current mobile phonebook or should they <b>tqreplace</b> all " "currently existing phonebook entries ?<br><br>" - "Please note, that in case you choose to replace the phonebook " + "Please note, that in case you choose to tqreplace the phonebook " "entries, every contact in your phone will be deleted and only " "the newly exported contacts will be available from inside your phone.</qt>"), i18n("Export to Mobile Phone"), @@ -1555,7 +1555,7 @@ finish: if (!failedList.isEmpty()) { GNOKII_DEBUG(TQString("Failed to export: %1\n").arg(failedList.join(", "))); - KMessageBox::informationList(parentWidget(), + KMessageBox::informationList(tqparentWidget(), i18n("<qt>The following contacts could not be exported to the Mobile Phone. " "Possible Reasons for this problem could be:<br><ul>" "<li>The contacts contain more information per entry than the phone can store.</li>" @@ -1583,7 +1583,7 @@ finish: KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const { KABC::AddresseeList addrList; - KMessageBox::error(parentWidget(), i18n("Gnokii interface is not available.\n" + KMessageBox::error(tqparentWidget(), i18n("Gnokii interface is not available.\n" "Please ask your distributor to add gnokii at compile time.")); return addrList; } @@ -1591,7 +1591,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & ) { Q_UNUSED(list); - KMessageBox::error(parentWidget(), i18n("Gnokii interface is not available.\n" + KMessageBox::error(tqparentWidget(), i18n("Gnokii interface is not available.\n" "Please ask your distributor to add gnokii at compile time.")); return true; } diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp index 92a311023..fb03e2c32 100644 --- a/kaddressbook/xxport/kde2_xxport.cpp +++ b/kaddressbook/xxport/kde2_xxport.cpp @@ -49,11 +49,11 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const { TQString fileName = locateLocal( "data", "kabc/std.vcf" ); if ( !TQFile::exists( fileName ) ) { - KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).arg( fileName ) ); + KMessageBox::sorry( tqparentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).arg( fileName ) ); return KABC::AddresseeList(); } - int result = KMessageBox::questionYesNoCancel( parentWidget(), + int result = KMessageBox::questionYesNoCancel( tqparentWidget(), i18n( "Override previously imported entries?" ), i18n( "Import KDE 2 Addressbook" ), i18n("Import"), i18n("Do Not Import") ); diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp index 92143c7e2..799e4ca35 100644 --- a/kaddressbook/xxport/ldif_xxport.cpp +++ b/kaddressbook/xxport/ldif_xxport.cpp @@ -71,7 +71,7 @@ KABC::AddresseeList LDIFXXPort::importContacts( const TQString& ) const TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" ); - KMessageBox::error( parentWidget(), msg.arg( fileName ) ); + KMessageBox::error( tqparentWidget(), msg.arg( fileName ) ); return addrList; } @@ -97,7 +97,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString return true; if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) return false; } @@ -106,7 +106,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString KTempFile tmpFile; if ( tmpFile.status() != 0 ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" ); - KMessageBox::error( parentWidget(), txt.arg( url.url() ) + KMessageBox::error( tqparentWidget(), txt.arg( url.url() ) .arg( strerror( tmpFile.status() ) ) ); return false; } @@ -114,14 +114,14 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString doExport( tmpFile.file(), list ); tmpFile.close(); - return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() ); + return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() ); } else { TQString filename = url.path(); TQFile file( filename ); if ( !file.open( IO_WriteOnly ) ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ); - KMessageBox::error( parentWidget(), txt.arg( filename ) ); + KMessageBox::error( tqparentWidget(), txt.arg( filename ) ); return false; } diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp index 474a66723..c10a28523 100644 --- a/kaddressbook/xxport/opera_xxport.cpp +++ b/kaddressbook/xxport/opera_xxport.cpp @@ -48,14 +48,14 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const { KABC::AddresseeList addrList; - TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath() + TQString::fromLatin1( "/.opera/contacts.adr" ) ); + TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath() + TQString::tqfromLatin1( "/.opera/contacts.adr" ) ); if ( fileName.isEmpty() ) return addrList; TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" ); - KMessageBox::error( parentWidget(), msg.arg( fileName ) ); + KMessageBox::error( tqparentWidget(), msg.arg( fileName ) ); return addrList; } @@ -70,7 +70,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const while ( !stream.atEnd() ) { line = stream.readLine(); line = line.stripWhiteSpace(); - if ( line == TQString::fromLatin1( "#CONTACT" ) ) { + if ( line == TQString::tqfromLatin1( "#CONTACT" ) ) { parseContact = true; addr = KABC::Addressee(); continue; @@ -87,9 +87,9 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const int sep = line.find( '=' ); key = line.left( sep ).lower(); value = line.mid( sep + 1 ); - if ( key == TQString::fromLatin1( "name" ) ) + if ( key == TQString::tqfromLatin1( "name" ) ) addr.setNameFromString( value ); - else if ( key == TQString::fromLatin1( "mail" ) ) { + else if ( key == TQString::tqfromLatin1( "mail" ) ) { TQStringList emails = TQStringList::split( separator, value ); TQStringList::Iterator it = emails.begin(); @@ -98,20 +98,20 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const addr.insertEmail( *it, preferred ); preferred = false; } - } else if ( key == TQString::fromLatin1( "phone" ) ) + } else if ( key == TQString::tqfromLatin1( "phone" ) ) addr.insertPhoneNumber( KABC::PhoneNumber( value ) ); - else if ( key == TQString::fromLatin1( "fax" ) ) + else if ( key == TQString::tqfromLatin1( "fax" ) ) addr.insertPhoneNumber( KABC::PhoneNumber( value, KABC::PhoneNumber::Fax | KABC::PhoneNumber::Home ) ); - else if ( key == TQString::fromLatin1( "postaladdress" ) ) { + else if ( key == TQString::tqfromLatin1( "postaladdress" ) ) { KABC::Address address( KABC::Address::Home ); - address.setLabel( value.replace( separator, "\n" ) ); + address.setLabel( value.tqreplace( separator, "\n" ) ); addr.insertAddress( address ); - } else if ( key == TQString::fromLatin1( "description" ) ) - addr.setNote( value.replace( separator, "\n" ) ); - else if ( key == TQString::fromLatin1( "url" ) ) + } else if ( key == TQString::tqfromLatin1( "description" ) ) + addr.setNote( value.tqreplace( separator, "\n" ) ); + else if ( key == TQString::tqfromLatin1( "url" ) ) addr.setUrl( KURL( value ) ); - else if ( key == TQString::fromLatin1( "pictureurl" ) ) { + else if ( key == TQString::tqfromLatin1( "pictureurl" ) ) { KABC::Picture pic( value ); addr.setPhoto( pic ); } diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp index 21ac67c07..6aa818503 100644 --- a/kaddressbook/xxport/pab_xxport.cpp +++ b/kaddressbook/xxport/pab_xxport.cpp @@ -55,7 +55,7 @@ KABC::AddresseeList PABXXPort::importContacts( const TQString& ) const if ( fileName.isEmpty() ) return addrList; if ( !TQFile::exists( fileName ) ) { - KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a MS Exchange Personal Address Book <b>%1</b>.</qt>" ).arg( fileName ) ); + KMessageBox::sorry( tqparentWidget(), i18n( "<qt>Could not find a MS Exchange Personal Address Book <b>%1</b>.</qt>" ).arg( fileName ) ); return addrList; } diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index 1dfc9bcc4..69f854f33 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -131,7 +131,7 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS TQString msg = i18n( "You have selected a list of contacts, shall they be " "exported to several files?" ); - switch ( KMessageBox::questionYesNo( parentWidget(), msg, TQString::null, i18n("Export to Several Files"), i18n("Export to One File") ) ) { + switch ( KMessageBox::questionYesNo( tqparentWidget(), msg, TQString::null, i18n("Export to Several Files"), i18n("Export to One File") ) ) { case KMessageBox::Yes: { KURL baseUrl = KFileDialog::getExistingURL(); if ( baseUrl.isEmpty() ) @@ -146,7 +146,7 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS else testUrl = baseUrl.url() + "/" + (*it).givenName() + "_" + (*it).familyName(); - if ( KIO::NetAccess::exists( testUrl + (counter == 0 ? "" : TQString::number( counter )) + ".vcf", false, parentWidget() ) ) { + if ( KIO::NetAccess::exists( testUrl + (counter == 0 ? "" : TQString::number( counter )) + ".vcf", false, tqparentWidget() ) ) { counter++; url = testUrl + TQString::number( counter ) + ".vcf"; } else @@ -208,7 +208,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const #endif } else { if ( XXPortManager::importURL.isEmpty() ) - urls = KFileDialog::getOpenURLs( TQString::null, "*.vcf|vCards", parentWidget(), + urls = KFileDialog::getOpenURLs( TQString::null, "*.vcf|vCards", tqparentWidget(), i18n( "Select vCard to Import" ) ); else urls.append( XXPortManager::importURL ); @@ -220,7 +220,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const bool anyFailures = false; KURL::List::Iterator it; for ( it = urls.begin(); it != urls.end(); ++it ) { - if ( KIO::NetAccess::download( *it, fileName, parentWidget() ) ) { + if ( KIO::NetAccess::download( *it, fileName, tqparentWidget() ) ) { TQFile file( fileName ); @@ -237,12 +237,12 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const TQString vCardText; - // With version 3.0, vCards are encoded with UTF-8 by default. Otherwise, use fromLatin1() + // With version 3.0, vCards are encoded with UTF-8 by default. Otherwise, use tqfromLatin1() // and hope that are fields are encoded correctly. - if ( TQString::fromLatin1( rawData ).lower().contains( "version:3.0" ) ) { + if ( TQString::tqfromLatin1( rawData ).lower().tqcontains( "version:3.0" ) ) { vCardText = TQString::fromUtf8( rawData ); } else { - vCardText = TQString::fromLatin1( rawData ); + vCardText = TQString::tqfromLatin1( rawData ); } addrList += parseVCard( vCardText ); } @@ -253,13 +253,13 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const text = text.arg( (*it).url() ); text = text.arg( kapp->translate( "TQFile", file.errorString().latin1() ) ); - KMessageBox::error( parentWidget(), text, caption ); + KMessageBox::error( tqparentWidget(), text, caption ); anyFailures = true; } } else { TQString text = i18n( "<qt>Unable to access vCard: %1</qt>" ); text = text.arg( KIO::NetAccess::lastErrorString() ); - KMessageBox::error( parentWidget(), text, caption ); + KMessageBox::error( tqparentWidget(), text, caption ); anyFailures = true; } } @@ -267,12 +267,12 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const if ( !XXPortManager::importURL.isEmpty() ) { // a vcard was passed via cmd if ( addrList.isEmpty() ) { if ( anyFailures && urls.count() > 1 ) - KMessageBox::information( parentWidget(), + KMessageBox::information( tqparentWidget(), i18n( "No contacts were imported, due to errors with the vCards." ) ); else if ( !anyFailures ) - KMessageBox::information( parentWidget(), i18n( "The vCard does not contain any contacts." ) ); + KMessageBox::information( tqparentWidget(), i18n( "The vCard does not contain any contacts." ) ); } else { - VCardViewerDialog dlg( addrList, parentWidget() ); + VCardViewerDialog dlg( addrList, tqparentWidget() ); dlg.exec(); addrList = dlg.contacts(); } @@ -293,7 +293,7 @@ KABC::AddresseeList VCardXXPort::parseVCard( const TQByteArray &data ) const bool VCardXXPort::doExport( const KURL &url, const TQByteArray &data ) { if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) return false; } KTempFile tmpFile; @@ -302,7 +302,7 @@ bool VCardXXPort::doExport( const KURL &url, const TQByteArray &data ) tmpFile.file()->writeBlock( data.data(), data.size() ); tmpFile.close(); - return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() ); + return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() ); } #else KABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const @@ -315,7 +315,7 @@ KABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const bool VCardXXPort::doExport( const KURL &url, const TQString &data ) { if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) return false; } KTempFile tmpFile; @@ -327,7 +327,7 @@ bool VCardXXPort::doExport( const KURL &url, const TQString &data ) stream << data; tmpFile.close(); - return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() ); + return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() ); } #endif @@ -338,7 +338,7 @@ KABC::AddresseeList VCardXXPort::filterContacts( const KABC::AddresseeList &addr if ( addrList.isEmpty() ) return addrList; - VCardExportSelectionDialog dlg( parentWidget() ); + VCardExportSelectionDialog dlg( tqparentWidget() ); if ( !dlg.exec() ) return list; @@ -471,18 +471,18 @@ VCardViewerDialog::VCardViewerDialog( const KABC::Addressee::List &list, mContacts( list ) { TQFrame *page = plainPage(); - TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() ); TQLabel *label = new TQLabel( i18n( "Do you want to import this contact in your address book?" ), page ); TQFont font = label->font(); font.setBold( true ); label->setFont( font ); - layout->addWidget( label ); + tqlayout->addWidget( label ); mView = new KPIM::AddresseeView( page ); mView->enableLinks( 0 ); mView->setVScrollBarMode( TQScrollView::Auto ); - layout->addWidget( mView ); + tqlayout->addWidget( mView ); setButtonText( Apply, i18n( "Import All..." ) ); @@ -544,22 +544,22 @@ VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *parent, { TQFrame *page = plainPage(); - TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() ); TQLabel *label = new TQLabel( i18n( "Select the fields which shall be exported in the vCard." ), page ); - layout->addWidget( label ); + tqlayout->addWidget( label ); mPrivateBox = new TQCheckBox( i18n( "Private fields" ), page ); - layout->addWidget( mPrivateBox ); + tqlayout->addWidget( mPrivateBox ); mBusinessBox = new TQCheckBox( i18n( "Business fields" ), page ); - layout->addWidget( mBusinessBox ); + tqlayout->addWidget( mBusinessBox ); mOtherBox = new TQCheckBox( i18n( "Other fields" ), page ); - layout->addWidget( mOtherBox ); + tqlayout->addWidget( mOtherBox ); mEncryptionKeys = new TQCheckBox( i18n( "Encryption keys" ), page ); - layout->addWidget( mEncryptionKeys ); + tqlayout->addWidget( mEncryptionKeys ); KConfig config( "kaddressbookrc" ); config.setGroup( "XXPortVCard" ); diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp index 1cbf75a56..9b84961dd 100644 --- a/kaddressbook/xxportselectdialog.cpp +++ b/kaddressbook/xxportselectdialog.cpp @@ -94,7 +94,7 @@ KABC::AddresseeList XXPortSelectDialog::contacts() if ( mUseSelection->isChecked() ) { TQStringList::ConstIterator it; for ( it = selection.begin(); it != selection.end(); ++it ) { - KABC::Addressee addr = mCore->addressBook()->findByUid( *it ); + KABC::Addressee addr = mCore->addressBook()->tqfindByUid( *it ); if ( !addr.isEmpty() ) list.append( addr ); } @@ -119,7 +119,7 @@ KABC::AddresseeList XXPortSelectDialog::contacts() const TQStringList tmp( (*it).categories() ); TQStringList::ConstIterator tmpIt; for ( tmpIt = tmp.begin(); tmpIt != tmp.end(); ++tmpIt ) - if ( categorieList.contains( *tmpIt ) ) { + if ( categorieList.tqcontains( *tmpIt ) ) { list.append( *it ); break; } @@ -187,11 +187,11 @@ void XXPortSelectDialog::initGUI() mButtonGroup = new TQButtonGroup( i18n( "Selection" ), page ); mButtonGroup->setColumnLayout( 0, Qt::Vertical ); - mButtonGroup->layout()->setSpacing( KDialog::spacingHint() ); - mButtonGroup->layout()->setMargin( KDialog::marginHint() ); + mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); + mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() ); - TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->layout() ); - groupLayout->setAlignment( Qt::AlignTop ); + TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() ); + groupLayout->tqsetAlignment( Qt::AlignTop ); mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup ); mUseWholeBook->setChecked( true ); @@ -226,9 +226,9 @@ void XXPortSelectDialog::initGUI() TQButtonGroup *sortingGroup = new TQButtonGroup( i18n( "Sorting" ), page ); sortingGroup->setColumnLayout( 0, Qt::Vertical ); - TQGridLayout *sortLayout = new TQGridLayout( sortingGroup->layout(), 2, 2, + TQGridLayout *sortLayout = new TQGridLayout( sortingGroup->tqlayout(), 2, 2, KDialog::spacingHint() ); - sortLayout->setAlignment( Qt::AlignTop ); + sortLayout->tqsetAlignment( Qt::AlignTop ); label = new TQLabel( i18n( "Criterion:" ), sortingGroup ); sortLayout->addWidget( label, 0, 0 ); |