From c3b301575a98e4c3505ad95534d6192b65539dab Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 18 Dec 2011 18:36:08 -0600
Subject: Rename old tq methods that no longer need a unique name

---
 kdevdesigner/designer/metadatabase.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'kdevdesigner/designer/metadatabase.cpp')

diff --git a/kdevdesigner/designer/metadatabase.cpp b/kdevdesigner/designer/metadatabase.cpp
index 5f8ce367..ffd736c4 100644
--- a/kdevdesigner/designer/metadatabase.cpp
+++ b/kdevdesigner/designer/metadatabase.cpp
@@ -652,8 +652,8 @@ void MetaDataBase::doConnections( TQObject *o )
 	TQString s2 = "1""%1";
 	s2 = s2.tqarg( conn.slot.data() );
 
-	TQStrList signalList = sender->tqmetaObject()->signalNames( TRUE );
-	TQStrList slotList = receiver->tqmetaObject()->slotNames( TRUE );
+	TQStrList signalList = sender->metaObject()->signalNames( TRUE );
+	TQStrList slotList = receiver->metaObject()->slotNames( TRUE );
 
 	// avoid warnings
 	if ( signalList.find( conn.signal ) == -1 ||
@@ -675,13 +675,13 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom
     }
 
     if ( !onlyCustom ) {
-	TQStrList slotList = o->tqmetaObject()->slotNames( TRUE );
+	TQStrList slotList = o->metaObject()->slotNames( TRUE );
 	if ( slotList.find( slot ) != -1 )
 	    return TRUE;
 
 	if ( ::tqqt_cast<FormWindow*>(o) ) {
 	    o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer());
-	    slotList = o->tqmetaObject()->slotNames( TRUE );
+	    slotList = o->metaObject()->slotNames( TRUE );
 	    if ( slotList.find( slot ) != -1 )
 		return TRUE;
 	}
@@ -905,13 +905,13 @@ bool MetaDataBase::hasFunction( TQObject *o, const TQCString &function, bool onl
     }
 
     if ( !onlyCustom ) {
-	TQStrList functionList = o->tqmetaObject()->slotNames( TRUE );
+	TQStrList functionList = o->metaObject()->slotNames( TRUE );
 	if ( functionList.find( function ) != -1 )
 	    return TRUE;
 
 	if ( ::tqqt_cast<FormWindow*>(o) ) {
 	    o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer());
-	    functionList = o->tqmetaObject()->slotNames( TRUE );
+	    functionList = o->metaObject()->slotNames( TRUE );
 	    if ( functionList.find( function ) != -1 )
 		return TRUE;
 	}
@@ -1276,7 +1276,7 @@ MetaDataBase::CustomWidget::CustomWidget()
     className = "MyCustomWidget";
     includeFile = "mywidget.h";
     includePolicy = Local;
-    tqsizeHint = TQSize( -1, -1 );
+    sizeHint = TQSize( -1, -1 );
     pixmap = new TQPixmap( BarIcon( "designer_customwidget.png", KDevDesignerPartFactory::instance() ) );
     id = -1;
     sizePolicy = TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred );
@@ -1288,7 +1288,7 @@ MetaDataBase::CustomWidget::CustomWidget( const CustomWidget &w )
     className = w.className;
     includeFile = w.includeFile;
     includePolicy = w.includePolicy;
-    tqsizeHint = w.tqsizeHint;
+    sizeHint = w.sizeHint;
     if ( w.pixmap )
 	pixmap = new TQPixmap( *w.pixmap );
     else
@@ -1339,7 +1339,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW
     className = w.className;
     includeFile = w.includeFile;
     includePolicy = w.includePolicy;
-    tqsizeHint = w.tqsizeHint;
+    sizeHint = w.sizeHint;
     if ( w.pixmap )
 	pixmap = new TQPixmap( *w.pixmap );
     else
@@ -1354,7 +1354,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW
 
 bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const
 {
-    TQStrList sigList = TQWidget::tqstaticMetaObject()->signalNames( TRUE );
+    TQStrList sigList = TQWidget::staticMetaObject()->signalNames( TRUE );
     if ( sigList.find( signal ) != -1 )
 	return TRUE;
     for ( TQValueList<TQCString>::ConstIterator it = lstSignals.begin(); it != lstSignals.end(); ++it ) {
@@ -1366,7 +1366,7 @@ bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const
 
 bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const
 {
-    TQStrList slotList = TQWidget::tqstaticMetaObject()->slotNames( TRUE );
+    TQStrList slotList = TQWidget::staticMetaObject()->slotNames( TRUE );
     if ( slotList.find( normalizeFunction( slot ) ) != -1 )
 	return TRUE;
 
@@ -1379,7 +1379,7 @@ bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const
 
 bool MetaDataBase::CustomWidget::hasProperty( const TQCString &prop ) const
 {
-    TQStrList propList = TQWidget::tqstaticMetaObject()->propertyNames( TRUE );
+    TQStrList propList = TQWidget::staticMetaObject()->propertyNames( TRUE );
     if ( propList.find( prop ) != -1 )
 	return TRUE;
 
-- 
cgit v1.2.1