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

This reverts commit 44ec35d6f3ec0bf8067f31896d7721ac3082f66f.

16 files changed, 90 insertions, 90 deletions

diff --git a/krusader/Konfigurator/kgadvanced.cpp b/krusader/Konfigurator/kgadvanced.cpp
index cccc85f..9fc62f0 100644
--- a/krusader/Konfigurator/kgadvanced.cpp
+++ b/krusader/Konfigurator/kgadvanced.cpp
@@ -46,7 +46,7 @@ KgAdvanced::KgAdvanced( bool first, TQWidget* parent,  const char* name ) :
   //  -------------------------- GENERAL GROUPBOX ----------------------------------
   
   TQGroupBox *generalGrp = createFrame( i18n( "General" ), parent, "kgAdvGeneralGrp" );
-  TQGridLayout *generalGrid = createGridLayout( generalGrp->layout() );
+  TQGridLayout *generalGrid = createGridLayout( generalGrp->tqlayout() );
 
 #if KDE_IS_VERSION( 3,5,1 )
   bool dontUseMedia = false;
@@ -86,7 +86,7 @@ KgAdvanced::KgAdvanced( bool first, TQWidget* parent,  const char* name ) :
   //  ----------------------- CONFIRMATIONS GROUPBOX -------------------------------
   
   TQGroupBox *confirmGrp = createFrame( i18n( "Confirmations" ), parent, "confirmGrp" );
-  TQGridLayout *confirmGrid = createGridLayout( confirmGrp->layout() );
+  TQGridLayout *confirmGrid = createGridLayout( confirmGrp->tqlayout() );
 
   addLabel( confirmGrid, 0, 0, "\n"+i18n( "Request user confirmation for the following operations:" )+"\n",
             confirmGrp, "KgAdvLabel1" );
@@ -110,8 +110,8 @@ KgAdvanced::KgAdvanced( bool first, TQWidget* parent,  const char* name ) :
   //  ------------------------ FINE-TUNING GROUPBOX --------------------------------
 
   TQGroupBox *fineTuneGrp = createFrame( i18n( "Fine-Tuning" ), parent, "kgFineTuneGrp" );
-  TQGridLayout *fineTuneGrid = createGridLayout( fineTuneGrp->layout() );
-  fineTuneGrid->setAlignment( TQt::AlignLeft | TQt::AlignTop );
+  TQGridLayout *fineTuneGrid = createGridLayout( fineTuneGrp->tqlayout() );
+  fineTuneGrid->tqsetAlignment( TQt::AlignLeft | TQt::AlignTop );
   
   TQLabel *label = new TQLabel( i18n( "Icon cache size (KB):" ), fineTuneGrp, "iconCacheLabel" );
   TQWhatsThis::add( label, i18n( "The icon cache size influences how fast the contents of a panel can be displayed. However, too large a cache might consume your memory." ) );
@@ -119,7 +119,7 @@ KgAdvanced::KgAdvanced( bool first, TQWidget* parent,  const char* name ) :
   KonfiguratorSpinBox *spinBox = createSpinBox( "Advanced", "Icon Cache Size", _IconCacheSize,
                                                 1, 8192, fineTuneGrp, false );
   TQWhatsThis::add( spinBox, i18n( "The icon cache size influences how fast the contents of a panel can be displayed. However, too large a cache might consume your memory." ) );
