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

author: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2011-12-15 15:50:52 -0600
committer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2011-12-15 15:50:52 -0600
commit: bf280726d5d22f33d33e4f9e771220c725249407 (patch)
tree: 48b7496821910eb85179d543acee981cf5d16dd8 /khexedit
parent: c78266617c282543427d2c000b3b68fe2b6b6722 (diff)
download: tdeutils-bf280726d5d22f33d33e4f9e771220c725249407.tar.gz
tdeutils-bf280726d5d22f33d33e4f9e771220c725249407.zip
58 files changed, 499 insertions, 499 deletions
diff --git a/khexedit/bitswapwidget.cc b/khexedit/bitswapwidget.cc
index 7e7f14c..14c81c1 100644
--- a/khexedit/bitswapwidget.cc
+++ b/khexedit/bitswapwidget.cc
@@ -81,7 +81,7 @@ void CDigitLabel::setDotPosition( uint dotPosition )
 
 
 
-TQSize CDigitLabel::tqsizeHint( void ) const
+TQSize CDigitLabel::sizeHint( void ) const
 {
   int h = fontMetrics().height();
   TQSize s( h, h ); // Retangular
@@ -98,13 +98,13 @@ void CDigitLabel::drawContents( TQPainter *p )
 
   if( hasFocus() == true )
   {
-    p->fillRect( cr, tqpalette().active().highlight() );
-    p->setPen( tqpalette().active().highlightedText() );
+    p->fillRect( cr, palette().active().highlight() );
+    p->setPen( palette().active().highlightedText() );
   }
   else
   {
-    p->fillRect( cr, tqpalette().active().base() );
-    p->setPen( tqpalette().active().text() );
+    p->fillRect( cr, palette().active().base() );
+    p->setPen( palette().active().text() );
   }
 
   if( mDotPosition != 0 )
@@ -132,7 +132,7 @@ void CDigitLabel::drawContents( TQPainter *p )
 
   TQString text;
   text.setNum( mDigit );
-  p->drawText( 0, 0, cr.width(), cr.height(), tqalignment(), text );
+  p->drawText( 0, 0, cr.width(), cr.height(), alignment(), text );
 
   
 
@@ -183,9 +183,9 @@ CByteWidget::CByteWidget( TQWidget *parent, const char *name )
   {
     mDigit[i] = new CDigitLabel( this, 7-i );
     mDigit[i]->setLineWidth( 1 );
-    mDigit[i]->setFixedSize( mDigit[i]->tqsizeHint()*2 );
+    mDigit[i]->setFixedSize( mDigit[i]->sizeHint()*2 );
     mDigit[i]->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-    mDigit[i]->tqsetAlignment( AlignCenter );
+    mDigit[i]->setAlignment( AlignCenter );
     connect( mDigit[i], TQT_SIGNAL(stepCell(const TQObject *, bool )),
 	     this, TQT_SLOT(stepCell(const TQObject *, bool )));
     connect( mDigit[i], TQT_SIGNAL(valueChanged(const TQObject *, uint, bool )),
diff --git a/khexedit/bitswapwidget.h b/khexedit/bitswapwidget.h
index 0dfccbf..51a582f 100644
--- a/khexedit/bitswapwidget.h
+++ b/khexedit/bitswapwidget.h
@@ -22,7 +22,7 @@
 #define _BITSWAP_WIDGET_H_
 
 #include <tqlabel.h>
-#include <tqlayout.h> 
+#include <layout.h> 
 #include <tqstring.h> 
 
 
@@ -35,7 +35,7 @@ class CDigitLabel : public TQLabel
     CDigitLabel( TQWidget *parent, uint digit = 0, const char *name=0 );
     ~CDigitLabel( void );
 
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
     inline uint value( void );
 
   signals:
diff --git a/khexedit/chartabledialog.cc b/khexedit/chartabledialog.cc
index 4475604..b0cb49b 100644
--- a/khexedit/chartabledialog.cc
+++ b/khexedit/chartabledialog.cc
@@ -22,7 +22,7 @@
 
 #include <tqlabel.h>
 #include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqspinbox.h>
 
 #include <kglobalsettings.h>
@@ -69,7 +69,7 @@ CCharTableDialog::CCharTableDialog( TQWidget *parent, const char *name,
 
   text = i18n("Insert this number of characters:");
   TQLabel *label = new TQLabel( text, plainPage() );
-  label->setFixedWidth( label->tqsizeHint().width() );
+  label->setFixedWidth( label->sizeHint().width() );
   hbox->addWidget( label );
 
   mInputCountSpin = new TQSpinBox( plainPage(), "spin" );
diff --git a/khexedit/converterdialog.cc b/khexedit/converterdialog.cc
index 6f3a82e..e9b1732 100644
--- a/khexedit/converterdialog.cc
+++ b/khexedit/converterdialog.cc
@@ -20,7 +20,7 @@
 
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 
diff --git a/khexedit/dialog.cc b/khexedit/dialog.cc
index e04bb30..a598b04 100644
--- a/khexedit/dialog.cc
+++ b/khexedit/dialog.cc
@@ -24,7 +24,7 @@
 
 #include <tqbuttongroup.h>
 #include <tqfileinfo.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvalidator.h>
 
 #include <kfiledialog.h>
@@ -533,7 +533,7 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal )
   text = i18n("For&mat (replace):");
   label = new TQLabel( mReplaceSelector, text, plainPage() );
   if( label == 0 ) { return; }
-  label->setFixedHeight( label->tqsizeHint().height() );
+  label->setFixedHeight( label->sizeHint().height() );
 
   vbox->addWidget( label );
   vbox->addWidget( mReplaceSelector );
@@ -549,7 +549,7 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal )
 
   label = new TQLabel( mReplaceInput, i18n("Rep&lace:"), plainPage() );
   if( label == 0 ) { return; }
-  label->setFixedHeight( label->tqsizeHint().height() );
+  label->setFixedHeight( label->sizeHint().height() );
 
   vbox->addWidget( label );
   vbox->addWidget( mReplaceInput );
@@ -846,7 +846,7 @@ void CFilterDialog::makeOperandLayout( void )
 
   mOperandSelector = new TQComboBox( false, page );
   if( mOperandSelector == 0 ) { return; }
-  mOperandSelector->setFixedHeight( mOperandSelector->tqsizeHint().height());
+  mOperandSelector->setFixedHeight( mOperandSelector->sizeHint().height());
   mOperandSelector->setMinimumWidth( fontMetrics().width("M")*20 );
   mOperandSelector->insertStringList( formatStrings() );
   connect( mOperandSelector, TQT_SIGNAL(activated(int)),
@@ -891,7 +891,7 @@ void CFilterDialog::makeBitSwapLayout( void )
   text = i18n("Swap rule");
   TQLabel *label = new TQLabel( text, page );
   if( label == 0 ) { return; }
-  label->setFixedHeight( label->tqsizeHint().height() );
+  label->setFixedHeight( label->sizeHint().height() );
   vbox->addWidget( label );
 
   mByteWidget = new CByteWidget( page );
@@ -902,7 +902,7 @@ void CFilterDialog::makeBitSwapLayout( void )
 
   text = i18n("&Reset");
   TQPushButton *resetButton = new TQPushButton( text, page );
-  resetButton->setFixedHeight( resetButton->tqsizeHint().height() );
+  resetButton->setFixedHeight( resetButton->sizeHint().height() );
   connect( resetButton, TQT_SIGNAL(clicked()), mByteWidget, TQT_SLOT(reset()) );
 
   hbox->addWidget( resetButton );
@@ -1237,7 +1237,7 @@ void centerDialog( TQWidget *widget, TQWidget *centerParent )
   }
 
   TQPoint point = centerParent->mapToGlobal( TQPoint(0,0) );
-  TQRect pos    = centerParent->tqgeometry();
+  TQRect pos    = centerParent->geometry();
 
   widget->setGeometry( point.x() + pos.width()/2  - widget->width()/2,
 		       point.y() + pos.height()/2 - widget->height()/2,
@@ -1253,7 +1253,7 @@ void centerDialogBottom( TQWidget *widget, TQWidget *centerParent )
   }
 
   TQPoint point = centerParent->mapToGlobal( TQPoint(0,0) );
-  TQRect pos    = centerParent->tqgeometry();
+  TQRect pos    = centerParent->geometry();
 
   widget->setGeometry( point.x() + pos.width()/2  - widget->width()/2,
 		       point.y() + pos.height() - widget->height(),
diff --git a/khexedit/exportdialog.cc b/khexedit/exportdialog.cc
index d5b90e1..612c245 100644
--- a/khexedit/exportdialog.cc
+++ b/khexedit/exportdialog.cc
@@ -208,17 +208,17 @@ void CExportDialog::setupDestinationPage( void )
   vbox->addSpacing( fontMetrics().lineSpacing() );
   
   TQRadioButton *radio1 = new TQRadioButton( i18n("&Everything"), group );
-  radio1->setFixedSize( radio1->tqsizeHint() );
+  radio1->setFixedSize( radio1->sizeHint() );
   mDestination.rangeBox->insert( radio1, 0 );
   vbox->addWidget( radio1, 0, AlignLeft );
 
   TQRadioButton *radio2 = new TQRadioButton( i18n("&Selection"), group );
-  radio2->setFixedSize( radio2->tqsizeHint() );
+  radio2->setFixedSize( radio2->sizeHint() );
   mDestination.rangeBox->insert( radio2, 1 );
   vbox->addWidget( radio2, 0, AlignLeft );
 
   TQRadioButton *radio3 = new TQRadioButton( i18n("&Range"), group );
-  radio3->setFixedSize( radio3->tqsizeHint() );
+  radio3->setFixedSize( radio3->sizeHint() );
   mDestination.rangeBox->insert( radio3, 2 );
   vbox->addWidget( radio3, 0, AlignLeft );
 
@@ -264,7 +264,7 @@ void CExportDialog::setupOptionPage( void )
   makeCArrayOption();
   mOptionStack->raiseWidget( (int)option_text );
 
-  TQSize size = mOptionStack->tqsizeHint();
+  TQSize size = mOptionStack->sizeHint();
   size += TQSize(spacingHint()*2, spacingHint()*2);
   page->setMinimumSize( size ); 
 }
@@ -462,11 +462,11 @@ void CExportDialog::browserClicked( void )
   TQString url;
   if( mDestination.formatCombo->currentItem() == option_html )
   {
-    url = KFileDialog::getExistingDirectory( mWorkDir, tqtopLevelWidget() );
+    url = KFileDialog::getExistingDirectory( mWorkDir, topLevelWidget() );
   }
   else
   {
-    url = KFileDialog::getSaveFileName( mWorkDir, "*", tqtopLevelWidget() );
+    url = KFileDialog::getSaveFileName( mWorkDir, "*", topLevelWidget() );
   }
 
   if( url.isEmpty() )
@@ -673,14 +673,14 @@ bool CExportDialog::verifyPackage( const TQString &path )
       }
 
       const TQString prefix = mHtml.prefixInput->text();
-      TQString f1 = TQString("%1%2.html").tqarg(prefix).tqarg("00000000");
-      TQString f2 = TQString("%1%2.html").tqarg(prefix).tqarg("99999999");
+      TQString f1 = TQString("%1%2.html").arg(prefix).arg("00000000");
+      TQString f2 = TQString("%1%2.html").arg(prefix).arg("99999999");
 
       TQString msg = i18n( ""
         "You have specified an existing folder.\n"
 	"If you continue, any existing file in the range "
 	"\"%1\" to \"%2\" can be lost.\n"
-	"Continue?").tqarg(f1).tqarg(f2);
+	"Continue?").arg(f1).arg(f2);
       int reply = KMessageBox::warningContinueCancel( this, msg, title );
       if( reply != KMessageBox::Continue )
       {
diff --git a/khexedit/fileinfodialog.cc b/khexedit/fileinfodialog.cc
index 957f1d7..502eedb 100644
--- a/khexedit/fileinfodialog.cc
+++ b/khexedit/fileinfodialog.cc
@@ -20,7 +20,7 @@
 
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kglobalsettings.h>
 #include <kglobal.h>
@@ -239,13 +239,13 @@ void CFileInfoDialog::setStatistics( SStatisticControl &sc )
     o.sprintf("%03o", i );
     b.sprintf("%s", printBin(i) );
 
-    n = TQString("%1").tqarg( sc.occurrence[i], pre );
+    n = TQString("%1").arg( sc.occurrence[i], pre );
     if( sc.documentSize == 0 )
       p = "0.00";
     else
     {
       double val = 100.0*((double)sc.occurrence[i]/(double)sc.documentSize);
-      p = TQString("%1").tqarg( val, 6, 'f', 2 );
+      p = TQString("%1").arg( val, 6, 'f', 2 );
     }
 
     const TQChar _i((char)i);
diff --git a/khexedit/hexbuffer.cc b/khexedit/hexbuffer.cc
index dcfdd91..e6a5532 100644
--- a/khexedit/hexbuffer.cc
+++ b/khexedit/hexbuffer.cc
@@ -447,8 +447,8 @@ TQString SExportCArray::variableName( uint range ) const
   uint es = elementSize();
   uint numElement = range / es + ((range % es) ? 1 : 0);
 
-  return( TQString("%1 %2[%2]").tqarg(typeString[elementType]).
-	  tqarg(arrayName).tqarg(numElement) );
+  return( TQString("%1 %2[%2]").arg(typeString[elementType]).
+	  arg(arrayName).arg(numElement) );
 }
 
 
@@ -580,9 +580,9 @@ bool CHexBuffer::hasFileName( void )
 
 
 
-int CHexBuffer::setLayout( SDisplayLayout &tqlayout )
+int CHexBuffer::setLayout( SDisplayLayout &layout )
 {
-  mLayout = tqlayout;
+  mLayout = layout;
   mLayout.verify();
 
   if( mLayout.primaryMode == SDisplayLayout::textOnly )
@@ -676,7 +676,7 @@ bool CHexBuffer::toggleEditor( void )
       edit_secondary : edit_primary;
   }
 
-  setEditMode( mEditMode ); // Sets the cursor tqshapes as well
+  setEditMode( mEditMode ); // Sets the cursor shapes as well
 
   if( changed == true )
   {
@@ -766,7 +766,7 @@ void CHexBuffer::setDisableCursor( bool disableCursor )
 }
 
 
