From e8a1cdc01d38125bea12d5494db977ae6429919a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 1 Mar 2012 13:29:58 -0600
Subject: Rename additional global TQt functions

---
 kcontrol/energy/energy.cpp       | 2 +-
 kcontrol/keys/keyconfig.cpp      | 4 ++--
 kcontrol/keys/shortcuts.cpp      | 2 +-
 kcontrol/kio/kmanualproxydlg.cpp | 2 +-
 kcontrol/krdb/krdb.cpp           | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kcontrol')

diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp
index 1d0241914..d9fa4cb08 100644
--- a/kcontrol/energy/energy.cpp
+++ b/kcontrol/energy/energy.cpp
@@ -344,7 +344,7 @@ void KEnergy::applySettings(bool enable, int standby, int suspend, int off)
         } else
             DPMSDisable(dpy);
     } else
-        qWarning("Server has no DPMS extension");
+        tqWarning("Server has no DPMS extension");
 
     XFlush(dpy);
     XSetErrorHandler(defaultHandler);
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index 3de43f6a9..4e35f46a5 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -365,7 +365,7 @@ void KKeyModule::readScheme( int index )
   TQDir d( kksPath );
   if ( !d.exists() )
     if ( !d.mkdir( kksPath ) ) {
-      qWarning("KKeyModule: Could not make directory to store user info.");
+      tqWarning("KKeyModule: Could not make directory to store user info.");
       return;
     }
 
@@ -375,7 +375,7 @@ void KKeyModule::readScheme( int index )
   d.setPath( kksPath );
   if ( !d.exists() )
     if ( !d.mkdir( kksPath ) ) {
-      qWarning("KKeyModule: Could not make directory to store user info.");
+      tqWarning("KKeyModule: Could not make directory to store user info.");
       return;
     }
 
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index 6bb9a08c2..ff71990c6 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -410,7 +410,7 @@ void ShortcutsModule::slotSaveSchemeAs()
 
 	TQDir dir( kksPath );
 	if( !dir.exists() && !dir.mkdir( kksPath ) ) {
-		qWarning("KShortcutsModule: Could not make directory to store user info.");
+		tqWarning("KShortcutsModule: Could not make directory to store user info.");
 		return;
 	}
 
diff --git a/kcontrol/kio/kmanualproxydlg.cpp b/kcontrol/kio/kmanualproxydlg.cpp
index 92e8a98e6..f240791c2 100644
--- a/kcontrol/kio/kmanualproxydlg.cpp
+++ b/kcontrol/kio/kmanualproxydlg.cpp
@@ -324,7 +324,7 @@ void KManualProxyDlg::copyDown()
 
 void KManualProxyDlg::slotOk()
 {
-    //qDebug("m_bHasValidData: %s" , m_bHasValidData ? "true" : "false");
+    //tqDebug("m_bHasValidData: %s" , m_bHasValidData ? "true" : "false");
     if ( m_bHasValidData || validate() )
     {
       KDialogBase::slotOk();
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index dbbc2b9d0..b31b1ae6b 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -173,7 +173,7 @@ static void applyQtSettings( KConfig& kglobals, TQSettings& settings )
     // users. So we need to know whether a path being added is from KApp, and in this case
     // end it with.. So keep a TQMap to bool, specifying whether the path is KDE-specified..
 
-  TQString qversion = qVersion();
+  TQString qversion = tqVersion();
   if ( qversion.contains( '.' ) > 1 )
      qversion.truncate( qversion.findRev( '.' ) );
   if ( qversion.contains( '-' ) )
-- 
cgit v1.2.1