diff options
-rw-r--r-- | smb4k/browser/smb4knetworkbrowser_part.cpp | 20 | ||||
-rw-r--r-- | smb4k/browser/smb4knetworkbrowser_part.h | 8 | ||||
-rw-r--r-- | smb4k/core/smb4kmounter.cpp | 2 | ||||
-rw-r--r-- | smb4k/iconview/smb4ksharesiconview_part.cpp | 8 | ||||
-rw-r--r-- | smb4k/iconview/smb4ksharesiconview_part.h | 6 | ||||
-rw-r--r-- | smb4k/listview/smb4kshareslistview_part.cpp | 8 | ||||
-rw-r--r-- | smb4k/listview/smb4kshareslistview_part.h | 6 | ||||
-rw-r--r-- | smb4k/searchdlg/smb4ksearchdialog_part.cpp | 8 | ||||
-rw-r--r-- | smb4k/searchdlg/smb4ksearchdialog_part.h | 6 | ||||
-rw-r--r-- | smb4k/searchdlg/smb4ksearchdialogitem.h | 2 | ||||
-rw-r--r-- | smb4k/smb4k.cpp | 10 | ||||
-rw-r--r-- | smb4k/smb4ksystemtray.cpp | 24 |
12 files changed, 54 insertions, 54 deletions
diff --git a/smb4k/browser/smb4knetworkbrowser_part.cpp b/smb4k/browser/smb4knetworkbrowser_part.cpp index f116d55..e6e1225 100644 --- a/smb4k/browser/smb4knetworkbrowser_part.cpp +++ b/smb4k/browser/smb4knetworkbrowser_part.cpp @@ -61,7 +61,7 @@ KInstance *Smb4KNetworkBrowserPartFactory::m_instance = 0L; KAboutData *Smb4KNetworkBrowserPartFactory::m_about = 0L; -Smb4KNetworkBrowserPart::Smb4KNetworkBrowserPart( TQWidget *tqparentWidget, const char *widgetName, +Smb4KNetworkBrowserPart::Smb4KNetworkBrowserPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, Mode mode ) : KParts::Part( tqparent, name ), m_mode( mode ) { @@ -72,7 +72,7 @@ Smb4KNetworkBrowserPart::Smb4KNetworkBrowserPart( TQWidget *tqparentWidget, cons setXMLFile( "smb4knetworkbrowser_part.rc" ); // Set the widget of this part: - m_widget = new Smb4KNetworkBrowser( tqparentWidget, widgetName ); + m_widget = new Smb4KNetworkBrowser( parentWidget, widgetName ); setWidget( m_widget ); // Set up the actions. @@ -1580,11 +1580,11 @@ void Smb4KNetworkBrowserPart::slotBookmark() if ( item && item->type() == Smb4KNetworkBrowserItem::Share ) { - Smb4KNetworkBrowserItem *tqparent_item = static_cast<Smb4KNetworkBrowserItem *>( item->tqparent() ); + Smb4KNetworkBrowserItem *parent_item = static_cast<Smb4KNetworkBrowserItem *>( item->tqparent() ); // Add a bookmark. The alternative label can be set in the bookmark editor, // so we won't do anything about it here. - Smb4KCore::bookmarkHandler()->addBookmark( new Smb4KBookmark( item->shareItem(), tqparent_item->hostItem()->ip() ) ); + Smb4KCore::bookmarkHandler()->addBookmark( new Smb4KBookmark( item->shareItem(), parent_item->hostItem()->ip() ) ); } } @@ -1656,11 +1656,11 @@ 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 *tqparent_browser_item = static_cast<Smb4KNetworkBrowserItem *>( browser_item->tqparent() ); + Smb4KNetworkBrowserItem *parent_browser_item = static_cast<Smb4KNetworkBrowserItem *>( browser_item->tqparent() ); Smb4KCore::mounter()->mountShare( browser_item->shareItem()->workgroup(), browser_item->shareItem()->host(), - tqparent_browser_item->hostItem()->ip() /* There is no better way ATM */, + parent_browser_item->hostItem()->ip() /* There is no better way ATM */, browser_item->shareItem()->name() ); } } @@ -1866,7 +1866,7 @@ Smb4KNetworkBrowserPartFactory::~Smb4KNetworkBrowserPartFactory() } -KParts::Part *Smb4KNetworkBrowserPartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, +KParts::Part *Smb4KNetworkBrowserPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, 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( tqparentWidget, widgetName, tqparent, name, Smb4KNetworkBrowserPart::KonqPlugin ); + obj = new Smb4KNetworkBrowserPart( parentWidget, widgetName, tqparent, name, Smb4KNetworkBrowserPart::KonqPlugin ); } else { - obj = new Smb4KNetworkBrowserPart( tqparentWidget, widgetName, tqparent, name, Smb4KNetworkBrowserPart::Normal ); + obj = new Smb4KNetworkBrowserPart( parentWidget, widgetName, tqparent, name, Smb4KNetworkBrowserPart::Normal ); } } } if ( !obj ) { - obj = new Smb4KNetworkBrowserPart( tqparentWidget, widgetName, tqparent, name, Smb4KNetworkBrowserPart::Normal ); + obj = new Smb4KNetworkBrowserPart( parentWidget, widgetName, tqparent, name, Smb4KNetworkBrowserPart::Normal ); } return obj ; diff --git a/smb4k/browser/smb4knetworkbrowser_part.h b/smb4k/browser/smb4knetworkbrowser_part.h index 627b0eb..c4710f9 100644 --- a/smb4k/browser/smb4knetworkbrowser_part.h +++ b/smb4k/browser/smb4knetworkbrowser_part.h @@ -67,7 +67,7 @@ class Smb4KNetworkBrowserPart : public KParts::Part /** * The constructor. * - * @param tqparentWidget The tqparent widget + * @param parentWidget The tqparent widget * * @param widgetName The name the widget should have * @@ -77,7 +77,7 @@ class Smb4KNetworkBrowserPart : public KParts::Part * * @param mode Determines in which mode the KPart should be started */ - Smb4KNetworkBrowserPart( TQWidget *tqparentWidget = 0, + Smb4KNetworkBrowserPart( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, @@ -340,7 +340,7 @@ class Smb4KNetworkBrowserPartFactory : public KParts::Factory * Reimplemented from KParts::Factory. This function is used to * create a part object. * - * @param tqparentWidget The tqparent of the part's widget. + * @param parentWidget The tqparent of the part's widget. * * @param widgetName The name of the part's widget. * @@ -355,7 +355,7 @@ class Smb4KNetworkBrowserPartFactory : public KParts::Factory * the following pairs: * konqplugin="true"|"false". */ - virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName, + virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const char *classname, const TQStringList &args = TQStringList() ); diff --git a/smb4k/core/smb4kmounter.cpp b/smb4k/core/smb4kmounter.cpp index a6f07ae..4a419fc 100644 --- a/smb4k/core/smb4kmounter.cpp +++ b/smb4k/core/smb4kmounter.cpp @@ -449,7 +449,7 @@ void Smb4KMounter::import() } } - // Aptqparently, under FreeBSD we do not need to delete + // Apparently, under FreeBSD we do not need to delete // the pointer (see manual page). #endif diff --git a/smb4k/iconview/smb4ksharesiconview_part.cpp b/smb4k/iconview/smb4ksharesiconview_part.cpp index ab46025..ddb1729 100644 --- a/smb4k/iconview/smb4ksharesiconview_part.cpp +++ b/smb4k/iconview/smb4ksharesiconview_part.cpp @@ -51,7 +51,7 @@ KInstance *Smb4KSharesIconViewPartFactory::m_instance = 0L; KAboutData *Smb4KSharesIconViewPartFactory::m_about = 0L; -Smb4KSharesIconViewPart::Smb4KSharesIconViewPart( TQWidget *tqparentWidget, const char *widgetName, +Smb4KSharesIconViewPart::Smb4KSharesIconViewPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name ) : KParts::Part( tqparent, name ) { @@ -62,7 +62,7 @@ Smb4KSharesIconViewPart::Smb4KSharesIconViewPart( TQWidget *tqparentWidget, cons setXMLFile( "smb4ksharesiconview_part.rc" ); // Set the widget of this part: - m_widget = new Smb4KSharesIconView( tqparentWidget, widgetName ); + m_widget = new Smb4KSharesIconView( parentWidget, widgetName ); setWidget( m_widget ); // Set up the actions. @@ -527,10 +527,10 @@ Smb4KSharesIconViewPartFactory::~Smb4KSharesIconViewPartFactory() } -KParts::Part *Smb4KSharesIconViewPartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, +KParts::Part *Smb4KSharesIconViewPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const char *, const TQStringList & ) { - Smb4KSharesIconViewPart *obj = new Smb4KSharesIconViewPart( tqparentWidget, widgetName, tqparent, name ); + Smb4KSharesIconViewPart *obj = new Smb4KSharesIconViewPart( parentWidget, widgetName, tqparent, 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 1df5547..aec3e1a 100644 --- a/smb4k/iconview/smb4ksharesiconview_part.h +++ b/smb4k/iconview/smb4ksharesiconview_part.h @@ -54,7 +54,7 @@ class Smb4KSharesIconViewPart : public KParts::Part /** * The constructor. * - * @param tqparentWidget The tqparent widget + * @param parentWidget The tqparent widget * * @param widgetName The name the widget should have * @@ -62,7 +62,7 @@ class Smb4KSharesIconViewPart : public KParts::Part * * @param name The name this object should have */ - Smb4KSharesIconViewPart( TQWidget *tqparentWidget = 0, const char *widgetName = 0, + Smb4KSharesIconViewPart( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0 ); /** @@ -209,7 +209,7 @@ class Smb4KSharesIconViewPartFactory : public KParts::Factory /** * Reimplemented from KParts::Factory */ - virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName, + virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const char *classname, const TQStringList &args ); diff --git a/smb4k/listview/smb4kshareslistview_part.cpp b/smb4k/listview/smb4kshareslistview_part.cpp index 60cd5e2..80c3a0d 100644 --- a/smb4k/listview/smb4kshareslistview_part.cpp +++ b/smb4k/listview/smb4kshareslistview_part.cpp @@ -54,7 +54,7 @@ KInstance *Smb4KSharesListViewPartFactory::m_instance = 0L; KAboutData *Smb4KSharesListViewPartFactory::m_about = 0L; -Smb4KSharesListViewPart::Smb4KSharesListViewPart( TQWidget *tqparentWidget, const char *widgetName, +Smb4KSharesListViewPart::Smb4KSharesListViewPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name ) : KParts::Part( tqparent, name ) { @@ -65,7 +65,7 @@ Smb4KSharesListViewPart::Smb4KSharesListViewPart( TQWidget *tqparentWidget, cons setXMLFile( "smb4kshareslistview_part.rc" ); // Set the widget of this part: - m_widget = new Smb4KSharesListView( tqparentWidget, widgetName ); + m_widget = new Smb4KSharesListView( parentWidget, widgetName ); setWidget( m_widget ); // Set up the actions. @@ -654,10 +654,10 @@ Smb4KSharesListViewPartFactory::~Smb4KSharesListViewPartFactory() } -KParts::Part *Smb4KSharesListViewPartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, +KParts::Part *Smb4KSharesListViewPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const char *, const TQStringList & ) { - Smb4KSharesListViewPart *obj = new Smb4KSharesListViewPart( tqparentWidget, widgetName, tqparent, name ); + Smb4KSharesListViewPart *obj = new Smb4KSharesListViewPart( parentWidget, widgetName, tqparent, 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 213f41e..797028d 100644 --- a/smb4k/listview/smb4kshareslistview_part.h +++ b/smb4k/listview/smb4kshareslistview_part.h @@ -54,7 +54,7 @@ class Smb4KSharesListViewPart : public KParts::Part /** * The constructor. * - * @param tqparentWidget The tqparent widget + * @param parentWidget The tqparent widget * * @param widgetName The name the widget should have * @@ -62,7 +62,7 @@ class Smb4KSharesListViewPart : public KParts::Part * * @param name The name this object should have */ - Smb4KSharesListViewPart( TQWidget *tqparentWidget = 0, const char *widgetName = 0, + Smb4KSharesListViewPart( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0 ); /** @@ -211,7 +211,7 @@ class Smb4KSharesListViewPartFactory : public KParts::Factory /** * Reimplemented from KParts::Factory */ - virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName, + virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const char *classname, const TQStringList &args ); diff --git a/smb4k/searchdlg/smb4ksearchdialog_part.cpp b/smb4k/searchdlg/smb4ksearchdialog_part.cpp index fd44ab8..fb4ec10 100644 --- a/smb4k/searchdlg/smb4ksearchdialog_part.cpp +++ b/smb4k/searchdlg/smb4ksearchdialog_part.cpp @@ -48,7 +48,7 @@ KInstance *Smb4KSearchDialogPartFactory::m_instance = 0L; KAboutData *Smb4KSearchDialogPartFactory::m_about = 0L; -Smb4KSearchDialogPart::Smb4KSearchDialogPart( TQWidget *tqparentWidget, const char *widgetName, +Smb4KSearchDialogPart::Smb4KSearchDialogPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name ) : KParts::Part( tqparent, name ) { @@ -59,7 +59,7 @@ Smb4KSearchDialogPart::Smb4KSearchDialogPart( TQWidget *tqparentWidget, const ch // setXMLFile( "smb4ksearchdialog_part.rc" ); // Set the widget of this part: - m_widget = new Smb4KSearchDialog( tqparentWidget, widgetName ); + m_widget = new Smb4KSearchDialog( parentWidget, widgetName ); setWidget( m_widget ); m_serial_number = 0; @@ -232,10 +232,10 @@ Smb4KSearchDialogPartFactory::~Smb4KSearchDialogPartFactory() } -KParts::Part *Smb4KSearchDialogPartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, +KParts::Part *Smb4KSearchDialogPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const char *, const TQStringList & ) { - Smb4KSearchDialogPart *obj = new Smb4KSearchDialogPart( tqparentWidget, widgetName, tqparent, name ); + Smb4KSearchDialogPart *obj = new Smb4KSearchDialogPart( parentWidget, widgetName, tqparent, 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 38e97b9..633b217 100644 --- a/smb4k/searchdlg/smb4ksearchdialog_part.h +++ b/smb4k/searchdlg/smb4ksearchdialog_part.h @@ -58,7 +58,7 @@ class Smb4KSearchDialogPart : public KParts::Part /** * The constructor. * - * @param tqparentWidget The tqparent widget + * @param parentWidget The tqparent widget * * @param widgetName The name the widget should have * @@ -66,7 +66,7 @@ class Smb4KSearchDialogPart : public KParts::Part * * @param name The name this object should have */ - Smb4KSearchDialogPart( TQWidget *tqparentWidget = 0, const char *widgetName = 0, + Smb4KSearchDialogPart( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0 ); /** @@ -149,7 +149,7 @@ class Smb4KSearchDialogPartFactory : public KParts::Factory /** * Reimplemented from KParts::Factory */ - virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName, + virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const char *classname, const TQStringList &args ); diff --git a/smb4k/searchdlg/smb4ksearchdialogitem.h b/smb4k/searchdlg/smb4ksearchdialogitem.h index 9b070b9..0469b7f 100644 --- a/smb4k/searchdlg/smb4ksearchdialogitem.h +++ b/smb4k/searchdlg/smb4ksearchdialogitem.h @@ -76,7 +76,7 @@ class Smb4KSearchDialogItem : public KListViewItem * here. * * Make sure you copy the contents to a new item, because the pointer - * will be tqinvalidated if this Smb4KSearchDialogItem is deleted. + * will be invalidated if this Smb4KSearchDialogItem is deleted. * * @returns the encapsulated Smb4KHostItem object. */ diff --git a/smb4k/smb4k.cpp b/smb4k/smb4k.cpp index 549bcef..8021c8b 100644 --- a/smb4k/smb4k.cpp +++ b/smb4k/smb4k.cpp @@ -101,15 +101,15 @@ Smb4KApp::Smb4KApp( TQWidget *tqparent, const char *name ) // because the first labels will be saved and then loaded again // and again. KDockWidget *dock = NULL; - KDockTabGroup *tqparent_group = NULL; + KDockTabGroup *parent_group = NULL; if ( (dock = manager()->getDockWidgetFromName( "NetworkBrowser" )) != NULL ) { dock->setTabPageLabel( i18n( "Network Browser" ) ); - if ( (tqparent_group = dock->parentDockTabGroup()) != NULL ) + if ( (parent_group = dock->parentDockTabGroup()) != NULL ) { - tqparent_group->changeTab( dock, i18n( "Network Browser" ) ); + parent_group->changeTab( dock, i18n( "Network Browser" ) ); } } @@ -117,9 +117,9 @@ Smb4KApp::Smb4KApp( TQWidget *tqparent, const char *name ) { dock->setTabPageLabel( i18n( "Search Dialog" ) ); - if ( (tqparent_group = dock->parentDockTabGroup()) != NULL ) + if ( (parent_group = dock->parentDockTabGroup()) != NULL ) { - tqparent_group->changeTab( dock, i18n( "Search Dialog" ) ); + parent_group->changeTab( dock, i18n( "Search Dialog" ) ); } } diff --git a/smb4k/smb4ksystemtray.cpp b/smb4k/smb4ksystemtray.cpp index 2b21b85..4b25391 100644 --- a/smb4k/smb4ksystemtray.cpp +++ b/smb4k/smb4ksystemtray.cpp @@ -141,9 +141,9 @@ void Smb4KSystemTray::slotMountManually() { Smb4KMountDialog *dlg = NULL; - if ( tqparentWidget() ) + if ( parentWidget() ) { - dlg = static_cast<Smb4KMountDialog *>( TQT_TQWIDGET(tqparentWidget()->child( "MountDialog", "Smb4KMountDialog", true )) ); + dlg = static_cast<Smb4KMountDialog *>( TQT_TQWIDGET(parentWidget()->child( "MountDialog", "Smb4KMountDialog", true )) ); } else { @@ -152,9 +152,9 @@ void Smb4KSystemTray::slotMountManually() if ( !dlg ) { - if ( tqparentWidget() && tqparentWidget()->isShown() ) + if ( parentWidget() && parentWidget()->isShown() ) { - dlg = new Smb4KMountDialog( tqparentWidget(), "MountDialog" ); + dlg = new Smb4KMountDialog( parentWidget(), "MountDialog" ); } else { @@ -192,9 +192,9 @@ void Smb4KSystemTray::slotConfigDialog() if ( config_factory ) { - if ( tqparentWidget() && tqparentWidget()->isShown() ) + if ( parentWidget() && parentWidget()->isShown() ) { - dlg = static_cast<KConfigDialog *>( TQT_TQWIDGET(config_factory->create( TQT_TQOBJECT(tqparentWidget()), "ConfigDialog", "KConfigDialog" )) ); + dlg = static_cast<KConfigDialog *>( TQT_TQWIDGET(config_factory->create( TQT_TQOBJECT(parentWidget()), "ConfigDialog", "KConfigDialog" )) ); } else { @@ -337,9 +337,9 @@ void Smb4KSystemTray::slotBookmarkEditor() { Smb4KBookmarkEditor *dlg = NULL; - if ( tqparentWidget() ) + if ( parentWidget() ) { - dlg = static_cast<Smb4KBookmarkEditor *>( TQT_TQWIDGET(tqparentWidget()->child( "BookmarkEditor", "Smb4KBookmarkEditor", true )) ); + dlg = static_cast<Smb4KBookmarkEditor *>( TQT_TQWIDGET(parentWidget()->child( "BookmarkEditor", "Smb4KBookmarkEditor", true )) ); } else { @@ -348,9 +348,9 @@ void Smb4KSystemTray::slotBookmarkEditor() if ( !dlg ) { - if ( tqparentWidget() && tqparentWidget()->isShown() ) + if ( parentWidget() && parentWidget()->isShown() ) { - dlg = new Smb4KBookmarkEditor( tqparentWidget(), "BookmarkEditor" ); + dlg = new Smb4KBookmarkEditor( parentWidget(), "BookmarkEditor" ); } else { @@ -1013,9 +1013,9 @@ void Smb4KSystemTray::slotSynchronize() { Smb4KSynchronizationDialog *dlg = NULL; - if ( tqparentWidget() && tqparentWidget()->isShown() ) + if ( parentWidget() && parentWidget()->isShown() ) { - dlg = new Smb4KSynchronizationDialog( share, tqparentWidget(), "SynchronizationDialog" ); + dlg = new Smb4KSynchronizationDialog( share, parentWidget(), "SynchronizationDialog" ); } else { |