-void CHexBuffer::settqCursorShapeModifier( bool alwaysBlock, bool thickInsert )
+void CHexBuffer::setCursorShapeModifier( bool alwaysBlock, bool thickInsert )
 {
   mCursor.setShapeModifier( alwaysBlock, thickInsert );
   setEditMode( mEditMode );
@@ -813,12 +813,12 @@ void CHexBuffer::setEditMode( EEditMode editMode )
 
 
 
-void CHexBuffer::setMaximumSize( uint tqmaximumSize )
+void CHexBuffer::setMaximumSize( uint maximumSize )
 {
-  if( tqmaximumSize == 0 ) { tqmaximumSize = ~0; }
+  if( maximumSize == 0 ) { maximumSize = ~0; }
 
-  mMaximumSize   = tqmaximumSize;
-  mFixedSizeMode = tqmaximumSize == (uint)~0 ? false : true;
+  mMaximumSize   = maximumSize;
+  mFixedSizeMode = maximumSize == (uint)~0 ? false : true;
   mCursor.setFixedSizeMode( mFixedSizeMode );
 
   if( mLayout.offsetVisible == false )
@@ -832,9 +832,9 @@ void CHexBuffer::setMaximumSize( uint tqmaximumSize )
     if( mLayout.offsetMode ==  SDisplayLayout::decimal )
     {
       printOffset = &CHexBuffer::printDecimalOffset;
-      for( mOffsetSize=0; tqmaximumSize > 0; mOffsetSize += 1 )
+      for( mOffsetSize=0; maximumSize > 0; mOffsetSize += 1 )
       {
-	tqmaximumSize = tqmaximumSize / 10;
+	maximumSize = maximumSize / 10;
       }
       mOffsetIndex = 10 - mOffsetSize;
     }
@@ -848,9 +848,9 @@ void CHexBuffer::setMaximumSize( uint tqmaximumSize )
       {
 	printOffset = &CHexBuffer::printHexadecimalSmallOffset;
       }
-      for( mOffsetSize=0; tqmaximumSize > 0; mOffsetSize += 1 )
+      for( mOffsetSize=0; maximumSize > 0; mOffsetSize += 1 )
       {
-	tqmaximumSize = tqmaximumSize / 16;
+	maximumSize = maximumSize / 16;
       }
       if( mOffsetSize > 4 ) { mOffsetSize += 1; } // Space for the ':' sign
       mOffsetIndex = 9 - mOffsetSize;
@@ -952,7 +952,7 @@ int CHexBuffer::writeFile( TQFile &file, CProgress &p )
 
 int CHexBuffer::readFile( TQFile &file, const TQString &url, CProgress &p )
 {
-  if( tqresize( file.size() + 100 ) == false )
+  if( resize( file.size() + 100 ) == false )
   {
     p.finish();
     return( Err_NoMemory );
@@ -1064,7 +1064,7 @@ int CHexBuffer::insertFile( TQFile &file, CProgress &p )
 
 int CHexBuffer::newFile( const TQString &url )
 {
-  if( tqresize( 100 ) == 0 )
+  if( resize( 100 ) == 0 )
   {
     return( Err_NoMemory );
   }
@@ -1923,8 +1923,8 @@ void CHexBuffer::drawHeader( TQPainter &paint, int sx, int width, int y,
     else if( header.pos[i] == SPageHeader::PageNumber )
     {
       msg = i18n("Page %1 of %2")
-        .tqarg(KGlobal::locale()->formatNumber(position.curPage, 0))
-        .tqarg(KGlobal::locale()->formatNumber(position.maxPage, 0));
+        .arg(KGlobal::locale()->formatNumber(position.curPage, 0))
+        .arg(KGlobal::locale()->formatNumber(position.maxPage, 0));
     }
     else if( header.pos[i] == SPageHeader::FileName )
     {
@@ -2091,7 +2091,7 @@ void CHexBuffer::drawCursor( TQPainter &paint, uint line, int startx,
   }
 
   //
-  // Draw the cursor tqshape
+  // Draw the cursor shape
   //
   bool transparent = false;
   if( mActiveEditor == edit_primary )
@@ -2116,7 +2116,7 @@ void CHexBuffer::drawCursor( TQPainter &paint, uint line, int startx,
 	  paint.drawLine( center-2, mFontHeight-1, center+2, mFontHeight-1 );
 	}
       }
-      else // Solid block tqshape
+      else // Solid block shape
       {
 	paint.fillRect( c.x1 - startx, 0, mUnitWidth, mFontHeight, cbg );
 	useFg = true;
@@ -2209,7 +2209,7 @@ void CHexBuffer::drawCursor( TQPainter &paint, uint line, int startx,
   }
 
   //
-  // Draw the cursor tqshape
+  // Draw the cursor shape
   //
   transparent = false;
   if( mActiveEditor == edit_secondary )
@@ -2822,16 +2822,16 @@ int CHexBuffer::exportHtml( const SExportHtml &ex, CProgress &p )
   for( uint i=0; i < numFiles; i++ )
   {
     name.sprintf( "%08d.html", i+1 );
-    fileNames.append( TQString("%1/%2%3").tqarg(ex.package).tqarg(ex.prefix).
+    fileNames.append( TQString("%1/%2%3").arg(ex.package).arg(ex.prefix).
 		      arg(name));
   }
   name.sprintf( "%08d.html", 0 );
-  TQString tocName =TQString("%1/%2%3").tqarg(ex.package).tqarg(ex.prefix).tqarg(name);
+  TQString tocName =TQString("%1/%2%3").arg(ex.package).arg(ex.prefix).arg(name);
 
   TQString linkName;
   if( ex.symLink == true )
   {
-    linkName = TQString("%1/%2").tqarg(ex.package).tqarg("index.html");
+    linkName = TQString("%1/%2").arg(ex.package).arg("index.html");
   }
 
   while( remaining  > 0 )
@@ -2849,7 +2849,7 @@ int CHexBuffer::exportHtml( const SExportHtml &ex, CProgress &p )
 
     THIS_FPTR(printOffset)( mPrintBuf, (startLine-1)*mLayout.lineSize );
     mPrintBuf[mOffsetSize]=0;
-    offset += TQString(" %1 [%2]").tqarg(i18n("to")).tqarg(mPrintBuf);
+    offset += TQString(" %1 [%2]").arg(i18n("to")).arg(mPrintBuf);
     offsets.append(offset);
 
     if( p.expired() == true )
@@ -2981,7 +2981,7 @@ int CHexBuffer::copyText( TQByteArray &array, const SExportRange &range,
 
   uint bytePerLine = mOffsetSize + 1 + (mNumCell + 2)*mLayout.lineSize + 1;
   uint size = (stopLine - startLine + 1)*bytePerLine;
-  if( array.tqresize( size+1 ) == false )
+  if( array.resize( size+1 ) == false )
   {
     return( Err_NoMemory );
   }
@@ -3021,7 +3021,7 @@ int CHexBuffer::copySelectedData( TQByteArray &array )
   }
 
   uint size = stop - start;
-  if( array.tqresize( size ) == false )
+  if( array.resize( size ) == false )
   {
     return( Err_NoMemory );
   }
@@ -4829,7 +4829,7 @@ void CHexBuffer::printHtmlCaption( TQTextStream &os, uint captionType,
     break;
 
     case 3:
-      caption = i18n("Page %1 of %2").tqarg(curPage).tqarg(numPage);
+      caption = i18n("Page %1 of %2").arg(curPage).arg(numPage);
     break;
   }
 
diff --git a/khexedit/hexbuffer.h b/khexedit/hexbuffer.h
index 2955af0..a236f44 100644
--- a/khexedit/hexbuffer.h
+++ b/khexedit/hexbuffer.h
@@ -35,7 +35,7 @@
 #include <tqptrlist.h>
 #include <tqpainter.h>
 #include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <kapplication.h>
 
@@ -1072,7 +1072,7 @@ class CHexBuffer : public TQByteArray
     CHexBuffer( void );
     ~CHexBuffer( void );
 
-    int  setLayout( SDisplayLayout &tqlayout );
+    int  setLayout( SDisplayLayout &layout );
     void setColor( SDisplayColor &color );
     void setInputMode( SDisplayInputMode &mode );
     bool toggleEditor( void );
@@ -1082,7 +1082,7 @@ class CHexBuffer : public TQByteArray
     void setNonPrintChar( TQChar nonPrintChar );
     void setShowCursor( bool showCursor );
     void setDisableCursor( bool disableCursor );
-    void settqCursorShapeModifier( bool alwaysBlock, bool thickInsert );
+    void setCursorShapeModifier( bool alwaysBlock, bool thickInsert );
     void setEditMode( EEditMode editMode );
     void setEditMode( EEditMode editMode, bool alwaysBlock, bool thickInsert );
     void setMaximumSize( uint size );
@@ -1156,7 +1156,7 @@ class CHexBuffer : public TQByteArray
     inline SCursorState &cursorState( void );
     inline void valueOnCursor( TQByteArray &buf, uint size );
     inline SFileState &fileState( void );
-    inline const SDisplayLayout &tqlayout( void );
+    inline const SDisplayLayout &layout( void );
 
     inline const SDisplayInputMode &inputMode( void );
     inline TQPtrList<SCursorOffset> &bookmarkList( void );
@@ -1417,7 +1417,7 @@ inline void CHexBuffer::valueOnCursor( TQByteArray &buf, uint size )
 }
 
 
-inline const SDisplayLayout &CHexBuffer::tqlayout( void )
+inline const SDisplayLayout &CHexBuffer::layout( void )
 {
   return( mLayout );
 }
diff --git a/khexedit/hexdrag.cc b/khexedit/hexdrag.cc
index 0347129..1c9e234 100644
--- a/khexedit/hexdrag.cc
+++ b/khexedit/hexdrag.cc
@@ -75,7 +75,7 @@ const char *CHexDrag::format( int i ) const
 }
 
 
-TQByteArray CHexDrag::tqencodedData( const char *fmt ) const
+TQByteArray CHexDrag::encodedData( const char *fmt ) const
 {
   if( fmt != 0 )
   {
@@ -98,7 +98,7 @@ bool CHexDrag::canDecode( const TQMimeSource *e )
 
 bool CHexDrag::decode( const TQMimeSource *e, TQByteArray &dest )
 {
-  dest = e->tqencodedData(mediaString);
+  dest = e->encodedData(mediaString);
   return( dest.size() == 0 ? false : true );
 
   //
@@ -116,7 +116,7 @@ bool CHexDrag::decode( const TQMimeSource *e, TQByteArray &dest )
   #if 0
   if( e->provides(mediaString) == true )
   {
-    dest = e->tqencodedData(mediaString);
+    dest = e->encodedData(mediaString);
     return( true );
   }
   else
diff --git a/khexedit/hexdrag.h b/khexedit/hexdrag.h
index aef2e01..7d4fd26 100644
--- a/khexedit/hexdrag.h
+++ b/khexedit/hexdrag.h
@@ -37,7 +37,7 @@ class CHexDrag : public TQDragObject
 
     void setData( const TQByteArray &data );
     const char* format ( int i ) const; 
-    TQByteArray tqencodedData( const char *fmt ) const;
+    TQByteArray encodedData( const char *fmt ) const;
 
 
     static bool canDecode( const TQMimeSource *e );  
diff --git a/khexedit/hexeditorwidget.cc b/khexedit/hexeditorwidget.cc
index 6235e09..894b70f 100644
--- a/khexedit/hexeditorwidget.cc
+++ b/khexedit/hexeditorwidget.cc
@@ -72,7 +72,7 @@ CHexEditorWidget::CHexEditorWidget( TQWidget *parent, const char *name )
 	   this, TQT_SLOT( inputModeChanged( const SDisplayInputMode & ) ) );
 
   mHexView->setFocus();
-  setBackgroundColor( tqpalette().active().base() );
+  setBackgroundColor( palette().active().base() );
 
   mProgressBusy    = false;
   mGotoDialog      = 0;
@@ -115,7 +115,7 @@ void CHexEditorWidget::initialize( void )
   setFont( mDisplayState.font );
   mHexView->setMisc( mDisplayState.misc );
   mHexView->setCursor( mDisplayState.cursor, false );
-  mHexView->setLayout( mDisplayState.tqlayout );
+  mHexView->setLayout( mDisplayState.layout );
   mHexView->setInputMode( mDisplayState.input );
   mHexView->setInsertMode( mDisplayState.misc.insertMode );
 }
@@ -123,25 +123,25 @@ void CHexEditorWidget::initialize( void )
 
 void CHexEditorWidget::writeConfiguration( KConfig &config )
 {
-  SDisplayLayout &tqlayout = mDisplayState.tqlayout;
+  SDisplayLayout &layout = mDisplayState.layout;
   config.setGroup( "Display Options" );
-  config.writeEntry( "PrimaryMode",          tqlayout.primaryModeString() );
-  config.writeEntry( "SecondaryMode",        tqlayout.secondaryModeString() );
-  config.writeEntry( "OffsetMode",           tqlayout.offsetModeString() );
-  config.writeEntry( "OffsetVisible",        tqlayout.offsetVisible );
-  config.writeEntry( "PrimaryUpperCase",     tqlayout.primaryUpperCase );
-  config.writeEntry( "OffsetUpperCase",      tqlayout.offsetUpperCase );
-  config.writeEntry( "LineSize",             tqlayout.lineSize );
-  config.writeEntry( "ColumnSize",           tqlayout.columnSize );
-  config.writeEntry( "LockLine",             tqlayout.lockLine );
-  config.writeEntry( "LockColumn",           tqlayout.lockColumn );
-  config.writeEntry( "ColumnCharSpace",      tqlayout.columnCharSpace );
-  config.writeEntry( "ColumnSpacing",        tqlayout.columnSpacing );
-  config.writeEntry( "SeparatorMarginWidth", tqlayout.separatorMarginWidth );
-  config.writeEntry( "EdgeMarginWidth",      tqlayout.edgeMarginWidth );
-  config.writeEntry( "LeftSeparatorWidth",   tqlayout.leftSeparatorWidth );
-  config.writeEntry( "RightSeparatorWidth",  tqlayout.rightSeparatorWidth );
-  config.writeEntry( "GridMode",             tqlayout.gridModeString() );
+  config.writeEntry( "PrimaryMode",          layout.primaryModeString() );
+  config.writeEntry( "SecondaryMode",        layout.secondaryModeString() );
+  config.writeEntry( "OffsetMode",           layout.offsetModeString() );
+  config.writeEntry( "OffsetVisible",        layout.offsetVisible );
+  config.writeEntry( "PrimaryUpperCase",     layout.primaryUpperCase );
+  config.writeEntry( "OffsetUpperCase",      layout.offsetUpperCase );
+  config.writeEntry( "LineSize",             layout.lineSize );
+  config.writeEntry( "ColumnSize",           layout.columnSize );
+  config.writeEntry( "LockLine",             layout.lockLine );
+  config.writeEntry( "LockColumn",           layout.lockColumn );
+  config.writeEntry( "ColumnCharSpace",      layout.columnCharSpace );
+  config.writeEntry( "ColumnSpacing",        layout.columnSpacing );
+  config.writeEntry( "SeparatorMarginWidth", layout.separatorMarginWidth );
+  config.writeEntry( "EdgeMarginWidth",      layout.edgeMarginWidth );
+  config.writeEntry( "LeftSeparatorWidth",   layout.leftSeparatorWidth );
+  config.writeEntry( "RightSeparatorWidth",  layout.rightSeparatorWidth );
+  config.writeEntry( "GridMode",             layout.gridModeString() );
 
   SDisplayLine &line = mDisplayState.line;
   config.setGroup( "Line Size" );
@@ -183,7 +183,7 @@ void CHexEditorWidget::writeConfiguration( KConfig &config )
   config.setGroup( "Display Font" );
   config.writeEntry( "UseSystemFont",        font.useSystemFont );
   config.writeEntry( "LocalFont",            font.localFont );
-  config.writeEntry( "NonPrintChar",         font.nonPrintChar.tqunicode() );
+  config.writeEntry( "NonPrintChar",         font.nonPrintChar.unicode() );
 
   SDisplayCursor &cursor = mDisplayState.cursor;
   config.setGroup( "Display Cursor" );
@@ -221,38 +221,38 @@ void CHexEditorWidget::writeConfiguration( KConfig &config )
 
 void CHexEditorWidget::readConfiguration( KConfig &config )
 {
-  SDisplayLayout &tqlayout = mDisplayState.tqlayout;
+  SDisplayLayout &layout = mDisplayState.layout;
   config.setGroup( "Display Options" );
-  tqlayout.setPrimaryMode( config.readEntry("PrimaryMode") );
-  tqlayout.setSecondaryMode( config.readEntry("SecondaryMode") );
-  tqlayout.setOffsetMode( config.readEntry("OffsetMode") );
-  tqlayout.offsetVisible = config.readBoolEntry(
-    "OffsetVisible", tqlayout.offsetVisible );
-  tqlayout.primaryUpperCase = config.readBoolEntry(
-    "PrimaryUpperCase", tqlayout.primaryUpperCase );
-  tqlayout.offsetUpperCase = config.readBoolEntry(
-    "OffsetUpperCase", tqlayout.offsetUpperCase );
-  tqlayout.lineSize = config.readNumEntry(
-    "LineSize", tqlayout.lineSize );
-  tqlayout.columnSize = config.readNumEntry(
-    "ColumnSize", tqlayout.columnSize );
-  tqlayout.lockLine = config.readBoolEntry(
-    "LockLine", tqlayout.lockLine );
-  tqlayout.lockColumn = config.readBoolEntry(
-    "LockColumn", tqlayout.lockColumn );
-  tqlayout.columnCharSpace = config.readBoolEntry(
-    "ColumnCharSpace", tqlayout.columnCharSpace );
-  tqlayout.columnSpacing = config.readNumEntry(
-    "ColumnSpacing", tqlayout.columnSpacing );
-  tqlayout.separatorMarginWidth = config.readNumEntry(
-    "SeparatorMarginWidth", tqlayout.separatorMarginWidth );
-  tqlayout.edgeMarginWidth = config.readNumEntry(
-    "EdgeMarginWidth", tqlayout.edgeMarginWidth );
-  tqlayout.leftSeparatorWidth = config.readNumEntry(
-    "LeftSeparatorWidth", tqlayout.leftSeparatorWidth );
-  tqlayout.rightSeparatorWidth = config.readNumEntry(
-    "RightSeparatorWidth", tqlayout.rightSeparatorWidth );
-  tqlayout.setGridMode( config.readEntry("GridMode") );
+  layout.setPrimaryMode( config.readEntry("PrimaryMode") );
+  layout.setSecondaryMode( config.readEntry("SecondaryMode") );
+  layout.setOffsetMode( config.readEntry("OffsetMode") );
+  layout.offsetVisible = config.readBoolEntry(
+    "OffsetVisible", layout.offsetVisible );
+  layout.primaryUpperCase = config.readBoolEntry(
+    "PrimaryUpperCase", layout.primaryUpperCase );
+  layout.offsetUpperCase = config.readBoolEntry(
+    "OffsetUpperCase", layout.offsetUpperCase );
+  layout.lineSize = config.readNumEntry(
+    "LineSize", layout.lineSize );
+  layout.columnSize = config.readNumEntry(
+    "ColumnSize", layout.columnSize );
+  layout.lockLine = config.readBoolEntry(
+    "LockLine", layout.lockLine );
+  layout.lockColumn = config.readBoolEntry(
+    "LockColumn", layout.lockColumn );
+  layout.columnCharSpace = config.readBoolEntry(
+    "ColumnCharSpace", layout.columnCharSpace );
+  layout.columnSpacing = config.readNumEntry(
+    "ColumnSpacing", layout.columnSpacing );
+  layout.separatorMarginWidth = config.readNumEntry(
+    "SeparatorMarginWidth", layout.separatorMarginWidth );
+  layout.edgeMarginWidth = config.readNumEntry(
+    "EdgeMarginWidth", layout.edgeMarginWidth );
+  layout.leftSeparatorWidth = config.readNumEntry(
+    "LeftSeparatorWidth", layout.leftSeparatorWidth );
+  layout.rightSeparatorWidth = config.readNumEntry(
+    "RightSeparatorWidth", layout.rightSeparatorWidth );
+  layout.setGridMode( config.readEntry("GridMode") );
 
   SDisplayLine &line = mDisplayState.line;
   config.setGroup( "Line Size" );
@@ -398,9 +398,9 @@ void CHexEditorWidget::paletteChanged( void )
   setColor( mDisplayState.color );
 }
 
-void CHexEditorWidget::layoutChanged( const SDisplayLayout &/*tqlayout*/ )
+void CHexEditorWidget::layoutChanged( const SDisplayLayout &/*layout*/ )
 {
-  //mDisplayState.tqlayout = tqlayout;
+  //mDisplayState.layout = layout;
 }
 
 void CHexEditorWidget::inputModeChanged( const SDisplayInputMode &input )
@@ -414,30 +414,30 @@ void CHexEditorWidget::setLineSize(const SDisplayLine &line )
   mDisplayState.line = line;
 }
 
-void CHexEditorWidget::setLayout( const SDisplayLayout &tqlayout )
+void CHexEditorWidget::setLayout( const SDisplayLayout &layout )
 {
   //
   // We only set the values that can be modified by the dialog
   //
-  mDisplayState.tqlayout.lockLine = tqlayout.lockLine;
-  mDisplayState.tqlayout.lockColumn = tqlayout.lockColumn;
-  mDisplayState.tqlayout.leftSeparatorWidth = tqlayout.leftSeparatorWidth;
-  mDisplayState.tqlayout.rightSeparatorWidth = tqlayout.rightSeparatorWidth;
-  mDisplayState.tqlayout.separatorMarginWidth = tqlayout.separatorMarginWidth;
-  mDisplayState.tqlayout.edgeMarginWidth = tqlayout.edgeMarginWidth;
-  mDisplayState.tqlayout.columnCharSpace = tqlayout.columnCharSpace;
-  mDisplayState.tqlayout.columnSpacing = tqlayout.columnSpacing;
-  mDisplayState.tqlayout.horzGridWidth = tqlayout.horzGridWidth;
-  mDisplayState.tqlayout.vertGridWidth = tqlayout.vertGridWidth;
+  mDisplayState.layout.lockLine = layout.lockLine;
+  mDisplayState.layout.lockColumn = layout.lockColumn;
+  mDisplayState.layout.leftSeparatorWidth = layout.leftSeparatorWidth;
+  mDisplayState.layout.rightSeparatorWidth = layout.rightSeparatorWidth;
+  mDisplayState.layout.separatorMarginWidth = layout.separatorMarginWidth;
+  mDisplayState.layout.edgeMarginWidth = layout.edgeMarginWidth;
+  mDisplayState.layout.columnCharSpace = layout.columnCharSpace;
+  mDisplayState.layout.columnSpacing = layout.columnSpacing;
+  mDisplayState.layout.horzGridWidth = layout.horzGridWidth;
+  mDisplayState.layout.vertGridWidth = layout.vertGridWidth;
 
   //
   // Select the line and column sizes we shall use now.
   //
-  SDisplayLayout &l = mDisplayState.tqlayout;
+  SDisplayLayout &l = mDisplayState.layout;
   l.lineSize   = mDisplayState.line.lineSize[ l.primaryMode ];
   l.columnSize = mDisplayState.line.columnSize[ l.primaryMode ];
 
-  mHexView->setLayout( mDisplayState.tqlayout );
+  mHexView->setLayout( mDisplayState.layout );
 }
 
 void CHexEditorWidget::setCursor( const SDisplayCursor &cursor )
@@ -453,26 +453,26 @@ void CHexEditorWidget::setColor( const SDisplayColor &color )
   //
   // The selection colors can not be chosen.
   //
-  mDisplayState.color.selectBg = kapp->tqpalette().active().highlight();
-  mDisplayState.color.selectFg = kapp->tqpalette().active().highlightedText();
+  mDisplayState.color.selectBg = kapp->palette().active().highlight();
+  mDisplayState.color.selectFg = kapp->palette().active().highlightedText();
 
   if( mDisplayState.color.useSystemColor == true )
   {
     SDisplayColor c = mDisplayState.color;
-    c.textBg           = kapp->tqpalette().active().base();
-    c.secondTextBg     = kapp->tqpalette().active().base();
-    c.offsetBg         = kapp->tqpalette().active().base();
-    c.inactiveBg       = kapp->tqpalette().active().base();
-    c.primaryFg[0]     = kapp->tqpalette().active().text();
-    c.primaryFg[1]     = kapp->tqpalette().active().text();
-    c.nonPrintFg       = kapp->tqpalette().active().text();
-    c.offsetFg         = kapp->tqpalette().active().text();
-    c.secondaryFg      = kapp->tqpalette().active().text();
-    c.leftSeparatorFg  = kapp->tqpalette().active().text();
-    c.rightSeparatorFg = kapp->tqpalette().active().text();
-    c.cursorBg         = kapp->tqpalette().active().text();
-    c.cursorFg         = kapp->tqpalette().active().base();
-    c.gridFg           = kapp->tqpalette().active().text();
+    c.textBg           = kapp->palette().active().base();
+    c.secondTextBg     = kapp->palette().active().base();
+    c.offsetBg         = kapp->palette().active().base();
+    c.inactiveBg       = kapp->palette().active().base();
+    c.primaryFg[0]     = kapp->palette().active().text();
+    c.primaryFg[1]     = kapp->palette().active().text();
+    c.nonPrintFg       = kapp->palette().active().text();
+    c.offsetFg         = kapp->palette().active().text();
+    c.secondaryFg      = kapp->palette().active().text();
+    c.leftSeparatorFg  = kapp->palette().active().text();
+    c.rightSeparatorFg = kapp->palette().active().text();
+    c.cursorBg         = kapp->palette().active().text();
+    c.cursorFg         = kapp->palette().active().base();
+    c.gridFg           = kapp->palette().active().text();
     SDisplayColor defaultColor;
     c.bookmarkBg       = defaultColor.bookmarkBg;
     c.bookmarkFg       = defaultColor.bookmarkFg;
@@ -513,46 +513,46 @@ void CHexEditorWidget::setMisc( const SDisplayMisc &misc )
 
 void CHexEditorWidget::setHexadecimalMode( void )
 {
-  tqlayout().primaryMode   = SDisplayLayout::hexadecimal;
-  tqlayout().lineSize      = line().lineSize[ SDisplayLine::hexadecimal ];
-  tqlayout().columnSize    = line().columnSize[ SDisplayLine::hexadecimal ];
-  mHexView->setLayout( tqlayout() );
+  layout().primaryMode   = SDisplayLayout::hexadecimal;
+  layout().lineSize      = line().lineSize[ SDisplayLine::hexadecimal ];
+  layout().columnSize    = line().columnSize[ SDisplayLine::hexadecimal ];
+  mHexView->setLayout( layout() );
 }
 
 
 void CHexEditorWidget::setDecimalMode( void )
 {
-  tqlayout().primaryMode   = SDisplayLayout::decimal;
-  tqlayout().lineSize      = line().lineSize[ SDisplayLine::decimal ];
-  tqlayout().columnSize    = line().columnSize[ SDisplayLine::decimal ];
-  mHexView->setLayout( tqlayout() );
+  layout().primaryMode   = SDisplayLayout::decimal;
+  layout().lineSize      = line().lineSize[ SDisplayLine::decimal ];
+  layout().columnSize    = line().columnSize[ SDisplayLine::decimal ];
+  mHexView->setLayout( layout() );
 }
 
 
 void CHexEditorWidget::setOctalMode( void )
 {
-  tqlayout().primaryMode   = SDisplayLayout::octal;
-  tqlayout().lineSize      = line().lineSize[ SDisplayLine::octal ];
-  tqlayout().columnSize    = line().columnSize[ SDisplayLine::octal ];
-  mHexView->setLayout( tqlayout() );
+  layout().primaryMode   = SDisplayLayout::octal;
+  layout().lineSize      = line().lineSize[ SDisplayLine::octal ];
+  layout().columnSize    = line().columnSize[ SDisplayLine::octal ];
+  mHexView->setLayout( layout() );
 }
 
 
 void CHexEditorWidget::setBinaryMode( void )
 {
-  tqlayout().primaryMode   = SDisplayLayout::binary;
-  tqlayout().lineSize      = line().lineSize[ SDisplayLine::binary ];
-  tqlayout().columnSize    = line().columnSize[ SDisplayLine::binary ];
-  mHexView->setLayout( tqlayout() );
+  layout().primaryMode   = SDisplayLayout::binary;
+  layout().lineSize      = line().lineSize[ SDisplayLine::binary ];
+  layout().columnSize    = line().columnSize[ SDisplayLine::binary ];
+  mHexView->setLayout( layout() );
 }
 
 
 void CHexEditorWidget::setTextMode( void )
 {
-  tqlayout().primaryMode   = SDisplayLayout::textOnly;
-  tqlayout().lineSize      = line().lineSize[ SDisplayLine::textOnly ];
-  tqlayout().columnSize    = line().columnSize[ SDisplayLine::textOnly ];
-  mHexView->setLayout( tqlayout() );
+  layout().primaryMode   = SDisplayLayout::textOnly;
+  layout().lineSize      = line().lineSize[ SDisplayLine::textOnly ];
+  layout().columnSize    = line().columnSize[ SDisplayLine::textOnly ];
+  mHexView->setLayout( layout() );
 }
 
 
@@ -580,7 +580,7 @@ void CHexEditorWidget::newFile( void )
     return;
   }
 
-  TQString url = i18n("Untitled %1").tqarg( mUntitledCount );
+  TQString url = i18n("Untitled %1").arg( mUntitledCount );
 
   //
   // If the url is already present in the document list (should not happen),
@@ -605,7 +605,7 @@ void CHexEditorWidget::newFile( void )
   if( errCode != Err_Success )
   {
     TQString msg = i18n("Unable to create new document.");
-    KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Operation Failed") );
+    KMessageBox::sorry( topLevelWidget(), msg, i18n("Operation Failed") );
     return;
   }
 
@@ -626,7 +626,7 @@ void CHexEditorWidget::newFile( const TQByteArray &data )
 
 void CHexEditorWidget::open()
 {
-  KURL file = KFileDialog::getOpenURL( mWorkDir, "*" ,tqtopLevelWidget() );
+  KURL file = KFileDialog::getOpenURL( mWorkDir, "*" ,topLevelWidget() );
 
   if( file.isEmpty() )
     return;
@@ -764,7 +764,7 @@ bool CHexEditorWidget::selectDocument( const TQString &url,
 
 void CHexEditorWidget::insertFile( void )
 {
-  KFileDialog fdlg(mWorkDir, TQString(), tqtopLevelWidget(), 0, TRUE);
+  KFileDialog fdlg(mWorkDir, TQString(), topLevelWidget(), 0, TRUE);
   fdlg.setOperationMode( KFileDialog::Opening );
   fdlg.okButton()->setGuiItem( KStdGuiItem::insert() );
   fdlg.setCaption(i18n("Insert File"));
@@ -868,7 +868,7 @@ bool CHexEditorWidget::querySave( void )
   TQString msg = i18n(""
     "The current document has been modified.\n"
     "Do you want to save it?" );
-  int reply = KMessageBox::warningYesNoCancel( tqtopLevelWidget(), msg, TQString(), KStdGuiItem::save(), KStdGuiItem::discard() );
+  int reply = KMessageBox::warningYesNoCancel( topLevelWidget(), msg, TQString(), KStdGuiItem::save(), KStdGuiItem::discard() );
   if( reply == KMessageBox::Yes )
   {
     return( save() );
@@ -934,7 +934,7 @@ bool CHexEditorWidget::save( void )
        "Current document has been changed on disk.\n"
        "If you save now, those changes will be lost.\n"
        "Proceed?" );
-      int reply = KMessageBox::warningYesNoCancel( tqtopLevelWidget(), msg,
+      int reply = KMessageBox::warningYesNoCancel( topLevelWidget(), msg,
 						   i18n("Save"), KStdGuiItem::save(), KStdGuiItem::discard() );
       if( reply == KMessageBox::No || reply == KMessageBox::Cancel )
       {
@@ -986,7 +986,7 @@ bool CHexEditorWidget::saveAs( void )
 	TQString msg = i18n(""
           "A document with this name already exists.\n"
           "Do you want to overwrite it?" );
-	int reply = KMessageBox::warningContinueCancel( tqtopLevelWidget(), msg,
+	int reply = KMessageBox::warningContinueCancel( topLevelWidget(), msg,
 					       i18n("Save As"), i18n("Overwrite") );
 	if( reply == KMessageBox::Continue )
 	  break;
@@ -1021,7 +1021,7 @@ void CHexEditorWidget::reload( void )
   if( mHexView->urlValid() == false )
   {
     TQString msg = i18n( "The current document does not exist on the disk." );
-    KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Reload") );
+    KMessageBox::sorry( topLevelWidget(), msg, i18n("Reload") );
     return;
   }
 
@@ -1040,7 +1040,7 @@ void CHexEditorWidget::reload( void )
                    "If you reload now, the modifications will be lost." );
     }
 
-    int reply = KMessageBox::warningContinueCancel(tqtopLevelWidget(),msg,i18n("Reload"), i18n("&Reload"));
+    int reply = KMessageBox::warningContinueCancel(topLevelWidget(),msg,i18n("Reload"), i18n("&Reload"));
     if( reply != KMessageBox::Continue )
     {
       return;
@@ -1070,7 +1070,7 @@ void CHexEditorWidget::print( void )
   prt.setFullPage( true ); // I use my own marings
 
   // FIXME: Make a better header for the printingdialog
-  if (prt.setup(tqtopLevelWidget(), i18n("Print Hex-Document")))
+  if (prt.setup(topLevelWidget(), i18n("Print Hex-Document")))
   {
      prt.setTopMarginMM( prt.option("kde-khexedit-topmarginmm").toInt() );
      prt.setBottomMarginMM( prt.option("kde-khexedit-bottommarginmm").toInt() );
@@ -1125,7 +1125,7 @@ void CHexEditorWidget::printPostscript( CHexPrinter &printer )
 
   if( errCode != Err_Success )
   {
-    KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Print") );
+    KMessageBox::sorry( topLevelWidget(), msg, i18n("Print") );
   }
 }
 
@@ -1148,7 +1148,7 @@ bool CHexEditorWidget::confirmPrintPageNumber( CHexPrinter &printer )
         "You are about to print %n pages.<br>"
 	"Proceed?</qt>",
 	numPageSelected );
-      int reply = KMessageBox::warningYesNo( tqtopLevelWidget(), msg,
+      int reply = KMessageBox::warningYesNo( topLevelWidget(), msg,
 					     i18n("Print"), KStdGuiItem::print(), KStdGuiItem::cancel() );
       if( reply != KMessageBox::Continue )
       {
@@ -1165,7 +1165,7 @@ void CHexEditorWidget::exportDialog( void )
 {
   if( mExportDialog == 0 )
   {
-    mExportDialog = new CExportDialog( tqtopLevelWidget(), 0, false );
+    mExportDialog = new CExportDialog( topLevelWidget(), 0, false );
     if( mExportDialog == 0 ) { return; }
     connect( mExportDialog, TQT_SIGNAL( exportText(const SExportText &)),
 	     this, TQT_SLOT( exportText( const SExportText &)) );
@@ -1191,7 +1191,7 @@ void CHexEditorWidget::exportText( const SExportText &ex )
   {
     TQString msg = i18n("Unable to export data.\n");
     msg += hexError( errCode );
-    KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Export") );
+    KMessageBox::sorry( topLevelWidget(), msg, i18n("Export") );
   }
 }
 
@@ -1208,7 +1208,7 @@ void CHexEditorWidget::exportHtml( const SExportHtml &ex )
   {
     TQString msg = i18n("Unable to export data.\n");
     msg += hexError( errCode );
-    KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Export") );
+    KMessageBox::sorry( topLevelWidget(), msg, i18n("Export") );
   }
 }
 
@@ -1225,7 +1225,7 @@ void CHexEditorWidget::exportCArray( const SExportCArray &ex )
   {
     TQString msg = i18n("Unable to export data.\n");
     msg += hexError( errCode );
-    KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Export") );
+    KMessageBox::sorry( topLevelWidget(), msg, i18n("Export") );
   }
 }
 
@@ -1238,7 +1238,7 @@ void CHexEditorWidget::encode( CConversion::EMode mode )
       "The encoding you have selected is not reversible.\n"
       "If you revert to the original encoding later, there is no "
       "guarantee that the data can be restored to the original state.");
-    int reply = KMessageBox::warningContinueCancel( tqtopLevelWidget(), msg,
+    int reply = KMessageBox::warningContinueCancel( topLevelWidget(), msg,
 					   i18n("Encode"), i18n("&Encode"));
     if( reply != KMessageBox::Continue )
     {
@@ -1258,7 +1258,7 @@ void CHexEditorWidget::encode( CConversion::EMode mode )
   {
     TQString msg = i18n("Could not encode data.\n");
     msg += hexError( errCode );
-    KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Encode") );
+    KMessageBox::sorry( topLevelWidget(), msg, i18n("Encode") );
   }
 }
 
@@ -1306,34 +1306,34 @@ void CHexEditorWidget::enableInputLock( bool inputLock )
 
 void CHexEditorWidget::toggleOffsetColumnVisibility( void )
 {
-  tqlayout().offsetVisible = tqlayout().offsetVisible == true ? false : true;
-  mHexView->setLayout( tqlayout() );
+  layout().offsetVisible = layout().offsetVisible == true ? false : true;
+  mHexView->setLayout( layout() );
 }
 
 void CHexEditorWidget::toggleTextColumnVisibility( void )
 {
-  tqlayout().secondaryMode = tqlayout().secondaryMode == SDisplayLayout::hide ?
+  layout().secondaryMode = layout().secondaryMode == SDisplayLayout::hide ?
     SDisplayLayout::textOnly : SDisplayLayout::hide;
-  mHexView->setLayout( tqlayout() );
+  mHexView->setLayout( layout() );
 }
 
 void CHexEditorWidget::toggleOffsetAsDecimal( void )
 {
-  tqlayout().offsetMode = tqlayout().offsetMode == SDisplayLayout::hexadecimal ?
+  layout().offsetMode = layout().offsetMode == SDisplayLayout::hexadecimal ?
     SDisplayLayout::decimal : SDisplayLayout::hexadecimal;
-  mHexView->setLayout( tqlayout() );
+  mHexView->setLayout( layout() );
 }
 
 void CHexEditorWidget::toggleDataUppercase( void )
 {
-  tqlayout().primaryUpperCase = tqlayout().primaryUpperCase == true ? false : true;
-  mHexView->setLayout( tqlayout() );
+  layout().primaryUpperCase = layout().primaryUpperCase == true ? false : true;
+  mHexView->setLayout( layout() );
 }
 
 void CHexEditorWidget::toggleOffsetUppercase( void )
 {
-  tqlayout().offsetUpperCase = tqlayout().offsetUpperCase == true ? false : true;
-  mHexView->setLayout( tqlayout() );
+  layout().offsetUpperCase = layout().offsetUpperCase == true ? false : true;
+  mHexView->setLayout( layout() );
 }
 
 void CHexEditorWidget::toggleInsertMode( void )
@@ -1412,7 +1412,7 @@ void CHexEditorWidget::removeAllBookmark( void )
     TQString msg = i18n(""
       "Deleted bookmarks can not be restored.\n"
       "Proceed?" );
-    int reply = KMessageBox::warningContinueCancel( tqtopLevelWidget(), msg );
+    int reply = KMessageBox::warningContinueCancel( topLevelWidget(), msg );
     if( reply != KMessageBox::Continue )
     {
       return;
@@ -1447,7 +1447,7 @@ void CHexEditorWidget::gotoOffset( void )
 {
   if( mGotoDialog == 0 )
   {
-    mGotoDialog = new CGotoDialog( tqtopLevelWidget(), 0, false );
+    mGotoDialog = new CGotoDialog( topLevelWidget(), 0, false );
     if( mGotoDialog == 0 ) { return; }
     connect( mGotoDialog, TQT_SIGNAL(gotoOffset( uint, uint, bool, bool )),
 	     mHexView, TQT_SLOT(gotoOffset( uint, uint, bool, bool )) );
@@ -1465,7 +1465,7 @@ void CHexEditorWidget::find( void )
 
   if( mFindDialog == 0 )
   {
-    mFindDialog = new CFindDialog( tqtopLevelWidget(), 0, false );
+    mFindDialog = new CFindDialog( topLevelWidget(), 0, false );
     if( mFindDialog == 0 ) { return; }
     connect( mFindDialog,
 	     TQT_SIGNAL(findData(SSearchControl &, uint, bool)),
@@ -1526,7 +1526,7 @@ void CHexEditorWidget::findData( SSearchControl &sc, uint mode, bool navigator)
   if( mode == Find_First )
   {
     TQString msg = i18n( "Search key not found in document." );
-    KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Find") );
+    KMessageBox::sorry( topLevelWidget(), msg, i18n("Find") );
   }
 }
 
@@ -1580,7 +1580,7 @@ bool CHexEditorWidget::askWrap( bool fwd, const TQString &header )
       "Continue from the end?" );
   }
 
-  int reply = KMessageBox::questionYesNo( tqtopLevelWidget(), msg, header, KStdGuiItem::cont(), KStdGuiItem::cancel() );
+  int reply = KMessageBox::questionYesNo( topLevelWidget(), msg, header, KStdGuiItem::cont(), KStdGuiItem::cancel() );
   return( reply == KMessageBox::Yes ? true : false );
 }
 
@@ -1594,7 +1594,7 @@ bool CHexEditorWidget::canFind( bool showError )
       TQString msg = i18n(""
         "Your request can not be processed.\n"
         "No search pattern defined." );
-      KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Find") );
+      KMessageBox::sorry( topLevelWidget(), msg, i18n("Find") );
     }
     return( false );
   }
@@ -1613,7 +1613,7 @@ void CHexEditorWidget::findNavigator( SSearchControl &sc )
 
   if( mFindNavigatorDialog == 0 )
   {
-    mFindNavigatorDialog = new CFindNavigatorDialog(tqtopLevelWidget(),0,false);
+    mFindNavigatorDialog = new CFindNavigatorDialog(topLevelWidget(),0,false);
     if( mFindNavigatorDialog == 0 ) { return; }
     connect( mFindNavigatorDialog,
 	     TQT_SIGNAL(findData(SSearchControl &, uint, bool)),
@@ -1636,7 +1636,7 @@ void CHexEditorWidget::replace( void )
 
   if( mReplaceDialog == 0 )
   {
-    mReplaceDialog = new CReplaceDialog( tqtopLevelWidget(), 0, false );
+    mReplaceDialog = new CReplaceDialog( topLevelWidget(), 0, false );
     if( mReplaceDialog == 0 ) { return; }
     connect( mReplaceDialog,
 	     TQT_SIGNAL( replaceData( SSearchControl &, uint)),
@@ -1726,7 +1726,7 @@ void CHexEditorWidget::replacePrompt( SSearchControl &sc )
 {
   if( mReplacePromptDialog == 0 )
   {
-    mReplacePromptDialog = new CReplacePromptDialog(tqtopLevelWidget(), 0,false);
+    mReplacePromptDialog = new CReplacePromptDialog(topLevelWidget(), 0,false);
     if( mReplacePromptDialog == 0 ) { return; }
     connect( mReplacePromptDialog,
 	     TQT_SIGNAL( replaceData( SSearchControl &, uint)),
@@ -1765,14 +1765,14 @@ void CHexEditorWidget::replaceResult( SSearchControl &sc )
     {
       msg += i18n( "Search key not found in document." );
     }
-    KMessageBox::information( tqtopLevelWidget(), msg, i18n("Find & Replace"));
+    KMessageBox::information( topLevelWidget(), msg, i18n("Find & Replace"));
   }
   else
   {
     const TQString msg = i18n(
       "<qt>Operation complete.<br><br>One replacement was made.</qt>",
       "<qt>Operation complete.<br><br>%n replacements were made.</qt>", sc.numReplace );
-    KMessageBox::information( tqtopLevelWidget(), msg, i18n("Find & Replace"));
+    KMessageBox::information( topLevelWidget(), msg, i18n("Find & Replace"));
   }
 }
 
@@ -1781,7 +1781,7 @@ void CHexEditorWidget::insertPattern( void )
 {
   if( mInsertDialog == 0 )
   {
-    mInsertDialog = new CInsertDialog( tqtopLevelWidget(), 0, false );
+    mInsertDialog = new CInsertDialog( topLevelWidget(), 0, false );
     if( mInsertDialog == 0 ) { return; }
     connect( mInsertDialog, TQT_SIGNAL(execute( SInsertData & )),
 	     mHexView, TQT_SLOT(insert( SInsertData & )) );
@@ -1795,7 +1795,7 @@ void CHexEditorWidget::encoding( void )
   TQString msg = i18n(""
     "Not available yet!\n"
     "Define your own encoding" );
-  KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Encoding") );
+  KMessageBox::sorry( topLevelWidget(), msg, i18n("Encoding") );
 }
 
 
@@ -1803,7 +1803,7 @@ void CHexEditorWidget::strings( void )
 {
   if( mStringDialog == 0 )
   {
-    mStringDialog = new CStringDialog( tqtopLevelWidget(), 0, false );
+    mStringDialog = new CStringDialog( topLevelWidget(), 0, false );
     if( mStringDialog == 0 ) { return; }
     connect( mStringDialog, TQT_SIGNAL(markText( uint, uint, bool )),
 	     mHexView, TQT_SLOT(setMark( uint, uint, bool )) );
@@ -1830,7 +1830,7 @@ void CHexEditorWidget::collectStrings( void )
   {
     TQString msg = i18n("Could not collect strings.\n");
     msg += hexError( errCode );
-    KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Collect Strings") );
+    KMessageBox::sorry( topLevelWidget(), msg, i18n("Collect Strings") );
   }
 
 }
@@ -1842,14 +1842,14 @@ void CHexEditorWidget::recordView( void )
   TQString msg = i18n(""
    "Not available yet!\n"
    "Define a record (structure) and fill it with data from the document." );
-  KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Record Viewer") );
+  KMessageBox::sorry( topLevelWidget(), msg, i18n("Record Viewer") );
 }
 
 void CHexEditorWidget::filter( void )
 {
   if( mFilterDialog == 0 )
   {
-    mFilterDialog = new CFilterDialog( tqtopLevelWidget(), 0, false );
+    mFilterDialog = new CFilterDialog( topLevelWidget(), 0, false );
     if( mFilterDialog == 0 ) { return; }
     connect( mFilterDialog, TQT_SIGNAL(filterData( SFilterControl & )),
 	     mHexView, TQT_SLOT(filter( SFilterControl & )) );
@@ -1862,7 +1862,7 @@ void CHexEditorWidget::chart( void )
 {
   if( mCharTableDialog == 0 )
   {
-    mCharTableDialog = new CCharTableDialog( tqtopLevelWidget(), 0, false );
+    mCharTableDialog = new CCharTableDialog( topLevelWidget(), 0, false );
     if( mCharTableDialog == 0 ) { return; }
     connect( mCharTableDialog, TQT_SIGNAL(assign( const TQByteArray & )),
 	     mHexView, TQT_SLOT(insert( const TQByteArray & )) );
@@ -1887,7 +1887,7 @@ void CHexEditorWidget::statistics( void )
 {
   if( mFileInfoDialog == 0 )
   {
-    mFileInfoDialog = new CFileInfoDialog( tqtopLevelWidget(), 0, false );
+    mFileInfoDialog = new CFileInfoDialog( topLevelWidget(), 0, false );
     if( mFileInfoDialog == 0 ) { return; }
     connect( mFileInfoDialog, TQT_SIGNAL(collectStatistic(SStatisticControl &)),
 	     TQT_SLOT(collectStatistics(SStatisticControl &)));
@@ -1916,7 +1916,7 @@ void CHexEditorWidget::collectStatistics( SStatisticControl &sc )
 
     TQString msg = i18n("Could not collect document statistics.\n");
     msg += hexError( errCode );
-    KMessageBox::sorry( tqtopLevelWidget(), msg,
+    KMessageBox::sorry( topLevelWidget(), msg,
 			i18n("Collect Document Statistics") );
   }
 
@@ -1927,7 +1927,7 @@ void CHexEditorWidget::options( void )
 {
   if( mOptionDialog == 0 )
   {
-    mOptionDialog = new COptionDialog( tqtopLevelWidget(), 0, false );
+    mOptionDialog = new COptionDialog( topLevelWidget(), 0, false );
     if( mOptionDialog == 0 ) { return; }
 
     connect( mOptionDialog, TQT_SIGNAL(lineSizeChoice(const SDisplayLine &)),
@@ -1958,8 +1958,8 @@ void CHexEditorWidget::favorites( void )
 {
   TQString msg = i18n(""
     "Not available yet!\n"
-    "Save or retrive your favorite tqlayout" );
-  KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Profiles") );
+    "Save or retrive your favorite layout" );
+  KMessageBox::sorry( topLevelWidget(), msg, i18n("Profiles") );
 }
 
 
@@ -1978,8 +1978,8 @@ int CHexEditorWidget::readURL( const KURL &url, bool insert )
   //
   if( !url.isValid() )
   {
-    TQString msg = i18n("Malformed URL\n%1").tqarg( url.url() );
-    KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Read URL") );
+    TQString msg = i18n("Malformed URL\n%1").arg( url.url() );
+    KMessageBox::sorry( topLevelWidget(), msg, i18n("Read URL") );
     return( Err_IllegalArgument );
   }
 
@@ -2013,7 +2013,7 @@ void CHexEditorWidget::writeURL( TQString &url )
     {
       mHexView->setModified( modified );
       TQString msg = i18n("Could not save remote file.");
-      KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Write Failure") );
+      KMessageBox::sorry( topLevelWidget(), msg, i18n("Write Failure") );
     }
   }
 }
@@ -2049,30 +2049,30 @@ bool CHexEditorWidget::readFile( const TQString &diskPath, const TQString &url,
   TQFileInfo info( diskPath );
   if( info.exists() == false )
   {
-    const TQString msg = i18n("The specified file does not exist.\n%1").tqarg( diskPath );
-    KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Read") );
+    const TQString msg = i18n("The specified file does not exist.\n%1").arg( diskPath );
+    KMessageBox::sorry( topLevelWidget(), msg, i18n("Read") );
     return( false );
   }
 
   if( info.isDir() == true )
   {
-    const TQString msg = i18n("You have specified a folder.\n%1").tqarg( diskPath );
-    KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Read") );
+    const TQString msg = i18n("You have specified a folder.\n%1").arg( diskPath );
+    KMessageBox::sorry( topLevelWidget(), msg, i18n("Read") );
     return( false );
   }
 
   if( info.isReadable() == false )
   {
-    const TQString msg = i18n("You do not have read permission to this file.\n%1").tqarg( diskPath );
-    KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Read") );
+    const TQString msg = i18n("You do not have read permission to this file.\n%1").arg( diskPath );
+    KMessageBox::sorry( topLevelWidget(), msg, i18n("Read") );
     return( false );
   }
 
   TQFile file( diskPath );
   if( file.open( IO_ReadOnly | IO_Raw ) == false )
   {
-    const TQString msg = i18n("An error occurred while trying to open the file.\n%1").tqarg( diskPath );
-    KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Read") );
+    const TQString msg = i18n("An error occurred while trying to open the file.\n%1").arg( diskPath );
+    KMessageBox::sorry( topLevelWidget(), msg, i18n("Read") );
     return( false );
   }
 
@@ -2102,7 +2102,7 @@ bool CHexEditorWidget::readFile( const TQString &diskPath, const TQString &url,
     TQString header = insert == true ? i18n("Insert") : i18n("Read");
     TQString msg = i18n("Could not read file.\n");
     msg += hexError( errCode );
-    KMessageBox::sorry( tqtopLevelWidget(), msg, header );
+    KMessageBox::sorry( topLevelWidget(), msg, header );
   }
 
   file.close();
@@ -2120,14 +2120,14 @@ bool CHexEditorWidget::writeFile( const TQString &diskPath )
     if( info.isDir() == true )
     {
       TQString msg = i18n("You have specified a folder.");
-      KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Write Failure") );
+      KMessageBox::sorry( topLevelWidget(), msg, i18n("Write Failure") );
       return( false );
     }
 
     if( info.isWritable() == false )
     {
       TQString msg = i18n("You do not have write permission.");
-      KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Write Failure") );
+      KMessageBox::sorry( topLevelWidget(), msg, i18n("Write Failure") );
       return( false );
     }
   }
@@ -2136,7 +2136,7 @@ bool CHexEditorWidget::writeFile( const TQString &diskPath )
   if( file.open( IO_WriteOnly | IO_Raw | IO_Truncate ) == false )
   {
     TQString msg = i18n("An error occurred while trying to open the file.");
-    KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Write Failure") );
+    KMessageBox::sorry( topLevelWidget(), msg, i18n("Write Failure") );
     return( false );
   }
 
@@ -2149,7 +2149,7 @@ bool CHexEditorWidget::writeFile( const TQString &diskPath )
   {
     TQString msg = i18n("Could not write data to disk.\n");
     msg += hexError( errCode );
-    KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Write Failure") );
+    KMessageBox::sorry( topLevelWidget(), msg, i18n("Write Failure") );
   }
 
   file.close();
@@ -2231,7 +2231,7 @@ bool CHexEditorWidget::createBuffer( void )
   {
     TQString msg = i18n( "Can not create text buffer.\n" );
     msg += hexError( Err_NoMemory );
-    KMessageBox::error( tqtopLevelWidget(), msg, i18n("Loading Failed" ) );
+    KMessageBox::error( topLevelWidget(), msg, i18n("Loading Failed" ) );
     return( false );
   }
 
@@ -2418,7 +2418,7 @@ int CHexEditorWidget::progressParse( const SProgressData &pd )
 
   }
 
-  int reply = KMessageBox::warningYesNo( tqtopLevelWidget(), msg, header, KStdGuiItem::cancel(), KStdGuiItem::cont() );
+  int reply = KMessageBox::warningYesNo( topLevelWidget(), msg, header, KStdGuiItem::cancel(), KStdGuiItem::cont() );
   mProgressStop = false;
   return( reply == KMessageBox::Yes ? Err_Stop : Err_Success );
 }
@@ -2431,7 +2431,7 @@ bool CHexEditorWidget::busy( bool showWarning )
   {
     TQString msg = i18n("Could not finish operation.\n");
     msg += hexError( Err_Busy );
-    KMessageBox::sorry( tqtopLevelWidget(), msg );
+    KMessageBox::sorry( topLevelWidget(), msg );
   }
 
   return( mProgressBusy );
diff --git a/khexedit/hexeditorwidget.h b/khexedit/hexeditorwidget.h
index def98e0..669d789 100644
--- a/khexedit/hexeditorwidget.h
+++ b/khexedit/hexeditorwidget.h
@@ -83,7 +83,7 @@ class CHexEditorWidget : public TQWidget
     
     inline int defaultTextWidth( void );
     inline CHexViewWidget *view( void );
-    inline SDisplayLayout &tqlayout( void );
+    inline SDisplayLayout &layout( void );
     inline SDisplayLine &line( void );
     inline SDisplayInputMode &inputMode( void );
     inline SDisplayMisc::EOpenFile openFile( void );
@@ -170,10 +170,10 @@ class CHexEditorWidget : public TQWidget
   protected slots:
     void fontChanged( void );
     void paletteChanged( void );
-    void layoutChanged( const SDisplayLayout &tqlayout );
+    void layoutChanged( const SDisplayLayout &layout );
     void inputModeChanged( const SDisplayInputMode &input );
     void setLineSize(const SDisplayLine &line );
-    void setLayout( const SDisplayLayout &tqlayout );
+    void setLayout( const SDisplayLayout &layout );
     void setCursor( const SDisplayCursor &cursor );
     void setColor( const SDisplayColor &color );
     void setFont( const SDisplayFont &font );
@@ -259,9 +259,9 @@ inline CHexViewWidget *CHexEditorWidget::view( void )
   return( mHexView );
 }
 
-inline SDisplayLayout &CHexEditorWidget::tqlayout( void )
+inline SDisplayLayout &CHexEditorWidget::layout( void )
 {
-  return( mDisplayState.tqlayout );
+  return( mDisplayState.layout );
 }
 
 inline SDisplayLine &CHexEditorWidget::line( void )
diff --git a/khexedit/hexeditstate.h b/khexedit/hexeditstate.h
index 04f6425..f6b7d22 100644
--- a/khexedit/hexeditstate.h
+++ b/khexedit/hexeditstate.h
@@ -23,7 +23,7 @@
 
 #include <kapplication.h>
 #include <tqfont.h> 
-#include <tqpalette.h>
+#include <palette.h>
 #include <kglobalsettings.h>
 
 
@@ -382,8 +382,8 @@ class SDisplayColor
       textBg           = TQt::white;
       secondTextBg     = TQt::white;
       inactiveBg       = TQt::gray;
-      selectBg         = kapp->tqpalette().active().highlight();
-      selectFg         = kapp->tqpalette().active().highlightedText();
+      selectBg         = kapp->palette().active().highlight();
+      selectFg         = kapp->palette().active().highlightedText();
       markBg           = TQt::blue;
       markFg           = TQt::white;
       primaryFg[0]     = TQt::black;
@@ -574,7 +574,7 @@ class SDisplayState
 {
   public:
     SDisplayLine      line;
-    SDisplayLayout    tqlayout;
+    SDisplayLayout    layout;
     SDisplayCursor    cursor;
     SDisplayColor     color;
     SDisplayFont      font;
diff --git a/khexedit/hexmanagerwidget.cc b/khexedit/hexmanagerwidget.cc
index 0059c0a..2d4fa31 100644
--- a/khexedit/hexmanagerwidget.cc
+++ b/khexedit/hexmanagerwidget.cc
@@ -19,7 +19,7 @@
  */
 
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include "hexmanagerwidget.h"
 #include "searchbar.h"
 
@@ -70,7 +70,7 @@ void CHexManagerWidget::updateLayout( void )
 {
   if( mValid == false ) { return; }
 
-  delete tqlayout();
+  delete layout();
   TQVBoxLayout *vlay = new TQVBoxLayout( this, 0, 0 );
 
   if( mSearchBar && mSearchBarPosition == AboveEditor )
@@ -126,19 +126,19 @@ void CHexManagerWidget::setConversionVisibility( EConversionPosition position )
   else if( mConversionPosition == Float )
   {
     TQPoint point = mapToGlobal( TQPoint(0,0) );
-    TQRect  rect  = tqgeometry();
+    TQRect  rect  = geometry();
     TQPoint p;
 
-    p.setX(point.x() + rect.width()/2 - mConverter->tqminimumSize().width()/2);
-    p.setY(point.y() + rect.height()/2 - mConverter->tqminimumSize().height()/2);
-    mConverter->resize( mConverter->tqminimumSize() );
+    p.setX(point.x() + rect.width()/2 - mConverter->minimumSize().width()/2);
+    p.setY(point.y() + rect.height()/2 - mConverter->minimumSize().height()/2);
+    mConverter->resize( mConverter->minimumSize() );
     mConverter->reparent( 0, WStyle_Customize | WStyle_DialogBorder, p, true );
     mConverter->setCaption(kapp->makeStdCaption(i18n("Conversion")));
   }
   else
   {
     mConversionPosition = Embed;
-    uint utilHeight = mConverter->tqminimumSize().height();
+    uint utilHeight = mConverter->minimumSize().height();
     TQPoint p( 0, height() - utilHeight );
     mConverter->reparent( this, 0, p, true );
   }
@@ -250,7 +250,7 @@ int CHexManagerWidget::preferredWidth( void )
   int w = mEditor->defaultTextWidth();
   if( mConversionPosition == Embed )
   {
-    int converterWidth = mConverter->tqsizeHint().width();
+    int converterWidth = mConverter->sizeHint().width();
     w = TQMAX( w, converterWidth );
   }
   return( w );
diff --git a/khexedit/hextoolwidget.cc b/khexedit/hextoolwidget.cc
index 48a6a08..484f8a1 100644
--- a/khexedit/hextoolwidget.cc
+++ b/khexedit/hextoolwidget.cc
@@ -23,7 +23,7 @@
 
 #include "hextoolwidget.h"
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
@@ -64,30 +64,30 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name )
   for( int i=0; i<4; i++ )
   {
     TQLabel *Label = new TQLabel( msg1[i], this );
-    Label->tqsetAlignment( AlignRight|AlignVCenter );
+    Label->setAlignment( AlignRight|AlignVCenter );
     ValuesBox->addWidget( Label, i, 0 );
 
     mText1[i] = new TQLineEdit( this );
     mText1[i]->setReadOnly( true );
-    mText1[i]->tqsetAlignment( AlignRight );
+    mText1[i]->setAlignment( AlignRight );
     ValuesBox->addWidget( mText1[i], i, 1 );
 
     Label = new TQLabel( msg2[i], this );
-    Label->tqsetAlignment( AlignRight|AlignVCenter );
+    Label->setAlignment( AlignRight|AlignVCenter );
     ValuesBox->addWidget( Label, i, 3 );
 
     mText2[i] = new TQLineEdit( this );
     mText2[i]->setReadOnly( true );
-    mText2[i]->tqsetAlignment( AlignRight );
+    mText2[i]->setAlignment( AlignRight );
     ValuesBox->addWidget( mText2[i], i, 4 );
 
     Label = new TQLabel( msg3[i], this );
-    Label->tqsetAlignment( AlignRight|AlignVCenter );
+    Label->setAlignment( AlignRight|AlignVCenter );
     mUtilBox->addWidget( Label, i, 1 );
 
     mText3[i] = new TQLineEdit( this );
     mText3[i]->setReadOnly( true );
-    mText3[i]->tqsetAlignment( AlignRight );
+    mText3[i]->setAlignment( AlignRight );
     mUtilBox->addWidget( mText3[i], i, 2 );
   }
 
@@ -95,7 +95,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name )
 
   text = i18n("Show little endian decoding");
   mCheckIntelFormat = new TQCheckBox( text, this );
-  mCheckIntelFormat->setMinimumSize( mCheckIntelFormat->tqsizeHint() );
+  mCheckIntelFormat->setMinimumSize( mCheckIntelFormat->sizeHint() );
   connect( mCheckIntelFormat, TQT_SIGNAL(clicked()), this, TQT_SLOT(intelFormat()) );
   SettingsBox->addWidget( mCheckIntelFormat, 0, AlignVCenter );
   mCheckIntelFormat->setChecked( // default value to please endian system users
@@ -109,7 +109,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name )
 
   text = i18n("Show unsigned as hexadecimal");
   mCheckHexadecimal = new TQCheckBox( text, this );
-  mCheckHexadecimal->setMinimumSize( mCheckHexadecimal->tqsizeHint() );
+  mCheckHexadecimal->setMinimumSize( mCheckHexadecimal->sizeHint() );
   connect( mCheckHexadecimal, TQT_SIGNAL(clicked()), this, TQT_SLOT(unsignedFormat()) );
   SettingsBox->addWidget( mCheckHexadecimal, 0, AlignVCenter );
 
@@ -120,7 +120,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name )
   // Variable bitwidth. Based on Craig Graham's work.
   //
   TQLabel *bitLabel = new TQLabel( i18n("Stream length:"), this );
-  bitLabel->tqsetAlignment( AlignRight|AlignVCenter );
+  bitLabel->setAlignment( AlignRight|AlignVCenter );
   mUtilBox->addWidget( bitLabel, 4, 1 );
 
   mBitCombo = new TQComboBox( false, this );
@@ -132,7 +132,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name )
     text += i==0 ? i18n("Bit Window") : i18n("Bits Window");
     mBitCombo->insertItem( text );
   }
-  mBitCombo->setMinimumSize( mBitCombo->tqsizeHint() );
+  mBitCombo->setMinimumSize( mBitCombo->sizeHint() );
   connect( mBitCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(bitWidthChanged(int)));
   mUtilBox->addWidget( mBitCombo, 4, 2 );
 
@@ -147,7 +147,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name )
   mCursorState.valid = false;
   mViewHexCaps = true;
 
-  setMinimumSize( tqsizeHint() );
+  setMinimumSize( sizeHint() );
   show();
 }
 
@@ -258,7 +258,7 @@ void CHexToolWidget::cursorChanged( SCursorState &state )
     // checking for system endianess, using the compiler for the byte interpretation and cutting bloaded code
     // TODO: add PDP endianess
     void *P8Bit, *P16Bit, *P32Bit, *P64Bit;
-    // ensure strict tqalignment for double as needed on some architectures (e.g. PA-RISC)
+    // ensure strict alignment for double as needed on some architectures (e.g. PA-RISC)
     typedef union { unsigned char b[8]; double d; } aligned_t;
     aligned_t Data;
     if(
diff --git a/khexedit/hexviewwidget.cc b/khexedit/hexviewwidget.cc
index 555e0cc..db9274a 100644
--- a/khexedit/hexviewwidget.cc
+++ b/khexedit/hexviewwidget.cc
@@ -20,7 +20,7 @@
 
 #include <iostream>
 
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqdrawutil.h>
 
 
@@ -233,7 +233,7 @@ CHexViewWidget::CHexViewWidget( TQWidget *parent, const char *name,
   setStartY(0);
 
   setAcceptDrops(true);
-  setDropHighlight(false); // Init state + frame tqshape
+  setDropHighlight(false); // Init state + frame shape
   setBackgroundColor( mHexBuffer->backgroundColor() );
 }
 
@@ -438,7 +438,7 @@ void CHexViewWidget::changeYPos( int p )
 
 void CHexViewWidget::clipboardChanged( void )
 {
-  disconnect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()),
+  disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),
 	     this,TQT_SLOT(clipboardChanged()));
   unselect();
 }
@@ -459,7 +459,7 @@ void CHexViewWidget::filter( SFilterControl &fc )
   int errCode = mHexBuffer->filter( fc );
   if( errCode == Err_Success )
   {
-    tqrepaint();
+    repaint();
     emit dataChanged();
     emit cursorChanged( mHexBuffer->cursorState() );
   }
@@ -716,9 +716,9 @@ void CHexViewWidget::setPalette( const TQPalette &p )
 }
 
 
-void CHexViewWidget::setLayout( SDisplayLayout &tqlayout )
+void CHexViewWidget::setLayout( SDisplayLayout &layout )
 {
-  mLayout = tqlayout;
+  mLayout = layout;
   mHexBuffer->setLayout( mLayout );
   updateWindow();
 
@@ -739,7 +739,7 @@ void CHexViewWidget::setCursor( const SDisplayCursor &cursor,
                                 bool /*updateDisplay*/ )
 {
   mCursor = cursor;
-  mHexBuffer->settqCursorShapeModifier( cursor.alwaysBlockShape,
+  mHexBuffer->setCursorShapeModifier( cursor.alwaysBlockShape,
 				      cursor.thickInsertShape );
   setupCursorTimer();
   redrawFromOffset( mHexBuffer->cursorOffset(), false );
@@ -752,7 +752,7 @@ void CHexViewWidget::setColor( const SDisplayColor &color,
   mHexBuffer->setColor( mColor );
   if( updateDisplay == true )
   {
-    tqrepaint();
+    repaint();
   }
 }
 
@@ -796,7 +796,7 @@ int CHexViewWidget::setEncoding( CConversion::EMode mode, CProgress &p )
   int errCode = mHexBuffer->setEncoding( mode, p );
   if( errCode == Err_Success )
   {
-    tqrepaint();
+    repaint();
     emit cursorChanged( mHexBuffer->cursorState() );
     emit encodingChanged( mHexBuffer->encoding() );
   }
@@ -964,7 +964,7 @@ void CHexViewWidget::copy( void )
   {
     return;
   }
-  disconnect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()),
+  disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),
 	     this,TQT_SLOT(clipboardChanged()));
   //
   // Note: Do no give the CHexDrag a parent != 0. The clipboard
@@ -974,8 +974,8 @@ void CHexViewWidget::copy( void )
   // is destroyed. We will then have a double destroy situation
   // when the app. is closed (=> segfault).
   //
-  TQApplication::tqclipboard()->setData(new CHexDrag( buf ));
-  connect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()),
+  TQApplication::clipboard()->setData(new CHexDrag( buf ));
+  connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),
 	  this,TQT_SLOT(clipboardChanged()));
 }
 
@@ -988,10 +988,10 @@ void CHexViewWidget::copyText( int columnSegment )
     return;
   }
 
-  disconnect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()),
+  disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),
 	     this,TQT_SLOT(clipboardChanged()));
-  TQApplication::tqclipboard()->setText( buf.data() );
-  connect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()),
+  TQApplication::clipboard()->setText( buf.data() );
+  connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),
 	  this,TQT_SLOT(clipboardChanged()));
 }
 
