diff options
Diffstat (limited to 'kaddressbook')
37 files changed, 105 insertions, 105 deletions
diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index a23c4436b..5e311c32e 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/kaddressbook/addresseditwidget.cpp @@ -93,7 +93,7 @@ AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name ) mAddressField = new KActiveLabel( this ); mAddressField->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); mAddressField->setMinimumHeight( 20 ); - mAddressField->tqsetAlignment( TQt::AlignTop ); + mAddressField->setAlignment( TQt::AlignTop ); mAddressField->setTextFormat( TQt::PlainText ); tqlayout->addWidget( mAddressField ); @@ -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:" ).tqarg( KABC::Address::streetLabel() ), page ); - label->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft ); + label->setAlignment( TQt::AlignTop | TQt::AlignLeft ); topLayout->addWidget( label, 1, 0 ); mStreetTextEdit = new TQTextEdit( page ); mStreetTextEdit->setTextFormat( TQt::PlainText ); diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index 6892f909b..6018b4abd 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -430,11 +430,11 @@ void AddresseeEditorWidget::setupTab2() ////////////////////////////////////// // Notes label = new TQLabel( i18n( "Note:" ), tab2 ); - label->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft ); + label->setAlignment( TQt::AlignTop | TQt::AlignLeft ); tqlayout->addWidget( label, 7, 0 ); mNoteEdit = new TQTextEdit( tab2 ); mNoteEdit->setWordWrap( TQTextEdit::WidgetWidth ); - mNoteEdit->setMinimumSize( mNoteEdit->tqsizeHint() ); + mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() ); connect( mNoteEdit, TQT_SIGNAL( textChanged() ), TQT_SLOT( emitModified() ) ); label->setBuddy( mNoteEdit ); tqlayout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 ); diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp index d63a33fab..b9f89249a 100644 --- a/kaddressbook/addviewdialog.cpp +++ b/kaddressbook/addviewdialog.cpp @@ -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->tqsetAlignment( TQt::WordBreak ); + label->setAlignment( TQt::WordBreak ); groupLayout->addWidget( button, row, 0, TQt::AlignTop ); groupLayout->addWidget( label, row, 1, TQt::AlignTop ); diff --git a/kaddressbook/common/kabprefs.h b/kaddressbook/common/kabprefs.h index bab2cb70b..a14586711 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::tqfromLatin1( "LocationMapURL" ) ) ) + if ( !isImmutable( TQString::fromLatin1( "LocationMapURL" ) ) ) mLocationMapURL = locationMapURL; } @@ -53,7 +53,7 @@ class KDE_EXPORT KABPrefs : public KABPrefsBase void setLocationMapURLs( const TQStringList &locationMapURLs ) { - if ( !isImmutable( TQString::tqfromLatin1( "LocationMapURLs" ) ) ) + if ( !isImmutable( TQString::fromLatin1( "LocationMapURLs" ) ) ) mLocationMapURLs = locationMapURLs; } diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp index 1466e9900..752fd6cc8 100644 --- a/kaddressbook/customfieldswidget.cpp +++ b/kaddressbook/customfieldswidget.cpp @@ -128,7 +128,7 @@ FieldWidget::FieldWidget( TQWidget *parent, const char *name ) KDialog::spacingHint() ); mGlobalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); - mGlobalLayout->tqsetAlignment( TQt::AlignTop ); + mGlobalLayout->setAlignment( TQt::AlignTop ); mSeparator = new TQFrame( this ); mSeparator->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); @@ -136,7 +136,7 @@ FieldWidget::FieldWidget( TQWidget *parent, const char *name ) tqlayout->addWidget( mSeparator ); mLocalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); - mLocalLayout->tqsetAlignment( TQt::AlignTop ); + mLocalLayout->setAlignment( TQt::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( TQDATEEDIT_OBJECT_NAME_STRING ) ) { TQDateEdit *wdg = static_cast<TQDateEdit*>( (*fieldIt).mWidget ); - wdg->setDate( TQDate::tqcurrentDate() ); + wdg->setDate( TQDate::currentDate() ); } else if ( (*fieldIt).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) { TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*fieldIt).mWidget ); wdg->setTime( TQTime::currentTime() ); } else if ( (*fieldIt).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*fieldIt).mWidget ); - wdg->setDateTime( TQDateTime::tqcurrentDateTime() ); + wdg->setDateTime( TQDateTime::currentDateTime() ); } } } @@ -370,7 +370,7 @@ void FieldWidget::recalculateLayout() FieldRecordList::ConstIterator it; for ( it = mFieldList.begin(); it != mFieldList.end(); ++it ) - maxWidth = TQMAX( maxWidth, (*it).mLabel->tqminimumSizeHint().width() ); + maxWidth = TQMAX( maxWidth, (*it).mLabel->minimumSizeHint().width() ); for ( it = mFieldList.begin(); it != mFieldList.end(); ++it ) (*it).mLabel->setMinimumWidth( maxWidth ); diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp index b206e886d..7f1db106c 100644 --- a/kaddressbook/distributionlisteditor.cpp +++ b/kaddressbook/distributionlisteditor.cpp @@ -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->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); + d->memberListWidget->setSizePolicy( 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 = tqsizeHint(); + const TQSize hint = sizeHint(); resize( hint.width() * 3L/2, hint.height() ); } diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp index 030f58197..380047129 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->tqsetAlignment( TQt::SingleLine ); + distLabel->setAlignment( TQt::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->tqsetAlignment( TQt::SingleLine ); + emailLabel->setAlignment( TQt::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" ).tqarg( m_entry.addressee.resource() ? m_entry.addressee.resource()->resourceName() : TQString() ) ); - m_resourceLabel->tqsetAlignment( TQt::SingleLine ); + m_resourceLabel->setAlignment( TQt::SingleLine ); m_emailGroup = new TQVButtonGroup( this ); m_emailGroup->setFlat( true ); diff --git a/kaddressbook/editors/imeditorbase.ui b/kaddressbook/editors/imeditorbase.ui index 77d11794d..40270b504 100644 --- a/kaddressbook/editors/imeditorbase.ui +++ b/kaddressbook/editors/imeditorbase.ui @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -116,7 +116,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>28</height> diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp index 533b7d4b7..9f468bfd6 100644 --- a/kaddressbook/editors/imeditorwidget.cpp +++ b/kaddressbook/editors/imeditorwidget.cpp @@ -167,7 +167,7 @@ IMEditorWidget::IMEditorWidget( TQWidget *parent, const TQString &preferredIM, c //mWidget->btnDown->setEnabled( false ); mPreferred = preferredIM; mPreferred = mPreferred.replace( " on ", TQString( TQChar( 0xE120 ) ), true ); - mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::tqfromLatin1( "KABC/IMProtocol" ) ) ); + mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::fromLatin1( "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::tqfromLatin1( "messaging/" ) ) ) { - if ( name == TQString::tqfromLatin1( "All" ) ) { + if ( app.startsWith( TQString::fromLatin1( "messaging/" ) ) ) { + if ( name == TQString::fromLatin1( "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::tqfromLatin1( "All" ), lst.join( TQChar( 0xE000 ) ) ); + addr->insertCustom( addrBookField, TQString::fromLatin1( "All" ), lst.join( TQChar( 0xE000 ) ) ); else - addr->removeCustom( addrBookField, TQString::tqfromLatin1( "All" ) ); + addr->removeCustom( addrBookField, TQString::fromLatin1( "All" ) ); } } diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp index 4ecee68a1..3ed79f49d 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->tqsizeHint().height() + 30 ); + mEmailListBox->setMinimumHeight( mEmailListBox->sizeHint().height() + 30 ); connect( mEmailListBox, TQT_SIGNAL( highlighted( int ) ), TQT_SLOT( selectionChanged( int ) ) ); connect( mEmailListBox, TQT_SIGNAL( selected( int ) ), diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp index 5a828ad1a..17fc899d6 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( tqitemRect( item ) ); + event->accept( itemRect( item ) ); } } diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp index 725dde3dc..427e33bd9 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->tqsetAlignment( TQt::AlignTop ); + label->setAlignment( TQt::AlignTop ); topLayout->addMultiCellWidget( label, 0, 3, 0, 0 ); mGeoIsValid = new TQCheckBox( i18n( "Use geo data" ), this ); diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp index aaad464f1..8509018a5 100644 --- a/kaddressbook/incsearchwidget.cpp +++ b/kaddressbook/incsearchwidget.cpp @@ -43,7 +43,7 @@ IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name ) TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 2, KDialog::spacingHint() ); TQToolButton *button = new TQToolButton( this ); - button->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); + button->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); button->setPixmap( SmallIcon( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase" ) ); button->setAccel( TQKeySequence( CTRL+ALT+Key_S ) ); button->setAutoRaise( true ); @@ -51,17 +51,17 @@ IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name ) tqlayout->addWidget( button ); TQLabel *label = new TQLabel( i18n( "Search:" ), this, "kde toolbar widget" ); - label->tqsetAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); + label->setAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); tqlayout->addWidget( label ); mSearchText = new KLineEdit( this ); - mSearchText->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); + mSearchText->setSizePolicy( 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 ); tqlayout->addWidget( mSearchText ); label = new TQLabel( i18n( "as in 'Search in:'", "&in:" ), this, "kde toolbar widget" ); - label->tqsetAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); + label->setAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); tqlayout->addWidget( label ); mFieldCombo = new TQComboBox( false, this ); diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index 2b603fe23..11c9a9d1a 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -68,7 +68,7 @@ JumpButtonBar::JumpButtonBar( KAB::Core *core, TQWidget *parent, const char *nam setMinimumSize( 1, 1 ); TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, 0 ); - tqlayout->tqsetAlignment( TQt::AlignTop ); + tqlayout->setAlignment( TQt::AlignTop ); tqlayout->setAutoAdd( true ); tqlayout->setResizeMode( TQLayout::FreeResize ); @@ -179,7 +179,7 @@ void JumpButtonBar::updateButtons() int maxWidth = 0; TQPushButton *button; for ( button = mButtons.first(); button; button = mButtons.next() ) - maxWidth = TQMAX( maxWidth, button->tqsizeHint().width() ); + maxWidth = TQMAX( maxWidth, button->sizeHint().width() ); setFixedWidth( maxWidth ); } diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index fac69a0a3..9e4f19f24 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -433,7 +433,7 @@ void KABCore::setContactSelected( const TQString &uid ) TQClipboard *cb = TQApplication::tqclipboard(); #if defined(KABC_VCARD_ENCODING_FIX) const TQMimeSource *data = cb->data( TQClipboard::Clipboard ); - list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) ); + list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) ); #else list = AddresseeUtil::clipboardToAddressees( cb->text() ); #endif @@ -578,7 +578,7 @@ void KABCore::pasteContacts() TQClipboard *cb = TQApplication::tqclipboard(); #if defined(KABC_VCARD_ENCODING_FIX) const TQMimeSource *data = cb->data( TQClipboard::Clipboard ); - KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) ); + KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) ); #else KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( cb->text() ); #endif @@ -661,7 +661,7 @@ void KABCore::incrementalJumpButtonSearch( const TQString& character ) KABC::AddresseeList::ConstIterator it; const KABC::AddresseeList::ConstIterator endIt( list.end() ); for ( it = list.begin(); it != endIt; ++it ) { - if ( field->value( *it ).tqstartsWith( character, false ) ) { + if ( field->value( *it ).startsWith( character, false ) ) { mViewManager->setSelected( (*it).uid(), true ); return; } @@ -1224,7 +1224,7 @@ void KABCore::initGUI() viewLayout->setSpacing( KDialog::spacingHint() ); mViewHeaderLabel = new TQLabel( viewWidget ); -// mViewHeaderLabel->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); +// mViewHeaderLabel->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); mViewHeaderLabel->setText( i18n( "Contacts" ) ); viewLayout->addWidget( mViewHeaderLabel ); mViewManager = new ViewManager( this, viewWidget ); diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index a3775b369..ed233482b 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -61,7 +61,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage ); TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->tqlayout() ); - boxLayout->tqsetAlignment( TQt::AlignTop ); + boxLayout->setAlignment( TQt::AlignTop ); mViewsSingleClickBox = new TQCheckBox( i18n( "Honor KDE single click" ), groupBox, "msingle" ); boxLayout->addWidget( mViewsSingleClickBox ); @@ -128,10 +128,10 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Location Map" ), generalPage ); boxLayout = new TQVBoxLayout( groupBox->tqlayout(), KDialog::spacingHint() ); - boxLayout->tqsetAlignment( TQt::AlignTop ); + boxLayout->setAlignment( TQt::AlignTop ); mLocationMapURL = new TQComboBox( true, groupBox ); - mLocationMapURL->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + mLocationMapURL->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); TQToolTip::add( mLocationMapURL, i18n( "<ul> <li>%s: Street</li>" "<li>%r: Region</li>" "<li>%l: Location</li>" diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp index a091c0f0c..e1f47e3db 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp +++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp @@ -297,7 +297,7 @@ void LDAPOptionsWidget::initGUI() tqlayout->addWidget( buttons ); - resize( TQSize( 460, 300 ).expandedTo( tqsizeHint() ) ); + resize( TQSize( 460, 300 ).expandedTo( sizeHint() ) ); } #include "ldapoptionswidget.moc" diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index 8d5b90d97..9066c0ec3 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/kaddressbook/ldapsearchdialog.cpp @@ -176,10 +176,10 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, TQSize buttonSize; mSearchButton = new TQPushButton( i18n( "Stop" ), groupBox ); - buttonSize = mSearchButton->tqsizeHint(); + buttonSize = mSearchButton->sizeHint(); mSearchButton->setText( i18n( "&Search" ) ); - if ( buttonSize.width() < mSearchButton->tqsizeHint().width() ) - buttonSize = mSearchButton->tqsizeHint(); + if ( buttonSize.width() < mSearchButton->sizeHint().width() ) + buttonSize = mSearchButton->sizeHint(); 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( tqminimumSizeHint() ) ); + resize( TQSize( 600, 400).expandedTo( minimumSizeHint() ) ); 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::tqcurrentDateTime(); + const TQDateTime now = TQDateTime::currentDateTime(); TQStringList importedAddrs; KABC::Addressee::List localAddrs; diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp index 5c5733142..47d8d506a 100644 --- a/kaddressbook/phoneeditwidget.cpp +++ b/kaddressbook/phoneeditwidget.cpp @@ -176,11 +176,11 @@ PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name ) tqlayout->addMultiCellLayout( mWidgetLayout, 0, 0, 0, 1 ); mAddButton = new TQPushButton( i18n( "Add" ), this ); - mAddButton->setMaximumSize( mAddButton->tqsizeHint() ); + mAddButton->setMaximumSize( mAddButton->sizeHint() ); tqlayout->addWidget( mAddButton, 1, 0, TQt::AlignRight ); mRemoveButton = new TQPushButton( i18n( "Remove" ), this ); - mRemoveButton->setMaximumSize( mRemoveButton->tqsizeHint() ); + mRemoveButton->setMaximumSize( mRemoveButton->sizeHint() ); tqlayout->addWidget( mRemoveButton, 1, 1 ); mMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp index 91bf9f342..427dd9de1 100644 --- a/kaddressbook/printing/kabentrypainter.cpp +++ b/kaddressbook/printing/kabentrypainter.cpp @@ -399,27 +399,27 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, line1 = i18n( "Preferred Address" ); } - line1 += TQString::tqfromLatin1( ":" ); + line1 += TQString::fromLatin1( ":" ); text = TQString(); if ( !address.extended().isEmpty() ) text = address.extended().stripWhiteSpace(); if ( !text.isEmpty() ) { - line1 = line1 + TQString::tqfromLatin1( " (" ) + text + - TQString::tqfromLatin1( ")" ); + line1 = line1 + TQString::fromLatin1( " (" ) + text + + TQString::fromLatin1( ")" ); } line1 = line1.stripWhiteSpace(); line2 = address.street(); if ( !address.postOfficeBox().isEmpty() ) - line2 += TQString::tqfromLatin1( " - " ) + address.postOfficeBox(); + line2 += TQString::fromLatin1( " - " ) + address.postOfficeBox(); // print address in american style, this will need localisation: line3 = address.locality() + ( address.region().isEmpty() ? - TQString::tqfromLatin1( "" ) : TQString::tqfromLatin1( ", " ) + + TQString::fromLatin1( "" ) : TQString::fromLatin1( ", " ) + address.region() ) + ( address.postalCode().isEmpty() - ? TQString::tqfromLatin1( "" ) : TQString::tqfromLatin1( " " ) + ? TQString::fromLatin1( "" ) : TQString::fromLatin1( " " ) + address.postalCode() ); line4 = address.country(); diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp index 746677ec8..a3fea0f67 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)" ) - .tqarg( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) ); + .tqarg( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); p.setPen( TQt::black ); p.drawText( 0, fm.height(), text ); diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp index 3a9c00d19..64442056e 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( tqminimumSizeHint() ) ); + resize( TQSize( 370, 220 ).expandedTo( minimumSizeHint() ) ); } PrintProgress::~PrintProgress() diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp index e71c27891..4e52b57db 100644 --- a/kaddressbook/printing/selectionpage.cpp +++ b/kaddressbook/printing/selectionpage.cpp @@ -56,7 +56,7 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name ) mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() ); TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() ); - groupLayout->tqsetAlignment( TQt::AlignTop ); + groupLayout->setAlignment( TQt::AlignTop ); mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup ); mUseWholeBook->setChecked( true ); diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp index b1c29b464..e157f1820 100644 --- a/kaddressbook/printing/stylepage.cpp +++ b/kaddressbook/printing/stylepage.cpp @@ -124,7 +124,7 @@ void StylePage::initGUI() group->setColumnLayout( 0, Qt::Vertical ); TQGridLayout *sortLayout = new TQGridLayout( group->tqlayout(), 2, 2, KDialog::spacingHint() ); - sortLayout->tqsetAlignment( TQt::AlignTop ); + sortLayout->setAlignment( TQt::AlignTop ); label = new TQLabel( i18n( "Criterion:" ), group ); sortLayout->addWidget( label, 0, 0 ); @@ -153,7 +153,7 @@ void StylePage::initGUI() font.setPointSize( 20 ); mPreview->setFont( font ); mPreview->setScaledContents( true ); - mPreview->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) ); + mPreview->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) ); styleLayout->addWidget( mPreview ); topLayout->addWidget( group, 1, 1 ); diff --git a/kaddressbook/searchmanager.cpp b/kaddressbook/searchmanager.cpp index 3bad8eb73..16a694c80 100644 --- a/kaddressbook/searchmanager.cpp +++ b/kaddressbook/searchmanager.cpp @@ -109,11 +109,11 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi const KABC::Field::List::ConstIterator fieldEndIt( fieldList.end() ); for ( ; fieldIt != fieldEndIt; ++fieldIt ) { - if ( type == StartsWith && (*fieldIt)->value( *it ).tqstartsWith( pattern, false ) ) { + if ( type == StartsWith && (*fieldIt)->value( *it ).startsWith( pattern, false ) ) { mContacts.append( *it ); found = true; break; - } else if ( type == EndsWith && (*fieldIt)->value( *it ).tqendsWith( pattern, false ) ) { + } else if ( type == EndsWith && (*fieldIt)->value( *it ).endsWith( pattern, false ) ) { mContacts.append( *it ); found = true; break; @@ -138,10 +138,10 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi int pos = (*customIt).find( ':' ); if ( pos != -1 ) { const TQString value = (*customIt).mid( pos + 1 ); - if ( type == StartsWith && value.tqstartsWith( pattern, false ) ) { + if ( type == StartsWith && value.startsWith( pattern, false ) ) { mContacts.append( *it ); break; - } else if ( type == EndsWith && value.tqendsWith( pattern, false ) ) { + } else if ( type == EndsWith && value.endsWith( pattern, false ) ) { mContacts.append( *it ); break; } else if ( type == Contains && value.find( pattern, 0, false ) != -1 ) { diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp index e50e129ba..d661a14ea 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->tqsetAlignment( TQt::AlignTop ); + label->setAlignment( TQt::AlignTop ); topLayout->addMultiCellWidget( label, 0, 1, 0, 0 ); mPlayButton = new TQPushButton( i18n( "Play" ), this ); diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp index 9ab4b26e2..bbe0f3f19 100644 --- a/kaddressbook/viewconfigurefieldspage.cpp +++ b/kaddressbook/viewconfigurefieldspage.cpp @@ -262,16 +262,16 @@ void ViewConfigureFieldsPage::initGUI() vb2->addStretch(); gl->addLayout( vb2, 1, 3 ); - TQSize tqsizeHint = mUnSelectedBox->tqsizeHint(); + TQSize sizeHint = mUnSelectedBox->sizeHint(); // 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 ); - tqsizeHint = tqsizeHint.expandedTo( mSelectedBox->tqsizeHint() ); - tqsizeHint.setWidth( mUnSelectedBox->maxItemWidth() ); - mUnSelectedBox->setMinimumSize( tqsizeHint ); - mSelectedBox->setMinimumSize( tqsizeHint ); + sizeHint = sizeHint.expandedTo( mSelectedBox->sizeHint() ); + sizeHint.setWidth( mUnSelectedBox->maxItemWidth() ); + mUnSelectedBox->setMinimumSize( sizeHint ); + mSelectedBox->setMinimumSize( sizeHint ); gl->activate(); diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp index 83c358f3e..39bab7c81 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->tqsetAlignment( TQt::AlignLeft | TQt::AlignTop | TQt::WordBreak ); + label->setAlignment( TQt::AlignLeft | TQt::AlignTop | TQt::WordBreak ); topLayout->addWidget( label ); TQWidget *spacer = new TQWidget( this ); diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index df956398e..66ec75d16 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -681,7 +681,7 @@ CardViewItem *CardView::itemAt( const TQPoint &viewPos ) const return 0; } -TQRect CardView::tqitemRect( const CardViewItem *item ) const +TQRect CardView::itemRect( const CardViewItem *item ) const { return TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ); } @@ -1324,7 +1324,7 @@ void CardView::keyPressEvent( TQKeyEvent *e ) break; case Key_Menu: emit contextMenuRequested( d->mCurrentItem, viewport()->mapToGlobal( - tqitemRect(d->mCurrentItem).center() ) ); + itemRect(d->mCurrentItem).center() ) ); break; default: if ( (e->state() & ControlButton) && e->key() == Key_A ) { @@ -1462,7 +1462,7 @@ void CardView::tryShowFullText() CardViewItem *item = itemAt( cpos ); if ( item ) { // query it for a value to display - TQPoint ipos = cpos - tqitemRect( item ).topLeft(); + TQPoint ipos = cpos - itemRect( item ).topLeft(); item->showFullString( ipos, d->mTip ); } } diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h index e3c29e5a4..4b6bbe7e1 100644 --- a/kaddressbook/views/cardview.h +++ b/kaddressbook/views/cardview.h @@ -245,7 +245,7 @@ class CardView : public TQScrollView /** @return The bounding rect of the given item. */ - TQRect tqitemRect( const CardViewItem *item ) const; + TQRect itemRect( const CardViewItem *item ) const; /** Ensures that the given item is in the viewable area of the widget diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index 8cacbfec6..de28c5d17 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 = tqcolorGroup().foreground(); + c = colorGroup().foreground(); lbColors->insertItem( new ColorListItem( i18n("Text Color"), config->readColorEntry( "TextColor", &c ) ) ); - c = tqcolorGroup().button(); + c = colorGroup().button(); lbColors->insertItem( new ColorListItem( i18n("Header, Border & Separator Color"), config->readColorEntry( "HeaderColor", &c ) ) ); - c = tqcolorGroup().buttonText(); + c = colorGroup().buttonText(); lbColors->insertItem( new ColorListItem( i18n("Header Text Color"), config->readColorEntry( "HeaderTextColor", &c ) ) ); - c = tqcolorGroup().highlight(); + c = colorGroup().highlight(); lbColors->insertItem( new ColorListItem( i18n("Highlight Color"), config->readColorEntry( "HighlightColor", &c ) ) ); - c = tqcolorGroup().highlightedText(); + c = colorGroup().highlightedText(); lbColors->insertItem( new ColorListItem( i18n("Highlighted Text Color"), config->readColorEntry( "HighlightedTextColor", &c ) ) ); diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index 47a1e86e1..4090b134f 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -72,7 +72,7 @@ void DynamicTip::maybeTip( const TQPoint &pos ) return; TQString s; - TQRect r = plv->tqitemRect( lvi ); + TQRect r = plv->itemRect( lvi ); r.moveBy( posVp.x(), posVp.y() ); //kdDebug(5720) << "Tip rec: " << r.x() << "," << r.y() << "," << r.width() diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 88a2c087a..14a40c611 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -387,7 +387,7 @@ void CSVImportDialog::initGUI() mDelimiterBox->tqlayout()->setSpacing( spacingHint() ); mDelimiterBox->tqlayout()->setMargin( marginHint() ); TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->tqlayout() ); - delimiterLayout->tqsetAlignment( TQt::AlignTop ); + delimiterLayout->setAlignment( TQt::AlignTop ); tqlayout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 ); mRadioComma = new TQRadioButton( i18n( "Comma" ), mDelimiterBox ); diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp index abd3234b7..f4d1e9dbd 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::tqfromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>"); + TQString format = TQString::fromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>"); - return TQString::tqfromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>") + return TQString::fromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>") .tqarg(i18n("Mobile Phone information:")) .tqarg(format.tqarg(i18n("Manufacturer")).tqarg(GN_FROM(manufacturer))) .tqarg(format.tqarg(i18n("Phone model")).tqarg(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::tqcurrentDateTime(); + datetime = TQDateTime::currentDateTime(); else datetime = TQDateTime( TQDate(ts.year, ts.month, ts.day), TQTime(ts.hour, ts.minute, ts.second) ); @@ -481,7 +481,7 @@ 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::tqfromLatin1(",")); + 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 ) ); @@ -891,7 +891,7 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat memset(memstat, 0, sizeof(*memstat)); memstat->memory_type = memtype; data.memory_status = memstat; - error = gn_sm_functions(GN_OP_GetMemorytqStatus, &data, &state); + error = gn_sm_functions(GN_OP_GetMemoryStatus, &data, &state); GNOKII_CHECK_ERROR(error); if (error != GN_ERR_NONE) { switch (memtype) { @@ -943,9 +943,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::tqfromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>"); + TQString format = TQString::fromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>"); - return TQString::tqfromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>") + return TQString::fromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>") .tqarg(i18n("Mobile Phone information:")) .tqarg(format.tqarg(i18n("Manufacturer")).tqarg(GN_FROM(manufacturer))) .tqarg(format.tqarg(i18n("Phone model")).tqarg(GN_FROM(model))) @@ -1044,7 +1044,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::tqcurrentDateTime(); + datetime = TQDateTime::currentDateTime(); else datetime = TQDateTime( TQDate(entry.date.year, entry.date.month, entry.date.day), TQTime(entry.date.hour, entry.date.minute, entry.date.second) ); @@ -1263,7 +1263,7 @@ 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::tqfromLatin1(",")); + 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 ) ); diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp index 4c2949cc9..a115d8dfd 100644 --- a/kaddressbook/xxport/opera_xxport.cpp +++ b/kaddressbook/xxport/opera_xxport.cpp @@ -48,7 +48,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const { KABC::AddresseeList addrList; - TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath() + TQString::tqfromLatin1( "/.opera/contacts.adr" ) ); + TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath() + TQString::fromLatin1( "/.opera/contacts.adr" ) ); if ( fileName.isEmpty() ) 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::tqfromLatin1( "#CONTACT" ) ) { + if ( line == TQString::fromLatin1( "#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::tqfromLatin1( "name" ) ) + if ( key == TQString::fromLatin1( "name" ) ) addr.setNameFromString( value ); - else if ( key == TQString::tqfromLatin1( "mail" ) ) { + else if ( key == TQString::fromLatin1( "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::tqfromLatin1( "phone" ) ) + } else if ( key == TQString::fromLatin1( "phone" ) ) addr.insertPhoneNumber( KABC::PhoneNumber( value ) ); - else if ( key == TQString::tqfromLatin1( "fax" ) ) + else if ( key == TQString::fromLatin1( "fax" ) ) addr.insertPhoneNumber( KABC::PhoneNumber( value, KABC::PhoneNumber::Fax | KABC::PhoneNumber::Home ) ); - else if ( key == TQString::tqfromLatin1( "postaladdress" ) ) { + else if ( key == TQString::fromLatin1( "postaladdress" ) ) { KABC::Address address( KABC::Address::Home ); address.setLabel( value.replace( separator, "\n" ) ); addr.insertAddress( address ); - } else if ( key == TQString::tqfromLatin1( "description" ) ) + } else if ( key == TQString::fromLatin1( "description" ) ) addr.setNote( value.replace( separator, "\n" ) ); - else if ( key == TQString::tqfromLatin1( "url" ) ) + else if ( key == TQString::fromLatin1( "url" ) ) addr.setUrl( KURL( value ) ); - else if ( key == TQString::tqfromLatin1( "pictureurl" ) ) { + else if ( key == TQString::fromLatin1( "pictureurl" ) ) { KABC::Picture pic( value ); addr.setPhoto( pic ); } diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index 2d4da849b..849bd5917 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -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 tqfromLatin1() + // With version 3.0, vCards are encoded with UTF-8 by default. Otherwise, use fromLatin1() // and hope that are fields are encoded correctly. - if ( TQString::tqfromLatin1( rawData ).lower().contains( "version:3.0" ) ) { + if ( TQString::fromLatin1( rawData ).lower().contains( "version:3.0" ) ) { vCardText = TQString::fromUtf8( rawData ); } else { - vCardText = TQString::tqfromLatin1( rawData ); + vCardText = TQString::fromLatin1( rawData ); } addrList += parseVCard( vCardText ); } diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp index b932f9d97..fce57e74f 100644 --- a/kaddressbook/xxportselectdialog.cpp +++ b/kaddressbook/xxportselectdialog.cpp @@ -191,7 +191,7 @@ void XXPortSelectDialog::initGUI() mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() ); TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() ); - groupLayout->tqsetAlignment( TQt::AlignTop ); + groupLayout->setAlignment( TQt::AlignTop ); mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup ); mUseWholeBook->setChecked( true ); @@ -228,7 +228,7 @@ void XXPortSelectDialog::initGUI() sortingGroup->setColumnLayout( 0, Qt::Vertical ); TQGridLayout *sortLayout = new TQGridLayout( sortingGroup->tqlayout(), 2, 2, KDialog::spacingHint() ); - sortLayout->tqsetAlignment( TQt::AlignTop ); + sortLayout->setAlignment( TQt::AlignTop ); label = new TQLabel( i18n( "Criterion:" ), sortingGroup ); sortLayout->addWidget( label, 0, 0 ); |