diff options
171 files changed, 376 insertions, 376 deletions
diff --git a/apps/ktorrent/addpeerwidget.cpp b/apps/ktorrent/addpeerwidget.cpp index db9f624..f93be34 100644 --- a/apps/ktorrent/addpeerwidget.cpp +++ b/apps/ktorrent/addpeerwidget.cpp @@ -58,8 +58,8 @@ void ManualPeerSource::signalPeersReady() //AddPeerWidget -AddPeerWidget::AddPeerWidget(kt::TorrentInterface* tc, TQWidget *tqparent, const char *name) - :AddPeerWidgetBase(tqparent, name), m_tc(tc) +AddPeerWidget::AddPeerWidget(kt::TorrentInterface* tc, TQWidget *parent, const char *name) + :AddPeerWidgetBase(parent, name), m_tc(tc) { if(!tc) { diff --git a/apps/ktorrent/addpeerwidget.h b/apps/ktorrent/addpeerwidget.h index 6983d39..d0c23f5 100644 --- a/apps/ktorrent/addpeerwidget.h +++ b/apps/ktorrent/addpeerwidget.h @@ -81,7 +81,7 @@ class AddPeerWidget: public AddPeerWidgetBase Q_OBJECT TQ_OBJECT public: - AddPeerWidget(kt::TorrentInterface* tc, TQWidget *tqparent = 0, const char *name = 0); + AddPeerWidget(kt::TorrentInterface* tc, TQWidget *parent = 0, const char *name = 0); ~AddPeerWidget(); public slots: diff --git a/apps/ktorrent/fileselectdlg.cpp b/apps/ktorrent/fileselectdlg.cpp index c84bcc9..5f0e33d 100644 --- a/apps/ktorrent/fileselectdlg.cpp +++ b/apps/ktorrent/fileselectdlg.cpp @@ -49,8 +49,8 @@ using namespace kt; -FileSelectDlg::FileSelectDlg(GroupManager* gm, bool* user, bool* start, TQWidget* tqparent, const char* name, bool modal, WFlags fl) - : FileSelectDlgBase(tqparent, name, modal, fl), m_gman(gm), m_user(user), m_start(start) +FileSelectDlg::FileSelectDlg(GroupManager* gm, bool* user, bool* start, TQWidget* parent, const char* name, bool modal, WFlags fl) + : FileSelectDlgBase(parent, name, modal, fl), m_gman(gm), m_user(user), m_start(start) { root = 0; connect(m_select_all, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectAll())); diff --git a/apps/ktorrent/fileselectdlg.h b/apps/ktorrent/fileselectdlg.h index 684a2c8..2fc4393 100644 --- a/apps/ktorrent/fileselectdlg.h +++ b/apps/ktorrent/fileselectdlg.h @@ -54,7 +54,7 @@ class FileSelectDlg : public FileSelectDlgBase, public kt::FileTreeRootListener bool* m_start; public: - FileSelectDlg(kt::GroupManager* gm, bool* user, bool* start, TQWidget* tqparent = 0, const char* name = 0, + FileSelectDlg(kt::GroupManager* gm, bool* user, bool* start, TQWidget* parent = 0, const char* name = 0, bool modal = true, WFlags fl = 0); virtual ~FileSelectDlg(); diff --git a/apps/ktorrent/filterbar.cpp b/apps/ktorrent/filterbar.cpp index dc59945..0be4049 100644 --- a/apps/ktorrent/filterbar.cpp +++ b/apps/ktorrent/filterbar.cpp @@ -34,8 +34,8 @@ -FilterBar::FilterBar(TQWidget *tqparent, const char *name) : - TQWidget(tqparent, name) +FilterBar::FilterBar(TQWidget *parent, const char *name) : + TQWidget(parent, name) { const int gap = 3; diff --git a/apps/ktorrent/filterbar.h b/apps/ktorrent/filterbar.h index e04a73a..4fc5d5a 100644 --- a/apps/ktorrent/filterbar.h +++ b/apps/ktorrent/filterbar.h @@ -45,7 +45,7 @@ class FilterBar : public TQWidget TQ_OBJECT public: - FilterBar ( TQWidget *tqparent = 0, const char *name = 0 ); + FilterBar ( TQWidget *parent = 0, const char *name = 0 ); virtual ~FilterBar(); bool matchesFilter(kt::TorrentInterface* tc); diff --git a/apps/ktorrent/groups/groupview.cpp b/apps/ktorrent/groups/groupview.cpp index 1918de6..11a6aa6 100644 --- a/apps/ktorrent/groups/groupview.cpp +++ b/apps/ktorrent/groups/groupview.cpp @@ -41,13 +41,13 @@ using namespace bt; namespace kt { - GroupViewItem::GroupViewItem(GroupView* tqparent,Group* g) : KListViewItem(tqparent),gview(tqparent) + GroupViewItem::GroupViewItem(GroupView* parent,Group* g) : KListViewItem(parent),gview(parent) { setText(0,g->groupName()); setPixmap(0,g->groupIcon()); } - GroupViewItem::GroupViewItem(GroupView* gview,KListViewItem* tqparent,Group* g) : KListViewItem(tqparent),gview(gview) + GroupViewItem::GroupViewItem(GroupView* gview,KListViewItem* parent,Group* g) : KListViewItem(parent),gview(gview) { setText(0,g->groupName()); setPixmap(0,g->groupIcon()); @@ -65,8 +65,8 @@ namespace kt return TQString::compare(text(1),i->text(1)); } - GroupView::GroupView(ViewManager* view,KActionCollection* col,TQWidget *tqparent, const char *name) - : KListView(tqparent, name),view(view),custom_root(0) + GroupView::GroupView(ViewManager* view,KActionCollection* col,TQWidget *parent, const char *name) + : KListView(parent, name),view(view),custom_root(0) { setFullWidth(true); setRootIsDecorated(true); @@ -226,12 +226,12 @@ namespace kt } } - GroupViewItem* GroupView::addGroup(Group* g,KListViewItem* tqparent) + GroupViewItem* GroupView::addGroup(Group* g,KListViewItem* parent) { GroupViewItem* li = 0; - if (tqparent) + if (parent) { - li = new GroupViewItem(this,tqparent,g); + li = new GroupViewItem(this,parent,g); } else { @@ -240,7 +240,7 @@ namespace kt } groups.insert(li,g); - if (custom_root && custom_root->childCount() == 1 && custom_root == tqparent) + if (custom_root && custom_root->childCount() == 1 && custom_root == parent) setOpen(custom_root,true); return li; diff --git a/apps/ktorrent/groups/groupview.h b/apps/ktorrent/groups/groupview.h index d78f318..2805548 100644 --- a/apps/ktorrent/groups/groupview.h +++ b/apps/ktorrent/groups/groupview.h @@ -40,8 +40,8 @@ namespace kt Group* g; GroupView* gview; public: - GroupViewItem(GroupView* tqparent,Group* g); - GroupViewItem(GroupView* gview,KListViewItem* tqparent,Group* g); + GroupViewItem(GroupView* parent,Group* g); + GroupViewItem(GroupView* gview,KListViewItem* parent,Group* g); virtual ~GroupViewItem(); virtual int compare(TQListViewItem* i,int col,bool ascending) const; @@ -55,7 +55,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - GroupView(ViewManager* view,KActionCollection* col,TQWidget *tqparent = 0, const char *name = 0); + GroupView(ViewManager* view,KActionCollection* col,TQWidget *parent = 0, const char *name = 0); virtual ~GroupView(); /// Get the current group @@ -100,7 +100,7 @@ namespace kt private: void createMenu(KActionCollection* col); - GroupViewItem* addGroup(Group* g,KListViewItem* tqparent); + GroupViewItem* addGroup(Group* g,KListViewItem* parent); private: ViewManager* view; diff --git a/apps/ktorrent/ipfilterwidget.cpp b/apps/ktorrent/ipfilterwidget.cpp index b15c035..76ba43f 100644 --- a/apps/ktorrent/ipfilterwidget.cpp +++ b/apps/ktorrent/ipfilterwidget.cpp @@ -40,8 +40,8 @@ using namespace bt; -IPFilterWidget::IPFilterWidget(TQWidget *tqparent, const char *name) - :BlacklistWidgetBase(tqparent, name) +IPFilterWidget::IPFilterWidget(TQWidget *parent, const char *name) + :BlacklistWidgetBase(parent, name) { IPBlocklist& ipfilter = IPBlocklist::instance(); TQStringList* blocklist = ipfilter.getBlocklist(); diff --git a/apps/ktorrent/ipfilterwidget.h b/apps/ktorrent/ipfilterwidget.h index 1dadc3f..d03da92 100644 --- a/apps/ktorrent/ipfilterwidget.h +++ b/apps/ktorrent/ipfilterwidget.h @@ -32,7 +32,7 @@ class IPFilterWidget: public BlacklistWidgetBase Q_OBJECT TQ_OBJECT public: - IPFilterWidget(TQWidget *tqparent = 0, const char *name = 0); + IPFilterWidget(TQWidget *parent = 0, const char *name = 0); virtual void btnApply_clicked(); virtual void btnOk_clicked(); diff --git a/apps/ktorrent/ktorrentview.cpp b/apps/ktorrent/ktorrentview.cpp index 6c963bf..624c508 100644 --- a/apps/ktorrent/ktorrentview.cpp +++ b/apps/ktorrent/ktorrentview.cpp @@ -55,7 +55,7 @@ using namespace bt; using namespace kt; -TorrentView::TorrentView(KTorrentView* tqparent) : KListView(tqparent),ktview(tqparent) +TorrentView::TorrentView(KTorrentView* parent) : KListView(parent),ktview(parent) {} TorrentView::~TorrentView() @@ -82,8 +82,8 @@ bool TorrentView::eventFilter(TQObject* watched, TQEvent* e) return KListView::eventFilter(watched, e); } -KTorrentView::KTorrentView(TQWidget *tqparent) - : TQWidget(tqparent),menu(0),current_group(0),running(0),total(0),view(0),filter_bar(0) +KTorrentView::KTorrentView(TQWidget *parent) + : TQWidget(parent),menu(0),current_group(0),running(0),total(0),view(0),filter_bar(0) { TQVBoxLayout* tqlayout = new TQVBoxLayout(this); tqlayout->setAutoAdd(true); diff --git a/apps/ktorrent/ktorrentview.h b/apps/ktorrent/ktorrentview.h index fea5b4f..0e2de7e 100644 --- a/apps/ktorrent/ktorrentview.h +++ b/apps/ktorrent/ktorrentview.h @@ -48,7 +48,7 @@ using namespace bt; class TorrentView : public KListView { public: - TorrentView(KTorrentView* tqparent); + TorrentView(KTorrentView* parent); virtual ~TorrentView(); virtual bool eventFilter(TQObject* watched, TQEvent* e); @@ -81,7 +81,7 @@ public: /** * Default constructor */ - KTorrentView(TQWidget *tqparent); + KTorrentView(TQWidget *parent); /** * Destructor diff --git a/apps/ktorrent/ktorrentviewitem.cpp b/apps/ktorrent/ktorrentviewitem.cpp index 6709088..1156b88 100644 --- a/apps/ktorrent/ktorrentviewitem.cpp +++ b/apps/ktorrent/ktorrentviewitem.cpp @@ -116,10 +116,10 @@ static double Percentage(const TorrentStats & s) -KTorrentViewItem::KTorrentViewItem(KTorrentView* tqparent,TorrentInterface* tc) - : KListViewItem(tqparent->listView()),tc(tc) +KTorrentViewItem::KTorrentViewItem(KTorrentView* parent,TorrentInterface* tc) + : KListViewItem(parent->listView()),tc(tc) { - m_parent = tqparent; + m_parent = parent; update(); } diff --git a/apps/ktorrent/ktorrentviewitem.h b/apps/ktorrent/ktorrentviewitem.h index b38710c..65ca29b 100644 --- a/apps/ktorrent/ktorrentviewitem.h +++ b/apps/ktorrent/ktorrentviewitem.h @@ -39,7 +39,7 @@ class KTorrentViewItem : public KListViewItem kt::TorrentInterface* tc; bt::Int64 eta; public: - KTorrentViewItem(KTorrentView* tqparent,kt::TorrentInterface* tc); + KTorrentViewItem(KTorrentView* parent,kt::TorrentInterface* tc); virtual ~KTorrentViewItem(); kt::TorrentInterface* getTC() {return tc;} diff --git a/apps/ktorrent/ktorrentviewmenu.cpp b/apps/ktorrent/ktorrentviewmenu.cpp index 96e2c94..9dee4ce 100644 --- a/apps/ktorrent/ktorrentviewmenu.cpp +++ b/apps/ktorrent/ktorrentviewmenu.cpp @@ -28,76 +28,76 @@ using namespace kt; -KTorrentViewMenu::KTorrentViewMenu (KTorrentView *tqparent, const char *name ) - : KPopupMenu ( tqparent, name ),view(tqparent) +KTorrentViewMenu::KTorrentViewMenu (KTorrentView *parent, const char *name ) + : KPopupMenu ( parent, name ),view(parent) { KIconLoader* iload = KGlobal::iconLoader(); stop_id = insertItem( iload->loadIconSet("ktstop",KIcon::Small),i18n("to stop", "Stop"), - tqparent,TQT_SLOT(stopDownloads())); + parent,TQT_SLOT(stopDownloads())); start_id = insertItem( iload->loadIconSet("ktstart",KIcon::Small),i18n("to start", "Start"), - tqparent,TQT_SLOT(startDownloads())); + parent,TQT_SLOT(startDownloads())); remove_id = insertItem( iload->loadIconSet("ktremove",KIcon::Small),i18n("Remove Torrent"), - tqparent,TQT_SLOT(removeDownloads())); + parent,TQT_SLOT(removeDownloads())); remove_all_id = insertItem( iload->loadIconSet("ktremove",KIcon::Small),i18n("Remove Torrent and Data"), - tqparent,TQT_SLOT(removeDownloadsAndData())); + parent,TQT_SLOT(removeDownloadsAndData())); queue_id = insertItem( iload->loadIconSet("player_playlist",KIcon::Small),i18n("Enqueue/Dequeue"), - tqparent,TQT_SLOT(queueSlot())); + parent,TQT_SLOT(queueSlot())); insertSeparator(); add_peer_id = insertItem( iload->loadIconSet("add", KIcon::Small), i18n("Add Peers"), - tqparent, TQT_SLOT(showAddPeersWidget())); + parent, TQT_SLOT(showAddPeersWidget())); peer_sources_menu = new KPopupMenu(this); peer_sources_id = insertItem(i18n("Additional Peer Sources"), peer_sources_menu); peer_sources_menu->insertTitle(i18n("Torrent Peer Sources:")); peer_sources_menu->setCheckable(true); - dht_id = peer_sources_menu->insertItem(i18n("DHT"), tqparent, TQT_SLOT(dhtSlot())); - ut_pex_id = peer_sources_menu->insertItem(i18n("Peer Exchange"), tqparent, TQT_SLOT(utPexSlot())); + dht_id = peer_sources_menu->insertItem(i18n("DHT"), parent, TQT_SLOT(dhtSlot())); + ut_pex_id = peer_sources_menu->insertItem(i18n("Peer Exchange"), parent, TQT_SLOT(utPexSlot())); insertSeparator(); announce_id = insertItem( iload->loadIconSet("apply",KIcon::Small),i18n("Manual Announce"), - tqparent,TQT_SLOT(manualAnnounce())); + parent,TQT_SLOT(manualAnnounce())); preview_id = insertItem( iload->loadIconSet("frame_image",KIcon::Small),i18n("Preview"), - tqparent, TQT_SLOT(previewFiles())); + parent, TQT_SLOT(previewFiles())); insertSeparator(); dirs_sub_menu = new KPopupMenu(this); dirs_id = insertItem(i18n("Open Directory"), dirs_sub_menu); outputdir_id = dirs_sub_menu->insertItem(iload->loadIconSet("folder",KIcon::Small), i18n("Data Directory"), - tqparent, TQT_SLOT(openOutputDirectory())); + parent, TQT_SLOT(openOutputDirectory())); torxdir_id = dirs_sub_menu->insertItem(iload->loadIconSet("folder",KIcon::Small), i18n("Temporary Directory"), - tqparent, TQT_SLOT(openTorXDirectory())); + parent, TQT_SLOT(openTorXDirectory())); - downloaddir_id = insertItem(i18n("Set Download Location"), tqparent, TQT_SLOT(setDownloadLocationSlot())); + downloaddir_id = insertItem(i18n("Set Download Location"), parent, TQT_SLOT(setDownloadLocationSlot())); insertSeparator(); - remove_from_group_id = insertItem(i18n("Remove From Group"),tqparent, TQT_SLOT(removeFromGroup())); + remove_from_group_id = insertItem(i18n("Remove From Group"),parent, TQT_SLOT(removeFromGroup())); groups_sub_menu = new KPopupMenu(this); add_to_group_id = insertItem(i18n("Add to Group"),groups_sub_menu); insertSeparator(); - scan_id = insertItem(i18n("Check Data Integrity"),tqparent, TQT_SLOT(checkDataIntegrity())); + scan_id = insertItem(i18n("Check Data Integrity"),parent, TQT_SLOT(checkDataIntegrity())); connect(groups_sub_menu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(gsmItemActived(int))); - traffic_lim_id = insertItem(i18n("Speed Limits"),tqparent,TQT_SLOT(speedLimits())); + traffic_lim_id = insertItem(i18n("Speed Limits"),parent,TQT_SLOT(speedLimits())); } diff --git a/apps/ktorrent/ktorrentviewmenu.h b/apps/ktorrent/ktorrentviewmenu.h index 313d9bf..f6f0263 100644 --- a/apps/ktorrent/ktorrentviewmenu.h +++ b/apps/ktorrent/ktorrentviewmenu.h @@ -32,7 +32,7 @@ class KTorrentViewMenu : public KPopupMenu Q_OBJECT TQ_OBJECT public: - KTorrentViewMenu(KTorrentView *tqparent, const char *name = 0 ); + KTorrentViewMenu(KTorrentView *parent, const char *name = 0 ); virtual ~KTorrentViewMenu(); /// Show the menu at the given point diff --git a/apps/ktorrent/newui/button.cpp b/apps/ktorrent/newui/button.cpp index e24b359..a68aeab 100644 --- a/apps/ktorrent/newui/button.cpp +++ b/apps/ktorrent/newui/button.cpp @@ -39,10 +39,10 @@ namespace Ideal { -Button::Button(ButtonBar *tqparent, const TQString text, const TQIconSet &icon, +Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, const TQString &description) - :TQPushButton(icon, text, tqparent), m_buttonBar(tqparent), m_description(description), - m_place(tqparent->place()), m_realText(text), m_realIconSet(icon) + :TQPushButton(icon, text, parent), m_buttonBar(parent), m_description(description), + m_place(parent->place()), m_realText(text), m_realIconSet(icon) { hide(); setFlat(true); diff --git a/apps/ktorrent/newui/button.h b/apps/ktorrent/newui/button.h index fd668f8..86e27c2 100644 --- a/apps/ktorrent/newui/button.h +++ b/apps/ktorrent/newui/button.h @@ -41,7 +41,7 @@ class Button : public TQPushButton { Q_OBJECT TQ_OBJECT public: - Button(ButtonBar *tqparent, const TQString text, const TQIconSet &icon = TQIconSet(), + Button(ButtonBar *parent, const TQString text, const TQIconSet &icon = TQIconSet(), const TQString &description = TQString()); /**Sets the description used as a tooltip.*/ diff --git a/apps/ktorrent/newui/buttonbar.cpp b/apps/ktorrent/newui/buttonbar.cpp index 8d043f5..80da533 100644 --- a/apps/ktorrent/newui/buttonbar.cpp +++ b/apps/ktorrent/newui/buttonbar.cpp @@ -32,8 +32,8 @@ namespace Ideal { //ButtonLayout class -ButtonLayout::ButtonLayout(ButtonBar *tqparent, Direction d, int margin, int spacing, const char *name) - :TQBoxLayout(tqparent, d, margin, spacing, name), m_buttonBar(tqparent) +ButtonLayout::ButtonLayout(ButtonBar *parent, Direction d, int margin, int spacing, const char *name) + :TQBoxLayout(parent, d, margin, spacing, name), m_buttonBar(parent) { } @@ -62,8 +62,8 @@ TQSize ButtonLayout::tqminimumSize() const //ButtonBar class -ButtonBar::ButtonBar(Place place, ButtonMode mode, TQWidget *tqparent, const char *name) - :TQWidget(tqparent, name), m_place(place), l(0), m_shrinked(false), m_autoResize(true) +ButtonBar::ButtonBar(Place place, ButtonMode mode, TQWidget *parent, const char *name) + :TQWidget(parent, name), m_place(place), l(0), m_shrinked(false), m_autoResize(true) { switch (m_place) { diff --git a/apps/ktorrent/newui/buttonbar.h b/apps/ktorrent/newui/buttonbar.h index 7e25278..5f11d97 100644 --- a/apps/ktorrent/newui/buttonbar.h +++ b/apps/ktorrent/newui/buttonbar.h @@ -37,7 +37,7 @@ class ButtonBar; Overrides tqminimumSize method to allow shrinking button bar buttons.*/ class ButtonLayout: public TQBoxLayout{ public: - ButtonLayout(ButtonBar *tqparent, Direction d, int margin = 0, int spacing = -1, const char * name = 0); + ButtonLayout(ButtonBar *parent, Direction d, int margin = 0, int spacing = -1, const char * name = 0); virtual TQSize tqminimumSize() const; @@ -56,7 +56,7 @@ class ButtonBar : public TQWidget { TQ_OBJECT public: ButtonBar(Place place, ButtonMode mode = IconsAndText, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); virtual ~ButtonBar(); /**Adds a button to the bar.*/ diff --git a/apps/ktorrent/newui/ddockwindow.cpp b/apps/ktorrent/newui/ddockwindow.cpp index 2d473f6..6fd9b88 100644 --- a/apps/ktorrent/newui/ddockwindow.cpp +++ b/apps/ktorrent/newui/ddockwindow.cpp @@ -39,9 +39,9 @@ #include "button.h" #include "dmainwindow.h" -DDockWindow::DDockWindow(DMainWindow *tqparent, Position position) - :TQDockWindow(TQDockWindow::InDock, tqparent), m_position(position), m_visible(false), - m_mainWindow(tqparent), m_doNotCloseActiveWidget(false), m_toggledButton(0), m_lastContextMenuButton(0) +DDockWindow::DDockWindow(DMainWindow *parent, Position position) + :TQDockWindow(TQDockWindow::InDock, parent), m_position(position), m_visible(false), + m_mainWindow(parent), m_doNotCloseActiveWidget(false), m_toggledButton(0), m_lastContextMenuButton(0) { setMovingEnabled(false); setResizeEnabled(true); @@ -347,7 +347,7 @@ bool DDockWindow::isActive() else { do { - w = (TQWidget*)w->tqparent(); + w = (TQWidget*)w->parent(); if (w && (w == toolWidget)) return true; } while (w); } diff --git a/apps/ktorrent/newui/ddockwindow.h b/apps/ktorrent/newui/ddockwindow.h index daecc60..e6427e0 100644 --- a/apps/ktorrent/newui/ddockwindow.h +++ b/apps/ktorrent/newui/ddockwindow.h @@ -44,7 +44,7 @@ class DDockWindow : public TQDockWindow { public: enum Position { Bottom, Left, Right }; - DDockWindow(DMainWindow *tqparent, Position position); + DDockWindow(DMainWindow *parent, Position position); virtual ~DDockWindow(); virtual void setVisible(bool v); diff --git a/apps/ktorrent/newui/dmainwindow.cpp b/apps/ktorrent/newui/dmainwindow.cpp index ba1d7e6..7ccc689 100644 --- a/apps/ktorrent/newui/dmainwindow.cpp +++ b/apps/ktorrent/newui/dmainwindow.cpp @@ -29,8 +29,8 @@ #include "dtabwidget.h" #include "docksplitter.h" -DMainWindow::DMainWindow(TQWidget *tqparent, const char *name) - :KParts::MainWindow(tqparent, name), m_firstRemoved(false), m_currentWidget(0) +DMainWindow::DMainWindow(TQWidget *parent, const char *name) + :KParts::MainWindow(parent, name), m_firstRemoved(false), m_currentWidget(0) { loadSettings(); createToolWindows(); diff --git a/apps/ktorrent/newui/dmainwindow.h b/apps/ktorrent/newui/dmainwindow.h index edcdb32..e677281 100644 --- a/apps/ktorrent/newui/dmainwindow.h +++ b/apps/ktorrent/newui/dmainwindow.h @@ -35,7 +35,7 @@ class DMainWindow: public KParts::MainWindow { Q_OBJECT TQ_OBJECT public: - DMainWindow(TQWidget *tqparent = 0, const char *name = 0); + DMainWindow(TQWidget *parent = 0, const char *name = 0); virtual ~DMainWindow(); /**@return The tool window in given @p position.*/ diff --git a/apps/ktorrent/newui/docksplitter.cpp b/apps/ktorrent/newui/docksplitter.cpp index b41a5b1..14d321e 100644 --- a/apps/ktorrent/newui/docksplitter.cpp +++ b/apps/ktorrent/newui/docksplitter.cpp @@ -23,8 +23,8 @@ namespace Ideal { -DockSplitter::DockSplitter(Qt::Orientation orientation, TQWidget *tqparent, const char *name) - :TQSplitter(tqparent, name), m_orientation(orientation) +DockSplitter::DockSplitter(Qt::Orientation orientation, TQWidget *parent, const char *name) + :TQSplitter(parent, name), m_orientation(orientation) { switch (m_orientation) { diff --git a/apps/ktorrent/newui/docksplitter.h b/apps/ktorrent/newui/docksplitter.h index a9569d3..87f56b6 100644 --- a/apps/ktorrent/newui/docksplitter.h +++ b/apps/ktorrent/newui/docksplitter.h @@ -34,7 +34,7 @@ class DockSplitter: public TQSplitter { Q_OBJECT TQ_OBJECT public: - DockSplitter(Qt::Orientation orientation, TQWidget *tqparent = 0, const char *name = 0); + DockSplitter(Qt::Orientation orientation, TQWidget *parent = 0, const char *name = 0); ~DockSplitter(); void addDock(uint row, uint col, TQWidget *dock); diff --git a/apps/ktorrent/newui/dtabwidget.cpp b/apps/ktorrent/newui/dtabwidget.cpp index 42fffd3..455b820 100644 --- a/apps/ktorrent/newui/dtabwidget.cpp +++ b/apps/ktorrent/newui/dtabwidget.cpp @@ -26,8 +26,8 @@ #include <kiconloader.h> #include <kapplication.h> -DTabWidget::DTabWidget(TQWidget *tqparent, const char *name) - :KTabWidget(tqparent, name), m_closeButton(0) +DTabWidget::DTabWidget(TQWidget *parent, const char *name) + :KTabWidget(parent, name), m_closeButton(0) { setFocusPolicy(TQ_NoFocus); setMargin(0); diff --git a/apps/ktorrent/newui/dtabwidget.h b/apps/ktorrent/newui/dtabwidget.h index 3fa3945..cf939eb 100644 --- a/apps/ktorrent/newui/dtabwidget.h +++ b/apps/ktorrent/newui/dtabwidget.h @@ -28,7 +28,7 @@ class DTabWidget: public KTabWidget { Q_OBJECT TQ_OBJECT public: - DTabWidget(TQWidget *tqparent=0, const char *name=0); + DTabWidget(TQWidget *parent=0, const char *name=0); /**@return The close button at the top right corner. May be 0 if the configuration do not allow close buttons or the tabbar.*/ diff --git a/apps/ktorrent/pastedialog.cpp b/apps/ktorrent/pastedialog.cpp index 91587d5..7d3bff9 100644 --- a/apps/ktorrent/pastedialog.cpp +++ b/apps/ktorrent/pastedialog.cpp @@ -29,8 +29,8 @@ #include <kmessagebox.h> #include <klocale.h> -PasteDialog::PasteDialog(KTorrentCore* core, TQWidget *tqparent, const char *name) - :PasteDlgBase(tqparent, name) +PasteDialog::PasteDialog(KTorrentCore* core, TQWidget *parent, const char *name) + :PasteDlgBase(parent, name) { m_core = core; TQClipboard *cb = TQApplication::tqclipboard(); diff --git a/apps/ktorrent/pastedialog.h b/apps/ktorrent/pastedialog.h index e2699f1..03cbdfe 100644 --- a/apps/ktorrent/pastedialog.h +++ b/apps/ktorrent/pastedialog.h @@ -36,7 +36,7 @@ public slots: virtual void btnOK_clicked(); public: - PasteDialog(KTorrentCore* core, TQWidget *tqparent = 0, const char *name = 0); + PasteDialog(KTorrentCore* core, TQWidget *parent = 0, const char *name = 0); private: KTorrentCore* m_core; diff --git a/apps/ktorrent/pref.cpp b/apps/ktorrent/pref.cpp index bd92ba8..4fbc0fd 100644 --- a/apps/ktorrent/pref.cpp +++ b/apps/ktorrent/pref.cpp @@ -152,9 +152,9 @@ DownloadPrefPage::~ DownloadPrefPage() delete dp; } -void DownloadPrefPage::createWidget(TQWidget* tqparent) +void DownloadPrefPage::createWidget(TQWidget* parent) { - dp = new DownloadPref(tqparent); + dp = new DownloadPref(parent); updateData(); } @@ -222,9 +222,9 @@ GeneralPrefPage::~GeneralPrefPage() delete gp; } -void GeneralPrefPage::createWidget(TQWidget* tqparent) +void GeneralPrefPage::createWidget(TQWidget* parent) { - gp = new GeneralPref(tqparent); + gp = new GeneralPref(parent); updateData(); connect(gp->custom_ip_check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(customIPChecked(bool))); @@ -459,9 +459,9 @@ void AdvancedPrefPage::updateData() ap->max_con_setups->setValue(Settings::maxConnectingSockets()); } -void AdvancedPrefPage::createWidget(TQWidget* tqparent) +void AdvancedPrefPage::createWidget(TQWidget* parent) { - ap = new AdvancedPref(tqparent); + ap = new AdvancedPref(parent); updateData(); connect(ap->no_recheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(noDataCheckChecked(bool))); diff --git a/apps/ktorrent/pref.h b/apps/ktorrent/pref.h index b100595..121bce7 100644 --- a/apps/ktorrent/pref.h +++ b/apps/ktorrent/pref.h @@ -44,7 +44,7 @@ public: virtual bool apply(); virtual void updateData(); - virtual void createWidget(TQWidget* tqparent); + virtual void createWidget(TQWidget* parent); virtual void deleteWidget(); }; @@ -59,7 +59,7 @@ public: virtual bool apply(); virtual void updateData(); - virtual void createWidget(TQWidget* tqparent); + virtual void createWidget(TQWidget* parent); virtual void deleteWidget(); private slots: @@ -81,7 +81,7 @@ public: virtual bool apply(); virtual void updateData(); - virtual void createWidget(TQWidget* tqparent); + virtual void createWidget(TQWidget* parent); virtual void deleteWidget(); private slots: diff --git a/apps/ktorrent/queuedialog.cpp b/apps/ktorrent/queuedialog.cpp index 2761770..508789b 100644 --- a/apps/ktorrent/queuedialog.cpp +++ b/apps/ktorrent/queuedialog.cpp @@ -44,8 +44,8 @@ using namespace bt; using namespace kt; -QueueItem::QueueItem(kt::TorrentInterface* t, TQListView* tqparent) - :TQListViewItem(tqparent), tc(t) +QueueItem::QueueItem(kt::TorrentInterface* t, TQListView* parent) + :TQListViewItem(parent), tc(t) { setPriority(tc->getPriority()); setText(0, TQString(tc->getStats().torrent_name)); @@ -95,8 +95,8 @@ void QueueItem::paintCell(TQPainter* p,const TQColorGroup & cg,int column,int wi TQListViewItem::paintCell(p,colorGrp,column,width,align); } -QueueDialog::QueueDialog(bt::QueueManager* qm, TQWidget *tqparent, const char *name) - :QueueDlg(tqparent, name) +QueueDialog::QueueDialog(bt::QueueManager* qm, TQWidget *parent, const char *name) + :QueueDlg(parent, name) { KIconLoader* iload = KGlobal::iconLoader(); diff --git a/apps/ktorrent/queuedialog.h b/apps/ktorrent/queuedialog.h index c997556..b672fa9 100644 --- a/apps/ktorrent/queuedialog.h +++ b/apps/ktorrent/queuedialog.h @@ -30,7 +30,7 @@ class QueueItem: public TQListViewItem { public: - QueueItem(kt::TorrentInterface* t, TQListView* tqparent); + QueueItem(kt::TorrentInterface* t, TQListView* parent); int getPriority() { return torrentPriority; } void setPriority(int p); @@ -53,7 +53,7 @@ class QueueDialog: public QueueDlg Q_OBJECT TQ_OBJECT public: - QueueDialog(bt::QueueManager* qm, TQWidget *tqparent = 0, const char *name = 0); + QueueDialog(bt::QueueManager* qm, TQWidget *parent = 0, const char *name = 0); public slots: virtual void btnMoveUp_clicked(); virtual void btnClose_clicked(); diff --git a/apps/ktorrent/scandialog.cpp b/apps/ktorrent/scandialog.cpp index ceabf53..292c1ea 100644 --- a/apps/ktorrent/scandialog.cpp +++ b/apps/ktorrent/scandialog.cpp @@ -36,8 +36,8 @@ using namespace kt; ScanDialog::ScanDialog(KTorrentCore* core,bool auto_import, - TQWidget* tqparent, const char* name, bool modal, WFlags fl) - : ScanDlgBase(tqparent,name, modal,fl),DataCheckerListener(auto_import),mutex(true),core(core) + TQWidget* parent, const char* name, bool modal, WFlags fl) + : ScanDlgBase(parent,name, modal,fl),DataCheckerListener(auto_import),mutex(true),core(core) { m_cancel->setGuiItem(KStdGuiItem::cancel()); connect(m_cancel,TQT_SIGNAL(clicked()),this,TQT_SLOT(onCancelPressed())); diff --git a/apps/ktorrent/scandialog.h b/apps/ktorrent/scandialog.h index bf1fe97..5d3b512 100644 --- a/apps/ktorrent/scandialog.h +++ b/apps/ktorrent/scandialog.h @@ -39,7 +39,7 @@ class ScanDialog : public ScanDlgBase, public bt::DataCheckerListener Q_OBJECT TQ_OBJECT public: - ScanDialog(KTorrentCore* core,bool auto_import,TQWidget* tqparent = 0, const char* name = 0, bool modal = false, WFlags fl = WDestructiveClose ); + ScanDialog(KTorrentCore* core,bool auto_import,TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = WDestructiveClose ); virtual ~ScanDialog(); /// Starts the scan thread diff --git a/apps/ktorrent/speedlimitsdlg.cpp b/apps/ktorrent/speedlimitsdlg.cpp index ad22a54..5fbe5b4 100644 --- a/apps/ktorrent/speedlimitsdlg.cpp +++ b/apps/ktorrent/speedlimitsdlg.cpp @@ -30,8 +30,8 @@ using namespace bt; using namespace kt; -SpeedLimitsDlg::SpeedLimitsDlg(kt::TorrentInterface* ti,TQWidget* tqparent, const char* name) - : SpeedLimitsDlgBase(tqparent,name,true,0),tor(ti) +SpeedLimitsDlg::SpeedLimitsDlg(kt::TorrentInterface* ti,TQWidget* parent, const char* name) + : SpeedLimitsDlgBase(parent,name,true,0),tor(ti) { m_main_caption->setText(i18n("Speed limits for <b>%1</b>:").tqarg(tor->getStats().torrent_name)); Uint32 up,down; diff --git a/apps/ktorrent/speedlimitsdlg.h b/apps/ktorrent/speedlimitsdlg.h index 7f3c213..ec1d4b7 100644 --- a/apps/ktorrent/speedlimitsdlg.h +++ b/apps/ktorrent/speedlimitsdlg.h @@ -35,7 +35,7 @@ class SpeedLimitsDlg : public SpeedLimitsDlgBase kt::TorrentInterface* tor; public: - SpeedLimitsDlg(kt::TorrentInterface* ti,TQWidget* tqparent = 0, const char* name = 0); + SpeedLimitsDlg(kt::TorrentInterface* ti,TQWidget* parent = 0, const char* name = 0); virtual ~SpeedLimitsDlg(); diff --git a/apps/ktorrent/torrentcreatordlg.cpp b/apps/ktorrent/torrentcreatordlg.cpp index 22b76d1..d42c06f 100644 --- a/apps/ktorrent/torrentcreatordlg.cpp +++ b/apps/ktorrent/torrentcreatordlg.cpp @@ -28,8 +28,8 @@ #include <torrent/globals.h> #include <kademlia/dhtbase.h> -TorrentCreatorDlg::TorrentCreatorDlg(KTorrentCore* core,TQWidget *tqparent, const char *name) - :TorrentCreatorDlgBase(tqparent, name),core(core) +TorrentCreatorDlg::TorrentCreatorDlg(KTorrentCore* core,TQWidget *parent, const char *name) + :TorrentCreatorDlgBase(parent, name),core(core) { KURLRequester* r = m_file_or_dir; r->fileDialog()->setMode( diff --git a/apps/ktorrent/torrentcreatordlg.h b/apps/ktorrent/torrentcreatordlg.h index cb3482c..2098331 100644 --- a/apps/ktorrent/torrentcreatordlg.h +++ b/apps/ktorrent/torrentcreatordlg.h @@ -21,7 +21,7 @@ class TorrentCreatorDlg: public TorrentCreatorDlgBase Q_OBJECT TQ_OBJECT public: - TorrentCreatorDlg(KTorrentCore* core,TQWidget *tqparent = 0, const char *name = 0); + TorrentCreatorDlg(KTorrentCore* core,TQWidget *parent = 0, const char *name = 0); virtual ~TorrentCreatorDlg(); public slots: diff --git a/apps/ktorrent/trayhoverpopup.cpp b/apps/ktorrent/trayhoverpopup.cpp index 612944d..7df590f 100644 --- a/apps/ktorrent/trayhoverpopup.cpp +++ b/apps/ktorrent/trayhoverpopup.cpp @@ -28,8 +28,8 @@ using namespace bt; -TrayHoverPopup::TrayHoverPopup(const TQPixmap & pix,TQWidget *tqparent, const char *name ) - : KPassivePopup(KPassivePopup::Boxed,tqparent,name),pix(pix) +TrayHoverPopup::TrayHoverPopup(const TQPixmap & pix,TQWidget *parent, const char *name ) + : KPassivePopup(KPassivePopup::Boxed,parent,name),pix(pix) { setTimeout(0); setAutoDelete(false); diff --git a/apps/ktorrent/trayhoverpopup.h b/apps/ktorrent/trayhoverpopup.h index de0ef04..b1a9b9e 100644 --- a/apps/ktorrent/trayhoverpopup.h +++ b/apps/ktorrent/trayhoverpopup.h @@ -36,7 +36,7 @@ class TrayHoverPopup : public KPassivePopup Q_OBJECT TQ_OBJECT public: - TrayHoverPopup(const TQPixmap & pix,TQWidget *tqparent = 0, const char *name = 0 ); + TrayHoverPopup(const TQPixmap & pix,TQWidget *parent = 0, const char *name = 0 ); virtual ~TrayHoverPopup(); /// Cursor entered system tray icon diff --git a/apps/ktorrent/trayicon.cpp b/apps/ktorrent/trayicon.cpp index 5c5d813..14a3db7 100644 --- a/apps/ktorrent/trayicon.cpp +++ b/apps/ktorrent/trayicon.cpp @@ -36,8 +36,8 @@ using namespace bt; using namespace kt; -TrayIcon::TrayIcon( KTorrentCore* tc, TQWidget *tqparent, const char *name) - : KSystemTray(tqparent, name) +TrayIcon::TrayIcon( KTorrentCore* tc, TQWidget *parent, const char *name) + : KSystemTray(parent, name) { m_core = tc; m_kt_pix = loadIcon("ktorrent"); @@ -282,7 +282,7 @@ void TrayIcon::lowDiskSpace(kt::TorrentInterface * tc, bool stopped) showPassivePopup(msg,i18n("Device running out of space")); } -SetMaxRate::SetMaxRate( KTorrentCore* tc, int t, TQWidget *tqparent, const char *name):KPopupMenu(tqparent, name) +SetMaxRate::SetMaxRate( KTorrentCore* tc, int t, TQWidget *parent, const char *name):KPopupMenu(parent, name) { m_core = tc; type=t; diff --git a/apps/ktorrent/trayicon.h b/apps/ktorrent/trayicon.h index f2cd579..6e4ac11 100644 --- a/apps/ktorrent/trayicon.h +++ b/apps/ktorrent/trayicon.h @@ -52,7 +52,7 @@ class TrayIcon : public KSystemTray Q_OBJECT TQ_OBJECT public: - TrayIcon(KTorrentCore* tc, TQWidget *tqparent = 0, const char *name = 0); + TrayIcon(KTorrentCore* tc, TQWidget *parent = 0, const char *name = 0); virtual ~TrayIcon(); /// Update stats for system tray icon @@ -126,7 +126,7 @@ class SetMaxRate : public KPopupMenu Q_OBJECT TQ_OBJECT public: - SetMaxRate(KTorrentCore* tc, int t, TQWidget *tqparent=0, const char *name=0); // type: 0 Upload; 1 Download + SetMaxRate(KTorrentCore* tc, int t, TQWidget *parent=0, const char *name=0); // type: 0 Upload; 1 Download ~SetMaxRate() {} ; diff --git a/apps/ktorrent/viewmanager.cpp b/apps/ktorrent/viewmanager.cpp index 917b68e..2d75635 100644 --- a/apps/ktorrent/viewmanager.cpp +++ b/apps/ktorrent/viewmanager.cpp @@ -28,8 +28,8 @@ typedef TQValueList<KTorrentView*>::iterator ViewItr; -ViewManager::ViewManager ( TQObject *tqparent, const char *name ) - : TQObject ( tqparent, name ),current(0) +ViewManager::ViewManager ( TQObject *parent, const char *name ) + : TQObject ( parent, name ),current(0) {} diff --git a/apps/ktorrent/viewmanager.h b/apps/ktorrent/viewmanager.h index c9465d2..38b658f 100644 --- a/apps/ktorrent/viewmanager.h +++ b/apps/ktorrent/viewmanager.h @@ -37,7 +37,7 @@ class ViewManager : public TQObject, public kt::CloseTabListener Q_OBJECT TQ_OBJECT public: - ViewManager(TQObject *tqparent = 0, const char *name = 0); + ViewManager(TQObject *parent = 0, const char *name = 0); virtual ~ViewManager(); /// Create a new view diff --git a/apps/ktupnptest/upnptestapp.cpp b/apps/ktupnptest/upnptestapp.cpp index 1cb6d31..0d14228 100644 --- a/apps/ktupnptest/upnptestapp.cpp +++ b/apps/ktupnptest/upnptestapp.cpp @@ -29,8 +29,8 @@ using namespace bt; using namespace kt; -UPnPTestApp::UPnPTestApp(TQWidget *tqparent, const char *name) - : KMainWindow(tqparent, name) +UPnPTestApp::UPnPTestApp(TQWidget *parent, const char *name) + : KMainWindow(parent, name) { sock = new UPnPMCastSocket(true); connect(sock,TQT_SIGNAL(discovered( UPnPRouter* )),this,TQT_SLOT(discovered( UPnPRouter* ))); diff --git a/apps/ktupnptest/upnptestapp.h b/apps/ktupnptest/upnptestapp.h index c98facf..6fd0faf 100644 --- a/apps/ktupnptest/upnptestapp.h +++ b/apps/ktupnptest/upnptestapp.h @@ -40,7 +40,7 @@ class UPnPTestApp : public KMainWindow, public kt::LogMonitorInterface Q_OBJECT TQ_OBJECT public: - UPnPTestApp(TQWidget *tqparent = 0, const char *name = 0); + UPnPTestApp(TQWidget *parent = 0, const char *name = 0); virtual ~UPnPTestApp(); virtual void message(const TQString& line, unsigned int arg); diff --git a/estimation-scripts/enable-logging.diff b/estimation-scripts/enable-logging.diff index b199bca..072ad45 100644 --- a/estimation-scripts/enable-logging.diff +++ b/estimation-scripts/enable-logging.diff @@ -16,8 +16,8 @@ Index: estimation-scripts/enable-logging.diff - using namespace bt; - -@@ -77,6 +78,9 @@ -- KTorrentViewItem::KTorrentViewItem(QListView* tqparent,bt::TorrentControl* tc) -- : KListViewItem(tqparent),tc(tc) +- KTorrentViewItem::KTorrentViewItem(QListView* parent,bt::TorrentControl* tc) +- : KListViewItem(parent),tc(tc) - { -+ toLog = true; -+ counter = 1; @@ -125,8 +125,8 @@ Index: apps/ktorrent/ktorrentviewitem.cpp using namespace kt; @@ -78,6 +81,9 @@ - KTorrentViewItem::KTorrentViewItem(QListView* tqparent,TorrentInterface* tc) - : KListViewItem(tqparent),tc(tc) + KTorrentViewItem::KTorrentViewItem(QListView* parent,TorrentInterface* tc) + : KListViewItem(parent),tc(tc) { + toLog = true; + counter = 1; diff --git a/libktorrent/expandablewidget.cpp b/libktorrent/expandablewidget.cpp index 8c06357..a6ec44d 100644 --- a/libktorrent/expandablewidget.cpp +++ b/libktorrent/expandablewidget.cpp @@ -24,8 +24,8 @@ namespace kt { - ExpandableWidget::ExpandableWidget(TQWidget* child,TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) + ExpandableWidget::ExpandableWidget(TQWidget* child,TQWidget *parent, const char *name) + : TQWidget(parent, name) { top_layout = new TQHBoxLayout(this); child->reparent(this,TQPoint(),true); diff --git a/libktorrent/expandablewidget.h b/libktorrent/expandablewidget.h index 02e6cf8..bf76dbb 100644 --- a/libktorrent/expandablewidget.h +++ b/libktorrent/expandablewidget.h @@ -48,23 +48,23 @@ namespace kt /** * Constructor, the first child must be provided. * @param child The first child - * @param tqparent The tqparent + * @param parent The parent * @param name The name */ - ExpandableWidget(TQWidget* child,TQWidget *tqparent = 0, const char *name = 0); + ExpandableWidget(TQWidget* child,TQWidget *parent = 0, const char *name = 0); virtual ~ExpandableWidget(); /** - * Expand the widget. This will ensure the proper tqparent child relations. + * Expand the widget. This will ensure the proper parent child relations. * @param w The widget * @param pos It's position relative to the current widget */ void expand(TQWidget* w,Position pos); /** - * Remove a widget. This will ensure the proper tqparent child relations. + * Remove a widget. This will ensure the proper parent child relations. * The widget w will become parentless. Note the first child will never be removed. * @param w The widget */ diff --git a/libktorrent/interfaces/filetreediritem.cpp b/libktorrent/interfaces/filetreediritem.cpp index 7cb78ca..86481f2 100644 --- a/libktorrent/interfaces/filetreediritem.cpp +++ b/libktorrent/interfaces/filetreediritem.cpp @@ -37,7 +37,7 @@ namespace kt FileTreeDirItem::FileTreeDirItem(KListView* klv,const TQString & name,FileTreeRootListener* rl) : TQCheckListItem(klv,TQString(),TQCheckListItem::CheckBox),name(name),root_listener(rl) { - tqparent = 0; + parent = 0; size = 0; setPixmap(0,KGlobal::iconLoader()->loadIcon("folder",KIcon::Small)); setText(0,name); @@ -48,9 +48,9 @@ namespace kt manual_change = false; } - FileTreeDirItem::FileTreeDirItem(FileTreeDirItem* tqparent,const TQString & name) - : TQCheckListItem(tqparent,TQString(),TQCheckListItem::CheckBox), - name(name),tqparent(tqparent) + FileTreeDirItem::FileTreeDirItem(FileTreeDirItem* parent,const TQString & name) + : TQCheckListItem(parent,TQString(),TQCheckListItem::CheckBox), + name(name),parent(parent) { size = 0; setPixmap(0,KGlobal::iconLoader()->loadIcon("folder",KIcon::Small)); @@ -161,8 +161,8 @@ namespace kt return; } } - if (tqparent) - tqparent->childStateChange(); + if (parent) + parent->childStateChange(); } setText(2,on ? i18n("Yes") : i18n("No")); } @@ -219,8 +219,8 @@ namespace kt setOn(allChildrenOn()); manual_change = false; - if (tqparent) - tqparent->childStateChange(); + if (parent) + parent->childStateChange(); else if (root_listener) root_listener->treeItemChanged(); @@ -286,10 +286,10 @@ namespace kt TQString FileTreeDirItem::getPath() const { - if (!tqparent) + if (!parent) return bt::DirSeparator(); else - return tqparent->getPath() + name + bt::DirSeparator(); + return parent->getPath() + name + bt::DirSeparator(); } } diff --git a/libktorrent/interfaces/filetreediritem.h b/libktorrent/interfaces/filetreediritem.h index 9afdbd1..37de320 100644 --- a/libktorrent/interfaces/filetreediritem.h +++ b/libktorrent/interfaces/filetreediritem.h @@ -51,12 +51,12 @@ namespace kt Uint64 size; bt::PtrMap<TQString,FileTreeItem> tqchildren; bt::PtrMap<TQString,FileTreeDirItem> subdirs; - FileTreeDirItem* tqparent; + FileTreeDirItem* parent; bool manual_change; FileTreeRootListener* root_listener; public: FileTreeDirItem(KListView* klv,const TQString & name,FileTreeRootListener* rl = 0); - FileTreeDirItem(FileTreeDirItem* tqparent,const TQString & name); + FileTreeDirItem(FileTreeDirItem* parent,const TQString & name); virtual ~FileTreeDirItem(); /// Get the path of the directory (if this is the root directory / will be returned) @@ -93,11 +93,11 @@ namespace kt void invertChecked(); /** - * Called by the child to notify the tqparent it's state has changed. + * Called by the child to notify the parent it's state has changed. */ void childStateChange(); - FileTreeDirItem* getParent() {return tqparent;} + FileTreeDirItem* getParent() {return parent;} /// Recusively get the total number of bytes to download Uint64 bytesToDownload() const; diff --git a/libktorrent/interfaces/filetreeitem.cpp b/libktorrent/interfaces/filetreeitem.cpp index 666c1a0..6431152 100644 --- a/libktorrent/interfaces/filetreeitem.cpp +++ b/libktorrent/interfaces/filetreeitem.cpp @@ -35,7 +35,7 @@ namespace kt FileTreeItem::FileTreeItem(FileTreeDirItem* item,const TQString & name,kt::TorrentFileInterface & file) : TQCheckListItem(item,TQString(),TQCheckListItem::CheckBox),name(name),file(file) { - tqparent = item; + parent = item; manual_change = false; init(); } @@ -66,7 +66,7 @@ namespace kt } updatePriorityText(); - tqparent->childStateChange(); + parent->childStateChange(); } void FileTreeItem::updatePriorityText() @@ -141,7 +141,7 @@ namespace kt } updatePriorityText(); - tqparent->childStateChange(); + parent->childStateChange(); } int FileTreeItem::compare(TQListViewItem* i, int col, bool ascending) const diff --git a/libktorrent/interfaces/filetreeitem.h b/libktorrent/interfaces/filetreeitem.h index 6d6ed79..9d32253 100644 --- a/libktorrent/interfaces/filetreeitem.h +++ b/libktorrent/interfaces/filetreeitem.h @@ -45,11 +45,11 @@ namespace kt protected: TQString name; TorrentFileInterface & file; - FileTreeDirItem* tqparent; + FileTreeDirItem* parent; bool manual_change; public: /** - * Constructor, set the tqparent, name and file + * Constructor, set the parent, name and file * @param item Parent item * @param name Name of file * @param file THe TorrentFileInterface diff --git a/libktorrent/interfaces/plugin.cpp b/libktorrent/interfaces/plugin.cpp index 50903d7..92a4f22 100644 --- a/libktorrent/interfaces/plugin.cpp +++ b/libktorrent/interfaces/plugin.cpp @@ -22,11 +22,11 @@ namespace kt { - Plugin::Plugin(TQObject *tqparent, const char* qt_name,const TQStringList & /*args*/, + Plugin::Plugin(TQObject *parent, const char* qt_name,const TQStringList & /*args*/, const TQString & name,const TQString & gui_name,const TQString & author, const TQString & email,const TQString & description, const TQString & icon) - : KParts::Plugin(tqparent,qt_name), + : KParts::Plugin(parent,qt_name), name(name),author(author),email(email),description(description),icon(icon),gui_name(gui_name) { core = 0; diff --git a/libktorrent/interfaces/plugin.h b/libktorrent/interfaces/plugin.h index d147d46..9c72a0f 100644 --- a/libktorrent/interfaces/plugin.h +++ b/libktorrent/interfaces/plugin.h @@ -60,7 +60,7 @@ namespace kt * @param description What does the plugin do * @param icon Name of the plugin's icon */ - Plugin(TQObject *tqparent,const char* qt_name,const TQStringList & args, + Plugin(TQObject *parent,const char* qt_name,const TQStringList & args, const TQString & name,const TQString & gui_name,const TQString & author, const TQString & email,const TQString & description, const TQString & icon); diff --git a/libktorrent/interfaces/prefpageinterface.h b/libktorrent/interfaces/prefpageinterface.h index b27390e..850a344 100644 --- a/libktorrent/interfaces/prefpageinterface.h +++ b/libktorrent/interfaces/prefpageinterface.h @@ -58,9 +58,9 @@ namespace kt /** * Create the actual widget. - * @param tqparent The tqparent of the widget + * @param parent The parent of the widget */ - virtual void createWidget(TQWidget* tqparent)=0; + virtual void createWidget(TQWidget* parent)=0; /** * Update all data on the widget, gets called before diff --git a/libktorrent/kademlia/rpcserver.cpp b/libktorrent/kademlia/rpcserver.cpp index 0be22a8..8157f9b 100644 --- a/libktorrent/kademlia/rpcserver.cpp +++ b/libktorrent/kademlia/rpcserver.cpp @@ -42,7 +42,7 @@ namespace dht - RPCServer::RPCServer(DHT* dh_table,Uint16 port,TQObject *tqparent) : TQObject(tqparent),dh_table(dh_table),next_mtid(0),port(port) + RPCServer::RPCServer(DHT* dh_table,Uint16 port,TQObject *parent) : TQObject(parent),dh_table(dh_table),next_mtid(0),port(port) { sock = new KDatagramSocket(this); sock->setBlocking(false); diff --git a/libktorrent/kademlia/rpcserver.h b/libktorrent/kademlia/rpcserver.h index 393db7a..0af88be 100644 --- a/libktorrent/kademlia/rpcserver.h +++ b/libktorrent/kademlia/rpcserver.h @@ -57,7 +57,7 @@ namespace dht Q_OBJECT TQ_OBJECT public: - RPCServer(DHT* dh_table,Uint16 port,TQObject *tqparent = 0); + RPCServer(DHT* dh_table,Uint16 port,TQObject *parent = 0); virtual ~RPCServer(); /// Start the server diff --git a/libktorrent/labelview.cpp b/libktorrent/labelview.cpp index e33d448..b46de3a 100644 --- a/libktorrent/labelview.cpp +++ b/libktorrent/labelview.cpp @@ -107,7 +107,7 @@ namespace kt { TQVBoxLayout* tqlayout; public: - LabelViewBox(TQWidget* tqparent) : TQWidget(tqparent) + LabelViewBox(TQWidget* parent) : TQWidget(parent) { setPaletteBackgroundColor(KGlobalSettings::baseColor()); tqlayout = new TQVBoxLayout(this); @@ -145,8 +145,8 @@ namespace kt /////////////////////////////////////// - LabelView::LabelView ( TQWidget *tqparent, const char *name ) - : TQScrollView ( tqparent, name ),selected(0) + LabelView::LabelView ( TQWidget *parent, const char *name ) + : TQScrollView ( parent, name ),selected(0) { item_box = new LabelViewBox(this->viewport()); setResizePolicy(TQScrollView::AutoOneFit); diff --git a/libktorrent/labelview.h b/libktorrent/labelview.h index 04ddf92..550e2d5 100644 --- a/libktorrent/labelview.h +++ b/libktorrent/labelview.h @@ -85,7 +85,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - LabelView(TQWidget *tqparent = 0, const char *name = 0); + LabelView(TQWidget *parent = 0, const char *name = 0); virtual ~LabelView(); /// Add an item to the label view diff --git a/libktorrent/pluginmanagerprefpage.cpp b/libktorrent/pluginmanagerprefpage.cpp index 0dfc9cc..66b1166 100644 --- a/libktorrent/pluginmanagerprefpage.cpp +++ b/libktorrent/pluginmanagerprefpage.cpp @@ -38,8 +38,8 @@ namespace kt { Plugin* p; public: - PluginViewItem(Plugin* p,LabelView* tqparent) - : LabelViewItem(p->getIcon(),p->getGuiName(),p->getDescription(),tqparent),p(p) + PluginViewItem(Plugin* p,LabelView* parent) + : LabelViewItem(p->getIcon(),p->getGuiName(),p->getDescription(),parent),p(p) { update(); } @@ -74,9 +74,9 @@ namespace kt return true; } - void PluginManagerPrefPage::createWidget(TQWidget* tqparent) + void PluginManagerPrefPage::createWidget(TQWidget* parent) { - pmw = new PluginManagerWidget(tqparent); + pmw = new PluginManagerWidget(parent); connect(pmw->load_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onLoad())); connect(pmw->unload_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onUnload())); diff --git a/libktorrent/pluginmanagerprefpage.h b/libktorrent/pluginmanagerprefpage.h index 9b78394..8585246 100644 --- a/libktorrent/pluginmanagerprefpage.h +++ b/libktorrent/pluginmanagerprefpage.h @@ -45,7 +45,7 @@ namespace kt virtual ~PluginManagerPrefPage(); virtual bool apply(); - virtual void createWidget(TQWidget* tqparent); + virtual void createWidget(TQWidget* parent); virtual void updateData(); virtual void deleteWidget(); diff --git a/libktorrent/torrent/cachefile.cpp b/libktorrent/torrent/cachefile.cpp index da5ecae..678124a 100644 --- a/libktorrent/torrent/cachefile.cpp +++ b/libktorrent/torrent/cachefile.cpp @@ -46,7 +46,7 @@ // Not all systems have an O_LARGEFILE - Solaris depending // on command-line defines, FreeBSD never - so in those cases, -// make it a zero bittqmask. As long as it's only OR'ed into +// make it a zero bitmask. As long as it's only OR'ed into // open(2) flags, that's fine. // #ifndef O_LARGEFILE diff --git a/libktorrent/torrent/ipblocklist.cpp b/libktorrent/torrent/ipblocklist.cpp index 632f42c..547b6ad 100644 --- a/libktorrent/torrent/ipblocklist.cpp +++ b/libktorrent/torrent/ipblocklist.cpp @@ -75,7 +75,7 @@ namespace bt Uint32 ipi = toUint32(ip, &ok); if(!ok) return; - IPKey key(ipi,0xFFFFFFFF); //-- you can test ranges here. Just specify your tqmask. + IPKey key(ipi,0xFFFFFFFF); //-- you can test ranges here. Just specify your mask. insertRangeIP(key, state); Out(SYS_IPF|LOG_NOTICE) << "IP " << ip << " banned." << endl; } @@ -85,13 +85,13 @@ namespace bt bool ok; int tmp = 0; Uint32 addr = 0; - Uint32 tqmask = 0xFFFFFFFF; + Uint32 mask = 0xFFFFFFFF; tmp = ip.section('.',0,0).toInt(&ok); if(!ok) { if(ip.section('.',0,0) == "*") - tqmask &= 0x00FFFFFF; + mask &= 0x00FFFFFF; else return; //illegal character } else @@ -102,7 +102,7 @@ namespace bt { addr <<= 8; if(ip.section('.',1,1) == "*") - tqmask &= 0xFF00FFFF; + mask &= 0xFF00FFFF; else return; //illegal character } else @@ -116,7 +116,7 @@ namespace bt { addr <<= 8; if(ip.section('.',2,2) == "*") - tqmask &= 0xFFFF00FF; + mask &= 0xFFFF00FF; else return; //illegal character } else @@ -130,7 +130,7 @@ namespace bt { addr <<= 8; if(ip.section('.',3,3) == "*") - tqmask &=0xFFFFFF00; + mask &=0xFFFFFF00; else return; //illegal character } else @@ -139,21 +139,21 @@ namespace bt addr |= tmp; } - IPKey key(addr, tqmask); + IPKey key(addr, mask); this->insertRangeIP(key); } void IPBlocklist::insertRangeIP(IPKey& key, int state) { -// Out() << "Blocked range: " << key.m_ip << " - " << key.m_tqmask << endl; +// Out() << "Blocked range: " << key.m_ip << " - " << key.m_mask << endl; TQMap<IPKey, int>::iterator it; if ((it = m_peers.find(key)) != m_peers.end()) { - if(it.key().m_tqmask != key.m_tqmask) + if(it.key().m_mask != key.m_mask) { int st = it.data(); - IPKey key1(key.m_ip, it.key().m_tqmask | key.m_tqmask); + IPKey key1(key.m_ip, it.key().m_mask | key.m_mask); m_peers.insert(key1, state+st); return; } @@ -168,13 +168,13 @@ namespace bt bool ok; int tmp = 0; Uint32 addr = 0; - Uint32 tqmask = 0xFFFFFFFF; + Uint32 mask = 0xFFFFFFFF; tmp = ip.section('.',0,0).toInt(&ok); if(!ok) { if(ip.section('.',0,0) == "*") - tqmask &= 0x00FFFFFF; + mask &= 0x00FFFFFF; else return; //illegal character } else @@ -185,7 +185,7 @@ namespace bt { addr <<= 8; if(ip.section('.',1,1) == "*") - tqmask &= 0xFF00FFFF; + mask &= 0xFF00FFFF; else return; //illegal character } else @@ -199,7 +199,7 @@ namespace bt { addr <<= 8; if(ip.section('.',2,2) == "*") - tqmask &= 0xFFFF00FF; + mask &= 0xFFFF00FF; else return; //illegal character } else @@ -213,7 +213,7 @@ namespace bt { addr <<= 8; if(ip.section('.',3,3) == "*") - tqmask &=0xFFFFFF00; + mask &=0xFFFFFF00; else return; //illegal character } else @@ -222,7 +222,7 @@ namespace bt addr |= tmp; } - IPKey key(addr, tqmask); + IPKey key(addr, mask); TQMap<IPKey, int>::iterator it = m_peers.find(key); if (it == m_peers.end()) @@ -304,11 +304,11 @@ namespace bt IPKey::IPKey() { m_ip = 0; - m_tqmask = 0xFFFFFFFF; + m_mask = 0xFFFFFFFF; } - IPKey::IPKey(TQString& ip, Uint32 tqmask) - : m_tqmask(tqmask) + IPKey::IPKey(TQString& ip, Uint32 mask) + : m_mask(mask) { bool ok; this->m_ip = toUint32(ip, &ok); @@ -317,55 +317,55 @@ namespace bt IPKey::IPKey(const IPKey& ip) { m_ip = ip.m_ip; - m_tqmask = ip.m_tqmask; + m_mask = ip.m_mask; } - IPKey::IPKey(Uint32 ip, Uint32 tqmask) - : m_ip(ip), m_tqmask(tqmask) + IPKey::IPKey(Uint32 ip, Uint32 mask) + : m_ip(ip), m_mask(mask) {} TQString IPKey::toString() { - Uint32 tmp, tmptqmask; + Uint32 tmp, tmpmask; Uint32 ip = m_ip; - Uint32 tqmask = m_tqmask; + Uint32 mask = m_mask; TQString out; tmp = ip; - tmptqmask = tqmask; + tmpmask = mask; tmp &= 0x000000FF; - tmptqmask &= 0x000000FF; - if(tmptqmask == 0) + tmpmask &= 0x000000FF; + if(tmpmask == 0) out.prepend("*"); else out.prepend(TQString("%1").tqarg(tmp)); ip >>= 8; - tqmask >>= 8; + mask >>= 8; tmp = ip; - tmptqmask = tqmask; + tmpmask = mask; tmp &= 0x000000FF; - tmptqmask &= 0x000000FF; - if(tmptqmask == 0) + tmpmask &= 0x000000FF; + if(tmpmask == 0) out.prepend("*."); else out.prepend(TQString("%1.").tqarg(tmp)); ip >>= 8; - tqmask >>= 8; + mask >>= 8; tmp = ip; - tmptqmask = tqmask; + tmpmask = mask; tmp &= 0x000000FF; - tmptqmask &= 0x000000FF; - if(tmptqmask == 0) + tmpmask &= 0x000000FF; + if(tmpmask == 0) out.prepend("*."); else out.prepend(TQString("%1.").tqarg(tmp)); ip >>= 8; - tqmask >>= 8; + mask >>= 8; tmp = ip; - tmptqmask = tqmask; + tmpmask = mask; tmp &= 0x000000FF; - tmptqmask &= 0x000000FF; - if(tmptqmask == 0) + tmpmask &= 0x000000FF; + if(tmpmask == 0) out.prepend("*."); else out.prepend(TQString("%1.").tqarg(tmp)); @@ -375,23 +375,23 @@ namespace bt bool IPKey::operator ==(const IPKey& ip) const { - return (m_ip & m_tqmask) == m_tqmask & ip.m_ip; + return (m_ip & m_mask) == m_mask & ip.m_ip; } bool IPKey::operator !=(const IPKey& ip) const { - return (m_ip & m_tqmask) != m_tqmask & ip.m_ip; + return (m_ip & m_mask) != m_mask & ip.m_ip; } bool IPKey::operator < (const IPKey& ip) const { - return (m_ip & m_tqmask) < (m_tqmask & ip.m_ip); + return (m_ip & m_mask) < (m_mask & ip.m_ip); } IPKey& IPKey::operator =(const IPKey& ip) { m_ip = ip.m_ip; - m_tqmask = ip.m_tqmask; + m_mask = ip.m_mask; return *this; } diff --git a/libktorrent/torrent/ipblocklist.h b/libktorrent/torrent/ipblocklist.h index 51e5aa5..6439972 100644 --- a/libktorrent/torrent/ipblocklist.h +++ b/libktorrent/torrent/ipblocklist.h @@ -35,8 +35,8 @@ namespace bt { public: IPKey(); - IPKey(TQString& ip, Uint32 tqmask = 0xFFFFFFFF); - IPKey(Uint32 ip, Uint32 tqmask = 0xFFFFFFFF); + IPKey(TQString& ip, Uint32 mask = 0xFFFFFFFF); + IPKey(Uint32 ip, Uint32 mask = 0xFFFFFFFF); IPKey(const IPKey& ip); ~IPKey(); @@ -48,7 +48,7 @@ namespace bt TQString toString(); Uint32 m_ip; - Uint32 m_tqmask; + Uint32 m_mask; }; /** @@ -143,7 +143,7 @@ namespace bt kt::IPBlockingInterface* pluginInterface; /** - * @param IPKey - Key: Peer IP address and bit tqmask if it is a range + * @param IPKey - Key: Peer IP address and bit mask if it is a range * @param int - Number of bad chunks sent. **/ TQMap<IPKey, int> m_peers; diff --git a/libktorrent/torrent/torrentcreator.cpp b/libktorrent/torrent/torrentcreator.cpp index 6ccbd63..5538b9e 100644 --- a/libktorrent/torrent/torrentcreator.cpp +++ b/libktorrent/torrent/torrentcreator.cpp @@ -350,7 +350,7 @@ namespace bt TorrentControl* tc = new TorrentControl(); try { - // get the tqparent dir of target + // get the parent dir of target TQFileInfo fi = TQFileInfo(target); TQString odir; diff --git a/libktorrent/util/log.cpp b/libktorrent/util/log.cpp index 6935a45..6030e99 100644 --- a/libktorrent/util/log.cpp +++ b/libktorrent/util/log.cpp @@ -45,7 +45,7 @@ namespace bt class Log::Private { public: - Log* tqparent; + Log* parent; TQTextStream* out; TQFile fptr; bool to_cout; @@ -55,7 +55,7 @@ namespace bt unsigned int m_filter; AutoRotateLogJob* rotate_job; public: - Private(Log* tqparent) : tqparent(tqparent),out(0),to_cout(false),rotate_job(0) + Private(Log* parent) : parent(parent),out(0),to_cout(false),rotate_job(0) { out = new TQTextStream(); } @@ -146,7 +146,7 @@ namespace bt fptr.close(); // close the log file out->setDevice(0); // start the rotate job - rotate_job = new AutoRotateLogJob(file,tqparent); + rotate_job = new AutoRotateLogJob(file,parent); } } diff --git a/libktorrent/util/profiler.cpp b/libktorrent/util/profiler.cpp index 766012d..a0f42d2 100644 --- a/libktorrent/util/profiler.cpp +++ b/libktorrent/util/profiler.cpp @@ -25,7 +25,7 @@ namespace bt { - Profile::Profile(Profile* tqparent,const TQString & name) : tqparent(tqparent),name(name) + Profile::Profile(Profile* parent,const TQString & name) : parent(parent),name(name) { min = max = avg = 0.0; count = 0; diff --git a/libktorrent/util/profiler.h b/libktorrent/util/profiler.h index 836f4ba..917a671 100644 --- a/libktorrent/util/profiler.h +++ b/libktorrent/util/profiler.h @@ -34,7 +34,7 @@ namespace bt */ class Profile { - Profile* tqparent; + Profile* parent; TQPtrList<Profile> tqchildren; TQString name; @@ -42,7 +42,7 @@ namespace bt Uint32 count; double start_time; public: - Profile(Profile* tqparent,const TQString & name); + Profile(Profile* parent,const TQString & name); virtual ~Profile(); /** @@ -63,9 +63,9 @@ namespace bt Profile* child(const TQString & name); /** - * Get the tqparent of the current profile. + * Get the parent of the current profile. */ - Profile* getParent() const {return tqparent;} + Profile* getParent() const {return parent;} /** * Save profile information to a file. diff --git a/plugins/infowidget/availabilitychunkbar.cpp b/plugins/infowidget/availabilitychunkbar.cpp index 23c4dba..7f26efa 100644 --- a/plugins/infowidget/availabilitychunkbar.cpp +++ b/plugins/infowidget/availabilitychunkbar.cpp @@ -27,7 +27,7 @@ namespace kt { -AvailabilityChunkBar::AvailabilityChunkBar(TQWidget* tqparent, const char* name): ChunkBar(tqparent, name) +AvailabilityChunkBar::AvailabilityChunkBar(TQWidget* parent, const char* name): ChunkBar(parent, name) { TQToolTip::add(this, i18n("<img src=\"available_color\"> - Available Chunks<br><img src=\"unavailable_color\"> - Unavailable Chunks<br><img src=\"excluded_color\"> - Excluded Chunks")); } diff --git a/plugins/infowidget/availabilitychunkbar.h b/plugins/infowidget/availabilitychunkbar.h index 31a5b65..650b6a6 100644 --- a/plugins/infowidget/availabilitychunkbar.h +++ b/plugins/infowidget/availabilitychunkbar.h @@ -33,7 +33,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - AvailabilityChunkBar(TQWidget* tqparent, const char* name); + AvailabilityChunkBar(TQWidget* parent, const char* name); virtual ~AvailabilityChunkBar(); virtual const bt::BitSet & getBitSet() const; diff --git a/plugins/infowidget/chunkbar.cpp b/plugins/infowidget/chunkbar.cpp index 48f0aac..ad6dfd6 100644 --- a/plugins/infowidget/chunkbar.cpp +++ b/plugins/infowidget/chunkbar.cpp @@ -83,8 +83,8 @@ namespace kt factory->setImage("unavailable_color", unavailable); } - ChunkBar::ChunkBar(TQWidget *tqparent, const char *name) - : TQFrame(tqparent, name),curr_tc(0) + ChunkBar::ChunkBar(TQWidget *parent, const char *name) + : TQFrame(parent, name),curr_tc(0) { setFrameShape(StyledPanel); setFrameShadow(Sunken); diff --git a/plugins/infowidget/chunkbar.h b/plugins/infowidget/chunkbar.h index 32366c3..ef078a7 100644 --- a/plugins/infowidget/chunkbar.h +++ b/plugins/infowidget/chunkbar.h @@ -52,7 +52,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - ChunkBar(TQWidget *tqparent = 0, const char *name = 0); + ChunkBar(TQWidget *parent = 0, const char *name = 0); virtual ~ChunkBar(); void setTC(kt::TorrentInterface* tc); diff --git a/plugins/infowidget/chunkdownloadview.cpp b/plugins/infowidget/chunkdownloadview.cpp index cec3386..eaed47e 100644 --- a/plugins/infowidget/chunkdownloadview.cpp +++ b/plugins/infowidget/chunkdownloadview.cpp @@ -69,8 +69,8 @@ namespace kt } - ChunkDownloadView::ChunkDownloadView(TQWidget *tqparent, const char *name) - : ChunkDownloadViewBase(tqparent, name) + ChunkDownloadView::ChunkDownloadView(TQWidget *parent, const char *name) + : ChunkDownloadViewBase(parent, name) { m_list_view->setShowSortIndicator(true); m_list_view->setAllColumnsShowFocus(true); diff --git a/plugins/infowidget/chunkdownloadview.h b/plugins/infowidget/chunkdownloadview.h index 860052d..cc57d5b 100644 --- a/plugins/infowidget/chunkdownloadview.h +++ b/plugins/infowidget/chunkdownloadview.h @@ -51,7 +51,7 @@ namespace kt TQMap<kt::ChunkDownloadInterface*,ChunkDownloadViewItem*> items; kt::TorrentInterface* curr_tc; public: - ChunkDownloadView(TQWidget *tqparent = 0, const char *name = 0); + ChunkDownloadView(TQWidget *parent = 0, const char *name = 0); virtual ~ChunkDownloadView(); void saveLayout(KConfig* cfg,const TQString & group_name); diff --git a/plugins/infowidget/downloadedchunkbar.cpp b/plugins/infowidget/downloadedchunkbar.cpp index 6e6fe9a..4d72a60 100644 --- a/plugins/infowidget/downloadedchunkbar.cpp +++ b/plugins/infowidget/downloadedchunkbar.cpp @@ -24,8 +24,8 @@ namespace kt { - DownloadedChunkBar::DownloadedChunkBar(TQWidget* tqparent, const char* name) - : ChunkBar(tqparent,name) + DownloadedChunkBar::DownloadedChunkBar(TQWidget* parent, const char* name) + : ChunkBar(parent,name) { show_excluded = true; } diff --git a/plugins/infowidget/downloadedchunkbar.h b/plugins/infowidget/downloadedchunkbar.h index 2b9fce1..c2f1bcf 100644 --- a/plugins/infowidget/downloadedchunkbar.h +++ b/plugins/infowidget/downloadedchunkbar.h @@ -32,7 +32,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - DownloadedChunkBar(TQWidget* tqparent, const char* name); + DownloadedChunkBar(TQWidget* parent, const char* name); virtual ~DownloadedChunkBar(); virtual const bt::BitSet & getBitSet() const; diff --git a/plugins/infowidget/fileview.cpp b/plugins/infowidget/fileview.cpp index 9c64960..b8d371f 100644 --- a/plugins/infowidget/fileview.cpp +++ b/plugins/infowidget/fileview.cpp @@ -40,8 +40,8 @@ using namespace bt; namespace kt { - FileView::FileView(TQWidget *tqparent, const char *name) - : KListView(tqparent, name),curr_tc(0),multi_root(0),pending_fill(0),next_fill_item(0) + FileView::FileView(TQWidget *parent, const char *name) + : KListView(parent, name),curr_tc(0),multi_root(0),pending_fill(0),next_fill_item(0) { setFrameShape(TQFrame::NoFrame); addColumn( i18n( "File" ) ); diff --git a/plugins/infowidget/fileview.h b/plugins/infowidget/fileview.h index 0e06eba..8e9555d 100644 --- a/plugins/infowidget/fileview.h +++ b/plugins/infowidget/fileview.h @@ -37,7 +37,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - FileView(TQWidget *tqparent = 0, const char *name = 0); + FileView(TQWidget *parent = 0, const char *name = 0); virtual ~FileView(); void update(); diff --git a/plugins/infowidget/floatspinbox.cpp b/plugins/infowidget/floatspinbox.cpp index d498d7d..35f5c42 100644 --- a/plugins/infowidget/floatspinbox.cpp +++ b/plugins/infowidget/floatspinbox.cpp @@ -28,10 +28,10 @@ kt::FloatSpinBox::FloatSpinBox( - TQWidget * tqparent, + TQWidget * parent, const char * name ) - :TQSpinBox( -100, 100, 1, tqparent, name), + :TQSpinBox( -100, 100, 1, parent, name), m_precision_digits( 2 ), m_value(0.0f), m_minValue(0.0f), @@ -48,10 +48,10 @@ kt::FloatSpinBox::FloatSpinBox( kt::FloatSpinBox::FloatSpinBox( int precision, - TQWidget * tqparent, + TQWidget * parent, const char * name ) - :TQSpinBox( -100, 100, 1, tqparent, name), + :TQSpinBox( -100, 100, 1, parent, name), m_precision_digits( precision ), m_value(0.0f), m_minValue(0.0f), @@ -71,10 +71,10 @@ kt::FloatSpinBox::FloatSpinBox( float maxValue, float step, int precision, - TQWidget * tqparent, + TQWidget * parent, const char * name ) - :TQSpinBox( -100, 100, 1, tqparent, name), + :TQSpinBox( -100, 100, 1, parent, name), m_precision_digits( precision ), m_value(0.0f), m_minValue(minValue), diff --git a/plugins/infowidget/floatspinbox.h b/plugins/infowidget/floatspinbox.h index 8aa4dc8..515634b 100644 --- a/plugins/infowidget/floatspinbox.h +++ b/plugins/infowidget/floatspinbox.h @@ -40,10 +40,10 @@ namespace kt Q_OBJECT TQ_OBJECT public: - FloatSpinBox( TQWidget* tqparent=0, const char* name=0 ); - FloatSpinBox( int precision = 2, TQWidget* tqparent=0, const char* name=0 ); + FloatSpinBox( TQWidget* parent=0, const char* name=0 ); + FloatSpinBox( int precision = 2, TQWidget* parent=0, const char* name=0 ); FloatSpinBox( float minValue, float maxValue, float step = 0.5, int precision = 2, - TQWidget* tqparent=0, const char* name=0 ); + TQWidget* parent=0, const char* name=0 ); virtual ~FloatSpinBox(); TQString mapValueToText( int value ); diff --git a/plugins/infowidget/infowidgetplugin.cpp b/plugins/infowidget/infowidgetplugin.cpp index cbd30ef..8928841 100644 --- a/plugins/infowidget/infowidgetplugin.cpp +++ b/plugins/infowidget/infowidgetplugin.cpp @@ -47,8 +47,8 @@ namespace kt { - InfoWidgetPlugin::InfoWidgetPlugin(TQObject* tqparent, const char* name, const TQStringList& args) - : Plugin(tqparent, name, args,NAME,i18n("Info Widget"),AUTHOR,EMAIL, + InfoWidgetPlugin::InfoWidgetPlugin(TQObject* parent, const char* name, const TQStringList& args) + : Plugin(parent, name, args,NAME,i18n("Info Widget"),AUTHOR,EMAIL, i18n("Shows additional information about a download. Like which chunks have been downloaded, how many seeders and leechers ..."), "ktinfowidget") { diff --git a/plugins/infowidget/infowidgetplugin.h b/plugins/infowidget/infowidgetplugin.h index cb6702c..0d3f55c 100644 --- a/plugins/infowidget/infowidgetplugin.h +++ b/plugins/infowidget/infowidgetplugin.h @@ -44,7 +44,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - InfoWidgetPlugin(TQObject* tqparent, const char* name, const TQStringList& args); + InfoWidgetPlugin(TQObject* parent, const char* name, const TQStringList& args); virtual ~InfoWidgetPlugin(); virtual void load(); diff --git a/plugins/infowidget/infowidgetprefpage.cpp b/plugins/infowidget/infowidgetprefpage.cpp index 2fa7f4e..971b1c3 100644 --- a/plugins/infowidget/infowidgetprefpage.cpp +++ b/plugins/infowidget/infowidgetprefpage.cpp @@ -53,9 +53,9 @@ namespace kt return true; } - void InfoWidgetPrefPage::createWidget(TQWidget* tqparent) + void InfoWidgetPrefPage::createWidget(TQWidget* parent) { - pref = new IWPref(tqparent); + pref = new IWPref(parent); updateData(); } diff --git a/plugins/infowidget/infowidgetprefpage.h b/plugins/infowidget/infowidgetprefpage.h index 89ab56b..1274462 100644 --- a/plugins/infowidget/infowidgetprefpage.h +++ b/plugins/infowidget/infowidgetprefpage.h @@ -41,7 +41,7 @@ namespace kt virtual ~InfoWidgetPrefPage(); virtual bool apply(); - virtual void createWidget(TQWidget* tqparent); + virtual void createWidget(TQWidget* parent); virtual void deleteWidget(); virtual void updateData(); diff --git a/plugins/infowidget/iwfiletreediritem.cpp b/plugins/infowidget/iwfiletreediritem.cpp index c1eee32..c143e7e 100644 --- a/plugins/infowidget/iwfiletreediritem.cpp +++ b/plugins/infowidget/iwfiletreediritem.cpp @@ -38,8 +38,8 @@ namespace kt { } - IWFileTreeDirItem::IWFileTreeDirItem(IWFileTreeDirItem* tqparent,const TQString & name) - : kt::FileTreeDirItem(tqparent,name) + IWFileTreeDirItem::IWFileTreeDirItem(IWFileTreeDirItem* parent,const TQString & name) + : kt::FileTreeDirItem(parent,name) { } diff --git a/plugins/infowidget/iwfiletreediritem.h b/plugins/infowidget/iwfiletreediritem.h index 3c26031..1439cbe 100644 --- a/plugins/infowidget/iwfiletreediritem.h +++ b/plugins/infowidget/iwfiletreediritem.h @@ -50,7 +50,7 @@ namespace kt { public: IWFileTreeDirItem(KListView* klv,const TQString & name); - IWFileTreeDirItem(IWFileTreeDirItem* tqparent,const TQString & name); + IWFileTreeDirItem(IWFileTreeDirItem* parent,const TQString & name); virtual ~IWFileTreeDirItem(); /** diff --git a/plugins/infowidget/localefloatvalidator.cpp b/plugins/infowidget/localefloatvalidator.cpp index f0c20ae..f61808d 100644 --- a/plugins/infowidget/localefloatvalidator.cpp +++ b/plugins/infowidget/localefloatvalidator.cpp @@ -23,8 +23,8 @@ #include <klocale.h> #include "localefloatvalidator.h" -kt::LocaleFloatValidator::LocaleFloatValidator( TQObject * tqparent, const char * name ) -:TQValidator(tqparent, name) +kt::LocaleFloatValidator::LocaleFloatValidator( TQObject * parent, const char * name ) +:TQValidator(parent, name) { TQString decimalPoint = TQRegExp::escape(KGlobal::locale()->decimalSymbol()); regexp.setPattern("^-?\\d*(" + decimalPoint + "\\d*)?$"); diff --git a/plugins/infowidget/localefloatvalidator.h b/plugins/infowidget/localefloatvalidator.h index 3466445..2d9b4db 100644 --- a/plugins/infowidget/localefloatvalidator.h +++ b/plugins/infowidget/localefloatvalidator.h @@ -35,7 +35,7 @@ namespace kt{ Q_OBJECT TQ_OBJECT public: - LocaleFloatValidator( TQObject * tqparent, const char *name = 0 ); + LocaleFloatValidator( TQObject * parent, const char *name = 0 ); virtual TQValidator::State validate( TQString & str, int & pos) const; private: diff --git a/plugins/infowidget/peerview.cpp b/plugins/infowidget/peerview.cpp index a6b0675..35d2024 100644 --- a/plugins/infowidget/peerview.cpp +++ b/plugins/infowidget/peerview.cpp @@ -207,8 +207,8 @@ namespace kt return 0; } - PeerView::PeerView(TQWidget *tqparent, const char *name) - : KListView(tqparent, name) + PeerView::PeerView(TQWidget *parent, const char *name) + : KListView(parent, name) { addColumn(i18n("IP")); addColumn(i18n("Country")); diff --git a/plugins/infowidget/peerview.h b/plugins/infowidget/peerview.h index e7e403b..fbdef37 100644 --- a/plugins/infowidget/peerview.h +++ b/plugins/infowidget/peerview.h @@ -59,7 +59,7 @@ namespace kt TQMap<kt::PeerInterface*,PeerViewItem*> items; public: - PeerView(TQWidget *tqparent = 0, const char *name = 0); + PeerView(TQWidget *parent = 0, const char *name = 0); virtual ~PeerView(); public slots: diff --git a/plugins/infowidget/statustab.cpp b/plugins/infowidget/statustab.cpp index 0fc6f16..7317437 100644 --- a/plugins/infowidget/statustab.cpp +++ b/plugins/infowidget/statustab.cpp @@ -34,8 +34,8 @@ namespace kt { - StatusTab::StatusTab(TQWidget* tqparent, const char* name, WFlags fl) - : StatusTabBase(tqparent,name,fl),curr_tc(0) + StatusTab::StatusTab(TQWidget* parent, const char* name, WFlags fl) + : StatusTabBase(parent,name,fl),curr_tc(0) { TQColorGroup cg = tqcolorGroup(); // do not use hardcoded colors diff --git a/plugins/infowidget/statustab.h b/plugins/infowidget/statustab.h index b747596..acfa003 100644 --- a/plugins/infowidget/statustab.h +++ b/plugins/infowidget/statustab.h @@ -33,7 +33,7 @@ namespace kt TQ_OBJECT public: - StatusTab(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + StatusTab(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); virtual ~StatusTab(); diff --git a/plugins/infowidget/trackerview.cpp b/plugins/infowidget/trackerview.cpp index 0c23548..c928a7f 100644 --- a/plugins/infowidget/trackerview.cpp +++ b/plugins/infowidget/trackerview.cpp @@ -43,8 +43,8 @@ namespace kt { - TrackerView::TrackerView(TQWidget *tqparent, const char *name) - :TrackerViewBase(tqparent, name), tc(0) + TrackerView::TrackerView(TQWidget *parent, const char *name) + :TrackerViewBase(parent, name), tc(0) { KIconLoader* iload = KGlobal::iconLoader(); btnUpdate->setIconSet(iload->loadIconSet("apply", KIcon::Small)); diff --git a/plugins/infowidget/trackerview.h b/plugins/infowidget/trackerview.h index 9499e4b..5b08760 100644 --- a/plugins/infowidget/trackerview.h +++ b/plugins/infowidget/trackerview.h @@ -37,7 +37,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - TrackerView(TQWidget *tqparent = 0, const char *name = 0); + TrackerView(TQWidget *parent = 0, const char *name = 0); virtual ~TrackerView(); void update(); diff --git a/plugins/ipfilter/convertdialog.cpp b/plugins/ipfilter/convertdialog.cpp index c8fef33..8c9cf5a 100644 --- a/plugins/ipfilter/convertdialog.cpp +++ b/plugins/ipfilter/convertdialog.cpp @@ -74,8 +74,8 @@ namespace kt return block; } - ConvertDialog::ConvertDialog( IPFilterPlugin* p, TQWidget *tqparent, const char *name ) - : ConvertingDlg( tqparent, name ) + ConvertDialog::ConvertDialog( IPFilterPlugin* p, TQWidget *parent, const char *name ) + : ConvertingDlg( parent, name ) { m_plugin = p; btnClose->setText(i18n("Convert")); diff --git a/plugins/ipfilter/convertdialog.h b/plugins/ipfilter/convertdialog.h index 53eab64..5c170ea 100644 --- a/plugins/ipfilter/convertdialog.h +++ b/plugins/ipfilter/convertdialog.h @@ -33,7 +33,7 @@ namespace kt TQ_OBJECT public: - ConvertDialog( IPFilterPlugin* p, TQWidget *tqparent = 0, const char *name = 0 ); + ConvertDialog( IPFilterPlugin* p, TQWidget *parent = 0, const char *name = 0 ); public slots: virtual void btnClose_clicked(); diff --git a/plugins/ipfilter/ipblockingprefpage.cpp b/plugins/ipfilter/ipblockingprefpage.cpp index 41d427d..210e8c5 100644 --- a/plugins/ipfilter/ipblockingprefpage.cpp +++ b/plugins/ipfilter/ipblockingprefpage.cpp @@ -55,7 +55,7 @@ using namespace bt; namespace kt { - IPBlockingPrefPageWidget::IPBlockingPrefPageWidget(TQWidget* tqparent) : IPBlockingPref(tqparent) + IPBlockingPrefPageWidget::IPBlockingPrefPageWidget(TQWidget* parent) : IPBlockingPref(parent) { m_url->setURL(IPBlockingPluginSettings::filterURL()); if (m_url->url() == "") @@ -240,9 +240,9 @@ namespace kt return true; } - void IPBlockingPrefPage::createWidget(TQWidget* tqparent) + void IPBlockingPrefPage::createWidget(TQWidget* parent) { - widget = new IPBlockingPrefPageWidget(tqparent); + widget = new IPBlockingPrefPageWidget(parent); widget->setPlugin(m_plugin); widget->setPrefPage(this); } diff --git a/plugins/ipfilter/ipblockingprefpage.h b/plugins/ipfilter/ipblockingprefpage.h index 7626bea..1e6d19e 100644 --- a/plugins/ipfilter/ipblockingprefpage.h +++ b/plugins/ipfilter/ipblockingprefpage.h @@ -41,7 +41,7 @@ namespace kt class IPBlockingPrefPageWidget : public IPBlockingPref { public: - IPBlockingPrefPageWidget(TQWidget *tqparent = 0); + IPBlockingPrefPageWidget(TQWidget *parent = 0); void apply(); void convert(); void setPlugin(IPFilterPlugin* p); @@ -70,7 +70,7 @@ namespace kt virtual ~IPBlockingPrefPage(); virtual bool apply(); - virtual void createWidget(TQWidget* tqparent); + virtual void createWidget(TQWidget* parent); virtual void updateData(); virtual void deleteWidget(); diff --git a/plugins/ipfilter/ipfilterplugin.cpp b/plugins/ipfilter/ipfilterplugin.cpp index 8381226..96f71bf 100644 --- a/plugins/ipfilter/ipfilterplugin.cpp +++ b/plugins/ipfilter/ipfilterplugin.cpp @@ -42,8 +42,8 @@ namespace kt const TQString EMAIL = "ivasic@gmail.com"; const TQString DESCRIPTION = i18n("Filters out unwanted peers based on their IP address"); - IPFilterPlugin::IPFilterPlugin(TQObject* tqparent, const char* name, const TQStringList& args) - : Plugin(tqparent, name, args,NAME,i18n("IP Filter"),AUTHOR,EMAIL,DESCRIPTION,"filter") + IPFilterPlugin::IPFilterPlugin(TQObject* parent, const char* name, const TQStringList& args) + : Plugin(parent, name, args,NAME,i18n("IP Filter"),AUTHOR,EMAIL,DESCRIPTION,"filter") { // setXMLFile("ktpluginui.rc"); level1 = 0; diff --git a/plugins/ipfilter/ipfilterplugin.h b/plugins/ipfilter/ipfilterplugin.h index d016ee9..c434b2d 100644 --- a/plugins/ipfilter/ipfilterplugin.h +++ b/plugins/ipfilter/ipfilterplugin.h @@ -44,7 +44,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - IPFilterPlugin(TQObject* tqparent, const char* name, const TQStringList& args); + IPFilterPlugin(TQObject* parent, const char* name, const TQStringList& args); virtual ~IPFilterPlugin(); virtual void load(); diff --git a/plugins/logviewer/logprefpage.cpp b/plugins/logviewer/logprefpage.cpp index b49c4ce..6cc6ce8 100644 --- a/plugins/logviewer/logprefpage.cpp +++ b/plugins/logviewer/logprefpage.cpp @@ -46,9 +46,9 @@ namespace kt return true; } - void LogPrefPage::createWidget(TQWidget* tqparent) + void LogPrefPage::createWidget(TQWidget* parent) { - m_widget = new LogPrefWidget(tqparent); + m_widget = new LogPrefWidget(parent); } void LogPrefPage::updateData() diff --git a/plugins/logviewer/logprefpage.h b/plugins/logviewer/logprefpage.h index cd8e6a8..1176d92 100644 --- a/plugins/logviewer/logprefpage.h +++ b/plugins/logviewer/logprefpage.h @@ -38,7 +38,7 @@ namespace kt virtual ~LogPrefPage(); virtual bool apply(); - virtual void createWidget(TQWidget* tqparent); + virtual void createWidget(TQWidget* parent); virtual void updateData(); virtual void deleteWidget(); diff --git a/plugins/logviewer/logprefwidget.cpp b/plugins/logviewer/logprefwidget.cpp index 215bce6..46ea88d 100644 --- a/plugins/logviewer/logprefwidget.cpp +++ b/plugins/logviewer/logprefwidget.cpp @@ -31,8 +31,8 @@ namespace kt { - LogPrefWidget::LogPrefWidget(TQWidget *tqparent, const char *name) - :LogPrefWidgetBase(tqparent, name) + LogPrefWidget::LogPrefWidget(TQWidget *parent, const char *name) + :LogPrefWidgetBase(parent, name) { m_sysgen->setCurrentItem(getLevel(LogViewerPluginSettings::sysGEN())); m_syscon->setCurrentItem(getLevel(LogViewerPluginSettings::sysCON())); diff --git a/plugins/logviewer/logprefwidget.h b/plugins/logviewer/logprefwidget.h index 4bb1030..efd7dc6 100644 --- a/plugins/logviewer/logprefwidget.h +++ b/plugins/logviewer/logprefwidget.h @@ -29,7 +29,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - LogPrefWidget(TQWidget *tqparent = 0, const char *name = 0); + LogPrefWidget(TQWidget *parent = 0, const char *name = 0); bool apply(); private: diff --git a/plugins/logviewer/logviewer.cpp b/plugins/logviewer/logviewer.cpp index 916af8e..ac3e02e 100644 --- a/plugins/logviewer/logviewer.cpp +++ b/plugins/logviewer/logviewer.cpp @@ -41,8 +41,8 @@ namespace kt const TQString & msg() const {return str;} }; - LogViewer::LogViewer(TQWidget *tqparent, const char *name) - : KTextBrowser(tqparent, name), LogMonitorInterface() + LogViewer::LogViewer(TQWidget *parent, const char *name) + : KTextBrowser(parent, name), LogMonitorInterface() { /* IMPORTANT: use LogText mode, so that setMaxLogLines will work, if not everything will be kept in memory. diff --git a/plugins/logviewer/logviewer.h b/plugins/logviewer/logviewer.h index ced8bf0..80c37f4 100644 --- a/plugins/logviewer/logviewer.h +++ b/plugins/logviewer/logviewer.h @@ -34,7 +34,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - LogViewer(TQWidget *tqparent = 0, const char *name = 0); + LogViewer(TQWidget *parent = 0, const char *name = 0); virtual ~LogViewer(); virtual void message(const TQString& line, unsigned int arg); diff --git a/plugins/logviewer/logviewerplugin.cpp b/plugins/logviewer/logviewerplugin.cpp index 5df9fac..4c11680 100644 --- a/plugins/logviewer/logviewerplugin.cpp +++ b/plugins/logviewer/logviewerplugin.cpp @@ -40,8 +40,8 @@ K_EXPORT_COMPONENT_FACTORY(ktlogviewerplugin,KGenericFactory<kt::LogViewerPlugin namespace kt { - LogViewerPlugin::LogViewerPlugin(TQObject* tqparent, const char* qt_name, const TQStringList& args) - : Plugin(tqparent, qt_name, args, NAME,i18n("Log Viewer"), AUTHOR, EMAIL, + LogViewerPlugin::LogViewerPlugin(TQObject* parent, const char* qt_name, const TQStringList& args) + : Plugin(parent, qt_name, args, NAME,i18n("Log Viewer"), AUTHOR, EMAIL, i18n("Displays ktorrent logging output"),"log") { lv = 0; diff --git a/plugins/logviewer/logviewerplugin.h b/plugins/logviewer/logviewerplugin.h index 238121f..3596148 100644 --- a/plugins/logviewer/logviewerplugin.h +++ b/plugins/logviewer/logviewerplugin.h @@ -37,7 +37,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - LogViewerPlugin(TQObject* tqparent, const char* qt_name, const TQStringList& args); + LogViewerPlugin(TQObject* parent, const char* qt_name, const TQStringList& args); virtual ~LogViewerPlugin(); virtual void load(); diff --git a/plugins/partfileimport/importdialog.cpp b/plugins/partfileimport/importdialog.cpp index 5ca35c4..d7f92d0 100644 --- a/plugins/partfileimport/importdialog.cpp +++ b/plugins/partfileimport/importdialog.cpp @@ -42,8 +42,8 @@ using namespace bt; namespace kt { - ImportDialog::ImportDialog(CoreInterface* core,TQWidget* tqparent, const char* name, bool modal, WFlags fl) - : ImportDlgBase(tqparent,name, modal,fl),DataCheckerListener(false),core(core) + ImportDialog::ImportDialog(CoreInterface* core,TQWidget* parent, const char* name, bool modal, WFlags fl) + : ImportDlgBase(parent,name, modal,fl),DataCheckerListener(false),core(core) { KURLRequester* r = m_torrent_url; r->setMode(KFile::File|KFile::LocalOnly); diff --git a/plugins/partfileimport/importdialog.h b/plugins/partfileimport/importdialog.h index 9f7db9f..ea39920 100644 --- a/plugins/partfileimport/importdialog.h +++ b/plugins/partfileimport/importdialog.h @@ -49,7 +49,7 @@ namespace kt TQ_OBJECT public: - ImportDialog(CoreInterface* core,TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + ImportDialog(CoreInterface* core,TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); virtual ~ImportDialog(); public slots: diff --git a/plugins/partfileimport/partfileimportplugin.cpp b/plugins/partfileimport/partfileimportplugin.cpp index 04ef8fd..e831a1b 100644 --- a/plugins/partfileimport/partfileimportplugin.cpp +++ b/plugins/partfileimport/partfileimportplugin.cpp @@ -39,8 +39,8 @@ K_EXPORT_COMPONENT_FACTORY(ktpartfileimportplugin,KGenericFactory<kt::PartFileIm namespace kt { - PartFileImportPlugin::PartFileImportPlugin(TQObject* tqparent, const char* name, const TQStringList& args) - : Plugin(tqparent, name, args,NAME,i18n("Import"),AUTHOR,EMAIL,i18n("Imports partially or fully downloaded torrents from other clients"),"ktplugins") + PartFileImportPlugin::PartFileImportPlugin(TQObject* parent, const char* name, const TQStringList& args) + : Plugin(parent, name, args,NAME,i18n("Import"),AUTHOR,EMAIL,i18n("Imports partially or fully downloaded torrents from other clients"),"ktplugins") { setXMLFile("ktpartfileimportpluginui.rc"); import_action = 0; diff --git a/plugins/partfileimport/partfileimportplugin.h b/plugins/partfileimport/partfileimportplugin.h index da2874e..ff97ba5 100644 --- a/plugins/partfileimport/partfileimportplugin.h +++ b/plugins/partfileimport/partfileimportplugin.h @@ -35,7 +35,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - PartFileImportPlugin(TQObject* tqparent, const char* name, const TQStringList& args); + PartFileImportPlugin(TQObject* parent, const char* name, const TQStringList& args); virtual ~PartFileImportPlugin(); virtual void load(); diff --git a/plugins/rssfeed/rss/article.cpp b/plugins/rssfeed/rss/article.cpp index 476eb09..9e52589 100644 --- a/plugins/rssfeed/rss/article.cpp +++ b/plugins/rssfeed/rss/article.cpp @@ -241,9 +241,9 @@ TQString Article::meta(const TQString &key) const return d->meta[key]; } -KURLLabel *Article::widget(TQWidget *tqparent, const char *name) const +KURLLabel *Article::widget(TQWidget *parent, const char *name) const { - KURLLabel *label = new KURLLabel(d->link.url(), d->title, tqparent, name); + KURLLabel *label = new KURLLabel(d->link.url(), d->title, parent, name); label->setUseTips(true); if (!d->description.isNull()) label->setTipText(d->description); diff --git a/plugins/rssfeed/rss/article.h b/plugins/rssfeed/rss/article.h index 93f1908..6fbbe44 100644 --- a/plugins/rssfeed/rss/article.h +++ b/plugins/rssfeed/rss/article.h @@ -132,7 +132,7 @@ namespace RSS TQString meta(const TQString &key) const; /** - * @param tqparent The tqparent widget for the KURLLabel. + * @param parent The parent widget for the KURLLabel. * @param name A name for the widget which will be used internally. * @return a widget (a KURLLabel in this case) for the Article. * This makes building a user-interface which contains the @@ -145,7 +145,7 @@ namespace RSS * Note that you have to delete the KURLLabel object returned by * this method yourself. */ - KURLLabel *widget(TQWidget *tqparent = 0, const char *name = 0) const; + KURLLabel *widget(TQWidget *parent = 0, const char *name = 0) const; typedef TQMap<TQString, TQString> MetaInfoMap; diff --git a/plugins/rssfeed/rss/document.cpp b/plugins/rssfeed/rss/document.cpp index 812338a..c65e263 100644 --- a/plugins/rssfeed/rss/document.cpp +++ b/plugins/rssfeed/rss/document.cpp @@ -150,7 +150,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) d->link = elemText; - /* This is ugly but necessary since RSS 0.90 and 1.0 have a different tqparent + /* This is ugly but necessary since RSS 0.90 and 1.0 have a different parent * node for <image>, <textinput> and <item> than RSS 0.91-0.94 and RSS 2.0. */ TQDomNode parentNode; diff --git a/plugins/rssfeed/rss/tools_p.cpp b/plugins/rssfeed/rss/tools_p.cpp index fb161e8..cc2d2ab 100644 --- a/plugins/rssfeed/rss/tools_p.cpp +++ b/plugins/rssfeed/rss/tools_p.cpp @@ -27,9 +27,9 @@ time_t RSS::parseISO8601Date(const TQString &s) } -TQString RSS::extractNode(const TQDomNode &tqparent, const TQString &elemName, bool isInlined) +TQString RSS::extractNode(const TQDomNode &parent, const TQString &elemName, bool isInlined) { - TQDomNode node = tqparent.namedItem(elemName); + TQDomNode node = parent.namedItem(elemName); if (node.isNull()) return TQString(); diff --git a/plugins/rssfeed/rss/tools_p.h b/plugins/rssfeed/rss/tools_p.h index 1f77171..45e8bdc 100644 --- a/plugins/rssfeed/rss/tools_p.h +++ b/plugins/rssfeed/rss/tools_p.h @@ -26,7 +26,7 @@ namespace RSS unsigned int count; }; - TQString extractNode(const TQDomNode &tqparent, const TQString &elemName, bool isInlined=true); + TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isInlined=true); time_t parseISO8601Date(const TQString &s); } diff --git a/plugins/rssfeed/rssfeed.cpp b/plugins/rssfeed/rssfeed.cpp index ef81495..f051f1b 100644 --- a/plugins/rssfeed/rssfeed.cpp +++ b/plugins/rssfeed/rssfeed.cpp @@ -54,7 +54,7 @@ namespace kt startFeed(); } - RssFeed::RssFeed(TQObject * tqparent) : TQObject(tqparent) + RssFeed::RssFeed(TQObject * parent) : TQObject(parent) { m_active = false; m_articleAge = 365; diff --git a/plugins/rssfeed/rssfeed.h b/plugins/rssfeed/rssfeed.h index 279862b..5213d8f 100644 --- a/plugins/rssfeed/rssfeed.h +++ b/plugins/rssfeed/rssfeed.h @@ -54,7 +54,7 @@ namespace kt /** * Default constructor. */ - RssFeed(TQObject * tqparent = 0); + RssFeed(TQObject * parent = 0); RssFeed(KURL feedUrl, TQString title = "", bool active = false, int articleAge = 3, bool ignoreTTL = false, TQTime autoRefresh = TQTime()); RssFeed(const RssFeed &other); RssFeed &operator=(const RssFeed &other); diff --git a/plugins/rssfeed/rssfeedmanager.cpp b/plugins/rssfeed/rssfeedmanager.cpp index f9d0a2f..20f81a6 100644 --- a/plugins/rssfeed/rssfeedmanager.cpp +++ b/plugins/rssfeed/rssfeedmanager.cpp @@ -60,7 +60,7 @@ using namespace bt; namespace kt { - RssFeedManager::RssFeedManager(CoreInterface* core, TQWidget * tqparent) : RssFeedWidget(tqparent) + RssFeedManager::RssFeedManager(CoreInterface* core, TQWidget * parent) : RssFeedWidget(parent) { //Construct the manager m_core = core; diff --git a/plugins/rssfeed/rssfeedmanager.h b/plugins/rssfeed/rssfeedmanager.h index 2d3e7cd..bfb0660 100644 --- a/plugins/rssfeed/rssfeedmanager.h +++ b/plugins/rssfeed/rssfeedmanager.h @@ -55,7 +55,7 @@ namespace kt * @param core Pointer to core interface * @param openSilently Wheather to open torrent silently or nor. */ - RssFeedManager(CoreInterface* core, TQWidget * tqparent = 0); + RssFeedManager(CoreInterface* core, TQWidget * parent = 0); ~RssFeedManager(); public slots: diff --git a/plugins/rssfeed/rssfeedplugin.cpp b/plugins/rssfeed/rssfeedplugin.cpp index 66761cc..fbe83e4 100644 --- a/plugins/rssfeed/rssfeedplugin.cpp +++ b/plugins/rssfeed/rssfeedplugin.cpp @@ -47,8 +47,8 @@ namespace kt const TQString EMAIL = "skyphyr@gmail.com"; const TQString DESCRIPTION = i18n("Automatically scans RSS feeds for torrent matching regular expressions and loads them."); - RssFeedPlugin::RssFeedPlugin(TQObject* tqparent, const char* name, const TQStringList& args) - : Plugin(tqparent, name, args,NAME,i18n("RSS Feeds"),AUTHOR,EMAIL,DESCRIPTION,"player_playlist") + RssFeedPlugin::RssFeedPlugin(TQObject* parent, const char* name, const TQStringList& args) + : Plugin(parent, name, args,NAME,i18n("RSS Feeds"),AUTHOR,EMAIL,DESCRIPTION,"player_playlist") { m_rssFeedManager = 0; } diff --git a/plugins/rssfeed/rssfeedplugin.h b/plugins/rssfeed/rssfeedplugin.h index 991727f..1fa0ff5 100644 --- a/plugins/rssfeed/rssfeedplugin.h +++ b/plugins/rssfeed/rssfeedplugin.h @@ -39,7 +39,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - RssFeedPlugin(TQObject* tqparent, const char* name, const TQStringList& args); + RssFeedPlugin(TQObject* parent, const char* name, const TQStringList& args); virtual ~RssFeedPlugin(); virtual void load(); diff --git a/plugins/rssfeed/rssfilter.cpp b/plugins/rssfeed/rssfilter.cpp index 8210bcc..51ac2ff 100644 --- a/plugins/rssfeed/rssfilter.cpp +++ b/plugins/rssfeed/rssfilter.cpp @@ -53,7 +53,7 @@ namespace kt return m_link==other.link() && m_season==other.season() && m_episode==other.episode(); } - RssFilter::RssFilter(TQObject * tqparent) : TQObject(tqparent) + RssFilter::RssFilter(TQObject * parent) : TQObject(parent) { m_title = "New"; m_active = false; diff --git a/plugins/rssfeed/rssfilter.h b/plugins/rssfeed/rssfilter.h index 2bf3dca..53695f5 100644 --- a/plugins/rssfeed/rssfilter.h +++ b/plugins/rssfeed/rssfilter.h @@ -75,7 +75,7 @@ namespace kt /** * Default constructor. */ - RssFilter(TQObject * tqparent = 0); + RssFilter(TQObject * parent = 0); RssFilter(const RssFilter &other); RssFilter(TQString title, bool active, TQStringList regexps, bool series, bool sansEpisode, int minSeason, int minEpisode, int maxSeason, int maxEpisode, diff --git a/plugins/rssfeed/rsslinkdownloader.cpp b/plugins/rssfeed/rsslinkdownloader.cpp index dd754e5..972a220 100644 --- a/plugins/rssfeed/rsslinkdownloader.cpp +++ b/plugins/rssfeed/rsslinkdownloader.cpp @@ -33,7 +33,7 @@ using namespace bt; namespace kt { - RssLinkDownloader::RssLinkDownloader(CoreInterface* core, TQString link, RssFilter * filter, TQObject * tqparent) : TQObject (tqparent) + RssLinkDownloader::RssLinkDownloader(CoreInterface* core, TQString link, RssFilter * filter, TQObject * parent) : TQObject (parent) { //tempFile.setAutoDelete(true); m_core = core; diff --git a/plugins/rssfeed/rsslinkdownloader.h b/plugins/rssfeed/rsslinkdownloader.h index 0c5541f..2bd8bf1 100644 --- a/plugins/rssfeed/rsslinkdownloader.h +++ b/plugins/rssfeed/rsslinkdownloader.h @@ -53,7 +53,7 @@ namespace kt /** * Default constructor. */ - RssLinkDownloader(CoreInterface* core, TQString link, RssFilter * filter = 0, TQObject * tqparent = 0); + RssLinkDownloader(CoreInterface* core, TQString link, RssFilter * filter = 0, TQObject * parent = 0); ~RssLinkDownloader(); diff --git a/plugins/scanfolder/scanfolderplugin.cpp b/plugins/scanfolder/scanfolderplugin.cpp index b4bcd5c..2d9c069 100644 --- a/plugins/scanfolder/scanfolderplugin.cpp +++ b/plugins/scanfolder/scanfolderplugin.cpp @@ -48,8 +48,8 @@ namespace kt const TQString EMAIL = "ivasic@gmail.com"; const TQString DESCRIPTION = i18n("Automatically scans directories for torrent files and loads them."); - ScanFolderPlugin::ScanFolderPlugin(TQObject* tqparent, const char* name, const TQStringList& args) - : Plugin(tqparent, name, args,NAME,i18n("Scan Folder"),AUTHOR,EMAIL,DESCRIPTION,"view_sidetree") + ScanFolderPlugin::ScanFolderPlugin(TQObject* parent, const char* name, const TQStringList& args) + : Plugin(parent, name, args,NAME,i18n("Scan Folder"),AUTHOR,EMAIL,DESCRIPTION,"view_sidetree") { // setXMLFile("ktscanfolderpluginui.rc"); m_sf1 = 0; diff --git a/plugins/scanfolder/scanfolderplugin.h b/plugins/scanfolder/scanfolderplugin.h index 64f2f5b..3d74fab 100644 --- a/plugins/scanfolder/scanfolderplugin.h +++ b/plugins/scanfolder/scanfolderplugin.h @@ -40,7 +40,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - ScanFolderPlugin(TQObject* tqparent, const char* name, const TQStringList& args); + ScanFolderPlugin(TQObject* parent, const char* name, const TQStringList& args); virtual ~ScanFolderPlugin(); virtual void load(); diff --git a/plugins/scanfolder/scanfolderprefpage.cpp b/plugins/scanfolder/scanfolderprefpage.cpp index f5a462b..4e01901 100644 --- a/plugins/scanfolder/scanfolderprefpage.cpp +++ b/plugins/scanfolder/scanfolderprefpage.cpp @@ -49,9 +49,9 @@ namespace kt return true; } - void ScanFolderPrefPage::createWidget(TQWidget* tqparent) + void ScanFolderPrefPage::createWidget(TQWidget* parent) { - m_widget = new ScanFolderPrefPageWidget(tqparent); + m_widget = new ScanFolderPrefPageWidget(parent); } void ScanFolderPrefPage::updateData() diff --git a/plugins/scanfolder/scanfolderprefpage.h b/plugins/scanfolder/scanfolderprefpage.h index e09210b..cb2f80c 100644 --- a/plugins/scanfolder/scanfolderprefpage.h +++ b/plugins/scanfolder/scanfolderprefpage.h @@ -39,7 +39,7 @@ namespace kt virtual ~ScanFolderPrefPage(); virtual bool apply(); - virtual void createWidget(TQWidget* tqparent); + virtual void createWidget(TQWidget* parent); virtual void updateData(); virtual void deleteWidget(); diff --git a/plugins/scanfolder/scanfolderprefpagewidget.cpp b/plugins/scanfolder/scanfolderprefpagewidget.cpp index b1a6125..af70fc6 100644 --- a/plugins/scanfolder/scanfolderprefpagewidget.cpp +++ b/plugins/scanfolder/scanfolderprefpagewidget.cpp @@ -32,8 +32,8 @@ namespace kt { - ScanFolderPrefPageWidget::ScanFolderPrefPageWidget(TQWidget *tqparent, const char *name) - :SfPrefPageWidgetBase(tqparent, name) + ScanFolderPrefPageWidget::ScanFolderPrefPageWidget(TQWidget *parent, const char *name) + :SfPrefPageWidgetBase(parent, name) { use1->setChecked(ScanFolderPluginSettings::useFolder1()); use2->setChecked(ScanFolderPluginSettings::useFolder2()); diff --git a/plugins/scanfolder/scanfolderprefpagewidget.h b/plugins/scanfolder/scanfolderprefpagewidget.h index 6419e1c..ab4b348 100644 --- a/plugins/scanfolder/scanfolderprefpagewidget.h +++ b/plugins/scanfolder/scanfolderprefpagewidget.h @@ -29,7 +29,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - ScanFolderPrefPageWidget(TQWidget *tqparent = 0, const char *name = 0); + ScanFolderPrefPageWidget(TQWidget *parent = 0, const char *name = 0); void apply(); }; diff --git a/plugins/scheduler/bwsprefpagewidget.cpp b/plugins/scheduler/bwsprefpagewidget.cpp index 96e0613..95f72d6 100644 --- a/plugins/scheduler/bwsprefpagewidget.cpp +++ b/plugins/scheduler/bwsprefpagewidget.cpp @@ -45,8 +45,8 @@ namespace kt /* PREF PAGE WIDGET --------------------------------------------------------*/ - BWSPrefPageWidget::BWSPrefPageWidget(TQWidget* tqparent, const char* name, WFlags fl) - : BWSPage(tqparent,name,fl) + BWSPrefPageWidget::BWSPrefPageWidget(TQWidget* parent, const char* name, WFlags fl) + : BWSPage(parent,name,fl) { loadDefault(); diff --git a/plugins/scheduler/bwsprefpagewidget.h b/plugins/scheduler/bwsprefpagewidget.h index 7529887..840311c 100644 --- a/plugins/scheduler/bwsprefpagewidget.h +++ b/plugins/scheduler/bwsprefpagewidget.h @@ -36,7 +36,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - BWSPrefPageWidget(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + BWSPrefPageWidget(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~BWSPrefPageWidget(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/plugins/scheduler/bwswidget.cpp b/plugins/scheduler/bwswidget.cpp index a4180ab..dd9728f 100644 --- a/plugins/scheduler/bwswidget.cpp +++ b/plugins/scheduler/bwswidget.cpp @@ -34,8 +34,8 @@ namespace kt { - BWSWidget::BWSWidget(TQWidget* tqparent, const char* name, bool useColors) - : TQTable(tqparent,name), m_leftCategory(1), m_rightCategory(0), draw_focus(true), right_click(false), use_colors(useColors) + BWSWidget::BWSWidget(TQWidget* parent, const char* name, bool useColors) + : TQTable(parent,name), m_leftCategory(1), m_rightCategory(0), draw_focus(true), right_click(false), use_colors(useColors) { use_colors = SchedulerPluginSettings::useColors(); diff --git a/plugins/scheduler/bwswidget.h b/plugins/scheduler/bwswidget.h index c313dd1..781517a 100644 --- a/plugins/scheduler/bwswidget.h +++ b/plugins/scheduler/bwswidget.h @@ -46,7 +46,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - BWSWidget(TQWidget* tqparent = 0, const char* name = 0, bool useColors = true); + BWSWidget(TQWidget* parent = 0, const char* name = 0, bool useColors = true); ~BWSWidget(); ///Repaints the whole widget diff --git a/plugins/scheduler/schedulerplugin.cpp b/plugins/scheduler/schedulerplugin.cpp index 9177ebb..ddef7c8 100644 --- a/plugins/scheduler/schedulerplugin.cpp +++ b/plugins/scheduler/schedulerplugin.cpp @@ -55,8 +55,8 @@ namespace kt const TQString EMAIL = "ivasic@gmail.com"; const TQString DESCRIPTION = i18n("Bandwidth scheduling plugin"); - SchedulerPlugin::SchedulerPlugin(TQObject* tqparent, const char* name, const TQStringList& args) - : Plugin(tqparent, name, args,NAME,i18n("Bandwidth Scheduler"),AUTHOR,EMAIL,DESCRIPTION, "clock") + SchedulerPlugin::SchedulerPlugin(TQObject* parent, const char* name, const TQStringList& args) + : Plugin(parent, name, args,NAME,i18n("Bandwidth Scheduler"),AUTHOR,EMAIL,DESCRIPTION, "clock") { setXMLFile("ktschedulerpluginui.rc"); bws_action = 0; diff --git a/plugins/scheduler/schedulerplugin.h b/plugins/scheduler/schedulerplugin.h index 96dad21..8d228c3 100644 --- a/plugins/scheduler/schedulerplugin.h +++ b/plugins/scheduler/schedulerplugin.h @@ -45,7 +45,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - SchedulerPlugin(TQObject* tqparent, const char* name, const TQStringList& args); + SchedulerPlugin(TQObject* parent, const char* name, const TQStringList& args); virtual ~SchedulerPlugin(); virtual void load(); diff --git a/plugins/scheduler/schedulerprefpage.cpp b/plugins/scheduler/schedulerprefpage.cpp index 076fb5c..8af124b 100644 --- a/plugins/scheduler/schedulerprefpage.cpp +++ b/plugins/scheduler/schedulerprefpage.cpp @@ -48,9 +48,9 @@ namespace kt return true; } - void SchedulerPrefPage::createWidget( TQWidget * tqparent ) + void SchedulerPrefPage::createWidget( TQWidget * parent ) { - widget = new SchedulerPrefPageWidget(tqparent); + widget = new SchedulerPrefPageWidget(parent); } void SchedulerPrefPage::updateData() diff --git a/plugins/scheduler/schedulerprefpage.h b/plugins/scheduler/schedulerprefpage.h index a2efa21..56fbe3b 100644 --- a/plugins/scheduler/schedulerprefpage.h +++ b/plugins/scheduler/schedulerprefpage.h @@ -40,7 +40,7 @@ namespace kt virtual ~SchedulerPrefPage(); virtual bool apply(); - virtual void createWidget(TQWidget* tqparent); + virtual void createWidget(TQWidget* parent); virtual void updateData(); virtual void deleteWidget(); diff --git a/plugins/scheduler/schedulerprefpagewidget.cpp b/plugins/scheduler/schedulerprefpagewidget.cpp index ad12e73..65d600b 100644 --- a/plugins/scheduler/schedulerprefpagewidget.cpp +++ b/plugins/scheduler/schedulerprefpagewidget.cpp @@ -30,8 +30,8 @@ namespace kt { - SchedulerPrefPageWidget::SchedulerPrefPageWidget(TQWidget* tqparent, const char* name, WFlags fl) - : SchedulerPage(tqparent,name,fl) + SchedulerPrefPageWidget::SchedulerPrefPageWidget(TQWidget* parent, const char* name, WFlags fl) + : SchedulerPage(parent,name,fl) { groupBWS->setEnabled(false); bool useit = SchedulerPluginSettings::enableBWS(); diff --git a/plugins/scheduler/schedulerprefpagewidget.h b/plugins/scheduler/schedulerprefpagewidget.h index 5274f3d..567e5d7 100644 --- a/plugins/scheduler/schedulerprefpagewidget.h +++ b/plugins/scheduler/schedulerprefpagewidget.h @@ -34,7 +34,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - SchedulerPrefPageWidget(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + SchedulerPrefPageWidget(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~SchedulerPrefPageWidget(); diff --git a/plugins/search/htmlpart.cpp b/plugins/search/htmlpart.cpp index 00d5326..bad55d6 100644 --- a/plugins/search/htmlpart.cpp +++ b/plugins/search/htmlpart.cpp @@ -36,8 +36,8 @@ using namespace bt; namespace kt { - HTMLPart::HTMLPart(TQWidget *tqparent) - : KHTMLPart(tqparent) + HTMLPart::HTMLPart(TQWidget *parent) + : KHTMLPart(parent) { setJScriptEnabled(true); setJavaEnabled(true); diff --git a/plugins/search/htmlpart.h b/plugins/search/htmlpart.h index 8b400dc..1a50d9b 100644 --- a/plugins/search/htmlpart.h +++ b/plugins/search/htmlpart.h @@ -39,7 +39,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - HTMLPart(TQWidget *tqparent = 0); + HTMLPart(TQWidget *parent = 0); virtual ~HTMLPart(); public slots: diff --git a/plugins/search/searchplugin.cpp b/plugins/search/searchplugin.cpp index 9b13680..b22e858 100644 --- a/plugins/search/searchplugin.cpp +++ b/plugins/search/searchplugin.cpp @@ -46,8 +46,8 @@ K_EXPORT_COMPONENT_FACTORY(ktsearchplugin,KGenericFactory<kt::SearchPlugin>("kts namespace kt { - SearchPlugin::SearchPlugin(TQObject* tqparent, const char* name, const TQStringList& args) - : Plugin(tqparent, name, args,NAME,i18n("Search"),AUTHOR,EMAIL, + SearchPlugin::SearchPlugin(TQObject* parent, const char* name, const TQStringList& args) + : Plugin(parent, name, args,NAME,i18n("Search"),AUTHOR,EMAIL, i18n("Search for torrents on several popular torrent search engines"),"viewmag") { // setXMLFile("ktsearchpluginui.rc"); diff --git a/plugins/search/searchplugin.h b/plugins/search/searchplugin.h index 9bfbb0b..46b859b 100644 --- a/plugins/search/searchplugin.h +++ b/plugins/search/searchplugin.h @@ -39,7 +39,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - SearchPlugin(TQObject* tqparent, const char* name, const TQStringList& args); + SearchPlugin(TQObject* parent, const char* name, const TQStringList& args); virtual ~SearchPlugin(); virtual void load(); diff --git a/plugins/search/searchprefpage.cpp b/plugins/search/searchprefpage.cpp index 197dd0f..adf78ba 100644 --- a/plugins/search/searchprefpage.cpp +++ b/plugins/search/searchprefpage.cpp @@ -47,7 +47,7 @@ using namespace bt; namespace kt { - SearchPrefPageWidget::SearchPrefPageWidget(TQWidget *tqparent) : SEPreferences(tqparent) + SearchPrefPageWidget::SearchPrefPageWidget(TQWidget *parent) : SEPreferences(parent) { TQString info = i18n("Use your web browser to search for the string %1" " (capital letters) on the search engine you want to add. <br> " @@ -264,9 +264,9 @@ namespace kt return ret; } - void SearchPrefPage::createWidget(TQWidget* tqparent) + void SearchPrefPage::createWidget(TQWidget* parent) { - widget = new SearchPrefPageWidget(tqparent); + widget = new SearchPrefPageWidget(parent); } void SearchPrefPage::deleteWidget() diff --git a/plugins/search/searchprefpage.h b/plugins/search/searchprefpage.h index 748b378..58c80dd 100644 --- a/plugins/search/searchprefpage.h +++ b/plugins/search/searchprefpage.h @@ -36,7 +36,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - SearchPrefPageWidget(TQWidget *tqparent = 0); + SearchPrefPageWidget(TQWidget *parent = 0); bool apply(); void saveSearchEngines(); @@ -65,7 +65,7 @@ namespace kt virtual ~SearchPrefPage(); virtual bool apply(); - virtual void createWidget(TQWidget* tqparent); + virtual void createWidget(TQWidget* parent); virtual void updateData(); virtual void deleteWidget(); diff --git a/plugins/stats/StatsPluginPrefs.cc b/plugins/stats/StatsPluginPrefs.cc index 1d501a6..63a853d 100644 --- a/plugins/stats/StatsPluginPrefs.cc +++ b/plugins/stats/StatsPluginPrefs.cc @@ -54,9 +54,9 @@ bool StatsPluginPrefs::apply () return true; } -void StatsPluginPrefs::createWidget (TQWidget *tqparent) +void StatsPluginPrefs::createWidget (TQWidget *parent) { - pmUi = new StatsPluginPrefsPage(tqparent); + pmUi = new StatsPluginPrefsPage(parent); } void StatsPluginPrefs::updateData () diff --git a/plugins/stats/StatsPluginPrefs.h b/plugins/stats/StatsPluginPrefs.h index 2eabcac..1d5b4f7 100644 --- a/plugins/stats/StatsPluginPrefs.h +++ b/plugins/stats/StatsPluginPrefs.h @@ -55,7 +55,7 @@ class StatsPluginPrefs : public TQObject, public PrefPageInterface virtual ~StatsPluginPrefs(); virtual bool apply (); - virtual void createWidget (TQWidget *tqparent); + virtual void createWidget (TQWidget *parent); virtual void updateData (); virtual void deleteWidget (); signals: diff --git a/plugins/stats/statsplugin.cc b/plugins/stats/statsplugin.cc index 224d736..2980cb3 100644 --- a/plugins/stats/statsplugin.cc +++ b/plugins/stats/statsplugin.cc @@ -25,8 +25,8 @@ K_EXPORT_COMPONENT_FACTORY(ktstatsplugin, KGenericFactory<kt::StatsPlugin>("ktst namespace kt { -StatsPlugin::StatsPlugin(TQObject* tqparent, const char* qt_name, const TQStringList& args): - Plugin(tqparent, qt_name, args, "Statistics", i18n("Statistics"),"Krzysztof Kundzicz", "athantor@gmail.com", i18n("Shows transfers statistics"),"ktimemon"), pmUiSpd(0), pmUiCon(0), pmPrefsUi(0), pmUpdTmr(0) +StatsPlugin::StatsPlugin(TQObject* parent, const char* qt_name, const TQStringList& args): + Plugin(parent, qt_name, args, "Statistics", i18n("Statistics"),"Krzysztof Kundzicz", "athantor@gmail.com", i18n("Shows transfers statistics"),"ktimemon"), pmUiSpd(0), pmUiCon(0), pmPrefsUi(0), pmUpdTmr(0) { mUpAvg = std::make_pair(0.0, 0.0); mDownAvg = std::make_pair(0.0, 0.0); @@ -46,8 +46,8 @@ void StatsPlugin::load() mUpdCtr = 1; mPeerSpdUpdCtr = 1; - pmUiSpd = new StatsSpd(dynamic_cast<TQWidget *>(tqparent())); - pmUiCon = new StatsCon(dynamic_cast<TQWidget *>(tqparent())); + pmUiSpd = new StatsSpd(dynamic_cast<TQWidget *>(parent())); + pmUiCon = new StatsCon(dynamic_cast<TQWidget *>(parent())); pmPrefsUi = new StatsPluginPrefs(); pmUpdTmr = new TQTimer(this); diff --git a/plugins/stats/statsplugin.h b/plugins/stats/statsplugin.h index df482a7..4266d43 100644 --- a/plugins/stats/statsplugin.h +++ b/plugins/stats/statsplugin.h @@ -134,11 +134,11 @@ class StatsPlugin : public Plugin public: /** \brief Constructor - \param tqparent Parent + \param parent Parent \param qt_name \param args */ - StatsPlugin(TQObject* tqparent, const char* qt_name, const TQStringList& args); + StatsPlugin(TQObject* parent, const char* qt_name, const TQStringList& args); ///Destructor virtual ~StatsPlugin(); diff --git a/plugins/upnp/upnpplugin.cpp b/plugins/upnp/upnpplugin.cpp index 95df507..66ee23c 100644 --- a/plugins/upnp/upnpplugin.cpp +++ b/plugins/upnp/upnpplugin.cpp @@ -42,8 +42,8 @@ K_EXPORT_COMPONENT_FACTORY(ktupnpplugin,KGenericFactory<kt::UPnPPlugin>("ktupnpp namespace kt { - UPnPPlugin::UPnPPlugin(TQObject* tqparent, const char* name, const TQStringList& args) - : Plugin(tqparent, name, args,NAME,i18n("UPnP"),AUTHOR,EMAIL,i18n("Uses UPnP to automatically forward ports on your router"),"ktupnp") + UPnPPlugin::UPnPPlugin(TQObject* parent, const char* name, const TQStringList& args) + : Plugin(parent, name, args,NAME,i18n("UPnP"),AUTHOR,EMAIL,i18n("Uses UPnP to automatically forward ports on your router"),"ktupnp") { sock = 0; pref = 0; diff --git a/plugins/upnp/upnpplugin.h b/plugins/upnp/upnpplugin.h index f6e10f0..54fc619 100644 --- a/plugins/upnp/upnpplugin.h +++ b/plugins/upnp/upnpplugin.h @@ -35,7 +35,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - UPnPPlugin(TQObject* tqparent, const char* name, const TQStringList& args); + UPnPPlugin(TQObject* parent, const char* name, const TQStringList& args); virtual ~UPnPPlugin(); virtual void load(); diff --git a/plugins/upnp/upnpprefpage.cpp b/plugins/upnp/upnpprefpage.cpp index aa7a241..bce2285 100644 --- a/plugins/upnp/upnpprefpage.cpp +++ b/plugins/upnp/upnpprefpage.cpp @@ -43,9 +43,9 @@ namespace kt return true; } - void UPnPPrefPage::createWidget(TQWidget* tqparent) + void UPnPPrefPage::createWidget(TQWidget* parent) { - widget = new UPnPPrefWidget(tqparent); + widget = new UPnPPrefWidget(parent); TQObject::connect(sock,TQT_SIGNAL(discovered(UPnPRouter* )),widget,TQT_SLOT(addDevice(UPnPRouter* ))); TQObject::connect(widget,TQT_SIGNAL(rescan()),sock,TQT_SLOT(discover())); } diff --git a/plugins/upnp/upnpprefpage.h b/plugins/upnp/upnpprefpage.h index abba967..b66576e 100644 --- a/plugins/upnp/upnpprefpage.h +++ b/plugins/upnp/upnpprefpage.h @@ -46,7 +46,7 @@ namespace kt virtual ~UPnPPrefPage(); virtual bool apply(); - virtual void createWidget(TQWidget* tqparent); + virtual void createWidget(TQWidget* parent); virtual void deleteWidget(); virtual void updateData(); diff --git a/plugins/upnp/upnpprefwidget.cpp b/plugins/upnp/upnpprefwidget.cpp index bc05ad4..9b4c453 100644 --- a/plugins/upnp/upnpprefwidget.cpp +++ b/plugins/upnp/upnpprefwidget.cpp @@ -37,8 +37,8 @@ using namespace bt; namespace kt { - UPnPPrefWidget::UPnPPrefWidget(TQWidget* tqparent, const char* name, WFlags fl) - : UPnPWidget(tqparent,name,fl) + UPnPPrefWidget::UPnPPrefWidget(TQWidget* parent, const char* name, WFlags fl) + : UPnPWidget(parent,name,fl) { def_router = 0; connect(m_forward_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onForwardBtnClicked())); diff --git a/plugins/upnp/upnpprefwidget.h b/plugins/upnp/upnpprefwidget.h index 4c2c954..4164943 100644 --- a/plugins/upnp/upnpprefwidget.h +++ b/plugins/upnp/upnpprefwidget.h @@ -44,7 +44,7 @@ namespace kt TQ_OBJECT public: - UPnPPrefWidget(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + UPnPPrefWidget(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); virtual ~UPnPPrefWidget(); void shutdown(bt::WaitJob* job); diff --git a/plugins/webinterface/webinterfaceplugin.cpp b/plugins/webinterface/webinterfaceplugin.cpp index 513f3b8..32cc164 100644 --- a/plugins/webinterface/webinterfaceplugin.cpp +++ b/plugins/webinterface/webinterfaceplugin.cpp @@ -40,8 +40,8 @@ K_EXPORT_COMPONENT_FACTORY(ktwebinterfaceplugin,KGenericFactory<kt::WebInterface using namespace bt; namespace kt { - WebInterfacePlugin::WebInterfacePlugin(TQObject* tqparent, const char* name, const TQStringList& args) - : Plugin(tqparent, name, args,NAME,i18n("Web Interface"),AUTHOR,EMAIL,i18n("Allow to control ktorrent through browser"),"toggle_log") + WebInterfacePlugin::WebInterfacePlugin(TQObject* parent, const char* name, const TQStringList& args) + : Plugin(parent, name, args,NAME,i18n("Web Interface"),AUTHOR,EMAIL,i18n("Allow to control ktorrent through browser"),"toggle_log") { http_server = 0; pref=0; diff --git a/plugins/webinterface/webinterfaceplugin.h b/plugins/webinterface/webinterfaceplugin.h index 87c0f4d..3121641 100644 --- a/plugins/webinterface/webinterfaceplugin.h +++ b/plugins/webinterface/webinterfaceplugin.h @@ -35,7 +35,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - WebInterfacePlugin(TQObject* tqparent, const char* name, const TQStringList& args); + WebInterfacePlugin(TQObject* parent, const char* name, const TQStringList& args); virtual ~WebInterfacePlugin(); virtual void load(); diff --git a/plugins/webinterface/webinterfaceprefpage.cpp b/plugins/webinterface/webinterfaceprefpage.cpp index 1e1bc16..7225afd 100644 --- a/plugins/webinterface/webinterfaceprefpage.cpp +++ b/plugins/webinterface/webinterfaceprefpage.cpp @@ -43,9 +43,9 @@ namespace kt return true; } - void WebInterfacePrefPage::createWidget(TQWidget* tqparent) + void WebInterfacePrefPage::createWidget(TQWidget* parent) { - m_widget = new WebInterfacePrefWidget(tqparent); + m_widget = new WebInterfacePrefWidget(parent); } void WebInterfacePrefPage::updateData() diff --git a/plugins/webinterface/webinterfaceprefpage.h b/plugins/webinterface/webinterfaceprefpage.h index ee796af..9bf606e 100644 --- a/plugins/webinterface/webinterfaceprefpage.h +++ b/plugins/webinterface/webinterfaceprefpage.h @@ -41,7 +41,7 @@ namespace kt virtual ~WebInterfacePrefPage(); virtual bool apply(); - virtual void createWidget(TQWidget* tqparent); + virtual void createWidget(TQWidget* parent); virtual void updateData(); virtual void deleteWidget(); diff --git a/plugins/webinterface/webinterfaceprefwidget.cpp b/plugins/webinterface/webinterfaceprefwidget.cpp index ccf9555..6f4baed 100644 --- a/plugins/webinterface/webinterfaceprefwidget.cpp +++ b/plugins/webinterface/webinterfaceprefwidget.cpp @@ -44,7 +44,7 @@ using namespace bt; namespace kt { -WebInterfacePrefWidget::WebInterfacePrefWidget(TQWidget *tqparent, const char *name):WebInterfacePreference(tqparent,name) +WebInterfacePrefWidget::WebInterfacePrefWidget(TQWidget *parent, const char *name):WebInterfacePreference(parent,name) { port->setValue(WebInterfacePluginSettings::port()); forward->setChecked(WebInterfacePluginSettings::forward()); diff --git a/plugins/webinterface/webinterfaceprefwidget.h b/plugins/webinterface/webinterfaceprefwidget.h index 52bde80..d670238 100644 --- a/plugins/webinterface/webinterfaceprefwidget.h +++ b/plugins/webinterface/webinterfaceprefwidget.h @@ -30,7 +30,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - WebInterfacePrefWidget(TQWidget *tqparent = 0, const char *name = 0); + WebInterfacePrefWidget(TQWidget *parent = 0, const char *name = 0); bool apply(); TQCString password; public slots: diff --git a/plugins/webinterface/www/coldmilk/rest.php b/plugins/webinterface/www/coldmilk/rest.php index 91b67a7..bab7e68 100644 --- a/plugins/webinterface/www/coldmilk/rest.php +++ b/plugins/webinterface/www/coldmilk/rest.php @@ -203,7 +203,7 @@ class RestInterface { class KTorrentXML extends DomDocument { private $root_element; public function __construct($root, $value = null, $attributes = null) { - tqparent::__construct('1.0'); + parent::__construct('1.0'); $this->root_element = $this->createElement($root); $this->appendChild($this->root_element); $this->formatOutput = true; diff --git a/plugins/zeroconf/zeroconfplugin.cpp b/plugins/zeroconf/zeroconfplugin.cpp index 3427900..d7e68d5 100644 --- a/plugins/zeroconf/zeroconfplugin.cpp +++ b/plugins/zeroconf/zeroconfplugin.cpp @@ -37,8 +37,8 @@ using namespace bt; namespace kt { - ZeroConfPlugin::ZeroConfPlugin(TQObject* tqparent, const char* name, const TQStringList& args) - : Plugin(tqparent, name,args,NAME,i18n("Zeroconf"),AUTHOR,TQString(),i18n("Finds peers running ktorrent on the local network to share torrents with"),"ktplugins") + ZeroConfPlugin::ZeroConfPlugin(TQObject* parent, const char* name, const TQStringList& args) + : Plugin(parent, name,args,NAME,i18n("Zeroconf"),AUTHOR,TQString(),i18n("Finds peers running ktorrent on the local network to share torrents with"),"ktplugins") { services.setAutoDelete(true); } diff --git a/plugins/zeroconf/zeroconfplugin.h b/plugins/zeroconf/zeroconfplugin.h index f658f3e..8888caf 100644 --- a/plugins/zeroconf/zeroconfplugin.h +++ b/plugins/zeroconf/zeroconfplugin.h @@ -38,7 +38,7 @@ namespace kt Q_OBJECT TQ_OBJECT public: - ZeroConfPlugin(TQObject* tqparent, const char* name, const TQStringList& args); + ZeroConfPlugin(TQObject* parent, const char* name, const TQStringList& args); virtual ~ZeroConfPlugin(); virtual void load(); |