rename the following methods:

tqparent parent
tqmask mask


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

43 files changed, 123 insertions, 123 deletions

diff --git a/khexedit/bitswapwidget.cc b/khexedit/bitswapwidget.cc
index 20d4039..7e7f14c 100644
--- a/khexedit/bitswapwidget.cc
+++ b/khexedit/bitswapwidget.cc
@@ -24,8 +24,8 @@
 
 #include "bitswapwidget.h"
 
-CDigitLabel::CDigitLabel( TQWidget *tqparent, uint digit, const char *name )
-  :TQLabel(tqparent, name), mDigit( digit ), mDotPosition( 0 )
+CDigitLabel::CDigitLabel( TQWidget *parent, uint digit, const char *name )
+  :TQLabel(parent, name), mDigit( digit ), mDotPosition( 0 )
 {
   setFocusPolicy( TQ_StrongFocus );
   initialize();
@@ -174,8 +174,8 @@ void CDigitLabel::keyPressEvent( TQKeyEvent *e )
 
 
 
-CByteWidget::CByteWidget( TQWidget *tqparent, const char *name )
-  :TQWidget(tqparent, name)
+CByteWidget::CByteWidget( TQWidget *parent, const char *name )
+  :TQWidget(parent, name)
 {
   mHBox = new TQHBoxLayout( this, 0 );
   
diff --git a/khexedit/bitswapwidget.h b/khexedit/bitswapwidget.h
index 14d6ab2..0dfccbf 100644
--- a/khexedit/bitswapwidget.h
+++ b/khexedit/bitswapwidget.h
@@ -32,7 +32,7 @@ class CDigitLabel : public TQLabel
   TQ_OBJECT
 
   public:
-    CDigitLabel( TQWidget *tqparent, uint digit = 0, const char *name=0 );
+    CDigitLabel( TQWidget *parent, uint digit = 0, const char *name=0 );
     ~CDigitLabel( void );
 
     virtual TQSize tqsizeHint() const;
@@ -74,7 +74,7 @@ class CByteWidget : public TQWidget
   TQ_OBJECT
 
   public:
-    CByteWidget( TQWidget *tqparent, const char *name=0 );
+    CByteWidget( TQWidget *parent, const char *name=0 );
     ~CByteWidget( void );
 
     bool flag( TQByteArray &buf );
diff --git a/khexedit/chartabledialog.cc b/khexedit/chartabledialog.cc
index a249325..4475604 100644
--- a/khexedit/chartabledialog.cc
+++ b/khexedit/chartabledialog.cc
@@ -32,10 +32,10 @@
 #include "chartabledialog.h"
 
 
-CCharTableDialog::CCharTableDialog( TQWidget *tqparent, const char *name,
+CCharTableDialog::CCharTableDialog( TQWidget *parent, const char *name,
 				    bool modal )
   :KDialogBase( Plain, i18n("Character Table"), Help|User1|Cancel, User1,
-		tqparent, name, modal, true, KStdGuiItem::insert())
+		parent, name, modal, true, KStdGuiItem::insert())
 {
   updateGeometry();
   setHelp( "khexedit/khexedit.html", TQString() );
diff --git a/khexedit/chartabledialog.h b/khexedit/chartabledialog.h
index ac829e7..6b7610b 100644
--- a/khexedit/chartabledialog.h
+++ b/khexedit/chartabledialog.h
@@ -38,7 +38,7 @@ class CCharTableDialog : public KDialogBase
   TQ_OBJECT
   
   public:
-    CCharTableDialog( TQWidget *tqparent=0, const char *name=0,bool modal=false );
+    CCharTableDialog( TQWidget *parent=0, const char *name=0,bool modal=false );
     ~CCharTableDialog( void );
 
   signals:
diff --git a/khexedit/converterdialog.cc b/khexedit/converterdialog.cc
index 3452c4f..6f3a82e 100644
--- a/khexedit/converterdialog.cc
+++ b/khexedit/converterdialog.cc
@@ -28,9 +28,9 @@
 #include "hexvalidator.h"
 
 
-CValidateLineEdit::CValidateLineEdit( TQWidget *tqparent, int validateType,
+CValidateLineEdit::CValidateLineEdit( TQWidget *parent, int validateType,
 				      const char *name )
-  :TQLineEdit( tqparent, name ), mBusy(false)
+  :TQLineEdit( parent, name ), mBusy(false)
 {
   mValidator = new CHexValidator( this, (CHexValidator::EState)validateType );
   setValidator( mValidator );
@@ -66,9 +66,9 @@ void CValidateLineEdit::convertText( const TQString &text )
 
 
 
-CConverterDialog::CConverterDialog( TQWidget *tqparent, const char *name, 
+CConverterDialog::CConverterDialog( TQWidget *parent, const char *name, 
 				    bool modal )
-  :KDialogBase( tqparent, name, modal, i18n("Converter"), Cancel|User2|User1, 
+  :KDialogBase( parent, name, modal, i18n("Converter"), Cancel|User2|User1, 
 		Cancel, true, KStdGuiItem::clear(), i18n("&On Cursor") )
 {
   TQWidget *page = new TQWidget( this );
diff --git a/khexedit/converterdialog.h b/khexedit/converterdialog.h
index d5e8d7e..544517b 100644
--- a/khexedit/converterdialog.h
+++ b/khexedit/converterdialog.h
@@ -33,7 +33,7 @@ class CValidateLineEdit : public TQLineEdit
   TQ_OBJECT
    
   public:
-    CValidateLineEdit( TQWidget *tqparent, int validateType, const char *name=0 );
+    CValidateLineEdit( TQWidget *parent, int validateType, const char *name=0 );
     ~CValidateLineEdit( void );
 
   public slots:
@@ -57,7 +57,7 @@ class CConverterDialog : public KDialogBase
   TQ_OBJECT
   
   public:
-    CConverterDialog( TQWidget *tqparent, const char *name=0, bool modal=true );
+    CConverterDialog( TQWidget *parent, const char *name=0, bool modal=true );
     ~CConverterDialog( void );
     
   protected:
diff --git a/khexedit/dialog.cc b/khexedit/dialog.cc
index df9296c..e04bb30 100644
--- a/khexedit/dialog.cc
+++ b/khexedit/dialog.cc
@@ -40,8 +40,8 @@ static const TQStringList &formatStrings( void );
 static const TQStringList &operationStrings( void );
 
 
-CGotoDialog::CGotoDialog( TQWidget *tqparent, const char *name, bool modal )
-  :KDialogBase( Plain, i18n("Goto Offset"), Ok|Cancel, Ok, tqparent, name,
+CGotoDialog::CGotoDialog( TQWidget *parent, const char *name, bool modal )
+  :KDialogBase( Plain, i18n("Goto Offset"), Ok|Cancel, Ok, parent, name,
 		modal )
 {
   TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
@@ -174,8 +174,8 @@ void CGotoDialog::slotOk( void )
 
 
 
-CFindDialog::CFindDialog( TQWidget *tqparent, const char *name, bool modal )
-  :KDialogBase( Plain, i18n("Find"), Ok|Cancel, Ok, tqparent, name, modal )
+CFindDialog::CFindDialog( TQWidget *parent, const char *name, bool modal )
+  :KDialogBase( Plain, i18n("Find"), Ok|Cancel, Ok, parent, name, modal )
 {
 
   TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
@@ -343,10 +343,10 @@ void CFindDialog::findAgain( EOperation operation )
 
 
 
-CFindNavigatorDialog::CFindNavigatorDialog( TQWidget *tqparent, const char *name,
+CFindNavigatorDialog::CFindNavigatorDialog( TQWidget *parent, const char *name,
 					     bool modal )
   :KDialogBase( Plain, i18n("Find (Navigator)"), User3|User2|User1|Close,
-		User2, tqparent, name, modal, true, i18n("New &Key"),
+		User2, parent, name, modal, true, i18n("New &Key"),
 		i18n("&Next"), i18n("&Previous") )
 {
   TQString text;
@@ -481,9 +481,9 @@ void CFindNavigatorDialog::done( int resultCode )
 
 
 
-CReplaceDialog::CReplaceDialog( TQWidget *tqparent, const char *name, bool modal )
+CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal )
   :KDialogBase( Plain, i18n("Find & Replace"), Ok|Cancel, Ok,
-		tqparent, name, modal )
+		parent, name, modal )
 {
   TQString text;
   TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
@@ -676,10 +676,10 @@ void CReplaceDialog::slotOk( void )
 
 
 
-CReplacePromptDialog::CReplacePromptDialog( TQWidget *tqparent, const char *name,
+CReplacePromptDialog::CReplacePromptDialog( TQWidget *parent, const char *name,
 					     bool modal )
   :KDialogBase( Plain, i18n("Find & Replace"), User3|User2|User1|Close,
-		User2, tqparent, name, modal, true, i18n("Replace &All"),
+		User2, parent, name, modal, true, i18n("Replace &All"),
 		i18n("Do Not Replace"), i18n("Replace"))
 {
   TQString text;
@@ -757,9 +757,9 @@ void CReplacePromptDialog::done( int returnCode )
 
 
 
-CFilterDialog::CFilterDialog( TQWidget *tqparent, const char *name, bool modal )
+CFilterDialog::CFilterDialog( TQWidget *parent, const char *name, bool modal )
   :KDialogBase( Plain, i18n("Binary Filter"), Ok|Cancel, Ok,
-		tqparent, name, modal )
+		parent, name, modal )
 {
   TQString text;
   TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
@@ -1066,9 +1066,9 @@ void CFilterDialog::operationSelectorChanged( int index )
 
 
 
-CInsertDialog::CInsertDialog( TQWidget *tqparent, const char *name, bool modal )
+CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal )
   :KDialogBase( Plain, i18n("Insert Pattern"), Ok|Cancel, Ok,
-		tqparent, name, modal )
+		parent, name, modal )
 {
   setButtonOKText(i18n("&Insert"));
 
@@ -1278,7 +1278,7 @@ void comboMatchText( TQComboBox *combo, const TQString &text )
 
 
 
-void showEntryFailure( TQWidget *tqparent, const TQString &msg )
+void showEntryFailure( TQWidget *parent, const TQString &msg )
 {
   TQString message;
   message += i18n("Your request can not be processed.");
@@ -1291,17 +1291,17 @@ void showEntryFailure( TQWidget *tqparent, const TQString &msg )
   {
     message += msg;
   }
-  KMessageBox::sorry( tqparent, message, i18n("Invalid argument(s)") );
+  KMessageBox::sorry( parent, message, i18n("Invalid argument(s)") );
 }
 
 
-bool verifyFileDestnation( TQWidget *tqparent, const TQString &title,
+bool verifyFileDestnation( TQWidget *parent, const TQString &title,
 			   const TQString &path )
 {
   if( path.isEmpty() == true )
   {
     TQString msg = i18n("You must specify a destination file.");
-    KMessageBox::sorry( tqparent, msg, title );
+    KMessageBox::sorry( parent, msg, title );
     return( false );
   }
 
@@ -1311,21 +1311,21 @@ bool verifyFileDestnation( TQWidget *tqparent, const TQString &title,
     if( info.isDir() == true )
     {
       TQString msg = i18n("You have specified an existing folder.");
-      KMessageBox::sorry( tqparent, msg, title );
+      KMessageBox::sorry( parent, msg, title );
       return( false );
     }
 
     if( info.isWritable() == false )
     {
       TQString msg = i18n("You do not have write permission to this file.");
-      KMessageBox::sorry( tqparent, msg, title );
+      KMessageBox::sorry( parent, msg, title );
       return( false );
     }
 
     TQString msg = i18n( ""
       "You have specified an existing file.\n"
       "Overwrite current file?" );
-    int reply = KMessageBox::warningContinueCancel( tqparent, msg, title, i18n("Overwrite") );
+    int reply = KMessageBox::warningContinueCancel( parent, msg, title, i18n("Overwrite") );
     if( reply != KMessageBox::Continue )
     {
       return( false );
diff --git a/khexedit/dialog.h b/khexedit/dialog.h
index 12456be..61b4633 100644
--- a/khexedit/dialog.h
+++ b/khexedit/dialog.h
@@ -67,7 +67,7 @@ class CGotoDialog : public KDialogBase
   TQ_OBJECT
   
   public:
-    CGotoDialog( TQWidget *tqparent, const char *name = 0, bool modal = false );
+    CGotoDialog( TQWidget *parent, const char *name = 0, bool modal = false );
     ~CGotoDialog( void );
 
   protected:
@@ -102,7 +102,7 @@ class CFindDialog : public KDialogBase
     };
 
   public:
-    CFindDialog( TQWidget *tqparent=0, const char *name=0, bool modal=false );
+    CFindDialog( TQWidget *parent=0, const char *name=0, bool modal=false );
     ~CFindDialog( void );
     bool isEmpty( void );
 
@@ -142,7 +142,7 @@ class CFindNavigatorDialog : public KDialogBase
   TQ_OBJECT
   
   public:
-    CFindNavigatorDialog( TQWidget *tqparent=0, const char *name=0, 
+    CFindNavigatorDialog( TQWidget *parent=0, const char *name=0, 
 			  bool modal=false );
     ~CFindNavigatorDialog( void );
     void defineData( SSearchControl &sc );
@@ -172,7 +172,7 @@ class CReplaceDialog : public KDialogBase
   TQ_OBJECT
   
   public:
-    CReplaceDialog( TQWidget *tqparent=0, const char *name=0, bool modal=false );
+    CReplaceDialog( TQWidget *parent=0, const char *name=0, bool modal=false );
     ~CReplaceDialog( void );
 
   protected:
@@ -216,7 +216,7 @@ class CReplacePromptDialog : public KDialogBase
   TQ_OBJECT
   
   public:
-    CReplacePromptDialog( TQWidget *tqparent=0, const char *name=0, 
+    CReplacePromptDialog( TQWidget *parent=0, const char *name=0, 
 			  bool modal=false );
     ~CReplacePromptDialog( void );
     void defineData( SSearchControl &sc );
@@ -255,7 +255,7 @@ class CFilterDialog : public KDialogBase
     };
 
   public:
-    CFilterDialog( TQWidget *tqparent=0, const char *name=0, bool modal=false );
+    CFilterDialog( TQWidget *parent=0, const char *name=0, bool modal=false );
     ~CFilterDialog( void );
 
   protected:
@@ -306,7 +306,7 @@ class CInsertDialog : public KDialogBase
   TQ_OBJECT
   
   public:
-    CInsertDialog( TQWidget *tqparent=0, const char *name=0, bool modal=false );
+    CInsertDialog( TQWidget *parent=0, const char *name=0, bool modal=false );
     ~CInsertDialog( void );
 
   protected:
@@ -343,8 +343,8 @@ void centerDialogBottom( TQWidget *widget, TQWidget *centerParent );
 void comboMatchText( TQComboBox *combo, const TQString &text );
 bool stringToOffset( const TQString & text, uint &offset );
 
-void showEntryFailure( TQWidget *tqparent, const TQString &msg );
-bool verifyFileDestnation( TQWidget *tqparent, const TQString &title, 
+void showEntryFailure( TQWidget *parent, const TQString &msg );
+bool verifyFileDestnation( TQWidget *parent, const TQString &title, 
 			   const TQString &path );
 
 
diff --git a/khexedit/draglabel.cc b/khexedit/draglabel.cc
index b404f8e..564521f 100644
--- a/khexedit/draglabel.cc
+++ b/khexedit/draglabel.cc
@@ -28,8 +28,8 @@
 #include "draglabel.h"
 
 
-CDragLabel::CDragLabel( TQWidget *tqparent )
-  : TQLabel( "draglabel", tqparent, "kde toolbar widget" )
+CDragLabel::CDragLabel( TQWidget *parent )
+  : TQLabel( "draglabel", parent, "kde toolbar widget" )
 {
   mValid = true;
   mDragPending = false;
@@ -120,12 +120,12 @@ void CDragLabel::prepPixmap( KURLDrag &uriDrag )
   int h = fontMetrics().lineSpacing();
   if( pixmap()->height() > h ) { h = pixmap()->height(); }
 
-  TQBitmap tqmask( w, h, TRUE );
+  TQBitmap mask( w, h, TRUE );
   TQPixmap dragPixmap( w, h );
   dragPixmap.fill( black );
 
   TQPainter p;
-  p.begin( &tqmask );
+  p.begin( &mask );
   p.setPen( white );
   p.drawPixmap( 0, 0, mDragMask );
   p.drawText( pixmap()->width()+sep, 0, w-pixmap()->width()+sep,
@@ -136,7 +136,7 @@ void CDragLabel::prepPixmap( KURLDrag &uriDrag )
   p.drawPixmap( 0, 0, *pixmap() );
   p.end();
 
-  dragPixmap.setMask( tqmask );
+  dragPixmap.setMask( mask );
 
   TQPoint hotspot( pixmap()->width(), pixmap()->height()/2 );
   uriDrag.setPixmap( dragPixmap, hotspot );
diff --git a/khexedit/draglabel.h b/khexedit/draglabel.h
index 16176f0..44f355b 100644
--- a/khexedit/draglabel.h
+++ b/khexedit/draglabel.h
@@ -35,7 +35,7 @@ class CDragLabel: public TQLabel
   TQ_OBJECT
 
   public:
-    CDragLabel( TQWidget *tqparent );
+    CDragLabel( TQWidget *parent );
     ~CDragLabel( void );
 
     void setUrl( const TQString &url );
diff --git a/khexedit/exportdialog.cc b/khexedit/exportdialog.cc
index 7ea3573..d5b90e1 100644
--- a/khexedit/exportdialog.cc
+++ b/khexedit/exportdialog.cc
@@ -31,9 +31,9 @@
 #include <tqpushbutton.h>
 
 
-CExportDialog::CExportDialog( TQWidget *tqparent, char *name, bool modal )
+CExportDialog::CExportDialog( TQWidget *parent, char *name, bool modal )
   :KDialogBase( Tabbed, i18n("Export Document"), Help|Ok|Cancel, Ok,
-		tqparent, name,  modal )
+		parent, name,  modal )
 {
   setHelp( "khexedit/khexedit.html", TQString() );
 
diff --git a/khexedit/exportdialog.h b/khexedit/exportdialog.h
index 52adac8..ee89134 100644
--- a/khexedit/exportdialog.h
+++ b/khexedit/exportdialog.h
@@ -58,7 +58,7 @@ class CExportDialog : public KDialogBase
       option_max
     };
 
-    CExportDialog( TQWidget *tqparent = 0, char *name = 0, bool modal = false );
+    CExportDialog( TQWidget *parent = 0, char *name = 0, bool modal = false );
     ~CExportDialog( void );
     void writeConfiguration( void );
 
diff --git a/khexedit/fileinfodialog.cc b/khexedit/fileinfodialog.cc
index 08fa5b1..957f1d7 100644
--- a/khexedit/fileinfodialog.cc
+++ b/khexedit/fileinfodialog.cc
@@ -33,10 +33,10 @@
 class CStatisticListViewItem : public TQListViewItem
 {
   public:
-    CStatisticListViewItem( TQListView * tqparent, TQListViewItem * after,
+    CStatisticListViewItem( TQListView * parent, TQListViewItem * after,
                             TQString label1, TQString label2, TQString label3, TQString label4,
                             TQString label5, TQString label6, TQString label7, int i, int o)
-    : TQListViewItem( tqparent, after, label1, label2, label3, label4, label5, label6, label7),
+    : TQListViewItem( parent, after, label1, label2, label3, label4, label5, label6, label7),
       item( i ),
       occurrence( o )
     {}
@@ -69,9 +69,9 @@ class CStatisticListViewItem : public TQListViewItem
 
 
 
-CFileInfoDialog::CFileInfoDialog( TQWidget *tqparent,const char *name,bool modal)
+CFileInfoDialog::CFileInfoDialog( TQWidget *parent,const char *name,bool modal)
   :KDialogBase( Plain, i18n("Statistics"), Help|User1|Cancel, User1,
-		tqparent, name, modal, true, i18n("&Update") ),
+		parent, name, modal, true, i18n("&Update") ),
    mBusy(false), mDirty(false)
 {
   setHelp( "khexedit/khexedit.html", TQString() );
diff --git a/khexedit/fileinfodialog.h b/khexedit/fileinfodialog.h
index 5c8528f..816c972 100644
--- a/khexedit/fileinfodialog.h
+++ b/khexedit/fileinfodialog.h
@@ -39,7 +39,7 @@ class CFileInfoDialog : public KDialogBase
   TQ_OBJECT
   
   public:
-    CFileInfoDialog( TQWidget *tqparent=0, const char *name=0,bool modal=false );
+    CFileInfoDialog( TQWidget *parent=0, const char *name=0,bool modal=false );
     ~CFileInfoDialog( void );
 
     void setStatistics( void );
diff --git a/khexedit/hexbuffer.cc b/khexedit/hexbuffer.cc
index 25c1330..dcfdd91 100644
--- a/khexedit/hexbuffer.cc
+++ b/khexedit/hexbuffer.cc
@@ -1609,7 +1609,7 @@ void CHexBuffer::drawText( TQPainter &paint, uint line, int sx, int x1, int x2 )
 
   //
   // Draw the bookmark identifiers on this line (if any).  We use the
-  // bittqmask to minimize the number of times we try to draw the bookmarks.
+  // bitmask to minimize the number of times we try to draw the bookmarks.
   //
   int bookmarkPosition = 0;
   if( mBookmarkMap.testBit(fileOffset/200) ||
diff --git a/khexedit/hexeditorwidget.cc b/khexedit/hexeditorwidget.cc
index 5b17d60..6235e09 100644
--- a/khexedit/hexeditorwidget.cc
+++ b/khexedit/hexeditorwidget.cc
@@ -47,8 +47,8 @@
 
 
 
-CHexEditorWidget::CHexEditorWidget( TQWidget *tqparent, const char *name )
-  : TQWidget( tqparent, name )
+CHexEditorWidget::CHexEditorWidget( TQWidget *parent, const char *name )
+  : TQWidget( parent, name )
 {
   CHexBuffer *hexBuffer = new CHexBuffer;
   if( hexBuffer == 0 ) { return; }
diff --git a/khexedit/hexeditorwidget.h b/khexedit/hexeditorwidget.h
index 92491e5..def98e0 100644
--- a/khexedit/hexeditorwidget.h
+++ b/khexedit/hexeditorwidget.h
@@ -71,7 +71,7 @@ class CHexEditorWidget : public TQWidget
     };
 
   public:
-    CHexEditorWidget( TQWidget *tqparent = 0, const char *name = 0 );
+    CHexEditorWidget( TQWidget *parent = 0, const char *name = 0 );
     ~CHexEditorWidget( void );
 
     void initialize( void );
diff --git a/khexedit/hexmanagerwidget.cc b/khexedit/hexmanagerwidget.cc
index 40f72fe..0059c0a 100644
--- a/khexedit/hexmanagerwidget.cc
+++ b/khexedit/hexmanagerwidget.cc
@@ -23,11 +23,11 @@
 #include "hexmanagerwidget.h"
 #include "searchbar.h"
 
-CHexManagerWidget::CHexManagerWidget( TQWidget *tqparent, const char *name,
+CHexManagerWidget::CHexManagerWidget( TQWidget *parent, const char *name,
 				      EConversionPosition conversionPosition,
 				      EPosition tabBarPosition,
 				      EPosition searchBarPosition )
-  : TQWidget( tqparent, name )
+  : TQWidget( parent, name )
 {
   mValid = false;
 
@@ -258,8 +258,8 @@ int CHexManagerWidget::preferredWidth( void )
 
 
 
-CTabBar::CTabBar( TQWidget *tqparent, char *name )
-  :TQTabBar( tqparent, name )
+CTabBar::CTabBar( TQWidget *parent, char *name )
+  :TQTabBar( parent, name )
 {
   connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotSelected(int)) );
 }
diff --git a/khexedit/hexmanagerwidget.h b/khexedit/hexmanagerwidget.h
index e4b4652..b04fbc8 100644
--- a/khexedit/hexmanagerwidget.h
+++ b/khexedit/hexmanagerwidget.h
@@ -78,7 +78,7 @@ class CTabBar : public TQTabBar
   TQ_OBJECT
 
   public:
-    CTabBar( TQWidget *tqparent=0, char *name=0 );
+    CTabBar( TQWidget *parent=0, char *name=0 );
     void addName( const TQString &name );
     void removeName( const TQString &name );
     void changeName( const TQString &curName, const TQString &newName );
@@ -119,7 +119,7 @@ class CHexManagerWidget : public TQWidget
     };      
 
   public:
-    CHexManagerWidget( TQWidget *tqparent = 0, const char *name = 0, 
+    CHexManagerWidget( TQWidget *parent = 0, const char *name = 0, 
 		       EConversionPosition state = Embed,
 		       EPosition tabBarPosition = HideItem,
 		       EPosition searchBarPosition = HideItem );
diff --git a/khexedit/hextoolwidget.cc b/khexedit/hextoolwidget.cc
index 7c80583..48a6a08 100644
--- a/khexedit/hextoolwidget.cc
+++ b/khexedit/hextoolwidget.cc
@@ -29,8 +29,8 @@
 #include <tqcombobox.h>
 
 
-CHexToolWidget::CHexToolWidget( TQWidget *tqparent, const char *name )
-  : TQFrame( tqparent, name )
+CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name )
+  : TQFrame( parent, name )
 {
   setFrameStyle( TQFrame::Panel | TQFrame::Raised );
   setLineWidth( 1 );
@@ -192,7 +192,7 @@ void CHexToolWidget::bitWidthChanged( int /*i*/ )
 //
 unsigned long CHexToolWidget::bitValue( SCursorState &state, int n )
 {
-  static const unsigned char bittqmask[9] =
+  static const unsigned char bitmask[9] =
   {
     0, 1<<7, 3<<6, 7<<5, 15<<4, 31<<3, 63<<2, 127<<1, 255
   };
@@ -217,9 +217,9 @@ unsigned long CHexToolWidget::bitValue( SCursorState &state, int n )
     int this_time = ((8-bit)>=n)?n:(8-bit);
 
     //
-    // tqmask to get only the bit's we're swallowing
+    // mask to get only the bit's we're swallowing
     //
-    c &= bittqmask[this_time];
+    c &= bitmask[this_time];
 
     //
     // shift down to get bit's in low part of byte
diff --git a/khexedit/hextoolwidget.h b/khexedit/hextoolwidget.h
index 2c2abe5..cdaaad6 100644
--- a/khexedit/hextoolwidget.h
+++ b/khexedit/hextoolwidget.h
@@ -37,7 +37,7 @@ class CHexToolWidget : public TQFrame
   TQ_OBJECT
 
   public:
-    CHexToolWidget( TQWidget *tqparent = 0, const char *name = 0 );
+    CHexToolWidget( TQWidget *parent = 0, const char *name = 0 );
     ~CHexToolWidget( void );
 
     void writeConfiguration( KConfig &config );
diff --git a/khexedit/hexvalidator.cc b/khexedit/hexvalidator.cc
index 28325a9..74126e7 100644
--- a/khexedit/hexvalidator.cc
+++ b/khexedit/hexvalidator.cc
@@ -23,9 +23,9 @@
 #include <tqwidget.h>
 #include "hexvalidator.h"
 
-CHexValidator::CHexValidator( TQWidget *tqparent, EState state,
+CHexValidator::CHexValidator( TQWidget *parent, EState state,
 			      const char *name )
-  :TQValidator( TQT_TQOBJECT(tqparent), name )
+  :TQValidator( TQT_TQOBJECT(parent), name )
 {
   setState( state );
 }
diff --git a/khexedit/hexvalidator.h b/khexedit/hexvalidator.h
index 551bc4f..387fcbe 100644
--- a/khexedit/hexvalidator.h
+++ b/khexedit/hexvalidator.h
@@ -39,7 +39,7 @@ class CHexValidator: public TQValidator
     };
 
   public:
-    CHexValidator( TQWidget *tqparent, EState state, const char *name = 0 );
+    CHexValidator( TQWidget *parent, EState state, const char *name = 0 );
     ~CHexValidator( void );
     TQValidator::State validate( TQString &string, int &pos ) const;
     void setState( EState state );
diff --git a/khexedit/hexviewwidget.cc b/khexedit/hexviewwidget.cc
index ca2edd2..555e0cc 100644
--- a/khexedit/hexviewwidget.cc
+++ b/khexedit/hexviewwidget.cc
@@ -165,11 +165,11 @@ void CDragManager::setupTimer( void )
 
 
 //
-// This widget will use the entire space of the tqparent widget
+// This widget will use the entire space of the parent widget
 //
-CHexViewWidget::CHexViewWidget( TQWidget *tqparent, const char *name,
+CHexViewWidget::CHexViewWidget( TQWidget *parent, const char *name,
 				CHexBuffer *hexBuffer )
-  : TQFrame( tqparent, name,
+  : TQFrame( parent, name,
 	    #ifdef USE_NORTHWEST_GRAVITY
 	    TQt::WStaticContents
 	    #else
@@ -177,7 +177,7 @@ CHexViewWidget::CHexViewWidget( TQWidget *tqparent, const char *name,
 	    #endif
 	    ), mScrollBarSize( 16 )
 {
-  if( tqparent == 0 || hexBuffer == 0 ) { return; }
+  if( parent == 0 || hexBuffer == 0 ) { return; }
 
   //
   // TQt 2.0:
@@ -967,10 +967,10 @@ void CHexViewWidget::copy( void )
   disconnect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()),
 	     this,TQT_SLOT(clipboardChanged()));
   //
-  // Note: Do no give the CHexDrag a tqparent != 0. The clipboard
+  // Note: Do no give the CHexDrag a parent != 0. The clipboard
   // owns the current dragdata and will destroy it on exit or
-  // when it receives a new object. If the CHexDrag has a tqparent
-  // != 0, the CHexDrag object will be destroyed when the tqparent
+  // when it receives a new object. If the CHexDrag has a parent
+  // != 0, the CHexDrag object will be destroyed when the parent
   // is destroyed. We will then have a double destroy situation
   // when the app. is closed (=> segfault).
   //
@@ -1670,7 +1670,7 @@ void CHexViewWidget::dropEvent( TQDropEvent *e )
   {
     //
     // This widget can not itself open a file so it will simply pass
-    // the request to a tqparent that can (hopefully) do this
+    // the request to a parent that can (hopefully) do this
     //
     for( KURL::List::ConstIterator it = list.begin(); it != list.end(); it++ )
     {
diff --git a/khexedit/hexviewwidget.h b/khexedit/hexviewwidget.h
index 65f1164..1e3f02c 100644
--- a/khexedit/hexviewwidget.h
+++ b/khexedit/hexviewwidget.h
@@ -43,8 +43,8 @@ class CScrollBar : public TQScrollBar
   TQ_OBJECT
  
   public:
-    CScrollBar( Qt::Orientation o, TQWidget *tqparent, const char *name = 0 )
-      : TQScrollBar( o, tqparent, name )
+    CScrollBar( Qt::Orientation o, TQWidget *parent, const char *name = 0 )
+      : TQScrollBar( o, parent, name )
     {
     } 
   
@@ -103,7 +103,7 @@ class CHexViewWidget : public TQFrame
   TQ_OBJECT
 
   public:
-    CHexViewWidget( TQWidget *tqparent, const char *name, CHexBuffer *hexBuffer );
+    CHexViewWidget( TQWidget *parent, const char *name, CHexBuffer *hexBuffer );
     ~CHexViewWidget( void );
     inline bool widgetValid( void );
 
diff --git a/khexedit/lib/kbytesedit.h b/khexedit/lib/kbytesedit.h
index defb734..915276b 100644
--- a/khexedit/lib/kbytesedit.h
+++ b/khexedit/lib/kbytesedit.h
@@ -70,7 +70,7 @@ class KHEXEDIT_EXPORT KBytesEdit : public KHexEdit
       * @param S size of used memory
       * @param RS_ real size of the memory
       * @param KM keep the memory on resize (RS_ is then the maximum size)
-      * @param Parent tqparent widget
+      * @param Parent parent widget
       * @param Name name for this widget
       * @param F flags
       */
diff --git a/khexedit/lib/kcolumnsview.h b/khexedit/lib/kcolumnsview.h
index ea5f520..3323df9 100644
--- a/khexedit/lib/kcolumnsview.h
+++ b/khexedit/lib/kcolumnsview.h
@@ -47,7 +47,7 @@ class KColumnsView : public TQScrollView
    friend class KColumn;
 
   public:
-    KColumnsView( /*bool R = false,*/ TQWidget *tqparent=0, const char *name=0, WFlags Flags=0 );
+    KColumnsView( /*bool R = false,*/ TQWidget *parent=0, const char *name=0, WFlags Flags=0 );
     virtual ~KColumnsView();
 
   public: // drawing
diff --git a/khexedit/listview.cc b/khexedit/listview.cc
index b6af69b..3217cac 100644
--- a/khexedit/listview.cc
+++ b/khexedit/listview.cc
@@ -24,8 +24,8 @@
 #include "listview.h"
 
 
-CListView::CListView( TQWidget *tqparent, const char *name, int visibleItem )
-  :KListView( tqparent, name ),  mVisibleItem(TQMAX( 1, visibleItem ))
+CListView::CListView( TQWidget *parent, const char *name, int visibleItem )
+  :KListView( parent, name ),  mVisibleItem(TQMAX( 1, visibleItem ))
 {
   setVisibleItem(visibleItem);
 }
diff --git a/khexedit/listview.h b/khexedit/listview.h
index f549539..975f3da 100644
--- a/khexedit/listview.h
+++ b/khexedit/listview.h
@@ -29,7 +29,7 @@ class CListView : public KListView
   TQ_OBJECT
 
   public:
-    CListView( TQWidget *tqparent=0, const char *name=0, int visibleItem=10 );
+    CListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 );
     
     void setVisibleItem( int visibleItem, bool updateSize=true );
     virtual TQSize tqsizeHint( void ) const; 
diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc
index 4669d9d..a754e72 100644
--- a/khexedit/optiondialog.cc
+++ b/khexedit/optiondialog.cc
@@ -64,9 +64,9 @@ static void enableWidget( TQWidget *w, bool state )
 
 
 
-COptionDialog::COptionDialog( TQWidget *tqparent, char *name, bool modal )
+COptionDialog::COptionDialog( TQWidget *parent, char *name, bool modal )
   :KDialogBase( IconList, i18n("Configure"), Help|Default|Apply|Ok|Cancel,
-		Ok, tqparent, name, modal, true )
+		Ok, parent, name, modal, true )
 {
   setHelp( "khexedit/khexedit.html", TQString() );
 
@@ -1050,8 +1050,8 @@ SDisplayCursor::EFocusMode COptionDialog::cursorFocusMode( void )
 
 
 
-CColorListBox::CColorListBox( TQWidget *tqparent, const char *name, WFlags f )
-  :KListBox( tqparent, name, f ), mCurrentOnDragEnter(-1)
+CColorListBox::CColorListBox( TQWidget *parent, const char *name, WFlags f )
+  :KListBox( parent, name, f ), mCurrentOnDragEnter(-1)
 {
   connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) );
   setAcceptDrops( true);
diff --git a/khexedit/optiondialog.h b/khexedit/optiondialog.h
index 7a8f678..0a54dab 100644
--- a/khexedit/optiondialog.h
+++ b/khexedit/optiondialog.h
@@ -46,7 +46,7 @@ class CColorListBox : public KListBox
   TQ_OBJECT
 
   public:
-    CColorListBox( TQWidget *tqparent=0, const char * name=0, WFlags f=0 );
+    CColorListBox( TQWidget *parent=0, const char * name=0, WFlags f=0 );
     void setColor( uint index, const TQColor &color );
     const TQColor color( uint index );
 
@@ -107,7 +107,7 @@ class COptionDialog : public KDialogBase
       page_max
     };
 
-    COptionDialog( TQWidget *tqparent = 0, char *name = 0, bool modal = false );
+    COptionDialog( TQWidget *parent = 0, char *name = 0, bool modal = false );
     ~COptionDialog( void );
 
     void setLayout( SDisplayLayout &tqlayout, SDisplayLine &line );
diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp
index bfcb6be..cb2b549 100644
--- a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp
+++ b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp
@@ -26,8 +26,8 @@
 #include "kbyteseditwidget.h"
 
 
-KBytesEditWidget::KBytesEditWidget( TQWidget *tqparent, const char *name, const TQStringList & )
-  : TQWidget( tqparent, name)
+KBytesEditWidget::KBytesEditWidget( TQWidget *parent, const char *name, const TQStringList & )
+  : TQWidget( parent, name)
 {
   TQHBoxLayout* Layout = new TQHBoxLayout( this );
   BytesEdit = new KHE::KBytesEdit( this, "BytesEdit" );
diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.h b/khexedit/parts/kbytesedit/kbyteseditwidget.h
index 9747ae6..1f44fbf 100644
--- a/khexedit/parts/kbytesedit/kbyteseditwidget.h
+++ b/khexedit/parts/kbytesedit/kbyteseditwidget.h
@@ -47,7 +47,7 @@ class KBytesEditWidget : public TQWidget, public KHE::BytesEditInterface,
 
   public:
     /** constructor API as demanded by KGenericFactory */
-    KBytesEditWidget( TQWidget *tqparent, const char *name, const TQStringList & = TQStringList() );
+    KBytesEditWidget( TQWidget *parent, const char *name, const TQStringList & = TQStringList() );
 
   public: // bytesedit interface
     /** hands over to the editor a new byte array.
diff --git a/khexedit/parts/kpart/khepartfactory.h b/khexedit/parts/kpart/khepartfactory.h
index 38aafd9..15f821c 100644
--- a/khexedit/parts/kpart/khepartfactory.h
+++ b/khexedit/parts/kpart/khepartfactory.h
@@ -35,7 +35,7 @@ class KHexEditPartFactory : public KParts::Factory
 
   public:
     virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
-                                            TQObject *tqparent, const char *name,
+                                            TQObject *parent, const char *name,
                                             const char *classname, const TQStringList &args );
     static KInstance* instance();
 
diff --git a/khexedit/printdialogpage.cc b/khexedit/printdialogpage.cc
index ff65f10..cc01c8a 100644
--- a/khexedit/printdialogpage.cc
+++ b/khexedit/printdialogpage.cc
@@ -31,8 +31,8 @@
 
 #include "printdialogpage.h"
 
-LayoutDialogPage::LayoutDialogPage( TQWidget *tqparent, const char *name )
- : KPrintDialogPage( tqparent, name )
+LayoutDialogPage::LayoutDialogPage( TQWidget *parent, const char *name )
+ : KPrintDialogPage( parent, name )
 {
   mConfig = 0;
   setTitle( i18n( "Page Layout" ) );
diff --git a/khexedit/printdialogpage.h b/khexedit/printdialogpage.h
index 6e2a1fb..1ad0ee4 100644
--- a/khexedit/printdialogpage.h
+++ b/khexedit/printdialogpage.h
@@ -36,7 +36,7 @@ class LayoutDialogPage : public KPrintDialogPage
   TQ_OBJECT
 
  public:
-    LayoutDialogPage( TQWidget *tqparent = 0, const char *name = 0 );
+    LayoutDialogPage( TQWidget *parent = 0, const char *name = 0 );
     ~LayoutDialogPage( void );
 
     void getOptions( TQMap<TQString,TQString>& opts, bool incldef = false );
diff --git a/khexedit/searchbar.cc b/khexedit/searchbar.cc
index 3de511d..3122980 100644
--- a/khexedit/searchbar.cc
+++ b/khexedit/searchbar.cc
@@ -51,8 +51,8 @@ static const char * close_xpm[] = {
 "                ",
 "                "};
 
-CSearchBar::CSearchBar( TQWidget *tqparent, const char *name, WFlags f )
-  :TQFrame( tqparent, name, f )
+CSearchBar::CSearchBar( TQWidget *parent, const char *name, WFlags f )
+  :TQFrame( parent, name, f )
 {
   setFrameStyle( TQFrame::Panel | TQFrame::Raised );
   setLineWidth( 1 );
diff --git a/khexedit/searchbar.h b/khexedit/searchbar.h
index 00b25a8..25b9011 100644
--- a/khexedit/searchbar.h
+++ b/khexedit/searchbar.h
@@ -36,7 +36,7 @@ class CSearchBar : public TQFrame
   TQ_OBJECT
   
   public:
-    CSearchBar( TQWidget *tqparent=0, const char *name=0, WFlags f=0 );
+    CSearchBar( TQWidget *parent=0, const char *name=0, WFlags f=0 );
     virtual bool eventFilter( TQObject *o, TQEvent *e );
 
   public slots:
diff --git a/khexedit/statusbarprogress.cc b/khexedit/statusbarprogress.cc
index fda0c9d..ca1e918 100644
--- a/khexedit/statusbarprogress.cc
+++ b/khexedit/statusbarprogress.cc
@@ -28,16 +28,16 @@
 #include <klocale.h>
 #include <tqstyle.h>
 
-CStatusBarProgress::CStatusBarProgress( TQWidget *tqparent, const char *name )
-  : TQFrame(tqparent, name), TQRangeControl(0, 100, 1, 10, 0),
+CStatusBarProgress::CStatusBarProgress( TQWidget *parent, const char *name )
+  : TQFrame(parent, name), TQRangeControl(0, 100, 1, 10, 0),
     mOrientation(Horizontal )
 {
   initialize();
 }
 
 CStatusBarProgress::CStatusBarProgress( Orientation orientation,
-					TQWidget *tqparent, const char *name )
-  : TQFrame(tqparent, name), TQRangeControl(0, 100, 1, 10, 0),
+					TQWidget *parent, const char *name )
+  : TQFrame(parent, name), TQRangeControl(0, 100, 1, 10, 0),
     mOrientation( orientation )
 {
   initialize();
@@ -45,8 +45,8 @@ CStatusBarProgress::CStatusBarProgress( Orientation orientation,
 
 CStatusBarProgress::CStatusBarProgress( int minValue, int maxValue, int value,
 					Orientation orientation,
-					TQWidget *tqparent, const char *name )
-  : TQFrame(tqparent, name), TQRangeControl(minValue, maxValue, 1, 10, value),
+					TQWidget *parent, const char *name )
+  : TQFrame(parent, name), TQRangeControl(minValue, maxValue, 1, 10, value),
     mOrientation(orientation)
 {
   initialize();
diff --git a/khexedit/statusbarprogress.h b/khexedit/statusbarprogress.h
index 43dfd9d..f477055 100644
--- a/khexedit/statusbarprogress.h
+++ b/khexedit/statusbarprogress.h
@@ -47,18 +47,18 @@ class CStatusBarProgress : public TQFrame, public TQRangeControl
   /** 
   * Construct a default progress bar. Orientation is horizontal. 
   */
-  CStatusBarProgress(TQWidget *tqparent=0, const char *name=0);
+  CStatusBarProgress(TQWidget *parent=0, const char *name=0);
 
   /** 
   * Construct a KProgress bar with an orientation. 
   */
-  CStatusBarProgress(Orientation, TQWidget *tqparent=0, const char *name=0);
+  CStatusBarProgress(Orientation, TQWidget *parent=0, const char *name=0);
 
   /** 
   * Construct a KProgress bar with minimum, maximum and initial value. 
   */
   CStatusBarProgress(int minValue, int maxValue, int value, Orientation, 
-		     TQWidget *tqparent=0, const char *name=0);
+		     TQWidget *parent=0, const char *name=0);
 	
   /** 
   * Destructor 
diff --git a/khexedit/stringdialog.cc b/khexedit/stringdialog.cc
index d960da1..efd0933 100644
--- a/khexedit/stringdialog.cc
+++ b/khexedit/stringdialog.cc
@@ -34,9 +34,9 @@
 #include <tqpushbutton.h>
 
 
-CStringDialog::CStringDialog( TQWidget *tqparent, const char *name, bool modal )
+CStringDialog::CStringDialog( TQWidget *parent, const char *name, bool modal )
   : KDialogBase( Plain, i18n("Extract Strings"), Help|User1|Cancel, User1,
-		 tqparent, name, modal, true, i18n("&Update") ),
+		 parent, name, modal, true, i18n("&Update") ),
   mMaxLength(0), mBusy(false), mDirty(false)
 {
   setHelp( "khexedit/khexedit.html", TQString() );
diff --git a/khexedit/stringdialog.h b/khexedit/stringdialog.h
index 36b46f8..b854971 100644
--- a/khexedit/stringdialog.h
+++ b/khexedit/stringdialog.h
@@ -44,7 +44,7 @@ class CStringDialog : public KDialogBase
   TQ_OBJECT
   
   public:
-    CStringDialog( TQWidget *tqparent=0, const char *name = 0, bool modal=false );
+    CStringDialog( TQWidget *parent=0, const char *name = 0, bool modal=false );
     ~CStringDialog( void );
 
     int  updateList( CProgress &p ); 
diff --git a/khexedit/toplevel.cc b/khexedit/toplevel.cc
index db63594..7ac6a9a 100644
--- a/khexedit/toplevel.cc
+++ b/khexedit/toplevel.cc
@@ -288,7 +288,7 @@ actionCollection());
 
   mDragLabel = new CDragLabel(this);
   mDragLabel->setPixmap( UserIcon( "hexdrag" ) );
-  mDragLabel->setDragMask( UserIcon( "hextqmask" ) );
+  mDragLabel->setDragMask( UserIcon( "hexmask" ) );
   mDragLabel->setEnabled( false ); // Enabled once we open a document
   TQToolTip::add( mDragLabel, i18n("Drag document") );
  (void) new KWidgetAction(mDragLabel, i18n("Drag Document"), 0, TQT_TQOBJECT(editor()), TQT_SLOT(options()), actionCollection(), "drag_document");