Rename obsolete tq methods to standard names

16 files changed, 64 insertions, 64 deletions

diff --git a/plugin/smb4k_konqplugin.cpp b/plugin/smb4k_konqplugin.cpp
index 1a5a1c4..070dd7a 100644
--- a/plugin/smb4k_konqplugin.cpp
+++ b/plugin/smb4k_konqplugin.cpp
@@ -155,10 +155,10 @@ void KonqSidebar_Smb4K::slotSearch()
 
     if ( m_search_part )
     {
-      TQGridLayout *tqlayout = new TQGridLayout( frame );
-      tqlayout->setSpacing( 10 );
-      tqlayout->setMargin( 0 );
-      tqlayout->addWidget ( m_search_part->widget(), 0, 0, 0 );
+      TQGridLayout *layout = new TQGridLayout( frame );
+      layout->setSpacing( 10 );
+      layout->setMargin( 0 );
+      layout->addWidget ( m_search_part->widget(), 0, 0, 0 );
       searchDialog->resize(400,300);
       // We do not want the dialog to be closed if the user presses return.
       // Instead we want that a search is started:
diff --git a/smb4k/browser/smb4knetworkbrowsertooltip.h b/smb4k/browser/smb4knetworkbrowsertooltip.h
index a389991..beb9fa3 100644
--- a/smb4k/browser/smb4knetworkbrowsertooltip.h
+++ b/smb4k/browser/smb4knetworkbrowsertooltip.h
@@ -110,7 +110,7 @@ class Smb4KNetworkBrowserToolTip : public TQLabel
     Smb4KNetworkBrowserItem *m_item;
 
     /**
-     * The tqlayout for the tool tip
+     * The layout for the tool tip
      */
     TQGridLayout *m_layout;
 
diff --git a/smb4k/configdlg/smb4ksambaoptions.cpp b/smb4k/configdlg/smb4ksambaoptions.cpp
index 8eb6194..db83aa8 100644
--- a/smb4k/configdlg/smb4ksambaoptions.cpp
+++ b/smb4k/configdlg/smb4ksambaoptions.cpp
@@ -196,7 +196,7 @@ Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *parent, const char *name )
   codepage->insertItem( "cp1256", Smb4KSettings::EnumServerCodepage::cp1256 );
   codepage->insertItem( "cp1257", Smb4KSettings::EnumServerCodepage::cp1257 );
   codepage->insertItem( "cp1258", Smb4KSettings::EnumServerCodepage::cp1258 );
-  codepage->insertItem( "tqunicode", Smb4KSettings::EnumServerCodepage::unicode );
+  codepage->insertItem( "unicode", Smb4KSettings::EnumServerCodepage::unicode );
 
   TQGroupBox *perms_box =        new TQGroupBox( 2, Qt::Horizontal,
                                 i18n( "Permissions" ), mount_tab );
