From b703a19e4396fe12092253fd4d69cb02a64f59a3 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 1 Jan 2024 18:17:24 +0900 Subject: [PATCH] Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro (cherry picked from commit 7e5d553752153c1cd05c1b6561e33727f87b8f6f) --- plugin/smb4k_konqplugin.cpp | 14 ++-- smb4k/browser/smb4knetworkbrowser.cpp | 18 ++-- smb4k/browser/smb4knetworkbrowser_part.cpp | 82 +++++++++---------- smb4k/browser/smb4knetworkbrowsertooltip.cpp | 4 +- smb4k/configdlg/smb4kauthoptions.cpp | 10 +-- smb4k/configdlg/smb4ksambaoptions.cpp | 46 +++++------ smb4k/configdlg/smb4ksuperuseroptions.cpp | 6 +- smb4k/configdlg/smb4kuserinterfaceoptions.cpp | 6 +- smb4k/configdlg/smb4tdeconfigdialog.cpp | 18 ++-- smb4k/configdlg/smb4tdersyncoptions.cpp | 46 +++++------ smb4k/core/smb4kcore.cpp | 26 +++--- smb4k/core/smb4khomesshareshandler.cpp | 10 +-- smb4k/core/smb4kmounter.cpp | 18 ++-- smb4k/core/smb4kpasswordhandler.cpp | 22 ++--- smb4k/core/smb4kpreviewer.cpp | 14 ++-- smb4k/core/smb4kprint.cpp | 16 ++-- smb4k/core/smb4kscanner.cpp | 22 ++--- smb4k/core/smb4ksynchronizer.cpp | 18 ++-- smb4k/core/smb4tdefileio.cpp | 18 ++-- smb4k/dialogs/smb4kbookmarkeditor.cpp | 26 +++--- smb4k/dialogs/smb4kcustomoptionsdialog.cpp | 46 +++++------ smb4k/dialogs/smb4kmountdialog.cpp | 8 +- smb4k/dialogs/smb4kpreviewdialog.cpp | 18 ++-- smb4k/dialogs/smb4kprintdialog.cpp | 8 +- smb4k/dialogs/smb4ksynchronizationdialog.cpp | 10 +-- smb4k/iconview/smb4ksharesiconview.cpp | 10 +-- smb4k/iconview/smb4ksharesiconview_part.cpp | 38 ++++----- smb4k/iconview/smb4ksharesiconviewtooltip.cpp | 4 +- smb4k/listview/smb4kshareslistview.cpp | 10 +-- smb4k/listview/smb4kshareslistview_part.cpp | 38 ++++----- smb4k/listview/smb4kshareslistviewtooltip.cpp | 4 +- smb4k/searchdlg/smb4ksearchdialog.cpp | 22 ++--- smb4k/searchdlg/smb4ksearchdialog_part.cpp | 18 ++-- smb4k/smb4k.cpp | 46 +++++------ smb4k/smb4ksystemtray.cpp | 44 +++++----- 35 files changed, 382 insertions(+), 382 deletions(-) diff --git a/plugin/smb4k_konqplugin.cpp b/plugin/smb4k_konqplugin.cpp index c30280d..87b9527 100644 --- a/plugin/smb4k_konqplugin.cpp +++ b/plugin/smb4k_konqplugin.cpp @@ -67,9 +67,9 @@ KonqSidebar_Smb4K::KonqSidebar_Smb4K(TDEInstance *inst,TQObject *parent,TQWidget TDEToolBar *topBar = new TDEToolBar( widget, "Topbar" ); topBar->setIconSize(16); - topBar->insertButton( "reload", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRescan() ) , TRUE, i18n( "Scan Network" ) ); - topBar->insertButton( "edit-find", 1, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSearch() ) , TRUE, i18n( "Search" ) ); - topBar->insertButton( "configure", 2, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSmb4KOptionsDlg() ) , TRUE, i18n( "Configure" ) ); + topBar->insertButton( "reload", 0, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRescan() ) , TRUE, i18n( "Scan Network" ) ); + topBar->insertButton( "edit-find", 1, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSearch() ) , TRUE, i18n( "Search" ) ); + topBar->insertButton( "configure", 2, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSmb4KOptionsDlg() ) , TRUE, i18n( "Configure" ) ); // // Browser widget: @@ -90,8 +90,8 @@ KonqSidebar_Smb4K::KonqSidebar_Smb4K(TDEInstance *inst,TQObject *parent,TQWidget return; } - connect( Smb4KCore::mounter(), TQT_SIGNAL( mountedShare( const TQString &) ), this, TQT_SLOT( slotMountedShare( const TQString & ) ) ); - connect( Smb4KCore::mounter(), TQT_SIGNAL( aboutToUnmount( const TQString& ) ), this, TQT_SLOT( slotPrepareUnmount( const TQString& ) ) ); + connect( Smb4KCore::mounter(), TQ_SIGNAL( mountedShare( const TQString &) ), this, TQ_SLOT( slotMountedShare( const TQString & ) ) ); + connect( Smb4KCore::mounter(), TQ_SIGNAL( aboutToUnmount( const TQString& ) ), this, TQ_SLOT( slotPrepareUnmount( const TQString& ) ) ); // Scan the network and remount recently used shares: Smb4KCore::self()->init(); @@ -164,7 +164,7 @@ void KonqSidebar_Smb4K::slotSearch() // Instead we want that a search is started: searchDialog->actionButton( KDialogBase::Close )->setAutoDefault( false ); - //connect( m_search_dialog, TQT_SIGNAL( searchResult( Smb4KHostItem * ) ), this, TQT_SLOT( slotInsertItem( Smb4KHostItem * ) ) ); + //connect( m_search_dialog, TQ_SIGNAL( searchResult( Smb4KHostItem * ) ), this, TQ_SLOT( slotInsertItem( Smb4KHostItem * ) ) ); searchDialog->show(); } @@ -192,7 +192,7 @@ void KonqSidebar_Smb4K::slotSmb4KOptionsDlg() if ( dlg ) { - connect( dlg, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotSettingsChanged() ) ); + connect( dlg, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotSettingsChanged() ) ); dlg->show(); } diff --git a/smb4k/browser/smb4knetworkbrowser.cpp b/smb4k/browser/smb4knetworkbrowser.cpp index d6fdfde..806a40f 100644 --- a/smb4k/browser/smb4knetworkbrowser.cpp +++ b/smb4k/browser/smb4knetworkbrowser.cpp @@ -53,14 +53,14 @@ Smb4KNetworkBrowser::Smb4KNetworkBrowser( TQWidget *parent, const char *name ) addColumn( i18n( "Comment" ), -1 ); // Add some connections: - connect( this, TQT_SIGNAL( expanded( TQListViewItem * ) ), - this, TQT_SLOT( slotItemExpandedCollapsed( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( expanded( TQListViewItem * ) ), + this, TQ_SLOT( slotItemExpandedCollapsed( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( collapsed( TQListViewItem * ) ), - this, TQT_SLOT( slotItemExpandedCollapsed( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( collapsed( TQListViewItem * ) ), + this, TQ_SLOT( slotItemExpandedCollapsed( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( executed( TQListViewItem * ) ), - this, TQT_SLOT( slotItemExecuted( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( executed( TQListViewItem * ) ), + this, TQ_SLOT( slotItemExecuted( TQListViewItem * ) ) ); } @@ -114,7 +114,7 @@ void Smb4KNetworkBrowser::contentsMouseMoveEvent( TQMouseEvent *e ) { m_tooltip = new Smb4KNetworkBrowserToolTip( item ); - TQTimer::singleShot( 2000, this, TQT_SLOT( slotShowToolTip() ) ); + TQTimer::singleShot( 2000, this, TQ_SLOT( slotShowToolTip() ) ); } else { @@ -133,7 +133,7 @@ void Smb4KNetworkBrowser::contentsMouseMoveEvent( TQMouseEvent *e ) { m_tooltip = new Smb4KNetworkBrowserToolTip( item ); - TQTimer::singleShot( 2000, this, TQT_SLOT( slotShowToolTip() ) ); + TQTimer::singleShot( 2000, this, TQ_SLOT( slotShowToolTip() ) ); } else { @@ -161,7 +161,7 @@ void Smb4KNetworkBrowser::contentsMouseMoveEvent( TQMouseEvent *e ) ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KNetworkBrowser::slotItemExpandedCollapsed( TQListViewItem *item ) diff --git a/smb4k/browser/smb4knetworkbrowser_part.cpp b/smb4k/browser/smb4knetworkbrowser_part.cpp index 14d4495..721a79f 100644 --- a/smb4k/browser/smb4knetworkbrowser_part.cpp +++ b/smb4k/browser/smb4knetworkbrowser_part.cpp @@ -84,50 +84,50 @@ Smb4KNetworkBrowserPart::Smb4KNetworkBrowserPart( TQWidget *parentWidget, const loadSettings(); // Add some connections: - connect( m_widget, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint & , int ) ), - this, TQT_SLOT( slotContextMenuRequested( TQListViewItem *, const TQPoint &, int ) ) ); + connect( m_widget, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint & , int ) ), + this, TQ_SLOT( slotContextMenuRequested( TQListViewItem *, const TQPoint &, int ) ) ); - connect( m_widget, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); + connect( m_widget, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); - connect( m_widget, TQT_SIGNAL( pressed( TQListViewItem * ) ), - this, TQT_SLOT( slotPressed( TQListViewItem * ) ) ); + connect( m_widget, TQ_SIGNAL( pressed( TQListViewItem * ) ), + this, TQ_SLOT( slotPressed( TQListViewItem * ) ) ); - connect( m_widget, TQT_SIGNAL( expanded( TQListViewItem * ) ), - this, TQT_SLOT( slotItemExpanded( TQListViewItem * ) ) ); + connect( m_widget, TQ_SIGNAL( expanded( TQListViewItem * ) ), + this, TQ_SLOT( slotItemExpanded( TQListViewItem * ) ) ); - connect( m_widget, TQT_SIGNAL( collapsed( TQListViewItem * ) ), - this, TQT_SLOT( slotItemCollapsed( TQListViewItem * ) ) ); + connect( m_widget, TQ_SIGNAL( collapsed( TQListViewItem * ) ), + this, TQ_SLOT( slotItemCollapsed( TQListViewItem * ) ) ); - connect( m_widget, TQT_SIGNAL( executed( TQListViewItem * ) ), - this, TQT_SLOT( slotItemExecuted( TQListViewItem * ) ) ); + connect( m_widget, TQ_SIGNAL( executed( TQListViewItem * ) ), + this, TQ_SLOT( slotItemExecuted( TQListViewItem * ) ) ); - connect( m_widget, TQT_SIGNAL( aboutToShowToolTip( Smb4KNetworkBrowserItem * ) ), - this, TQT_SLOT( slotAboutToShowToolTip( Smb4KNetworkBrowserItem * ) ) ); + connect( m_widget, TQ_SIGNAL( aboutToShowToolTip( Smb4KNetworkBrowserItem * ) ), + this, TQ_SLOT( slotAboutToShowToolTip( Smb4KNetworkBrowserItem * ) ) ); - connect( Smb4KCore::scanner(), TQT_SIGNAL( workgroups( const TQValueList & ) ), - this, TQT_SLOT( slotWorkgroups( const TQValueList & ) ) ); + connect( Smb4KCore::scanner(), TQ_SIGNAL( workgroups( const TQValueList & ) ), + this, TQ_SLOT( slotWorkgroups( const TQValueList & ) ) ); - connect( Smb4KCore::scanner(), TQT_SIGNAL( members( const TQString &, const TQValueList & ) ), - this, TQT_SLOT( slotWorkgroupMembers( const TQString &, const TQValueList & ) ) ); + connect( Smb4KCore::scanner(), TQ_SIGNAL( members( const TQString &, const TQValueList & ) ), + this, TQ_SLOT( slotWorkgroupMembers( const TQString &, const TQValueList & ) ) ); - connect( Smb4KCore::scanner(), TQT_SIGNAL( shares( const TQString &, const TQValueList & ) ), - this, TQT_SLOT( slotShares( const TQString &, const TQValueList & ) ) ); + connect( Smb4KCore::scanner(), TQ_SIGNAL( shares( const TQString &, const TQValueList & ) ), + this, TQ_SLOT( slotShares( const TQString &, const TQValueList & ) ) ); - connect( Smb4KCore::scanner(), TQT_SIGNAL( ipAddress( Smb4KHostItem * ) ), - this, TQT_SLOT( slotAddIPAddress( Smb4KHostItem * ) ) ); + connect( Smb4KCore::scanner(), TQ_SIGNAL( ipAddress( Smb4KHostItem * ) ), + this, TQ_SLOT( slotAddIPAddress( Smb4KHostItem * ) ) ); - connect( Smb4KCore::scanner(), TQT_SIGNAL( info( Smb4KHostItem * ) ), - this, TQT_SLOT( slotAddInformation( Smb4KHostItem * ) ) ); + connect( Smb4KCore::scanner(), TQ_SIGNAL( info( Smb4KHostItem * ) ), + this, TQ_SLOT( slotAddInformation( Smb4KHostItem * ) ) ); - connect( Smb4KCore::scanner(), TQT_SIGNAL( hostAdded( Smb4KHostItem * ) ), - this, TQT_SLOT( slotInsertHost( Smb4KHostItem * ) ) ); + connect( Smb4KCore::scanner(), TQ_SIGNAL( hostAdded( Smb4KHostItem * ) ), + this, TQ_SLOT( slotInsertHost( Smb4KHostItem * ) ) ); - connect( Smb4KCore::mounter(), TQT_SIGNAL( updated() ), - this, TQT_SLOT( slotMarkMountedShares() ) ); + connect( Smb4KCore::mounter(), TQ_SIGNAL( updated() ), + this, TQ_SLOT( slotMarkMountedShares() ) ); - connect( Smb4KCore::self(), TQT_SIGNAL( runStateChanged() ), - this, TQT_SLOT( slotRunStateChanged() ) ); + connect( Smb4KCore::self(), TQ_SIGNAL( runStateChanged() ), + this, TQ_SLOT( slotRunStateChanged() ) ); } @@ -139,35 +139,35 @@ Smb4KNetworkBrowserPart::~Smb4KNetworkBrowserPart() void Smb4KNetworkBrowserPart::setupActions() { TDEAction *rescan = new TDEAction( i18n( "Scan Netwo&rk" ), "reload", TDEShortcut( CTRL+Key_R ), - this, TQT_SLOT( slotRescan() ), + this, TQ_SLOT( slotRescan() ), actionCollection(), "rescan_action" ); TDEAction *abort = new TDEAction( i18n( "&Abort" ) , "process-stop", TDEShortcut( CTRL+Key_A ), - this, TQT_SLOT( slotAbort() ), + this, TQ_SLOT( slotAbort() ), actionCollection(), "abort_action" ); TDEActionSeparator *sep1 = new TDEActionSeparator( actionCollection(), "separator_1" ); TDEAction *manual_mount = new TDEAction( i18n( "M&ount Manually" ), "connect_creating", TDEShortcut( CTRL+Key_O ), - this, TQT_SLOT( slotMountManually() ), + this, TQ_SLOT( slotMountManually() ), actionCollection(), "mount_manually_action" ); TDEActionSeparator *sep2 = new TDEActionSeparator( actionCollection(), "separator_2" ); TDEAction *auth = new TDEAction( i18n( "Au&thentication" ), "identity", TDEShortcut( CTRL+Key_T ), - this, TQT_SLOT( slotAuthentication() ), + this, TQ_SLOT( slotAuthentication() ), actionCollection(), "askpass_action" ); TDEAction *custom = new TDEAction( i18n( "&Custom Options" ), "samba", TDEShortcut( CTRL+Key_C ), - this, TQT_SLOT( slotCustomOptions() ), + this, TQ_SLOT( slotCustomOptions() ), actionCollection(), "custom_action" ); TDEAction *bookmark = new TDEAction( i18n( "Add &Bookmark" ), "bookmark_add", TDEShortcut( CTRL+Key_B ), - this, TQT_SLOT( slotBookmark() ), + this, TQ_SLOT( slotBookmark() ), actionCollection(), "bookmark_action" ); TDEAction *preview = new TDEAction( i18n( "Pre&view" ), "view_icon", TDEShortcut( CTRL+Key_V ), - this, TQT_SLOT( slotPreview() ), + this, TQ_SLOT( slotPreview() ), actionCollection(), "preview_action" ); TDEAction *print = new TDEAction( i18n( "&Print File" ), "printer", TDEShortcut( CTRL+Key_P ), - this, TQT_SLOT( slotPrint() ), + this, TQ_SLOT( slotPrint() ), actionCollection(), "print_action" ); TDEAction *mount = new TDEAction( i18n( "&Mount" ), "drive-harddisk-mounted", TDEShortcut( CTRL+Key_M ), - this, TQT_SLOT( slotMount() ), + this, TQ_SLOT( slotMount() ), actionCollection(), "mount_action" ); // Enable/disable the actions: @@ -201,7 +201,7 @@ void Smb4KNetworkBrowserPart::setupActions() if ( m_mode == KonqPlugin ) { TDEAction *unmount = new TDEAction( i18n( "&Unmount" ), "drive-harddisk-unmounted", TDEShortcut( CTRL+Key_U ), - this, TQT_SLOT( slotUnmount() ), + this, TQ_SLOT( slotUnmount() ), actionCollection(), "konq_umount_action" ); unmount->setEnabled( false ); @@ -306,7 +306,7 @@ void Smb4KNetworkBrowserPart::customEvent( TQCustomEvent *e ) ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS (Smb4KNetworkBrowserPart) +// SLOT IMPLEMENTATIONS (Smb4KNetworkBrowserPart) ///////////////////////////////////////////////////////////////////////////// void Smb4KNetworkBrowserPart::slotContextMenuRequested( TQListViewItem *item, const TQPoint &pos, diff --git a/smb4k/browser/smb4knetworkbrowsertooltip.cpp b/smb4k/browser/smb4knetworkbrowsertooltip.cpp index ddd505c..f52b2a7 100644 --- a/smb4k/browser/smb4knetworkbrowsertooltip.cpp +++ b/smb4k/browser/smb4knetworkbrowsertooltip.cpp @@ -96,7 +96,7 @@ void Smb4KNetworkBrowserToolTip::showTip( const TQPoint &pos ) setGeometry( p.x(), p.y(), width(), height() ); polish(); show(); - TQTimer::singleShot( 10000, this, TQT_SLOT( slotHideToolTip() ) ); + TQTimer::singleShot( 10000, this, TQ_SLOT( slotHideToolTip() ) ); } @@ -363,7 +363,7 @@ void Smb4KNetworkBrowserToolTip::leaveEvent( TQEvent *e ) ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KNetworkBrowserToolTip::slotHideToolTip() diff --git a/smb4k/configdlg/smb4kauthoptions.cpp b/smb4k/configdlg/smb4kauthoptions.cpp index bd352c8..101d103 100644 --- a/smb4k/configdlg/smb4kauthoptions.cpp +++ b/smb4k/configdlg/smb4kauthoptions.cpp @@ -87,10 +87,10 @@ Smb4KAuthOptions::Smb4KAuthOptions( TQWidget *parent, const char *name ) grid->addWidget( login_box, 1, 0, 0 ); grid->addItem( spacer2, 2, 0 ); - connect( use_wallet, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotTDEWalletButtonState( int ) ) ); - connect( default_auth, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotDefaultAuthButtonState( int ) ) ); + connect( use_wallet, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotTDEWalletButtonState( int ) ) ); + connect( default_auth, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotDefaultAuthButtonState( int ) ) ); slotTDEWalletButtonState( use_wallet->state() ); slotDefaultAuthButtonState( default_auth->state() ); @@ -102,7 +102,7 @@ Smb4KAuthOptions::~Smb4KAuthOptions() } ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KAuthOptions::slotTDEWalletButtonState( int state ) diff --git a/smb4k/configdlg/smb4ksambaoptions.cpp b/smb4k/configdlg/smb4ksambaoptions.cpp index 4b668e1..ec5748a 100644 --- a/smb4k/configdlg/smb4ksambaoptions.cpp +++ b/smb4k/configdlg/smb4ksambaoptions.cpp @@ -496,41 +496,41 @@ Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *parent, const char *name ) // Connections // #ifndef __FreeBSD__ - connect( filesystem, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotSambaFileSystem( int ) ) ); + connect( filesystem, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotSambaFileSystem( int ) ) ); #endif - connect( remove_custom, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotRemoveCustomOption() ) ); + connect( remove_custom, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotRemoveCustomOption() ) ); - connect( rm_all_custom, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotRemoveAllCustomOptions() ) ); + connect( rm_all_custom, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotRemoveAllCustomOptions() ) ); - connect( custom_options, TQT_SIGNAL( clicked( TQListViewItem * ) ), - this, TQT_SLOT( slotCustomItemClicked( TQListViewItem * ) ) ); + connect( custom_options, TQ_SIGNAL( clicked( TQListViewItem * ) ), + this, TQ_SLOT( slotCustomItemClicked( TQListViewItem * ) ) ); - connect( custom_protocol, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotCustomProtocolChanged( int ) ) ); + connect( custom_protocol, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotCustomProtocolChanged( int ) ) ); #ifndef __FreeBSD__ - connect( custom_fs, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotCustomFileSystemChanged( int ) ) ); + connect( custom_fs, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotCustomFileSystemChanged( int ) ) ); - connect( custom_rw, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotCustomWriteAccessChanged( int ) ) ); + connect( custom_rw, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotCustomWriteAccessChanged( int ) ) ); #endif - connect( custom_krb, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotCustomKerberosChanged( int ) ) ); + connect( custom_krb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotCustomKerberosChanged( int ) ) ); - connect( custom_uid, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotCustomUIDChanged( const TQString & ) ) ); + connect( custom_uid, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotCustomUIDChanged( const TQString & ) ) ); - connect( custom_gid, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotCustomGIDChanged( const TQString & ) ) ); + connect( custom_gid, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotCustomGIDChanged( const TQString & ) ) ); - connect( custom_port, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotCustomPortChanged( int ) ) ); + connect( custom_port, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotCustomPortChanged( int ) ) ); // // Do last things before we are ready to go @@ -554,7 +554,7 @@ void Smb4KSambaOptions::resetCustomTab() ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// #ifndef __FreeBSD__ diff --git a/smb4k/configdlg/smb4ksuperuseroptions.cpp b/smb4k/configdlg/smb4ksuperuseroptions.cpp index d11f333..bbb6164 100644 --- a/smb4k/configdlg/smb4ksuperuseroptions.cpp +++ b/smb4k/configdlg/smb4ksuperuseroptions.cpp @@ -77,8 +77,8 @@ Smb4KSuperUserOptions::Smb4KSuperUserOptions( TQWidget *parent, const char *name grid->addWidget( remove, 2, 3, 0 ); grid->addMultiCell( spacer2, 3, 3, 0, 3, 0 ); - connect( remove, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotRemoveClicked() ) ); + connect( remove, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotRemoveClicked() ) ); } @@ -88,7 +88,7 @@ Smb4KSuperUserOptions::~Smb4KSuperUserOptions() ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KSuperUserOptions::slotRemoveClicked() diff --git a/smb4k/configdlg/smb4kuserinterfaceoptions.cpp b/smb4k/configdlg/smb4kuserinterfaceoptions.cpp index 1553896..b7353da 100644 --- a/smb4k/configdlg/smb4kuserinterfaceoptions.cpp +++ b/smb4k/configdlg/smb4kuserinterfaceoptions.cpp @@ -172,8 +172,8 @@ Smb4KUserInterfaceOptions::Smb4KUserInterfaceOptions( TQWidget *parent, const ch addTab( preview_widget, i18n( "Preview Dialog" ) ); // Add connections: - connect( hidden, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotShowHiddenShares( int ) ) ); + connect( hidden, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotShowHiddenShares( int ) ) ); // Do last adjustments: slotShowHiddenShares( hidden->state() ); @@ -186,7 +186,7 @@ Smb4KUserInterfaceOptions::~Smb4KUserInterfaceOptions() ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// diff --git a/smb4k/configdlg/smb4tdeconfigdialog.cpp b/smb4k/configdlg/smb4tdeconfigdialog.cpp index e73d189..f0565cd 100644 --- a/smb4k/configdlg/smb4tdeconfigdialog.cpp +++ b/smb4k/configdlg/smb4tdeconfigdialog.cpp @@ -174,17 +174,17 @@ Smb4TDEConfigDialog::Smb4TDEConfigDialog( Smb4KSettings *settings, TQWidget *par setInitialSize( configDialogSize( *(Smb4KSettings::self()->config()), "ConfigDialog" ) ); // Connections - connect( samba_options, TQT_SIGNAL( customSettingsChanged() ), - this, TQT_SLOT( slotCustomSambaSettingsChanged() ) ); + connect( samba_options, TQ_SIGNAL( customSettingsChanged() ), + this, TQ_SLOT( slotCustomSambaSettingsChanged() ) ); - connect( super_user_options, TQT_SIGNAL( removeEntries() ), - this, TQT_SLOT( slotRemoveSuperUserEntries() ) ); + connect( super_user_options, TQ_SIGNAL( removeEntries() ), + this, TQ_SLOT( slotRemoveSuperUserEntries() ) ); - connect( Smb4KCore::fileIO(), TQT_SIGNAL( failed() ), - this, TQT_SLOT( slotReceivedFileIOFailed() ) ); + connect( Smb4KCore::fileIO(), TQ_SIGNAL( failed() ), + this, TQ_SLOT( slotReceivedFileIOFailed() ) ); - connect( Smb4KCore::fileIO(), TQT_SIGNAL( finished() ), - this, TQT_SLOT( slotReceivedFileIOFinished() ) ); + connect( Smb4KCore::fileIO(), TQ_SIGNAL( finished() ), + this, TQ_SLOT( slotReceivedFileIOFinished() ) ); } @@ -930,7 +930,7 @@ void Smb4TDEConfigDialog::showEvent( TQShowEvent *e ) ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4TDEConfigDialog::slotApply() diff --git a/smb4k/configdlg/smb4tdersyncoptions.cpp b/smb4k/configdlg/smb4tdersyncoptions.cpp index 45627de..7dd1fe1 100644 --- a/smb4k/configdlg/smb4tdersyncoptions.cpp +++ b/smb4k/configdlg/smb4tdersyncoptions.cpp @@ -247,38 +247,38 @@ Smb4KRsyncOptions::Smb4KRsyncOptions( TQWidget *parent, const char *name ) : TQT addTab( advanced_tab, i18n( "Advanced" ) ); - connect( archive_mode, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotArchiveToggled( bool ) ) ); + connect( archive_mode, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotArchiveToggled( bool ) ) ); - connect( recursive, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUncheckArchive( bool ) ) ); + connect( recursive, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUncheckArchive( bool ) ) ); - connect( links, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUncheckArchive( bool ) ) ); + connect( links, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUncheckArchive( bool ) ) ); - connect( perms, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUncheckArchive( bool ) ) ); + connect( perms, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUncheckArchive( bool ) ) ); - connect( times, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUncheckArchive( bool ) ) ); + connect( times, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUncheckArchive( bool ) ) ); - connect( group, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUncheckArchive( bool ) ) ); + connect( group, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUncheckArchive( bool ) ) ); - connect( owner, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUncheckArchive( bool ) ) ); + connect( owner, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUncheckArchive( bool ) ) ); - connect( devices, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUncheckArchive( bool ) ) ); + connect( devices, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUncheckArchive( bool ) ) ); - connect( backup, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotBackupToggled( bool ) ) ); + connect( backup, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotBackupToggled( bool ) ) ); - connect( f_filter, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotFShortcutToggled( bool ) ) ); + connect( f_filter, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotFShortcutToggled( bool ) ) ); - connect( ff_filter, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotFFShortcutToggled( bool ) ) ); + connect( ff_filter, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotFFShortcutToggled( bool ) ) ); slotArchiveToggled( true ); slotBackupToggled( false ); @@ -291,7 +291,7 @@ Smb4KRsyncOptions::~Smb4KRsyncOptions() ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KRsyncOptions::slotArchiveToggled( bool on ) diff --git a/smb4k/core/smb4kcore.cpp b/smb4k/core/smb4kcore.cpp index 8319ff4..43e3bc9 100644 --- a/smb4k/core/smb4kcore.cpp +++ b/smb4k/core/smb4kcore.cpp @@ -83,23 +83,23 @@ Smb4KCore::Smb4KCore() : TQObject() m_previewer_state = PREVIEWER_STOP; // Connections: - connect( m_scanner, TQT_SIGNAL( state( int ) ), - this, TQT_SLOT( slotSetScannerState( int ) ) ); + connect( m_scanner, TQ_SIGNAL( state( int ) ), + this, TQ_SLOT( slotSetScannerState( int ) ) ); - connect( m_mounter, TQT_SIGNAL( state( int ) ), - this, TQT_SLOT( slotSetMounterState( int ) ) ); + connect( m_mounter, TQ_SIGNAL( state( int ) ), + this, TQ_SLOT( slotSetMounterState( int ) ) ); - connect( m_print, TQT_SIGNAL( state( int ) ), - this, TQT_SLOT( slotSetPrinterHandlerState( int ) ) ); + connect( m_print, TQ_SIGNAL( state( int ) ), + this, TQ_SLOT( slotSetPrinterHandlerState( int ) ) ); - connect( m_synchronizer, TQT_SIGNAL( state( int ) ), - this, TQT_SLOT( slotSetSynchronizerState( int ) ) ); + connect( m_synchronizer, TQ_SIGNAL( state( int ) ), + this, TQ_SLOT( slotSetSynchronizerState( int ) ) ); - connect( m_previewer, TQT_SIGNAL( state( int ) ), - this, TQT_SLOT( slotSetSynchronizerState( int ) ) ); + connect( m_previewer, TQ_SIGNAL( state( int ) ), + this, TQ_SLOT( slotSetSynchronizerState( int ) ) ); - connect( kapp, TQT_SIGNAL( shutDown() ), - this, TQT_SLOT( slotShutdown() ) ); + connect( kapp, TQ_SIGNAL( shutDown() ), + this, TQ_SLOT( slotShutdown() ) ); } @@ -904,7 +904,7 @@ void Smb4KCore::setDefaultSettings() ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KCore::slotSetScannerState( int state ) diff --git a/smb4k/core/smb4khomesshareshandler.cpp b/smb4k/core/smb4khomesshareshandler.cpp index 6039009..8f1f2ad 100644 --- a/smb4k/core/smb4khomesshareshandler.cpp +++ b/smb4k/core/smb4khomesshareshandler.cpp @@ -98,10 +98,10 @@ const TQString Smb4KHomesSharesHandler::specifyUser( const TQString &host, TQWid layout->addMultiCellWidget( userCombo, 1, 1, 1, 4, 0 ); layout->addItem( spacer1, 0, 2 ); - connect( userCombo, TQT_SIGNAL( textChanged( const TQString &) ), - this, TQT_SLOT( slotTextChanged( const TQString & ) ) ); - connect( m_dlg, TQT_SIGNAL( user1Clicked() ), - this, TQT_SLOT( slotClearClicked() ) ); + connect( userCombo, TQ_SIGNAL( textChanged( const TQString &) ), + this, TQ_SLOT( slotTextChanged( const TQString & ) ) ); + connect( m_dlg, TQ_SIGNAL( user1Clicked() ), + this, TQ_SLOT( slotClearClicked() ) ); // Read the list of logins, that are already defined // for this 'homes' share. @@ -325,7 +325,7 @@ void Smb4KHomesSharesHandler::write_names( const TQString &host, const TQStringL ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KHomesSharesHandler::slotTextChanged( const TQString &text ) diff --git a/smb4k/core/smb4kmounter.cpp b/smb4k/core/smb4kmounter.cpp index 28e54de..254bfd9 100644 --- a/smb4k/core/smb4kmounter.cpp +++ b/smb4k/core/smb4kmounter.cpp @@ -84,17 +84,17 @@ Smb4KMounter::Smb4KMounter( TQObject *parent, const char *name ) : TQObject( par m_queue.setAutoDelete( true ); - connect( m_proc, TQT_SIGNAL( processExited( TDEProcess * ) ), - this, TQT_SLOT( slotProcessExited( TDEProcess * ) ) ); + connect( m_proc, TQ_SIGNAL( processExited( TDEProcess * ) ), + this, TQ_SLOT( slotProcessExited( TDEProcess * ) ) ); - connect( m_proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); + connect( m_proc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); - connect( m_proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); + connect( m_proc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); - connect( kapp, TQT_SIGNAL( shutDown() ), - this, TQT_SLOT( slotShutdown() ) ); + connect( kapp, TQ_SIGNAL( shutDown() ), + this, TQ_SLOT( slotShutdown() ) ); } @@ -1534,7 +1534,7 @@ void Smb4KMounter::timerEvent( TQTimerEvent * ) ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// diff --git a/smb4k/core/smb4kpasswordhandler.cpp b/smb4k/core/smb4kpasswordhandler.cpp index 421ccde..ab8abad 100644 --- a/smb4k/core/smb4kpasswordhandler.cpp +++ b/smb4k/core/smb4kpasswordhandler.cpp @@ -323,13 +323,13 @@ bool Smb4KPasswordHandler::askpass( const TQString &workgroup, const TQString &h // the edit line for the user to enable/disable the OK button. if ( user_edit ) { - connect( user_edit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotEnableOKButton( const TQString& ) ) ); + connect( user_edit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotEnableOKButton( const TQString& ) ) ); } else { - connect( user_combo, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotEnableOKButton( const TQString& ) ) ); + connect( user_combo, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotEnableOKButton( const TQString& ) ) ); } // Process the authentication data: @@ -355,8 +355,8 @@ bool Smb4KPasswordHandler::askpass( const TQString &workgroup, const TQString &h user_combo->insertStringList( list ); user_combo->setCurrentText( TQString() ); - connect( user_combo, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( slotGetPassword( const TQString & ) ) ); + connect( user_combo, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( slotGetPassword( const TQString & ) ) ); user_combo->setFocus(); } @@ -786,10 +786,10 @@ void Smb4KPasswordHandler::writeToSMBConfFile( Smb4KAuthInfo *authInfo ) TDEProcess *p = new TDEProcess(); p->setUseShell( true ); - connect( p, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivePassword( TDEProcess *, char *, int ) ) ); - connect( p, TQT_SIGNAL( processExited( TDEProcess * ) ), - this, TQT_SLOT( slotWritePassword( TDEProcess * ) ) ); + connect( p, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivePassword( TDEProcess *, char *, int ) ) ); + connect( p, TQ_SIGNAL( processExited( TDEProcess * ) ), + this, TQ_SLOT( slotWritePassword( TDEProcess * ) ) ); *p << TQString( "smbutil crypt %1" ).arg( m_nsmbrc_auth.password() ); @@ -800,7 +800,7 @@ void Smb4KPasswordHandler::writeToSMBConfFile( Smb4KAuthInfo *authInfo ) ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// diff --git a/smb4k/core/smb4kpreviewer.cpp b/smb4k/core/smb4kpreviewer.cpp index ee7cc75..68c70d2 100644 --- a/smb4k/core/smb4kpreviewer.cpp +++ b/smb4k/core/smb4kpreviewer.cpp @@ -55,14 +55,14 @@ Smb4KPreviewer::Smb4KPreviewer( TQObject *parent, const char *name ) m_proc = new TDEProcess( this, "PreviewProcess" ); m_proc->setUseShell( true ); - connect( m_proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); + connect( m_proc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); - connect( m_proc, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( slotProcessExited( TDEProcess * ) ) ); + connect( m_proc, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( slotProcessExited( TDEProcess * ) ) ); - connect( m_proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); + connect( m_proc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); } @@ -177,7 +177,7 @@ void Smb4KPreviewer::timerEvent( TQTimerEvent * ) ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KPreviewer::slotReceivedStdout( TDEProcess *, char *buf, int len ) diff --git a/smb4k/core/smb4kprint.cpp b/smb4k/core/smb4kprint.cpp index 09d042e..a9108e1 100644 --- a/smb4k/core/smb4kprint.cpp +++ b/smb4k/core/smb4kprint.cpp @@ -59,14 +59,14 @@ Smb4KPrint::Smb4KPrint( TQObject *parent, const char *name ) : TQObject( parent, m_working = false; - connect( m_proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); + connect( m_proc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); - connect( m_proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); + connect( m_proc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); - connect( m_proc, TQT_SIGNAL( processExited( TDEProcess * ) ), - this, TQT_SLOT( slotProcessExited( TDEProcess * ) ) ); + connect( m_proc, TQ_SIGNAL( processExited( TDEProcess * ) ), + this, TQ_SLOT( slotProcessExited( TDEProcess * ) ) ); } @@ -289,7 +289,7 @@ void Smb4KPrint::printText() ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KPrint::slotReceivedStdout( TDEProcess *, char *buf, int len ) @@ -333,7 +333,7 @@ void Smb4KPrint::slotProcessExited( TDEProcess * ) if ( passwordHandler()->askpass( m_info->workgroup(), m_info->host(), m_info->printer(), state ) ) { retry = true; - TQTimer::singleShot( 50, this, TQT_SLOT( slotRetry() ) ); + TQTimer::singleShot( 50, this, TQ_SLOT( slotRetry() ) ); } } else diff --git a/smb4k/core/smb4kscanner.cpp b/smb4k/core/smb4kscanner.cpp index 8998d68..4531890 100644 --- a/smb4k/core/smb4kscanner.cpp +++ b/smb4k/core/smb4kscanner.cpp @@ -88,14 +88,14 @@ TQObject *parent, const char *name ) m_queue.setAutoDelete( true ); - connect( m_proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); + connect( m_proc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); - connect( m_proc, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( slotProcessExited( TDEProcess * ) ) ); + connect( m_proc, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( slotProcessExited( TDEProcess * ) ) ); - connect( m_proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); + connect( m_proc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); } @@ -1582,7 +1582,7 @@ void Smb4KScanner::timerEvent( TQTimerEvent * ) ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// @@ -1656,10 +1656,10 @@ void Smb4KScanner::lookupIPAddresses() TDEProcess *proc = new TDEProcess( this ); proc->setUseShell( true ); - connect( proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedIPAddresses( TDEProcess *, char *, int ) ) ); - connect( proc, TQT_SIGNAL( processExited( TDEProcess * ) ), - this, TQT_SLOT( slotIPAddressProcessExited( TDEProcess * ) ) ); + connect( proc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedIPAddresses( TDEProcess *, char *, int ) ) ); + connect( proc, TQ_SIGNAL( processExited( TDEProcess * ) ), + this, TQ_SLOT( slotIPAddressProcessExited( TDEProcess * ) ) ); *proc << command; proc->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ); diff --git a/smb4k/core/smb4ksynchronizer.cpp b/smb4k/core/smb4ksynchronizer.cpp index 67e682b..20a7288 100644 --- a/smb4k/core/smb4ksynchronizer.cpp +++ b/smb4k/core/smb4ksynchronizer.cpp @@ -63,17 +63,17 @@ Smb4KSynchronizer::Smb4KSynchronizer( TQObject *parent, const char *name ) m_working = false; - connect( m_proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); + connect( m_proc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); - connect( m_proc, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( slotProcessExited( TDEProcess * ) ) ); + connect( m_proc, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( slotProcessExited( TDEProcess * ) ) ); - connect( m_proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); + connect( m_proc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); - connect( kapp, TQT_SIGNAL( shutDown() ), - this, TQT_SLOT( slotShutdown() ) ); + connect( kapp, TQ_SIGNAL( shutDown() ), + this, TQ_SLOT( slotShutdown() ) ); } @@ -356,7 +356,7 @@ const TQString Smb4KSynchronizer::readRsyncOptions() ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KSynchronizer::abort() diff --git a/smb4k/core/smb4tdefileio.cpp b/smb4k/core/smb4tdefileio.cpp index 8513e82..49c9f50 100644 --- a/smb4k/core/smb4tdefileio.cpp +++ b/smb4k/core/smb4tdefileio.cpp @@ -63,17 +63,17 @@ Smb4KFileIO::Smb4KFileIO( TQObject *parent, const char *name ) : TQObject( paren m_proc = new TDEProcess( this, "FileIOProcess" ); m_proc->setUseShell( true ); - connect( m_proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); + connect( m_proc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); - connect( m_proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); + connect( m_proc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); - connect( m_proc, TQT_SIGNAL( processExited( TDEProcess * ) ), - this, TQT_SLOT( slotProcessExited( TDEProcess * ) ) ); + connect( m_proc, TQ_SIGNAL( processExited( TDEProcess * ) ), + this, TQ_SLOT( slotProcessExited( TDEProcess * ) ) ); - connect( kapp, TQT_SIGNAL( shutDown() ), - this, TQT_SLOT( slotShutdown() ) ); + connect( kapp, TQ_SIGNAL( shutDown() ), + this, TQ_SLOT( slotShutdown() ) ); } @@ -1695,7 +1695,7 @@ void Smb4KFileIO::processSuperTab() } ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KFileIO::slotShutdown() diff --git a/smb4k/dialogs/smb4kbookmarkeditor.cpp b/smb4k/dialogs/smb4kbookmarkeditor.cpp index 5dbd660..8f5358a 100644 --- a/smb4k/dialogs/smb4kbookmarkeditor.cpp +++ b/smb4k/dialogs/smb4kbookmarkeditor.cpp @@ -71,9 +71,9 @@ Smb4KBookmarkEditor::Smb4KBookmarkEditor( TQWidget *parent, const char *name ) m_collection = new TDEActionCollection( this, "BookmarkEditor_ActionCollection", TDEGlobal::instance() ); - (void) new TDEAction( i18n( "&Remove" ), "remove", Key_Delete, this, TQT_SLOT( slotRemoveClicked() ), m_collection, "remove_bookmark" ); + (void) new TDEAction( i18n( "&Remove" ), "remove", Key_Delete, this, TQ_SLOT( slotRemoveClicked() ), m_collection, "remove_bookmark" ); - (void) new TDEAction( i18n( "Remove &All" ), "edit-delete", CTRL+Key_X, this, TQT_SLOT( slotDeleteAllClicked() ), m_collection, "remove_all_bookmarks" ); + (void) new TDEAction( i18n( "Remove &All" ), "edit-delete", CTRL+Key_X, this, TQ_SLOT( slotDeleteAllClicked() ), m_collection, "remove_all_bookmarks" ); slotLoadBookmarks(); @@ -82,20 +82,20 @@ Smb4KBookmarkEditor::Smb4KBookmarkEditor( TQWidget *parent, const char *name ) setInitialSize( configDialogSize( *(Smb4KSettings::self()->config()), "BookmarkEditor" ) ); setMinimumSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() ); - connect( m_view, TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( slotRightButtonPressed( TQListViewItem *, const TQPoint &, int ) ) ); + connect( m_view, TQ_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( slotRightButtonPressed( TQListViewItem *, const TQPoint &, int ) ) ); - connect( m_view, TQT_SIGNAL( itemRenamed( TQListViewItem * ) ), - this, TQT_SLOT( slotItemRenamed( TQListViewItem * ) ) ); + connect( m_view, TQ_SIGNAL( itemRenamed( TQListViewItem * ) ), + this, TQ_SLOT( slotItemRenamed( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( okClicked() ), - this, TQT_SLOT( slotOkClicked() ) ); + connect( this, TQ_SIGNAL( okClicked() ), + this, TQ_SLOT( slotOkClicked() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), - this, TQT_SLOT( slotCancelClicked() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), + this, TQ_SLOT( slotCancelClicked() ) ); - connect( Smb4KCore::bookmarkHandler(), TQT_SIGNAL( bookmarksUpdated() ), - this, TQT_SLOT( slotLoadBookmarks() ) ); + connect( Smb4KCore::bookmarkHandler(), TQ_SIGNAL( bookmarksUpdated() ), + this, TQ_SLOT( slotLoadBookmarks() ) ); } @@ -113,7 +113,7 @@ Smb4KBookmarkEditor::~Smb4KBookmarkEditor() ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KBookmarkEditor::slotRightButtonPressed( TQListViewItem *item, const TQPoint &pos, int ) diff --git a/smb4k/dialogs/smb4kcustomoptionsdialog.cpp b/smb4k/dialogs/smb4kcustomoptionsdialog.cpp index 7f9528e..d2a3ccc 100644 --- a/smb4k/dialogs/smb4kcustomoptionsdialog.cpp +++ b/smb4k/dialogs/smb4kcustomoptionsdialog.cpp @@ -262,14 +262,14 @@ void Smb4KCustomOptionsDialog::setupDialog() } // Connections: - connect( m_port_input, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotPortChanged( int ) ) ); + connect( m_port_input, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotPortChanged( int ) ) ); - connect( m_kerberos, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotKerberosToggled( bool ) ) ); + connect( m_kerberos, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotKerberosToggled( bool ) ) ); - connect( m_proto_input, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( slotProtocolChanged( const TQString & ) ) ); + connect( m_proto_input, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( slotProtocolChanged( const TQString & ) ) ); break; } @@ -448,24 +448,24 @@ void Smb4KCustomOptionsDialog::setupDialog() #endif // Connections: - connect( m_port_input, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotPortChanged( int ) ) ); + connect( m_port_input, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotPortChanged( int ) ) ); - connect( m_uid_input, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotUIDChanged( const TQString & ) ) ); + connect( m_uid_input, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotUIDChanged( const TQString & ) ) ); - connect( m_gid_input, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotGIDChanged( const TQString & ) ) ); + connect( m_gid_input, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotGIDChanged( const TQString & ) ) ); #ifndef __FreeBSD__ - connect( m_kerberos, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotKerberosToggled( bool ) ) ); + connect( m_kerberos, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotKerberosToggled( bool ) ) ); - connect( m_rw_input, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( slotWriteAccessChanged( const TQString & ) ) ); + connect( m_rw_input, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( slotWriteAccessChanged( const TQString & ) ) ); - connect( m_fs_input, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( slotFilesystemChanged( const TQString & ) ) ); + connect( m_fs_input, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( slotFilesystemChanged( const TQString & ) ) ); #endif break; @@ -482,17 +482,17 @@ void Smb4KCustomOptionsDialog::setupDialog() enableButton( User1, enable_default_button ); // Connect the buttons: - connect( this, TQT_SIGNAL( okClicked() ), - this, TQT_SLOT( slotOKButtonClicked() ) ); + connect( this, TQ_SIGNAL( okClicked() ), + this, TQ_SLOT( slotOKButtonClicked() ) ); - connect( this, TQT_SIGNAL( user1Clicked() ), - this, TQT_SLOT( slotDefaultButtonClicked() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), + this, TQ_SLOT( slotDefaultButtonClicked() ) ); setFixedSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() ); } ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KCustomOptionsDialog::slotPortChanged( int val ) diff --git a/smb4k/dialogs/smb4kmountdialog.cpp b/smb4k/dialogs/smb4kmountdialog.cpp index 597215d..a149a75 100644 --- a/smb4k/dialogs/smb4kmountdialog.cpp +++ b/smb4k/dialogs/smb4kmountdialog.cpp @@ -90,15 +90,15 @@ void Smb4KMountDialog::setupView() layout->addWidget( m_workgroup_input, 2, 1, 0 ); layout->addMultiCellWidget( m_bookmark, 3, 3, 0, 1, 0 ); - connect( m_share_input, TQT_SIGNAL( textChanged ( const TQString & ) ) , - this, TQT_SLOT( slotChangeInputValue( const TQString & ) ) ); + connect( m_share_input, TQ_SIGNAL( textChanged ( const TQString & ) ) , + this, TQ_SLOT( slotChangeInputValue( const TQString & ) ) ); slotChangeInputValue( m_share_input->text() ); } ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KMountDialog::slotChangeInputValue( const TQString& _test) @@ -133,7 +133,7 @@ void Smb4KMountDialog::slotOk() Smb4KCore::bookmarkHandler()->addBookmark( new Smb4KBookmark( host, share, workgroup, ip, TQString() ) ); } - connect( Smb4KCore::mounter(), TQT_SIGNAL( state( int ) ), this, TQT_SLOT( slotMounterStateChanged( int ) ) ); + connect( Smb4KCore::mounter(), TQ_SIGNAL( state( int ) ), this, TQ_SLOT( slotMounterStateChanged( int ) ) ); } else { diff --git a/smb4k/dialogs/smb4kpreviewdialog.cpp b/smb4k/dialogs/smb4kpreviewdialog.cpp index 4186151..4180108 100644 --- a/smb4k/dialogs/smb4kpreviewdialog.cpp +++ b/smb4k/dialogs/smb4kpreviewdialog.cpp @@ -64,17 +64,17 @@ Smb4KPreviewDialog::Smb4KPreviewDialog( Smb4KShareItem *item, TQWidget *parent, setInitialSize( configDialogSize( *(Smb4KSettings::self()->config()), "PreviewDialog" ) ); - connect( m_view, TQT_SIGNAL( executed( TQIconViewItem * ) ), - this, TQT_SLOT( slotItemExecuted( TQIconViewItem * ) ) ); + connect( m_view, TQ_SIGNAL( executed( TQIconViewItem * ) ), + this, TQ_SLOT( slotItemExecuted( TQIconViewItem * ) ) ); - connect( m_toolbar, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotButtonClicked( int ) ) ); + connect( m_toolbar, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotButtonClicked( int ) ) ); - connect( m_combo, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( slotItemActivated( const TQString & ) ) ); + connect( m_combo, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( slotItemActivated( const TQString & ) ) ); - connect( Smb4KCore::previewer(), TQT_SIGNAL( result( Smb4KPreviewItem * ) ), - this, TQT_SLOT( slotReceivedData( Smb4KPreviewItem * ) ) ); + connect( Smb4KCore::previewer(), TQ_SIGNAL( result( Smb4KPreviewItem * ) ), + this, TQ_SLOT( slotReceivedData( Smb4KPreviewItem * ) ) ); m_initialized = Smb4KCore::previewer()->preview( m_item ); } @@ -124,7 +124,7 @@ void Smb4KPreviewDialog::setupView() ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KPreviewDialog::slotReceivedData( Smb4KPreviewItem *item ) diff --git a/smb4k/dialogs/smb4kprintdialog.cpp b/smb4k/dialogs/smb4kprintdialog.cpp index 4081b04..d8165f3 100644 --- a/smb4k/dialogs/smb4kprintdialog.cpp +++ b/smb4k/dialogs/smb4kprintdialog.cpp @@ -115,8 +115,8 @@ m_item( item ), m_ip( TQString() ) /* will collect it in an instant */ enableButton( User1, false ); - connect( requester, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotInputValueChanged( const TQString & ) ) ); + connect( requester, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotInputValueChanged( const TQString & ) ) ); } @@ -127,7 +127,7 @@ Smb4KPrintDialog::~ Smb4KPrintDialog() ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KPrintDialog::slotUser1() @@ -143,7 +143,7 @@ void Smb4KPrintDialog::slotUser1() { enableButton( User1, false ); - connect( Smb4KCore::print(), TQT_SIGNAL( state( int ) ), this, TQT_SLOT( slotPrintStateChanged( int ) ) ); + connect( Smb4KCore::print(), TQ_SIGNAL( state( int ) ), this, TQ_SLOT( slotPrintStateChanged( int ) ) ); } else { diff --git a/smb4k/dialogs/smb4ksynchronizationdialog.cpp b/smb4k/dialogs/smb4ksynchronizationdialog.cpp index 58cf75a..1425709 100644 --- a/smb4k/dialogs/smb4ksynchronizationdialog.cpp +++ b/smb4k/dialogs/smb4ksynchronizationdialog.cpp @@ -109,11 +109,11 @@ m_share( share ) layout->addMultiCellWidget( transfer_widget, 5, 6, 0, 1, 0 ); // Connections - connect( Smb4KCore::synchronizer(), TQT_SIGNAL( progress( const Smb4KSynchronizationInfo & ) ), - this, TQT_SLOT( slotProgress( const Smb4KSynchronizationInfo & ) ) ); + connect( Smb4KCore::synchronizer(), TQ_SIGNAL( progress( const Smb4KSynchronizationInfo & ) ), + this, TQ_SLOT( slotProgress( const Smb4KSynchronizationInfo & ) ) ); - connect( Smb4KCore::synchronizer(), TQT_SIGNAL( finished() ), - this, TQT_SLOT( slotSynchronizationFinished() ) ); + connect( Smb4KCore::synchronizer(), TQ_SIGNAL( finished() ), + this, TQ_SLOT( slotSynchronizationFinished() ) ); setFixedSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() ); @@ -127,7 +127,7 @@ Smb4KSynchronizationDialog::~Smb4KSynchronizationDialog() ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// diff --git a/smb4k/iconview/smb4ksharesiconview.cpp b/smb4k/iconview/smb4ksharesiconview.cpp index 1b08751..50db329 100644 --- a/smb4k/iconview/smb4ksharesiconview.cpp +++ b/smb4k/iconview/smb4ksharesiconview.cpp @@ -55,8 +55,8 @@ Smb4KSharesIconView::Smb4KSharesIconView( TQWidget *parent, const char *name ) m_tooltip = NULL; // Connections: - connect( this, TQT_SIGNAL( pressed( TQIconViewItem * ) ), - this, TQT_SLOT( slotPressed( TQIconViewItem * ) ) ); + connect( this, TQ_SIGNAL( pressed( TQIconViewItem * ) ), + this, TQ_SLOT( slotPressed( TQIconViewItem * ) ) ); } @@ -187,7 +187,7 @@ void Smb4KSharesIconView::contentsMouseMoveEvent( TQMouseEvent *e ) { m_tooltip = new Smb4KSharesIconViewToolTip( item ); - TQTimer::singleShot( 2000, this, TQT_SLOT( slotShowToolTip() ) ); + TQTimer::singleShot( 2000, this, TQ_SLOT( slotShowToolTip() ) ); } else { @@ -207,7 +207,7 @@ void Smb4KSharesIconView::contentsMouseMoveEvent( TQMouseEvent *e ) { m_tooltip = new Smb4KSharesIconViewToolTip( item ); - TQTimer::singleShot( 2000, this, TQT_SLOT( slotShowToolTip() ) ); + TQTimer::singleShot( 2000, this, TQ_SLOT( slotShowToolTip() ) ); } else { @@ -229,7 +229,7 @@ void Smb4KSharesIconView::contentsMouseMoveEvent( TQMouseEvent *e ) ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KSharesIconView::slotPressed( TQIconViewItem *item ) diff --git a/smb4k/iconview/smb4ksharesiconview_part.cpp b/smb4k/iconview/smb4ksharesiconview_part.cpp index 75e5197..c1c5db5 100644 --- a/smb4k/iconview/smb4ksharesiconview_part.cpp +++ b/smb4k/iconview/smb4ksharesiconview_part.cpp @@ -77,23 +77,23 @@ Smb4KSharesIconViewPart::Smb4KSharesIconViewPart( TQWidget *parentWidget, const loadSettings(); // Add some connections: - connect( Smb4KCore::mounter(), TQT_SIGNAL( updated() ), - this, TQT_SLOT( slotMountedShares() ) ); + connect( Smb4KCore::mounter(), TQ_SIGNAL( updated() ), + this, TQ_SLOT( slotMountedShares() ) ); - connect( Smb4KCore::synchronizer(), TQT_SIGNAL( state( int ) ), - this, TQT_SLOT( slotSynchronizationState( int ) ) ); + connect( Smb4KCore::synchronizer(), TQ_SIGNAL( state( int ) ), + this, TQ_SLOT( slotSynchronizationState( int ) ) ); - connect( m_widget, TQT_SIGNAL( contextMenuRequested( TQIconViewItem *, const TQPoint & ) ), - this, TQT_SLOT( slotContextMenuRequested( TQIconViewItem *, const TQPoint & ) ) ); + connect( m_widget, TQ_SIGNAL( contextMenuRequested( TQIconViewItem *, const TQPoint & ) ), + this, TQ_SLOT( slotContextMenuRequested( TQIconViewItem *, const TQPoint & ) ) ); - connect( m_widget, TQT_SIGNAL( selectionChanged( TQIconViewItem * ) ), - this, TQT_SLOT( slotSelectionChanged( TQIconViewItem * ) ) ); + connect( m_widget, TQ_SIGNAL( selectionChanged( TQIconViewItem * ) ), + this, TQ_SLOT( slotSelectionChanged( TQIconViewItem * ) ) ); - connect( m_widget, TQT_SIGNAL( pressed( TQIconViewItem * ) ), - this, TQT_SLOT( slotMouseButtonPressed( TQIconViewItem * ) ) ); + connect( m_widget, TQ_SIGNAL( pressed( TQIconViewItem * ) ), + this, TQ_SLOT( slotMouseButtonPressed( TQIconViewItem * ) ) ); - connect( m_widget, TQT_SIGNAL( executed( TQIconViewItem * ) ), - this, TQT_SLOT( slotFilemanager() ) ); + connect( m_widget, TQ_SIGNAL( executed( TQIconViewItem * ) ), + this, TQ_SLOT( slotFilemanager() ) ); } @@ -106,24 +106,24 @@ void Smb4KSharesIconViewPart::setupActions() { // Create the actions: TDEAction *unmount = new TDEAction( i18n( "&Unmount" ), "drive-harddisk-unmounted", TDEShortcut( CTRL+Key_U ), - this, TQT_SLOT( slotUnmountShare() ), + this, TQ_SLOT( slotUnmountShare() ), actionCollection(), "unmount_action" ); #ifdef __linux__ TDEAction *force = new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk-unmounted", TDEShortcut( CTRL+Key_F ), - this, TQT_SLOT( slotForceUnmountShare() ), + this, TQ_SLOT( slotForceUnmountShare() ), actionCollection(), "force_unmount_action" ); #endif TDEAction *all = new TDEAction( i18n( "U&nmount All" ), "gear", TDEShortcut( CTRL+Key_N ), - this, TQT_SLOT( slotUnmountAllShares() ), + this, TQ_SLOT( slotUnmountAllShares() ), actionCollection(), "unmount_all_action" ); TDEAction *sync = new TDEAction( i18n( "S&ynchronize" ), "go-bottom", TDEShortcut( CTRL+Key_Y ), - this, TQT_SLOT( slotSynchronize() ), + this, TQ_SLOT( slotSynchronize() ), actionCollection(), "synchronize_action" ); TDEAction *konsole = new TDEAction( i18n( "Open with Konso&le" ), "terminal", TDEShortcut( CTRL+Key_L ), - this, TQT_SLOT( slotKonsole() ), + this, TQ_SLOT( slotKonsole() ), actionCollection(), "konsole_action" ); TDEAction *konq = new TDEAction( i18n( "Open with &Konqueror" ), "kfm_home", TDEShortcut( CTRL+Key_K ), - this, TQT_SLOT( slotFilemanager() ), + this, TQ_SLOT( slotFilemanager() ), actionCollection(), "filemanager_action" ); // Disable all actions for now: @@ -217,7 +217,7 @@ void Smb4KSharesIconViewPart::customEvent( TQCustomEvent *e ) ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS (Smb4KSharesIconViewPart) +// SLOT IMPLEMENTATIONS (Smb4KSharesIconViewPart) ///////////////////////////////////////////////////////////////////////////// void Smb4KSharesIconViewPart::slotContextMenuRequested( TQIconViewItem *item, const TQPoint &pos ) diff --git a/smb4k/iconview/smb4ksharesiconviewtooltip.cpp b/smb4k/iconview/smb4ksharesiconviewtooltip.cpp index 04e6c91..74ef3a9 100644 --- a/smb4k/iconview/smb4ksharesiconviewtooltip.cpp +++ b/smb4k/iconview/smb4ksharesiconviewtooltip.cpp @@ -106,7 +106,7 @@ void Smb4KSharesIconViewToolTip::showTip( const TQPoint &pos ) setGeometry( p.x(), p.y(), width(), height() ); polish(); show(); - TQTimer::singleShot( 10000, this, TQT_SLOT( slotHideToolTip() ) ); + TQTimer::singleShot( 10000, this, TQ_SLOT( slotHideToolTip() ) ); } @@ -415,7 +415,7 @@ void Smb4KSharesIconViewToolTip::leaveEvent( TQEvent *e ) ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KSharesIconViewToolTip::slotHideToolTip() diff --git a/smb4k/listview/smb4kshareslistview.cpp b/smb4k/listview/smb4kshareslistview.cpp index 6519698..30b375a 100644 --- a/smb4k/listview/smb4kshareslistview.cpp +++ b/smb4k/listview/smb4kshareslistview.cpp @@ -68,8 +68,8 @@ Smb4KSharesListView::Smb4KSharesListView( TQWidget *parent, const char *name ) m_tooltip = NULL; // Connections: - connect( this, TQT_SIGNAL( pressed( TQListViewItem * ) ), - this, TQT_SLOT( slotPressed( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( pressed( TQListViewItem * ) ), + this, TQ_SLOT( slotPressed( TQListViewItem * ) ) ); } @@ -192,7 +192,7 @@ void Smb4KSharesListView::contentsMouseMoveEvent( TQMouseEvent *e ) { m_tooltip = new Smb4KSharesListViewToolTip( item ); - TQTimer::singleShot( 2000, this, TQT_SLOT( slotShowToolTip() ) ); + TQTimer::singleShot( 2000, this, TQ_SLOT( slotShowToolTip() ) ); } else { @@ -212,7 +212,7 @@ void Smb4KSharesListView::contentsMouseMoveEvent( TQMouseEvent *e ) { m_tooltip = new Smb4KSharesListViewToolTip( item ); - TQTimer::singleShot( 2000, this, TQT_SLOT( slotShowToolTip() ) ); + TQTimer::singleShot( 2000, this, TQ_SLOT( slotShowToolTip() ) ); } else { @@ -234,7 +234,7 @@ void Smb4KSharesListView::contentsMouseMoveEvent( TQMouseEvent *e ) ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KSharesListView::slotPressed( TQListViewItem *item ) diff --git a/smb4k/listview/smb4kshareslistview_part.cpp b/smb4k/listview/smb4kshareslistview_part.cpp index 8ab0667..2900484 100644 --- a/smb4k/listview/smb4kshareslistview_part.cpp +++ b/smb4k/listview/smb4kshareslistview_part.cpp @@ -80,23 +80,23 @@ Smb4KSharesListViewPart::Smb4KSharesListViewPart( TQWidget *parentWidget, const loadSettings(); // Add some connections: - connect( Smb4KCore::mounter(), TQT_SIGNAL( updated() ), - this, TQT_SLOT( slotMountedShares() ) ); + connect( Smb4KCore::mounter(), TQ_SIGNAL( updated() ), + this, TQ_SLOT( slotMountedShares() ) ); - connect( Smb4KCore::synchronizer(), TQT_SIGNAL( state( int ) ), - this, TQT_SLOT( slotSynchronizationState( int ) ) ); + connect( Smb4KCore::synchronizer(), TQ_SIGNAL( state( int ) ), + this, TQ_SLOT( slotSynchronizationState( int ) ) ); - connect( m_widget, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint & , int) ), - this, TQT_SLOT( slotContextMenuRequested( TQListViewItem *, const TQPoint &, int ) ) ); + connect( m_widget, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint & , int) ), + this, TQ_SLOT( slotContextMenuRequested( TQListViewItem *, const TQPoint &, int ) ) ); - connect( m_widget, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); + connect( m_widget, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); - connect( m_widget, TQT_SIGNAL( pressed( TQListViewItem * ) ), - this, TQT_SLOT( slotMouseButtonPressed( TQListViewItem * ) ) ); + connect( m_widget, TQ_SIGNAL( pressed( TQListViewItem * ) ), + this, TQ_SLOT( slotMouseButtonPressed( TQListViewItem * ) ) ); - connect( m_widget, TQT_SIGNAL( executed( TQListViewItem * ) ), - this, TQT_SLOT( slotFilemanager() ) ); + connect( m_widget, TQ_SIGNAL( executed( TQListViewItem * ) ), + this, TQ_SLOT( slotFilemanager() ) ); } @@ -109,24 +109,24 @@ void Smb4KSharesListViewPart::setupActions() { // Create the actions: TDEAction *unmount = new TDEAction( i18n( "&Unmount" ), "drive-harddisk-unmounted", TDEShortcut( CTRL+Key_U ), - this, TQT_SLOT( slotUnmountShare() ), + this, TQ_SLOT( slotUnmountShare() ), actionCollection(), "unmount_action" ); #ifdef __linux__ TDEAction *force = new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk-unmounted", TDEShortcut( CTRL+Key_F ), - this, TQT_SLOT( slotForceUnmountShare() ), + this, TQ_SLOT( slotForceUnmountShare() ), actionCollection(), "force_unmount_action" ); #endif TDEAction *all = new TDEAction( i18n( "U&nmount All" ), "gear", TDEShortcut( CTRL+Key_N ), - this, TQT_SLOT( slotUnmountAllShares() ), + this, TQ_SLOT( slotUnmountAllShares() ), actionCollection(), "unmount_all_action" ); TDEAction *sync = new TDEAction( i18n( "S&ynchronize" ), "go-bottom", TDEShortcut( CTRL+Key_Y ), - this, TQT_SLOT( slotSynchronize() ), + this, TQ_SLOT( slotSynchronize() ), actionCollection(), "synchronize_action" ); TDEAction *konsole = new TDEAction( i18n( "Open with Konso&le" ), "terminal", TDEShortcut( CTRL+Key_L ), - this, TQT_SLOT( slotKonsole() ), + this, TQ_SLOT( slotKonsole() ), actionCollection(), "konsole_action" ); TDEAction *konq = new TDEAction( i18n( "Open with &Konqueror" ), "kfm_home", TDEShortcut( CTRL+Key_K ), - this, TQT_SLOT( slotFilemanager() ), + this, TQ_SLOT( slotFilemanager() ), actionCollection(), "filemanager_action" ); // Disable all actions for now: @@ -331,7 +331,7 @@ void Smb4KSharesListViewPart::customEvent( TQCustomEvent *e ) ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS (Smb4KSharesListViewPart) +// SLOT IMPLEMENTATIONS (Smb4KSharesListViewPart) ///////////////////////////////////////////////////////////////////////////// void Smb4KSharesListViewPart::slotContextMenuRequested( TQListViewItem *item, const TQPoint &pos, int /*col*/ ) diff --git a/smb4k/listview/smb4kshareslistviewtooltip.cpp b/smb4k/listview/smb4kshareslistviewtooltip.cpp index 8e379c8..e432421 100644 --- a/smb4k/listview/smb4kshareslistviewtooltip.cpp +++ b/smb4k/listview/smb4kshareslistviewtooltip.cpp @@ -106,7 +106,7 @@ void Smb4KSharesListViewToolTip::showTip( const TQPoint &pos ) setGeometry( p.x(), p.y(), width(), height() ); polish(); show(); - TQTimer::singleShot( 10000, this, TQT_SLOT( slotHideToolTip() ) ); + TQTimer::singleShot( 10000, this, TQ_SLOT( slotHideToolTip() ) ); } @@ -415,7 +415,7 @@ void Smb4KSharesListViewToolTip::leaveEvent( TQEvent *e ) ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KSharesListViewToolTip::slotHideToolTip() diff --git a/smb4k/searchdlg/smb4ksearchdialog.cpp b/smb4k/searchdlg/smb4ksearchdialog.cpp index f13c21e..c9b4612 100644 --- a/smb4k/searchdlg/smb4ksearchdialog.cpp +++ b/smb4k/searchdlg/smb4ksearchdialog.cpp @@ -47,8 +47,8 @@ Smb4KSearchDialog::Smb4KSearchDialog( TQWidget *parent, const char *name ) // Tool bar m_tool_bar = new TDEToolBar( this, "SearchDialogToolBar", true, true ); - m_tool_bar->insertCombo( TQStringList(), Combo, true, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( slotReturnPressed() ), true, + m_tool_bar->insertCombo( TQStringList(), Combo, true, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( slotReturnPressed() ), true, i18n( "Enter the search string here." ), -1, Combo ); m_tool_bar->setItemAutoSized( Combo, true ); @@ -70,17 +70,17 @@ Smb4KSearchDialog::Smb4KSearchDialog( TQWidget *parent, const char *name ) m_search_string = TQString(); // Connections: - connect( m_tool_bar->getCombo( Combo ), TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotTextChanged( const TQString & ) ) ); + connect( m_tool_bar->getCombo( Combo ), TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotTextChanged( const TQString & ) ) ); - connect( m_tool_bar, TQT_SIGNAL( pressed( int ) ), - this, TQT_SLOT( slotButtonPressed( int ) ) ); + connect( m_tool_bar, TQ_SIGNAL( pressed( int ) ), + this, TQ_SLOT( slotButtonPressed( int ) ) ); - connect( m_list_view, TQT_SIGNAL( clicked( TQListViewItem * ) ), - this, TQT_SLOT( slotItemClicked( TQListViewItem * ) ) ); + connect( m_list_view, TQ_SIGNAL( clicked( TQListViewItem * ) ), + this, TQ_SLOT( slotItemClicked( TQListViewItem * ) ) ); - connect( m_list_view, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); + connect( m_list_view, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); } @@ -98,7 +98,7 @@ const TQString &Smb4KSearchDialog::searchString() ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KSearchDialog::slotReturnPressed() diff --git a/smb4k/searchdlg/smb4ksearchdialog_part.cpp b/smb4k/searchdlg/smb4ksearchdialog_part.cpp index 75c76e9..3c3ea5e 100644 --- a/smb4k/searchdlg/smb4ksearchdialog_part.cpp +++ b/smb4k/searchdlg/smb4ksearchdialog_part.cpp @@ -65,17 +65,17 @@ Smb4KSearchDialogPart::Smb4KSearchDialogPart( TQWidget *parentWidget, const char m_serial_number = 0; // Connections: - connect( m_widget, TQT_SIGNAL( buttonPressed( int ) ), - this, TQT_SLOT( slotButtonPressed( int ) ) ); + connect( m_widget, TQ_SIGNAL( buttonPressed( int ) ), + this, TQ_SLOT( slotButtonPressed( int ) ) ); - connect( m_widget->listView(), TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( slotItemDoubleClicked( TQListViewItem * ) ) ); + connect( m_widget->listView(), TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( slotItemDoubleClicked( TQListViewItem * ) ) ); - connect( Smb4KCore::scanner(), TQT_SIGNAL( searchResult( Smb4KHostItem * ) ), - this, TQT_SLOT( slotReceivedSearchResult( Smb4KHostItem * ) ) ); + connect( Smb4KCore::scanner(), TQ_SIGNAL( searchResult( Smb4KHostItem * ) ), + this, TQ_SLOT( slotReceivedSearchResult( Smb4KHostItem * ) ) ); - connect( Smb4KCore::scanner(), TQT_SIGNAL( hostListChanged() ), - this, TQT_SLOT( slotCheckItemIsKnown() ) ); + connect( Smb4KCore::scanner(), TQ_SIGNAL( hostListChanged() ), + this, TQ_SLOT( slotCheckItemIsKnown() ) ); } @@ -111,7 +111,7 @@ void Smb4KSearchDialogPart::customEvent( TQCustomEvent *e ) ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS (Smb4KSearchDialogPart) +// SLOT IMPLEMENTATIONS (Smb4KSearchDialogPart) ///////////////////////////////////////////////////////////////////////////// void Smb4KSearchDialogPart::slotButtonPressed( int button_id ) diff --git a/smb4k/smb4k.cpp b/smb4k/smb4k.cpp index 3893eb8..03a0828 100644 --- a/smb4k/smb4k.cpp +++ b/smb4k/smb4k.cpp @@ -124,17 +124,17 @@ Smb4KApp::Smb4KApp( TQWidget *parent, const char *name ) } // Connections - connect( actionCollection(), TQT_SIGNAL( actionHighlighted( TDEAction * ) ), - this, TQT_SLOT( slotActionHighlighted( TDEAction * ) ) ); + connect( actionCollection(), TQ_SIGNAL( actionHighlighted( TDEAction * ) ), + this, TQ_SLOT( slotActionHighlighted( TDEAction * ) ) ); - connect( Smb4KCore::self(), TQT_SIGNAL( runStateChanged() ), - this, TQT_SLOT( slotRunStateChanged() ) ); + connect( Smb4KCore::self(), TQ_SIGNAL( runStateChanged() ), + this, TQ_SLOT( slotRunStateChanged() ) ); - connect( Smb4KCore::bookmarkHandler(), TQT_SIGNAL( bookmarksUpdated() ), - this, TQT_SLOT( slotSetupBookmarksMenu() ) ); + connect( Smb4KCore::bookmarkHandler(), TQ_SIGNAL( bookmarksUpdated() ), + this, TQ_SLOT( slotSetupBookmarksMenu() ) ); - connect( Smb4KCore::mounter(), TQT_SIGNAL( updated() ), - this, TQT_SLOT( slotShareListUpdated() ) ); + connect( Smb4KCore::mounter(), TQ_SIGNAL( updated() ), + this, TQ_SLOT( slotShareListUpdated() ) ); } @@ -147,7 +147,7 @@ void Smb4KApp::setupActions() { actionCollection()->setHighlightingEnabled( true ); - (void) KStdAction::quit( this, TQT_SLOT( slotQuit() ), actionCollection(), "quit_action" ); + (void) KStdAction::quit( this, TQ_SLOT( slotQuit() ), actionCollection(), "quit_action" ); // Set up the "Settings" menu: setStandardToolBarMenuEnabled( true ); @@ -157,11 +157,11 @@ void Smb4KApp::setupActions() actionCollection(), "view_modes_menu" ); TDERadioAction *icon_view = new TDERadioAction( i18n( "&Icon View" ), "view_icon", CTRL+Key_I, - this, TQT_SLOT( slotChangeSharesView() ), actionCollection(), "icon_view_action" ); + this, TQ_SLOT( slotChangeSharesView() ), actionCollection(), "icon_view_action" ); icon_view->setExclusiveGroup( "SharesViewActions" ); TDERadioAction *list_view = new TDERadioAction( i18n( "List Vie&w" ), "view_detailed", CTRL+Key_W, - this, TQT_SLOT( slotChangeSharesView() ), actionCollection(), "list_view_action" ); + this, TQ_SLOT( slotChangeSharesView() ), actionCollection(), "list_view_action" ); list_view->setExclusiveGroup( "SharesViewActions" ); switch ( Smb4KSettings::sharesView() ) @@ -187,7 +187,7 @@ void Smb4KApp::setupActions() view_modes->insert( icon_view, -1 ); view_modes->insert( list_view, -1 ); - (void) KStdAction::preferences( this, TQT_SLOT( slotConfigDialog() ), actionCollection(), "configure_action" ); + (void) KStdAction::preferences( this, TQ_SLOT( slotConfigDialog() ), actionCollection(), "configure_action" ); // Notes: // (1) Actions from the parts will be included by setupView(). @@ -261,7 +261,7 @@ void Smb4KApp::setupView() createGUI( m_shares_part ); - accel()->insert( i18n( "Jump to shares view" ).utf8().data(), CTRL+Key_3, this, TQT_SLOT( slotJumpToSharesView() ), false, true ); + accel()->insert( i18n( "Jump to shares view" ).utf8().data(), CTRL+Key_3, this, TQ_SLOT( slotJumpToSharesView() ), false, true ); } } else @@ -290,7 +290,7 @@ void Smb4KApp::setupView() factory()->addClient( m_browser_part ); - accel()->insert( i18n( "Jump to network browser" ).utf8().data(), CTRL+Key_1, this, TQT_SLOT( slotJumpToNetworkBrowser() ), false, true ); + accel()->insert( i18n( "Jump to network browser" ).utf8().data(), CTRL+Key_1, this, TQ_SLOT( slotJumpToNetworkBrowser() ), false, true ); } } else @@ -329,7 +329,7 @@ void Smb4KApp::setupView() factory()->addClient( m_search_part ); - accel()->insert( i18n( "Jump to search dialog" ).utf8().data(), CTRL+Key_2, this, TQT_SLOT( slotJumpToSearchDialog() ), false, true ); + accel()->insert( i18n( "Jump to search dialog" ).utf8().data(), CTRL+Key_2, this, TQ_SLOT( slotJumpToSearchDialog() ), false, true ); } } else @@ -350,11 +350,11 @@ void Smb4KApp::setupSystemTray() m_system_tray = new Smb4KSystemTray( this, "SystemTray" ); } - connect( m_system_tray, TQT_SIGNAL( quitSelected() ), - this, TQT_SLOT( slotQuit() ) ); + connect( m_system_tray, TQ_SIGNAL( quitSelected() ), + this, TQ_SLOT( slotQuit() ) ); - connect( m_system_tray, TQT_SIGNAL( settingsChanged() ), - this, TQT_SLOT( slotSettingsChanged() ) ); + connect( m_system_tray, TQ_SIGNAL( settingsChanged() ), + this, TQ_SLOT( slotSettingsChanged() ) ); m_system_tray->embed( Smb4KSettings::embedIntoSystemTray() ); } @@ -488,7 +488,7 @@ void Smb4KApp::timerEvent( TQTimerEvent * ) ///////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////// void Smb4KApp::slotQuit() @@ -575,7 +575,7 @@ void Smb4KApp::slotConfigDialog() if ( dlg ) { - connect( dlg, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotSettingsChanged() ) ); + connect( dlg, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotSettingsChanged() ) ); dlg->show(); } @@ -817,7 +817,7 @@ void Smb4KApp::slotSetupBookmarksMenu() // Create the "Edit Bookmarks" action: bookmark_actions.append( new TDEAction( i18n( "&Edit Bookmarks" ), "bookmark", CTRL+Key_E, - this, TQT_SLOT( slotBookmarkEditor() ), actionCollection(), + this, TQ_SLOT( slotBookmarkEditor() ), actionCollection(), "edit_bookmarks_action" ) ); // Get the "Add Bookmark" action from the browser: @@ -888,7 +888,7 @@ void Smb4KApp::slotSetupBookmarksMenu() { TDEAction *a = new TDEAction( *it, "folder", TDEShortcut::null(), 0, 0, actionCollection(), (*it).utf8() ); a->setGroup( "Bookmarks" ); - connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotBookmarkActivated() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( slotBookmarkActivated() ) ); bookmark_list.append( a ); } diff --git a/smb4k/smb4ksystemtray.cpp b/smb4k/smb4ksystemtray.cpp index d675b36..8a87905 100644 --- a/smb4k/smb4ksystemtray.cpp +++ b/smb4k/smb4ksystemtray.cpp @@ -70,9 +70,9 @@ Smb4KSystemTray::Smb4KSystemTray( TQWidget *parent, const char *name ) actionCollection(), "st_bookmark_action_menu" ); TDEActionSeparator *sep = new TDEActionSeparator( this ); TDEAction *manual_mount = new TDEAction( i18n( "M&ount Manually" ), "connect_creating", - 0, this, TQT_SLOT( slotMountManually() ), + 0, this, TQ_SLOT( slotMountManually() ), actionCollection(), "st_mount_manually_action" ); - TDEAction *configure = KStdAction::preferences( this, TQT_SLOT( slotConfigDialog() ), + TDEAction *configure = KStdAction::preferences( this, TQ_SLOT( slotConfigDialog() ), actionCollection(), "st_configure_action" ); m_shares_menu->plug( contextMenu() ); @@ -86,17 +86,17 @@ Smb4KSystemTray::Smb4KSystemTray( TQWidget *parent, const char *name ) slotSetupSharesMenu(); // Connections: - connect( actionCollection(), TQT_SIGNAL( actionHighlighted( TDEAction * ) ), - this, TQT_SLOT( slotActionHighlighted( TDEAction * ) ) ); + connect( actionCollection(), TQ_SIGNAL( actionHighlighted( TDEAction * ) ), + this, TQ_SLOT( slotActionHighlighted( TDEAction * ) ) ); - connect( Smb4KCore::bookmarkHandler(), TQT_SIGNAL( bookmarksUpdated() ), - this, TQT_SLOT( slotSetupBookmarksMenu() ) ); + connect( Smb4KCore::bookmarkHandler(), TQ_SIGNAL( bookmarksUpdated() ), + this, TQ_SLOT( slotSetupBookmarksMenu() ) ); - connect( Smb4KCore::mounter(), TQT_SIGNAL( updated() ), - this, TQT_SLOT( slotEnableBookmarks() ) ); + connect( Smb4KCore::mounter(), TQ_SIGNAL( updated() ), + this, TQ_SLOT( slotEnableBookmarks() ) ); - connect( Smb4KCore::mounter(), TQT_SIGNAL( updated() ), - this, TQT_SLOT( slotSetupSharesMenu() ) ); + connect( Smb4KCore::mounter(), TQ_SIGNAL( updated() ), + this, TQ_SLOT( slotSetupSharesMenu() ) ); // Connection to quitSelected() signal must be done in parent widget. } @@ -134,7 +134,7 @@ void Smb4KSystemTray::loadSettings() ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KSystemTray::slotMountManually() @@ -181,8 +181,8 @@ void Smb4KSystemTray::slotConfigDialog() // To make sure we do not connect the config dialog several times // to slotSettingsChanged(), we break the connection first and re- // establish it afterwards: - disconnect( dlg, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotSettingsChanged() ) ); - connect( dlg, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotSettingsChanged() ) ); + disconnect( dlg, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotSettingsChanged() ) ); + connect( dlg, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotSettingsChanged() ) ); return; } @@ -204,7 +204,7 @@ void Smb4KSystemTray::slotConfigDialog() // ... and show it. if ( dlg ) { - connect( dlg, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotSettingsChanged() ) ); + connect( dlg, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotSettingsChanged() ) ); dlg->show(); } @@ -234,7 +234,7 @@ void Smb4KSystemTray::slotSetupBookmarksMenu() { // OK, build the menu from ground up: TDEAction *edit_bookmarks = new TDEAction( i18n( "&Edit Bookmarks" ), "bookmark", 0, - this, TQT_SLOT( slotBookmarkEditor() ), actionCollection(), + this, TQ_SLOT( slotBookmarkEditor() ), actionCollection(), "st_edit_bookmarks_action" ); edit_bookmarks->setGroup( "BookmarkActions" ); edit_bookmarks->plug( m_bookmarks_menu->popupMenu() ); @@ -291,7 +291,7 @@ void Smb4KSystemTray::slotSetupBookmarksMenu() // Create the bookmark action: TDEAction *a = new TDEAction( *it, "folder", TDEShortcut::null(), 0, 0, actionCollection(), ("st_"+*it).utf8() ); a->setGroup( "Bookmarks" ); - connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotBookmarkActivated() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( slotBookmarkActivated() ) ); // Let's have a look if the bookmark action has to be enabled or disabled: TQString name; @@ -444,7 +444,7 @@ void Smb4KSystemTray::slotSetupSharesMenu() { // OK, build the menu from ground up: TDEAction *unmount_all = new TDEAction( i18n( "U&nmount All" ), "gear", TDEShortcut::null(), - this, TQT_SLOT( slotUnmountAllShares() ), actionCollection(), + this, TQ_SLOT( slotUnmountAllShares() ), actionCollection(), "st_unmount_all_action" ); unmount_all->setGroup( "ShareActions" ); unmount_all->plug( m_shares_menu->popupMenu(), 0 ); @@ -788,26 +788,26 @@ void Smb4KSystemTray::slotSetupSharesMenu() // Define the actions that can be performed on a share from within // the system tray widget: TDEAction *umount = new TDEAction( i18n( "&Unmount" ), "drive-harddisk-unmounted", TDEShortcut::null(), this, - TQT_SLOT( slotUnmountShare() ), actionCollection(), "st_[unmount]_"+(*it)->canonicalPath() ); + TQ_SLOT( slotUnmountShare() ), actionCollection(), "st_[unmount]_"+(*it)->canonicalPath() ); umount->setGroup( "ShareActions" ); #ifdef __linux__ TDEAction *force_umount = new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk-unmounted", TDEShortcut::null(), this, - TQT_SLOT( slotForceUnmountShare() ), actionCollection(), "st_[force]_"+(*it)->canonicalPath() ); + TQ_SLOT( slotForceUnmountShare() ), actionCollection(), "st_[force]_"+(*it)->canonicalPath() ); force_umount->setGroup( "ShareActions" ); force_umount->setEnabled( Smb4KSettings::useForceUnmount() ); #endif TDEAction *synchronize = new TDEAction( i18n( "S&ynchronize" ), "go-bottom", TDEShortcut::null(), this, - TQT_SLOT( slotSynchronize() ), actionCollection(), "st_[synchronize]_"+(*it)->canonicalPath() ); + TQ_SLOT( slotSynchronize() ), actionCollection(), "st_[synchronize]_"+(*it)->canonicalPath() ); synchronize->setGroup( "ShareActions" ); synchronize->setEnabled( !Smb4KSettings::rsync().isEmpty() ); TDEAction *konsole = new TDEAction( i18n( "Open with Konso&le" ), "terminal", TDEShortcut::null(), this, - TQT_SLOT( slotKonsole() ), actionCollection(), "st_[konsole]_"+(*it)->canonicalPath() ); + TQ_SLOT( slotKonsole() ), actionCollection(), "st_[konsole]_"+(*it)->canonicalPath() ); konsole->setGroup( "ShareActions" ); konsole->setEnabled( !Smb4KSettings::konsole().isEmpty() ); TDEAction *konqueror = new TDEAction( i18n( "Open with &Konqueror" ), "kfm_home", TDEShortcut::null(), this, - TQT_SLOT( slotFilemanager() ), actionCollection(), "st_[filemanager]_"+(*it)->canonicalPath() ); + TQ_SLOT( slotFilemanager() ), actionCollection(), "st_[filemanager]_"+(*it)->canonicalPath() ); konqueror->setGroup( "ShareActions" ); // Set up the action submenu: