Rename obsolete tq methods to standard names

(cherry picked from commit 89856e749bf14e63fed55a8f3436ea9a6f19667a)

103 files changed, 469 insertions, 469 deletions

diff --git a/ark/arkviewer.cpp b/ark/arkviewer.cpp
index 21cd510..13dbfbe 100644
--- a/ark/arkviewer.cpp
+++ b/ark/arkviewer.cpp
@@ -40,7 +40,7 @@ ArkViewer::ArkViewer( TQWidget * parent, const char * name )
 	: KDialogBase( parent, name, false, TQString(), Close ), m_part( 0 )
 {
 	m_widget = new TQVBox( this );
-	m_widget->tqlayout()->setSpacing( 10 );
+	m_widget->layout()->setSpacing( 10 );
 
 	connect( this, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFinished() ) );
 
diff --git a/ark/extractiondialog.cpp b/ark/extractiondialog.cpp
index 26b8eaf..cf95d48 100644
--- a/ark/extractiondialog.cpp
+++ b/ark/extractiondialog.cpp
@@ -69,7 +69,7 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,
 	TQVBox *vbox = makeVBoxMainWidget();
 
 	TQHBox *header = new TQHBox( vbox );
-	header->tqlayout()->setSpacing( 10 );
+	header->layout()->setSpacing( 10 );
 
 	TQLabel *icon = new TQLabel( header );
 	icon->setPixmap( DesktopIcon( "ark_extract" ) );
@@ -78,7 +78,7 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,
 	if ( enableSelected )
 	{
 		TQVBox *whichFiles = new TQVBox( header );
-		whichFiles->tqlayout()->setSpacing( 6 );
+		whichFiles->layout()->setSpacing( 6 );
 		new TQLabel( TQString( "<qt><b><font size=\"+1\">%1</font></b></qt>" )
 		            .arg( i18n( "Extract:" ) ), whichFiles );
 		TQHButtonGroup *filesGroup = new TQHButtonGroup( whichFiles );
diff --git a/ark/general.ui b/ark/general.ui
index ccd54c3..18cb405 100644
--- a/ark/general.ui
+++ b/ark/general.ui
@@ -37,7 +37,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/ark/rar.cpp b/ark/rar.cpp
index 1cebe05..5369e89 100644
--- a/ark/rar.cpp
+++ b/ark/rar.cpp
@@ -90,10 +90,10 @@ RarArch::RarArch( ArkWidget *_gui, const TQString & _fileName )
 
 bool RarArch::processLine( const TQCString &line )
 {
-  TQString tqunicode_line;
+  TQString unicode_line;
 
   TQTextCodec *codec = TQTextCodec::codecForLocale();
-  tqunicode_line = codec->toUnicode( line );
+  unicode_line = codec->toUnicode( line );
 
   if ( m_isFirstLine )
   {
diff --git a/charselectapplet/charselectapplet.cpp b/charselectapplet/charselectapplet.cpp
index 2b2929e..1608b45 100644
--- a/charselectapplet/charselectapplet.cpp
+++ b/charselectapplet/charselectapplet.cpp
@@ -66,7 +66,7 @@ CharSelectApplet::CharSelectApplet(const TQString& configFile, Type type, int ac
     cell_height = c->readNumEntry("CellHeight", cell_height);
     TQString characters = c->readEntry("Characters", "������ߩ��");
 
-    // setup tqlayout
+    // setup layout
     TQHBoxLayout *_layout = new TQHBoxLayout(this);
     _layout->setAutoAdd(true);
 
@@ -310,7 +310,7 @@ void CharTable::selectCell(int row, int col)
     repaintCell(oldRow, oldCol);
     repaintCell(_activeRow, _activeCol);
 
-    TQClipboard *cb = TQApplication::tqclipboard();
+    TQClipboard *cb = TQApplication::clipboard();
     TQObject::disconnect( cb, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clearCell()) );
     TQString text = TQString(_map[col + row * _cols]);
     bool oldMode = cb->selectionModeEnabled();
@@ -332,7 +332,7 @@ void CharTable::clearCell()
 
     repaintCell(oldRow, oldCol);
     
-    TQObject::disconnect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clearCell()) );
+    TQObject::disconnect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clearCell()) );
 }
 
 
diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp
index e6c2ef2..8fc490b 100644
--- a/kcalc/kcalc.cpp
+++ b/kcalc/kcalc.cpp
@@ -246,14 +246,14 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
 	mainLayout->addLayout(topLayout);
 	mainLayout->addLayout(btnLayout);
 
-	// button tqlayout
+	// button layout
 	btnLayout->addWidget(mSmallPage, 0, AlignTop);
 	btnLayout->addSpacing(2*mInternalSpacing);
 	btnLayout->addWidget(mNumericPage, 0, AlignTop);
 	btnLayout->addSpacing(2*mInternalSpacing);
 	btnLayout->addWidget(mLargePage, 0, AlignTop);
 
-	// small button tqlayout
+	// small button layout
 	smallBtnLayout->addWidget(pbStat["NumData"], 0, 0);
 	smallBtnLayout->addWidget(pbScientific["HypMode"], 0, 1);
 	smallBtnLayout->addWidget(pbLogic["AND"], 0, 2);
@@ -303,7 +303,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
 	smallBtnLayout->setRowStretch(4, 0);
 	smallBtnLayout->setRowStretch(5, 0);
 
-	// large button tqlayout
+	// large button layout
 	largeBtnLayout->addWidget(pbClear, 0, 0);
 	largeBtnLayout->addWidget(pbAC, 0, 1);
 
@@ -319,7 +319,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
 	largeBtnLayout->addWidget(pbPercent, 4, 0);
 	largeBtnLayout->addWidget(pbPlusMinus, 4, 1);
 
-	// top tqlayout
+	// top layout
 	topLayout->addWidget(pbAngleChoose);
 	topLayout->addWidget(BaseChooseGroup);
 	topLayout->addStretch();
@@ -608,7 +608,7 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent)
 	TQGridLayout *thisLayout = new TQGridLayout(thisPage, 5, 4, 0,
 						  mInternalSpacing);
 
-	// large button tqlayout
+	// large button layout
 	thisLayout->addWidget(pbEE, 0, 0);
 	thisLayout->addWidget(pbDivision, 0, 1);
 	thisLayout->addWidget(pbX, 0, 2);