diff --git a/smb4k/core/smb4khomesshareshandler.cpp b/smb4k/core/smb4khomesshareshandler.cpp
index bf1431a..612171c 100644
--- a/smb4k/core/smb4khomesshareshandler.cpp
+++ b/smb4k/core/smb4khomesshareshandler.cpp
@@ -77,8 +77,8 @@ const TQString Smb4KHomesSharesHandler::specifyUser( const TQString &host, TQWid
 
   // Set up the ask pass dialog.
   TQFrame *frame = m_dlg->plainPage();
-  TQGridLayout *tqlayout = new TQGridLayout( frame );
-  tqlayout->setSpacing( 5 );
+  TQGridLayout *layout = new TQGridLayout( frame );
+  layout->setSpacing( 5 );
 
   TQLabel *pic = new TQLabel( frame );
   pic->setPixmap( DesktopIcon( "personal" ) );
@@ -92,11 +92,11 @@ const TQString Smb4KHomesSharesHandler::specifyUser( const TQString &host, TQWid
 
   TQSpacerItem *spacer1 = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Preferred );
 
-  tqlayout->addWidget( pic, 0, 0, 0 );
-  tqlayout->addMultiCellWidget( text, 0, 0, 1, 3, 0 );
-  tqlayout->addWidget( userLabel, 1, 0, 0 );
-  tqlayout->addMultiCellWidget( userCombo, 1, 1, 1, 4, 0 );
-  tqlayout->addItem( spacer1, 0, 2 );
+  layout->addWidget( pic, 0, 0, 0 );
+  layout->addMultiCellWidget( text, 0, 0, 1, 3, 0 );
+  layout->addWidget( userLabel, 1, 0, 0 );
+  layout->addMultiCellWidget( userCombo, 1, 1, 1, 4, 0 );
+  layout->addItem( spacer1, 0, 2 );
 
   connect( userCombo, TQT_SIGNAL( textChanged( const TQString &) ),
            this,      TQT_SLOT( slotTextChanged( const TQString & ) ) );
diff --git a/smb4k/core/smb4kpasswordhandler.cpp b/smb4k/core/smb4kpasswordhandler.cpp
index 2b0b21f..0d6f5e4 100644
--- a/smb4k/core/smb4kpasswordhandler.cpp
+++ b/smb4k/core/smb4kpasswordhandler.cpp
@@ -238,15 +238,15 @@ bool Smb4KPasswordHandler::askpass( const TQString &workgroup, const TQString &h
                            KDialogBase::Ok, parent, name, true, true );
 
   TQFrame *frame = m_dlg->plainPage();
-  TQGridLayout *tqlayout = new TQGridLayout( frame );
-  tqlayout->setSpacing( 5 );
-  tqlayout->setMargin( 0 );
+  TQGridLayout *layout = new TQGridLayout( frame );
+  layout->setSpacing( 5 );
+  layout->setMargin( 0 );
 
   TQLabel *pixmap_label = new TQLabel( frame );
   pixmap_label->setPixmap( DesktopIcon( "identity" ) );
   pixmap_label->adjustSize();
 
-  tqlayout->addWidget( pixmap_label, 0, 0, TQt::AlignCenter );
+  layout->addWidget( pixmap_label, 0, 0, TQt::AlignCenter );
 
   TQString message;
 
@@ -286,10 +286,10 @@ bool Smb4KPasswordHandler::askpass( const TQString &workgroup, const TQString &h
   message_label->setText( message.stripWhiteSpace() );
   message_label->setTextFormat( TQt::RichText );
 
-  tqlayout->addWidget( message_label, 0, 1, 0 );
+  layout->addWidget( message_label, 0, 1, 0 );
 
   TQLabel *user_label = new TQLabel( i18n( "User:" ), frame );
-  tqlayout->addWidget( user_label, 1, 0, 0 );
+  layout->addWidget( user_label, 1, 0, 0 );
 
   KLineEdit *user_edit = NULL;
   KComboBox *user_combo = NULL;
@@ -298,22 +298,22 @@ bool Smb4KPasswordHandler::askpass( const TQString &workgroup, const TQString &h
   {
     user_edit = new KLineEdit( frame, "AskPassUserEdit" );
     user_edit->setMinimumWidth( 200 );
-    tqlayout->addWidget( user_edit, 1, 1, 0 );
+    layout->addWidget( user_edit, 1, 1, 0 );
   }
   else
   {
     user_combo = new KComboBox( frame, "AskPassUserCombo" );
     user_combo->setEditable( true );
     user_combo->setMinimumWidth( 200 );
-    tqlayout->addWidget( user_combo, 1, 1, 0 );
+    layout->addWidget( user_combo, 1, 1, 0 );
   }
 
   TQLabel *password_label = new TQLabel( i18n( "Password:" ), frame );
-  tqlayout->addWidget( password_label, 2, 0, 0 );
+  layout->addWidget( password_label, 2, 0, 0 );
 
   KLineEdit *pass_edit = new KLineEdit( frame, "AskPassPasswordEdit" );
   pass_edit->setEchoMode( KLineEdit::Password );
-  tqlayout->addWidget( pass_edit, 2, 1, 0 );
+  layout->addWidget( pass_edit, 2, 1, 0 );
 
   m_dlg->setMainWidget( frame );
   m_dlg->setFixedSize( 350, m_dlg->sizeHint().height() );
diff --git a/smb4k/core/smb4ksambaoptionshandler.cpp b/smb4k/core/smb4ksambaoptionshandler.cpp
index 5fa49ae..7ffd3b5 100644
--- a/smb4k/core/smb4ksambaoptionshandler.cpp
+++ b/smb4k/core/smb4ksambaoptionshandler.cpp
@@ -1167,7 +1167,7 @@ const TQString Smb4KSambaOptionsHandler::mountOptions( const TQString &share )
     }
     case Smb4KSettings::EnumServerCodepage::unicode:
     {
-      codepage = "tqunicode";
+      codepage = "unicode";
 
       break;
     }
@@ -1299,7 +1299,7 @@ const TQString Smb4KSambaOptionsHandler::mountOptions( const TQString &share )
                    TQString() );
 
       args.append( Smb4KSettings::unicodeSupport() ?
-                   "tqunicode," :
+                   "unicode," :
                    TQString() );
 
       args.append( Smb4KSettings::largeFileSystemSupport() ?
diff --git a/smb4k/core/smb4ksettings.cpp b/smb4k/core/smb4ksettings.cpp
index 28e7752..4bbac1c 100644
--- a/smb4k/core/smb4ksettings.cpp
+++ b/smb4k/core/smb4ksettings.cpp
@@ -650,7 +650,7 @@ Smb4KSettings::Smb4KSettings(  )
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::fromLatin1( "tqunicode" );
+    choice.name = TQString::fromLatin1( "unicode" );
     valuesServerCodepage.append( choice );
   }
   mServerCodepageItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "ServerCodepage" ), mServerCodepage, valuesServerCodepage, EnumServerCodepage::default_codepage );
