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

This reverts commit f3a9c5ace2048794e4432ddc71401b41d3361e4b.

6 files changed, 55 insertions, 55 deletions

diff --git a/smb4k/dialogs/smb4kbookmarkeditor.cpp b/smb4k/dialogs/smb4kbookmarkeditor.cpp
index a98c5eb..9e1f33c 100644
--- a/smb4k/dialogs/smb4kbookmarkeditor.cpp
+++ b/smb4k/dialogs/smb4kbookmarkeditor.cpp
@@ -24,7 +24,7 @@
  ***************************************************************************/
 
 // TQt includes
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvaluelist.h>
 
 // KDE includes
@@ -54,8 +54,8 @@ Smb4KBookmarkEditor::Smb4KBookmarkEditor( TQWidget *parent, const char *name )
   setWFlags( TQt::WDestructiveClose );
 
   TQFrame *frame = plainPage();
-  TQGridLayout *layout = new TQGridLayout( frame );
-  layout->setSpacing( 5 );
+  TQGridLayout *tqlayout = new TQGridLayout( frame );
+  tqlayout->setSpacing( 5 );
 
   m_view = new KListView( frame );
   m_view->addColumn( i18n( "Bookmark" ), Bookmark );
@@ -77,10 +77,10 @@ Smb4KBookmarkEditor::Smb4KBookmarkEditor( TQWidget *parent, const char *name )
 
   slotLoadBookmarks();
 
-  layout->addWidget( m_view, 0, 0, 0 );
+  tqlayout->addWidget( m_view, 0, 0, 0 );
 
   setInitialSize( configDialogSize( *(Smb4KSettings::self()->config()), "BookmarkEditor" ) );
-  setMinimumSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() );
+  setMinimumSize( (tqsizeHint().width() > 350 ? tqsizeHint().width() : 350), tqsizeHint().height() );
 
   connect( m_view,                       TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int ) ),
            this,                         TQT_SLOT( slotRightButtonPressed( TQListViewItem *, const TQPoint &, int ) ) );
diff --git a/smb4k/dialogs/smb4kcustomoptionsdialog.cpp b/smb4k/dialogs/smb4kcustomoptionsdialog.cpp
index 8d9ac99..8dff9e9 100644
--- a/smb4k/dialogs/smb4kcustomoptionsdialog.cpp
+++ b/smb4k/dialogs/smb4kcustomoptionsdialog.cpp
@@ -25,7 +25,7 @@
  ***************************************************************************/
 
 // TQt includes
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqframe.h>
 
@@ -167,7 +167,7 @@ void Smb4KCustomOptionsDialog::setupDialog()
   m_port_input->setMinValue( -1 );
   m_port_input->setMaxValue( 65535 );
 
-  // The widgets will be put into the layout below.
+  // The widgets will be put into the tqlayout below.
 
   // Here comes the item-dependent stuff:
   switch ( m_type )
@@ -292,11 +292,11 @@ void Smb4KCustomOptionsDialog::setupDialog()
       TQLabel *uid_label = new TQLabel( i18n( "User ID:" ), frame );
       m_uid_input = new KLineEdit( frame );
       m_uid_input->setMinimumWidth( 200 );
-      m_uid_input->setAlignment( TQt::AlignRight );
+      m_uid_input->tqsetAlignment( TQt::AlignRight );
       TQLabel *gid_label = new TQLabel( i18n( "Group ID:" ), frame );
       m_gid_input = new KLineEdit( frame );
       m_gid_input->setMinimumWidth( 200 );
-      m_gid_input->setAlignment( TQt::AlignRight );
+      m_gid_input->tqsetAlignment( TQt::AlignRight );
 
       m_kerberos = new TQCheckBox( i18n( "Try to authenticate with Kerberos (Active Directory)" ), frame );
 
@@ -317,11 +317,11 @@ void Smb4KCustomOptionsDialog::setupDialog()
       TQLabel *uid_label = new TQLabel( i18n( "User ID:" ), frame );
       m_uid_input = new KLineEdit( frame );
       m_uid_input->setMinimumWidth( 200 );
-      m_uid_input->setAlignment( TQt::AlignRight );
+      m_uid_input->tqsetAlignment( TQt::AlignRight );
       TQLabel *gid_label = new TQLabel( i18n( "Group ID:" ), frame );
       m_gid_input = new KLineEdit( frame );
       m_gid_input->setMinimumWidth( 200 );
-      m_gid_input->setAlignment( TQt::AlignRight );
+      m_gid_input->tqsetAlignment( TQt::AlignRight );
 
       grid->addWidget( location_label, 0, 0, 0 );
       grid->addWidget( location, 0, 1, 0 );
