diff options
Diffstat (limited to 'smb4k/smb4ksystemtray.cpp')
-rw-r--r-- | smb4k/smb4ksystemtray.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/smb4k/smb4ksystemtray.cpp b/smb4k/smb4ksystemtray.cpp index 44dad2b..d675b36 100644 --- a/smb4k/smb4ksystemtray.cpp +++ b/smb4k/smb4ksystemtray.cpp @@ -68,11 +68,11 @@ Smb4KSystemTray::Smb4KSystemTray( TQWidget *parent, const char *name ) actionCollection(), "st_mounted_shares_action_menu" ); m_bookmarks_menu = new TDEActionMenu( i18n( "Bookmarks" ), "bookmark_folder", actionCollection(), "st_bookmark_action_menu" ); - TDEActionSeparator *sep = new TDEActionSeparator( TQT_TQOBJECT(this) ); + TDEActionSeparator *sep = new TDEActionSeparator( this ); TDEAction *manual_mount = new TDEAction( i18n( "M&ount Manually" ), "connect_creating", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotMountManually() ), + 0, this, TQT_SLOT( slotMountManually() ), actionCollection(), "st_mount_manually_action" ); - TDEAction *configure = KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( slotConfigDialog() ), + TDEAction *configure = KStdAction::preferences( this, TQT_SLOT( slotConfigDialog() ), actionCollection(), "st_configure_action" ); m_shares_menu->plug( contextMenu() ); @@ -143,11 +143,11 @@ void Smb4KSystemTray::slotMountManually() if ( parentWidget() ) { - dlg = static_cast<Smb4KMountDialog *>( TQT_TQWIDGET(parentWidget()->child( "MountDialog", "Smb4KMountDialog", true )) ); + dlg = static_cast<Smb4KMountDialog *>( parentWidget()->child( "MountDialog", "Smb4KMountDialog", true ) ); } else { - dlg = static_cast<Smb4KMountDialog *>( TQT_TQWIDGET(child( "MountDialog", "Smb4KMountDialog", true )) ); + dlg = static_cast<Smb4KMountDialog *>( child( "MountDialog", "Smb4KMountDialog", true ) ); } if ( !dlg ) @@ -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() ), TQT_TQOBJECT(this), TQT_SLOT( slotSettingsChanged() ) ); - connect( dlg, TQT_SIGNAL( settingsChanged() ), TQT_TQOBJECT(this), TQT_SLOT( slotSettingsChanged() ) ); + disconnect( dlg, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotSettingsChanged() ) ); + connect( dlg, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotSettingsChanged() ) ); return; } @@ -194,17 +194,17 @@ void Smb4KSystemTray::slotConfigDialog() { if ( parentWidget() && parentWidget()->isShown() ) { - dlg = static_cast<TDEConfigDialog *>( TQT_TQWIDGET(config_factory->create( TQT_TQOBJECT(parentWidget()), "ConfigDialog", "TDEConfigDialog" )) ); + dlg = static_cast<TDEConfigDialog *>( config_factory->create( parentWidget(), "ConfigDialog", "TDEConfigDialog" ) ); } else { - dlg = static_cast<TDEConfigDialog *>( TQT_TQWIDGET(config_factory->create( TQT_TQOBJECT(this), "ConfigDialog", "TDEConfigDialog" )) ); + dlg = static_cast<TDEConfigDialog *>( config_factory->create( this, "ConfigDialog", "TDEConfigDialog" ) ); } // ... and show it. if ( dlg ) { - connect( dlg, TQT_SIGNAL( settingsChanged() ), TQT_TQOBJECT(this), TQT_SLOT( slotSettingsChanged() ) ); + connect( dlg, TQT_SIGNAL( settingsChanged() ), this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( slotBookmarkEditor() ), actionCollection(), + this, TQT_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() ), TQT_TQOBJECT(this), TQT_SLOT( slotBookmarkActivated() ) ); + connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotBookmarkActivated() ) ); // Let's have a look if the bookmark action has to be enabled or disabled: TQString name; @@ -339,11 +339,11 @@ void Smb4KSystemTray::slotBookmarkEditor() if ( parentWidget() ) { - dlg = static_cast<Smb4KBookmarkEditor *>( TQT_TQWIDGET(parentWidget()->child( "BookmarkEditor", "Smb4KBookmarkEditor", true )) ); + dlg = static_cast<Smb4KBookmarkEditor *>( parentWidget()->child( "BookmarkEditor", "Smb4KBookmarkEditor", true ) ); } else { - dlg = static_cast<Smb4KBookmarkEditor *>( TQT_TQWIDGET(child( "BookmarkEditor", "Smb4KBookmarkEditor", true )) ); + dlg = static_cast<Smb4KBookmarkEditor *>( child( "BookmarkEditor", "Smb4KBookmarkEditor", true ) ); } if ( !dlg ) @@ -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(), - TQT_TQOBJECT(this), TQT_SLOT( slotUnmountAllShares() ), actionCollection(), + this, TQT_SLOT( slotUnmountAllShares() ), actionCollection(), "st_unmount_all_action" ); unmount_all->setGroup( "ShareActions" ); unmount_all->plug( m_shares_menu->popupMenu(), 0 ); @@ -787,26 +787,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(), TQT_TQOBJECT(this), + TDEAction *umount = new TDEAction( i18n( "&Unmount" ), "drive-harddisk-unmounted", TDEShortcut::null(), this, TQT_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(), TQT_TQOBJECT(this), + TDEAction *force_umount = new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk-unmounted", TDEShortcut::null(), this, TQT_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(), TQT_TQOBJECT(this), + TDEAction *synchronize = new TDEAction( i18n( "S&ynchronize" ), "go-bottom", TDEShortcut::null(), this, TQT_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(), TQT_TQOBJECT(this), + TDEAction *konsole = new TDEAction( i18n( "Open with Konso&le" ), "terminal", TDEShortcut::null(), this, TQT_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(), TQT_TQOBJECT(this), + TDEAction *konqueror = new TDEAction( i18n( "Open with &Konqueror" ), "kfm_home", TDEShortcut::null(), this, TQT_SLOT( slotFilemanager() ), actionCollection(), "st_[filemanager]_"+(*it)->canonicalPath() ); konqueror->setGroup( "ShareActions" ); |