From 2c01fd64ddde84a6d78b632f7f3b7c3560dc288c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:58:25 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab.
---
 kcontrol/fonts/fonts.cpp      | 6 +++---
 kcontrol/fonts/kxftconfig.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kcontrol/fonts')

diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index 1d2efde86..484f57410 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -14,7 +14,7 @@
 #include <tqgroupbox.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqsettings.h>
 #include <tqtooltip.h>
@@ -688,7 +688,7 @@ void KFonts::load()
 void KFonts::load( bool useDefaults )
 {
   for ( uint i = 0; i < fontUseList.count(); i++ )
-    fontUseList.at( i )->readFont( useDefaults );
+    fontUseList.tqat( i )->readFont( useDefaults );
 
   useAA_original = useAA = aaSettings->load( useDefaults ) ? AAEnabled : AADisabled;
   cbAA->setCurrentItem( useAA );
@@ -779,7 +779,7 @@ void KFonts::slotApplyFontDiff()
   if (ret == KDialog::Accepted && fontDiffFlags)
   {
     for ( int i = 0; i < (int) fontUseList.count(); i++ )
-      fontUseList.at( i )->applyFontDiff( font,fontDiffFlags );
+      fontUseList.tqat( i )->applyFontDiff( font,fontDiffFlags );
     emit changed(true);
   }
 }
diff --git a/kcontrol/fonts/kxftconfig.cpp b/kcontrol/fonts/kxftconfig.cpp
index 124d33d2f..6b7d166db 100644
--- a/kcontrol/fonts/kxftconfig.cpp
+++ b/kcontrol/fonts/kxftconfig.cpp
@@ -52,7 +52,7 @@ TQString KXftConfig::contractHome(TQString path)
             unsigned int len = home.length();
 
             if(path.length() == len || path[len] == '/')
-                return path.replace(0, len, TQString::fromLatin1("~"));
+                return path.replace(0, len, TQString::tqfromLatin1("~"));
         }
     }
 
-- 
cgit v1.2.1