rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 14 insertions, 14 deletions

diff --git a/kdevdesigner/designer/menubareditor.cpp b/kdevdesigner/designer/menubareditor.cpp
index 65b55522..498c6827 100644
--- a/kdevdesigner/designer/menubareditor.cpp
+++ b/kdevdesigner/designer/menubareditor.cpp
@@ -47,7 +47,7 @@ class MenuBarEditorItemPtrDrag : public TQStoredDrag
 {
 public:
     MenuBarEditorItemPtrDrag( MenuBarEditorItem * item,
-			      TQWidget * tqparent = 0,
+			      TQWidget * parent = 0,
 			      const char * name = 0 );
     ~MenuBarEditorItemPtrDrag() {};
     static bool canDecode( TQDragMoveEvent * e );
@@ -57,9 +57,9 @@ public:
 // Drag Object Implementation ---------------------------------------
 
 MenuBarEditorItemPtrDrag::MenuBarEditorItemPtrDrag( MenuBarEditorItem * item,
-						    TQWidget * tqparent,
+						    TQWidget * parent,
 						    const char * name )
-    : TQStoredDrag( "qt/menubareditoritemptr", tqparent, name )
+    : TQStoredDrag( "qt/menubareditoritemptr", parent, name )
 {
     TQByteArray data( sizeof( TQ_LONG ) );
     TQDataStream stream( data, IO_WriteOnly );
@@ -89,8 +89,8 @@ bool MenuBarEditorItemPtrDrag::decode( TQDropEvent * e, MenuBarEditorItem ** i )
 
 // MenuBarEditorItem ---------------------------------------------------
 
-MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * tqparent, const char * name )
-    : TQObject( tqparent, name ),
+MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * parent, const char * name )
+    : TQObject( parent, name ),
       menuBar( bar ),
       popupMenu( 0 ),
       visible( TRUE ),
@@ -99,8 +99,8 @@ MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * tqparent,
 { }
 
 MenuBarEditorItem::MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * bar,
-				      TQObject * tqparent, const char * name )
-    : TQObject( tqparent, name ),
+				      TQObject * parent, const char * name )
+    : TQObject( parent, name ),
       menuBar( bar ),
       popupMenu( menu ),
       visible( TRUE ),
@@ -111,8 +111,8 @@ MenuBarEditorItem::MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * ba
 }
 
 MenuBarEditorItem::MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor * bar,
-				      TQObject * tqparent, const char * name )
-    : TQObject( tqparent, name ),
+				      TQObject * parent, const char * name )
+    : TQObject( parent, name ),
       menuBar( bar ),
       popupMenu( 0 ),
       visible( TRUE ),
@@ -124,8 +124,8 @@ MenuBarEditorItem::MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor
     popupMenu->insert( actionGroup );
 }
 
-MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, TQObject * tqparent, const char * name )
-    : TQObject( tqparent, name ),
+MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, TQObject * parent, const char * name )
+    : TQObject( parent, name ),
       menuBar( item->menuBar ),
       popupMenu( 0 ),
       text( item->text ),
@@ -141,8 +141,8 @@ MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, TQObject * tqpar
 int MenuBarEditor::clipboardOperation = 0;
 MenuBarEditorItem * MenuBarEditor::clipboardItem = 0;
 
-MenuBarEditor::MenuBarEditor( FormWindow * fw, TQWidget * tqparent, const char * name )
-    : TQMenuBar( tqparent, name ),
+MenuBarEditor::MenuBarEditor( FormWindow * fw, TQWidget * parent, const char * name )
+    : TQMenuBar( parent, name ),
       formWnd( fw ),
       draggedItem( 0 ),
       currentIndex( 0 ),
@@ -185,7 +185,7 @@ FormWindow * MenuBarEditor::formWindow()
 MenuBarEditorItem * MenuBarEditor::createItem( int index, bool addToCmdStack )
 {
     MenuBarEditorItem * i =
-	new MenuBarEditorItem( new PopupMenuEditor( formWnd, ( TQWidget * ) tqparent() ), this );
+	new MenuBarEditorItem( new PopupMenuEditor( formWnd, ( TQWidget * ) parent() ), this );
     if ( addToCmdStack ) {
 	AddMenuCommand * cmd = new AddMenuCommand( i18n( "Add Menu" ), formWnd, this, i, index );
 	formWnd->commandHistory()->addCommand( cmd );