@@ -333,7 +333,7 @@ void Smb4KCustomOptionsDialog::setupDialog()
       grid->addWidget( m_gid_input, 3, 1, 0 );
 #endif
 
-      info = optionsHandler()->findItem( TQString( "//%1/%2" ).arg( m_share_item->host(), m_share_item->name() ) );
+      info = optionsHandler()->findItem( TQString( "//%1/%2" ).tqarg( m_share_item->host(), m_share_item->name() ) );
 
       // Get the default values from the config file:
       default_port = Smb4KSettings::remotePort();
@@ -488,7 +488,7 @@ void Smb4KCustomOptionsDialog::setupDialog()
   connect( this,          TQT_SIGNAL( user1Clicked() ),
            this,          TQT_SLOT( slotDefaultButtonClicked() ) );
 
-  setFixedSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() );
+  setFixedSize( (tqsizeHint().width() > 350 ? tqsizeHint().width() : 350), tqsizeHint().height() );
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -885,7 +885,7 @@ void Smb4KCustomOptionsDialog::slotOKButtonClicked()
     }
     case Share:
     {
-      TQString item_name = TQString( "//%1/%2" ).arg( m_share_item->host(),
+      TQString item_name = TQString( "//%1/%2" ).tqarg( m_share_item->host(),
                                                     TQString::compare( m_share_item->name(), "homes" ) == 0 ?
                                                     m_homes_user :
                                                     m_share_item->name() );
diff --git a/smb4k/dialogs/smb4kmountdialog.cpp b/smb4k/dialogs/smb4kmountdialog.cpp
index d2501fa..131ce8d 100644
--- a/smb4k/dialogs/smb4kmountdialog.cpp
+++ b/smb4k/dialogs/smb4kmountdialog.cpp
@@ -25,7 +25,7 @@
  ***************************************************************************/
 
 // TQt includes
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqframe.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
@@ -51,7 +51,7 @@ KDialogBase( Plain, i18n( "Mount Share" ), Ok|Cancel, Ok, parent, name, true, tr
 
   setupView();
 
-  setFixedSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() );
+  setFixedSize( (tqsizeHint().width() > 350 ? tqsizeHint().width() : 350), tqsizeHint().height() );
 }
 
 
@@ -63,9 +63,9 @@ Smb4KMountDialog::~Smb4KMountDialog()
 void Smb4KMountDialog::setupView()
 {
   TQFrame *frame = plainPage();
-  TQGridLayout *layout = new TQGridLayout( frame );
-  layout->setSpacing( 5 );
-  layout->setMargin( 0 );
+  TQGridLayout *tqlayout = new TQGridLayout( frame );
+  tqlayout->setSpacing( 5 );
+  tqlayout->setMargin( 0 );
 
   TQLabel *shareLabel = new TQLabel( i18n( "Share:" ), frame );
   m_share_input = new KLineEdit( frame, "ShareInputLine" );
@@ -82,13 +82,13 @@ void Smb4KMountDialog::setupView()
 
   m_bookmark = new TQCheckBox( i18n( "Add this share to the bookmarks" ), frame, "BookmarkButton" );
 
-  layout->addWidget( shareLabel, 0, 0, 0 );
-  layout->addWidget( m_share_input, 0, 1, 0 );
-  layout->addWidget( addressLabel, 1, 0, 0 );
-  layout->addWidget( m_ip_input, 1, 1, 0 );
-  layout->addWidget( workgroupLabel, 2, 0, 0 );
-  layout->addWidget( m_workgroup_input, 2, 1, 0 );
-  layout->addMultiCellWidget( m_bookmark, 3, 3, 0, 1, 0 );
+  tqlayout->addWidget( shareLabel, 0, 0, 0 );
+  tqlayout->addWidget( m_share_input, 0, 1, 0 );
+  tqlayout->addWidget( addressLabel, 1, 0, 0 );
+  tqlayout->addWidget( m_ip_input, 1, 1, 0 );
+  tqlayout->addWidget( workgroupLabel, 2, 0, 0 );
+  tqlayout->addWidget( m_workgroup_input, 2, 1, 0 );
+  tqlayout->addMultiCellWidget( m_bookmark, 3, 3, 0, 1, 0 );
 
   connect( m_share_input, TQT_SIGNAL( textChanged ( const TQString & ) ) ,
            this,          TQT_SLOT( slotChangeInputValue( const TQString & ) ) );
diff --git a/smb4k/dialogs/smb4kpreviewdialog.cpp b/smb4k/dialogs/smb4kpreviewdialog.cpp
index d220bbe..07361b2 100644
--- a/smb4k/dialogs/smb4kpreviewdialog.cpp
+++ b/smb4k/dialogs/smb4kpreviewdialog.cpp
@@ -24,7 +24,7 @@
  ***************************************************************************/
 
 // TQt includes
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqiconset.h>
 
@@ -79,7 +79,7 @@ Smb4KPreviewDialog::Smb4KPreviewDialog( Smb4KShareItem *item, TQWidget *parent,
     m_initialized = Smb4KCore::previewer()->preview( m_item );
   }
 
-  setMinimumSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() );
+  setMinimumSize( (tqsizeHint().width() > 350 ? tqsizeHint().width() : 350), tqsizeHint().height() );
 }
 
 
