From a84302cc767bcabbf01b8c76f61419f4a2ab4ff0 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 18 Dec 2011 18:31:39 -0600
Subject: Rename old tq methods that no longer need a unique name (cherry
 picked from commit 45f529de247fc4b3662f6b474abe03fe904306ec)

---
 kview/kviewcanvas/config/generalconfigwidget.ui | 8 ++++----
 kview/kviewcanvas/kimagecanvas.cpp              | 2 +-
 kview/kviewcanvas/kimageholder.cpp              | 2 +-
 kview/kviewcanvas/kimageholder.h                | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kview/kviewcanvas')

diff --git a/kview/kviewcanvas/config/generalconfigwidget.ui b/kview/kviewcanvas/config/generalconfigwidget.ui
index 746fa02c..15476bcd 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="tqsizeHint">
+                    <property name="sizeHint">
                         <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="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -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="tqminimumSize">
+                    <property name="minimumSize">
                         <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="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>151</width>
                             <height>21</height>
diff --git a/kview/kviewcanvas/kimagecanvas.cpp b/kview/kviewcanvas/kimagecanvas.cpp
index a2e6c5b7..67d8fd9a 100644
--- a/kview/kviewcanvas/kimagecanvas.cpp
+++ b/kview/kviewcanvas/kimagecanvas.cpp
@@ -543,7 +543,7 @@ void KImageCanvas::slotUpdateImage()
 
 		if( m_bSizeChanged || m_bNewImage )
 		{
-			TQSize sh = m_client->tqsizeHint();
+			TQSize sh = m_client->sizeHint();
 			if( ! sh.isValid() )
 				sh = TQSize( 0, 0 );
 			m_client->resize( sh );
diff --git a/kview/kviewcanvas/kimageholder.cpp b/kview/kviewcanvas/kimageholder.cpp
index f2e54462..eb287d37 100644
--- a/kview/kviewcanvas/kimageholder.cpp
+++ b/kview/kviewcanvas/kimageholder.cpp
@@ -269,7 +269,7 @@ TQRect KImageHolder::selection() const
 		return TQRect();
 }
 
-TQSize KImageHolder::tqsizeHint() const
+TQSize KImageHolder::sizeHint() const
 {
 	if( m_pPixmap )
 		return m_pPixmap->size();
diff --git a/kview/kviewcanvas/kimageholder.h b/kview/kviewcanvas/kimageholder.h
index 165ec0bc..a5555e2b 100644
--- a/kview/kviewcanvas/kimageholder.h
+++ b/kview/kviewcanvas/kimageholder.h
@@ -57,7 +57,7 @@ class KImageHolder : public TQWidget
 		 */
 		TQRect selection() const;
 
-		TQSize tqsizeHint() const;
+		TQSize sizeHint() const;
 
 		void setDrawRect( const TQRect & rect ) { m_drawRect = rect; }
 		const TQRect & drawRect() const { return m_drawRect; }
-- 
cgit v1.2.1