-  spinBox->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+  spinBox->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed);
   fineTuneGrid->addWidget( spinBox, 0, 1 );
 
   addLabel( fineTuneGrid, 1, 0, i18n( "Arguments of updatedb:" ),
diff --git a/krusader/Konfigurator/kgarchives.cpp b/krusader/Konfigurator/kgarchives.cpp
index a4ea958..5ab4424 100644
--- a/krusader/Konfigurator/kgarchives.cpp
+++ b/krusader/Konfigurator/kgarchives.cpp
@@ -49,7 +49,7 @@ KgArchives::KgArchives( bool first, TQWidget* parent,  const char* name ) :
   //  -------------------------- GENERAL GROUPBOX ----------------------------------
 
   TQGroupBox *generalGrp = createFrame( i18n( "General" ), parent, "generalGrp" );
-  TQGridLayout *generalGrid = createGridLayout( generalGrp->layout() );
+  TQGridLayout *generalGrid = createGridLayout( generalGrp->tqlayout() );
 
   addLabel( generalGrid, 0, 0, i18n( "Krusader transparently handles the following types of archives:" ),
             generalGrp, "KgLabel1" );
@@ -87,7 +87,7 @@ KgArchives::KgArchives( bool first, TQWidget* parent,  const char* name ) :
   //  ------------------------ FINE-TUNING GROUPBOX --------------------------------
 
   TQGroupBox *fineTuneGrp = createFrame( i18n( "Fine-Tuning" ), parent, "fineTuneGrp" );
-  TQGridLayout *fineTuneGrid = createGridLayout( fineTuneGrp->layout() );
+  TQGridLayout *fineTuneGrid = createGridLayout( fineTuneGrp->tqlayout() );
 
   KONFIGURATOR_CHECKBOX_PARAM finetuners[] =
   //   cfg_class  cfg_name                  default           text                                          restart ToolTip
diff --git a/krusader/Konfigurator/kgcolors.cpp b/krusader/Konfigurator/kgcolors.cpp
index 1eaec6a..01e4a7e 100644
--- a/krusader/Konfigurator/kgcolors.cpp
+++ b/krusader/Konfigurator/kgcolors.cpp
@@ -49,7 +49,7 @@ KgColors::KgColors( bool first, TQWidget* parent,  const char* name ) :
   //  -------------------------- GENERAL GROUPBOX ----------------------------------
 
   TQGroupBox *generalGrp = createFrame( i18n( "General" ), parent, "kgColorsGeneralGrp" );
-  TQGridLayout *generalGrid = createGridLayout( generalGrp->layout() );
+  TQGridLayout *generalGrid = createGridLayout( generalGrp->tqlayout() );
 
   generalGrid->setSpacing( 0 );
   generalGrid->setMargin( 5 );
@@ -64,7 +64,7 @@ KgColors::KgColors( bool first, TQWidget* parent,  const char* name ) :
   generals = createCheckBoxGroup( 0, 2, generalSettings, sizeof(generalSettings)/sizeof(generalSettings[0]), generalGrp );
   generalGrid->addWidget( generals, 1, 0 );
 
-  generals->layout()->setSpacing( 5 );
+  generals->tqlayout()->setSpacing( 5 );
 
   connect( generals->find( "KDE Default" ), TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( slotDisable() ) );
   connect( generals->find( "Enable Alternate Background" ), TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( generatePreview() ) );
@@ -77,7 +77,7 @@ KgColors::KgColors( bool first, TQWidget* parent,  const char* name ) :
   //  -------------------------- COLORS GROUPBOX ----------------------------------
 
   TQGroupBox *colorsFrameGrp = createFrame( i18n( "Colors" ), hbox, "kgColorsColorsGrp" );
-  TQGridLayout *colorsFrameGrid = createGridLayout( colorsFrameGrp->layout() );
+  TQGridLayout *colorsFrameGrid = createGridLayout( colorsFrameGrp->tqlayout() );
   colorsFrameGrid->setSpacing( 0 );
   colorsFrameGrid->setMargin( 3 );
 
@@ -168,9 +168,9 @@ KgColors::KgColors( bool first, TQWidget* parent,  const char* name ) :
   addColorSelector( "Dim Target Color", i18n( "Dim target color:" ), TQt::white);
 
   int index = itemList.count() - offset;
-  labelList.append( addLabel( colorsGrid, index, 0, i18n("Dim factor:"), colorsGrp, TQString( "ColorsLabel%1" ).arg( index ).ascii() ) );
+  labelList.append( addLabel( colorsGrid, index, 0, i18n("Dim factor:"), colorsGrp, TQString( "ColorsLabel%1" ).tqarg( index ).ascii() ) );
   dimFactor = createSpinBox("Colors", "Dim Factor", 100, 0, 100, colorsGrp);
-  dimFactor->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+  dimFactor->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
   connect( dimFactor, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( generatePreview() ) );
   colorsGrid->addWidget( dimFactor, index++, 1 );
 
@@ -210,7 +210,7 @@ KgColors::KgColors( bool first, TQWidget* parent,  const char* name ) :
   //  -------------------------- PREVIEW GROUPBOX ----------------------------------
 
   previewGrp = createFrame( i18n( "Preview" ), hbox, "kgColorsPreviewGrp" );
-  previewGrid = createGridLayout( previewGrp->layout() );
+  previewGrid = createGridLayout( previewGrp->tqlayout() );
 
   preview = new TQListView( previewGrp, "colorPreView" );
 
@@ -241,9 +241,9 @@ int KgColors::addColorSelector( TQString cfgName, TQString name, TQColor dflt, T
 {
   int index = itemList.count() - offset;
 
-  labelList.append( addLabel( colorsGrid, index, 0, name, colorsGrp, TQString( "ColorsLabel%1" ).arg( index ).ascii() ) );
+  labelList.append( addLabel( colorsGrid, index, 0, name, colorsGrp, TQString( "ColorsLabel%1" ).tqarg( index ).ascii() ) );
   KonfiguratorColorChooser *chooser = createColorChooser( "Colors", cfgName, dflt, colorsGrp, false, addColor, addColNum );
-  chooser->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+  chooser->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
 
   if( !dfltName.isEmpty() )
     chooser->setDefaultText( dfltName );
diff --git a/krusader/Konfigurator/kgdependencies.cpp b/krusader/Konfigurator/kgdependencies.cpp
index 76366a2..a9f2c96 100644
--- a/krusader/Konfigurator/kgdependencies.cpp
+++ b/krusader/Konfigurator/kgdependencies.cpp
@@ -55,7 +55,7 @@ KgDependencies::KgDependencies( bool first, TQWidget* parent,  const char* name
   TQGridLayout *pathsGrid = new TQGridLayout( general_tab );
   pathsGrid->setSpacing( 6 );
   pathsGrid->setMargin( 11 );
-  pathsGrid->setAlignment( TQt::AlignTop );
+  pathsGrid->tqsetAlignment( TQt::AlignTop );
   
   addApplication( "df",       pathsGrid, 0, general_tab, PAGE_GENERAL );
   addApplication( "eject",    pathsGrid, 1, general_tab, PAGE_GENERAL );
@@ -77,7 +77,7 @@ KgDependencies::KgDependencies( bool first, TQWidget* parent,  const char* name
   TQGridLayout *archGrid1 = new TQGridLayout( packers_tab );
   archGrid1->setSpacing( 6 );
   archGrid1->setMargin( 11 );
-  archGrid1->setAlignment( TQt::AlignTop );
+  archGrid1->tqsetAlignment( TQt::AlignTop );
 
   addApplication( "7z",    archGrid1, 0, packers_tab, PAGE_PACKERS, "7za" );
   addApplication( "arj",   archGrid1, 1, packers_tab, PAGE_PACKERS );
@@ -101,7 +101,7 @@ KgDependencies::KgDependencies( bool first, TQWidget* parent,  const char* name
   TQGridLayout *archGrid2 = new TQGridLayout( checksum_tab );
   archGrid2->setSpacing( 6 );
   archGrid2->setMargin( 11 );
-  archGrid2->setAlignment( TQt::AlignTop );
+  archGrid2->tqsetAlignment( TQt::AlignTop );
 
   addApplication( "md5sum",         archGrid2, 0, checksum_tab, PAGE_CHECKSUM );
   addApplication( "sha1sum",        archGrid2, 1, checksum_tab, PAGE_CHECKSUM );
@@ -154,10 +154,10 @@ void KgDependencies::slotApply( TQObject *obj, TQString cls, TQString name )
     krConfig->writeEntry( name, usedPath );
     if( usedPath.isEmpty() )
       KMessageBox::error( this, i18n( "The %1 path is incorrect, no valid path found." )
-                          .arg( urlRequester->url() ) );
+                          .tqarg( urlRequester->url() ) );
     else
       KMessageBox::error( this, i18n( "The %1 path is incorrect, %2 used instead." )
-                          .arg( urlRequester->url() ).arg( usedPath ) );
+                          .tqarg( urlRequester->url() ).tqarg( usedPath ) );
     urlRequester->setURL( usedPath );
   }
 }
diff --git a/krusader/Konfigurator/kggeneral.cpp b/krusader/Konfigurator/kggeneral.cpp
index 5087580..3f9923e 100644
--- a/krusader/Konfigurator/kggeneral.cpp
+++ b/krusader/Konfigurator/kggeneral.cpp
@@ -53,7 +53,7 @@ if( first )
   //  -------------------------- GENERAL GROUPBOX ----------------------------------
 
   TQGroupBox *generalGrp = createFrame( i18n( "General" ), parent, "kgGenGeneralGrp" );
-  TQGridLayout *generalGrid = createGridLayout( generalGrp->layout() );
+  TQGridLayout *generalGrid = createGridLayout( generalGrp->tqlayout() );
 
   KONFIGURATOR_NAME_VALUE_TIP deleteMode[] =
   //            name            value    tooltip
diff --git a/krusader/Konfigurator/kglookfeel.cpp b/krusader/Konfigurator/kglookfeel.cpp
index 8d33893..e2f542b 100644
--- a/krusader/Konfigurator/kglookfeel.cpp
+++ b/krusader/Konfigurator/kglookfeel.cpp
@@ -78,7 +78,7 @@ void KgLookFeel::setupOperationTab() {
 
   // -------------- General -----------------
   TQGroupBox *lookFeelGrp = createFrame( i18n( "Look && Feel" ), tab, "kgLookAndFeelGrp" );
-  TQGridLayout *lookFeelGrid = createGridLayout( lookFeelGrp->layout() );
+  TQGridLayout *lookFeelGrid = createGridLayout( lookFeelGrp->tqlayout() );
 
   KONFIGURATOR_CHECKBOX_PARAM settings[] =
     { //   cfg_class  cfg_name                default             text                              restart tooltip
@@ -97,7 +97,7 @@ void KgLookFeel::setupOperationTab() {
 
   // -------------- Quicksearch -----------------
   TQGroupBox *quicksearchGroup = createFrame( i18n( "Quicksearch" ), tab, "kgQuicksearchGrp" );
-  TQGridLayout *quicksearchGrid = createGridLayout( quicksearchGroup->layout() );
+  TQGridLayout *quicksearchGrid = createGridLayout( quicksearchGroup->tqlayout() );
 
   KONFIGURATOR_CHECKBOX_PARAM quicksearch[] =
    { //   cfg_class  cfg_name                default             text                              restart tooltip
@@ -124,7 +124,7 @@ void KgLookFeel::setupPanelTab() {
   panelLayout->setSpacing( 6 );
   panelLayout->setMargin( 11 );
   TQGroupBox *panelGrp = createFrame( i18n( "Panel settings" ), tab_panel, "kgPanelGrp" );
-  TQGridLayout *panelGrid = createGridLayout( panelGrp->layout() );
+  TQGridLayout *panelGrid = createGridLayout( panelGrp->tqlayout() );
 
   TQHBox *hbox = new TQHBox( panelGrp, "lookAndFeelHBox1" );
   new TQLabel( i18n( "Panel font:" ), hbox, "lookAndFeelLabel" );
@@ -200,7 +200,7 @@ void KgLookFeel::setupPanelToolbarTab() {
   connect( panelToolbarActive->find( "Panel Toolbar visible" ), TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( slotEnablePanelToolbar() ) );
     
   TQGroupBox * panelToolbarGrp = createFrame( i18n( "Visible Panel Toolbar buttons" ), tab_4, "panelToolbarGrp");
-  TQGridLayout * panelToolbarGrid = createGridLayout( panelToolbarGrp->layout() );
+  TQGridLayout * panelToolbarGrid = createGridLayout( panelToolbarGrp->tqlayout() );
 
   KONFIGURATOR_CHECKBOX_PARAM panelToolbarCheckboxes[] = 
     {
@@ -238,7 +238,7 @@ void KgLookFeel::setupMouseModeTab() {
 
   // -------------- General -----------------
   TQGroupBox *mouseGeneralGroup = createFrame( i18n( "General" ), tab_mouse, "mouseGeneralGroup" );
-  TQGridLayout *mouseGeneralGrid = createGridLayout( mouseGeneralGroup->layout() );
+  TQGridLayout *mouseGeneralGrid = createGridLayout( mouseGeneralGroup->tqlayout() );
   mouseGeneralGrid->setSpacing( 0 );
   mouseGeneralGrid->setMargin( 5 );
 
@@ -251,7 +251,7 @@ void KgLookFeel::setupMouseModeTab() {
      	{ i18n( "Custom Selection Mode" ), "3", i18n( "Design your own selection mode!" ) }
      };
   mouseRadio = createRadioButtonGroup( "Look&Feel", "Mouse Selection", "0", 2, 2, mouseSelection, 4, mouseGeneralGroup, "myLook&FeelRadio", true, PAGE_MOUSE );
-  mouseRadio->layout()->setMargin( 0 );
+  mouseRadio->tqlayout()->setMargin( 0 );
   mouseGeneralGrid->addWidget( mouseRadio, 0, 0 );
   connect( mouseRadio, TQT_SIGNAL( clicked(int) ), TQT_SLOT( slotSelectionModeChanged() ) );
 
@@ -259,7 +259,7 @@ void KgLookFeel::setupMouseModeTab() {
 
   // -------------- Details -----------------
   TQGroupBox *mouseDetailGroup = createFrame( i18n( "Details" ), tab_mouse, "mouseDetailGroup" );
-  TQGridLayout *mouseDetailGrid = createGridLayout( mouseDetailGroup->layout() );
+  TQGridLayout *mouseDetailGrid = createGridLayout( mouseDetailGroup->tqlayout() );
   mouseDetailGrid->setSpacing( 0 );
   mouseDetailGrid->setMargin( 5 );
 
@@ -270,7 +270,7 @@ void KgLookFeel::setupMouseModeTab() {
     	{ i18n( "Obey KDE's global selection policy" ), "1", i18n( "<p>Use KDE's global setting:</p><p><i>KDE Control Center -> Peripherals -> Mouse</i></p>" ) }
     };
   KonfiguratorRadioButtons *clickRadio = createRadioButtonGroup( "Look&Feel", "Single Click Selects", "0", 1, 0, singleOrDoubleClick, 2, mouseDetailGroup, "myLook&FeelRadio0", true, PAGE_MOUSE );
-  clickRadio->layout()->setMargin( 0 );
+  clickRadio->tqlayout()->setMargin( 0 );
   mouseDetailGrid->addWidget( clickRadio, 0, 0 );
   
   KONFIGURATOR_CHECKBOX_PARAM mouseCheckboxesParam[] = 
@@ -324,7 +324,7 @@ void KgLookFeel::setupMouseModeTab() {
 
   // -------------- Preview -----------------
   TQGroupBox *mousePreviewGroup = createFrame( i18n( "Preview" ), tab_mouse, "mousePreviewGroup" );
-  TQGridLayout *mousePreviewGrid = createGridLayout( mousePreviewGroup->layout() );
+  TQGridLayout *mousePreviewGrid = createGridLayout( mousePreviewGroup->tqlayout() );
   // TODO preview
   mousePreview = new TQListView( mousePreviewGroup, "mousePreview" );
   mousePreviewGrid->addWidget( mousePreview, 0 ,0 );
diff --git a/krusader/Konfigurator/kgprotocols.cpp b/krusader/Konfigurator/kgprotocols.cpp
index 08b613a..a6ea11f 100644
--- a/krusader/Konfigurator/kgprotocols.cpp
+++ b/krusader/Konfigurator/kgprotocols.cpp
@@ -65,7 +65,7 @@ KgProtocols::KgProtocols( bool first, TQWidget* parent,  const char* name ) :
   //  -------------------------- LINK VIEW ----------------------------------
   
   TQGroupBox *linkGrp = createFrame( i18n( "Links" ), parent, "linkGrp" );    
-  TQGridLayout *linkGrid = createGridLayout( linkGrp->layout() );
+  TQGridLayout *linkGrid = createGridLayout( linkGrp->tqlayout() );
   
   linkList = new TQListView( linkGrp, "linkList" );
   linkList->addColumn( i18n( "Defined Links" ) );
@@ -106,7 +106,7 @@ KgProtocols::KgProtocols( bool first, TQWidget* parent,  const char* name ) :
   //  -------------------------- PROTOCOLS LISTBOX ----------------------------------
 
   TQGroupBox *protocolGrp = createFrame( i18n( "Protocols" ), parent, "protocolGrp" );    
-  TQGridLayout *protocolGrid = createGridLayout( protocolGrp->layout() );
+  TQGridLayout *protocolGrid = createGridLayout( protocolGrp->tqlayout() );
   
   protocolList = new TQListBox( protocolGrp, "protocolList" );
   loadListCapableProtocols();
@@ -117,7 +117,7 @@ KgProtocols::KgProtocols( bool first, TQWidget* parent,  const char* name ) :
   //  -------------------------- MIMES LISTBOX ----------------------------------
 
   TQGroupBox *mimeGrp = createFrame( i18n( "Mimes" ), parent, "mimeGrp" );    
-  TQGridLayout *mimeGrid = createGridLayout( mimeGrp->layout() );
+  TQGridLayout *mimeGrid = createGridLayout( mimeGrp->tqlayout() );
   
   mimeList = new TQListBox( mimeGrp, "protocolList" );
   loadMimes();
@@ -143,9 +143,9 @@ KgProtocols::KgProtocols( bool first, TQWidget* parent,  const char* name ) :
 TQWidget* KgProtocols::addSpacer( TQWidget *parent, const char *widgetName )
 {
   TQWidget *widget = new TQWidget( parent, widgetName );
-  TQVBoxLayout *vboxlayout = new TQVBoxLayout( widget );
+  TQVBoxLayout *vboxtqlayout = new TQVBoxLayout( widget );
   TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-  vboxlayout->addItem( spacer );
+  vboxtqlayout->addItem( spacer );
   return widget;
 }
 
@@ -305,7 +305,7 @@ void KgProtocols::loadInitialValues()
   {
     addProtocol( *it );
     
-    TQStringList mimes = krConfig->readListEntry( TQString( "Mimes For %1" ).arg( *it ) );
+    TQStringList mimes = krConfig->readListEntry( TQString( "Mimes For %1" ).tqarg( *it ) );
     
     for( TQStringList::Iterator it2 = mimes.begin(); it2 != mimes.end(); it2++ )
       addMime( *it2, *it );
@@ -354,7 +354,7 @@ bool KgProtocols::isChanged()
     if( !protList.contains( item->text( 0 ) ) )
       return true;
       
-    TQStringList mimes = krConfig->readListEntry( TQString( "Mimes For %1" ).arg( item->text( 0 ) ) );
+    TQStringList mimes = krConfig->readListEntry( TQString( "Mimes For %1" ).tqarg( item->text( 0 ) ) );
     
     if( (int)mimes.count() != item->childCount() )
       return true;
@@ -390,7 +390,7 @@ bool KgProtocols::apply()
       mimes.append( childs->text( 0 ) );
       childs = childs->nextSibling();
     }
-    krConfig->writeEntry( TQString( "Mimes For %1" ).arg( item->text( 0 ) ), mimes );
+    krConfig->writeEntry( TQString( "Mimes For %1" ).tqarg( item->text( 0 ) ), mimes );
     
     item = item->nextSibling();
   }  
diff --git a/krusader/Konfigurator/kgstartup.cpp b/krusader/Konfigurator/kgstartup.cpp
index 6af61bc..6201039 100644
--- a/krusader/Konfigurator/kgstartup.cpp
+++ b/krusader/Konfigurator/kgstartup.cpp
@@ -45,7 +45,7 @@ KgStartup::KgStartup( bool first, TQWidget* parent,  const char* name ) :
   //  --------------------------- PANELS GROUPBOX ----------------------------------
 
   TQGroupBox *panelsGrp = createFrame( i18n( "General" ), parent, "panelsGrp" );
-  TQGridLayout *panelsGrid = createGridLayout( panelsGrp->layout() );
+  TQGridLayout *panelsGrid = createGridLayout( panelsGrp->tqlayout() );
 
   TQString s = "<p><img src='toolbar|kr_profile'></p>" + i18n( "Defines the panel profile used at startup. A panel profile contains:<ul><li>all the tabs paths</li><li>the current tab</li><li>the active panel</li></ul><b>&lt;Last session&gt;</b> is a special panel profile which is saved automatically when Krusader is closed.");
   TQLabel *label = addLabel( panelsGrid, 0, 0, i18n( "Startup profile:" ), panelsGrp, "Startup session" );
@@ -61,7 +61,7 @@ KgStartup::KgStartup( bool first, TQWidget* parent,  const char* name ) :
   comboItems[ 0 ].value = "";
 
   profileCombo = createComboBox( "Startup", "Starter Profile Name", comboItems[ 0 ].value, comboItems, profileList.count(), panelsGrp, false, false );
-  profileCombo->setSizePolicy(  TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+  profileCombo->tqsetSizePolicy(  TQSizePolicy::Expanding, TQSizePolicy::Fixed);
   panelsGrid->addWidget( profileCombo, 0, 1 );
 
   //------------------------------------------------
@@ -81,7 +81,7 @@ KgStartup::KgStartup( bool first, TQWidget* parent,  const char* name ) :
   //  ------------------------ USERINTERFACE GROUPBOX ------------------------------
 
   TQGroupBox *uiGrp = createFrame( i18n( "User Interface" ), parent, "uiGrp" );
-  TQGridLayout *uiGrid = createGridLayout( uiGrp->layout() );
+  TQGridLayout *uiGrid = createGridLayout( uiGrp->tqlayout() );
 
   KONFIGURATOR_CHECKBOX_PARAM uiCheckBoxes[] =
     { //   cfg_class  cfg_name                default               text                                   restart ToolTip
diff --git a/krusader/Konfigurator/kguseractions.cpp b/krusader/Konfigurator/kguseractions.cpp
index ebb18fd..9a8a938 100644
--- a/krusader/Konfigurator/kguseractions.cpp
+++ b/krusader/Konfigurator/kguseractions.cpp
@@ -46,7 +46,7 @@ KgUserActions::KgUserActions( bool first, TQWidget* parent,  const char* name )
 
    // ============= Info Group =============
    TQGroupBox *InfoGroup = createFrame( i18n( "Information" ), parent, "kgUserActionInfoGroup" );
-   TQGridLayout *InfoGrid = createGridLayout( InfoGroup->layout() );
+   TQGridLayout *InfoGrid = createGridLayout( InfoGroup->tqlayout() );
 
    // terminal for the UserActions
    TQLabel *labelInfo = new TQLabel( i18n(
@@ -62,7 +62,7 @@ KgUserActions::KgUserActions( bool first, TQWidget* parent,  const char* name )
 
    // ============= Terminal Group =============
    TQGroupBox *terminalGroup = createFrame( i18n( "Terminal execution" ), parent, "kgUserActionTerminalGroup" );
-   TQGridLayout *terminalGrid = createGridLayout( terminalGroup->layout() );
+   TQGridLayout *terminalGrid = createGridLayout( terminalGroup->tqlayout() );
 
    // terminal for the UserActions
    TQLabel *labelTerminal = new TQLabel( i18n( "Terminal for UserActions:" ),
@@ -76,7 +76,7 @@ KgUserActions::KgUserActions( bool first, TQWidget* parent,  const char* name )
 
    // ============= Outputcollection Group =============
    TQGroupBox *outputGroup = createFrame( i18n( "Output collection" ), parent, "kgUserActionOutputGroup" );
-   TQGridLayout *outputGrid = createGridLayout( outputGroup->layout() );
+   TQGridLayout *outputGrid = createGridLayout( outputGroup->tqlayout() );
 
    TQHBox *hbox;
    hbox = new TQHBox( outputGroup, "HBoxNormalFont" );
diff --git a/krusader/Konfigurator/konfiguratoritems.cpp b/krusader/Konfigurator/konfiguratoritems.cpp
index 13e0fb2..0fd922d 100644
--- a/krusader/Konfigurator/konfiguratoritems.cpp
+++ b/krusader/Konfigurator/konfiguratoritems.cpp
@@ -418,7 +418,7 @@ void KonfiguratorFontChooser::loadInitialValue()
 void KonfiguratorFontChooser::setFont()
 {
   pLabel->setFont( font );
-  pLabel->setText( font.family()+TQString(", %1").arg(font.pointSize()) );
+  pLabel->setText( font.family()+TQString(", %1").tqarg(font.pointSize()) );
 }
 
 void KonfiguratorFontChooser::slotApply(TQObject *,TQString cls, TQString name)
@@ -696,7 +696,7 @@ TQString KonfiguratorColorChooser::getValue()
   else if( currentItem() >= 2 && (unsigned)currentItem() < 2 + additionalColors.size() )
     return additionalColors[ currentItem() - 2 ].value;
   else
-    return TQString( "%1,%2,%3" ).arg( color.red() ).arg( color.green() ).arg( color.blue() );
+    return TQString( "%1,%2,%3" ).tqarg( color.red() ).tqarg( color.green() ).tqarg( color.blue() );
 }
 
 bool KonfiguratorColorChooser::isValueRGB()
diff --git a/krusader/Konfigurator/konfiguratorpage.cpp b/krusader/Konfigurator/konfiguratorpage.cpp
index 811e077..0ae9e3d 100644
--- a/krusader/Konfigurator/konfiguratorpage.cpp
+++ b/krusader/Konfigurator/konfiguratorpage.cpp
@@ -29,7 +29,7 @@
  ***************************************************************************/
 
 #include "konfiguratorpage.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include "../krusader.h"
 #include <tqwhatsthis.h>
 
@@ -156,34 +156,34 @@ TQGroupBox* KonfiguratorPage::createFrame( TQString text, TQWidget *parent,
   if( !text.isNull() )
     groupBox->setTitle( text );
   groupBox->setColumnLayout(0, Qt::Vertical );
-  groupBox->layout()->setSpacing( 0 );
-  groupBox->layout()->setMargin( 0 );
+  groupBox->tqlayout()->setSpacing( 0 );
+  groupBox->tqlayout()->setMargin( 0 );
   return groupBox;
 }                                          
 
 TQGridLayout* KonfiguratorPage::createGridLayout( TQLayout *parent )
 {
   TQGridLayout *gridLayout = new TQGridLayout( parent );
-  gridLayout->setAlignment( TQt::AlignTop );
+  gridLayout->tqsetAlignment( TQt::AlignTop );
   gridLayout->setSpacing( 6 );
   gridLayout->setMargin( 11 );
   return gridLayout;
 }
 
-TQLabel* KonfiguratorPage::addLabel( TQGridLayout *layout, int x, int y, TQString label,
+TQLabel* KonfiguratorPage::addLabel( TQGridLayout *tqlayout, int x, int y, TQString label,
                                     TQWidget *parent, const char *widgetName )
 {
   TQLabel *lbl = new TQLabel( label, parent, widgetName );
-  layout->addWidget( lbl, x, y );
+  tqlayout->addWidget( lbl, x, y );
   return lbl;
 }
 
 TQWidget* KonfiguratorPage::createSpacer( TQWidget *parent, const char *widgetName )
 {
   TQWidget *widget = new TQWidget( parent, widgetName );
-  TQHBoxLayout *hboxlayout = new TQHBoxLayout( widget );
+  TQHBoxLayout *hboxtqlayout = new TQHBoxLayout( widget );
   TQSpacerItem* spacer = new TQSpacerItem( 40, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-  hboxlayout->addItem( spacer );
+  hboxtqlayout->addItem( spacer );
   return widget;
 }
 
@@ -192,9 +192,9 @@ KonfiguratorCheckBoxGroup* KonfiguratorPage::createCheckBoxGroup( int sizex, int
     const char *widgetName, int pg )
 {
   KonfiguratorCheckBoxGroup *groupWidget = new KonfiguratorCheckBoxGroup( parent, widgetName );
-  TQGridLayout *layout = new TQGridLayout( groupWidget );
-  layout->setSpacing( 6 );
-  layout->setMargin( 0 );
+  TQGridLayout *tqlayout = new TQGridLayout( groupWidget );
+  tqlayout->setSpacing( 6 );
+  tqlayout->setMargin( 0 );
   
   int x = 0, y = 0;
   
@@ -205,7 +205,7 @@ KonfiguratorCheckBoxGroup* KonfiguratorPage::createCheckBoxGroup( int sizex, int
       params[i].restart, params[i].toolTip, pg );
 
     groupWidget->add( checkBox );
-    layout->addWidget( checkBox, y, x );
+    tqlayout->addWidget( checkBox, y, x );
 
     if( sizex )
     {
@@ -234,10 +234,10 @@ KonfiguratorRadioButtons* KonfiguratorPage::createRadioButtonGroup( TQString cls
   radioWidget->setRadioButtonExclusive( true );
   radioWidget->setColumnLayout(0, Qt::Vertical );
 
-  TQGridLayout *layout = new TQGridLayout( radioWidget->layout() );
-  layout->setAlignment( TQt::AlignTop );
-  layout->setSpacing( 6 );
-  layout->setMargin( 0 );
+  TQGridLayout *tqlayout = new TQGridLayout( radioWidget->tqlayout() );
+  tqlayout->tqsetAlignment( TQt::AlignTop );
+  tqlayout->setSpacing( 6 );
+  tqlayout->setMargin( 0 );
 
   int x = 0, y = 0;
 
@@ -249,7 +249,7 @@ KonfiguratorRadioButtons* KonfiguratorPage::createRadioButtonGroup( TQString cls
     if( !params[i].tooltip.isEmpty() )
       TQWhatsThis::add( radBtn, params[i].tooltip );
 
-    layout->addWidget( radBtn, y, x );
+    tqlayout->addWidget( radBtn, y, x );
 
     radioWidget->addRadioButton( radBtn, params[i].text, params[i].value );
 
diff --git a/krusader/Konfigurator/konfiguratorpage.h b/krusader/Konfigurator/konfiguratorpage.h
index 393a18f..5717acb 100644
--- a/krusader/Konfigurator/konfiguratorpage.h
+++ b/krusader/Konfigurator/konfiguratorpage.h
@@ -36,7 +36,7 @@
 #include <tqptrlist.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 struct KONFIGURATOR_CHECKBOX_PARAM;
 struct KONFIGURATOR_NAME_VALUE_TIP;
@@ -293,25 +293,25 @@ public:
     *
     * Sample:<br><br>
     * TQGroupBox *myGroup = createFrame( i18n( "MyFrameName" ), parentWidget, "frameName" );<br>
-    * TQGridLayout *myLayout = createGridLayout( myGroup->layout() );<br>
+    * TQGridLayout *myLayout = createGridLayout( myGroup->tqlayout() );<br>
     * myLayout->addWidget( myGroup, 0, 0 );
     *
-    * @param  parent      Reference to the parent layout
+    * @param  parent      Reference to the parent tqlayout
     *
     * @return             reference to the newly created TQGridLayout
     */
   TQGridLayout             *createGridLayout( TQLayout *parent );
 
   /**
-    * Adds a new label to a grid layout.
+    * Adds a new label to a grid tqlayout.
     *
     * Sample:<br><br>
     * TQGroupBox *myGroup = createFrame( i18n( "MyFrameName" ), parentWidget, "frameName" );<br>
-    * TQGridLayout *myLayout = createGridLayout( myGroup->layout() );<br>
+    * TQGridLayout *myLayout = createGridLayout( myGroup->tqlayout() );<br>
     * addLabel( myLayout, 0, 0, i18n( "Hello world!" ), myGroup, "myLabel" );<br>
     * mainLayout->addWidget( myGroup, 0, 0 );
     *
-    * @param  layout      The grid layout on which the item will be placed
+    * @param  tqlayout      The grid tqlayout on which the item will be placed
     * @param  x           the column to which the label will be placed
     * @param  y           the row to which the label will be placed
     * @param  label       the text of the label
@@ -320,7 +320,7 @@ public:
     *
     * @return             reference to the newly created label
     */
-  TQLabel                  *addLabel( TQGridLayout *layout, int x, int y, TQString label,
+  TQLabel                  *addLabel( TQGridLayout *tqlayout, int x, int y, TQString label,
                                            TQWidget *parent=0, const char *widgetName=0 );
 
   /**
diff --git a/krusader/Konfigurator/krresulttable.cpp b/krusader/Konfigurator/krresulttable.cpp
index 9abc8a1..32f2691 100644
--- a/krusader/Konfigurator/krresulttable.cpp
+++ b/krusader/Konfigurator/krresulttable.cpp
@@ -80,7 +80,7 @@ void KrResultTable::adjustRow(TQGridLayout* grid)
   while( (child = it.current()) != 0 )
   {
     // Add some space between columns
-    child->widget()->setMinimumWidth( child->widget()->sizeHint().width() + 15 );
+    child->widget()->setMinimumWidth( child->widget()->tqsizeHint().width() + 15 );
 
     // Paint uneven rows in alternate color
     if( ((col/_numColumns)%2) )
@@ -178,7 +178,7 @@ bool KrArchiverResultTable::addRow(SearchObject* search, TQGridLayout* grid)
   // Name column
   _label = new KURLLabel(arch->getWebsite(), arch->getSearchName(), this);
   _label->setMargin(5);
-  _label->setAlignment(TQt::AlignTop);
+  _label->tqsetAlignment(TQt::AlignTop);
   grid->addWidget(_label, _numRows, 0);
   connect(_label, TQT_SIGNAL(leftClickedURL(const TQString&)),
                       TQT_SLOT(website(const TQString&)));
@@ -191,7 +191,7 @@ bool KrArchiverResultTable::addRow(SearchObject* search, TQGridLayout* grid)
   // Packing column
   _label = new TQLabel(this);
   _label->setMargin(5);
-  _label->setAlignment( TQt::AlignTop );
+  _label->tqsetAlignment( TQt::AlignTop );
   if( arch->getIsPacker() && arch->getFound() ) {
     _label->setText( i18n("enabled") );
     _label->setPaletteForegroundColor("darkgreen");
@@ -205,7 +205,7 @@ bool KrArchiverResultTable::addRow(SearchObject* search, TQGridLayout* grid)
   // Unpacking column
   _label = new TQLabel(this);
   _label->setMargin(5);
-  _label->setAlignment( TQt::AlignTop );
+  _label->tqsetAlignment( TQt::AlignTop );
   if( arch->getIsUnpacker() && arch->getFound() ) {
     _label->setText( i18n("enabled") );
     _label->setPaletteForegroundColor("darkgreen");
@@ -219,7 +219,7 @@ bool KrArchiverResultTable::addRow(SearchObject* search, TQGridLayout* grid)
   // Note column
   _label = new TQLabel(arch->getNote(), this);
   _label->setMargin(5);
-  _label->setAlignment( TQt::AlignTop | TQt::WordBreak ); // wrap words
+  _label->tqsetAlignment( TQt::AlignTop | TQt::WordBreak ); // wrap words
   grid->addWidget(_label, _numRows, 4);
 
   // Apply shared design elements
@@ -323,7 +323,7 @@ bool KrToolResultTable::addRow(SearchObject* search, TQGridLayout* grid)
   // Name column
   _label = new TQLabel(appGroup->getSearchName(), this);
   _label->setMargin(5);
-  _label->setAlignment( TQt::AlignTop );
+  _label->tqsetAlignment( TQt::AlignTop );
   grid->addWidget(_label, _numRows, 0);
 
   // Tool column
@@ -331,7 +331,7 @@ bool KrToolResultTable::addRow(SearchObject* search, TQGridLayout* grid)
   for( TQValueVector<Application*>::Iterator it=_apps.begin(); it!=_apps.end(); it++ )
   {
     KURLLabel* l = new KURLLabel( (*it)->getWebsite(), (*it)->getAppName(), toolBox);
-    l->setAlignment(TQt::AlignLeft | TQt::AlignTop);
+    l->tqsetAlignment(TQt::AlignLeft | TQt::AlignTop);
     l->setMargin(5);
     connect(l, TQT_SIGNAL(leftClickedURL(const TQString&)),
                TQT_SLOT(website(const TQString&)));
@@ -344,14 +344,14 @@ bool KrToolResultTable::addRow(SearchObject* search, TQGridLayout* grid)
   {
     _label = new TQLabel( (*it)->getPath(), vbox);
     _label->setMargin(5);
-    _label->setAlignment( TQt::AlignTop );
+    _label->tqsetAlignment( TQt::AlignTop );
   }
   grid->addWidget(vbox, _numRows, 2);
 
-  // Status column
+  // tqStatus column
   _label = new TQLabel(this);
   _label->setMargin(5);
-  _label->setAlignment( TQt::AlignTop );
+  _label->tqsetAlignment( TQt::AlignTop );
   if( appGroup->getFoundGroup() ) {
     _label->setText( i18n("enabled") );
     _label->setPaletteForegroundColor("darkgreen");
diff --git a/krusader/Konfigurator/krresulttable.h b/krusader/Konfigurator/krresulttable.h
index ebac759..0e6729f 100644
--- a/krusader/Konfigurator/krresulttable.h
+++ b/krusader/Konfigurator/krresulttable.h
@@ -33,7 +33,7 @@
 
 #include <tqstring.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqhbox.h>
 #include <tqvbox.h>
 #include <tqgrid.h>
@@ -84,14 +84,14 @@ protected:
   TQLabel* _label; // generic label
 
   /**
-  * Creates the main grid layout and attaches the table header
+  * Creates the main grid tqlayout and attaches the table header
   *
-  * @return bool  Pointer to the main grid layout
+  * @return bool  Pointer to the main grid tqlayout
   */
   TQGridLayout* initTable();
 
   /**
-  * Applies settings to each cell of the grid layout
+  * Applies settings to each cell of the grid tqlayout
   * Supposed to be run after a row was added
   *
   * @param const TQGridLayout* grid  The GridLayout
diff --git a/krusader/Konfigurator/krresulttabledialog.cpp b/krusader/Konfigurator/krresulttabledialog.cpp
index f7f6571..179099a 100644
--- a/krusader/Konfigurator/krresulttabledialog.cpp
+++ b/krusader/Konfigurator/krresulttabledialog.cpp
@@ -40,7 +40,7 @@ KrResultTableDialog::KrResultTableDialog( TQWidget *parent, DialogType type,
   _page = new TQWidget(this);
   setMainWidget(_page);
   _topLayout = new TQVBoxLayout(_page, 0, spacingHint());
-  _topLayout->setAlignment( TQt::AlignTop );
+  _topLayout->tqsetAlignment( TQt::AlignTop );
 
   // +++ Heading +++
   // prepare the icon
@@ -48,8 +48,8 @@ KrResultTableDialog::KrResultTableDialog( TQWidget *parent, DialogType type,
   _iconLabel = new TQLabel(_iconBox, "iconLabel");
   _iconLabel->setPixmap(krLoader->loadIcon(headerIcon, KIcon::Desktop, 32));
   _iconLabel->setMinimumWidth(fontMetrics().maxWidth()*20);
-  _iconLabel->setAlignment( TQt::AlignLeft | TQt::AlignVCenter );
-  _iconLabel->setFixedSize( _iconLabel->sizeHint() );
+  _iconLabel->tqsetAlignment( TQt::AlignLeft | TQt::AlignVCenter );
+  _iconLabel->setFixedSize( _iconLabel->tqsizeHint() );
   _headingLabel = new TQLabel(heading, _iconBox);
   TQFont defFont = KGlobalSettings::generalFont();
   defFont.setBold(true);
@@ -85,11 +85,11 @@ KrResultTableDialog::KrResultTableDialog( TQWidget *parent, DialogType type,
   if(hint != TQString()) {
     _hintLabel = new TQLabel(hint, _page);
     _hintLabel->setIndent(5);
-    _hintLabel->setAlignment(TQt::AlignRight);
+    _hintLabel->tqsetAlignment(TQt::AlignRight);
     _topLayout->addWidget(_hintLabel);
   }
 
-  this->setFixedSize( this->sizeHint() ); // make non-resizeable
+  this->setFixedSize( this->tqsizeHint() ); // make non-resizeable
 }
 
 KrResultTableDialog::~KrResultTableDialog()
diff --git a/krusader/Konfigurator/krresulttabledialog.h b/krusader/Konfigurator/krresulttabledialog.h
index f36d20d..28bbe65 100644
--- a/krusader/Konfigurator/krresulttabledialog.h
+++ b/krusader/Konfigurator/krresulttabledialog.h
@@ -34,7 +34,7 @@
 #include <tqlabel.h>
 #include <tqvbox.h>
 #include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstringlist.h>
 #include <tqvaluevector.h>