diff --git a/plugin/smb4k_konqplugin.cpp b/plugin/smb4k_konqplugin.cpp index fa71d4b..c30280d 100644 --- a/plugin/smb4k_konqplugin.cpp +++ b/plugin/smb4k_konqplugin.cpp @@ -78,7 +78,7 @@ KonqSidebar_Smb4K::KonqSidebar_Smb4K(TDEInstance *inst,TQObject *parent,TQWidget if ( browser_factory ) { - m_browser_part = static_cast( browser_factory->create( TQT_TQOBJECT(widget), "BrowserPart", "KParts::Part", TQStringList( "konqplugin=\"true\"" ) ) ); + m_browser_part = static_cast( browser_factory->create( widget, "BrowserPart", "KParts::Part", TQStringList( "konqplugin=\"true\"" ) ) ); // Do nothing here. The network scan (and the mounting of recently used // shares) will be done by Smb4KCore::init() below. @@ -151,7 +151,7 @@ void KonqSidebar_Smb4K::slotSearch() TQFrame *frame = searchDialog->plainPage(); - m_search_part = static_cast( search_factory->create( TQT_TQOBJECT(frame), "SearchDialogPart", "KParts::Part" ) ); + m_search_part = static_cast( search_factory->create( frame, "SearchDialogPart", "KParts::Part" ) ); if ( m_search_part ) { @@ -188,7 +188,7 @@ void KonqSidebar_Smb4K::slotSmb4KOptionsDlg() if ( config_factory ) { - TDEConfigDialog *dlg = static_cast( TQT_TQWIDGET(config_factory->create( TQT_TQOBJECT(widget), "ConfigDialog", "TDEConfigDialog" )) ); + TDEConfigDialog *dlg = static_cast( config_factory->create( widget, "ConfigDialog", "TDEConfigDialog" ) ); if ( dlg ) { diff --git a/smb4k/browser/smb4knetworkbrowser_part.cpp b/smb4k/browser/smb4knetworkbrowser_part.cpp index b3d1662..14d4495 100644 --- a/smb4k/browser/smb4knetworkbrowser_part.cpp +++ b/smb4k/browser/smb4knetworkbrowser_part.cpp @@ -1477,7 +1477,7 @@ void Smb4KNetworkBrowserPart::slotAbort() void Smb4KNetworkBrowserPart::slotMountManually() { - Smb4KMountDialog *dlg = static_cast( TQT_TQWIDGET(m_widget->child( "MountDialog", "Smb4KMountDialog", true )) ); + Smb4KMountDialog *dlg = static_cast( m_widget->child( "MountDialog", "Smb4KMountDialog", true ) ); if ( !dlg ) { @@ -1534,7 +1534,7 @@ void Smb4KNetworkBrowserPart::slotAuthentication() void Smb4KNetworkBrowserPart::slotCustomOptions() { Smb4KCustomOptionsDialog *dlg = static_cast( - TQT_TQWIDGET(m_widget->child( "CustomOptionsDialog", "Smb4KCustomOptionsDialog", true )) ); + m_widget->child( "CustomOptionsDialog", "Smb4KCustomOptionsDialog", true ) ); Smb4KNetworkBrowserItem *item = static_cast( m_widget->currentItem() ); if ( !dlg && item ) @@ -1618,7 +1618,7 @@ void Smb4KNetworkBrowserPart::slotPreview() void Smb4KNetworkBrowserPart::slotPrint() { - Smb4KPrintDialog *dlg = static_cast( TQT_TQWIDGET(m_widget->child( "PrintDialog", "Smb4KPrintDialog", true )) ); + Smb4KPrintDialog *dlg = static_cast( m_widget->child( "PrintDialog", "Smb4KPrintDialog", true ) ); Smb4KNetworkBrowserItem *item = static_cast( m_widget->currentItem() ); if ( !dlg && item ) diff --git a/smb4k/browser/smb4knetworkbrowsertooltip.cpp b/smb4k/browser/smb4knetworkbrowsertooltip.cpp index 30fea3c..ddd505c 100644 --- a/smb4k/browser/smb4knetworkbrowsertooltip.cpp +++ b/smb4k/browser/smb4knetworkbrowsertooltip.cpp @@ -267,7 +267,7 @@ void Smb4KNetworkBrowserToolTip::update() { case Smb4KNetworkBrowserItem::Workgroup: { - TQLabel *master_label = static_cast( TQT_TQWIDGET(child( "MasterBrowser", "TQLabel", true )) ); + TQLabel *master_label = static_cast( child( "MasterBrowser", "TQLabel", true ) ); if ( master_label ) { @@ -282,9 +282,9 @@ void Smb4KNetworkBrowserToolTip::update() } case Smb4KNetworkBrowserItem::Host: { - TQLabel *os_label = static_cast( TQT_TQWIDGET(child( "OSString", "TQLabel", true )) ); - TQLabel *server_label = static_cast( TQT_TQWIDGET(child( "ServerString", "TQLabel", true )) ); - TQLabel *ip_label = static_cast( TQT_TQWIDGET(child( "IPAddress", "TQLabel", true )) ); + TQLabel *os_label = static_cast( child( "OSString", "TQLabel", true ) ); + TQLabel *server_label = static_cast( child( "ServerString", "TQLabel", true ) ); + TQLabel *ip_label = static_cast( child( "IPAddress", "TQLabel", true ) ); if ( os_label ) { @@ -317,7 +317,7 @@ void Smb4KNetworkBrowserToolTip::update() } case Smb4KNetworkBrowserItem::Share: { - TQLabel *ip_label = static_cast( TQT_TQWIDGET(child( "IPAddress", "TQLabel", true )) ); + TQLabel *ip_label = static_cast( child( "IPAddress", "TQLabel", true ) ); if ( ip_label ) { diff --git a/smb4k/configdlg/smb4kauthoptions.cpp b/smb4k/configdlg/smb4kauthoptions.cpp index daab696..bd352c8 100644 --- a/smb4k/configdlg/smb4kauthoptions.cpp +++ b/smb4k/configdlg/smb4kauthoptions.cpp @@ -109,11 +109,11 @@ void Smb4KAuthOptions::slotTDEWalletButtonState( int state ) { if ( state == TQCheckBox::On ) { - static_cast( TQT_TQWIDGET(child( "DefaultLoginBox", "TQGroupBox", true )) )->setEnabled( true ); + static_cast( child( "DefaultLoginBox", "TQGroupBox", true ) )->setEnabled( true ); } else if ( state == TQCheckBox::Off ) { - static_cast( TQT_TQWIDGET(child( "DefaultLoginBox", "TQGroupBox", true )) )->setEnabled( false ); + static_cast( child( "DefaultLoginBox", "TQGroupBox", true ) )->setEnabled( false ); } } @@ -122,11 +122,11 @@ void Smb4KAuthOptions::slotDefaultAuthButtonState( int state ) { if ( state == TQCheckBox::On ) { - static_cast( TQT_TQWIDGET(child( "DefaultAuthWidget", "TQWidget", true )) )->setEnabled( true ); + static_cast( child( "DefaultAuthWidget", "TQWidget", true ) )->setEnabled( true ); } else if ( state == TQCheckBox::Off ) { - static_cast( TQT_TQWIDGET(child( "DefaultAuthWidget", "TQWidget", true )) )->setEnabled( false ); + static_cast( child( "DefaultAuthWidget", "TQWidget", true ) )->setEnabled( false ); } } diff --git a/smb4k/configdlg/smb4ksambaoptions.cpp b/smb4k/configdlg/smb4ksambaoptions.cpp index fb5b153..4b668e1 100644 --- a/smb4k/configdlg/smb4ksambaoptions.cpp +++ b/smb4k/configdlg/smb4ksambaoptions.cpp @@ -564,28 +564,28 @@ void Smb4KSambaOptions::slotSambaFileSystem( int item_index ) { case Smb4KSettings::EnumFilesystem::CIFS: { - TQGroupBox *adv_cifs = static_cast( TQT_TQWIDGET(child( "AdvancedCIFSOptions", "TQGroupBox", true )) ); + TQGroupBox *adv_cifs = static_cast( child( "AdvancedCIFSOptions", "TQGroupBox", true ) ); if ( adv_cifs ) { adv_cifs->setEnabled( true ); } - TQGroupBox *adv_smbfs = static_cast( TQT_TQWIDGET(child( "AdvancedSMBFSOptions", "TQGroupBox", true )) ); + TQGroupBox *adv_smbfs = static_cast( child( "AdvancedSMBFSOptions", "TQGroupBox", true ) ); if ( adv_smbfs ) { adv_smbfs->setEnabled( false ); } - TQLabel *codepage = static_cast( TQT_TQWIDGET(child( "CodepageLabel", "TQLabel", true )) ); + TQLabel *codepage = static_cast( child( "CodepageLabel", "TQLabel", true ) ); if ( codepage ) { codepage->setEnabled( false ); } - KComboBox *srv_codepage = static_cast( TQT_TQWIDGET(child( "kcfg_ServerCodepage", "KComboBox", true )) ); + KComboBox *srv_codepage = static_cast( child( "kcfg_ServerCodepage", "KComboBox", true ) ); if ( srv_codepage ) { @@ -596,28 +596,28 @@ void Smb4KSambaOptions::slotSambaFileSystem( int item_index ) } case Smb4KSettings::EnumFilesystem::SMBFS: { - TQGroupBox *adv_cifs = static_cast( TQT_TQWIDGET(child( "AdvancedCIFSOptions", "TQGroupBox", true )) ); + TQGroupBox *adv_cifs = static_cast( child( "AdvancedCIFSOptions", "TQGroupBox", true ) ); if ( adv_cifs ) { adv_cifs->setEnabled( false ); } - TQGroupBox *adv_smbfs = static_cast( TQT_TQWIDGET(child( "AdvancedSMBFSOptions", "TQGroupBox", true )) ); + TQGroupBox *adv_smbfs = static_cast( child( "AdvancedSMBFSOptions", "TQGroupBox", true ) ); if ( adv_smbfs ) { adv_smbfs->setEnabled( true ); } - TQLabel *codepage = static_cast( TQT_TQWIDGET(child( "CodepageLabel", "TQLabel", true )) ); + TQLabel *codepage = static_cast( child( "CodepageLabel", "TQLabel", true ) ); if ( codepage ) { codepage->setEnabled( true ); } - KComboBox *srv_codepage = static_cast( TQT_TQWIDGET(child( "kcfg_ServerCodepage", "KComboBox", true )) ); + KComboBox *srv_codepage = static_cast( child( "kcfg_ServerCodepage", "KComboBox", true ) ); if ( srv_codepage ) { @@ -643,7 +643,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) if ( item ) { // Enable the input widget: - TQWidget *input = static_cast( TQT_TQWIDGET(child( "CustomInputWidget", "TQGroupBox", true )) ); + TQWidget *input = static_cast( child( "CustomInputWidget", "TQGroupBox", true ) ); if ( input ) { @@ -651,7 +651,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) } // Enable/disable the labels, combo boxes, buttons, etc: - TQLabel *protocol_label = static_cast( TQT_TQWIDGET(child( "CustomProtocolLabel", "TQLabel", true )) ); + TQLabel *protocol_label = static_cast( child( "CustomProtocolLabel", "TQLabel", true ) ); if ( protocol_label ) { @@ -665,7 +665,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) } } - KComboBox *protocol = static_cast( TQT_TQWIDGET(child( "CustomProtocol", "KComboBox", true )) ); + KComboBox *protocol = static_cast( child( "CustomProtocol", "KComboBox", true ) ); if ( protocol ) { @@ -683,7 +683,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) #ifndef __FreeBSD__ - TQLabel *fs_label = static_cast( TQT_TQWIDGET(child( "CustomFileSystemLabel", "TQLabel", true )) ); + TQLabel *fs_label = static_cast( child( "CustomFileSystemLabel", "TQLabel", true ) ); if ( fs_label ) { @@ -697,7 +697,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) } } - KComboBox *filesystem = static_cast( TQT_TQWIDGET(child( "CustomFileSystem", "KComboBox", true )) ); + KComboBox *filesystem = static_cast( child( "CustomFileSystem", "KComboBox", true ) ); if ( filesystem ) { @@ -713,7 +713,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) filesystem->setCurrentText( item->text( FileSystem ) ); } - TQLabel *write_access_label = static_cast( TQT_TQWIDGET(child( "CustomWriteAccessLabel", "TQLabel", true )) ); + TQLabel *write_access_label = static_cast( child( "CustomWriteAccessLabel", "TQLabel", true ) ); if ( write_access_label ) { @@ -727,7 +727,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) } } - KComboBox *write_access = static_cast( TQT_TQWIDGET(child( "CustomWriteAccess", "KComboBox", true )) ); + KComboBox *write_access = static_cast( child( "CustomWriteAccess", "KComboBox", true ) ); if ( write_access ) { @@ -745,7 +745,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) #endif - TQLabel *krb_label = static_cast( TQT_TQWIDGET(child( "CustomKerberosLabel", "TQLabel", true )) ); + TQLabel *krb_label = static_cast( child( "CustomKerberosLabel", "TQLabel", true ) ); if ( krb_label ) { @@ -759,7 +759,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) } } - KComboBox *kerberos = static_cast( TQT_TQWIDGET(child( "CustomKerberos", "KComboBox", true )) ); + KComboBox *kerberos = static_cast( child( "CustomKerberos", "KComboBox", true ) ); if ( kerberos ) { @@ -775,7 +775,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) kerberos->setCurrentText( item->text( Kerberos ) ); } - TQLabel *uid_label = static_cast( TQT_TQWIDGET(child( "CustomUIDLabel", "TQLabel", true )) ); + TQLabel *uid_label = static_cast( child( "CustomUIDLabel", "TQLabel", true ) ); if ( uid_label ) { @@ -789,7 +789,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) } } - KLineEdit *uid = static_cast( TQT_TQWIDGET(child( "CustomUID", "KLineEdit", true )) ); + KLineEdit *uid = static_cast( child( "CustomUID", "KLineEdit", true ) ); if ( uid ) { @@ -805,7 +805,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) uid->setText( item->text( UID ) ); } - TQLabel *gid_label = static_cast( TQT_TQWIDGET(child( "CustomGIDLabel", "TQLabel", true )) ); + TQLabel *gid_label = static_cast( child( "CustomGIDLabel", "TQLabel", true ) ); if ( gid_label ) { @@ -819,7 +819,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) } } - KLineEdit *gid = static_cast( TQT_TQWIDGET(child( "CustomGID", "KLineEdit", true )) ); + KLineEdit *gid = static_cast( child( "CustomGID", "KLineEdit", true ) ); if ( gid ) { @@ -835,7 +835,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) gid->setText( item->text( GID ) ); } - TQLabel *port_label = static_cast( TQT_TQWIDGET(child( "CustomPortLabel", "TQLabel", true )) ); + TQLabel *port_label = static_cast( child( "CustomPortLabel", "TQLabel", true ) ); if ( port_label ) { @@ -849,7 +849,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) } } - KIntNumInput *port = static_cast( TQT_TQWIDGET(child( "CustomPort", "KIntNumInput", true )) ); + KIntNumInput *port = static_cast( child( "CustomPort", "KIntNumInput", true ) ); if ( port ) { @@ -865,14 +865,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) port->setValue( item->text( Port ).toInt() ); } - KPushButton *remove = static_cast( TQT_TQWIDGET(child( "CustomRemoveItem", "KPushButton", true )) ); + KPushButton *remove = static_cast( child( "CustomRemoveItem", "KPushButton", true ) ); if ( remove ) { remove->setEnabled( true ); } - KPushButton *remove_all = static_cast( TQT_TQWIDGET(child( "CustomRemoveAllItems", "KPushButton", true )) ); + KPushButton *remove_all = static_cast( child( "CustomRemoveAllItems", "KPushButton", true ) ); if ( remove_all ) { @@ -882,18 +882,18 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) else { // Get the list view: - TDEListView *view = static_cast( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); + TDEListView *view = static_cast( child( "CustomOptionsList", "TDEListView", true ) ); if ( view ) { - TQLabel *protocol_label = static_cast( TQT_TQWIDGET(child( "CustomProtocolLabel", "TQLabel", true )) ); + TQLabel *protocol_label = static_cast( child( "CustomProtocolLabel", "TQLabel", true ) ); if ( protocol_label ) { protocol_label->setEnabled( false ); } - KComboBox *protocol = static_cast( TQT_TQWIDGET(child( "CustomProtocol", "KComboBox", true )) ); + KComboBox *protocol = static_cast( child( "CustomProtocol", "KComboBox", true ) ); if ( protocol ) { @@ -903,14 +903,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) #ifndef __FreeBSD__ - TQLabel *fs_label = static_cast( TQT_TQWIDGET(child( "CustomFileSystemLabel", "TQLabel", true )) ); + TQLabel *fs_label = static_cast( child( "CustomFileSystemLabel", "TQLabel", true ) ); if ( fs_label ) { fs_label->setEnabled( false ); } - KComboBox *filesystem = static_cast( TQT_TQWIDGET(child( "CustomFileSystem", "KComboBox", true )) ); + KComboBox *filesystem = static_cast( child( "CustomFileSystem", "KComboBox", true ) ); if ( filesystem ) { @@ -918,14 +918,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) filesystem->setEnabled( false ); } - TQLabel *write_access_label = static_cast( TQT_TQWIDGET(child( "CustomWriteAccessLabel", "TQLabel", true )) ); + TQLabel *write_access_label = static_cast( child( "CustomWriteAccessLabel", "TQLabel", true ) ); if ( write_access_label ) { write_access_label->setEnabled( false ); } - KComboBox *write_access = static_cast( TQT_TQWIDGET(child( "CustomWriteAccess", "KComboBox", true )) ); + KComboBox *write_access = static_cast( child( "CustomWriteAccess", "KComboBox", true ) ); if ( write_access ) { @@ -935,14 +935,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) #endif - TQLabel *krb_label = static_cast( TQT_TQWIDGET(child( "CustomKerberosLabel", "TQLabel", true )) ); + TQLabel *krb_label = static_cast( child( "CustomKerberosLabel", "TQLabel", true ) ); if ( krb_label ) { krb_label->setEnabled( false ); } - KComboBox *kerberos = static_cast( TQT_TQWIDGET(child( "CustomKerberos", "KComboBox", true )) ); + KComboBox *kerberos = static_cast( child( "CustomKerberos", "KComboBox", true ) ); if ( kerberos ) { @@ -950,14 +950,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) kerberos->setEnabled( false ); } - TQLabel *uid_label = static_cast( TQT_TQWIDGET(child( "CustomUIDLabel", "TQLabel", true )) ); + TQLabel *uid_label = static_cast( child( "CustomUIDLabel", "TQLabel", true ) ); if ( uid_label ) { uid_label->setEnabled( false ); } - KLineEdit *uid = static_cast( TQT_TQWIDGET(child( "CustomUID", "KLineEdit", true )) ); + KLineEdit *uid = static_cast( child( "CustomUID", "KLineEdit", true ) ); if ( uid ) { @@ -965,14 +965,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) uid->setEnabled( false ); } - TQLabel *gid_label = static_cast( TQT_TQWIDGET(child( "CustomGIDLabel", "TQLabel", true )) ); + TQLabel *gid_label = static_cast( child( "CustomGIDLabel", "TQLabel", true ) ); if ( gid_label ) { gid_label->setEnabled( false ); } - KLineEdit *gid = static_cast( TQT_TQWIDGET(child( "CustomGID", "KLineEdit", true )) ); + KLineEdit *gid = static_cast( child( "CustomGID", "KLineEdit", true ) ); if ( gid ) { @@ -980,14 +980,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) gid->setEnabled( false ); } - TQLabel *port_label = static_cast( TQT_TQWIDGET(child( "CustomPortLabel", "TQLabel", true )) ); + TQLabel *port_label = static_cast( child( "CustomPortLabel", "TQLabel", true ) ); if ( port_label ) { port_label->setEnabled( false ); } - KIntNumInput *port = static_cast( TQT_TQWIDGET(child( "CustomPort", "KIntNumInput", true )) ); + KIntNumInput *port = static_cast( child( "CustomPort", "KIntNumInput", true ) ); if ( port ) { @@ -995,14 +995,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) port->setEnabled( false ); } - KPushButton *remove = static_cast( TQT_TQWIDGET(child( "CustomRemoveItem", "KPushButton", true )) ); + KPushButton *remove = static_cast( child( "CustomRemoveItem", "KPushButton", true ) ); if ( remove ) { remove->setEnabled( false ); } - KPushButton *remove_all = static_cast( TQT_TQWIDGET(child( "CustomRemoveAllItems", "KPushButton", true )) ); + KPushButton *remove_all = static_cast( child( "CustomRemoveAllItems", "KPushButton", true ) ); if ( remove_all ) { @@ -1015,8 +1015,8 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) void Smb4KSambaOptions::slotCustomProtocolChanged( int index ) { - TDEListView *view = static_cast( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); - KComboBox *custom_protocol = static_cast( TQT_TQWIDGET(child( "CustomProtocol", "KComboBox", true )) ); + TDEListView *view = static_cast( child( "CustomOptionsList", "TDEListView", true ) ); + KComboBox *custom_protocol = static_cast( child( "CustomProtocol", "KComboBox", true ) ); if ( view && view->selectedItem() && custom_protocol ) { @@ -1043,8 +1043,8 @@ void Smb4KSambaOptions::slotCustomProtocolChanged( int index ) #ifndef __FreeBSD__ void Smb4KSambaOptions::slotCustomFileSystemChanged( int index ) { - TDEListView *view = static_cast( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); - KComboBox *custom_filesystem = static_cast( TQT_TQWIDGET(child( "CustomFileSystem", "KComboBox", true )) ); + TDEListView *view = static_cast( child( "CustomOptionsList", "TDEListView", true ) ); + KComboBox *custom_filesystem = static_cast( child( "CustomFileSystem", "KComboBox", true ) ); if ( view && view->selectedItem() && custom_filesystem ) { @@ -1075,8 +1075,8 @@ void Smb4KSambaOptions::slotCustomFileSystemChanged( int ) #ifndef __FreeBSD__ void Smb4KSambaOptions::slotCustomWriteAccessChanged( int index ) { - TDEListView *view = static_cast( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); - KComboBox *custom_rw = static_cast( TQT_TQWIDGET(child( "CustomWriteAccess", "KComboBox", true )) ); + TDEListView *view = static_cast( child( "CustomOptionsList", "TDEListView", true ) ); + KComboBox *custom_rw = static_cast( child( "CustomWriteAccess", "KComboBox", true ) ); if ( view && view->selectedItem() && custom_rw ) { @@ -1109,8 +1109,8 @@ void Smb4KSambaOptions::slotCustomKerberosChanged( int index ) // FIXME: Do we need to adjust something here with respect to // FreeBSD? It does not know Kerberos for mounting! - TDEListView *view = static_cast( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); - KComboBox *custom_kerberos = static_cast( TQT_TQWIDGET(child( "CustomWriteAccess", "KComboBox", true )) ); + TDEListView *view = static_cast( child( "CustomOptionsList", "TDEListView", true ) ); + KComboBox *custom_kerberos = static_cast( child( "CustomWriteAccess", "KComboBox", true ) ); if ( view && view->selectedItem() && custom_kerberos ) { @@ -1136,7 +1136,7 @@ void Smb4KSambaOptions::slotCustomKerberosChanged( int index ) void Smb4KSambaOptions::slotCustomUIDChanged( const TQString &uid ) { - TDEListView *view = static_cast( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); + TDEListView *view = static_cast( child( "CustomOptionsList", "TDEListView", true ) ); if ( view && view->selectedItem() ) { @@ -1154,7 +1154,7 @@ void Smb4KSambaOptions::slotCustomUIDChanged( const TQString &uid ) void Smb4KSambaOptions::slotCustomGIDChanged( const TQString &gid ) { - TDEListView *view = static_cast( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); + TDEListView *view = static_cast( child( "CustomOptionsList", "TDEListView", true ) ); if ( view && view->selectedItem() ) { @@ -1172,7 +1172,7 @@ void Smb4KSambaOptions::slotCustomGIDChanged( const TQString &gid ) void Smb4KSambaOptions::slotCustomPortChanged( int port ) { - TDEListView *view = static_cast( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); + TDEListView *view = static_cast( child( "CustomOptionsList", "TDEListView", true ) ); if ( view && view->selectedItem() ) { @@ -1189,7 +1189,7 @@ void Smb4KSambaOptions::slotCustomPortChanged( int port ) void Smb4KSambaOptions::slotRemoveCustomOption() { - TDEListView *view = static_cast( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); + TDEListView *view = static_cast( child( "CustomOptionsList", "TDEListView", true ) ); if ( view && view->selectedItem() ) { @@ -1208,7 +1208,7 @@ void Smb4KSambaOptions::slotRemoveCustomOption() void Smb4KSambaOptions::slotRemoveAllCustomOptions() { - TDEListView *view = static_cast( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); + TDEListView *view = static_cast( child( "CustomOptionsList", "TDEListView", true ) ); if ( view ) { diff --git a/smb4k/configdlg/smb4kuserinterfaceoptions.cpp b/smb4k/configdlg/smb4kuserinterfaceoptions.cpp index 8fe66c0..1553896 100644 --- a/smb4k/configdlg/smb4kuserinterfaceoptions.cpp +++ b/smb4k/configdlg/smb4kuserinterfaceoptions.cpp @@ -194,13 +194,13 @@ void Smb4KUserInterfaceOptions::slotShowHiddenShares( int state ) { if ( state == TQCheckBox::On ) { - static_cast( TQT_TQWIDGET(child( "kcfg_ShowHiddenIPCShares", "TQCheckBox" )) )->setEnabled( true ); - static_cast( TQT_TQWIDGET(child( "kcfg_ShowHiddenADMINShares", "TQCheckBox" )) )->setEnabled( true ); + static_cast( child( "kcfg_ShowHiddenIPCShares", "TQCheckBox" ) )->setEnabled( true ); + static_cast( child( "kcfg_ShowHiddenADMINShares", "TQCheckBox" ) )->setEnabled( true ); } else if ( state == TQCheckBox::Off ) { - static_cast( TQT_TQWIDGET(child( "kcfg_ShowHiddenIPCShares", "TQCheckBox" )) )->setEnabled( false ); - static_cast( TQT_TQWIDGET(child( "kcfg_ShowHiddenADMINShares", "TQCheckBox" )) )->setEnabled( false ); + static_cast( child( "kcfg_ShowHiddenIPCShares", "TQCheckBox" ) )->setEnabled( false ); + static_cast( child( "kcfg_ShowHiddenADMINShares", "TQCheckBox" ) )->setEnabled( false ); } } diff --git a/smb4k/configdlg/smb4tdeconfigdialog.cpp b/smb4k/configdlg/smb4tdeconfigdialog.cpp index f9aeef9..e73d189 100644 --- a/smb4k/configdlg/smb4tdeconfigdialog.cpp +++ b/smb4k/configdlg/smb4tdeconfigdialog.cpp @@ -108,7 +108,7 @@ Smb4TDEConfigDialog::Smb4TDEConfigDialog( Smb4KSettings *settings, TQWidget *par // done by the core. We only need to disable widgets here. if ( Smb4KSettings::sudo().isEmpty() ) { - TQRadioButton *sudo = static_cast( TQT_TQWIDGET(super_user_options->child( "SudoButton", "TQRadioButton", true )) ); + TQRadioButton *sudo = static_cast( super_user_options->child( "SudoButton", "TQRadioButton", true ) ); if ( sudo ) { @@ -117,7 +117,7 @@ Smb4TDEConfigDialog::Smb4TDEConfigDialog( Smb4KSettings *settings, TQWidget *par } else if ( Smb4KSettings::super().isEmpty() ) { - TQRadioButton *super = static_cast( TQT_TQWIDGET(super_user_options->child( "SuperButton", "TQRadioButton", true )) ); + TQRadioButton *super = static_cast( super_user_options->child( "SuperButton", "TQRadioButton", true ) ); if ( super ) { @@ -196,7 +196,7 @@ Smb4TDEConfigDialog::~Smb4TDEConfigDialog() void Smb4TDEConfigDialog::loadCustomSambaOptions() { // Get the list view: - TDEListView *custom_list = static_cast( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); + TDEListView *custom_list = static_cast( child( "CustomOptionsList", "TDEListView", true ) ); if ( !custom_list ) { @@ -380,7 +380,7 @@ void Smb4TDEConfigDialog::loadCustomSambaOptions() } } - Smb4KSambaOptions *samba_options = static_cast( TQT_TQWIDGET(child( "SambaOptions", "Smb4KSambaOptions", true )) ); + Smb4KSambaOptions *samba_options = static_cast( child( "SambaOptions", "Smb4KSambaOptions", true ) ); if ( samba_options ) { @@ -392,7 +392,7 @@ void Smb4TDEConfigDialog::loadCustomSambaOptions() void Smb4TDEConfigDialog::saveCustomSambaOptions() { // Get the list view: - TDEListView *custom_list = static_cast( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); + TDEListView *custom_list = static_cast( child( "CustomOptionsList", "TDEListView", true ) ); if ( !custom_list ) { @@ -517,14 +517,14 @@ void Smb4TDEConfigDialog::loadAuthenticationData() (void) passwordHandler()->readDefaultAuth( &auth ); - KLineEdit *default_user = static_cast( TQT_TQWIDGET(child( "DefaultUserName", "KLineEdit", true )) ); + KLineEdit *default_user = static_cast( child( "DefaultUserName", "KLineEdit", true ) ); if ( default_user ) { default_user->setText( auth.user() ); } - KLineEdit *default_pass = static_cast( TQT_TQWIDGET(child( "DefaultPassword", "KLineEdit", true )) ); + KLineEdit *default_pass = static_cast( child( "DefaultPassword", "KLineEdit", true ) ); if ( default_pass ) { @@ -543,14 +543,14 @@ void Smb4TDEConfigDialog::saveAuthenticationData() { Smb4KAuthInfo auth( TQString::null, TQString::null, TQString::null ); - KLineEdit *default_user = static_cast( TQT_TQWIDGET(child( "DefaultUserName", "KLineEdit", true )) ); + KLineEdit *default_user = static_cast( child( "DefaultUserName", "KLineEdit", true ) ); if ( default_user ) { auth.setUser( default_user->text() ); } - KLineEdit *default_pass = static_cast( TQT_TQWIDGET(child( "DefaultPassword", "KLineEdit", true )) ); + KLineEdit *default_pass = static_cast( child( "DefaultPassword", "KLineEdit", true ) ); if ( default_pass ) { @@ -568,12 +568,12 @@ void Smb4TDEConfigDialog::saveAuthenticationData() bool Smb4TDEConfigDialog::writeSuperUserEntries() { - TQRadioButton *sudo = static_cast( TQT_TQWIDGET(child( "SudoButton", "TQRadioButton", true )) ); - TQRadioButton *super = static_cast( TQT_TQWIDGET(child( "SuperButton", "TQRadioButton", true )) ); + TQRadioButton *sudo = static_cast( child( "SudoButton", "TQRadioButton", true ) ); + TQRadioButton *super = static_cast( child( "SuperButton", "TQRadioButton", true ) ); #ifdef __linux__ - TQCheckBox *force = static_cast( TQT_TQWIDGET(child( "kcfg_UseForceUnmount", "TQCheckBox", true )) ); + TQCheckBox *force = static_cast( child( "kcfg_UseForceUnmount", "TQCheckBox", true ) ); #endif - TQCheckBox *full_use = static_cast( TQT_TQWIDGET(child( "kcfg_AlwaysUseSuperUser", "TQCheckBox", true )) ); + TQCheckBox *full_use = static_cast( child( "kcfg_AlwaysUseSuperUser", "TQCheckBox", true ) ); // Check if we need to write anything at all: Smb4KFileIO::Operation op = Smb4KFileIO::NoOperation; @@ -640,12 +640,12 @@ bool Smb4TDEConfigDialog::writeSuperUserEntries() void Smb4TDEConfigDialog::removeSuperUserEntries() { - TQRadioButton *sudo = static_cast( TQT_TQWIDGET(child( "SudoButton", "TQRadioButton", true )) ); - TQRadioButton *super = static_cast( TQT_TQWIDGET(child( "SuperButton", "TQRadioButton", true )) ); + TQRadioButton *sudo = static_cast( child( "SudoButton", "TQRadioButton", true ) ); + TQRadioButton *super = static_cast( child( "SuperButton", "TQRadioButton", true ) ); #ifdef __linux__ - TQCheckBox *force = static_cast( TQT_TQWIDGET(child( "kcfg_UseForceUnmount", "TQCheckBox", true )) ); + TQCheckBox *force = static_cast( child( "kcfg_UseForceUnmount", "TQCheckBox", true ) ); #endif - TQCheckBox *full_use = static_cast( TQT_TQWIDGET(child( "kcfg_AlwaysUseSuperUser", "TQCheckBox", true )) ); + TQCheckBox *full_use = static_cast( child( "kcfg_AlwaysUseSuperUser", "TQCheckBox", true ) ); #ifdef __linux__ if ( sudo && super && force && full_use ) @@ -694,8 +694,8 @@ bool Smb4TDEConfigDialog::checkSettings() // If the user chose "Query custom master browser" in the // "Network" tab, there must be a master browser present: - TQRadioButton *query_custom_master = static_cast( TQT_TQWIDGET(child( "CustomMasterBrowserLabel", "TQRadioButton", true )) ); - KLineEdit *custom_master_input = static_cast( TQT_TQWIDGET(child( "kcfg_CustomMasterBrowser", "KLineEdit", true )) ); + TQRadioButton *query_custom_master = static_cast( child( "CustomMasterBrowserLabel", "TQRadioButton", true ) ); + KLineEdit *custom_master_input = static_cast( child( "kcfg_CustomMasterBrowser", "KLineEdit", true ) ); if ( query_custom_master && custom_master_input && query_custom_master->isChecked() && @@ -709,8 +709,8 @@ bool Smb4TDEConfigDialog::checkSettings() // If the user chose "Scan broadcast areas" in the // "Network" tab, there must broadcast areas present: - TQRadioButton *scan_bcast_areas = static_cast( TQT_TQWIDGET(child( "BroadcastAreasLabel", "TQRadioButton", true )) ); - KLineEdit *bcast_areas_input = static_cast( TQT_TQWIDGET(child( "kcfg_BroadcastAreas", "KLineEdit", true )) ); + TQRadioButton *scan_bcast_areas = static_cast( child( "BroadcastAreasLabel", "TQRadioButton", true ) ); + KLineEdit *bcast_areas_input = static_cast( child( "kcfg_BroadcastAreas", "KLineEdit", true ) ); if ( scan_bcast_areas && bcast_areas_input && scan_bcast_areas->isChecked() && @@ -723,7 +723,7 @@ bool Smb4TDEConfigDialog::checkSettings() } // The mount prefix must not be empty: - KURLRequester *mount_prefix = static_cast( TQT_TQWIDGET(child( "kcfg_MountPrefix", "KURLRequester", true )) ); + KURLRequester *mount_prefix = static_cast( child( "kcfg_MountPrefix", "KURLRequester", true ) ); if ( mount_prefix && mount_prefix->url().stripWhiteSpace().isEmpty() ) { @@ -735,8 +735,8 @@ bool Smb4TDEConfigDialog::checkSettings() // If the user wants to use a default login, the user // name must not be empty. - TQCheckBox *use_default_login = static_cast( TQT_TQWIDGET(child( "kcfg_UseDefaultLogin", "TQCheckBox", true )) ); - KLineEdit *default_user_name = static_cast( TQT_TQWIDGET(child( "kcfg_DefaultUserName", "KLineEdit", true )) ); + TQCheckBox *use_default_login = static_cast( child( "kcfg_UseDefaultLogin", "TQCheckBox", true ) ); + KLineEdit *default_user_name = static_cast( child( "kcfg_DefaultUserName", "KLineEdit", true ) ); if ( use_default_login && default_user_name && use_default_login->isChecked() && @@ -749,7 +749,7 @@ bool Smb4TDEConfigDialog::checkSettings() } // The file mask must not be empty. - KLineEdit *file_mask = static_cast( TQT_TQWIDGET(child( "kcfg_FileMask", "KLineEdit", true )) ); + KLineEdit *file_mask = static_cast( child( "kcfg_FileMask", "KLineEdit", true ) ); if ( file_mask && file_mask->text().stripWhiteSpace().isEmpty() ) { @@ -760,7 +760,7 @@ bool Smb4TDEConfigDialog::checkSettings() } // The directory mask must not be empty. - KLineEdit *directory_mask = static_cast( TQT_TQWIDGET(child( "kcfg_DirectoryMask", "KLineEdit", true )) ); + KLineEdit *directory_mask = static_cast( child( "kcfg_DirectoryMask", "KLineEdit", true ) ); if ( directory_mask && directory_mask->text().stripWhiteSpace().isEmpty() ) { @@ -771,7 +771,7 @@ bool Smb4TDEConfigDialog::checkSettings() } // The UID must not be empty. - KLineEdit *user_id = static_cast( TQT_TQWIDGET(child( "kcfg_UserID", "KLineEdit", true )) ); + KLineEdit *user_id = static_cast( child( "kcfg_UserID", "KLineEdit", true ) ); if ( user_id && user_id->text().stripWhiteSpace().isEmpty() ) { @@ -782,7 +782,7 @@ bool Smb4TDEConfigDialog::checkSettings() } // The GID must not be empty. - KLineEdit *group_id = static_cast( TQT_TQWIDGET(child( "kcfg_GroupID", "KLineEdit", true )) ); + KLineEdit *group_id = static_cast( child( "kcfg_GroupID", "KLineEdit", true ) ); if ( group_id && group_id->text().stripWhiteSpace().isEmpty() ) { @@ -793,7 +793,7 @@ bool Smb4TDEConfigDialog::checkSettings() } // The rsync prefix must not be empty. - KURLRequester *rsync_prefix = static_cast( TQT_TQWIDGET(child( "kcfg_RsyncPrefix", "KURLRequester", true )) ); + KURLRequester *rsync_prefix = static_cast( child( "kcfg_RsyncPrefix", "KURLRequester", true ) ); if ( rsync_prefix && rsync_prefix->url().stripWhiteSpace().isEmpty() ) { @@ -804,8 +804,8 @@ bool Smb4TDEConfigDialog::checkSettings() } // The path where to store partial files must not be empty. - TQCheckBox *use_partical_directory = static_cast( TQT_TQWIDGET(child( "kcfg_UsePartialDirectory", "TQCheckBox", true )) ); - KURLRequester *partial_directory = static_cast( TQT_TQWIDGET(child( "kcfg_PartialDirectory", "KURLRequester", true )) ); + TQCheckBox *use_partical_directory = static_cast( child( "kcfg_UsePartialDirectory", "TQCheckBox", true ) ); + KURLRequester *partial_directory = static_cast( child( "kcfg_PartialDirectory", "KURLRequester", true ) ); if ( use_partical_directory && use_partical_directory->isChecked() && partial_directory && partial_directory->url().stripWhiteSpace().isEmpty() ) @@ -817,8 +817,8 @@ bool Smb4TDEConfigDialog::checkSettings() } // The the exclude patterns must not be empty. - TQCheckBox *use_exclude_pattern = static_cast( TQT_TQWIDGET(child( "kcfg_UseExcludePattern", "TQCheckBox", true )) ); - KLineEdit *exclude_pattern = static_cast( TQT_TQWIDGET(child( "kcfg_ExcludePattern", "KLineEdit", true )) ); + TQCheckBox *use_exclude_pattern = static_cast( child( "kcfg_UseExcludePattern", "TQCheckBox", true ) ); + KLineEdit *exclude_pattern = static_cast( child( "kcfg_ExcludePattern", "KLineEdit", true ) ); if ( use_exclude_pattern && use_exclude_pattern->isChecked() && exclude_pattern && exclude_pattern->text().stripWhiteSpace().isEmpty() ) @@ -830,8 +830,8 @@ bool Smb4TDEConfigDialog::checkSettings() } // The the path of the exclude file must not be empty. - TQCheckBox *use_exclude_file = static_cast( TQT_TQWIDGET(child( "kcfg_UseExcludeFrom", "TQCheckBox", true )) ); - KURLRequester *exclude_file = static_cast( TQT_TQWIDGET(child( "kcfg_ExcludeFrom", "KURLRequester", true )) ); + TQCheckBox *use_exclude_file = static_cast( child( "kcfg_UseExcludeFrom", "TQCheckBox", true ) ); + KURLRequester *exclude_file = static_cast( child( "kcfg_ExcludeFrom", "KURLRequester", true ) ); if ( use_exclude_file && use_exclude_file->isChecked() && exclude_file && exclude_file->url().stripWhiteSpace().isEmpty() ) @@ -843,8 +843,8 @@ bool Smb4TDEConfigDialog::checkSettings() } // The the include patterns must not be empty. - TQCheckBox *use_include_pattern = static_cast( TQT_TQWIDGET(child( "kcfg_UseIncludePattern", "TQCheckBox", true )) ); - KLineEdit *include_pattern = static_cast( TQT_TQWIDGET(child( "kcfg_IncludePattern", "KLineEdit", true )) ); + TQCheckBox *use_include_pattern = static_cast( child( "kcfg_UseIncludePattern", "TQCheckBox", true ) ); + KLineEdit *include_pattern = static_cast( child( "kcfg_IncludePattern", "KLineEdit", true ) ); if ( use_include_pattern && use_include_pattern->isChecked() && include_pattern && include_pattern->text().stripWhiteSpace().isEmpty() ) @@ -856,8 +856,8 @@ bool Smb4TDEConfigDialog::checkSettings() } // The the path of the exclude file must not be empty. - TQCheckBox *use_include_file = static_cast( TQT_TQWIDGET(child( "kcfg_UseIncludeFrom", "TQCheckBox", true )) ); - KURLRequester *include_file = static_cast( TQT_TQWIDGET(child( "kcfg_IncludeFrom", "KURLRequester", true )) ); + TQCheckBox *use_include_file = static_cast( child( "kcfg_UseIncludeFrom", "TQCheckBox", true ) ); + KURLRequester *include_file = static_cast( child( "kcfg_IncludeFrom", "KURLRequester", true ) ); if ( use_include_file && use_include_file->isChecked() && include_file && include_file->url().stripWhiteSpace().isEmpty() ) @@ -870,13 +870,13 @@ bool Smb4TDEConfigDialog::checkSettings() // If you make backups, check that the suffix and that the // backup directory is not empty. - TQCheckBox *make_backups = static_cast( TQT_TQWIDGET(child( "kcfg_MakeBackups", "TQCheckBox", true )) ); + TQCheckBox *make_backups = static_cast( child( "kcfg_MakeBackups", "TQCheckBox", true ) ); if ( make_backups && make_backups->isChecked() ) { // The backup suffix must not be empty. - TQCheckBox *use_backup_suffix = static_cast( TQT_TQWIDGET(child( "kcfg_UseBackupSuffix", "TQCheckBox", true )) ); - KLineEdit *backup_suffix = static_cast( TQT_TQWIDGET(child( "kcfg_BackupSuffix", "KLineEdit", true )) ); + TQCheckBox *use_backup_suffix = static_cast( child( "kcfg_UseBackupSuffix", "TQCheckBox", true ) ); + KLineEdit *backup_suffix = static_cast( child( "kcfg_BackupSuffix", "KLineEdit", true ) ); if ( use_backup_suffix && use_backup_suffix->isChecked() && backup_suffix && backup_suffix->text().stripWhiteSpace().isEmpty() ) @@ -888,8 +888,8 @@ bool Smb4TDEConfigDialog::checkSettings() } // The the path for backups must not be empty. - TQCheckBox *use_backup_dir = static_cast( TQT_TQWIDGET(child( "kcfg_UseBackupDirectory", "TQCheckBox", true )) ); - KURLRequester *backup_dir = static_cast( TQT_TQWIDGET(child( "kcfg_BackupDirectory", "KURLRequester", true )) ); + TQCheckBox *use_backup_dir = static_cast( child( "kcfg_UseBackupDirectory", "TQCheckBox", true ) ); + KURLRequester *backup_dir = static_cast( child( "kcfg_BackupDirectory", "KURLRequester", true ) ); if ( use_backup_dir && use_backup_dir->isChecked() && backup_dir && backup_dir->url().stripWhiteSpace().isEmpty() ) @@ -996,7 +996,7 @@ void Smb4TDEConfigDialog::slotOk() void Smb4TDEConfigDialog::slotCancel() { // Reset the custom Samba options tab: - Smb4KSambaOptions *samba_options = static_cast( TQT_TQWIDGET(child( "SambaOptions", "Smb4KSambaOptions", true )) ); + Smb4KSambaOptions *samba_options = static_cast( child( "SambaOptions", "Smb4KSambaOptions", true ) ); if ( samba_options ) { @@ -1010,7 +1010,7 @@ void Smb4TDEConfigDialog::slotCancel() void Smb4TDEConfigDialog::slotCustomSambaSettingsChanged() { // Get the list view and all other input widgets: - TDEListView *view = static_cast( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); + TDEListView *view = static_cast( child( "CustomOptionsList", "TDEListView", true ) ); if ( !view ) { @@ -1136,9 +1136,9 @@ void Smb4TDEConfigDialog::slotRemoveSuperUserEntries() void Smb4TDEConfigDialog::slotReceivedFileIOFailed() { #ifdef __linux__ - TQCheckBox *force = static_cast( TQT_TQWIDGET(child( "kcfg_UseForceUnmount", "TQCheckBox", true )) ); + TQCheckBox *force = static_cast( child( "kcfg_UseForceUnmount", "TQCheckBox", true ) ); #endif - TQCheckBox *full_use = static_cast( TQT_TQWIDGET(child( "kcfg_AlwaysUseSuperUser", "TQCheckBox", true )) ); + TQCheckBox *full_use = static_cast( child( "kcfg_AlwaysUseSuperUser", "TQCheckBox", true ) ); #ifdef __linux__ if ( force && full_use ) @@ -1201,7 +1201,7 @@ TDEInstance *Smb4TDEConfigDialogFactory::instance() TQObject *Smb4TDEConfigDialogFactory::createObject( TQObject *parent, const char *name, const char *, const TQStringList & ) { - return TQT_TQOBJECT( new Smb4TDEConfigDialog( Smb4KSettings::self(), TQT_TQWIDGET( parent ), name ) ); + return new Smb4TDEConfigDialog( Smb4KSettings::self(), static_cast( parent ), name ) ; } diff --git a/smb4k/configdlg/smb4tdersyncoptions.cpp b/smb4k/configdlg/smb4tdersyncoptions.cpp index 7e48e58..45627de 100644 --- a/smb4k/configdlg/smb4tdersyncoptions.cpp +++ b/smb4k/configdlg/smb4tdersyncoptions.cpp @@ -298,13 +298,13 @@ void Smb4KRsyncOptions::slotArchiveToggled( bool on ) { if ( on ) { - static_cast( TQT_TQWIDGET(child( "kcfg_RecurseIntoDirectories", "TQCheckBox", true )) )->setChecked( on ); - static_cast( TQT_TQWIDGET(child( "kcfg_PreserveSymlinks", "TQCheckBox", true )) )->setChecked( on ); - static_cast( TQT_TQWIDGET(child( "kcfg_PreservePermissions", "TQCheckBox", true )) )->setChecked( on ); - static_cast( TQT_TQWIDGET(child( "kcfg_PreserveTimes", "TQCheckBox", true )) )->setChecked( on ); - static_cast( TQT_TQWIDGET(child( "kcfg_PreserveGroup", "TQCheckBox", true )) )->setChecked( on ); - static_cast( TQT_TQWIDGET(child( "kcfg_PreserveOwner", "TQCheckBox", true )) )->setChecked( on ); - static_cast( TQT_TQWIDGET(child( "kcfg_PreserveDevicesAndSpecials", "TQCheckBox", true )) )->setChecked( on ); + static_cast( child( "kcfg_RecurseIntoDirectories", "TQCheckBox", true ) )->setChecked( on ); + static_cast( child( "kcfg_PreserveSymlinks", "TQCheckBox", true ) )->setChecked( on ); + static_cast( child( "kcfg_PreservePermissions", "TQCheckBox", true ) )->setChecked( on ); + static_cast( child( "kcfg_PreserveTimes", "TQCheckBox", true ) )->setChecked( on ); + static_cast( child( "kcfg_PreserveGroup", "TQCheckBox", true ) )->setChecked( on ); + static_cast( child( "kcfg_PreserveOwner", "TQCheckBox", true ) )->setChecked( on ); + static_cast( child( "kcfg_PreserveDevicesAndSpecials", "TQCheckBox", true ) )->setChecked( on ); } } @@ -313,23 +313,23 @@ void Smb4KRsyncOptions::slotUncheckArchive( bool on ) { if ( !on ) { - static_cast( TQT_TQWIDGET(child( "kcfg_ArchiveMode", "TQCheckBox", true )) )->setChecked( on ); + static_cast( child( "kcfg_ArchiveMode", "TQCheckBox", true ) )->setChecked( on ); } } void Smb4KRsyncOptions::slotBackupToggled( bool on ) { - static_cast( TQT_TQWIDGET(child( "kcfg_UseBackupDirectory", "TQCheckBox", true )) )->setEnabled( on ); - static_cast( TQT_TQWIDGET(child( "kcfg_BackupDirectory", "KURLRequester", true )) )->setEnabled( on ); - static_cast( TQT_TQWIDGET(child( "kcfg_UseBackupSuffix", "TQCheckBox", true )) )->setEnabled( on ); - static_cast( TQT_TQWIDGET(child( "kcfg_BackupSuffix", "KLineEdit", true )) )->setEnabled( on ); + static_cast( child( "kcfg_UseBackupDirectory", "TQCheckBox", true ) )->setEnabled( on ); + static_cast( child( "kcfg_BackupDirectory", "KURLRequester", true ) )->setEnabled( on ); + static_cast( child( "kcfg_UseBackupSuffix", "TQCheckBox", true ) )->setEnabled( on ); + static_cast( child( "kcfg_BackupSuffix", "KLineEdit", true ) )->setEnabled( on ); } void Smb4KRsyncOptions::slotFShortcutToggled( bool on ) { - TQCheckBox *ff_filter = static_cast( TQT_TQWIDGET(child( "kcfg_UseFFFilterRule", "TQCheckBox", true )) ); + TQCheckBox *ff_filter = static_cast( child( "kcfg_UseFFFilterRule", "TQCheckBox", true ) ); if ( on && ff_filter->isChecked() ) { @@ -340,7 +340,7 @@ void Smb4KRsyncOptions::slotFShortcutToggled( bool on ) void Smb4KRsyncOptions::slotFFShortcutToggled( bool on ) { - TQCheckBox *f_filter = static_cast( TQT_TQWIDGET(child( "kcfg_UseFFilterRule", "TQCheckBox", true )) ); + TQCheckBox *f_filter = static_cast( child( "kcfg_UseFFilterRule", "TQCheckBox", true ) ); if ( on && f_filter->isChecked() ) { diff --git a/smb4k/core/smb4kpasswordhandler.cpp b/smb4k/core/smb4kpasswordhandler.cpp index bef5607..421ccde 100644 --- a/smb4k/core/smb4kpasswordhandler.cpp +++ b/smb4k/core/smb4kpasswordhandler.cpp @@ -812,7 +812,7 @@ void Smb4KPasswordHandler::slotGetPassword( const TQString &username ) // of the homes shares: Smb4KAuthInfo *auth = readAuth( new Smb4KAuthInfo( m_auth->workgroup().upper(), m_auth->host().upper(), username ) ); - KLineEdit *lineEdit = static_cast( TQT_TQWIDGET(m_dlg->child( "AskPassPasswordEdit", "KLineEdit", true )) ); + KLineEdit *lineEdit = static_cast( m_dlg->child( "AskPassPasswordEdit", "KLineEdit", true ) ); lineEdit->setText( auth->password() ); delete auth; diff --git a/smb4k/dialogs/smb4kbookmarkeditor.cpp b/smb4k/dialogs/smb4kbookmarkeditor.cpp index 4551933..5dbd660 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, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveClicked() ), m_collection, "remove_bookmark" ); + (void) new TDEAction( i18n( "&Remove" ), "remove", Key_Delete, this, TQT_SLOT( slotRemoveClicked() ), m_collection, "remove_bookmark" ); - (void) new TDEAction( i18n( "Remove &All" ), "edit-delete", CTRL+Key_X, TQT_TQOBJECT(this), TQT_SLOT( slotDeleteAllClicked() ), m_collection, "remove_all_bookmarks" ); + (void) new TDEAction( i18n( "Remove &All" ), "edit-delete", CTRL+Key_X, this, TQT_SLOT( slotDeleteAllClicked() ), m_collection, "remove_all_bookmarks" ); slotLoadBookmarks(); @@ -140,7 +140,7 @@ void Smb4KBookmarkEditor::slotRightButtonPressed( TQListViewItem *item, const TQ if ( !menu ) { - menu = new TDEActionMenu( TQT_TQOBJECT(this), "BookmarkEditorPopupMenu" ); + menu = new TDEActionMenu( this, "BookmarkEditorPopupMenu" ); menu->insert( m_collection->action( "remove_bookmark" ) ); menu->insert( m_collection->action( "remove_all_bookmarks" ) ); } diff --git a/smb4k/dialogs/smb4kprintdialog.cpp b/smb4k/dialogs/smb4kprintdialog.cpp index 11c6b73..4081b04 100644 --- a/smb4k/dialogs/smb4kprintdialog.cpp +++ b/smb4k/dialogs/smb4kprintdialog.cpp @@ -132,8 +132,8 @@ Smb4KPrintDialog::~ Smb4KPrintDialog() void Smb4KPrintDialog::slotUser1() { - KURLRequester *url = static_cast( TQT_TQWIDGET(child( "URL", "KURLRequester", true )) ); - KIntNumInput *copies = static_cast( TQT_TQWIDGET(child( "Copies", "KIntNumInput", true )) ); + KURLRequester *url = static_cast( child( "URL", "KURLRequester", true ) ); + KIntNumInput *copies = static_cast( child( "Copies", "KIntNumInput", true ) ); if ( url && copies ) { diff --git a/smb4k/dialogs/smb4ksynchronizationdialog.cpp b/smb4k/dialogs/smb4ksynchronizationdialog.cpp index 9ad3a51..58cf75a 100644 --- a/smb4k/dialogs/smb4ksynchronizationdialog.cpp +++ b/smb4k/dialogs/smb4ksynchronizationdialog.cpp @@ -137,23 +137,23 @@ void Smb4KSynchronizationDialog::slotUser1() // Disable the URL requesters but in a way, that the information // proviced in them is still readable: - KURLRequester *source = static_cast( TQT_TQWIDGET(child( "SourceURL", "KURLRequester", true )) ); + KURLRequester *source = static_cast( child( "SourceURL", "KURLRequester", true ) ); source->lineEdit()->setReadOnly( true ); source->button()->setEnabled( false ); - KURLRequester *destination = static_cast( TQT_TQWIDGET(child( "DestinationURL", "KURLRequester", true )) ); + KURLRequester *destination = static_cast( child( "DestinationURL", "KURLRequester", true ) ); destination->lineEdit()->setReadOnly( true ); destination->button()->setEnabled( false ); - TQWidget *transfer_widget = static_cast( TQT_TQWIDGET(child( "TransferInfoWidget", "TQWidget", true )) ); + TQWidget *transfer_widget = static_cast( child( "TransferInfoWidget", "TQWidget", true ) ); transfer_widget->setEnabled( true ); enableButton( User1, false ); enableButton( User2, false ); // Enable the progress bars and the information widgets: - static_cast( TQT_TQWIDGET(child( "IndividualProgress", "KProgress", true )) )->setEnabled( true ); - static_cast( TQT_TQWIDGET(child( "TotalProgress", "KProgress", true )) )->setEnabled( true ); + static_cast( child( "IndividualProgress", "KProgress", true ) )->setEnabled( true ); + static_cast( child( "TotalProgress", "KProgress", true ) )->setEnabled( true ); Smb4KCore::synchronizer()->synchronize( source->url(), destination->url() ); } @@ -163,8 +163,8 @@ void Smb4KSynchronizationDialog::slotUser2() { // Swap URLs. - KURLRequester *source = static_cast( TQT_TQWIDGET(child( "SourceURL", "KURLRequester", true )) ); - KURLRequester *destination = static_cast( TQT_TQWIDGET(child( "DestinationURL", "KURLRequester", true )) ); + KURLRequester *source = static_cast( child( "SourceURL", "KURLRequester", true ) ); + KURLRequester *destination = static_cast( child( "DestinationURL", "KURLRequester", true ) ); TQString sourceURL = source->url(); TQString destinationURL = destination->url(); @@ -184,11 +184,11 @@ void Smb4KSynchronizationDialog::slotCancel() void Smb4KSynchronizationDialog::slotProgress( const Smb4KSynchronizationInfo &info ) { - KLineEdit *progress = static_cast( TQT_TQWIDGET(child( "ProgressInfo", "KLineEdit", true )) ); - KProgress *individual = static_cast( TQT_TQWIDGET(child( "IndividualProgress", "KProgress", true )) ); - KProgress *total = static_cast( TQT_TQWIDGET(child( "TotalProgress", "KProgress", true )) ); - TQLabel *transferred = static_cast( TQT_TQWIDGET(child( "FilesTransferred", "TQLabel", true )) ); - TQLabel *rate = static_cast( TQT_TQWIDGET(child( "TransferRate", "TQLabel", true )) ); + KLineEdit *progress = static_cast( child( "ProgressInfo", "KLineEdit", true ) ); + KProgress *individual = static_cast( child( "IndividualProgress", "KProgress", true ) ); + KProgress *total = static_cast( child( "TotalProgress", "KProgress", true ) ); + TQLabel *transferred = static_cast( child( "FilesTransferred", "TQLabel", true ) ); + TQLabel *rate = static_cast( child( "TransferRate", "TQLabel", true ) ); if ( !info.text().isEmpty() ) { @@ -219,8 +219,8 @@ void Smb4KSynchronizationDialog::slotProgress( const Smb4KSynchronizationInfo &i void Smb4KSynchronizationDialog::slotSynchronizationFinished() { - KProgress *individual = static_cast( TQT_TQWIDGET(child( "IndividualProgress", "KProgress", true )) ); - KProgress *total = static_cast( TQT_TQWIDGET(child( "TotalProgress", "KProgress", true )) ); + KProgress *individual = static_cast( child( "IndividualProgress", "KProgress", true ) ); + KProgress *total = static_cast( child( "TotalProgress", "KProgress", true ) ); if ( individual && individual->progress() != 100 ) { diff --git a/smb4k/iconview/smb4ksharesiconview_part.cpp b/smb4k/iconview/smb4ksharesiconview_part.cpp index c271862..75e5197 100644 --- a/smb4k/iconview/smb4ksharesiconview_part.cpp +++ b/smb4k/iconview/smb4ksharesiconview_part.cpp @@ -444,7 +444,7 @@ void Smb4KSharesIconViewPart::slotUnmountAllShares() void Smb4KSharesIconViewPart::slotSynchronize() { Smb4KSharesIconViewItem *item = static_cast( m_widget->currentItem() ); - Smb4KSynchronizationDialog *dlg = static_cast( TQT_TQWIDGET(m_widget->child( "SynchronizationDialog", "Smb4KSynchronizationDialog", true )) ); + Smb4KSynchronizationDialog *dlg = static_cast( m_widget->child( "SynchronizationDialog", "Smb4KSynchronizationDialog", true ) ); if ( item && !item->shareObject()->isBroken() && !dlg ) { diff --git a/smb4k/iconview/smb4ksharesiconviewtooltip.cpp b/smb4k/iconview/smb4ksharesiconviewtooltip.cpp index a1af8fc..04e6c91 100644 --- a/smb4k/iconview/smb4ksharesiconviewtooltip.cpp +++ b/smb4k/iconview/smb4ksharesiconviewtooltip.cpp @@ -322,7 +322,7 @@ void Smb4KSharesIconViewToolTip::update() } else { - TQLabel *free_label = static_cast( TQT_TQWIDGET(child( "FreeLabel", "TQLabel" )) ); + TQLabel *free_label = static_cast( child( "FreeLabel", "TQLabel" ) ); if ( free_label ) { @@ -337,7 +337,7 @@ void Smb4KSharesIconViewToolTip::update() m_free = NULL; } - TQLabel *used_label = static_cast( TQT_TQWIDGET(child( "UsedLabel", "TQLabel" )) ); + TQLabel *used_label = static_cast( child( "UsedLabel", "TQLabel" ) ); if ( used_label ) { @@ -352,7 +352,7 @@ void Smb4KSharesIconViewToolTip::update() m_used = NULL; } - TQLabel *total_label = static_cast( TQT_TQWIDGET(child( "TotalLabel", "TQLabel" )) ); + TQLabel *total_label = static_cast( child( "TotalLabel", "TQLabel" ) ); if ( total_label ) { @@ -367,7 +367,7 @@ void Smb4KSharesIconViewToolTip::update() m_total = NULL; } - TQLabel *usage_label = static_cast( TQT_TQWIDGET(child( "UsageLabel", "TQLabel" )) ); + TQLabel *usage_label = static_cast( child( "UsageLabel", "TQLabel" ) ); if ( usage_label ) { diff --git a/smb4k/listview/smb4kshareslistview_part.cpp b/smb4k/listview/smb4kshareslistview_part.cpp index 62f89ea..8ab0667 100644 --- a/smb4k/listview/smb4kshareslistview_part.cpp +++ b/smb4k/listview/smb4kshareslistview_part.cpp @@ -578,7 +578,7 @@ void Smb4KSharesListViewPart::slotUnmountAllShares() void Smb4KSharesListViewPart::slotSynchronize() { Smb4KSharesListViewItem *item = static_cast( m_widget->currentItem() ); - Smb4KSynchronizationDialog *dlg = static_cast( TQT_TQWIDGET(m_widget->child( "SynchronizationDialog", "Smb4KSynchronizationDialog", true )) ); + Smb4KSynchronizationDialog *dlg = static_cast( m_widget->child( "SynchronizationDialog", "Smb4KSynchronizationDialog", true ) ); if ( item && !item->shareObject()->isBroken() && !dlg ) { diff --git a/smb4k/listview/smb4kshareslistviewtooltip.cpp b/smb4k/listview/smb4kshareslistviewtooltip.cpp index d97404b..8e379c8 100644 --- a/smb4k/listview/smb4kshareslistviewtooltip.cpp +++ b/smb4k/listview/smb4kshareslistviewtooltip.cpp @@ -322,7 +322,7 @@ void Smb4KSharesListViewToolTip::update() } else { - TQLabel *free_label = static_cast( TQT_TQWIDGET(child( "FreeLabel", "TQLabel" )) ); + TQLabel *free_label = static_cast( child( "FreeLabel", "TQLabel" ) ); if ( free_label ) { @@ -337,7 +337,7 @@ void Smb4KSharesListViewToolTip::update() m_free = NULL; } - TQLabel *used_label = static_cast( TQT_TQWIDGET(child( "UsedLabel", "TQLabel" )) ); + TQLabel *used_label = static_cast( child( "UsedLabel", "TQLabel" ) ); if ( used_label ) { @@ -352,7 +352,7 @@ void Smb4KSharesListViewToolTip::update() m_used = NULL; } - TQLabel *total_label = static_cast( TQT_TQWIDGET(child( "TotalLabel", "TQLabel" )) ); + TQLabel *total_label = static_cast( child( "TotalLabel", "TQLabel" ) ); if ( total_label ) { @@ -367,7 +367,7 @@ void Smb4KSharesListViewToolTip::update() m_total = NULL; } - TQLabel *usage_label = static_cast( TQT_TQWIDGET(child( "UsageLabel", "TQLabel" )) ); + TQLabel *usage_label = static_cast( child( "UsageLabel", "TQLabel" ) ); if ( usage_label ) { diff --git a/smb4k/searchdlg/smb4ksearchdialog.cpp b/smb4k/searchdlg/smb4ksearchdialog.cpp index 4e4e2c1..f13c21e 100644 --- a/smb4k/searchdlg/smb4ksearchdialog.cpp +++ b/smb4k/searchdlg/smb4ksearchdialog.cpp @@ -48,7 +48,7 @@ Smb4KSearchDialog::Smb4KSearchDialog( TQWidget *parent, const char *name ) m_tool_bar = new TDEToolBar( this, "SearchDialogToolBar", true, true ); m_tool_bar->insertCombo( TQStringList(), Combo, true, TQT_SIGNAL( returnPressed() ), - TQT_TQOBJECT(this), TQT_SLOT( slotReturnPressed() ), true, + this, TQT_SLOT( slotReturnPressed() ), true, i18n( "Enter the search string here." ), -1, Combo ); m_tool_bar->setItemAutoSized( Combo, true ); diff --git a/smb4k/smb4k.cpp b/smb4k/smb4k.cpp index ee347d4..3893eb8 100644 --- a/smb4k/smb4k.cpp +++ b/smb4k/smb4k.cpp @@ -77,7 +77,7 @@ Smb4KApp::Smb4KApp( TQWidget *parent, const char *name ) // Setup all things that need to be done *after* createGUI() // was run: - TQPopupMenu *settings = static_cast( TQT_TQWIDGET(child( "settings", "TQPopupMenu", true )) ); + TQPopupMenu *settings = static_cast( child( "settings", "TQPopupMenu", true ) ); if ( settings ) { @@ -147,7 +147,7 @@ void Smb4KApp::setupActions() { actionCollection()->setHighlightingEnabled( true ); - (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotQuit() ), actionCollection(), "quit_action" ); + (void) KStdAction::quit( this, TQT_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, - TQT_TQOBJECT(this), TQT_SLOT( slotChangeSharesView() ), actionCollection(), "icon_view_action" ); + this, TQT_SLOT( slotChangeSharesView() ), actionCollection(), "icon_view_action" ); icon_view->setExclusiveGroup( "SharesViewActions" ); TDERadioAction *list_view = new TDERadioAction( i18n( "List Vie&w" ), "view_detailed", CTRL+Key_W, - TQT_TQOBJECT(this), TQT_SLOT( slotChangeSharesView() ), actionCollection(), "list_view_action" ); + this, TQT_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( TQT_TQOBJECT(this), TQT_SLOT( slotConfigDialog() ), actionCollection(), "configure_action" ); + (void) KStdAction::preferences( this, TQT_SLOT( slotConfigDialog() ), actionCollection(), "configure_action" ); // Notes: // (1) Actions from the parts will be included by setupView(). @@ -248,7 +248,7 @@ void Smb4KApp::setupView() if ( shares_factory ) { - m_shares_part = static_cast( shares_factory->create( TQT_TQOBJECT(this), "SharesPart", "KParts::Part" ) ); + m_shares_part = static_cast( shares_factory->create( this, "SharesPart", "KParts::Part" ) ); if ( m_shares_part ) { @@ -261,7 +261,7 @@ void Smb4KApp::setupView() createGUI( m_shares_part ); - accel()->insert( i18n( "Jump to shares view" ).utf8().data(), CTRL+Key_3, TQT_TQOBJECT(this), TQT_SLOT( slotJumpToSharesView() ), false, true ); + accel()->insert( i18n( "Jump to shares view" ).utf8().data(), CTRL+Key_3, this, TQT_SLOT( slotJumpToSharesView() ), false, true ); } } else @@ -280,7 +280,7 @@ void Smb4KApp::setupView() if ( browser_factory ) { - m_browser_part = static_cast( browser_factory->create( TQT_TQOBJECT(this), "BrowserPart", "KParts::Part" ) ); + m_browser_part = static_cast( browser_factory->create( this, "BrowserPart", "KParts::Part" ) ); if ( m_browser_part ) { @@ -290,7 +290,7 @@ void Smb4KApp::setupView() factory()->addClient( m_browser_part ); - accel()->insert( i18n( "Jump to network browser" ).utf8().data(), CTRL+Key_1, TQT_TQOBJECT(this), TQT_SLOT( slotJumpToNetworkBrowser() ), false, true ); + accel()->insert( i18n( "Jump to network browser" ).utf8().data(), CTRL+Key_1, this, TQT_SLOT( slotJumpToNetworkBrowser() ), false, true ); } } else @@ -309,7 +309,7 @@ void Smb4KApp::setupView() if ( search_factory ) { - m_search_part = static_cast( search_factory->create( TQT_TQOBJECT(this), "SearchDialogPart", "KParts::Part" ) ); + m_search_part = static_cast( search_factory->create( this, "SearchDialogPart", "KParts::Part" ) ); if ( m_search_part ) { @@ -329,7 +329,7 @@ void Smb4KApp::setupView() factory()->addClient( m_search_part ); - accel()->insert( i18n( "Jump to search dialog" ).utf8().data(), CTRL+Key_2, TQT_TQOBJECT(this), TQT_SLOT( slotJumpToSearchDialog() ), false, true ); + accel()->insert( i18n( "Jump to search dialog" ).utf8().data(), CTRL+Key_2, this, TQT_SLOT( slotJumpToSearchDialog() ), false, true ); } } else @@ -403,7 +403,7 @@ void Smb4KApp::changeSharesView() if ( shares_factory ) { - m_shares_part = static_cast( shares_factory->create( TQT_TQOBJECT(this), "SharesPart", "KParts::Part" ) ); + m_shares_part = static_cast( shares_factory->create( this, "SharesPart", "KParts::Part" ) ); if ( m_shares_part ) { @@ -478,7 +478,7 @@ bool Smb4KApp::queryClose() void Smb4KApp::timerEvent( TQTimerEvent * ) { - KProgress *progress_bar = static_cast( TQT_TQWIDGET(child( "StatusBarProgressBar", "KProgress", true )) ); + KProgress *progress_bar = static_cast( child( "StatusBarProgressBar", "KProgress", true ) ); if ( progress_bar ) { @@ -571,11 +571,11 @@ void Smb4KApp::slotConfigDialog() if ( config_factory ) { - TDEConfigDialog *dlg = static_cast( TQT_TQWIDGET(config_factory->create( TQT_TQOBJECT(this), "ConfigDialog", "TDEConfigDialog" )) ); + TDEConfigDialog *dlg = static_cast( config_factory->create( this, "ConfigDialog", "TDEConfigDialog" ) ); if ( dlg ) { - connect( dlg, TQT_SIGNAL( settingsChanged() ), TQT_TQOBJECT(this), TQT_SLOT( slotSettingsChanged() ) ); + connect( dlg, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotSettingsChanged() ) ); dlg->show(); } @@ -618,7 +618,7 @@ void Smb4KApp::slotSettingsChanged() void Smb4KApp::slotBookmarkEditor() { - Smb4KBookmarkEditor *dlg = static_cast( TQT_TQWIDGET(child( "BookmarkEditor", "Smb4KBookmarkEditor", true )) ); + Smb4KBookmarkEditor *dlg = static_cast( child( "BookmarkEditor", "Smb4KBookmarkEditor", true ) ); if ( !dlg ) { @@ -632,7 +632,7 @@ void Smb4KApp::slotBookmarkEditor() void Smb4KApp::slotRunStateChanged() { // Get the progress bar: - KProgress *progress_bar = static_cast( TQT_TQWIDGET(child( "StatusBarProgressBar", "KProgress", true )) ); + KProgress *progress_bar = static_cast( child( "StatusBarProgressBar", "KProgress", true ) ); // Clear the status bar: statusBar()->clear(); @@ -817,7 +817,7 @@ void Smb4KApp::slotSetupBookmarksMenu() // Create the "Edit Bookmarks" action: bookmark_actions.append( new TDEAction( i18n( "&Edit Bookmarks" ), "bookmark", CTRL+Key_E, - TQT_TQOBJECT(this), TQT_SLOT( slotBookmarkEditor() ), actionCollection(), + this, TQT_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() ), TQT_TQOBJECT(this), TQT_SLOT( slotBookmarkActivated() ) ); + connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotBookmarkActivated() ) ); bookmark_list.append( a ); } 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( TQT_TQWIDGET(parentWidget()->child( "MountDialog", "Smb4KMountDialog", true )) ); + dlg = static_cast( parentWidget()->child( "MountDialog", "Smb4KMountDialog", true ) ); } else { - dlg = static_cast( TQT_TQWIDGET(child( "MountDialog", "Smb4KMountDialog", true )) ); + dlg = static_cast( 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( TQT_TQWIDGET(config_factory->create( TQT_TQOBJECT(parentWidget()), "ConfigDialog", "TDEConfigDialog" )) ); + dlg = static_cast( config_factory->create( parentWidget(), "ConfigDialog", "TDEConfigDialog" ) ); } else { - dlg = static_cast( TQT_TQWIDGET(config_factory->create( TQT_TQOBJECT(this), "ConfigDialog", "TDEConfigDialog" )) ); + dlg = static_cast( 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( TQT_TQWIDGET(parentWidget()->child( "BookmarkEditor", "Smb4KBookmarkEditor", true )) ); + dlg = static_cast( parentWidget()->child( "BookmarkEditor", "Smb4KBookmarkEditor", true ) ); } else { - dlg = static_cast( TQT_TQWIDGET(child( "BookmarkEditor", "Smb4KBookmarkEditor", true )) ); + dlg = static_cast( 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" );