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

This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a.
---
 kview/kviewcanvas/config/confmodules.cpp        |  6 +++---
 kview/kviewcanvas/config/generalconfigwidget.ui | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'kview/kviewcanvas/config')

diff --git a/kview/kviewcanvas/config/confmodules.cpp b/kview/kviewcanvas/config/confmodules.cpp
index 0aeb3b1b..f9cf90cc 100644
--- a/kview/kviewcanvas/config/confmodules.cpp
+++ b/kview/kviewcanvas/config/confmodules.cpp
@@ -20,7 +20,7 @@
 #include "generalconfigwidget.h"
 #include "defaults.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqframe.h>
 
@@ -38,8 +38,8 @@ KViewCanvasConfig::KViewCanvasConfig( TQWidget * parent, const char *, const TQS
 	: KCModule( KViewCanvasConfigFactory::instance(), parent, args )
 	, m_config( new KConfig( "kviewcanvasrc" ) )
 {
-	TQBoxLayout * layout = new TQVBoxLayout( this );
-	layout->setAutoAdd( true );
+	TQBoxLayout * tqlayout = new TQVBoxLayout( this );
+	tqlayout->setAutoAdd( true );
 
 	m_pWidget = new GeneralConfigWidget( this );
 	m_pWidget->m_pMinWidth ->setRange( 1, 200 );
diff --git a/kview/kviewcanvas/config/generalconfigwidget.ui b/kview/kviewcanvas/config/generalconfigwidget.ui
index 108ed82e..746fa02c 100644
--- a/kview/kviewcanvas/config/generalconfigwidget.ui
+++ b/kview/kviewcanvas/config/generalconfigwidget.ui
@@ -110,7 +110,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
                     <property name="sizeType">
                         <enum>MinimumExpanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -127,7 +127,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
                     <property name="sizeType">
                         <enum>MinimumExpanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -138,7 +138,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -181,7 +181,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -239,7 +239,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>32</width>
                             <height>32</height>
@@ -259,7 +259,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>151</width>
                             <height>21</height>
-- 
cgit v1.2.1