From 90363652674deb94cd07057428b24fcb1735dbce Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- konq-plugins/adblock/adblock.cpp | 6 +- konq-plugins/adblock/adblock.h | 2 +- konq-plugins/adblock/adblockdialogue.cpp | 4 +- konq-plugins/adblock/adblockdialogue.h | 2 +- konq-plugins/akregator/akregatorplugin.cpp | 4 +- konq-plugins/akregator/konqfeedicon.cpp | 6 +- konq-plugins/akregator/konqfeedicon.h | 2 +- konq-plugins/autorefresh/autorefresh.cpp | 8 +-- konq-plugins/autorefresh/autorefresh.h | 2 +- konq-plugins/babelfish/plugin_babelfish.cpp | 18 +++--- konq-plugins/babelfish/plugin_babelfish.h | 2 +- konq-plugins/crashes/crashesplugin.cpp | 6 +- konq-plugins/crashes/crashesplugin.h | 2 +- konq-plugins/dirfilter/dirfilterplugin.cpp | 6 +- konq-plugins/dirfilter/dirfilterplugin.h | 2 +- konq-plugins/domtreeviewer/domlistviewitem.cpp | 16 ++--- konq-plugins/domtreeviewer/domlistviewitem.h | 8 +-- konq-plugins/domtreeviewer/domtreecommands.cpp | 16 ++--- konq-plugins/domtreeviewer/domtreecommands.h | 16 ++--- konq-plugins/domtreeviewer/domtreeview.cpp | 48 +++++++-------- konq-plugins/domtreeviewer/domtreeview.h | 2 +- .../domtreeviewer/plugin_domtreeviewer.cpp | 6 +- konq-plugins/domtreeviewer/plugin_domtreeviewer.h | 2 +- konq-plugins/domtreeviewer/signalreceiver.cpp | 4 +- konq-plugins/domtreeviewer/signalreceiver.h | 2 +- konq-plugins/fsview/fsview.cpp | 4 +- konq-plugins/fsview/fsview.h | 2 +- konq-plugins/fsview/fsview_part.cpp | 8 +-- konq-plugins/fsview/fsview_part.h | 2 +- konq-plugins/fsview/inode.cpp | 16 ++--- konq-plugins/fsview/scan.cpp | 4 +- konq-plugins/fsview/scan.h | 4 +- konq-plugins/fsview/treemap.cpp | 70 +++++++++++----------- konq-plugins/fsview/treemap.h | 24 ++++---- .../khtmlsettingsplugin/settingsplugin.cpp | 28 ++++----- konq-plugins/khtmlsettingsplugin/settingsplugin.h | 2 +- konq-plugins/kimgalleryplugin/imgallerydialog.cpp | 4 +- konq-plugins/kimgalleryplugin/imgallerydialog.h | 2 +- konq-plugins/kimgalleryplugin/imgalleryplugin.cpp | 14 ++--- konq-plugins/kimgalleryplugin/imgalleryplugin.h | 2 +- konq-plugins/kuick/kcmkuick/kcmkuick.cpp | 4 +- konq-plugins/kuick/kcmkuick/kcmkuick.h | 2 +- konq-plugins/kuick/kdirmenu.cpp | 4 +- konq-plugins/kuick/kdirmenu.h | 2 +- konq-plugins/kuick/kimcontactmenu.cpp | 4 +- konq-plugins/kuick/kimcontactmenu.h | 2 +- konq-plugins/kuick/kmetamenu.cpp | 14 ++--- konq-plugins/kuick/kmetamenu.h | 2 +- konq-plugins/microformat/konqmficon.cpp | 6 +- konq-plugins/microformat/konqmficon.h | 2 +- konq-plugins/minitools/minitoolsplugin.cpp | 6 +- konq-plugins/minitools/minitoolsplugin.h | 2 +- konq-plugins/rellinks/plugin_rellinks.cpp | 14 ++--- konq-plugins/rellinks/plugin_rellinks.h | 2 +- konq-plugins/rsync/rsyncconfigdialog.cpp | 4 +- konq-plugins/rsync/rsyncconfigdialog.h | 2 +- konq-plugins/rsync/rsyncplugin.cpp | 6 +- konq-plugins/rsync/rsyncplugin.h | 2 +- konq-plugins/searchbar/searchbar.cpp | 10 ++-- konq-plugins/searchbar/searchbar.h | 4 +- .../sidebar/delicious/bookmarkListItem.cpp | 4 +- konq-plugins/sidebar/delicious/bookmarkListItem.h | 2 +- konq-plugins/sidebar/delicious/mainWidget.cpp | 4 +- konq-plugins/sidebar/delicious/mainWidget.h | 2 +- konq-plugins/sidebar/delicious/plugin.cpp | 4 +- konq-plugins/sidebar/delicious/plugin.h | 2 +- konq-plugins/sidebar/delicious/tagListItem.cpp | 4 +- konq-plugins/sidebar/delicious/tagListItem.h | 2 +- konq-plugins/sidebar/mediaplayer/controls.cpp | 16 ++--- konq-plugins/sidebar/mediaplayer/controls.h | 8 +-- konq-plugins/sidebar/mediaplayer/engine.cpp | 4 +- konq-plugins/sidebar/mediaplayer/engine.h | 2 +- konq-plugins/sidebar/mediaplayer/mediaplayer.cpp | 4 +- konq-plugins/sidebar/mediaplayer/mediaplayer.h | 2 +- konq-plugins/sidebar/mediaplayer/mediawidget.cpp | 2 +- konq-plugins/sidebar/mediaplayer/mediawidget.h | 2 +- konq-plugins/sidebar/mediaplayer/player.cpp | 4 +- konq-plugins/sidebar/mediaplayer/player.h | 2 +- konq-plugins/sidebar/metabar/src/configdialog.cpp | 4 +- konq-plugins/sidebar/metabar/src/configdialog.h | 2 +- konq-plugins/sidebar/metabar/src/metabar.cpp | 4 +- konq-plugins/sidebar/metabar/src/metabar.h | 2 +- .../sidebar/metabar/src/metabarfunctions.cpp | 10 ++-- .../sidebar/metabar/src/metabarfunctions.h | 2 +- konq-plugins/sidebar/metabar/src/metabarwidget.cpp | 10 ++-- konq-plugins/sidebar/metabar/src/metabarwidget.h | 2 +- konq-plugins/sidebar/metabar/src/serviceloader.cpp | 2 +- konq-plugins/sidebar/metabar/src/serviceloader.h | 2 +- konq-plugins/sidebar/newsticker/configfeeds.cpp | 2 +- konq-plugins/sidebar/newsticker/configfeeds.h | 2 +- konq-plugins/sidebar/newsticker/norsswidget.cpp | 4 +- konq-plugins/sidebar/newsticker/norsswidget.h | 2 +- konq-plugins/sidebar/newsticker/nspanel.cpp | 8 +-- konq-plugins/sidebar/newsticker/nspanel.h | 4 +- .../sidebar/newsticker/nsstacktabwidget.cpp | 4 +- konq-plugins/sidebar/newsticker/nsstacktabwidget.h | 2 +- konq-plugins/sidebar/newsticker/sidebar_news.cpp | 4 +- konq-plugins/sidebar/newsticker/sidebar_news.h | 2 +- konq-plugins/uachanger/uachangerplugin.cpp | 8 +-- konq-plugins/uachanger/uachangerplugin.h | 2 +- konq-plugins/validators/plugin_validators.cpp | 14 ++--- konq-plugins/validators/plugin_validators.h | 2 +- konq-plugins/validators/validatorsdialog.cpp | 4 +- konq-plugins/validators/validatorsdialog.h | 2 +- konq-plugins/webarchiver/archivedialog.cpp | 4 +- konq-plugins/webarchiver/archivedialog.h | 2 +- konq-plugins/webarchiver/plugin_webarchiver.cpp | 8 +-- konq-plugins/webarchiver/plugin_webarchiver.h | 2 +- 108 files changed, 332 insertions(+), 332 deletions(-) (limited to 'konq-plugins') diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp index 74d07cd..57cf2cc 100644 --- a/konq-plugins/adblock/adblock.cpp +++ b/konq-plugins/adblock/adblock.cpp @@ -56,11 +56,11 @@ using namespace DOM; typedef KGenericFactory AdBlockFactory; K_EXPORT_COMPONENT_FACTORY( libadblock, AdBlockFactory( "adblock" ) ) -AdBlock::AdBlock(TQObject *tqparent, const char *name, const TQStringList &) : - KParts::Plugin(tqparent, name), +AdBlock::AdBlock(TQObject *parent, const char *name, const TQStringList &) : + KParts::Plugin(parent, name), m_label(0), m_menu(0) { - m_part = dynamic_cast(tqparent); + m_part = dynamic_cast(parent); if(!m_part) { kdDebug() << "couldn't get KHTMLPart" << endl; return; } m_menu = new KPopupMenu(m_part->widget()); diff --git a/konq-plugins/adblock/adblock.h b/konq-plugins/adblock/adblock.h index 87c1e5d..a0b4775 100644 --- a/konq-plugins/adblock/adblock.h +++ b/konq-plugins/adblock/adblock.h @@ -49,7 +49,7 @@ class AdBlock : public KParts::Plugin TQ_OBJECT public: - AdBlock(TQObject *tqparent, const char *name, const TQStringList &); + AdBlock(TQObject *parent, const char *name, const TQStringList &); ~AdBlock(); private: diff --git a/konq-plugins/adblock/adblockdialogue.cpp b/konq-plugins/adblock/adblockdialogue.cpp index d4e0140..1aff0f6 100644 --- a/konq-plugins/adblock/adblockdialogue.cpp +++ b/konq-plugins/adblock/adblockdialogue.cpp @@ -32,8 +32,8 @@ #include #include -AdBlockDlg::AdBlockDlg(TQWidget *tqparent, AdElementList &elements) : - KDialogBase( tqparent, "Adblock dialogue", true, "Adblock - able Items", Ok|Cancel, Ok, true ) +AdBlockDlg::AdBlockDlg(TQWidget *parent, AdElementList &elements) : + KDialogBase( parent, "Adblock dialogue", true, "Adblock - able Items", Ok|Cancel, Ok, true ) { TQVBox *page = makeVBoxMainWidget(); m_label1 = new TQLabel( i18n("All blockable items in this page:"), page, "label1" ); diff --git a/konq-plugins/adblock/adblockdialogue.h b/konq-plugins/adblock/adblockdialogue.h index b0e397f..f62c2ee 100644 --- a/konq-plugins/adblock/adblockdialogue.h +++ b/konq-plugins/adblock/adblockdialogue.h @@ -40,7 +40,7 @@ private: KPopupMenu *m_menu; public: - AdBlockDlg(TQWidget *tqparent, AdElementList &elements); + AdBlockDlg(TQWidget *parent, AdElementList &elements); ~AdBlockDlg(); private slots: diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp index 684bc20..32891a2 100644 --- a/konq-plugins/akregator/akregatorplugin.cpp +++ b/konq-plugins/akregator/akregatorplugin.cpp @@ -65,8 +65,8 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const KHTMLView* view = 0L; - if (popupmenu && popupmenu->tqparent() && popupmenu->tqparent()->inherits("KHTMLView")) - view = static_cast(TQT_TQWIDGET(popupmenu->tqparent())); + if (popupmenu && popupmenu->parent() && popupmenu->parent()->inherits("KHTMLView")) + view = static_cast(TQT_TQWIDGET(popupmenu->parent())); if (view) m_part = view->part(); diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp index f8cedbd..57bddf3 100644 --- a/konq-plugins/akregator/konqfeedicon.cpp +++ b/konq-plugins/akregator/konqfeedicon.cpp @@ -55,12 +55,12 @@ typedef KGenericFactory KonqFeedIconFactory; K_EXPORT_COMPONENT_FACTORY(libakregatorkonqfeedicon, KonqFeedIconFactory("akregatorkonqfeedicon")) -KonqFeedIcon::KonqFeedIcon(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name), PluginBase(), m_part(0), m_feedIcon(0), m_statusBarEx(0), m_menu(0) +KonqFeedIcon::KonqFeedIcon(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name), PluginBase(), m_part(0), m_feedIcon(0), m_statusBarEx(0), m_menu(0) { KGlobal::locale()->insertCatalogue("akregator_konqplugin"); - m_part = dynamic_cast(tqparent); + m_part = dynamic_cast(parent); if(!m_part) { kdDebug() << "couldn't get part" << endl; return; } // FIXME: need to do this because of a bug in khtmlpart, it's fixed now for 3.4 (and prolly backported for 3.3.3?) //connect(m_part->view(), TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(addFeedIcon())); diff --git a/konq-plugins/akregator/konqfeedicon.h b/konq-plugins/akregator/konqfeedicon.h index 1dcadcd..8699442 100644 --- a/konq-plugins/akregator/konqfeedicon.h +++ b/konq-plugins/akregator/konqfeedicon.h @@ -48,7 +48,7 @@ class KonqFeedIcon : public KParts::Plugin, PluginBase Q_OBJECT TQ_OBJECT public: - KonqFeedIcon(TQObject *tqparent, const char *name, const TQStringList &); + KonqFeedIcon(TQObject *parent, const char *name, const TQStringList &); ~KonqFeedIcon(); diff --git a/konq-plugins/autorefresh/autorefresh.cpp b/konq-plugins/autorefresh/autorefresh.cpp index bcb40f2..64be883 100644 --- a/konq-plugins/autorefresh/autorefresh.cpp +++ b/konq-plugins/autorefresh/autorefresh.cpp @@ -16,8 +16,8 @@ #include #include -AutoRefresh::AutoRefresh( TQObject* tqparent, const char* name, const TQStringList & /*args*/ ) - : Plugin( tqparent, name ) +AutoRefresh::AutoRefresh( TQObject* parent, const char* name, const TQStringList & /*args*/ ) + : Plugin( parent, name ) { timer = new TQTimer( this ); connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRefresh() ) ); @@ -85,7 +85,7 @@ void AutoRefresh::slotIntervalChanged() void AutoRefresh::slotRefresh() { - if ( !tqparent()->inherits("KParts::ReadOnlyPart") ) { + if ( !parent()->inherits("KParts::ReadOnlyPart") ) { TQString title = i18n( "Cannot Refresh Source" ); TQString text = i18n( "This plugin cannot auto-refresh the current part." ); @@ -93,7 +93,7 @@ void AutoRefresh::slotRefresh() } else { - KParts::ReadOnlyPart *part = (KParts::ReadOnlyPart *) tqparent(); + KParts::ReadOnlyPart *part = (KParts::ReadOnlyPart *) parent(); // Get URL KURL url = part->url(); diff --git a/konq-plugins/autorefresh/autorefresh.h b/konq-plugins/autorefresh/autorefresh.h index 04bdbdc..c84295d 100644 --- a/konq-plugins/autorefresh/autorefresh.h +++ b/konq-plugins/autorefresh/autorefresh.h @@ -37,7 +37,7 @@ public: /** * Construct a new KParts plugin. */ - AutoRefresh( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); + AutoRefresh( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); /** * Destructor. diff --git a/konq-plugins/babelfish/plugin_babelfish.cpp b/konq-plugins/babelfish/plugin_babelfish.cpp index bf2e7da..4d1a61b 100644 --- a/konq-plugins/babelfish/plugin_babelfish.cpp +++ b/konq-plugins/babelfish/plugin_babelfish.cpp @@ -34,9 +34,9 @@ typedef KGenericFactory BabelFishFactory; static const KAboutData aboutdata("babelfish", I18N_NOOP("Translate Web Page") , "1.0" ); K_EXPORT_COMPONENT_FACTORY( libbabelfishplugin, BabelFishFactory( &aboutdata ) ) -PluginBabelFish::PluginBabelFish( TQObject* tqparent, const char* name, +PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name, const TQStringList & ) - : Plugin( tqparent, name ) + : Plugin( parent, name ) { setInstance(BabelFishFactory::instance()); @@ -178,9 +178,9 @@ PluginBabelFish::PluginBabelFish( TQObject* tqparent, const char* name, m_menu->setEnabled( true ); // TODO: we could also support plain text viewers... - if ( tqparent && tqparent->inherits( "KHTMLPart" ) ) + if ( parent && parent->inherits( "KHTMLPart" ) ) { - KParts::ReadOnlyPart* part = static_cast(tqparent); + KParts::ReadOnlyPart* part = static_cast(parent); connect( part, TQT_SIGNAL(started(KIO::Job*)), this, TQT_SLOT(slotStarted(KIO::Job*)) ); } @@ -193,9 +193,9 @@ PluginBabelFish::~PluginBabelFish() void PluginBabelFish::slotStarted( KIO::Job* ) { - if ( tqparent()->inherits("KHTMLPart") && + if ( parent()->inherits("KHTMLPart") && // Babelfish wants http URLs only. No https. - static_cast(tqparent())->url().protocol().lower() == "http" ) + static_cast(parent())->url().protocol().lower() == "http" ) { m_menu->setEnabled( true ); } @@ -211,8 +211,8 @@ void PluginBabelFish::translateURL() if ( !sender() ) return; - // The tqparent is assumed to be a KHTMLPart - if ( !tqparent()->inherits("KHTMLPart") ) + // The parent is assumed to be a KHTMLPart + if ( !parent()->inherits("KHTMLPart") ) { TQString title = i18n( "Cannot Translate Source" ); TQString text = i18n( "Only web pages can be translated using " @@ -227,7 +227,7 @@ void PluginBabelFish::translateURL() TQString engine = cfg.readEntry( TQT_TQOBJECT(const_cast(sender()))->name(), "babelfish" ); // Get URL - KHTMLPart *part = dynamic_cast(tqparent()); + KHTMLPart *part = dynamic_cast(parent()); if ( !part ) return; diff --git a/konq-plugins/babelfish/plugin_babelfish.h b/konq-plugins/babelfish/plugin_babelfish.h index 98efe04..af7bb01 100644 --- a/konq-plugins/babelfish/plugin_babelfish.h +++ b/konq-plugins/babelfish/plugin_babelfish.h @@ -30,7 +30,7 @@ class PluginBabelFish : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - PluginBabelFish( TQObject* tqparent, const char* name, + PluginBabelFish( TQObject* parent, const char* name, const TQStringList & ); virtual ~PluginBabelFish(); diff --git a/konq-plugins/crashes/crashesplugin.cpp b/konq-plugins/crashes/crashesplugin.cpp index 5e04b1a..57a4caa 100644 --- a/konq-plugins/crashes/crashesplugin.cpp +++ b/konq-plugins/crashes/crashesplugin.cpp @@ -37,10 +37,10 @@ typedef KGenericFactory CrashesPluginFactory; K_EXPORT_COMPONENT_FACTORY( libcrashesplugin, CrashesPluginFactory( "crashesplugin" ) ) -CrashesPlugin::CrashesPlugin( TQObject* tqparent, const char* name, const TQStringList & ) -: KParts::Plugin( tqparent, name ) +CrashesPlugin::CrashesPlugin( TQObject* parent, const char* name, const TQStringList & ) +: KParts::Plugin( parent, name ) { - m_part = (tqparent && tqparent->inherits( "KHTMLPart" )) ? static_cast(tqparent) : 0L; + m_part = (parent && parent->inherits( "KHTMLPart" )) ? static_cast(parent) : 0L; m_pCrashesMenu = new KActionMenu( i18n("&Crashes"), "core", actionCollection(), "crashes" ); diff --git a/konq-plugins/crashes/crashesplugin.h b/konq-plugins/crashes/crashesplugin.h index 0af567e..fa68b97 100644 --- a/konq-plugins/crashes/crashesplugin.h +++ b/konq-plugins/crashes/crashesplugin.h @@ -38,7 +38,7 @@ class CrashesPlugin : public KParts::Plugin TQ_OBJECT public: - CrashesPlugin( TQObject* tqparent, const char* name, + CrashesPlugin( TQObject* parent, const char* name, const TQStringList & ); ~CrashesPlugin(); diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp b/konq-plugins/dirfilter/dirfilterplugin.cpp index eb06bbc..09a3bfb 100644 --- a/konq-plugins/dirfilter/dirfilterplugin.cpp +++ b/konq-plugins/dirfilter/dirfilterplugin.cpp @@ -141,14 +141,14 @@ void SessionManager::loadSettings() -DirFilterPlugin::DirFilterPlugin (TQObject* tqparent, const char* name, +DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name, const TQStringList&) - :KParts::Plugin (tqparent, name), + :KParts::Plugin (parent, name), m_pFilterMenu(0), m_searchWidget(0), m_oldFilterString("") { - m_part = ::tqqt_cast(tqparent); + m_part = ::tqqt_cast(parent); if ( !m_part || !m_part->scrollWidget() ) return; diff --git a/konq-plugins/dirfilter/dirfilterplugin.h b/konq-plugins/dirfilter/dirfilterplugin.h index d6e87e6..4e5f32c 100644 --- a/konq-plugins/dirfilter/dirfilterplugin.h +++ b/konq-plugins/dirfilter/dirfilterplugin.h @@ -85,7 +85,7 @@ class DirFilterPlugin : public KParts::Plugin public: - DirFilterPlugin (TQObject* tqparent, const char* name, const TQStringList &); + DirFilterPlugin (TQObject* parent, const char* name, const TQStringList &); ~DirFilterPlugin (); protected: diff --git a/konq-plugins/domtreeviewer/domlistviewitem.cpp b/konq-plugins/domtreeviewer/domlistviewitem.cpp index 4203765..8951451 100644 --- a/konq-plugins/domtreeviewer/domlistviewitem.cpp +++ b/konq-plugins/domtreeviewer/domlistviewitem.cpp @@ -23,26 +23,26 @@ #include -DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *tqparent ) - : TQListViewItem( tqparent ), m_node(node) +DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *parent ) + : TQListViewItem( parent ), m_node(node) { init(); } -DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *tqparent, TQListViewItem *after) - : TQListViewItem( tqparent, after ), m_node(node) +DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *parent, TQListViewItem *after) + : TQListViewItem( parent, after ), m_node(node) { init(); } -DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *tqparent ) - : TQListViewItem( tqparent ), m_node(node) +DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *parent ) + : TQListViewItem( parent ), m_node(node) { init(); } -DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *tqparent, TQListViewItem *after) - : TQListViewItem( tqparent, after ), m_node(node) +DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *parent, TQListViewItem *after) + : TQListViewItem( parent, after ), m_node(node) { init(); } diff --git a/konq-plugins/domtreeviewer/domlistviewitem.h b/konq-plugins/domtreeviewer/domlistviewitem.h index 14cf5ec..3ba7378 100644 --- a/konq-plugins/domtreeviewer/domlistviewitem.h +++ b/konq-plugins/domtreeviewer/domlistviewitem.h @@ -26,10 +26,10 @@ class DOMListViewItem : public TQListViewItem { public: - DOMListViewItem( const DOM::Node &, TQListView *tqparent ); - DOMListViewItem( const DOM::Node &, TQListView *tqparent, TQListViewItem *after ); - DOMListViewItem( const DOM::Node &, TQListViewItem *tqparent ); - DOMListViewItem( const DOM::Node &, TQListViewItem *tqparent, TQListViewItem *after ); + DOMListViewItem( const DOM::Node &, TQListView *parent ); + DOMListViewItem( const DOM::Node &, TQListView *parent, TQListViewItem *after ); + DOMListViewItem( const DOM::Node &, TQListViewItem *parent ); + DOMListViewItem( const DOM::Node &, TQListViewItem *parent, TQListViewItem *after ); virtual ~DOMListViewItem(); virtual void paintCell( TQPainter *p, const TQColorGroup &cg, diff --git a/konq-plugins/domtreeviewer/domtreecommands.cpp b/konq-plugins/domtreeviewer/domtreecommands.cpp index 7eef49d..a072409 100644 --- a/konq-plugins/domtreeviewer/domtreecommands.cpp +++ b/konq-plugins/domtreeviewer/domtreecommands.cpp @@ -423,8 +423,8 @@ TQString ChangeCDataCommand::name() const // == ManipulateNodeCommand =========================================== -ManipulateNodeCommand::ManipulateNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after) -: _node(node), _parent(tqparent), _after(after) +ManipulateNodeCommand::ManipulateNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after) +: _node(node), _parent(parent), _after(after) { } @@ -457,8 +457,8 @@ void ManipulateNodeCommand::remove() // == InsertNodeCommand =========================================== -InsertNodeCommand::InsertNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after) -: ManipulateNodeCommand(node, tqparent, after) +InsertNodeCommand::InsertNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after) +: ManipulateNodeCommand(node, parent, after) { } @@ -485,8 +485,8 @@ TQString InsertNodeCommand::name() const // == RemoveNodeCommand =========================================== -RemoveNodeCommand::RemoveNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after) -: ManipulateNodeCommand(node, tqparent, after) +RemoveNodeCommand::RemoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after) +: ManipulateNodeCommand(node, parent, after) { } @@ -513,8 +513,8 @@ TQString RemoveNodeCommand::name() const // == MoveNodeCommand =========================================== -MoveNodeCommand::MoveNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after) -: _node(node), new_parent(tqparent), new_after(after) +MoveNodeCommand::MoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after) +: _node(node), new_parent(parent), new_after(after) { old_parent = node.parentNode(); old_after = node.nextSibling(); diff --git a/konq-plugins/domtreeviewer/domtreecommands.h b/konq-plugins/domtreeviewer/domtreecommands.h index 43af96b..6361fd7 100644 --- a/konq-plugins/domtreeviewer/domtreecommands.h +++ b/konq-plugins/domtreeviewer/domtreecommands.h @@ -277,10 +277,10 @@ class ManipulateNodeCommand : public ManipulationCommand { public: /** - * Prepare command, where \c node is to be contained in \c tqparent, just + * Prepare command, where \c node is to be contained in \c parent, just * before \c after. If \c after is 0, it is appended at the end. */ - ManipulateNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after); + ManipulateNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after); virtual ~ManipulateNodeCommand(); protected: @@ -304,10 +304,10 @@ class InsertNodeCommand : public ManipulateNodeCommand { public: /** - * Prepare insertion command, inserting \c node into \c tqparent, just + * Prepare insertion command, inserting \c node into \c parent, just * before \c after. If \c after is 0, append it to the list of tqchildren. */ - InsertNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after); + InsertNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after); virtual ~InsertNodeCommand(); virtual TQString name() const; @@ -330,10 +330,10 @@ class RemoveNodeCommand : public ManipulateNodeCommand { public: /** - * Prepare insertion command, inserting \c node into \c tqparent, just + * Prepare insertion command, inserting \c node into \c parent, just * before \c after. If \c after is 0, append it to the list of tqchildren. */ - RemoveNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after); + RemoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after); virtual ~RemoveNodeCommand(); virtual TQString name() const; @@ -353,10 +353,10 @@ class MoveNodeCommand : public ManipulationCommand { public: /** - * Move \c node from current position into \c tqparent, just before \c after. + * Move \c node from current position into \c parent, just before \c after. * Appends if \c after is 0. */ - MoveNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after); + MoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after); virtual ~MoveNodeCommand(); virtual TQString name() const; diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp index 84f78ac..615f056 100644 --- a/konq-plugins/domtreeviewer/domtreeview.cpp +++ b/konq-plugins/domtreeviewer/domtreeview.cpp @@ -64,8 +64,8 @@ using namespace domtreeviewer; -DOMTreeView::DOMTreeView(TQWidget *tqparent, const char* name, bool /*allowSaving*/) - : DOMTreeViewBase(tqparent, name), m_expansionDepth(5), m_maxDepth(0), +DOMTreeView::DOMTreeView(TQWidget *parent, const char* name, bool /*allowSaving*/) + : DOMTreeViewBase(parent, name), m_expansionDepth(5), m_maxDepth(0), m_bPure(true), m_bShowAttributes(true), m_bHighlightHTML(true), m_findDialog(0), focused_child(0) { @@ -318,13 +318,13 @@ void DOMTreeView::addElement ( const DOM::Node &node, DOMListViewItem *cur_item m_itemdict.insert(node.handle(), cur_item); } - DOMListViewItem *tqparent; - if (cur_item->tqparent()) { - tqparent = static_cast(cur_item->tqparent()); + DOMListViewItem *parent; + if (cur_item->parent()) { + parent = static_cast(cur_item->parent()); } else { - tqparent = cur_item; + parent = cur_item; } - cur_item = new DOMListViewItem(node, tqparent, cur_item); + cur_item = new DOMListViewItem(node, parent, cur_item); } // This is one is too much DOMListViewItem *notLastItem = static_cast(cur_item->itemAbove()); @@ -469,13 +469,13 @@ void DOMTreeView::slotMovedItems(TQPtrList &items, TQPtrList(*it); DOMListViewItem *anitem = static_cast(*anit); - DOM::Node tqparent = static_cast(item->tqparent())->node(); - Q_ASSERT(!tqparent.isNull()); + DOM::Node parent = static_cast(item->parent())->node(); + Q_ASSERT(!parent.isNull()); // kdDebug(90180) << " afternow " << anitem << " node " << (anitem ? anitem->node().nodeName().string() : TQString()) << "=" << (anitem ? anitem->node().nodeValue().string() : TQString()) << endl; - cmd->addCommand(new MoveNodeCommand(item->node(), tqparent, - anitem ? anitem->node().nextSibling() : tqparent.firstChild()) + cmd->addCommand(new MoveNodeCommand(item->node(), parent, + anitem ? anitem->node().nextSibling() : parent.firstChild()) ); } @@ -720,8 +720,8 @@ void DOMTreeView::hideMessageLine() void DOMTreeView::moveToParent() { // This is a hypersmart algorithm. - // If infoNode is defined, go to the tqparent of infoNode, otherwise, go - // to the tqparent of the tree view's current item. + // If infoNode is defined, go to the parent of infoNode, otherwise, go + // to the parent of the tree view's current item. // Hope this isn't too smart. DOM::Node cur = infoNode; @@ -773,15 +773,15 @@ void DOMTreeView::deleteNodes() // don't regard node more than once if (item->node() == last) continue; - // check for selected tqparent + // check for selected parent bool has_selected_parent = false; - for (TQListViewItem *p = item->tqparent(); p; p = p->tqparent()) { + for (TQListViewItem *p = item->parent(); p; p = p->parent()) { if (p->isSelected()) { has_selected_parent = true; break; } } if (has_selected_parent) continue; // kdDebug(90180) << " item->node " << item->node().nodeName().string() << ": schedule for removal" << endl; - // remove this node if it isn't already recursively removed by its tqparent + // remove this node if it isn't already recursively removed by its parent cmd->addCommand(new RemoveNodeCommand(item->node(), item->node().parentNode(), item->node().nextSibling())); last = item->node(); } @@ -885,13 +885,13 @@ void DOMTreeView::slotAddElementDlg() DOM::Node curNode = item->node(); try { - DOM::Node tqparent = addBefore() ? curNode.parentNode() : curNode; + DOM::Node parent = addBefore() ? curNode.parentNode() : curNode; DOM::Node after = addBefore() ? curNode : 0; // ### take namespace into account DOM::Node newNode = curNode.ownerDocument().createElement(qname); - ManipulationCommand *cmd = new InsertNodeCommand(newNode, tqparent, after); + ManipulationCommand *cmd = new InsertNodeCommand(newNode, parent, after); mainWindow()->executeAndAddCommand(cmd); if (cmd->isValid()) activateNode(newNode); @@ -921,12 +921,12 @@ void DOMTreeView::slotAddTextDlg() DOM::Node curNode = item->node(); try { - DOM::Node tqparent = addBefore() ? curNode.parentNode() : curNode; + DOM::Node parent = addBefore() ? curNode.parentNode() : curNode; DOM::Node after = addBefore() ? curNode : 0; DOM::Node newNode = curNode.ownerDocument().createTextNode(text); - ManipulationCommand *cmd = new InsertNodeCommand(newNode, tqparent, after); + ManipulationCommand *cmd = new InsertNodeCommand(newNode, parent, after); mainWindow()->executeAndAddCommand(cmd); if (cmd->isValid()) activateNode(newNode); @@ -950,14 +950,14 @@ class AttributeListItem : public TQListViewItem bool _new; public: - AttributeListItem(TQListView *tqparent, TQListViewItem *prev) - : super(tqparent, prev), _new(true) + AttributeListItem(TQListView *parent, TQListViewItem *prev) + : super(parent, prev), _new(true) { } AttributeListItem(const TQString &attrName, const TQString &attrValue, - TQListView *tqparent, TQListViewItem *prev) - : super(tqparent, prev), _new(false) + TQListView *parent, TQListViewItem *prev) + : super(parent, prev), _new(false) { setText(0, attrName); setText(1, attrValue); diff --git a/konq-plugins/domtreeviewer/domtreeview.h b/konq-plugins/domtreeviewer/domtreeview.h index 499a545..6ff1634 100644 --- a/konq-plugins/domtreeviewer/domtreeview.h +++ b/konq-plugins/domtreeviewer/domtreeview.h @@ -50,7 +50,7 @@ class DOMTreeView : public DOMTreeViewBase TQ_OBJECT public: - DOMTreeView(TQWidget *tqparent, const char* name, bool allowSaving = true); + DOMTreeView(TQWidget *parent, const char* name, bool allowSaving = true); ~DOMTreeView(); KHTMLPart *htmlPart() const { return part; } diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp index 2615263..bf3afa7 100644 --- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp +++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp @@ -15,9 +15,9 @@ typedef KGenericFactory DomtreeviewerFactory; K_EXPORT_COMPONENT_FACTORY( libdomtreeviewerplugin, DomtreeviewerFactory( "domtreeviewer" ) ) -PluginDomtreeviewer::PluginDomtreeviewer( TQObject* tqparent, const char* name, +PluginDomtreeviewer::PluginDomtreeviewer( TQObject* parent, const char* name, const TQStringList & ) - : Plugin( tqparent, name ), m_dialog( 0 ) + : Plugin( parent, name ), m_dialog( 0 ) { (void) new KAction( i18n("Show &DOM Tree"), "domtreeviewer", 0, @@ -38,7 +38,7 @@ void PluginDomtreeviewer::slotShowDOMTree() delete m_dialog; Q_ASSERT((DOMTreeWindow *)m_dialog == (DOMTreeWindow *)0); } - if (KHTMLPart *part = ::tqqt_cast(tqparent())) + if (KHTMLPart *part = ::tqqt_cast(parent())) { m_dialog = new DOMTreeWindow(this); connect( m_dialog, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.h b/konq-plugins/domtreeviewer/plugin_domtreeviewer.h index 75ec607..e450555 100644 --- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.h +++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.h @@ -14,7 +14,7 @@ class PluginDomtreeviewer : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - PluginDomtreeviewer( TQObject* tqparent, const char* name, + PluginDomtreeviewer( TQObject* parent, const char* name, const TQStringList & ); virtual ~PluginDomtreeviewer(); diff --git a/konq-plugins/domtreeviewer/signalreceiver.cpp b/konq-plugins/domtreeviewer/signalreceiver.cpp index fb67abf..a0c0b1b 100644 --- a/konq-plugins/domtreeviewer/signalreceiver.cpp +++ b/konq-plugins/domtreeviewer/signalreceiver.cpp @@ -20,8 +20,8 @@ #include "signalreceiver.h" -SignalReceiver::SignalReceiver(TQObject *tqparent, const char *name) -: TQObject(tqparent, name), rcvd(false) +SignalReceiver::SignalReceiver(TQObject *parent, const char *name) +: TQObject(parent, name), rcvd(false) { } diff --git a/konq-plugins/domtreeviewer/signalreceiver.h b/konq-plugins/domtreeviewer/signalreceiver.h index 9652310..8ff35cd 100644 --- a/konq-plugins/domtreeviewer/signalreceiver.h +++ b/konq-plugins/domtreeviewer/signalreceiver.h @@ -48,7 +48,7 @@ class SignalReceiver : public TQObject TQ_OBJECT public: - SignalReceiver(TQObject *tqparent = 0, const char *name = 0); + SignalReceiver(TQObject *parent = 0, const char *name = 0); virtual ~SignalReceiver(); /** returns true if any signal has been received */ diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp index a22e8b2..830bb3d 100644 --- a/konq-plugins/fsview/fsview.cpp +++ b/konq-plugins/fsview/fsview.cpp @@ -43,8 +43,8 @@ TQMap FSView::_dirMetric; -FSView::FSView(Inode* base, TQWidget* tqparent, const char* name) - : TreeMapWidget(base, tqparent, name) +FSView::FSView(Inode* base, TQWidget* parent, const char* name) + : TreeMapWidget(base, parent, name) { setFieldType(0, i18n("Name")); setFieldType(1, i18n("Size")); diff --git a/konq-plugins/fsview/fsview.h b/konq-plugins/fsview/fsview.h index fe1c689..91471c5 100644 --- a/konq-plugins/fsview/fsview.h +++ b/konq-plugins/fsview/fsview.h @@ -63,7 +63,7 @@ class FSView : public TreeMapWidget, public ScanListener public: enum ColorMode { None = 0, Depth, Name, Owner, Group, Mime }; - FSView(Inode*, TQWidget* tqparent=0, const char* name=0); + FSView(Inode*, TQWidget* parent=0, const char* name=0); ~FSView(); KConfig* config() { return _config; } diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp index 0fdfee7..0d5eda7 100644 --- a/konq-plugins/fsview/fsview_part.cpp +++ b/konq-plugins/fsview/fsview_part.cpp @@ -94,9 +94,9 @@ KAboutData* FSViewPart::createAboutData() } FSViewPart::FSViewPart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const TQStringList& /* args */) - : KParts::ReadOnlyPart(tqparent, name) + : KParts::ReadOnlyPart(parent, name) { // we need an instance setInstance( FSViewPartFactory::instance() ); @@ -365,9 +365,9 @@ void FSViewBrowserExtension::refresh() while( (i=s.next()) ) commonParent = commonParent->commonParent(i); - /* if commonParent is a file, update tqparent directory */ + /* if commonParent is a file, update parent directory */ if ( !((Inode*)commonParent)->isDir() ) { - commonParent = commonParent->tqparent(); + commonParent = commonParent->parent(); if (!commonParent) return; } diff --git a/konq-plugins/fsview/fsview_part.h b/konq-plugins/fsview/fsview_part.h index 2328e21..5d3545f 100644 --- a/konq-plugins/fsview/fsview_part.h +++ b/konq-plugins/fsview/fsview_part.h @@ -87,7 +87,7 @@ class FSViewPart : public KParts::ReadOnlyPart TQ_PROPERTY( bool supportsUndo READ supportsUndo ) public: FSViewPart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, const TQStringList &args); + TQObject *parent, const char *name, const TQStringList &args); virtual ~FSViewPart(); diff --git a/konq-plugins/fsview/inode.cpp b/konq-plugins/fsview/inode.cpp index 849877e..d4875c2 100644 --- a/konq-plugins/fsview/inode.cpp +++ b/konq-plugins/fsview/inode.cpp @@ -40,12 +40,12 @@ Inode::Inode() init(""); } -Inode::Inode(ScanDir* d, Inode* tqparent) - : TreeMapItem(tqparent) +Inode::Inode(ScanDir* d, Inode* parent) + : TreeMapItem(parent) { TQString absPath; - if (tqparent) { - absPath = tqparent->path(); + if (parent) { + absPath = parent->path(); if (!absPath.endsWith("/")) absPath += "/"; } absPath += d->name(); @@ -56,12 +56,12 @@ Inode::Inode(ScanDir* d, Inode* tqparent) init(absPath); } -Inode::Inode(ScanFile* f, Inode* tqparent) - : TreeMapItem(tqparent) +Inode::Inode(ScanFile* f, Inode* parent) + : TreeMapItem(parent) { TQString absPath; - if (tqparent) - absPath = tqparent->path() + "/"; + if (parent) + absPath = parent->path() + "/"; absPath += f->name(); _dirPeer = 0; diff --git a/konq-plugins/fsview/scan.cpp b/konq-plugins/fsview/scan.cpp index c79ff99..1d3d06a 100644 --- a/konq-plugins/fsview/scan.cpp +++ b/konq-plugins/fsview/scan.cpp @@ -80,8 +80,8 @@ void ScanManager::startScan(ScanDir* from) if (scanRunning()) stopScan(); from->clear(); - if (from->tqparent()) - from->tqparent()->setupChildRescan(); + if (from->parent()) + from->parent()->setupChildRescan(); _list.append(new ScanItem(from->path(),from)); } diff --git a/konq-plugins/fsview/scan.h b/konq-plugins/fsview/scan.h index 6d570f7..ca4ce4f 100644 --- a/konq-plugins/fsview/scan.h +++ b/konq-plugins/fsview/scan.h @@ -179,7 +179,7 @@ class ScanDir */ void setupChildRescan(); - /* Absolute path. Warning: Slow, loops to top tqparent. */ + /* Absolute path. Warning: Slow, loops to top parent. */ TQString path(); /* get integer data attribute */ @@ -192,7 +192,7 @@ class ScanDir KIO::fileoffset_t size() { update(); return _size; } unsigned int fileCount() { update(); return _fileCount; } unsigned int dirCount() { update(); return _dirCount; } - ScanDir* tqparent() { return _parent; } + ScanDir* parent() { return _parent; } bool scanStarted() { return (_dirsFinished >= 0); } bool scanFinished() { return (_dirsFinished == (int)_dirs.count()); } bool scanRunning() { return scanStarted() && !scanFinished(); } diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp index f77b37f..fc83601 100644 --- a/konq-plugins/fsview/treemap.cpp +++ b/konq-plugins/fsview/treemap.cpp @@ -717,11 +717,11 @@ int TreeMapItemList::compareItems ( Item item1, Item item2 ) bool ascending; int result; - TreeMapItem* tqparent = ((TreeMapItem*)item1)->tqparent(); + TreeMapItem* parent = ((TreeMapItem*)item1)->parent(); // shouldn't happen - if (!tqparent) return 0; + if (!parent) return 0; - int textNo = tqparent->sorting(&ascending); + int textNo = parent->sorting(&ascending); if (textNo < 0) { double diff = ((TreeMapItem*)item1)->value() - @@ -738,22 +738,22 @@ int TreeMapItemList::compareItems ( Item item1, Item item2 ) TreeMapItem* TreeMapItemList::commonParent() { - TreeMapItem* tqparent, *item; - tqparent = first(); - if (tqparent) + TreeMapItem* parent, *item; + parent = first(); + if (parent) while( (item = next()) != 0) - tqparent = tqparent->commonParent(item); + parent = parent->commonParent(item); - return tqparent; + return parent; } // TreeMapItem -TreeMapItem::TreeMapItem(TreeMapItem* tqparent, double value) +TreeMapItem::TreeMapItem(TreeMapItem* parent, double value) { _value = value; - _parent = tqparent; + _parent = parent; _sum = 0; _tqchildren = 0; @@ -764,7 +764,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* tqparent, double value) _freeRects = 0; if (_parent) { - // take sorting from tqparent + // take sorting from parent _sortTextNo = _parent->sorting(&_sortAscending); _parent->addItem(this); } @@ -775,12 +775,12 @@ TreeMapItem::TreeMapItem(TreeMapItem* tqparent, double value) } -TreeMapItem::TreeMapItem(TreeMapItem* tqparent, double value, +TreeMapItem::TreeMapItem(TreeMapItem* parent, double value, TQString text1, TQString text2, TQString text3, TQString text4) { _value = value; - _parent = tqparent; + _parent = parent; // this resizes the text vector only if needed if (!text4.isEmpty()) setText(3, text4); @@ -829,7 +829,7 @@ bool TreeMapItem::isChildOf(TreeMapItem* item) TreeMapItem* TreeMapItem::commonParent(TreeMapItem* item) { while (item && !isChildOf(item)) { - item = item->tqparent(); + item = item->parent(); } return item; } @@ -1103,8 +1103,8 @@ void TreeMapTip::maybeTip( const TQPoint& pos ) // TreeMapWidget TreeMapWidget::TreeMapWidget(TreeMapItem* base, - TQWidget* tqparent, const char* name) - : TQWidget(tqparent, name) + TQWidget* parent, const char* name) + : TQWidget(parent, name) { _base = base; _base->setWidget(this); @@ -1446,9 +1446,9 @@ void TreeMapWidget::deletingItem(TreeMapItem* i) // don't redraw a deleted item if (_needsRefresh == i) { - // we can savely redraw the tqparent, as deleting order is - // from child to tqparent; i.e. i->tqparent() is existing. - _needsRefresh = i->tqparent(); + // we can savely redraw the parent, as deleting order is + // from child to parent; i.e. i->parent() is existing. + _needsRefresh = i->parent(); } } @@ -1468,7 +1468,7 @@ TQString TreeMapWidget::tipString(TreeMapItem* i) const tip += itemTip; } - i = i->tqparent(); + i = i->parent(); } return tip; } @@ -1530,7 +1530,7 @@ TreeMapItem* TreeMapWidget::possibleSelection(TreeMapItem* i) const if (_maxSelectDepth>=0) { int depth = i->depth(); while(i && depth > _maxSelectDepth) { - i = i->tqparent(); + i = i->parent(); depth--; } } @@ -1544,7 +1544,7 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const /* Must have a visible area */ while(i && ((i->tqitemRect().width() <1) || (i->tqitemRect().height() <1))) { - TreeMapItem* p = i->tqparent(); + TreeMapItem* p = i->parent(); if (!p) break; int idx = p->tqchildren()->findRef(i); idx--; @@ -1644,13 +1644,13 @@ TreeMapItem* TreeMapWidget::setTmpSelected(TreeMapItem* item, bool selected) } -bool TreeMapWidget::clearSelection(TreeMapItem* tqparent) +bool TreeMapWidget::clearSelection(TreeMapItem* parent) { TreeMapItemList old = _selection; TreeMapItem* i=_selection.first(); while (i) { - if (i->isChildOf(tqparent)) { + if (i->isChildOf(parent)) { _selection.remove(); i = _selection.current(); } @@ -1738,11 +1738,11 @@ TreeMapItem* TreeMapWidget::setTmpRangeSelection(TreeMapItem* i1, TreeMapItem* commonParent = i1; while (commonParent && !i2->isChildOf(commonParent)) { i1 = commonParent; - commonParent = commonParent->tqparent(); + commonParent = commonParent->parent(); } if (!commonParent) return changed; - while (i2 && i2->tqparent() != commonParent) - i2 = i2->tqparent(); + while (i2 && i2->parent() != commonParent) + i2 = i2->parent(); if (!i2) return changed; TreeMapItemList* list = commonParent->tqchildren(); @@ -1935,7 +1935,7 @@ void TreeMapWidget::mouseDoubleClickEvent( TQMouseEvent* e ) /* returns -1 if nothing visible found */ int nextVisible(TreeMapItem* i) { - TreeMapItem* p = i->tqparent(); + TreeMapItem* p = i->parent(); if (!p || p->tqitemRect().isEmpty()) return -1; int idx = p->tqchildren()->findRef(i); @@ -1953,7 +1953,7 @@ int nextVisible(TreeMapItem* i) /* returns -1 if nothing visible found */ int prevVisible(TreeMapItem* i) { - TreeMapItem* p = i->tqparent(); + TreeMapItem* p = i->parent(); if (!p || p->tqitemRect().isEmpty()) return -1; int idx = p->tqchildren()->findRef(i); @@ -2024,7 +2024,7 @@ void TreeMapWidget::keyPressEvent( TQKeyEvent* e ) } TreeMapItem* old = _current, *newItem; - TreeMapItem* p = _current->tqparent(); + TreeMapItem* p = _current->parent(); bool goBack; if (_current->sorting(&goBack) == -1) { @@ -2184,7 +2184,7 @@ void TreeMapWidget::drawItem(TQPainter* p, TreeMapItem* i; if (_markNo>0) { - for(i = item;i;i=i->tqparent()) + for(i = item;i;i=i->parent()) if (i->isMarked(_markNo)) break; isSelected = (i!=0); @@ -2906,7 +2906,7 @@ void TreeMapWidget::selectionActivated(int id) TreeMapItem* i = _menuItem; id -= _selectionID; while (id>0 && i) { - i=i->tqparent(); + i=i->parent(); id--; } if (i) @@ -2928,7 +2928,7 @@ void TreeMapWidget::addSelectionItems(TQPopupMenu* popup, TQString name = i->text(0); if (name.isEmpty()) break; popup->insertItem(i->text(0), id++); - i = i->tqparent(); + i = i->parent(); } } @@ -2939,7 +2939,7 @@ void TreeMapWidget::fieldStopActivated(int id) TreeMapItem* i = _menuItem; id -= _fieldStopID+1; while (id>0 && i) { - i=i->tqparent(); + i=i->parent(); id--; } if (i) @@ -2971,7 +2971,7 @@ void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup, popup->setItemChecked(id, true); foundFieldStop = true; } - i = i->tqparent(); + i = i->parent(); } } diff --git a/konq-plugins/fsview/treemap.h b/konq-plugins/fsview/treemap.h index 8ce6aca..0aa5a9d 100644 --- a/konq-plugins/fsview/treemap.h +++ b/konq-plugins/fsview/treemap.h @@ -237,8 +237,8 @@ public: HAlternate, VAlternate, Horizontal, Vertical }; - TreeMapItem(TreeMapItem* tqparent = 0, double value = 1.0 ); - TreeMapItem(TreeMapItem* tqparent, double value, + TreeMapItem(TreeMapItem* parent = 0, double value = 1.0 ); + TreeMapItem(TreeMapItem* parent, double value, TQString text1, TQString text2 = TQString(), TQString text3 = TQString(), TQString text4 = TQString()); virtual ~TreeMapItem(); @@ -261,9 +261,9 @@ public: bool initialized(); /** - * Adds an item to a tqparent. + * Adds an item to a parent. * When no sorting is used, the item is appended (drawn at bottom). - * This is only needed if the tqparent was not already specified in the + * This is only needed if the parent was not already specified in the * construction of the item. */ void addItem(TreeMapItem*); @@ -282,7 +282,7 @@ public: /** * Parent Item */ - TreeMapItem* tqparent() const { return _parent; } + TreeMapItem* parent() const { return _parent; } /** * Temporary rectangle used for drawing this item the last time. @@ -401,7 +401,7 @@ public: */ enum SelectionMode { Single, Multi, Extended, NoSelection }; - TreeMapWidget(TreeMapItem* base, TQWidget* tqparent=0, const char* name=0); + TreeMapWidget(TreeMapItem* base, TQWidget* parent=0, const char* name=0); ~TreeMapWidget(); /** @@ -428,7 +428,7 @@ public: /** * Returns the item possible for selection. this returns the - * given item itself or a tqparent thereof, + * given item itself or a parent thereof, * depending on setting of maxSelectDepth(). */ TreeMapItem* possibleSelection(TreeMapItem*) const; @@ -453,17 +453,17 @@ public: /** * Clear selection of all selected items which are tqchildren of - * tqparent. When tqparent == 0, clears whole selection + * parent. When parent == 0, clears whole selection * Returns true if selection changed. */ - bool clearSelection(TreeMapItem* tqparent = 0); + bool clearSelection(TreeMapItem* parent = 0); /** * Selects or unselects items in a range. * This is needed internally for Shift-Click in Extented mode. * Range means for a hierarchical widget: * - select/unselect i1 and i2 according selected - * - search common tqparent of i1 and i2, and select/unselect the + * - search common parent of i1 and i2, and select/unselect the * range of direct tqchildren between but excluding the child * leading to i1 and the child leading to i2. */ @@ -520,12 +520,12 @@ public: * If a tqchildren value() is almost the parents sum(), * it can happen that the border to be drawn for visibilty of * nesting relations takes to much space, and the - * tqparent/child size relation can not be mapped to a correct + * parent/child size relation can not be mapped to a correct * area size relation. * * Either * (1) Ignore the incorrect drawing, or - * (2) Skip drawing of the tqparent level alltogether. + * (2) Skip drawing of the parent level alltogether. */ void setSkipIncorrectBorder(bool enable = true); bool skipIncorrectBorder() const { return _skipIncorrectBorder; } diff --git a/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp index 3d52c5b..d9f5219 100644 --- a/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp +++ b/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp @@ -39,9 +39,9 @@ static const KAboutData aboutdata("khtmlsettingsplugin", I18N_NOOP("HTML Setting K_EXPORT_COMPONENT_FACTORY( libkhtmlsettingsplugin, SettingsPluginFactory( &aboutdata ) ) -SettingsPlugin::SettingsPlugin( TQObject* tqparent, const char* name, +SettingsPlugin::SettingsPlugin( TQObject* parent, const char* name, const TQStringList & ) - : KParts::Plugin( tqparent, name ), mConfig(0) + : KParts::Plugin( parent, name ), mConfig(0) { setInstance(SettingsPluginFactory::instance()); @@ -118,13 +118,13 @@ SettingsPlugin::~SettingsPlugin() void SettingsPlugin::showPopup() { - if( !tqparent() || !tqparent()->inherits("KHTMLPart")) + if( !parent() || !parent()->inherits("KHTMLPart")) return; if (!mConfig) mConfig = new KConfig("settingspluginrc", false, false); - KHTMLPart *part = static_cast( tqparent() ); + KHTMLPart *part = static_cast( parent() ); KProtocolManager::reparseConfiguration(); bool cookies = cookiesEnabled( part->url().url() ); @@ -159,28 +159,28 @@ void SettingsPlugin::showPopup() void SettingsPlugin::toggleJava() { - if( tqparent() && tqparent()->inherits("KHTMLPart")) + if( parent() && parent()->inherits("KHTMLPart")) { - KHTMLPart *part = static_cast(tqparent()); + KHTMLPart *part = static_cast(parent()); part->setJavaEnabled( ((KToggleAction*)actionCollection()->action("java"))->isChecked() ); } } void SettingsPlugin::toggleJavascript() { - if( tqparent() && tqparent()->inherits("KHTMLPart")) + if( parent() && parent()->inherits("KHTMLPart")) { - KHTMLPart *part = static_cast(tqparent()); + KHTMLPart *part = static_cast(parent()); part->setJScriptEnabled( ((KToggleAction*)actionCollection()->action("javascript"))->isChecked() ); } } void SettingsPlugin::toggleCookies() { - if( !tqparent() || !tqparent()->inherits("KHTMLPart")) + if( !parent() || !parent()->inherits("KHTMLPart")) return; - KHTMLPart *part = static_cast( tqparent() ); + KHTMLPart *part = static_cast( parent() ); TQString advice; bool enable = ((KToggleAction*)actionCollection()->action("cookies"))->isChecked(); @@ -203,18 +203,18 @@ void SettingsPlugin::toggleCookies() void SettingsPlugin::togglePlugins() { - if( tqparent() && tqparent()->inherits("KHTMLPart")) + if( parent() && parent()->inherits("KHTMLPart")) { - KHTMLPart *part = static_cast(tqparent()); + KHTMLPart *part = static_cast(parent()); part->setPluginsEnabled( ((KToggleAction*)actionCollection()->action("plugins"))->isChecked() ); } } void SettingsPlugin::toggleImageLoading() { - if( tqparent() && tqparent()->inherits("KHTMLPart")) + if( parent() && parent()->inherits("KHTMLPart")) { - KHTMLPart *part = static_cast(tqparent()); + KHTMLPart *part = static_cast(parent()); part->setAutoloadImages( ((KToggleAction*)actionCollection()->action("imageloading"))->isChecked() ); } } diff --git a/konq-plugins/khtmlsettingsplugin/settingsplugin.h b/konq-plugins/khtmlsettingsplugin/settingsplugin.h index 77fdc09..d70e60e 100644 --- a/konq-plugins/khtmlsettingsplugin/settingsplugin.h +++ b/konq-plugins/khtmlsettingsplugin/settingsplugin.h @@ -30,7 +30,7 @@ class SettingsPlugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - SettingsPlugin( TQObject* tqparent, const char* name, + SettingsPlugin( TQObject* parent, const char* name, const TQStringList & ); virtual ~SettingsPlugin(); diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp index 7e07835..671b90e 100644 --- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp +++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp @@ -44,9 +44,9 @@ Boston, MA 02110-1301, USA. #include "imgallerydialog.h" #include "imgallerydialog.moc" -KIGPDialog::KIGPDialog(TQWidget *tqparent, const TQString& path, const char *name ) +KIGPDialog::KIGPDialog(TQWidget *parent, const TQString& path, const char *name ) : KDialogBase( IconList, i18n("Configure"), Default|Ok|Cancel, - Ok, tqparent, name, true, true ), + Ok, parent, name, true, true ), m_dialogOk( false ) { m_path = path; diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.h b/konq-plugins/kimgalleryplugin/imgallerydialog.h index f22c06b..a8e2a8d 100644 --- a/konq-plugins/kimgalleryplugin/imgallerydialog.h +++ b/konq-plugins/kimgalleryplugin/imgallerydialog.h @@ -42,7 +42,7 @@ class KIGPDialog : public KDialogBase TQ_OBJECT public: - KIGPDialog(TQWidget *tqparent=0, const TQString& path=0, const char *name=0 ); + KIGPDialog(TQWidget *parent=0, const TQString& path=0, const char *name=0 ); ~KIGPDialog(); bool isDialogOk() const; diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp index 2b33df4..fde2131 100644 --- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp +++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp @@ -48,8 +48,8 @@ Boston, MA 02110-1301, USA. typedef KGenericFactory KImGalleryPluginFactory; K_EXPORT_COMPONENT_FACTORY( libkimgallery, KImGalleryPluginFactory( "imgalleryplugin" ) ) -KImGalleryPlugin::KImGalleryPlugin( TQObject* tqparent, const char* name, const TQStringList & ) - : KParts::Plugin( tqparent, name ), m_commentMap(0) +KImGalleryPlugin::KImGalleryPlugin( TQObject* parent, const char* name, const TQStringList & ) + : KParts::Plugin( parent, name ), m_commentMap(0) { new KAction( i18n( "&Create Image Gallery..." ), "imagegallery", CTRL+Key_I, this, TQT_SLOT( slotExecute() ), actionCollection(), "create_img_gallery" ); @@ -58,12 +58,12 @@ KImGalleryPlugin::KImGalleryPlugin( TQObject* tqparent, const char* name, const void KImGalleryPlugin::slotExecute() { m_progressDlg=0L; - if ( !tqparent() || !tqparent()->inherits("KonqDirPart")) + if ( !parent() || !parent()->inherits("KonqDirPart")) { KMessageBox::sorry( 0L, i18n("Could not create the plugin, please report a bug.")); return; } - m_part = static_cast(tqparent()); + m_part = static_cast(parent()); if (!m_part->url().isLocalFile()) { //TODO support remote URLs too? KMessageBox::sorry(m_part->widget(), i18n("Creating an image gallery works only on local folders.")); return; @@ -249,9 +249,9 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const TQString& sourceDirName if(m_cancelled) return false; - if( !tqparent() || !tqparent()->inherits("KonqDirPart")) + if( !parent() || !parent()->inherits("KonqDirPart")) return false; - KonqDirPart * part = static_cast(tqparent()); + KonqDirPart * part = static_cast(parent()); TQStringList subDirList; if (m_recurseSubDirectories && (recursionLevel >= 0)) { //recursionLevel == 0 means endless @@ -431,7 +431,7 @@ bool KImGalleryPlugin::createThumb( const TQString& imgName, const TQString& sou //kdDebug(90170) << "srcURL: " << srcURL << endl; KURL destURL = KURL::fromPathOrURL(imgGalleryDir + TQString::tqfromLatin1("/images/") + imgName); //kdDebug(90170) << "destURL: " << destURL << endl; - KIO::NetAccess::copy(srcURL, destURL, static_cast(tqparent())->widget()); + KIO::NetAccess::copy(srcURL, destURL, static_cast(parent())->widget()); } const TQString imgNameFormat = imgName + extension(imageFormat); diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.h b/konq-plugins/kimgalleryplugin/imgalleryplugin.h index 0139ae3..1a6cd1d 100644 --- a/konq-plugins/kimgalleryplugin/imgalleryplugin.h +++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.h @@ -37,7 +37,7 @@ class KImGalleryPlugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - KImGalleryPlugin( TQObject* tqparent, const char* name, + KImGalleryPlugin( TQObject* parent, const char* name, const TQStringList & ); ~KImGalleryPlugin() {} diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp index de544bf..27459ee 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp +++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp @@ -33,8 +33,8 @@ typedef KGenericFactory KuickFactory; K_EXPORT_COMPONENT_FACTORY ( kcm_kuick, KuickFactory( "kcmkuick" ) ) -KCMKuick::KCMKuick(TQWidget *tqparent, const char *name, const TQStringList &) -:KCModule(tqparent, name) +KCMKuick::KCMKuick(TQWidget *parent, const char *name, const TQStringList &) +:KCModule(parent, name) { KAboutData *ab=new KAboutData( "kcmkuick", I18N_NOOP("KCM Kuick"), "0.2",I18N_NOOP("KControl module for Kuick's configuration"), KAboutData::License_GPL, diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.h b/konq-plugins/kuick/kcmkuick/kcmkuick.h index 6ff97eb..634548c 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuick.h +++ b/konq-plugins/kuick/kcmkuick/kcmkuick.h @@ -27,7 +27,7 @@ class KCMKuick TQ_OBJECT public: - KCMKuick (TQWidget *tqparent, const char *name, const TQStringList &); + KCMKuick (TQWidget *parent, const char *name, const TQStringList &); ~KCMKuick(); void load(); void load(const TQString &); diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp index 22d45b4..b9fa89d 100644 --- a/konq-plugins/kuick/kdirmenu.cpp +++ b/konq-plugins/kuick/kdirmenu.cpp @@ -34,9 +34,9 @@ TQMap *KDirMenu::_icons = 0; -KDirMenu::KDirMenu ( TQWidget *tqparent, const KURL &_src, +KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src, const TQString &_path, const TQString &_name, bool /*showfile*/ ) - : TQPopupMenu(tqparent), + : TQPopupMenu(parent), path(_path), name(_name), src( _src ), diff --git a/konq-plugins/kuick/kdirmenu.h b/konq-plugins/kuick/kdirmenu.h index cdc2933..979fdf6 100644 --- a/konq-plugins/kuick/kdirmenu.h +++ b/konq-plugins/kuick/kdirmenu.h @@ -32,7 +32,7 @@ class KDirMenu : public TQPopupMenu { Q_OBJECT TQ_OBJECT public: - KDirMenu( TQWidget *tqparent, const KURL &src, const TQString &_path, + KDirMenu( TQWidget *parent, const KURL &src, const TQString &_path, const TQString &name, bool showfiles = false ); ~KDirMenu( ); void setPath( const TQString &_path); diff --git a/konq-plugins/kuick/kimcontactmenu.cpp b/konq-plugins/kuick/kimcontactmenu.cpp index e711df2..77ef7a4 100644 --- a/konq-plugins/kuick/kimcontactmenu.cpp +++ b/konq-plugins/kuick/kimcontactmenu.cpp @@ -34,8 +34,8 @@ #include "kimcontactmenu.h" -KIMContactMenu::KIMContactMenu( TQWidget *tqparent, KIMProxy *proxy ) - : TQPopupMenu( tqparent), mProxy( proxy ) +KIMContactMenu::KIMContactMenu( TQWidget *parent, KIMProxy *proxy ) + : TQPopupMenu( parent), mProxy( proxy ) { #ifdef KIMCONTACTS_USE_KABC m_addressBook = KABC::StdAddressBook::self( false ); diff --git a/konq-plugins/kuick/kimcontactmenu.h b/konq-plugins/kuick/kimcontactmenu.h index 2f1c0bb..2b90a77 100644 --- a/konq-plugins/kuick/kimcontactmenu.h +++ b/konq-plugins/kuick/kimcontactmenu.h @@ -36,7 +36,7 @@ class KIMContactMenu : public TQPopupMenu Q_OBJECT TQ_OBJECT public: - KIMContactMenu( TQWidget *tqparent, KIMProxy *proxy ); + KIMContactMenu( TQWidget *parent, KIMProxy *proxy ); ~KIMContactMenu(); protected slots: // populate menus if not already populated diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp index 90682ac..aa4f0dd 100644 --- a/konq-plugins/kuick/kmetamenu.cpp +++ b/konq-plugins/kuick/kmetamenu.cpp @@ -36,9 +36,9 @@ #include "kimcontactmenu.h" #include "kmetamenu.moc" -KMetaMenu::KMetaMenu( TQWidget *tqparent, const KURL &url, +KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, const TQString &text, const TQString &key, KIMProxy *imProxy ) -: TQPopupMenu( tqparent), +: TQPopupMenu( parent), m_root( 0 ), m_home( 0 ), m_etc( 0 ), m_current( 0 ), m_browse( 0 ) { int recent_no; group = key; @@ -51,7 +51,7 @@ KMetaMenu::KMetaMenu( TQWidget *tqparent, const KURL &url, u.setPath(TQDir::homeDirPath()); if ( kapp->authorizeURLAction("list", u, u) ) { - m_home = new KDirMenu( tqparent, url, u.path() , text ); + m_home = new KDirMenu( parent, url, u.path() , text ); insertItem( SmallIcon( "kfm_home" ), i18n("&Home Folder"), m_home); dirList << u.path(); @@ -62,7 +62,7 @@ KMetaMenu::KMetaMenu( TQWidget *tqparent, const KURL &url, u.setPath(TQDir::rootDirPath()); if ( kapp->authorizeURLAction("list", u, u) ) { - m_root = new KDirMenu( tqparent, url, u.path() , text ); + m_root = new KDirMenu( parent, url, u.path() , text ); insertItem( SmallIcon( "folder_red" ), i18n("&Root Folder"), m_root); dirList << u.path(); @@ -75,7 +75,7 @@ KMetaMenu::KMetaMenu( TQWidget *tqparent, const KURL &url, if ( TQFileInfo( confDir ).isWritable() && kapp->authorizeURLAction("list", u, u) ) { - m_etc = new KDirMenu( tqparent, url, confDir, text ); + m_etc = new KDirMenu( parent, url, confDir, text ); insertItem( SmallIcon( "folder_yellow" ) , i18n("&System Configuration"), m_etc); dirList << confDir; @@ -93,7 +93,7 @@ KMetaMenu::KMetaMenu( TQWidget *tqparent, const KURL &url, //(#60192) { // Also add current working directory - m_current = new KDirMenu( tqparent, url, url.path(), text ); + m_current = new KDirMenu( parent, url, url.path(), text ); insertItem( SmallIcon( "folder" ), i18n( "&Current Folder" ), m_current ); @@ -103,7 +103,7 @@ KMetaMenu::KMetaMenu( TQWidget *tqparent, const KURL &url, if ( imProxy ) { - m_contacts = new KIMContactMenu( tqparent, imProxy ); + m_contacts = new KIMContactMenu( parent, imProxy ); int item = insertItem( SmallIconSet( "personal" ), i18n( "C&ontact" ), m_contacts ); connect ( m_contacts, TQT_SIGNAL( contactChosen( const TQString &) ), TQT_SIGNAL( contactChosen( const TQString & ) ) ); if ( !imProxy->initialize() || imProxy->fileTransferContacts().isEmpty() ) diff --git a/konq-plugins/kuick/kmetamenu.h b/konq-plugins/kuick/kmetamenu.h index a15878b..92e0598 100644 --- a/konq-plugins/kuick/kmetamenu.h +++ b/konq-plugins/kuick/kmetamenu.h @@ -38,7 +38,7 @@ class KMetaMenu : public TQPopupMenu { TQ_OBJECT public: - KMetaMenu( TQWidget *tqparent, const KURL &url, const TQString &text, + KMetaMenu( TQWidget *parent, const KURL &url, const TQString &text, const TQString &key, KIMProxy * imProxy = 0L ); KMetaMenu(); ~KMetaMenu(); diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp index 1816b08..341cc2e 100644 --- a/konq-plugins/microformat/konqmficon.cpp +++ b/konq-plugins/microformat/konqmficon.cpp @@ -41,11 +41,11 @@ typedef KGenericFactory KonqMFIconFactory; K_EXPORT_COMPONENT_FACTORY(libmfkonqmficon, KonqMFIconFactory("mfkonqmficon")) -KonqMFIcon::KonqMFIcon(TQObject *tqparent, const char *name, const TQStringList &) -: KParts::Plugin(tqparent, name), PluginBase(), m_part(0), m_mfIcon(0), m_statusBarEx(0), m_menu(0) { +KonqMFIcon::KonqMFIcon(TQObject *parent, const char *name, const TQStringList &) +: KParts::Plugin(parent, name), PluginBase(), m_part(0), m_mfIcon(0), m_statusBarEx(0), m_menu(0) { KGlobal::locale()->insertCatalogue("mf_konqplugin"); - m_part = dynamic_cast(tqparent); + m_part = dynamic_cast(parent); if (!m_part) { kdDebug() << "couldn't get part" << endl; return; diff --git a/konq-plugins/microformat/konqmficon.h b/konq-plugins/microformat/konqmficon.h index 8213f8f..3b4bb7f 100644 --- a/konq-plugins/microformat/konqmficon.h +++ b/konq-plugins/microformat/konqmficon.h @@ -43,7 +43,7 @@ class KonqMFIcon : public KParts::Plugin, PluginBase { Q_OBJECT TQ_OBJECT public: - KonqMFIcon(TQObject *tqparent, const char *name, const TQStringList &); + KonqMFIcon(TQObject *parent, const char *name, const TQStringList &); ~KonqMFIcon(); diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp index 2346831..60eb724 100644 --- a/konq-plugins/minitools/minitoolsplugin.cpp +++ b/konq-plugins/minitools/minitoolsplugin.cpp @@ -42,9 +42,9 @@ typedef KGenericFactory MinitoolsPluginFactory; K_EXPORT_COMPONENT_FACTORY( libminitoolsplugin, MinitoolsPluginFactory("minitoolsplugin") ) -MinitoolsPlugin::MinitoolsPlugin(TQObject* tqparent, const char* name, const TQStringList &) - : KParts::Plugin(tqparent, name) { - m_part = (tqparent && tqparent->inherits( "KHTMLPart" )) ? static_cast(tqparent) : 0L; +MinitoolsPlugin::MinitoolsPlugin(TQObject* parent, const char* name, const TQStringList &) + : KParts::Plugin(parent, name) { + m_part = (parent && parent->inherits( "KHTMLPart" )) ? static_cast(parent) : 0L; m_pMinitoolsMenu = new KActionMenu(i18n("&Minitools"), "minitools", actionCollection(), "minitools"); diff --git a/konq-plugins/minitools/minitoolsplugin.h b/konq-plugins/minitools/minitoolsplugin.h index 8607efe..6e286e6 100644 --- a/konq-plugins/minitools/minitoolsplugin.h +++ b/konq-plugins/minitools/minitoolsplugin.h @@ -37,7 +37,7 @@ class MinitoolsPlugin : public KParts::Plugin { TQ_OBJECT public: - MinitoolsPlugin( TQObject* tqparent, const char* name, const TQStringList & ); + MinitoolsPlugin( TQObject* parent, const char* name, const TQStringList & ); ~MinitoolsPlugin(); protected slots: diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp index d3576d7..7b2d61b 100644 --- a/konq-plugins/rellinks/plugin_rellinks.cpp +++ b/konq-plugins/rellinks/plugin_rellinks.cpp @@ -61,8 +61,8 @@ K_EXPORT_COMPONENT_FACTORY( librellinksplugin, RelLinksFactory("rellinks") ) #endif /** Constructor of the plugin. */ -RelLinksPlugin::RelLinksPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin( tqparent, name ), +RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin( parent, name ), m_part(0), m_viewVisible(false) { @@ -74,7 +74,7 @@ RelLinksPlugin::RelLinksPlugin(TQObject *tqparent, const char *name, const TQStr kaction_map["home"]->setWhatsThis( i18n("

This link references a home page or the top of some hierarchy.

") ); kaction_map["up"] = new KAction( i18n("&Up"), "1uparrow", KShortcut("Ctrl+Alt+U"), this, TQT_SLOT(goUp()), actionCollection(), "rellinks_up" ); - kaction_map["up"]->setWhatsThis( i18n("

This link references the immediate tqparent of the current document.

") ); + kaction_map["up"]->setWhatsThis( i18n("

This link references the immediate parent of the current document.

") ); bool isRTL = TQApplication::reverseLayout(); @@ -175,7 +175,7 @@ RelLinksPlugin::RelLinksPlugin(TQObject *tqparent, const char *name, const TQStr disableAll(); // When the rendering of the HTML is done, we update the site navigation bar - m_part = dynamic_cast(tqparent); + m_part = dynamic_cast(parent); if (!m_part) return; @@ -364,7 +364,7 @@ void RelLinksPlugin::updateToolbar() { void RelLinksPlugin::guessRelations() { - m_part = dynamic_cast(tqparent()); + m_part = dynamic_cast(parent()); if (!m_part || m_part->document().isNull() ) return; @@ -422,7 +422,7 @@ void RelLinksPlugin::guessRelations() /** Menu links */ void RelLinksPlugin::goToLink(const TQString & rel, int id) { // have the KHTML part open it - KHTMLPart *part = dynamic_cast(tqparent()); + KHTMLPart *part = dynamic_cast(parent()); if (!part) return; @@ -571,7 +571,7 @@ TQString RelLinksPlugin::getLinkType(const TQString &lrel) { // ...known relations... if (lrel == "top" || lrel == "origin" || lrel == "start") return "home"; - if (lrel == "tqparent") + if (lrel == "parent") return "up"; if (lrel == "first") return "begin"; diff --git a/konq-plugins/rellinks/plugin_rellinks.h b/konq-plugins/rellinks/plugin_rellinks.h index c6e0942..e5dfd8c 100644 --- a/konq-plugins/rellinks/plugin_rellinks.h +++ b/konq-plugins/rellinks/plugin_rellinks.h @@ -60,7 +60,7 @@ class RelLinksPlugin : public KParts::Plugin { TQ_OBJECT public: /** Constructor */ - RelLinksPlugin( TQObject *tqparent, const char *name, const TQStringList & ); + RelLinksPlugin( TQObject *parent, const char *name, const TQStringList & ); /** Destructor */ virtual ~RelLinksPlugin(); diff --git a/konq-plugins/rsync/rsyncconfigdialog.cpp b/konq-plugins/rsync/rsyncconfigdialog.cpp index 1bf9341..f123645 100644 --- a/konq-plugins/rsync/rsyncconfigdialog.cpp +++ b/konq-plugins/rsync/rsyncconfigdialog.cpp @@ -100,12 +100,12 @@ /* * RsyncConfigDialog implementation */ -RsyncConfigDialog::RsyncConfigDialog(TQWidget* tqparent, const char* name, +RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name, const TQString& caption, const TQString& text, const TQString& localfolder, const TQString& remotefolder, int syncmode, bool modal) : KDialogBase(KDialogBase::Plain, caption, KDialogBase::Cancel | KDialogBase::Ok, - KDialogBase::Ok, tqparent, name, modal), + KDialogBase::Ok, parent, name, modal), mAutoClose(true), mAutoReset(false), mCancelled(false), diff --git a/konq-plugins/rsync/rsyncconfigdialog.h b/konq-plugins/rsync/rsyncconfigdialog.h index 44ab118..20a8a2a 100644 --- a/konq-plugins/rsync/rsyncconfigdialog.h +++ b/konq-plugins/rsync/rsyncconfigdialog.h @@ -40,7 +40,7 @@ class RsyncConfigDialog : public KDialogBase TQ_OBJECT public: - RsyncConfigDialog(TQWidget* tqparent = 0, const char* name = 0, + RsyncConfigDialog(TQWidget* parent = 0, const char* name = 0, const TQString& caption = TQString(), const TQString& text = TQString(), const TQString& localfolder = TQString(), diff --git a/konq-plugins/rsync/rsyncplugin.cpp b/konq-plugins/rsync/rsyncplugin.cpp index a0987ff..3f8c23d 100644 --- a/konq-plugins/rsync/rsyncplugin.cpp +++ b/konq-plugins/rsync/rsyncplugin.cpp @@ -106,13 +106,13 @@ typedef KGenericFactory RsyncPluginFactory; K_EXPORT_COMPONENT_FACTORY(librsyncplugin, RsyncPluginFactory("rsyncplugin")) -RsyncPlugin::RsyncPlugin (TQObject* tqparent, const char* name, +RsyncPlugin::RsyncPlugin (TQObject* parent, const char* name, const TQStringList&) - :KParts::Plugin (tqparent, name), + :KParts::Plugin (parent, name), m_pSyncNow(0), m_pSyncSetup(0) { - m_part = ::tqqt_cast(tqparent); + m_part = ::tqqt_cast(parent); if ( !m_part || !m_part->scrollWidget() ) return; diff --git a/konq-plugins/rsync/rsyncplugin.h b/konq-plugins/rsync/rsyncplugin.h index 6c58d0d..d06eaf1 100644 --- a/konq-plugins/rsync/rsyncplugin.h +++ b/konq-plugins/rsync/rsyncplugin.h @@ -52,7 +52,7 @@ class RsyncPlugin : public KParts::Plugin public: - RsyncPlugin (TQObject* tqparent, const char* name, const TQStringList &); + RsyncPlugin (TQObject* parent, const char* name, const TQStringList &); virtual ~RsyncPlugin(); protected: diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp index aa9dc27..a820d87 100644 --- a/konq-plugins/searchbar/searchbar.cpp +++ b/konq-plugins/searchbar/searchbar.cpp @@ -57,9 +57,9 @@ K_EXPORT_COMPONENT_FACTORY(libsearchbarplugin, SearchBarPluginFactory("searchbarplugin")) -SearchBarPlugin::SearchBarPlugin(TQObject *tqparent, const char *name, +SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name, const TQStringList &) : - KParts::Plugin(tqparent, name), + KParts::Plugin(parent, name), m_searchCombo(0), m_searchMode(UseSearchProvider), m_urlEnterLock(false), @@ -94,7 +94,7 @@ SearchBarPlugin::SearchBarPlugin(TQObject *tqparent, const char *name, configurationChanged(); - KParts::MainWindow *mainWin = static_cast(TQT_TQWIDGET(tqparent)); + KParts::MainWindow *mainWin = static_cast(TQT_TQWIDGET(parent)); //Grab the part manager. Don't know of any other way, and neither does Tronical, so.. KParts::PartManager *partMan = static_cast(mainWin->child(0, "KParts::PartManager")); @@ -546,8 +546,8 @@ void SearchBarPlugin::focusSearchbar() #endif // USE_QT4 } -SearchBarCombo::SearchBarCombo(TQWidget *tqparent, const char *name) : - KHistoryCombo(tqparent, name), +SearchBarCombo::SearchBarCombo(TQWidget *parent, const char *name) : + KHistoryCombo(parent, name), m_pluginActive(true) { connect(this, TQT_SIGNAL(cleared()), TQT_SLOT(historyCleared())); diff --git a/konq-plugins/searchbar/searchbar.h b/konq-plugins/searchbar/searchbar.h index 3f032ed..15ade36 100644 --- a/konq-plugins/searchbar/searchbar.h +++ b/konq-plugins/searchbar/searchbar.h @@ -48,7 +48,7 @@ class SearchBarCombo : public KHistoryCombo /** * Constructor. */ - SearchBarCombo(TQWidget *tqparent, const char *name); + SearchBarCombo(TQWidget *parent, const char *name); /** * Returns the icon currently displayed in the combo box. @@ -113,7 +113,7 @@ class SearchBarPlugin : public KParts::Plugin /** Possible search modes */ enum SearchModes { FindInThisPage = 0, UseSearchProvider }; - SearchBarPlugin(TQObject *tqparent, const char *name, + SearchBarPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~SearchBarPlugin(); diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp index 21dbcaf..6f5d663 100644 --- a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp +++ b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp @@ -24,8 +24,8 @@ #include #include -BookmarkListItem::BookmarkListItem( TQListView *tqparent, const TQString & url, const TQString & desc, time_t time ) - : KListViewItem( tqparent ), m_desc( desc ) +BookmarkListItem::BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time ) + : KListViewItem( parent ), m_desc( desc ) { m_url = KURL::fromPathOrURL( url ); m_dateTime.setTime_t( time ); diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.h b/konq-plugins/sidebar/delicious/bookmarkListItem.h index 3e37ea4..5b4c8c7 100644 --- a/konq-plugins/sidebar/delicious/bookmarkListItem.h +++ b/konq-plugins/sidebar/delicious/bookmarkListItem.h @@ -34,7 +34,7 @@ class TQString; class BookmarkListItem: public KListViewItem { public: - BookmarkListItem( TQListView *tqparent, const TQString & url, const TQString & desc, time_t time ); + BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time ); KURL url() const; TQDateTime date() const; TQString desc() const; diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp index 929ded4..3f3b03a 100644 --- a/konq-plugins/sidebar/delicious/mainWidget.cpp +++ b/konq-plugins/sidebar/delicious/mainWidget.cpp @@ -42,8 +42,8 @@ #include #include -MainWidget::MainWidget( KConfig * config, TQWidget * tqparent ) - : MainWidget_base( tqparent ), m_config( config ) +MainWidget::MainWidget( KConfig * config, TQWidget * parent ) + : MainWidget_base( parent ), m_config( config ) { loadTags(); diff --git a/konq-plugins/sidebar/delicious/mainWidget.h b/konq-plugins/sidebar/delicious/mainWidget.h index e77cfc5..a6ed2a3 100644 --- a/konq-plugins/sidebar/delicious/mainWidget.h +++ b/konq-plugins/sidebar/delicious/mainWidget.h @@ -40,7 +40,7 @@ class MainWidget: public MainWidget_base Q_OBJECT TQ_OBJECT public: - MainWidget( KConfig * config, TQWidget * tqparent ); + MainWidget( KConfig * config, TQWidget * parent ); ~MainWidget(); /** diff --git a/konq-plugins/sidebar/delicious/plugin.cpp b/konq-plugins/sidebar/delicious/plugin.cpp index 23244b7..3ed6c09 100644 --- a/konq-plugins/sidebar/delicious/plugin.cpp +++ b/konq-plugins/sidebar/delicious/plugin.cpp @@ -27,10 +27,10 @@ #include #include -KonqSidebarDelicious::KonqSidebarDelicious( KInstance *instance, TQObject *tqparent, +KonqSidebarDelicious::KonqSidebarDelicious( KInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName_, const char* name ) - : KonqSidebarPlugin( instance, tqparent, widgetParent, desktopName_, name ), + : KonqSidebarPlugin( instance, parent, widgetParent, desktopName_, name ), DCOPObject( "sidebar-delicious" ) { diff --git a/konq-plugins/sidebar/delicious/plugin.h b/konq-plugins/sidebar/delicious/plugin.h index 4e220da..23234a2 100644 --- a/konq-plugins/sidebar/delicious/plugin.h +++ b/konq-plugins/sidebar/delicious/plugin.h @@ -43,7 +43,7 @@ class KonqSidebarDelicious: public KonqSidebarPlugin, DCOPObject // TQ_OBJECT K_DCOP public: - KonqSidebarDelicious( KInstance * instance, TQObject * tqparent, TQWidget * widgetParent, + KonqSidebarDelicious( KInstance * instance, TQObject * parent, TQWidget * widgetParent, TQString & desktopName_, const char * name = 0 ); ~KonqSidebarDelicious(); virtual void * provides( const TQString & ); diff --git a/konq-plugins/sidebar/delicious/tagListItem.cpp b/konq-plugins/sidebar/delicious/tagListItem.cpp index a8b98cd..bc050d9 100644 --- a/konq-plugins/sidebar/delicious/tagListItem.cpp +++ b/konq-plugins/sidebar/delicious/tagListItem.cpp @@ -21,8 +21,8 @@ #include "tagListItem.h" -TagListItem::TagListItem( TQListView * tqparent, const TQString & tagName, int count ) - : TQCheckListItem( tqparent, tagName, TQCheckListItem::CheckBox ), m_name( tagName ), m_count( count ) +TagListItem::TagListItem( TQListView * parent, const TQString & tagName, int count ) + : TQCheckListItem( parent, tagName, TQCheckListItem::CheckBox ), m_name( tagName ), m_count( count ) { } diff --git a/konq-plugins/sidebar/delicious/tagListItem.h b/konq-plugins/sidebar/delicious/tagListItem.h index f60e0b4..27a045d 100644 --- a/konq-plugins/sidebar/delicious/tagListItem.h +++ b/konq-plugins/sidebar/delicious/tagListItem.h @@ -30,7 +30,7 @@ class TagListItem: public TQObject, public TQCheckListItem Q_OBJECT TQ_OBJECT public: - TagListItem( TQListView * tqparent, const TQString & tagName, int count = 1 ); + TagListItem( TQListView * parent, const TQString & tagName, int count = 1 ); int count() const; TQString name() const; void setName( const TQString & name ); diff --git a/konq-plugins/sidebar/mediaplayer/controls.cpp b/konq-plugins/sidebar/mediaplayer/controls.cpp index 63d91ac..5b110a0 100644 --- a/konq-plugins/sidebar/mediaplayer/controls.cpp +++ b/konq-plugins/sidebar/mediaplayer/controls.cpp @@ -23,15 +23,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "controls.h" -L33tSlider::L33tSlider(TQWidget * tqparent, const char * name) : - TQSlider(tqparent,name), pressed(false) +L33tSlider::L33tSlider(TQWidget * parent, const char * name) : + TQSlider(parent,name), pressed(false) {} -L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * tqparent, const char * name) : - TQSlider(o,tqparent,name), pressed(false) +L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * parent, const char * name) : + TQSlider(o,parent,name), pressed(false) {} L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value, - Qt::Orientation o, TQWidget * tqparent, const char * name) : - TQSlider(minValue, maxValue, pageStep, value, o, tqparent,name), pressed(false) + Qt::Orientation o, TQWidget * parent, const char * name) : + TQSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false) {} bool L33tSlider::currentlyPressed() const @@ -76,8 +76,8 @@ void L33tSlider::wheelEvent(TQWheelEvent *e) } SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver, - const char *member, TQObject* tqparent, const char* name ) - : KAction( text, accel, tqparent, name ) + const char *member, TQObject* parent, const char* name ) + : KAction( text, accel, parent, name ) { m_receiver = receiver; m_member = member; diff --git a/konq-plugins/sidebar/mediaplayer/controls.h b/konq-plugins/sidebar/mediaplayer/controls.h index 73a8340..762b3eb 100644 --- a/konq-plugins/sidebar/mediaplayer/controls.h +++ b/konq-plugins/sidebar/mediaplayer/controls.h @@ -43,10 +43,10 @@ class L33tSlider : public TQSlider Q_OBJECT TQ_OBJECT public: - L33tSlider(TQWidget * tqparent, const char * name=0); - L33tSlider(Qt::Orientation, TQWidget * tqparent, const char * name=0); + L33tSlider(TQWidget * parent, const char * name=0); + L33tSlider(Qt::Orientation, TQWidget * parent, const char * name=0); L33tSlider(int minValue, int maxValue, int pageStep, int value, - Qt::Orientation, TQWidget * tqparent, const char * name=0); + Qt::Orientation, TQWidget * parent, const char * name=0); bool currentlyPressed() const; signals: @@ -75,7 +75,7 @@ Q_OBJECT TQ_OBJECT public: SliderAction(const TQString& text, int accel, const TQObject *receiver, - const char *member, TQObject* tqparent, const char* name ); + const char *member, TQObject* parent, const char* name ); virtual int plug( TQWidget *w, int index = -1 ); virtual void unplug( TQWidget *w ); TQSlider* slider() const { return m_slider; } diff --git a/konq-plugins/sidebar/mediaplayer/engine.cpp b/konq-plugins/sidebar/mediaplayer/engine.cpp index 8f01888..e4590b6 100644 --- a/konq-plugins/sidebar/mediaplayer/engine.cpp +++ b/konq-plugins/sidebar/mediaplayer/engine.cpp @@ -71,8 +71,8 @@ public: KURL file; }; -Engine::Engine(TQObject *tqparent) - : TQObject(tqparent) +Engine::Engine(TQObject *parent) + : TQObject(parent) , d(new EnginePrivate) { } diff --git a/konq-plugins/sidebar/mediaplayer/engine.h b/konq-plugins/sidebar/mediaplayer/engine.h index c1d129f..fd15efe 100644 --- a/konq-plugins/sidebar/mediaplayer/engine.h +++ b/konq-plugins/sidebar/mediaplayer/engine.h @@ -46,7 +46,7 @@ Q_OBJECT TQ_OBJECT public: - Engine(TQObject *tqparent=0); + Engine(TQObject *parent=0); ~Engine(); Arts::PlayObject playObject() const; diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp index 8ea041f..2de09af 100644 --- a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp @@ -27,8 +27,8 @@ #include #include "mediawidget.h" -KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName_, const char* name): - KonqSidebarPlugin(instance,tqparent,widgetParent,desktopName_,name) +KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name): + KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name) { widget=new KSB_MediaWidget(widgetParent); } diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.h b/konq-plugins/sidebar/mediaplayer/mediaplayer.h index 2213ef2..f03c882 100644 --- a/konq-plugins/sidebar/mediaplayer/mediaplayer.h +++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.h @@ -29,7 +29,7 @@ class KonqSidebar_MediaPlayer: public KonqSidebarPlugin Q_OBJECT TQ_OBJECT public: - KonqSidebar_MediaPlayer(KInstance *instance,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0); + KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0); ~KonqSidebar_MediaPlayer(); virtual void *provides(const TQString &); void emitStatusBarText (const TQString &); diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp index 436b678..5130cbb 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp @@ -32,7 +32,7 @@ #include #include -KSB_MediaWidget::KSB_MediaWidget(TQWidget *tqparent):KSB_MediaWidget_skel(tqparent) +KSB_MediaWidget::KSB_MediaWidget(TQWidget *parent):KSB_MediaWidget_skel(parent) { player = new Player(TQT_TQOBJECT(this)); empty(); diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.h b/konq-plugins/sidebar/mediaplayer/mediawidget.h index 8e106a8..2a7e77a 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget.h +++ b/konq-plugins/sidebar/mediaplayer/mediawidget.h @@ -26,7 +26,7 @@ class KSB_MediaWidget: public KSB_MediaWidget_skel Q_OBJECT TQ_OBJECT public: - KSB_MediaWidget(TQWidget *tqparent); + KSB_MediaWidget(TQWidget *parent); ~KSB_MediaWidget(){;} private: diff --git a/konq-plugins/sidebar/mediaplayer/player.cpp b/konq-plugins/sidebar/mediaplayer/player.cpp index c11b2b0..741a6b6 100644 --- a/konq-plugins/sidebar/mediaplayer/player.cpp +++ b/konq-plugins/sidebar/mediaplayer/player.cpp @@ -29,8 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "engine.h" #include "player.h" -Player::Player(TQObject *tqparent) - : TQObject(tqparent) +Player::Player(TQObject *parent) + : TQObject(parent) , position(0) , unfinished(false) { diff --git a/konq-plugins/sidebar/mediaplayer/player.h b/konq-plugins/sidebar/mediaplayer/player.h index c0a9159..f17acc0 100644 --- a/konq-plugins/sidebar/mediaplayer/player.h +++ b/konq-plugins/sidebar/mediaplayer/player.h @@ -40,7 +40,7 @@ Q_OBJECT friend class KaboodlePart; public: - Player(TQObject *tqparent = 0); + Player(TQObject *parent = 0); ~Player(); /** diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp index e6acdbd..2585c7b 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.cpp +++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp @@ -56,9 +56,9 @@ ActionListItem::ActionListItem(TQListBox *listbox, const TQString &action, const setText(text); } -ConfigDialog::ConfigDialog(TQWidget *tqparent, const char *name) : TQDialog(tqparent, name) +ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent, name) { - topWidgetName = tqparent->tqtopLevelWidget()->name(); + topWidgetName = parent->tqtopLevelWidget()->name(); config = new KConfig("metabarrc"); iconConfig = new KConfig(locate("data", "metabar/iconsrc")); diff --git a/konq-plugins/sidebar/metabar/src/configdialog.h b/konq-plugins/sidebar/metabar/src/configdialog.h index 8417d15..4dc04f9 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.h +++ b/konq-plugins/sidebar/metabar/src/configdialog.h @@ -48,7 +48,7 @@ class ConfigDialog : public TQDialog TQ_OBJECT public: - ConfigDialog(TQWidget *tqparent = 0, const char *name = 0); + ConfigDialog(TQWidget *parent = 0, const char *name = 0); ~ConfigDialog(); protected: diff --git a/konq-plugins/sidebar/metabar/src/metabar.cpp b/konq-plugins/sidebar/metabar/src/metabar.cpp index bc7d978..6a020f0 100644 --- a/konq-plugins/sidebar/metabar/src/metabar.cpp +++ b/konq-plugins/sidebar/metabar/src/metabar.cpp @@ -7,8 +7,8 @@ #include "metabar.h" #include "metabar.moc" -Metabar::Metabar(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name): - KonqSidebarPlugin(inst,tqparent,widgetParent,desktopName,name) +Metabar::Metabar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): + KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) { KImageIO::registerFormats(); KGlobal::locale()->insertCatalogue( "konqsidebar_metabar" ); diff --git a/konq-plugins/sidebar/metabar/src/metabar.h b/konq-plugins/sidebar/metabar/src/metabar.h index bb2387b..530f687 100644 --- a/konq-plugins/sidebar/metabar/src/metabar.h +++ b/konq-plugins/sidebar/metabar/src/metabar.h @@ -16,7 +16,7 @@ class Metabar : public KonqSidebarPlugin TQ_OBJECT public: - Metabar(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); + Metabar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); ~Metabar(); virtual TQWidget *getWidget(){ return widget; } diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp index d184f58..f7bc152 100644 --- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp @@ -32,7 +32,7 @@ #define RESIZE_SPEED 5 #define RESIZE_STEP 2 -MetabarFunctions::MetabarFunctions(KHTMLPart *html, TQObject *tqparent, const char* name) : TQObject(tqparent, name), m_html(html) +MetabarFunctions::MetabarFunctions(KHTMLPart *html, TQObject *parent, const char* name) : TQObject(parent, name), m_html(html) { timer = new TQTimer(this); connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animate())); @@ -187,9 +187,9 @@ void MetabarFunctions::show(DOM::DOMString item) DOM::HTMLDocument doc = m_html->htmlDocument(); DOM::HTMLElement node = static_cast(doc.getElementById(item)); if(!node.isNull()){ - DOM::HTMLElement tqparent = static_cast(node.parentNode()); + DOM::HTMLElement parent = static_cast(node.parentNode()); - DOM::CSSStyleDeclaration style = tqparent.style(); + DOM::CSSStyleDeclaration style = parent.style(); style.setProperty("display", "block", CSS_PRIORITY); } } @@ -199,9 +199,9 @@ void MetabarFunctions::hide(DOM::DOMString item) DOM::HTMLDocument doc = m_html->htmlDocument(); DOM::HTMLElement node = static_cast(doc.getElementById(item)); if(!node.isNull()){ - DOM::HTMLElement tqparent = static_cast(node.parentNode()); + DOM::HTMLElement parent = static_cast(node.parentNode()); - DOM::CSSStyleDeclaration style = tqparent.style(); + DOM::CSSStyleDeclaration style = parent.style(); style.setProperty("display", "none", CSS_PRIORITY); } } diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.h b/konq-plugins/sidebar/metabar/src/metabarfunctions.h index 96742e5..71afce8 100644 --- a/konq-plugins/sidebar/metabar/src/metabarfunctions.h +++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.h @@ -35,7 +35,7 @@ class MetabarFunctions : public TQObject TQ_OBJECT public: - MetabarFunctions(KHTMLPart *html, TQObject *tqparent = 0, const char* name=0); + MetabarFunctions(KHTMLPart *html, TQObject *parent = 0, const char* name=0); ~MetabarFunctions(); void toggle(DOM::DOMString item); diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp index 2b01a02..0439c98 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp @@ -73,7 +73,7 @@ #define EVENT_TYPE DOM::DOMString("click") #define ACTIVATION 1 -MetabarWidget::MetabarWidget(TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) +MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(parent, name) { skip = false; loadComplete = false; @@ -419,8 +419,8 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg for(uint i = 0; i < list.length(); i++){ DOM::HTMLElement node = static_cast(list.item(i)); if(!node.isNull()){ - DOM::HTMLElement tqparent = static_cast(node.parentNode()); - DOM::CSSStyleDeclaration style = tqparent.style(); + DOM::HTMLElement parent = static_cast(node.parentNode()); + DOM::CSSStyleDeclaration style = parent.style(); DOM::DOMString display = style.getPropertyValue("display"); DOM::DOMString newDisplay = display == "none" ? "block" : "none"; @@ -436,8 +436,8 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg element.setAttribute("style", style); } - DOM::HTMLElement tqparent = static_cast(element.parentNode().parentNode()); - functions->adjustSize(tqparent.id()); + DOM::HTMLElement parent = static_cast(element.parentNode().parentNode()); + functions->adjustSize(parent.id()); } else if(protocol == "function"){ diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h index 4f6d21b..34d0015 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.h +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h @@ -41,7 +41,7 @@ class MetabarWidget : public TQWidget TQ_OBJECT public: - MetabarWidget(TQWidget *tqparent = 0, const char* name=0); + MetabarWidget(TQWidget *parent = 0, const char* name=0); ~MetabarWidget(); void setFileItems(const KFileItemList &items, bool check = true); diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp index 8ef445c..ef190f3 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp +++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp @@ -37,7 +37,7 @@ #include -ServiceLoader::ServiceLoader(TQWidget *tqparent, const char *name) : TQObject(tqparent, name) +ServiceLoader::ServiceLoader(TQWidget *parent, const char *name) : TQObject(parent, name) { popups.setAutoDelete(true); } diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.h b/konq-plugins/sidebar/metabar/src/serviceloader.h index 31f1366..c1f6433 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.h +++ b/konq-plugins/sidebar/metabar/src/serviceloader.h @@ -41,7 +41,7 @@ class ServiceLoader : public TQObject TQ_OBJECT public: - ServiceLoader(TQWidget *tqparent, const char *name = 0); + ServiceLoader(TQWidget *parent, const char *name = 0); ~ServiceLoader(); void loadServices(const KFileItem item, DOM::DOMString &html, int &count); diff --git a/konq-plugins/sidebar/newsticker/configfeeds.cpp b/konq-plugins/sidebar/newsticker/configfeeds.cpp index 5fbc533..dd038b6 100644 --- a/konq-plugins/sidebar/newsticker/configfeeds.cpp +++ b/konq-plugins/sidebar/newsticker/configfeeds.cpp @@ -29,7 +29,7 @@ namespace KSB_News { -ConfigFeeds::ConfigFeeds(TQWidget* tqparent, const char* name) : ConfigFeedsBase(tqparent, name) +ConfigFeeds::ConfigFeeds(TQWidget* parent, const char* name) : ConfigFeedsBase(parent, name) { } diff --git a/konq-plugins/sidebar/newsticker/configfeeds.h b/konq-plugins/sidebar/newsticker/configfeeds.h index 5ca80a7..e0e78ad 100644 --- a/konq-plugins/sidebar/newsticker/configfeeds.h +++ b/konq-plugins/sidebar/newsticker/configfeeds.h @@ -44,7 +44,7 @@ namespace KSB_News { TQ_OBJECT public: - ConfigFeeds(TQWidget* tqparent, const char* name = 0); + ConfigFeeds(TQWidget* parent, const char* name = 0); }; diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp index 35ee14d..99e8fb4 100644 --- a/konq-plugins/sidebar/newsticker/norsswidget.cpp +++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp @@ -37,8 +37,8 @@ namespace KSB_News { - NoRSSWidget::NoRSSWidget(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) { + NoRSSWidget::NoRSSWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name) { TQVBoxLayout *topLayout = new TQVBoxLayout(this); diff --git a/konq-plugins/sidebar/newsticker/norsswidget.h b/konq-plugins/sidebar/newsticker/norsswidget.h index 70ee265..9d2b133 100644 --- a/konq-plugins/sidebar/newsticker/norsswidget.h +++ b/konq-plugins/sidebar/newsticker/norsswidget.h @@ -36,7 +36,7 @@ namespace KSB_News { TQ_OBJECT public: - NoRSSWidget(TQWidget *tqparent = 0, const char *name = 0); + NoRSSWidget(TQWidget *parent = 0, const char *name = 0); private slots: void slotBtnClicked(); diff --git a/konq-plugins/sidebar/newsticker/nspanel.cpp b/konq-plugins/sidebar/newsticker/nspanel.cpp index e58d0c4..56a7c52 100644 --- a/konq-plugins/sidebar/newsticker/nspanel.cpp +++ b/konq-plugins/sidebar/newsticker/nspanel.cpp @@ -35,8 +35,8 @@ namespace KSB_News { //////////////////////////////////////////////////////////////// // ListBox including ToolTip for item //////////////////////////////////////////////////////////////// - TTListBox::TTListBox(TQWidget *tqparent, const char *name, WFlags f) - : KListBox(tqparent, name, f), + TTListBox::TTListBox(TQWidget *parent, const char *name, WFlags f) + : KListBox(parent, name, f), TQToolTip(this) { } @@ -61,9 +61,9 @@ namespace KSB_News { - NSPanel::NSPanel(TQObject *tqparent, const char *name, const TQString &key, + NSPanel::NSPanel(TQObject *parent, const char *name, const TQString &key, DCOPRef *rssservice) - :TQObject(tqparent, name) + :TQObject(parent, name) ,DCOPObject(TQString(TQString("sidebar-newsticker-")+key).latin1()) ,m_listbox() ,m_pixmap() diff --git a/konq-plugins/sidebar/newsticker/nspanel.h b/konq-plugins/sidebar/newsticker/nspanel.h index 01cf1e2..f920199 100644 --- a/konq-plugins/sidebar/newsticker/nspanel.h +++ b/konq-plugins/sidebar/newsticker/nspanel.h @@ -44,7 +44,7 @@ namespace KSB_News { //////////////////////////////////////////////////////////////// class TTListBox : public KListBox, TQToolTip { public: - TTListBox (TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0); + TTListBox (TQWidget *parent = 0, const char *name = 0, WFlags f = 0); void clear(); protected: @@ -59,7 +59,7 @@ namespace KSB_News { K_DCOP public: - NSPanel(TQObject *tqparent, const char *name, const TQString &key, + NSPanel(TQObject *parent, const char *name, const TQString &key, DCOPRef *rssservice); ~NSPanel(); diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp index f8a1c92..6bc6d1a 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp @@ -50,8 +50,8 @@ namespace KSB_News { - NSStackTabWidget::NSStackTabWidget(TQWidget *tqparent, const char *name, - TQPixmap appIcon) : TQWidget(tqparent, name) { + NSStackTabWidget::NSStackTabWidget(TQWidget *parent, const char *name, + TQPixmap appIcon) : TQWidget(parent, name) { currentPage = 0; tqlayout = new TQVBoxLayout(this); diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h index 49650e7..08f0f22 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h @@ -50,7 +50,7 @@ namespace KSB_News { TQ_OBJECT public: - NSStackTabWidget(TQWidget *tqparent = 0, const char *name = 0, + NSStackTabWidget(TQWidget *parent = 0, const char *name = 0, TQPixmap appIcon = TQPixmap()); void addStackTab(NSPanel *nsp, TQWidget *page); void delStackTab(NSPanel *nsp); diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp index d59413d..3e1178f 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp +++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp @@ -46,10 +46,10 @@ namespace KSB_News { - KonqSidebar_News::KonqSidebar_News(KInstance *inst, TQObject *tqparent, + KonqSidebar_News::KonqSidebar_News(KInstance *inst, TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char* name) - : KonqSidebarPlugin(inst, tqparent, widgetParent, desktopName, name), + : KonqSidebarPlugin(inst, parent, widgetParent, desktopName, name), DCOPObject("sidebar-newsticker") { // get the application icon diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.h b/konq-plugins/sidebar/newsticker/sidebar_news.h index 1c92c0e..a0f7e05 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.h +++ b/konq-plugins/sidebar/newsticker/sidebar_news.h @@ -48,7 +48,7 @@ namespace KSB_News { K_DCOP public: - KonqSidebar_News(KInstance *instance, TQObject *tqparent, + KonqSidebar_News(KInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName_, const char* name=0); ~KonqSidebar_News(); diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp index f76f0de..d376d73 100644 --- a/konq-plugins/uachanger/uachangerplugin.cpp +++ b/konq-plugins/uachanger/uachangerplugin.cpp @@ -50,9 +50,9 @@ K_EXPORT_COMPONENT_FACTORY (libuachangerplugin, UAChangerPluginFactory (&aboutda #define TQFL1(x) TQString::tqfromLatin1(x) -UAChangerPlugin::UAChangerPlugin( TQObject* tqparent, const char* name, +UAChangerPlugin::UAChangerPlugin( TQObject* parent, const char* name, const TQStringList & ) - :KParts::Plugin( tqparent, name ), + :KParts::Plugin( parent, name ), m_bSettingsLoaded(false), m_part(0L), m_config(0L) { setInstance(UAChangerPlugin::instance()); @@ -65,9 +65,9 @@ UAChangerPlugin::UAChangerPlugin( TQObject* tqparent, const char* name, m_pUAMenu->setEnabled ( false ); - if ( tqparent && tqparent->inherits( "KHTMLPart" ) ) + if ( parent && parent->inherits( "KHTMLPart" ) ) { - m_part = static_cast(tqparent); + m_part = static_cast(parent); connect( m_part, TQT_SIGNAL(started(KIO::Job*)), this, TQT_SLOT(slotStarted(KIO::Job*)) ); } diff --git a/konq-plugins/uachanger/uachangerplugin.h b/konq-plugins/uachanger/uachangerplugin.h index ef5abd4..3f97516 100644 --- a/konq-plugins/uachanger/uachangerplugin.h +++ b/konq-plugins/uachanger/uachangerplugin.h @@ -44,7 +44,7 @@ class UAChangerPlugin : public KParts::Plugin TQ_OBJECT public: - UAChangerPlugin( TQObject* tqparent, const char* name, + UAChangerPlugin( TQObject* parent, const char* name, const TQStringList & ); ~UAChangerPlugin(); diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp index 6bd4fee..fe61ae3 100644 --- a/konq-plugins/validators/plugin_validators.cpp +++ b/konq-plugins/validators/plugin_validators.cpp @@ -44,9 +44,9 @@ static const KAboutData aboutdata("validatorsplugin", I18N_NOOP("Validate Web Pa K_EXPORT_COMPONENT_FACTORY( libvalidatorsplugin, PluginValidatorsFactory( &aboutdata ) ) -PluginValidators::PluginValidators( TQObject* tqparent, const char* name, +PluginValidators::PluginValidators( TQObject* parent, const char* name, const TQStringList & ) - : Plugin( tqparent, name ), m_configDialog(0), m_part(0) + : Plugin( parent, name ), m_configDialog(0), m_part(0) { setInstance(PluginValidatorsFactory::instance()); @@ -71,14 +71,14 @@ PluginValidators::PluginValidators( TQObject* tqparent, const char* name, m_menu->setEnabled( false ); - if ( tqparent && tqparent->inherits( "KHTMLPart" )) + if ( parent && parent->inherits( "KHTMLPart" )) { m_menu->insert( new KAction( i18n( "C&onfigure Validator..." ), "configure", 0, this, TQT_SLOT(slotConfigure()), actionCollection(), "configure") ); - m_part = static_cast( tqparent ); + m_part = static_cast( parent ); m_configDialog = new ValidatorsDialog( m_part->widget() ); setURLs(); @@ -90,7 +90,7 @@ PluginValidators::PluginValidators( TQObject* tqparent, const char* name, PluginValidators::~PluginValidators() { delete m_configDialog; -// Dont' delete the action. KActionCollection as tqparent does the job already +// Dont' delete the action. KActionCollection as parent does the job already // and not deleting it at this point also ensures that in case we are not unplugged // from the GUI yet and the ~KXMLGUIClient destructor will do so it won't hit a // dead pointer. The kxmlgui factory keeps references to the actions, but it does not @@ -140,8 +140,8 @@ void PluginValidators::slotConfigure() void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl) { - // The tqparent is assumed to be a KHTMLPart - if ( !tqparent()->inherits("KHTMLPart") ) + // The parent is assumed to be a KHTMLPart + if ( !parent()->inherits("KHTMLPart") ) { TQString title = i18n( "Cannot Validate Source" ); TQString text = i18n( "You cannot validate anything except web pages with " diff --git a/konq-plugins/validators/plugin_validators.h b/konq-plugins/validators/plugin_validators.h index 6743d99..2df1e23 100644 --- a/konq-plugins/validators/plugin_validators.h +++ b/konq-plugins/validators/plugin_validators.h @@ -43,7 +43,7 @@ class PluginValidators : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - PluginValidators( TQObject* tqparent, const char* name, + PluginValidators( TQObject* parent, const char* name, const TQStringList & ); virtual ~PluginValidators(); diff --git a/konq-plugins/validators/validatorsdialog.cpp b/konq-plugins/validators/validatorsdialog.cpp index bd0e4d9..864de55 100644 --- a/konq-plugins/validators/validatorsdialog.cpp +++ b/konq-plugins/validators/validatorsdialog.cpp @@ -29,8 +29,8 @@ #include "validatorsdialog.h" #include "validatorsdialog.moc" -ValidatorsDialog::ValidatorsDialog(TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, false, i18n("Configure"), Ok|Cancel, Ok, true ) +ValidatorsDialog::ValidatorsDialog(TQWidget *parent, const char *name ) + : KDialogBase( parent, name, false, i18n("Configure"), Ok|Cancel, Ok, true ) { setCaption(i18n("Configure Validating Servers")); setMinimumWidth(300); diff --git a/konq-plugins/validators/validatorsdialog.h b/konq-plugins/validators/validatorsdialog.h index 345323a..2376a1e 100644 --- a/konq-plugins/validators/validatorsdialog.h +++ b/konq-plugins/validators/validatorsdialog.h @@ -31,7 +31,7 @@ class ValidatorsDialog : public KDialogBase TQ_OBJECT public: - ValidatorsDialog(TQWidget *tqparent=0, const char *name=0 ); + ValidatorsDialog(TQWidget *parent=0, const char *name=0 ); ~ValidatorsDialog(); const TQString getWWWValidatorUrl() const {return m_WWWValidatorCB->currentText();} diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp index 802b2fe..b72ca42 100644 --- a/konq-plugins/webarchiver/archivedialog.cpp +++ b/konq-plugins/webarchiver/archivedialog.cpp @@ -49,9 +49,9 @@ #define CONTENT_TYPE "" -ArchiveDialog::ArchiveDialog(TQWidget *tqparent, const TQString &filename, +ArchiveDialog::ArchiveDialog(TQWidget *parent, const TQString &filename, KHTMLPart *part) : - KDialogBase(tqparent, "WebArchiveDialog", false, i18n("Web Archiver"), + KDialogBase(parent, "WebArchiveDialog", false, i18n("Web Archiver"), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::User1 ), m_bPreserveWS(false), m_tmpFile(0), m_url(part->url()) { diff --git a/konq-plugins/webarchiver/archivedialog.h b/konq-plugins/webarchiver/archivedialog.h index d82b9b0..1a42868 100644 --- a/konq-plugins/webarchiver/archivedialog.h +++ b/konq-plugins/webarchiver/archivedialog.h @@ -44,7 +44,7 @@ class ArchiveDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - ArchiveDialog(TQWidget *tqparent, const TQString &targetFilename, KHTMLPart *part); + ArchiveDialog(TQWidget *parent, const TQString &targetFilename, KHTMLPart *part); ~ArchiveDialog(); void archive(); diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp index 0b6ed68..85d43ee 100644 --- a/konq-plugins/webarchiver/plugin_webarchiver.cpp +++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp @@ -50,9 +50,9 @@ typedef KGenericFactory PluginWebArchiverFactory; K_EXPORT_COMPONENT_FACTORY( libwebarchiverplugin, PluginWebArchiverFactory( "webarchiver" ) ) -PluginWebArchiver::PluginWebArchiver( TQObject* tqparent, const char* name, +PluginWebArchiver::PluginWebArchiver( TQObject* parent, const char* name, const TQStringList & ) - : Plugin( tqparent, name ) + : Plugin( parent, name ) { (void) new KAction( i18n("Archive &Web Page..."), "webarchiver", 0, @@ -67,9 +67,9 @@ PluginWebArchiver::~PluginWebArchiver() void PluginWebArchiver::slotSaveToArchive() { // ## Unicode ok? - if( !tqparent() || !tqparent()->inherits("KHTMLPart")) + if( !parent() || !parent()->inherits("KHTMLPart")) return; - KHTMLPart *part = static_cast( tqparent() ); + KHTMLPart *part = static_cast( parent() ); TQString archiveName = TQString::fromUtf8(part->htmlDocument().title().string().utf8()); diff --git a/konq-plugins/webarchiver/plugin_webarchiver.h b/konq-plugins/webarchiver/plugin_webarchiver.h index 338eec8..754e26b 100644 --- a/konq-plugins/webarchiver/plugin_webarchiver.h +++ b/konq-plugins/webarchiver/plugin_webarchiver.h @@ -31,7 +31,7 @@ class PluginWebArchiver : public KParts::Plugin TQ_OBJECT public: - PluginWebArchiver( TQObject* tqparent, const char* name, + PluginWebArchiver( TQObject* parent, const char* name, const TQStringList & ); virtual ~PluginWebArchiver(); -- cgit v1.2.1