diff options
29 files changed, 276 insertions, 276 deletions
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/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/smb4ksambaoptions.cpp b/smb4k/configdlg/smb4ksambaoptions.cpp index c579b18..8eb6194 100644 --- a/smb4k/configdlg/smb4ksambaoptions.cpp +++ b/smb4k/configdlg/smb4ksambaoptions.cpp @@ -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..24e309a 100644 --- a/smb4k/configdlg/smb4kshareoptions.cpp +++ b/smb4k/configdlg/smb4kshareoptions.cpp @@ -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/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..75fddd1 100644 --- a/smb4k/core/smb4kfileio.cpp +++ b/smb4k/core/smb4kfileio.cpp @@ -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/smb4kmounter.cpp b/smb4k/core/smb4kmounter.cpp index ccf687d..8ed59c9 100644 --- a/smb4k/core/smb4kmounter.cpp +++ b/smb4k/core/smb4kmounter.cpp @@ -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 a19756c..2b0b21f 100644 --- a/smb4k/core/smb4kpasswordhandler.cpp +++ b/smb4k/core/smb4kpasswordhandler.cpp @@ -275,11 +275,11 @@ 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 ); @@ -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..5fa49ae 100644 --- a/smb4k/core/smb4ksambaoptionshandler.cpp +++ b/smb4k/core/smb4ksambaoptionshandler.cpp @@ -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; } @@ -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,29 +1273,29 @@ 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() ? @@ -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 3d0c418..28e7752 100644 --- a/smb4k/core/smb4ksettings.cpp +++ b/smb4k/core/smb4ksettings.cpp @@ -657,11 +657,11 @@ Smb4KSettings::Smb4KSettings( ) 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::fromLatin1( "ServerCodepage" ) ); - mUserIDItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "UserID" ), mUserID, TQString( "%1" ).tqarg( (int)getuid() ) ); + 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::fromLatin1( "UserID" ) ); - mGroupIDItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "GroupID" ), mGroupID, TQString( "%1" ).tqarg( (int)getgid() ) ); + 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::fromLatin1( "GroupID" ) ); diff --git a/smb4k/core/smb4ksynchronizer.cpp b/smb4k/core/smb4ksynchronizer.cpp index 819ad79..d8e9585 100644 --- a/smb4k/core/smb4ksynchronizer.cpp +++ b/smb4k/core/smb4ksynchronizer.cpp @@ -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/smb4kcustomoptionsdialog.cpp b/smb4k/dialogs/smb4kcustomoptionsdialog.cpp index c9b2d1b..6d70f08 100644 --- a/smb4k/dialogs/smb4kcustomoptionsdialog.cpp +++ b/smb4k/dialogs/smb4kcustomoptionsdialog.cpp @@ -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(); @@ -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/smb4kpreviewdialog.cpp b/smb4k/dialogs/smb4kpreviewdialog.cpp index 53bc0bf..f9a3d13 100644 --- a/smb4k/dialogs/smb4kpreviewdialog.cpp +++ b/smb4k/dialogs/smb4kpreviewdialog.cpp @@ -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/smb4ksynchronizationdialog.cpp b/smb4k/dialogs/smb4ksynchronizationdialog.cpp index 9a3c453..4794a80 100644 --- a/smb4k/dialogs/smb4ksynchronizationdialog.cpp +++ b/smb4k/dialogs/smb4ksynchronizationdialog.cpp @@ -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/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/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..a944def 100644 --- a/smb4k/listview/smb4kshareslistviewitem.h +++ b/smb4k/listview/smb4kshareslistviewitem.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/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 |