summaryrefslogtreecommitdiffstats
path: root/kmail/configuredialog_p.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:50 -0600
commit9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (patch)
treeab537a329b9613e11dce8195761f93ffe82aed24 /kmail/configuredialog_p.cpp
parent3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (diff)
downloadtdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.tar.gz
tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
Diffstat (limited to 'kmail/configuredialog_p.cpp')
-rw-r--r--kmail/configuredialog_p.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp
index 7609be3c8..6357e1e86 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 <layout.h>
+#include <tqlayout.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::fromLatin1("configure-identity-newidentitydialog") );
+ setHelp( TQString::tqfromLatin1("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 = sizeHint();
- setMinimumSize( s.width() + verticalScrollBar()->sizeHint().width() +
+ TQSize s = tqsizeHint();
+ setMinimumSize( s.width() + verticalScrollBar()->tqsizeHint().width() +
lineWidth() * 2, s.height() );
}
}
-TQSize ListView::sizeHint() const
+TQSize ListView::tqsizeHint() const
{
- TQSize s = TQListView::sizeHint();
+ TQSize s = TQListView::tqsizeHint();
int h = fontMetrics().height() + 2*itemMargin();
if( h % 2 > 0 ) { h++; }
- s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->sizeHint().height());
+ s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->tqsizeHint().height());
return s;
}
-static TQString flagPng = TQString::fromLatin1("/flag.png");
+static TQString flagPng = TQString::tqfromLatin1("/flag.png");
NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
TQWidget *parent, const char *name,
bool modal )
: KDialogBase( parent, name, modal, i18n("New Language"), Ok|Cancel, Ok, true )
{
- // layout the page (a combobox with label):
+ // tqlayout 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::fromLatin1("*/entry.desktop") );
+ TQString::tqfromLatin1("*/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::fromLatin1("%1 (%2)")
- .arg( name ).arg( acronym );
+ TQString displayname = TQString::tqfromLatin1("%1 (%2)")
+ .tqarg( name ).tqarg( 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::fromLatin1("/entry.desktop");
+ static TQString entryDesktop = TQString::tqfromLatin1("/entry.desktop");
KSimpleConfig entry( locate("locale", language + entryDesktop) );
entry.setGroup( "KCM Locale" );
TQString name = entry.readEntry( "Name" );
- TQString output = TQString::fromLatin1("%1 (%2)").arg( name ).arg( language );
+ TQString output = TQString::tqfromLatin1("%1 (%2)").tqarg( name ).tqarg( 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::fromLatin1("(%1)").arg( language );
+ TQString parenthizedLanguage = TQString::tqfromLatin1("(%1)").tqarg( 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::fromLatin1("kmail/profile-*-rc");
+ const TQString profileFilenameFilter = TQString::tqfromLatin1("kmail/profile-*-rc");
mProfileList = KGlobal::dirs()->findAllResources( "data", profileFilenameFilter );
kdDebug(5006) << "Profile manager: found " << mProfileList.count()