diff options
Diffstat (limited to 'smb4k/browser')
| -rw-r--r-- | smb4k/browser/Makefile.am | 15 | ||||
| -rw-r--r-- | smb4k/browser/smb4knetworkbrowser.cpp | 18 | ||||
| -rw-r--r-- | smb4k/browser/smb4knetworkbrowser.h | 6 | ||||
| -rw-r--r-- | smb4k/browser/smb4knetworkbrowser_part.cpp | 90 | ||||
| -rw-r--r-- | smb4k/browser/smb4knetworkbrowseritem.h | 12 | ||||
| -rw-r--r-- | smb4k/browser/smb4knetworkbrowsertooltip.cpp | 14 |
6 files changed, 70 insertions, 85 deletions
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() |