@@ -999,7 +999,7 @@ void CHexViewWidget::copyText( int columnSegment )
 
 void CHexViewWidget::paste( void )
 {
-  TQMimeSource *data = TQApplication::tqclipboard()->data();
+  TQMimeSource *data = TQApplication::clipboard()->data();
   if( data != 0 )
   {
     TQByteArray buf;
@@ -1099,11 +1099,11 @@ int CHexViewWidget::bookmarkMenu( const TQString &title )
     if( p == 0 ) { continue; }
 
     text.sprintf("%04X:%04X", p->offset>>16, p->offset&0x0000FFFF );
-    text.prepend( TQString("[%1] %2: ").tqarg(i+1).tqarg(i18n("Offset")) );
+    text.prepend( TQString("[%1] %2: ").arg(i+1).arg(i18n("Offset")) );
     popup->insertItem( text, i );
   }
 
-  TQSize s(popup->tqsizeHint());
+  TQSize s(popup->sizeHint());
   TQPoint center( (width()-s.width())/2, (height()-s.height())/2 );
   int position = popup->exec( mapToGlobal(center) );
   delete popup;
@@ -1379,7 +1379,7 @@ void CHexViewWidget::drawFrame( TQPainter *p )
   // accepts a drop. The setPalette() function causes quite a bit of flicker
   // in the scrollbars (even when PropagationMode is NoChildren), so I
   // draw the frame manually when it can accept a drop. Note that the
-  // code below is for the frame tqshape "TQFrame::WinPanel|TQFrame::Plain"
+  // code below is for the frame shape "TQFrame::WinPanel|TQFrame::Plain"
   //
   if( mDropHighlight == true )
   {
@@ -1860,7 +1860,7 @@ void CHexViewWidget::setCursorPosition(int x, int y, bool init, bool cellLevel)
 void CHexViewWidget::redrawInterval( uint startOffset, uint stopOffset )
 {
   //
-  // Can be improved, I tqrepaint the entire line even if the offsets
+  // Can be improved, I repaint the entire line even if the offsets
   // only specify one byte.
   //
   uint lineStart = mHexBuffer->calculateLine( startOffset );
@@ -2270,7 +2270,7 @@ void CHexViewWidget::setDropHighlight( bool dropHighlight )
     //
     // 2000-01-10 Espen Sand
     // Highlight. I have reimplemented TQFrame::drawFrame(TQPainter *)
-    // to support a custom frame color. I assume the frame tqshape is
+    // to support a custom frame color. I assume the frame shape is
     // "TQFrame::WinPanel|TQFrame::Plain" in that function.
     //
     setFrameStyle( TQFrame::WinPanel|TQFrame::Plain );
diff --git a/khexedit/hexviewwidget.h b/khexedit/hexviewwidget.h
index 1e3f02c..a958309 100644
--- a/khexedit/hexviewwidget.h
+++ b/khexedit/hexviewwidget.h
@@ -140,7 +140,7 @@ class CHexViewWidget : public TQFrame
 
     virtual void setPalette( const TQPalette & );
     void setInputMode( SDisplayInputMode &mode );
-    void setLayout( SDisplayLayout &tqlayout );
+    void setLayout( SDisplayLayout &layout );
     void setCursor( const SDisplayCursor &cursor, bool updateDisplay );
     void setColor( const SDisplayColor &color, bool updateDisplay );
     void setFont( const SDisplayFontInfo &fontInfo, bool updateDisplay );
@@ -218,7 +218,7 @@ class CHexViewWidget : public TQFrame
     void cursorChanged( SCursorState &state );
     void fileState( SFileState &state );
     void dataChanged( void );
-    void layoutChanged( const SDisplayLayout &tqlayout );
+    void layoutChanged( const SDisplayLayout &layout );
     void inputModeChanged( const SDisplayInputMode &mode );
     void bookmarkChanged( TQPtrList<SCursorOffset> &list );
     void editMode( CHexBuffer::EEditMode editMode );
diff --git a/khexedit/lib/codecs/kbinarybytecodec.cpp b/khexedit/lib/codecs/kbinarybytecodec.cpp
index fc9fe8d..a49a460 100644
--- a/khexedit/lib/codecs/kbinarybytecodec.cpp
+++ b/khexedit/lib/codecs/kbinarybytecodec.cpp
@@ -24,7 +24,7 @@ using namespace KHE;
 void KBinaryByteCodec::encode( TQString &Digits, unsigned int Pos, const unsigned char Char ) const
 {
   for( unsigned char M=1<<7; M>0; M>>=1 )
-    Digits.tqat(Pos++) = (Char & M) ? '1' : '0';
+    Digits.at(Pos++) = (Char & M) ? '1' : '0';
 }
 
 void KBinaryByteCodec::encodeShort( TQString &Digits, unsigned int Pos, unsigned char Char ) const
@@ -36,7 +36,7 @@ void KBinaryByteCodec::encodeShort( TQString &Digits, unsigned int Pos, unsigned
       break;
   // now set the
   for( ; M>0; M>>=1 )
-    Digits.tqat(Pos++) = (Char & M) ? '1' : '0';
+    Digits.at(Pos++) = (Char & M) ? '1' : '0';
 }
 
 
diff --git a/khexedit/lib/codecs/kbytecodec.cpp b/khexedit/lib/codecs/kbytecodec.cpp
index 900055e..f4847ba 100644
--- a/khexedit/lib/codecs/kbytecodec.cpp
+++ b/khexedit/lib/codecs/kbytecodec.cpp
@@ -40,7 +40,7 @@ KByteCodec *KByteCodec::createCodec( KCoding C )
 
 unsigned int KByteCodec::decode( unsigned char *Char, const TQString &Digits, uint Pos ) const
 {
-  //kdDebug() << TQString("KByteCodec::decode(%1,%2)").tqarg(Digits).tqarg(Pos) << endl;
+  //kdDebug() << TQString("KByteCodec::decode(%1,%2)").arg(Digits).arg(Pos) << endl;
   const uint P = Pos;
 
   // remove leading 0s
@@ -50,7 +50,7 @@ unsigned int KByteCodec::decode( unsigned char *Char, const TQString &Digits, ui
   unsigned int d = encodingWidth();
   do
   {
-    if( !appendDigit(&C,Digits.tqat(Pos)) )
+    if( !appendDigit(&C,Digits.at(Pos)) )
       break;
 
     ++Pos;
diff --git a/khexedit/lib/codecs/kdecimalbytecodec.cpp b/khexedit/lib/codecs/kdecimalbytecodec.cpp
index 065eb81..c556875 100644
--- a/khexedit/lib/codecs/kdecimalbytecodec.cpp
+++ b/khexedit/lib/codecs/kdecimalbytecodec.cpp
@@ -24,12 +24,12 @@ using namespace KHE;
 void KDecimalByteCodec::encode( TQString &Digits, unsigned int Pos, unsigned char Char ) const
 {
   unsigned char C = Char / 100;
-  Digits.tqat(Pos++) = '0'+C;
+  Digits.at(Pos++) = '0'+C;
   Char -= C * 100;
   C = Char / 10;
-  Digits.tqat(Pos++) = '0'+C;
+  Digits.at(Pos++) = '0'+C;
   Char -= C * 10;
-  Digits.tqat(Pos) = '0'+Char;
+  Digits.at(Pos) = '0'+Char;
 }
 
 
@@ -38,15 +38,15 @@ void KDecimalByteCodec::encodeShort( TQString &Digits, unsigned int Pos, unsigne
   unsigned char C;
   if( (C = Char / 100) )
   {
-    Digits.tqat(Pos++) = '0'+C;
+    Digits.at(Pos++) = '0'+C;
     Char -= C * 100;
   }
   if( (C = Char / 10) )
   {
-    Digits.tqat(Pos++) = '0'+C;
+    Digits.at(Pos++) = '0'+C;
     Char -= C * 10;
   }
-  Digits.tqat(Pos) = '0'+Char;
+  Digits.at(Pos) = '0'+Char;
 }
 
 
diff --git a/khexedit/lib/codecs/kebcdic1047charcodec.cpp b/khexedit/lib/codecs/kebcdic1047charcodec.cpp
index 2e91035..e787715 100644
--- a/khexedit/lib/codecs/kebcdic1047charcodec.cpp
+++ b/khexedit/lib/codecs/kebcdic1047charcodec.cpp
@@ -98,7 +98,7 @@ static const char KEBCDIC1047CharCodecName[] = "EBCDIC 1047";
 
 bool KEBCDIC1047CharCodec::encode( char *D, const TQChar &C ) const
 {
-  int I = C.tqunicode();
+  int I = C.unicode();
   // not in range?
   if( 0x00FF < I )
     return false;
@@ -119,6 +119,6 @@ const TQString& KEBCDIC1047CharCodec::name() const
 
 const TQString& KEBCDIC1047CharCodec::codecName()
 {
-  static const TQString Name( TQString::tqfromLatin1(KEBCDIC1047CharCodecName) );
+  static const TQString Name( TQString::fromLatin1(KEBCDIC1047CharCodecName) );
   return Name;
 }
diff --git a/khexedit/lib/codecs/khexadecimalbytecodec.cpp b/khexedit/lib/codecs/khexadecimalbytecodec.cpp
index 46abdad..596fd24 100644
--- a/khexedit/lib/codecs/khexadecimalbytecodec.cpp
+++ b/khexedit/lib/codecs/khexadecimalbytecodec.cpp
@@ -41,16 +41,16 @@ bool KHexadecimalByteCodec::smallDigits() const { return Digit != BigDigit; }
 
 void KHexadecimalByteCodec::encode( TQString &Digits, unsigned int Pos, unsigned char Char ) const
 {
-  Digits.tqat(Pos++) = Digit[Char>>4];
-  Digits.tqat(Pos) = Digit[Char&0x0F];
+  Digits.at(Pos++) = Digit[Char>>4];
+  Digits.at(Pos) = Digit[Char&0x0F];
 }
 
 void KHexadecimalByteCodec::encodeShort( TQString &Digits, unsigned int Pos, unsigned char Char ) const
 {
   unsigned char C;
   if( (C = (Char>>4)) )
-    Digits.tqat(Pos++) = Digit[C];
-  Digits.tqat(Pos) = Digit[Char&0x0F];
+    Digits.at(Pos++) = Digit[C];
+  Digits.at(Pos) = Digit[Char&0x0F];
 }
 
 
diff --git a/khexedit/lib/codecs/koctalbytecodec.cpp b/khexedit/lib/codecs/koctalbytecodec.cpp
index 7aa156d..44c7952 100644
--- a/khexedit/lib/codecs/koctalbytecodec.cpp
+++ b/khexedit/lib/codecs/koctalbytecodec.cpp
@@ -23,9 +23,9 @@ using namespace KHE;
 
 void KOctalByteCodec::encode( TQString &Digits, unsigned int Pos, unsigned char Char ) const
 {
-  Digits.tqat(Pos++) = '0'+(Char>>6);
-  Digits.tqat(Pos++) = '0'+((Char>>3)&0x07);
-  Digits.tqat(Pos) = '0'+((Char)   &0x07);
+  Digits.at(Pos++) = '0'+(Char>>6);
+  Digits.at(Pos++) = '0'+((Char>>3)&0x07);
+  Digits.at(Pos) = '0'+((Char)   &0x07);
 }
 
 
@@ -33,10 +33,10 @@ void KOctalByteCodec::encodeShort( TQString &Digits, unsigned int Pos, unsigned
 {
   unsigned char C;
   if( (C = (Char>>6)&0x07) )
-    Digits.tqat(Pos++) = '0'+C;
+    Digits.at(Pos++) = '0'+C;
   if( (C = (Char>>3)&0x07) )
-    Digits.tqat(Pos++) = '0'+C;
-  Digits.tqat(Pos) = '0'+((Char)&0x07);
+    Digits.at(Pos++) = '0'+C;
+  Digits.at(Pos) = '0'+((Char)&0x07);
 }
 
 
diff --git a/khexedit/lib/codecs/ktextcharcodec.cpp b/khexedit/lib/codecs/ktextcharcodec.cpp
index f5bcc65..137c920 100644
--- a/khexedit/lib/codecs/ktextcharcodec.cpp
+++ b/khexedit/lib/codecs/ktextcharcodec.cpp
@@ -16,7 +16,7 @@
 
 
 // qt specific
-#include "tqtextcodec.h"
+#include "textcodec.h"
 // kde specific
 #include <kglobal.h>
 #include <klocale.h>
@@ -127,7 +127,7 @@ const TQStringList &KTextCharCodec::codecNames()
       bool Found = true;
       TQTextCodec* Codec = KGlobal::charsets()->codecForName( *it, Found );
       if( Found && is8Bit(Codec) )
-        CodecNames.append( TQString::tqfromLatin1(Codec->name()) );
+        CodecNames.append( TQString::fromLatin1(Codec->name()) );
 }
 }
 
@@ -150,7 +150,7 @@ TQString KTextCharCodec::nameOfEncoding( KEncoding C )
 
   if( N != 0 )
   {
-    TQString CodeName = TQString::tqfromLatin1( N );
+    TQString CodeName = TQString::fromLatin1( N );
   }
   return Codec;
 }
@@ -186,10 +186,10 @@ const TQStringList &KTextCharCodec::codecNames()
     for( unsigned int i=0; i<NoOfEncodings; ++i )
     {
       bool Found = true;
-      TQString Name = TQString::tqfromLatin1( EncodingNames[i].Name );
+      TQString Name = TQString::fromLatin1( EncodingNames[i].Name );
       TQTextCodec* Codec = KGlobal::charsets()->codecForName( Name, Found );
       if( Found )
-        CodecNames.append( TQString::tqfromLatin1(Codec->name()) );
+        CodecNames.append( TQString::fromLatin1(Codec->name()) );
     }
   }
 
@@ -231,6 +231,6 @@ KHEChar KTextCharCodec::decode( char Byte ) const
 const TQString& KTextCharCodec::name() const
 {
   if( Name.isNull() )
-    Name = TQString::tqfromLatin1( Codec->name() );
+    Name = TQString::fromLatin1( Codec->name() );
   return Name;
 }
diff --git a/khexedit/lib/codecs/ktextcharcodec.h b/khexedit/lib/codecs/ktextcharcodec.h
index 05a40ab..8d834ea 100644
--- a/khexedit/lib/codecs/ktextcharcodec.h
+++ b/khexedit/lib/codecs/ktextcharcodec.h
@@ -51,9 +51,9 @@ class KTextCharCodec : public KCharCodec
 
   protected:
     TQTextCodec *Codec;
-    /** decodes the chars to tqunicode */
+    /** decodes the chars to unicode */
     TQTextDecoder *Decoder;
-    /** encodes the chars from tqunicode */
+    /** encodes the chars from unicode */
     TQTextEncoder *Encoder;
     /** */
     mutable TQString Name;
diff --git a/khexedit/lib/kbordercolumn.cpp b/khexedit/lib/kbordercolumn.cpp
index 170f972..4a22919 100644
--- a/khexedit/lib/kbordercolumn.cpp
+++ b/khexedit/lib/kbordercolumn.cpp
@@ -49,8 +49,8 @@ void KBorderColumn::paintLine( TQPainter *P )
 
     if( Middle )
     {
-      int GridColor = View->tqstyle().tqstyleHint( TQStyle::SH_Table_GridLineColor, View );
-      P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->tqcolorGroup().mid() );
+      int GridColor = View->tqstyle().styleHint( TQStyle::SH_Table_GridLineColor, View );
+      P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->colorGroup().mid() );
       P->drawLine( LineX, 0, LineX, LineHeight-1 ) ;
     }
   }
@@ -75,8 +75,8 @@ void KBorderColumn::paintEmptyColumn( TQPainter *P, KPixelXs Xs, KPixelYs Ys )
   KPixelX LX = x() + LineX;
   if( Middle && Xs.includes(LX) )
   {
-    int GridColor = View->tqstyle().tqstyleHint( TQStyle::SH_Table_GridLineColor, View );
-    P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->tqcolorGroup().mid() );
+    int GridColor = View->tqstyle().styleHint( TQStyle::SH_Table_GridLineColor, View );
+    P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->colorGroup().mid() );
     P->drawLine( LX, Ys.start(), LX, Ys.end() ) ;
   }
 }