diff --git a/smb4k/dialogs/smb4kbookmarkeditor.cpp b/smb4k/dialogs/smb4kbookmarkeditor.cpp
index d6e33af..858a628 100644
--- a/smb4k/dialogs/smb4kbookmarkeditor.cpp
+++ b/smb4k/dialogs/smb4kbookmarkeditor.cpp
@@ -54,8 +54,8 @@ Smb4KBookmarkEditor::Smb4KBookmarkEditor( TQWidget *parent, const char *name )
   setWFlags( TQt::WDestructiveClose );
 
   TQFrame *frame = plainPage();
-  TQGridLayout *tqlayout = new TQGridLayout( frame );
-  tqlayout->setSpacing( 5 );
+  TQGridLayout *layout = new TQGridLayout( frame );
+  layout->setSpacing( 5 );
 
   m_view = new KListView( frame );
   m_view->addColumn( i18n( "Bookmark" ), Bookmark );
@@ -77,7 +77,7 @@ Smb4KBookmarkEditor::Smb4KBookmarkEditor( TQWidget *parent, const char *name )
 
   slotLoadBookmarks();
 
-  tqlayout->addWidget( m_view, 0, 0, 0 );
+  layout->addWidget( m_view, 0, 0, 0 );
 
   setInitialSize( configDialogSize( *(Smb4KSettings::self()->config()), "BookmarkEditor" ) );
   setMinimumSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() );
diff --git a/smb4k/dialogs/smb4kcustomoptionsdialog.cpp b/smb4k/dialogs/smb4kcustomoptionsdialog.cpp
index 6d70f08..aafd87c 100644
--- a/smb4k/dialogs/smb4kcustomoptionsdialog.cpp
+++ b/smb4k/dialogs/smb4kcustomoptionsdialog.cpp
@@ -167,7 +167,7 @@ void Smb4KCustomOptionsDialog::setupDialog()
   m_port_input->setMinValue( -1 );
   m_port_input->setMaxValue( 65535 );
 
-  // The widgets will be put into the tqlayout below.
+  // The widgets will be put into the layout below.
 
   // Here comes the item-dependent stuff:
   switch ( m_type )
diff --git a/smb4k/dialogs/smb4kmountdialog.cpp b/smb4k/dialogs/smb4kmountdialog.cpp
index 0bc109a..b3849da 100644
--- a/smb4k/dialogs/smb4kmountdialog.cpp
+++ b/smb4k/dialogs/smb4kmountdialog.cpp
@@ -63,9 +63,9 @@ Smb4KMountDialog::~Smb4KMountDialog()
 void Smb4KMountDialog::setupView()
 {
   TQFrame *frame = plainPage();
-  TQGridLayout *tqlayout = new TQGridLayout( frame );
-  tqlayout->setSpacing( 5 );
-  tqlayout->setMargin( 0 );
+  TQGridLayout *layout = new TQGridLayout( frame );
+  layout->setSpacing( 5 );
+  layout->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" );
 
-  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 );
+  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 );
 
   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 f9a3d13..79d420d 100644
--- a/smb4k/dialogs/smb4kpreviewdialog.cpp
+++ b/smb4k/dialogs/smb4kpreviewdialog.cpp
@@ -92,7 +92,7 @@ Smb4KPreviewDialog::~Smb4KPreviewDialog()
 void Smb4KPreviewDialog::setupView()
 {
   TQFrame *frame = plainPage();
-  TQGridLayout *tqlayout = new TQGridLayout( frame );
+  TQGridLayout *layout = 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 );
 
-  tqlayout->addWidget( m_view, 0, 0, 0 );
-  tqlayout->addWidget( m_toolbar, 1, 0, 0 );
+  layout->addWidget( m_view, 0, 0, 0 );
+  layout->addWidget( m_toolbar, 1, 0, 0 );
 }
 
 
diff --git a/smb4k/dialogs/smb4kprintdialog.cpp b/smb4k/dialogs/smb4kprintdialog.cpp
index 1cef14a..b869174 100644
--- a/smb4k/dialogs/smb4kprintdialog.cpp
+++ b/smb4k/dialogs/smb4kprintdialog.cpp
@@ -65,8 +65,8 @@ m_item( item ), m_ip( TQString() ) /* will collect it in an instant */
   // Bild the view:
   TQFrame *frame = plainPage();
 
