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.
---
 kdmlib/kdmtsak.cpp        | 2 +-
 kdmlib/kgreet_classic.cpp | 2 +-
 kdmlib/kgreet_pam.cpp     | 2 +-
 kdmlib/kgreet_pam.h       | 2 +-
 kdmlib/kgreet_winbind.cpp | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kdmlib')

diff --git a/kdmlib/kdmtsak.cpp b/kdmlib/kdmtsak.cpp
index 22f8a0b9a..cb3c5b3b2 100644
--- a/kdmlib/kdmtsak.cpp
+++ b/kdmlib/kdmtsak.cpp
@@ -76,7 +76,7 @@ bool is_vt_active() {
 		if (intFound == false) {
 			return true;
 		}
-		curConsole = TQString("vt%1").arg(curConsoleNum);;
+		curConsole = TQString("vt%1").tqarg(curConsoleNum);;
 		TQStringList sessionList = TQStringList::split('\t', output, false);
 		for ( TQStringList::Iterator it = sessionList.begin(); it != sessionList.end(); ++it ) {
 			TQStringList sessionInfoList = TQStringList::split(',', *it, true);
diff --git a/kdmlib/kgreet_classic.cpp b/kdmlib/kgreet_classic.cpp
index a803faffa..af6d80172 100644
--- a/kdmlib/kgreet_classic.cpp
+++ b/kdmlib/kgreet_classic.cpp
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kuser.h>
 
 #include <tqregexp.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 
 class KDMPasswordEdit : public KPasswordEdit {
diff --git a/kdmlib/kgreet_pam.cpp b/kdmlib/kgreet_pam.cpp
index cce3c6585..41c7b2439 100644
--- a/kdmlib/kgreet_pam.cpp
+++ b/kdmlib/kgreet_pam.cpp
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kuser.h>
 
 #include <tqregexp.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqtimer.h>
 
diff --git a/kdmlib/kgreet_pam.h b/kdmlib/kgreet_pam.h
index 42b1ad034..2c1e3f252 100644
--- a/kdmlib/kgreet_pam.h
+++ b/kdmlib/kgreet_pam.h
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "kgreeterplugin.h"
 
 #include <tqobject.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 class KLineEdit;
 class KPasswordEdit;
diff --git a/kdmlib/kgreet_winbind.cpp b/kdmlib/kgreet_winbind.cpp
index c48eca2af..3ab5bbaa8 100644
--- a/kdmlib/kgreet_winbind.cpp
+++ b/kdmlib/kgreet_winbind.cpp
@@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kprocio.h>
 
 #include <tqregexp.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 
 #include <stdlib.h>
-- 
cgit v1.2.1