TDE
/
smb4k
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/smb4k
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source 
This reverts commit f3a9c5ace2.
pull/1/head
Timothy Pearson 13 years ago
parent f3a9c5ace2
commit 30cc1f3718
44 changed files with 799 additions and 799 deletions
Show Stats Download Patch File Download Diff File

10
plugin/smb4k_konqplugin.cpp
Unescape View File

@ -24,7 +24,7 @@
#include <tqtooltip.h>
#include <tqstring.h>
#include <tqwidget.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqpainter.h>
#include <tqheader.h>
#include <tqvaluelist.h>
@ -155,10 +155,10 @@ void KonqSidebar_Smb4K::slotSearch()
if ( m_search_part )
{
TQGridLayout *layout = new TQGridLayout( frame );
layout->setSpacing( 10 );
layout->setMargin( 0 );
layout->addWidget ( m_search_part->widget(), 0, 0, 0 );
TQGridLayout *tqlayout = new TQGridLayout( frame );
tqlayout->setSpacing( 10 );
tqlayout->setMargin( 0 );
tqlayout->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:

12
smb4k/browser/smb4knetworkbrowser_part.cpp
Unescape View File

@ -619,7 +619,7 @@ void Smb4KNetworkBrowserPart::slotItemCollapsed( TQListViewItem *item )
{
Smb4KNetworkBrowserItem *browser_item = static_cast<Smb4KNetworkBrowserItem *>( item );
// Remove all children if we have a host item, because we
// Remove all tqchildren 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 children to the childless host item:
// Add the tqchildren 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 children to the childless host item:
// Add the tqchildren 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 children for that:
// workgroup's tqchildren 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" ).arg( browser_item->shareItem()->host(),
TQString share_name = TQString( "//%1/%2" ).tqarg( 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" ).arg( share_item->host(), share_item->name() ) );
TQValueList<Smb4KShare> list = Smb4KCore::mounter()->findShareByName( TQString( "//%1/%2" ).tqarg( share_item->host(), share_item->name() ) );
if ( list.isEmpty() )
{

2
smb4k/browser/smb4knetworkbrowser_part.h
Unescape View File

@ -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 children of @p host into the list
* this @p list and inserts its items as tqchildren of @p host into the list
* view. Obsolete items will be deleted from the network browser.
*
* @param host The host where the shares belong

4
smb4k/browser/smb4knetworkbrowsertooltip.h
Unescape View File

@ -32,7 +32,7 @@
// TQt includes
#include <tqlabel.h>
#include <layout.h>
#include <tqlayout.h>
// Forward declarations:
class Smb4KNetworkBrowserItem;
@ -110,7 +110,7 @@ class Smb4KNetworkBrowserToolTip : public TQLabel
Smb4KNetworkBrowserItem *m_item;
/**
* The layout for the tool tip
* The tqlayout for the tool tip
*/
TQGridLayout *m_layout;

2
smb4k/configdlg/smb4kauthoptions.cpp
Unescape View File

@ -26,7 +26,7 @@
// TQt includes
#include <tqcheckbox.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqgroupbox.h>
#include <tqbuttongroup.h>
#include <tqlabel.h>

8
smb4k/configdlg/smb4kconfigdialog.cpp
Unescape View File

@ -316,8 +316,8 @@ void Smb4KConfigDialog::loadCustomSambaOptions()
item->setText( Smb4KSambaOptions::ItemName, (*it)->itemName() );
item->setText( Smb4KSambaOptions::Port, ((*it)->port() != -1 ?
TQString( "%1" ).arg( (*it)->port() ) :
TQString( "%1" ).arg( Smb4KSettings::remotePort() )) );
TQString( "%1" ).tqarg( (*it)->port() ) :
TQString( "%1" ).tqarg( 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." ).arg( issues ) );
KMessageBox::error( this, i18n( "The configuration could not be written, because one setting is incomplete:\n%1Please correct this issue." ).tqarg( issues ) );
}
else
{
KMessageBox::error( this, i18n( "The configuration could not be written, because %1 settings are incomplete:\n%1Please correct these issues." ).arg( index ).arg( issues ) );
KMessageBox::error( this, i18n( "The configuration could not be written, because %1 settings are incomplete:\n%1Please correct these issues." ).tqarg( index ).tqarg( issues ) );
}
}

2
smb4k/configdlg/smb4knetworkoptions.cpp
Unescape View File

@ -26,7 +26,7 @@
// TQt includes
#include <tqbuttongroup.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqradiobutton.h>
#include <tqlabel.h>

2
smb4k/configdlg/smb4krsyncoptions.cpp
Unescape View File

@ -24,7 +24,7 @@
***************************************************************************/
// TQt includes
#include <layout.h>
#include <tqlayout.h>
#include <tqbuttongroup.h>
#include <tqcheckbox.h>
#include <tqlabel.h>

14
smb4k/configdlg/smb4ksambaoptions.cpp
Unescape View File

@ -25,7 +25,7 @@
***************************************************************************/
// TQt includes
#include <layout.h>
#include <tqlayout.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->setAlignment( TQt::AlignRight );
user_id->tqsetAlignment( TQt::AlignRight );
(void) new TQLabel( i18n( "Group ID:" ), user_group_box );
KLineEdit *group_id = new KLineEdit( user_group_box, "kcfg_GroupID" );
group_id->setAlignment( TQt::AlignRight );
group_id->tqsetAlignment( 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( "unicode", Smb4KSettings::EnumServerCodepage::unicode );
codepage->insertItem( "tqunicode", 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->setAlignment( TQt::AlignRight );
fmask->tqsetAlignment( TQt::AlignRight );
(void) new TQLabel( i18n( "Directory mask:" ), perms_box );
KLineEdit *dmask = new KLineEdit( perms_box, "kcfg_DirectoryMask" );
dmask->setAlignment( TQt::AlignRight );
dmask->tqsetAlignment( 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" ).arg( port ) );
view->selectedItem()->setText( Port, TQString( "%1" ).tqarg( port ) );
emit customSettingsChanged();
}

4
smb4k/configdlg/smb4kshareoptions.cpp
Unescape View File

@ -25,7 +25,7 @@
***************************************************************************/
// TQt includes
#include <layout.h>
#include <tqlayout.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" ).arg( getpwuid( getuid() )->pw_name ),
(void) new TQCheckBox( i18n( "Unmount all shares of user %1 on exit" ).tqarg( getpwuid( getuid() )->pw_name ),
mount_box, "kcfg_UnmountSharesOnExit" );
(void) new TQCheckBox( i18n( "Remount recently used shares on program start" ),
mount_box, "kcfg_RemountShares" );

2
smb4k/configdlg/smb4ksuperuseroptions.cpp
Unescape View File

@ -28,7 +28,7 @@
#include <tqgroupbox.h>
#include <tqbuttongroup.h>
#include <tqlabel.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqradiobutton.h>
#include <tqcheckbox.h>

2
smb4k/configdlg/smb4kuserinterfaceoptions.cpp
Unescape View File

@ -25,7 +25,7 @@
***************************************************************************/
// TQt includes
#include <layout.h>
#include <tqlayout.h>
#include <tqbuttongroup.h>
#include <tqcheckbox.h>
#include <tqradiobutton.h>

6
smb4k/core/smb4kbookmark.cpp
Unescape View File

@ -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" ).arg( m_host, m_share );
m_bookmark = TQString( "//%1/%2" ).tqarg( 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" ).arg( m_host, m_share );
m_bookmark = TQString( "//%1/%2" ).tqarg( m_host, m_share );
}
@ -61,7 +61,7 @@ void Smb4KBookmark::setShareName( const TQString &name )
{
m_share = name;
m_bookmark = TQString( "//%1/%2" ).arg( m_host, m_share );
m_bookmark = TQString( "//%1/%2" ).tqarg( m_host, m_share );
}

2
smb4k/core/smb4kbookmarkhandler.cpp
Unescape View File

@ -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)" ).arg( (*it)->label() ).arg( serial_number++ ) );
(*it)->setLabel( TQString( "%1 (%2)" ).tqarg( (*it)->label() ).tqarg( serial_number++ ) );
}
}

2
smb4k/core/smb4kcore.cpp
Unescape View File

@ -297,7 +297,7 @@ void Smb4KCore::searchPrograms()
Smb4KSettings::self()->readConfig();
// List of paths that should be searched.
TQStringList path_list = TQStringList::split( ":", TQString( "%1" ).arg( getenv( "PATH" ) ), false );
TQStringList path_list = TQStringList::split( ":", TQString( "%1" ).tqarg( getenv( "PATH" ) ), false );
if ( path_list.find( "/sbin" ) == path_list.end() )
{

58
smb4k/core/smb4kerror.cpp
Unescape View File

@ -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." ).arg( text ) );
KMessageBox::error( 0, i18n( "The wallet \"%1\" could not be opened. KWallet support will be disabled for this session." ).tqarg( 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." ).arg( text ) );
KMessageBox::error( 0, i18n( "The share \"%1\" could not be mounted.\nDetailed information cannot be provided because there was no error message." ).tqarg( text ) );
}
else
{
KMessageBox::detailedError( 0, i18n( "The share \"%1\" could not be mounted.\nRead the error message under \"Details\" to find out more." ).arg( text ), details );
KMessageBox::detailedError( 0, i18n( "The share \"%1\" could not be mounted.\nRead the error message under \"Details\" to find out more." ).tqarg( 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." ).arg( text ) );
KMessageBox::error( 0, i18n( "The share \"%1\" could not be unmounted.\nDetailed information cannot be provided because there was no error message." ).tqarg( text ) );
}
else
{
KMessageBox::detailedError( 0, i18n( "The share \"%1\" could not be unmounted.\nRead the error message under \"Details\" to find out more." ).arg( text ), details );
KMessageBox::detailedError( 0, i18n( "The share \"%1\" could not be unmounted.\nRead the error message under \"Details\" to find out more." ).tqarg( text ), details );
}
break;
}
case ERROR_FILE_NOT_FOUND:
{
KMessageBox::error( 0, i18n( "The file \"%1\" could not be found." ).arg( text ) );
KMessageBox::error( 0, i18n( "The file \"%1\" could not be found." ).tqarg( 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." ).arg( text ) );
KMessageBox::error( 0, i18n( "The file \"%1\" could not be read." ).tqarg( text ) );
}
else
{
KMessageBox::detailedError( 0, i18n( "The file \"%1\" could not be read.\nRead the error message under \"Details\" to find out more." ).arg( text ), details );
KMessageBox::detailedError( 0, i18n( "The file \"%1\" could not be read.\nRead the error message under \"Details\" to find out more." ).tqarg( 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." ).arg( 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." ).tqarg( 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." ).arg( 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." ).tqarg( text.section( ":", 1, 1 ), text.section( ":", 0, 0 ) ) );
break;
}
case ERROR_MKDIR_FAILED:
{
KMessageBox::error( 0, i18n( "The directory \"%1\" could not be created." ).arg( text ) );
KMessageBox::error( 0, i18n( "The directory \"%1\" could not be created." ).tqarg( text ) );
break;
}
case ERROR_WRITING_FILE:
{
KMessageBox::error( 0, i18n( "The file \"%1\" could not be written." ).arg( text ) );
KMessageBox::error( 0, i18n( "The file \"%1\" could not be written." ).tqarg( 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." ).arg( text ) );
KMessageBox::error( 0, i18n( "The command \"%1\" could not be found." ).tqarg( 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." ).arg( text ) );
KMessageBox::error( 0, i18n( "The file \"%1\" could not be printed.\nDetailed information cannot be provided because there was no error message." ).tqarg( text ) );
}
else
{
KMessageBox::detailedError( 0, i18n( "The file \"%1\" could not be printed.\nRead the error message under \"Details\" to find out more." ).arg( text ), details );
KMessageBox::detailedError( 0, i18n( "The file \"%1\" could not be printed.\nRead the error message under \"Details\" to find out more." ).tqarg( 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." ).arg( text ) );
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 ) );
}
else
{
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 );
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 );
}
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." ).arg( text ) );
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 ) );
}
else
{
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 );
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 );
}
break;
}
case ERROR_DIRECTORY_NOT_FOUND:
{
KMessageBox::error( 0, i18n( "The directory \"%1\" could not be found." ).arg( text ) );
KMessageBox::error( 0, i18n( "The directory \"%1\" could not be found." ).tqarg( 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." ).arg( 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." ).tqarg( 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." ).arg( text ) );
KMessageBox::error( 0, i18n( "The file \"%1\" could not be opened." ).tqarg( text ) );
}
else
{
KMessageBox::detailedError( 0, i18n( "The file \"%1\" could not be opened.\nRead the error message under \"Details\" to find out more." ).arg( text ), details );
KMessageBox::detailedError( 0, i18n( "The file \"%1\" could not be opened.\nRead the error message under \"Details\" to find out more." ).tqarg( 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." ).arg( text ) );
KMessageBox::error( 0, i18n( "The file \"%1\" could not be closed." ).tqarg( text ) );
}
else
{
KMessageBox::detailedError( 0, i18n( "The file \"%1\" could not be closed.\nRead the error message under \"Details\" to find out more." ).arg( text ), details );
KMessageBox::detailedError( 0, i18n( "The file \"%1\" could not be closed.\nRead the error message under \"Details\" to find out more." ).tqarg( 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" ).arg( text ) );
KMessageBox::error( 0, i18n( "The list of arguments for the \"net\" command could not be assembled.\nAt the moment it reads: %1" ).tqarg( 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." ).arg( text ) );
KMessageBox::information( 0, i18n( "The mimetype \"%1\" is not supported. Please convert the file to PostScript or PDF." ).tqarg( 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." ).arg( text ) );
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 ) );
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." ).arg( 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." ).tqarg( text, details ) );
break;
}

24
smb4k/core/smb4kfileio.cpp
Unescape View File

@ -26,7 +26,7 @@
// TQt includes
#include <tqdir.h>
#include <tqfile.h>
#include <textstream.h>
#include <tqtextstream.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" ).arg( getpwuid( getuid() )->pw_name ) );
contents.append( "User_Alias\tSMB4KUSERS = "+TQString( "%1" ).tqarg( 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" ).arg( getpwuid( getuid() )->pw_name ) );
contents.append( ":define Smb4KUsers "+TQString( "%1" ).tqarg( 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" ).arg( getpwuid( getuid() )->pw_name ).arg( filename );
contents << TQString( "%1:%2" ).tqarg( getpwuid( getuid() )->pw_name ).tqarg( 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" ).arg( getpwuid( getuid() )->pw_name ) );
contents.append( "User_Alias\tSMB4KUSERS = "+TQString( "%1" ).tqarg( 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" ).arg( (int)file_stat.st_mode, 0, 8 );
TQString perms = TQString( "%1" ).tqarg( (int)file_stat.st_mode, 0, 8 );
perms = perms.right( 4 );
TQString owner = TQString( "%1" ).arg( (int)file_stat.st_uid );
TQString group = TQString( "%1" ).arg( (int)file_stat.st_gid );
TQString owner = TQString( "%1" ).tqarg( (int)file_stat.st_uid );
TQString group = TQString( "%1" ).tqarg( (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" ).arg( getpwuid( getuid() )->pw_name ) );
contents.append( ":define Smb4KUsers "+TQString( "%1" ).tqarg( 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" ).arg( (int)file_stat.st_mode, 0, 8 );
TQString perms = TQString( "%1" ).tqarg( (int)file_stat.st_mode, 0, 8 );
perms = perms.right( 4 );
TQString owner = TQString( "%1" ).arg( (int)file_stat.st_uid );
TQString group = TQString( "%1" ).arg( (int)file_stat.st_gid );
TQString owner = TQString( "%1" ).tqarg( (int)file_stat.st_uid );
TQString group = TQString( "%1" ).tqarg( (int)file_stat.st_gid );
TQString temp_file_name = TQString( tmp );
// Assemble the command.

18
smb4k/core/smb4khomesshareshandler.cpp
Unescape View File

@ -25,7 +25,7 @@
// TQt includes
#include <tqmap.h>
#include <layout.h>
#include <tqlayout.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 *layout = new TQGridLayout( frame );
layout->setSpacing( 5 );
TQGridLayout *tqlayout = new TQGridLayout( frame );
tqlayout->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 );
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 );
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 );
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->sizeHint() );
m_dlg->setFixedSize( m_dlg->tqsizeHint() );
if ( m_dlg->exec() == KDialogBase::Accepted )
{

110
smb4k/core/smb4kmounter.cpp
Unescape View File

@ -26,9 +26,9 @@
// TQt includes
#include <tqapplication.h>
#include <tqdir.h>
#include <textstream.h>
#include <tqtextstream.h>
#include <tqfile.h>
#include <textstream.h>
#include <tqtextstream.h>
// KDE includes
#include <kapplication.h>
@ -115,8 +115,8 @@ Smb4KMounter::~Smb4KMounter()
void Smb4KMounter::init()
{
m_queue.enqueue( new TQString( TQString( "%1:" ).arg( Import ) ) );
m_queue.enqueue( new TQString( TQString( "%1:" ).arg( Remount ) ) );
m_queue.enqueue( new TQString( TQString( "%1:" ).tqarg( Import ) ) );
m_queue.enqueue( new TQString( TQString( "%1:" ).tqarg( Remount ) ) );
startTimer( TIMER_INTERVAL );
}
@ -160,7 +160,7 @@ void Smb4KMounter::abort()
KProcess proc;
proc.setUseShell( true );
proc << TQString( "%1 smb4k_kill %2" ).arg( suid_program ).arg( m_proc->pid() );
proc << TQString( "%1 smb4k_kill %2" ).tqarg( suid_program ).tqarg( 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" ).arg( host, share_name ) );
TQValueList<Smb4KShare> list = findShareByName( TQString( "//%1/%2" ).tqarg( 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" ).arg( Mount )
.arg( workgroup, host )
.arg( ip, share_name ) ) );
m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4:%5" ).tqarg( Mount )
.tqarg( workgroup, host )
.tqarg( 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" ).arg( m_priv->host(), m_priv->share() ), true );
Smb4KSambaOptionsInfo *info = optionsHandler()->findItem( TQString( "//%1/%2" ).tqarg( 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 " ).arg( suid_program ) :
TQString( "%1 smb4k_mount -s -t cifs " ).tqarg( suid_program ) :
"smb4k_mount -n -t cifs " );
command.append( "-o " );
command.append( optionsHandler()->mountOptions( TQString( "//%1/%2" ).arg( m_priv->host(), m_priv->share() ) ) );
command.append( optionsHandler()->mountOptions( TQString( "//%1/%2" ).tqarg( m_priv->host(), m_priv->share() ) ) );
command.append( !m_priv->workgroup().stripWhiteSpace().isEmpty() ?
TQString( "domain='%1'," ).arg( m_priv->workgroup() ) :
TQString( "domain='%1'," ).tqarg( m_priv->workgroup() ) :
"" );
command.append( !m_priv->ip().stripWhiteSpace().isEmpty() ?
TQString( "ip=%1," ).arg( m_priv->ip() ) :
TQString( "ip=%1," ).tqarg( m_priv->ip() ) :
"" );
command.append( !authInfo.user().isEmpty() ?
TQString( "user=%1" ).arg( authInfo.user().data() ) :
TQString( "user=%1" ).tqarg( authInfo.user().data() ) :
"guest" );
command.append( " -- " );
command.append( TQString( "//'%1'/'%2' '%3'" ).arg( m_priv->host(), m_priv->share(), m_priv->path() ) );
command.append( TQString( "//'%1'/'%2' '%3'" ).tqarg( 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 " ).arg( suid_program ) :
TQString( "%1 smb4k_mount -s -t smbfs " ).tqarg( suid_program ) :
"smb4k_mount -n -t smbfs " );
command.append( "-o " );
command.append( optionsHandler()->mountOptions( TQString( "//%1/%2" ).arg( m_priv->host(), m_priv->share() ) ) );
command.append( optionsHandler()->mountOptions( TQString( "//%1/%2" ).tqarg( m_priv->host(), m_priv->share() ) ) );
command.append( !m_priv->workgroup().stripWhiteSpace().isEmpty() ?
TQString( "workgroup='%1'," ).arg( m_priv->workgroup() ) :
TQString( "workgroup='%1'," ).tqarg( m_priv->workgroup() ) :
"" );
command.append( !m_priv->ip().stripWhiteSpace().isEmpty() ?
TQString( "ip=%1," ).arg( m_priv->ip() ) :
TQString( "ip=%1," ).tqarg( m_priv->ip() ) :
"" );
command.append( !authInfo.user().isEmpty() ?
TQString( "username=%1" ).arg( authInfo.user().data() ) :
TQString( "username=%1" ).tqarg( authInfo.user().data() ) :
"guest" );
command.append( " -- " );
command.append( TQString( "//'%1'/'%2' '%3'" ).arg( m_priv->host(), m_priv->share(), m_priv->path() ) );
command.append( TQString( "//'%1'/'%2' '%3'" ).tqarg( 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 " ).arg( suid_program ) :
TQString( "%1 smb4k_mount " ).tqarg( suid_program ) :
"smb4k_mount " );
command.append( optionsHandler()->mountOptions( TQString( "//%1/%2" ).arg( m_priv->host(), m_priv->share() ) ) );
command.append( optionsHandler()->mountOptions( TQString( "//%1/%2" ).tqarg( m_priv->host(), m_priv->share() ) ) );
command.append( !m_priv->workgroup().stripWhiteSpace().isEmpty() ?
TQString( " -W '%1'" ).arg( m_priv->workgroup() ) :
TQString( " -W '%1'" ).tqarg( m_priv->workgroup() ) :
"" );
command.append( !m_priv->ip().stripWhiteSpace().isEmpty() ?
TQString( " -I %1" ).arg( m_priv->ip() ) :
TQString( " -I %1" ).tqarg( m_priv->ip() ) :
"" );
command.append( " -N" );
command.append( " -- " );
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() ) );
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() ) );
#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" ).arg( Unmount )
.arg( share->canonicalPath().data() )
.arg( force, noMessage ) ) );
m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4" ).tqarg( Unmount )
.tqarg( share->canonicalPath().data() )
.tqarg( 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 " ).arg( suid_program ) );
command.append( TQString( "%1 smb4k_umount -s -l " ).tqarg( suid_program ) );
#else
#ifdef __FreeBSD__
command.append( TQString( "%1 smb4k_umount " ).arg( suid_program ) );
command.append( TQString( "%1 smb4k_umount " ).tqarg( suid_program ) );
#else
command.append( TQString( "%1 smb4k_umount -s " ).arg( suid_program ) );
command.append( TQString( "%1 smb4k_umount -s " ).tqarg( 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 " ).arg( suid_program ) );
command.append( TQString( "%1 smb4k_umount -s " ).tqarg( suid_program ) );
#else
command.append( TQString( "%1 smb4k_umount " ).arg( suid_program ) );
command.append( TQString( "%1 smb4k_umount " ).tqarg( 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 " ).arg( suid_program ) );
command.append( TQString( "%1 smb4k_umount -s -l " ).tqarg( suid_program ) );
#else
#ifdef __FreeBSD__
command.append( TQString( "%1 smb4k_umount " ).arg( suid_program ) );
command.append( TQString( "%1 smb4k_umount " ).tqarg( suid_program ) );
#else
command.append( TQString( "%1 smb4k_umount -s " ).arg( suid_program ) );
command.append( TQString( "%1 smb4k_umount -s " ).tqarg( 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 " ).arg( suid_program ) );
command.append( TQString( "%1 smb4k_umount -s " ).tqarg( suid_program ) );
#else
command.append( TQString( "%1 smb4k_umount " ).arg( suid_program ) );
command.append( TQString( "%1 smb4k_umount " ).tqarg( suid_program ) );
#endif
}
}
@ -915,9 +915,9 @@ void Smb4KMounter::unmount( const TQString &mountpoint, bool force, bool noMessa
}
#ifndef __FreeBSD__
command.append( TQString( "-t %1 " ).arg( share->filesystem() ) );
command.append( TQString( "-t %1 " ).tqarg( share->filesystem() ) );
#endif
command.append( TQString( "'%1'" ).arg( m_priv->path() ) );
command.append( TQString( "'%1'" ).tqarg( 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" ).arg( UnmountAll ) ) );
m_queue.enqueue( new TQString( TQString( "%1" ).tqarg( 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" ).arg( m_priv->host() ).arg( m_priv->share() );
TQString name = TQString( "//%1/%2" ).tqarg( m_priv->host() ).tqarg( m_priv->share() );
// Check file system
#if !defined(__solaris__)
@ -1176,7 +1176,7 @@ void Smb4KMounter::processMount()
}
else
{
TQString name = TQString( "//%1/%2" ).arg( m_priv->host() ).arg( m_priv->share() );
TQString name = TQString( "//%1/%2" ).tqarg( m_priv->host() ).tqarg( 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" ).arg( authInfo.user().upper(), m_priv->host().upper(), m_priv->share().upper() );
TQString name = TQString( "//%1@%2/%3" ).tqarg( 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" ).arg( authInfo.user().upper(), m_priv->host().upper(), m_priv->share().upper() );
TQString name = TQString( "//%1@%2/%3" ).tqarg( 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" ).arg( hostname );
TQString str = TQString( "sudo: unable to resolve host %1\n" ).tqarg( 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:" ).arg( Import ) ) );
m_queue.enqueue( new TQString( TQString( "%1:" ).tqarg( 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 " ).arg( suid_program ).arg( (*it)->filesystem() ) );
command.append( TQString( "%1 smb4k_umount -s -t %2 " ).tqarg( suid_program ).tqarg( (*it)->filesystem() ) );
#else
command.append( TQString( "%1 smb4k_umount " ).arg( suid_program ) );
command.append( TQString( "%1 smb4k_umount " ).tqarg( 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 " ).arg( (*it)->filesystem() ) );
command.append( TQString( "smb4k_umount -n -t %1 " ).tqarg( (*it)->filesystem() ) );
#else
command.append( "smb4k_umount " );
#endif

34
smb4k/core/smb4kpasswordhandler.cpp
Unescape View File

@ -26,7 +26,7 @@
// TQt includes
#include <tqframe.h>
#include <layout.h>
#include <tqlayout.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 *layout = new TQGridLayout( frame );
layout->setSpacing( 5 );
layout->setMargin( 0 );
TQGridLayout *tqlayout = new TQGridLayout( frame );
tqlayout->setSpacing( 5 );
tqlayout->setMargin( 0 );
TQLabel *pixmap_label = new TQLabel( frame );
pixmap_label->setPixmap( DesktopIcon( "identity" ) );
pixmap_label->adjustSize();
layout->addWidget( pixmap_label, 0, 0, TQt::AlignCenter );
tqlayout->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." ).arg( m_auth->host() ) );
message.append( i18n( "Please enter authentication data for server %1." ).tqarg( m_auth->host() ) );
}
else
{
message.append( i18n( "Please enter authentication data for share %1." ).arg( "//"+m_auth->host()+"/"+m_auth->share() ) );
message.append( i18n( "Please enter authentication data for share %1." ).tqarg( "//"+m_auth->host()+"/"+m_auth->share() ) );
}
TQLabel *message_label = new TQLabel( frame );
message_label->setText( message.stripWhiteSpace() );
message_label->setTextFormat( TQt::RichText );
layout->addWidget( message_label, 0, 1, 0 );
tqlayout->addWidget( message_label, 0, 1, 0 );
TQLabel *user_label = new TQLabel( i18n( "User:" ), frame );
layout->addWidget( user_label, 1, 0, 0 );
tqlayout->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 );
layout->addWidget( user_edit, 1, 1, 0 );
tqlayout->addWidget( user_edit, 1, 1, 0 );
}
else
{
user_combo = new KComboBox( frame, "AskPassUserCombo" );
user_combo->setEditable( true );
user_combo->setMinimumWidth( 200 );
layout->addWidget( user_combo, 1, 1, 0 );
tqlayout->addWidget( user_combo, 1, 1, 0 );
}
TQLabel *password_label = new TQLabel( i18n( "Password:" ), frame );
layout->addWidget( password_label, 2, 0, 0 );
tqlayout->addWidget( password_label, 2, 0, 0 );
KLineEdit *pass_edit = new KLineEdit( frame, "AskPassPasswordEdit" );
pass_edit->setEchoMode( KLineEdit::Password );
layout->addWidget( pass_edit, 2, 1, 0 );
tqlayout->addWidget( pass_edit, 2, 1, 0 );
m_dlg->setMainWidget( frame );
m_dlg->setFixedSize( 350, m_dlg->sizeHint().height() );
m_dlg->setFixedSize( 350, m_dlg->tqsizeHint().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" ).arg( m_nsmbrc_auth.password() );
*p << TQString( "smbutil crypt %1" ).tqarg( 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]" ).arg( m_nsmbrc_auth.host().upper(), m_nsmbrc_auth.user().isEmpty() ? "GUEST" : m_nsmbrc_auth.user().upper() ) );
section.append( TQString( "[%1:%2]" ).tqarg( m_nsmbrc_auth.host().upper(), m_nsmbrc_auth.user().isEmpty() ? "GUEST" : m_nsmbrc_auth.user().upper() ) );
}
else
{
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() ) );
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() ) );
}
TQStringList::Iterator it = contents.find( section );

8
smb4k/core/smb4kpreviewer.cpp
Unescape View File

@ -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 " ).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( 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( " -c \"ls\" " );
if ( !m_item->ip().isEmpty() )
{
command.append( TQString( " -I %1 " ).arg( m_item->ip() ) );
command.append( TQString( " -I %1 " ).tqarg( 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" ).arg( KProcess::quote( auth->user() ) ) );
command.append( TQString( " -U %1" ).tqarg( KProcess::quote( auth->user() ) ) );
if ( !auth->password().isEmpty() )
{

18
smb4k/core/smb4kprint.cpp
Unescape View File

@ -180,22 +180,22 @@ void Smb4KPrint::setDeviceURI()
{
if ( !auth->user().isEmpty() )
{
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() );
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() );
}
else
{
uri = TQString( "smb://%1/%2/%3" ).arg( m_info->workgroup(), m_info->host(), m_info->printer() );
uri = TQString( "smb://%1/%2/%3" ).tqarg( m_info->workgroup(), m_info->host(), m_info->printer() );
}
}
else
{
if ( !auth->user().isEmpty() )
{
uri = TQString( "smb://%1:%2@%3/%4" ).arg( auth->user().data(), auth->password().data() ).arg( m_info->host(), m_info->printer() );
uri = TQString( "smb://%1:%2@%3/%4" ).tqarg( auth->user().data(), auth->password().data() ).tqarg( m_info->host(), m_info->printer() );
}
else
{
uri = TQString( "smb://%1/%2" ).arg( m_info->host(), m_info->printer() );
uri = TQString( "smb://%1/%2" ).tqarg( 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" ).arg( m_info->copies() ) );
command.append( " \"Smb4K print job\" "+TQString( "%1" ).tqarg( 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" ).arg( m_info->copies() ) );
command.append( " \"Smb4K print job\" "+TQString( "%1" ).tqarg( 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" ).arg( m_info->copies() ) );
command.append( " \"Smb4K print job\" "+TQString( "%1" ).tqarg( 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" ).arg( tempDir() ) );
TQFile::remove( TQString( "%1/smb4k_print.ps" ).tqarg( tempDir() ) );
}
}
else
{
// Clean up:
TQFile::remove( TQString( "%1/smb4k_print.ps" ).arg( tempDir() ) );
TQFile::remove( TQString( "%1/smb4k_print.ps" ).tqarg( tempDir() ) );
}
m_proc->clearArguments();

80
smb4k/core/smb4ksambaoptionshandler.cpp
Unescape View File

@ -25,7 +25,7 @@
// TQt includes
#include <tqfile.h>
#include <textstream.h>
#include <tqtextstream.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'" ).arg( resolve_order ) :
TQString( " -R '%1'" ).tqarg( resolve_order ) :
TQString() );
args.append( !netbios_name.isEmpty() ?
TQString( " -n '%1'" ).arg( netbios_name ) :
TQString( " -n '%1'" ).tqarg( netbios_name ) :
TQString() );
args.append( !netbios_scope.isEmpty() ?
TQString( " -i '%1'" ).arg( netbios_scope ) :
TQString( " -i '%1'" ).tqarg( netbios_scope ) :
TQString() );
args.append( !socket_options.isEmpty() ?
TQString( " -O '%1'" ).arg( socket_options ) :
TQString( " -O '%1'" ).tqarg( socket_options ) :
TQString() );
args.append( Smb4KSettings::bufferSize() != 65520 ?
TQString( " -b %1" ).arg( Smb4KSettings::bufferSize() ) :
TQString( " -b %1" ).tqarg( 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" ).arg( port ) );
args.append( TQString( " -p %1" ).tqarg( port ) );
return args;
}
@ -615,24 +615,24 @@ const TQString Smb4KSambaOptionsHandler::nmblookupOptions( bool with_broadcast )
TQString();
args.append( !netbios_name.isEmpty() ?
TQString( " -n '%1'" ).arg( netbios_name ) :
TQString( " -n '%1'" ).tqarg( netbios_name ) :
TQString() );
args.append( !netbios_scope.isEmpty() ?
TQString( " -i '%1'" ).arg( netbios_scope ) :
TQString( " -i '%1'" ).tqarg( netbios_scope ) :
TQString() );
args.append( !socket_options.isEmpty() ?
TQString( " -O '%1'" ).arg( socket_options ) :
TQString( " -O '%1'" ).tqarg( socket_options ) :
TQString() );
args.append( !domain.isEmpty() ?
TQString( " -W '%1'" ).arg( domain ) :
TQString( " -W '%1'" ).tqarg( domain ) :
TQString() );
args.append( (!Smb4KSettings::broadcastAddress().isEmpty() &&
with_broadcast) ?
TQString( " -B %1" ).arg( Smb4KSettings::broadcastAddress() ) :
TQString( " -B %1" ).tqarg( 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" ).arg( protocol ) );
args.append( TQString( " %1" ).tqarg( protocol ) );
}
else
{
args.append( TQString( " %1" ).arg( TQString::compare( default_protocol, "ads" ) != 0 ?
args.append( TQString( " %1" ).tqarg( 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" ).arg( networkItem ) );
args.append( TQString( " lookup host %1" ).tqarg( 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'" ).arg( networkItem ) );
args.append( TQString( " lookup master '%1'" ).tqarg( networkItem ) );
break;
}
@ -789,18 +789,18 @@ const TQString Smb4KSambaOptionsHandler::netOptions( int command, const TQString
}
args.append( !domain.isEmpty() ?
TQString( " -W '%1'" ).arg( domain ) :
TQString( " -W '%1'" ).tqarg( domain ) :
TQString() );
args.append( !netbios_name.isEmpty() ?
TQString( " -n '%1'" ).arg( netbios_name ) :
TQString( " -n '%1'" ).tqarg( netbios_name ) :
TQString() );
args.append( Smb4KSettings::machineAccount() ?
" -P" :
TQString() );
args.append( TQString( " -p %1" ).arg( port ) );
args.append( TQString( " -p %1" ).tqarg( port ) );
return args;
}
@ -1167,7 +1167,7 @@ const TQString Smb4KSambaOptionsHandler::mountOptions( const TQString &share )
}
case Smb4KSettings::EnumServerCodepage::unicode:
{
codepage = "unicode";
codepage = "tqunicode";
break;
}
@ -1209,21 +1209,21 @@ const TQString Smb4KSambaOptionsHandler::mountOptions( const TQString &share )
// Compile the arguments list:
args.append( !netbios_name.isEmpty() ?
TQString( "netbiosname='%1'," ).arg( netbios_name ) :
TQString( "netbiosname='%1'," ).tqarg( netbios_name ) :
TQString() );
args.append( !uid.isEmpty() ?
TQString( "uid=%1," ).arg( uid ) :
TQString( "uid=%1," ).tqarg( uid ) :
TQString() );
args.append( !gid.isEmpty() ?
TQString( "gid=%1," ).arg( gid ) :
TQString( "gid=%1," ).tqarg( gid ) :
TQString() );
args.append( TQString( "port=%1," ).arg( port ) );
args.append( TQString( "port=%1," ).tqarg( port ) );
args.append( !charset.isEmpty() ?
TQString( "iocharset=%1," ).arg( charset ) :
TQString( "iocharset=%1," ).tqarg( 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," ).arg( Smb4KSettings::fileMask() ) :
TQString( "file_mode=%1," ).tqarg( Smb4KSettings::fileMask() ) :
TQString() );
args.append( !Smb4KSettings::directoryMask().isEmpty() ?
TQString( "dir_mode=%1," ).arg( Smb4KSettings::directoryMask() ) :
TQString( "dir_mode=%1," ).tqarg( 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'," ).arg( socket_options ) :
TQString( "sockopt='%1'," ).tqarg( socket_options ) :
TQString() );
args.append( !netbios_scope.isEmpty() ?
TQString( "scope=%1," ).arg( netbios_scope ) :
TQString( "scope=%1," ).tqarg( netbios_scope ) :
TQString() );
args.append( !codepage.isEmpty() ?
TQString( "codepage=%1," ).arg( codepage ) :
TQString( "codepage=%1," ).tqarg( codepage ) :
TQString() );
args.append( !Smb4KSettings::fileMask().isEmpty() ?
TQString( "fmask=%1," ).arg( Smb4KSettings::fileMask() ) :
TQString( "fmask=%1," ).tqarg( Smb4KSettings::fileMask() ) :
TQString() );
args.append( !Smb4KSettings::directoryMask().isEmpty() ?
TQString( "dmask=%1," ).arg( Smb4KSettings::directoryMask() ) :
TQString( "dmask=%1," ).tqarg( Smb4KSettings::directoryMask() ) :
TQString() );
args.append( kerberos ? "krb," : TQString() );
args.append( Smb4KSettings::cachingTime() != 1000 ?
TQString( "ttl=%1," ).arg( Smb4KSettings::cachingTime() ) :
TQString( "ttl=%1," ).tqarg( Smb4KSettings::cachingTime() ) :
TQString() );
args.append( Smb4KSettings::unicodeSupport() ?
"unicode," :
"tqunicode," :
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" ).arg( uid ) :
TQString( " -u %1" ).tqarg( uid ) :
TQString() );
args.append( !gid.isEmpty() ?
TQString( " -g %1" ).arg( gid ) :
TQString( " -g %1" ).tqarg( gid ) :
TQString() );
args.append( !charset.isEmpty() && !codepage.isEmpty() ?
TQString( " -E %1:%2" ).arg( charset, codepage ) :
TQString( " -E %1:%2" ).tqarg( charset, codepage ) :
TQString() );
args.append( !Smb4KSettings::fileMask().isEmpty() ?
TQString( " -f %1" ).arg( Smb4KSettings::fileMask() ) :
TQString( " -f %1" ).tqarg( Smb4KSettings::fileMask() ) :
TQString() );
args.append( !Smb4KSettings::directoryMask().isEmpty() ?
TQString( " -d %1" ).arg( Smb4KSettings::directoryMask() ) :
TQString( " -d %1" ).tqarg( 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" ).arg( hostname ) ).upper();
m_samba_options["netbios name"] = ( TQString( "%1" ).tqarg( hostname ) ).upper();
}
delete [] hostname;

2
smb4k/core/smb4ksambaoptionsinfo.cpp
Unescape View File

@ -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" ).arg( share->uid() ) ), m_gid( TQString( "%1" ).arg( share->gid() ) )
m_uid( TQString( "%1" ).tqarg( share->uid() ) ), m_gid( TQString( "%1" ).tqarg( share->gid() ) )
{
}

46
smb4k/core/smb4kscanner.cpp
Unescape View File

@ -150,7 +150,7 @@ void Smb4KScanner::init()
void Smb4KScanner::rescan()
{
m_queue.enqueue( new TQString( TQString( "%1:" ).arg( Init ) ) );
m_queue.enqueue( new TQString( TQString( "%1:" ).tqarg( 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" ).arg( Hosts ).arg( workgroup, master, ip ) ) );
m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4" ).tqarg( Hosts ).tqarg( 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" ).arg( Shares ).arg( workgroup, host, ip ).arg( protocol ) ) );
m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4:%5" ).tqarg( Shares ).tqarg( workgroup, host, ip ).tqarg( 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" ).arg( Info ).arg( workgroup, host, ip ) ) );
m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4" ).tqarg( Info ).tqarg( workgroup, host, ip ) ) );
}
@ -215,7 +215,7 @@ void Smb4KScanner::search( const TQString &host )
return;
}
m_queue.enqueue( new TQString( TQString( "%1:%2" ).arg( Search ).arg( host ) ) );
m_queue.enqueue( new TQString( TQString( "%1:%2" ).tqarg( Search ).tqarg( 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 " ).arg( optionsHandler()->winsServer() ) :
TQString( " | xargs nmblookup -R -U %1 -A " ).tqarg( 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" ).arg( KProcess::quote( authInfo.user() ) ) );
command.append( TQString( " -U %1" ).tqarg( 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'" ).arg( KProcess::quote( authInfo.user() ) ) );
command.append( TQString( " -U %1'" ).tqarg( 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" ).arg( optionsHandler()->netOptions( Smb4KSambaOptionsHandler::Share, host, protocol ) ).arg( KProcess::quote( workgroup ), KProcess::quote( host ) );
command = TQString( "net %1 -w %2 -S %3" ).tqarg( optionsHandler()->netOptions( Smb4KSambaOptionsHandler::Share, host, protocol ) ).tqarg( KProcess::quote( workgroup ), KProcess::quote( host ) );
if ( !ip.isEmpty() )
{
command.append( TQString( " -I %1" ).arg( KProcess::quote( ip ) ) );
command.append( TQString( " -I %1" ).tqarg( KProcess::quote( ip ) ) );
}
if ( !auth->user().isEmpty() )
{
command.append( TQString( " -U %1" ).arg( KProcess::quote( auth->user() ) ) );
command.append( TQString( " -U %1" ).tqarg( 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" ).arg( KProcess::quote( workgroup ) ).arg( KProcess::quote( host ) );
TQString command = TQString( "smbclient -d1 -U guest% -W %1 -L %2" ).tqarg( KProcess::quote( workgroup ) ).tqarg( KProcess::quote( host ) );
if ( !ip.isEmpty() )
{
command.append( TQString( " -I %1" ).arg( KProcess::quote( ip ) ) );
command.append( TQString( " -I %1" ).tqarg( 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>.*//'" ).arg( wins ).arg( m_priv->host() ) );
command.append( TQString( " -R -U %1 %2 -S | grep '<00>' | sed -e 's/<00>.*//'" ).tqarg( wins ).tqarg( m_priv->host() ) );
}
else
{
command.append( TQString( " %1 -S | grep '<00>' | sed -e 's/<00>.*//'" ).arg( m_priv->host() ) );
command.append( TQString( " %1 -S | grep '<00>' | sed -e 's/<00>.*//'" ).tqarg( m_priv->host() ) );
}
}
else
{
if ( !wins.isEmpty() )
{
command.append( TQString( " -R -U %1 %2 -A | grep '<00>' | sed -e 's/<00>.*//'" ).arg( wins ).arg( m_priv->host() ) );
command.append( TQString( " -R -U %1 %2 -A | grep '<00>' | sed -e 's/<00>.*//'" ).tqarg( wins ).tqarg( m_priv->host() ) );
}
else
{
command.append( TQString( " %1 -A | grep '<00>' | sed -e 's/<00>.*//'" ).arg( m_priv->host() ) );
command.append( TQString( " %1 -A | grep '<00>' | sed -e 's/<00>.*//'" ).tqarg( m_priv->host() ) );
}
}
@ -573,7 +573,7 @@ void Smb4KScanner::searchForHost( const TQString &host )
}
case Smb4KSettings::EnumSearchMethod::Smbclient:
{
command = TQString( "smbclient -d2 -U % -L %1" ).arg( m_priv->host() );
command = TQString( "smbclient -d2 -U % -L %1" ).tqarg( 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" ).arg( Hosts ).arg( m_priv->workgroup(), m_priv->host(), m_priv->ip() ) ) );
m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4" ).tqarg( Hosts ).tqarg( 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" ).arg( Hosts ).arg( m_priv->workgroup(), m_priv->host(), m_priv->ip() ) ) );
m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4" ).tqarg( Hosts ).tqarg( 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" ).arg( Shares ).arg( m_priv->workgroup(), m_priv->host(), m_priv->ip(), TQString() ) ) );
m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4:%5" ).tqarg( Shares ).tqarg( 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" ).arg( Shares ).arg( m_priv->workgroup(), m_priv->host(), m_priv->ip(), "rap" ) ) );
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_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" ).arg( m_priv->host() ) ) != 0 )
if ( m_buffer.contains( TQString( "Connection to %1 failed" ).tqarg( m_priv->host() ) ) != 0 )
{
emit searchResult( new Smb4KHostItem() );
}

838
smb4k/core/smb4ksettings.cpp
View File

File diff suppressed because it is too large Load Diff

14
smb4k/core/smb4ksynchronizer.cpp
Unescape View File

@ -24,7 +24,7 @@
***************************************************************************/
// TQt includes
#include <layout.h>
#include <tqlayout.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" ).arg( Smb4KSettings::maximumDeleteValue() ) :
" --max-delete="+TQString( "%1" ).tqarg( Smb4KSettings::maximumDeleteValue() ) :
"" );
options.append( Smb4KSettings::useChecksum() ?
@ -294,11 +294,11 @@ const TQString Smb4KSynchronizer::readRsyncOptions()
"" );
options.append( Smb4KSettings::useBlockSize() ?
" --block-size="+TQString( "%1" ).arg( Smb4KSettings::blockSize() ) :
" --block-size="+TQString( "%1" ).tqarg( Smb4KSettings::blockSize() ) :
"" );
options.append( Smb4KSettings::useChecksumSeed() ?
" --checksum-seed="+TQString( "%1" ).arg( Smb4KSettings::checksumSeed() ) :
" --checksum-seed="+TQString( "%1" ).tqarg( Smb4KSettings::checksumSeed() ) :
"" );
if ( !Smb4KSettings::customFilteringRules().isEmpty() )
@ -307,11 +307,11 @@ const TQString Smb4KSynchronizer::readRsyncOptions()
}
options.append( Smb4KSettings::useMinimalTransferSize() ?
" --min-size="+TQString( "%1" ).arg( Smb4KSettings::minimalTransferSize() )+"K" :
" --min-size="+TQString( "%1" ).tqarg( Smb4KSettings::minimalTransferSize() )+"K" :
"" );
options.append( Smb4KSettings::useMaximalTransferSize() ?
" --max-size="+TQString( "%1" ).arg( Smb4KSettings::maximalTransferSize() )+"K" :
" --max-size="+TQString( "%1" ).tqarg( 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" ).arg( tmp_percent ).section( ".", 0, 0 ).stripWhiteSpace();
total = TQString( "%1" ).tqarg( tmp_percent ).section( ".", 0, 0 ).stripWhiteSpace();
}
}
else

10
smb4k/dialogs/smb4kbookmarkeditor.cpp
Unescape View File

@ -24,7 +24,7 @@
***************************************************************************/
// TQt includes
#include <layout.h>
#include <tqlayout.h>
#include <tqvaluelist.h>
// KDE includes
@ -54,8 +54,8 @@ Smb4KBookmarkEditor::Smb4KBookmarkEditor( TQWidget *parent, const char *name )
setWFlags( TQt::WDestructiveClose );
TQFrame *frame = plainPage();
TQGridLayout *layout = new TQGridLayout( frame );
layout->setSpacing( 5 );
TQGridLayout *tqlayout = new TQGridLayout( frame );
tqlayout->setSpacing( 5 );
m_view = new KListView( frame );
m_view->addColumn( i18n( "Bookmark" ), Bookmark );
@ -77,10 +77,10 @@ Smb4KBookmarkEditor::Smb4KBookmarkEditor( TQWidget *parent, const char *name )
slotLoadBookmarks();
layout->addWidget( m_view, 0, 0, 0 );
tqlayout->addWidget( m_view, 0, 0, 0 );
setInitialSize( configDialogSize( *(Smb4KSettings::self()->config()), "BookmarkEditor" ) );
setMinimumSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() );
setMinimumSize( (tqsizeHint().width() > 350 ? tqsizeHint().width() : 350), tqsizeHint().height() );
connect( m_view, TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int ) ),
this, TQT_SLOT( slotRightButtonPressed( TQListViewItem *, const TQPoint &, int ) ) );

18
smb4k/dialogs/smb4kcustomoptionsdialog.cpp
Unescape View File

@ -25,7 +25,7 @@
***************************************************************************/
// TQt includes
#include <layout.h>
#include <tqlayout.h>
#include <tqlabel.h>
#include <tqframe.h>
@ -167,7 +167,7 @@ void Smb4KCustomOptionsDialog::setupDialog()
m_port_input->setMinValue( -1 );
m_port_input->setMaxValue( 65535 );
// The widgets will be put into the layout below.
// The widgets will be put into the tqlayout below.
// Here comes the item-dependent stuff:
switch ( m_type )
@ -292,11 +292,11 @@ void Smb4KCustomOptionsDialog::setupDialog()
TQLabel *uid_label = new TQLabel( i18n( "User ID:" ), frame );
m_uid_input = new KLineEdit( frame );
m_uid_input->setMinimumWidth( 200 );
m_uid_input->setAlignment( TQt::AlignRight );
m_uid_input->tqsetAlignment( TQt::AlignRight );
TQLabel *gid_label = new TQLabel( i18n( "Group ID:" ), frame );
m_gid_input = new KLineEdit( frame );
m_gid_input->setMinimumWidth( 200 );
m_gid_input->setAlignment( TQt::AlignRight );
m_gid_input->tqsetAlignment( TQt::AlignRight );
m_kerberos = new TQCheckBox( i18n( "Try to authenticate with Kerberos (Active Directory)" ), frame );
@ -317,11 +317,11 @@ void Smb4KCustomOptionsDialog::setupDialog()
TQLabel *uid_label = new TQLabel( i18n( "User ID:" ), frame );
m_uid_input = new KLineEdit( frame );
m_uid_input->setMinimumWidth( 200 );
m_uid_input->setAlignment( TQt::AlignRight );
m_uid_input->tqsetAlignment( TQt::AlignRight );
TQLabel *gid_label = new TQLabel( i18n( "Group ID:" ), frame );
m_gid_input = new KLineEdit( frame );
m_gid_input->setMinimumWidth( 200 );
m_gid_input->setAlignment( TQt::AlignRight );
m_gid_input->tqsetAlignment( TQt::AlignRight );
grid->addWidget( location_label, 0, 0, 0 );
grid->addWidget( location, 0, 1, 0 );
@ -333,7 +333,7 @@ void Smb4KCustomOptionsDialog::setupDialog()
grid->addWidget( m_gid_input, 3, 1, 0 );
#endif
info = optionsHandler()->findItem( TQString( "//%1/%2" ).arg( m_share_item->host(), m_share_item->name() ) );
info = optionsHandler()->findItem( TQString( "//%1/%2" ).tqarg( m_share_item->host(), m_share_item->name() ) );
// Get the default values from the config file:
default_port = Smb4KSettings::remotePort();
@ -488,7 +488,7 @@ void Smb4KCustomOptionsDialog::setupDialog()
connect( this, TQT_SIGNAL( user1Clicked() ),
this, TQT_SLOT( slotDefaultButtonClicked() ) );
setFixedSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() );
setFixedSize( (tqsizeHint().width() > 350 ? tqsizeHint().width() : 350), tqsizeHint().height() );
}
/////////////////////////////////////////////////////////////////////////////
@ -885,7 +885,7 @@ void Smb4KCustomOptionsDialog::slotOKButtonClicked()
}
case Share:
{
TQString item_name = TQString( "//%1/%2" ).arg( m_share_item->host(),
TQString item_name = TQString( "//%1/%2" ).tqarg( m_share_item->host(),
TQString::compare( m_share_item->name(), "homes" ) == 0 ?
m_homes_user :
m_share_item->name() );

24
smb4k/dialogs/smb4kmountdialog.cpp
Unescape View File

@ -25,7 +25,7 @@
***************************************************************************/
// TQt includes
#include <layout.h>
#include <tqlayout.h>
#include <tqframe.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
@ -51,7 +51,7 @@ KDialogBase( Plain, i18n( "Mount Share" ), Ok|Cancel, Ok, parent, name, true, tr
setupView();
setFixedSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() );
setFixedSize( (tqsizeHint().width() > 350 ? tqsizeHint().width() : 350), tqsizeHint().height() );
}
@ -63,9 +63,9 @@ Smb4KMountDialog::~Smb4KMountDialog()
void Smb4KMountDialog::setupView()
{
TQFrame *frame = plainPage();
TQGridLayout *layout = new TQGridLayout( frame );
layout->setSpacing( 5 );
layout->setMargin( 0 );
TQGridLayout *tqlayout = new TQGridLayout( frame );
tqlayout->setSpacing( 5 );
tqlayout->setMargin( 0 );
TQLabel *shareLabel = new TQLabel( i18n( "Share:" ), frame );
m_share_input = new KLineEdit( frame, "ShareInputLine" );
@ -82,13 +82,13 @@ void Smb4KMountDialog::setupView()
m_bookmark = new TQCheckBox( i18n( "Add this share to the bookmarks" ), frame, "BookmarkButton" );
layout->addWidget( shareLabel, 0, 0, 0 );
layout->addWidget( m_share_input, 0, 1, 0 );
layout->addWidget( addressLabel, 1, 0, 0 );
layout->addWidget( m_ip_input, 1, 1, 0 );
layout->addWidget( workgroupLabel, 2, 0, 0 );
layout->addWidget( m_workgroup_input, 2, 1, 0 );
layout->addMultiCellWidget( m_bookmark, 3, 3, 0, 1, 0 );
tqlayout->addWidget( shareLabel, 0, 0, 0 );
tqlayout->addWidget( m_share_input, 0, 1, 0 );
tqlayout->addWidget( addressLabel, 1, 0, 0 );
tqlayout->addWidget( m_ip_input, 1, 1, 0 );
tqlayout->addWidget( workgroupLabel, 2, 0, 0 );
tqlayout->addWidget( m_workgroup_input, 2, 1, 0 );
tqlayout->addMultiCellWidget( m_bookmark, 3, 3, 0, 1, 0 );
connect( m_share_input, TQT_SIGNAL( textChanged ( const TQString & ) ) ,
this, TQT_SLOT( slotChangeInputValue( const TQString & ) ) );

18
smb4k/dialogs/smb4kpreviewdialog.cpp
Unescape View File

@ -24,7 +24,7 @@
***************************************************************************/
// TQt includes
#include <layout.h>
#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqiconset.h>
@ -79,7 +79,7 @@ Smb4KPreviewDialog::Smb4KPreviewDialog( Smb4KShareItem *item, TQWidget *parent,
m_initialized = Smb4KCore::previewer()->preview( m_item );
}
setMinimumSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() );
setMinimumSize( (tqsizeHint().width() > 350 ? tqsizeHint().width() : 350), tqsizeHint().height() );
}
@ -92,7 +92,7 @@ Smb4KPreviewDialog::~Smb4KPreviewDialog()
void Smb4KPreviewDialog::setupView()
{
TQFrame *frame = plainPage();
TQGridLayout *layout = new TQGridLayout( frame );
TQGridLayout *tqlayout = new TQGridLayout( frame );
m_view = new KIconView( frame, 0, 0 );
m_view->setItemTextPos( KIconView::Right );
@ -118,8 +118,8 @@ void Smb4KPreviewDialog::setupView()
m_toolbar->insertWidget( Combo, 10, m_combo, 4 );
m_toolbar->setItemAutoSized( Combo, true );
layout->addWidget( m_view, 0, 0, 0 );
layout->addWidget( m_toolbar, 1, 0, 0 );
tqlayout->addWidget( m_view, 0, 0, 0 );
tqlayout->addWidget( m_toolbar, 1, 0, 0 );
}
@ -189,7 +189,7 @@ void Smb4KPreviewDialog::slotReceivedData( Smb4KPreviewItem *item )
case Smb4KPreviewItem::File:
{
KIconViewItem *view_item = new KIconViewItem( m_view, (*it).second, SmallIcon( "file" ) );
view_item->setKey( TQString( "[file]_%1" ).arg( (*it).second ) );
view_item->setKey( TQString( "[file]_%1" ).tqarg( (*it).second ) );
break;
}
@ -199,7 +199,7 @@ void Smb4KPreviewDialog::slotReceivedData( Smb4KPreviewItem *item )
if ( TQString::compare( (*it).second, "." ) != 0 && TQString::compare( (*it).second, ".." ) != 0 )
{
KIconViewItem *view_item = new KIconViewItem( m_view, (*it).second, SmallIcon( "folder" ) );
view_item->setKey( TQString( "[directory]_%1" ).arg( (*it).second ) );
view_item->setKey( TQString( "[directory]_%1" ).tqarg( (*it).second ) );
}
break;
@ -209,7 +209,7 @@ void Smb4KPreviewDialog::slotReceivedData( Smb4KPreviewItem *item )
if ( Smb4KSettings::previewHiddenItems() )
{
KIconViewItem *view_item = new KIconViewItem( m_view, (*it).second, SmallIcon( "file" ) );
view_item->setKey( TQString( "[file]_%1" ).arg( (*it).second ) );
view_item->setKey( TQString( "[file]_%1" ).tqarg( (*it).second ) );
}
break;
@ -220,7 +220,7 @@ void Smb4KPreviewDialog::slotReceivedData( Smb4KPreviewItem *item )
TQString::compare( (*it).second, "." ) != 0 && TQString::compare( (*it).second, ".." ) != 0 )
{
KIconViewItem *view_item = new KIconViewItem( m_view, (*it).second, SmallIcon( "folder" ) );
view_item->setKey( TQString( "[directory]_%1" ).arg( (*it).second ) );
view_item->setKey( TQString( "[directory]_%1" ).tqarg( (*it).second ) );
}
break;

12
smb4k/dialogs/smb4kprintdialog.cpp
Unescape View File

@ -25,7 +25,7 @@
// TQt includes
#include <tqlabel.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqframe.h>
// KDE includes
@ -65,8 +65,8 @@ m_item( item ), m_ip( TQString() ) /* will collect it in an instant */
// Bild the view:
TQFrame *frame = plainPage();
TQGridLayout *layout = new TQGridLayout( frame );
layout->setSpacing( 10 );
TQGridLayout *tqlayout = new TQGridLayout( frame );
tqlayout->setSpacing( 10 );
TQGroupBox *p = new TQGroupBox( 2, Qt::Horizontal, i18n( "Printer" ), frame );
p->setInsideSpacing( 5 );
@ -108,10 +108,10 @@ m_item( item ), m_ip( TQString() ) /* will collect it in an instant */
KIntNumInput *cp = new KIntNumInput( 1, s, 10, "Copies" );
cp->setMinValue( 1 );
layout->addWidget( p, 0, 0, 0 );
layout->addWidget( f, 1, 0, 0 );
tqlayout->addWidget( p, 0, 0, 0 );
tqlayout->addWidget( f, 1, 0, 0 );
setFixedSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() );
setFixedSize( (tqsizeHint().width() > 350 ? tqsizeHint().width() : 350), tqsizeHint().height() );
enableButton( User1, false );

28
smb4k/dialogs/smb4ksynchronizationdialog.cpp
Unescape View File

@ -24,7 +24,7 @@
***************************************************************************/
// TQt includes
#include <layout.h>
#include <tqlayout.h>
#include <tqframe.h>
#include <tqlabel.h>
@ -53,9 +53,9 @@ m_share( share )
setButtonGuiItem( User2, KGuiItem( i18n( "Swap Paths" ), TQString(), i18n( "Swap source and destination" ) ) );
TQFrame *frame = plainPage();
TQGridLayout *layout = new TQGridLayout( frame );
layout->setSpacing( 5 );
layout->setMargin( 0 );
TQGridLayout *tqlayout = new TQGridLayout( frame );
tqlayout->setSpacing( 5 );
tqlayout->setMargin( 0 );
TQLabel *source_label = new TQLabel( i18n( "Source:" ), frame, "SourceURLLabel" );
KURLRequester *source = new KURLRequester( m_share->path()+"/", frame, "SourceURL" );
@ -99,14 +99,14 @@ m_share( share )
transfer_widget->setEnabled( false );
layout->addWidget( source_label, 0, 0, 0 );
layout->addWidget( source, 0, 1, 0 );
layout->addWidget( destination_label, 1, 0, 0 );
layout->addWidget( destination, 1, 1, 0 );
layout->addMultiCellWidget( current_file, 2, 2, 0, 1, 0 );
layout->addMultiCellWidget( individual, 3, 3, 0, 1, 0 );
layout->addMultiCellWidget( total, 4, 4, 0, 1, 0 );
layout->addMultiCellWidget( transfer_widget, 5, 6, 0, 1, 0 );
tqlayout->addWidget( source_label, 0, 0, 0 );
tqlayout->addWidget( source, 0, 1, 0 );
tqlayout->addWidget( destination_label, 1, 0, 0 );
tqlayout->addWidget( destination, 1, 1, 0 );
tqlayout->addMultiCellWidget( current_file, 2, 2, 0, 1, 0 );
tqlayout->addMultiCellWidget( individual, 3, 3, 0, 1, 0 );
tqlayout->addMultiCellWidget( total, 4, 4, 0, 1, 0 );
tqlayout->addMultiCellWidget( transfer_widget, 5, 6, 0, 1, 0 );
// Connections
connect( Smb4KCore::synchronizer(), TQT_SIGNAL( progress( const Smb4KSynchronizationInfo & ) ),
@ -116,7 +116,7 @@ m_share( share )
this, TQT_SLOT( slotSynchronizationFinished() ) );
setFixedSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() );
setFixedSize( (tqsizeHint().width() > 350 ? tqsizeHint().width() : 350), tqsizeHint().height() );
}
@ -207,7 +207,7 @@ void Smb4KSynchronizationDialog::slotProgress( const Smb4KSynchronizationInfo &i
if ( info.totalFileNumber() != -1 && info.processedFileNumber() != -1 )
{
transferred->setText( TQString( "%1 / %2" ).arg( info.processedFileNumber() ).arg( info.totalFileNumber() ) );
transferred->setText( TQString( "%1 / %2" ).tqarg( info.processedFileNumber() ).tqarg( info.totalFileNumber() ) );
}
if ( !info.transferRate().isEmpty() )

2
smb4k/iconview/smb4ksharesiconviewitem.h
Unescape View File

@ -32,7 +32,7 @@
// TQt includes
#include <tqpainter.h>
#include <palette.h>
#include <tqpalette.h>
// KDE includes
#include <kiconview.h>

42
smb4k/iconview/smb4ksharesiconviewtooltip.cpp
Unescape View File

@ -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" ).arg( m_item->shareObject()->user(), m_item->shareObject()->group() ), this ), 2, 2, 0 );
m_layout->addWidget( new TQLabel( TQString( "%1 - %2" ).tqarg( 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" ).arg( tmp_used, 0, 'f', 1 );
used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 );
}
else
{
used_dim = "kB";
double tmp_used = m_item->shareObject()->totalDiskSpace() - m_item->shareObject()->freeDiskSpace();
used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 );
used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 );
}
if ( m_item->shareObject()->freeDiskSpace() >= 1024 )
@ -181,12 +181,12 @@ void Smb4KSharesIconViewToolTip::setupTip()
free_dim = "GB";
}
free = TQString( "%1" ).arg( tmp_free, 0, 'f', 1 );
free = TQString( "%1" ).tqarg( tmp_free, 0, 'f', 1 );
}
else
{
free_dim = "kB";
free = TQString( "%1" ).arg( m_item->shareObject()->freeDiskSpace(), 0, 'f', 1 );
free = TQString( "%1" ).tqarg( 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" ).arg( tmp_total, 0, 'f', 1 );
total = TQString( "%1" ).tqarg( tmp_total, 0, 'f', 1 );
}
else
{
total_dim = "kB";
total = TQString( "%1" ).arg( m_item->shareObject()->totalDiskSpace(), 0, 'f', 1 );
total = TQString( "%1" ).tqarg( 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" ).arg( free, free_dim ), this );
m_free = new TQLabel( TQString( "%1 %2" ).tqarg( 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" ).arg( used, used_dim ), this );
m_used = new TQLabel( TQString( "%1 %2" ).tqarg( 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" ).arg( total, total_dim ), this );
m_total = new TQLabel( TQString( "%1 %2" ).tqarg( 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 %" ).arg( m_item->shareObject()->percentage(), 0, 'f', 1 ), this );
m_usage = new TQLabel( TQString( "%1 %" ).tqarg( 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" ).arg( tmp_used, 0, 'f', 1 );
used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 );
}
else
{
used_dim = "kB";
double tmp_used = m_item->shareObject()->totalDiskSpace() - m_item->shareObject()->freeDiskSpace();
used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 );
used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 );
}
if ( m_item->shareObject()->freeDiskSpace() >= 1024 )
@ -288,12 +288,12 @@ void Smb4KSharesIconViewToolTip::update()
free_dim = "GB";
}
free = TQString( "%1" ).arg( tmp_free, 0, 'f', 1 );
free = TQString( "%1" ).tqarg( tmp_free, 0, 'f', 1 );
}
else
{
free_dim = "kB";
free = TQString( "%1" ).arg( m_item->shareObject()->freeDiskSpace(), 0, 'f', 1 );
free = TQString( "%1" ).tqarg( 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" ).arg( tmp_total, 0, 'f', 1 );
total = TQString( "%1" ).tqarg( tmp_total, 0, 'f', 1 );
}
else
{
total_dim = "kB";
total = TQString( "%1" ).arg( m_item->shareObject()->totalDiskSpace(), 0, 'f', 1 );
total = TQString( "%1" ).tqarg( m_item->shareObject()->totalDiskSpace(), 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 ) );
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 ) );
}
else
{

4
smb4k/iconview/smb4ksharesiconviewtooltip.h
Unescape View File

@ -33,7 +33,7 @@
// TQt includes
#include <tqlabel.h>
#include <tqpoint.h>
#include <layout.h>
#include <tqlayout.h>
// Forward declarations:
class Smb4KSharesIconViewItem;
@ -115,7 +115,7 @@ class Smb4KSharesIconViewToolTip : public TQLabel
Smb4KSharesIconViewItem *m_item;
/**
* The layout of the tool tip.
* The tqlayout of the tool tip.
*/
TQGridLayout *m_layout;

2
smb4k/listview/smb4kshareslistview.cpp
Unescape View File

@ -59,7 +59,7 @@ Smb4KSharesListView::Smb4KSharesListView( TQWidget *parent, const char *name )
addColumn( i18n( "Total" ) );
addColumn( i18n( "Usage" ) );
// Set alignment
// Set tqalignment
setColumnAlignment( Free, TQt::AlignRight );
setColumnAlignment( Used, TQt::AlignRight );
setColumnAlignment( Total, TQt::AlignRight );

40
smb4k/listview/smb4kshareslistviewitem.cpp
Unescape View File

@ -128,13 +128,13 @@ void Smb4KSharesListViewItem::setupItem( const Smb4KShare &share, bool mountpoin
used_dim = "GB";
}
used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 );
used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 );
}
else
{
used_dim = "kB";
double tmp_used = shareObject()->totalDiskSpace() - shareObject()->freeDiskSpace();
used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 );
used = TQString( "%1" ).tqarg( 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" ).arg( tmp_free, 0, 'f', 1 );
free = TQString( "%1" ).tqarg( tmp_free, 0, 'f', 1 );
}
else
{
free_dim = "kB";
free = TQString( "%1" ).arg( shareObject()->freeDiskSpace(), 0, 'f', 1 );
free = TQString( "%1" ).tqarg( 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" ).arg( tmp_total, 0, 'f', 1 );
total = TQString( "%1" ).tqarg( tmp_total, 0, 'f', 1 );
}
else
{
total_dim = "kB";
total = TQString( "%1" ).arg( shareObject()->totalDiskSpace(), 0, 'f', 1 );
total = TQString( "%1" ).tqarg( shareObject()->totalDiskSpace(), 0, 'f', 1 );
}
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 ) );
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 ) );
}
else
{
setText( Item, (m_mountpoint ? m_share.path() : m_share.name()) );
setText( Owner, TQString::compare( m_share.filesystem(), "smbfs" ) == 0 ?
TQString( "%1 - %2" ).arg( m_share.user() ).arg( m_share.group() ) :
TQString( "%1 - %2" ).tqarg( m_share.user() ).tqarg( 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" ).arg( tmp_used, 0, 'f', 1 );
used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 );
}
else
{
used_dim = "kB";
double tmp_used = shareObject()->totalDiskSpace() - shareObject()->freeDiskSpace();
used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 );
used = TQString( "%1" ).tqarg( 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" ).arg( tmp_free, 0, 'f', 1 );
free = TQString( "%1" ).tqarg( tmp_free, 0, 'f', 1 );
}
else
{
free_dim = "kB";
free = TQString( "%1" ).arg( shareObject()->freeDiskSpace(), 0, 'f', 1 );
free = TQString( "%1" ).tqarg( 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" ).arg( tmp_total, 0, 'f', 1 );
total = TQString( "%1" ).tqarg( tmp_total, 0, 'f', 1 );
}
else
{
total_dim = "kB";
total = TQString( "%1" ).arg( shareObject()->totalDiskSpace(), 0, 'f', 1 );
total = TQString( "%1" ).tqarg( shareObject()->totalDiskSpace(), 0, 'f', 1 );
}
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 ) );
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 ) );
}
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 \%" ).arg( m_share.percentage(), 0, 'f', 1 ) );
p->drawText( 0, 0, width-1, height()-1, TQt::AlignCenter, TQString( "%1 \%" ).tqarg( m_share.percentage(), 0, 'f', 1 ) );
}
else
{

6
smb4k/listview/smb4kshareslistviewitem.h
Unescape View File

@ -32,7 +32,7 @@
// TQt includes
#include <tqpainter.h>
#include <palette.h>
#include <tqpalette.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 alignment The alignment of the column that will be used.
* @param tqalignment The tqalignment of the column that will be used.
*/
void paintCell( TQPainter *p,
const TQColorGroup &cg,
int column,
int width,
int alignment );
int tqalignment );
/**
* Reimplemented from KListViewItem.

42
smb4k/listview/smb4kshareslistviewtooltip.cpp
Unescape View File

@ -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" ).arg( m_item->shareObject()->user(), m_item->shareObject()->group() ), this ), 2, 2, 0 );
m_layout->addWidget( new TQLabel( TQString( "%1 - %2" ).tqarg( 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" ).arg( tmp_used, 0, 'f', 1 );
used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 );
}
else
{
used_dim = "kB";
double tmp_used = m_item->shareObject()->totalDiskSpace() - m_item->shareObject()->freeDiskSpace();
used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 );
used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 );
}
if ( m_item->shareObject()->freeDiskSpace() >= 1024 )
@ -181,12 +181,12 @@ void Smb4KSharesListViewToolTip::setupTip()
free_dim = "GB";
}
free = TQString( "%1" ).arg( tmp_free, 0, 'f', 1 );
free = TQString( "%1" ).tqarg( tmp_free, 0, 'f', 1 );
}
else
{
free_dim = "kB";
free = TQString( "%1" ).arg( m_item->shareObject()->freeDiskSpace(), 0, 'f', 1 );
free = TQString( "%1" ).tqarg( 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" ).arg( tmp_total, 0, 'f', 1 );
total = TQString( "%1" ).tqarg( tmp_total, 0, 'f', 1 );
}
else
{
total_dim = "kB";
total = TQString( "%1" ).arg( m_item->shareObject()->totalDiskSpace(), 0, 'f', 1 );
total = TQString( "%1" ).tqarg( 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" ).arg( free, free_dim ), this );
m_free = new TQLabel( TQString( "%1 %2" ).tqarg( 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" ).arg( used, used_dim ), this );
m_used = new TQLabel( TQString( "%1 %2" ).tqarg( 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" ).arg( total, total_dim ), this );
m_total = new TQLabel( TQString( "%1 %2" ).tqarg( 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 %" ).arg( m_item->shareObject()->percentage(), 0, 'f', 1 ), this );
m_usage = new TQLabel( TQString( "%1 %" ).tqarg( 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" ).arg( tmp_used, 0, 'f', 1 );
used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 );
}
else
{
used_dim = "kB";
double tmp_used = m_item->shareObject()->totalDiskSpace() - m_item->shareObject()->freeDiskSpace();
used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 );
used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 );
}
if ( m_item->shareObject()->freeDiskSpace() >= 1024 )
@ -288,12 +288,12 @@ void Smb4KSharesListViewToolTip::update()
free_dim = "GB";
}
free = TQString( "%1" ).arg( tmp_free, 0, 'f', 1 );
free = TQString( "%1" ).tqarg( tmp_free, 0, 'f', 1 );
}
else
{
free_dim = "kB";
free = TQString( "%1" ).arg( m_item->shareObject()->freeDiskSpace(), 0, 'f', 1 );
free = TQString( "%1" ).tqarg( 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" ).arg( tmp_total, 0, 'f', 1 );
total = TQString( "%1" ).tqarg( tmp_total, 0, 'f', 1 );
}
else
{
total_dim = "kB";
total = TQString( "%1" ).arg( m_item->shareObject()->totalDiskSpace(), 0, 'f', 1 );
total = TQString( "%1" ).tqarg( m_item->shareObject()->totalDiskSpace(), 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 ) );
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 ) );
}
else
{

4
smb4k/listview/smb4kshareslistviewtooltip.h
Unescape View File

@ -33,7 +33,7 @@
// TQt includes
#include <tqlabel.h>
#include <tqpoint.h>
#include <layout.h>
#include <tqlayout.h>
// Forward declarations:
class Smb4KSharesListViewItem;
@ -115,7 +115,7 @@ class Smb4KSharesListViewToolTip : public TQLabel
Smb4KSharesListViewItem *m_item;
/**
* The layout of the tool tip.
* The tqlayout of the tool tip.
*/
TQGridLayout *m_layout;

10
smb4k/searchdlg/smb4ksearchdialog.cpp
Unescape View File

@ -24,7 +24,7 @@
***************************************************************************/
// TQt includes
#include <layout.h>
#include <tqlayout.h>
#include <tqstringlist.h>
#include <tqheader.h>
@ -41,8 +41,8 @@
Smb4KSearchDialog::Smb4KSearchDialog( TQWidget *parent, const char *name )
: TQWidget( parent, name )
{
TQGridLayout *layout = new TQGridLayout( this );
layout->setSpacing( 5 );
TQGridLayout *tqlayout = new TQGridLayout( this );
tqlayout->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 );
layout->addWidget( m_tool_bar, 0, 0, 0 );
layout->addWidget( m_list_view, 1, 0, 0 );
tqlayout->addWidget( m_tool_bar, 0, 0, 0 );
tqlayout->addWidget( m_list_view, 1, 0, 0 );
m_search_string = TQString();

4
smb4k/smb4k.cpp
Unescape View File

@ -208,7 +208,7 @@ void Smb4KApp::setupStatusBar()
progress->setPercentageVisible( false );
statusBar()->addWidget( progress, 0, true );
statusBar()->insertFixedItem( TQString( "Smb4K %1" ).arg( VERSION ), Version, true );
statusBar()->insertFixedItem( TQString( "Smb4K %1" ).tqarg( 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..." ).arg( Smb4KSettings::customMasterBrowser().upper() ), Message );
statusBar()->changeItem( i18n( "Querying master browser %1..." ).tqarg( Smb4KSettings::customMasterBrowser().upper() ), Message );
break;
}

8
smb4k/smb4ksystemtray.cpp
Unescape View File

@ -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" ).arg( TQString((*it)->name()), TQString((*it)->canonicalPath()) );
TQString item = TQString( "%1_::_%2" ).tqarg( 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" ).arg( TQString((*it)->canonicalPath()) );
TQString item = TQString( "st_[share_menu]_%1" ).tqarg( 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" ).arg( TQString((*it)->name()), TQString((*it)->canonicalPath()) );
TQString item = TQString( "%1_::_%2" ).tqarg( 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 children of the share action menus:
// Remove all tqchildren of the share action menus:
KAction *action = NULL;
// Unmount action

Write Preview
Loading…
Cancel
Save