1 files changed, 17 insertions, 17 deletions

diff --git a/kdevdesigner/designer/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp
index 8c16be98..c5dcd8bf 100644
--- a/kdevdesigner/designer/popupmenueditor.cpp
+++ b/kdevdesigner/designer/popupmenueditor.cpp
@@ -258,7 +258,7 @@ PopupMenuEditorItem * PopupMenuEditor::clipboardItem = 0;
 PopupMenuEditor::PopupMenuEditor( FormWindow * fw, TQWidget * tqparent, const char * name )
     : TQWidget( 0, name, WStyle_Customize | WStyle_NoBorder | WRepaintNoErase | WResizeNoErase ),
       formWnd( fw ),
-      tqparentMenu( tqparent ),
+      parentMenu( tqparent ),
       iconWidth( 0 ),
       textWidth( 0 ),
       accelWidth( 0 ),
@@ -274,7 +274,7 @@ PopupMenuEditor::PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu,
 				  TQWidget * tqparent, const char * name )
     : TQWidget( 0, name, WStyle_Customize | WStyle_NoBorder | WRepaintNoErase ),
       formWnd( fw ),
-      tqparentMenu( tqparent ),
+      parentMenu( tqparent ),
       iconWidth( menu->iconWidth ),
       textWidth( menu->textWidth ),
       accelWidth( menu->accelWidth ),
@@ -335,10 +335,10 @@ void PopupMenuEditor::insert( PopupMenuEditorItem * item, int index )
 	    currentIndex = index;
     }
     item->m = this;
-    item->s->tqparentMenu = this;
+    item->s->parentMenu = this;
     resizeToContents();
-    if ( isVisible() && tqparentMenu )
-	tqparentMenu->update(); // draw arrow in tqparent menu
+    if ( isVisible() && parentMenu )
+	parentMenu->update(); // draw arrow in tqparent menu
     emit inserted( item->action() );
 }
 
@@ -644,8 +644,8 @@ void PopupMenuEditor::removeItem( int index )
 									       idx );
 	formWnd->commandHistory()->addCommand( cmd );
 	cmd->execute();
-	if ( itemList.count() == 0 && tqparentMenu )
-	    tqparentMenu->update();
+	if ( itemList.count() == 0 && parentMenu )
+	    parentMenu->update();
 	resizeToContents();
     }
 }
@@ -1006,7 +1006,7 @@ void PopupMenuEditor::focusInEvent( TQFocusEvent * )
 {
     showSubMenu();
     update();
-    tqparentMenu->update();
+    parentMenu->update();
 }
 
 void PopupMenuEditor::focusOutEvent( TQFocusEvent * )
@@ -1019,7 +1019,7 @@ void PopupMenuEditor::focusOutEvent( TQFocusEvent * )
 	TQWidget * w = this;
 	while ( w && w != fw && ::tqqt_cast<PopupMenuEditor*>(w) ) { // hide all popups
 	    w->hide();
-	    w = ((PopupMenuEditor *)w)->tqparentEditor();
+	    w = ((PopupMenuEditor *)w)->parentEditor();
 	}
     }
 }
@@ -1259,8 +1259,8 @@ void PopupMenuEditor::safeDec()
     } while ( currentIndex > 0 && !currentItem()->isVisible() );
     if ( currentIndex == 0 &&
 	 !currentItem()->isVisible() &&
-	 tqparentMenu ) {
-	tqparentMenu->setFocus();
+	 parentMenu ) {
+	parentMenu->setFocus();
     }
 }
 
@@ -1317,9 +1317,9 @@ void PopupMenuEditor::navigateUp( bool ctrl )
 	    safeDec();
 	}
 	showSubMenu();
-    } else if ( tqparentMenu ) {
-	tqparentMenu->setFocus();
-	tqparentMenu->update();
+    } else if ( parentMenu ) {
+	parentMenu->setFocus();
+	parentMenu->update();
     }
 }
 
@@ -1351,9 +1351,9 @@ void PopupMenuEditor::navigateLeft()
     if ( currentItem()->isSeparator() ||
 	 currentIndex >= (int)itemList.count() ||
 	 currentField == 0 ) {
-	if ( tqparentMenu ) {
+	if ( parentMenu ) {
 	    hideSubMenu();
-	    tqparentMenu->setFocus();
+	    parentMenu->setFocus();
 	} else if ( !currentItem()->isSeparator() ) {
 	    currentField = 2;
 	}
@@ -1448,7 +1448,7 @@ TQString PopupMenuEditor::constructName( PopupMenuEditorItem *item )
 {
     TQString s;
     TQString name = item->action()->menuText();
-    TQWidget *e = tqparentEditor();
+    TQWidget *e = parentEditor();
     PopupMenuEditor *p = ::tqqt_cast<PopupMenuEditor*>(e);
     if ( p ) {
 	int idx = p->tqfind( item->m );