diff --git a/plugin/smb4k_konqplugin.cpp b/plugin/smb4k_konqplugin.cpp index 794482c..1a5a1c4 100644 --- a/plugin/smb4k_konqplugin.cpp +++ b/plugin/smb4k_konqplugin.cpp @@ -53,14 +53,14 @@ #include "../smb4k/core/smb4kcore.h" #include "../smb4k/core/smb4kdefs.h" -smb4kWidget::smb4kWidget( TQWidget * tqparent, const char * name, WFlags f ) - : TQVBox(tqparent, name, f) +smb4kWidget::smb4kWidget( TQWidget * parent, const char * name, WFlags f ) + : TQVBox(parent, name, f) { // Nothing exciting to do ! } -KonqSidebar_Smb4K::KonqSidebar_Smb4K(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name): - KonqSidebarPlugin(inst,tqparent,widgetParent,desktopName,name) +KonqSidebar_Smb4K::KonqSidebar_Smb4K(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): + KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) { widget = new smb4kWidget( widgetParent ); diff --git a/plugin/smb4k_konqplugin.h b/plugin/smb4k_konqplugin.h index fbefb26..fbc7770 100644 --- a/plugin/smb4k_konqplugin.h +++ b/plugin/smb4k_konqplugin.h @@ -45,7 +45,7 @@ class smb4kWidget : public TQVBox Q_OBJECT TQ_OBJECT public: - smb4kWidget( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); + smb4kWidget( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); private: @@ -60,12 +60,12 @@ public: * Construct a @ref KonqSidebarPlugin. * * @param inst The sidebar's kinstance class. - * @param tqparent The sidebar internal button info class responsible for this plugin. + * @param parent The sidebar internal button info class responsible for this plugin. * @param widgetParent The container which will contain the plugins widget. * @param desktopName The filename of the configuration file. * @param name A TQt object name for your plugin. **/ - KonqSidebar_Smb4K(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); + KonqSidebar_Smb4K(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); /** destructor */ ~KonqSidebar_Smb4K(); diff --git a/smb4k/browser/smb4knetworkbrowser.cpp b/smb4k/browser/smb4knetworkbrowser.cpp index 91562e0..45e08cd 100644 --- a/smb4k/browser/smb4knetworkbrowser.cpp +++ b/smb4k/browser/smb4knetworkbrowser.cpp @@ -37,8 +37,8 @@ #include "../core/smb4ksettings.h" -Smb4KNetworkBrowser::Smb4KNetworkBrowser( TQWidget *tqparent, const char *name ) -: KListView( tqparent, name ) +Smb4KNetworkBrowser::Smb4KNetworkBrowser( TQWidget *parent, const char *name ) +: KListView( parent, name ) { setRootIsDecorated( true ); setAllColumnsShowFocus( false ); diff --git a/smb4k/browser/smb4knetworkbrowser.h b/smb4k/browser/smb4knetworkbrowser.h index 9c7ebda..3a9a272 100644 --- a/smb4k/browser/smb4knetworkbrowser.h +++ b/smb4k/browser/smb4knetworkbrowser.h @@ -46,11 +46,11 @@ class Smb4KNetworkBrowser : public KListView /** * The constructor * - * @param tqparent The tqparent widget + * @param parent The parent widget * * @param name The widget name */ - Smb4KNetworkBrowser( TQWidget *tqparent = 0, const char *name = 0 ); + Smb4KNetworkBrowser( TQWidget *parent = 0, const char *name = 0 ); /** * The destructor diff --git a/smb4k/browser/smb4knetworkbrowser_part.cpp b/smb4k/browser/smb4knetworkbrowser_part.cpp index 6d1346c..11cc316 100644 --- a/smb4k/browser/smb4knetworkbrowser_part.cpp +++ b/smb4k/browser/smb4knetworkbrowser_part.cpp @@ -62,8 +62,8 @@ KAboutData *Smb4KNetworkBrowserPartFactory::m_about = 0L; Smb4KNetworkBrowserPart::Smb4KNetworkBrowserPart( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, Mode mode ) -: KParts::Part( tqparent, name ), m_mode( mode ) + TQObject *parent, const char *name, Mode mode ) +: KParts::Part( parent, name ), m_mode( mode ) { // First of all we need an instance: setInstance( Smb4KNetworkBrowserPartFactory::instance() ); @@ -1264,7 +1264,7 @@ void Smb4KNetworkBrowserPart::slotAddIPAddress( Smb4KHostItem *item ) Smb4KNetworkBrowserItem *host_item = static_cast( m_widget->findItem( item->name(), Smb4KNetworkBrowser::Network, ExactMatch|CaseSensitive ) ); - if ( host_item && host_item->tqparent() && TQString::compare( host_item->hostItem()->workgroup(), item->workgroup() ) == 0 ) + if ( host_item && host_item->parent() && TQString::compare( host_item->hostItem()->workgroup(), item->workgroup() ) == 0 ) { host_item->update( item ); @@ -1346,7 +1346,7 @@ void Smb4KNetworkBrowserPart::slotInsertHost( Smb4KHostItem *item ) } - if ( !host_item || (host_item && host_item->tqparent() && + if ( !host_item || (host_item && host_item->parent() && TQString::compare( host_item->hostItem()->workgroup(), item->workgroup() ) != 0) ) { // The host is not there. Insert it. @@ -1438,7 +1438,7 @@ void Smb4KNetworkBrowserPart::slotRescan() } case Smb4KNetworkBrowserItem::Share: { - Smb4KHostItem *item = static_cast( browser_item->tqparent() )->hostItem(); + Smb4KHostItem *item = static_cast( browser_item->parent() )->hostItem(); Smb4KCore::scanner()->getShares( item->workgroup(), item->name(), item->ip() ); break; @@ -1580,7 +1580,7 @@ void Smb4KNetworkBrowserPart::slotBookmark() if ( item && item->type() == Smb4KNetworkBrowserItem::Share ) { - Smb4KNetworkBrowserItem *parent_item = static_cast( item->tqparent() ); + Smb4KNetworkBrowserItem *parent_item = static_cast( item->parent() ); // Add a bookmark. The alternative label can be set in the bookmark editor, // so we won't do anything about it here. @@ -1655,8 +1655,8 @@ void Smb4KNetworkBrowserPart::slotMount() if ( browser_item && browser_item->type() == Smb4KNetworkBrowserItem::Share ) { - // If the item is a share item, get its tqparent and start mounting it: - Smb4KNetworkBrowserItem *parent_browser_item = static_cast( browser_item->tqparent() ); + // If the item is a share item, get its parent and start mounting it: + Smb4KNetworkBrowserItem *parent_browser_item = static_cast( browser_item->parent() ); Smb4KCore::mounter()->mountShare( browser_item->shareItem()->workgroup(), browser_item->shareItem()->host(), @@ -1867,7 +1867,7 @@ Smb4KNetworkBrowserPartFactory::~Smb4KNetworkBrowserPartFactory() KParts::Part *Smb4KNetworkBrowserPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, -TQObject *tqparent, const char *name, const char *, const TQStringList &args ) +TQObject *parent, const char *name, const char *, const TQStringList &args ) { Smb4KNetworkBrowserPart *obj = NULL; @@ -1880,18 +1880,18 @@ TQObject *tqparent, const char *name, const char *, const TQStringList &args ) { if ( TQString::compare( value, "\"true\"" ) == 0 ) { - obj = new Smb4KNetworkBrowserPart( parentWidget, widgetName, tqparent, name, Smb4KNetworkBrowserPart::KonqPlugin ); + obj = new Smb4KNetworkBrowserPart( parentWidget, widgetName, parent, name, Smb4KNetworkBrowserPart::KonqPlugin ); } else { - obj = new Smb4KNetworkBrowserPart( parentWidget, widgetName, tqparent, name, Smb4KNetworkBrowserPart::Normal ); + obj = new Smb4KNetworkBrowserPart( parentWidget, widgetName, parent, name, Smb4KNetworkBrowserPart::Normal ); } } } if ( !obj ) { - obj = new Smb4KNetworkBrowserPart( parentWidget, widgetName, tqparent, name, Smb4KNetworkBrowserPart::Normal ); + obj = new Smb4KNetworkBrowserPart( parentWidget, widgetName, parent, name, Smb4KNetworkBrowserPart::Normal ); } return obj ; diff --git a/smb4k/browser/smb4knetworkbrowser_part.h b/smb4k/browser/smb4knetworkbrowser_part.h index c4710f9..78cc7fb 100644 --- a/smb4k/browser/smb4knetworkbrowser_part.h +++ b/smb4k/browser/smb4knetworkbrowser_part.h @@ -67,11 +67,11 @@ class Smb4KNetworkBrowserPart : public KParts::Part /** * The constructor. * - * @param parentWidget The tqparent widget + * @param parentWidget The parent widget * * @param widgetName The name the widget should have * - * @param tqparent The tqparent object + * @param parent The parent object * * @param name The name this object should have * @@ -79,7 +79,7 @@ class Smb4KNetworkBrowserPart : public KParts::Part */ Smb4KNetworkBrowserPart( TQWidget *parentWidget = 0, const char *widgetName = 0, - TQObject *tqparent = 0, + TQObject *parent = 0, const char *name = 0, Mode mode = Normal ); @@ -174,7 +174,7 @@ class Smb4KNetworkBrowserPart : public KParts::Part /** * This slot receives the list of workgroup/domain members that were found * by the scanner. It takes this @p list and inserts it into the list view. - * The tqparent of the items is the workgroup/domain item with the name + * The parent of the items is the workgroup/domain item with the name * @p workgroup. Obsolete items will be deleted from the network browser. * * @param workgroup The workgroup where the hosts belong @@ -340,11 +340,11 @@ class Smb4KNetworkBrowserPartFactory : public KParts::Factory * Reimplemented from KParts::Factory. This function is used to * create a part object. * - * @param parentWidget The tqparent of the part's widget. + * @param parentWidget The parent of the part's widget. * * @param widgetName The name of the part's widget. * - * @param tqparent The tqparent of the part. + * @param parent The parent of the part. * * @param name The name of the part. * @@ -356,7 +356,7 @@ class Smb4KNetworkBrowserPartFactory : public KParts::Factory * konqplugin="true"|"false". */ virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const char *classname, const TQStringList &args = TQStringList() ); /** diff --git a/smb4k/browser/smb4knetworkbrowseritem.cpp b/smb4k/browser/smb4knetworkbrowseritem.cpp index f72a414..dba18ae 100644 --- a/smb4k/browser/smb4knetworkbrowseritem.cpp +++ b/smb4k/browser/smb4knetworkbrowseritem.cpp @@ -33,24 +33,24 @@ // application specific includes #include "smb4knetworkbrowseritem.h" -Smb4KNetworkBrowserItem::Smb4KNetworkBrowserItem( TQListView *tqparent, Smb4KWorkgroupItem *item ) -: KListViewItem( tqparent, item->name() ), m_type( Workgroup ), m_workgroup( *item ), +Smb4KNetworkBrowserItem::Smb4KNetworkBrowserItem( TQListView *parent, Smb4KWorkgroupItem *item ) +: KListViewItem( parent, item->name() ), m_type( Workgroup ), m_workgroup( *item ), m_mounted( false ) { setIcon(); } -Smb4KNetworkBrowserItem::Smb4KNetworkBrowserItem( TQListViewItem *tqparent, Smb4KHostItem *item ) -: KListViewItem( tqparent, item->name(), TQString(), item->ip(), item->comment() ), +Smb4KNetworkBrowserItem::Smb4KNetworkBrowserItem( TQListViewItem *parent, Smb4KHostItem *item ) +: KListViewItem( parent, item->name(), TQString(), item->ip(), item->comment() ), m_type( Host ), m_host( *item ), m_mounted( false ) { setIcon(); } -Smb4KNetworkBrowserItem::Smb4KNetworkBrowserItem( TQListViewItem *tqparent, Smb4KShareItem *item ) -: KListViewItem( tqparent, item->name(), item->plainType(), TQString(), item->comment() ), +Smb4KNetworkBrowserItem::Smb4KNetworkBrowserItem( TQListViewItem *parent, Smb4KShareItem *item ) +: KListViewItem( parent, item->name(), item->plainType(), TQString(), item->comment() ), m_type( Share ), m_share( *item ), m_mounted( false ) { setIcon(); diff --git a/smb4k/browser/smb4knetworkbrowseritem.h b/smb4k/browser/smb4knetworkbrowseritem.h index 73fecf2..df36e58 100644 --- a/smb4k/browser/smb4knetworkbrowseritem.h +++ b/smb4k/browser/smb4knetworkbrowseritem.h @@ -46,30 +46,30 @@ class Smb4KNetworkBrowserItem : public KListViewItem /** * The constructor for toplevel (workgroup) items. * - * @param tqparent The tqparent list view. + * @param parent The parent list view. * * @param item The Smb4KWorkgroupItem that carries all the data * needed to set up a "workgroup item". */ - Smb4KNetworkBrowserItem( TQListView *tqparent, Smb4KWorkgroupItem *item ); + Smb4KNetworkBrowserItem( TQListView *parent, Smb4KWorkgroupItem *item ); /** * The constructor for the host items. * - * @param tqparent The tqparent list view item. + * @param parent The parent list view item. * * @param item The Smb4KHostItem that carries all the data. */ - Smb4KNetworkBrowserItem( TQListViewItem *tqparent, Smb4KHostItem *item ); + Smb4KNetworkBrowserItem( TQListViewItem *parent, Smb4KHostItem *item ); /** * The constructor for the share items. * - * @param tqparent The tqparent list view item. + * @param parent The parent list view item. * * @param item The Smb4KShareItem that carries all the data. */ - Smb4KNetworkBrowserItem( TQListViewItem *tqparent, Smb4KShareItem *item ); + Smb4KNetworkBrowserItem( TQListViewItem *parent, Smb4KShareItem *item ); /** * The destructor. diff --git a/smb4k/browser/smb4knetworkbrowsertooltip.cpp b/smb4k/browser/smb4knetworkbrowsertooltip.cpp index 0c111ea..5efd25b 100644 --- a/smb4k/browser/smb4knetworkbrowsertooltip.cpp +++ b/smb4k/browser/smb4knetworkbrowsertooltip.cpp @@ -154,7 +154,7 @@ void Smb4KNetworkBrowserToolTip::setupTip() TQLabel *workgroup_label = new TQLabel( i18n( "Workgroup:" ), this ); TQLabel *workgroup = new TQLabel( m_item->hostItem()->workgroup(), this ); - Smb4KWorkgroupItem *workgroup_item = static_cast( m_item->tqparent() )->workgroupItem(); + Smb4KWorkgroupItem *workgroup_item = static_cast( m_item->parent() )->workgroupItem(); TQLabel *master_label = new TQLabel( i18n( "Master browser:" ), this ); TQLabel *master_yes_no = new TQLabel( (workgroup_item && !workgroup_item->master().isEmpty()) ? workgroup_item->master() : i18n( "Unknown" ), this ); @@ -207,7 +207,7 @@ void Smb4KNetworkBrowserToolTip::setupTip() TQLabel *host_label = new TQLabel( i18n( "Host:" ), this ); TQLabel *host = new TQLabel( m_item->shareItem()->host(), this ); - Smb4KHostItem *host_item = static_cast( m_item->tqparent() )->hostItem(); + Smb4KHostItem *host_item = static_cast( m_item->parent() )->hostItem(); TQLabel *ip_label = new TQLabel( i18n( "IP address:" ), this ); TQLabel *ip_address = new TQLabel( (host_item && !host_item->ip().isEmpty()) ? host_item->ip() : i18n( "Unknown" ), this, "IPAddress" ); @@ -321,7 +321,7 @@ void Smb4KNetworkBrowserToolTip::update() if ( ip_label ) { - Smb4KHostItem *host = static_cast( m_item->tqparent() )->hostItem(); + Smb4KHostItem *host = static_cast( m_item->parent() )->hostItem(); TQString ip_string; if ( host ) diff --git a/smb4k/configdlg/smb4kauthoptions.cpp b/smb4k/configdlg/smb4kauthoptions.cpp index 6dcbd9d..ac9c918 100644 --- a/smb4k/configdlg/smb4kauthoptions.cpp +++ b/smb4k/configdlg/smb4kauthoptions.cpp @@ -39,8 +39,8 @@ // application specific includes #include "smb4kauthoptions.h" -Smb4KAuthOptions::Smb4KAuthOptions( TQWidget *tqparent, const char *name ) -: TQWidget( tqparent, name ) +Smb4KAuthOptions::Smb4KAuthOptions( TQWidget *parent, const char *name ) +: TQWidget( parent, name ) { // // Default Authentication diff --git a/smb4k/configdlg/smb4kauthoptions.h b/smb4k/configdlg/smb4kauthoptions.h index 119f077..59f5849 100644 --- a/smb4k/configdlg/smb4kauthoptions.h +++ b/smb4k/configdlg/smb4kauthoptions.h @@ -52,11 +52,11 @@ class Smb4KAuthOptions : public TQWidget /** * The constructor. * - * @param tqparent The tqparent widget + * @param parent The parent widget * * @param name The name of this widget */ - Smb4KAuthOptions( TQWidget *tqparent = 0, const char *name = 0 ); + Smb4KAuthOptions( TQWidget *parent = 0, const char *name = 0 ); /** * The destructor. diff --git a/smb4k/configdlg/smb4kconfigdialog.cpp b/smb4k/configdlg/smb4kconfigdialog.cpp index 2c14ded..07b689c 100644 --- a/smb4k/configdlg/smb4kconfigdialog.cpp +++ b/smb4k/configdlg/smb4kconfigdialog.cpp @@ -74,8 +74,8 @@ bool always_use_su = false; bool close_dialog = false; -Smb4KConfigDialog::Smb4KConfigDialog( Smb4KSettings *settings, TQWidget *tqparent, const char *name ) -: KConfigDialog( tqparent, name, settings ) +Smb4KConfigDialog::Smb4KConfigDialog( Smb4KSettings *settings, TQWidget *parent, const char *name ) +: KConfigDialog( parent, name, settings ) { // FIXME: I guess, normally we would not need to close destructively, // but at the moment there are issues with the KURLRequester in file @@ -748,26 +748,26 @@ bool Smb4KConfigDialog::checkSettings() issues.append( "* "+i18n( "[Authentication] The default user name has not been entered.\n" ) ); } - // The file tqmask must not be empty. - KLineEdit *file_tqmask = static_cast( TQT_TQWIDGET(child( "kcfg_FileMask", "KLineEdit", true )) ); + // The file mask must not be empty. + KLineEdit *file_mask = static_cast( TQT_TQWIDGET(child( "kcfg_FileMask", "KLineEdit", true )) ); - if ( file_tqmask && file_tqmask->text().stripWhiteSpace().isEmpty() ) + if ( file_mask && file_mask->text().stripWhiteSpace().isEmpty() ) { ok = false; index++; - issues.append( "* "+i18n( "[Samba] The file tqmask is empty.\n" ) ); + issues.append( "* "+i18n( "[Samba] The file mask is empty.\n" ) ); } - // The directory tqmask must not be empty. - KLineEdit *directory_tqmask = static_cast( TQT_TQWIDGET(child( "kcfg_DirectoryMask", "KLineEdit", true )) ); + // The directory mask must not be empty. + KLineEdit *directory_mask = static_cast( TQT_TQWIDGET(child( "kcfg_DirectoryMask", "KLineEdit", true )) ); - if ( directory_tqmask && directory_tqmask->text().stripWhiteSpace().isEmpty() ) + if ( directory_mask && directory_mask->text().stripWhiteSpace().isEmpty() ) { ok = false; index++; - issues.append( "* "+i18n( "[Samba] The directory tqmask is empty.\n" ) ); + issues.append( "* "+i18n( "[Samba] The directory mask is empty.\n" ) ); } // The UID must not be empty. @@ -1198,10 +1198,10 @@ KInstance *Smb4KConfigDialogFactory::instance() } -TQObject *Smb4KConfigDialogFactory::createObject( TQObject *tqparent, const char *name, const char *, +TQObject *Smb4KConfigDialogFactory::createObject( TQObject *parent, const char *name, const char *, const TQStringList & ) { - return TQT_TQOBJECT( new Smb4KConfigDialog( Smb4KSettings::self(), TQT_TQWIDGET( tqparent ), name ) ); + return TQT_TQOBJECT( new Smb4KConfigDialog( Smb4KSettings::self(), TQT_TQWIDGET( parent ), name ) ); } diff --git a/smb4k/configdlg/smb4kconfigdialog.h b/smb4k/configdlg/smb4kconfigdialog.h index 4681df2..4a87dc8 100644 --- a/smb4k/configdlg/smb4kconfigdialog.h +++ b/smb4k/configdlg/smb4kconfigdialog.h @@ -57,11 +57,11 @@ class Smb4KConfigDialog : public KConfigDialog * @param settings The Smb4KSettings object that needs to be passed * so that the settings can be managed. * - * @param tqparent The tqparent widget + * @param parent The parent widget * * @param name The name of this dialog */ - Smb4KConfigDialog( Smb4KSettings *settings, TQWidget *tqparent = 0, const char *name = 0 ); + Smb4KConfigDialog( Smb4KSettings *settings, TQWidget *parent = 0, const char *name = 0 ); /** * The destructor @@ -191,7 +191,7 @@ class Smb4KConfigDialogFactory : KLibFactory static KInstance *instance(); protected: - TQObject *createObject( TQObject *tqparent = 0, const char *name = 0, + TQObject *createObject( TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); diff --git a/smb4k/configdlg/smb4knetworkoptions.cpp b/smb4k/configdlg/smb4knetworkoptions.cpp index 23b7f22..eab4640 100644 --- a/smb4k/configdlg/smb4knetworkoptions.cpp +++ b/smb4k/configdlg/smb4knetworkoptions.cpp @@ -39,7 +39,7 @@ #include "smb4knetworkoptions.h" #include "../core/smb4ksettings.h" -Smb4KNetworkOptions::Smb4KNetworkOptions( TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ) +Smb4KNetworkOptions::Smb4KNetworkOptions( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { TQGridLayout *grid = new TQGridLayout( this ); grid->setSpacing( 10 ); diff --git a/smb4k/configdlg/smb4knetworkoptions.h b/smb4k/configdlg/smb4knetworkoptions.h index a23e64f..7d1baf9 100644 --- a/smb4k/configdlg/smb4knetworkoptions.h +++ b/smb4k/configdlg/smb4knetworkoptions.h @@ -50,11 +50,11 @@ class Smb4KNetworkOptions : public TQWidget /** * The constructor * - * @param tqparent The tqparent widget + * @param parent The parent widget * * @param name The widget's name */ - Smb4KNetworkOptions( TQWidget *tqparent = 0, const char *name = 0 ); + Smb4KNetworkOptions( TQWidget *parent = 0, const char *name = 0 ); /** * The destructor diff --git a/smb4k/configdlg/smb4krsyncoptions.cpp b/smb4k/configdlg/smb4krsyncoptions.cpp index e7ca576..cd2b75c 100644 --- a/smb4k/configdlg/smb4krsyncoptions.cpp +++ b/smb4k/configdlg/smb4krsyncoptions.cpp @@ -41,7 +41,7 @@ // application specific includes #include "smb4krsyncoptions.h" -Smb4KRsyncOptions::Smb4KRsyncOptions( TQWidget *tqparent, const char *name ) : TQTabWidget( tqparent, name ) +Smb4KRsyncOptions::Smb4KRsyncOptions( TQWidget *parent, const char *name ) : TQTabWidget( parent, name ) { setMargin( 10 ); diff --git a/smb4k/configdlg/smb4krsyncoptions.h b/smb4k/configdlg/smb4krsyncoptions.h index 9e6aba8..e3f7cd9 100644 --- a/smb4k/configdlg/smb4krsyncoptions.h +++ b/smb4k/configdlg/smb4krsyncoptions.h @@ -50,11 +50,11 @@ class Smb4KRsyncOptions : public TQTabWidget /** * The constructor. * - * @param tqparent The tqparent widget + * @param parent The parent widget * * @param name The name of this widget */ - Smb4KRsyncOptions( TQWidget *tqparent = 0, const char *name = 0 ); + Smb4KRsyncOptions( TQWidget *parent = 0, const char *name = 0 ); /** * The destructor diff --git a/smb4k/configdlg/smb4ksambaoptions.cpp b/smb4k/configdlg/smb4ksambaoptions.cpp index 6628a60..e80c561 100644 --- a/smb4k/configdlg/smb4ksambaoptions.cpp +++ b/smb4k/configdlg/smb4ksambaoptions.cpp @@ -54,8 +54,8 @@ using namespace Smb4KGlobal; -Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *tqparent, const char *name ) -: TQTabWidget( tqparent, name ) +Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *parent, const char *name ) +: TQTabWidget( parent, name ) { setMargin( 10 ); @@ -202,13 +202,13 @@ Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *tqparent, const char *name ) i18n( "Permissions" ), mount_tab ); perms_box->setInsideSpacing( 5 ); - (void) new TQLabel( i18n( "File tqmask:" ), perms_box ); - KLineEdit *ftqmask = new KLineEdit( perms_box, "kcfg_FileMask" ); - ftqmask->tqsetAlignment( TQt::AlignRight ); + (void) new TQLabel( i18n( "File mask:" ), perms_box ); + KLineEdit *fmask = new KLineEdit( perms_box, "kcfg_FileMask" ); + fmask->tqsetAlignment( TQt::AlignRight ); - (void) new TQLabel( i18n( "Directory tqmask:" ), perms_box ); - KLineEdit *dtqmask = new KLineEdit( perms_box, "kcfg_DirectoryMask" ); - dtqmask->tqsetAlignment( TQt::AlignRight ); + (void) new TQLabel( i18n( "Directory mask:" ), perms_box ); + KLineEdit *dmask = new KLineEdit( perms_box, "kcfg_DirectoryMask" ); + dmask->tqsetAlignment( TQt::AlignRight ); (void) new TQLabel( i18n( "Write access:" ), perms_box ); KComboBox *read_mode = new KComboBox( perms_box, "kcfg_WriteAccess" ); diff --git a/smb4k/configdlg/smb4ksambaoptions.h b/smb4k/configdlg/smb4ksambaoptions.h index 911f82c..e761d73 100644 --- a/smb4k/configdlg/smb4ksambaoptions.h +++ b/smb4k/configdlg/smb4ksambaoptions.h @@ -53,11 +53,11 @@ class Smb4KSambaOptions : public TQTabWidget /** * The constructor. * - * @param tqparent The tqparent widget + * @param parent The parent widget * * @param name This widget's name */ - Smb4KSambaOptions( TQWidget *tqparent = 0, const char *name = 0 ); + Smb4KSambaOptions( TQWidget *parent = 0, const char *name = 0 ); /** * The destructor. diff --git a/smb4k/configdlg/smb4kshareoptions.cpp b/smb4k/configdlg/smb4kshareoptions.cpp index 040ff88..d1667d2 100644 --- a/smb4k/configdlg/smb4kshareoptions.cpp +++ b/smb4k/configdlg/smb4kshareoptions.cpp @@ -45,7 +45,7 @@ #include "smb4kshareoptions.h" -Smb4KShareOptions::Smb4KShareOptions( TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ) +Smb4KShareOptions::Smb4KShareOptions( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { TQGridLayout *grid = new TQGridLayout( this ); grid->setSpacing( 10 ); diff --git a/smb4k/configdlg/smb4kshareoptions.h b/smb4k/configdlg/smb4kshareoptions.h index 8c115f2..8cca547 100644 --- a/smb4k/configdlg/smb4kshareoptions.h +++ b/smb4k/configdlg/smb4kshareoptions.h @@ -50,11 +50,11 @@ class Smb4KShareOptions : public TQWidget /** * The constructor. * - * @param tqparent The tqparent of this widget + * @param parent The parent of this widget * * @param name The name of this widget */ - Smb4KShareOptions( TQWidget *tqparent = 0, const char *name = 0 ); + Smb4KShareOptions( TQWidget *parent = 0, const char *name = 0 ); /** * The destructor. */ diff --git a/smb4k/configdlg/smb4ksuperuseroptions.cpp b/smb4k/configdlg/smb4ksuperuseroptions.cpp index a9dce42..a3e422e 100644 --- a/smb4k/configdlg/smb4ksuperuseroptions.cpp +++ b/smb4k/configdlg/smb4ksuperuseroptions.cpp @@ -42,8 +42,8 @@ #include "../core/smb4ksettings.h" -Smb4KSuperUserOptions::Smb4KSuperUserOptions( TQWidget *tqparent, const char *name ) -: TQWidget( tqparent, name ) +Smb4KSuperUserOptions::Smb4KSuperUserOptions( TQWidget *parent, const char *name ) +: TQWidget( parent, name ) { TQGridLayout *grid = new TQGridLayout( this ); grid->setSpacing( 10 ); diff --git a/smb4k/configdlg/smb4ksuperuseroptions.h b/smb4k/configdlg/smb4ksuperuseroptions.h index 9fcffbf..00e9840 100644 --- a/smb4k/configdlg/smb4ksuperuseroptions.h +++ b/smb4k/configdlg/smb4ksuperuseroptions.h @@ -51,11 +51,11 @@ class Smb4KSuperUserOptions : public TQWidget /** * The constructor * - * @param tqparent The tqparent widget + * @param parent The parent widget * * @param name The name of this widget */ - Smb4KSuperUserOptions( TQWidget *tqparent = 0, const char *name = 0 ); + Smb4KSuperUserOptions( TQWidget *parent = 0, const char *name = 0 ); /** * The destructor */ diff --git a/smb4k/configdlg/smb4kuserinterfaceoptions.cpp b/smb4k/configdlg/smb4kuserinterfaceoptions.cpp index 2fd83a7..5f7f465 100644 --- a/smb4k/configdlg/smb4kuserinterfaceoptions.cpp +++ b/smb4k/configdlg/smb4kuserinterfaceoptions.cpp @@ -37,8 +37,8 @@ #include "smb4kuserinterfaceoptions.h" #include "../core/smb4ksettings.h" -Smb4KUserInterfaceOptions::Smb4KUserInterfaceOptions( TQWidget *tqparent, const char *name ) -: TQTabWidget( tqparent, name ) +Smb4KUserInterfaceOptions::Smb4KUserInterfaceOptions( TQWidget *parent, const char *name ) +: TQTabWidget( parent, name ) { setMargin( 10 ); diff --git a/smb4k/configdlg/smb4kuserinterfaceoptions.h b/smb4k/configdlg/smb4kuserinterfaceoptions.h index 88414a7..4e848f1 100644 --- a/smb4k/configdlg/smb4kuserinterfaceoptions.h +++ b/smb4k/configdlg/smb4kuserinterfaceoptions.h @@ -50,7 +50,7 @@ class Smb4KUserInterfaceOptions : public TQTabWidget /** * The constructor */ - Smb4KUserInterfaceOptions( TQWidget *tqparent = 0, const char *name = 0 ); + Smb4KUserInterfaceOptions( TQWidget *parent = 0, const char *name = 0 ); /** * The destructor diff --git a/smb4k/core/smb4kbookmarkhandler.cpp b/smb4k/core/smb4kbookmarkhandler.cpp index 6d5d253..26215b8 100644 --- a/smb4k/core/smb4kbookmarkhandler.cpp +++ b/smb4k/core/smb4kbookmarkhandler.cpp @@ -48,8 +48,8 @@ using namespace Smb4KGlobal; Smb4KBookmarkHandler::Smb4KBookmarkHandler( TQValueList *hosts, -TQObject *tqparent, const char *name ) -: TQObject( tqparent, name ), m_hosts( hosts ) +TQObject *parent, const char *name ) +: TQObject( parent, name ), m_hosts( hosts ) { // First we need the directory. KStandardDirs *stddir = new KStandardDirs(); diff --git a/smb4k/core/smb4kbookmarkhandler.h b/smb4k/core/smb4kbookmarkhandler.h index 4e4f29f..07f75eb 100644 --- a/smb4k/core/smb4kbookmarkhandler.h +++ b/smb4k/core/smb4kbookmarkhandler.h @@ -61,12 +61,12 @@ class Smb4KBookmarkHandler : public TQObject * In case a NULL pointer is passed, the bookmarks won't * be updated. * - * @param tqparent The tqparent of this object + * @param parent The parent of this object * * @param name This object's name */ Smb4KBookmarkHandler( TQValueList *hosts = 0, - TQObject *tqparent = 0, + TQObject *parent = 0, const char *name = 0 ); /** diff --git a/smb4k/core/smb4kfileio.cpp b/smb4k/core/smb4kfileio.cpp index 64cf608..9b42709 100644 --- a/smb4k/core/smb4kfileio.cpp +++ b/smb4k/core/smb4kfileio.cpp @@ -54,7 +54,7 @@ using namespace Smb4KGlobal; -Smb4KFileIO::Smb4KFileIO( TQObject *tqparent, const char *name ) : TQObject( tqparent, name ) +Smb4KFileIO::Smb4KFileIO( TQObject *parent, const char *name ) : TQObject( parent, name ) { m_operation = NoOperation; m_state = Idle; diff --git a/smb4k/core/smb4kfileio.h b/smb4k/core/smb4kfileio.h index 496593c..ba253aa 100644 --- a/smb4k/core/smb4kfileio.h +++ b/smb4k/core/smb4kfileio.h @@ -55,11 +55,11 @@ class Smb4KFileIO : public TQObject /** * The constructor * - * @param tqparent The tqparent object of this class + * @param parent The parent object of this class * * @param name The name of this class */ - Smb4KFileIO( TQObject *tqparent = 0, const char *name = 0 ); + Smb4KFileIO( TQObject *parent = 0, const char *name = 0 ); /** * The destructor diff --git a/smb4k/core/smb4kglobal.cpp b/smb4k/core/smb4kglobal.cpp index 4c1fa0c..a4d27f0 100644 --- a/smb4k/core/smb4kglobal.cpp +++ b/smb4k/core/smb4kglobal.cpp @@ -48,9 +48,9 @@ const int Smb4KGlobal::timerInterval() } -const TQString Smb4KGlobal::specifyUser( const TQString &host, TQWidget *tqparent, const char *name ) +const TQString Smb4KGlobal::specifyUser( const TQString &host, TQWidget *parent, const char *name ) { - return p.homesHandler()->specifyUser( host, tqparent, name ); + return p.homesHandler()->specifyUser( host, parent, name ); } diff --git a/smb4k/core/smb4kglobal.h b/smb4k/core/smb4kglobal.h index db6d4c0..1efe779 100644 --- a/smb4k/core/smb4kglobal.h +++ b/smb4k/core/smb4kglobal.h @@ -67,13 +67,13 @@ namespace Smb4KGlobal * * @param host The host where the homes share is located * - * @param tqparent The tqparent widget + * @param parent The parent widget * * @param name The name of this dialog * * @returns A user name */ - const TQString specifyUser( const TQString &host, TQWidget *tqparent = 0, const char *name = 0 ); + const TQString specifyUser( const TQString &host, TQWidget *parent = 0, const char *name = 0 ); /** * This function returns the password handler. diff --git a/smb4k/core/smb4khomesshareshandler.cpp b/smb4k/core/smb4khomesshareshandler.cpp index 35fdb2a..392581c 100644 --- a/smb4k/core/smb4khomesshareshandler.cpp +++ b/smb4k/core/smb4khomesshareshandler.cpp @@ -42,8 +42,8 @@ #include "smb4kerror.h" -Smb4KHomesSharesHandler::Smb4KHomesSharesHandler( TQObject *tqparent, const char *name ) -: TQObject( tqparent, name ) +Smb4KHomesSharesHandler::Smb4KHomesSharesHandler( TQObject *parent, const char *name ) +: TQObject( parent, name ) { // First we need the directory. KStandardDirs *stddir = new KStandardDirs(); @@ -66,11 +66,11 @@ Smb4KHomesSharesHandler::~Smb4KHomesSharesHandler() } -const TQString Smb4KHomesSharesHandler::specifyUser( const TQString &host, TQWidget *tqparent, const char *name ) +const TQString Smb4KHomesSharesHandler::specifyUser( const TQString &host, TQWidget *parent, const char *name ) { TQString username = TQString(); - m_dlg = new KDialogBase( KDialogBase::Plain, i18n( "Specify User" ), KDialogBase::User1|KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, tqparent, name, true, true ); + m_dlg = new KDialogBase( KDialogBase::Plain, i18n( "Specify User" ), KDialogBase::User1|KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, parent, name, true, true ); m_dlg->setButtonGuiItem( KDialogBase::User1, KGuiItem( i18n( "Clear List" ), "editdelete", 0, 0 ) ); m_dlg->enableButton( KDialogBase::Ok, false ); m_dlg->enableButton( KDialogBase::User1, false ); diff --git a/smb4k/core/smb4khomesshareshandler.h b/smb4k/core/smb4khomesshareshandler.h index 4db96f7..aee4568 100644 --- a/smb4k/core/smb4khomesshareshandler.h +++ b/smb4k/core/smb4khomesshareshandler.h @@ -54,11 +54,11 @@ class Smb4KHomesSharesHandler : public TQObject /** * The constructor * - * @param tqparent The tqparent object of this class + * @param parent The parent object of this class * * @param name The name of this class */ - Smb4KHomesSharesHandler( TQObject *tqparent = 0, const char *name = 0 ); + Smb4KHomesSharesHandler( TQObject *parent = 0, const char *name = 0 ); /** * The destructor @@ -72,13 +72,13 @@ class Smb4KHomesSharesHandler : public TQObject * * @param host The host where the homes share is located * - * @param tqparent The tqparent widget + * @param parent The parent widget * * @param name The name of this dialog * * @returns A user name */ - const TQString specifyUser( const TQString &host, TQWidget *tqparent = 0, const char *name = 0 ); + const TQString specifyUser( const TQString &host, TQWidget *parent = 0, const char *name = 0 ); /** * Read and return the user names that are defined for a homes share. diff --git a/smb4k/core/smb4kmounter.cpp b/smb4k/core/smb4kmounter.cpp index e12b30a..ccf687d 100644 --- a/smb4k/core/smb4kmounter.cpp +++ b/smb4k/core/smb4kmounter.cpp @@ -73,7 +73,7 @@ using namespace Smb4KGlobal; -Smb4KMounter::Smb4KMounter( TQObject *tqparent, const char *name ) : TQObject( tqparent, name ) +Smb4KMounter::Smb4KMounter( TQObject *parent, const char *name ) : TQObject( parent, name ) { m_priv = new Smb4KMounterPrivate; diff --git a/smb4k/core/smb4kmounter.h b/smb4k/core/smb4kmounter.h index be29116..cfb41cc 100644 --- a/smb4k/core/smb4kmounter.h +++ b/smb4k/core/smb4kmounter.h @@ -65,7 +65,7 @@ class Smb4KMounter : public TQObject /** * The constructor. */ - Smb4KMounter( TQObject *tqparent = 0, const char *name = 0 ); + Smb4KMounter( TQObject *parent = 0, const char *name = 0 ); /** * The destructor. */ diff --git a/smb4k/core/smb4kpasswordhandler.cpp b/smb4k/core/smb4kpasswordhandler.cpp index 2b7e6ff..e3624ee 100644 --- a/smb4k/core/smb4kpasswordhandler.cpp +++ b/smb4k/core/smb4kpasswordhandler.cpp @@ -60,11 +60,11 @@ #ifndef __FreeBSD__ -Smb4KPasswordHandler::Smb4KPasswordHandler( Smb4KHomesSharesHandler *handler, TQObject *tqparent, const char *name ) -: TQObject( tqparent, name ), m_handler( handler ), m_wallet_support_disabled( false ) +Smb4KPasswordHandler::Smb4KPasswordHandler( Smb4KHomesSharesHandler *handler, TQObject *parent, const char *name ) +: TQObject( parent, name ), m_handler( handler ), m_wallet_support_disabled( false ) #else -Smb4KPasswordHandler::Smb4KPasswordHandler( Smb4KHomesSharesHandler *s_handler, Smb4KSambaOptionsHandler *o_handler, TQObject *tqparent, const char *name ) -: TQObject( tqparent, name ), m_handler( s_handler ), m_options_handler( o_handler ), +Smb4KPasswordHandler::Smb4KPasswordHandler( Smb4KHomesSharesHandler *s_handler, Smb4KSambaOptionsHandler *o_handler, TQObject *parent, const char *name ) +: TQObject( parent, name ), m_handler( s_handler ), m_options_handler( o_handler ), m_wallet_support_disabled( false ) #endif { @@ -228,14 +228,14 @@ void Smb4KPasswordHandler::convert_old_entries() } -bool Smb4KPasswordHandler::askpass( const TQString &workgroup, const TQString &host, const TQString &share, int desc, TQWidget *tqparent, const char *name ) +bool Smb4KPasswordHandler::askpass( const TQString &workgroup, const TQString &host, const TQString &share, int desc, TQWidget *parent, const char *name ) { // m_auth is NULL: m_auth = readAuth( new Smb4KAuthInfo( workgroup, host, share ) ); // Set up the askpass dialog: m_dlg = new KDialogBase( KDialogBase::Plain, i18n( "Authentication" ), KDialogBase::Ok|KDialogBase::Cancel, - KDialogBase::Ok, tqparent, name, true, true ); + KDialogBase::Ok, parent, name, true, true ); TQFrame *frame = m_dlg->plainPage(); TQGridLayout *tqlayout = new TQGridLayout( frame ); diff --git a/smb4k/core/smb4kpasswordhandler.h b/smb4k/core/smb4kpasswordhandler.h index 744aa15..8898249 100644 --- a/smb4k/core/smb4kpasswordhandler.h +++ b/smb4k/core/smb4kpasswordhandler.h @@ -76,12 +76,12 @@ class Smb4KPasswordHandler : public TQObject * infos in case we need to look up authentication information for * 'homes' shares. * - * @param tqparent The tqparent object. + * @param parent The parent object. * * @param name The name this class should carry. */ Smb4KPasswordHandler( Smb4KHomesSharesHandler *handler, - TQObject *tqparent = 0, + TQObject *parent = 0, const char *name = 0 ); #else /** @@ -94,13 +94,13 @@ class Smb4KPasswordHandler : public TQObject * @param o_handler The Smb4KSambaOptionsHandler object. It is needed to write the * ~/.nsmbrc file correctly. * - * @param tqparent The tqparent object. + * @param parent The parent object. * * @param name The name this class should carry. */ Smb4KPasswordHandler( Smb4KHomesSharesHandler *s_handler, Smb4KSambaOptionsHandler *o_handler, - TQObject *tqparent = 0, + TQObject *parent = 0, const char *name = 0 ); #endif @@ -122,13 +122,13 @@ class Smb4KPasswordHandler : public TQObject * Values are taken from the Smb4KPasswordHandler::AskPass::Description * enumeration. * - * @param tqparent The tqparent of this dialog. + * @param parent The parent of this dialog. * * @param name The name of this dialog. * * @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 *tqparent = 0, const char *name = 0 ); + bool askpass( const TQString &workgroup, const TQString &host, const TQString &share, int desc, TQWidget *parent = 0, const char *name = 0 ); /** * Returns the authentication data that was found for the defined share. You need to diff --git a/smb4k/core/smb4kpreviewer.cpp b/smb4k/core/smb4kpreviewer.cpp index 6d76f8f..1ddff6f 100644 --- a/smb4k/core/smb4kpreviewer.cpp +++ b/smb4k/core/smb4kpreviewer.cpp @@ -43,8 +43,8 @@ using namespace Smb4KGlobal; -Smb4KPreviewer::Smb4KPreviewer( TQObject *tqparent, const char *name ) -: TQObject( tqparent, name ) +Smb4KPreviewer::Smb4KPreviewer( TQObject *parent, const char *name ) +: TQObject( parent, name ) { m_item = NULL; diff --git a/smb4k/core/smb4kpreviewer.h b/smb4k/core/smb4kpreviewer.h index bc99ca8..2ae55a2 100644 --- a/smb4k/core/smb4kpreviewer.h +++ b/smb4k/core/smb4kpreviewer.h @@ -57,11 +57,11 @@ class Smb4KPreviewer : public TQObject /** * The constructor * - * @param tqparent The tqparent object + * @param parent The parent object * * @param name The name of this object */ - Smb4KPreviewer( TQObject *tqparent = 0, const char *name = 0 ); + Smb4KPreviewer( TQObject *parent = 0, const char *name = 0 ); /** * The destructor diff --git a/smb4k/core/smb4kprint.cpp b/smb4k/core/smb4kprint.cpp index 76e4a9a..b3672d3 100644 --- a/smb4k/core/smb4kprint.cpp +++ b/smb4k/core/smb4kprint.cpp @@ -50,7 +50,7 @@ using namespace Smb4KGlobal; -Smb4KPrint::Smb4KPrint( TQObject *tqparent, const char *name ) : TQObject( tqparent, name ) +Smb4KPrint::Smb4KPrint( TQObject *parent, const char *name ) : TQObject( parent, name ) { m_proc = new KProcess( this, "PrintProcess" ); m_proc->setUseShell( true ); diff --git a/smb4k/core/smb4kprint.h b/smb4k/core/smb4kprint.h index 2f75de2..13b8059 100644 --- a/smb4k/core/smb4kprint.h +++ b/smb4k/core/smb4kprint.h @@ -61,7 +61,7 @@ class Smb4KPrint : public TQObject /** * The constructor. */ - Smb4KPrint( TQObject *tqparent = 0, const char *name = 0 ); + Smb4KPrint( TQObject *parent = 0, const char *name = 0 ); /** * The destructor. diff --git a/smb4k/core/smb4ksambaoptionshandler.cpp b/smb4k/core/smb4ksambaoptionshandler.cpp index acd2d82..b7d145f 100644 --- a/smb4k/core/smb4ksambaoptionshandler.cpp +++ b/smb4k/core/smb4ksambaoptionshandler.cpp @@ -51,8 +51,8 @@ using namespace Smb4KGlobal; -Smb4KSambaOptionsHandler::Smb4KSambaOptionsHandler( TQObject *tqparent, const char *name ) -: TQObject( tqparent, name ) +Smb4KSambaOptionsHandler::Smb4KSambaOptionsHandler( TQObject *parent, const char *name ) +: TQObject( parent, name ) { // We need the directory. KStandardDirs *stddir = new KStandardDirs(); @@ -1285,11 +1285,11 @@ const TQString Smb4KSambaOptionsHandler::mountOptions( const TQString &share ) TQString() ); args.append( !Smb4KSettings::fileMask().isEmpty() ? - TQString( "ftqmask=%1," ).tqarg( Smb4KSettings::fileMask() ) : + TQString( "fmask=%1," ).tqarg( Smb4KSettings::fileMask() ) : TQString() ); args.append( !Smb4KSettings::directoryMask().isEmpty() ? - TQString( "dtqmask=%1," ).tqarg( Smb4KSettings::directoryMask() ) : + TQString( "dmask=%1," ).tqarg( Smb4KSettings::directoryMask() ) : TQString() ); args.append( kerberos ? "krb," : TQString() ); diff --git a/smb4k/core/smb4ksambaoptionshandler.h b/smb4k/core/smb4ksambaoptionshandler.h index d14f0fb..a0e833a 100644 --- a/smb4k/core/smb4ksambaoptionshandler.h +++ b/smb4k/core/smb4ksambaoptionshandler.h @@ -58,11 +58,11 @@ class Smb4KSambaOptionsHandler : public TQObject /** * The constructor * - * @param tqparent The tqparent object + * @param parent The parent object * * @param name The name of this object */ - Smb4KSambaOptionsHandler( TQObject *tqparent = 0, const char *name = 0 ); + Smb4KSambaOptionsHandler( TQObject *parent = 0, const char *name = 0 ); /** * The destructor diff --git a/smb4k/core/smb4kscanner.cpp b/smb4k/core/smb4kscanner.cpp index f9d3021..c70aec7 100644 --- a/smb4k/core/smb4kscanner.cpp +++ b/smb4k/core/smb4kscanner.cpp @@ -56,8 +56,8 @@ static bool created_hosts_list = false; Smb4KScanner::Smb4KScanner( TQValueList *workgroups, TQValueList *hosts, -TQObject *tqparent, const char *name ) -: TQObject( tqparent, name ), m_workgroups_list( workgroups ), m_hosts_list( hosts ) +TQObject *parent, const char *name ) +: TQObject( parent, name ), m_workgroups_list( workgroups ), m_hosts_list( hosts ) { m_priv = new Smb4KScannerPrivate; diff --git a/smb4k/core/smb4kscanner.h b/smb4k/core/smb4kscanner.h index 4a5f4ad..1d9f1a3 100644 --- a/smb4k/core/smb4kscanner.h +++ b/smb4k/core/smb4kscanner.h @@ -72,13 +72,13 @@ class Smb4KScanner : public TQObject * with the list of available hosts. If a NULL pointer is passed, a * private list will be created which cannot be accessed from outside. * - * @param tqparent The tqparent of this class. + * @param parent The parent of this class. * * @param name The name of this class. */ Smb4KScanner( TQValueList *workgroups = 0, TQValueList *hosts = 0, - TQObject *tqparent = 0, + TQObject *parent = 0, const char *name = 0 ); /** diff --git a/smb4k/core/smb4ksettings.cpp b/smb4k/core/smb4ksettings.cpp index 92aa79b..098c6a5 100644 --- a/smb4k/core/smb4ksettings.cpp +++ b/smb4k/core/smb4ksettings.cpp @@ -666,12 +666,12 @@ Smb4KSettings::Smb4KSettings( ) mGroupIDItem->setWhatsThis( i18n("Here you can enter the group ID (a number) that the files and directories of the mounted share will have. If you are using the CIFS file system and the remote server supports the CIFS Unix Extentions, this setting will be ignored.") ); addItem( mGroupIDItem, TQString::tqfromLatin1( "GroupID" ) ); mFileMaskItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "FileMask" ), mFileMask, TQString::tqfromLatin1( "0755" ) ); - mFileMaskItem->setLabel( i18n("The file tqmask for a share") ); - mFileMaskItem->setWhatsThis( i18n("This is the tqmask that will be used for creating files. It must be defined in octal. In case the CIFS file system is used, this setting only takes effect if the server does not support the CIFS Unix Extensions.") ); + mFileMaskItem->setLabel( i18n("The file mask for a share") ); + mFileMaskItem->setWhatsThis( i18n("This is the mask that will be used for creating files. It must be defined in octal. In case the CIFS file system is used, this setting only takes effect if the server does not support the CIFS Unix Extensions.") ); addItem( mFileMaskItem, TQString::tqfromLatin1( "FileMask" ) ); mDirectoryMaskItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "DirectoryMask" ), mDirectoryMask, TQString::tqfromLatin1( "0755" ) ); - mDirectoryMaskItem->setLabel( i18n("The directory tqmask for a share") ); - mDirectoryMaskItem->setWhatsThis( i18n("This is the tqmask that will be used for creating directories. It must be defined in octal. In case the CIFS file system is used, this setting only takes effect if the server does not support the CIFS Unix Extensions.") ); + mDirectoryMaskItem->setLabel( i18n("The directory mask for a share") ); + mDirectoryMaskItem->setWhatsThis( i18n("This is the mask that will be used for creating directories. It must be defined in octal. In case the CIFS file system is used, this setting only takes effect if the server does not support the CIFS Unix Extensions.") ); addItem( mDirectoryMaskItem, TQString::tqfromLatin1( "DirectoryMask" ) ); TQValueList valuesWriteAccess; { diff --git a/smb4k/core/smb4ksynchronizer.cpp b/smb4k/core/smb4ksynchronizer.cpp index 8944157..819ad79 100644 --- a/smb4k/core/smb4ksynchronizer.cpp +++ b/smb4k/core/smb4ksynchronizer.cpp @@ -54,8 +54,8 @@ using namespace Smb4KGlobal; bool cancel = false; -Smb4KSynchronizer::Smb4KSynchronizer( TQObject *tqparent, const char *name ) -: TQObject( tqparent, name ) +Smb4KSynchronizer::Smb4KSynchronizer( TQObject *parent, const char *name ) +: TQObject( parent, name ) { m_proc = new KProcess( this, "SynchronizerProcess" ); diff --git a/smb4k/core/smb4ksynchronizer.h b/smb4k/core/smb4ksynchronizer.h index 1bce096..298343e 100644 --- a/smb4k/core/smb4ksynchronizer.h +++ b/smb4k/core/smb4ksynchronizer.h @@ -60,11 +60,11 @@ class Smb4KSynchronizer : public TQObject /** * The constructor of the synchronizer. * - * @param tqparent The tqparent of this object + * @param parent The parent of this object * * @param name The name of this object */ - Smb4KSynchronizer( TQObject *tqparent = 0, const char *name = 0 ); + Smb4KSynchronizer( TQObject *parent = 0, const char *name = 0 ); /** * The destructor. diff --git a/smb4k/dialogs/smb4kbookmarkeditor.cpp b/smb4k/dialogs/smb4kbookmarkeditor.cpp index bec79e0..9e1f33c 100644 --- a/smb4k/dialogs/smb4kbookmarkeditor.cpp +++ b/smb4k/dialogs/smb4kbookmarkeditor.cpp @@ -48,8 +48,8 @@ using namespace Smb4KGlobal; -Smb4KBookmarkEditor::Smb4KBookmarkEditor( TQWidget *tqparent, const char *name ) -: KDialogBase( Plain, i18n( "Bookmark Editor" ), Ok|Cancel, Ok, tqparent, name, true, true ) +Smb4KBookmarkEditor::Smb4KBookmarkEditor( TQWidget *parent, const char *name ) +: KDialogBase( Plain, i18n( "Bookmark Editor" ), Ok|Cancel, Ok, parent, name, true, true ) { setWFlags( TQt::WDestructiveClose ); diff --git a/smb4k/dialogs/smb4kbookmarkeditor.h b/smb4k/dialogs/smb4kbookmarkeditor.h index 5d0f59a..a5f6760 100644 --- a/smb4k/dialogs/smb4kbookmarkeditor.h +++ b/smb4k/dialogs/smb4kbookmarkeditor.h @@ -50,11 +50,11 @@ class Smb4KBookmarkEditor : public KDialogBase /** * The constructor. * - * @param tqparent The tqparent of this dialog. + * @param parent The parent of this dialog. * * @param name The name of this dialog. */ - Smb4KBookmarkEditor( TQWidget *tqparent = 0, const char *name = 0 ); + Smb4KBookmarkEditor( TQWidget *parent = 0, const char *name = 0 ); /** * The destructor. diff --git a/smb4k/dialogs/smb4kcustomoptionsdialog.cpp b/smb4k/dialogs/smb4kcustomoptionsdialog.cpp index aa8a9fc..8dff9e9 100644 --- a/smb4k/dialogs/smb4kcustomoptionsdialog.cpp +++ b/smb4k/dialogs/smb4kcustomoptionsdialog.cpp @@ -89,8 +89,8 @@ static bool readwrite_changed_default = false; #endif -Smb4KCustomOptionsDialog::Smb4KCustomOptionsDialog( Smb4KHostItem *host, TQWidget *tqparent, const char *name ) -: KDialogBase( Plain, i18n( "Custom Options" ), User1|Ok|Cancel, Ok, tqparent, name, true, true ), m_type( Host ), m_host_item( host ), m_share_item( NULL ), m_homes_user( TQString() ) +Smb4KCustomOptionsDialog::Smb4KCustomOptionsDialog( Smb4KHostItem *host, TQWidget *parent, const char *name ) +: KDialogBase( Plain, i18n( "Custom Options" ), User1|Ok|Cancel, Ok, parent, name, true, true ), m_type( Host ), m_host_item( host ), m_share_item( NULL ), m_homes_user( TQString() ) { m_initialized = true; @@ -102,8 +102,8 @@ Smb4KCustomOptionsDialog::Smb4KCustomOptionsDialog( Smb4KHostItem *host, TQWidge } -Smb4KCustomOptionsDialog::Smb4KCustomOptionsDialog( Smb4KShareItem *share, TQWidget *tqparent, const char *name ) -: KDialogBase( Plain, i18n( "Custom Options" ), User1|Ok|Cancel, Ok, tqparent, name, true, true ), m_type( Share ), m_host_item( NULL ), m_share_item( share ), m_homes_user( TQString() ) +Smb4KCustomOptionsDialog::Smb4KCustomOptionsDialog( Smb4KShareItem *share, TQWidget *parent, const char *name ) +: KDialogBase( Plain, i18n( "Custom Options" ), User1|Ok|Cancel, Ok, parent, name, true, true ), m_type( Share ), m_host_item( NULL ), m_share_item( share ), m_homes_user( TQString() ) { if ( TQString::compare( share->name(), "homes" ) != 0 ) { diff --git a/smb4k/dialogs/smb4kcustomoptionsdialog.h b/smb4k/dialogs/smb4kcustomoptionsdialog.h index 00c6123..0445817 100644 --- a/smb4k/dialogs/smb4kcustomoptionsdialog.h +++ b/smb4k/dialogs/smb4kcustomoptionsdialog.h @@ -55,22 +55,22 @@ class Smb4KCustomOptionsDialog : public KDialogBase * * @param host The host (server) for which the custom options should be defined. * - * @param tqparent The tqparent of this dialog + * @param parent The parent of this dialog * * @param name The name of this dialog */ - Smb4KCustomOptionsDialog( Smb4KHostItem *host, TQWidget *tqparent = 0, const char *name = 0 ); + Smb4KCustomOptionsDialog( Smb4KHostItem *host, TQWidget *parent = 0, const char *name = 0 ); /** * Another constructor, similar to the one above. * * @param share The share for which the custom options should be defined. * - * @param tqparent The tqparent of this dialog + * @param parent The parent of this dialog * * @param name The name of this dialog */ - Smb4KCustomOptionsDialog( Smb4KShareItem *share, TQWidget *tqparent = 0, const char *name = 0 ); + Smb4KCustomOptionsDialog( Smb4KShareItem *share, TQWidget *parent = 0, const char *name = 0 ); /** * The destructor diff --git a/smb4k/dialogs/smb4kmountdialog.cpp b/smb4k/dialogs/smb4kmountdialog.cpp index 4cf33a2..131ce8d 100644 --- a/smb4k/dialogs/smb4kmountdialog.cpp +++ b/smb4k/dialogs/smb4kmountdialog.cpp @@ -44,8 +44,8 @@ #include "../core/smb4kcore.h" #include "../smb4k.h" -Smb4KMountDialog::Smb4KMountDialog( TQWidget *tqparent, const char *name ) : -KDialogBase( Plain, i18n( "Mount Share" ), Ok|Cancel, Ok, tqparent, name, true, true ) +Smb4KMountDialog::Smb4KMountDialog( TQWidget *parent, const char *name ) : +KDialogBase( Plain, i18n( "Mount Share" ), Ok|Cancel, Ok, parent, name, true, true ) { setWFlags( TQt::WDestructiveClose ); diff --git a/smb4k/dialogs/smb4kmountdialog.h b/smb4k/dialogs/smb4kmountdialog.h index e9a07ef..bf94a28 100644 --- a/smb4k/dialogs/smb4kmountdialog.h +++ b/smb4k/dialogs/smb4kmountdialog.h @@ -53,7 +53,7 @@ class Smb4KMountDialog : public KDialogBase /** * The constructor. */ - Smb4KMountDialog( TQWidget *tqparent = 0, const char *name = 0 ); + Smb4KMountDialog( TQWidget *parent = 0, const char *name = 0 ); /** * The destructor. */ diff --git a/smb4k/dialogs/smb4kpreviewdialog.cpp b/smb4k/dialogs/smb4kpreviewdialog.cpp index 0b7c280..07361b2 100644 --- a/smb4k/dialogs/smb4kpreviewdialog.cpp +++ b/smb4k/dialogs/smb4kpreviewdialog.cpp @@ -42,8 +42,8 @@ #include "../core/smb4ksettings.h" -Smb4KPreviewDialog::Smb4KPreviewDialog( Smb4KShareItem *item, TQWidget *tqparent, const char *name ) -: KDialogBase( Plain, i18n( "Preview" ), Close, Close, tqparent, name, false, true ) +Smb4KPreviewDialog::Smb4KPreviewDialog( Smb4KShareItem *item, TQWidget *parent, const char *name ) +: KDialogBase( Plain, i18n( "Preview" ), Close, Close, parent, name, false, true ) { setWFlags( TQt::WDestructiveClose ); diff --git a/smb4k/dialogs/smb4kpreviewdialog.h b/smb4k/dialogs/smb4kpreviewdialog.h index 9a7c48a..cf9cc1a 100644 --- a/smb4k/dialogs/smb4kpreviewdialog.h +++ b/smb4k/dialogs/smb4kpreviewdialog.h @@ -63,11 +63,11 @@ class Smb4KPreviewDialog : public KDialogBase * * @param item The Smb4KShareItem object. * - * @param tqparent The tqparent of this widget + * @param parent The parent of this widget * * @param name The name of this widget */ - Smb4KPreviewDialog( Smb4KShareItem *item, TQWidget *tqparent = 0, const char *name = 0 ); + Smb4KPreviewDialog( Smb4KShareItem *item, TQWidget *parent = 0, const char *name = 0 ); /** * The destructor. diff --git a/smb4k/dialogs/smb4kprintdialog.cpp b/smb4k/dialogs/smb4kprintdialog.cpp index ab147ff..5443273 100644 --- a/smb4k/dialogs/smb4kprintdialog.cpp +++ b/smb4k/dialogs/smb4kprintdialog.cpp @@ -42,8 +42,8 @@ #include "../core/smb4knetworkitems.h" -Smb4KPrintDialog::Smb4KPrintDialog( Smb4KShareItem *item, TQWidget *tqparent, const char *name ) -: KDialogBase( Plain, i18n( "Print File" ), Details|Filler|User1|Cancel, User1, tqparent, name, true, true ), +Smb4KPrintDialog::Smb4KPrintDialog( Smb4KShareItem *item, TQWidget *parent, const char *name ) +: KDialogBase( Plain, i18n( "Print File" ), Details|Filler|User1|Cancel, User1, parent, name, true, true ), m_item( item ), m_ip( TQString() ) /* will collect it in an instant */ { setWFlags( TQt::WDestructiveClose ); diff --git a/smb4k/dialogs/smb4kprintdialog.h b/smb4k/dialogs/smb4kprintdialog.h index bd2294c..af152ca 100644 --- a/smb4k/dialogs/smb4kprintdialog.h +++ b/smb4k/dialogs/smb4kprintdialog.h @@ -59,11 +59,11 @@ class Smb4KPrintDialog : public KDialogBase * * @param item The Smb4KShareItem of the printer. * - * @param tqparent The tqparent widget of this dialog. + * @param parent The parent widget of this dialog. * * @param name The name of this dialog. */ - Smb4KPrintDialog( Smb4KShareItem *item, TQWidget *tqparent = 0, const char *name = 0 ); + Smb4KPrintDialog( Smb4KShareItem *item, TQWidget *parent = 0, const char *name = 0 ); /** * The destructor */ diff --git a/smb4k/dialogs/smb4ksynchronizationdialog.cpp b/smb4k/dialogs/smb4ksynchronizationdialog.cpp index fbe03a0..4b37c89 100644 --- a/smb4k/dialogs/smb4ksynchronizationdialog.cpp +++ b/smb4k/dialogs/smb4ksynchronizationdialog.cpp @@ -43,8 +43,8 @@ #include "../core/smb4ksynchronizationinfo.h" #include "../core/smb4ksettings.h" -Smb4KSynchronizationDialog::Smb4KSynchronizationDialog( Smb4KShare *share, TQWidget *tqparent, const char *name ) -: KDialogBase( Plain, i18n( "Synchronization" ), User2|User1|Cancel, User1, tqparent, name, false, true ), +Smb4KSynchronizationDialog::Smb4KSynchronizationDialog( Smb4KShare *share, TQWidget *parent, const char *name ) +: KDialogBase( Plain, i18n( "Synchronization" ), User2|User1|Cancel, User1, parent, name, false, true ), m_share( share ) { setWFlags( TQt::WDestructiveClose ); diff --git a/smb4k/dialogs/smb4ksynchronizationdialog.h b/smb4k/dialogs/smb4ksynchronizationdialog.h index 00c121f..3000c93 100644 --- a/smb4k/dialogs/smb4ksynchronizationdialog.h +++ b/smb4k/dialogs/smb4ksynchronizationdialog.h @@ -57,11 +57,11 @@ class Smb4KSynchronizationDialog : public KDialogBase * * @param share The share item * - * @param tqparent The tqparent widget + * @param parent The parent widget * * @param name The name of this dialog */ - Smb4KSynchronizationDialog( Smb4KShare *share, TQWidget *tqparent = 0, const char *name = 0 ); + Smb4KSynchronizationDialog( Smb4KShare *share, TQWidget *parent = 0, const char *name = 0 ); /** * The destructor diff --git a/smb4k/iconview/smb4ksharesiconview.cpp b/smb4k/iconview/smb4ksharesiconview.cpp index b7dfb7e..397eabb 100644 --- a/smb4k/iconview/smb4ksharesiconview.cpp +++ b/smb4k/iconview/smb4ksharesiconview.cpp @@ -38,8 +38,8 @@ #include "../core/smb4kcore.h" -Smb4KSharesIconView::Smb4KSharesIconView( TQWidget *tqparent, const char *name ) -: KIconView( tqparent, name ) +Smb4KSharesIconView::Smb4KSharesIconView( TQWidget *parent, const char *name ) +: KIconView( parent, name ) { setSelectionMode( KIconView::Single ); // If this is changed, revise dragObject() function. setResizeMode( KIconView::Adjust ); @@ -62,7 +62,7 @@ Smb4KSharesIconView::Smb4KSharesIconView( TQWidget *tqparent, const char *name ) Smb4KSharesIconView::~Smb4KSharesIconView() { - // The tool tip's tqparent is 0 and not this icon view. + // The tool tip's parent is 0 and not this icon view. if ( m_tooltip ) { delete m_tooltip; @@ -150,7 +150,7 @@ void Smb4KSharesIconView::contentsDropEvent( TQDropEvent *e ) { if ( dest.equals( *it, true ) ) { - if ( e->source() == this || TQT_BASE_OBJECT(e->source()->tqparent()) == TQT_BASE_OBJECT(this) ) + if ( e->source() == this || TQT_BASE_OBJECT(e->source()->parent()) == TQT_BASE_OBJECT(this) ) { e->ignore(); diff --git a/smb4k/iconview/smb4ksharesiconview.h b/smb4k/iconview/smb4ksharesiconview.h index cecf441..c54c670 100644 --- a/smb4k/iconview/smb4ksharesiconview.h +++ b/smb4k/iconview/smb4ksharesiconview.h @@ -57,11 +57,11 @@ class Smb4KSharesIconView : public KIconView /** * The constructor. * - * @param tqparent The tqparent widget + * @param parent The parent widget * * @param name The name of the widget */ - Smb4KSharesIconView( TQWidget *tqparent = 0, const char *name = 0 ); + Smb4KSharesIconView( TQWidget *parent = 0, const char *name = 0 ); /** * The destructor. diff --git a/smb4k/iconview/smb4ksharesiconview_part.cpp b/smb4k/iconview/smb4ksharesiconview_part.cpp index ddb1729..093ca9e 100644 --- a/smb4k/iconview/smb4ksharesiconview_part.cpp +++ b/smb4k/iconview/smb4ksharesiconview_part.cpp @@ -52,8 +52,8 @@ KAboutData *Smb4KSharesIconViewPartFactory::m_about = 0L; Smb4KSharesIconViewPart::Smb4KSharesIconViewPart( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name ) -: KParts::Part( tqparent, name ) + TQObject *parent, const char *name ) +: KParts::Part( parent, name ) { // First of all We need an instance: setInstance( Smb4KSharesIconViewPartFactory::instance() ); @@ -528,9 +528,9 @@ Smb4KSharesIconViewPartFactory::~Smb4KSharesIconViewPartFactory() KParts::Part *Smb4KSharesIconViewPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, -TQObject *tqparent, const char *name, const char *, const TQStringList & ) +TQObject *parent, const char *name, const char *, const TQStringList & ) { - Smb4KSharesIconViewPart *obj = new Smb4KSharesIconViewPart( parentWidget, widgetName, tqparent, name ); + Smb4KSharesIconViewPart *obj = new Smb4KSharesIconViewPart( parentWidget, widgetName, parent, name ); // See if we are to be read-write or not // if (TQCString(classname) == "KParts::ReadOnlyPart") diff --git a/smb4k/iconview/smb4ksharesiconview_part.h b/smb4k/iconview/smb4ksharesiconview_part.h index aec3e1a..cbf486d 100644 --- a/smb4k/iconview/smb4ksharesiconview_part.h +++ b/smb4k/iconview/smb4ksharesiconview_part.h @@ -54,16 +54,16 @@ class Smb4KSharesIconViewPart : public KParts::Part /** * The constructor. * - * @param parentWidget The tqparent widget + * @param parentWidget The parent widget * * @param widgetName The name the widget should have * - * @param tqparent The tqparent object + * @param parent The parent object * * @param name The name this object should have */ Smb4KSharesIconViewPart( TQWidget *parentWidget = 0, const char *widgetName = 0, - TQObject *tqparent = 0, const char *name = 0 ); + TQObject *parent = 0, const char *name = 0 ); /** * The destructor. @@ -210,7 +210,7 @@ class Smb4KSharesIconViewPartFactory : public KParts::Factory * Reimplemented from KParts::Factory */ virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const char *classname, const TQStringList &args ); /** diff --git a/smb4k/iconview/smb4ksharesiconviewitem.cpp b/smb4k/iconview/smb4ksharesiconviewitem.cpp index 7ac94a3..bbbbd2b 100644 --- a/smb4k/iconview/smb4ksharesiconviewitem.cpp +++ b/smb4k/iconview/smb4ksharesiconviewitem.cpp @@ -35,8 +35,8 @@ #include "smb4ksharesiconview.h" Smb4KSharesIconViewItem::Smb4KSharesIconViewItem( Smb4KShare *share, bool mountpoint, - Smb4KSharesIconView *tqparent ) -: KIconViewItem( tqparent, TQString() ), m_share( *share ), m_mountpoint( mountpoint ), + Smb4KSharesIconView *parent ) +: KIconViewItem( parent, TQString() ), m_share( *share ), m_mountpoint( mountpoint ), m_initial_setup( false ) { setDropEnabled( true ); diff --git a/smb4k/iconview/smb4ksharesiconviewitem.h b/smb4k/iconview/smb4ksharesiconviewitem.h index eba33d6..9be9502 100644 --- a/smb4k/iconview/smb4ksharesiconviewitem.h +++ b/smb4k/iconview/smb4ksharesiconviewitem.h @@ -62,11 +62,11 @@ class Smb4KSharesIconViewItem : public KIconViewItem * @param mountpoint Tells the item if the mount point instead of the * share name should be shown. Default is FALSE. * - * @param tqparent The tqparent widget of this item. + * @param parent The parent widget of this item. */ Smb4KSharesIconViewItem( Smb4KShare *share, bool mountpoint = false, - Smb4KSharesIconView *tqparent = 0 ); + Smb4KSharesIconView *parent = 0 ); /** * The destructor diff --git a/smb4k/iconview/smb4ksharesiconviewtooltip.h b/smb4k/iconview/smb4ksharesiconviewtooltip.h index 48761e0..4b61345 100644 --- a/smb4k/iconview/smb4ksharesiconviewtooltip.h +++ b/smb4k/iconview/smb4ksharesiconviewtooltip.h @@ -54,9 +54,9 @@ class Smb4KSharesIconViewToolTip : public TQLabel /** * The constructor. * - * Please note that the tqparent of the tool tip will be '0' and - * not the tqparent widget of @p item. Thus, you have to delete the - * tool tip object in the destructor of the tqparent widget. + * Please note that the parent of the tool tip will be '0' and + * not the parent widget of @p item. Thus, you have to delete the + * tool tip object in the destructor of the parent widget. * * @param item The item for which the tool tip should be shown. */ diff --git a/smb4k/listview/smb4kshareslistview.cpp b/smb4k/listview/smb4kshareslistview.cpp index 95b8284..680cf06 100644 --- a/smb4k/listview/smb4kshareslistview.cpp +++ b/smb4k/listview/smb4kshareslistview.cpp @@ -39,8 +39,8 @@ #include "smb4kshareslistviewtooltip.h" #include "../core/smb4ksettings.h" -Smb4KSharesListView::Smb4KSharesListView( TQWidget *tqparent, const char *name ) -: KListView( tqparent, name ) +Smb4KSharesListView::Smb4KSharesListView( TQWidget *parent, const char *name ) +: KListView( parent, name ) { setSelectionModeExt( KListView::Single ); setAllColumnsShowFocus( false ); @@ -155,7 +155,7 @@ void Smb4KSharesListView::contentsDropEvent( TQDropEvent *e ) { if ( dest.equals( *it, true ) ) { - if ( e->source() == this || TQT_BASE_OBJECT(e->source()->tqparent()) == TQT_BASE_OBJECT(this) ) + if ( e->source() == this || TQT_BASE_OBJECT(e->source()->parent()) == TQT_BASE_OBJECT(this) ) { e->ignore(); diff --git a/smb4k/listview/smb4kshareslistview.h b/smb4k/listview/smb4kshareslistview.h index ecd1d11..af75ec5 100644 --- a/smb4k/listview/smb4kshareslistview.h +++ b/smb4k/listview/smb4kshareslistview.h @@ -52,11 +52,11 @@ class Smb4KSharesListView : public KListView /** * The constructor * - * @param tqparent The tqparent widget + * @param parent The parent widget * * @param name The name of this object */ - Smb4KSharesListView( TQWidget *tqparent = 0, const char *name = 0 ); + Smb4KSharesListView( TQWidget *parent = 0, const char *name = 0 ); /** * The destructor diff --git a/smb4k/listview/smb4kshareslistview_part.cpp b/smb4k/listview/smb4kshareslistview_part.cpp index 80c3a0d..fcd1f8e 100644 --- a/smb4k/listview/smb4kshareslistview_part.cpp +++ b/smb4k/listview/smb4kshareslistview_part.cpp @@ -55,8 +55,8 @@ KAboutData *Smb4KSharesListViewPartFactory::m_about = 0L; Smb4KSharesListViewPart::Smb4KSharesListViewPart( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name ) -: KParts::Part( tqparent, name ) + TQObject *parent, const char *name ) +: KParts::Part( parent, name ) { // First of all We need an instance: setInstance( Smb4KSharesListViewPartFactory::instance() ); @@ -655,9 +655,9 @@ Smb4KSharesListViewPartFactory::~Smb4KSharesListViewPartFactory() KParts::Part *Smb4KSharesListViewPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, -TQObject *tqparent, const char *name, const char *, const TQStringList & ) +TQObject *parent, const char *name, const char *, const TQStringList & ) { - Smb4KSharesListViewPart *obj = new Smb4KSharesListViewPart( parentWidget, widgetName, tqparent, name ); + Smb4KSharesListViewPart *obj = new Smb4KSharesListViewPart( parentWidget, widgetName, parent, name ); // See if we are to be read-write or not // if (TQCString(classname) == "KParts::ReadOnlyPart") diff --git a/smb4k/listview/smb4kshareslistview_part.h b/smb4k/listview/smb4kshareslistview_part.h index 797028d..c660556 100644 --- a/smb4k/listview/smb4kshareslistview_part.h +++ b/smb4k/listview/smb4kshareslistview_part.h @@ -54,16 +54,16 @@ class Smb4KSharesListViewPart : public KParts::Part /** * The constructor. * - * @param parentWidget The tqparent widget + * @param parentWidget The parent widget * * @param widgetName The name the widget should have * - * @param tqparent The tqparent object + * @param parent The parent object * * @param name The name this object should have */ Smb4KSharesListViewPart( TQWidget *parentWidget = 0, const char *widgetName = 0, - TQObject *tqparent = 0, const char *name = 0 ); + TQObject *parent = 0, const char *name = 0 ); /** * The destructor. @@ -212,7 +212,7 @@ class Smb4KSharesListViewPartFactory : public KParts::Factory * Reimplemented from KParts::Factory */ virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const char *classname, const TQStringList &args ); /** diff --git a/smb4k/listview/smb4kshareslistviewitem.cpp b/smb4k/listview/smb4kshareslistviewitem.cpp index ef94e0f..3930f66 100644 --- a/smb4k/listview/smb4kshareslistviewitem.cpp +++ b/smb4k/listview/smb4kshareslistviewitem.cpp @@ -37,8 +37,8 @@ Smb4KSharesListViewItem::Smb4KSharesListViewItem( Smb4KShare *share, bool mountpoint, - Smb4KSharesListView *tqparent ) -: KListViewItem( tqparent ), m_share( *share ), m_mountpoint( mountpoint ), + Smb4KSharesListView *parent ) +: KListViewItem( parent ), m_share( *share ), m_mountpoint( mountpoint ), m_initial_setup( true ) { setDropEnabled( true ); diff --git a/smb4k/listview/smb4kshareslistviewitem.h b/smb4k/listview/smb4kshareslistviewitem.h index 052c37b..b47f888 100644 --- a/smb4k/listview/smb4kshareslistviewitem.h +++ b/smb4k/listview/smb4kshareslistviewitem.h @@ -62,11 +62,11 @@ class Smb4KSharesListViewItem : public KListViewItem * @param mountpoint Tells the item if the mount point instead of the * share name should be shown. Default is FALSE. * - * @param tqparent The tqparent widget of this item. + * @param parent The parent widget of this item. */ Smb4KSharesListViewItem( Smb4KShare *share, bool mountpoint = false, - Smb4KSharesListView *tqparent = 0 ); + Smb4KSharesListView *parent = 0 ); /** * The destructor diff --git a/smb4k/listview/smb4kshareslistviewtooltip.h b/smb4k/listview/smb4kshareslistviewtooltip.h index a41623e..41fc91f 100644 --- a/smb4k/listview/smb4kshareslistviewtooltip.h +++ b/smb4k/listview/smb4kshareslistviewtooltip.h @@ -54,9 +54,9 @@ class Smb4KSharesListViewToolTip : public TQLabel /** * The constructor. * - * Please note that the tqparent of the tool tip will be '0' and - * not the tqparent widget of @p item. Thus, you have to delete the - * tool tip object in the destructor of the tqparent widget. + * Please note that the parent of the tool tip will be '0' and + * not the parent widget of @p item. Thus, you have to delete the + * tool tip object in the destructor of the parent widget. * * @param item The item for which the tool tip should be shown. */ diff --git a/smb4k/searchdlg/smb4ksearchdialog.cpp b/smb4k/searchdlg/smb4ksearchdialog.cpp index e092958..5b63110 100644 --- a/smb4k/searchdlg/smb4ksearchdialog.cpp +++ b/smb4k/searchdlg/smb4ksearchdialog.cpp @@ -38,8 +38,8 @@ #include "smb4ksearchdialogitem.h" #include "../core/smb4knetworkitems.h" -Smb4KSearchDialog::Smb4KSearchDialog( TQWidget *tqparent, const char *name ) -: TQWidget( tqparent, name ) +Smb4KSearchDialog::Smb4KSearchDialog( TQWidget *parent, const char *name ) +: TQWidget( parent, name ) { TQGridLayout *tqlayout = new TQGridLayout( this ); tqlayout->setSpacing( 5 ); diff --git a/smb4k/searchdlg/smb4ksearchdialog.h b/smb4k/searchdlg/smb4ksearchdialog.h index 19d2526..1abf84f 100644 --- a/smb4k/searchdlg/smb4ksearchdialog.h +++ b/smb4k/searchdlg/smb4ksearchdialog.h @@ -59,11 +59,11 @@ class Smb4KSearchDialog : public TQWidget /** * The constructor. * - * @param tqparent The tqparent widget + * @param parent The parent widget * * @param name The name of this widget */ - Smb4KSearchDialog( TQWidget *tqparent = 0, const char *name = 0 ); + Smb4KSearchDialog( TQWidget *parent = 0, const char *name = 0 ); /** * The destructor. diff --git a/smb4k/searchdlg/smb4ksearchdialog_part.cpp b/smb4k/searchdlg/smb4ksearchdialog_part.cpp index fb4ec10..72d9563 100644 --- a/smb4k/searchdlg/smb4ksearchdialog_part.cpp +++ b/smb4k/searchdlg/smb4ksearchdialog_part.cpp @@ -49,8 +49,8 @@ KAboutData *Smb4KSearchDialogPartFactory::m_about = 0L; Smb4KSearchDialogPart::Smb4KSearchDialogPart( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name ) -: KParts::Part( tqparent, name ) + TQObject *parent, const char *name ) +: KParts::Part( parent, name ) { // First of all we need an instance: setInstance( Smb4KSearchDialogPartFactory::instance() ); @@ -233,9 +233,9 @@ Smb4KSearchDialogPartFactory::~Smb4KSearchDialogPartFactory() KParts::Part *Smb4KSearchDialogPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, -TQObject *tqparent, const char *name, const char *, const TQStringList & ) +TQObject *parent, const char *name, const char *, const TQStringList & ) { - Smb4KSearchDialogPart *obj = new Smb4KSearchDialogPart( parentWidget, widgetName, tqparent, name ); + Smb4KSearchDialogPart *obj = new Smb4KSearchDialogPart( parentWidget, widgetName, parent, name ); // See if we are to be read-write or not // if (TQCString(classname) == "KParts::ReadOnlyPart") diff --git a/smb4k/searchdlg/smb4ksearchdialog_part.h b/smb4k/searchdlg/smb4ksearchdialog_part.h index 633b217..4ff69dd 100644 --- a/smb4k/searchdlg/smb4ksearchdialog_part.h +++ b/smb4k/searchdlg/smb4ksearchdialog_part.h @@ -58,16 +58,16 @@ class Smb4KSearchDialogPart : public KParts::Part /** * The constructor. * - * @param parentWidget The tqparent widget + * @param parentWidget The parent widget * * @param widgetName The name the widget should have * - * @param tqparent The tqparent object + * @param parent The parent object * * @param name The name this object should have */ Smb4KSearchDialogPart( TQWidget *parentWidget = 0, const char *widgetName = 0, - TQObject *tqparent = 0, const char *name = 0 ); + TQObject *parent = 0, const char *name = 0 ); /** * The destructor. @@ -150,7 +150,7 @@ class Smb4KSearchDialogPartFactory : public KParts::Factory * Reimplemented from KParts::Factory */ virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const char *classname, const TQStringList &args ); /** diff --git a/smb4k/searchdlg/smb4ksearchdialogitem.h b/smb4k/searchdlg/smb4ksearchdialogitem.h index 0469b7f..0873d0a 100644 --- a/smb4k/searchdlg/smb4ksearchdialogitem.h +++ b/smb4k/searchdlg/smb4ksearchdialogitem.h @@ -56,7 +56,7 @@ class Smb4KSearchDialogItem : public KListViewItem * text according to the contents of @p item. If the search failed * and @p item is empty, an error message will be displayed. * - * @param listBox The tqparent list box. + * @param listBox The parent list box. * * @param item The host item that represents the search * result. diff --git a/smb4k/smb4k.cpp b/smb4k/smb4k.cpp index 8281ed9..dea3b9b 100644 --- a/smb4k/smb4k.cpp +++ b/smb4k/smb4k.cpp @@ -54,8 +54,8 @@ using namespace Smb4KGlobal; -Smb4KApp::Smb4KApp( TQWidget *tqparent, const char *name ) -: KParts::DockMainWindow( tqparent, name ) +Smb4KApp::Smb4KApp( TQWidget *parent, const char *name ) +: KParts::DockMainWindow( parent, name ) { m_system_tray = NULL; diff --git a/smb4k/smb4k.h b/smb4k/smb4k.h index 1282285..02da55a 100644 --- a/smb4k/smb4k.h +++ b/smb4k/smb4k.h @@ -52,11 +52,11 @@ class Smb4KApp : public KParts::DockMainWindow /** * The constructor. * - * @param tqparent The tqparent of this widget + * @param parent The parent of this widget * * @param name The name of this widget */ - Smb4KApp( TQWidget *tqparent = 0, const char *name = 0 ); + Smb4KApp( TQWidget *parent = 0, const char *name = 0 ); /** * The destructor. diff --git a/smb4k/smb4ksystemtray.cpp b/smb4k/smb4ksystemtray.cpp index d383a74..9aa1243 100644 --- a/smb4k/smb4ksystemtray.cpp +++ b/smb4k/smb4ksystemtray.cpp @@ -51,8 +51,8 @@ #include "core/smb4ksettings.h" -Smb4KSystemTray::Smb4KSystemTray( TQWidget *tqparent, const char *name ) -: KSystemTray( tqparent, name ) +Smb4KSystemTray::Smb4KSystemTray( TQWidget *parent, const char *name ) +: KSystemTray( parent, name ) { setPixmap( loadIcon( "smb4k" ) ); @@ -98,7 +98,7 @@ Smb4KSystemTray::Smb4KSystemTray( TQWidget *tqparent, const char *name ) connect( Smb4KCore::mounter(), TQT_SIGNAL( updated() ), this, TQT_SLOT( slotSetupSharesMenu() ) ); - // Connection to quitSelected() signal must be done in tqparent widget. + // Connection to quitSelected() signal must be done in parent widget. } @@ -219,7 +219,7 @@ void Smb4KSystemTray::slotConfigDialog() void Smb4KSystemTray::slotSettingsChanged() { - // Notify the tqparent that the settings changed: + // Notify the parent that the settings changed: emit settingsChanged(); // Execute loadSettings(): diff --git a/smb4k/smb4ksystemtray.h b/smb4k/smb4ksystemtray.h index 2ecc7bf..53fa11f 100644 --- a/smb4k/smb4ksystemtray.h +++ b/smb4k/smb4ksystemtray.h @@ -43,11 +43,11 @@ class Smb4KSystemTray : public KSystemTray /** * The constructor. * - * @param tqparent The tqparent widget of the system tray window + * @param parent The parent widget of the system tray window * * @param name The name of the system tray window */ - Smb4KSystemTray( TQWidget *tqparent = 0, const char *name = 0 ); + Smb4KSystemTray( TQWidget *parent = 0, const char *name = 0 ); /** * The destructor.