@@ -92,7 +92,7 @@ Smb4KPreviewDialog::~Smb4KPreviewDialog()
 void Smb4KPreviewDialog::setupView()
 {
   TQFrame *frame = plainPage();
-  TQGridLayout *layout = new TQGridLayout( frame );
+  TQGridLayout *tqlayout = new TQGridLayout( frame );
 
   m_view = new KIconView( frame, 0, 0 );
   m_view->setItemTextPos( KIconView::Right );
@@ -118,8 +118,8 @@ void Smb4KPreviewDialog::setupView()
   m_toolbar->insertWidget( Combo, 10, m_combo, 4 );
   m_toolbar->setItemAutoSized( Combo, true );
 
-  layout->addWidget( m_view, 0, 0, 0 );
-  layout->addWidget( m_toolbar, 1, 0, 0 );
+  tqlayout->addWidget( m_view, 0, 0, 0 );
+  tqlayout->addWidget( m_toolbar, 1, 0, 0 );
 }
 
 
@@ -189,7 +189,7 @@ void Smb4KPreviewDialog::slotReceivedData( Smb4KPreviewItem *item )
         case Smb4KPreviewItem::File:
         {
           KIconViewItem *view_item = new KIconViewItem( m_view, (*it).second, SmallIcon( "file" ) );
-          view_item->setKey( TQString( "[file]_%1" ).arg( (*it).second ) );
+          view_item->setKey( TQString( "[file]_%1" ).tqarg( (*it).second ) );
 
           break;
         }
@@ -199,7 +199,7 @@ void Smb4KPreviewDialog::slotReceivedData( Smb4KPreviewItem *item )
           if ( TQString::compare( (*it).second, "." ) != 0 && TQString::compare( (*it).second, ".." ) != 0 )
           {
             KIconViewItem *view_item = new KIconViewItem( m_view, (*it).second, SmallIcon( "folder" ) );
-            view_item->setKey( TQString( "[directory]_%1" ).arg( (*it).second ) );
+            view_item->setKey( TQString( "[directory]_%1" ).tqarg( (*it).second ) );
           }
 
           break;
@@ -209,7 +209,7 @@ void Smb4KPreviewDialog::slotReceivedData( Smb4KPreviewItem *item )
           if ( Smb4KSettings::previewHiddenItems() )
           {
             KIconViewItem *view_item = new KIconViewItem( m_view, (*it).second, SmallIcon( "file" ) );
-            view_item->setKey( TQString( "[file]_%1" ).arg( (*it).second ) );
+            view_item->setKey( TQString( "[file]_%1" ).tqarg( (*it).second ) );
           }
 
           break;
@@ -220,7 +220,7 @@ void Smb4KPreviewDialog::slotReceivedData( Smb4KPreviewItem *item )
                TQString::compare( (*it).second, "." ) != 0 && TQString::compare( (*it).second, ".." ) != 0 )
           {
             KIconViewItem *view_item = new KIconViewItem( m_view, (*it).second, SmallIcon( "folder" ) );
-            view_item->setKey( TQString( "[directory]_%1" ).arg( (*it).second ) );
+            view_item->setKey( TQString( "[directory]_%1" ).tqarg( (*it).second ) );
           }
 
           break;
diff --git a/smb4k/dialogs/smb4kprintdialog.cpp b/smb4k/dialogs/smb4kprintdialog.cpp
index fc41462..5443273 100644
--- a/smb4k/dialogs/smb4kprintdialog.cpp
+++ b/smb4k/dialogs/smb4kprintdialog.cpp
@@ -25,7 +25,7 @@
 
 // TQt includes
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqframe.h>
 
 // KDE includes
@@ -65,8 +65,8 @@ m_item( item ), m_ip( TQString() ) /* will collect it in an instant */
   // Bild the view:
   TQFrame *frame = plainPage();
 
