diff options
Diffstat (limited to 'smb4k')
81 files changed, 806 insertions, 1029 deletions
diff --git a/smb4k/Makefile.am b/smb4k/Makefile.am deleted file mode 100644 index 9254122..0000000 --- a/smb4k/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDES = $(all_includes) -METASOURCES = AUTO - -SUBDIRS = icons core configdlg dialogs browser iconview listview searchdlg - -# Main program -bin_PROGRAMS = smb4k - -smb4k_SOURCES = main.cpp smb4k.cpp smb4ksystemtray.cpp -smb4k_LDADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \ - $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_TQT) -smb4k_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor - - -KDE_ICON = smb4k - -xdg_apps_DATA = smb4k.desktop - -rcdir = $(kde_datadir)/smb4k -rc_DATA = smb4k_shell.rc - -noinst_HEADERS = smb4ksystemtray.h diff --git a/smb4k/browser/Makefile.am b/smb4k/browser/Makefile.am deleted file mode 100644 index 50b4b5c..0000000 --- a/smb4k/browser/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDES = $(all_includes) -METASOURCES = AUTO -kde_module_LTLIBRARIES = libsmb4knetworkbrowser.la -noinst_HEADERS = smb4knetworkbrowser_part.h smb4knetworkbrowser.h \ - smb4knetworkbrowseritem.h smb4knetworkbrowsertooltip.h -libsmb4knetworkbrowser_la_SOURCES = smb4knetworkbrowser_part.cpp \ - smb4knetworkbrowser.cpp smb4knetworkbrowseritem.cpp \ - smb4knetworkbrowsertooltip.cpp -libsmb4knetworkbrowser_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \ - $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) \ - $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_TQT) -libsmb4knetworkbrowser_la_LDFLAGS = -module -no-undefined $(all_libraries) - -partrcdir = $(kde_datadir)/smb4knetworkbrowserpart -partrc_DATA = smb4knetworkbrowser_part.rc 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.h b/smb4k/browser/smb4knetworkbrowser.h index c1fb000..20e41da 100644 --- a/smb4k/browser/smb4knetworkbrowser.h +++ b/smb4k/browser/smb4knetworkbrowser.h @@ -80,11 +80,11 @@ class Smb4KNetworkBrowser : public TDEListView Smb4KNetworkBrowserToolTip *tooltip() { return m_tooltip; } /** - * Block the showing of tool tips. If @p block is set to TRUE, the + * Block the showing of tool tips. If @p block is set to true, the * current tool tip gets deleted (if there is one) and no tool tip - * will be shown until @p block is reset to FALSE. + * will be shown until @p block is reset to false. * - * @param block Set this parameter to TRUE to block the showing + * @param block Set this parameter to true to block the showing * of tool tips. */ void blockToolTips( bool block ); diff --git a/smb4k/browser/smb4knetworkbrowser_part.cpp b/smb4k/browser/smb4knetworkbrowser_part.cpp index b3d1662..2d4f5d3 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<Smb4KWorkgroupItem *> & ) ), - this, TQT_SLOT( slotWorkgroups( const TQValueList<Smb4KWorkgroupItem *> & ) ) ); + connect( Smb4KCore::scanner(), TQ_SIGNAL( workgroups( const TQValueList<Smb4KWorkgroupItem *> & ) ), + this, TQ_SLOT( slotWorkgroups( const TQValueList<Smb4KWorkgroupItem *> & ) ) ); - connect( Smb4KCore::scanner(), TQT_SIGNAL( members( const TQString &, const TQValueList<Smb4KHostItem *> & ) ), - this, TQT_SLOT( slotWorkgroupMembers( const TQString &, const TQValueList<Smb4KHostItem *> & ) ) ); + connect( Smb4KCore::scanner(), TQ_SIGNAL( members( const TQString &, const TQValueList<Smb4KHostItem *> & ) ), + this, TQ_SLOT( slotWorkgroupMembers( const TQString &, const TQValueList<Smb4KHostItem *> & ) ) ); - connect( Smb4KCore::scanner(), TQT_SIGNAL( shares( const TQString &, const TQValueList<Smb4KShareItem *> & ) ), - this, TQT_SLOT( slotShares( const TQString &, const TQValueList<Smb4KShareItem *> & ) ) ); + connect( Smb4KCore::scanner(), TQ_SIGNAL( shares( const TQString &, const TQValueList<Smb4KShareItem *> & ) ), + this, TQ_SLOT( slotShares( const TQString &, const TQValueList<Smb4KShareItem *> & ) ) ); - 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, @@ -1477,7 +1477,7 @@ void Smb4KNetworkBrowserPart::slotAbort() void Smb4KNetworkBrowserPart::slotMountManually() { - Smb4KMountDialog *dlg = static_cast<Smb4KMountDialog *>( TQT_TQWIDGET(m_widget->child( "MountDialog", "Smb4KMountDialog", true )) ); + Smb4KMountDialog *dlg = static_cast<Smb4KMountDialog *>( m_widget->child( "MountDialog", "Smb4KMountDialog", true ) ); if ( !dlg ) { @@ -1534,7 +1534,7 @@ void Smb4KNetworkBrowserPart::slotAuthentication() void Smb4KNetworkBrowserPart::slotCustomOptions() { Smb4KCustomOptionsDialog *dlg = static_cast<Smb4KCustomOptionsDialog *>( - TQT_TQWIDGET(m_widget->child( "CustomOptionsDialog", "Smb4KCustomOptionsDialog", true )) ); + m_widget->child( "CustomOptionsDialog", "Smb4KCustomOptionsDialog", true ) ); Smb4KNetworkBrowserItem *item = static_cast<Smb4KNetworkBrowserItem *>( m_widget->currentItem() ); if ( !dlg && item ) @@ -1618,7 +1618,7 @@ void Smb4KNetworkBrowserPart::slotPreview() void Smb4KNetworkBrowserPart::slotPrint() { - Smb4KPrintDialog *dlg = static_cast<Smb4KPrintDialog *>( TQT_TQWIDGET(m_widget->child( "PrintDialog", "Smb4KPrintDialog", true )) ); + Smb4KPrintDialog *dlg = static_cast<Smb4KPrintDialog *>( m_widget->child( "PrintDialog", "Smb4KPrintDialog", true ) ); Smb4KNetworkBrowserItem *item = static_cast<Smb4KNetworkBrowserItem *>( m_widget->currentItem() ); if ( !dlg && item ) @@ -1918,7 +1918,7 @@ TDEInstance *Smb4KNetworkBrowserPartFactory::instance() extern "C" { - KDE_EXPORT void *init_libsmb4knetworkbrowser() + TDE_EXPORT void *init_libsmb4knetworkbrowser() { TDEGlobal::locale()->insertCatalogue( "smb4k" ); return new Smb4KNetworkBrowserPartFactory; diff --git a/smb4k/browser/smb4knetworkbrowseritem.h b/smb4k/browser/smb4knetworkbrowseritem.h index 75b10e3..3f8134b 100644 --- a/smb4k/browser/smb4knetworkbrowseritem.h +++ b/smb4k/browser/smb4knetworkbrowseritem.h @@ -139,10 +139,10 @@ class Smb4KNetworkBrowserItem : public TDEListViewItem void update( Smb4KShareItem *item ); /** - * This is a convenience function. It returns TRUE if the item is a - * printer share and FALSE otherwise. + * This is a convenience function. It returns true if the item is a + * printer share and false otherwise. * - * @returns TRUE if the item is a printer share and FALSE otherwise. + * @returns true if the item is a printer share and false otherwise. */ bool isPrinter(); @@ -151,15 +151,15 @@ class Smb4KNetworkBrowserItem : public TDEListViewItem * changed by this function and the item text will be set to italic by * Smb4KNetworkBrowserItem::paintCell(). * - * @param mounted TRUE if the share is mounted and FALSE otherwise + * @param mounted true if the share is mounted and false otherwise */ void setMounted( bool mounted = true ); /** * Tells whether the respective share is shown as mounted or not. For non-share - * items this function will always return FALSE. + * items this function will always return false. * - * @returns TRUE if the share is mounted and FALSE otherwise. + * @returns true if the share is mounted and false otherwise. */ bool isMounted(); diff --git a/smb4k/browser/smb4knetworkbrowsertooltip.cpp b/smb4k/browser/smb4knetworkbrowsertooltip.cpp index 30fea3c..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() ) ); } @@ -267,7 +267,7 @@ void Smb4KNetworkBrowserToolTip::update() { case Smb4KNetworkBrowserItem::Workgroup: { - TQLabel *master_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "MasterBrowser", "TQLabel", true )) ); + TQLabel *master_label = static_cast<TQLabel *>( child( "MasterBrowser", "TQLabel", true ) ); if ( master_label ) { @@ -282,9 +282,9 @@ void Smb4KNetworkBrowserToolTip::update() } case Smb4KNetworkBrowserItem::Host: { - TQLabel *os_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "OSString", "TQLabel", true )) ); - TQLabel *server_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "ServerString", "TQLabel", true )) ); - TQLabel *ip_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "IPAddress", "TQLabel", true )) ); + TQLabel *os_label = static_cast<TQLabel *>( child( "OSString", "TQLabel", true ) ); + TQLabel *server_label = static_cast<TQLabel *>( child( "ServerString", "TQLabel", true ) ); + TQLabel *ip_label = static_cast<TQLabel *>( child( "IPAddress", "TQLabel", true ) ); if ( os_label ) { @@ -317,7 +317,7 @@ void Smb4KNetworkBrowserToolTip::update() } case Smb4KNetworkBrowserItem::Share: { - TQLabel *ip_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "IPAddress", "TQLabel", true )) ); + TQLabel *ip_label = static_cast<TQLabel *>( child( "IPAddress", "TQLabel", true ) ); if ( ip_label ) { @@ -363,7 +363,7 @@ void Smb4KNetworkBrowserToolTip::leaveEvent( TQEvent *e ) ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KNetworkBrowserToolTip::slotHideToolTip() diff --git a/smb4k/configdlg/Makefile.am b/smb4k/configdlg/Makefile.am deleted file mode 100644 index 8ea570b..0000000 --- a/smb4k/configdlg/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -INCLUDES = $(all_includes) -METASOURCES = AUTO -kde_module_LTLIBRARIES = libsmb4tdeconfigdialog.la -noinst_HEADERS = smb4kauthoptions.h smb4tdeconfigdialog.h smb4knetworkoptions.h \ - smb4tdersyncoptions.h smb4ksambaoptions.h smb4kshareoptions.h smb4ksuperuseroptions.h \ - smb4kuserinterfaceoptions.h -libsmb4tdeconfigdialog_la_SOURCES = smb4kauthoptions.cpp smb4tdeconfigdialog.cpp \ - smb4knetworkoptions.cpp smb4tdersyncoptions.cpp smb4ksambaoptions.cpp smb4kshareoptions.cpp \ - smb4ksuperuseroptions.cpp smb4kuserinterfaceoptions.cpp -libsmb4tdeconfigdialog_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \ - $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TQT) -libsmb4tdeconfigdialog_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TDECORE) $(LIB_TDEFILE) diff --git a/smb4k/configdlg/smb4kauthoptions.cpp b/smb4k/configdlg/smb4kauthoptions.cpp index daab696..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,18 +102,18 @@ Smb4KAuthOptions::~Smb4KAuthOptions() } ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KAuthOptions::slotTDEWalletButtonState( int state ) { if ( state == TQCheckBox::On ) { - static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "DefaultLoginBox", "TQGroupBox", true )) )->setEnabled( true ); + static_cast<TQCheckBox *>( child( "DefaultLoginBox", "TQGroupBox", true ) )->setEnabled( true ); } else if ( state == TQCheckBox::Off ) { - static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "DefaultLoginBox", "TQGroupBox", true )) )->setEnabled( false ); + static_cast<TQCheckBox *>( child( "DefaultLoginBox", "TQGroupBox", true ) )->setEnabled( false ); } } @@ -122,11 +122,11 @@ void Smb4KAuthOptions::slotDefaultAuthButtonState( int state ) { if ( state == TQCheckBox::On ) { - static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "DefaultAuthWidget", "TQWidget", true )) )->setEnabled( true ); + static_cast<TQCheckBox *>( child( "DefaultAuthWidget", "TQWidget", true ) )->setEnabled( true ); } else if ( state == TQCheckBox::Off ) { - static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "DefaultAuthWidget", "TQWidget", true )) )->setEnabled( false ); + static_cast<TQCheckBox *>( child( "DefaultAuthWidget", "TQWidget", true ) )->setEnabled( false ); } } diff --git a/smb4k/configdlg/smb4ksambaoptions.cpp b/smb4k/configdlg/smb4ksambaoptions.cpp index fb5b153..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__ @@ -564,28 +564,28 @@ void Smb4KSambaOptions::slotSambaFileSystem( int item_index ) { case Smb4KSettings::EnumFilesystem::CIFS: { - TQGroupBox *adv_cifs = static_cast<TQGroupBox *>( TQT_TQWIDGET(child( "AdvancedCIFSOptions", "TQGroupBox", true )) ); + TQGroupBox *adv_cifs = static_cast<TQGroupBox *>( child( "AdvancedCIFSOptions", "TQGroupBox", true ) ); if ( adv_cifs ) { adv_cifs->setEnabled( true ); } - TQGroupBox *adv_smbfs = static_cast<TQGroupBox *>( TQT_TQWIDGET(child( "AdvancedSMBFSOptions", "TQGroupBox", true )) ); + TQGroupBox *adv_smbfs = static_cast<TQGroupBox *>( child( "AdvancedSMBFSOptions", "TQGroupBox", true ) ); if ( adv_smbfs ) { adv_smbfs->setEnabled( false ); } - TQLabel *codepage = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CodepageLabel", "TQLabel", true )) ); + TQLabel *codepage = static_cast<TQLabel *>( child( "CodepageLabel", "TQLabel", true ) ); if ( codepage ) { codepage->setEnabled( false ); } - KComboBox *srv_codepage = static_cast<KComboBox *>( TQT_TQWIDGET(child( "kcfg_ServerCodepage", "KComboBox", true )) ); + KComboBox *srv_codepage = static_cast<KComboBox *>( 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<TQGroupBox *>( TQT_TQWIDGET(child( "AdvancedCIFSOptions", "TQGroupBox", true )) ); + TQGroupBox *adv_cifs = static_cast<TQGroupBox *>( child( "AdvancedCIFSOptions", "TQGroupBox", true ) ); if ( adv_cifs ) { adv_cifs->setEnabled( false ); } - TQGroupBox *adv_smbfs = static_cast<TQGroupBox *>( TQT_TQWIDGET(child( "AdvancedSMBFSOptions", "TQGroupBox", true )) ); + TQGroupBox *adv_smbfs = static_cast<TQGroupBox *>( child( "AdvancedSMBFSOptions", "TQGroupBox", true ) ); if ( adv_smbfs ) { adv_smbfs->setEnabled( true ); } - TQLabel *codepage = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CodepageLabel", "TQLabel", true )) ); + TQLabel *codepage = static_cast<TQLabel *>( child( "CodepageLabel", "TQLabel", true ) ); if ( codepage ) { codepage->setEnabled( true ); } - KComboBox *srv_codepage = static_cast<KComboBox *>( TQT_TQWIDGET(child( "kcfg_ServerCodepage", "KComboBox", true )) ); + KComboBox *srv_codepage = static_cast<KComboBox *>( 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<TQGroupBox *>( TQT_TQWIDGET(child( "CustomInputWidget", "TQGroupBox", true )) ); + TQWidget *input = static_cast<TQGroupBox *>( 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<TQLabel *>( TQT_TQWIDGET(child( "CustomProtocolLabel", "TQLabel", true )) ); + TQLabel *protocol_label = static_cast<TQLabel *>( child( "CustomProtocolLabel", "TQLabel", true ) ); if ( protocol_label ) { @@ -665,7 +665,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) } } - KComboBox *protocol = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomProtocol", "KComboBox", true )) ); + KComboBox *protocol = static_cast<KComboBox *>( child( "CustomProtocol", "KComboBox", true ) ); if ( protocol ) { @@ -683,7 +683,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) #ifndef __FreeBSD__ - TQLabel *fs_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomFileSystemLabel", "TQLabel", true )) ); + TQLabel *fs_label = static_cast<TQLabel *>( child( "CustomFileSystemLabel", "TQLabel", true ) ); if ( fs_label ) { @@ -697,7 +697,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) } } - KComboBox *filesystem = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomFileSystem", "KComboBox", true )) ); + KComboBox *filesystem = static_cast<KComboBox *>( 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<TQLabel *>( TQT_TQWIDGET(child( "CustomWriteAccessLabel", "TQLabel", true )) ); + TQLabel *write_access_label = static_cast<TQLabel *>( child( "CustomWriteAccessLabel", "TQLabel", true ) ); if ( write_access_label ) { @@ -727,7 +727,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) } } - KComboBox *write_access = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomWriteAccess", "KComboBox", true )) ); + KComboBox *write_access = static_cast<KComboBox *>( child( "CustomWriteAccess", "KComboBox", true ) ); if ( write_access ) { @@ -745,7 +745,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) #endif - TQLabel *krb_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomKerberosLabel", "TQLabel", true )) ); + TQLabel *krb_label = static_cast<TQLabel *>( child( "CustomKerberosLabel", "TQLabel", true ) ); if ( krb_label ) { @@ -759,7 +759,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) } } - KComboBox *kerberos = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomKerberos", "KComboBox", true )) ); + KComboBox *kerberos = static_cast<KComboBox *>( 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<TQLabel *>( TQT_TQWIDGET(child( "CustomUIDLabel", "TQLabel", true )) ); + TQLabel *uid_label = static_cast<TQLabel *>( child( "CustomUIDLabel", "TQLabel", true ) ); if ( uid_label ) { @@ -789,7 +789,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) } } - KLineEdit *uid = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "CustomUID", "KLineEdit", true )) ); + KLineEdit *uid = static_cast<KLineEdit *>( 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<TQLabel *>( TQT_TQWIDGET(child( "CustomGIDLabel", "TQLabel", true )) ); + TQLabel *gid_label = static_cast<TQLabel *>( child( "CustomGIDLabel", "TQLabel", true ) ); if ( gid_label ) { @@ -819,7 +819,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) } } - KLineEdit *gid = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "CustomGID", "KLineEdit", true )) ); + KLineEdit *gid = static_cast<KLineEdit *>( 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<TQLabel *>( TQT_TQWIDGET(child( "CustomPortLabel", "TQLabel", true )) ); + TQLabel *port_label = static_cast<TQLabel *>( child( "CustomPortLabel", "TQLabel", true ) ); if ( port_label ) { @@ -849,7 +849,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) } } - KIntNumInput *port = static_cast<KIntNumInput *>( TQT_TQWIDGET(child( "CustomPort", "KIntNumInput", true )) ); + KIntNumInput *port = static_cast<KIntNumInput *>( 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<KPushButton *>( TQT_TQWIDGET(child( "CustomRemoveItem", "KPushButton", true )) ); + KPushButton *remove = static_cast<KPushButton *>( child( "CustomRemoveItem", "KPushButton", true ) ); if ( remove ) { remove->setEnabled( true ); } - KPushButton *remove_all = static_cast<KPushButton *>( TQT_TQWIDGET(child( "CustomRemoveAllItems", "KPushButton", true )) ); + KPushButton *remove_all = static_cast<KPushButton *>( 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<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); + TDEListView *view = static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) ); if ( view ) { - TQLabel *protocol_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomProtocolLabel", "TQLabel", true )) ); + TQLabel *protocol_label = static_cast<TQLabel *>( child( "CustomProtocolLabel", "TQLabel", true ) ); if ( protocol_label ) { protocol_label->setEnabled( false ); } - KComboBox *protocol = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomProtocol", "KComboBox", true )) ); + KComboBox *protocol = static_cast<KComboBox *>( child( "CustomProtocol", "KComboBox", true ) ); if ( protocol ) { @@ -903,14 +903,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) #ifndef __FreeBSD__ - TQLabel *fs_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomFileSystemLabel", "TQLabel", true )) ); + TQLabel *fs_label = static_cast<TQLabel *>( child( "CustomFileSystemLabel", "TQLabel", true ) ); if ( fs_label ) { fs_label->setEnabled( false ); } - KComboBox *filesystem = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomFileSystem", "KComboBox", true )) ); + KComboBox *filesystem = static_cast<KComboBox *>( child( "CustomFileSystem", "KComboBox", true ) ); if ( filesystem ) { @@ -918,14 +918,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) filesystem->setEnabled( false ); } - TQLabel *write_access_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomWriteAccessLabel", "TQLabel", true )) ); + TQLabel *write_access_label = static_cast<TQLabel *>( child( "CustomWriteAccessLabel", "TQLabel", true ) ); if ( write_access_label ) { write_access_label->setEnabled( false ); } - KComboBox *write_access = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomWriteAccess", "KComboBox", true )) ); + KComboBox *write_access = static_cast<KComboBox *>( child( "CustomWriteAccess", "KComboBox", true ) ); if ( write_access ) { @@ -935,14 +935,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) #endif - TQLabel *krb_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomKerberosLabel", "TQLabel", true )) ); + TQLabel *krb_label = static_cast<TQLabel *>( child( "CustomKerberosLabel", "TQLabel", true ) ); if ( krb_label ) { krb_label->setEnabled( false ); } - KComboBox *kerberos = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomKerberos", "KComboBox", true )) ); + KComboBox *kerberos = static_cast<KComboBox *>( child( "CustomKerberos", "KComboBox", true ) ); if ( kerberos ) { @@ -950,14 +950,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) kerberos->setEnabled( false ); } - TQLabel *uid_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomUIDLabel", "TQLabel", true )) ); + TQLabel *uid_label = static_cast<TQLabel *>( child( "CustomUIDLabel", "TQLabel", true ) ); if ( uid_label ) { uid_label->setEnabled( false ); } - KLineEdit *uid = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "CustomUID", "KLineEdit", true )) ); + KLineEdit *uid = static_cast<KLineEdit *>( child( "CustomUID", "KLineEdit", true ) ); if ( uid ) { @@ -965,14 +965,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) uid->setEnabled( false ); } - TQLabel *gid_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomGIDLabel", "TQLabel", true )) ); + TQLabel *gid_label = static_cast<TQLabel *>( child( "CustomGIDLabel", "TQLabel", true ) ); if ( gid_label ) { gid_label->setEnabled( false ); } - KLineEdit *gid = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "CustomGID", "KLineEdit", true )) ); + KLineEdit *gid = static_cast<KLineEdit *>( child( "CustomGID", "KLineEdit", true ) ); if ( gid ) { @@ -980,14 +980,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) gid->setEnabled( false ); } - TQLabel *port_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomPortLabel", "TQLabel", true )) ); + TQLabel *port_label = static_cast<TQLabel *>( child( "CustomPortLabel", "TQLabel", true ) ); if ( port_label ) { port_label->setEnabled( false ); } - KIntNumInput *port = static_cast<KIntNumInput *>( TQT_TQWIDGET(child( "CustomPort", "KIntNumInput", true )) ); + KIntNumInput *port = static_cast<KIntNumInput *>( child( "CustomPort", "KIntNumInput", true ) ); if ( port ) { @@ -995,14 +995,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item ) port->setEnabled( false ); } - KPushButton *remove = static_cast<KPushButton *>( TQT_TQWIDGET(child( "CustomRemoveItem", "KPushButton", true )) ); + KPushButton *remove = static_cast<KPushButton *>( child( "CustomRemoveItem", "KPushButton", true ) ); if ( remove ) { remove->setEnabled( false ); } - KPushButton *remove_all = static_cast<KPushButton *>( TQT_TQWIDGET(child( "CustomRemoveAllItems", "KPushButton", true )) ); + KPushButton *remove_all = static_cast<KPushButton *>( 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<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); - KComboBox *custom_protocol = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomProtocol", "KComboBox", true )) ); + TDEListView *view = static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) ); + KComboBox *custom_protocol = static_cast<KComboBox *>( 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<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); - KComboBox *custom_filesystem = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomFileSystem", "KComboBox", true )) ); + TDEListView *view = static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) ); + KComboBox *custom_filesystem = static_cast<KComboBox *>( 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<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); - KComboBox *custom_rw = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomWriteAccess", "KComboBox", true )) ); + TDEListView *view = static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) ); + KComboBox *custom_rw = static_cast<KComboBox *>( 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<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); - KComboBox *custom_kerberos = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomWriteAccess", "KComboBox", true )) ); + TDEListView *view = static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) ); + KComboBox *custom_kerberos = static_cast<KComboBox *>( 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<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); + TDEListView *view = static_cast<TDEListView *>( 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<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); + TDEListView *view = static_cast<TDEListView *>( 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<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); + TDEListView *view = static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) ); if ( view && view->selectedItem() ) { @@ -1189,7 +1189,7 @@ void Smb4KSambaOptions::slotCustomPortChanged( int port ) void Smb4KSambaOptions::slotRemoveCustomOption() { - TDEListView *view = static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); + TDEListView *view = static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) ); if ( view && view->selectedItem() ) { @@ -1208,7 +1208,7 @@ void Smb4KSambaOptions::slotRemoveCustomOption() void Smb4KSambaOptions::slotRemoveAllCustomOptions() { - TDEListView *view = static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); + TDEListView *view = static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) ); if ( view ) { 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 8fe66c0..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 ///////////////////////////////////////////////////////////////////////////// @@ -194,13 +194,13 @@ void Smb4KUserInterfaceOptions::slotShowHiddenShares( int state ) { if ( state == TQCheckBox::On ) { - static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_ShowHiddenIPCShares", "TQCheckBox" )) )->setEnabled( true ); - static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_ShowHiddenADMINShares", "TQCheckBox" )) )->setEnabled( true ); + static_cast<TQCheckBox *>( child( "kcfg_ShowHiddenIPCShares", "TQCheckBox" ) )->setEnabled( true ); + static_cast<TQCheckBox *>( child( "kcfg_ShowHiddenADMINShares", "TQCheckBox" ) )->setEnabled( true ); } else if ( state == TQCheckBox::Off ) { - static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_ShowHiddenIPCShares", "TQCheckBox" )) )->setEnabled( false ); - static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_ShowHiddenADMINShares", "TQCheckBox" )) )->setEnabled( false ); + static_cast<TQCheckBox *>( child( "kcfg_ShowHiddenIPCShares", "TQCheckBox" ) )->setEnabled( false ); + static_cast<TQCheckBox *>( child( "kcfg_ShowHiddenADMINShares", "TQCheckBox" ) )->setEnabled( false ); } } diff --git a/smb4k/configdlg/smb4tdeconfigdialog.cpp b/smb4k/configdlg/smb4tdeconfigdialog.cpp index f9aeef9..c93f1e0 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<TQRadioButton *>( TQT_TQWIDGET(super_user_options->child( "SudoButton", "TQRadioButton", true )) ); + TQRadioButton *sudo = static_cast<TQRadioButton *>( 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<TQRadioButton *>( TQT_TQWIDGET(super_user_options->child( "SuperButton", "TQRadioButton", true )) ); + TQRadioButton *super = static_cast<TQRadioButton *>( super_user_options->child( "SuperButton", "TQRadioButton", true ) ); if ( super ) { @@ -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() ) ); } @@ -196,7 +196,7 @@ Smb4TDEConfigDialog::~Smb4TDEConfigDialog() void Smb4TDEConfigDialog::loadCustomSambaOptions() { // Get the list view: - TDEListView *custom_list = static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); + TDEListView *custom_list = static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) ); if ( !custom_list ) { @@ -380,7 +380,7 @@ void Smb4TDEConfigDialog::loadCustomSambaOptions() } } - Smb4KSambaOptions *samba_options = static_cast<Smb4KSambaOptions *>( TQT_TQWIDGET(child( "SambaOptions", "Smb4KSambaOptions", true )) ); + Smb4KSambaOptions *samba_options = static_cast<Smb4KSambaOptions *>( 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<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); + TDEListView *custom_list = static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) ); if ( !custom_list ) { @@ -517,14 +517,14 @@ void Smb4TDEConfigDialog::loadAuthenticationData() (void) passwordHandler()->readDefaultAuth( &auth ); - KLineEdit *default_user = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "DefaultUserName", "KLineEdit", true )) ); + KLineEdit *default_user = static_cast<KLineEdit *>( child( "DefaultUserName", "KLineEdit", true ) ); if ( default_user ) { default_user->setText( auth.user() ); } - KLineEdit *default_pass = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "DefaultPassword", "KLineEdit", true )) ); + KLineEdit *default_pass = static_cast<KLineEdit *>( 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<KLineEdit *>( TQT_TQWIDGET(child( "DefaultUserName", "KLineEdit", true )) ); + KLineEdit *default_user = static_cast<KLineEdit *>( child( "DefaultUserName", "KLineEdit", true ) ); if ( default_user ) { auth.setUser( default_user->text() ); } - KLineEdit *default_pass = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "DefaultPassword", "KLineEdit", true )) ); + KLineEdit *default_pass = static_cast<KLineEdit *>( child( "DefaultPassword", "KLineEdit", true ) ); if ( default_pass ) { @@ -568,12 +568,12 @@ void Smb4TDEConfigDialog::saveAuthenticationData() bool Smb4TDEConfigDialog::writeSuperUserEntries() { - TQRadioButton *sudo = static_cast<TQRadioButton *>( TQT_TQWIDGET(child( "SudoButton", "TQRadioButton", true )) ); - TQRadioButton *super = static_cast<TQRadioButton *>( TQT_TQWIDGET(child( "SuperButton", "TQRadioButton", true )) ); + TQRadioButton *sudo = static_cast<TQRadioButton *>( child( "SudoButton", "TQRadioButton", true ) ); + TQRadioButton *super = static_cast<TQRadioButton *>( child( "SuperButton", "TQRadioButton", true ) ); #ifdef __linux__ - TQCheckBox *force = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseForceUnmount", "TQCheckBox", true )) ); + TQCheckBox *force = static_cast<TQCheckBox *>( child( "kcfg_UseForceUnmount", "TQCheckBox", true ) ); #endif - TQCheckBox *full_use = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_AlwaysUseSuperUser", "TQCheckBox", true )) ); + TQCheckBox *full_use = static_cast<TQCheckBox *>( 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<TQRadioButton *>( TQT_TQWIDGET(child( "SudoButton", "TQRadioButton", true )) ); - TQRadioButton *super = static_cast<TQRadioButton *>( TQT_TQWIDGET(child( "SuperButton", "TQRadioButton", true )) ); + TQRadioButton *sudo = static_cast<TQRadioButton *>( child( "SudoButton", "TQRadioButton", true ) ); + TQRadioButton *super = static_cast<TQRadioButton *>( child( "SuperButton", "TQRadioButton", true ) ); #ifdef __linux__ - TQCheckBox *force = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseForceUnmount", "TQCheckBox", true )) ); + TQCheckBox *force = static_cast<TQCheckBox *>( child( "kcfg_UseForceUnmount", "TQCheckBox", true ) ); #endif - TQCheckBox *full_use = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_AlwaysUseSuperUser", "TQCheckBox", true )) ); + TQCheckBox *full_use = static_cast<TQCheckBox *>( 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<TQRadioButton *>( TQT_TQWIDGET(child( "CustomMasterBrowserLabel", "TQRadioButton", true )) ); - KLineEdit *custom_master_input = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_CustomMasterBrowser", "KLineEdit", true )) ); + TQRadioButton *query_custom_master = static_cast<TQRadioButton *>( child( "CustomMasterBrowserLabel", "TQRadioButton", true ) ); + KLineEdit *custom_master_input = static_cast<KLineEdit *>( 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<TQRadioButton *>( TQT_TQWIDGET(child( "BroadcastAreasLabel", "TQRadioButton", true )) ); - KLineEdit *bcast_areas_input = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_BroadcastAreas", "KLineEdit", true )) ); + TQRadioButton *scan_bcast_areas = static_cast<TQRadioButton *>( child( "BroadcastAreasLabel", "TQRadioButton", true ) ); + KLineEdit *bcast_areas_input = static_cast<KLineEdit *>( 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<KURLRequester *>( TQT_TQWIDGET(child( "kcfg_MountPrefix", "KURLRequester", true )) ); + KURLRequester *mount_prefix = static_cast<KURLRequester *>( 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<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseDefaultLogin", "TQCheckBox", true )) ); - KLineEdit *default_user_name = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_DefaultUserName", "KLineEdit", true )) ); + TQCheckBox *use_default_login = static_cast<TQCheckBox *>( child( "kcfg_UseDefaultLogin", "TQCheckBox", true ) ); + KLineEdit *default_user_name = static_cast<KLineEdit *>( 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<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_FileMask", "KLineEdit", true )) ); + KLineEdit *file_mask = static_cast<KLineEdit *>( 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<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_DirectoryMask", "KLineEdit", true )) ); + KLineEdit *directory_mask = static_cast<KLineEdit *>( 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<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_UserID", "KLineEdit", true )) ); + KLineEdit *user_id = static_cast<KLineEdit *>( 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<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_GroupID", "KLineEdit", true )) ); + KLineEdit *group_id = static_cast<KLineEdit *>( 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<KURLRequester *>( TQT_TQWIDGET(child( "kcfg_RsyncPrefix", "KURLRequester", true )) ); + KURLRequester *rsync_prefix = static_cast<KURLRequester *>( 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<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UsePartialDirectory", "TQCheckBox", true )) ); - KURLRequester *partial_directory = static_cast<KURLRequester *>( TQT_TQWIDGET(child( "kcfg_PartialDirectory", "KURLRequester", true )) ); + TQCheckBox *use_partical_directory = static_cast<TQCheckBox *>( child( "kcfg_UsePartialDirectory", "TQCheckBox", true ) ); + KURLRequester *partial_directory = static_cast<KURLRequester *>( 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<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseExcludePattern", "TQCheckBox", true )) ); - KLineEdit *exclude_pattern = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_ExcludePattern", "KLineEdit", true )) ); + TQCheckBox *use_exclude_pattern = static_cast<TQCheckBox *>( child( "kcfg_UseExcludePattern", "TQCheckBox", true ) ); + KLineEdit *exclude_pattern = static_cast<KLineEdit *>( 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<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseExcludeFrom", "TQCheckBox", true )) ); - KURLRequester *exclude_file = static_cast<KURLRequester *>( TQT_TQWIDGET(child( "kcfg_ExcludeFrom", "KURLRequester", true )) ); + TQCheckBox *use_exclude_file = static_cast<TQCheckBox *>( child( "kcfg_UseExcludeFrom", "TQCheckBox", true ) ); + KURLRequester *exclude_file = static_cast<KURLRequester *>( 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<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseIncludePattern", "TQCheckBox", true )) ); - KLineEdit *include_pattern = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_IncludePattern", "KLineEdit", true )) ); + TQCheckBox *use_include_pattern = static_cast<TQCheckBox *>( child( "kcfg_UseIncludePattern", "TQCheckBox", true ) ); + KLineEdit *include_pattern = static_cast<KLineEdit *>( 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<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseIncludeFrom", "TQCheckBox", true )) ); - KURLRequester *include_file = static_cast<KURLRequester *>( TQT_TQWIDGET(child( "kcfg_IncludeFrom", "KURLRequester", true )) ); + TQCheckBox *use_include_file = static_cast<TQCheckBox *>( child( "kcfg_UseIncludeFrom", "TQCheckBox", true ) ); + KURLRequester *include_file = static_cast<KURLRequester *>( 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<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_MakeBackups", "TQCheckBox", true )) ); + TQCheckBox *make_backups = static_cast<TQCheckBox *>( child( "kcfg_MakeBackups", "TQCheckBox", true ) ); if ( make_backups && make_backups->isChecked() ) { // The backup suffix must not be empty. - TQCheckBox *use_backup_suffix = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseBackupSuffix", "TQCheckBox", true )) ); - KLineEdit *backup_suffix = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_BackupSuffix", "KLineEdit", true )) ); + TQCheckBox *use_backup_suffix = static_cast<TQCheckBox *>( child( "kcfg_UseBackupSuffix", "TQCheckBox", true ) ); + KLineEdit *backup_suffix = static_cast<KLineEdit *>( 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<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseBackupDirectory", "TQCheckBox", true )) ); - KURLRequester *backup_dir = static_cast<KURLRequester *>( TQT_TQWIDGET(child( "kcfg_BackupDirectory", "KURLRequester", true )) ); + TQCheckBox *use_backup_dir = static_cast<TQCheckBox *>( child( "kcfg_UseBackupDirectory", "TQCheckBox", true ) ); + KURLRequester *backup_dir = static_cast<KURLRequester *>( child( "kcfg_BackupDirectory", "KURLRequester", true ) ); if ( use_backup_dir && use_backup_dir->isChecked() && backup_dir && backup_dir->url().stripWhiteSpace().isEmpty() ) @@ -930,7 +930,7 @@ void Smb4TDEConfigDialog::showEvent( TQShowEvent *e ) ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4TDEConfigDialog::slotApply() @@ -996,7 +996,7 @@ void Smb4TDEConfigDialog::slotOk() void Smb4TDEConfigDialog::slotCancel() { // Reset the custom Samba options tab: - Smb4KSambaOptions *samba_options = static_cast<Smb4KSambaOptions *>( TQT_TQWIDGET(child( "SambaOptions", "Smb4KSambaOptions", true )) ); + Smb4KSambaOptions *samba_options = static_cast<Smb4KSambaOptions *>( 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<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) ); + TDEListView *view = static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) ); if ( !view ) { @@ -1136,9 +1136,9 @@ void Smb4TDEConfigDialog::slotRemoveSuperUserEntries() void Smb4TDEConfigDialog::slotReceivedFileIOFailed() { #ifdef __linux__ - TQCheckBox *force = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseForceUnmount", "TQCheckBox", true )) ); + TQCheckBox *force = static_cast<TQCheckBox *>( child( "kcfg_UseForceUnmount", "TQCheckBox", true ) ); #endif - TQCheckBox *full_use = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_AlwaysUseSuperUser", "TQCheckBox", true )) ); + TQCheckBox *full_use = static_cast<TQCheckBox *>( 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<TQWidget*>( parent ), name ) ; } @@ -1212,7 +1212,7 @@ const TQStringList & ) extern "C" { - KDE_EXPORT void *init_libsmb4tdeconfigdialog() + TDE_EXPORT void *init_libsmb4tdeconfigdialog() { TDEGlobal::locale()->insertCatalogue( "smb4k" ); return new Smb4TDEConfigDialogFactory; diff --git a/smb4k/configdlg/smb4tdeconfigdialog.h b/smb4k/configdlg/smb4tdeconfigdialog.h index 0587c15..2dce48b 100644 --- a/smb4k/configdlg/smb4tdeconfigdialog.h +++ b/smb4k/configdlg/smb4tdeconfigdialog.h @@ -34,7 +34,7 @@ #include <tdeconfigdialog.h> #include <klibloader.h> #include <tdeaboutdata.h> -#include <kinstance.h> +#include <tdeinstance.h> // forward declarations class Smb4KSettings; @@ -145,7 +145,7 @@ class Smb4TDEConfigDialog : public TDEConfigDialog /** * Write super user configuration entries to configuration file. * - * @returns TRUE if something needs to be written. + * @returns true if something needs to be written. */ bool writeSuperUserEntries(); @@ -159,7 +159,7 @@ class Smb4TDEConfigDialog : public TDEConfigDialog * need it. This function will report all missing input to the user * via a message box. * - * @returns TRUE if the check passed and FALSE if it failed. + * @returns true if the check passed and false if it failed. */ bool checkSettings(); }; diff --git a/smb4k/configdlg/smb4tdersyncoptions.cpp b/smb4k/configdlg/smb4tdersyncoptions.cpp index 7e48e58..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,20 +291,20 @@ Smb4KRsyncOptions::~Smb4KRsyncOptions() ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KRsyncOptions::slotArchiveToggled( bool on ) { if ( on ) { - static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_RecurseIntoDirectories", "TQCheckBox", true )) )->setChecked( on ); - static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreserveSymlinks", "TQCheckBox", true )) )->setChecked( on ); - static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreservePermissions", "TQCheckBox", true )) )->setChecked( on ); - static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreserveTimes", "TQCheckBox", true )) )->setChecked( on ); - static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreserveGroup", "TQCheckBox", true )) )->setChecked( on ); - static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreserveOwner", "TQCheckBox", true )) )->setChecked( on ); - static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreserveDevicesAndSpecials", "TQCheckBox", true )) )->setChecked( on ); + static_cast<TQCheckBox *>( child( "kcfg_RecurseIntoDirectories", "TQCheckBox", true ) )->setChecked( on ); + static_cast<TQCheckBox *>( child( "kcfg_PreserveSymlinks", "TQCheckBox", true ) )->setChecked( on ); + static_cast<TQCheckBox *>( child( "kcfg_PreservePermissions", "TQCheckBox", true ) )->setChecked( on ); + static_cast<TQCheckBox *>( child( "kcfg_PreserveTimes", "TQCheckBox", true ) )->setChecked( on ); + static_cast<TQCheckBox *>( child( "kcfg_PreserveGroup", "TQCheckBox", true ) )->setChecked( on ); + static_cast<TQCheckBox *>( child( "kcfg_PreserveOwner", "TQCheckBox", true ) )->setChecked( on ); + static_cast<TQCheckBox *>( child( "kcfg_PreserveDevicesAndSpecials", "TQCheckBox", true ) )->setChecked( on ); } } @@ -313,23 +313,23 @@ void Smb4KRsyncOptions::slotUncheckArchive( bool on ) { if ( !on ) { - static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_ArchiveMode", "TQCheckBox", true )) )->setChecked( on ); + static_cast<TQCheckBox *>( child( "kcfg_ArchiveMode", "TQCheckBox", true ) )->setChecked( on ); } } void Smb4KRsyncOptions::slotBackupToggled( bool on ) { - static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseBackupDirectory", "TQCheckBox", true )) )->setEnabled( on ); - static_cast<KURLRequester *>( TQT_TQWIDGET(child( "kcfg_BackupDirectory", "KURLRequester", true )) )->setEnabled( on ); - static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseBackupSuffix", "TQCheckBox", true )) )->setEnabled( on ); - static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_BackupSuffix", "KLineEdit", true )) )->setEnabled( on ); + static_cast<TQCheckBox *>( child( "kcfg_UseBackupDirectory", "TQCheckBox", true ) )->setEnabled( on ); + static_cast<KURLRequester *>( child( "kcfg_BackupDirectory", "KURLRequester", true ) )->setEnabled( on ); + static_cast<TQCheckBox *>( child( "kcfg_UseBackupSuffix", "TQCheckBox", true ) )->setEnabled( on ); + static_cast<KLineEdit *>( child( "kcfg_BackupSuffix", "KLineEdit", true ) )->setEnabled( on ); } void Smb4KRsyncOptions::slotFShortcutToggled( bool on ) { - TQCheckBox *ff_filter = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseFFFilterRule", "TQCheckBox", true )) ); + TQCheckBox *ff_filter = static_cast<TQCheckBox *>( 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<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseFFilterRule", "TQCheckBox", true )) ); + TQCheckBox *f_filter = static_cast<TQCheckBox *>( child( "kcfg_UseFFilterRule", "TQCheckBox", true ) ); if ( on && f_filter->isChecked() ) { diff --git a/smb4k/configdlg/smb4tdersyncoptions.h b/smb4k/configdlg/smb4tdersyncoptions.h index 4407c7b..dcf8bd4 100644 --- a/smb4k/configdlg/smb4tdersyncoptions.h +++ b/smb4k/configdlg/smb4tdersyncoptions.h @@ -66,7 +66,7 @@ class Smb4KRsyncOptions : public TQTabWidget * This slot is invoked if the "Archive mode" checkbox has been * toggled. * - * @param on Is TRUE if the checkbox is checked and FALSE otherwise. + * @param on Is true if the checkbox is checked and false otherwise. */ void slotArchiveToggled( bool on ); @@ -74,8 +74,8 @@ class Smb4KRsyncOptions : public TQTabWidget * This slot is invoked if the --archive option has to be switched * off. * - * @param on Is FALSE if one of the connected checkboxes is unchecked - * and TRUE otherwise. + * @param on Is false if one of the connected checkboxes is unchecked + * and true otherwise. */ void slotUncheckArchive( bool on ); @@ -84,8 +84,8 @@ class Smb4KRsyncOptions : public TQTabWidget * It enables/disables all other backup options according to the * state the backup button is in. * - * @param on Is TRUE if the m_backup check box has been - * checked and FALSE otherwise. + * @param on Is true if the m_backup check box has been + * checked and false otherwise. */ void slotBackupToggled( bool on ); @@ -93,7 +93,7 @@ class Smb4KRsyncOptions : public TQTabWidget * This slot is called if the '-F' shortcut has been toggled. * It unchecks the '-F -F' shortcut. * - * @param on Is TRUE is m_f_filter is checked and FALSE otherwise. + * @param on Is true is m_f_filter is checked and false otherwise. */ void slotFShortcutToggled( bool on ); @@ -101,7 +101,7 @@ class Smb4KRsyncOptions : public TQTabWidget * This slot is called if the '-F -F' shortcut has been toggled. * It unchecks the '-F' shortcut. * - * @param on Is TRUE is m_ff_filter is checked and FALSE otherwise. + * @param on Is true is m_ff_filter is checked and false otherwise. */ void slotFFShortcutToggled( bool on ); }; diff --git a/smb4k/core/Makefile.am b/smb4k/core/Makefile.am deleted file mode 100644 index 96bad28..0000000 --- a/smb4k/core/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -INCLUDES = $(all_includes) -METASOURCES = AUTO - -lib_LTLIBRARIES = libsmb4kcore.la -libsmb4kcore_la_LDFLAGS = -no-undefined $(all_libraries) -ltdewalletclient \ - -version-info 2:0:0 -include_HEADERS = smb4kauthinfo.h smb4kbookmark.h smb4kbookmarkhandler.h \ - smb4kcore.h smb4kdefs.h smb4kerror.h smb4tdefileio.h smb4tdeglobal.h \ - smb4khomesshareshandler.h smb4kmounter.h smb4knetworkitems.h \ - smb4kpasswordhandler.h smb4kpreviewer.h smb4kpreviewitem.h \ - smb4kprint.h smb4kprintinfo.h smb4ksambaoptionshandler.h \ - smb4ksambaoptionsinfo.h smb4kscanner.h smb4kshare.h \ - smb4ksynchronizationinfo.h smb4ksynchronizer.h -libsmb4kcore_la_SOURCES = smb4kauthinfo.cpp smb4kbookmark.cpp \ - smb4kbookmarkhandler.cpp smb4kcore.cpp smb4kerror.cpp smb4tdefileio.cpp smb4tdeglobal.cpp \ - smb4kglobal_p.cpp smb4khomesshareshandler.cpp smb4kmounter.cpp smb4kmounter_p.cpp \ - smb4knetworkitems.cpp smb4kpasswordhandler.cpp smb4kpreviewer.cpp smb4kpreviewitem.cpp \ - smb4kprint.cpp smb4kprintinfo.cpp smb4ksambaoptionshandler.cpp \ - smb4ksambaoptionsinfo.cpp smb4kscanner.cpp smb4kscanner_p.cpp smb4ksettings.kcfgc smb4kshare.cpp \ - smb4ksynchronizationinfo.cpp smb4ksynchronizer.cpp -libsmb4kcore_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TQT) - -kde_kcfg_DATA = smb4k.kcfg - -# Build rules -smb4kcore.lo: smb4ksettings.h -smb4tdefileio.lo: smb4ksettings.h -smb4kmounter.lo: smb4ksettings.h -smb4kpasswordhandler.lo: smb4ksettings.h -smb4kprint.lo: smb4ksettings.h -smb4ksambaoptionshandler.lo: smb4ksettings.h -smb4kscanner.lo: smb4ksettings.h -smb4ksynchronizer.lo: smb4ksettings.h - -noinst_HEADERS = smb4kglobal_p.h smb4kmounter_p.h smb4kscanner_p.h diff --git a/smb4k/core/smb4kauthinfo.h b/smb4k/core/smb4kauthinfo.h index 3323db0..4dac018 100644 --- a/smb4k/core/smb4kauthinfo.h +++ b/smb4k/core/smb4kauthinfo.h @@ -31,7 +31,7 @@ #include <tqstring.h> #include <tqcstring.h> -#include <kdemacros.h> +#include <tdemacros.h> /** * This class provides a container for the authentication data. @@ -40,7 +40,7 @@ */ -class KDE_EXPORT Smb4KAuthInfo +class TDE_EXPORT Smb4KAuthInfo { public: /** diff --git a/smb4k/core/smb4kbookmark.h b/smb4k/core/smb4kbookmark.h index 536862c..88a0f4f 100644 --- a/smb4k/core/smb4kbookmark.h +++ b/smb4k/core/smb4kbookmark.h @@ -31,7 +31,7 @@ // TQt includes #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> // forward declarations class Smb4KShareItem; @@ -40,7 +40,7 @@ class Smb4KShareItem; * This class is a container for a set bookmark on a samba share */ -class KDE_EXPORT Smb4KBookmark +class TDE_EXPORT Smb4KBookmark { public: /** @@ -201,12 +201,12 @@ class KDE_EXPORT Smb4KBookmark /** * This function checks if the IP address is valid, i.e. the - * IP address is either IP v4 or IP v6. It returns either TRUE - * or FALSE. + * IP address is either IP v4 or IP v6. It returns either true + * or false. * * @param ip The IP address that's going to be checked. * - * @returns TRUE if the IP address is valid and FALSE otherwise. + * @returns true if the IP address is valid and false otherwise. */ bool ipIsValid( const TQString &ip ); }; diff --git a/smb4k/core/smb4kbookmarkhandler.cpp b/smb4k/core/smb4kbookmarkhandler.cpp index 4661835..52153a8 100644 --- a/smb4k/core/smb4kbookmarkhandler.cpp +++ b/smb4k/core/smb4kbookmarkhandler.cpp @@ -28,7 +28,7 @@ #include <tqfile.h> // KDE includes -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdeapplication.h> @@ -96,7 +96,7 @@ void Smb4KBookmarkHandler::addBookmark( Smb4KBookmark *bookmark ) if ( TQString::compare( bookmark->share(), "homes" ) == 0 ) { - TQString share = specifyUser( bookmark->host(), kapp->mainWidget() ? kapp->mainWidget() : 0, "SpecifyUser" ); + TQString share = specifyUser( bookmark->host(), tdeApp->mainWidget() ? tdeApp->mainWidget() : 0, "SpecifyUser" ); bookmark->setShareName( share ); } diff --git a/smb4k/core/smb4kbookmarkhandler.h b/smb4k/core/smb4kbookmarkhandler.h index 0e33b49..d3bd9a1 100644 --- a/smb4k/core/smb4kbookmarkhandler.h +++ b/smb4k/core/smb4kbookmarkhandler.h @@ -34,7 +34,7 @@ #include <tqobject.h> #include <tqvaluelist.h> -#include <kdemacros.h> +#include <tdemacros.h> // forward declarations class Smb4KHostItem; @@ -48,7 +48,7 @@ class Smb4KBookmark; * @author Alexander Reinholdt <dustpuppy@mail.berlios.de> */ -class KDE_EXPORT Smb4KBookmarkHandler : public TQObject +class TDE_EXPORT Smb4KBookmarkHandler : public TQObject { TQ_OBJECT diff --git a/smb4k/core/smb4kcore.cpp b/smb4k/core/smb4kcore.cpp index 8319ff4..d550438 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( tdeApp, 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/smb4kcore.h b/smb4k/core/smb4kcore.h index f3faea7..82b500b 100644 --- a/smb4k/core/smb4kcore.h +++ b/smb4k/core/smb4kcore.h @@ -36,7 +36,7 @@ #include <tqtimer.h> #include <tqvaluelist.h> -#include <kdemacros.h> +#include <tdemacros.h> // application specific includes #include "smb4kscanner.h" @@ -59,7 +59,7 @@ class Smb4KShare; * @author Alexander Reinholdt <dustpuppy@users.berlios.de> */ -class KDE_EXPORT Smb4KCore : public TQObject +class TDE_EXPORT Smb4KCore : public TQObject { TQ_OBJECT @@ -89,7 +89,7 @@ class KDE_EXPORT Smb4KCore : public TQObject static int scannerState() { return self()->m_scanner_state; } /** - * Returns TRUE, if the scanner is running, otherwise FALSE. + * Returns true, if the scanner is running, otherwise false. */ static bool scannerIsRunning() { return self()->m_scanner->isRunning(); } @@ -99,7 +99,7 @@ class KDE_EXPORT Smb4KCore : public TQObject static int mounterState() { return self()->m_mounter_state; } /** - * Returns TRUE, if the mounter is running, otherwise FALSE. + * Returns true, if the mounter is running, otherwise false. */ static bool mounterIsRunning() { return self()->m_mounter->isRunning(); } @@ -109,7 +109,7 @@ class KDE_EXPORT Smb4KCore : public TQObject static int printState() { return self()->m_print_state; } /** - * Returns TRUE, if the print object is running, otherwise FALSE. + * Returns true, if the print object is running, otherwise false. */ static bool printIsRunning() { return self()->m_print->isRunning(); } @@ -119,12 +119,12 @@ class KDE_EXPORT Smb4KCore : public TQObject static int synchronizerState() { return self()->m_syncer_state; } /** - * Returns TRUE, if the synchronizer is running, otherwise FALSE. + * Returns true, if the synchronizer is running, otherwise false. */ static bool synchronizerIsRunning() { return self()->m_synchronizer->isRunning(); } /** - * Returns TRUE if one of the core classes is doing something. + * Returns true if one of the core classes is doing something. */ static bool isRunning(); diff --git a/smb4k/core/smb4khomesshareshandler.cpp b/smb4k/core/smb4khomesshareshandler.cpp index 6039009..0aa661a 100644 --- a/smb4k/core/smb4khomesshareshandler.cpp +++ b/smb4k/core/smb4khomesshareshandler.cpp @@ -31,7 +31,7 @@ // KDE includes #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kiconloader.h> #include <kcombobox.h> @@ -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..685423d 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( tdeApp, TQ_SIGNAL( shutDown() ), + this, TQ_SLOT( slotShutdown() ) ); } @@ -480,7 +480,7 @@ void Smb4KMounter::mountShare( const TQString &workgroup, const TQString &host, if ( TQString::compare( share, "homes" ) == 0 ) { - share_name = specifyUser( host, kapp->mainWidget() ? kapp->mainWidget() : 0, "SpecifyUser" ); + share_name = specifyUser( host, tdeApp->mainWidget() ? tdeApp->mainWidget() : 0, "SpecifyUser" ); } else { @@ -1534,7 +1534,7 @@ void Smb4KMounter::timerEvent( TQTimerEvent * ) ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// diff --git a/smb4k/core/smb4kmounter.h b/smb4k/core/smb4kmounter.h index 1652405..f945b9e 100644 --- a/smb4k/core/smb4kmounter.h +++ b/smb4k/core/smb4kmounter.h @@ -37,8 +37,8 @@ #include <tqfile.h> // KDE includes -#include <kdemacros.h> -#include <kprocess.h> +#include <tdemacros.h> +#include <tdeprocess.h> // application specific includes #include "smb4kdefs.h" @@ -57,7 +57,7 @@ class Smb4KShare; * @author Alexander Reinholdt <dustpuppy@users.berlios.de> */ -class KDE_EXPORT Smb4KMounter : public TQObject +class TDE_EXPORT Smb4KMounter : public TQObject { TQ_OBJECT @@ -85,7 +85,7 @@ class KDE_EXPORT Smb4KMounter : public TQObject /** * Unmounts a share. This can either be done the "normal" way, or you may - * force it. If you decide the force the unmounting by setting @p force to TRUE, + * force it. If you decide the force the unmounting by setting @p force to true, * a lazy unmount will be initiated. With the parameter @p noMessage you can * suppress any error messages. * @@ -94,7 +94,7 @@ class KDE_EXPORT Smb4KMounter : public TQObject * @param force Force the unmounting of the share. * * @param noMessage Determines whether this function should emit an error code in case of an error. - * The default value is FALSE. + * The default value is false. */ void unmountShare( Smb4KShare *share, bool force = false, bool noMessage = false ); @@ -136,23 +136,23 @@ class KDE_EXPORT Smb4KMounter : public TQObject TQValueList<Smb4KShare> findShareByName( const TQString &name ); /** - * This function returns TRUE if a share is mounted and FALSE otherwise. + * This function returns true if a share is mounted and false otherwise. * * @param name The name of the share. It has to look like this: * //HOST/SHARE. * * @param userOnly Specifies whether this function should only consider * shares mounted by the user or all shares that are - * available on the system. The default is TRUE. + * available on the system. The default is true. * - * @return TRUE if the share is mounted and FALSE otherwise. + * @return true if the share is mounted and false otherwise. */ bool isMounted( const TQString &name, bool userOnly = true ); /** * This function reports if the mounter is running or not. * - * @returns TRUE if the scanner is running and FALSE otherwise. + * @returns true if the scanner is running and false otherwise. */ bool isRunning() { return m_working; } diff --git a/smb4k/core/smb4knetworkitems.h b/smb4k/core/smb4knetworkitems.h index 6b017ad..63e2c0b 100644 --- a/smb4k/core/smb4knetworkitems.h +++ b/smb4k/core/smb4knetworkitems.h @@ -35,14 +35,14 @@ #include <tqobject.h> #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> /** * This class provides a container for a workgroup/domain found in the network * neighborhood. */ -class KDE_EXPORT Smb4KWorkgroupItem +class TDE_EXPORT Smb4KWorkgroupItem { public: /** @@ -95,7 +95,7 @@ class KDE_EXPORT Smb4KWorkgroupItem void setPseudoMaster(); /** - * Returns TRUE, if the master is a 'pseudo' master. @see setPseudoMaster() + * Returns true, if the master is a 'pseudo' master. @see setPseudoMaster() * for further information. */ bool hasPseudoMaster() const { return m_pseudo; } @@ -144,12 +144,12 @@ class KDE_EXPORT Smb4KWorkgroupItem /** * This function checks if the IP address is valid, i.e. the - * IP address is either IP v4 or IP v6. It returns either TRUE - * or FALSE. + * IP address is either IP v4 or IP v6. It returns either true + * or false. * * @param ip The IP address that's going to be checked. * - * @returns TRUE if the IP address is valid and FALSE otherwise. + * @returns true if the IP address is valid and false otherwise. */ bool ipIsValid( const TQString &ip ); }; @@ -160,7 +160,7 @@ class KDE_EXPORT Smb4KWorkgroupItem * neighborhood. */ -class KDE_EXPORT Smb4KHostItem +class TDE_EXPORT Smb4KHostItem { public: /** @@ -240,14 +240,14 @@ class KDE_EXPORT Smb4KHostItem * This functions determines whether this host should be * registered as a master browser. * - * @param master Set this to TRUE if the host is a master browser. + * @param master Set this to true if the host is a master browser. */ void setMaster( bool master ); /** * This function tells you if the host is a master or not. * - * @returns TRUE if the host is a master browser. + * @returns true if the host is a master browser. */ const bool isMaster() const { return m_master; } @@ -269,14 +269,14 @@ class KDE_EXPORT Smb4KHostItem * This function is used to tell the host item, if a * check for the IP address has already been performed. * - * @param yes Should be set to TRUE if a check was performed. + * @param yes Should be set to true if a check was performed. */ void setIPAddressChecked( bool yes ); /** * Tells if a check for the IP address has already been performed. * - * @returns TRUE if a check was performed, and FALSE otherwise. + * @returns true if a check was performed, and false otherwise. */ const bool ipAddressChecked() const { return m_ip_checked; } @@ -284,7 +284,7 @@ class KDE_EXPORT Smb4KHostItem * This function is used to tell the host item, if a * check for the information (OS and Server string ) has already been performed. * - * @param yes Should be set to TRUE if a check was performed. + * @param yes Should be set to true if a check was performed. */ void setInfoChecked( bool yes ); @@ -292,7 +292,7 @@ class KDE_EXPORT Smb4KHostItem * Tells if a check for the information (OS and Server string) has already * been performed. * - * @returns TRUE is the check was performed previously. + * @returns true is the check was performed previously. */ const bool infoChecked() const { return m_info_checked; } @@ -347,12 +347,12 @@ class KDE_EXPORT Smb4KHostItem /** * This function checks if the IP address is valid, i.e. the - * IP address is either IP v4 or IP v6. It returns either TRUE - * or FALSE. + * IP address is either IP v4 or IP v6. It returns either true + * or false. * * @param ip The IP address that's going to be checked. * - * @returns TRUE if the IP address is valid and FALSE otherwise. + * @returns true if the IP address is valid and false otherwise. */ bool ipIsValid( const TQString &ip ); }; @@ -363,7 +363,7 @@ class KDE_EXPORT Smb4KHostItem * network neighborhood. */ -class KDE_EXPORT Smb4KShareItem +class TDE_EXPORT Smb4KShareItem { public: /** @@ -431,31 +431,31 @@ class KDE_EXPORT Smb4KShareItem /** * This function tells if the share is a hidden one. * - * @returns TRUE is the share is a hidden one and FALSE otherwise. + * @returns true is the share is a hidden one and false otherwise. */ bool isHidden() const; /** - * This function is TRUE if the share is a printer and - * FALSE otherwise. + * This function is true if the share is a printer and + * false otherwise. * - * @returns TRUE if the share is a printer + * @returns true if the share is a printer */ bool isPrinter() const; /** - * This function returns TRUE if the share is an IPC$ - * share and FALSE otherwise. + * This function returns true if the share is an IPC$ + * share and false otherwise. * - * @returns TRUE if the share is an IPC$ share + * @returns true if the share is an IPC$ share */ bool isIPC() const; /** - * This function returns TRUE if the share is an ADMIN$ - * share and FALSE otherwise. + * This function returns true if the share is an ADMIN$ + * share and false otherwise. * - * @returns TRUE if the share is an ADMIN$ share + * @returns true if the share is an ADMIN$ share */ bool isADMIN() const; diff --git a/smb4k/core/smb4kpasswordhandler.cpp b/smb4k/core/smb4kpasswordhandler.cpp index bef5607..13682fc 100644 --- a/smb4k/core/smb4kpasswordhandler.cpp +++ b/smb4k/core/smb4kpasswordhandler.cpp @@ -36,7 +36,7 @@ // KDE includes #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <kiconloader.h> #include <klineedit.h> @@ -109,9 +109,9 @@ void Smb4KPasswordHandler::open_close_wallet() // Start the wallet manager before accessing the wallet. We // do not care about the return value, because we do not do // error handling here. - if ( kapp ) + if ( tdeApp ) { - (void) kapp->tdeinitExec( "tdewalletmanager" ); + (void) tdeApp->tdeinitExec( "tdewalletmanager" ); } else { @@ -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 ///////////////////////////////////////////////////////////////////////////// @@ -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<KLineEdit *>( TQT_TQWIDGET(m_dlg->child( "AskPassPasswordEdit", "KLineEdit", true )) ); + KLineEdit *lineEdit = static_cast<KLineEdit *>( m_dlg->child( "AskPassPasswordEdit", "KLineEdit", true ) ); lineEdit->setText( auth->password() ); delete auth; diff --git a/smb4k/core/smb4kpasswordhandler.h b/smb4k/core/smb4kpasswordhandler.h index 997087d..4d2c33b 100644 --- a/smb4k/core/smb4kpasswordhandler.h +++ b/smb4k/core/smb4kpasswordhandler.h @@ -35,9 +35,9 @@ #include <tqcheckbox.h> // KDE includes -#include <kdemacros.h> +#include <tdemacros.h> #include <kdialogbase.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdewallet.h> // forward declarations @@ -61,7 +61,7 @@ class Smb4KAuthInfo; * @author Alexander Reinholdt <dustpuppy@users.berlios.de> */ -class KDE_EXPORT Smb4KPasswordHandler : public TQObject +class TDE_EXPORT Smb4KPasswordHandler : public TQObject { TQ_OBJECT @@ -127,7 +127,7 @@ class KDE_EXPORT Smb4KPasswordHandler : public TQObject * * @param name The name of this dialog. * - * @returns TRUE if a new password has been supplied and FALSE otherwise. + * @returns true if a new password has been supplied and false otherwise. */ bool askpass( const TQString &workgroup, const TQString &host, const TQString &share, int desc, TQWidget *parent = 0, const char *name = 0 ); @@ -174,18 +174,18 @@ class KDE_EXPORT Smb4KPasswordHandler : public TQObject enum Description{ NewData, AccessDenied, BadPassword, PermDenied, AuthError, LogonFailure, None }; /** - * This function returns TRUE if the wallet it open at the moment and FALSE + * This function returns true if the wallet it open at the moment and false * if it is closed or not used. * - * @returns TRUE if the wallet is open. + * @returns true if the wallet is open. */ bool walletIsOpen() { return (m_wallet && m_wallet->isOpen()); } /** - * This function returns TRUE if the digital wallet support has been + * This function returns true if the digital wallet support has been * disabled. This happens when the wallet could not be opened. * - * @returns TRUE if the digital wallet support has been disabled. + * @returns true if the digital wallet support has been disabled. */ bool walletSupportIsDisabled() { return m_wallet_support_disabled; } diff --git a/smb4k/core/smb4kpreviewer.cpp b/smb4k/core/smb4kpreviewer.cpp index ee7cc75..da1066c 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 ) ) ); } @@ -83,7 +83,7 @@ bool Smb4KPreviewer::preview( Smb4KPreviewItem *item ) if ( TQString::compare( item->share(), "homes" ) == 0 ) { - TQString share_name = specifyUser( item->host(), kapp->mainWidget() ? kapp->mainWidget() : 0, "SpecifyUser" ); + TQString share_name = specifyUser( item->host(), tdeApp->mainWidget() ? tdeApp->mainWidget() : 0, "SpecifyUser" ); if ( !share_name.isEmpty() ) { @@ -177,7 +177,7 @@ void Smb4KPreviewer::timerEvent( TQTimerEvent * ) ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KPreviewer::slotReceivedStdout( TDEProcess *, char *buf, int len ) @@ -237,7 +237,7 @@ void Smb4KPreviewer::slotProcessExited( TDEProcess * ) if ( passwordHandler()->askpass( m_item->workgroup(), m_item->host(), m_item->share(), state, - kapp->mainWidget() ? kapp->mainWidget() : 0, + tdeApp->mainWidget() ? tdeApp->mainWidget() : 0, "AskPass" ) ) { // Now we have a password. Retry. diff --git a/smb4k/core/smb4kpreviewer.h b/smb4k/core/smb4kpreviewer.h index 72e75c6..e78bcf8 100644 --- a/smb4k/core/smb4kpreviewer.h +++ b/smb4k/core/smb4kpreviewer.h @@ -36,8 +36,8 @@ #include <tqptrqueue.h> // KDE includes -#include <kdemacros.h> -#include <kprocess.h> +#include <tdemacros.h> +#include <tdeprocess.h> // forward declarations class Smb4KPreviewItem; @@ -49,7 +49,7 @@ class Smb4KPreviewItem; * @author Alexander Reinholdt <dustpuppy@users.berlios.de> */ -class KDE_EXPORT Smb4KPreviewer : public TQObject +class TDE_EXPORT Smb4KPreviewer : public TQObject { TQ_OBJECT @@ -79,8 +79,8 @@ class KDE_EXPORT Smb4KPreviewer : public TQObject * @param item The item for which a preview should be * requested. * - * @returns TRUE if einter the share name is not 'homes' or if it could - * successfully be set to a user name. Otherwise it returns FALSE. + * @returns true if einter the share name is not 'homes' or if it could + * successfully be set to a user name. Otherwise it returns false. */ bool preview( Smb4KPreviewItem *item ); @@ -88,7 +88,7 @@ class KDE_EXPORT Smb4KPreviewer : public TQObject * Using this function, you can find out whether the previewer is running * at the moment. * - * @returns TRUE if the previewer is running or FALSE otherwise. + * @returns true if the previewer is running or false otherwise. */ bool isRunning() { return m_working; } diff --git a/smb4k/core/smb4kpreviewitem.cpp b/smb4k/core/smb4kpreviewitem.cpp index d97a367..4764eef 100644 --- a/smb4k/core/smb4kpreviewitem.cpp +++ b/smb4k/core/smb4kpreviewitem.cpp @@ -68,7 +68,7 @@ void Smb4KPreviewItem::setPath( const TQString &path ) void Smb4KPreviewItem::addContents( const ContentsItem &item ) { - // Do not set the last argument to TRUE, because then + // Do not set the last argument to true, because then // we would be in overwrite mode. m_contents.append( item ); } diff --git a/smb4k/core/smb4kpreviewitem.h b/smb4k/core/smb4kpreviewitem.h index 45b1e88..a56b8e0 100644 --- a/smb4k/core/smb4kpreviewitem.h +++ b/smb4k/core/smb4kpreviewitem.h @@ -35,7 +35,7 @@ #include <tqmap.h> #include <tqpair.h> -#include <kdemacros.h> +#include <tdemacros.h> // application specific includes #include "smb4knetworkitems.h" @@ -49,7 +49,7 @@ typedef TQPair<int, TQString> ContentsItem; * @author Alexander Reinholdt <dustpuppy@users.berlios.de> */ -class KDE_EXPORT Smb4KPreviewItem +class TDE_EXPORT Smb4KPreviewItem { public: /** @@ -205,12 +205,12 @@ class KDE_EXPORT Smb4KPreviewItem /** * This function checks if the IP address is valid, i.e. the - * IP address is either IP v4 or IP v6. It returns either TRUE - * or FALSE. + * IP address is either IP v4 or IP v6. It returns either true + * or false. * * @param ip The IP address that's going to be checked. * - * @returns TRUE if the IP address is valid and FALSE otherwise. + * @returns true if the IP address is valid and false otherwise. */ bool ipIsValid( const TQString &ip ); }; 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/smb4kprint.h b/smb4k/core/smb4kprint.h index c4ef162..6e9b57b 100644 --- a/smb4k/core/smb4kprint.h +++ b/smb4k/core/smb4kprint.h @@ -36,9 +36,9 @@ #include <tqwidget.h> // KDE includes -#include <kdemacros.h> +#include <tdemacros.h> #include <kdialogbase.h> -#include <kprocess.h> +#include <tdeprocess.h> // forward declarations class Smb4KPrintInfo; @@ -53,7 +53,7 @@ class Smb4KPrintInfo; * @author Alexander Reinholdt <dustpuppy@users.berlios.de> */ -class KDE_EXPORT Smb4KPrint : public TQObject +class TDE_EXPORT Smb4KPrint : public TQObject { TQ_OBJECT @@ -87,10 +87,10 @@ class KDE_EXPORT Smb4KPrint : public TQObject void abort(); /** - * This function returns TRUE if the printer handler is running and - * FALSE otherwise. + * This function returns true if the printer handler is running and + * false otherwise. * - * @returns TRUE is the printer handler is running and FALSE otherwise. + * @returns true is the printer handler is running and false otherwise. */ bool isRunning() { return m_working; } @@ -138,8 +138,8 @@ class KDE_EXPORT Smb4KPrint : public TQObject TQString m_buffer; /** - * This boolean is TRUE if the printer handler is running and - * FALSE otherwise. + * This boolean is true if the printer handler is running and + * false otherwise. */ bool m_working; diff --git a/smb4k/core/smb4kprintinfo.h b/smb4k/core/smb4kprintinfo.h index 89bf753..8cf7aaa 100644 --- a/smb4k/core/smb4kprintinfo.h +++ b/smb4k/core/smb4kprintinfo.h @@ -33,7 +33,7 @@ // TQt includes #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> // application specific includes #include "smb4knetworkitems.h" @@ -43,7 +43,7 @@ * that is needed to print a file. */ -class KDE_EXPORT Smb4KPrintInfo +class TDE_EXPORT Smb4KPrintInfo { public: /** @@ -135,12 +135,12 @@ class KDE_EXPORT Smb4KPrintInfo /** * This function checks if the IP address is valid, i.e. the - * IP address is either IP v4 or IP v6. It returns either TRUE - * or FALSE. + * IP address is either IP v4 or IP v6. It returns either true + * or false. * * @param ip The IP address that's going to be checked. * - * @returns TRUE if the IP address is valid and FALSE otherwise. + * @returns true if the IP address is valid and false otherwise. */ bool ipIsValid( const TQString &ip ); }; diff --git a/smb4k/core/smb4ksambaoptionshandler.cpp b/smb4k/core/smb4ksambaoptionshandler.cpp index 6188542..98dd1ab 100644 --- a/smb4k/core/smb4ksambaoptionshandler.cpp +++ b/smb4k/core/smb4ksambaoptionshandler.cpp @@ -29,8 +29,8 @@ #include <tqdir.h> // KDE includes -#include <kstandarddirs.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeprocess.h> #include <kdebug.h> #include <tdelocale.h> diff --git a/smb4k/core/smb4ksambaoptionshandler.h b/smb4k/core/smb4ksambaoptionshandler.h index b6b72b4..e21f5b7 100644 --- a/smb4k/core/smb4ksambaoptionshandler.h +++ b/smb4k/core/smb4ksambaoptionshandler.h @@ -35,7 +35,7 @@ #include <tqmap.h> // KDE includes -#include <kdemacros.h> +#include <tdemacros.h> #include <tdeconfig.h> // forward declarations @@ -50,7 +50,7 @@ class Smb4KShare; * @author Alexander Reinholdt <dustpuppy@mail.berlios.de> */ -class KDE_EXPORT Smb4KSambaOptionsHandler : public TQObject +class TDE_EXPORT Smb4KSambaOptionsHandler : public TQObject { TQ_OBJECT @@ -80,14 +80,14 @@ class KDE_EXPORT Smb4KSambaOptionsHandler : public TQObject const TQValueList<Smb4KSambaOptionsInfo *> &customOptionsList(); /** - * This functions sets the remount flag of the share @p share to TRUE or FALSE. + * This functions sets the remount flag of the share @p share to true or false. * In case the share is not yet in the list of shares that are to be remounted, - * it will be added. If you set the remount flag to FALSE on an existing entry, + * it will be added. If you set the remount flag to false on an existing entry, * it will stay in the list even if no other custom options were defined. * * @param share The Smb4KShare object that represents the share * - * @param yes TRUE if you want the share to be remounted and FALSE + * @param yes true if you want the share to be remounted and false * otherwise */ void remount( Smb4KShare *share, bool yes ); @@ -170,7 +170,7 @@ class KDE_EXPORT Smb4KSambaOptionsHandler : public TQObject * * Please note that if the host where a share you are probing for * is located, a pointer to this *host* item will be returned unless - * you set @p exactMatch to TRUE in which case NULL is returned! If + * you set @p exactMatch to true in which case NULL is returned! If * neither the host nor the share is found, NULL is returned. * * @param item The name of the network item to find. @@ -187,7 +187,7 @@ class KDE_EXPORT Smb4KSambaOptionsHandler : public TQObject * * @param info The Smb4KSambaOptionsInfo object * - * @param sync If TRUE, the list is sync'ed with the config file. + * @param sync If true, the list is sync'ed with the config file. */ void addItem( Smb4KSambaOptionsInfo *info, bool sync ); @@ -196,7 +196,7 @@ class KDE_EXPORT Smb4KSambaOptionsHandler : public TQObject * * @param name The name of the item. * - * @param sync If TRUE, the list is sync'ed with the config file. + * @param sync If true, the list is sync'ed with the config file. */ void removeItem( const TQString &name, bool sync ); @@ -220,7 +220,7 @@ class KDE_EXPORT Smb4KSambaOptionsHandler : public TQObject * This function searches a particular network item in the list. If this item is a share * and it is not found, @p exactMatch determines if NULL is returned or if the values of * the item that matches @p item closest (i.e. the host, or another share that's located - * on the host). In most cases you want @p exactMatch to be FALSE. + * on the host). In most cases you want @p exactMatch to be false. * Please note: Do not delete the pointer that's returned by this function or you will * remove an item from the list! * diff --git a/smb4k/core/smb4ksambaoptionsinfo.h b/smb4k/core/smb4ksambaoptionsinfo.h index 80e141f..a6de0ff 100644 --- a/smb4k/core/smb4ksambaoptionsinfo.h +++ b/smb4k/core/smb4ksambaoptionsinfo.h @@ -34,7 +34,7 @@ // TQt includes #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> // forward declarations class Smb4KShare; @@ -47,7 +47,7 @@ class Smb4KShare; * @author Alexander Reinholdt <dustpuppy@mail.berlios.de> */ -class KDE_EXPORT Smb4KSambaOptionsInfo +class TDE_EXPORT Smb4KSambaOptionsInfo { public: /** @@ -83,15 +83,15 @@ class KDE_EXPORT Smb4KSambaOptionsInfo /** * Sets the "should be remounted" flag. * - * @param rm TRUE if the share is to be remounted and - * FALSE otherwise. + * @param rm true if the share is to be remounted and + * false otherwise. */ void setRemount( bool rm ); /** - * Returns TRUE if the share is to be remounted and FALSE otherwise. + * Returns true if the share is to be remounted and false otherwise. * - * @returns TRUE if the share is to be remounted and FALSE otherwise + * @returns true if the share is to be remounted and false otherwise */ bool remount() const { return m_remount; } @@ -145,16 +145,16 @@ class KDE_EXPORT Smb4KSambaOptionsInfo /** * Set the 'Use Kerberos' flag. * - * @param krb TRUE if the user wants to use Kerberos - * and FALSE otherwise. + * @param krb true if the user wants to use Kerberos + * and false otherwise. */ void setKerberos( bool krb ); /** - * This functions returns TRUE if the user wants to use Kerberos and - * otherwise it returns FALSE. + * This functions returns true if the user wants to use Kerberos and + * otherwise it returns false. * - * @returns TRUE if Kerberos should be used and FALSE + * @returns true if Kerberos should be used and false * otherwise. */ bool kerberos() const { return m_kerberos; } @@ -226,17 +226,17 @@ class KDE_EXPORT Smb4KSambaOptionsInfo * * Note: This function is not available und FreeBSD. * - * @param rw TRUE if read-write and FALSE otherwise. + * @param rw true if read-write and false otherwise. */ void setWriteAccess( bool rw ); /** - * This functions returns TRUE if the user wants to mount a share read-write - * otherwise it returns FALSE. + * This functions returns true if the user wants to mount a share read-write + * otherwise it returns false. * * Note: This function is not available und FreeBSD. * - * @returns TRUE if read-write and FALSE otherwise. + * @returns true if read-write and false otherwise. */ bool writeAccess() const { return m_write_access; } #endif diff --git a/smb4k/core/smb4kscanner.cpp b/smb4k/core/smb4kscanner.cpp index 8998d68..ef94bf9 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 ) ) ); } @@ -906,7 +906,7 @@ void Smb4KScanner::processWorkgroupMembers() if ( passwordHandler()->askpass( m_priv->workgroup(), m_priv->host(), TQString(), Smb4KPasswordHandler::AccessDenied, - kapp->mainWidget() ? kapp->mainWidget() : 0, "AskPass" ) ) + tdeApp->mainWidget() ? tdeApp->mainWidget() : 0, "AskPass" ) ) { m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4" ).arg( Hosts ).arg( m_priv->workgroup(), m_priv->host(), m_priv->ip() ) ) ); } @@ -1088,7 +1088,7 @@ void Smb4KScanner::processWorkgroupMembers() if ( passwordHandler()->askpass( m_priv->workgroup(), m_priv->host(), TQString(), Smb4KPasswordHandler::AccessDenied, - kapp->mainWidget() ? kapp->mainWidget() : 0, "AskPass" ) ) + tdeApp->mainWidget() ? tdeApp->mainWidget() : 0, "AskPass" ) ) { m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4" ).arg( Hosts ).arg( m_priv->workgroup(), m_priv->host(), m_priv->ip() ) ) ); } @@ -1185,7 +1185,7 @@ void Smb4KScanner::processShares() // Authentication failed: emit failed(); - if ( passwordHandler()->askpass( m_priv->workgroup(), m_priv->host(), TQString(), Smb4KPasswordHandler::AccessDenied, kapp->mainWidget() ? kapp->mainWidget() : 0, "AskPass" ) ) + if ( passwordHandler()->askpass( m_priv->workgroup(), m_priv->host(), TQString(), Smb4KPasswordHandler::AccessDenied, tdeApp->mainWidget() ? tdeApp->mainWidget() : 0, "AskPass" ) ) { m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4:%5" ).arg( Shares ).arg( m_priv->workgroup(), m_priv->host(), m_priv->ip(), TQString() ) ) ); } @@ -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/smb4kscanner.h b/smb4k/core/smb4kscanner.h index 24807f3..2fbd5b6 100644 --- a/smb4k/core/smb4kscanner.h +++ b/smb4k/core/smb4kscanner.h @@ -36,8 +36,8 @@ #include <tqptrqueue.h> // KDE includes -#include <kdemacros.h> -#include <kprocess.h> +#include <tdemacros.h> +#include <tdeprocess.h> // application specific includes #include "smb4kdefs.h" @@ -56,7 +56,7 @@ class Smb4KShareItem; * @author Alexander Reinholdt <dustpuppy@mail.berlios.de> */ -class KDE_EXPORT Smb4KScanner : public TQObject +class TDE_EXPORT Smb4KScanner : public TQObject { TQ_OBJECT @@ -172,7 +172,7 @@ class KDE_EXPORT Smb4KScanner : public TQObject /** * This function reports if the scanner is running or not. * - * @returns TRUE if the scanner is running and FALSE otherwise. + * @returns true if the scanner is running and false otherwise. */ bool isRunning() { return m_working; } diff --git a/smb4k/core/smb4ksettings.kcfgc b/smb4k/core/smb4ksettings.kcfgc index 05fce7c..b57ea76 100644 --- a/smb4k/core/smb4ksettings.kcfgc +++ b/smb4k/core/smb4ksettings.kcfgc @@ -4,4 +4,4 @@ Singleton=true Mutators=true ItemAccessors=true SetUserTexts=true -Visibility=KDE_EXPORT +Visibility=TDE_EXPORT diff --git a/smb4k/core/smb4kshare.h b/smb4k/core/smb4kshare.h index 4bc51be..2e549e0 100644 --- a/smb4k/core/smb4kshare.h +++ b/smb4k/core/smb4kshare.h @@ -38,7 +38,7 @@ #include <tqcstring.h> // KDE includes -#include <kdemacros.h> +#include <tdemacros.h> #include <kuser.h> @@ -51,7 +51,7 @@ * @author Alexander Reinholdt <dustpuppy@users.berlios.de> */ -class KDE_EXPORT Smb4KShare +class TDE_EXPORT Smb4KShare { public: /** @@ -124,7 +124,7 @@ class KDE_EXPORT Smb4KShare /** * This function returns the canonical path of the share. In contrast to * Smb4KShare::path(), it will return the absolute path without symlinks. However, - * should the share be broken (i.e. Smb4KShare::isBroken() returns TRUE), + * should the share be broken (i.e. Smb4KShare::isBroken() returns true), * only Smb4KShare::path() is returned. * * @returns Returns the canonical path of the share. @@ -176,29 +176,29 @@ class KDE_EXPORT Smb4KShare const TQString &cifsLogin() const; /** - * Is TRUE if the share is/seems to be mounted by another + * Is true if the share is/seems to be mounted by another * user. * - * @returns TRUE if another user mounted the share and FALSE otherwise. + * @returns true if another user mounted the share and false otherwise. */ bool isForeign() const; /** * This function sets the share to be foreign. * - * @param foreign TRUE if share is foreign and FALSE otherwise. + * @param foreign true if share is foreign and false otherwise. */ void setForeign( bool foreign ); /** - * Returns TRUE if the share is broken and FALSE otherwise. + * Returns true if the share is broken and false otherwise. */ bool isBroken() const; /** * Sets the share to be broken. * - * @param broken TRUE if the share is broken and FALSE otherwise. + * @param broken true if the share is broken and false otherwise. */ void setBroken( bool broken ); @@ -243,12 +243,12 @@ class KDE_EXPORT Smb4KShare double percentage() const; /** - * Compare another Smb4KShare object with this one and return TRUE if both + * Compare another Smb4KShare object with this one and return true if both * carry the same data. * * @param share The Smb4KShare object that is compared to this one * - * @returns TRUE if the values match. + * @returns true if the values match. */ bool equals( const Smb4KShare &share ); diff --git a/smb4k/core/smb4ksynchronizer.cpp b/smb4k/core/smb4ksynchronizer.cpp index 67e682b..fe1aa3a 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( tdeApp, 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/smb4ksynchronizer.h b/smb4k/core/smb4ksynchronizer.h index ea55e87..a89a4ba 100644 --- a/smb4k/core/smb4ksynchronizer.h +++ b/smb4k/core/smb4ksynchronizer.h @@ -31,9 +31,9 @@ #endif // KDE includes -#include <kdemacros.h> +#include <tdemacros.h> #include <kdialogbase.h> -#include <kprocess.h> +#include <tdeprocess.h> // TQt includes #include <tqobject.h> @@ -52,7 +52,7 @@ class Smb4KSynchronizationInfo; */ -class KDE_EXPORT Smb4KSynchronizer : public TQObject +class TDE_EXPORT Smb4KSynchronizer : public TQObject { TQ_OBJECT @@ -84,7 +84,7 @@ class KDE_EXPORT Smb4KSynchronizer : public TQObject /** * This function reports if the synchronizer is running or not. * - * @returns TRUE if the synchronizer is running an FALSE otherwise. + * @returns true if the synchronizer is running an false otherwise. */ bool isRunning() { return m_working; } @@ -168,7 +168,7 @@ class KDE_EXPORT Smb4KSynchronizer : public TQObject TDEProcess *m_proc; /** - * This booian is TRUE if the synchronizer is working and FALSE otherwise. + * This booian is true if the synchronizer is working and false otherwise. */ bool m_working; diff --git a/smb4k/core/smb4tdefileio.cpp b/smb4k/core/smb4tdefileio.cpp index 8513e82..6e56fe4 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( tdeApp, 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/core/smb4tdefileio.h b/smb4k/core/smb4tdefileio.h index 7c93a59..af42c69 100644 --- a/smb4k/core/smb4tdefileio.h +++ b/smb4k/core/smb4tdefileio.h @@ -36,8 +36,8 @@ #include <tqcstring.h> // KDE include -#include <kdemacros.h> -#include <kprocess.h> +#include <tdemacros.h> +#include <tdeprocess.h> /** @@ -47,7 +47,7 @@ * @author Alexander Reinholdt <dustpuppy@mail.berlios.de> */ -class KDE_EXPORT Smb4KFileIO : public TQObject +class TDE_EXPORT Smb4KFileIO : public TQObject { TQ_OBJECT @@ -78,9 +78,9 @@ class KDE_EXPORT Smb4KFileIO : public TQObject * * @param operation Defines whether entries should be inserted or if * they should be removed. With Smb4KFileIO::NoOperation - * the function exits immediately and returns TRUE. + * the function exits immediately and returns true. * - * @returns TRUE if the write process was successfully initiate and FALSE + * @returns true if the write process was successfully initiate and false * otherwise. * * @note You need to connect to the finished() and failed() signals to find @@ -94,9 +94,9 @@ class KDE_EXPORT Smb4KFileIO : public TQObject * * @param operation Defines whether entries should be inserted or if * they should be removed. With Smb4KFileIO::NoOperation - * the function exits immediately and returns TRUE. + * the function exits immediately and returns true. * - * @returns TRUE if the write process was successfully initiate and FALSE + * @returns true if the write process was successfully initiate and false * otherwise. * * @note You need to connect to the finished() and failed() signals to find @@ -160,14 +160,14 @@ class KDE_EXPORT Smb4KFileIO : public TQObject * This function creates a lock file in /tmp if it does not * exist already. If the user is not allowed to write to the * desired file a the moment, the user will be shown an error - * dialog and the function will return FALSE. + * dialog and the function will return false. * * Checks are performed to make sure it is save to write to an * existing lock file using the system call lstat(). * * @param filename The name of the file that is to be modified. * - * @returns TRUE if the creation was successful and FALSE if + * @returns true if the creation was successful and false if * something went wrong. */ bool createLockFile( const TQString &filename ); @@ -179,11 +179,11 @@ class KDE_EXPORT Smb4KFileIO : public TQObject * Checks are performed to make sure it is save to write to an * existing lock file using the system call lstat(). * - * @param shutdown Should be set to FALSE if you do not want to have + * @param shutdown Should be set to false if you do not want to have * any error message shown. Otherwise you should set it - * to TRUE. + * to true. * - * @returns TRUE if the removal was successful and FALSE if + * @returns true if the removal was successful and false if * something went wrong. */ bool removeLockFile( const bool error_message = true ); diff --git a/smb4k/core/smb4tdeglobal.h b/smb4k/core/smb4tdeglobal.h index dd5dbe1..bf0e13c 100644 --- a/smb4k/core/smb4tdeglobal.h +++ b/smb4k/core/smb4tdeglobal.h @@ -29,7 +29,7 @@ #include <tqstring.h> #include <tqtimer.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tdeconfig.h> // forward declarations: @@ -43,7 +43,7 @@ class Smb4KHomesSharesHandler; * @author Alexander Reinholdt <dustpuppy@users.berlios.de> */ -namespace KDE_EXPORT Smb4TDEGlobal +namespace Smb4TDEGlobal TDE_EXPORT { /** * This returns the pointer to the global timer for the application. @@ -52,7 +52,7 @@ namespace KDE_EXPORT Smb4TDEGlobal * * @returns A pointer to the global timer. */ - TQTimer *timer() KDE_DEPRECATED; + TQTimer *timer() TDE_DEPRECATED; /** * This function returns the interval of the timer. diff --git a/smb4k/dialogs/Makefile.am b/smb4k/dialogs/Makefile.am deleted file mode 100644 index 2b99869..0000000 --- a/smb4k/dialogs/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -INCLUDES = $(all_includes) -METASOURCES = AUTO -lib_LTLIBRARIES = libsmb4kdialogs.la -libsmb4kdialogs_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) -libsmb4kdialogs_la_SOURCES = smb4kbookmarkeditor.cpp \ - smb4kcustomoptionsdialog.cpp smb4kmountdialog.cpp smb4kpreviewdialog.cpp smb4kprintdialog.cpp \ - smb4ksynchronizationdialog.cpp -libsmb4kdialogs_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \ - $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TQT) -noinst_HEADERS = smb4kbookmarkeditor.h smb4kmountdialog.h smb4kpreviewdialog.h \ - smb4kprintdialog.h smb4ksynchronizationdialog.h diff --git a/smb4k/dialogs/smb4kbookmarkeditor.cpp b/smb4k/dialogs/smb4kbookmarkeditor.cpp index 4551933..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, TQT_TQOBJECT(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, TQT_TQOBJECT(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 ) @@ -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/smb4kbookmarkeditor.h b/smb4k/dialogs/smb4kbookmarkeditor.h index 6927154..d1761d9 100644 --- a/smb4k/dialogs/smb4kbookmarkeditor.h +++ b/smb4k/dialogs/smb4kbookmarkeditor.h @@ -31,7 +31,7 @@ #endif // KDE includes -#include <kdemacros.h> +#include <tdemacros.h> #include <kdialogbase.h> #include <tdelistview.h> #include <tdeactioncollection.h> @@ -42,7 +42,7 @@ * @author Alexander Reinholdt <dustpuppy@users.berlios.de> */ -class KDE_EXPORT Smb4KBookmarkEditor : public KDialogBase +class TDE_EXPORT Smb4KBookmarkEditor : public KDialogBase { TQ_OBJECT diff --git a/smb4k/dialogs/smb4kcustomoptionsdialog.cpp b/smb4k/dialogs/smb4kcustomoptionsdialog.cpp index 7f9528e..404ba94 100644 --- a/smb4k/dialogs/smb4kcustomoptionsdialog.cpp +++ b/smb4k/dialogs/smb4kcustomoptionsdialog.cpp @@ -111,7 +111,7 @@ Smb4KCustomOptionsDialog::Smb4KCustomOptionsDialog( Smb4KShareItem *share, TQWid } else { - m_homes_user = specifyUser( share->host(), kapp->mainWidget() ? kapp->mainWidget() : 0, "SpecifyUser" ); + m_homes_user = specifyUser( share->host(), tdeApp->mainWidget() ? tdeApp->mainWidget() : 0, "SpecifyUser" ); m_initialized = m_homes_user.isEmpty() ? false : true; } @@ -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/smb4kcustomoptionsdialog.h b/smb4k/dialogs/smb4kcustomoptionsdialog.h index dbe0529..66dd72b 100644 --- a/smb4k/dialogs/smb4kcustomoptionsdialog.h +++ b/smb4k/dialogs/smb4kcustomoptionsdialog.h @@ -35,7 +35,7 @@ #include <tqcheckbox.h> // KDE includes -#include <kdemacros.h> +#include <tdemacros.h> #include <kdialogbase.h> #include <knuminput.h> #include <kcombobox.h> @@ -45,7 +45,7 @@ class Smb4KHostItem; class Smb4KShareItem; -class KDE_EXPORT Smb4KCustomOptionsDialog : public KDialogBase +class TDE_EXPORT Smb4KCustomOptionsDialog : public KDialogBase { TQ_OBJECT @@ -79,12 +79,12 @@ class KDE_EXPORT Smb4KCustomOptionsDialog : public KDialogBase ~Smb4KCustomOptionsDialog(); /** - * This function returns TRUE if the dialog has been initialized correctly - * and may be shown now. It will always return TRUE if you want to set options + * This function returns true if the dialog has been initialized correctly + * and may be shown now. It will always return true if you want to set options * for a server or for a share, that is not a 'homes' share. Only in the case - * of a homes share it may return FALSE, if you didn't choose a user name. + * of a homes share it may return false, if you didn't choose a user name. * - * @returns TRUE if the dialog has been set up correctly. + * @returns true if the dialog has been set up correctly. */ bool isInitialized() { return m_initialized; } @@ -114,8 +114,8 @@ class KDE_EXPORT Smb4KCustomOptionsDialog : public KDialogBase * Is invoked when the user clicked the 'Use Kerberos' * check box. * - * @param on TRUE if the check box was - * checked and FALSE otherwise + * @param on true if the check box was + * checked and false otherwise */ void slotKerberosToggled( bool on ); @@ -201,7 +201,7 @@ class KDE_EXPORT Smb4KCustomOptionsDialog : public KDialogBase KComboBox *m_proto_input; /** - * Boolean that is TRUE if the dialog has been initialized + * Boolean that is true if the dialog has been initialized * correctly and my be shown now. */ bool m_initialized; 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/smb4kmountdialog.h b/smb4k/dialogs/smb4kmountdialog.h index 24adb50..ed65b17 100644 --- a/smb4k/dialogs/smb4kmountdialog.h +++ b/smb4k/dialogs/smb4kmountdialog.h @@ -35,7 +35,7 @@ #include <tqcheckbox.h> // KDE includes -#include <kdemacros.h> +#include <tdemacros.h> #include <kdialogbase.h> #include <klineedit.h> @@ -45,7 +45,7 @@ * @author Alexander Reinholdt <dustpuppy@users.berlios.de> */ -class KDE_EXPORT Smb4KMountDialog : public KDialogBase +class TDE_EXPORT Smb4KMountDialog : public KDialogBase { TQ_OBJECT 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/smb4kpreviewdialog.h b/smb4k/dialogs/smb4kpreviewdialog.h index f4ea96f..6518901 100644 --- a/smb4k/dialogs/smb4kpreviewdialog.h +++ b/smb4k/dialogs/smb4kpreviewdialog.h @@ -34,7 +34,7 @@ #include <tqvaluelist.h> // KDE includes -#include <kdemacros.h> +#include <tdemacros.h> #include <kdialogbase.h> #include <kiconview.h> #include <tdetoolbar.h> @@ -53,7 +53,7 @@ class Smb4KShareItem; * @author Alexander Reinholdt <dustpuppy@users.berlios.de> */ -class KDE_EXPORT Smb4KPreviewDialog : public KDialogBase +class TDE_EXPORT Smb4KPreviewDialog : public KDialogBase { TQ_OBJECT @@ -76,10 +76,10 @@ class KDE_EXPORT Smb4KPreviewDialog : public KDialogBase ~Smb4KPreviewDialog(); /** - * This function returns TRUE if the preview dialog has been - * initialized correctly and FALSE otherwise. + * This function returns true if the preview dialog has been + * initialized correctly and false otherwise. * - * @returns TRUE if the dialog was initialized correctly. + * @returns true if the dialog was initialized correctly. */ bool isInitialized() { return m_initialized; } @@ -161,8 +161,8 @@ class KDE_EXPORT Smb4KPreviewDialog : public KDialogBase TQStringList::Iterator m_current_item; /** - * TRUE if the dialog was successfully initilized and - * FALSE otherwise. + * true if the dialog was successfully initilized and + * false otherwise. */ bool m_initialized; }; diff --git a/smb4k/dialogs/smb4kprintdialog.cpp b/smb4k/dialogs/smb4kprintdialog.cpp index 11c6b73..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,13 +127,13 @@ Smb4KPrintDialog::~ Smb4KPrintDialog() ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KPrintDialog::slotUser1() { - KURLRequester *url = static_cast<KURLRequester *>( TQT_TQWIDGET(child( "URL", "KURLRequester", true )) ); - KIntNumInput *copies = static_cast<KIntNumInput *>( TQT_TQWIDGET(child( "Copies", "KIntNumInput", true )) ); + KURLRequester *url = static_cast<KURLRequester *>( child( "URL", "KURLRequester", true ) ); + KIntNumInput *copies = static_cast<KIntNumInput *>( child( "Copies", "KIntNumInput", true ) ); if ( url && copies ) { @@ -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/smb4kprintdialog.h b/smb4k/dialogs/smb4kprintdialog.h index 523513c..06999c2 100644 --- a/smb4k/dialogs/smb4kprintdialog.h +++ b/smb4k/dialogs/smb4kprintdialog.h @@ -34,7 +34,7 @@ #include <tqstring.h> // KDE includes -#include <kdemacros.h> +#include <tdemacros.h> #include <kdialogbase.h> // forward declarations @@ -49,7 +49,7 @@ class Smb4KShareItem; * @author Alexander Reinholdt <dustpuppy@users.berlios.de> */ -class KDE_EXPORT Smb4KPrintDialog : public KDialogBase +class TDE_EXPORT Smb4KPrintDialog : public KDialogBase { TQ_OBJECT diff --git a/smb4k/dialogs/smb4ksynchronizationdialog.cpp b/smb4k/dialogs/smb4ksynchronizationdialog.cpp index 9ad3a51..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 ///////////////////////////////////////////////////////////////////////////// @@ -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<KURLRequester *>( TQT_TQWIDGET(child( "SourceURL", "KURLRequester", true )) ); + KURLRequester *source = static_cast<KURLRequester *>( child( "SourceURL", "KURLRequester", true ) ); source->lineEdit()->setReadOnly( true ); source->button()->setEnabled( false ); - KURLRequester *destination = static_cast<KURLRequester *>( TQT_TQWIDGET(child( "DestinationURL", "KURLRequester", true )) ); + KURLRequester *destination = static_cast<KURLRequester *>( child( "DestinationURL", "KURLRequester", true ) ); destination->lineEdit()->setReadOnly( true ); destination->button()->setEnabled( false ); - TQWidget *transfer_widget = static_cast<TQWidget *>( TQT_TQWIDGET(child( "TransferInfoWidget", "TQWidget", true )) ); + TQWidget *transfer_widget = static_cast<TQWidget *>( child( "TransferInfoWidget", "TQWidget", true ) ); transfer_widget->setEnabled( true ); enableButton( User1, false ); enableButton( User2, false ); // Enable the progress bars and the information widgets: - static_cast<KProgress *>( TQT_TQWIDGET(child( "IndividualProgress", "KProgress", true )) )->setEnabled( true ); - static_cast<KProgress *>( TQT_TQWIDGET(child( "TotalProgress", "KProgress", true )) )->setEnabled( true ); + static_cast<KProgress *>( child( "IndividualProgress", "KProgress", true ) )->setEnabled( true ); + static_cast<KProgress *>( 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<KURLRequester *>( TQT_TQWIDGET(child( "SourceURL", "KURLRequester", true )) ); - KURLRequester *destination = static_cast<KURLRequester *>( TQT_TQWIDGET(child( "DestinationURL", "KURLRequester", true )) ); + KURLRequester *source = static_cast<KURLRequester *>( child( "SourceURL", "KURLRequester", true ) ); + KURLRequester *destination = static_cast<KURLRequester *>( 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<KLineEdit *>( TQT_TQWIDGET(child( "ProgressInfo", "KLineEdit", true )) ); - KProgress *individual = static_cast<KProgress *>( TQT_TQWIDGET(child( "IndividualProgress", "KProgress", true )) ); - KProgress *total = static_cast<KProgress *>( TQT_TQWIDGET(child( "TotalProgress", "KProgress", true )) ); - TQLabel *transferred = static_cast<TQLabel *>( TQT_TQWIDGET(child( "FilesTransferred", "TQLabel", true )) ); - TQLabel *rate = static_cast<TQLabel *>( TQT_TQWIDGET(child( "TransferRate", "TQLabel", true )) ); + KLineEdit *progress = static_cast<KLineEdit *>( child( "ProgressInfo", "KLineEdit", true ) ); + KProgress *individual = static_cast<KProgress *>( child( "IndividualProgress", "KProgress", true ) ); + KProgress *total = static_cast<KProgress *>( child( "TotalProgress", "KProgress", true ) ); + TQLabel *transferred = static_cast<TQLabel *>( child( "FilesTransferred", "TQLabel", true ) ); + TQLabel *rate = static_cast<TQLabel *>( 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<KProgress *>( TQT_TQWIDGET(child( "IndividualProgress", "KProgress", true )) ); - KProgress *total = static_cast<KProgress *>( TQT_TQWIDGET(child( "TotalProgress", "KProgress", true )) ); + KProgress *individual = static_cast<KProgress *>( child( "IndividualProgress", "KProgress", true ) ); + KProgress *total = static_cast<KProgress *>( child( "TotalProgress", "KProgress", true ) ); if ( individual && individual->progress() != 100 ) { diff --git a/smb4k/dialogs/smb4ksynchronizationdialog.h b/smb4k/dialogs/smb4ksynchronizationdialog.h index 78cefcb..64118fe 100644 --- a/smb4k/dialogs/smb4ksynchronizationdialog.h +++ b/smb4k/dialogs/smb4ksynchronizationdialog.h @@ -31,7 +31,7 @@ #endif // KDE includes -#include <kdemacros.h> +#include <tdemacros.h> #include <kdialogbase.h> #include <kurlrequester.h> @@ -47,7 +47,7 @@ class Smb4KSynchronizationInfo; * @author Alexander Reinholdt <dustpuppy@users.berlios.de> */ -class KDE_EXPORT Smb4KSynchronizationDialog : public KDialogBase +class TDE_EXPORT Smb4KSynchronizationDialog : public KDialogBase { TQ_OBJECT diff --git a/smb4k/icons/Makefile.am b/smb4k/icons/Makefile.am deleted file mode 100644 index 622e8eb..0000000 --- a/smb4k/icons/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -####### tdevelop will overwrite this part!!! (begin)########## - - -EXTRA_DIST = cr16-app-smb4k.png cr32-app-smb4k.png cr48-app-smb4k.png cr64-app-smb4k.png - -install-data-local: - $(mkinstalldirs) $(kde_icondir)/crystalsvg/16x16/apps/ - $(INSTALL_DATA) $(srcdir)/cr16-app-smb4k.png $(kde_icondir)/crystalsvg/16x16/apps/smb4k.png - $(mkinstalldirs) $(kde_icondir)/crystalsvg/32x32/apps/ - $(INSTALL_DATA) $(srcdir)/cr32-app-smb4k.png $(kde_icondir)/crystalsvg/32x32/apps/smb4k.png - $(mkinstalldirs) $(kde_icondir)/crystalsvg/48x48/apps/ - $(INSTALL_DATA) $(srcdir)/cr48-app-smb4k.png $(kde_icondir)/crystalsvg/48x48/apps/smb4k.png - $(mkinstalldirs) $(kde_icondir)/crystalsvg/64x64/apps/ - $(INSTALL_DATA) $(srcdir)/cr64-app-smb4k.png $(kde_icondir)/crystalsvg/64x64/apps/smb4k.png - -uninstall-local: - -rm -f $(kde_icondir)/crystalsvg/16x16/apps/smb4k.png - -rm -f $(kde_icondir)/crystalsvg/32x32/apps/smb4k.png - -rm -f $(kde_icondir)/crystalsvg/48x48/apps/smb4k.png - -rm -f $(kde_icondir)/crystalsvg/64x64/apps/smb4k.png - -####### tdevelop will overwrite this part!!! (end)############ diff --git a/smb4k/iconview/Makefile.am b/smb4k/iconview/Makefile.am deleted file mode 100644 index 864519e..0000000 --- a/smb4k/iconview/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -INCLUDES = $(all_includes) -METASOURCES = AUTO - -kde_module_LTLIBRARIES = libsmb4ksharesiconview.la -libsmb4ksharesiconview_la_SOURCES = smb4ksharesiconview.cpp \ - smb4ksharesiconview_part.cpp smb4ksharesiconviewitem.cpp \ - smb4ksharesiconviewtooltip.cpp -libsmb4ksharesiconview_la_LDFLAGS = -module -no-undefined $(all_libraries) -noinst_HEADERS = smb4ksharesiconview.h smb4ksharesiconview_part.h \ - smb4ksharesiconviewitem.h smb4ksharesiconviewtooltip.h -libsmb4ksharesiconview_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \ - $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) \ - $(LIB_TQT) - -partrcdir = $(kde_datadir)/smb4ksharesiconviewpart -partrc_DATA = smb4ksharesiconview_part.rc 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 c271862..2befae8 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 ) @@ -444,7 +444,7 @@ void Smb4KSharesIconViewPart::slotUnmountAllShares() void Smb4KSharesIconViewPart::slotSynchronize() { Smb4KSharesIconViewItem *item = static_cast<Smb4KSharesIconViewItem *>( m_widget->currentItem() ); - Smb4KSynchronizationDialog *dlg = static_cast<Smb4KSynchronizationDialog *>( TQT_TQWIDGET(m_widget->child( "SynchronizationDialog", "Smb4KSynchronizationDialog", true )) ); + Smb4KSynchronizationDialog *dlg = static_cast<Smb4KSynchronizationDialog *>( m_widget->child( "SynchronizationDialog", "Smb4KSynchronizationDialog", true ) ); if ( item && !item->shareObject()->isBroken() && !dlg ) { @@ -562,7 +562,7 @@ TDEInstance *Smb4KSharesIconViewPartFactory::instance() extern "C" { - KDE_EXPORT void *init_libsmb4ksharesiconview() + TDE_EXPORT void *init_libsmb4ksharesiconview() { TDEGlobal::locale()->insertCatalogue( "smb4k" ); return new Smb4KSharesIconViewPartFactory; diff --git a/smb4k/iconview/smb4ksharesiconviewitem.h b/smb4k/iconview/smb4ksharesiconviewitem.h index a85798f..64d2be4 100644 --- a/smb4k/iconview/smb4ksharesiconviewitem.h +++ b/smb4k/iconview/smb4ksharesiconviewitem.h @@ -60,7 +60,7 @@ class Smb4KSharesIconViewItem : public TDEIconViewItem * @param share The Smb4KShare object that represents the share. * * @param mountpoint Tells the item if the mount point instead of the - * share name should be shown. Default is FALSE. + * share name should be shown. Default is false. * * @param parent The parent widget of this item. */ @@ -75,11 +75,11 @@ class Smb4KSharesIconViewItem : public TDEIconViewItem /** * This function compares the encapsulated Smb4KShare object with @p item - * and returns TRUE if they contain equal values. + * and returns true if they contain equal values. * * @param item A Smb4KShare object that should be compared * - * @returns TRUE if @p item has the same values stored as the + * @returns true if @p item has the same values stored as the * encapsulated Smb4KShare object. */ bool sameShareObject( Smb4KShare *share ); @@ -112,7 +112,7 @@ class Smb4KSharesIconViewItem : public TDEIconViewItem * Reimplemented from TQIconViewItem. * * This function paints the icon text and uses Smb4KShare::isForeign() to - * determine the color (TRUE: gray, FALSE: the default color). + * determine the color (true: gray, false: the default color). * * @param p The painter * @@ -136,7 +136,7 @@ class Smb4KSharesIconViewItem : public TDEIconViewItem * * @param share The Smb4KShare object. * - * @param mountpoint If TRUE, the mount point will be shown instead of the + * @param mountpoint If true, the mount point will be shown instead of the * share name. */ void setupItem( const Smb4KShare &share, diff --git a/smb4k/iconview/smb4ksharesiconviewtooltip.cpp b/smb4k/iconview/smb4ksharesiconviewtooltip.cpp index a1af8fc..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() ) ); } @@ -322,7 +322,7 @@ void Smb4KSharesIconViewToolTip::update() } else { - TQLabel *free_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "FreeLabel", "TQLabel" )) ); + TQLabel *free_label = static_cast<TQLabel *>( child( "FreeLabel", "TQLabel" ) ); if ( free_label ) { @@ -337,7 +337,7 @@ void Smb4KSharesIconViewToolTip::update() m_free = NULL; } - TQLabel *used_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "UsedLabel", "TQLabel" )) ); + TQLabel *used_label = static_cast<TQLabel *>( child( "UsedLabel", "TQLabel" ) ); if ( used_label ) { @@ -352,7 +352,7 @@ void Smb4KSharesIconViewToolTip::update() m_used = NULL; } - TQLabel *total_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "TotalLabel", "TQLabel" )) ); + TQLabel *total_label = static_cast<TQLabel *>( child( "TotalLabel", "TQLabel" ) ); if ( total_label ) { @@ -367,7 +367,7 @@ void Smb4KSharesIconViewToolTip::update() m_total = NULL; } - TQLabel *usage_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "UsageLabel", "TQLabel" )) ); + TQLabel *usage_label = static_cast<TQLabel *>( child( "UsageLabel", "TQLabel" ) ); if ( usage_label ) { @@ -415,7 +415,7 @@ void Smb4KSharesIconViewToolTip::leaveEvent( TQEvent *e ) ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KSharesIconViewToolTip::slotHideToolTip() diff --git a/smb4k/listview/Makefile.am b/smb4k/listview/Makefile.am deleted file mode 100644 index 28ab7f2..0000000 --- a/smb4k/listview/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDES = $(all_includes) -METASOURCES = AUTO - -kde_module_LTLIBRARIES = libsmb4kshareslistview.la -libsmb4kshareslistview_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \ - $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) \ - $(LIB_TQT) -libsmb4kshareslistview_la_LDFLAGS = -module -no-undefined $(all_libraries) - -partrcdir = $(kde_datadir)/smb4kshareslistviewpart -partrc_DATA = smb4kshareslistview_part.rc -libsmb4kshareslistview_la_SOURCES = smb4kshareslistview.cpp \ - smb4kshareslistview_part.cpp smb4kshareslistviewitem.cpp smb4kshareslistviewtooltip.cpp -noinst_HEADERS = smb4kshareslistview.h smb4kshareslistview_part.h \ - smb4kshareslistviewitem.h smb4kshareslistviewtooltip.h 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 62f89ea..1818436 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*/ ) @@ -578,7 +578,7 @@ void Smb4KSharesListViewPart::slotUnmountAllShares() void Smb4KSharesListViewPart::slotSynchronize() { Smb4KSharesListViewItem *item = static_cast<Smb4KSharesListViewItem *>( m_widget->currentItem() ); - Smb4KSynchronizationDialog *dlg = static_cast<Smb4KSynchronizationDialog *>( TQT_TQWIDGET(m_widget->child( "SynchronizationDialog", "Smb4KSynchronizationDialog", true )) ); + Smb4KSynchronizationDialog *dlg = static_cast<Smb4KSynchronizationDialog *>( m_widget->child( "SynchronizationDialog", "Smb4KSynchronizationDialog", true ) ); if ( item && !item->shareObject()->isBroken() && !dlg ) { @@ -689,7 +689,7 @@ TDEInstance *Smb4KSharesListViewPartFactory::instance() extern "C" { - KDE_EXPORT void *init_libsmb4kshareslistview() + TDE_EXPORT void *init_libsmb4kshareslistview() { TDEGlobal::locale()->insertCatalogue( "smb4k" ); return new Smb4KSharesListViewPartFactory; diff --git a/smb4k/listview/smb4kshareslistviewitem.h b/smb4k/listview/smb4kshareslistviewitem.h index 0bece63..33cea00 100644 --- a/smb4k/listview/smb4kshareslistviewitem.h +++ b/smb4k/listview/smb4kshareslistviewitem.h @@ -60,7 +60,7 @@ class Smb4KSharesListViewItem : public TDEListViewItem * @param share The Smb4KShare object that represents the share. * * @param mountpoint Tells the item if the mount point instead of the - * share name should be shown. Default is FALSE. + * share name should be shown. Default is false. * * @param parent The parent widget of this item. */ @@ -75,11 +75,11 @@ class Smb4KSharesListViewItem : public TDEListViewItem /** * This function compares the encapsulated Smb4KShare object with @p item - * and returns TRUE if they contain equal values. + * and returns true if they contain equal values. * * @param item A Smb4KShare object that should be compared * - * @returns TRUE if @p item has the same values stored as the + * @returns true if @p item has the same values stored as the * encapsulated Smb4KShare object. */ bool sameShareObject( Smb4KShare *share ); @@ -134,7 +134,7 @@ class Smb4KSharesListViewItem : public TDEListViewItem * Reimplemented from TDEListViewItem. * * This function paints the icon text and the usage. It uses Smb4KShare::isForeign() to - * determine the color of the icon text (TRUE: gray, FALSE: the default color). + * determine the color of the icon text (true: gray, false: the default color). * * @param p The painter * @@ -167,7 +167,7 @@ class Smb4KSharesListViewItem : public TDEListViewItem * * @param share The Smb4KShare object. * - * @param mountpoint If TRUE, the mount point will be shown instead of the + * @param mountpoint If true, the mount point will be shown instead of the * share name. */ void setupItem( const Smb4KShare &share, diff --git a/smb4k/listview/smb4kshareslistviewtooltip.cpp b/smb4k/listview/smb4kshareslistviewtooltip.cpp index d97404b..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() ) ); } @@ -322,7 +322,7 @@ void Smb4KSharesListViewToolTip::update() } else { - TQLabel *free_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "FreeLabel", "TQLabel" )) ); + TQLabel *free_label = static_cast<TQLabel *>( child( "FreeLabel", "TQLabel" ) ); if ( free_label ) { @@ -337,7 +337,7 @@ void Smb4KSharesListViewToolTip::update() m_free = NULL; } - TQLabel *used_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "UsedLabel", "TQLabel" )) ); + TQLabel *used_label = static_cast<TQLabel *>( child( "UsedLabel", "TQLabel" ) ); if ( used_label ) { @@ -352,7 +352,7 @@ void Smb4KSharesListViewToolTip::update() m_used = NULL; } - TQLabel *total_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "TotalLabel", "TQLabel" )) ); + TQLabel *total_label = static_cast<TQLabel *>( child( "TotalLabel", "TQLabel" ) ); if ( total_label ) { @@ -367,7 +367,7 @@ void Smb4KSharesListViewToolTip::update() m_total = NULL; } - TQLabel *usage_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "UsageLabel", "TQLabel" )) ); + TQLabel *usage_label = static_cast<TQLabel *>( child( "UsageLabel", "TQLabel" ) ); if ( usage_label ) { @@ -415,7 +415,7 @@ void Smb4KSharesListViewToolTip::leaveEvent( TQEvent *e ) ///////////////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////////////// void Smb4KSharesListViewToolTip::slotHideToolTip() diff --git a/smb4k/main.cpp b/smb4k/main.cpp index fd0e51f..2ad0e4d 100644 --- a/smb4k/main.cpp +++ b/smb4k/main.cpp @@ -34,9 +34,9 @@ #include <kiconloader.h> #include <dcopclient.h> #include <tdeconfig.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // system includes #include <stdlib.h> @@ -102,17 +102,17 @@ int main( int argc, char *argv[] ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); - // This is not needed, because KUniqueApplication::start() + // This is not needed, because TDEUniqueApplication::start() // is called directly before the application is executed, but // we use it anyway. There is no performance impact. - if ( !KUniqueApplication::start() ) + if ( !TDEUniqueApplication::start() ) { exit( 0 ); } - KUniqueApplication app; + TDEUniqueApplication app; // Check the current config file and remove it if it belongs to // a version < 0.9.0. diff --git a/smb4k/searchdlg/Makefile.am b/smb4k/searchdlg/Makefile.am deleted file mode 100644 index 787bdbb..0000000 --- a/smb4k/searchdlg/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -INCLUDES = $(all_includes) -METASOURCES = AUTO -kde_module_LTLIBRARIES = libsmb4ksearchdialog.la -libsmb4ksearchdialog_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \ - $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_TQT) -noinst_HEADERS = smb4ksearchdialog.h smb4ksearchdialog_part.h \ - smb4ksearchdialogitem.h -libsmb4ksearchdialog_la_SOURCES = smb4ksearchdialog.cpp \ - smb4ksearchdialog_part.cpp smb4ksearchdialogitem.cpp -libsmb4ksearchdialog_la_LDFLAGS = -module -no-undefined $(all_libraries) diff --git a/smb4k/searchdlg/smb4ksearchdialog.cpp b/smb4k/searchdlg/smb4ksearchdialog.cpp index 4e4e2c1..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() ), - TQT_TQOBJECT(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..6f7c4ee 100644 --- a/smb4k/searchdlg/smb4ksearchdialog_part.cpp +++ b/smb4k/searchdlg/smb4ksearchdialog_part.cpp @@ -30,7 +30,7 @@ // KDE includes #include <tdeaboutdata.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <kiconeffect.h> #include <kiconloader.h> @@ -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 ) @@ -267,7 +267,7 @@ TDEInstance *Smb4KSearchDialogPartFactory::instance() extern "C" { - KDE_EXPORT void *init_libsmb4ksearchdialog() + TDE_EXPORT void *init_libsmb4ksearchdialog() { TDEGlobal::locale()->insertCatalogue( "smb4k" ); return new Smb4KSearchDialogPartFactory; diff --git a/smb4k/searchdlg/smb4ksearchdialogitem.h b/smb4k/searchdlg/smb4ksearchdialogitem.h index 75449a1..463caa5 100644 --- a/smb4k/searchdlg/smb4ksearchdialogitem.h +++ b/smb4k/searchdlg/smb4ksearchdialogitem.h @@ -83,11 +83,11 @@ class Smb4KSearchDialogItem : public TDEListViewItem Smb4KHostItem *hostItem() { return &m_item; } /** - * This function returns TRUE, if the item is regular, that means it + * This function returns true, if the item is regular, that means it * represents a host. If it represents a failed search, it returns - * FALSE. + * false. * - * @returns TRUE is the item is a regular one. + * @returns true is the item is a regular one. */ bool isRegular() { return m_is_regular; } @@ -96,14 +96,14 @@ class Smb4KSearchDialogItem : public TDEListViewItem * known to the application, i.e. it is in the list of hosts. It will set * the pixmap accordingly and sets m_is_known. * - * @param known Should be TRUE is the host is known. + * @param known Should be true is the host is known. */ void setKnown( bool known ); /** - * This function returns TRUE, if the item is already known by the scanner. + * This function returns true, if the item is already known by the scanner. * - * @returns TRUE is the item is already known. + * @returns true is the item is already known. */ bool isKnown() { return m_is_known; } @@ -116,7 +116,7 @@ class Smb4KSearchDialogItem : public TDEListViewItem /** * Reimplemented from TQListViewItem. It is used for sorting and compares the - * serial numbers of this item and @p item. If @p ascending is TRUE and the + * serial numbers of this item and @p item. If @p ascending is true and the * serial number of this item is greater than that of @p item, it will be inserted * before @p item and else it will be inserted after. In this implementation, * @p col is *not* used. @@ -126,7 +126,7 @@ class Smb4KSearchDialogItem : public TDEListViewItem * @param col The column that should be used for sorting. It is * not used in this implementation. * - * @param ascending Sort ascending if TRUE or descending if FALSE. + * @param ascending Sort ascending if true or descending if false. * * @returns 0 if serialNumber() and @p item->serialNumber() are equal and != 0 if * they are not. Which value and especially which algebraic sign is returned depends @@ -141,12 +141,12 @@ class Smb4KSearchDialogItem : public TDEListViewItem Smb4KHostItem m_item; /** - * TRUE, if we have a regular item + * true, if we have a regular item */ bool m_is_regular; /** - * TRUE is the item is known + * true is the item is known */ bool m_is_known; diff --git a/smb4k/smb4k.cpp b/smb4k/smb4k.cpp index ee347d4..f37cc29 100644 --- a/smb4k/smb4k.cpp +++ b/smb4k/smb4k.cpp @@ -32,7 +32,7 @@ #include <kstdaction.h> #include <klibloader.h> #include <tdemessagebox.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <kiconloader.h> #include <tdeactionclasses.h> #include <tdelocale.h> @@ -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<TQPopupMenu *>( TQT_TQWIDGET(child( "settings", "TQPopupMenu", true )) ); + TQPopupMenu *settings = static_cast<TQPopupMenu *>( child( "settings", "TQPopupMenu", true ) ); if ( settings ) { @@ -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( TQT_TQOBJECT(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, - TQT_TQOBJECT(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, - TQT_TQOBJECT(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( TQT_TQOBJECT(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(). @@ -248,7 +248,7 @@ void Smb4KApp::setupView() if ( shares_factory ) { - m_shares_part = static_cast<KParts::Part *>( shares_factory->create( TQT_TQOBJECT(this), "SharesPart", "KParts::Part" ) ); + m_shares_part = static_cast<KParts::Part *>( 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, TQ_SLOT( slotJumpToSharesView() ), false, true ); } } else @@ -280,7 +280,7 @@ void Smb4KApp::setupView() if ( browser_factory ) { - m_browser_part = static_cast<KParts::Part *>( browser_factory->create( TQT_TQOBJECT(this), "BrowserPart", "KParts::Part" ) ); + m_browser_part = static_cast<KParts::Part *>( 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, TQ_SLOT( slotJumpToNetworkBrowser() ), false, true ); } } else @@ -309,7 +309,7 @@ void Smb4KApp::setupView() if ( search_factory ) { - m_search_part = static_cast<KParts::Part *>( search_factory->create( TQT_TQOBJECT(this), "SearchDialogPart", "KParts::Part" ) ); + m_search_part = static_cast<KParts::Part *>( 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, 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() ); } @@ -403,7 +403,7 @@ void Smb4KApp::changeSharesView() if ( shares_factory ) { - m_shares_part = static_cast<KParts::Part *>( shares_factory->create( TQT_TQOBJECT(this), "SharesPart", "KParts::Part" ) ); + m_shares_part = static_cast<KParts::Part *>( shares_factory->create( this, "SharesPart", "KParts::Part" ) ); if ( m_shares_part ) { @@ -455,7 +455,7 @@ bool Smb4KApp::queryExit() bool Smb4KApp::queryClose() { - if ( !kapp->sessionSaving() && isVisible() && m_system_tray->isEmbedded() && + if ( !tdeApp->sessionSaving() && isVisible() && m_system_tray->isEmbedded() && Smb4KSettings::embedIntoSystemTray() ) { // This part has been 'stolen' from JuK application. @@ -478,7 +478,7 @@ bool Smb4KApp::queryClose() void Smb4KApp::timerEvent( TQTimerEvent * ) { - KProgress *progress_bar = static_cast<KProgress *>( TQT_TQWIDGET(child( "StatusBarProgressBar", "KProgress", true )) ); + KProgress *progress_bar = static_cast<KProgress *>( child( "StatusBarProgressBar", "KProgress", true ) ); if ( progress_bar ) { @@ -488,7 +488,7 @@ void Smb4KApp::timerEvent( TQTimerEvent * ) ///////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATIONS +// SLOT IMPLEMENTATIONS ///////////////////////////////////////////////////////////////////// void Smb4KApp::slotQuit() @@ -571,11 +571,11 @@ void Smb4KApp::slotConfigDialog() if ( config_factory ) { - TDEConfigDialog *dlg = static_cast<TDEConfigDialog *>( TQT_TQWIDGET(config_factory->create( TQT_TQOBJECT(this), "ConfigDialog", "TDEConfigDialog" )) ); + TDEConfigDialog *dlg = static_cast<TDEConfigDialog *>( config_factory->create( this, "ConfigDialog", "TDEConfigDialog" ) ); if ( dlg ) { - connect( dlg, TQT_SIGNAL( settingsChanged() ), TQT_TQOBJECT(this), TQT_SLOT( slotSettingsChanged() ) ); + connect( dlg, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotSettingsChanged() ) ); dlg->show(); } @@ -618,7 +618,7 @@ void Smb4KApp::slotSettingsChanged() void Smb4KApp::slotBookmarkEditor() { - Smb4KBookmarkEditor *dlg = static_cast<Smb4KBookmarkEditor *>( TQT_TQWIDGET(child( "BookmarkEditor", "Smb4KBookmarkEditor", true )) ); + Smb4KBookmarkEditor *dlg = static_cast<Smb4KBookmarkEditor *>( 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<KProgress *>( TQT_TQWIDGET(child( "StatusBarProgressBar", "KProgress", true )) ); + KProgress *progress_bar = static_cast<KProgress *>( 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, 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() ), TQT_TQOBJECT(this), TQT_SLOT( slotBookmarkActivated() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( slotBookmarkActivated() ) ); bookmark_list.append( a ); } diff --git a/smb4k/smb4k.desktop b/smb4k/smb4k.desktop index 88656d0..ffbf965 100644 --- a/smb4k/smb4k.desktop +++ b/smb4k/smb4k.desktop @@ -1,80 +1,15 @@ [Desktop Entry] +Type=Application + Name=Smb4K + GenericName=The SMB/CIFS Share Browser -GenericName[bg]=Самба ресурсен четец -GenericName[ca]=El navegador de compartits SMB/CIFS -GenericName[cs]=Prohližeč SMB/CIFS sdílení -GenericName[da]=SMB/CIFS ressource browseren -GenericName[de]=Der Browser für SMB/CIFS-Freigaben -GenericName[es]=El explorador de recursos compartidos SMB/CIFS -GenericName[fr]=L'explorateur de partages SMB / CIFS -GenericName[hu]=Az SMB/CIFS böngésző -GenericName[is]=SMB/CIFS sameignarflakkarinn -GenericName[it]=Browser di condivisioni SMB/CIFS -GenericName[ja]=SMB/CIFS 共有(シェア)・ブラウザー -GenericName[nb]=SMB/CIFS ressursutforsker -GenericName[nl]=De SMB/CIFS Share Browser -GenericName[nn]=SMB/CIFS ressurs-surfar -GenericName[pl]=Przeglądarka Zasobów SMB/CIFS -GenericName[pt_BR]=O navegador de compartilhamentos SMB/CIFS -GenericName[ru]=The SMB/CIFS Share Browser -GenericName[sk]=Prehliadač SMB/CIFS zdieľaní -GenericName[sv]=SMB Katalog programmed -GenericName[tr]=The SMB/CIFS Share Browser -GenericName[uk]=Навігатор спільних ресурсів SMB/CIFS -GenericName[zh_CN]=SMB 共享浏览器 -# -# The following lines seem to be necessary for SuSE. -# -Name[bg]=Smb4K -Name[ca]=Smb4K -Name[cs]=Smb4K -Name[da]=Smb4K -Name[de]=Smb4K -Name[es]=Smb4K -Name[fr]=Smb4K -Name[hu]=Smb4K -Name[is]=Smb4K -Name[it]=Smb4K -Name[ja]=Smb4K -Name[nb]=Smb4K -Name[nl]=Smb4K -Name[nn]=Smb4K -Name[pl]=Smb4K -Name[pt_BR]=Smb4K -Name[ru]=Smb4K -Name[sk]=Smb4K -Name[sv]=Smb4K -Name[tr]=Smb4K -Name[uk]=Smb4K -Name[zh_CN]=Smb4K + Comment=The SMB/CIFS Share Browser -Comment[bg]=Самба ресурсен четец -Comment[ca]=El navegador de compartits SMB/CIFS -Comment[cs]=Prohližeč SMB/CIFS sdílení -Comment[da]=SMB/CIFS ressource browseren -Comment[de]=Der Browser für SMB/CIFS-Freigaben -Comment[es]=El explorador de recursos compartidos SMB/CIFS -Comment[fr]=L'explorateur de partages SMB / CIFS -Comment[hu]=Az SMB/CIFS böngésző -Comment[is]=SMB/CIFS sameignarflakkarinn -Comment[it]=Browser di condivisioni SMB/CIFS -Comment[ja]=SMB/CIFS 共有(シェア)・ブラウザー -Comment[nb]=SMB/CIFS ressursutforsker -Comment[nl]=De SMB/CIFS Share Browser -Comment[nn]=SMB/CIFS ressurs-surfar -Comment[pl]=Przeglądarka Zasobów SMB/CIFS -Comment[pt_BR]=O navegador de compartilhamentos SMB/CIFS -Comment[ru]=The SMB/CIFS Share Browser -Comment[sk]=Prehliadač SMB/CIFS zdieľaní -Comment[sv]=SMB Katalog programmed -Comment[tr]=The SMB/CIFS Share Browser -Comment[uk]=Навігатор спільних ресурсів SMB/CIFS -Comment[zh_CN]=SMB 共享浏览器 -Exec=smb4k + Icon=smb4k -X-DocPath=smb4k/index.html -Type=Application +Exec=smb4k Terminal=false Categories=Qt;TDE;Network; +X-DocPath=smb4k/index.html X-DCOP-ServiceType=Unique diff --git a/smb4k/smb4ksystemtray.cpp b/smb4k/smb4ksystemtray.cpp index 44dad2b..8a87905 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, TQ_SLOT( slotMountManually() ), actionCollection(), "st_mount_manually_action" ); - TDEAction *configure = KStdAction::preferences( TQT_TQOBJECT(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() @@ -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, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotSettingsChanged() ) ); + connect( dlg, TQ_SIGNAL( settingsChanged() ), this, TQ_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, 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, - TQT_TQOBJECT(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() ), TQT_TQOBJECT(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; @@ -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, TQ_SLOT( slotUnmountAllShares() ), actionCollection(), "st_unmount_all_action" ); unmount_all->setGroup( "ShareActions" ); unmount_all->plug( m_shares_menu->popupMenu(), 0 ); @@ -787,27 +787,27 @@ 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), - TQT_SLOT( slotUnmountShare() ), actionCollection(), "st_[unmount]_"+(*it)->canonicalPath() ); + TDEAction *umount = new TDEAction( i18n( "&Unmount" ), "drive-harddisk-unmounted", TDEShortcut::null(), this, + 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(), TQT_TQOBJECT(this), - TQT_SLOT( slotForceUnmountShare() ), actionCollection(), "st_[force]_"+(*it)->canonicalPath() ); + TDEAction *force_umount = new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk-unmounted", TDEShortcut::null(), this, + 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(), TQT_TQOBJECT(this), - TQT_SLOT( slotSynchronize() ), actionCollection(), "st_[synchronize]_"+(*it)->canonicalPath() ); + TDEAction *synchronize = new TDEAction( i18n( "S&ynchronize" ), "go-bottom", TDEShortcut::null(), this, + 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(), TQT_TQOBJECT(this), - TQT_SLOT( slotKonsole() ), actionCollection(), "st_[konsole]_"+(*it)->canonicalPath() ); + TDEAction *konsole = new TDEAction( i18n( "Open with Konso&le" ), "terminal", TDEShortcut::null(), this, + 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(), TQT_TQOBJECT(this), - TQT_SLOT( slotFilemanager() ), actionCollection(), "st_[filemanager]_"+(*it)->canonicalPath() ); + TDEAction *konqueror = new TDEAction( i18n( "Open with &Konqueror" ), "kfm_home", TDEShortcut::null(), this, + TQ_SLOT( slotFilemanager() ), actionCollection(), "st_[filemanager]_"+(*it)->canonicalPath() ); konqueror->setGroup( "ShareActions" ); // Set up the action submenu: diff --git a/smb4k/smb4ksystemtray.h b/smb4k/smb4ksystemtray.h index 9f59599..d09cb0b 100644 --- a/smb4k/smb4ksystemtray.h +++ b/smb4k/smb4ksystemtray.h @@ -56,19 +56,19 @@ class Smb4KSystemTray : public KSystemTray /** * Embeds the system tray window into the system tray, if @p ebd is - * TRUE. Otherwise, it removes it from there. Note, that the system tray + * true. Otherwise, it removes it from there. Note, that the system tray * icon won't be deleted but only hidden! * - * @param ebd If TRUE the system tray icon will be embedded into + * @param ebd If true the system tray icon will be embedded into * the system tray. */ void embed( bool ebd ); /** - * This function returns TRUE if the system tray window is embedded into - * the system tray and FALSE otherwise. + * This function returns true if the system tray window is embedded into + * the system tray and false otherwise. * - * @returns TRUE if the system tray window is embedded. + * @returns true if the system tray window is embedded. */ bool isEmbedded() { return isShown(); } |