Rename obsolete tq methods to standard names

26 files changed, 223 insertions, 223 deletions

diff --git a/khexedit/bitswapwidget.cc b/khexedit/bitswapwidget.cc
index 77a4f16..1a1a3d3 100644
--- a/khexedit/bitswapwidget.cc
+++ b/khexedit/bitswapwidget.cc
@@ -103,8 +103,8 @@ void CDigitLabel::drawContents( TQPainter *p )
   }
   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 )
diff --git a/khexedit/hexbuffer.cc b/khexedit/hexbuffer.cc
index 746b00e..e6a5532 100644
--- a/khexedit/hexbuffer.cc
+++ b/khexedit/hexbuffer.cc
@@ -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 )
diff --git a/khexedit/hexbuffer.h b/khexedit/hexbuffer.h
index 862935b..b06a40b 100644
--- a/khexedit/hexbuffer.h
+++ b/khexedit/hexbuffer.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 );
@@ -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/hexeditorwidget.cc b/khexedit/hexeditorwidget.cc
index c0ce4f6..720c0bf 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.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.tqlayout.horzGridWidth = tqlayout.horzGridWidth;
-  mDisplayState.tqlayout.vertGridWidth = tqlayout.vertGridWidth;
+  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 )
@@ -459,20 +459,20 @@ void CHexEditorWidget::setColor( const SDisplayColor &color )
   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() );
 }
 
 
@@ -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 )
@@ -1958,7 +1958,7 @@ void CHexEditorWidget::favorites( void )
 {
   TQString msg = i18n(""
     "Not available yet!\n"
-    "Save or retrive your favorite tqlayout" );
+    "Save or retrive your favorite layout" );
   KMessageBox::sorry( topLevelWidget(), msg, i18n("Profiles") );
 }
 
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..199d2cc 100644
--- a/khexedit/hexeditstate.h
+++ b/khexedit/hexeditstate.h
@@ -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 2413f6b..8c4c00d 100644
--- a/khexedit/hexmanagerwidget.cc
+++ b/khexedit/hexmanagerwidget.cc
@@ -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 )
diff --git a/khexedit/hexviewwidget.cc b/khexedit/hexviewwidget.cc
index eb13d18..18ea05b 100644
--- a/khexedit/hexviewwidget.cc
+++ b/khexedit/hexviewwidget.cc
@@ -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();
 }
@@ -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();
 
@@ -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;
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/kebcdic1047charcodec.cpp b/khexedit/lib/codecs/kebcdic1047charcodec.cpp
index 48986b2..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;
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 4a22919..a58e339 100644
--- a/khexedit/lib/kbordercolumn.cpp
+++ b/khexedit/lib/kbordercolumn.cpp
@@ -49,7 +49,7 @@ void KBorderColumn::paintLine( TQPainter *P )
 
     if( Middle )
     {
-      int GridColor = View->tqstyle().styleHint( TQStyle::SH_Table_GridLineColor, View );
+      int GridColor = View->style().styleHint( TQStyle::SH_Table_GridLineColor, View );
       P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->colorGroup().mid() );
       P->drawLine( LineX, 0, LineX, LineHeight-1 ) ;
     }
@@ -75,7 +75,7 @@ void KBorderColumn::paintEmptyColumn( TQPainter *P, KPixelXs Xs, KPixelYs Ys )
   KPixelX LX = x() + LineX;
   if( Middle && Xs.includes(LX) )
   {
-    int GridColor = View->tqstyle().styleHint( TQStyle::SH_Table_GridLineColor, View );
+    int GridColor = View->style().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.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/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/khexedit.cpp b/khexedit/lib/khexedit.cpp
index f8fecc9..2a833d6 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() );
@@ -558,7 +558,7 @@ 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().pixelMetric(TQStyle::PM_ScrollBarExtent):0 );
+                lineHeight() + noOfLines()>1? style().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().pixelMetric( TQStyle::PM_ScrollBarExtent );//verticalScrollBar()->width();
+  KPixelX ScrollbarExtent = style().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 );
 }
 
@@ -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 b974542..7122f80 100644
--- a/khexedit/lib/khexedit.h
+++ b/khexedit/lib/khexedit.h
@@ -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.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/optiondialog.cc b/khexedit/optiondialog.cc
index c631195..f6bec82 100644
--- a/khexedit/optiondialog.cc
+++ b/khexedit/optiondialog.cc
@@ -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)");
@@ -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,23 +883,23 @@ 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 );
+  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( tqlayout.horzGridWidth == 0 && tqlayout.vertGridWidth == 0 )
   {
@@ -911,7 +911,7 @@ void COptionDialog::setLayout( SDisplayLayout &tqlayout, SDisplayLine &line )
   }
   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.h b/khexedit/parts/kbytesedit/kbyteseditwidget.h
index 5e16bfa..42ae126 100644
--- a/khexedit/parts/kbytesedit/kbyteseditwidget.h
+++ b/khexedit/parts/kbytesedit/kbyteseditwidget.h
@@ -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/searchbar.cc b/khexedit/searchbar.cc
index 23449b5..000a400 100644
--- a/khexedit/searchbar.cc
+++ b/khexedit/searchbar.cc
@@ -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 8ac56bb..59facfc 100644
--- a/khexedit/statusbarprogress.cc
+++ b/khexedit/statusbarprogress.cc
@@ -69,8 +69,8 @@ void CStatusBarProgress::initialize( void )
 
   mBarColor     = tqpalette().active().highlight();
   mBarTextColor = tqpalette().active().highlightedText();
-  mTextColor    = tqpalette().active().text();
-  setBackgroundColor( tqpalette().active().background() );
+  mTextColor    = palette().active().text();
+  setBackgroundColor( palette().active().background() );
 
   TQFont font( KGlobalSettings::generalFont() );
   font.setBold( true );
@@ -229,7 +229,7 @@ void CStatusBarProgress::styleChange( GUIStyle )
 
 void CStatusBarProgress::adjustStyle( void )
 {
-  switch( tqstyle().SH_GUIStyle)
+  switch( style().SH_GUIStyle)
   {
     case WindowsStyle:
       setFrameStyle( TQFrame::NoFrame );
@@ -248,8 +248,8 @@ void CStatusBarProgress::paletteChange( const TQPalette & )
 {
   mBarColor     = tqpalette().active().highlight();
   mBarTextColor = tqpalette().active().highlightedText();
-  mTextColor    = tqpalette().active().text();
-  setBackgroundColor( tqpalette().active().background() );
+  mTextColor    = palette().active().text();
+  setBackgroundColor( palette().active().background() );
 }
 
 void CStatusBarProgress::drawText( TQPainter *p )
diff --git a/khexedit/toplevel.cc b/khexedit/toplevel.cc
index c55e334..2297c62 100644
--- a/khexedit/toplevel.cc
+++ b/khexedit/toplevel.cc
@@ -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 );
@@ -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 );
   }
diff --git a/khexedit/toplevel.h b/khexedit/toplevel.h
index 9f52418..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 );