@@ -1049,7 +1049,7 @@ void KCalculator::updateGeometry(void)
         if( o->isWidgetType() )
         {
             TQWidget *tmp_widget = dynamic_cast<TQWidget *>(o);
-            margin = TQApplication::tqstyle().
+            margin = TQApplication::style().
                 pixelMetric(TQStyle::PM_ButtonMargin, (tmp_widget))*2;
             tmp_widget->setFixedSize(s.width()+margin, s.height()+margin);
             //tmp_widget->setMinimumSize(s.width()+margin, s.height()+margin);
@@ -1063,7 +1063,7 @@ void KCalculator::updateGeometry(void)
     int h1 = (NumButtonGroup->find(0x0F))->minimumSize().height();
     int h2 = static_cast<int>( (static_cast<float>(h1) + 4.0) / 5.0 );
     s.setWidth(mLargePage->fontMetrics().width("MMM") +
-               TQApplication::tqstyle().
+               TQApplication::style().
                pixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2);
     s.setHeight(h1 + h2);
 
@@ -1090,7 +1090,7 @@ void KCalculator::updateGeometry(void)
     h1 = (NumButtonGroup->find(0x0F))->minimumSize().height();
     h2 = (int)((((float)h1 + 4.0) / 5.0));
     s.setWidth(mLargePage->fontMetrics().width("MMM") +
-               TQApplication::tqstyle().
+               TQApplication::style().
                pixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2);
     s.setHeight(h1 + h2);
 
@@ -2139,7 +2139,7 @@ void KCalculator::set_colors()
 
 	calc_display->changeSettings();
 
-	TQColor bg = tqpalette().active().background();
+	TQColor bg = palette().active().background();
 
 	TQPalette numPal(KCalcSettings::numberButtonsColor(), bg);
 	for(int i=0; i<10; i++)
@@ -2212,7 +2212,7 @@ bool KCalculator::eventFilter(TQObject *o, TQEvent *e)
 			if((num_but = NumButtonGroup->id((KCalcButton*)o))
 			   != -1)
 			{
-			  TQPalette pal(c, tqpalette().active().background());
+			  TQPalette pal(c, palette().active().background());
 
 			  // Was it hex-button or normal digit??
 			  if (num_but <10)
@@ -2243,7 +2243,7 @@ bool KCalculator::eventFilter(TQObject *o, TQEvent *e)
 			else
 				return false;
 
-			TQPalette pal(c, tqpalette().active().background());
+			TQPalette pal(c, palette().active().background());
 
 			for(KCalcButton *p = list->first(); p; p=list->next())
 				p->setPalette(pal);
diff --git a/kcalc/kcalc.kcfg b/kcalc/kcalc.kcfg
index b54de8f..26cdbf1 100644
--- a/kcalc/kcalc.kcfg
+++ b/kcalc/kcalc.kcfg
@@ -18,7 +18,7 @@
     </entry>
     <entry name="NumberButtonsColor" type="Color">
       <label>The color of number buttons.</label>
-      <code>QColor defaultButtonColor = kapp->tqpalette().active().background();</code>
+      <code>QColor defaultButtonColor = kapp->palette().active().background();</code>
       <default code="true">defaultButtonColor</default>
     </entry>
     <entry name="FunctionButtonsColor" type="Color">
diff --git a/kcalc/kcalcdisplay.cpp b/kcalc/kcalcdisplay.cpp
index a875106..17ad67a 100644
--- a/kcalc/kcalcdisplay.cpp
+++ b/kcalc/kcalcdisplay.cpp
@@ -105,13 +105,13 @@ void KCalcDisplay::slotCopy(void)
 	TQString txt = TQLabel::text();
 	if (_num_base == NB_HEX)
 		txt.prepend( "0x" );
-	(TQApplication::tqclipboard())->setText(txt, TQClipboard::Clipboard);
-	(TQApplication::tqclipboard())->setText(txt, TQClipboard::Selection);
+	(TQApplication::clipboard())->setText(txt, TQClipboard::Clipboard);
+	(TQApplication::clipboard())->setText(txt, TQClipboard::Selection);
 }
 
 void KCalcDisplay::slotPaste(bool bClipboard)
 {
-	TQString tmp_str = (TQApplication::tqclipboard())->text(bClipboard ? TQClipboard::Clipboard : TQClipboard::Selection);
+	TQString tmp_str = (TQApplication::clipboard())->text(bClipboard ? TQClipboard::Clipboard : TQClipboard::Selection);
 
 	if (tmp_str.isNull())
 	{
diff --git a/kcharselect/kcharselectdia.cc b/kcharselect/kcharselectdia.cc
index 18e3ad2..d5397e7 100644
--- a/kcharselect/kcharselectdia.cc
+++ b/kcharselect/kcharselectdia.cc
@@ -148,7 +148,7 @@ void KCharSelectDia::add(const TQChar &_chr)
 //==================================================================
 void KCharSelectDia::toClip()
 {
-  TQClipboard *cb = TQApplication::tqclipboard();
+  TQClipboard *cb = TQApplication::clipboard();
   cb->setSelectionMode( true );
   cb->setText(lined->text());
   cb->setSelectionMode( false );
@@ -161,7 +161,7 @@ void KCharSelectDia::toClip()
 //
 void KCharSelectDia::toClipUTF8()
 {
-  TQClipboard *cb = TQApplication::tqclipboard();
+  TQClipboard *cb = TQApplication::clipboard();
   TQString str = lined->text();
   cb->setText(str.utf8());
 }
@@ -174,7 +174,7 @@ void KCharSelectDia::toClipUTF8()
 //
 void KCharSelectDia::toClipHTML()
 {
-  TQClipboard *cb = TQApplication::tqclipboard();
+  TQClipboard *cb = TQApplication::clipboard();
   TQString input;
   TQString html;
   TQString tempstring;
@@ -185,13 +185,13 @@ void KCharSelectDia::toClipHTML()
   for(i=0; i< input.length(); i++ )
     {
       tempchar = input.at(i);
-      if(  tempchar.latin1() && ((tempchar.tqunicode() < 128) || (tempchar.tqunicode() >= 128+32)) )
+      if(  tempchar.latin1() && ((tempchar.unicode() < 128) || (tempchar.unicode() >= 128+32)) )
         {
           html.append(input.at(i));
         }
       else
         {
-          html.append(tempstring.sprintf("&#x%x;", tempchar.tqunicode()));
+          html.append(tempstring.sprintf("&#x%x;", tempchar.unicode()));
         }
     }
   cb->setText(html);
@@ -201,7 +201,7 @@ void KCharSelectDia::toClipHTML()
 //
 void KCharSelectDia::fromClip()
 {
-  TQClipboard *cb = TQApplication::tqclipboard();
+  TQClipboard *cb = TQApplication::clipboard();
   lined->setText( cb->text() );
 }
 
@@ -213,7 +213,7 @@ void KCharSelectDia::fromClip()
 //
 void KCharSelectDia::fromClipUTF8()
 {
-  TQClipboard *cb = TQApplication::tqclipboard();
+  TQClipboard *cb = TQApplication::clipboard();
   TQString str = cb->text();
 
   lined->setText( str.fromUtf8( str.latin1() ) );
@@ -266,7 +266,7 @@ void KCharSelectDia::_exit()
 
   config->setGroup("General");
   config->writeEntry("selectedFont",vFont);
-  config->writeEntry("char",static_cast<int>(vChr.tqunicode()));
+  config->writeEntry("char",static_cast<int>(vChr.unicode()));
   config->writeEntry("table",charSelect->tableNum());
   config->writeEntry("entryDirection",entryDirection);
   config->sync();
diff --git a/kdelirc/kcmlirc/addactionbase.ui b/kdelirc/kcmlirc/addactionbase.ui
index 8c6a15a..f052889 100644
--- a/kdelirc/kcmlirc/addactionbase.ui
+++ b/kdelirc/kcmlirc/addactionbase.ui
@@ -65,7 +65,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout14</cstring>
+                            <cstring>layout14</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -229,7 +229,7 @@
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout6</cstring>
+                    <cstring>layout6</cstring>
                 </property>
                 <hbox>
                     <property name="name">
@@ -414,7 +414,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout13</cstring>
+                        <cstring>layout13</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -512,7 +512,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout37</cstring>
+                            <cstring>layout37</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -677,7 +677,7 @@
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout35</cstring>
+                    <cstring>layout35</cstring>
                 </property>
                 <hbox>
                     <property name="name">
@@ -685,7 +685,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout34</cstring>
+                            <cstring>layout34</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -1218,7 +1218,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout13</cstring>
+                            <cstring>layout13</cstring>
                         </property>
                         <hbox>
                             <property name="name">
diff --git a/kdelirc/kcmlirc/editactionbase.ui b/kdelirc/kcmlirc/editactionbase.ui
index e95a07c..300c6de 100644
--- a/kdelirc/kcmlirc/editactionbase.ui
+++ b/kdelirc/kcmlirc/editactionbase.ui
@@ -56,7 +56,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout40</cstring>
+                                    <cstring>layout40</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -242,7 +242,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout36</cstring>
+                                    <cstring>layout36</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -542,7 +542,7 @@
                             </spacer>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout17</cstring>
+                                    <cstring>layout17</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
diff --git a/kdelirc/kcmlirc/editmodebase.ui b/kdelirc/kcmlirc/editmodebase.ui
index 2f991ac..785287b 100644
--- a/kdelirc/kcmlirc/editmodebase.ui
+++ b/kdelirc/kcmlirc/editmodebase.ui
@@ -43,7 +43,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout25</cstring>
+                <cstring>layout25</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -62,7 +62,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="1">
                     <property name="name">
-                        <cstring>tqlayout24</cstring>
+                        <cstring>layout24</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -215,7 +215,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout15</cstring>
+                <cstring>layout15</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kdelirc/kcmlirc/kcmlircbase.ui b/kdelirc/kcmlirc/kcmlircbase.ui
index 929641c..b8c8128 100644
--- a/kdelirc/kcmlirc/kcmlircbase.ui
+++ b/kdelirc/kcmlirc/kcmlircbase.ui
@@ -204,7 +204,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout9</cstring>
+                                <cstring>layout9</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -300,7 +300,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout7</cstring>
+                                        <cstring>layout7</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -325,7 +325,7 @@
                                         </spacer>
                                         <widget class="TQLayoutWidget">
                                             <property name="name">
-                                                <cstring>tqlayout6</cstring>
+                                                <cstring>layout6</cstring>
                                             </property>
                                             <grid>
                                                 <property name="name">
@@ -429,7 +429,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout9</cstring>
+                                <cstring>layout9</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
diff --git a/kdelirc/kcmlirc/newmode.ui b/kdelirc/kcmlirc/newmode.ui
index 571863b..913b912 100644
--- a/kdelirc/kcmlirc/newmode.ui
+++ b/kdelirc/kcmlirc/newmode.ui
@@ -40,7 +40,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout11</cstring>
+                <cstring>layout11</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -77,7 +77,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout12</cstring>
+                <cstring>layout12</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kdelirc/kcmlirc/selectprofile.ui b/kdelirc/kcmlirc/selectprofile.ui
index 7da2f25..8731a66 100644
--- a/kdelirc/kcmlirc/selectprofile.ui
+++ b/kdelirc/kcmlirc/selectprofile.ui
@@ -54,7 +54,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout47</cstring>
+                <cstring>layout47</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp
index c49eeef..8e8910d 100644
--- a/kedit/kedit.cpp
+++ b/kedit/kedit.cpp
@@ -1204,7 +1204,7 @@ void TopLevel::timer_slot(){
 
 void TopLevel::set_colors()
 {
-  TQPalette mypalette = TQPalette((eframe->tqpalette()));
+  TQPalette mypalette = TQPalette((eframe->palette()));
 
   TQColorGroup ncgrp( mypalette.active() );
 
diff --git a/kgpg/conf_encryption.ui b/kgpg/conf_encryption.ui
index 2aabb64..ff807aa 100644
--- a/kgpg/conf_encryption.ui
+++ b/kgpg/conf_encryption.ui
@@ -111,7 +111,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="7" column="0" rowspan="1" colspan="4">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kgpg/conf_gpg.ui b/kgpg/conf_gpg.ui
index 416f242..8a7f14a 100644
--- a/kgpg/conf_gpg.ui
+++ b/kgpg/conf_gpg.ui
@@ -166,7 +166,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <vbox>
                         <property name="name">
diff --git a/kgpg/conf_servers.ui b/kgpg/conf_servers.ui
index a765cd9..f93b871 100644
--- a/kgpg/conf_servers.ui
+++ b/kgpg/conf_servers.ui
@@ -82,7 +82,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="4" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/kgpg/keyproperties.ui b/kgpg/keyproperties.ui
index b64e9a8..7dce70b 100644
--- a/kgpg/keyproperties.ui
+++ b/kgpg/keyproperties.ui
@@ -32,7 +32,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="3" rowspan="7" colspan="1">
             <property name="name">
-                <cstring>tqlayout39</cstring>
+                <cstring>layout39</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -92,7 +92,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout13</cstring>
+                        <cstring>layout13</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -117,7 +117,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="7" column="3" rowspan="4" colspan="1">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp
index 45895c0..ca02ed0 100644
--- a/kgpg/kgpg.cpp
+++ b/kgpg/kgpg.cpp
@@ -121,13 +121,13 @@ void  MyView::clipEncrypt()
 
 void  MyView::clipDecrypt()
 {
-        TQString clippie=kapp->tqclipboard()->text(clipboardMode).stripWhiteSpace();
+        TQString clippie=kapp->clipboard()->text(clipboardMode).stripWhiteSpace();
 	droppedtext(clippie,false);
 }
 
 void  MyView::clipSign(bool openEditor)
 {
-        TQString clippie=kapp->tqclipboard()->text(clipboardMode).stripWhiteSpace();
+        TQString clippie=kapp->clipboard()->text(clipboardMode).stripWhiteSpace();
         if (!clippie.isEmpty()) {
                 KgpgApp *kgpgtxtedit = new KgpgApp(0, "editor",WDestructiveClose,goDefaultKey);
 		connect(this,TQT_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQT_SLOT(slotSetFont(TQFont)));
@@ -302,8 +302,8 @@ void  MyView::shredDroppedFile()
 KDialogBase *shredConfirm=new KDialogBase( this, "confirm_shred", true,i18n("Shred Files"),KDialogBase::Ok | KDialogBase::Cancel);
 TQWidget *page = new TQWidget(shredConfirm);
 shredConfirm->setMainWidget(page);
-TQBoxLayout *tqlayout=new TQBoxLayout(page,TQBoxLayout::TopToBottom,0);
-tqlayout->setAutoAdd(true);
+TQBoxLayout *layout=new TQBoxLayout(page,TQBoxLayout::TopToBottom,0);
+layout->setAutoAdd(true);
 
 (void) new KActiveLabel( i18n("Do you really want to <a href=\"whatsthis:%1\">shred</a> these files?").arg(i18n( "<qt><p>You must be aware that <b>shredding is not secure</b> on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).</p></qt>")),page);
 KListBox *lb=new KListBox(page);
@@ -560,7 +560,7 @@ void  MyView::dropEvent (TQDropEvent *o)
                 droppedfile(list);
         else if ( TQTextDrag::decode(o, text) )
 		{
-	        TQApplication::tqclipboard()->setText(text,clipboardMode);
+	        TQApplication::clipboard()->setText(text,clipboardMode);
                 droppedtext(text);
 		}
 }
@@ -569,7 +569,7 @@ void  MyView::dropEvent (TQDropEvent *o)
 void  MyView::readOptions()
 {
 	clipboardMode=TQClipboard::Clipboard;
-        if ( KGpgSettings::useMouseSelection() && kapp->tqclipboard()->supportsSelection())
+        if ( KGpgSettings::useMouseSelection() && kapp->clipboard()->supportsSelection())
                 clipboardMode=TQClipboard::Selection;
 
 	if (KGpgSettings::firstRun()) {
@@ -804,7 +804,7 @@ kgpgapplet::kgpgapplet(TQWidget *parent, const char *name)
 void kgpgapplet::checkMenu()
 {
 	KgpgDecryptClipboard->setEnabled(false);
-	if ((kapp->tqclipboard()->text(w->clipboardMode).isEmpty()))
+	if ((kapp->clipboard()->text(w->clipboardMode).isEmpty()))
 	{
 		KgpgEncryptClipboard->setEnabled(false);
 		KgpgSignClipboard->setEnabled(false);
@@ -812,7 +812,7 @@ void kgpgapplet::checkMenu()
 	else
 	{
 		KgpgEncryptClipboard->setEnabled(true);
-		if (kapp->tqclipboard()->text(w->clipboardMode).stripWhiteSpace().startsWith("-----BEGIN"))
+		if (kapp->clipboard()->text(w->clipboardMode).stripWhiteSpace().startsWith("-----BEGIN"))
 		KgpgDecryptClipboard->setEnabled(true);
 		KgpgSignClipboard->setEnabled(true);
 	}
@@ -1008,7 +1008,7 @@ int KgpgAppletApp::newInstance()
 
 void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,bool,bool symmetric)
 {
-        if (kapp->tqclipboard()->text(clipboardMode).isEmpty()) {
+        if (kapp->clipboard()->text(clipboardMode).isEmpty()) {
 	KPassivePopup::message(i18n("Clipboard is empty."),TQString(),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this);
 	return;
 	}
@@ -1020,12 +1020,12 @@ void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,boo
                 KgpgInterface *txtEncrypt=new KgpgInterface();
                 connect (txtEncrypt,TQT_SIGNAL(txtencryptionfinished(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotSetClip(TQString)));
 		connect (txtEncrypt,TQT_SIGNAL(txtencryptionstarted()),TQT_TQOBJECT(this),TQT_SLOT(slotPassiveClip()));
-                txtEncrypt->KgpgEncryptText(kapp->tqclipboard()->text(clipboardMode),selec,encryptOptions);
+                txtEncrypt->KgpgEncryptText(kapp->clipboard()->text(clipboardMode),selec,encryptOptions);
 }
 
 void MyView::slotPassiveClip()
 {
-TQString newtxt=kapp->tqclipboard()->text(clipboardMode);
+TQString newtxt=kapp->clipboard()->text(clipboardMode);
 if (newtxt.length()>300)
                         newtxt=TQString(newtxt.left(250).stripWhiteSpace())+"...\n"+TQString(newtxt.right(40).stripWhiteSpace());
 
@@ -1045,7 +1045,7 @@ pop = new KPassivePopup( this);
 void MyView::slotSetClip(TQString newtxt)
 {
         if (newtxt.isEmpty()) return;
-                TQApplication::tqclipboard()->setText(newtxt,clipboardMode);//,TQClipboard::Clipboard);    QT 3.1 only
+                TQApplication::clipboard()->setText(newtxt,clipboardMode);//,TQClipboard::Clipboard);    QT 3.1 only
 }
 
 
diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp
index 5de453a..59acd4e 100644
--- a/kgpg/kgpgeditor.cpp
+++ b/kgpg/kgpgeditor.cpp
@@ -314,7 +314,7 @@ void KgpgApp::slotFileSave()
     TQTextCodec*cod=TQTextCodec::codecForName (textEncoding.ascii());
         // slotStatusMsg(i18n("Saving file..."));
     if (!checkEncoding(cod)) {
-	KMessageBox::sorry(this,i18n("The document could not been saved, as the selected encoding cannot encode every tqunicode character in it."));
+	KMessageBox::sorry(this,i18n("The document could not been saved, as the selected encoding cannot encode every unicode character in it."));
 	return;
     }
 
diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp
index aa65050..7e9dc56 100644
--- a/kgpg/kgpginterface.cpp
+++ b/kgpg/kgpginterface.cpp
@@ -664,7 +664,7 @@ Md5Widget::~Md5Widget()
 
 void Md5Widget::slotApply()
 {
-        TQClipboard *cb = TQApplication::tqclipboard();
+        TQClipboard *cb = TQApplication::clipboard();
         TQString text;
         // Copy text from the clipboard (paste)
         text = cb->text(TQClipboard::Clipboard);
diff --git a/kgpg/kgpgview.cpp b/kgpg/kgpgview.cpp
index a8a3cb9..2e6540c 100644
--- a/kgpg/kgpgview.cpp
+++ b/kgpg/kgpgview.cpp
@@ -195,7 +195,7 @@ KgpgView::KgpgView(TQWidget *parent, const char *name) : TQWidget(parent, name)
         editor=new MyEditor(this);
 	windowAutoClose=true;
 
-        /////    tqlayout
+        /////    layout
 
         TQVBoxLayout *vbox=new TQVBoxLayout(this,3);
 
@@ -214,7 +214,7 @@ KgpgView::KgpgView(TQWidget *parent, const char *name) : TQWidget(parent, name)
 
         TQObject::connect(editor,TQT_SIGNAL(textChanged()),TQT_TQOBJECT(this),TQT_SLOT(modified()));
 
-        boutonbox->tqlayout();
+        boutonbox->layout();
         editor->resize(editor->maximumSize());
         vbox->addWidget(editor);
         vbox->addWidget(boutonbox);
diff --git a/kgpg/kgpgwizard.ui b/kgpg/kgpgwizard.ui
index 7a6b774..c607b30 100644
--- a/kgpg/kgpgwizard.ui
+++ b/kgpg/kgpgwizard.ui
@@ -313,7 +313,7 @@ Remember that if you download a file or open one in an editor, parts of the file
             </spacer>
             <widget class="TQLayoutWidget" row="1" column="1">
                 <property name="name">
-                    <cstring>tqlayout2</cstring>
+                    <cstring>layout2</cstring>
                 </property>
                 <hbox>
                     <property name="name">
diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp
index aeb190b..548c868 100644
--- a/kgpg/listkeys.cpp
+++ b/kgpg/listkeys.cpp
@@ -1593,7 +1593,7 @@ void listKeys::slotProcessExportMail(TQString keys)
 
 void listKeys::slotProcessExportClip(TQString keys)
 {
-        kapp->tqclipboard()->setText(keys,clipboardMode);
+        kapp->clipboard()->setText(keys,clipboardMode);
 }
 
 
@@ -2488,7 +2488,7 @@ void listKeys::slotPreImportKey()
                                 connect(importKeyProcess,TQT_SIGNAL(refreshOrphaned()),keysList2,TQT_SLOT(slotReloadOrphaned()));
                         }
                 } else {
-                        TQString keystr = kapp->tqclipboard()->text(clipboardMode);
+                        TQString keystr = kapp->clipboard()->text(clipboardMode);
                         if (!keystr.isEmpty()) {
                                 changeMessage(i18n("Importing..."),0,true);
                                 KgpgInterface *importKeyProcess=new KgpgInterface();
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 b8942d6..b59bbb1 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 );
diff --git a/kjots/CHANGES b/kjots/CHANGES
index a4cc4ff..9815d90 100644
--- a/kjots/CHANGES
+++ b/kjots/CHANGES
@@ -15,12 +15,12 @@ new in version 0.5 (Aaron J. Seigo)
 
 new in version 0.4 (Mario Weilguni <mweilguni@kde.org>)
 - works now with Qt 2.0
-- fixed broken tqlayout of main window
-- tqlayout improvements in AskFileName()
-- tqlayout improvements in SubjList()
+- fixed broken layout of main window
+- layout improvements in AskFileName()
+- layout improvements in SubjList()
 - compiles without warnings
 - "Apply" button is only activated when changes were made
-- improved tqlayout of configuration dialog
+- improved layout of configuration dialog
 - fixed a bug in the font selection
 
 - now compiles with EGCS   ( Robert Williams )
@@ -59,7 +59,7 @@ new in version 0.2.1
 
 new in version 0.2.0
 
-- changed the tqlayout to be more KDE conforming (toolbar, statusbar,...)
+- changed the layout to be more KDE conforming (toolbar, statusbar,...)
 - folders are now called books and entries are pages
 - added subject to each page
 - you may popup a window with a list of all subjects and use it to find
diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp
index 5e2c279..e082d55 100644
--- a/klaptopdaemon/battery.cpp
+++ b/klaptopdaemon/battery.cpp
@@ -112,10 +112,10 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name)
 
       // group box to hold the icons together
       TQVGroupBox* icons_groupbox = new TQVGroupBox( i18n("Select Battery Icons"), this );
-      icons_groupbox->tqlayout()->setSpacing( KDialog::spacingHint() );
+      icons_groupbox->layout()->setSpacing( KDialog::spacingHint() );
       top_layout->addWidget( icons_groupbox, 0, TQt::AlignLeft );
 
-      // tqlayout to hold the icons inside the groupbox
+      // layout to hold the icons inside the groupbox
       TQGrid *icon_grid = new TQGrid( 3 /*cols*/, icons_groupbox );
       icon_grid->setSpacing( KDialog::spacingHint() );
 
diff --git a/klaptopdaemon/buttons.cpp b/klaptopdaemon/buttons.cpp
index cec7c60..51c9ce7 100644
--- a/klaptopdaemon/buttons.cpp
+++ b/klaptopdaemon/buttons.cpp
@@ -120,7 +120,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name)
 
       if (laptop_portable::has_button(laptop_portable::LidButton)) {
       	lidBox = new TQVButtonGroup(i18n("Lid Switch Closed"), this);
-      	lidBox->tqlayout()->setSpacing( KDialog::spacingHint() );
+      	lidBox->layout()->setSpacing( KDialog::spacingHint() );
         TQToolTip::add( lidBox, i18n( "Select which actions will occur when the laptop's lid is closed" ) );
       	hlay->addWidget( lidBox );
 
@@ -196,7 +196,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name)
       if (laptop_portable::has_button(laptop_portable::PowerButton)) {
 
       	powerBox = new TQVButtonGroup(i18n("Power Switch Pressed"), this);
-      	powerBox->tqlayout()->setSpacing( KDialog::spacingHint() );
+      	powerBox->layout()->setSpacing( KDialog::spacingHint() );
         TQToolTip::add( powerBox, i18n( "Select which actions will occur when the laptop's power button is pressed" ) );
       	hlay->addWidget( powerBox );
 
diff --git a/klaptopdaemon/krichtextlabel.h b/klaptopdaemon/krichtextlabel.h
index f990725..713a8da 100644
--- a/klaptopdaemon/krichtextlabel.h
+++ b/klaptopdaemon/krichtextlabel.h
@@ -24,7 +24,7 @@
 #include <kdelibs_export.h>
 
 /**
- * @short A replacement for TQLabel that supports richtext and proper tqlayout management
+ * @short A replacement for TQLabel that supports richtext and proper layout management
  *
  * @author Waldo Bastian <bastian@kde.org>
  */
diff --git a/klaptopdaemon/main.cpp b/klaptopdaemon/main.cpp
index 535e391..6d30933 100644
--- a/klaptopdaemon/main.cpp
+++ b/klaptopdaemon/main.cpp
@@ -147,9 +147,9 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *)
     enablehibernate = config.readBoolEntry("EnableHibernate", false);
     laptop_portable::software_suspend_set_mask(enablehibernate);
   }
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+  TQVBoxLayout *layout = new TQVBoxLayout(this);
   tab = new TQTabWidget(this);
-  tqlayout->addWidget(tab);
+  layout->addWidget(tab);
 
   battery = new BatteryConfig(parent, "kcmlaptop");
   tab->addTab(battery, i18n("&Battery"));
diff --git a/klaptopdaemon/portable.cpp b/klaptopdaemon/portable.cpp
index 0ac3568..7c5d227 100644
--- a/klaptopdaemon/portable.cpp
+++ b/klaptopdaemon/portable.cpp
@@ -2267,7 +2267,7 @@ laptop_portable::apm_set_mask(bool , bool )
 //	adds extra widgets to the battery panel
 //
 void
-laptop_portable::extra_config(TQWidget * /*parent*/, KConfig * /*config*/, TQVBoxLayout * /*tqlayout*/)
+laptop_portable::extra_config(TQWidget * /*parent*/, KConfig * /*config*/, TQVBoxLayout * /*layout*/)
 {
 	// INSERT HERE
 }
@@ -2945,7 +2945,7 @@ int laptop_portable::has_apm(int)
 //	adds extra widgets to the battery panel
 //
 void
-laptop_portable::extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *tqlayout)
+laptop_portable::extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *layout)
 {
 	// INSERT HERE
 }
diff --git a/klaptopdaemon/portable.h b/klaptopdaemon/portable.h
index b4843e1..a9fa703 100644
--- a/klaptopdaemon/portable.h
+++ b/klaptopdaemon/portable.h
@@ -98,7 +98,7 @@ public:
 	static void get_battery_status(int &num_batteries, TQStringList &names, TQStringList &state, TQStringList &values); // get multiple battery status
 	static bool has_lav();			// true if the following returns a valid value
 	static float get_load_average();	// current short term load average
-	static void extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *tqlayout);
+	static void extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *layout);
 	static void acpi_set_mask(bool standby, bool suspend, bool hibernate, bool perf, bool throttle);	
 	static void apm_set_mask(bool standby, bool suspend);
 	static void software_suspend_set_mask(bool hibernate);
diff --git a/klaptopdaemon/power.cpp b/klaptopdaemon/power.cpp
index 56ba373..446e900 100644
--- a/klaptopdaemon/power.cpp
+++ b/klaptopdaemon/power.cpp
@@ -122,7 +122,7 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name)
 
       nopowerBox = new TQVButtonGroup(i18n("Not Powered"), this);
       TQToolTip::add( nopowerBox, i18n( "Options in this box apply when the laptop is unplugged from the wall and has been idle for a while" ) );
-      nopowerBox->tqlayout()->setSpacing( KDialog::spacingHint() );
+      nopowerBox->layout()->setSpacing( KDialog::spacingHint() );
       hlay->addWidget( nopowerBox );
 
       if (can_standby) {
@@ -214,7 +214,7 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name)
 
 
       powerBox = new TQVButtonGroup(i18n("Powered"), this);
-      powerBox->tqlayout()->setSpacing( KDialog::spacingHint() );
+      powerBox->layout()->setSpacing( KDialog::spacingHint() );
       TQToolTip::add( powerBox, i18n( "Options in this box apply when the laptop is plugged into the wall and has been idle for a while" ) );
       hlay->addWidget( powerBox );
 
diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp
index 935e47d..4845fdc 100644
--- a/klaptopdaemon/warning.cpp
+++ b/klaptopdaemon/warning.cpp
@@ -236,7 +236,7 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
 
     TQVButtonGroup *b = new TQVButtonGroup(i18n("System State Change"), this);
     TQToolTip::add( b, i18n( "You may choose one of the following to occur when the battery gets low" ) );
-    b->tqlayout()->setSpacing( KDialog::spacingHint() );
+    b->layout()->setSpacing( KDialog::spacingHint() );
     if (can_standby) {
       checkStandby = new TQRadioButton(i18n("Standb&y"), b);
       TQToolTip::add( checkStandby, i18n( "Move the system into the standby state - a temporary lower power state" ) );
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
index e5d9f67..32fc821 100644
--- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
+++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
@@ -61,10 +61,10 @@ KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList
                      "mirko@kde.org");
     setAboutData( about );
 
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+    TQVBoxLayout *layout = new TQVBoxLayout(this);
     mKVaioGeneral = new KCMKVaioGeneral(this);
-    tqlayout->addWidget( mKVaioGeneral );
-    tqlayout->addStretch();
+    layout->addWidget( mKVaioGeneral );
+    layout->addStretch();
 
     mDriver = new KVaioDriverInterface(TQT_TQOBJECT(this));
     mDriverAvailable = mDriver->connectToDriver(false);
diff --git a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui
index 47d3874..5fb8d90 100644
--- a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui
+++ b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui
@@ -62,7 +62,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="2" column="0">
                     <property name="name">
-                        <cstring>tqlayout27</cstring>
+                        <cstring>layout27</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp
index 2d51778..b98dc28 100644
--- a/kmilo/thinkpad/kcmthinkpad/main.cpp
+++ b/kmilo/thinkpad/kcmthinkpad/main.cpp
@@ -68,10 +68,10 @@ KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const T
 			 "jr@jriddell.org");
 	setAboutData( about );
 
-	TQVBoxLayout* tqlayout = new TQVBoxLayout(this);
+	TQVBoxLayout* layout = new TQVBoxLayout(this);
 	m_KCMThinkpadGeneral = new KCMThinkpadGeneral(this);
-	tqlayout->addWidget( m_KCMThinkpadGeneral );
-	tqlayout->addStretch();
+	layout->addWidget( m_KCMThinkpadGeneral );
+	layout->addStretch();
 
 	load();
 
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp
index a455bae..58b82da 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp
@@ -40,9 +40,9 @@ KMultiFormListBox::KMultiFormListBox( KMultiFormListBoxFactory *factory, KMultiF
 
   TQWidget *widget = theWidget->qWidget();
 
-  TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
+  TQHBoxLayout *layout = new TQHBoxLayout( this );
 	_factory = factory;
-  tqlayout->addWidget( widget );
+  layout->addWidget( widget );
 }
 
 void KMultiFormListBox::append( KMultiFormListBoxEntry *element )
diff --git a/kregexpeditor/auxbuttons.cpp b/kregexpeditor/auxbuttons.cpp
index 3b7032e..e276acf 100644
--- a/kregexpeditor/auxbuttons.cpp
+++ b/kregexpeditor/auxbuttons.cpp
@@ -35,48 +35,48 @@
 AuxButtons::AuxButtons( TQWidget* parent, const char* name = 0)
   :TQDockWindow( TQDockWindow::InDock, parent, name)
 {
-  TQBoxLayout* tqlayout = boxLayout();
+  TQBoxLayout* layout = boxLayout();
 
   _undo = new TQToolButton( this );
   _undo->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("undo") ) );
-  tqlayout->addWidget( _undo );
+  layout->addWidget( _undo );
   connect( _undo, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(undo()) );
   TQToolTip::add( _undo, i18n( "Undo" ) );
 
   _redo = new TQToolButton( this );
   _redo->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("redo") ) );
-  tqlayout->addWidget( _redo );
+  layout->addWidget( _redo );
   connect( _redo, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(redo()) );
   TQToolTip::add( _redo, i18n( "Redo" ) );
 
   _cut = new TQToolButton( this );
   _cut->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("editcut") ) );
-  tqlayout->addWidget( _cut );
+  layout->addWidget( _cut );
   connect( _cut, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(cut()) );
   TQToolTip::add( _cut, i18n( "Cut" ) );
 
   _copy = new TQToolButton( this );
   _copy->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("editcopy") ) );
