From 0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 18 Dec 2011 18:34:45 -0600
Subject: Rename old tq methods that no longer need a unique name

---
 kmail/configuredialog_p.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'kmail/configuredialog_p.cpp')

diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp
index 6357e1e8..ccc0230b 100644
--- a/kmail/configuredialog_p.cpp
+++ b/kmail/configuredialog_p.cpp
@@ -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,26 +169,26 @@ 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,
@@ -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,7 +224,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
 
     if ( suppressedAcronyms.find( acronym ) == suppressedAcronyms.end() ) {
       // not found:
-      TQString displayname = TQString::tqfromLatin1("%1 (%2)")
+      TQString displayname = TQString::fromLatin1("%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::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)").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::tqfromLatin1("(%1)").tqarg( language );
+  TQString parenthizedLanguage = TQString::fromLatin1("(%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::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()
-- 
cgit v1.2.3