diff --git a/khexedit/lib/kbuffercoltextexport.cpp b/khexedit/lib/kbuffercoltextexport.cpp
index 9ee6f77..142504c 100644
--- a/khexedit/lib/kbuffercoltextexport.cpp
+++ b/khexedit/lib/kbuffercoltextexport.cpp
@@ -38,7 +38,7 @@ KBufferColTextExport::KBufferColTextExport( const KBufferColumn* BufferColumn, c
  : Data( D ),
    CoordRange( CR )
 {
-  NoOfBytesPerLine = BufferColumn->tqlayout()->noOfBytesPerLine();
+  NoOfBytesPerLine = BufferColumn->layout()->noOfBytesPerLine();
   Pos = new int[NoOfBytesPerLine];
 
   // TODO: remove this hack and make it more general
diff --git a/khexedit/lib/kbuffercolumn.cpp b/khexedit/lib/kbuffercolumn.cpp
index 1d26bf0..fb2cfb9 100644
--- a/khexedit/lib/kbuffercolumn.cpp
+++ b/khexedit/lib/kbuffercolumn.cpp
@@ -395,7 +395,7 @@ void KBufferColumn::paintLine( TQPainter *P, int Line ) // TODO: could be remove
 
 void KBufferColumn::paintPositions( TQPainter *P, int Line, KSection Pos )
 {
-  const TQColorGroup &CG = View->tqcolorGroup();
+  const TQColorGroup &CG = View->colorGroup();
 
   // clear background
   unsigned int BlankFlag = (Pos.start()!=0?StartsBefore:0) | (Pos.end()!=LastPos?EndsLater:0);
@@ -501,7 +501,7 @@ void KBufferColumn::paintPlain( TQPainter *P, KSection Positions, int Index )
 
 void KBufferColumn::paintSelection( TQPainter *P, KSection Positions, int Index, int Flag )
 {
-  const TQColorGroup &CG = View->tqcolorGroup();
+  const TQColorGroup &CG = View->colorGroup();
 
   paintRange( P, CG.highlight(), Positions, Flag );
 
@@ -524,7 +524,7 @@ void KBufferColumn::paintSelection( TQPainter *P, KSection Positions, int Index,
 
 void KBufferColumn::paintMarking( TQPainter *P, KSection Positions, int Index, int Flag )
 {
-  const TQColorGroup &CG = View->tqcolorGroup();
+  const TQColorGroup &CG = View->colorGroup();
 
   paintRange( P, CG.text(), Positions, Flag );
 
@@ -581,7 +581,7 @@ void KBufferColumn::paintByte( TQPainter *P, int Index )
   char Byte = ( Index > -1 ) ? Buffer->datum( Index ) : EmptyByte;
   KHEChar B = Codec->decode( Byte );
 
-  const TQColorGroup &CG = View->tqcolorGroup();
+  const TQColorGroup &CG = View->colorGroup();
   TQColor Color = CG.text();
   TQBrush Brush( CG.base(), TQt::SolidPattern );
 
diff --git a/khexedit/lib/kbuffercolumn.h b/khexedit/lib/kbuffercolumn.h
index 47f21d1..10e930d 100644
--- a/khexedit/lib/kbuffercolumn.h
+++ b/khexedit/lib/kbuffercolumn.h
@@ -39,7 +39,7 @@ class KCharCodec;
 const int NoByteFound = -1;
 
 /** base class of all buffer column displayers
-  * holds all information about the vertical tqlayout of a buffer column
+  * holds all information about the vertical layout of a buffer column
   * knows how to paint the data and the editing things (focus, cursor, selection)
   * but does not offer
   *
@@ -154,7 +154,7 @@ class KBufferColumn : public KColumn
     int firstPos() const;
     int lastPos()  const;
     KSection visiblePositions() const;
-    const KBufferLayout *tqlayout() const;
+    const KBufferLayout *layout() const;
     KCharCodec* codec() const;
 
   protected:
@@ -184,7 +184,7 @@ class KBufferColumn : public KColumn
   protected:
     /** pointer to the buffer */
     KDataBuffer *Buffer;
-    /** pointer to the tqlayout */
+    /** pointer to the layout */
     const KBufferLayout *Layout;
     /** pointer to the ranges */
     KBufferRanges *Ranges;
@@ -242,7 +242,7 @@ inline int KBufferColumn::firstPos() const { return PaintPositions.start(); }
 inline int KBufferColumn::lastPos()  const { return PaintPositions.end(); }
 inline KSection KBufferColumn::visiblePositions() const { return PaintPositions; }
 
-inline const KBufferLayout *KBufferColumn::tqlayout() const { return Layout; }
+inline const KBufferLayout *KBufferColumn::layout() const { return Layout; }
 
 
 inline void KBufferColumn::setCodec( KCharCodec *C ) { Codec = C; }
diff --git a/khexedit/lib/kbuffercursor.h b/khexedit/lib/kbuffercursor.h
index 93205cc..855b3e8 100644
--- a/khexedit/lib/kbuffercursor.h
+++ b/khexedit/lib/kbuffercursor.h
@@ -27,10 +27,10 @@ namespace KHE
 class KBufferLayout;
 
 
-/**@short navigates through the buffer in an abstract way, based on the tqlayout
+/**@short navigates through the buffer in an abstract way, based on the layout
   *
   * The cursor is allowed to access every coord that has content as
-  * described in the tqlayout. It holds the coord of the actual position
+  * described in the layout. It holds the coord of the actual position
   * and the according index in the data array.
   *
   * To enable the cursor to be placed behind the last position in a line
@@ -138,7 +138,7 @@ class KBufferCursor
     void stepToEnd();
 
   private:
-    /** tqlayout, tells how the column is organized  */
+    /** layout, tells how the column is organized  */
     const KBufferLayout *Layout;
 
     /** Position in buffer */
@@ -151,7 +151,7 @@ class KBufferCursor
       */
     bool Behind : 1;
 
-    /** tells whether there could be a position behind the end of the tqlayout */
+    /** tells whether there could be a position behind the end of the layout */
     bool AppendPosEnabled : 1;
 };
 
diff --git a/khexedit/lib/kbufferdrag.cpp b/khexedit/lib/kbufferdrag.cpp
index c9cc54a..80b1d1c 100644
--- a/khexedit/lib/kbufferdrag.cpp
+++ b/khexedit/lib/kbufferdrag.cpp
@@ -17,7 +17,7 @@
 
 // qt specific
 #include <tqcstring.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 // kde specific
 #include <kglobal.h>
 #include <klocale.h>
@@ -135,7 +135,7 @@ const char *KBufferDrag::format( int i ) const
 }
 
 
-TQByteArray KBufferDrag::tqencodedData( const char *Format ) const
+TQByteArray KBufferDrag::encodedData( const char *Format ) const
 {
   if( Format != 0 )
   {
@@ -166,7 +166,7 @@ TQByteArray KBufferDrag::tqencodedData( const char *Format ) const
         { 
           KHEChar B = CharCodec->decode( Data[i] );
 
-          Text.tqat(i) = B.isUndefined() ? KHEChar(UndefinedChar) :
+          Text.at(i) = B.isUndefined() ? KHEChar(UndefinedChar) :
               (!B.isPrint() && B != Tab && B != Return ) ? KHEChar(SubstituteChar) : B;
         }
         // clean up
@@ -224,12 +224,12 @@ bool KBufferDrag::canDecode( const TQMimeSource* Source )
 
 bool KBufferDrag::decode( const TQMimeSource* Source, TQByteArray &Dest )
 {
-//   Dest = Source->tqencodedData( MediaString );
+//   Dest = Source->encodedData( MediaString );
 //   return Dest.size() != 0;
 
   bool CanDecode = Source->provides( OctetStream );
   if( CanDecode )
-    Dest = Source->tqencodedData( OctetStream );
+    Dest = Source->encodedData( OctetStream );
 
   return CanDecode;
 }
diff --git a/khexedit/lib/kbufferdrag.h b/khexedit/lib/kbufferdrag.h
index effd9a2..3af0ebd 100644
--- a/khexedit/lib/kbufferdrag.h
+++ b/khexedit/lib/kbufferdrag.h
@@ -52,7 +52,7 @@ class KBufferDrag : public TQDragObject
 
   public: // TQDragObject API
     virtual const char *format( int i ) const;
-    virtual TQByteArray tqencodedData( const char* ) const;
+    virtual TQByteArray encodedData( const char* ) const;
 
   public:
     virtual void setData( const TQByteArray &);
diff --git a/khexedit/lib/kbufferlayout.h b/khexedit/lib/kbufferlayout.h
index bd92005..c243225 100644
--- a/khexedit/lib/kbufferlayout.h
+++ b/khexedit/lib/kbufferlayout.h
@@ -24,7 +24,7 @@
 
 namespace KHE {
 
-/**@short the logical tqlayout of a plain buffer view
+/**@short the logical layout of a plain buffer view
   *
   * Given the values for
   * * length of the buffer,
@@ -38,7 +38,7 @@ namespace KHE {
   * * final position in this line, and
   * * the total number of lines (is final line +1 or 0)
   *
-  * This tqlayout sees the buffer as a continous stream of byte,
+  * This layout sees the buffer as a continous stream of byte,
   * thus uses each line after the start from the begin to the end.
   *
   * If the buffer is empty the end coord will be set one pos left to the start coord
@@ -75,7 +75,7 @@ class KBufferLayout
     /** returns the coord of the end */
     KBufferCoord final() const;
 
-    /** tells how much lines this tqlayout needs (incl. blank leading lines due to StartOffset) */
+    /** tells how much lines this layout needs (incl. blank leading lines due to StartOffset) */
     int noOfLines() const;
 
 
diff --git a/khexedit/lib/kbufferranges.h b/khexedit/lib/kbufferranges.h
index 6b293b2..ed2cbce 100644
--- a/khexedit/lib/kbufferranges.h
+++ b/khexedit/lib/kbufferranges.h
@@ -28,7 +28,7 @@ namespace KHE
 {
 
 /** a class to control all the ranges like marking and selections
-  * holds also all modified ranges and merges them so a tqrepaint can take its info from here
+  * holds also all modified ranges and merges them so a repaint can take its info from here
   *
   * @author Friedrich W. H.  Kossebau
   */
diff --git a/khexedit/lib/kbytesedit.h b/khexedit/lib/kbytesedit.h
index 915276b..eedf025 100644
--- a/khexedit/lib/kbytesedit.h
+++ b/khexedit/lib/kbytesedit.h
@@ -39,7 +39,7 @@ class KBytesEditPrivate;
   *       possible changes are told to the widget by repaintRange
   *    b) changing data ranges -> data pointer and length might change
   *       changes told by
-  *       * resetData( char *, int size, bool tqrepaint );
+  *       * resetData( char *, int size, bool repaint );
   *       *
   * 2. used as editor
   *    a) static data ranges
@@ -137,7 +137,7 @@ class KHEXEDIT_EXPORT KBytesEdit : public KHexEdit
       */
     void setKeepsMemory( bool KM = true );
 
-    /** tqrepaint the indizes from i1 to i2 */
+    /** repaint the indizes from i1 to i2 */
     void repaintRange( int i1, int i2 );
 
   protected:
diff --git a/khexedit/lib/kcolumnsview.cpp b/khexedit/lib/kcolumnsview.cpp
index 2b0b157..4bb939a 100644
--- a/khexedit/lib/kcolumnsview.cpp
+++ b/khexedit/lib/kcolumnsview.cpp
@@ -167,7 +167,7 @@ void KColumnsView::drawContents( TQPainter *P, int cx, int cy, int cw, int ch )
       if( AffectedLines.isValid() )
       {
         TQPainter Paint;
-        Paint.tqbegin( const_cast<TQPixmap*>(&LineBuffer), this );
+        Paint.begin( const_cast<TQPixmap*>(&LineBuffer), this );
 
         // starting painting with the first line
         KColumn *C = RedrawColumns.first();
@@ -198,7 +198,7 @@ void KColumnsView::drawContents( TQPainter *P, int cx, int cy, int cw, int ch )
             break;
 
           // to avoid flickers we first paint to the linebuffer
-          Paint.tqbegin( TQT_TQPAINTDEVICE(&LineBuffer), this );
+          Paint.begin( TQT_TQPAINTDEVICE(&LineBuffer), this );
 
           KColumn *C = RedrawColumns.first();
           Paint.translate( C->x(), 0 );
diff --git a/khexedit/lib/kcursor.h b/khexedit/lib/kcursor.h
index bb66003..17b4371 100644
--- a/khexedit/lib/kcursor.h
+++ b/khexedit/lib/kcursor.h
@@ -38,7 +38,7 @@ class KCursor
   public:
     /** sets size of the full cursor */
     void setSize( KPixelX Width, KPixelY Height );
-    /** sets the tqshape of the cursor to be drawn */
+    /** sets the shape of the cursor to be drawn */
     void setShape( KPixelX X, KPixelX W );
 
   public: // access
diff --git a/khexedit/lib/kfixedsizebuffer.cpp b/khexedit/lib/kfixedsizebuffer.cpp
index 83fd134..784858c 100644
--- a/khexedit/lib/kfixedsizebuffer.cpp
+++ b/khexedit/lib/kfixedsizebuffer.cpp
@@ -214,7 +214,7 @@ int KFixedSizeBuffer::fill( const char FChar, int FillLength, unsigned int Pos )
 
 int KFixedSizeBuffer::compare( const KDataBuffer &Other, KSection OtherRange, unsigned int Pos )
 {
-  //kdDebug() << TQString("Pos: %1, OtherRange: (%3/%4)" ).tqarg(Pos).tqarg(OtherRange.start()).tqarg(OtherRange.end())
+  //kdDebug() << TQString("Pos: %1, OtherRange: (%3/%4)" ).arg(Pos).arg(OtherRange.start()).arg(OtherRange.end())
   //    << endl;
   // test other values
   if( OtherRange.startsBehind(Other.size()-1) )
@@ -245,14 +245,14 @@ int KFixedSizeBuffer::compare( const KDataBuffer &Other, KSection OtherRange, un
       ValueByLength = -1;
   }
   //kdDebug()
-  //    << TQString( "Range: (%1/%2), OtherRange: (%3/%4)" ).tqarg(Range.start()).tqarg(Range.end()).tqarg(OtherRange.start()).tqarg(OtherRange.end())
+  //    << TQString( "Range: (%1/%2), OtherRange: (%3/%4)" ).arg(Range.start()).arg(Range.end()).arg(OtherRange.start()).arg(OtherRange.end())
   //    << endl;
   int oi = OtherRange.start();
   for( int i=Range.start(); i<=Range.end(); ++i,++oi )
   {
     char OD = Other.datum(oi);
     char D = Data[i];
-    //kdDebug() << TQString("%1==%2").tqarg((int)D).tqarg((int)OD) << endl;
+    //kdDebug() << TQString("%1==%2").arg((int)D).arg((int)OD) << endl;
     if( OD == D )
       continue;
     return OD < D ? 1 : -1;
diff --git a/khexedit/lib/khexedit.cpp b/khexedit/lib/khexedit.cpp
index 01d7602..54726fa 100644
--- a/khexedit/lib/khexedit.cpp
+++ b/khexedit/lib/khexedit.cpp
@@ -94,7 +94,7 @@ KHexEdit::KHexEdit( KDataBuffer *Buffer, TQWidget *Parent, const char *Name, WFl
    InZooming( false ),
    d( 0 )
 {
-  // initalize tqlayout
+  // initalize layout
   if( DataBuffer )
     BufferLayout->setLength( DataBuffer->size() );
   BufferLayout->setNoOfLinesPerPage( noOfLinesPerPage() );
@@ -199,7 +199,7 @@ void KHexEdit::setOverwriteMode( bool OM )
   OverWrite = OM;
 
   // affected:
-  // cursor tqshape
+  // cursor shape
   bool ChangeCursor = !( CursorPaused || ValueEditor->isInEditMode() );
   if( ChangeCursor )
     pauseCursor();
@@ -548,17 +548,17 @@ void KHexEdit::toggleOffsetColumn( bool Visible )
 }
 
 
-TQSize KHexEdit::tqsizeHint() const
+TQSize KHexEdit::sizeHint() const
 {
   return TQSize( totalWidth(), totalHeight() );
 }
 
 
-TQSize KHexEdit::tqminimumSizeHint() const
+TQSize KHexEdit::minimumSizeHint() const
 {
   // TODO: better minimal width (visibility!)
   return TQSize( OffsetColumn->visibleWidth()+FirstBorderColumn->visibleWidth()+SecondBorderColumn->visibleWidth()+valueColumn().byteWidth()+charColumn().byteWidth(),
-                lineHeight() + noOfLines()>1? tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent):0 );
+                lineHeight() + noOfLines()>1? tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent):0 );
 }
 
 
@@ -598,7 +598,7 @@ int KHexEdit::fittingBytesPerLine( const TQSize &NewSize ) const
 
   // check influence of dis-/appearing of the vertical scrollbar
   bool VerticalScrollbarIsVisible = verticalScrollBar()->isVisible();
-  KPixelX ScrollbarExtent = tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent );//verticalScrollBar()->width();
+  KPixelX ScrollbarExtent = tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent );//verticalScrollBar()->width();
 
   KPixelX AvailableWidth = FullWidth;
   if( VerticalScrollbarIsVisible )
@@ -850,7 +850,7 @@ void KHexEdit::cut()
   if( !Drag )
     return;
 
-  TQApplication::tqclipboard()->setData( Drag, ClipboardMode );
+  TQApplication::clipboard()->setData( Drag, ClipboardMode );
 
   removeSelectedData();
 }
@@ -862,7 +862,7 @@ void KHexEdit::copy()
   if( !Drag )
     return;
 
-  TQApplication::tqclipboard()->setData( Drag, ClipboardMode );
+  TQApplication::clipboard()->setData( Drag, ClipboardMode );
 }
 
 
@@ -871,7 +871,7 @@ void KHexEdit::paste()
   if( isReadOnly() )
     return;
 
-  TQMimeSource *Source = TQApplication::tqclipboard()->data( ClipboardMode );
+  TQMimeSource *Source = TQApplication::clipboard()->data( ClipboardMode );
   pasteFromSource( Source );
 }
 
@@ -1042,7 +1042,7 @@ void KHexEdit::updateLength()
 void KHexEdit::clipboardChanged()
 {
   // don't listen to selection changes
-  disconnect( TQApplication::tqclipboard(), TQT_SIGNAL(selectionChanged()), this, 0 );
+  disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0 );
   selectAll( false );
 }
 
@@ -1192,11 +1192,11 @@ bool KHexEdit::eventFilter( TQObject *O, TQEvent *E )
 
 //   if( O == this && E->type() == TQEvent::PaletteChange )
 //   {
-//     TQColor old( viewport()->tqcolorGroup().color(TQColorGroup::Text) );
+//     TQColor old( viewport()->colorGroup().color(TQColorGroup::Text) );
 //
-//     if( old != tqcolorGroup().color(TQColorGroup::Text) )
+//     if( old != colorGroup().color(TQColorGroup::Text) )
 //     {
-//       TQColor c( tqcolorGroup().color(TQColorGroup::Text) );
+//       TQColor c( colorGroup().color(TQColorGroup::Text) );
 //       doc->setMinimumWidth( -1 );
 //       doc->setDefaultFormat( doc->formatCollection()->defaultFormat()->font(), c );
 //       lastFormatted = doc->firstParagraph();
@@ -1275,15 +1275,15 @@ void KHexEdit::createCursorPixmaps()
   int Index = BufferCursor->validIndex();
 
   TQPainter Paint;
-  Paint.tqbegin( const_cast<TQPixmap*>(&CursorPixmaps->offPixmap()), this );
+  Paint.begin( const_cast<TQPixmap*>(&CursorPixmaps->offPixmap()), this );
   activeColumn().paintByte( &Paint, Index );
   Paint.end();
 
-  Paint.tqbegin( const_cast<TQPixmap*>(&CursorPixmaps->onPixmap()), this );
+  Paint.begin( const_cast<TQPixmap*>(&CursorPixmaps->onPixmap()), this );
   activeColumn().paintCursor( &Paint, Index );
   Paint.end();
 
-  // calculat the tqshape
+  // calculat the shape
   KPixelX CursorX;
   KPixelX CursorW;
   if( BufferCursor->isBehind() )
@@ -1498,7 +1498,7 @@ void KHexEdit::paintLine( KBufferColumn *C, int Line, KSection Positions )
 
   // to avoid flickers we first paint to the linebuffer
   TQPainter Paint;
-  Paint.tqbegin( &LineBuffer, this );
+  Paint.begin( &LineBuffer, this );
 
   Paint.translate( C->x(), 0 );
   C->paintPositions( &Paint, Line, Positions );
@@ -1671,14 +1671,14 @@ void KHexEdit::contentsMouseReleaseEvent( TQMouseEvent *e )
     // was end of selection operation?
     else if( BufferRanges->hasSelection() )
     {
-      if( TQApplication::tqclipboard()->supportsSelection() )
+      if( TQApplication::clipboard()->supportsSelection() )
       {
         ClipboardMode = TQClipboard::Selection;
-        disconnect( TQApplication::tqclipboard(), TQT_SIGNAL(selectionChanged()), this, 0);
+        disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0);
 
         copy();
 
-        connect( TQApplication::tqclipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(clipboardChanged()) );
+        connect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(clipboardChanged()) );
         ClipboardMode = TQClipboard::Clipboard;
       }
     }
