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

This reverts commit def182a745c9f7c9f91600c31d133389d0d59b82.
---
 knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp | 8 ++++----
 knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.h   | 2 +-
 knetworkmanager-0.8/vpn-plugins/pptp/src/pptpauth.ui              | 2 +-
 knetworkmanager-0.8/vpn-plugins/pptp/src/pptpprop.ui              | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'knetworkmanager-0.8/vpn-plugins/pptp')

diff --git a/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp b/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp
index 452fb23..091b400 100644
--- a/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp
+++ b/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp
@@ -67,9 +67,9 @@ VPNAuthenticationWidget* PPTPPlugin::CreateAuthenticationWidget(TQWidget* parent
 PPTPConfig::PPTPConfig(TQWidget* parent)
 	: VPNConfigWidget(parent)
 {
-	TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
 	_pptpWidget = new PPTPConfigWidget(this);
-	layout->addWidget(_pptpWidget);
+	tqlayout->addWidget(_pptpWidget);
 
 	connect(_pptpWidget->chkIPAdresses, TQT_SIGNAL(toggled(bool)), _pptpWidget->routes, TQT_SLOT(setEnabled(bool)));
 
@@ -201,9 +201,9 @@ bool PPTPConfig::isValid(TQStringList& err_msg)
 PPTPAuthentication::PPTPAuthentication(TQWidget* parent, char* name)
 	: VPNAuthenticationWidget(parent, name)
 {
-	TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
 	_pptpAuth = new PPTPAuthenticationWidget(this);
-	layout->addWidget(_pptpAuth);
+	tqlayout->addWidget(_pptpAuth);
 }
 
 PPTPAuthentication::~PPTPAuthentication()
diff --git a/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.h b/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.h
index 4bce41f..d703743 100644
--- a/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.h
+++ b/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.h
@@ -28,7 +28,7 @@
 #include <tqmap.h>
 #include <tqstring.h>
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include "knetworkmanager-vpnplugin.h"
 #include "pptpprop.h"
diff --git a/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpauth.ui b/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpauth.ui
index 4078684..5388561 100644
--- a/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpauth.ui
+++ b/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpauth.ui
@@ -32,7 +32,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpprop.ui b/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpprop.ui
index c966535..b57e065 100644
--- a/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpprop.ui
+++ b/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpprop.ui
@@ -60,7 +60,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>30</height>
@@ -99,7 +99,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
@@ -124,7 +124,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>220</width>
                                 <height>20</height>
@@ -141,7 +141,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>230</width>
                                 <height>20</height>
-- 
cgit v1.2.1