-  tqlayout->addWidget( _copy );
+  layout->addWidget( _copy );
   connect( _copy, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(copy()) );
   TQToolTip::add( _copy, i18n( "Copy" ) );
 
   _paste = new TQToolButton( this );
   _paste->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("editpaste")) );
-  tqlayout->addWidget( _paste );
+  layout->addWidget( _paste );
   connect( _paste, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(paste()) );
   TQToolTip::add( _paste, i18n( "Paste" ) );
 
   _save = new TQToolButton( this );
   _save->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("filesave")) );
-  tqlayout->addWidget( _save );
+  layout->addWidget( _save );
   connect( _save, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(save()) );
   TQToolTip::add( _save, i18n( "Save" ) );
 
 
   TQToolButton* button = new TQToolButton(this);
   button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("contexthelp") ) );
-  tqlayout->addWidget( button );
+  layout->addWidget( button );
   connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEnterWhatsThis()));
 
   _undo->setEnabled( false );
diff --git a/kregexpeditor/characterswidget.cpp b/kregexpeditor/characterswidget.cpp
index 7f64d56..3926260 100644
--- a/kregexpeditor/characterswidget.cpp
+++ b/kregexpeditor/characterswidget.cpp
@@ -380,10 +380,10 @@ void CharacterEdits::slotOK()
 SingleEntry::SingleEntry(TQWidget* parent, const char* name )
     :KMultiFormListBoxEntry( parent, name )
 {
-    TQHBoxLayout* tqlayout = new TQHBoxLayout( this, 3, 6 );
+    TQHBoxLayout* layout = new TQHBoxLayout( this, 3, 6 );
     _selector = new CharSelector( this );
-    tqlayout->addWidget( _selector );
-    tqlayout->addStretch(1);
+    layout->addWidget( _selector );
+    layout->addStretch(1);
 }
 
 TQString SingleEntry::text() const
