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/menubareditor.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/kdevdesigner/designer/menubareditor.cpp b/kdevdesigner/designer/menubareditor.cpp
index 498c6827..550c9b60 100644
--- a/kdevdesigner/designer/menubareditor.cpp
+++ b/kdevdesigner/designer/menubareditor.cpp
@@ -74,7 +74,7 @@ bool MenuBarEditorItemPtrDrag::canDecode( TQDragMoveEvent * e )
 
 bool MenuBarEditorItemPtrDrag::decode( TQDropEvent * e, MenuBarEditorItem ** i )
 {
-    TQByteArray data = e->tqencodedData( "qt/menubareditoritemptr" );
+    TQByteArray data = e->encodedData( "qt/menubareditoritemptr" );
     TQDataStream stream( data, IO_ReadOnly );
 
     if ( !data.size() )
@@ -502,7 +502,7 @@ void MenuBarEditor::deleteItem( int index )
     }
 }
 
-TQSize MenuBarEditor::tqsizeHint() const
+TQSize MenuBarEditor::sizeHint() const
 {
     return TQSize( parentWidget()->width(), heightForWidth( parentWidget()->width() ) );
 }
@@ -576,7 +576,7 @@ bool MenuBarEditor::eventFilter( TQObject * o, TQEvent * e )
 	lineEdit->hide();
 	update();
     } else if ( e->type() == TQEvent::LayoutHint ) {
-	resize( tqsizeHint() );
+	resize( sizeHint() );
      }
     return TQMenuBar::eventFilter( o, e );
 }
@@ -586,7 +586,7 @@ void MenuBarEditor::paintEvent( TQPaintEvent * )
     TQPainter p( this );
     TQRect r = rect();
     tqstyle().tqdrawPrimitive( TQStyle::PE_PanelMenuBar, &p,
-			   r, tqcolorGroup() );
+			   r, colorGroup() );
     drawItems( p );
 }
 
@@ -817,7 +817,7 @@ void MenuBarEditor::keyPressEvent( TQKeyEvent * e )
 
 void MenuBarEditor::focusOutEvent( TQFocusEvent * e )
 {
-    TQWidget * fw = tqApp->tqfocusWidget();
+    TQWidget * fw = tqApp->focusWidget();
     if ( e->lostFocus() && !::tqqt_cast<PopupMenuEditor*>(fw) )
 	hideItem();
     update();
@@ -834,7 +834,7 @@ void MenuBarEditor::drawItems( TQPainter & p )
     TQPoint pos( borderSize(), 0 );
     uint c = 0;
 
-    p.setPen( tqcolorGroup().buttonText() );
+    p.setPen( colorGroup().buttonText() );
 
     MenuBarEditorItem * i = itemList.first();
     while ( i ) {
-- 
cgit v1.2.1