Rename a number of old tq methods that are no longer tq specific

5 files changed, 19 insertions, 19 deletions

diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp
index 5f93c39fd..c47300190 100644
--- a/khelpcenter/htmlsearch/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch/htmlsearch.cpp
@@ -28,7 +28,7 @@ TQString HTMLSearch::dataPath(const TQString& _lang)
 
 void HTMLSearch::scanDir(const TQString& dir)
 {
-    assert( dir.tqat( dir.length() - 1 ) == '/' );
+    assert( dir.at( dir.length() - 1 ) == '/' );
 
     TQStringList::ConstIterator it;
 
@@ -83,7 +83,7 @@ bool HTMLSearch::saveFilesList(const TQString& _lang)
     TQStringList add = config->readListEntry("Paths");
     TQStringList::Iterator it;
     for (it = add.begin(); it != add.end(); ++it) {
-        if ( ( *it ).tqat( ( *it ).length() - 1 ) != '/' )
+        if ( ( *it ).at( ( *it ).length() - 1 ) != '/' )
             ( *it ) += '/';
         dirs.append(*it);
     }
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index 64a301be7..3803329a2 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kurllabel.h>
@@ -50,15 +50,15 @@ KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name)
   TQLabel *l = new TQLabel(i18n("The fulltext search feature makes use of the "
                   "ht://dig HTML search engine. "
                   "You can get ht://dig at the"), gb);
-  l->tqsetAlignment(TQLabel::WordBreak);
-  l->setMinimumSize(l->tqsizeHint());
+  l->setAlignment(TQLabel::WordBreak);
+  l->setMinimumSize(l->sizeHint());
   grid->addMultiCellWidget(l, 1, 1, 0, 1);
   TQWhatsThis::add( gb, i18n( "Information about where to get the ht://dig package." ) );
 
   KURLLabel *url = new KURLLabel(gb);
   url->setURL("http://www.htdig.org");
   url->setText(i18n("ht://dig home page"));
-  url->tqsetAlignment(TQLabel::AlignHCenter);
+  url->setAlignment(TQLabel::AlignHCenter);
   grid->addMultiCellWidget(url, 2,2, 0, 1);
   connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)),
       this, TQT_SLOT(urlClicked(const TQString&)));
@@ -157,7 +157,7 @@ KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name)
 
   runButton = new TQPushButton(i18n("Generate Index..."), this);
   TQWhatsThis::add( runButton, i18n( "Click this button to generate the index for the fulltext search." ) );
-  runButton->setFixedSize(runButton->tqsizeHint());
+  runButton->setFixedSize(runButton->sizeHint());
   vbox->addWidget(runButton, AlignRight);
   connect(runButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateIndex()));
 
@@ -179,14 +179,14 @@ void KHTMLSearchConfig::loadLanguages()
 
   // add all languages to the list
   TQStringList langs = KGlobal::dirs()->findAllResources("locale",
-							TQString::tqfromLatin1("*/entry.desktop"));
+							TQString::fromLatin1("*/entry.desktop"));
   langs.sort();
 
   for (TQStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it)
     {
       KSimpleConfig entry(*it);
-      entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
-      TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), KGlobal::locale()->translate("without name"));
+      entry.setGroup(TQString::fromLatin1("KCM Locale"));
+      TQString name = entry.readEntry(TQString::fromLatin1("Name"), KGlobal::locale()->translate("without name"));
 
       TQString path = *it;
       int index = path.findRev('/');
diff --git a/khelpcenter/htmlsearch/klangcombo.cpp b/khelpcenter/htmlsearch/klangcombo.cpp
index 6f4b01c42..308109d12 100644
--- a/khelpcenter/htmlsearch/klangcombo.cpp
+++ b/khelpcenter/htmlsearch/klangcombo.cpp
@@ -39,14 +39,14 @@ KLanguageCombo::KLanguageCombo (TQWidget * parent, const char *name)
 
 void KLanguageCombo::insertLanguage(const TQString& path, const TQString& name, const TQString& sub, const TQString &submenu, int index)
 {
-  TQString output = name + TQString::tqfromLatin1(" (") + path + TQString::tqfromLatin1(")");
-  TQPixmap flag(locate("locale", sub + path + TQString::tqfromLatin1("/flag.png")));
+  TQString output = name + TQString::fromLatin1(" (") + path + TQString::fromLatin1(")");
+  TQPixmap flag(locate("locale", sub + path + TQString::fromLatin1("/flag.png")));
   insertItem(TQIconSet(flag), output, path, submenu, index);
 }
 
 void KLanguageCombo::changeLanguage(const TQString& name, int i)
 {
   if (i < 0 || i >= count()) return;
-  TQString output = name + TQString::tqfromLatin1(" (") + tag(i) + TQString::tqfromLatin1(")");
+  TQString output = name + TQString::fromLatin1(" (") + tag(i) + TQString::fromLatin1(")");
   changeItem(output, i);
 }
diff --git a/khelpcenter/htmlsearch/ktagcombobox.cpp b/khelpcenter/htmlsearch/ktagcombobox.cpp
index cf259fa46..b3c70915c 100644
--- a/khelpcenter/htmlsearch/ktagcombobox.cpp
+++ b/khelpcenter/htmlsearch/ktagcombobox.cpp
@@ -83,7 +83,7 @@ void KTagComboBox::internalActivate( int index )
   if (current == index) return;
   current = index;
   emit activated( index );
-  tqrepaint();
+  repaint();
 }
 
 void KTagComboBox::internalHighlight( int index )
@@ -192,7 +192,7 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev)
   TQRect clip(2, 2, width() - 4, height() - 4);
 #if 0
   if ( hasFocus() && style().guiStyle() != MotifStyle )
-    p.setPen( tqcolorGroup().highlightedText() );
+    p.setPen( colorGroup().highlightedText() );
 #endif
   p.drawText(clip, AlignCenter | SingleLine, popup->text( current ));
 
@@ -211,7 +211,7 @@ bool KTagComboBox::containsTag( const TQString &str ) const
 
 TQString KTagComboBox::currentTag() const
 {
-  return *tags->tqat(currentItem());
+  return *tags->at(currentItem());
 }
 
 TQString KTagComboBox::tag(int i) const
@@ -221,7 +221,7 @@ TQString KTagComboBox::tag(int i) const
     kdDebug() << "KTagComboBox::tag(), unknown tag " << i << endl;
     return TQString::null;
   }
-  return *tags->tqat(i);
+  return *tags->at(i);
 }
 
 int KTagComboBox::currentItem() const
@@ -233,7 +233,7 @@ void KTagComboBox::setCurrentItem(int i)
 {
   if (i < 0 || i >= count()) return;
   current = i;
-  tqrepaint();
+  repaint();
 }
 
 void KTagComboBox::setCurrentItem(const TQString &code)
diff --git a/khelpcenter/htmlsearch/progressdialog.cpp b/khelpcenter/htmlsearch/progressdialog.cpp
index e7eafedb1..57c839459 100644
--- a/khelpcenter/htmlsearch/progressdialog.cpp
+++ b/khelpcenter/htmlsearch/progressdialog.cpp
@@ -1,4 +1,4 @@
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>