@@ -405,19 +405,19 @@ bool SingleEntry::isEmpty() const
 RangeEntry::RangeEntry(TQWidget* parent, const char* name )
     :KMultiFormListBoxEntry( parent, name )
 {
-    TQHBoxLayout* tqlayout = new TQHBoxLayout( this, 3, 6 );
+    TQHBoxLayout* layout = new TQHBoxLayout( this, 3, 6 );
 
     TQLabel* label = new TQLabel(i18n("From:"), this );
     _from = new CharSelector( this );
-    tqlayout->addWidget( label );
-    tqlayout->addWidget( _from );
+    layout->addWidget( label );
+    layout->addWidget( _from );
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
 
     label = new TQLabel(i18n("end of range","To:"), this );
     _to = new CharSelector( this );
-    tqlayout->addWidget( label );
-    tqlayout->addWidget( _to );
+    layout->addWidget( label );
+    layout->addWidget( _to );
 }
 
 TQString RangeEntry::fromText() const
diff --git a/kregexpeditor/charselector.cpp b/kregexpeditor/charselector.cpp
index 32e2a79..04c6f5d 100644
--- a/kregexpeditor/charselector.cpp
+++ b/kregexpeditor/charselector.cpp
@@ -43,10 +43,10 @@ class StackContainer :public TQWidget
 public:
     StackContainer( TQWidget* child, TQWidget* parent ) : TQWidget( parent )
         {
-            TQHBoxLayout* tqlayout = new TQHBoxLayout( this );
+            TQHBoxLayout* layout = new TQHBoxLayout( this );
             child->reparent( this, TQPoint(0,0), false );
-            tqlayout->addWidget( child );
-            tqlayout->addStretch( 1 );
+            layout->addWidget( child );
+            layout->addStretch( 1 );
         }
 };
 