-  TQGridLayout *layout = new TQGridLayout( frame );
-  layout->setSpacing( 10 );
+  TQGridLayout *tqlayout = new TQGridLayout( frame );
+  tqlayout->setSpacing( 10 );
 
   TQGroupBox *p = new TQGroupBox( 2, Qt::Horizontal, i18n( "Printer" ), frame );
   p->setInsideSpacing( 5 );
@@ -108,10 +108,10 @@ m_item( item ), m_ip( TQString() ) /* will collect it in an instant */
   KIntNumInput *cp = new KIntNumInput( 1, s, 10, "Copies" );
   cp->setMinValue( 1 );
 
-  layout->addWidget( p, 0, 0, 0 );
-  layout->addWidget( f, 1, 0, 0 );
+  tqlayout->addWidget( p, 0, 0, 0 );
+  tqlayout->addWidget( f, 1, 0, 0 );
 
-  setFixedSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() );
+  setFixedSize( (tqsizeHint().width() > 350 ? tqsizeHint().width() : 350), tqsizeHint().height() );
 
   enableButton( User1, false );
 
diff --git a/smb4k/dialogs/smb4ksynchronizationdialog.cpp b/smb4k/dialogs/smb4ksynchronizationdialog.cpp
index ee8d178..4b37c89 100644
--- a/smb4k/dialogs/smb4ksynchronizationdialog.cpp
+++ b/smb4k/dialogs/smb4ksynchronizationdialog.cpp
@@ -24,7 +24,7 @@
  ***************************************************************************/
 
 // TQt includes
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqframe.h>
 #include <tqlabel.h>
 
@@ -53,9 +53,9 @@ m_share( share )
   setButtonGuiItem( User2, KGuiItem( i18n( "Swap Paths" ), TQString(), i18n( "Swap source and destination" ) ) );
 
   TQFrame *frame = plainPage();
-  TQGridLayout *layout = new TQGridLayout( frame );
-  layout->setSpacing( 5 );
-  layout->setMargin( 0 );
+  TQGridLayout *tqlayout = new TQGridLayout( frame );
+  tqlayout->setSpacing( 5 );
+  tqlayout->setMargin( 0 );
 
   TQLabel *source_label =       new TQLabel( i18n( "Source:" ), frame, "SourceURLLabel" );
   KURLRequester *source =      new KURLRequester( m_share->path()+"/", frame, "SourceURL" );
@@ -99,14 +99,14 @@ m_share( share )
 
   transfer_widget->setEnabled( false );
 
-  layout->addWidget( source_label, 0, 0, 0 );
-  layout->addWidget( source, 0, 1, 0 );
-  layout->addWidget( destination_label, 1, 0, 0 );
-  layout->addWidget( destination, 1, 1, 0 );
-  layout->addMultiCellWidget( current_file, 2, 2, 0, 1, 0 );
-  layout->addMultiCellWidget( individual, 3, 3, 0, 1, 0 );
-  layout->addMultiCellWidget( total, 4, 4, 0, 1, 0 );
-  layout->addMultiCellWidget( transfer_widget, 5, 6, 0, 1, 0 );
+  tqlayout->addWidget( source_label, 0, 0, 0 );
+  tqlayout->addWidget( source, 0, 1, 0 );
+  tqlayout->addWidget( destination_label, 1, 0, 0 );
+  tqlayout->addWidget( destination, 1, 1, 0 );
+  tqlayout->addMultiCellWidget( current_file, 2, 2, 0, 1, 0 );
+  tqlayout->addMultiCellWidget( individual, 3, 3, 0, 1, 0 );
+  tqlayout->addMultiCellWidget( total, 4, 4, 0, 1, 0 );
+  tqlayout->addMultiCellWidget( transfer_widget, 5, 6, 0, 1, 0 );
 
   // Connections
   connect( Smb4KCore::synchronizer(), TQT_SIGNAL( progress( const Smb4KSynchronizationInfo & ) ),
@@ -116,7 +116,7 @@ m_share( share )
            this,                      TQT_SLOT( slotSynchronizationFinished() ) );
 
 
-  setFixedSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() );
+  setFixedSize( (tqsizeHint().width() > 350 ? tqsizeHint().width() : 350), tqsizeHint().height() );
 }
 
 
@@ -207,7 +207,7 @@ void Smb4KSynchronizationDialog::slotProgress( const Smb4KSynchronizationInfo &i
 
   if ( info.totalFileNumber() != -1 && info.processedFileNumber() != -1 )
   {
-    transferred->setText( TQString( "%1 / %2" ).arg( info.processedFileNumber() ).arg( info.totalFileNumber() ) );
+    transferred->setText( TQString( "%1 / %2" ).tqarg( info.processedFileNumber() ).tqarg( info.totalFileNumber() ) );
   }
 
   if ( !info.transferRate().isEmpty() )