@@ -2005,14 +2005,14 @@ void KHexEdit::contentsContextMenuEvent( TQContextMenuEvent *e )
   {
     selectAll();
     // if the clipboard support selections, put the newly selected text into the clipboard
-    if( TQApplication::tqclipboard()->supportsSelection() )
+    if( TQApplication::clipboard()->supportsSelection() )
     {
       ClipboardMode = TQClipboard::Selection;
-      disconnect( TQApplication::tqclipboard(), TQT_SIGNAL(selectionChanged()), this, 0);
+      disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0);
 
       copy();
 
-      connect( TQApplication::tqclipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(clipboardChanged()) );
+      connect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(clipboardChanged()) );
       ClipboardMode = TQClipboard::Clipboard;
     }
   }
diff --git a/khexedit/lib/khexedit.h b/khexedit/lib/khexedit.h
index 00a25d6..84193dd 100644
--- a/khexedit/lib/khexedit.h
+++ b/khexedit/lib/khexedit.h
@@ -19,7 +19,7 @@
 #define KHE_KHEXEDIT_H
 
 // qt specific
-#include <tqclipboard.h>
+#include <clipboard.h>
 // lib specific
 // #include "khe.h"
 #include "khexedit_export.h"
@@ -130,8 +130,8 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView
 //    void focusOutEvent( TQFocusEvent *FocusEvent );
     virtual bool eventFilter( TQObject *O, TQEvent *E );
 
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
 
   public: // value access