@@ -54,7 +54,7 @@ CharSelector::CharSelector( TQWidget* parent, const char* name )
     :TQWidget( parent, name ), _oldIndex(0)
 {
   TQStringList items;
-  TQHBoxLayout* tqlayout = new TQHBoxLayout( this, 0, 6 );
+  TQHBoxLayout* layout = new TQHBoxLayout( this, 0, 6 );
 
   _type = new TQComboBox( this, "_type" );
   items << i18n("Normal Character")
@@ -68,10 +68,10 @@ CharSelector::CharSelector( TQWidget* parent, const char* name )
         << i18n("TheQt::Horizontal Tab Character (\\t)")
         << i18n("TheQt::Vertical Tab Character (\\v)");
   _type->insertStringList( items );
-  tqlayout->addWidget( _type );
+  layout->addWidget( _type );
 
   _stack = new TQWidgetStack( this, "_stack" );
-  tqlayout->addWidget( _stack );
+  layout->addWidget( _stack );
 
   _normal = new LimitedCharLineEdit( LimitedCharLineEdit::NORMAL, 0, "_normal" );
   _stack->addWidget( new StackContainer( _normal, _stack ), 0 );
diff --git a/kregexpeditor/compoundwidget.cpp b/kregexpeditor/compoundwidget.cpp
index cf133dd..e19e3aa 100644
--- a/kregexpeditor/compoundwidget.cpp
+++ b/kregexpeditor/compoundwidget.cpp
@@ -40,8 +40,8 @@
 CompoundDetailWindow::CompoundDetailWindow( TQWidget* parent, const char* name )
   :TQWidget( parent, name )
 {
-  TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
-  tqlayout->setAutoAdd( true );
+  TQVBoxLayout* layout = new TQVBoxLayout( this );
+  layout->setAutoAdd( true );
 
   TQLabel* label = new TQLabel( i18n("&Title:"), this);
   _title = new TQLineEdit( this );
diff --git a/kregexpeditor/editorwindow.cpp b/kregexpeditor/editorwindow.cpp
index 6f7173f..26b2559 100644
--- a/kregexpeditor/editorwindow.cpp
+++ b/kregexpeditor/editorwindow.cpp
@@ -289,7 +289,7 @@ void RegExpEditorWindow::cutCopyAux( TQPoint pos )
     RegExpWidgetDrag *clipboardData = new RegExpWidgetDrag( regexp, this );
     delete regexp;
 
-    TQClipboard* clipboard = tqApp->tqclipboard();
+    TQClipboard* clipboard = tqApp->clipboard();
     clipboard->setData( clipboardData );
     emit anythingOnClipboard( true );
     emit canSave( _top->hasAnyChildren() );
@@ -298,7 +298,7 @@ void RegExpEditorWindow::cutCopyAux( TQPoint pos )
 
 void RegExpEditorWindow::slotStartPasteAction()
 {
-    TQByteArray data = tqApp->tqclipboard()->data()->encodedData( "KRegExpEditor/widgetdrag" );
+    TQByteArray data = tqApp->clipboard()->data()->encodedData( "KRegExpEditor/widgetdrag" );
     TQTextStream stream( data, IO_ReadOnly );
     TQString str = stream.read();
 
@@ -335,7 +335,7 @@ void RegExpEditorWindow::showRMBMenu( bool enableCutCopy )
     _menu->setItemEnabled( CUT, enableCutCopy );
     _menu->setItemEnabled( COPY, enableCutCopy );
 
-    if ( ! tqApp->tqclipboard()->data()->provides( "KRegExpEditor/widgetdrag" ) )
+    if ( ! tqApp->clipboard()->data()->provides( "KRegExpEditor/widgetdrag" ) )
         _menu->setItemEnabled( PASTE, false );
     else
         _menu->setItemEnabled( PASTE, true );
diff --git a/kregexpeditor/editorwindow.h b/kregexpeditor/editorwindow.h
index c8899a6..0d20597 100644
--- a/kregexpeditor/editorwindow.h
+++ b/kregexpeditor/editorwindow.h
@@ -232,7 +232,7 @@ private:
     /** This points to the top @ref RegExpWidget in the editor window. */
 	ConcWidget *_top;
 
-    /** This points to the tqlayout manager for the editor window */
+    /** This points to the layout manager for the editor window */
     TQHBoxLayout* _layout;
 
     /** Start point and last point draw. Used when doing rubber band selection  */
diff --git a/kregexpeditor/kregexpeditorgui.cpp b/kregexpeditor/kregexpeditorgui.cpp
index 6208dc6..f419c3b 100644
--- a/kregexpeditor/kregexpeditorgui.cpp
+++ b/kregexpeditor/kregexpeditorgui.cpp
@@ -38,9 +38,9 @@ KRegExpEditorGUI::KRegExpEditorGUI(TQWidget *parent, const char *name,
 	                           const TQStringList & )
   : TQWidget( parent, name)
 {
-  TQHBoxLayout* tqlayout = new TQHBoxLayout( this, 6 );
+  TQHBoxLayout* layout = new TQHBoxLayout( this, 6 );
   _editor = new KRegExpEditorPrivate( this, "_editor" );
-  tqlayout->addWidget( _editor );
+  layout->addWidget( _editor );
   connect( _editor, TQT_SIGNAL( canUndo(bool) ), this, TQT_SIGNAL( canUndo(bool) ) );
   connect( _editor, TQT_SIGNAL( canRedo(bool) ), this, TQT_SIGNAL( canRedo(bool) ) );
   connect( _editor, TQT_SIGNAL( changes(bool) ), this, TQT_SIGNAL( changes(bool) ) );
@@ -74,8 +74,8 @@ KRegExpEditorGUIDialog::KRegExpEditorGUIDialog( TQWidget *parent,
                  parent, name ? name : "KRegExpDialog" )
 {
   TQFrame* frame = plainPage();
-  TQVBoxLayout* tqlayout = new TQVBoxLayout( frame, 6 );
-  tqlayout->setAutoAdd( true );
+  TQVBoxLayout* layout = new TQVBoxLayout( frame, 6 );
+  layout->setAutoAdd( true );
   _editor = new KRegExpEditorGUI( frame );
 
   connect( _editor, TQT_SIGNAL( canUndo(bool) ), this, TQT_SIGNAL( canUndo(bool) ) );
diff --git a/kregexpeditor/kregexpeditorprivate.cpp b/kregexpeditor/kregexpeditorprivate.cpp
index e34e20c..08e661e 100644
--- a/kregexpeditor/kregexpeditorprivate.cpp
+++ b/kregexpeditor/kregexpeditorprivate.cpp
@@ -154,17 +154,17 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name)
 
 
   // Line Edit
-  TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout, 6 );
+  TQHBoxLayout* layout = new TQHBoxLayout( topLayout, 6 );
   TQLabel* label = new TQLabel( i18n("ASCII syntax:"), this );
-  tqlayout->addWidget( label );
+  layout->addWidget( label );
   clearButton = new TQToolButton( this );
   const TQString icon( TQString::fromLatin1( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase" ) );
   TQIconSet clearIcon = SmallIconSet( icon );
   clearButton->setIconSet( clearIcon );
-  tqlayout->addWidget( clearButton );
+  layout->addWidget( clearButton );
   TQToolTip::add( clearButton, i18n("Clear expression") );
   _regexpEdit = new TQLineEdit( this );
-  tqlayout->addWidget( _regexpEdit );
+  layout->addWidget( _regexpEdit );
   TQWhatsThis::add( _regexpEdit, i18n( "This is the regular expression in ASCII syntax. You are likely only "
 				      "to be interested in this if you are a programmer, and need to "
 				      "develop a regular expression using TQRegExp.<p>"
@@ -178,7 +178,7 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name)
 #endif
   _error = new TQLabel( this );
   _error->setPixmap( pix );
-  tqlayout->addWidget( _error );
+  layout->addWidget( _error );
   _error->hide();
 
   _timer = new TQTimer(this);
diff --git a/kregexpeditor/regexpbuttons.cpp b/kregexpeditor/regexpbuttons.cpp
index 0456816..2c2b247 100644
--- a/kregexpeditor/regexpbuttons.cpp
+++ b/kregexpeditor/regexpbuttons.cpp
@@ -37,7 +37,7 @@
 RegExpButtons::RegExpButtons( TQWidget *parent, const char *name )
   : TQDockWindow( TQDockWindow::InDock, parent, name), _keepMode(false)
 {
-  TQBoxLayout *tqlayout = boxLayout();
+  TQBoxLayout *layout = boxLayout();
 
   _grp = new TQButtonGroup(this);
   _grp->hide();
@@ -57,7 +57,7 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name )
 #endif
 
   _selectBut->setPixmap( pix );
-  tqlayout->addWidget( _selectBut );
+  layout->addWidget( _selectBut );
   _grp->insert(_selectBut);
   _selectBut->setToggleButton( true );
   connect( _selectBut, TQT_SIGNAL(clicked()), TQT_SIGNAL(doSelect()));
@@ -76,19 +76,19 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name )
   but = insert(TEXT, "text", i18n("Text"),
                i18n( "<qt>This will insert a text field, where you may write text. The text you write will "
                      "be matched literally. (i.e. you do not need to escape any characters)</qt>" ) );
-  tqlayout->addWidget( but );
+  layout->addWidget( but );
 
 
   but = insert(CHARSET, "characters", i18n("A single character specified in a range"),
                i18n("<qt>This will match a single character from a predefined range.<p>"
                     "When you insert this widget a dialog box will appear, which lets you specify "
                     "which characters this <i>regexp item</i> will match.</qt>") );
-  tqlayout->addWidget( but );
+  layout->addWidget( but );
 
 
   but = insert(DOT, "anychar", i18n("Any character"),
                i18n("<qt>This will match any single character</qt>") );
-  tqlayout->addWidget( but );
+  layout->addWidget( but );
 
 
   but = insert(REPEAT, "repeat", i18n("Repeated content"),
@@ -102,14 +102,14 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name )
                     "is <tt>abc</tt>, then this <i>regexp item</i> will match the empty string, "
                     "the string <tt>abc</tt>, the string <tt>abcabc</tt>, the string <tt>abcabcabcabc</tt>, "
                     "etc.</qt>") );
-  tqlayout->addWidget( but );
+  layout->addWidget( but );
 
 
   but = insert(ALTN, "altn", i18n("Alternatives"),
                i18n("<qt>This <i>regexp item</i> will match any of its alternatives.</p>"
                     "You specify alternatives by placing <i>regexp items</i> on top of "
                     "each other inside this widget.</qt>") );
-  tqlayout->addWidget( but );
+  layout->addWidget( but );
 
 
   but = insert(COMPOUND,  "compound", i18n("Compound regexp"),
@@ -118,38 +118,38 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name )
                     "a small box. This makes it easier for you to get an overview of large "
                     "<i>regexp items</i>. This is especially useful if you load a predefined <i>regexp item</i> "
                     "you perhaps don't care about the inner workings of.") );
-  tqlayout->addWidget( but );
+  layout->addWidget( but );
 
 
   but = insert(BEGLINE,  "begline", i18n("Beginning of line"),
                i18n("<qt>This will match the beginning of a line.</qt>") );
-  tqlayout->addWidget( but );
+  layout->addWidget( but );
 
 
   but = insert(ENDLINE,  "endline", i18n("End of line"),
                i18n("<qt>This will match the end of a line.</qt>") );
-  tqlayout->addWidget( but );
+  layout->addWidget( but );
 
 
   _wordBoundary = insert(WORDBOUNDARY,  "wordboundary", i18n("Word boundary"),
                          i18n("<qt>This asserts a word boundary (This part does not actually match any characters)</qt>") );
-  tqlayout->addWidget( _wordBoundary );
+  layout->addWidget( _wordBoundary );
 
   _nonWordBoundary = insert(NONWORDBOUNDARY,  "nonwordboundary", i18n("Non Word boundary"),
                             i18n("<qt>This asserts a non-word boundary "
                                  "(This part does not actually match any characters)</qt>") );
-  tqlayout->addWidget( _nonWordBoundary );
+  layout->addWidget( _nonWordBoundary );
 
   _posLookAhead = insert(POSLOOKAHEAD,  "poslookahead", i18n("Positive Look Ahead"),
                          i18n("<qt>This asserts a regular expression (This part does not actually match any characters). "
                               "You can only use this at the end of a regular expression.</qt>") );
-  tqlayout->addWidget( _posLookAhead );
+  layout->addWidget( _posLookAhead );
 
   _negLookAhead = insert(NEGLOOKAHEAD,  "neglookahead", i18n("Negative Look Ahead"),
                          i18n("<qt>This asserts a regular expression that must not match "
                               "(This part does not actually match any characters). "
                               "You can only use this at the end of a regular expression.</qt>") );
-  tqlayout->addWidget( _negLookAhead );
+  layout->addWidget( _negLookAhead );
 }
 
 DoubleClickButton* RegExpButtons::insert(RegExpType tp, const char* name, TQString tooltip, TQString whatsthis)
