Rename a number of old tq methods that are no longer tq specific

1 files changed, 10 insertions, 10 deletions

diff --git a/kdevdesigner/designer/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp
index 7770dcda..ea4ffec7 100644
--- a/kdevdesigner/designer/popupmenueditor.cpp
+++ b/kdevdesigner/designer/popupmenueditor.cpp
@@ -80,7 +80,7 @@ bool PopupMenuEditorItemPtrDrag::canDecode( TQDragMoveEvent * e )
 
 bool PopupMenuEditorItemPtrDrag::decode( TQDropEvent * e, PopupMenuEditorItem ** i )
 {
-    TQByteArray data = e->tqencodedData( "qt/popupmenueditoritemptr" );
+    TQByteArray data = e->encodedData( "qt/popupmenueditoritemptr" );
     TQDataStream stream( data, IO_ReadOnly );
 
     if ( !data.size() )
@@ -170,7 +170,7 @@ PopupMenuEditorItem::ItemType PopupMenuEditorItem::type() const
 void PopupMenuEditorItem::setVisible( bool enable )
 {
     if ( a )
-	a->tqsetVisible( enable );
+	a->setVisible( enable );
 }
 
 bool PopupMenuEditorItem::isVisible() const
@@ -730,7 +730,7 @@ void PopupMenuEditor::paintEvent( TQPaintEvent * )
 		 rect().width() - borderSize * 2, rect().height() - borderSize * 2 );
     reg -= mid;
     p.setClipRegion( reg );
-    tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), tqcolorGroup() );
+    tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), colorGroup() );
     p.restore();
     drawItems( &p );
 }
@@ -1011,7 +1011,7 @@ void PopupMenuEditor::focusInEvent( TQFocusEvent * )
 
 void PopupMenuEditor::focusOutEvent( TQFocusEvent * )
 {
-    TQWidget * fw = tqApp->tqfocusWidget();
+    TQWidget * fw = tqApp->focusWidget();
     if ( !fw || ( !::tqqt_cast<PopupMenuEditor*>(fw) && fw != lineEdit ) ) {
 	hideSubMenu();
 	if ( fw && ::tqqt_cast<MenuBarEditor*>(fw) )
@@ -1031,12 +1031,12 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
     int y = r.y();
     int h = r.height();
 
-    p->fillRect( r, tqcolorGroup().brush( TQColorGroup::Background ) );
+    p->fillRect( r, colorGroup().brush( TQColorGroup::Background ) );
 
     if ( i->isSeparator() ) {
 	tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, p,
 			       TQRect( r.x(), r.y() + 2, r.width(), 1 ),
-			       tqcolorGroup(), TQStyle::Style_Sunken | f );
+			       colorGroup(), TQStyle::Style_Sunken | f );
 	return;
     }
 
@@ -1044,7 +1044,7 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
     if ( a->isToggleAction() && a->isOn() ) {
 	tqstyle().tqdrawPrimitive( TQStyle::PE_CheckMark, p,
 			       TQRect( x , y, iconWidth, h ),
-			       tqcolorGroup(), f );
+			       colorGroup(), f );
     } else {
 	TQPixmap icon = a->iconSet().pixmap( TQIconSet::Automatic, TQIconSet::Normal );
 	p->drawPixmap( x + ( iconWidth - icon.width() ) / 2,
@@ -1066,7 +1066,7 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
     if ( i->count() ) // Item has submenu
 	tqstyle().tqdrawPrimitive( TQStyle::PE_ArrowRight, p,
 			       TQRect( r.width() - arrowWidth, r.y(), arrowWidth, r.height() ),
-			       tqcolorGroup(), f );
+			       colorGroup(), f );
 }
 
 void PopupMenuEditor::drawWinFocusRect( TQPainter * p, const TQRect & r ) const
@@ -1092,8 +1092,8 @@ void PopupMenuEditor::drawItems( TQPainter * p )
     int flags = 0;
     int idx = 0;
 
-    TQColorGroup enabled = tqcolorGroup();
-    TQColorGroup disabled = tqpalette().disabled();
+    TQColorGroup enabled = colorGroup();
+    TQColorGroup disabled = palette().disabled();
     TQRect focus;
     TQRect rect( borderSize, borderSize, width() - borderSize * 2, 0 );