@@ -425,7 +425,7 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView
   protected:
     /** recalcs all dependant values with the actual NoOfBytesPerLine  */
     void adjustToLayoutNoOfBytesPerLine();
-    /** recalcs a tqlayout due to the resize style that fits into the view size
+    /** recalcs a layout due to the resize style that fits into the view size
       * and updates the dependant values
       */
     void adjustLayoutToSize();
@@ -452,7 +452,7 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView
     /** Buffer with the data */
     KDataBuffer *DataBuffer;
 
-    /** holds the logical tqlayout */
+    /** holds the logical layout */
     KBufferLayout *BufferLayout;
     /** */
     KBufferCursor *BufferCursor;
diff --git a/khexedit/lib/koffsetcolumn.cpp b/khexedit/lib/koffsetcolumn.cpp
index c2be15a..43897b1 100644
--- a/khexedit/lib/koffsetcolumn.cpp
+++ b/khexedit/lib/koffsetcolumn.cpp
@@ -42,7 +42,7 @@ KOffsetColumn::~KOffsetColumn()
 
 void KOffsetColumn::paintLine( TQPainter *P, int Line )
 {
-  const TQColor &ButtonColor = View->tqcolorGroup().button();
+  const TQColor &ButtonColor = View->colorGroup().button();
   P->fillRect( 0,0,width(),LineHeight, TQBrush(ButtonColor,TQt::SolidPattern) );
 
   printFunction()( CodedOffset,FirstLineOffset+Delta*Line );
@@ -68,7 +68,7 @@ void KOffsetColumn::paintEmptyColumn( TQPainter *P, KPixelXs Xs, KPixelYs Ys )
 {
   Xs.restrictTo( XSpan );
 
-  const TQColor &ButtonColor = View->tqcolorGroup().button();
+  const TQColor &ButtonColor = View->colorGroup().button();
   P->fillRect( Xs.start(), Ys.start(), Xs.width(), Ys.width(), TQBrush(ButtonColor,TQt::SolidPattern) );
 }
 
diff --git a/khexedit/lib/koffsetcolumn.h b/khexedit/lib/koffsetcolumn.h
index 56b48f1..497d7ef 100644
--- a/khexedit/lib/koffsetcolumn.h
+++ b/khexedit/lib/koffsetcolumn.h
@@ -81,7 +81,7 @@ class KOffsetColumn : public KColumn
     /** */
     KPixelY DigitBaseLine;
 
-  protected: // general tqlayout
+  protected: // general layout
     KOffsetFormat::KFormat Format;
 
     int CodingWidth;
diff --git a/khexedit/lib/kplainbuffer.cpp b/khexedit/lib/kplainbuffer.cpp
index 08874ba..02b9d70 100644
--- a/khexedit/lib/kplainbuffer.cpp
+++ b/khexedit/lib/kplainbuffer.cpp
@@ -72,7 +72,7 @@ int KPlainBuffer::insert( int Pos, const char* D, int Length )
   // check all parameters
   if( Length == 0 )
     return 0;
-  //kdDebug() << TQString("before: Size: %1, RawSize: %2").tqarg(Size).tqarg(RawSize) << endl;
+  //kdDebug() << TQString("before: Size: %1, RawSize: %2").arg(Size).arg(RawSize) << endl;
   // correct for appending
   if( Pos > (int)Size )
     Pos = Size;
@@ -82,7 +82,7 @@ int KPlainBuffer::insert( int Pos, const char* D, int Length )
   // copy new data to its place
   memcpy( &Data[Pos], D, Length );
 
-  //kdDebug() << TQString("after: Size: %1, RawSize: %2").tqarg(Size).tqarg(RawSize) << endl;
+  //kdDebug() << TQString("after: Size: %1, RawSize: %2").arg(Size).arg(RawSize) << endl;
 
   Modified = true;
   return Length;
diff --git a/khexedit/lib/kvaluecolumn.cpp b/khexedit/lib/kvaluecolumn.cpp
index beb706a..645dc89 100644
--- a/khexedit/lib/kvaluecolumn.cpp
+++ b/khexedit/lib/kvaluecolumn.cpp
@@ -105,7 +105,7 @@ void KValueColumn::paintEditedByte( TQPainter *P, char Byte, const TQString &Edi
 {
   KHEChar B = Codec->decode( Byte );
 
-  const TQColorGroup &CG = View->tqcolorGroup();
+  const TQColorGroup &CG = View->colorGroup();
 
   P->fillRect( 0,0,ByteWidth,LineHeight, TQBrush(colorForChar(B),TQt::SolidPattern) );
 
diff --git a/khexedit/listview.cc b/khexedit/listview.cc
index 3217cac..63f18d8 100644
--- a/khexedit/listview.cc
+++ b/khexedit/listview.cc
@@ -35,20 +35,20 @@ void CListView::setVisibleItem( int visibleItem, bool updateSize )
   mVisibleItem = TQMAX( 1, visibleItem );
   if( updateSize == true )
   {
-    TQSize s = tqsizeHint();
-    setMinimumSize( s.width() + verticalScrollBar()->tqsizeHint().width() + 
+    TQSize s = sizeHint();
+    setMinimumSize( s.width() + verticalScrollBar()->sizeHint().width() + 
 		    lineWidth() * 2, s.height() );
   }
 }
 
-TQSize CListView::tqsizeHint( void ) const
+TQSize CListView::sizeHint( void ) const
 {
-  TQSize s = TQListView::tqsizeHint();
+  TQSize s = TQListView::sizeHint();
   
   int h = fontMetrics().height() + 2*itemMargin();
   if( h % 2 > 0 ) { h++; }
   
-  s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->tqsizeHint().height());
+  s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->sizeHint().height());
   return( s );
 }
 #include "listview.moc"
diff --git a/khexedit/listview.h b/khexedit/listview.h
index 975f3da..b9182bf 100644
--- a/khexedit/listview.h
+++ b/khexedit/listview.h
@@ -32,7 +32,7 @@ class CListView : public KListView
     CListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 );
     
     void setVisibleItem( int visibleItem, bool updateSize=true );