diff --git a/kregexpeditor/selectablelineedit.cpp b/kregexpeditor/selectablelineedit.cpp
index dda0a9b..0e085d5 100644
--- a/kregexpeditor/selectablelineedit.cpp
+++ b/kregexpeditor/selectablelineedit.cpp
@@ -33,7 +33,7 @@ SelectableLineEdit::SelectableLineEdit( RegExpWidget* owner, TQWidget* parent, c
 void SelectableLineEdit::setSelected( bool selected )
 {
   if ( selected ) {
-    TQPalette pal = TQPalette(tqpalette());
+    TQPalette pal = TQPalette(palette());
     pal.setBrush( TQColorGroup::Base, gray );
     setPalette( pal );
   }
diff --git a/kregexpeditor/verifybuttons.cpp b/kregexpeditor/verifybuttons.cpp
index e36e934..283b2fa 100644
--- a/kregexpeditor/verifybuttons.cpp
+++ b/kregexpeditor/verifybuttons.cpp
@@ -42,7 +42,7 @@
 VerifyButtons::VerifyButtons( TQWidget* parent, const char* name )
     :TQDockWindow( TQDockWindow::InDock, parent, name ), _configMenu( 0 )
 {
-    TQBoxLayout* tqlayout = boxLayout();
+    TQBoxLayout* layout = boxLayout();
 
     _verify =  new TQToolButton(this);
     TQIconSet icon = Util::getSystemIconSet( TQString::fromLatin1("spellcheck"));
@@ -50,48 +50,48 @@ VerifyButtons::VerifyButtons( TQWidget* parent, const char* name )
     TQToolTip::add( _verify, i18n( "Verify regular expression" ) );
     TQWhatsThis::add( _verify, i18n("Shows what part of the regular expression is being matched in the <i>verifier window</i>."
                                    "(The window below the graphical editor window)."));
-    tqlayout->addWidget( _verify );
+    layout->addWidget( _verify );
     connect( _verify, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( verify() ) );
 
     TQToolButton* button = new TQToolButton(this);
     button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("fileopen")) );
-    tqlayout->addWidget( button );
+    layout->addWidget( button );
     connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadText()));
     TQToolTip::add( button, i18n("Load text in the verifier window") );
 
     button = new TQToolButton(this);
     button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("package_settings")) );
-    tqlayout->addWidget( button );
+    layout->addWidget( button );
     connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(configure()));
     TQToolTip::add( button, i18n("Settings") );
 
     // It is currently not possible to ask for the paragraph being highlighted, thefore scrolling to next/prev match
     // do not work. Enable this when they work.
     // _first = new TQToolButton( TQString::fromLatin1("<<"), this);
-    // tqlayout->addWidget( _first );
+    // layout->addWidget( _first );
     // connect(_first, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoFirst()));
     // _first->setFixedWidth( 25 );
     //
     // _prev = new TQToolButton(TQString::fromLatin1("<"), this);
-    // tqlayout->addWidget( _prev );
+    // layout->addWidget( _prev );
     // connect(_prev, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoPrev()));
     // _prev->setFixedWidth( 20 );
     //
     // _next = new TQToolButton(TQString::fromLatin1(">"), this);
-    // tqlayout->addWidget( _next );
+    // layout->addWidget( _next );
     // connect(_next, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoNext()));
     // _next->setFixedWidth( 20 );
     //
     // _last = new TQToolButton(TQString::fromLatin1(">>"), this);
-    // tqlayout->addWidget( _last );
+    // layout->addWidget( _last );
     // connect(_last, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoLast()));
     // _last->setFixedWidth( 25 );
 
     // Same as above
 //  TQLabel* label = new TQLabel( i18n("Matches: "), this );
-//  tqlayout->addWidget( label );
+//  layout->addWidget( label );
 //  _matches = new TQLabel(i18n("-"), this );
-//  tqlayout->addWidget( _matches );
+//  layout->addWidget( _matches );
 //  TQString txt = i18n( "Shows number of times regular expression matches the text in the verifier window");
 //  TQToolTip::add( label, txt );
 //  TQToolTip::add( _matches, txt );
diff --git a/ksim/generalprefs.cpp b/ksim/generalprefs.cpp
index 0e89bc1..dc35e6d 100644
--- a/ksim/generalprefs.cpp
+++ b/ksim/generalprefs.cpp
@@ -50,7 +50,7 @@ KSim::GeneralPrefs::GeneralPrefs(TQWidget *parent, const char *name)
   m_sizeBox->setTitle(i18n("Graph Size"));
   m_sizeBox->setColumnLayout(0, Qt::Horizontal);
 
-  TQGridLayout *sizeBoxLayout = new TQGridLayout(m_sizeBox->tqlayout());
+  TQGridLayout *sizeBoxLayout = new TQGridLayout(m_sizeBox->layout());
   sizeBoxLayout->setSpacing(6);
 
   m_sizeHLabel = new TQLabel(m_sizeBox);
@@ -211,9 +211,9 @@ KSim::UptimePrefs::UptimePrefs(TQWidget *parent, const char *name)
   m_uptimeBox = new TQGroupBox(this);
   m_uptimeBox->setTitle(i18n("Uptime Legend"));
   m_uptimeBox->setColumnLayout(0, Qt::Vertical);
-  m_uptimeBox->tqlayout()->setSpacing(0);
-  m_uptimeBox->tqlayout()->setMargin(0);
-  m_boxLayout = new TQVBoxLayout(m_uptimeBox->tqlayout());
+  m_uptimeBox->layout()->setSpacing(0);
+  m_uptimeBox->layout()->setMargin(0);
+  m_boxLayout = new TQVBoxLayout(m_uptimeBox->layout());
   m_boxLayout->setAlignment(TQt::AlignTop);
   m_boxLayout->setSpacing(6);
   m_boxLayout->setMargin(11);
@@ -347,9 +347,9 @@ KSim::MemoryPrefs::MemoryPrefs(TQWidget *parent, const char *name)
   m_memBox = new TQGroupBox(this);
   m_memBox->setTitle(i18n("Memory Legend"));
   m_memBox->setColumnLayout(0, Qt::Vertical);
-  m_memBox->tqlayout()->setSpacing(0);
-  m_memBox->tqlayout()->setMargin(0);
-  m_boxLayout = new TQVBoxLayout(m_memBox->tqlayout());
+  m_memBox->layout()->setSpacing(0);
+  m_memBox->layout()->setMargin(0);
+  m_boxLayout = new TQVBoxLayout(m_memBox->layout());
   m_boxLayout->setAlignment(TQt::AlignTop);
   m_boxLayout->setSpacing(6);
   m_boxLayout->setMargin(11);
@@ -496,9 +496,9 @@ KSim::SwapPrefs::SwapPrefs(TQWidget *parent, const char *name)
   m_swapBox = new TQGroupBox(this);
   m_swapBox->setTitle(i18n("Swap Legend"));
   m_swapBox->setColumnLayout(0, Qt::Vertical);
-  m_swapBox->tqlayout()->setSpacing(0);
-  m_swapBox->tqlayout()->setMargin(0);
-  m_boxLayout = new TQVBoxLayout(m_swapBox->tqlayout());
+  m_swapBox->layout()->setSpacing(0);
+  m_swapBox->layout()->setMargin(0);
+  m_boxLayout = new TQVBoxLayout(m_swapBox->layout());
   m_boxLayout->setAlignment(TQt::AlignTop);
   m_boxLayout->setSpacing(6);
   m_boxLayout->setMargin(11);
diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp
index b68c073..b9b5e31 100644
--- a/ksim/library/chart.cpp
+++ b/ksim/library/chart.cpp
@@ -264,7 +264,7 @@ void KSim::Chart::configureObject(bool repaintWidget)
   }
 
   // Update our geometry if we need to let any
