diff options
44 files changed, 799 insertions, 799 deletions
diff --git a/plugin/smb4k_konqplugin.cpp b/plugin/smb4k_konqplugin.cpp index 1a5a1c4..9a23567 100644 --- a/plugin/smb4k_konqplugin.cpp +++ b/plugin/smb4k_konqplugin.cpp @@ -24,7 +24,7 @@ #include <tqtooltip.h> #include <tqstring.h> #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqheader.h> #include <tqvaluelist.h> @@ -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/smb4knetworkbrowser_part.cpp b/smb4k/browser/smb4knetworkbrowser_part.cpp index 4d905a1..3ef0e6c 100644 --- a/smb4k/browser/smb4knetworkbrowser_part.cpp +++ b/smb4k/browser/smb4knetworkbrowser_part.cpp @@ -619,7 +619,7 @@ void Smb4KNetworkBrowserPart::slotItemCollapsed( TQListViewItem *item ) { Smb4KNetworkBrowserItem *browser_item = static_cast<Smb4KNetworkBrowserItem *>( item ); - // Remove all tqchildren if we have a host item, because we + // Remove all children if we have a host item, because we // do not want shares already displayed before the user provided // the login data. if ( browser_item && browser_item->type() == Smb4KNetworkBrowserItem::Host ) @@ -903,7 +903,7 @@ void Smb4KNetworkBrowserPart::slotWorkgroupMembers( const TQString &workgroup, c } else { - // Add the tqchildren to the childless host item: + // Add the children to the childless host item: for ( TQValueList<Smb4KHostItem *>::ConstIterator it = list.begin(); it != list.end(); ++it ) { // In case the whole list of known hosts is emitted by the scanner, @@ -1151,7 +1151,7 @@ void Smb4KNetworkBrowserPart::slotShares( const TQString &host, const TQValueLis } else { - // Add the tqchildren to the childless host item: + // Add the children to the childless host item: for ( TQValueList<Smb4KShareItem *>::ConstIterator it = list.begin(); it != list.end(); ++it ) { // Respect the settings the user chose to use: @@ -1331,7 +1331,7 @@ void Smb4KNetworkBrowserPart::slotInsertHost( Smb4KHostItem *item ) if ( workgroup_item ) { // Check if the host item is already there. We traverse - // workgroup's tqchildren for that: + // workgroup's children for that: Smb4KNetworkBrowserItem *host_item = static_cast<Smb4KNetworkBrowserItem *>( workgroup_item->firstChild() ); while ( host_item ) @@ -1676,7 +1676,7 @@ void Smb4KNetworkBrowserPart::slotUnmount() if ( browser_item && browser_item->type() == Smb4KNetworkBrowserItem::Share && browser_item->isMounted() ) { - TQString share_name = TQString( "//%1/%2" ).tqarg( browser_item->shareItem()->host(), + TQString share_name = TQString( "//%1/%2" ).arg( browser_item->shareItem()->host(), browser_item->shareItem()->name() ); TQValueList<Smb4KShare> list = Smb4KCore::mounter()->findShareByName( share_name ); @@ -1729,7 +1729,7 @@ void Smb4KNetworkBrowserPart::slotMarkMountedShares() { Smb4KShareItem *share_item = static_cast<Smb4KNetworkBrowserItem *>( item )->shareItem(); - TQValueList<Smb4KShare> list = Smb4KCore::mounter()->findShareByName( TQString( "//%1/%2" ).tqarg( share_item->host(), share_item->name() ) ); + TQValueList<Smb4KShare> list = Smb4KCore::mounter()->findShareByName( TQString( "//%1/%2" ).arg( share_item->host(), share_item->name() ) ); if ( list.isEmpty() ) { diff --git a/smb4k/browser/smb4knetworkbrowser_part.h b/smb4k/browser/smb4knetworkbrowser_part.h index 78cc7fb..8b29f31 100644 --- a/smb4k/browser/smb4knetworkbrowser_part.h +++ b/smb4k/browser/smb4knetworkbrowser_part.h @@ -185,7 +185,7 @@ class Smb4KNetworkBrowserPart : public KParts::Part /** * This slot receives the list of shared resources a host provides. It takes - * this @p list and inserts its items as tqchildren of @p host into the list + * this @p list and inserts its items as children of @p host into the list * view. Obsolete items will be deleted from the network browser. * * @param host The host where the shares belong diff --git a/smb4k/browser/smb4knetworkbrowsertooltip.h b/smb4k/browser/smb4knetworkbrowsertooltip.h index a389991..aea9f25 100644 --- a/smb4k/browser/smb4knetworkbrowsertooltip.h +++ b/smb4k/browser/smb4knetworkbrowsertooltip.h @@ -32,7 +32,7 @@ // TQt includes #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> // Forward declarations: class Smb4KNetworkBrowserItem; @@ -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/smb4kauthoptions.cpp b/smb4k/configdlg/smb4kauthoptions.cpp index ac9c918..3b07c9c 100644 --- a/smb4k/configdlg/smb4kauthoptions.cpp +++ b/smb4k/configdlg/smb4kauthoptions.cpp @@ -26,7 +26,7 @@ // TQt includes #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <tqbuttongroup.h> #include <tqlabel.h> diff --git a/smb4k/configdlg/smb4kconfigdialog.cpp b/smb4k/configdlg/smb4kconfigdialog.cpp index 07b689c..2326389 100644 --- a/smb4k/configdlg/smb4kconfigdialog.cpp +++ b/smb4k/configdlg/smb4kconfigdialog.cpp @@ -316,8 +316,8 @@ void Smb4KConfigDialog::loadCustomSambaOptions() item->setText( Smb4KSambaOptions::ItemName, (*it)->itemName() ); item->setText( Smb4KSambaOptions::Port, ((*it)->port() != -1 ? - TQString( "%1" ).tqarg( (*it)->port() ) : - TQString( "%1" ).tqarg( Smb4KSettings::remotePort() )) ); + TQString( "%1" ).arg( (*it)->port() ) : + TQString( "%1" ).arg( Smb4KSettings::remotePort() )) ); switch ( (*it)->type() ) { @@ -905,11 +905,11 @@ bool Smb4KConfigDialog::checkSettings() { if ( index == 1 ) { - KMessageBox::error( this, i18n( "The configuration could not be written, because one setting is incomplete:\n%1Please correct this issue." ).tqarg( issues ) ); + KMessageBox::error( this, i18n( "The configuration could not be written, because one setting is incomplete:\n%1Please correct this issue." ).arg( issues ) ); } else { - KMessageBox::error( this, i18n( "The configuration could not be written, because %1 settings are incomplete:\n%1Please correct these issues." ).tqarg( index ).tqarg( issues ) ); + KMessageBox::error( this, i18n( "The configuration could not be written, because %1 settings are incomplete:\n%1Please correct these issues." ).arg( index ).arg( issues ) ); } } diff --git a/smb4k/configdlg/smb4knetworkoptions.cpp b/smb4k/configdlg/smb4knetworkoptions.cpp index eab4640..85a1846 100644 --- a/smb4k/configdlg/smb4knetworkoptions.cpp +++ b/smb4k/configdlg/smb4knetworkoptions.cpp @@ -26,7 +26,7 @@ // TQt includes #include <tqbuttongroup.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqlabel.h> diff --git a/smb4k/configdlg/smb4krsyncoptions.cpp b/smb4k/configdlg/smb4krsyncoptions.cpp index cd2b75c..212ba67 100644 --- a/smb4k/configdlg/smb4krsyncoptions.cpp +++ b/smb4k/configdlg/smb4krsyncoptions.cpp @@ -24,7 +24,7 @@ ***************************************************************************/ // TQt includes -#include <tqlayout.h> +#include <layout.h> #include <tqbuttongroup.h> #include <tqcheckbox.h> #include <tqlabel.h> diff --git a/smb4k/configdlg/smb4ksambaoptions.cpp b/smb4k/configdlg/smb4ksambaoptions.cpp index e80c561..b7bdd2c 100644 --- a/smb4k/configdlg/smb4ksambaoptions.cpp +++ b/smb4k/configdlg/smb4ksambaoptions.cpp @@ -25,7 +25,7 @@ ***************************************************************************/ // TQt includes -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <tqlabel.h> #include <tqcheckbox.h> @@ -126,11 +126,11 @@ Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *parent, const char *name ) (void) new TQLabel( i18n( "User ID:" ), user_group_box ); KLineEdit *user_id = new KLineEdit( user_group_box, "kcfg_UserID" ); - user_id->tqsetAlignment( TQt::AlignRight ); + user_id->setAlignment( TQt::AlignRight ); (void) new TQLabel( i18n( "Group ID:" ), user_group_box ); KLineEdit *group_id = new KLineEdit( user_group_box, "kcfg_GroupID" ); - group_id->tqsetAlignment( TQt::AlignRight ); + group_id->setAlignment( TQt::AlignRight ); TQGroupBox *charset_box = new TQGroupBox( 2, Qt::Horizontal, i18n( "Charset and Codepage" ), mount_tab ); @@ -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 ); @@ -204,11 +204,11 @@ Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *parent, const char *name ) (void) new TQLabel( i18n( "File mask:" ), perms_box ); KLineEdit *fmask = new KLineEdit( perms_box, "kcfg_FileMask" ); - fmask->tqsetAlignment( TQt::AlignRight ); + fmask->setAlignment( TQt::AlignRight ); (void) new TQLabel( i18n( "Directory mask:" ), perms_box ); KLineEdit *dmask = new KLineEdit( perms_box, "kcfg_DirectoryMask" ); - dmask->tqsetAlignment( TQt::AlignRight ); + dmask->setAlignment( TQt::AlignRight ); (void) new TQLabel( i18n( "Write access:" ), perms_box ); KComboBox *read_mode = new KComboBox( perms_box, "kcfg_WriteAccess" ); @@ -1176,7 +1176,7 @@ void Smb4KSambaOptions::slotCustomPortChanged( int port ) if ( view && view->selectedItem() ) { - view->selectedItem()->setText( Port, TQString( "%1" ).tqarg( port ) ); + view->selectedItem()->setText( Port, TQString( "%1" ).arg( port ) ); emit customSettingsChanged(); } diff --git a/smb4k/configdlg/smb4kshareoptions.cpp b/smb4k/configdlg/smb4kshareoptions.cpp index d1667d2..593f147 100644 --- a/smb4k/configdlg/smb4kshareoptions.cpp +++ b/smb4k/configdlg/smb4kshareoptions.cpp @@ -25,7 +25,7 @@ ***************************************************************************/ // TQt includes -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <tqbuttongroup.h> #include <tqlabel.h> @@ -67,7 +67,7 @@ Smb4KShareOptions::Smb4KShareOptions( TQWidget *parent, const char *name ) : TQW dir_box, "kcfg_ForceLowerCaseSubdirs" ); TQButtonGroup *mount_box = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Mounting and Unmounting" ), this ); - (void) new TQCheckBox( i18n( "Unmount all shares of user %1 on exit" ).tqarg( getpwuid( getuid() )->pw_name ), + (void) new TQCheckBox( i18n( "Unmount all shares of user %1 on exit" ).arg( getpwuid( getuid() )->pw_name ), mount_box, "kcfg_UnmountSharesOnExit" ); (void) new TQCheckBox( i18n( "Remount recently used shares on program start" ), mount_box, "kcfg_RemountShares" ); diff --git a/smb4k/configdlg/smb4ksuperuseroptions.cpp b/smb4k/configdlg/smb4ksuperuseroptions.cpp index a3e422e..5cc0136 100644 --- a/smb4k/configdlg/smb4ksuperuseroptions.cpp +++ b/smb4k/configdlg/smb4ksuperuseroptions.cpp @@ -28,7 +28,7 @@ #include <tqgroupbox.h> #include <tqbuttongroup.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqcheckbox.h> diff --git a/smb4k/configdlg/smb4kuserinterfaceoptions.cpp b/smb4k/configdlg/smb4kuserinterfaceoptions.cpp index 5f7f465..e2e0570 100644 --- a/smb4k/configdlg/smb4kuserinterfaceoptions.cpp +++ b/smb4k/configdlg/smb4kuserinterfaceoptions.cpp @@ -25,7 +25,7 @@ ***************************************************************************/ // TQt includes -#include <tqlayout.h> +#include <layout.h> #include <tqbuttongroup.h> #include <tqcheckbox.h> #include <tqradiobutton.h> diff --git a/smb4k/core/smb4kbookmark.cpp b/smb4k/core/smb4kbookmark.cpp index 2edae5f..1e02dd2 100644 --- a/smb4k/core/smb4kbookmark.cpp +++ b/smb4k/core/smb4kbookmark.cpp @@ -39,7 +39,7 @@ Smb4KBookmark::Smb4KBookmark( const TQString &host, const TQString &share, const //FIXME should throw an exception if one of the param is empty m_ip = ipIsValid( ip ) ? ip : TQString(); - m_bookmark = TQString( "//%1/%2" ).tqarg( m_host, m_share ); + m_bookmark = TQString( "//%1/%2" ).arg( m_host, m_share ); } @@ -48,7 +48,7 @@ Smb4KBookmark::Smb4KBookmark( Smb4KShareItem *item, const TQString &ip, const TQ m_type( item->plainType() ), m_label( label ) { m_ip = ipIsValid( ip ) ? ip : TQString(); - m_bookmark = TQString( "//%1/%2" ).tqarg( m_host, m_share ); + m_bookmark = TQString( "//%1/%2" ).arg( m_host, m_share ); } @@ -61,7 +61,7 @@ void Smb4KBookmark::setShareName( const TQString &name ) { m_share = name; - m_bookmark = TQString( "//%1/%2" ).tqarg( m_host, m_share ); + m_bookmark = TQString( "//%1/%2" ).arg( m_host, m_share ); } diff --git a/smb4k/core/smb4kbookmarkhandler.cpp b/smb4k/core/smb4kbookmarkhandler.cpp index 26215b8..0788f89 100644 --- a/smb4k/core/smb4kbookmarkhandler.cpp +++ b/smb4k/core/smb4kbookmarkhandler.cpp @@ -165,7 +165,7 @@ void Smb4KBookmarkHandler::writeBookmarkList( const TQValueList<Smb4KBookmark *> { Smb4KError::information( INFO_BOOKMARK_LABEL_IN_USE, (*it)->label(), (*it)->bookmark() ); - (*it)->setLabel( TQString( "%1 (%2)" ).tqarg( (*it)->label() ).tqarg( serial_number++ ) ); + (*it)->setLabel( TQString( "%1 (%2)" ).arg( (*it)->label() ).arg( serial_number++ ) ); } } diff --git a/smb4k/core/smb4kcore.cpp b/smb4k/core/smb4kcore.cpp index ec13b82..a63d4d8 100644 --- a/smb4k/core/smb4kcore.cpp +++ b/smb4k/core/smb4kcore.cpp @@ -297,7 +297,7 @@ void Smb4KCore::searchPrograms() Smb4KSettings::self()->readConfig(); // List of paths that should be searched. - TQStringList path_list = TQStringList::split( ":", TQString( "%1" ).tqarg( getenv( "PATH" ) ), false ); + TQStringList path_list = TQStringList::split( ":", TQString( "%1" ).arg( getenv( "PATH" ) ), false ); if ( path_list.find( "/sbin" ) == path_list.end() ) { diff --git a/smb4k/core/smb4kerror.cpp b/smb4k/core/smb4kerror.cpp index b8bffe1..d814db4 100644 --- a/smb4k/core/smb4kerror.cpp +++ b/smb4k/core/smb4kerror.cpp @@ -89,7 +89,7 @@ void Smb4KError::error( int code, const TQString &text, const TQString &details } case ERROR_OPENING_WALLET_FAILED: { - KMessageBox::error( 0, i18n( "The wallet \"%1\" could not be opened. KWallet support will be disabled for this session." ).tqarg( text ) ); + KMessageBox::error( 0, i18n( "The wallet \"%1\" could not be opened. KWallet support will be disabled for this session." ).arg( text ) ); break; } @@ -116,11 +116,11 @@ void Smb4KError::error( int code, const TQString &text, const TQString &details { if ( details.stripWhiteSpace().isEmpty() ) { - KMessageBox::error( 0, i18n( "The share \"%1\" could not be mounted.\nDetailed information cannot be provided because there was no error message." ).tqarg( text ) ); + KMessageBox::error( 0, i18n( "The share \"%1\" could not be mounted.\nDetailed information cannot be provided because there was no error message." ).arg( text ) ); } else { - KMessageBox::detailedError( 0, i18n( "The share \"%1\" could not be mounted.\nRead the error message under \"Details\" to find out more." ).tqarg( text ), details ); + KMessageBox::detailedError( 0, i18n( "The share \"%1\" could not be mounted.\nRead the error message under \"Details\" to find out more." ).arg( text ), details ); } break; @@ -129,18 +129,18 @@ void Smb4KError::error( int code, const TQString &text, const TQString &details { if ( details.stripWhiteSpace().isEmpty() ) { - KMessageBox::error( 0, i18n( "The share \"%1\" could not be unmounted.\nDetailed information cannot be provided because there was no error message." ).tqarg( text ) ); + KMessageBox::error( 0, i18n( "The share \"%1\" could not be unmounted.\nDetailed information cannot be provided because there was no error message." ).arg( text ) ); } else { - KMessageBox::detailedError( 0, i18n( "The share \"%1\" could not be unmounted.\nRead the error message under \"Details\" to find out more." ).tqarg( text ), details ); + KMessageBox::detailedError( 0, i18n( "The share \"%1\" could not be unmounted.\nRead the error message under \"Details\" to find out more." ).arg( text ), details ); } break; } case ERROR_FILE_NOT_FOUND: { - KMessageBox::error( 0, i18n( "The file \"%1\" could not be found." ).tqarg( text ) ); + KMessageBox::error( 0, i18n( "The file \"%1\" could not be found." ).arg( text ) ); break; } @@ -148,11 +148,11 @@ void Smb4KError::error( int code, const TQString &text, const TQString &details { if ( details.stripWhiteSpace().isEmpty() ) { - KMessageBox::error( 0, i18n( "The file \"%1\" could not be read." ).tqarg( text ) ); + KMessageBox::error( 0, i18n( "The file \"%1\" could not be read." ).arg( text ) ); } else { - KMessageBox::detailedError( 0, i18n( "The file \"%1\" could not be read.\nRead the error message under \"Details\" to find out more." ).tqarg( text ), details ); + KMessageBox::detailedError( 0, i18n( "The file \"%1\" could not be read.\nRead the error message under \"Details\" to find out more." ).arg( text ), details ); } break; @@ -172,25 +172,25 @@ void Smb4KError::error( int code, const TQString &text, const TQString &details } case ERROR_MISSING_PROGRAMS: { - KMessageBox::error( 0, i18n( "Either your PATH environment variable is not set properly or there are the following programs missing on your system:\n%1\nPlease correct this and restart Smb4K." ).tqarg( text ) ); + KMessageBox::error( 0, i18n( "Either your PATH environment variable is not set properly or there are the following programs missing on your system:\n%1\nPlease correct this and restart Smb4K." ).arg( text ) ); break; } case ERROR_LOCKED: { - KMessageBox::error( 0, i18n( "The file \"%1\" is currently being edited by user %2. To avoid any problems, access to this file is denied at the moment. Please try again later." ).tqarg( text.section( ":", 1, 1 ), text.section( ":", 0, 0 ) ) ); + KMessageBox::error( 0, i18n( "The file \"%1\" is currently being edited by user %2. To avoid any problems, access to this file is denied at the moment. Please try again later." ).arg( text.section( ":", 1, 1 ), text.section( ":", 0, 0 ) ) ); break; } case ERROR_MKDIR_FAILED: { - KMessageBox::error( 0, i18n( "The directory \"%1\" could not be created." ).tqarg( text ) ); + KMessageBox::error( 0, i18n( "The directory \"%1\" could not be created." ).arg( text ) ); break; } case ERROR_WRITING_FILE: { - KMessageBox::error( 0, i18n( "The file \"%1\" could not be written." ).tqarg( text ) ); + KMessageBox::error( 0, i18n( "The file \"%1\" could not be written." ).arg( text ) ); break; } @@ -233,7 +233,7 @@ void Smb4KError::error( int code, const TQString &text, const TQString &details } case ERROR_COMMAND_NOT_FOUND: { - KMessageBox::error( 0, i18n( "The command \"%1\" could not be found." ).tqarg( text ) ); + KMessageBox::error( 0, i18n( "The command \"%1\" could not be found." ).arg( text ) ); break; } @@ -241,11 +241,11 @@ void Smb4KError::error( int code, const TQString &text, const TQString &details { if ( details.stripWhiteSpace().isEmpty() ) { - KMessageBox::error( 0, i18n( "The file \"%1\" could not be printed.\nDetailed information cannot be provided because there was no error message." ).tqarg( text ) ); + KMessageBox::error( 0, i18n( "The file \"%1\" could not be printed.\nDetailed information cannot be provided because there was no error message." ).arg( text ) ); } else { - KMessageBox::detailedError( 0, i18n( "The file \"%1\" could not be printed.\nRead the error message under \"Details\" to find out more." ).tqarg( text ), details ); + KMessageBox::detailedError( 0, i18n( "The file \"%1\" could not be printed.\nRead the error message under \"Details\" to find out more." ).arg( text ), details ); } break; @@ -254,11 +254,11 @@ void Smb4KError::error( int code, const TQString &text, const TQString &details { if ( details.stripWhiteSpace().isEmpty() ) { - KMessageBox::error( 0, i18n( "The temporary directory \"%1\" could not be created.\nDetailed information cannot be provided because there was no error message." ).tqarg( text ) ); + KMessageBox::error( 0, i18n( "The temporary directory \"%1\" could not be created.\nDetailed information cannot be provided because there was no error message." ).arg( text ) ); } else { - KMessageBox::detailedError( 0, i18n( "The temporary directory \"%1\" could not be created.\nRead the error message under \"Details\" to find out more." ).tqarg( text ), details ); + KMessageBox::detailedError( 0, i18n( "The temporary directory \"%1\" could not be created.\nRead the error message under \"Details\" to find out more." ).arg( text ), details ); } break; @@ -267,24 +267,24 @@ void Smb4KError::error( int code, const TQString &text, const TQString &details { if ( details.stripWhiteSpace().isEmpty() ) { - KMessageBox::error( 0, i18n( "The temporary file \"%1\" could not be created.\nDetailed information cannot be provided because there was no error message." ).tqarg( text ) ); + KMessageBox::error( 0, i18n( "The temporary file \"%1\" could not be created.\nDetailed information cannot be provided because there was no error message." ).arg( text ) ); } else { - KMessageBox::detailedError( 0, i18n( "The temporary file \"%1\" could not be created.\nRead the error message under \"Details\" to find out more." ).tqarg( text ), details ); + KMessageBox::detailedError( 0, i18n( "The temporary file \"%1\" could not be created.\nRead the error message under \"Details\" to find out more." ).arg( text ), details ); } break; } case ERROR_DIRECTORY_NOT_FOUND: { - KMessageBox::error( 0, i18n( "The directory \"%1\" could not be found." ).tqarg( text ) ); + KMessageBox::error( 0, i18n( "The directory \"%1\" could not be found." ).arg( text ) ); break; } case ERROR_FILE_IS_IRREGULAR: { - KMessageBox::error( 0, i18n( "The file \"%1\" is irregular. That means it is either a symlink, a fifo, or something similar. This could indicate that someone is trying to exploit your system. Please inform your system administrator." ).tqarg( text ) ); + KMessageBox::error( 0, i18n( "The file \"%1\" is irregular. That means it is either a symlink, a fifo, or something similar. This could indicate that someone is trying to exploit your system. Please inform your system administrator." ).arg( text ) ); break; } @@ -305,11 +305,11 @@ void Smb4KError::error( int code, const TQString &text, const TQString &details { if ( details.stripWhiteSpace().isEmpty() ) { - KMessageBox::error( 0, i18n( "The file \"%1\" could not be opened." ).tqarg( text ) ); + KMessageBox::error( 0, i18n( "The file \"%1\" could not be opened." ).arg( text ) ); } else { - KMessageBox::detailedError( 0, i18n( "The file \"%1\" could not be opened.\nRead the error message under \"Details\" to find out more." ).tqarg( text ), details ); + KMessageBox::detailedError( 0, i18n( "The file \"%1\" could not be opened.\nRead the error message under \"Details\" to find out more." ).arg( text ), details ); } break; @@ -318,18 +318,18 @@ void Smb4KError::error( int code, const TQString &text, const TQString &details { if ( details.stripWhiteSpace().isEmpty() ) { - KMessageBox::error( 0, i18n( "The file \"%1\" could not be closed." ).tqarg( text ) ); + KMessageBox::error( 0, i18n( "The file \"%1\" could not be closed." ).arg( text ) ); } else { - KMessageBox::detailedError( 0, i18n( "The file \"%1\" could not be closed.\nRead the error message under \"Details\" to find out more." ).tqarg( text ), details ); + KMessageBox::detailedError( 0, i18n( "The file \"%1\" could not be closed.\nRead the error message under \"Details\" to find out more." ).arg( text ), details ); } break; } case ERROR_NET_COMMAND: { - KMessageBox::error( 0, i18n( "The list of arguments for the \"net\" command could not be assembled.\nAt the moment it reads: %1" ).tqarg( text ) ); + KMessageBox::error( 0, i18n( "The list of arguments for the \"net\" command could not be assembled.\nAt the moment it reads: %1" ).arg( text ) ); break; } @@ -382,19 +382,19 @@ void Smb4KError::information( int code, const TQString &text, const TQString &de { case INFO_MIMETYPE_NOT_SUPPORTED: { - KMessageBox::information( 0, i18n( "The mimetype \"%1\" is not supported. Please convert the file to PostScript or PDF." ).tqarg( text ) ); + KMessageBox::information( 0, i18n( "The mimetype \"%1\" is not supported. Please convert the file to PostScript or PDF." ).arg( text ) ); break; } case INFO_DISABLE_SUID_FEATURE: { - KMessageBox::information( 0, i18n( "You previously chose to use \"%1\", but now it is missing on your system. Smb4K will disable this feature." ).tqarg( text ) ); + KMessageBox::information( 0, i18n( "You previously chose to use \"%1\", but now it is missing on your system. Smb4K will disable this feature." ).arg( text ) ); break; } case INFO_BOOKMARK_LABEL_IN_USE: { - KMessageBox::information( 0, i18n( "The label \"%1\" is used more than once. It will automatically be renamed for bookmark \"%2\" to avoid confusion." ).tqarg( text, details ) ); + KMessageBox::information( 0, i18n( "The label \"%1\" is used more than once. It will automatically be renamed for bookmark \"%2\" to avoid confusion." ).arg( text, details ) ); break; } diff --git a/smb4k/core/smb4kfileio.cpp b/smb4k/core/smb4kfileio.cpp index 1a365a3..c8f59de 100644 --- a/smb4k/core/smb4kfileio.cpp +++ b/smb4k/core/smb4kfileio.cpp @@ -26,7 +26,7 @@ // TQt includes #include <tqdir.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> // KDE includes #include <kapplication.h> @@ -221,7 +221,7 @@ bool Smb4KFileIO::writeSudoers( Smb4KFileIO::Operation operation ) { contents.append( "# Entries for Smb4K users." ); contents.append( "# Generated by Smb4K. Please do not modify!" ); - contents.append( "User_Alias\tSMB4KUSERS = "+TQString( "%1" ).tqarg( getpwuid( getuid() )->pw_name ) ); + contents.append( "User_Alias\tSMB4KUSERS = "+TQString( "%1" ).arg( getpwuid( getuid() )->pw_name ) ); contents.append( "Defaults:SMB4KUSERS\tenv_keep += \"PASSWD USER\"" ); contents.append( "SMB4KUSERS\t"+hostname+" = NOPASSWD: "+Smb4KSettings::smb4k_kill() ); contents.append( "SMB4KUSERS\t"+hostname+" = NOPASSWD: "+Smb4KSettings::smb4k_umount() ); @@ -563,7 +563,7 @@ bool Smb4KFileIO::writeSuperTab( Smb4KFileIO::Operation operation ) { contents.append( "# Entries for Smb4K users." ); contents.append( "# Generated by Smb4K. Please do not modify!" ); - contents.append( ":define Smb4KUsers "+TQString( "%1" ).tqarg( getpwuid( getuid() )->pw_name ) ); + contents.append( ":define Smb4KUsers "+TQString( "%1" ).arg( getpwuid( getuid() )->pw_name ) ); #ifndef __FreeBSD__ contents.append( "smb4k_kill\t"+Smb4KSettings::smb4k_kill()+ "\t$(Smb4KUsers)\tuid=root\tgid=root" ); @@ -937,7 +937,7 @@ bool Smb4KFileIO::createLockFile( const TQString &filename ) } else { - contents << TQString( "%1:%2" ).tqarg( getpwuid( getuid() )->pw_name ).tqarg( filename ); + contents << TQString( "%1:%2" ).arg( getpwuid( getuid() )->pw_name ).arg( filename ); TQCString out = contents.join( "\n" ).local8Bit(); if ( write( file_descriptor, out, out.length() ) == -1 ) @@ -1224,7 +1224,7 @@ void Smb4KFileIO::processSudoers() { contents.append( "# Entries for Smb4K users." ); contents.append( "# Generated by Smb4K. Please do not modify!" ); - contents.append( "User_Alias\tSMB4KUSERS = "+TQString( "%1" ).tqarg( getpwuid( getuid() )->pw_name ) ); + contents.append( "User_Alias\tSMB4KUSERS = "+TQString( "%1" ).arg( getpwuid( getuid() )->pw_name ) ); contents.append( "Defaults:SMB4KUSERS\tenv_keep += \"PASSWD USER\"" ); contents.append( "SMB4KUSERS\t"+hostname+" = NOPASSWD: "+Smb4KSettings::smb4k_kill() ); contents.append( "SMB4KUSERS\t"+hostname+" = NOPASSWD: "+Smb4KSettings::smb4k_umount() ); @@ -1403,10 +1403,10 @@ void Smb4KFileIO::processSudoers() return; } - TQString perms = TQString( "%1" ).tqarg( (int)file_stat.st_mode, 0, 8 ); + TQString perms = TQString( "%1" ).arg( (int)file_stat.st_mode, 0, 8 ); perms = perms.right( 4 ); - TQString owner = TQString( "%1" ).tqarg( (int)file_stat.st_uid ); - TQString group = TQString( "%1" ).tqarg( (int)file_stat.st_gid ); + TQString owner = TQString( "%1" ).arg( (int)file_stat.st_uid ); + TQString group = TQString( "%1" ).arg( (int)file_stat.st_gid ); TQString temp_file_name = TQString( tmp ); // Assemble the command. @@ -1476,7 +1476,7 @@ void Smb4KFileIO::processSuperTab() { contents.append( "# Entries for Smb4K users." ); contents.append( "# Generated by Smb4K. Please do not modify!" ); - contents.append( ":define Smb4KUsers "+TQString( "%1" ).tqarg( getpwuid( getuid() )->pw_name ) ); + contents.append( ":define Smb4KUsers "+TQString( "%1" ).arg( getpwuid( getuid() )->pw_name ) ); #ifndef __FreeBSD__ contents.append( "smb4k_kill\t"+Smb4KSettings::smb4k_kill()+ "\t$(Smb4KUsers)\tuid=root\tgid=root" ); @@ -1666,10 +1666,10 @@ void Smb4KFileIO::processSuperTab() return; } - TQString perms = TQString( "%1" ).tqarg( (int)file_stat.st_mode, 0, 8 ); + TQString perms = TQString( "%1" ).arg( (int)file_stat.st_mode, 0, 8 ); perms = perms.right( 4 ); - TQString owner = TQString( "%1" ).tqarg( (int)file_stat.st_uid ); - TQString group = TQString( "%1" ).tqarg( (int)file_stat.st_gid ); + TQString owner = TQString( "%1" ).arg( (int)file_stat.st_uid ); + TQString group = TQString( "%1" ).arg( (int)file_stat.st_gid ); TQString temp_file_name = TQString( tmp ); // Assemble the command. diff --git a/smb4k/core/smb4khomesshareshandler.cpp b/smb4k/core/smb4khomesshareshandler.cpp index 392581c..0b0bea0 100644 --- a/smb4k/core/smb4khomesshareshandler.cpp +++ b/smb4k/core/smb4khomesshareshandler.cpp @@ -25,7 +25,7 @@ // TQt includes #include <tqmap.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqfile.h> @@ -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 & ) ) ); @@ -117,7 +117,7 @@ const TQString Smb4KHomesSharesHandler::specifyUser( const TQString &host, TQWid // Do the last things before showing. userCombo->setFocus(); - m_dlg->setFixedSize( m_dlg->tqsizeHint() ); + m_dlg->setFixedSize( m_dlg->sizeHint() ); if ( m_dlg->exec() == KDialogBase::Accepted ) { diff --git a/smb4k/core/smb4kmounter.cpp b/smb4k/core/smb4kmounter.cpp index ccf687d..5e1faa6 100644 --- a/smb4k/core/smb4kmounter.cpp +++ b/smb4k/core/smb4kmounter.cpp @@ -26,9 +26,9 @@ // TQt includes #include <tqapplication.h> #include <tqdir.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> // KDE includes #include <kapplication.h> @@ -115,8 +115,8 @@ Smb4KMounter::~Smb4KMounter() void Smb4KMounter::init() { - m_queue.enqueue( new TQString( TQString( "%1:" ).tqarg( Import ) ) ); - m_queue.enqueue( new TQString( TQString( "%1:" ).tqarg( Remount ) ) ); + m_queue.enqueue( new TQString( TQString( "%1:" ).arg( Import ) ) ); + m_queue.enqueue( new TQString( TQString( "%1:" ).arg( Remount ) ) ); startTimer( TIMER_INTERVAL ); } @@ -160,7 +160,7 @@ void Smb4KMounter::abort() KProcess proc; proc.setUseShell( true ); - proc << TQString( "%1 smb4k_kill %2" ).tqarg( suid_program ).tqarg( m_proc->pid() ); + proc << TQString( "%1 smb4k_kill %2" ).arg( suid_program ).arg( m_proc->pid() ); proc.start( KProcess::DontCare, KProcess::NoCommunication ); } else @@ -491,7 +491,7 @@ void Smb4KMounter::mountShare( const TQString &workgroup, const TQString &host, { // Before doing anything else let's check that the // share has not been mounted by the user already: - TQValueList<Smb4KShare> list = findShareByName( TQString( "//%1/%2" ).tqarg( host, share_name ) ); + TQValueList<Smb4KShare> list = findShareByName( TQString( "//%1/%2" ).arg( host, share_name ) ); for ( TQValueList<Smb4KShare>::ConstIterator it = list.begin(); it != list.end(); ++it ) { @@ -503,9 +503,9 @@ void Smb4KMounter::mountShare( const TQString &workgroup, const TQString &host, } } - m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4:%5" ).tqarg( Mount ) - .tqarg( workgroup, host ) - .tqarg( ip, share_name ) ) ); + m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4:%5" ).arg( Mount ) + .arg( workgroup, host ) + .arg( ip, share_name ) ) ); } } @@ -604,7 +604,7 @@ void Smb4KMounter::mount( const TQString &workgroup, const TQString &host, const #ifndef __FreeBSD__ // Let's see if the options handler knows the share: - Smb4KSambaOptionsInfo *info = optionsHandler()->findItem( TQString( "//%1/%2" ).tqarg( m_priv->host(), m_priv->share() ), true ); + Smb4KSambaOptionsInfo *info = optionsHandler()->findItem( TQString( "//%1/%2" ).arg( m_priv->host(), m_priv->share() ), true ); // Determine the file system we have to use: int filesystem; @@ -626,28 +626,28 @@ void Smb4KMounter::mount( const TQString &workgroup, const TQString &host, const case Smb4KSettings::EnumFilesystem::CIFS: { command.append( Smb4KSettings::alwaysUseSuperUser() ? // FIXME: Check if suid program is installed - TQString( "%1 smb4k_mount -s -t cifs " ).tqarg( suid_program ) : + TQString( "%1 smb4k_mount -s -t cifs " ).arg( suid_program ) : "smb4k_mount -n -t cifs " ); command.append( "-o " ); - command.append( optionsHandler()->mountOptions( TQString( "//%1/%2" ).tqarg( m_priv->host(), m_priv->share() ) ) ); + command.append( optionsHandler()->mountOptions( TQString( "//%1/%2" ).arg( m_priv->host(), m_priv->share() ) ) ); command.append( !m_priv->workgroup().stripWhiteSpace().isEmpty() ? - TQString( "domain='%1'," ).tqarg( m_priv->workgroup() ) : + TQString( "domain='%1'," ).arg( m_priv->workgroup() ) : "" ); command.append( !m_priv->ip().stripWhiteSpace().isEmpty() ? - TQString( "ip=%1," ).tqarg( m_priv->ip() ) : + TQString( "ip=%1," ).arg( m_priv->ip() ) : "" ); command.append( !authInfo.user().isEmpty() ? - TQString( "user=%1" ).tqarg( authInfo.user().data() ) : + TQString( "user=%1" ).arg( authInfo.user().data() ) : "guest" ); command.append( " -- " ); - command.append( TQString( "//'%1'/'%2' '%3'" ).tqarg( m_priv->host(), m_priv->share(), m_priv->path() ) ); + command.append( TQString( "//'%1'/'%2' '%3'" ).arg( m_priv->host(), m_priv->share(), m_priv->path() ) ); m_priv->setCIFSLogin( !authInfo.user().isEmpty() ? authInfo.user() : @@ -660,28 +660,28 @@ void Smb4KMounter::mount( const TQString &workgroup, const TQString &host, const case Smb4KSettings::EnumFilesystem::SMBFS: { command.append( Smb4KSettings::alwaysUseSuperUser() ? // FIXME: Check if suid program is installed - TQString( "%1 smb4k_mount -s -t smbfs " ).tqarg( suid_program ) : + TQString( "%1 smb4k_mount -s -t smbfs " ).arg( suid_program ) : "smb4k_mount -n -t smbfs " ); command.append( "-o " ); - command.append( optionsHandler()->mountOptions( TQString( "//%1/%2" ).tqarg( m_priv->host(), m_priv->share() ) ) ); + command.append( optionsHandler()->mountOptions( TQString( "//%1/%2" ).arg( m_priv->host(), m_priv->share() ) ) ); command.append( !m_priv->workgroup().stripWhiteSpace().isEmpty() ? - TQString( "workgroup='%1'," ).tqarg( m_priv->workgroup() ) : + TQString( "workgroup='%1'," ).arg( m_priv->workgroup() ) : "" ); command.append( !m_priv->ip().stripWhiteSpace().isEmpty() ? - TQString( "ip=%1," ).tqarg( m_priv->ip() ) : + TQString( "ip=%1," ).arg( m_priv->ip() ) : "" ); command.append( !authInfo.user().isEmpty() ? - TQString( "username=%1" ).tqarg( authInfo.user().data() ) : + TQString( "username=%1" ).arg( authInfo.user().data() ) : "guest" ); command.append( " -- " ); - command.append( TQString( "//'%1'/'%2' '%3'" ).tqarg( m_priv->host(), m_priv->share(), m_priv->path() ) ); + command.append( TQString( "//'%1'/'%2' '%3'" ).arg( m_priv->host(), m_priv->share(), m_priv->path() ) ); m_priv->setFileSystem( "smbfs" ); @@ -704,27 +704,27 @@ void Smb4KMounter::mount( const TQString &workgroup, const TQString &host, const Smb4KSettings::remotePort(); command.append( Smb4KSettings::alwaysUseSuperUser() ? // FIXME: Check if suid program is installed - TQString( "%1 smb4k_mount " ).tqarg( suid_program ) : + TQString( "%1 smb4k_mount " ).arg( suid_program ) : "smb4k_mount " ); - command.append( optionsHandler()->mountOptions( TQString( "//%1/%2" ).tqarg( m_priv->host(), m_priv->share() ) ) ); + command.append( optionsHandler()->mountOptions( TQString( "//%1/%2" ).arg( m_priv->host(), m_priv->share() ) ) ); command.append( !m_priv->workgroup().stripWhiteSpace().isEmpty() ? - TQString( " -W '%1'" ).tqarg( m_priv->workgroup() ) : + TQString( " -W '%1'" ).arg( m_priv->workgroup() ) : "" ); command.append( !m_priv->ip().stripWhiteSpace().isEmpty() ? - TQString( " -I %1" ).tqarg( m_priv->ip() ) : + TQString( " -I %1" ).arg( m_priv->ip() ) : "" ); command.append( " -N" ); command.append( " -- " ); - command.append( TQString( "//%1@'%2':%3/'%4' '%5'" ).tqarg( !authInfo.user().isEmpty() ? authInfo.user() : "guest" ) - .tqarg( m_priv->host() ) - .tqarg( port ) - .tqarg( m_priv->share(), m_priv->path() ) ); + command.append( TQString( "//%1@'%2':%3/'%4' '%5'" ).arg( !authInfo.user().isEmpty() ? authInfo.user() : "guest" ) + .arg( m_priv->host() ) + .arg( port ) + .arg( m_priv->share(), m_priv->path() ) ); #endif @@ -743,9 +743,9 @@ void Smb4KMounter::unmountShare( Smb4KShare *share, bool force, bool noMessage ) { // Do *not* change share->canonicalPath(). It is necessary for the // checks below to work. - m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4" ).tqarg( Unmount ) - .tqarg( share->canonicalPath().data() ) - .tqarg( force, noMessage ) ) ); + m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4" ).arg( Unmount ) + .arg( share->canonicalPath().data() ) + .arg( force, noMessage ) ) ); } @@ -815,12 +815,12 @@ void Smb4KMounter::unmount( const TQString &mountpoint, bool force, bool noMessa if ( KMessageBox::questionYesNo( 0, i18n( "Do you really want to force the unmounting of this share?" ), TQString(), KStdGuiItem::yes(), KStdGuiItem::no(), "Dont Ask Forced", KMessageBox::Notify ) == KMessageBox::Yes ) { #ifdef __linux__ - command.append( TQString( "%1 smb4k_umount -s -l " ).tqarg( suid_program ) ); + command.append( TQString( "%1 smb4k_umount -s -l " ).arg( suid_program ) ); #else #ifdef __FreeBSD__ - command.append( TQString( "%1 smb4k_umount " ).tqarg( suid_program ) ); + command.append( TQString( "%1 smb4k_umount " ).arg( suid_program ) ); #else - command.append( TQString( "%1 smb4k_umount -s " ).tqarg( suid_program ) ); + command.append( TQString( "%1 smb4k_umount -s " ).arg( suid_program ) ); #endif #endif execute = true; @@ -846,9 +846,9 @@ void Smb4KMounter::unmount( const TQString &mountpoint, bool force, bool noMessa else { #ifndef __FreeBSD__ - command.append( TQString( "%1 smb4k_umount -s " ).tqarg( suid_program ) ); + command.append( TQString( "%1 smb4k_umount -s " ).arg( suid_program ) ); #else - command.append( TQString( "%1 smb4k_umount " ).tqarg( suid_program ) ); + command.append( TQString( "%1 smb4k_umount " ).arg( suid_program ) ); #endif } } @@ -862,12 +862,12 @@ void Smb4KMounter::unmount( const TQString &mountpoint, bool force, bool noMessa if ( KMessageBox::questionYesNo( 0, i18n( "Do you really want to force the unmounting of this share?" ), TQString(), KStdGuiItem::yes(), KStdGuiItem::no(), "Dont Ask Forced", KMessageBox::Notify ) == KMessageBox::Yes ) { #ifdef __linux__ - command.append( TQString( "%1 smb4k_umount -s -l " ).tqarg( suid_program ) ); + command.append( TQString( "%1 smb4k_umount -s -l " ).arg( suid_program ) ); #else #ifdef __FreeBSD__ - command.append( TQString( "%1 smb4k_umount " ).tqarg( suid_program ) ); + command.append( TQString( "%1 smb4k_umount " ).arg( suid_program ) ); #else - command.append( TQString( "%1 smb4k_umount -s " ).tqarg( suid_program ) ); + command.append( TQString( "%1 smb4k_umount -s " ).arg( suid_program ) ); #endif #endif execute = true; @@ -893,9 +893,9 @@ void Smb4KMounter::unmount( const TQString &mountpoint, bool force, bool noMessa else { #ifndef __FreeBSD__ - command.append( TQString( "%1 smb4k_umount -s " ).tqarg( suid_program ) ); + command.append( TQString( "%1 smb4k_umount -s " ).arg( suid_program ) ); #else - command.append( TQString( "%1 smb4k_umount " ).tqarg( suid_program ) ); + command.append( TQString( "%1 smb4k_umount " ).arg( suid_program ) ); #endif } } @@ -915,9 +915,9 @@ void Smb4KMounter::unmount( const TQString &mountpoint, bool force, bool noMessa } #ifndef __FreeBSD__ - command.append( TQString( "-t %1 " ).tqarg( share->filesystem() ) ); + command.append( TQString( "-t %1 " ).arg( share->filesystem() ) ); #endif - command.append( TQString( "'%1'" ).tqarg( m_priv->path() ) ); + command.append( TQString( "'%1'" ).arg( m_priv->path() ) ); if ( force && !execute ) { @@ -952,7 +952,7 @@ void Smb4KMounter::unmount( const TQString &mountpoint, bool force, bool noMessa void Smb4KMounter::unmountAllShares() { - m_queue.enqueue( new TQString( TQString( "%1" ).tqarg( UnmountAll ) ) ); + m_queue.enqueue( new TQString( TQString( "%1" ).arg( UnmountAll ) ) ); } @@ -1043,7 +1043,7 @@ void Smb4KMounter::processMount() m_buffer.contains( "bad user name" ) == 0 && m_buffer.contains( "bad group name" ) == 0 ) { - TQString name = TQString( "//%1/%2" ).tqarg( m_priv->host() ).tqarg( m_priv->share() ); + TQString name = TQString( "//%1/%2" ).arg( m_priv->host() ).arg( m_priv->share() ); // Check file system #if !defined(__solaris__) @@ -1176,7 +1176,7 @@ void Smb4KMounter::processMount() } else { - TQString name = TQString( "//%1/%2" ).tqarg( m_priv->host() ).tqarg( m_priv->share() ); + TQString name = TQString( "//%1/%2" ).arg( m_priv->host() ).arg( m_priv->share() ); Smb4KError::error( ERROR_MOUNTING_SHARE, name, m_buffer ); } @@ -1200,7 +1200,7 @@ void Smb4KMounter::processMount() Smb4KAuthInfo authInfo( m_priv->workgroup(), m_priv->host(), m_priv->share() ); (void) passwordHandler()->readAuth( &authInfo ); - TQString name = TQString( "//%1@%2/%3" ).tqarg( authInfo.user().upper(), m_priv->host().upper(), m_priv->share().upper() ); + TQString name = TQString( "//%1@%2/%3" ).arg( authInfo.user().upper(), m_priv->host().upper(), m_priv->share().upper() ); share = new Smb4KShare( name, m_priv->path(), m_priv->filesystem(), (int)getuid(), (int)getgid() ); m_mounted_shares.append( share ); @@ -1225,7 +1225,7 @@ void Smb4KMounter::processMount() Smb4KAuthInfo authInfo( m_priv->workgroup(), m_priv->host(), m_priv->share() ); (void) passwordHandler()->readAuth( &authInfo ); - TQString name = TQString( "//%1@%2/%3" ).tqarg( authInfo.user().upper(), m_priv->host().upper(), m_priv->share().upper() ); + TQString name = TQString( "//%1@%2/%3" ).arg( authInfo.user().upper(), m_priv->host().upper(), m_priv->share().upper() ); Smb4KError::error( ERROR_MOUNTING_SHARE, name, m_buffer ); } @@ -1284,7 +1284,7 @@ void Smb4KMounter::processUnmount() } else { - TQString str = TQString( "sudo: unable to resolve host %1\n" ).tqarg( hostname ); + TQString str = TQString( "sudo: unable to resolve host %1\n" ).arg( hostname ); m_buffer.remove( str, false /* case insensitive */ ); @@ -1527,7 +1527,7 @@ void Smb4KMounter::timerEvent( TQTimerEvent * ) if ( m_priv->timerTicks * timerInterval() >= Smb4KSettings::checkInterval() /* msec */ && (!m_working || m_queue.isEmpty()) ) { - m_queue.enqueue( new TQString( TQString( "%1:" ).tqarg( Import ) ) ); + m_queue.enqueue( new TQString( TQString( "%1:" ).arg( Import ) ) ); m_priv->timerTicks = 0; } } @@ -1663,9 +1663,9 @@ void Smb4KMounter::slotShutdown() if ( Smb4KSettings::alwaysUseSuperUser() ) { #ifndef __FreeBSD__ - command.append( TQString( "%1 smb4k_umount -s -t %2 " ).tqarg( suid_program ).tqarg( (*it)->filesystem() ) ); + command.append( TQString( "%1 smb4k_umount -s -t %2 " ).arg( suid_program ).arg( (*it)->filesystem() ) ); #else - command.append( TQString( "%1 smb4k_umount " ).tqarg( suid_program ) ); + command.append( TQString( "%1 smb4k_umount " ).arg( suid_program ) ); #endif command.append( KProcess::quote( (*it)->path() ) ); command.append( " ; " ); @@ -1673,7 +1673,7 @@ void Smb4KMounter::slotShutdown() else { #ifndef __FreeBSD__ - command.append( TQString( "smb4k_umount -n -t %1 " ).tqarg( (*it)->filesystem() ) ); + command.append( TQString( "smb4k_umount -n -t %1 " ).arg( (*it)->filesystem() ) ); #else command.append( "smb4k_umount " ); #endif diff --git a/smb4k/core/smb4kpasswordhandler.cpp b/smb4k/core/smb4kpasswordhandler.cpp index 7d0eb5c..a9a8015 100644 --- a/smb4k/core/smb4kpasswordhandler.cpp +++ b/smb4k/core/smb4kpasswordhandler.cpp @@ -26,7 +26,7 @@ // TQt includes #include <tqframe.h> -#include <tqlayout.h> +#include <layout.h> #include <tqstring.h> #include <tqgroupbox.h> #include <tqlabel.h> @@ -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; @@ -275,21 +275,21 @@ bool Smb4KPasswordHandler::askpass( const TQString &workgroup, const TQString &h if ( m_auth->share().stripWhiteSpace().isEmpty() ) { - message.append( i18n( "Please enter authentication data for server %1." ).tqarg( m_auth->host() ) ); + message.append( i18n( "Please enter authentication data for server %1." ).arg( m_auth->host() ) ); } else { - message.append( i18n( "Please enter authentication data for share %1." ).tqarg( "//"+m_auth->host()+"/"+m_auth->share() ) ); + message.append( i18n( "Please enter authentication data for share %1." ).arg( "//"+m_auth->host()+"/"+m_auth->share() ) ); } TQLabel *message_label = new TQLabel( frame ); 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,25 +298,25 @@ 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->tqsizeHint().height() ); + m_dlg->setFixedSize( 350, m_dlg->sizeHint().height() ); m_dlg->enableButtonOK( false ); // Since we have to allow empty passwords, we will only connect @@ -791,7 +791,7 @@ void Smb4KPasswordHandler::writeToSMBConfFile( Smb4KAuthInfo *authInfo ) connect( p, TQT_SIGNAL( processExited( KProcess * ) ), this, TQT_SLOT( slotWritePassword( KProcess * ) ) ); - *p << TQString( "smbutil crypt %1" ).tqarg( m_nsmbrc_auth.password() ); + *p << TQString( "smbutil crypt %1" ).arg( m_nsmbrc_auth.password() ); p->start( KProcess::NotifyOnExit, KProcess::AllOutput ); } @@ -901,11 +901,11 @@ void Smb4KPasswordHandler::slotWritePassword( KProcess *proc ) if ( m_nsmbrc_auth.share().isEmpty() ) { - section.append( TQString( "[%1:%2]" ).tqarg( m_nsmbrc_auth.host().upper(), m_nsmbrc_auth.user().isEmpty() ? "GUEST" : m_nsmbrc_auth.user().upper() ) ); + section.append( TQString( "[%1:%2]" ).arg( m_nsmbrc_auth.host().upper(), m_nsmbrc_auth.user().isEmpty() ? "GUEST" : m_nsmbrc_auth.user().upper() ) ); } else { - section.append( TQString( "[%1:%2:%3]" ).tqarg( m_nsmbrc_auth.host().upper(), m_nsmbrc_auth.user().isEmpty() ? "GUEST" : m_nsmbrc_auth.user().upper(), m_nsmbrc_auth.share().upper() ) ); + section.append( TQString( "[%1:%2:%3]" ).arg( m_nsmbrc_auth.host().upper(), m_nsmbrc_auth.user().isEmpty() ? "GUEST" : m_nsmbrc_auth.user().upper(), m_nsmbrc_auth.share().upper() ) ); } TQStringList::Iterator it = contents.find( section ); diff --git a/smb4k/core/smb4kpreviewer.cpp b/smb4k/core/smb4kpreviewer.cpp index 1ddff6f..2e2876d 100644 --- a/smb4k/core/smb4kpreviewer.cpp +++ b/smb4k/core/smb4kpreviewer.cpp @@ -139,13 +139,13 @@ void Smb4KPreviewer::timerEvent( TQTimerEvent * ) // (b) Do not pass the path unquoted, or you'll get a NT_STATUS_OBJECT_NAME_NOT_FOUND // error message in the case the path is empty. TQString command; - command.append( TQString( "smbclient //%1/%2 " ).tqarg( KProcess::quote( m_item->host() ), KProcess::quote( m_item->share() ) ) ); - command.append( TQString( " -d1 -W %1 -D %2 " ).tqarg( KProcess::quote( m_item->workgroup() ), KProcess::quote( m_item->path() ) ) ); + command.append( TQString( "smbclient //%1/%2 " ).arg( KProcess::quote( m_item->host() ), KProcess::quote( m_item->share() ) ) ); + command.append( TQString( " -d1 -W %1 -D %2 " ).arg( KProcess::quote( m_item->workgroup() ), KProcess::quote( m_item->path() ) ) ); command.append( " -c \"ls\" " ); if ( !m_item->ip().isEmpty() ) { - command.append( TQString( " -I %1 " ).tqarg( m_item->ip() ) ); + command.append( TQString( " -I %1 " ).arg( m_item->ip() ) ); } command.append( optionsHandler()->smbclientOptions( "//"+m_item->host()+"/"+m_item->share() ) ); @@ -154,7 +154,7 @@ void Smb4KPreviewer::timerEvent( TQTimerEvent * ) if ( !auth->user().isEmpty() ) { - command.append( TQString( " -U %1" ).tqarg( KProcess::quote( auth->user() ) ) ); + command.append( TQString( " -U %1" ).arg( KProcess::quote( auth->user() ) ) ); if ( !auth->password().isEmpty() ) { diff --git a/smb4k/core/smb4kprint.cpp b/smb4k/core/smb4kprint.cpp index b3672d3..57f4161 100644 --- a/smb4k/core/smb4kprint.cpp +++ b/smb4k/core/smb4kprint.cpp @@ -180,22 +180,22 @@ void Smb4KPrint::setDeviceURI() { if ( !auth->user().isEmpty() ) { - uri = TQString( "smb://%1:%2@%3/%4/%5" ).tqarg( auth->user().data(), auth->password().data() ).tqarg( m_info->workgroup(), m_info->host(), m_info->printer() ); + uri = TQString( "smb://%1:%2@%3/%4/%5" ).arg( auth->user().data(), auth->password().data() ).arg( m_info->workgroup(), m_info->host(), m_info->printer() ); } else { - uri = TQString( "smb://%1/%2/%3" ).tqarg( m_info->workgroup(), m_info->host(), m_info->printer() ); + uri = TQString( "smb://%1/%2/%3" ).arg( m_info->workgroup(), m_info->host(), m_info->printer() ); } } else { if ( !auth->user().isEmpty() ) { - uri = TQString( "smb://%1:%2@%3/%4" ).tqarg( auth->user().data(), auth->password().data() ).tqarg( m_info->host(), m_info->printer() ); + uri = TQString( "smb://%1:%2@%3/%4" ).arg( auth->user().data(), auth->password().data() ).arg( m_info->host(), m_info->printer() ); } else { - uri = TQString( "smb://%1/%2" ).tqarg( m_info->host(), m_info->printer() ); + uri = TQString( "smb://%1/%2" ).arg( m_info->host(), m_info->printer() ); } } @@ -214,7 +214,7 @@ void Smb4KPrint::printNormal() TQString command; command.append( "smbspool 111 "+TQString( getpwuid( getuid() )->pw_name ) ); - command.append( " \"Smb4K print job\" "+TQString( "%1" ).tqarg( m_info->copies() ) ); + command.append( " \"Smb4K print job\" "+TQString( "%1" ).arg( m_info->copies() ) ); command.append( " \"\" "+KProcess::quote( m_info->path() ) ); *m_proc << command; @@ -242,7 +242,7 @@ void Smb4KPrint::printDVI() // The actual print command: command.append( "smbspool 111 "+TQString( getpwuid( getuid() )->pw_name ) ); - command.append( " \"Smb4K print job\" "+TQString( "%1" ).tqarg( m_info->copies() ) ); + command.append( " \"Smb4K print job\" "+TQString( "%1" ).arg( m_info->copies() ) ); command.append( " \"\" "+KProcess::quote( temp_file )+" && " ); // Clean up: @@ -274,7 +274,7 @@ void Smb4KPrint::printText() // The actual print command: command.append( "smbspool 111 "+TQString( getpwuid( getuid() )->pw_name ) ); - command.append( " \"Smb4K print job\" "+TQString( "%1" ).tqarg( m_info->copies() ) ); + command.append( " \"Smb4K print job\" "+TQString( "%1" ).arg( m_info->copies() ) ); command.append( " \"\" "+KProcess::quote( temp_file )+" && " ); // Clean up: @@ -341,13 +341,13 @@ void Smb4KPrint::slotProcessExited( KProcess * ) Smb4KError::error( ERROR_PRINTING, m_info->path(), m_buffer ); // Clean up: - TQFile::remove( TQString( "%1/smb4k_print.ps" ).tqarg( tempDir() ) ); + TQFile::remove( TQString( "%1/smb4k_print.ps" ).arg( tempDir() ) ); } } else { // Clean up: - TQFile::remove( TQString( "%1/smb4k_print.ps" ).tqarg( tempDir() ) ); + TQFile::remove( TQString( "%1/smb4k_print.ps" ).arg( tempDir() ) ); } m_proc->clearArguments(); diff --git a/smb4k/core/smb4ksambaoptionshandler.cpp b/smb4k/core/smb4ksambaoptionshandler.cpp index b7d145f..5ddf1bf 100644 --- a/smb4k/core/smb4ksambaoptionshandler.cpp +++ b/smb4k/core/smb4ksambaoptionshandler.cpp @@ -25,7 +25,7 @@ // TQt includes #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdir.h> // KDE includes @@ -522,23 +522,23 @@ const TQString Smb4KSambaOptionsHandler::smbclientOptions( const TQString &share // Options that are not customizable: args.append( !resolve_order.isEmpty() ? - TQString( " -R '%1'" ).tqarg( resolve_order ) : + TQString( " -R '%1'" ).arg( resolve_order ) : TQString() ); args.append( !netbios_name.isEmpty() ? - TQString( " -n '%1'" ).tqarg( netbios_name ) : + TQString( " -n '%1'" ).arg( netbios_name ) : TQString() ); args.append( !netbios_scope.isEmpty() ? - TQString( " -i '%1'" ).tqarg( netbios_scope ) : + TQString( " -i '%1'" ).arg( netbios_scope ) : TQString() ); args.append( !socket_options.isEmpty() ? - TQString( " -O '%1'" ).tqarg( socket_options ) : + TQString( " -O '%1'" ).arg( socket_options ) : TQString() ); args.append( Smb4KSettings::bufferSize() != 65520 ? - TQString( " -b %1" ).tqarg( Smb4KSettings::bufferSize() ) : + TQString( " -b %1" ).arg( Smb4KSettings::bufferSize() ) : TQString() ); args.append( Smb4KSettings::machineAccount() ? " -P" : TQString() ); @@ -577,7 +577,7 @@ const TQString Smb4KSambaOptionsHandler::smbclientOptions( const TQString &share args.append( kerberos ? " -k" : TQString() ); - args.append( TQString( " -p %1" ).tqarg( port ) ); + args.append( TQString( " -p %1" ).arg( port ) ); return args; } @@ -615,24 +615,24 @@ const TQString Smb4KSambaOptionsHandler::nmblookupOptions( bool with_broadcast ) TQString(); args.append( !netbios_name.isEmpty() ? - TQString( " -n '%1'" ).tqarg( netbios_name ) : + TQString( " -n '%1'" ).arg( netbios_name ) : TQString() ); args.append( !netbios_scope.isEmpty() ? - TQString( " -i '%1'" ).tqarg( netbios_scope ) : + TQString( " -i '%1'" ).arg( netbios_scope ) : TQString() ); args.append( !socket_options.isEmpty() ? - TQString( " -O '%1'" ).tqarg( socket_options ) : + TQString( " -O '%1'" ).arg( socket_options ) : TQString() ); args.append( !domain.isEmpty() ? - TQString( " -W '%1'" ).tqarg( domain ) : + TQString( " -W '%1'" ).arg( domain ) : TQString() ); args.append( (!Smb4KSettings::broadcastAddress().isEmpty() && with_broadcast) ? - TQString( " -B %1" ).tqarg( Smb4KSettings::broadcastAddress() ) : + TQString( " -B %1" ).arg( Smb4KSettings::broadcastAddress() ) : TQString() ); args.append( Smb4KSettings::usePort137() ? @@ -719,11 +719,11 @@ const TQString Smb4KSambaOptionsHandler::netOptions( int command, const TQString // Protocol can only be defined by us developers, // and we should know what we are doing. So, no // checks for the right protocol here: - args.append( TQString( " %1" ).tqarg( protocol ) ); + args.append( TQString( " %1" ).arg( protocol ) ); } else { - args.append( TQString( " %1" ).tqarg( TQString::compare( default_protocol, "ads" ) != 0 ? + args.append( TQString( " %1" ).arg( TQString::compare( default_protocol, "ads" ) != 0 ? default_protocol : TQString() /* FIXME: Is that the best way how to do it? */) ); } @@ -754,7 +754,7 @@ const TQString Smb4KSambaOptionsHandler::netOptions( int command, const TQString } // This lookup command takes no protocol: - args.append( TQString( " lookup host %1" ).tqarg( networkItem ) ); + args.append( TQString( " lookup host %1" ).arg( networkItem ) ); break; } @@ -769,7 +769,7 @@ const TQString Smb4KSambaOptionsHandler::netOptions( int command, const TQString } // This lookup command takes no protocol: - args.append( TQString( " lookup master '%1'" ).tqarg( networkItem ) ); + args.append( TQString( " lookup master '%1'" ).arg( networkItem ) ); break; } @@ -789,18 +789,18 @@ const TQString Smb4KSambaOptionsHandler::netOptions( int command, const TQString } args.append( !domain.isEmpty() ? - TQString( " -W '%1'" ).tqarg( domain ) : + TQString( " -W '%1'" ).arg( domain ) : TQString() ); args.append( !netbios_name.isEmpty() ? - TQString( " -n '%1'" ).tqarg( netbios_name ) : + TQString( " -n '%1'" ).arg( netbios_name ) : TQString() ); args.append( Smb4KSettings::machineAccount() ? " -P" : TQString() ); - args.append( TQString( " -p %1" ).tqarg( port ) ); + args.append( TQString( " -p %1" ).arg( port ) ); return args; } @@ -1167,7 +1167,7 @@ const TQString Smb4KSambaOptionsHandler::mountOptions( const TQString &share ) } case Smb4KSettings::EnumServerCodepage::unicode: { - codepage = "tqunicode"; + codepage = "unicode"; break; } @@ -1209,21 +1209,21 @@ const TQString Smb4KSambaOptionsHandler::mountOptions( const TQString &share ) // Compile the arguments list: args.append( !netbios_name.isEmpty() ? - TQString( "netbiosname='%1'," ).tqarg( netbios_name ) : + TQString( "netbiosname='%1'," ).arg( netbios_name ) : TQString() ); args.append( !uid.isEmpty() ? - TQString( "uid=%1," ).tqarg( uid ) : + TQString( "uid=%1," ).arg( uid ) : TQString() ); args.append( !gid.isEmpty() ? - TQString( "gid=%1," ).tqarg( gid ) : + TQString( "gid=%1," ).arg( gid ) : TQString() ); - args.append( TQString( "port=%1," ).tqarg( port ) ); + args.append( TQString( "port=%1," ).arg( port ) ); args.append( !charset.isEmpty() ? - TQString( "iocharset=%1," ).tqarg( charset ) : + TQString( "iocharset=%1," ).arg( charset ) : TQString() ); args.append( read_write ? "rw," : "ro," ); @@ -1233,11 +1233,11 @@ const TQString Smb4KSambaOptionsHandler::mountOptions( const TQString &share ) case Smb4KSettings::EnumFilesystem::CIFS: { args.append( !Smb4KSettings::fileMask().isEmpty() ? - TQString( "file_mode=%1," ).tqarg( Smb4KSettings::fileMask() ) : + TQString( "file_mode=%1," ).arg( Smb4KSettings::fileMask() ) : TQString() ); args.append( !Smb4KSettings::directoryMask().isEmpty() ? - TQString( "dir_mode=%1," ).tqarg( Smb4KSettings::directoryMask() ) : + TQString( "dir_mode=%1," ).arg( Smb4KSettings::directoryMask() ) : TQString() ); args.append( Smb4KSettings::permissionChecks() ? @@ -1273,33 +1273,33 @@ const TQString Smb4KSambaOptionsHandler::mountOptions( const TQString &share ) case Smb4KSettings::EnumFilesystem::SMBFS: { args.append( !socket_options.isEmpty() ? - TQString( "sockopt='%1'," ).tqarg( socket_options ) : + TQString( "sockopt='%1'," ).arg( socket_options ) : TQString() ); args.append( !netbios_scope.isEmpty() ? - TQString( "scope=%1," ).tqarg( netbios_scope ) : + TQString( "scope=%1," ).arg( netbios_scope ) : TQString() ); args.append( !codepage.isEmpty() ? - TQString( "codepage=%1," ).tqarg( codepage ) : + TQString( "codepage=%1," ).arg( codepage ) : TQString() ); args.append( !Smb4KSettings::fileMask().isEmpty() ? - TQString( "fmask=%1," ).tqarg( Smb4KSettings::fileMask() ) : + TQString( "fmask=%1," ).arg( Smb4KSettings::fileMask() ) : TQString() ); args.append( !Smb4KSettings::directoryMask().isEmpty() ? - TQString( "dmask=%1," ).tqarg( Smb4KSettings::directoryMask() ) : + TQString( "dmask=%1," ).arg( Smb4KSettings::directoryMask() ) : TQString() ); args.append( kerberos ? "krb," : TQString() ); args.append( Smb4KSettings::cachingTime() != 1000 ? - TQString( "ttl=%1," ).tqarg( Smb4KSettings::cachingTime() ) : + TQString( "ttl=%1," ).arg( Smb4KSettings::cachingTime() ) : TQString() ); args.append( Smb4KSettings::unicodeSupport() ? - "tqunicode," : + "unicode," : TQString() ); args.append( Smb4KSettings::largeFileSystemSupport() ? @@ -1318,23 +1318,23 @@ const TQString Smb4KSambaOptionsHandler::mountOptions( const TQString &share ) // Compile the arguments list: args.append( !uid.isEmpty() ? - TQString( " -u %1" ).tqarg( uid ) : + TQString( " -u %1" ).arg( uid ) : TQString() ); args.append( !gid.isEmpty() ? - TQString( " -g %1" ).tqarg( gid ) : + TQString( " -g %1" ).arg( gid ) : TQString() ); args.append( !charset.isEmpty() && !codepage.isEmpty() ? - TQString( " -E %1:%2" ).tqarg( charset, codepage ) : + TQString( " -E %1:%2" ).arg( charset, codepage ) : TQString() ); args.append( !Smb4KSettings::fileMask().isEmpty() ? - TQString( " -f %1" ).tqarg( Smb4KSettings::fileMask() ) : + TQString( " -f %1" ).arg( Smb4KSettings::fileMask() ) : TQString() ); args.append( !Smb4KSettings::directoryMask().isEmpty() ? - TQString( " -d %1" ).tqarg( Smb4KSettings::directoryMask() ) : + TQString( " -d %1" ).arg( Smb4KSettings::directoryMask() ) : TQString() ); // NOTE: Under FreeBSD the port must be managed by the mounter. @@ -1468,7 +1468,7 @@ void Smb4KSambaOptionsHandler::read_smb_conf() } else { - m_samba_options["netbios name"] = ( TQString( "%1" ).tqarg( hostname ) ).upper(); + m_samba_options["netbios name"] = ( TQString( "%1" ).arg( hostname ) ).upper(); } delete [] hostname; diff --git a/smb4k/core/smb4ksambaoptionsinfo.cpp b/smb4k/core/smb4ksambaoptionsinfo.cpp index 995796d..caa3ec7 100644 --- a/smb4k/core/smb4ksambaoptionsinfo.cpp +++ b/smb4k/core/smb4ksambaoptionsinfo.cpp @@ -47,7 +47,7 @@ Smb4KSambaOptionsInfo::Smb4KSambaOptionsInfo( Smb4KShare *share ) m_filesystem( share->filesystem() ), m_write_access( true ), #endif m_protocol( TQString() ), m_kerberos( false ), -m_uid( TQString( "%1" ).tqarg( share->uid() ) ), m_gid( TQString( "%1" ).tqarg( share->gid() ) ) +m_uid( TQString( "%1" ).arg( share->uid() ) ), m_gid( TQString( "%1" ).arg( share->gid() ) ) { } diff --git a/smb4k/core/smb4kscanner.cpp b/smb4k/core/smb4kscanner.cpp index c70aec7..8bb704e 100644 --- a/smb4k/core/smb4kscanner.cpp +++ b/smb4k/core/smb4kscanner.cpp @@ -150,7 +150,7 @@ void Smb4KScanner::init() void Smb4KScanner::rescan() { - m_queue.enqueue( new TQString( TQString( "%1:" ).tqarg( Init ) ) ); + m_queue.enqueue( new TQString( TQString( "%1:" ).arg( Init ) ) ); } @@ -160,7 +160,7 @@ void Smb4KScanner::rescan() void Smb4KScanner::getWorkgroupMembers( const TQString &workgroup, const TQString &master, const TQString &ip ) { - m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4" ).tqarg( Hosts ).tqarg( workgroup, master, ip ) ) ); + m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4" ).arg( Hosts ).arg( workgroup, master, ip ) ) ); } @@ -170,7 +170,7 @@ void Smb4KScanner::getWorkgroupMembers( const TQString &workgroup, const TQStrin void Smb4KScanner::getShares( const TQString &workgroup, const TQString &host, const TQString &ip, const TQString &protocol ) { - m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4:%5" ).tqarg( Shares ).tqarg( workgroup, host, ip ).tqarg( protocol ) ) ); + m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4:%5" ).arg( Shares ).arg( workgroup, host, ip ).arg( protocol ) ) ); } @@ -194,7 +194,7 @@ void Smb4KScanner::getInfo( const TQString &workgroup, const TQString &host, con item->setInfoChecked( true ); } - m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4" ).tqarg( Info ).tqarg( workgroup, host, ip ) ) ); + m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4" ).arg( Info ).arg( workgroup, host, ip ) ) ); } @@ -215,7 +215,7 @@ void Smb4KScanner::search( const TQString &host ) return; } - m_queue.enqueue( new TQString( TQString( "%1:%2" ).tqarg( Search ).tqarg( host ) ) ); + m_queue.enqueue( new TQString( TQString( "%1:%2" ).arg( Search ).arg( host ) ) ); } @@ -268,7 +268,7 @@ void Smb4KScanner::scanNetwork() command.append( optionsHandler()->nmblookupOptions() ); command.append( " -- - | grep '<01>' | awk '{print $1}'" ); command.append( !optionsHandler()->winsServer().isEmpty() ? - TQString( " | xargs nmblookup -R -U %1 -A " ).tqarg( optionsHandler()->winsServer() ) : + TQString( " | xargs nmblookup -R -U %1 -A " ).arg( optionsHandler()->winsServer() ) : " | xargs nmblookup -A " ); command.append( optionsHandler()->nmblookupOptions() ); @@ -386,7 +386,7 @@ void Smb4KScanner::scanForWorkgroupMembers( const TQString &workgroup, const TQS if ( !authInfo.user().isEmpty() ) { - command.append( TQString( " -U %1" ).tqarg( KProcess::quote( authInfo.user() ) ) ); + command.append( TQString( " -U %1" ).arg( KProcess::quote( authInfo.user() ) ) ); if ( !authInfo.password().isEmpty() ) { @@ -417,7 +417,7 @@ void Smb4KScanner::scanForWorkgroupMembers( const TQString &workgroup, const TQS if ( !authInfo.user().isEmpty() ) { - command.append( TQString( " -U %1'" ).tqarg( KProcess::quote( authInfo.user() ) ) ); + command.append( TQString( " -U %1'" ).arg( KProcess::quote( authInfo.user() ) ) ); if ( !authInfo.password().isEmpty() ) { @@ -450,16 +450,16 @@ void Smb4KScanner::scanForShares( const TQString &workgroup, const TQString &hos TQString command; - command = TQString( "net %1 -w %2 -S %3" ).tqarg( optionsHandler()->netOptions( Smb4KSambaOptionsHandler::Share, host, protocol ) ).tqarg( KProcess::quote( workgroup ), KProcess::quote( host ) ); + command = TQString( "net %1 -w %2 -S %3" ).arg( optionsHandler()->netOptions( Smb4KSambaOptionsHandler::Share, host, protocol ) ).arg( KProcess::quote( workgroup ), KProcess::quote( host ) ); if ( !ip.isEmpty() ) { - command.append( TQString( " -I %1" ).tqarg( KProcess::quote( ip ) ) ); + command.append( TQString( " -I %1" ).arg( KProcess::quote( ip ) ) ); } if ( !auth->user().isEmpty() ) { - command.append( TQString( " -U %1" ).tqarg( KProcess::quote( auth->user() ) ) ); + command.append( TQString( " -U %1" ).arg( KProcess::quote( auth->user() ) ) ); if ( !auth->password().isEmpty() ) { @@ -491,11 +491,11 @@ void Smb4KScanner::scanForInfo( const TQString &workgroup, const TQString &host, TQString smbclient_options = optionsHandler()->smbclientOptions(); - TQString command = TQString( "smbclient -d1 -U guest% -W %1 -L %2" ).tqarg( KProcess::quote( workgroup ) ).tqarg( KProcess::quote( host ) ); + TQString command = TQString( "smbclient -d1 -U guest% -W %1 -L %2" ).arg( KProcess::quote( workgroup ) ).arg( KProcess::quote( host ) ); if ( !ip.isEmpty() ) { - command.append( TQString( " -I %1" ).tqarg( KProcess::quote( ip ) ) ); + command.append( TQString( " -I %1" ).arg( KProcess::quote( ip ) ) ); } if ( !smbclient_options.stripWhiteSpace().isEmpty() ) @@ -550,22 +550,22 @@ void Smb4KScanner::searchForHost( const TQString &host ) { if ( !wins.isEmpty() ) { - command.append( TQString( " -R -U %1 %2 -S | grep '<00>' | sed -e 's/<00>.*//'" ).tqarg( wins ).tqarg( m_priv->host() ) ); + command.append( TQString( " -R -U %1 %2 -S | grep '<00>' | sed -e 's/<00>.*//'" ).arg( wins ).arg( m_priv->host() ) ); } else { - command.append( TQString( " %1 -S | grep '<00>' | sed -e 's/<00>.*//'" ).tqarg( m_priv->host() ) ); + command.append( TQString( " %1 -S | grep '<00>' | sed -e 's/<00>.*//'" ).arg( m_priv->host() ) ); } } else { if ( !wins.isEmpty() ) { - command.append( TQString( " -R -U %1 %2 -A | grep '<00>' | sed -e 's/<00>.*//'" ).tqarg( wins ).tqarg( m_priv->host() ) ); + command.append( TQString( " -R -U %1 %2 -A | grep '<00>' | sed -e 's/<00>.*//'" ).arg( wins ).arg( m_priv->host() ) ); } else { - command.append( TQString( " %1 -A | grep '<00>' | sed -e 's/<00>.*//'" ).tqarg( m_priv->host() ) ); + command.append( TQString( " %1 -A | grep '<00>' | sed -e 's/<00>.*//'" ).arg( m_priv->host() ) ); } } @@ -573,7 +573,7 @@ void Smb4KScanner::searchForHost( const TQString &host ) } case Smb4KSettings::EnumSearchMethod::Smbclient: { - command = TQString( "smbclient -d2 -U % -L %1" ).tqarg( m_priv->host() ); + command = TQString( "smbclient -d2 -U % -L %1" ).arg( m_priv->host() ); if ( !smbclient_options.stripWhiteSpace().isEmpty() ) { @@ -908,7 +908,7 @@ void Smb4KScanner::processWorkgroupMembers() TQString(), Smb4KPasswordHandler::AccessDenied, kapp->mainWidget() ? kapp->mainWidget() : 0, "AskPass" ) ) { - m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4" ).tqarg( Hosts ).tqarg( m_priv->workgroup(), m_priv->host(), m_priv->ip() ) ) ); + m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4" ).arg( Hosts ).arg( m_priv->workgroup(), m_priv->host(), m_priv->ip() ) ) ); } return; @@ -1090,7 +1090,7 @@ void Smb4KScanner::processWorkgroupMembers() TQString(), Smb4KPasswordHandler::AccessDenied, kapp->mainWidget() ? kapp->mainWidget() : 0, "AskPass" ) ) { - m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4" ).tqarg( Hosts ).tqarg( m_priv->workgroup(), m_priv->host(), m_priv->ip() ) ) ); + m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4" ).arg( Hosts ).arg( m_priv->workgroup(), m_priv->host(), m_priv->ip() ) ) ); } return; @@ -1187,7 +1187,7 @@ void Smb4KScanner::processShares() if ( passwordHandler()->askpass( m_priv->workgroup(), m_priv->host(), TQString(), Smb4KPasswordHandler::AccessDenied, kapp->mainWidget() ? kapp->mainWidget() : 0, "AskPass" ) ) { - m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4:%5" ).tqarg( Shares ).tqarg( m_priv->workgroup(), m_priv->host(), m_priv->ip(), TQString() ) ) ); + m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4:%5" ).arg( Shares ).arg( m_priv->workgroup(), m_priv->host(), m_priv->ip(), TQString() ) ) ); } return; @@ -1196,7 +1196,7 @@ void Smb4KScanner::processShares() { // FIXME: Does this error only occur when we scan a server that is // only capable of the RAP protocol or also under other conditions? - m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4:%5" ).tqarg( Shares ).tqarg( m_priv->workgroup(), m_priv->host(), m_priv->ip(), "rap" ) ) ); + m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4:%5" ).arg( Shares ).arg( m_priv->workgroup(), m_priv->host(), m_priv->ip(), "rap" ) ) ); m_priv->retry = true; @@ -1324,7 +1324,7 @@ void Smb4KScanner::processSearch() { if ( data.count() > 1 && !data[1].isEmpty() ) { - if ( m_buffer.contains( TQString( "Connection to %1 failed" ).tqarg( m_priv->host() ) ) != 0 ) + if ( m_buffer.contains( TQString( "Connection to %1 failed" ).arg( m_priv->host() ) ) != 0 ) { emit searchResult( new Smb4KHostItem() ); } diff --git a/smb4k/core/smb4ksettings.cpp b/smb4k/core/smb4ksettings.cpp index 098c6a5..4bbac1c 100644 --- a/smb4k/core/smb4ksettings.cpp +++ b/smb4k/core/smb4ksettings.cpp @@ -21,1067 +21,1067 @@ Smb4KSettings *Smb4KSettings::self() } Smb4KSettings::Smb4KSettings( ) - : KConfigSkeleton( TQString::tqfromLatin1( "smb4krc" ) ) + : KConfigSkeleton( TQString::fromLatin1( "smb4krc" ) ) { mSelf = this; - setCurrentGroup( TQString::tqfromLatin1( "Programs" ) ); + setCurrentGroup( TQString::fromLatin1( "Programs" ) ); - mGrepItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "grep" ), mGrep ); + mGrepItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "grep" ), mGrep ); mGrepItem->setLabel( i18n("The path to the program \"grep\"") ); - addItem( mGrepItem, TQString::tqfromLatin1( "grep" ) ); - mAwkItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "awk" ), mAwk ); + addItem( mGrepItem, TQString::fromLatin1( "grep" ) ); + mAwkItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "awk" ), mAwk ); mAwkItem->setLabel( i18n("The path to the program \"awk\"") ); - addItem( mAwkItem, TQString::tqfromLatin1( "awk" ) ); - mSedItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "sed" ), mSed ); + addItem( mAwkItem, TQString::fromLatin1( "awk" ) ); + mSedItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "sed" ), mSed ); mSedItem->setLabel( i18n("The path to the program \"sed\"") ); - addItem( mSedItem, TQString::tqfromLatin1( "sed" ) ); - mXargsItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "xargs" ), mXargs ); + addItem( mSedItem, TQString::fromLatin1( "sed" ) ); + mXargsItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "xargs" ), mXargs ); mXargsItem->setLabel( i18n("The path to the program \"xargs\"") ); - addItem( mXargsItem, TQString::tqfromLatin1( "xargs" ) ); - mRmdirItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "rmdir" ), mRmdir ); + addItem( mXargsItem, TQString::fromLatin1( "xargs" ) ); + mRmdirItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "rmdir" ), mRmdir ); mRmdirItem->setLabel( i18n("The path to the program \"rmdir\"") ); - addItem( mRmdirItem, TQString::tqfromLatin1( "rmdir" ) ); - mNmblookupItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "nmblookup" ), mNmblookup ); + addItem( mRmdirItem, TQString::fromLatin1( "rmdir" ) ); + mNmblookupItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "nmblookup" ), mNmblookup ); mNmblookupItem->setLabel( i18n("The path to the program \"nmblookup\"") ); - addItem( mNmblookupItem, TQString::tqfromLatin1( "nmblookup" ) ); - mSmbclientItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "smbclient" ), mSmbclient ); + addItem( mNmblookupItem, TQString::fromLatin1( "nmblookup" ) ); + mSmbclientItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "smbclient" ), mSmbclient ); mSmbclientItem->setLabel( i18n("The path to the program \"smbclient\"") ); - addItem( mSmbclientItem, TQString::tqfromLatin1( "smbclient" ) ); - mSmbspoolItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "smbspool" ), mSmbspool ); + addItem( mSmbclientItem, TQString::fromLatin1( "smbclient" ) ); + mSmbspoolItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "smbspool" ), mSmbspool ); mSmbspoolItem->setLabel( i18n("The path to the program \"smbspool\"") ); - addItem( mSmbspoolItem, TQString::tqfromLatin1( "smbspool" ) ); - mNetItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "net" ), mNet ); + addItem( mSmbspoolItem, TQString::fromLatin1( "smbspool" ) ); + mNetItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "net" ), mNet ); mNetItem->setLabel( i18n("The path to the program \"net\"") ); - addItem( mNetItem, TQString::tqfromLatin1( "net" ) ); - mMount_cifsItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "mount_cifs" ), mMount_cifs ); + addItem( mNetItem, TQString::fromLatin1( "net" ) ); + mMount_cifsItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "mount_cifs" ), mMount_cifs ); mMount_cifsItem->setLabel( i18n("The path to the program \"mount.cifs\"") ); - addItem( mMount_cifsItem, TQString::tqfromLatin1( "mount_cifs" ) ); - mUmount_cifsItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "umount_cifs" ), mUmount_cifs ); + addItem( mMount_cifsItem, TQString::fromLatin1( "mount_cifs" ) ); + mUmount_cifsItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "umount_cifs" ), mUmount_cifs ); mUmount_cifsItem->setLabel( i18n("The path to the program \"umount.cifs\"") ); - addItem( mUmount_cifsItem, TQString::tqfromLatin1( "umount_cifs" ) ); - mSmbmountItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "smbmount" ), mSmbmount ); + addItem( mUmount_cifsItem, TQString::fromLatin1( "umount_cifs" ) ); + mSmbmountItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "smbmount" ), mSmbmount ); mSmbmountItem->setLabel( i18n("The path to the program \"smbmount\"") ); - addItem( mSmbmountItem, TQString::tqfromLatin1( "smbmount" ) ); - mSmbumountItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "smbumount" ), mSmbumount ); + addItem( mSmbmountItem, TQString::fromLatin1( "smbmount" ) ); + mSmbumountItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "smbumount" ), mSmbumount ); mSmbumountItem->setLabel( i18n("The path to the program \"smbumount\"") ); - addItem( mSmbumountItem, TQString::tqfromLatin1( "smbumount" ) ); - mMountItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "mount" ), mMount ); + addItem( mSmbumountItem, TQString::fromLatin1( "smbumount" ) ); + mMountItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "mount" ), mMount ); mMountItem->setLabel( i18n("The path to the program \"mount\"") ); - addItem( mMountItem, TQString::tqfromLatin1( "mount" ) ); - mMount_smbfsItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "mount_smbfs" ), mMount_smbfs ); + addItem( mMountItem, TQString::fromLatin1( "mount" ) ); + mMount_smbfsItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "mount_smbfs" ), mMount_smbfs ); mMount_smbfsItem->setLabel( i18n("The path to the program \"mount_smbfs\" (FreeBSD only)") ); - addItem( mMount_smbfsItem, TQString::tqfromLatin1( "mount_smbfs" ) ); - mSmbutilItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "smbutil" ), mSmbutil ); + addItem( mMount_smbfsItem, TQString::fromLatin1( "mount_smbfs" ) ); + mSmbutilItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "smbutil" ), mSmbutil ); mSmbutilItem->setLabel( i18n("The path to the program \"smbutil\" (FreeBSD only)") ); - addItem( mSmbutilItem, TQString::tqfromLatin1( "smbutil" ) ); - mUmountItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "umount" ), mUmount ); + addItem( mSmbutilItem, TQString::fromLatin1( "smbutil" ) ); + mUmountItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "umount" ), mUmount ); mUmountItem->setLabel( i18n("The path to the program \"umount\"") ); - addItem( mUmountItem, TQString::tqfromLatin1( "umount" ) ); - mSmb4k_mountItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "smb4k_mount" ), mSmb4k_mount ); + addItem( mUmountItem, TQString::fromLatin1( "umount" ) ); + mSmb4k_mountItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "smb4k_mount" ), mSmb4k_mount ); mSmb4k_mountItem->setLabel( i18n("The path to the program \"smb4k_mount\"") ); - addItem( mSmb4k_mountItem, TQString::tqfromLatin1( "smb4k_mount" ) ); - mSmb4k_umountItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "smb4k_umount" ), mSmb4k_umount ); + addItem( mSmb4k_mountItem, TQString::fromLatin1( "smb4k_mount" ) ); + mSmb4k_umountItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "smb4k_umount" ), mSmb4k_umount ); mSmb4k_umountItem->setLabel( i18n("The path to the program \"smb4k_umount\"") ); - addItem( mSmb4k_umountItem, TQString::tqfromLatin1( "smb4k_umount" ) ); - mSmb4k_killItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "smb4k_kill" ), mSmb4k_kill ); + addItem( mSmb4k_umountItem, TQString::fromLatin1( "smb4k_umount" ) ); + mSmb4k_killItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "smb4k_kill" ), mSmb4k_kill ); mSmb4k_killItem->setLabel( i18n("The path to the program \"smb4k_kill\"") ); - addItem( mSmb4k_killItem, TQString::tqfromLatin1( "smb4k_kill" ) ); - mSmb4k_catItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "smb4k_cat" ), mSmb4k_cat ); + addItem( mSmb4k_killItem, TQString::fromLatin1( "smb4k_kill" ) ); + mSmb4k_catItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "smb4k_cat" ), mSmb4k_cat ); mSmb4k_catItem->setLabel( i18n("The path to the program \"smb4k_cat\"") ); - addItem( mSmb4k_catItem, TQString::tqfromLatin1( "smb4k_cat" ) ); - mSmb4k_mvItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "smb4k_mv" ), mSmb4k_mv ); + addItem( mSmb4k_catItem, TQString::fromLatin1( "smb4k_cat" ) ); + mSmb4k_mvItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "smb4k_mv" ), mSmb4k_mv ); mSmb4k_mvItem->setLabel( i18n("The path to the program \"smb4k_mv\"") ); - addItem( mSmb4k_mvItem, TQString::tqfromLatin1( "smb4k_mv" ) ); - mSuperItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "super" ), mSuper ); + addItem( mSmb4k_mvItem, TQString::fromLatin1( "smb4k_mv" ) ); + mSuperItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "super" ), mSuper ); mSuperItem->setLabel( i18n("The path to the program \"super\" (optional)") ); - addItem( mSuperItem, TQString::tqfromLatin1( "super" ) ); - mSudoItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "sudo" ), mSudo ); + addItem( mSuperItem, TQString::fromLatin1( "super" ) ); + mSudoItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "sudo" ), mSudo ); mSudoItem->setLabel( i18n("The path to the program \"sudo\" (optional)") ); - addItem( mSudoItem, TQString::tqfromLatin1( "sudo" ) ); - mDvipsItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "dvips" ), mDvips ); + addItem( mSudoItem, TQString::fromLatin1( "sudo" ) ); + mDvipsItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "dvips" ), mDvips ); mDvipsItem->setLabel( i18n("The path to the program \"dvips\" (optional)") ); - addItem( mDvipsItem, TQString::tqfromLatin1( "dvips" ) ); - mEnscriptItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "enscript" ), mEnscript ); + addItem( mDvipsItem, TQString::fromLatin1( "dvips" ) ); + mEnscriptItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "enscript" ), mEnscript ); mEnscriptItem->setLabel( i18n("The path to the program \"enscript\" (optional)") ); - addItem( mEnscriptItem, TQString::tqfromLatin1( "enscript" ) ); - mRsyncItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "rsync" ), mRsync ); + addItem( mEnscriptItem, TQString::fromLatin1( "enscript" ) ); + mRsyncItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "rsync" ), mRsync ); mRsyncItem->setLabel( i18n("The path to the program \"rsync\" (optional)") ); - addItem( mRsyncItem, TQString::tqfromLatin1( "rsync" ) ); - mKonsoleItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "konsole" ), mKonsole ); + addItem( mRsyncItem, TQString::fromLatin1( "rsync" ) ); + mKonsoleItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "konsole" ), mKonsole ); mKonsoleItem->setLabel( i18n("The path to the program \"konsole\" (optional)") ); - addItem( mKonsoleItem, TQString::tqfromLatin1( "konsole" ) ); + addItem( mKonsoleItem, TQString::fromLatin1( "konsole" ) ); - setCurrentGroup( TQString::tqfromLatin1( "UserInterface" ) ); + setCurrentGroup( TQString::fromLatin1( "UserInterface" ) ); - mShowCustomBookmarkLabelItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ShowCustomBookmarkLabel" ), mShowCustomBookmarkLabel, true ); + mShowCustomBookmarkLabelItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ShowCustomBookmarkLabel" ), mShowCustomBookmarkLabel, true ); mShowCustomBookmarkLabelItem->setLabel( i18n("Show custom bookmark label if available") ); mShowCustomBookmarkLabelItem->setWhatsThis( i18n("Do not show the name of the share that is represented by the bookmark but the custom label that was defined in the bookmark editor.") ); - addItem( mShowCustomBookmarkLabelItem, TQString::tqfromLatin1( "ShowCustomBookmarkLabel" ) ); - mEmbedIntoSystemTrayItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "EmbedIntoSystemTray" ), mEmbedIntoSystemTray, true ); + addItem( mShowCustomBookmarkLabelItem, TQString::fromLatin1( "ShowCustomBookmarkLabel" ) ); + mEmbedIntoSystemTrayItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "EmbedIntoSystemTray" ), mEmbedIntoSystemTray, true ); mEmbedIntoSystemTrayItem->setLabel( i18n("Embed application into system tray") ); mEmbedIntoSystemTrayItem->setWhatsThis( i18n("Embed the application into the system tray. The system tray widget provides a popup menu with several commonly used tasks so that you do not need to bring up the main window everytime. If this setting is chosen you have to use \"Quit\" from the \"File\" menu or the system tray widget to exit the application.") ); - addItem( mEmbedIntoSystemTrayItem, TQString::tqfromLatin1( "EmbedIntoSystemTray" ) ); - mStartMainWindowDockedItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "StartMainWindowDocked" ), mStartMainWindowDocked, false ); + addItem( mEmbedIntoSystemTrayItem, TQString::fromLatin1( "EmbedIntoSystemTray" ) ); + mStartMainWindowDockedItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "StartMainWindowDocked" ), mStartMainWindowDocked, false ); mStartMainWindowDockedItem->setLabel( i18n("Start docked") ); mStartMainWindowDockedItem->setWhatsThis( i18n("Start the application docked to the system tray, i.e. only the system tray widget is shown and the main window is hidden. You can bring the main window up by clicking on the system tray widget or by choosing \"Restore\" from its popup menu.") ); - addItem( mStartMainWindowDockedItem, TQString::tqfromLatin1( "StartMainWindowDocked" ) ); + addItem( mStartMainWindowDockedItem, TQString::fromLatin1( "StartMainWindowDocked" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesSharesView; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "IconView" ); + choice.name = TQString::fromLatin1( "IconView" ); valuesSharesView.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "ListView" ); + choice.name = TQString::fromLatin1( "ListView" ); valuesSharesView.append( choice ); } - mSharesViewItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "SharesView" ), mSharesView, valuesSharesView, EnumSharesView::IconView ); + mSharesViewItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "SharesView" ), mSharesView, valuesSharesView, EnumSharesView::IconView ); mSharesViewItem->setLabel( i18n("How the shares should be displayed") ); mSharesViewItem->setWhatsThis( i18n("Choose the kind of view you prefer for displaying the mounted shares. There is an icon view or a list view available.") ); - addItem( mSharesViewItem, TQString::tqfromLatin1( "SharesView" ) ); - mShowPrinterSharesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ShowPrinterShares" ), mShowPrinterShares, true ); + addItem( mSharesViewItem, TQString::fromLatin1( "SharesView" ) ); + mShowPrinterSharesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ShowPrinterShares" ), mShowPrinterShares, true ); mShowPrinterSharesItem->setLabel( i18n("Show printer shares") ); mShowPrinterSharesItem->setWhatsThis( i18n("Printer shares will be displayed in the network browser.") ); - addItem( mShowPrinterSharesItem, TQString::tqfromLatin1( "ShowPrinterShares" ) ); - mShowHiddenSharesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ShowHiddenShares" ), mShowHiddenShares, true ); + addItem( mShowPrinterSharesItem, TQString::fromLatin1( "ShowPrinterShares" ) ); + mShowHiddenSharesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ShowHiddenShares" ), mShowHiddenShares, true ); mShowHiddenSharesItem->setLabel( i18n("Show hidden shares") ); mShowHiddenSharesItem->setWhatsThis( i18n("Hidden shares will be displayed in the network browser. Hidden shares are ending with a $ sign, e.g. Musik$ or IPC$.") ); - addItem( mShowHiddenSharesItem, TQString::tqfromLatin1( "ShowHiddenShares" ) ); - mShowHiddenIPCSharesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ShowHiddenIPCShares" ), mShowHiddenIPCShares, true ); + addItem( mShowHiddenSharesItem, TQString::fromLatin1( "ShowHiddenShares" ) ); + mShowHiddenIPCSharesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ShowHiddenIPCShares" ), mShowHiddenIPCShares, true ); mShowHiddenIPCSharesItem->setLabel( i18n("Show hidden IPC$ shares") ); mShowHiddenIPCSharesItem->setWhatsThis( i18n("Hidden IPC$ shares will be displayed in the network browser.") ); - addItem( mShowHiddenIPCSharesItem, TQString::tqfromLatin1( "ShowHiddenIPCShares" ) ); - mShowHiddenADMINSharesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ShowHiddenADMINShares" ), mShowHiddenADMINShares, true ); + addItem( mShowHiddenIPCSharesItem, TQString::fromLatin1( "ShowHiddenIPCShares" ) ); + mShowHiddenADMINSharesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ShowHiddenADMINShares" ), mShowHiddenADMINShares, true ); mShowHiddenADMINSharesItem->setLabel( i18n("Show hidden ADMIN$ shares") ); mShowHiddenADMINSharesItem->setWhatsThis( i18n("Hidden ADMIN$ shares will be displayed in the network browser.") ); - addItem( mShowHiddenADMINSharesItem, TQString::tqfromLatin1( "ShowHiddenADMINShares" ) ); - mShowTypeItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ShowType" ), mShowType, true ); + addItem( mShowHiddenADMINSharesItem, TQString::fromLatin1( "ShowHiddenADMINShares" ) ); + mShowTypeItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ShowType" ), mShowType, true ); mShowTypeItem->setLabel( i18n("Show the type of a share") ); mShowTypeItem->setWhatsThis( i18n("The type of a share will be displayed in a separate column in the network browser. It can either be Disk, Print or IPC.") ); - addItem( mShowTypeItem, TQString::tqfromLatin1( "ShowType" ) ); - mShowIPAddressItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ShowIPAddress" ), mShowIPAddress, true ); + addItem( mShowTypeItem, TQString::fromLatin1( "ShowType" ) ); + mShowIPAddressItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ShowIPAddress" ), mShowIPAddress, true ); mShowIPAddressItem->setLabel( i18n("Show the IP address of a server") ); mShowIPAddressItem->setWhatsThis( i18n("The IP address of the server will be displayed in a separate column in the network browser.") ); - addItem( mShowIPAddressItem, TQString::tqfromLatin1( "ShowIPAddress" ) ); - mShowCommentItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ShowComment" ), mShowComment, true ); + addItem( mShowIPAddressItem, TQString::fromLatin1( "ShowIPAddress" ) ); + mShowCommentItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ShowComment" ), mShowComment, true ); mShowCommentItem->setLabel( i18n("Show the comment of a share") ); mShowCommentItem->setWhatsThis( i18n("The comment describing the server or share will be displayed in a separate column in the network browser.") ); - addItem( mShowCommentItem, TQString::tqfromLatin1( "ShowComment" ) ); - mShowNetworkItemToolTipItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ShowNetworkItemToolTip" ), mShowNetworkItemToolTip, true ); + addItem( mShowCommentItem, TQString::fromLatin1( "ShowComment" ) ); + mShowNetworkItemToolTipItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ShowNetworkItemToolTip" ), mShowNetworkItemToolTip, true ); mShowNetworkItemToolTipItem->setLabel( i18n("Show a tooltip with information about the network item") ); mShowNetworkItemToolTipItem->setWhatsThis( i18n("The tooltip shows various information about the current network item.") ); - addItem( mShowNetworkItemToolTipItem, TQString::tqfromLatin1( "ShowNetworkItemToolTip" ) ); - mShowMountPointItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ShowMountPoint" ), mShowMountPoint, false ); + addItem( mShowNetworkItemToolTipItem, TQString::fromLatin1( "ShowNetworkItemToolTip" ) ); + mShowMountPointItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ShowMountPoint" ), mShowMountPoint, false ); mShowMountPointItem->setLabel( i18n("Show the mount point of a share instead of its name") ); mShowMountPointItem->setWhatsThis( i18n("A share is normally displayed with its name in the shares view. Choosing this feature will cause the exchange of the share name by the mount point.") ); - addItem( mShowMountPointItem, TQString::tqfromLatin1( "ShowMountPoint" ) ); - mShowAllSharesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ShowAllShares" ), mShowAllShares, false ); + addItem( mShowMountPointItem, TQString::fromLatin1( "ShowMountPoint" ) ); + mShowAllSharesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ShowAllShares" ), mShowAllShares, false ); mShowAllSharesItem->setLabel( i18n("Show all shares that are mounted on the system") ); mShowAllSharesItem->setWhatsThis( i18n("You will not only see the shares that were mounted and are owned by you, but also all other mounts using the SMBFS and CIFS file system that are present on the system.") ); - addItem( mShowAllSharesItem, TQString::tqfromLatin1( "ShowAllShares" ) ); - mEnableDropSupportItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "EnableDropSupport" ), mEnableDropSupport, false ); + addItem( mShowAllSharesItem, TQString::fromLatin1( "ShowAllShares" ) ); + mEnableDropSupportItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "EnableDropSupport" ), mEnableDropSupport, false ); mEnableDropSupportItem->setLabel( i18n("Allow the dropping of files and directories onto share icons") ); mEnableDropSupportItem->setWhatsThis( i18n("This setting allows you to drop files or whole directories onto the share icons, which will cause them to be copied.") ); - addItem( mEnableDropSupportItem, TQString::tqfromLatin1( "EnableDropSupport" ) ); - mEnableDragSupportItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "EnableDragSupport" ), mEnableDragSupport, false ); + addItem( mEnableDropSupportItem, TQString::fromLatin1( "EnableDropSupport" ) ); + mEnableDragSupportItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "EnableDragSupport" ), mEnableDragSupport, false ); mEnableDragSupportItem->setLabel( i18n("Allow the dragging of share icons") ); mEnableDragSupportItem->setWhatsThis( i18n("This setting allows you to drag a share item out of Smb4K and onto the desktop or into a file manager. Only enable it if you think you absolutely need it and read the handbook before you mark this checkbox.") ); - addItem( mEnableDragSupportItem, TQString::tqfromLatin1( "EnableDragSupport" ) ); - mShowShareToolTipItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ShowShareToolTip" ), mShowShareToolTip, true ); + addItem( mEnableDragSupportItem, TQString::fromLatin1( "EnableDragSupport" ) ); + mShowShareToolTipItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ShowShareToolTip" ), mShowShareToolTip, true ); mShowShareToolTipItem->setLabel( i18n("Show a tooltip with information about the share") ); mShowShareToolTipItem->setWhatsThis( i18n("The tooltip shows various information about the current share.") ); - addItem( mShowShareToolTipItem, TQString::tqfromLatin1( "ShowShareToolTip" ) ); - mPreviewHiddenItemsItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "PreviewHiddenItems" ), mPreviewHiddenItems, false ); + addItem( mShowShareToolTipItem, TQString::fromLatin1( "ShowShareToolTip" ) ); + mPreviewHiddenItemsItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "PreviewHiddenItems" ), mPreviewHiddenItems, false ); mPreviewHiddenItemsItem->setLabel( i18n("Show hidden files and directories when previewing a share") ); mPreviewHiddenItemsItem->setWhatsThis( i18n("Display hidden files and directories in the preview dialog. The names of hidden files and directories are beginning with a period and are usually needed for very specific purposes (configuration file of an application, etc.). Since they are not of any importance for your regular work, you normally do not need to enable this feature.") ); - addItem( mPreviewHiddenItemsItem, TQString::tqfromLatin1( "PreviewHiddenItems" ) ); - mShowOwnerItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ShowOwner" ), mShowOwner, false ); + addItem( mPreviewHiddenItemsItem, TQString::fromLatin1( "PreviewHiddenItems" ) ); + mShowOwnerItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ShowOwner" ), mShowOwner, false ); mShowOwnerItem->setLabel( i18n("Show owner and group (SMBFS only)") ); mShowOwnerItem->setWhatsThis( i18n("Show the UID and GID that own all files on the mounted file system. At the moment the column will only contain an entry if the share was mounted with the SMBFS file system.") ); - addItem( mShowOwnerItem, TQString::tqfromLatin1( "ShowOwner" ) ); - mShowLoginItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ShowLogin" ), mShowLogin, false ); + addItem( mShowOwnerItem, TQString::fromLatin1( "ShowOwner" ) ); + mShowLoginItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ShowLogin" ), mShowLogin, false ); mShowLoginItem->setLabel( i18n("Show login (CIFS only)") ); mShowLoginItem->setWhatsThis( i18n("Show the login that was used to authenticate to the server. The column will only contain an entry if the share was mounted with the CIFS file system.") ); - addItem( mShowLoginItem, TQString::tqfromLatin1( "ShowLogin" ) ); - mShowFileSystemItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ShowFileSystem" ), mShowFileSystem, true ); + addItem( mShowLoginItem, TQString::fromLatin1( "ShowLogin" ) ); + mShowFileSystemItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ShowFileSystem" ), mShowFileSystem, true ); mShowFileSystemItem->setLabel( i18n("Show file system") ); mShowFileSystemItem->setWhatsThis( i18n("Show the file system that was used for mounting the share.") ); - addItem( mShowFileSystemItem, TQString::tqfromLatin1( "ShowFileSystem" ) ); - mShowFreeDiskSpaceItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ShowFreeDiskSpace" ), mShowFreeDiskSpace, false ); + addItem( mShowFileSystemItem, TQString::fromLatin1( "ShowFileSystem" ) ); + mShowFreeDiskSpaceItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ShowFreeDiskSpace" ), mShowFreeDiskSpace, false ); mShowFreeDiskSpaceItem->setLabel( i18n("Show free disk space") ); mShowFreeDiskSpaceItem->setWhatsThis( i18n("Show the free disk space that is left on the share.") ); - addItem( mShowFreeDiskSpaceItem, TQString::tqfromLatin1( "ShowFreeDiskSpace" ) ); - mShowUsedDiskSpaceItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ShowUsedDiskSpace" ), mShowUsedDiskSpace, false ); + addItem( mShowFreeDiskSpaceItem, TQString::fromLatin1( "ShowFreeDiskSpace" ) ); + mShowUsedDiskSpaceItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ShowUsedDiskSpace" ), mShowUsedDiskSpace, false ); mShowUsedDiskSpaceItem->setLabel( i18n("Show used disk space") ); mShowUsedDiskSpaceItem->setWhatsThis( i18n("Show the disk space that is already used on the share.") ); - addItem( mShowUsedDiskSpaceItem, TQString::tqfromLatin1( "ShowUsedDiskSpace" ) ); - mShowTotalDiskSpaceItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ShowTotalDiskSpace" ), mShowTotalDiskSpace, false ); + addItem( mShowUsedDiskSpaceItem, TQString::fromLatin1( "ShowUsedDiskSpace" ) ); + mShowTotalDiskSpaceItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ShowTotalDiskSpace" ), mShowTotalDiskSpace, false ); mShowTotalDiskSpaceItem->setLabel( i18n("Show total disk space") ); mShowTotalDiskSpaceItem->setWhatsThis( i18n("Show the total disk space of the share.") ); - addItem( mShowTotalDiskSpaceItem, TQString::tqfromLatin1( "ShowTotalDiskSpace" ) ); - mShowDiskUsageItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ShowDiskUsage" ), mShowDiskUsage, true ); + addItem( mShowTotalDiskSpaceItem, TQString::fromLatin1( "ShowTotalDiskSpace" ) ); + mShowDiskUsageItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ShowDiskUsage" ), mShowDiskUsage, true ); mShowDiskUsageItem->setLabel( i18n("Show disk usage") ); mShowDiskUsageItem->setWhatsThis( i18n("Show the space that is used on the share in percent.") ); - addItem( mShowDiskUsageItem, TQString::tqfromLatin1( "ShowDiskUsage" ) ); + addItem( mShowDiskUsageItem, TQString::fromLatin1( "ShowDiskUsage" ) ); - setCurrentGroup( TQString::tqfromLatin1( "Network" ) ); + setCurrentGroup( TQString::fromLatin1( "Network" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesBrowseList; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "LookupDomains" ); + choice.name = TQString::fromLatin1( "LookupDomains" ); valuesBrowseList.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "QueryCurrentMaster" ); + choice.name = TQString::fromLatin1( "QueryCurrentMaster" ); valuesBrowseList.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "QueryCustomMaster" ); + choice.name = TQString::fromLatin1( "QueryCustomMaster" ); valuesBrowseList.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "ScanBroadcastAreas" ); + choice.name = TQString::fromLatin1( "ScanBroadcastAreas" ); valuesBrowseList.append( choice ); } - mBrowseListItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "BrowseList" ), mBrowseList, valuesBrowseList, EnumBrowseList::LookupDomains ); + mBrowseListItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "BrowseList" ), mBrowseList, valuesBrowseList, EnumBrowseList::LookupDomains ); mBrowseListItem->setLabel( i18n("Method how to retrieve the browse list") ); mBrowseListItem->setWhatsThis( i18n("Choose the method how to compile the initial browse list. There are four options available: The first one is the default one and employs \"nmblookup -M -- -\" to discover all workgroups, domains, and their master browsers on your network neighborhood. The second one instructs Smb4K to query the current master browser of your workgroup or domain to retrieve the browse list. The third is similar to the second one except that you can define the master browser that should be queried. If you choose the last option, the provided list of broadcast areas will be scanned using \"nmblookup -B x.x.x.x -- '*'\".") ); - addItem( mBrowseListItem, TQString::tqfromLatin1( "BrowseList" ) ); - mCustomMasterBrowserItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "CustomMasterBrowser" ), mCustomMasterBrowser ); + addItem( mBrowseListItem, TQString::fromLatin1( "BrowseList" ) ); + mCustomMasterBrowserItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "CustomMasterBrowser" ), mCustomMasterBrowser ); mCustomMasterBrowserItem->setLabel( i18n("A custom master browser that is to be queried") ); mCustomMasterBrowserItem->setWhatsThis( i18n("Enter the name or IP address of a master browser here that should be queried to compile the initial browse list.") ); - addItem( mCustomMasterBrowserItem, TQString::tqfromLatin1( "CustomMasterBrowser" ) ); - mBroadcastAreasItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "BroadcastAreas" ), mBroadcastAreas ); + addItem( mCustomMasterBrowserItem, TQString::fromLatin1( "CustomMasterBrowser" ) ); + mBroadcastAreasItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "BroadcastAreas" ), mBroadcastAreas ); mBroadcastAreasItem->setLabel( i18n("A custom list of broadcast addresses") ); mBroadcastAreasItem->setWhatsThis( i18n("Enter a comma-separated list of broadcast addresses here (e.g. 192.168.0.255, 192.168.1.255). It is used to scan for all known hosts in the respective broadcast areas.") ); - addItem( mBroadcastAreasItem, TQString::tqfromLatin1( "BroadcastAreas" ) ); + addItem( mBroadcastAreasItem, TQString::fromLatin1( "BroadcastAreas" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesSearchMethod; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "Nmblookup" ); + choice.name = TQString::fromLatin1( "Nmblookup" ); valuesSearchMethod.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "Smbclient" ); + choice.name = TQString::fromLatin1( "Smbclient" ); valuesSearchMethod.append( choice ); } - mSearchMethodItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "SearchMethod" ), mSearchMethod, valuesSearchMethod, EnumSearchMethod::Nmblookup ); + mSearchMethodItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "SearchMethod" ), mSearchMethod, valuesSearchMethod, EnumSearchMethod::Nmblookup ); mSearchMethodItem->setLabel( i18n("Method for searching for remote hosts") ); mSearchMethodItem->setWhatsThis( i18n("Smb4K is able to search for remote hosts either using nmblookup or smbclient. The nmblookup method is very reliable and works well. However, if your network is configured uncommonly and you experience problems when searching, you should try the smbclient method. But please note that you lose the ability to search for IP addresses in that case.") ); - addItem( mSearchMethodItem, TQString::tqfromLatin1( "SearchMethod" ) ); + addItem( mSearchMethodItem, TQString::fromLatin1( "SearchMethod" ) ); - setCurrentGroup( TQString::tqfromLatin1( "Shares" ) ); + setCurrentGroup( TQString::fromLatin1( "Shares" ) ); - mMountPrefixItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "MountPrefix" ), mMountPrefix, TQString::tqfromLatin1( "${HOME}/smb4k/" ) ); + mMountPrefixItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "MountPrefix" ), mMountPrefix, TQString::fromLatin1( "${HOME}/smb4k/" ) ); mMountPrefixItem->setLabel( i18n("The mount prefix") ); mMountPrefixItem->setWhatsThis( i18n("This is the prefix where Smb4K will create the mount points and mount the remote shares.") ); - addItem( mMountPrefixItem, TQString::tqfromLatin1( "MountPrefix" ) ); - mForceLowerCaseSubdirsItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ForceLowerCaseSubdirs" ), mForceLowerCaseSubdirs, false ); + addItem( mMountPrefixItem, TQString::fromLatin1( "MountPrefix" ) ); + mForceLowerCaseSubdirsItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ForceLowerCaseSubdirs" ), mForceLowerCaseSubdirs, false ); mForceLowerCaseSubdirsItem->setLabel( i18n("Force the subdirectories created by Smb4K to be lowercase") ); mForceLowerCaseSubdirsItem->setWhatsThis( i18n("All names of the subdirectories created by Smb4K below the mount prefix will be lowercase.") ); - addItem( mForceLowerCaseSubdirsItem, TQString::tqfromLatin1( "ForceLowerCaseSubdirs" ) ); - mUnmountSharesOnExitItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UnmountSharesOnExit" ), mUnmountSharesOnExit, false ); + addItem( mForceLowerCaseSubdirsItem, TQString::fromLatin1( "ForceLowerCaseSubdirs" ) ); + mUnmountSharesOnExitItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UnmountSharesOnExit" ), mUnmountSharesOnExit, false ); mUnmountSharesOnExitItem->setLabel( i18n("Unmount the shares owned by the user on exit") ); mUnmountSharesOnExitItem->setWhatsThis( i18n("Unmount all shares that belong to you when the program exits.") ); - addItem( mUnmountSharesOnExitItem, TQString::tqfromLatin1( "UnmountSharesOnExit" ) ); - mRemountSharesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "RemountShares" ), mRemountShares, false ); + addItem( mUnmountSharesOnExitItem, TQString::fromLatin1( "UnmountSharesOnExit" ) ); + mRemountSharesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "RemountShares" ), mRemountShares, false ); mRemountSharesItem->setLabel( i18n("Remount shares") ); mRemountSharesItem->setWhatsThis( i18n("Remount all your shares that were still mounted when you exited the program. Shares that were mounted by other users are ignored.") ); - addItem( mRemountSharesItem, TQString::tqfromLatin1( "RemountShares" ) ); - mUnmountForeignSharesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UnmountForeignShares" ), mUnmountForeignShares, false ); + addItem( mRemountSharesItem, TQString::fromLatin1( "RemountShares" ) ); + mUnmountForeignSharesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UnmountForeignShares" ), mUnmountForeignShares, false ); mUnmountForeignSharesItem->setLabel( i18n("Allow the unmounting of shares owned by other users") ); mUnmountForeignSharesItem->setWhatsThis( i18n("Allow the unmounting of shares that were mounted by other users. In most cases you need super user privileges for this. Please think before you enable this option!") ); - addItem( mUnmountForeignSharesItem, TQString::tqfromLatin1( "UnmountForeignShares" ) ); - mCheckIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "CheckInterval" ), mCheckInterval, 2500 ); + addItem( mUnmountForeignSharesItem, TQString::fromLatin1( "UnmountForeignShares" ) ); + mCheckIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "CheckInterval" ), mCheckInterval, 2500 ); mCheckIntervalItem->setMinValue(500); mCheckIntervalItem->setMaxValue(300000); mCheckIntervalItem->setLabel( i18n("Interval between checks for new and inaccessible shares") ); mCheckIntervalItem->setWhatsThis( i18n("This is the time that elapses until Smb4K checks again for new mounts and unmounts. The lower limit is 500 ms, the upper one 300000 ms. Please note that the smaller the interval gets the higher is your system load.") ); - addItem( mCheckIntervalItem, TQString::tqfromLatin1( "CheckInterval" ) ); + addItem( mCheckIntervalItem, TQString::fromLatin1( "CheckInterval" ) ); - setCurrentGroup( TQString::tqfromLatin1( "Authentication" ) ); + setCurrentGroup( TQString::fromLatin1( "Authentication" ) ); - mUseWalletItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UseWallet" ), mUseWallet, true ); + mUseWalletItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UseWallet" ), mUseWallet, true ); mUseWalletItem->setLabel( i18n("Use a wallet to store authentication data") ); mUseWalletItem->setWhatsThis( i18n("Use a wallet to store the authentication data. The login name and the password name are stored encrypted on your hard drive. If this setting is disabled, the authentication data is not stored permanently but only temporarily.") ); - addItem( mUseWalletItem, TQString::tqfromLatin1( "UseWallet" ) ); - mRememberPasswordsItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "RememberPasswords" ), mRememberPasswords, true ); + addItem( mUseWalletItem, TQString::fromLatin1( "UseWallet" ) ); + mRememberPasswordsItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "RememberPasswords" ), mRememberPasswords, true ); mRememberPasswordsItem->setLabel( i18n("Remember passwords if no wallet is used") ); mRememberPasswordsItem->setWhatsThis( i18n("If you decided to store the login names and passwords only temporarily, Smb4K will remember them until the program exits. If you disable this setting, you will have to provide the authentication data everytime it is needed.") ); - addItem( mRememberPasswordsItem, TQString::tqfromLatin1( "RememberPasswords" ) ); - mUseDefaultLoginItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UseDefaultLogin" ), mUseDefaultLogin, false ); + addItem( mRememberPasswordsItem, TQString::fromLatin1( "RememberPasswords" ) ); + mUseDefaultLoginItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UseDefaultLogin" ), mUseDefaultLogin, false ); mUseDefaultLoginItem->setLabel( i18n("Use a default login") ); mUseDefaultLoginItem->setWhatsThis( i18n("Enable the usage of a default login name and password. The authentication data provided below is then used by default to authenticate to a remote server. This is very useful e.g. if you are working in an Active Directory environment or an NT domain.") ); - addItem( mUseDefaultLoginItem, TQString::tqfromLatin1( "UseDefaultLogin" ) ); + addItem( mUseDefaultLoginItem, TQString::fromLatin1( "UseDefaultLogin" ) ); - setCurrentGroup( TQString::tqfromLatin1( "Samba" ) ); + setCurrentGroup( TQString::fromLatin1( "Samba" ) ); - mNetBIOSNameItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "NetBIOSName" ), mNetBIOSName ); + mNetBIOSNameItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "NetBIOSName" ), mNetBIOSName ); mNetBIOSNameItem->setLabel( i18n("The NetBIOS name of this computer") ); mNetBIOSNameItem->setWhatsThis( i18n("This is the NetBIOS name of this computer that is used by Smb4K. By default, it is either the NetBIOS name that is defined in the smb.conf file or the host name.") ); - addItem( mNetBIOSNameItem, TQString::tqfromLatin1( "NetBIOSName" ) ); - mDomainNameItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "DomainName" ), mDomainName ); + addItem( mNetBIOSNameItem, TQString::fromLatin1( "NetBIOSName" ) ); + mDomainNameItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "DomainName" ), mDomainName ); mDomainNameItem->setLabel( i18n("The name of the workgroup/domain this computer is in") ); mDomainNameItem->setWhatsThis( i18n("This is the workgroup or domain this computer is or should be in. By default, it is the workgroup that is defined in the smb.conf file.") ); - addItem( mDomainNameItem, TQString::tqfromLatin1( "DomainName" ) ); - mSocketOptionsItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "SocketOptions" ), mSocketOptions ); + addItem( mDomainNameItem, TQString::fromLatin1( "DomainName" ) ); + mSocketOptionsItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "SocketOptions" ), mSocketOptions ); mSocketOptionsItem->setLabel( i18n("The socket options") ); mSocketOptionsItem->setWhatsThis( i18n("These are the TCP socket options that are used by nmblookup, smbmount and smbclient. Socket options are controls on the networking layer of the operating systems which allow the connection to be tuned. See the manual page of smb.conf for more information.") ); - addItem( mSocketOptionsItem, TQString::tqfromLatin1( "SocketOptions" ) ); - mNetBIOSScopeItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "NetBIOSScope" ), mNetBIOSScope ); + addItem( mSocketOptionsItem, TQString::fromLatin1( "SocketOptions" ) ); + mNetBIOSScopeItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "NetBIOSScope" ), mNetBIOSScope ); mNetBIOSScopeItem->setLabel( i18n("The NetBIOS scope") ); mNetBIOSScopeItem->setWhatsThis( i18n("This sets the NetBIOS scope that nmblookup, smbmount and smbclient will operate under. It should not be set unless every machine on your network neighborhood sets this value.") ); - addItem( mNetBIOSScopeItem, TQString::tqfromLatin1( "NetBIOSScope" ) ); - mRemotePortItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "RemotePort" ), mRemotePort, 139 ); + addItem( mNetBIOSScopeItem, TQString::fromLatin1( "NetBIOSScope" ) ); + mRemotePortItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "RemotePort" ), mRemotePort, 139 ); mRemotePortItem->setMinValue(1); mRemotePortItem->setMaxValue(65535); mRemotePortItem->setLabel( i18n("The remote SMB port") ); mRemotePortItem->setWhatsThis( i18n("This is the port that is to be used for connecting to remote servers. Please note that this is independent of the settings in the smb.conf file.") ); - addItem( mRemotePortItem, TQString::tqfromLatin1( "RemotePort" ) ); - mUseKerberosItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UseKerberos" ), mUseKerberos, false ); + addItem( mRemotePortItem, TQString::fromLatin1( "RemotePort" ) ); + mUseKerberosItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UseKerberos" ), mUseKerberos, false ); mUseKerberosItem->setLabel( i18n("Use Kerberos for authentication") ); mUseKerberosItem->setWhatsThis( i18n("Try to authenticate with Kerberos. This is only useful in an Active Directory environment. The setting affects the smbmount and smbclient command.") ); - addItem( mUseKerberosItem, TQString::tqfromLatin1( "UseKerberos" ) ); - mMachineAccountItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "MachineAccount" ), mMachineAccount, false ); + addItem( mUseKerberosItem, TQString::fromLatin1( "UseKerberos" ) ); + mMachineAccountItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "MachineAccount" ), mMachineAccount, false ); mMachineAccountItem->setLabel( i18n("Use machine account for login") ); mMachineAccountItem->setWhatsThis( i18n("Make queries to the remote server using the machine account of the local server. The setting affects the net and the smbclient command.") ); - addItem( mMachineAccountItem, TQString::tqfromLatin1( "MachineAccount" ) ); + addItem( mMachineAccountItem, TQString::fromLatin1( "MachineAccount" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesFilesystem; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "CIFS" ); + choice.name = TQString::fromLatin1( "CIFS" ); valuesFilesystem.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "SMBFS" ); + choice.name = TQString::fromLatin1( "SMBFS" ); valuesFilesystem.append( choice ); } - mFilesystemItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "Filesystem" ), mFilesystem, valuesFilesystem, EnumFilesystem::CIFS ); + mFilesystemItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Filesystem" ), mFilesystem, valuesFilesystem, EnumFilesystem::CIFS ); mFilesystemItem->setLabel( i18n("The file system that is used for mounting remote shares") ); mFilesystemItem->setWhatsThis( i18n("This is the file system that will be used to mount the remote shares. The Common Internet File System (CIFS) is supported by Windows 2000 and above as well as by Samba. It offers many improvements and advancements compared to the Server Message Block File System (SMBFS) which is used by Windows 9x and below.") ); - addItem( mFilesystemItem, TQString::tqfromLatin1( "Filesystem" ) ); + addItem( mFilesystemItem, TQString::fromLatin1( "Filesystem" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesClientCharset; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "default_charset" ); + choice.name = TQString::fromLatin1( "default_charset" ); valuesClientCharset.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "iso8859_1" ); + choice.name = TQString::fromLatin1( "iso8859_1" ); valuesClientCharset.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "iso8859_2" ); + choice.name = TQString::fromLatin1( "iso8859_2" ); valuesClientCharset.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "iso8859_3" ); + choice.name = TQString::fromLatin1( "iso8859_3" ); valuesClientCharset.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "iso8859_4" ); + choice.name = TQString::fromLatin1( "iso8859_4" ); valuesClientCharset.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "iso8859_5" ); + choice.name = TQString::fromLatin1( "iso8859_5" ); valuesClientCharset.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "iso8859_6" ); + choice.name = TQString::fromLatin1( "iso8859_6" ); valuesClientCharset.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "iso8859_7" ); + choice.name = TQString::fromLatin1( "iso8859_7" ); valuesClientCharset.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "iso8859_8" ); + choice.name = TQString::fromLatin1( "iso8859_8" ); valuesClientCharset.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "iso8859_9" ); + choice.name = TQString::fromLatin1( "iso8859_9" ); valuesClientCharset.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "iso8859_13" ); + choice.name = TQString::fromLatin1( "iso8859_13" ); valuesClientCharset.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "iso8859_14" ); + choice.name = TQString::fromLatin1( "iso8859_14" ); valuesClientCharset.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "iso8859_15" ); + choice.name = TQString::fromLatin1( "iso8859_15" ); valuesClientCharset.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "utf8" ); + choice.name = TQString::fromLatin1( "utf8" ); valuesClientCharset.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "koi8_r" ); + choice.name = TQString::fromLatin1( "koi8_r" ); valuesClientCharset.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "koi8_u" ); + choice.name = TQString::fromLatin1( "koi8_u" ); valuesClientCharset.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "koi8_ru" ); + choice.name = TQString::fromLatin1( "koi8_ru" ); valuesClientCharset.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp1251" ); + choice.name = TQString::fromLatin1( "cp1251" ); valuesClientCharset.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "gb2312" ); + choice.name = TQString::fromLatin1( "gb2312" ); valuesClientCharset.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "big5" ); + choice.name = TQString::fromLatin1( "big5" ); valuesClientCharset.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "euc_jp" ); + choice.name = TQString::fromLatin1( "euc_jp" ); valuesClientCharset.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "euc_kr" ); + choice.name = TQString::fromLatin1( "euc_kr" ); valuesClientCharset.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "tis_620" ); + choice.name = TQString::fromLatin1( "tis_620" ); valuesClientCharset.append( choice ); } - mClientCharsetItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "ClientCharset" ), mClientCharset, valuesClientCharset, EnumClientCharset::default_charset ); + mClientCharsetItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "ClientCharset" ), mClientCharset, valuesClientCharset, EnumClientCharset::default_charset ); mClientCharsetItem->setLabel( i18n("The charset used by the client") ); mClientCharsetItem->setWhatsThis( i18n("This is the charset that is used by the client side (i.e. your side) either to convert local path names to and from Unicode in case of the CIFS file system or for codepage to charset translations (NLS) in case of the SMBFS file system. If you keep the default setting, Smb4K will try to automatically determine the charset by looking up the \"unix charset\" option in the smb.conf.") ); - addItem( mClientCharsetItem, TQString::tqfromLatin1( "ClientCharset" ) ); + addItem( mClientCharsetItem, TQString::fromLatin1( "ClientCharset" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesServerCodepage; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "default_codepage" ); + choice.name = TQString::fromLatin1( "default_codepage" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp437" ); + choice.name = TQString::fromLatin1( "cp437" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp720" ); + choice.name = TQString::fromLatin1( "cp720" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp737" ); + choice.name = TQString::fromLatin1( "cp737" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp775" ); + choice.name = TQString::fromLatin1( "cp775" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp850" ); + choice.name = TQString::fromLatin1( "cp850" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp852" ); + choice.name = TQString::fromLatin1( "cp852" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp855" ); + choice.name = TQString::fromLatin1( "cp855" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp857" ); + choice.name = TQString::fromLatin1( "cp857" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp858" ); + choice.name = TQString::fromLatin1( "cp858" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp860" ); + choice.name = TQString::fromLatin1( "cp860" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp861" ); + choice.name = TQString::fromLatin1( "cp861" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp862" ); + choice.name = TQString::fromLatin1( "cp862" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp863" ); + choice.name = TQString::fromLatin1( "cp863" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp864" ); + choice.name = TQString::fromLatin1( "cp864" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp865" ); + choice.name = TQString::fromLatin1( "cp865" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp866" ); + choice.name = TQString::fromLatin1( "cp866" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp869" ); + choice.name = TQString::fromLatin1( "cp869" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp874" ); + choice.name = TQString::fromLatin1( "cp874" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp932" ); + choice.name = TQString::fromLatin1( "cp932" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp936" ); + choice.name = TQString::fromLatin1( "cp936" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp949" ); + choice.name = TQString::fromLatin1( "cp949" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp950" ); + choice.name = TQString::fromLatin1( "cp950" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp1250" ); + choice.name = TQString::fromLatin1( "cp1250" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp1251" ); + choice.name = TQString::fromLatin1( "cp1251" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp1252" ); + choice.name = TQString::fromLatin1( "cp1252" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp1253" ); + choice.name = TQString::fromLatin1( "cp1253" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp1254" ); + choice.name = TQString::fromLatin1( "cp1254" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp1255" ); + choice.name = TQString::fromLatin1( "cp1255" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp1256" ); + choice.name = TQString::fromLatin1( "cp1256" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp1257" ); + choice.name = TQString::fromLatin1( "cp1257" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "cp1258" ); + choice.name = TQString::fromLatin1( "cp1258" ); valuesServerCodepage.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "tqunicode" ); + choice.name = TQString::fromLatin1( "unicode" ); valuesServerCodepage.append( choice ); } - mServerCodepageItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "ServerCodepage" ), mServerCodepage, valuesServerCodepage, EnumServerCodepage::default_codepage ); + mServerCodepageItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "ServerCodepage" ), mServerCodepage, valuesServerCodepage, EnumServerCodepage::default_codepage ); mServerCodepageItem->setLabel( i18n("The codepage used by the server") ); mServerCodepageItem->setWhatsThis( i18n("This is the codepage that is used by the server. The setting is only available with the SMBFS file system. If you keep the default setting, Smb4K will try to automatically determine the codepage by looking up the \"dos charset\" option in the smb.conf.") ); - addItem( mServerCodepageItem, TQString::tqfromLatin1( "ServerCodepage" ) ); - mUserIDItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "UserID" ), mUserID, TQString( "%1" ).tqarg( (int)getuid() ) ); + addItem( mServerCodepageItem, TQString::fromLatin1( "ServerCodepage" ) ); + mUserIDItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "UserID" ), mUserID, TQString( "%1" ).arg( (int)getuid() ) ); mUserIDItem->setLabel( i18n("The user ID that is to be used for mounting") ); mUserIDItem->setWhatsThis( i18n("Here you can enter the user ID (a number) that the files and directories of the mounted share will have. If you are using the CIFS file system and the remote server supports the CIFS Unix Extentions, this setting will be ignored.") ); - addItem( mUserIDItem, TQString::tqfromLatin1( "UserID" ) ); - mGroupIDItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "GroupID" ), mGroupID, TQString( "%1" ).tqarg( (int)getgid() ) ); + addItem( mUserIDItem, TQString::fromLatin1( "UserID" ) ); + mGroupIDItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "GroupID" ), mGroupID, TQString( "%1" ).arg( (int)getgid() ) ); mGroupIDItem->setLabel( i18n("The group ID that is to be used for mounting") ); mGroupIDItem->setWhatsThis( i18n("Here you can enter the group ID (a number) that the files and directories of the mounted share will have. If you are using the CIFS file system and the remote server supports the CIFS Unix Extentions, this setting will be ignored.") ); - addItem( mGroupIDItem, TQString::tqfromLatin1( "GroupID" ) ); - mFileMaskItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "FileMask" ), mFileMask, TQString::tqfromLatin1( "0755" ) ); + addItem( mGroupIDItem, TQString::fromLatin1( "GroupID" ) ); + mFileMaskItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "FileMask" ), mFileMask, TQString::fromLatin1( "0755" ) ); mFileMaskItem->setLabel( i18n("The file mask for a share") ); mFileMaskItem->setWhatsThis( i18n("This is the mask that will be used for creating files. It must be defined in octal. In case the CIFS file system is used, this setting only takes effect if the server does not support the CIFS Unix Extensions.") ); - addItem( mFileMaskItem, TQString::tqfromLatin1( "FileMask" ) ); - mDirectoryMaskItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "DirectoryMask" ), mDirectoryMask, TQString::tqfromLatin1( "0755" ) ); + addItem( mFileMaskItem, TQString::fromLatin1( "FileMask" ) ); + mDirectoryMaskItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "DirectoryMask" ), mDirectoryMask, TQString::fromLatin1( "0755" ) ); mDirectoryMaskItem->setLabel( i18n("The directory mask for a share") ); mDirectoryMaskItem->setWhatsThis( i18n("This is the mask that will be used for creating directories. It must be defined in octal. In case the CIFS file system is used, this setting only takes effect if the server does not support the CIFS Unix Extensions.") ); - addItem( mDirectoryMaskItem, TQString::tqfromLatin1( "DirectoryMask" ) ); + addItem( mDirectoryMaskItem, TQString::fromLatin1( "DirectoryMask" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesWriteAccess; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "ReadWrite" ); + choice.name = TQString::fromLatin1( "ReadWrite" ); valuesWriteAccess.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "ReadOnly" ); + choice.name = TQString::fromLatin1( "ReadOnly" ); valuesWriteAccess.append( choice ); } - mWriteAccessItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "WriteAccess" ), mWriteAccess, valuesWriteAccess, EnumWriteAccess::ReadWrite ); + mWriteAccessItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "WriteAccess" ), mWriteAccess, valuesWriteAccess, EnumWriteAccess::ReadWrite ); mWriteAccessItem->setLabel( i18n("The write access granted for the share") ); mWriteAccessItem->setWhatsThis( i18n("Here you can choose if the shares should be mounted in read and write mode or only read-only.") ); - addItem( mWriteAccessItem, TQString::tqfromLatin1( "WriteAccess" ) ); - mPermissionChecksItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "PermissionChecks" ), mPermissionChecks, true ); + addItem( mWriteAccessItem, TQString::fromLatin1( "WriteAccess" ) ); + mPermissionChecksItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "PermissionChecks" ), mPermissionChecks, true ); mPermissionChecksItem->setLabel( i18n("Do permission checks") ); mPermissionChecksItem->setWhatsThis( i18n("The client side (i.e. your side) will check if you have the right UID/GID to manipulate a file or directory. You might want to switch this feature off if the server(s) support the CIFS Unix Extensions and you are not allowed to access the files and directories. This setting does not affect the normal ACL check.") ); - addItem( mPermissionChecksItem, TQString::tqfromLatin1( "PermissionChecks" ) ); - mClientControlsIDsItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ClientControlsIDs" ), mClientControlsIDs, false ); + addItem( mPermissionChecksItem, TQString::fromLatin1( "PermissionChecks" ) ); + mClientControlsIDsItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ClientControlsIDs" ), mClientControlsIDs, false ); mClientControlsIDsItem->setLabel( i18n("Set UID and GID") ); mClientControlsIDsItem->setWhatsThis( i18n("In case the server supports the CIFS Unix Extensions, the client side (i.e. your side) attempts to set the effective UID and GID of the current process on newly created files, directories and devices. If this feature is turned off, the default UID and GID defined for the share will be used. It is recommended that you read the manual page of mount.cifs before you change this setting.") ); - addItem( mClientControlsIDsItem, TQString::tqfromLatin1( "ClientControlsIDs" ) ); - mServerInodeNumbersItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ServerInodeNumbers" ), mServerInodeNumbers, false ); + addItem( mClientControlsIDsItem, TQString::fromLatin1( "ClientControlsIDs" ) ); + mServerInodeNumbersItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ServerInodeNumbers" ), mServerInodeNumbers, false ); mServerInodeNumbersItem->setLabel( i18n("Use server inode numbers") ); mServerInodeNumbersItem->setWhatsThis( i18n("Use inode numbers (unique persistent file identifiers) returned by the server instead of automatically generating temporary inode numbers on the client side.") ); - addItem( mServerInodeNumbersItem, TQString::tqfromLatin1( "ServerInodeNumbers" ) ); - mInodeDataCachingItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "InodeDataCaching" ), mInodeDataCaching, false ); + addItem( mServerInodeNumbersItem, TQString::fromLatin1( "ServerInodeNumbers" ) ); + mInodeDataCachingItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "InodeDataCaching" ), mInodeDataCaching, false ); mInodeDataCachingItem->setLabel( i18n("Do not cache inode data") ); mInodeDataCachingItem->setWhatsThis( i18n("Directly read from and write to files opened on the share. In some cases this can provide better performance than the default behavior which caches reads and writes.") ); - addItem( mInodeDataCachingItem, TQString::tqfromLatin1( "InodeDataCaching" ) ); - mTranslateReservedCharsItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "TranslateReservedChars" ), mTranslateReservedChars, false ); + addItem( mInodeDataCachingItem, TQString::fromLatin1( "InodeDataCaching" ) ); + mTranslateReservedCharsItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "TranslateReservedChars" ), mTranslateReservedChars, false ); mTranslateReservedCharsItem->setLabel( i18n("Translate reserved characters") ); mTranslateReservedCharsItem->setWhatsThis( i18n("Translate six of the seven reserved characters (including the colon, question mark, pipe, asterisk, greater than and less than characters but not the backslash) to remap range (above 0xF000). This allows you to open files that were created with such characters. This has no effect if the server does not support Unicode.") ); - addItem( mTranslateReservedCharsItem, TQString::tqfromLatin1( "TranslateReservedChars" ) ); - mNoLockingItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "NoLocking" ), mNoLocking, false ); + addItem( mTranslateReservedCharsItem, TQString::fromLatin1( "TranslateReservedChars" ) ); + mNoLockingItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "NoLocking" ), mNoLocking, false ); mNoLockingItem->setLabel( i18n("Do not use locking") ); mNoLockingItem->setWhatsThis( i18n("Do not use locking. Do not start lockd.") ); - addItem( mNoLockingItem, TQString::tqfromLatin1( "NoLocking" ) ); - mCustomCIFSOptionsItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "CustomCIFSOptions" ), mCustomCIFSOptions ); + addItem( mNoLockingItem, TQString::fromLatin1( "NoLocking" ) ); + mCustomCIFSOptionsItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "CustomCIFSOptions" ), mCustomCIFSOptions ); mCustomCIFSOptionsItem->setLabel( i18n("Advanced custom options for the CIFS file system") ); mCustomCIFSOptionsItem->setWhatsThis( i18n("Here you can enter advanced options for the CIFS file system in a comma-separated list (refer to the manual page of mount.cifs to learn more). The list will be added AS IS to the \"-o\" argument of mount.cifs. Please do not enter options that have already been defined in the configuration dialog.") ); - addItem( mCustomCIFSOptionsItem, TQString::tqfromLatin1( "CustomCIFSOptions" ) ); - mCachingTimeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "CachingTime" ), mCachingTime, 1000 ); + addItem( mCustomCIFSOptionsItem, TQString::fromLatin1( "CustomCIFSOptions" ) ); + mCachingTimeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "CachingTime" ), mCachingTime, 1000 ); mCachingTimeItem->setLabel( i18n("Determines how long directory listings are cached") ); mCachingTimeItem->setWhatsThis( i18n("This setting determines how long a directory listing is cached in milliseconds. A high value means it takes longer until changes on the server are noticed on the client side (i.e. your side), but it can also give you an increase in performance on large directories, especially on long distances. You need Linux kernel 2.4.2 or later to take advantage of this setting.") ); - addItem( mCachingTimeItem, TQString::tqfromLatin1( "CachingTime" ) ); - mUnicodeSupportItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UnicodeSupport" ), mUnicodeSupport, false ); + addItem( mCachingTimeItem, TQString::fromLatin1( "CachingTime" ) ); + mUnicodeSupportItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UnicodeSupport" ), mUnicodeSupport, false ); mUnicodeSupportItem->setLabel( i18n("Unicode support") ); mUnicodeSupportItem->setWhatsThis( i18n("Use Unicode when communicating with the server. This will give you better support for non-ASCII character sets with the SMBFS file system.") ); - addItem( mUnicodeSupportItem, TQString::tqfromLatin1( "UnicodeSupport" ) ); - mLargeFileSystemSupportItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "LargeFileSystemSupport" ), mLargeFileSystemSupport, false ); + addItem( mUnicodeSupportItem, TQString::fromLatin1( "UnicodeSupport" ) ); + mLargeFileSystemSupportItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "LargeFileSystemSupport" ), mLargeFileSystemSupport, false ); mLargeFileSystemSupportItem->setLabel( i18n("Long file support") ); mLargeFileSystemSupportItem->setWhatsThis( i18n("Large file support (LFS) enables you to read and write \n" "files bigger than 2 GB on shares that were mounted with the SMBFS file system.") ); - addItem( mLargeFileSystemSupportItem, TQString::tqfromLatin1( "LargeFileSystemSupport" ) ); + addItem( mLargeFileSystemSupportItem, TQString::fromLatin1( "LargeFileSystemSupport" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesProtocolHint; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "Automatic" ); + choice.name = TQString::fromLatin1( "Automatic" ); valuesProtocolHint.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "RPC" ); + choice.name = TQString::fromLatin1( "RPC" ); valuesProtocolHint.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "RAP" ); + choice.name = TQString::fromLatin1( "RAP" ); valuesProtocolHint.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "ADS" ); + choice.name = TQString::fromLatin1( "ADS" ); valuesProtocolHint.append( choice ); } - mProtocolHintItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "ProtocolHint" ), mProtocolHint, valuesProtocolHint, EnumProtocolHint::Automatic ); + mProtocolHintItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "ProtocolHint" ), mProtocolHint, valuesProtocolHint, EnumProtocolHint::Automatic ); mProtocolHintItem->setLabel( i18n("The protocol that is used with the net command") ); mProtocolHintItem->setWhatsThis( i18n("Here you can choose the protocol that will be used by the net command for the communication with remote servers if appropriate. In most cases the automatic detection will work fine and you should not need to change the default setting. However, if you experience problems, use the RPC protocol for newer operating systems (Windows NT4 and above) and the RAP protocol for older ones (Windows 98/NT3 and below). Functions that need the ADS protocol (for Active Directory environments) have not been implemented yet, so you can ignore that one for now.") ); - addItem( mProtocolHintItem, TQString::tqfromLatin1( "ProtocolHint" ) ); - mNameResolveOrderItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "NameResolveOrder" ), mNameResolveOrder ); + addItem( mProtocolHintItem, TQString::fromLatin1( "ProtocolHint" ) ); + mNameResolveOrderItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "NameResolveOrder" ), mNameResolveOrder ); mNameResolveOrderItem->setLabel( i18n("Name resolve order used by smbclient") ); mNameResolveOrderItem->setWhatsThis( i18n("This option is used to determine what naming services and in what order are used to resolve host names and IP addresses. It takes a space-separated list of up to four different name resolution options. Those are: lmhost, host, wins, bcast. See the manual page of smbclient for further information.") ); - addItem( mNameResolveOrderItem, TQString::tqfromLatin1( "NameResolveOrder" ) ); - mBufferSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "BufferSize" ), mBufferSize, 65520 ); + addItem( mNameResolveOrderItem, TQString::fromLatin1( "NameResolveOrder" ) ); + mBufferSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "BufferSize" ), mBufferSize, 65520 ); mBufferSizeItem->setMinValue(0); mBufferSizeItem->setLabel( i18n("Transmit/send buffer size used by smbclient") ); mBufferSizeItem->setWhatsThis( i18n("This option changes the transmit/send buffer size when getting or putting a file from/to the server. The default is 65520 bytes. Setting this value smaller has been observed to speed up file transfers to and from Windows 9x servers.") ); - addItem( mBufferSizeItem, TQString::tqfromLatin1( "BufferSize" ) ); + addItem( mBufferSizeItem, TQString::fromLatin1( "BufferSize" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesSigningState; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "None" ); + choice.name = TQString::fromLatin1( "None" ); valuesSigningState.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "On" ); + choice.name = TQString::fromLatin1( "On" ); valuesSigningState.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "Off" ); + choice.name = TQString::fromLatin1( "Off" ); valuesSigningState.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "Required" ); + choice.name = TQString::fromLatin1( "Required" ); valuesSigningState.append( choice ); } - mSigningStateItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "SigningState" ), mSigningState, valuesSigningState, EnumSigningState::None ); + mSigningStateItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "SigningState" ), mSigningState, valuesSigningState, EnumSigningState::None ); mSigningStateItem->setLabel( i18n("Signing state") ); mSigningStateItem->setWhatsThis( i18n("Set the signing state for smbclient.") ); - addItem( mSigningStateItem, TQString::tqfromLatin1( "SigningState" ) ); - mBroadcastAddressItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "BroadcastAddress" ), mBroadcastAddress ); + addItem( mSigningStateItem, TQString::fromLatin1( "SigningState" ) ); + mBroadcastAddressItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "BroadcastAddress" ), mBroadcastAddress ); mBroadcastAddressItem->setLabel( i18n("The broadcast address used by nmblookup") ); mBroadcastAddressItem->setWhatsThis( i18n("Queries performed with nmblookup will be send to the given broadcast address. Without this option the default behavior is to send the queries to the broadcast address of the network interface that was either auto-detected or defined in the \"interfaces\" parameter of the smb.conf file.") ); - addItem( mBroadcastAddressItem, TQString::tqfromLatin1( "BroadcastAddress" ) ); - mUsePort137Item = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UsePort137" ), mUsePort137, false ); + addItem( mBroadcastAddressItem, TQString::fromLatin1( "BroadcastAddress" ) ); + mUsePort137Item = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UsePort137" ), mUsePort137, false ); mUsePort137Item->setLabel( i18n("Use UDP port 137 with nmblookup") ); mUsePort137Item->setWhatsThis( i18n("Try and bind to UDP port 137 to send and receive UDP datagrams. The reason for this option is a bug in Windows 95 where it ignores the source port of the requesting packet and only replies to UDP port 137. Unfortunately, on most Unix systems super user privileges are needed to bind to this port. Please read the manual page of nmblookup for more information.") ); - addItem( mUsePort137Item, TQString::tqfromLatin1( "UsePort137" ) ); + addItem( mUsePort137Item, TQString::fromLatin1( "UsePort137" ) ); - setCurrentGroup( TQString::tqfromLatin1( "Synchronization" ) ); + setCurrentGroup( TQString::fromLatin1( "Synchronization" ) ); - mRsyncPrefixItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "RsyncPrefix" ), mRsyncPrefix, TQString::tqfromLatin1( "$HOME/smb4k_sync/" ) ); + mRsyncPrefixItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "RsyncPrefix" ), mRsyncPrefix, TQString::fromLatin1( "$HOME/smb4k_sync/" ) ); mRsyncPrefixItem->setLabel( i18n("Prefix for synchronization") ); mRsyncPrefixItem->setWhatsThis( i18n("This is the path where Smb4K will store the files and directories during synchronization. If you plan to synchronize only with one remote share, then you can put the data directly in this directory. If you want to synchronize with several remote shares, then you should create a subdirectory for each share and choose the appropriate one in the synchronization dialog.") ); - addItem( mRsyncPrefixItem, TQString::tqfromLatin1( "RsyncPrefix" ) ); - mArchiveModeItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ArchiveMode" ), mArchiveMode, true ); + addItem( mRsyncPrefixItem, TQString::fromLatin1( "RsyncPrefix" ) ); + mArchiveModeItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ArchiveMode" ), mArchiveMode, true ); mArchiveModeItem->setLabel( i18n("Use archive mode") ); mArchiveModeItem->setWhatsThis( i18n("Use archive mode (-a, --archive). This is a short form of -rlptgoD.") ); - addItem( mArchiveModeItem, TQString::tqfromLatin1( "ArchiveMode" ) ); - mRecurseIntoDirectoriesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "RecurseIntoDirectories" ), mRecurseIntoDirectories, true ); + addItem( mArchiveModeItem, TQString::fromLatin1( "ArchiveMode" ) ); + mRecurseIntoDirectoriesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "RecurseIntoDirectories" ), mRecurseIntoDirectories, true ); mRecurseIntoDirectoriesItem->setLabel( i18n("Recurse into subdirectories") ); mRecurseIntoDirectoriesItem->setWhatsThis( i18n("Recurse into directories (-r, --recursive).") ); - addItem( mRecurseIntoDirectoriesItem, TQString::tqfromLatin1( "RecurseIntoDirectories" ) ); - mUpdateTargetItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UpdateTarget" ), mUpdateTarget, true ); + addItem( mRecurseIntoDirectoriesItem, TQString::fromLatin1( "RecurseIntoDirectories" ) ); + mUpdateTargetItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UpdateTarget" ), mUpdateTarget, true ); mUpdateTargetItem->setLabel( i18n("Skip files that are newer in the target directory") ); mUpdateTargetItem->setWhatsThis( i18n("Update files in the destination directory that are older than in the source directory (-u, --update).") ); - addItem( mUpdateTargetItem, TQString::tqfromLatin1( "UpdateTarget" ) ); - mUpdateInPlaceItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UpdateInPlace" ), mUpdateInPlace, false ); + addItem( mUpdateTargetItem, TQString::fromLatin1( "UpdateTarget" ) ); + mUpdateInPlaceItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UpdateInPlace" ), mUpdateInPlace, false ); mUpdateInPlaceItem->setLabel( i18n("Update destination files in place") ); mUpdateInPlaceItem->setWhatsThis( i18n("Update destination files in-place (--inplace). By default, rsync first creates a new copy of a file and moves it into place after its transfer finished. If you enable this feature, no copy will be created but the destination file will immediately be overwritten instead. An exception to this is if you combine this option with --backup.") ); - addItem( mUpdateInPlaceItem, TQString::tqfromLatin1( "UpdateInPlace" ) ); - mRelativePathNamesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "RelativePathNames" ), mRelativePathNames, false ); + addItem( mUpdateInPlaceItem, TQString::fromLatin1( "UpdateInPlace" ) ); + mRelativePathNamesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "RelativePathNames" ), mRelativePathNames, false ); mRelativePathNamesItem->setLabel( i18n("Use relative path names") ); mRelativePathNamesItem->setWhatsThis( i18n("Use relative paths (-R, --relative). This means that the full path names specified on the command line are sent to the server rather than just the last parts of the file names.") ); - addItem( mRelativePathNamesItem, TQString::tqfromLatin1( "RelativePathNames" ) ); - mNoImpliedDirectoriesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "NoImpliedDirectories" ), mNoImpliedDirectories, false ); + addItem( mRelativePathNamesItem, TQString::fromLatin1( "RelativePathNames" ) ); + mNoImpliedDirectoriesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "NoImpliedDirectories" ), mNoImpliedDirectories, false ); mNoImpliedDirectoriesItem->setLabel( i18n("Don't send implied directories with --relative") ); mNoImpliedDirectoriesItem->setWhatsThis( i18n("Don't send implied directories with --relative (--no-implied-dirs). This means that the corresponding path elements on the destination system are left unchanged if they exist, and any missing implied directories are created with default attributes. This even allows these implied path elements to have big differences, such as being a symlink to a directory on one side of the transfer, and a real directory on the other side.") ); - addItem( mNoImpliedDirectoriesItem, TQString::tqfromLatin1( "NoImpliedDirectories" ) ); - mTransferDirectoriesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "TransferDirectories" ), mTransferDirectories, false ); + addItem( mNoImpliedDirectoriesItem, TQString::fromLatin1( "NoImpliedDirectories" ) ); + mTransferDirectoriesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "TransferDirectories" ), mTransferDirectories, false ); mTransferDirectoriesItem->setLabel( i18n("Transfer directories without recursing") ); mTransferDirectoriesItem->setWhatsThis( i18n("Transfer directories without recursing (-d, --dirs). This means that all top-level subdirectories are transferred but without their contents.") ); - addItem( mTransferDirectoriesItem, TQString::tqfromLatin1( "TransferDirectories" ) ); - mCompressDataItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "CompressData" ), mCompressData, false ); + addItem( mTransferDirectoriesItem, TQString::fromLatin1( "TransferDirectories" ) ); + mCompressDataItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "CompressData" ), mCompressData, false ); mCompressDataItem->setLabel( i18n("Compress data during transfer") ); mCompressDataItem->setWhatsThis( i18n("Compress data during transfer (-z, --compress). This significantly reduces the amount of data that is being transferred. You may want to use this option, if you have a slow connection.") ); - addItem( mCompressDataItem, TQString::tqfromLatin1( "CompressData" ) ); - mPreserveSymlinksItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "PreserveSymlinks" ), mPreserveSymlinks, true ); + addItem( mCompressDataItem, TQString::fromLatin1( "CompressData" ) ); + mPreserveSymlinksItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "PreserveSymlinks" ), mPreserveSymlinks, true ); mPreserveSymlinksItem->setLabel( i18n("Preserve symlinks") ); mPreserveSymlinksItem->setWhatsThis( i18n("Copy symlinks as symlinks (-l, --links).") ); - addItem( mPreserveSymlinksItem, TQString::tqfromLatin1( "PreserveSymlinks" ) ); - mTransformSymlinksItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "TransformSymlinks" ), mTransformSymlinks, false ); + addItem( mPreserveSymlinksItem, TQString::fromLatin1( "PreserveSymlinks" ) ); + mTransformSymlinksItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "TransformSymlinks" ), mTransformSymlinks, false ); mTransformSymlinksItem->setLabel( i18n("Transform symlinks") ); mTransformSymlinksItem->setWhatsThis( i18n("Transform symlinks into the items they are pointing to (-L, --copy-links).") ); - addItem( mTransformSymlinksItem, TQString::tqfromLatin1( "TransformSymlinks" ) ); - mTransformUnsafeSymlinksItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "TransformUnsafeSymlinks" ), mTransformUnsafeSymlinks, false ); + addItem( mTransformSymlinksItem, TQString::fromLatin1( "TransformSymlinks" ) ); + mTransformUnsafeSymlinksItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "TransformUnsafeSymlinks" ), mTransformUnsafeSymlinks, false ); mTransformUnsafeSymlinksItem->setLabel( i18n("Only transform unsafe symlinks") ); mTransformUnsafeSymlinksItem->setWhatsThis( i18n("Transform unsafe symlinks into the items they are pointing to (--copy-unsafe-links). This means that only those symlinks are transformed that point to items that are outside the copied tree. Absolute symlinks are treated the same way. This option has no additional effect if --copy-links has also been specified.") ); - addItem( mTransformUnsafeSymlinksItem, TQString::tqfromLatin1( "TransformUnsafeSymlinks" ) ); - mIgnoreUnsafeSymlinksItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "IgnoreUnsafeSymlinks" ), mIgnoreUnsafeSymlinks, false ); + addItem( mTransformUnsafeSymlinksItem, TQString::fromLatin1( "TransformUnsafeSymlinks" ) ); + mIgnoreUnsafeSymlinksItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "IgnoreUnsafeSymlinks" ), mIgnoreUnsafeSymlinks, false ); mIgnoreUnsafeSymlinksItem->setLabel( i18n("Ignore unsafe symlinks") ); mIgnoreUnsafeSymlinksItem->setWhatsThis( i18n("Ignore symlinks that point outside the copied tree (--safe-links). All absolute symlinks are also ignored. If you use this option in conjunction with --relative you might get unexpected results.") ); - addItem( mIgnoreUnsafeSymlinksItem, TQString::tqfromLatin1( "IgnoreUnsafeSymlinks" ) ); - mPreserveHardLinksItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "PreserveHardLinks" ), mPreserveHardLinks, false ); + addItem( mIgnoreUnsafeSymlinksItem, TQString::fromLatin1( "IgnoreUnsafeSymlinks" ) ); + mPreserveHardLinksItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "PreserveHardLinks" ), mPreserveHardLinks, false ); mPreserveHardLinksItem->setLabel( i18n("Preserve hard links") ); mPreserveHardLinksItem->setWhatsThis( i18n("Preserve hard links (-H, --hard-links). This options causes rsync to preserve the hard links that are found during the transfer. Without it, hard links are treated as though they were separate files.") ); - addItem( mPreserveHardLinksItem, TQString::tqfromLatin1( "PreserveHardLinks" ) ); - mKeepDirectorySymlinksItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "KeepDirectorySymlinks" ), mKeepDirectorySymlinks, false ); + addItem( mPreserveHardLinksItem, TQString::fromLatin1( "PreserveHardLinks" ) ); + mKeepDirectorySymlinksItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "KeepDirectorySymlinks" ), mKeepDirectorySymlinks, false ); mKeepDirectorySymlinksItem->setLabel( i18n("Keep directory symlinks") ); mKeepDirectorySymlinksItem->setWhatsThis( i18n("Treat symlinked directories on the receiving side as though they were real ones (-K, --keep-dirlinks). This only works if the symlink matches a real directory from the sending side. Without this option, the receiver's symlink will be deleted and replaced with a real directory.") ); - addItem( mKeepDirectorySymlinksItem, TQString::tqfromLatin1( "KeepDirectorySymlinks" ) ); - mPreservePermissionsItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "PreservePermissions" ), mPreservePermissions, true ); + addItem( mKeepDirectorySymlinksItem, TQString::fromLatin1( "KeepDirectorySymlinks" ) ); + mPreservePermissionsItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "PreservePermissions" ), mPreservePermissions, true ); mPreservePermissionsItem->setLabel( i18n("Preserve permissions") ); mPreservePermissionsItem->setWhatsThis( i18n("Preserve permissions (-p, --perms). The permissions of the destination file will be same as the source file. For what happens if this option is switched off, please read rsync's manual page.") ); - addItem( mPreservePermissionsItem, TQString::tqfromLatin1( "PreservePermissions" ) ); - mPreserveGroupItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "PreserveGroup" ), mPreserveGroup, true ); + addItem( mPreservePermissionsItem, TQString::fromLatin1( "PreservePermissions" ) ); + mPreserveGroupItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "PreserveGroup" ), mPreserveGroup, true ); mPreserveGroupItem->setLabel( i18n("Preserve group") ); mPreserveGroupItem->setWhatsThis( i18n("Preserve the group (-g, --group). The group of the destination file will be set to the same value as the source file.") ); - addItem( mPreserveGroupItem, TQString::tqfromLatin1( "PreserveGroup" ) ); - mPreserveOwnerItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "PreserveOwner" ), mPreserveOwner, true ); + addItem( mPreserveGroupItem, TQString::fromLatin1( "PreserveGroup" ) ); + mPreserveOwnerItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "PreserveOwner" ), mPreserveOwner, true ); mPreserveOwnerItem->setLabel( i18n("Preserve owner (super user only)") ); mPreserveOwnerItem->setWhatsThis( i18n("Preserve the owner (-o, --owner). The owner of the destination file will be set to the same value as the source file, but only if the receiving rsync is run as the super user. Without this option, the owner is set to the invoking user on the receiving side.") ); - addItem( mPreserveOwnerItem, TQString::tqfromLatin1( "PreserveOwner" ) ); - mPreserveDevicesAndSpecialsItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "PreserveDevicesAndSpecials" ), mPreserveDevicesAndSpecials, true ); + addItem( mPreserveOwnerItem, TQString::fromLatin1( "PreserveOwner" ) ); + mPreserveDevicesAndSpecialsItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "PreserveDevicesAndSpecials" ), mPreserveDevicesAndSpecials, true ); mPreserveDevicesAndSpecialsItem->setLabel( i18n("Preserve device and special files") ); mPreserveDevicesAndSpecialsItem->setWhatsThis( i18n("Preserve device and special files (-D, --devices --specials). This option causes rsync to transfer character and block devices as well as special files such as named sockets and fifos. It works only partially if rsync is not run as super user and the --super option is not specified.") ); - addItem( mPreserveDevicesAndSpecialsItem, TQString::tqfromLatin1( "PreserveDevicesAndSpecials" ) ); - mPreserveTimesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "PreserveTimes" ), mPreserveTimes, true ); + addItem( mPreserveDevicesAndSpecialsItem, TQString::fromLatin1( "PreserveDevicesAndSpecials" ) ); + mPreserveTimesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "PreserveTimes" ), mPreserveTimes, true ); mPreserveTimesItem->setLabel( i18n("Preserve times") ); mPreserveTimesItem->setWhatsThis( i18n("Preserve times (-t, --times). The modification times are transferred along with the files. For what happens if this option is switched off, please read rsync's manual page.") ); - addItem( mPreserveTimesItem, TQString::tqfromLatin1( "PreserveTimes" ) ); - mOmitDirectoryTimesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "OmitDirectoryTimes" ), mOmitDirectoryTimes, false ); + addItem( mPreserveTimesItem, TQString::fromLatin1( "PreserveTimes" ) ); + mOmitDirectoryTimesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "OmitDirectoryTimes" ), mOmitDirectoryTimes, false ); mOmitDirectoryTimesItem->setLabel( i18n("Omit directories when preserving times") ); mOmitDirectoryTimesItem->setWhatsThis( i18n("Omit directories when preserving times (-O, --omit-dir-times). This means that directories are omitted when modification times are being preserved. Thus, this feature only works in conjunction with --times.") ); - addItem( mOmitDirectoryTimesItem, TQString::tqfromLatin1( "OmitDirectoryTimes" ) ); - mRemoveSourceFilesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "RemoveSourceFiles" ), mRemoveSourceFiles, false ); + addItem( mOmitDirectoryTimesItem, TQString::fromLatin1( "OmitDirectoryTimes" ) ); + mRemoveSourceFilesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "RemoveSourceFiles" ), mRemoveSourceFiles, false ); mRemoveSourceFilesItem->setLabel( i18n("Remove synchronized source files") ); mRemoveSourceFilesItem->setWhatsThis( i18n("Remove all synchronized source files (--remove-source-files). This tells rsync to remove from the sending side the non-directory items that are a part of the transfer and have been successfully duplicated on the receiving side.") ); - addItem( mRemoveSourceFilesItem, TQString::tqfromLatin1( "RemoveSourceFiles" ) ); - mDeleteExtraneousItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "DeleteExtraneous" ), mDeleteExtraneous, false ); + addItem( mRemoveSourceFilesItem, TQString::fromLatin1( "RemoveSourceFiles" ) ); + mDeleteExtraneousItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "DeleteExtraneous" ), mDeleteExtraneous, false ); mDeleteExtraneousItem->setLabel( i18n("Delete extraneous files") ); mDeleteExtraneousItem->setWhatsThis( i18n("Delete extraneous files from destination (--delete). This tells rsync to delete all files from the receiving side that are not present on the sending side, but only for the directories that are being synchronized.") ); - addItem( mDeleteExtraneousItem, TQString::tqfromLatin1( "DeleteExtraneous" ) ); - mDeleteBeforeItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "DeleteBefore" ), mDeleteBefore, false ); + addItem( mDeleteExtraneousItem, TQString::fromLatin1( "DeleteExtraneous" ) ); + mDeleteBeforeItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "DeleteBefore" ), mDeleteBefore, false ); mDeleteBeforeItem->setLabel( i18n("Delete files before transfer") ); mDeleteBeforeItem->setWhatsThis( i18n("Delete files on the receiving side before the transfer starts (--delete-before). This is the default behavior if --delete or --delete-excluded is specified without one of the --delete-WHEN options.") ); - addItem( mDeleteBeforeItem, TQString::tqfromLatin1( "DeleteBefore" ) ); - mDeleteAfterItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "DeleteAfter" ), mDeleteAfter, false ); + addItem( mDeleteBeforeItem, TQString::fromLatin1( "DeleteBefore" ) ); + mDeleteAfterItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "DeleteAfter" ), mDeleteAfter, false ); mDeleteAfterItem->setLabel( i18n("Delete files after transfer") ); mDeleteAfterItem->setWhatsThis( i18n("Delete files on the receiving side after the transfer has completed (--delete-after, --del).") ); - addItem( mDeleteAfterItem, TQString::tqfromLatin1( "DeleteAfter" ) ); - mDeleteDuringItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "DeleteDuring" ), mDeleteDuring, false ); + addItem( mDeleteAfterItem, TQString::fromLatin1( "DeleteAfter" ) ); + mDeleteDuringItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "DeleteDuring" ), mDeleteDuring, false ); mDeleteDuringItem->setLabel( i18n("Delete files during transfer") ); mDeleteDuringItem->setWhatsThis( i18n("Delete files on the receiving side during the transfer (--delete-during). This method is faster than --delete-before or --delete-after, but it is only supported with rsync 2.6.4 or later.") ); - addItem( mDeleteDuringItem, TQString::tqfromLatin1( "DeleteDuring" ) ); - mDeleteExcludedItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "DeleteExcluded" ), mDeleteExcluded, false ); + addItem( mDeleteDuringItem, TQString::fromLatin1( "DeleteDuring" ) ); + mDeleteExcludedItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "DeleteExcluded" ), mDeleteExcluded, false ); mDeleteExcludedItem->setLabel( i18n("Also delete excluded files from destination directory") ); mDeleteExcludedItem->setWhatsThis( i18n("Also delete excluded files from destination directory (--delete-excluded). In addition to deleting the files on the receiving side that are not on the sending side, this tells rsync to also delete any files on the receiving side that are excluded. Refer to rsync's manual page for further information.") ); - addItem( mDeleteExcludedItem, TQString::tqfromLatin1( "DeleteExcluded" ) ); - mIgnoreErrorsItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "IgnoreErrors" ), mIgnoreErrors, false ); + addItem( mDeleteExcludedItem, TQString::fromLatin1( "DeleteExcluded" ) ); + mIgnoreErrorsItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "IgnoreErrors" ), mIgnoreErrors, false ); mIgnoreErrorsItem->setLabel( i18n("Delete even if I/O errors occur") ); mIgnoreErrorsItem->setWhatsThis( i18n("Delete even if I/O errors occur (--ignore-errors). This option has to be specified in conjunction with --delete to take effect.") ); - addItem( mIgnoreErrorsItem, TQString::tqfromLatin1( "IgnoreErrors" ) ); - mForceDirectoryDeletionItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "ForceDirectoryDeletion" ), mForceDirectoryDeletion, false ); + addItem( mIgnoreErrorsItem, TQString::fromLatin1( "IgnoreErrors" ) ); + mForceDirectoryDeletionItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "ForceDirectoryDeletion" ), mForceDirectoryDeletion, false ); mForceDirectoryDeletionItem->setLabel( i18n("Force deletion of non-void directories") ); mForceDirectoryDeletionItem->setWhatsThis( i18n("Force deletion of directories even if they are not empty (--force). This option tells rsync to delete a non-empty directory when it is to be replaced by a non-directory. This is only relevant if deletions are not active.") ); - addItem( mForceDirectoryDeletionItem, TQString::tqfromLatin1( "ForceDirectoryDeletion" ) ); - mUseMaximumDeleteItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UseMaximumDelete" ), mUseMaximumDelete, false ); + addItem( mForceDirectoryDeletionItem, TQString::fromLatin1( "ForceDirectoryDeletion" ) ); + mUseMaximumDeleteItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UseMaximumDelete" ), mUseMaximumDelete, false ); mUseMaximumDeleteItem->setLabel( i18n("Only delete a maximum number of files") ); mUseMaximumDeleteItem->setWhatsThis( i18n("Only delete as many files as defined here (--max-delete=NUM). This tells rsync not to delete more than NUM files or directories (NUM must be non-zero). This is useful when mirroring very large trees to prevent disasters.") ); - addItem( mUseMaximumDeleteItem, TQString::tqfromLatin1( "UseMaximumDelete" ) ); - mMaximumDeleteValueItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "MaximumDeleteValue" ), mMaximumDeleteValue, 0 ); + addItem( mUseMaximumDeleteItem, TQString::fromLatin1( "UseMaximumDelete" ) ); + mMaximumDeleteValueItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "MaximumDeleteValue" ), mMaximumDeleteValue, 0 ); mMaximumDeleteValueItem->setMinValue(0); mMaximumDeleteValueItem->setLabel( i18n("Value for DeleteMaximum config entry") ); - addItem( mMaximumDeleteValueItem, TQString::tqfromLatin1( "MaximumDeleteValue" ) ); - mUseMinimalTransferSizeItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UseMinimalTransferSize" ), mUseMinimalTransferSize, false ); + addItem( mMaximumDeleteValueItem, TQString::fromLatin1( "MaximumDeleteValue" ) ); + mUseMinimalTransferSizeItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UseMinimalTransferSize" ), mUseMinimalTransferSize, false ); mUseMinimalTransferSizeItem->setLabel( i18n("Don't transfer any file smaller than SIZE") ); mUseMinimalTransferSizeItem->setWhatsThis( i18n("This option causes rsync to not transfer any file that is smaller than the specified size (--min-size=SIZE).") ); - addItem( mUseMinimalTransferSizeItem, TQString::tqfromLatin1( "UseMinimalTransferSize" ) ); - mMinimalTransferSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "MinimalTransferSize" ), mMinimalTransferSize, 0 ); + addItem( mUseMinimalTransferSizeItem, TQString::fromLatin1( "UseMinimalTransferSize" ) ); + mMinimalTransferSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "MinimalTransferSize" ), mMinimalTransferSize, 0 ); mMinimalTransferSizeItem->setMinValue(0); mMinimalTransferSizeItem->setLabel( i18n("Value for MinimalTransferSize config entry") ); - addItem( mMinimalTransferSizeItem, TQString::tqfromLatin1( "MinimalTransferSize" ) ); - mUseMaximalTransferSizeItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UseMaximalTransferSize" ), mUseMaximalTransferSize, false ); + addItem( mMinimalTransferSizeItem, TQString::fromLatin1( "MinimalTransferSize" ) ); + mUseMaximalTransferSizeItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UseMaximalTransferSize" ), mUseMaximalTransferSize, false ); mUseMaximalTransferSizeItem->setLabel( i18n("Don't transfer any file smaller than SIZE") ); mUseMaximalTransferSizeItem->setWhatsThis( i18n("This option causes rsync to not transfer any file that is larger than the specified size (--max-size=SIZE).") ); - addItem( mUseMaximalTransferSizeItem, TQString::tqfromLatin1( "UseMaximalTransferSize" ) ); - mMaximalTransferSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "MaximalTransferSize" ), mMaximalTransferSize, 0 ); + addItem( mUseMaximalTransferSizeItem, TQString::fromLatin1( "UseMaximalTransferSize" ) ); + mMaximalTransferSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "MaximalTransferSize" ), mMaximalTransferSize, 0 ); mMaximalTransferSizeItem->setMinValue(0); mMaximalTransferSizeItem->setLabel( i18n("Value for MamximalTransferSize config entry") ); - addItem( mMaximalTransferSizeItem, TQString::tqfromLatin1( "MaximalTransferSize" ) ); - mKeepPartialItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "KeepPartial" ), mKeepPartial, false ); + addItem( mMaximalTransferSizeItem, TQString::fromLatin1( "MaximalTransferSize" ) ); + mKeepPartialItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "KeepPartial" ), mKeepPartial, false ); mKeepPartialItem->setLabel( i18n("Keep partially transferred files") ); mKeepPartialItem->setWhatsThis( i18n("Keep partially transferred files (--partial). The default behavor is that any partially transferred file is deleted if the transfer is interrupted.") ); - addItem( mKeepPartialItem, TQString::tqfromLatin1( "KeepPartial" ) ); - mUsePartialDirectoryItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UsePartialDirectory" ), mUsePartialDirectory, false ); + addItem( mKeepPartialItem, TQString::fromLatin1( "KeepPartial" ) ); + mUsePartialDirectoryItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UsePartialDirectory" ), mUsePartialDirectory, false ); mUsePartialDirectoryItem->setLabel( i18n("The directory where to put a partially transferred file into.") ); mUsePartialDirectoryItem->setWhatsThis( i18n("Put a partially transferred file into this directory (--partial-dir=DIR). This is a better way than the --partial option to keep partial files, because the partially transferred file is kept in a different directory and the destination file is not overwritten.") ); - addItem( mUsePartialDirectoryItem, TQString::tqfromLatin1( "UsePartialDirectory" ) ); - mPartialDirectoryItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "PartialDirectory" ), mPartialDirectory, TQString::tqfromLatin1( "$HOME" ) ); + addItem( mUsePartialDirectoryItem, TQString::fromLatin1( "UsePartialDirectory" ) ); + mPartialDirectoryItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "PartialDirectory" ), mPartialDirectory, TQString::fromLatin1( "$HOME" ) ); mPartialDirectoryItem->setLabel( i18n("The data for the UsePartialDirectory option") ); - addItem( mPartialDirectoryItem, TQString::tqfromLatin1( "PartialDirectory" ) ); - mUseCVSExcludeItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UseCVSExclude" ), mUseCVSExclude, false ); + addItem( mPartialDirectoryItem, TQString::fromLatin1( "PartialDirectory" ) ); + mUseCVSExcludeItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UseCVSExclude" ), mUseCVSExclude, false ); mUseCVSExcludeItem->setLabel( i18n("Auto-ignore files in the same way CVS does") ); mUseCVSExcludeItem->setWhatsThis( i18n("Auto-ignore files in the same way CVS does (-C, --cvs-exclude). This is a useful shorthand for excluding a broad range of files that you often do not want to transfer between systems. This option uses the same algorithm that CVS uses to determine if a file should be ignored.") ); - addItem( mUseCVSExcludeItem, TQString::tqfromLatin1( "UseCVSExclude" ) ); - mUseExcludePatternItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UseExcludePattern" ), mUseExcludePattern, false ); + addItem( mUseCVSExcludeItem, TQString::fromLatin1( "UseCVSExclude" ) ); + mUseExcludePatternItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UseExcludePattern" ), mUseExcludePattern, false ); mUseExcludePatternItem->setLabel( i18n("Exclude files that match a certain pattern") ); mUseExcludePatternItem->setWhatsThis( i18n("Exclude files that match a certain pattern (--exclude=PATTERN). This is a special filter rule. For further information on filter rules see rsync's manual page.") ); - addItem( mUseExcludePatternItem, TQString::tqfromLatin1( "UseExcludePattern" ) ); - mExcludePatternItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "ExcludePattern" ), mExcludePattern ); + addItem( mUseExcludePatternItem, TQString::fromLatin1( "UseExcludePattern" ) ); + mExcludePatternItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "ExcludePattern" ), mExcludePattern ); mExcludePatternItem->setLabel( i18n("Pattern that is used for file exclusion") ); - addItem( mExcludePatternItem, TQString::tqfromLatin1( "ExcludePattern" ) ); - mUseExcludeFromItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UseExcludeFrom" ), mUseExcludeFrom, false ); + addItem( mExcludePatternItem, TQString::fromLatin1( "ExcludePattern" ) ); + mUseExcludeFromItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UseExcludeFrom" ), mUseExcludeFrom, false ); mUseExcludeFromItem->setLabel( i18n("Read exclude patterns from a file") ); mUseExcludeFromItem->setWhatsThis( i18n("Read exclude patterns from a file (--exclude-from=FILE). This option is similar to the --exclude=PATTERN option except that the exclude patterns are read from a file. This is a special filter rule. For further information on filter rules see rsync's manual page.") ); - addItem( mUseExcludeFromItem, TQString::tqfromLatin1( "UseExcludeFrom" ) ); - mExcludeFromItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "ExcludeFrom" ), mExcludeFrom, TQString::tqfromLatin1( "$HOME/exclude.txt" ) ); + addItem( mUseExcludeFromItem, TQString::fromLatin1( "UseExcludeFrom" ) ); + mExcludeFromItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "ExcludeFrom" ), mExcludeFrom, TQString::fromLatin1( "$HOME/exclude.txt" ) ); mExcludeFromItem->setLabel( i18n("The file from which the exclude patterns are read") ); - addItem( mExcludeFromItem, TQString::tqfromLatin1( "ExcludeFrom" ) ); - mUseIncludePatternItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UseIncludePattern" ), mUseIncludePattern, false ); + addItem( mExcludeFromItem, TQString::fromLatin1( "ExcludeFrom" ) ); + mUseIncludePatternItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UseIncludePattern" ), mUseIncludePattern, false ); mUseIncludePatternItem->setLabel( i18n("Do not exclude files matching a certain pattern") ); mUseIncludePatternItem->setWhatsThis( i18n("Do not exclude files matching a certain pattern (--include=PATTERN). This is a special filter rule. For further information on filter rules see rsync's manual page.") ); - addItem( mUseIncludePatternItem, TQString::tqfromLatin1( "UseIncludePattern" ) ); - mIncludePatternItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "IncludePattern" ), mIncludePattern ); + addItem( mUseIncludePatternItem, TQString::fromLatin1( "UseIncludePattern" ) ); + mIncludePatternItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "IncludePattern" ), mIncludePattern ); mIncludePatternItem->setLabel( i18n("Pattern that is used for file inclusion") ); - addItem( mIncludePatternItem, TQString::tqfromLatin1( "IncludePattern" ) ); - mUseIncludeFromItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UseIncludeFrom" ), mUseIncludeFrom, false ); + addItem( mIncludePatternItem, TQString::fromLatin1( "IncludePattern" ) ); + mUseIncludeFromItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UseIncludeFrom" ), mUseIncludeFrom, false ); mUseIncludeFromItem->setLabel( i18n("Read include patterns from a file") ); mUseIncludeFromItem->setWhatsThis( i18n("Read include patterns from a file (--include-from=FILE). This option is similar to the --include=PATTERN option except that the include patterns are read from a file. This is a special filter rule. For further information on filter rules see rsync's manual page.") ); - addItem( mUseIncludeFromItem, TQString::tqfromLatin1( "UseIncludeFrom" ) ); - mIncludeFromItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "IncludeFrom" ), mIncludeFrom, TQString::tqfromLatin1( "$HOME/include.txt" ) ); + addItem( mUseIncludeFromItem, TQString::fromLatin1( "UseIncludeFrom" ) ); + mIncludeFromItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "IncludeFrom" ), mIncludeFrom, TQString::fromLatin1( "$HOME/include.txt" ) ); mIncludeFromItem->setLabel( i18n("The file from which the include patterns are read") ); - addItem( mIncludeFromItem, TQString::tqfromLatin1( "IncludeFrom" ) ); - mCustomFilteringRulesItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "CustomFilteringRules" ), mCustomFilteringRules ); + addItem( mIncludeFromItem, TQString::fromLatin1( "IncludeFrom" ) ); + mCustomFilteringRulesItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "CustomFilteringRules" ), mCustomFilteringRules ); mCustomFilteringRulesItem->setLabel( i18n("Add custom file-filtering rules") ); mCustomFilteringRulesItem->setWhatsThis( i18n("Add custom file-filtering rules (-f, --filter=RULE). This option allows you to add rules to selectively exclude certain files from the list of files to be transferred.") ); - addItem( mCustomFilteringRulesItem, TQString::tqfromLatin1( "CustomFilteringRules" ) ); - mUseFFilterRuleItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UseFFilterRule" ), mUseFFilterRule, false ); + addItem( mCustomFilteringRulesItem, TQString::fromLatin1( "CustomFilteringRules" ) ); + mUseFFilterRuleItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UseFFilterRule" ), mUseFFilterRule, false ); mUseFFilterRuleItem->setLabel( i18n("Use -F filter rule") ); mUseFFilterRuleItem->setWhatsThis( i18n("This filter rule tells rsync to look for per-directory .rsync-filter files that have been sprinkled through the hierarchy and use their rules to filter the files in the transfer. It has no effect, if you also choose to use the --filter='exclude .rsync-filter' rule.") ); - addItem( mUseFFilterRuleItem, TQString::tqfromLatin1( "UseFFilterRule" ) ); - mUseFFFilterRuleItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UseFFFilterRule" ), mUseFFFilterRule, false ); + addItem( mUseFFilterRuleItem, TQString::fromLatin1( "UseFFilterRule" ) ); + mUseFFFilterRuleItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UseFFFilterRule" ), mUseFFFilterRule, false ); mUseFFFilterRuleItem->setLabel( i18n("Use -FF filter rule") ); mUseFFFilterRuleItem->setWhatsThis( i18n("This rule filters out the .rsync-filter files from the transfer. These files normally contain filter rules that can be activated by choosing the --filter='dir-merge /.rsync-filter' rule and deselecting this one.") ); - addItem( mUseFFFilterRuleItem, TQString::tqfromLatin1( "UseFFFilterRule" ) ); - mEfficientSparseFileHandlingItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "EfficientSparseFileHandling" ), mEfficientSparseFileHandling, false ); + addItem( mUseFFFilterRuleItem, TQString::fromLatin1( "UseFFFilterRule" ) ); + mEfficientSparseFileHandlingItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "EfficientSparseFileHandling" ), mEfficientSparseFileHandling, false ); mEfficientSparseFileHandlingItem->setLabel( i18n("Handle sparse files efficiently") ); mEfficientSparseFileHandlingItem->setWhatsThis( i18n("Handle sparse files efficiently (-S, --sparse) so that they take up less space on the destination. This option conflicts with --inplace. For further information read rsync's manual page.") ); - addItem( mEfficientSparseFileHandlingItem, TQString::tqfromLatin1( "EfficientSparseFileHandling" ) ); - mCopyFilesWholeItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "CopyFilesWhole" ), mCopyFilesWhole, false ); + addItem( mEfficientSparseFileHandlingItem, TQString::fromLatin1( "EfficientSparseFileHandling" ) ); + mCopyFilesWholeItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "CopyFilesWhole" ), mCopyFilesWhole, false ); mCopyFilesWholeItem->setLabel( i18n("Copy files whole (no rsync algorithm)") ); mCopyFilesWholeItem->setWhatsThis( i18n("Copy files whole (-W, --whole-file). With this option the incremental rsync algorithm is not used and the whole file is sent as-is instead.") ); - addItem( mCopyFilesWholeItem, TQString::tqfromLatin1( "CopyFilesWhole" ) ); - mOneFileSystemItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "OneFileSystem" ), mOneFileSystem, false ); + addItem( mCopyFilesWholeItem, TQString::fromLatin1( "CopyFilesWhole" ) ); + mOneFileSystemItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "OneFileSystem" ), mOneFileSystem, false ); mOneFileSystemItem->setLabel( i18n("Do not cross file system boundaries") ); mOneFileSystemItem->setWhatsThis( i18n("Do not cross file system boundaries (-x, --one-file-system). This tells rsync to avoid crossing a filesystem boundary when recursing. For further information on this option, read the manual page.") ); - addItem( mOneFileSystemItem, TQString::tqfromLatin1( "OneFileSystem" ) ); - mUpdateExistingItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UpdateExisting" ), mUpdateExisting, false ); + addItem( mOneFileSystemItem, TQString::fromLatin1( "OneFileSystem" ) ); + mUpdateExistingItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UpdateExisting" ), mUpdateExisting, false ); mUpdateExistingItem->setLabel( i18n("Skip creating new files on the receiving side") ); mUpdateExistingItem->setWhatsThis( i18n("Skip creating new files on the receiving side (--existing). This tells rsync to skip creating files (including directories) that do not exist yet on the destination. If this option is combined with the --ignore-existing option, no files will be updated (which can be useful if all you want to do is to delete extraneous files).") ); - addItem( mUpdateExistingItem, TQString::tqfromLatin1( "UpdateExisting" ) ); - mIgnoreExistingItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "IgnoreExisting" ), mIgnoreExisting, false ); + addItem( mUpdateExistingItem, TQString::fromLatin1( "UpdateExisting" ) ); + mIgnoreExistingItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "IgnoreExisting" ), mIgnoreExisting, false ); mIgnoreExistingItem->setLabel( i18n("Skip updating files that exist on the receiving side") ); mIgnoreExistingItem->setWhatsThis( i18n("Skip updating files that already exist on the receiving side (--ignore-existing). Existing directories are not ignored.") ); - addItem( mIgnoreExistingItem, TQString::tqfromLatin1( "IgnoreExisting" ) ); - mDelayUpdatesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "DelayUpdates" ), mDelayUpdates, false ); + addItem( mIgnoreExistingItem, TQString::fromLatin1( "IgnoreExisting" ) ); + mDelayUpdatesItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "DelayUpdates" ), mDelayUpdates, false ); mDelayUpdatesItem->setLabel( i18n("Delay updates until the end of the transfer") ); mDelayUpdatesItem->setWhatsThis( i18n("Delay updates until the end of the transfer (--delay-updates). This option puts the temporary file from each updated file into a holding directory until the end of the transfer, at which time all the files are renamed and copied into place in rapid succession.") ); - addItem( mDelayUpdatesItem, TQString::tqfromLatin1( "DelayUpdates" ) ); - mMakeBackupsItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "MakeBackups" ), mMakeBackups, false ); + addItem( mDelayUpdatesItem, TQString::fromLatin1( "DelayUpdates" ) ); + mMakeBackupsItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "MakeBackups" ), mMakeBackups, false ); mMakeBackupsItem->setLabel( i18n("Make backups") ); mMakeBackupsItem->setWhatsThis( i18n("Make backups (-b, --backup). With this option, preexisting destination files are renamed as each file is transferred or deleted. You can control where the backup file goes and what (if any) suffix gets appended using the --backup-dir=DIR and --suffix=SUFFIX options.") ); - addItem( mMakeBackupsItem, TQString::tqfromLatin1( "MakeBackups" ) ); - mUseBackupSuffixItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UseBackupSuffix" ), mUseBackupSuffix, false ); + addItem( mMakeBackupsItem, TQString::fromLatin1( "MakeBackups" ) ); + mUseBackupSuffixItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UseBackupSuffix" ), mUseBackupSuffix, false ); mUseBackupSuffixItem->setLabel( i18n("Use a suffix for backups") ); mUseBackupSuffixItem->setWhatsThis( i18n("Use this suffix for backups (--suffix=SUFFIX).") ); - addItem( mUseBackupSuffixItem, TQString::tqfromLatin1( "UseBackupSuffix" ) ); - mBackupSuffixItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "BackupSuffix" ), mBackupSuffix, TQString::tqfromLatin1( "~" ) ); + addItem( mUseBackupSuffixItem, TQString::fromLatin1( "UseBackupSuffix" ) ); + mBackupSuffixItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "BackupSuffix" ), mBackupSuffix, TQString::fromLatin1( "~" ) ); mBackupSuffixItem->setLabel( i18n("Backup suffix") ); - addItem( mBackupSuffixItem, TQString::tqfromLatin1( "BackupSuffix" ) ); - mUseBackupDirectoryItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UseBackupDirectory" ), mUseBackupDirectory, false ); + addItem( mBackupSuffixItem, TQString::fromLatin1( "BackupSuffix" ) ); + mUseBackupDirectoryItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UseBackupDirectory" ), mUseBackupDirectory, false ); mUseBackupDirectoryItem->setLabel( i18n("Put backups into a certain directory") ); mUseBackupDirectoryItem->setWhatsThis( i18n("Store backups in this directory (--backup-dir=DIR).") ); - addItem( mUseBackupDirectoryItem, TQString::tqfromLatin1( "UseBackupDirectory" ) ); - mBackupDirectoryItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "BackupDirectory" ), mBackupDirectory, TQString::tqfromLatin1( "$HOME" ) ); + addItem( mUseBackupDirectoryItem, TQString::fromLatin1( "UseBackupDirectory" ) ); + mBackupDirectoryItem = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "BackupDirectory" ), mBackupDirectory, TQString::fromLatin1( "$HOME" ) ); mBackupDirectoryItem->setLabel( i18n("Backup directory") ); - addItem( mBackupDirectoryItem, TQString::tqfromLatin1( "BackupDirectory" ) ); - mUseBlockSizeItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UseBlockSize" ), mUseBlockSize, false ); + addItem( mBackupDirectoryItem, TQString::fromLatin1( "BackupDirectory" ) ); + mUseBlockSizeItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UseBlockSize" ), mUseBlockSize, false ); mUseBlockSizeItem->setLabel( i18n("Force a fixed checksum block-size") ); mUseBlockSizeItem->setWhatsThis( i18n("Force a fixed checksum block-size (-B, --block-size=SIZE). This forces the block size used in the rsync algorithm to a fixed value.") ); - addItem( mUseBlockSizeItem, TQString::tqfromLatin1( "UseBlockSize" ) ); - mBlockSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "BlockSize" ), mBlockSize, 0 ); + addItem( mUseBlockSizeItem, TQString::fromLatin1( "UseBlockSize" ) ); + mBlockSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "BlockSize" ), mBlockSize, 0 ); mBlockSizeItem->setMinValue(0); mBlockSizeItem->setLabel( i18n("The block size") ); - addItem( mBlockSizeItem, TQString::tqfromLatin1( "BlockSize" ) ); - mUseChecksumSeedItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UseChecksumSeed" ), mUseChecksumSeed, false ); + addItem( mBlockSizeItem, TQString::fromLatin1( "BlockSize" ) ); + mUseChecksumSeedItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UseChecksumSeed" ), mUseChecksumSeed, false ); mUseChecksumSeedItem->setLabel( i18n("Set block/file checksum seed") ); mUseChecksumSeedItem->setWhatsThis( i18n("Set block/file checksum seed (--checksum-seed=NUM). Set the MD4 checksum seed to this integer. This 4 byte checksum seed is included in each block and file MD4 checksum calculation. By default the checksum seed is generated by the server and defaults to the current time.") ); - addItem( mUseChecksumSeedItem, TQString::tqfromLatin1( "UseChecksumSeed" ) ); - mChecksumSeedItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "ChecksumSeed" ), mChecksumSeed, 0 ); + addItem( mUseChecksumSeedItem, TQString::fromLatin1( "UseChecksumSeed" ) ); + mChecksumSeedItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "ChecksumSeed" ), mChecksumSeed, 0 ); mChecksumSeedItem->setMinValue(0); mChecksumSeedItem->setLabel( i18n("The checksum seed") ); - addItem( mChecksumSeedItem, TQString::tqfromLatin1( "ChecksumSeed" ) ); - mUseChecksumItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UseChecksum" ), mUseChecksum, false ); + addItem( mChecksumSeedItem, TQString::fromLatin1( "ChecksumSeed" ) ); + mUseChecksumItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UseChecksum" ), mUseChecksum, false ); mUseChecksumItem->setLabel( i18n("Skip files based on a checksum") ); mUseChecksumItem->setWhatsThis( i18n("Skip files based on a checksum and not based on modification time and size (-c, --checksum). For further information on how this feature works read rsync's manual page.") ); - addItem( mUseChecksumItem, TQString::tqfromLatin1( "UseChecksum" ) ); + addItem( mUseChecksumItem, TQString::fromLatin1( "UseChecksum" ) ); - setCurrentGroup( TQString::tqfromLatin1( "SuperUser" ) ); + setCurrentGroup( TQString::fromLatin1( "SuperUser" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesSuperUserProgram; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "Sudo" ); + choice.name = TQString::fromLatin1( "Sudo" ); valuesSuperUserProgram.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::tqfromLatin1( "Super" ); + choice.name = TQString::fromLatin1( "Super" ); valuesSuperUserProgram.append( choice ); } - mSuperUserProgramItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "SuperUserProgram" ), mSuperUserProgram, valuesSuperUserProgram, EnumSuperUserProgram::Sudo ); + mSuperUserProgramItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "SuperUserProgram" ), mSuperUserProgram, valuesSuperUserProgram, EnumSuperUserProgram::Sudo ); mSuperUserProgramItem->setLabel( i18n("The program that should be used to gain super user privileges") ); mSuperUserProgramItem->setWhatsThis( i18n("Choose the program that will grant you limited super user privileges for mounting and unmounting remote shares. You can either select sudo, the standard tool for this purpose on most distributions, or super.") ); - addItem( mSuperUserProgramItem, TQString::tqfromLatin1( "SuperUserProgram" ) ); - mUseForceUnmountItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "UseForceUnmount" ), mUseForceUnmount, false ); + addItem( mSuperUserProgramItem, TQString::fromLatin1( "SuperUserProgram" ) ); + mUseForceUnmountItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "UseForceUnmount" ), mUseForceUnmount, false ); mUseForceUnmountItem->setLabel( i18n("Use super user privileges to unmount inaccessible shares") ); mUseForceUnmountItem->setWhatsThis( i18n("Unmount a share under Linux by force. This even works if the file system is \"busy\", because it is immediately detached from the file system hierarchy and all references to it are cleaned up later when it is not busy anymore. Linux kernel 2.4.11 or later is needed to take advantage of this feature. Use with case! Note, that you will need the root password to write the necessary changes to the configuration file.") ); - addItem( mUseForceUnmountItem, TQString::tqfromLatin1( "UseForceUnmount" ) ); - mAlwaysUseSuperUserItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "AlwaysUseSuperUser" ), mAlwaysUseSuperUser, false ); + addItem( mUseForceUnmountItem, TQString::fromLatin1( "UseForceUnmount" ) ); + mAlwaysUseSuperUserItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "AlwaysUseSuperUser" ), mAlwaysUseSuperUser, false ); mAlwaysUseSuperUserItem->setLabel( i18n("Use super user privileges to mount and unmount shares") ); mAlwaysUseSuperUserItem->setWhatsThis( i18n("Use super user privileges for mounting and unmounting remote shares. This feature is only needed, if you are not allowed to use smbmount, smbumount, mount.cifs and umount.cifs as normal user. Note, that you will need the root password to write the necessary changes to the configuration file.") ); - addItem( mAlwaysUseSuperUserItem, TQString::tqfromLatin1( "AlwaysUseSuperUser" ) ); + addItem( mAlwaysUseSuperUserItem, TQString::fromLatin1( "AlwaysUseSuperUser" ) ); } Smb4KSettings::~Smb4KSettings() diff --git a/smb4k/core/smb4ksynchronizer.cpp b/smb4k/core/smb4ksynchronizer.cpp index 819ad79..1ad9b9c 100644 --- a/smb4k/core/smb4ksynchronizer.cpp +++ b/smb4k/core/smb4ksynchronizer.cpp @@ -24,7 +24,7 @@ ***************************************************************************/ // TQt includes -#include <tqlayout.h> +#include <layout.h> #include <tqdir.h> #include <tqlabel.h> #include <tqregexp.h> @@ -286,7 +286,7 @@ const TQString Smb4KSynchronizer::readRsyncOptions() } options.append( Smb4KSettings::useMaximumDelete() ? - " --max-delete="+TQString( "%1" ).tqarg( Smb4KSettings::maximumDeleteValue() ) : + " --max-delete="+TQString( "%1" ).arg( Smb4KSettings::maximumDeleteValue() ) : "" ); options.append( Smb4KSettings::useChecksum() ? @@ -294,11 +294,11 @@ const TQString Smb4KSynchronizer::readRsyncOptions() "" ); options.append( Smb4KSettings::useBlockSize() ? - " --block-size="+TQString( "%1" ).tqarg( Smb4KSettings::blockSize() ) : + " --block-size="+TQString( "%1" ).arg( Smb4KSettings::blockSize() ) : "" ); options.append( Smb4KSettings::useChecksumSeed() ? - " --checksum-seed="+TQString( "%1" ).tqarg( Smb4KSettings::checksumSeed() ) : + " --checksum-seed="+TQString( "%1" ).arg( Smb4KSettings::checksumSeed() ) : "" ); if ( !Smb4KSettings::customFilteringRules().isEmpty() ) @@ -307,11 +307,11 @@ const TQString Smb4KSynchronizer::readRsyncOptions() } options.append( Smb4KSettings::useMinimalTransferSize() ? - " --min-size="+TQString( "%1" ).tqarg( Smb4KSettings::minimalTransferSize() )+"K" : + " --min-size="+TQString( "%1" ).arg( Smb4KSettings::minimalTransferSize() )+"K" : "" ); options.append( Smb4KSettings::useMaximalTransferSize() ? - " --max-size="+TQString( "%1" ).tqarg( Smb4KSettings::maximalTransferSize() )+"K" : + " --max-size="+TQString( "%1" ).arg( Smb4KSettings::maximalTransferSize() )+"K" : "" ); if ( Smb4KSettings::keepPartial() ) @@ -409,7 +409,7 @@ void Smb4KSynchronizer::slotReceivedStdout( KProcess *, char *buf, int len ) double tmp_done = tmp.section( "/", 0, 0 ).stripWhiteSpace().toInt(); double tmp_percent = ((tmp_total-tmp_done)/tmp_total)*100; - total = TQString( "%1" ).tqarg( tmp_percent ).section( ".", 0, 0 ).stripWhiteSpace(); + total = TQString( "%1" ).arg( tmp_percent ).section( ".", 0, 0 ).stripWhiteSpace(); } } else diff --git a/smb4k/dialogs/smb4kbookmarkeditor.cpp b/smb4k/dialogs/smb4kbookmarkeditor.cpp index 9e1f33c..a98c5eb 100644 --- a/smb4k/dialogs/smb4kbookmarkeditor.cpp +++ b/smb4k/dialogs/smb4kbookmarkeditor.cpp @@ -24,7 +24,7 @@ ***************************************************************************/ // TQt includes -#include <tqlayout.h> +#include <layout.h> #include <tqvaluelist.h> // KDE includes @@ -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,10 +77,10 @@ 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( (tqsizeHint().width() > 350 ? tqsizeHint().width() : 350), tqsizeHint().height() ); + setMinimumSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().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 8dff9e9..8d9ac99 100644 --- a/smb4k/dialogs/smb4kcustomoptionsdialog.cpp +++ b/smb4k/dialogs/smb4kcustomoptionsdialog.cpp @@ -25,7 +25,7 @@ ***************************************************************************/ // TQt includes -#include <tqlayout.h> +#include <layout.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 tqlayout below. + // The widgets will be put into the layout 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->tqsetAlignment( TQt::AlignRight ); + m_uid_input->setAlignment( 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->tqsetAlignment( TQt::AlignRight ); + m_gid_input->setAlignment( 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->tqsetAlignment( TQt::AlignRight ); + m_uid_input->setAlignment( 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->tqsetAlignment( TQt::AlignRight ); + m_gid_input->setAlignment( 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" ).tqarg( m_share_item->host(), m_share_item->name() ) ); + info = optionsHandler()->findItem( TQString( "//%1/%2" ).arg( 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( (tqsizeHint().width() > 350 ? tqsizeHint().width() : 350), tqsizeHint().height() ); + setFixedSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() ); } ///////////////////////////////////////////////////////////////////////////// @@ -885,7 +885,7 @@ void Smb4KCustomOptionsDialog::slotOKButtonClicked() } case Share: { - TQString item_name = TQString( "//%1/%2" ).tqarg( m_share_item->host(), + TQString item_name = TQString( "//%1/%2" ).arg( 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 131ce8d..d2501fa 100644 --- a/smb4k/dialogs/smb4kmountdialog.cpp +++ b/smb4k/dialogs/smb4kmountdialog.cpp @@ -25,7 +25,7 @@ ***************************************************************************/ // TQt includes -#include <tqlayout.h> +#include <layout.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( (tqsizeHint().width() > 350 ? tqsizeHint().width() : 350), tqsizeHint().height() ); + setFixedSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() ); } @@ -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 07361b2..d220bbe 100644 --- a/smb4k/dialogs/smb4kpreviewdialog.cpp +++ b/smb4k/dialogs/smb4kpreviewdialog.cpp @@ -24,7 +24,7 @@ ***************************************************************************/ // TQt includes -#include <tqlayout.h> +#include <layout.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( (tqsizeHint().width() > 350 ? tqsizeHint().width() : 350), tqsizeHint().height() ); + setMinimumSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() ); } @@ -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 ); } @@ -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" ).tqarg( (*it).second ) ); + view_item->setKey( TQString( "[file]_%1" ).arg( (*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" ).tqarg( (*it).second ) ); + view_item->setKey( TQString( "[directory]_%1" ).arg( (*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" ).tqarg( (*it).second ) ); + view_item->setKey( TQString( "[file]_%1" ).arg( (*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" ).tqarg( (*it).second ) ); + view_item->setKey( TQString( "[directory]_%1" ).arg( (*it).second ) ); } break; diff --git a/smb4k/dialogs/smb4kprintdialog.cpp b/smb4k/dialogs/smb4kprintdialog.cpp index 5443273..fc41462 100644 --- a/smb4k/dialogs/smb4kprintdialog.cpp +++ b/smb4k/dialogs/smb4kprintdialog.cpp @@ -25,7 +25,7 @@ // TQt includes #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.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 *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,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 ); - 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( (tqsizeHint().width() > 350 ? tqsizeHint().width() : 350), tqsizeHint().height() ); + setFixedSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() ); enableButton( User1, false ); diff --git a/smb4k/dialogs/smb4ksynchronizationdialog.cpp b/smb4k/dialogs/smb4ksynchronizationdialog.cpp index 4b37c89..ee8d178 100644 --- a/smb4k/dialogs/smb4ksynchronizationdialog.cpp +++ b/smb4k/dialogs/smb4ksynchronizationdialog.cpp @@ -24,7 +24,7 @@ ***************************************************************************/ // TQt includes -#include <tqlayout.h> +#include <layout.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 *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 & ) ), @@ -116,7 +116,7 @@ m_share( share ) this, TQT_SLOT( slotSynchronizationFinished() ) ); - setFixedSize( (tqsizeHint().width() > 350 ? tqsizeHint().width() : 350), tqsizeHint().height() ); + setFixedSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() ); } @@ -207,7 +207,7 @@ void Smb4KSynchronizationDialog::slotProgress( const Smb4KSynchronizationInfo &i if ( info.totalFileNumber() != -1 && info.processedFileNumber() != -1 ) { - transferred->setText( TQString( "%1 / %2" ).tqarg( info.processedFileNumber() ).tqarg( info.totalFileNumber() ) ); + transferred->setText( TQString( "%1 / %2" ).arg( info.processedFileNumber() ).arg( info.totalFileNumber() ) ); } if ( !info.transferRate().isEmpty() ) diff --git a/smb4k/iconview/smb4ksharesiconviewitem.h b/smb4k/iconview/smb4ksharesiconviewitem.h index 9be9502..0d247f6 100644 --- a/smb4k/iconview/smb4ksharesiconviewitem.h +++ b/smb4k/iconview/smb4ksharesiconviewitem.h @@ -32,7 +32,7 @@ // TQt includes #include <tqpainter.h> -#include <tqpalette.h> +#include <palette.h> // KDE includes #include <kiconview.h> diff --git a/smb4k/iconview/smb4ksharesiconviewtooltip.cpp b/smb4k/iconview/smb4ksharesiconviewtooltip.cpp index 0fc29a6..235b198 100644 --- a/smb4k/iconview/smb4ksharesiconviewtooltip.cpp +++ b/smb4k/iconview/smb4ksharesiconviewtooltip.cpp @@ -125,7 +125,7 @@ void Smb4KSharesIconViewToolTip::setupTip() if ( TQString::compare( m_item->shareObject()->filesystem(), "smbfs" ) == 0 ) { m_layout->addWidget( new TQLabel( "Owner:", this ), 2, 1, 0 ); - m_layout->addWidget( new TQLabel( TQString( "%1 - %2" ).tqarg( m_item->shareObject()->user(), m_item->shareObject()->group() ), this ), 2, 2, 0 ); + m_layout->addWidget( new TQLabel( TQString( "%1 - %2" ).arg( m_item->shareObject()->user(), m_item->shareObject()->group() ), this ), 2, 2, 0 ); } else { @@ -161,13 +161,13 @@ void Smb4KSharesIconViewToolTip::setupTip() used_dim = "GB"; } - used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 ); + used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 ); } else { used_dim = "kB"; double tmp_used = m_item->shareObject()->totalDiskSpace() - m_item->shareObject()->freeDiskSpace(); - used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 ); + used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 ); } if ( m_item->shareObject()->freeDiskSpace() >= 1024 ) @@ -181,12 +181,12 @@ void Smb4KSharesIconViewToolTip::setupTip() free_dim = "GB"; } - free = TQString( "%1" ).tqarg( tmp_free, 0, 'f', 1 ); + free = TQString( "%1" ).arg( tmp_free, 0, 'f', 1 ); } else { free_dim = "kB"; - free = TQString( "%1" ).tqarg( m_item->shareObject()->freeDiskSpace(), 0, 'f', 1 ); + free = TQString( "%1" ).arg( m_item->shareObject()->freeDiskSpace(), 0, 'f', 1 ); } if ( m_item->shareObject()->totalDiskSpace() >= 1024 ) @@ -200,28 +200,28 @@ void Smb4KSharesIconViewToolTip::setupTip() total_dim = "GB"; } - total = TQString( "%1" ).tqarg( tmp_total, 0, 'f', 1 ); + total = TQString( "%1" ).arg( tmp_total, 0, 'f', 1 ); } else { total_dim = "kB"; - total = TQString( "%1" ).tqarg( m_item->shareObject()->totalDiskSpace(), 0, 'f', 1 ); + total = TQString( "%1" ).arg( m_item->shareObject()->totalDiskSpace(), 0, 'f', 1 ); } m_layout->addWidget( new TQLabel( i18n( "Free:" ), this, "FreeLabel" ), 5, 1, 0 ); - m_free = new TQLabel( TQString( "%1 %2" ).tqarg( free, free_dim ), this ); + m_free = new TQLabel( TQString( "%1 %2" ).arg( free, free_dim ), this ); m_layout->addWidget( m_free, 5, 2, 0 ); m_layout->addWidget( new TQLabel( i18n( "Used:" ), this, "UsedLabel" ), 6, 1, 0 ); - m_used = new TQLabel( TQString( "%1 %2" ).tqarg( used, used_dim ), this ); + m_used = new TQLabel( TQString( "%1 %2" ).arg( used, used_dim ), this ); m_layout->addWidget( m_used, 6, 2, 0 ); m_layout->addWidget( new TQLabel( i18n( "Total:" ), this, "TotalLabel" ), 7, 1, 0 ); - m_total = new TQLabel( TQString( "%1 %2" ).tqarg( total, total_dim ), this ); + m_total = new TQLabel( TQString( "%1 %2" ).arg( total, total_dim ), this ); m_layout->addWidget( m_total, 7, 2, 0 ); m_layout->addWidget( new TQLabel( i18n( "Usage:" ), this, "UsageLabel" ), 8, 1, 0 ); - m_usage = new TQLabel( TQString( "%1 %" ).tqarg( m_item->shareObject()->percentage(), 0, 'f', 1 ), this ); + m_usage = new TQLabel( TQString( "%1 %" ).arg( m_item->shareObject()->percentage(), 0, 'f', 1 ), this ); m_layout->addWidget( m_usage, 8, 2, 0 ); } else @@ -268,13 +268,13 @@ void Smb4KSharesIconViewToolTip::update() used_dim = "GB"; } - used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 ); + used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 ); } else { used_dim = "kB"; double tmp_used = m_item->shareObject()->totalDiskSpace() - m_item->shareObject()->freeDiskSpace(); - used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 ); + used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 ); } if ( m_item->shareObject()->freeDiskSpace() >= 1024 ) @@ -288,12 +288,12 @@ void Smb4KSharesIconViewToolTip::update() free_dim = "GB"; } - free = TQString( "%1" ).tqarg( tmp_free, 0, 'f', 1 ); + free = TQString( "%1" ).arg( tmp_free, 0, 'f', 1 ); } else { free_dim = "kB"; - free = TQString( "%1" ).tqarg( m_item->shareObject()->freeDiskSpace(), 0, 'f', 1 ); + free = TQString( "%1" ).arg( m_item->shareObject()->freeDiskSpace(), 0, 'f', 1 ); } if ( m_item->shareObject()->totalDiskSpace() >= 1024 ) @@ -307,18 +307,18 @@ void Smb4KSharesIconViewToolTip::update() total_dim = "GB"; } - total = TQString( "%1" ).tqarg( tmp_total, 0, 'f', 1 ); + total = TQString( "%1" ).arg( tmp_total, 0, 'f', 1 ); } else { total_dim = "kB"; - total = TQString( "%1" ).tqarg( m_item->shareObject()->totalDiskSpace(), 0, 'f', 1 ); + total = TQString( "%1" ).arg( m_item->shareObject()->totalDiskSpace(), 0, 'f', 1 ); } - m_free->setText( TQString( "%1 %2" ).tqarg( free, free_dim ) ); - m_used->setText( TQString( "%1 %2" ).tqarg( used, used_dim ) ); - m_total->setText( TQString( "%1 %2" ).tqarg( total, total_dim ) ); - m_usage->setText( TQString( "%1 %" ).tqarg( m_item->shareObject()->percentage(), 0, 'f', 1 ) ); + m_free->setText( TQString( "%1 %2" ).arg( free, free_dim ) ); + m_used->setText( TQString( "%1 %2" ).arg( used, used_dim ) ); + m_total->setText( TQString( "%1 %2" ).arg( total, total_dim ) ); + m_usage->setText( TQString( "%1 %" ).arg( m_item->shareObject()->percentage(), 0, 'f', 1 ) ); } else { diff --git a/smb4k/iconview/smb4ksharesiconviewtooltip.h b/smb4k/iconview/smb4ksharesiconviewtooltip.h index 4b61345..f009a1b 100644 --- a/smb4k/iconview/smb4ksharesiconviewtooltip.h +++ b/smb4k/iconview/smb4ksharesiconviewtooltip.h @@ -33,7 +33,7 @@ // TQt includes #include <tqlabel.h> #include <tqpoint.h> -#include <tqlayout.h> +#include <layout.h> // Forward declarations: class Smb4KSharesIconViewItem; @@ -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/smb4kshareslistview.cpp b/smb4k/listview/smb4kshareslistview.cpp index 994d8d7..0943f7a 100644 --- a/smb4k/listview/smb4kshareslistview.cpp +++ b/smb4k/listview/smb4kshareslistview.cpp @@ -59,7 +59,7 @@ Smb4KSharesListView::Smb4KSharesListView( TQWidget *parent, const char *name ) addColumn( i18n( "Total" ) ); addColumn( i18n( "Usage" ) ); - // Set tqalignment + // Set alignment setColumnAlignment( Free, TQt::AlignRight ); setColumnAlignment( Used, TQt::AlignRight ); setColumnAlignment( Total, TQt::AlignRight ); diff --git a/smb4k/listview/smb4kshareslistviewitem.cpp b/smb4k/listview/smb4kshareslistviewitem.cpp index 3930f66..a05d969 100644 --- a/smb4k/listview/smb4kshareslistviewitem.cpp +++ b/smb4k/listview/smb4kshareslistviewitem.cpp @@ -128,13 +128,13 @@ void Smb4KSharesListViewItem::setupItem( const Smb4KShare &share, bool mountpoin used_dim = "GB"; } - used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 ); + used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 ); } else { used_dim = "kB"; double tmp_used = shareObject()->totalDiskSpace() - shareObject()->freeDiskSpace(); - used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 ); + used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 ); } if ( shareObject()->freeDiskSpace() >= 1024 ) @@ -148,12 +148,12 @@ void Smb4KSharesListViewItem::setupItem( const Smb4KShare &share, bool mountpoin free_dim = "GB"; } - free = TQString( "%1" ).tqarg( tmp_free, 0, 'f', 1 ); + free = TQString( "%1" ).arg( tmp_free, 0, 'f', 1 ); } else { free_dim = "kB"; - free = TQString( "%1" ).tqarg( shareObject()->freeDiskSpace(), 0, 'f', 1 ); + free = TQString( "%1" ).arg( shareObject()->freeDiskSpace(), 0, 'f', 1 ); } if ( shareObject()->totalDiskSpace() >= 1024 ) @@ -167,24 +167,24 @@ void Smb4KSharesListViewItem::setupItem( const Smb4KShare &share, bool mountpoin total_dim = "GB"; } - total = TQString( "%1" ).tqarg( tmp_total, 0, 'f', 1 ); + total = TQString( "%1" ).arg( tmp_total, 0, 'f', 1 ); } else { total_dim = "kB"; - total = TQString( "%1" ).tqarg( shareObject()->totalDiskSpace(), 0, 'f', 1 ); + total = TQString( "%1" ).arg( shareObject()->totalDiskSpace(), 0, 'f', 1 ); } - setText( Free, TQString( "%1 %2" ).tqarg( free, free_dim ) ); - setText( Used, TQString( "%1 %2" ).tqarg( used, used_dim ) ); - setText( Total, TQString( "%1 %2" ).tqarg( total, total_dim ) ); + setText( Free, TQString( "%1 %2" ).arg( free, free_dim ) ); + setText( Used, TQString( "%1 %2" ).arg( used, used_dim ) ); + setText( Total, TQString( "%1 %2" ).arg( total, total_dim ) ); } else { setText( Item, (m_mountpoint ? m_share.path() : m_share.name()) ); setText( Owner, TQString::compare( m_share.filesystem(), "smbfs" ) == 0 ? - TQString( "%1 - %2" ).tqarg( m_share.user() ).tqarg( m_share.group() ) : + TQString( "%1 - %2" ).arg( m_share.user() ).arg( m_share.group() ) : TQString() ); #ifndef __FreeBSD__ setText( Login, TQString::compare( m_share.filesystem(), "cifs" ) == 0 ? @@ -206,13 +206,13 @@ void Smb4KSharesListViewItem::setupItem( const Smb4KShare &share, bool mountpoin used_dim = "GB"; } - used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 ); + used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 ); } else { used_dim = "kB"; double tmp_used = shareObject()->totalDiskSpace() - shareObject()->freeDiskSpace(); - used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 ); + used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 ); } if ( shareObject()->freeDiskSpace() >= 1024 ) @@ -226,12 +226,12 @@ void Smb4KSharesListViewItem::setupItem( const Smb4KShare &share, bool mountpoin free_dim = "GB"; } - free = TQString( "%1" ).tqarg( tmp_free, 0, 'f', 1 ); + free = TQString( "%1" ).arg( tmp_free, 0, 'f', 1 ); } else { free_dim = "kB"; - free = TQString( "%1" ).tqarg( shareObject()->freeDiskSpace(), 0, 'f', 1 ); + free = TQString( "%1" ).arg( shareObject()->freeDiskSpace(), 0, 'f', 1 ); } if ( shareObject()->totalDiskSpace() >= 1024 ) @@ -245,17 +245,17 @@ void Smb4KSharesListViewItem::setupItem( const Smb4KShare &share, bool mountpoin total_dim = "GB"; } - total = TQString( "%1" ).tqarg( tmp_total, 0, 'f', 1 ); + total = TQString( "%1" ).arg( tmp_total, 0, 'f', 1 ); } else { total_dim = "kB"; - total = TQString( "%1" ).tqarg( shareObject()->totalDiskSpace(), 0, 'f', 1 ); + total = TQString( "%1" ).arg( shareObject()->totalDiskSpace(), 0, 'f', 1 ); } - setText( Free, TQString( "%1 %2" ).tqarg( free, free_dim ) ); - setText( Used, TQString( "%1 %2" ).tqarg( used, used_dim ) ); - setText( Total, TQString( "%1 %2" ).tqarg( total, total_dim ) ); + setText( Free, TQString( "%1 %2" ).arg( free, free_dim ) ); + setText( Used, TQString( "%1 %2" ).arg( used, used_dim ) ); + setText( Total, TQString( "%1 %2" ).arg( total, total_dim ) ); } m_initial_setup = false; @@ -330,7 +330,7 @@ void Smb4KSharesListViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, i // p->setPen( colorgrp.highlightedText() ); // } - p->drawText( 0, 0, width-1, height()-1, TQt::AlignCenter, TQString( "%1 \%" ).tqarg( m_share.percentage(), 0, 'f', 1 ) ); + p->drawText( 0, 0, width-1, height()-1, TQt::AlignCenter, TQString( "%1 \%" ).arg( m_share.percentage(), 0, 'f', 1 ) ); } else { diff --git a/smb4k/listview/smb4kshareslistviewitem.h b/smb4k/listview/smb4kshareslistviewitem.h index b47f888..679de44 100644 --- a/smb4k/listview/smb4kshareslistviewitem.h +++ b/smb4k/listview/smb4kshareslistviewitem.h @@ -32,7 +32,7 @@ // TQt includes #include <tqpainter.h> -#include <tqpalette.h> +#include <palette.h> // KDE includes #include <klistview.h> @@ -144,13 +144,13 @@ class Smb4KSharesListViewItem : public KListViewItem * * @param width The width of the area that will be painted. * - * @param tqalignment The tqalignment of the column that will be used. + * @param alignment The alignment of the column that will be used. */ void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, - int tqalignment ); + int alignment ); /** * Reimplemented from KListViewItem. diff --git a/smb4k/listview/smb4kshareslistviewtooltip.cpp b/smb4k/listview/smb4kshareslistviewtooltip.cpp index a2c49cc..9381be7 100644 --- a/smb4k/listview/smb4kshareslistviewtooltip.cpp +++ b/smb4k/listview/smb4kshareslistviewtooltip.cpp @@ -125,7 +125,7 @@ void Smb4KSharesListViewToolTip::setupTip() if ( TQString::compare( m_item->shareObject()->filesystem(), "smbfs" ) == 0 ) { m_layout->addWidget( new TQLabel( "Owner:", this ), 2, 1, 0 ); - m_layout->addWidget( new TQLabel( TQString( "%1 - %2" ).tqarg( m_item->shareObject()->user(), m_item->shareObject()->group() ), this ), 2, 2, 0 ); + m_layout->addWidget( new TQLabel( TQString( "%1 - %2" ).arg( m_item->shareObject()->user(), m_item->shareObject()->group() ), this ), 2, 2, 0 ); } else { @@ -161,13 +161,13 @@ void Smb4KSharesListViewToolTip::setupTip() used_dim = "GB"; } - used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 ); + used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 ); } else { used_dim = "kB"; double tmp_used = m_item->shareObject()->totalDiskSpace() - m_item->shareObject()->freeDiskSpace(); - used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 ); + used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 ); } if ( m_item->shareObject()->freeDiskSpace() >= 1024 ) @@ -181,12 +181,12 @@ void Smb4KSharesListViewToolTip::setupTip() free_dim = "GB"; } - free = TQString( "%1" ).tqarg( tmp_free, 0, 'f', 1 ); + free = TQString( "%1" ).arg( tmp_free, 0, 'f', 1 ); } else { free_dim = "kB"; - free = TQString( "%1" ).tqarg( m_item->shareObject()->freeDiskSpace(), 0, 'f', 1 ); + free = TQString( "%1" ).arg( m_item->shareObject()->freeDiskSpace(), 0, 'f', 1 ); } if ( m_item->shareObject()->totalDiskSpace() >= 1024 ) @@ -200,28 +200,28 @@ void Smb4KSharesListViewToolTip::setupTip() total_dim = "GB"; } - total = TQString( "%1" ).tqarg( tmp_total, 0, 'f', 1 ); + total = TQString( "%1" ).arg( tmp_total, 0, 'f', 1 ); } else { total_dim = "kB"; - total = TQString( "%1" ).tqarg( m_item->shareObject()->totalDiskSpace(), 0, 'f', 1 ); + total = TQString( "%1" ).arg( m_item->shareObject()->totalDiskSpace(), 0, 'f', 1 ); } m_layout->addWidget( new TQLabel( i18n( "Free:" ), this, "FreeLabel" ), 5, 1, 0 ); - m_free = new TQLabel( TQString( "%1 %2" ).tqarg( free, free_dim ), this ); + m_free = new TQLabel( TQString( "%1 %2" ).arg( free, free_dim ), this ); m_layout->addWidget( m_free, 5, 2, 0 ); m_layout->addWidget( new TQLabel( i18n( "Used:" ), this, "UsedLabel" ), 6, 1, 0 ); - m_used = new TQLabel( TQString( "%1 %2" ).tqarg( used, used_dim ), this ); + m_used = new TQLabel( TQString( "%1 %2" ).arg( used, used_dim ), this ); m_layout->addWidget( m_used, 6, 2, 0 ); m_layout->addWidget( new TQLabel( i18n( "Total:" ), this, "TotalLabel" ), 7, 1, 0 ); - m_total = new TQLabel( TQString( "%1 %2" ).tqarg( total, total_dim ), this ); + m_total = new TQLabel( TQString( "%1 %2" ).arg( total, total_dim ), this ); m_layout->addWidget( m_total, 7, 2, 0 ); m_layout->addWidget( new TQLabel( i18n( "Usage:" ), this, "UsageLabel" ), 8, 1, 0 ); - m_usage = new TQLabel( TQString( "%1 %" ).tqarg( m_item->shareObject()->percentage(), 0, 'f', 1 ), this ); + m_usage = new TQLabel( TQString( "%1 %" ).arg( m_item->shareObject()->percentage(), 0, 'f', 1 ), this ); m_layout->addWidget( m_usage, 8, 2, 0 ); } else @@ -268,13 +268,13 @@ void Smb4KSharesListViewToolTip::update() used_dim = "GB"; } - used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 ); + used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 ); } else { used_dim = "kB"; double tmp_used = m_item->shareObject()->totalDiskSpace() - m_item->shareObject()->freeDiskSpace(); - used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 ); + used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 ); } if ( m_item->shareObject()->freeDiskSpace() >= 1024 ) @@ -288,12 +288,12 @@ void Smb4KSharesListViewToolTip::update() free_dim = "GB"; } - free = TQString( "%1" ).tqarg( tmp_free, 0, 'f', 1 ); + free = TQString( "%1" ).arg( tmp_free, 0, 'f', 1 ); } else { free_dim = "kB"; - free = TQString( "%1" ).tqarg( m_item->shareObject()->freeDiskSpace(), 0, 'f', 1 ); + free = TQString( "%1" ).arg( m_item->shareObject()->freeDiskSpace(), 0, 'f', 1 ); } if ( m_item->shareObject()->totalDiskSpace() >= 1024 ) @@ -307,18 +307,18 @@ void Smb4KSharesListViewToolTip::update() total_dim = "GB"; } - total = TQString( "%1" ).tqarg( tmp_total, 0, 'f', 1 ); + total = TQString( "%1" ).arg( tmp_total, 0, 'f', 1 ); } else { total_dim = "kB"; - total = TQString( "%1" ).tqarg( m_item->shareObject()->totalDiskSpace(), 0, 'f', 1 ); + total = TQString( "%1" ).arg( m_item->shareObject()->totalDiskSpace(), 0, 'f', 1 ); } - m_free->setText( TQString( "%1 %2" ).tqarg( free, free_dim ) ); - m_used->setText( TQString( "%1 %2" ).tqarg( used, used_dim ) ); - m_total->setText( TQString( "%1 %2" ).tqarg( total, total_dim ) ); - m_usage->setText( TQString( "%1 %" ).tqarg( m_item->shareObject()->percentage(), 0, 'f', 1 ) ); + m_free->setText( TQString( "%1 %2" ).arg( free, free_dim ) ); + m_used->setText( TQString( "%1 %2" ).arg( used, used_dim ) ); + m_total->setText( TQString( "%1 %2" ).arg( total, total_dim ) ); + m_usage->setText( TQString( "%1 %" ).arg( m_item->shareObject()->percentage(), 0, 'f', 1 ) ); } else { diff --git a/smb4k/listview/smb4kshareslistviewtooltip.h b/smb4k/listview/smb4kshareslistviewtooltip.h index 41fc91f..38c58a2 100644 --- a/smb4k/listview/smb4kshareslistviewtooltip.h +++ b/smb4k/listview/smb4kshareslistviewtooltip.h @@ -33,7 +33,7 @@ // TQt includes #include <tqlabel.h> #include <tqpoint.h> -#include <tqlayout.h> +#include <layout.h> // Forward declarations: class Smb4KSharesListViewItem; @@ -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..94a298a 100644 --- a/smb4k/searchdlg/smb4ksearchdialog.cpp +++ b/smb4k/searchdlg/smb4ksearchdialog.cpp @@ -24,7 +24,7 @@ ***************************************************************************/ // TQt includes -#include <tqlayout.h> +#include <layout.h> #include <tqstringlist.h> #include <tqheader.h> @@ -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(); diff --git a/smb4k/smb4k.cpp b/smb4k/smb4k.cpp index dea3b9b..fe276f3 100644 --- a/smb4k/smb4k.cpp +++ b/smb4k/smb4k.cpp @@ -208,7 +208,7 @@ void Smb4KApp::setupStatusBar() progress->setPercentageVisible( false ); statusBar()->addWidget( progress, 0, true ); - statusBar()->insertFixedItem( TQString( "Smb4K %1" ).tqarg( VERSION ), Version, true ); + statusBar()->insertFixedItem( TQString( "Smb4K %1" ).arg( VERSION ), Version, true ); // Align the items: statusBar()->setItemAlignment( Message, AlignAuto ); @@ -658,7 +658,7 @@ void Smb4KApp::slotRunStateChanged() } case Smb4KSettings::EnumBrowseList::QueryCustomMaster: { - statusBar()->changeItem( i18n( "Querying master browser %1..." ).tqarg( Smb4KSettings::customMasterBrowser().upper() ), Message ); + statusBar()->changeItem( i18n( "Querying master browser %1..." ).arg( Smb4KSettings::customMasterBrowser().upper() ), Message ); break; } diff --git a/smb4k/smb4ksystemtray.cpp b/smb4k/smb4ksystemtray.cpp index 9aa1243..9ac6e57 100644 --- a/smb4k/smb4ksystemtray.cpp +++ b/smb4k/smb4ksystemtray.cpp @@ -709,7 +709,7 @@ void Smb4KSystemTray::slotSetupSharesMenu() { // _::_ is the devider between share name and the canonical path of // the share. - TQString item = TQString( "%1_::_%2" ).tqarg( TQString((*it)->name()), TQString((*it)->canonicalPath()) ); + TQString item = TQString( "%1_::_%2" ).arg( TQString((*it)->name()), TQString((*it)->canonicalPath()) ); strings.append( item ); } @@ -736,7 +736,7 @@ void Smb4KSystemTray::slotSetupSharesMenu() for ( KActionPtrList::ConstIterator i = new_actions_list.begin(); i != new_actions_list.end(); ++i ) { - TQString item = TQString( "st_[share_menu]_%1" ).tqarg( TQString((*it)->canonicalPath()) ); + TQString item = TQString( "st_[share_menu]_%1" ).arg( TQString((*it)->canonicalPath()) ); if ( TQString::compare( (*i)->name(), item ) == 0 ) { @@ -826,7 +826,7 @@ void Smb4KSystemTray::slotSetupSharesMenu() if ( !Smb4KSettings::showMountPoint() ) { - TQString item = TQString( "%1_::_%2" ).tqarg( TQString((*it)->name()), TQString((*it)->canonicalPath()) ); + TQString item = TQString( "%1_::_%2" ).arg( TQString((*it)->name()), TQString((*it)->canonicalPath()) ); index = strings.findIndex( item ); } @@ -900,7 +900,7 @@ void Smb4KSystemTray::slotSetupSharesMenu() TQString action_name = action_menu->name(); TQString canonical_path = action_name.section( "st_[share_menu]_", 1, -1 ); - // Remove all tqchildren of the share action menus: + // Remove all children of the share action menus: KAction *action = NULL; // Unmount action |