-    virtual TQSize tqsizeHint( void ) const; 
+    virtual TQSize sizeHint( void ) const; 
 
   private:
     int mVisibleItem;
diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc
index a754e72..2c3ed6f 100644
--- a/khexedit/optiondialog.cc
+++ b/khexedit/optiondialog.cc
@@ -25,7 +25,7 @@
 #include <tqpainter.h>
 
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
@@ -46,9 +46,9 @@
 #include <tqobjectlist.h>
 static void enableWidget( TQWidget *w, bool state )
 {
-  if( w->tqchildren() )
+  if( w->children() )
   {
-    TQObjectList *l = (TQObjectList*)w->tqchildren(); // silence please
+    TQObjectList *l = (TQObjectList*)w->children(); // silence please
     for( uint i=0; i < l->count(); i++ )
     {
       TQObject *o = l->at(i);
@@ -260,7 +260,7 @@ void COptionDialog::setupCursorPage( void )
   TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
 
   TQVButtonGroup *group = new TQVButtonGroup( i18n("Blinking"), page );
-  group->tqlayout()->setMargin( spacingHint() );
+  group->layout()->setMargin( spacingHint() );
   topLayout->addWidget( group );
 
   text = i18n("Do not b&link");
@@ -282,7 +282,7 @@ void COptionDialog::setupCursorPage( void )
     TQT_SLOT( slotChanged()));
 
   group = new TQVButtonGroup( i18n("Shape"), page );
-  group->tqlayout()->setMargin( spacingHint() );
+  group->layout()->setMargin( spacingHint() );
   topLayout->addWidget( group );
 
   text = i18n("Always &use block (rectangular) cursor");
@@ -298,7 +298,7 @@ void COptionDialog::setupCursorPage( void )
 
   text = i18n("Cursor Behavior When Editor Loses Focus");
   group = new TQVButtonGroup( text, page );
-  group->tqlayout()->setMargin( spacingHint() );
+  group->layout()->setMargin( spacingHint() );
   topLayout->addWidget( group );
 
   text = i18n("&Stop blinking (if blinking is enabled)");
@@ -351,7 +351,7 @@ void COptionDialog::setupColorPage( void )
   modeList.append( i18n("Marked Background") );
   modeList.append( i18n("Marked Text") );
   modeList.append( i18n("Cursor Background") );
-  modeList.append( i18n("Cursor Text (block tqshape)") );
+  modeList.append( i18n("Cursor Text (block shape)") );
   modeList.append( i18n("Bookmark Background") );
   modeList.append( i18n("Bookmark Text") );
   modeList.append( i18n("Separator") );
@@ -439,7 +439,7 @@ void COptionDialog::setupFilePage( void )
   modeList.append( i18n("Most Recent Document") );
   modeList.append( i18n("All Recent Documents") );
   mFile.openCombo->insertStringList( modeList );
-  mFile.openCombo->setMinimumWidth( mFile.openCombo->tqsizeHint().width() );
+  mFile.openCombo->setMinimumWidth( mFile.openCombo->sizeHint().width() );
   connect( mFile.openCombo, TQT_SIGNAL(activated(int)),
     this, TQT_SLOT( slotChanged()));
 
@@ -548,7 +548,7 @@ void COptionDialog::setupMiscPage( void )
     this, TQT_SLOT( slotChanged()));
 
   TQVButtonGroup *group = new TQVButtonGroup( i18n("Sounds"), page );
-  group->tqlayout()->setMargin( spacingHint() );
+  group->layout()->setMargin( spacingHint() );
   topLayout->addWidget( group );
   text = i18n("Make sound on data &input (eg. typing) failure");
   mMisc.inputCheck = new TQCheckBox( text, group );
@@ -560,7 +560,7 @@ void COptionDialog::setupMiscPage( void )
     this, TQT_SLOT( slotChanged()));
 
   group = new TQVButtonGroup( i18n("Bookmark Visibility"), page );
-  group->tqlayout()->setMargin( spacingHint() );
+  group->layout()->setMargin( spacingHint() );
   topLayout->addWidget( group );
   text = i18n("Use visible bookmarks in the offset column");
   mMisc.bookmarkColumnCheck = new TQCheckBox( text, group );
@@ -696,9 +696,9 @@ void COptionDialog::slotDefault( void )
   {
     case page_layout:
     {
-      SDisplayLayout tqlayout;
+      SDisplayLayout layout;
       SDisplayLine line;
-      setLayout( tqlayout, line );
+      setLayout( layout, line );
     }
     break;
 
@@ -758,7 +758,7 @@ void COptionDialog::slotApply( void )
       mDisplayState.line.setColumnSize(index, mLayout.columnSizeSpin->value());
       emit lineSizeChoice( mDisplayState.line );
 
-      SDisplayLayout &l = mDisplayState.tqlayout;
+      SDisplayLayout &l = mDisplayState.layout;
       l.lockLine = mLayout.lockLineCheck->isChecked();
       l.lockColumn = mLayout.lockColumnCheck->isChecked();
       l.leftSeparatorWidth = mLayout.leftSepWidthSpin->value();
@@ -789,7 +789,7 @@ void COptionDialog::slotApply( void )
 	l.horzGridWidth = l.vertGridWidth = 1;
       }
 
-      emit layoutChoice( mDisplayState.tqlayout );
+      emit layoutChoice( mDisplayState.layout );
     }
     break;
 
@@ -883,35 +883,35 @@ void COptionDialog::slotApply( void )
   configChanged = false;
 }
 
-void COptionDialog::setLayout( SDisplayLayout &tqlayout, SDisplayLine &line )
+void COptionDialog::setLayout( SDisplayLayout &layout, SDisplayLine &line )
 {
   mDisplayState.line = line;
-  mDisplayState.tqlayout = tqlayout;
+  mDisplayState.layout = layout;
 
   slotModeSelectorChanged( mLayout.formatCombo->currentItem() );
-  mLayout.lockLineCheck->setChecked( tqlayout.lockLine );
-  mLayout.lockColumnCheck->setChecked( tqlayout.lockColumn );
-  mLayout.leftSepWidthSpin->setValue( tqlayout.leftSeparatorWidth );
-  mLayout.rightSepWidthSpin->setValue( tqlayout.rightSeparatorWidth );
-  mLayout.separatorSpin->setValue( tqlayout.separatorMarginWidth );
-  mLayout.edgeSpin->setValue( tqlayout.edgeMarginWidth );
-  mLayout.leftSepWidthSpin->setValue( tqlayout.leftSeparatorWidth );
-  mLayout.rightSepWidthSpin->setValue( tqlayout.rightSeparatorWidth );
-  mLayout.columnCheck->setChecked( tqlayout.columnCharSpace );
-  slotColumnSepCheck( tqlayout.columnCharSpace );
-  mLayout.columnSepSpin->setValue( tqlayout.columnSpacing );
-
-  if( tqlayout.horzGridWidth == 0 && tqlayout.vertGridWidth == 0 )
+  mLayout.lockLineCheck->setChecked( layout.lockLine );
+  mLayout.lockColumnCheck->setChecked( layout.lockColumn );
+  mLayout.leftSepWidthSpin->setValue( layout.leftSeparatorWidth );
+  mLayout.rightSepWidthSpin->setValue( layout.rightSeparatorWidth );
+  mLayout.separatorSpin->setValue( layout.separatorMarginWidth );
+  mLayout.edgeSpin->setValue( layout.edgeMarginWidth );
+  mLayout.leftSepWidthSpin->setValue( layout.leftSeparatorWidth );
+  mLayout.rightSepWidthSpin->setValue( layout.rightSeparatorWidth );
+  mLayout.columnCheck->setChecked( layout.columnCharSpace );
+  slotColumnSepCheck( layout.columnCharSpace );
+  mLayout.columnSepSpin->setValue( layout.columnSpacing );
+
+  if( layout.horzGridWidth == 0 && layout.vertGridWidth == 0 )
   {
     mLayout.gridCombo->setCurrentItem(0);
   }
-  else if( tqlayout.horzGridWidth != 0 && tqlayout.vertGridWidth != 0 )
+  else if( layout.horzGridWidth != 0 && layout.vertGridWidth != 0 )
   {
     mLayout.gridCombo->setCurrentItem(3);
   }
   else
   {
-    mLayout.gridCombo->setCurrentItem( tqlayout.vertGridWidth != 0 ? 1 : 2 );
+    mLayout.gridCombo->setCurrentItem( layout.vertGridWidth != 0 ? 1 : 2 );
   }
 
 }
