From 6a1f2b1b6b19b0dd47b1e58afff29a12ae158226 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 18 Dec 2011 18:29:23 -0600
Subject: Rename old tq methods that no longer need a unique name (cherry
 picked from commit 628043be55ddd2f534411d028e4f68c8fe4eaabb)

---
 kdialog/kdialog.cpp        | 40 ++++++++++++++++++++--------------------
 kdialog/klistboxdialog.cpp |  2 +-
 kdialog/widgets.cpp        |  6 +++---
 3 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'kdialog')

diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp
index b37c768f7..52dbdc811 100644
--- a/kdialog/kdialog.cpp
+++ b/kdialog/kdialog.cpp
@@ -241,9 +241,9 @@ static int directCommand(KCmdLineArgs *args)
 
         TQString text = TQString::fromLocal8Bit(args->getOption( option ));
         int pos;
-        while ((pos = text.find( TQString::tqfromLatin1("\\n") )) >= 0)
+        while ((pos = text.find( TQString::fromLatin1("\\n") )) >= 0)
         {
-            text.replace(pos, 2, TQString::tqfromLatin1("\n"));
+            text.replace(pos, 2, TQString::fromLatin1("\n"));
         }
 
         if ( type == KMessageBox::WarningContinueCancel ) {
@@ -597,43 +597,43 @@ static int directCommand(KCmdLineArgs *args)
             contextStr = TQString::fromLocal8Bit(args->arg(0));
         }
         KIcon::Group group = KIcon::NoGroup;
-        if ( groupStr == TQString::tqfromLatin1( "Desktop" ) )
+        if ( groupStr == TQString::fromLatin1( "Desktop" ) )
             group = KIcon::Desktop;
-        else if ( groupStr == TQString::tqfromLatin1( "Toolbar" ) )
+        else if ( groupStr == TQString::fromLatin1( "Toolbar" ) )
             group = KIcon::Toolbar;
-        else if ( groupStr == TQString::tqfromLatin1( "MainToolbar" ) )
+        else if ( groupStr == TQString::fromLatin1( "MainToolbar" ) )
             group = KIcon::MainToolbar;
-        else if ( groupStr == TQString::tqfromLatin1( "Small" ) )
+        else if ( groupStr == TQString::fromLatin1( "Small" ) )
             group = KIcon::Small;
-        else if ( groupStr == TQString::tqfromLatin1( "Panel" ) )
+        else if ( groupStr == TQString::fromLatin1( "Panel" ) )
             group = KIcon::Panel;
-        else if ( groupStr == TQString::tqfromLatin1( "User" ) )
+        else if ( groupStr == TQString::fromLatin1( "User" ) )
             group = KIcon::User;
         KIcon::Context context = KIcon::Any;
         // From kicontheme.cpp
-        if ( contextStr == TQString::tqfromLatin1( "Devices" ) )
+        if ( contextStr == TQString::fromLatin1( "Devices" ) )
             context = KIcon::Device;
-        else if ( contextStr == TQString::tqfromLatin1( "MimeTypes" ) )
+        else if ( contextStr == TQString::fromLatin1( "MimeTypes" ) )
             context = KIcon::MimeType;
-        else if ( contextStr == TQString::tqfromLatin1( "FileSystems" ) )
+        else if ( contextStr == TQString::fromLatin1( "FileSystems" ) )
             context = KIcon::FileSystem;
-        else if ( contextStr == TQString::tqfromLatin1( "Applications" ) )
+        else if ( contextStr == TQString::fromLatin1( "Applications" ) )
             context = KIcon::Application;
-        else if ( contextStr == TQString::tqfromLatin1( "Actions" ) )
+        else if ( contextStr == TQString::fromLatin1( "Actions" ) )
             context = KIcon::Action;
-        else if ( contextStr == TQString::tqfromLatin1( "Animations" ) )
+        else if ( contextStr == TQString::fromLatin1( "Animations" ) )
             context = KIcon::Animation;
-        else if ( contextStr == TQString::tqfromLatin1( "Categories" ) )
+        else if ( contextStr == TQString::fromLatin1( "Categories" ) )
             context = KIcon::Category;
-        else if ( contextStr == TQString::tqfromLatin1( "Emblems" ) )
+        else if ( contextStr == TQString::fromLatin1( "Emblems" ) )
             context = KIcon::Emblem;
-        else if ( contextStr == TQString::tqfromLatin1( "Emotes" ) )
+        else if ( contextStr == TQString::fromLatin1( "Emotes" ) )
             context = KIcon::Emote;
-        else if ( contextStr == TQString::tqfromLatin1( "International" ) )
+        else if ( contextStr == TQString::fromLatin1( "International" ) )
             context = KIcon::International;
-        else if ( contextStr == TQString::tqfromLatin1( "Places" ) )
+        else if ( contextStr == TQString::fromLatin1( "Places" ) )
             context = KIcon::Place;
-        else if ( contextStr == TQString::tqfromLatin1( "Status" ) )
+        else if ( contextStr == TQString::fromLatin1( "Status" ) )
             context = KIcon::StatusIcon;
 
 	KIconDialog dlg(0, "icon dialog");
diff --git a/kdialog/klistboxdialog.cpp b/kdialog/klistboxdialog.cpp
index 23fe18f53..d7abfb694 100644
--- a/kdialog/klistboxdialog.cpp
+++ b/kdialog/klistboxdialog.cpp
@@ -32,7 +32,7 @@ KListBoxDialog::KListBoxDialog(TQString text, TQWidget *parent)
   TQVBox *page = makeVBoxMainWidget();
 
   label = new TQLabel(text, page);
-  label->tqsetAlignment(AlignCenter);
+  label->setAlignment(AlignCenter);
 
   table = new TQListBox(page);
   table->setFocus();
diff --git a/kdialog/widgets.cpp b/kdialog/widgets.cpp
index 322cf0a0d..d663d1bc3 100644
--- a/kdialog/widgets.cpp
+++ b/kdialog/widgets.cpp
@@ -218,7 +218,7 @@ bool Widgets::checkList(TQWidget *parent, const TQString& title, const TQString&
   table.setCurrentItem(0); // This is to circumvent a Qt bug
 
   for (unsigned int i=0; i+2<args.count(); i += 3) {
-    table.setSelected( i/3, args[i+2] == TQString::tqfromLatin1("on") );
+    table.setSelected( i/3, args[i+2] == TQString::fromLatin1("on") );
   }
 
   handleXGeometry(&box);
@@ -233,7 +233,7 @@ bool Widgets::checkList(TQWidget *parent, const TQString& title, const TQString&
     } else {
       for (unsigned int i=0; i<table.count(); i++)
         if (table.isSelected(i))
-          rs += TQString::tqfromLatin1("\"") + tags[i] + TQString::tqfromLatin1("\" ");
+          rs += TQString::fromLatin1("\"") + tags[i] + TQString::fromLatin1("\" ");
       result.append(rs);
     }
   }
@@ -260,7 +260,7 @@ bool Widgets::radioBox(TQWidget *parent, const TQString& title, const TQString&
   table.insertStringList(entries);
 
   for (unsigned int i=0; i+2<args.count(); i += 3) {
-    table.setSelected( i/3, args[i+2] == TQString::tqfromLatin1("on") );
+    table.setSelected( i/3, args[i+2] == TQString::fromLatin1("on") );
   }
 
   handleXGeometry(&box);
-- 
cgit v1.2.3