diff options
Diffstat (limited to 'kmail/configuredialog_p.cpp')
| -rw-r--r-- | kmail/configuredialog_p.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp index 6357e1e86..7609be3c8 100644 --- a/kmail/configuredialog_p.cpp +++ b/kmail/configuredialog_p.cpp @@ -31,7 +31,7 @@ #include <tqradiobutton.h> #include <tqbuttongroup.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> // Other headers: #include <assert.h> @@ -43,7 +43,7 @@ NewIdentityDialog::NewIdentityDialog( const TQStringList & identities, : KDialogBase( parent, name, modal, i18n("New Identity"), Ok|Cancel|Help, Ok, true ) { - setHelp( TQString::tqfromLatin1("configure-identity-newidentitydialog") ); + setHelp( TQString::fromLatin1("configure-identity-newidentitydialog") ); TQWidget * page = makeMainWidget(); TQVBoxLayout * vlay = new TQVBoxLayout( page, 0, spacingHint() ); @@ -169,33 +169,33 @@ void ListView::setVisibleItem( int visibleItem, bool updateSize ) mVisibleItem = TQMAX( 1, visibleItem ); if( updateSize == true ) { - TQSize s = tqsizeHint(); - setMinimumSize( s.width() + verticalScrollBar()->tqsizeHint().width() + + TQSize s = sizeHint(); + setMinimumSize( s.width() + verticalScrollBar()->sizeHint().width() + lineWidth() * 2, s.height() ); } } -TQSize ListView::tqsizeHint() const +TQSize ListView::sizeHint() const { - TQSize s = TQListView::tqsizeHint(); + TQSize s = TQListView::sizeHint(); int h = fontMetrics().height() + 2*itemMargin(); if( h % 2 > 0 ) { h++; } - s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->tqsizeHint().height()); + s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->sizeHint().height()); return s; } -static TQString flagPng = TQString::tqfromLatin1("/flag.png"); +static TQString flagPng = TQString::fromLatin1("/flag.png"); NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs, TQWidget *parent, const char *name, bool modal ) : KDialogBase( parent, name, modal, i18n("New Language"), Ok|Cancel, Ok, true ) { - // tqlayout the page (a combobox with label): + // layout the page (a combobox with label): TQWidget *page = makeMainWidget(); TQHBoxLayout *hlay = new TQHBoxLayout( page, 0, spacingHint() ); mComboBox = new TQComboBox( false, page ); @@ -203,7 +203,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs, hlay->addWidget( mComboBox, 1 ); TQStringList pathList = KGlobal::dirs()->findAllResources( "locale", - TQString::tqfromLatin1("*/entry.desktop") ); + TQString::fromLatin1("*/entry.desktop") ); // extract a list of language tags that should not be included: TQStringList suppressedAcronyms; for ( LanguageItemList::Iterator lit = suppressedLangs.begin(); @@ -224,8 +224,8 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs, if ( suppressedAcronyms.find( acronym ) == suppressedAcronyms.end() ) { // not found: - TQString displayname = TQString::tqfromLatin1("%1 (%2)") - .tqarg( name ).tqarg( acronym ); + TQString displayname = TQString::fromLatin1("%1 (%2)") + .arg( name ).arg( acronym ); TQPixmap flag( locate("locale", acronym + flagPng ) ); mComboBox->insertItem( flag, displayname ); } @@ -251,11 +251,11 @@ LanguageComboBox::LanguageComboBox( bool rw, TQWidget *parent, const char *name int LanguageComboBox::insertLanguage( const TQString & language ) { - static TQString entryDesktop = TQString::tqfromLatin1("/entry.desktop"); + static TQString entryDesktop = TQString::fromLatin1("/entry.desktop"); KSimpleConfig entry( locate("locale", language + entryDesktop) ); entry.setGroup( "KCM Locale" ); TQString name = entry.readEntry( "Name" ); - TQString output = TQString::tqfromLatin1("%1 (%2)").tqarg( name ).tqarg( language ); + TQString output = TQString::fromLatin1("%1 (%2)").arg( name ).arg( language ); insertItem( TQPixmap( locate("locale", language + flagPng ) ), output ); return listBox()->index( listBox()->findItem(output) ); } @@ -269,7 +269,7 @@ TQString LanguageComboBox::language() const void LanguageComboBox::setLanguage( const TQString & language ) { - TQString parenthizedLanguage = TQString::tqfromLatin1("(%1)").tqarg( language ); + TQString parenthizedLanguage = TQString::fromLatin1("(%1)").arg( language ); for (int i = 0; i < count(); i++) // ### FIXME: use .endWith(): if ( text(i).find( parenthizedLanguage ) >= 0 ) { @@ -323,7 +323,7 @@ void ProfileDialog::slotSelectionChanged() void ProfileDialog::setup() { mListView->clear(); // find all profiles (config files named "profile-xyz-rc"): - const TQString profileFilenameFilter = TQString::tqfromLatin1("kmail/profile-*-rc"); + const TQString profileFilenameFilter = TQString::fromLatin1("kmail/profile-*-rc"); mProfileList = KGlobal::dirs()->findAllResources( "data", profileFilenameFilter ); kdDebug(5006) << "Profile manager: found " << mProfileList.count() |