@@ -1021,7 +1021,7 @@ void COptionDialog::setFile( SDisplayMisc &misc )
 
 void COptionDialog::setState( SDisplayState &state )
 {
-  setLayout( state.tqlayout, state.line );
+  setLayout( state.layout, state.line );
   setCursor( state.cursor );
   setColor( state.color );
   setFont( state.font );
diff --git a/khexedit/optiondialog.h b/khexedit/optiondialog.h
index 0a54dab..f44aade 100644
--- a/khexedit/optiondialog.h
+++ b/khexedit/optiondialog.h
@@ -110,7 +110,7 @@ class COptionDialog : public KDialogBase
     COptionDialog( TQWidget *parent = 0, char *name = 0, bool modal = false );
     ~COptionDialog( void );
 
-    void setLayout( SDisplayLayout &tqlayout, SDisplayLine &line );
+    void setLayout( SDisplayLayout &layout, SDisplayLine &line );
     void setCursor( SDisplayCursor &cursor );
     void setColor( SDisplayColor &color );
     void setFont( SDisplayFont &font );
@@ -238,7 +238,7 @@ class COptionDialog : public KDialogBase
 
   signals:
     void lineSizeChoice( const SDisplayLine &lineSize );
-    void layoutChoice( const SDisplayLayout &tqlayout );
+    void layoutChoice( const SDisplayLayout &layout );
     void cursorChoice( const SDisplayCursor &cursor ); 
     void colorChoice( const SDisplayColor &color );
     void fontChoice( const SDisplayFont &font );
diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp
index cb2b549..b32e5f7 100644
--- a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp
+++ b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp
@@ -16,7 +16,7 @@
 
 
 // qt specific
-#include <tqlayout.h>
+#include <layout.h>
 // kde specific
 #include <klocale.h>
 #include <kgenericfactory.h>
diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.h b/khexedit/parts/kbytesedit/kbyteseditwidget.h
index 1f44fbf..42ae126 100644
--- a/khexedit/parts/kbytesedit/kbyteseditwidget.h
+++ b/khexedit/parts/kbytesedit/kbyteseditwidget.h
@@ -86,7 +86,7 @@ class KBytesEditWidget : public TQWidget, public KHE::BytesEditInterface,
     virtual bool isOverwriteOnly() const;
     virtual bool isReadOnly() const;
     virtual bool isModified() const;
-    /** tqrepaint the indizes from i1 to i2 */
+    /** repaint the indizes from i1 to i2 */
     virtual void repaintRange( int i1, int i2 );
 
   public: // cursor interface
@@ -94,7 +94,7 @@ class KBytesEditWidget : public TQWidget, public KHE::BytesEditInterface,
     virtual void setCursorPosition( int Index );
 //     virtual bool tabChangesFocus() const;
 
-  public: // tqlayout interface ??
+  public: // layout interface ??
     /** sets the resizestyle for the value column. Default is KHE::FullSizeUsage */
     virtual void setResizeStyle( KResizeStyle Style );
     /** sets the number of bytes per line, switching the resize style to KHE::NoResize */
diff --git a/khexedit/printdialogpage.cc b/khexedit/printdialogpage.cc
index cc01c8a..1d8e166 100644
--- a/khexedit/printdialogpage.cc
+++ b/khexedit/printdialogpage.cc
@@ -18,7 +18,7 @@
  *
  */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqbuttongroup.h>
 #include <tqspinbox.h>
 #include <tqlabel.h>
@@ -78,14 +78,14 @@ void LayoutDialogPage::setupLayoutPage( void )
   {
     mLayout.marginSpin[i] = new TQSpinBox( group );
     mLayout.marginSpin[i]->setFixedHeight(
-      mLayout.marginSpin[i]->tqsizeHint().height() );
+      mLayout.marginSpin[i]->sizeHint().height() );
     mLayout.marginSpin[i]->setMinimumWidth(
       mLayout.marginSpin[i]->fontMetrics().width("M")*10 );
     mLayout.marginSpin[i]->setRange( 0, INT_MAX );
 
     TQLabel *label = new TQLabel( mLayout.marginSpin[i], name[i], group );
-    label->setFixedHeight( mLayout.marginSpin[i]->tqsizeHint().height() );
-    label->setFixedWidth( label->tqsizeHint().width() );
+    label->setFixedHeight( mLayout.marginSpin[i]->sizeHint().height() );
+    label->setFixedWidth( label->sizeHint().width() );
 
     if( i < 2 )
     {
@@ -101,7 +101,7 @@ void LayoutDialogPage::setupLayoutPage( void )
   
   text = i18n("Draw h&eader above text");
   mLayout.headerCheck = new TQCheckBox( text, this );
-  mLayout.headerCheck->setFixedSize( mLayout.headerCheck->tqsizeHint() );
+  mLayout.headerCheck->setFixedSize( mLayout.headerCheck->sizeHint() );
   connect( mLayout.headerCheck, TQT_SIGNAL( toggled(bool)),
 	   TQT_SLOT( slotDrawHeader(bool)));
   topLayout->addWidget( mLayout.headerCheck, 0, AlignLeft );
@@ -135,16 +135,16 @@ void LayoutDialogPage::setupLayoutPage( void )
   {
     mLayout.headerCombo[i] = new TQComboBox( false, this );
     mLayout.headerCombo[i]->setFixedHeight(
-      mLayout.headerCombo[i]->tqsizeHint().height() );
+      mLayout.headerCombo[i]->sizeHint().height() );
     mLayout.headerCombo[i]->setMinimumWidth(
       mLayout.headerCombo[i]->fontMetrics().width("M")*10 );
  
     mLayout.headerLabel[i] = new TQLabel( mLayout.headerCombo[i], name[i],
 					 this );
     mLayout.headerLabel[i]->setFixedHeight( 
-      mLayout.headerLabel[i]->tqsizeHint().height() );
+      mLayout.headerLabel[i]->sizeHint().height() );
     mLayout.headerLabel[i]->setFixedWidth( 
-      mLayout.headerLabel[i]->tqsizeHint().width() );
+      mLayout.headerLabel[i]->sizeHint().width() );
 
     if( i<3 )
     {
@@ -163,7 +163,7 @@ void LayoutDialogPage::setupLayoutPage( void )
 
   text = i18n("Draw &footer below text");
   mLayout.footerCheck = new TQCheckBox( text, this );
-  mLayout.footerCheck->setFixedSize( mLayout.footerCheck->tqsizeHint() );
+  mLayout.footerCheck->setFixedSize( mLayout.footerCheck->sizeHint() );
   connect( mLayout.footerCheck, TQT_SIGNAL( toggled(bool)),
 	   TQT_SLOT( slotDrawFooter(bool)));
   topLayout->addWidget( mLayout.footerCheck, 0, AlignLeft );
@@ -181,16 +181,16 @@ void LayoutDialogPage::setupLayoutPage( void )
   {
     mLayout.footerCombo[i] = new TQComboBox( false, this );
     mLayout.footerCombo[i]->setFixedHeight(
-      mLayout.footerCombo[i]->tqsizeHint().height() );
+      mLayout.footerCombo[i]->sizeHint().height() );
     mLayout.footerCombo[i]->setMinimumWidth(
       mLayout.footerCombo[i]->fontMetrics().width("M")*10 );
 
     mLayout.footerLabel[i] = new TQLabel( mLayout.footerCombo[i], name[i], 
 					 this );
     mLayout.footerLabel[i]->setFixedHeight( 
-      mLayout.footerLabel[i]->tqsizeHint().height() );
+      mLayout.footerLabel[i]->sizeHint().height() );
     mLayout.footerLabel[i]->setFixedWidth( 
-      mLayout.footerLabel[i]->tqsizeHint().width() );
+      mLayout.footerLabel[i]->sizeHint().width() );
 
     if( i<3 )
     {
diff --git a/khexedit/searchbar.cc b/khexedit/searchbar.cc
index 3122980..000a400 100644
--- a/khexedit/searchbar.cc
+++ b/khexedit/searchbar.cc
@@ -74,7 +74,7 @@ CSearchBar::CSearchBar( TQWidget *parent, const char *name, WFlags f )
   mFindButton->setAutoDefault(false);
   connect( mFindButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(start()) );
   connect(mInputEdit,TQT_SIGNAL(returnPressed()),mFindButton,TQT_SLOT(animateClick()));
-  mFindButton->setFixedHeight( mTypeCombo->tqsizeHint().height() );
+  mFindButton->setFixedHeight( mTypeCombo->sizeHint().height() );
 
   mBackwards = new TQCheckBox( i18n("Backwards"), this );
   mIgnoreCase = new TQCheckBox( i18n("Ignore case"), this );
@@ -85,7 +85,7 @@ CSearchBar::CSearchBar( TQWidget *parent, const char *name, WFlags f )
   connect( mCloseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideWidget()) );
 
   //
-  // Make tqlayout
+  // Make layout
   //
   TQHBoxLayout *hlay = new TQHBoxLayout( this, 4, 6 );
   hlay->addWidget( mTypeCombo );
diff --git a/khexedit/statusbarprogress.cc b/khexedit/statusbarprogress.cc
index ca1e918..ebdaaba 100644
--- a/khexedit/statusbarprogress.cc
+++ b/khexedit/statusbarprogress.cc
@@ -67,10 +67,10 @@ void CStatusBarProgress::initialize( void )
   mBarPixmap    = 0;
   mBarStyle     = Solid;
 
-  mBarColor     = tqpalette().active().highlight();
-  mBarTextColor = tqpalette().active().highlightedText();
-  mTextColor    = tqpalette().active().text();
-  setBackgroundColor( tqpalette().active().background() );
+  mBarColor     = palette().active().highlight();
+  mBarTextColor = palette().active().highlightedText();
+  mTextColor    = palette().active().text();
+  setBackgroundColor( palette().active().background() );
 
   TQFont font( KGlobalSettings::generalFont() );
   font.setBold( true );
@@ -176,7 +176,7 @@ bool CStatusBarProgress::textEnabled( void ) const
   return( mTextEnabled );
 }
 
-TQSize CStatusBarProgress::tqsizeHint( void ) const
+TQSize CStatusBarProgress::sizeHint( void ) const
 {
   TQSize s( size() );
 
@@ -212,13 +212,13 @@ int CStatusBarProgress::recalcValue(int range)
 
 void CStatusBarProgress::valueChange()
 {
-  tqrepaint(contentsRect(), FALSE);
+  repaint(contentsRect(), FALSE);
   emit percentageChanged(recalcValue(100));
 }
 
 void CStatusBarProgress::rangeChange()
 {
-  tqrepaint(contentsRect(), FALSE);
+  repaint(contentsRect(), FALSE);
   emit percentageChanged(recalcValue(100));
 }
 
@@ -246,10 +246,10 @@ void CStatusBarProgress::adjustStyle( void )
 
 void CStatusBarProgress::paletteChange( const TQPalette & )
 {
-  mBarColor     = tqpalette().active().highlight();
-  mBarTextColor = tqpalette().active().highlightedText();
-  mTextColor    = tqpalette().active().text();
-  setBackgroundColor( tqpalette().active().background() );
+  mBarColor     = palette().active().highlight();
+  mBarTextColor = palette().active().highlightedText();
+  mTextColor    = palette().active().text();
+  setBackgroundColor( palette().active().background() );
 }
 
 void CStatusBarProgress::drawText( TQPainter *p )
@@ -259,17 +259,17 @@ void CStatusBarProgress::drawText( TQPainter *p )
 
   if( mMsg.isEmpty() == true )
   {
-    s = TQString("%1%").tqarg(recalcValue(100));
+    s = TQString("%1%").arg(recalcValue(100));
   }
   else
   {
     if( mCurPage > 0 )
     {
-      s = i18n("%1... %2 of %3").tqarg(mMsg).tqarg(mCurPage).tqarg(mMaxPage);
+      s = i18n("%1... %2 of %3").arg(mMsg).arg(mCurPage).arg(mMaxPage);
     }
     else
     {
-      s = i18n("%1... %2%").tqarg(mMsg).tqarg(recalcValue(100));
+      s = i18n("%1... %2%").arg(mMsg).arg(recalcValue(100));
     }
   }
 
diff --git a/khexedit/statusbarprogress.h b/khexedit/statusbarprogress.h
index f477055..531c9aa 100644
--- a/khexedit/statusbarprogress.h
+++ b/khexedit/statusbarprogress.h
@@ -115,7 +115,7 @@ class CStatusBarProgress : public TQFrame, public TQRangeControl
    * Returns the recommended width for vertical progress bars or
    * the recommended height for vertical progress bars
    */
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize sizeHint() const;
 	
 		
   public slots:
diff --git a/khexedit/stringdialog.cc b/khexedit/stringdialog.cc
index efd0933..5564cbd 100644
--- a/khexedit/stringdialog.cc
+++ b/khexedit/stringdialog.cc
@@ -20,7 +20,7 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqspinbox.h>
 
@@ -372,8 +372,8 @@ void CStringDialog::appendListItem( const TQString &str, uint offsetLen )
 
 void CStringDialog::updateListInfo( void )
 {
-  mListSizeLabel->setText( TQString("%1").tqarg(mStringData.count()) );
-  mDisplaySizeLabel->setText( TQString("%1").tqarg(mStringList->childCount()) );
+  mListSizeLabel->setText( TQString("%1").arg(mStringData.count()) );
+  mDisplaySizeLabel->setText( TQString("%1").arg(mStringList->childCount()) );
   setColumnWidth();
 }
 
diff --git a/khexedit/toplevel.cc b/khexedit/toplevel.cc
index 351a35d..2297c62 100644
--- a/khexedit/toplevel.cc
+++ b/khexedit/toplevel.cc
@@ -391,7 +391,7 @@ void KHexEdit::initialize( bool openFiles )
         maxItems = 1;
     for( unsigned int i = 1 ; i <= maxItems ; i++ )
     {
-        const TQString key = TQString( "File%1" ).tqarg( i );
+        const TQString key = TQString( "File%1" ).arg( i );
         const TQString value = config->readPathEntry( key );
     
         if (!value.isEmpty())
@@ -533,7 +533,7 @@ void KHexEdit::slotFileOpenRecent( const KURL& url )
   else
   {
     // ### TODO: support network transparency
-    KMessageBox::error( this, i18n("Non local recent file: %1").tqarg( url.prettyURL() ) );
+    KMessageBox::error( this, i18n("Non local recent file: %1").arg( url.prettyURL() ) );
   }
 }
 
@@ -545,7 +545,7 @@ KHexEdit *KHexEdit::newWindow( void )
   {
     TQString msg = i18n( "Can not create new window.\n" );
     msg += hexError( Err_NoMemory );
-    KMessageBox::error( tqtopLevelWidget(), msg );
+    KMessageBox::error( topLevelWidget(), msg );
     return(0);
   }
   hexEdit->show();
@@ -582,7 +582,7 @@ void KHexEdit::closeProgram( void )
 	TQString msg = i18n(""
 	  "There are windows with unsaved modified documents. "
 	  "If you quit now, these modifications will be lost.");
-	int reply = KMessageBox::warningContinueCancel( tqtopLevelWidget(), msg, TQString(), KStdGuiItem::quit() );
+	int reply = KMessageBox::warningContinueCancel( topLevelWidget(), msg, TQString(), KStdGuiItem::quit() );
 	if( reply == KMessageBox::Continue )
 	{
 	  break;
@@ -755,11 +755,11 @@ void KHexEdit::cursorChanged( SCursorState &state )
   }
   else
   {
-    SDisplayLayout &tqlayout = editor()->tqlayout();
+    SDisplayLayout &layout = editor()->layout();
 
-    if( tqlayout.offsetMode == SDisplayLayout::hexadecimal )
+    if( layout.offsetMode == SDisplayLayout::hexadecimal )
     {
-      if( tqlayout.offsetUpperCase == false )
+      if( layout.offsetUpperCase == false )
       {
 	offset += TQString().sprintf( " %04x:%04x-%u", state.offset>>16,
 				     state.offset&0x0000FFFF, state.cell );
@@ -788,7 +788,7 @@ void KHexEdit::fileState( SFileState &state )
 {
   if( state.valid == true )
   {
-    statusBar()->changeItem( i18n("Size: %1").tqarg( state.size ), status_Size);
+    statusBar()->changeItem( i18n("Size: %1").arg( state.size ), status_Size);
     statusBar()->changeItem( state.modified ? "!" : "", status_Modified);
 
     if( mIsModified != state.modified )
@@ -807,23 +807,23 @@ void KHexEdit::fileState( SFileState &state )
 
 
 
-void KHexEdit::layoutChanged( const SDisplayLayout &tqlayout )
+void KHexEdit::layoutChanged( const SDisplayLayout &layout )
 {
   KRadioAction *radioAction;
 
-  if( tqlayout.primaryMode == SDisplayLayout::hexadecimal )
+  if( layout.primaryMode == SDisplayLayout::hexadecimal )
   {
     radioAction = mAction.hexadecimal;
   }
-  else if( tqlayout.primaryMode == SDisplayLayout::decimal )
+  else if( layout.primaryMode == SDisplayLayout::decimal )
   {
     radioAction = mAction.decimal;
   }
-  else if( tqlayout.primaryMode == SDisplayLayout::octal )
+  else if( layout.primaryMode == SDisplayLayout::octal )
   {
     radioAction = mAction.octal;
   }
-  else if( tqlayout.primaryMode == SDisplayLayout::binary )
+  else if( layout.primaryMode == SDisplayLayout::binary )
   {
     radioAction = mAction.binary;
   }
@@ -841,15 +841,15 @@ void KHexEdit::layoutChanged( const SDisplayLayout &tqlayout )
   mAction.dataUppercase->blockSignals(true);
   mAction.offsetUppercase->blockSignals(true);
 
-  mAction.showOffsetColumn->setChecked( tqlayout.offsetVisible );
+  mAction.showOffsetColumn->setChecked( layout.offsetVisible );
   mAction.showTextColumn->setEnabled(
-    tqlayout.primaryMode != SDisplayLayout::textOnly );
+    layout.primaryMode != SDisplayLayout::textOnly );
   mAction.showTextColumn->setChecked(
-    tqlayout.secondaryMode != SDisplayLayout::hide );
+    layout.secondaryMode != SDisplayLayout::hide );
   mAction.offsetAsDecimal->setChecked(
-    tqlayout.offsetMode != SDisplayLayout::hexadecimal);
-  mAction.dataUppercase->setChecked( tqlayout.primaryUpperCase );
-  mAction.offsetUppercase->setChecked( tqlayout.offsetUpperCase );
+    layout.offsetMode != SDisplayLayout::hexadecimal);
+  mAction.dataUppercase->setChecked( layout.primaryUpperCase );
+  mAction.offsetUppercase->setChecked( layout.offsetUpperCase );
 
   mAction.showOffsetColumn->blockSignals(false);
   mAction.showTextColumn->blockSignals(false);
@@ -857,23 +857,23 @@ void KHexEdit::layoutChanged( const SDisplayLayout &tqlayout )
   mAction.dataUppercase->blockSignals(false);
   mAction.offsetUppercase->blockSignals(false);
 
-  if( tqlayout.primaryMode == SDisplayLayout::hexadecimal )
+  if( layout.primaryMode == SDisplayLayout::hexadecimal )
   {
     statusBar()->changeItem( i18n("Hex"), status_Layout );
   }
-  else if( tqlayout.primaryMode == SDisplayLayout::decimal )
+  else if( layout.primaryMode == SDisplayLayout::decimal )
   {
     statusBar()->changeItem( i18n("Dec"), status_Layout );
   }
-  else if( tqlayout.primaryMode == SDisplayLayout::octal )
+  else if( layout.primaryMode == SDisplayLayout::octal )
   {
     statusBar()->changeItem( i18n("Oct"), status_Layout );
   }
-  else if( tqlayout.primaryMode == SDisplayLayout::binary )
+  else if( layout.primaryMode == SDisplayLayout::binary )
   {
     statusBar()->changeItem( i18n("Bin"), status_Layout );
   }
-  else if( tqlayout.primaryMode == SDisplayLayout::textOnly )
+  else if( layout.primaryMode == SDisplayLayout::textOnly )
   {
     statusBar()->changeItem( i18n("Txt"), status_Layout );
   }
@@ -922,7 +922,7 @@ void KHexEdit::bookmarkChanged( TQPtrList<SCursorOffset> &list )
   for( SCursorOffset *p=list.first(); p!=0; p=list.next(), i++ )
   {
     offset.sprintf("%04X:%04X", p->offset>>16, p->offset&0x0000FFFF );
-    text = i18n("Offset: %1").tqarg(offset);
+    text = i18n("Offset: %1").arg(offset);
     KAction *action = new KAction(text, 0, mAction.bookmarkMapper, TQT_SLOT(map()), TQT_TQOBJECT(this), text.latin1());
     int key = acceleratorNumKey( i );
     if( key > 0 )
@@ -1021,7 +1021,7 @@ void KHexEdit::encodingChanged( const SEncodeState &encodeState )
 
   if( mSelectionSize == 0 )
   {
-    statusBar()->changeItem( i18n("Encoding: %1").tqarg(encodeState.name),
+    statusBar()->changeItem( i18n("Encoding: %1").arg(encodeState.name),
 			     status_Selection );
   }
 }
@@ -1186,7 +1186,7 @@ void KHexEdit::setSelectionText( uint selectionOffset, uint selectionSize )
   else
   {
     statusBar()->changeItem(
-      i18n("Encoding: %1").tqarg(hexView()->encoding().name), status_Selection);
+      i18n("Encoding: %1").arg(hexView()->encoding().name), status_Selection);
   }
 }
 
diff --git a/khexedit/toplevel.h b/khexedit/toplevel.h
index 5e72dee..6a8db9b 100644
--- a/khexedit/toplevel.h
+++ b/khexedit/toplevel.h
@@ -157,7 +157,7 @@ class KHexEdit : public KMainWindow
     void operationChanged( bool state );
     void cursorChanged( SCursorState &state );
     void fileState( SFileState &state );
-    void layoutChanged( const SDisplayLayout &tqlayout );
+    void layoutChanged( const SDisplayLayout &layout );
     void inputModeChanged( const SDisplayInputMode &mode );
     void bookmarkChanged( TQPtrList<SCursorOffset> &list );
     void removeRecentFile( const TQString &fileName );
@@ -249,7 +249,7 @@ protected:
 inline void KHexEdit::addStartupFile( const TQString &fileName )
 {
   mStartupFileList.prepend( fileName );
-  mStartupOffsetList.prepend( TQString("%1").tqarg(mStartupOffset,0,16) );
+  mStartupOffsetList.prepend( TQString("%1").arg(mStartupOffset,0,16) );
   mStartupOffset = 0;
 }
author	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2011-12-15 15:50:52 -0600
committer	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2011-12-15 15:50:52 -0600
commit	bf280726d5d22f33d33e4f9e771220c725249407 (patch)
tree	48b7496821910eb85179d543acee981cf5d16dd8 /khexedit
parent	c78266617c282543427d2c000b3b68fe2b6b6722 (diff)
download	tdeutils-bf280726d5d22f33d33e4f9e771220c725249407.tar.gz tdeutils-bf280726d5d22f33d33e4f9e771220c725249407.zip