-  // tqlayout know about our sizeHint() change
+  // layout know about our sizeHint() change
   if (oldSize != sizeHint()) {
     // Using resize() here seems to be needed
     resize(sizeHint());
diff --git a/ksim/library/label.cpp b/ksim/library/label.cpp
index 4aa12b0..91c23a6 100644
--- a/ksim/library/label.cpp
+++ b/ksim/library/label.cpp
@@ -232,7 +232,7 @@ void KSim::Label::drawText(TQPainter *painter, const TQRect &rect,
   if (!pixmap().isNull())
     location.setX(pixmap().width() + 5);
    
-  tqstyle().drawItem(painter, location, AlignCenter, colorGroup(), true,
+  style().drawItem(painter, location, AlignCenter, colorGroup(), true,
       0, text, -1, &color);
 }
 
@@ -242,7 +242,7 @@ void KSim::Label::drawPixmap(TQPainter *painter, const TQRect &rect,
   TQRect location(rect);
   location.setWidth(pixmap.width());
 
-  tqstyle().drawItem(painter, location, AlignCenter, colorGroup(), true,
+  style().drawItem(painter, location, AlignCenter, colorGroup(), true,
     pixmap.isNull() ? 0 : &pixmap, TQString());
 }
 
diff --git a/ksim/library/themeloader.cpp b/ksim/library/themeloader.cpp
index a7e21da..f6d6474 100644
--- a/ksim/library/themeloader.cpp
+++ b/ksim/library/themeloader.cpp
@@ -217,7 +217,7 @@ TQRect KSim::Theme::frameRightBorder(const TQRect &defValue) const
 TQColor KSim::Theme::chartInColour(const TQColor &defValue) const
 {
   if (d->recolour)
-    return TQApplication::tqpalette().active().background();
+    return TQApplication::palette().active().background();
 
   return internalColourEntry("chart_in_color", defValue);
 }
@@ -230,7 +230,7 @@ TQColor KSim::Theme::chartInColourGrid(const TQColor &defValue) const
 TQColor KSim::Theme::chartOutColour(const TQColor &defValue) const
 {
   if (d->recolour)
-    return TQApplication::tqpalette().active().background();
+    return TQApplication::palette().active().background();
 
   return internalColourEntry("chart_out_color", defValue);
 }
@@ -948,7 +948,7 @@ void KSim::ThemeLoader::reColourImage(TQImage &image)
   if (!d->recolour || image.isNull())
     return;
 
-  TQColor color = TQApplication::tqpalette().active().background();
+  TQColor color = TQApplication::palette().active().background();
   TQImage output(image.width(), image.height(), 32);
   output.setAlphaBuffer(image.hasAlphaBuffer());
 
diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp
index 9be4b15..fc7ccca 100644
--- a/ksim/monitors/cpu/ksimcpu.cpp
+++ b/ksim/monitors/cpu/ksimcpu.cpp
@@ -377,26 +377,26 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name)
 
   mainLayout->addWidget( m_listView );
 
-  TQHBoxLayout * tqlayout = new TQHBoxLayout;
-  tqlayout->setSpacing( 6 );
+  TQHBoxLayout * layout = new TQHBoxLayout;
+  layout->setSpacing( 6 );
 
   TQSpacerItem * spacer = new TQSpacerItem( 20, 20,
      TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-  tqlayout->addItem(spacer);
+  layout->addItem(spacer);
 
   m_modify = new TQPushButton( this );
   m_modify->setText( i18n( "Modify..." ) );
   connect( m_modify, TQT_SIGNAL( clicked() ), TQT_SLOT( modify() ) );
-  tqlayout->addWidget( m_modify );
-  mainLayout->addLayout( tqlayout );
+  layout->addWidget( m_modify );
+  mainLayout->addLayout( layout );
 
   m_legendBox = new TQGroupBox(this);
   m_legendBox->setColumnLayout(0, Qt::Vertical);
   m_legendBox->setTitle(i18n("Chart Legend"));
-  m_legendBox->tqlayout()->setSpacing(0);
-  m_legendBox->tqlayout()->setMargin(0);
+  m_legendBox->layout()->setSpacing(0);
+  m_legendBox->layout()->setMargin(0);
 
-  m_legendLayout = new TQVBoxLayout(m_legendBox->tqlayout());
+  m_legendLayout = new TQVBoxLayout(m_legendBox->layout());
   m_legendLayout->setAlignment(TQt::AlignTop);
   m_legendLayout->setSpacing(6);
   m_legendLayout->setMargin(11);
diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp
index c0123d4..7a778fd 100644
--- a/ksim/monitors/disk/ksimdisk.cpp
+++ b/ksim/monitors/disk/ksimdisk.cpp
@@ -482,23 +482,23 @@ DiskConfig::DiskConfig(KSim::PluginObject *parent, const char *name)
   m_listview->addColumn(i18n("Disks"));
   m_layout->addWidget(m_listview);
 
-  TQHBoxLayout *tqlayout = new TQHBoxLayout;
-  tqlayout->setSpacing(6);
+  TQHBoxLayout *layout = new TQHBoxLayout;
+  layout->setSpacing(6);
 
   TQSpacerItem *spacer = new TQSpacerItem(20, 20,
      TQSizePolicy::Expanding, TQSizePolicy::Minimum);
-  tqlayout->addItem(spacer);
+  layout->addItem(spacer);
 
   m_add = new TQPushButton(this);
   m_add->setText(i18n("Add..."));
   connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(addItem()));
-  tqlayout->addWidget(m_add);
+  layout->addWidget(m_add);
 
   m_remove = new TQPushButton(this);
   m_remove->setText(i18n("Remove"));
   connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem()));
-  tqlayout->addWidget(m_remove);
-  m_layout->addLayout(tqlayout);
+  layout->addWidget(m_remove);
+  m_layout->addLayout(layout);
 
   m_buttonBox = new TQVButtonGroup(i18n("Disk Styles"), this);
   m_layout->addWidget(m_buttonBox);
diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp
index 66eadf2..46a96e0 100644
--- a/ksim/monitors/i8k/ksimi8k.cpp
+++ b/ksim/monitors/i8k/ksimi8k.cpp
@@ -151,15 +151,15 @@ void I8KView::closeStream()
 
 void I8KView::initGUI()
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
 
   m_fan1Label = new KSim::Label( this );
   m_fan2Label = new KSim::Label( this );
   m_tempLabel = new KSim::Label( this );
 
-  tqlayout->addWidget( m_fan1Label );
-  tqlayout->addWidget( m_fan2Label );
-  tqlayout->addWidget( m_tempLabel );
+  layout->addWidget( m_fan1Label );
+  layout->addWidget( m_fan2Label );
+  layout->addWidget( m_tempLabel );
 }
 
 void I8KView::updateView()
@@ -218,14 +218,14 @@ I8KConfig::I8KConfig(KSim::PluginObject *parent, const char *name)
   m_interval->setRange( 2, 60, 1, true );
   m_interval->setSuffix( i18n( " sec" ) );
 
-  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 0, 
+  TQGridLayout *layout = new TQGridLayout( this, 3, 2, 0, 
       KDialog::spacingHint() );
 
-  tqlayout->addMultiCellWidget( m_unit, 0, 0, 0, 1 );
-  tqlayout->addWidget( label, 1, 0 );
-  tqlayout->addWidget( m_interval, 1, 1 );
-  tqlayout->setColStretch( 1, 1 );
-  tqlayout->setRowStretch( 2, 1 );
+  layout->addMultiCellWidget( m_unit, 0, 0, 0, 1 );
+  layout->addWidget( label, 1, 0 );
+  layout->addWidget( m_interval, 1, 1 );
+  layout->setColStretch( 1, 1 );
+  layout->setRowStretch( 2, 1 );
 }
 
 I8KConfig::~I8KConfig()
diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp
index 1f35224..fdda6bd 100644
--- a/ksim/monitors/mail/ksimmail.cpp
+++ b/ksim/monitors/mail/ksimmail.cpp
@@ -69,10 +69,10 @@ void MailPlugin::showAbout()
 MailView::MailView( KSim::PluginObject* parent, const char* name )
 	: KSim::PluginView( parent, name )
 {
-	TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+	TQVBoxLayout* layout = new TQVBoxLayout( this );
 
 	MailLabel* label = new MailLabel( this );
-	tqlayout->addWidget( label, 0, AlignHCenter );
+	layout->addWidget( label, 0, AlignHCenter );
 }
 
 MailView::~MailView()
diff --git a/ksim/monitors/net/netconfig.cpp b/ksim/monitors/net/netconfig.cpp
index b376c24..4444d4c 100644
--- a/ksim/monitors/net/netconfig.cpp
+++ b/ksim/monitors/net/netconfig.cpp
@@ -56,29 +56,29 @@ NetConfig::NetConfig(KSim::PluginObject *parent, const char *name)
      TQT_SLOT(modifyItem(TQListViewItem *)));
   mainLayout->addWidget(usingBox);
 
-  tqlayout = new TQHBoxLayout;
-  tqlayout->setSpacing(6);
+  layout = new TQHBoxLayout;
+  layout->setSpacing(6);
 
   TQSpacerItem *spacer = new TQSpacerItem(20, 20,
      TQSizePolicy::Expanding, TQSizePolicy::Minimum);
-  tqlayout->addItem(spacer);
+  layout->addItem(spacer);
 
   insertButton = new TQPushButton(this);
   insertButton->setText(i18n("Add..."));
   connect(insertButton, TQT_SIGNAL(clicked()), TQT_SLOT(showNetDialog()));
-  tqlayout->addWidget(insertButton);
+  layout->addWidget(insertButton);
 
   modifyButton = new TQPushButton(this);
   modifyButton->setText(i18n("Modify..."));
   connect(modifyButton, TQT_SIGNAL(clicked()), TQT_SLOT(modifyCurrent()));
-  tqlayout->addWidget(modifyButton);
+  layout->addWidget(modifyButton);
 
   removeButton = new TQPushButton(this);
   removeButton->setText(i18n("Remove"));
   connect(removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeCurrent()));
-  tqlayout->addWidget(removeButton);
+  layout->addWidget(removeButton);
 
-  mainLayout->addLayout(tqlayout);
+  mainLayout->addLayout(layout);
 }
 
 NetConfig::~NetConfig()
diff --git a/ksim/monitors/net/netconfig.h b/ksim/monitors/net/netconfig.h
index 4d6de56..c2b5387 100644
--- a/ksim/monitors/net/netconfig.h
+++ b/ksim/monitors/net/netconfig.h
@@ -54,7 +54,7 @@ class NetConfig : public KSim::PluginPage
     // Couldnt think of a better name for this :)
     const TQString &boolToString(bool) const;
 
-    TQHBoxLayout *tqlayout;
+    TQHBoxLayout *layout;
     TQPushButton *insertButton;
     TQPushButton *removeButton;
     TQPushButton *modifyButton;
diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp
index 997f9b2..735e3ce 100644
--- a/ksim/monitors/net/netdialog.cpp
+++ b/ksim/monitors/net/netdialog.cpp
@@ -86,9 +86,9 @@ NetDialog::NetDialog(TQWidget *parent, const char *name)
   m_timerBox = new TQGroupBox(m_generalTab);
   m_timerBox->setTitle(i18n("Timer"));
   m_timerBox->setColumnLayout(0, Qt::Vertical);