-  TQGridLayout *tqlayout = new TQGridLayout( frame );
-  tqlayout->setSpacing( 10 );
+  TQGridLayout *layout = new TQGridLayout( frame );
+  layout->setSpacing( 10 );
 
   TQGroupBox *p = new TQGroupBox( 2, Qt::Horizontal, i18n( "Printer" ), frame );
   p->setInsideSpacing( 5 );
@@ -108,8 +108,8 @@ m_item( item ), m_ip( TQString() ) /* will collect it in an instant */
   KIntNumInput *cp = new KIntNumInput( 1, s, 10, "Copies" );
   cp->setMinValue( 1 );
 
-  tqlayout->addWidget( p, 0, 0, 0 );
-  tqlayout->addWidget( f, 1, 0, 0 );
+  layout->addWidget( p, 0, 0, 0 );
+  layout->addWidget( f, 1, 0, 0 );
 
   setFixedSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() );
 
diff --git a/smb4k/dialogs/smb4ksynchronizationdialog.cpp b/smb4k/dialogs/smb4ksynchronizationdialog.cpp
index 4794a80..f91c587 100644
--- a/smb4k/dialogs/smb4ksynchronizationdialog.cpp
+++ b/smb4k/dialogs/smb4ksynchronizationdialog.cpp
@@ -53,9 +53,9 @@ m_share( share )
   setButtonGuiItem( User2, KGuiItem( i18n( "Swap Paths" ), TQString(), i18n( "Swap source and destination" ) ) );
 
   TQFrame *frame = plainPage();
-  TQGridLayout *tqlayout = new TQGridLayout( frame );
-  tqlayout->setSpacing( 5 );
-  tqlayout->setMargin( 0 );
+  TQGridLayout *layout = new TQGridLayout( frame );
+  layout->setSpacing( 5 );
+  layout->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 );
 
-  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 );
+  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 );
 
   // Connections
   connect( Smb4KCore::synchronizer(), TQT_SIGNAL( progress( const Smb4KSynchronizationInfo & ) ),
diff --git a/smb4k/iconview/smb4ksharesiconviewtooltip.h b/smb4k/iconview/smb4ksharesiconviewtooltip.h
index 4b61345..62e7f6f 100644
--- a/smb4k/iconview/smb4ksharesiconviewtooltip.h
+++ b/smb4k/iconview/smb4ksharesiconviewtooltip.h
@@ -115,7 +115,7 @@ class Smb4KSharesIconViewToolTip : public TQLabel
     Smb4KSharesIconViewItem *m_item;
 
     /**
-     * The tqlayout of the tool tip.
+     * The layout of the tool tip.
      */
     TQGridLayout *m_layout;
 
diff --git a/smb4k/listview/smb4kshareslistviewtooltip.h b/smb4k/listview/smb4kshareslistviewtooltip.h
index 41fc91f..6480574 100644
--- a/smb4k/listview/smb4kshareslistviewtooltip.h
+++ b/smb4k/listview/smb4kshareslistviewtooltip.h
@@ -115,7 +115,7 @@ class Smb4KSharesListViewToolTip : public TQLabel
     Smb4KSharesListViewItem *m_item;
 
     /**
-     * The tqlayout of the tool tip.
+     * The layout of the tool tip.
      */
     TQGridLayout *m_layout;
 
diff --git a/smb4k/searchdlg/smb4ksearchdialog.cpp b/smb4k/searchdlg/smb4ksearchdialog.cpp
index 5b63110..83bad5f 100644
--- a/smb4k/searchdlg/smb4ksearchdialog.cpp
+++ b/smb4k/searchdlg/smb4ksearchdialog.cpp
@@ -41,8 +41,8 @@
 Smb4KSearchDialog::Smb4KSearchDialog( TQWidget *parent, const char *name )
 : TQWidget( parent, name )
 {
-  TQGridLayout *tqlayout = new TQGridLayout( this );
-  tqlayout->setSpacing( 5 );
+  TQGridLayout *layout = new TQGridLayout( this );
+  layout->setSpacing( 5 );
 
   // Tool bar
   m_tool_bar = new KToolBar( this, "SearchDialogToolBar", true, true );
@@ -64,8 +64,8 @@ Smb4KSearchDialog::Smb4KSearchDialog( TQWidget *parent, const char *name )
   m_list_view->header()->hide();
   m_list_view->setSelectionMode( TQListView::Single );
 
-  tqlayout->addWidget( m_tool_bar, 0, 0, 0 );
-  tqlayout->addWidget( m_list_view, 1, 0, 0 );
+  layout->addWidget( m_tool_bar, 0, 0, 0 );
+  layout->addWidget( m_list_view, 1, 0, 0 );
 
   m_search_string = TQString();