-  m_timerBox->tqlayout()->setSpacing(0);
-  m_timerBox->tqlayout()->setMargin(0);
-  m_timerBoxLayout = new TQVBoxLayout(m_timerBox->tqlayout());
+  m_timerBox->layout()->setSpacing(0);
+  m_timerBox->layout()->setMargin(0);
+  m_timerBoxLayout = new TQVBoxLayout(m_timerBox->layout());
   m_timerBoxLayout->setAlignment(TQt::AlignTop);
   m_timerBoxLayout->setSpacing(6);
   m_timerBoxLayout->setMargin(11);
diff --git a/ksim/monitors/snmp/browsedialogbase.ui b/ksim/monitors/snmp/browsedialogbase.ui
index 9bfae99..3dfc236 100644
--- a/ksim/monitors/snmp/browsedialogbase.ui
+++ b/ksim/monitors/snmp/browsedialogbase.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -157,7 +157,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/ksim/monitors/snmp/hostdialogbase.ui b/ksim/monitors/snmp/hostdialogbase.ui
index 12fe8ab..f25aa12 100644
--- a/ksim/monitors/snmp/hostdialogbase.ui
+++ b/ksim/monitors/snmp/hostdialogbase.ui
@@ -384,7 +384,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="5">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/ksim/monitors/snmp/monitordialogbase.ui b/ksim/monitors/snmp/monitordialogbase.ui
index 628c5dd..bb7f7cc 100644
--- a/ksim/monitors/snmp/monitordialogbase.ui
+++ b/ksim/monitors/snmp/monitordialogbase.ui
@@ -112,7 +112,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="1" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -174,7 +174,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="4" column="1" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/ksim/monitors/snmp/session.cpp b/ksim/monitors/snmp/session.cpp
index 2f16adc..6d63fab 100644
--- a/ksim/monitors/snmp/session.cpp
+++ b/ksim/monitors/snmp/session.cpp
@@ -54,7 +54,7 @@ Session::Session( const HostConfig &source )
 
     d->source = source;
 
-    // tqunicode madness
+    // unicode madness
     d->host = source.name.ascii();
     d->community = source.community.ascii();
     d->securityName = source.securityName.ascii();
diff --git a/kwallet/kbetterthankdialogbase.ui b/kwallet/kbetterthankdialogbase.ui
index fa407c9..65d8b5a 100644
--- a/kwallet/kbetterthankdialogbase.ui
+++ b/kwallet/kbetterthankdialogbase.ui
@@ -46,7 +46,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="1" column="1">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kwallet/konfigurator/walletconfigwidget.ui b/kwallet/konfigurator/walletconfigwidget.ui
index 99bc45a..da3a642 100644
--- a/kwallet/konfigurator/walletconfigwidget.ui
+++ b/kwallet/konfigurator/walletconfigwidget.ui
@@ -64,7 +64,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout1</cstring>
+                                    <cstring>layout1</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
diff --git a/kwallet/kwalleteditor.cpp b/kwallet/kwalleteditor.cpp
index 996f05e..5233047 100644
--- a/kwallet/kwalleteditor.cpp
+++ b/kwallet/kwalleteditor.cpp
@@ -133,7 +133,7 @@ KWalletEditor::KWalletEditor(const TQString& wallet, bool isPath, TQWidget *pare
 
 	setCaption(wallet);
 
-	TQTimer::singleShot(0, this, TQT_SLOT(tqlayout()));
+	TQTimer::singleShot(0, this, TQT_SLOT(layout()));
 }
 
 KWalletEditor::~KWalletEditor() {
@@ -149,7 +149,7 @@ KWalletEditor::~KWalletEditor() {
 	}
 }
 
-void KWalletEditor::tqlayout() {
+void KWalletEditor::layout() {
 	TQValueList<int> sz = _ww->_splitter->sizes();
 	int sum = sz[0] + sz[1];
 	sz[0] = sum/2;
@@ -617,7 +617,7 @@ void KWalletEditor::copyPassword() {
 	if (_w && item) {
 		TQString pass;
 		if (_w->readPassword(item->text(0), pass) == 0) {
-			TQApplication::tqclipboard()->setText(pass);
+			TQApplication::clipboard()->setText(pass);
 		}
 	}
 }
diff --git a/kwallet/kwalleteditor.h b/kwallet/kwalleteditor.h
index 02f1342..d38f4a2 100644
--- a/kwallet/kwalleteditor.h
+++ b/kwallet/kwalleteditor.h
@@ -52,7 +52,7 @@ class KWalletEditor : public KMainWindow {
 		void deleteFolder();
 
 	private slots:
-		void tqlayout();
+		void layout();
 		void updateFolderList(bool checkEntries = false);
 		void entrySelectionChanged(TQListViewItem *item);
 		void listItemRenamed(TQListViewItem *, int, const TQString&);
diff --git a/kwallet/kwmapeditor.cpp b/kwallet/kwmapeditor.cpp
index e169238..a4fa442 100644
--- a/kwallet/kwmapeditor.cpp
+++ b/kwallet/kwmapeditor.cpp
@@ -125,7 +125,7 @@ void KWMapEditor::contextMenu(int row, int col, const TQPoint& pos) {
 
 
 void KWMapEditor::copy() {
-	TQApplication::tqclipboard()->setText(text(_contextRow, 2));
+	TQApplication::clipboard()->setText(text(_contextRow, 2));
 }
 
 
diff --git a/kwallet/walletwidget.ui b/kwallet/walletwidget.ui
index 2d34c3e..9979097 100644
--- a/kwallet/walletwidget.ui
+++ b/kwallet/walletwidget.ui
@@ -47,7 +47,7 @@
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout3</cstring>
+                    <cstring>layout3</cstring>
                 </property>
                 <grid>
                     <property name="name">
@@ -105,7 +105,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
                         <property name="name">
-                            <cstring>tqlayout2</cstring>
+                            <cstring>layout2</cstring>
                         </property>
                         <hbox>
                             <property name="name">
diff --git a/superkaramba/examples/richtext/richtext.py b/superkaramba/examples/richtext/richtext.py
index 11fe9d7..518aa65 100644
--- a/superkaramba/examples/richtext/richtext.py
+++ b/superkaramba/examples/richtext/richtext.py
@@ -1,6 +1,6 @@
 #Unicode Example
 
-#For Symbol Tables look at www.tqunicode.org/charts/
+#For Symbol Tables look at www.unicode.org/charts/
 
 hidden = 0
 
@@ -35,7 +35,7 @@ is used to encode the formatting commands.</p>
 <li>Hyperlinks: <a href="kfmclient openURL http://netdragon.sourceforge.net"> Superkaramba Homepage</a></li>
 <li>Links can also <a href="#trigger">trigger</a> actions in the script</li>
 <li><i>Various</i> <b>different</b> <u>caracter</u> <s>styles</s></li>
-<li><a href="kfmclient openURL http://www.tqunicode.org">Unicode</a>: \u03B6 \u03B3 \u03BB \u03A3 \u03A9 </li>
+<li><a href="kfmclient openURL http://www.unicode.org">Unicode</a>: \u03B6 \u03B3 \u03BB \u03A3 \u03A9 </li>
 <li>Simple Tables:
 <table bgcolor="darkgray" border="1" width="80%">
 <tr><th colspan="3">Header</th></tr>
diff --git a/superkaramba/examples/test_all.sh b/superkaramba/examples/test_all.sh
index cdf192d..5e95063 100755
--- a/superkaramba/examples/test_all.sh
+++ b/superkaramba/examples/test_all.sh
@@ -10,7 +10,7 @@ themes=(
 	"richtext/richtext.theme"
 	"richtext/rtext.theme"
 	"globalMouse/eyes.theme"
-	"tqunicode/tqunicode.theme"
+	"unicode/unicode.theme"
         "mouseDrag/karmix/karmix.theme"
         "input_api/input_api.theme"
         "input_example/input_example.theme"
diff --git a/superkaramba/examples/unicode/unicode.py b/superkaramba/examples/unicode/unicode.py
index 1a15f83..13d1136 100644
--- a/superkaramba/examples/unicode/unicode.py
+++ b/superkaramba/examples/unicode/unicode.py
@@ -1,6 +1,6 @@
 #Unicode Example
 
-#For Symbol Tables look at www.tqunicode.org/charts/
+#For Symbol Tables look at www.unicode.org/charts/
 
 
 #this import statement allows access to the karamba functions
@@ -31,8 +31,8 @@ def initWidget(widget):
 \u0631\u0632\u0633\u0634\u0635\u0636\u0637\u0638\u0639\u063A\u0641\u0642\u0643\u0644\u0645\u0646
 \u0647\u0648\u064A
 <p>
-For a complete reference on tqunicode caracter codes look at:
-<center><a href="kfmclient openURL http://www.tqunicode.org/charts/">www.tqunicode.org/charts/</a></center>
+For a complete reference on unicode caracter codes look at:
+<center><a href="kfmclient openURL http://www.unicode.org/charts/">www.unicode.org/charts/</a></center>
 </p>
 """
     karamba.resizeWidget(widget, 400, 400)
diff --git a/superkaramba/src/karamba_python.cpp b/superkaramba/src/karamba_python.cpp
index 99b901b..9f09f79 100644
--- a/superkaramba/src/karamba_python.cpp
+++ b/superkaramba/src/karamba_python.cpp
@@ -214,7 +214,7 @@ static PyMethodDef karamba_methods[] = {
     {(char*)"showSystray", py_show_systray, METH_VARARGS, (char*)"Show the Systray"},
     {(char*)"moveSystray", py_move_systray, METH_VARARGS, (char*)"Move the Systray"},
     {(char*)"getCurrentWindowCount", py_get_current_window_count, METH_VARARGS, (char*)"Get current Window count"},
-    {(char*)"updateSystrayLayout", py_update_systray_layout, METH_VARARGS, (char*)"Update Systray tqlayout"},
+    {(char*)"updateSystrayLayout", py_update_systray_layout, METH_VARARGS, (char*)"Update Systray layout"},
 
     // Misc - misc_python.cpp
     {(char*)"getThemePath", py_get_theme_path, METH_VARARGS,  (char*)"Get the file path of the theme"},
diff --git a/superkaramba/src/themes_layout.ui b/superkaramba/src/themes_layout.ui
index 9fa108d..8b76e0b 100644
--- a/superkaramba/src/themes_layout.ui
+++ b/superkaramba/src/themes_layout.ui
@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/superkaramba/src/xmmssensor.cpp b/superkaramba/src/xmmssensor.cpp
index d78d119..268700b 100644
--- a/superkaramba/src/xmmssensor.cpp
+++ b/superkaramba/src/xmmssensor.cpp
@@ -164,9 +164,9 @@ void XMMSSensor::update()
     {
         isPlaying = xmms->isPlaying(0);
         pos = xmms->getPlaylistPos(0);
-        qDebug("tqunicode start");
+        qDebug("unicode start");
         title = codec->toUnicode( TQCString( xmms->getPlaylistTitle( 0, pos ) )  );
-        qDebug("tqunicode end");
+        qDebug("unicode end");
         if( title.isEmpty() )
             title = "XMMS";