diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
commit | 2bc1d72869b62af05ae4feafd878203b526da8c5 (patch) | |
tree | 2676903bb600bd9646644856e354940471ad84e2 /kget | |
parent | 937b2991d8e78166eea904c80ad04d34607017a4 (diff) | |
download | tdenetwork-2bc1d72869b62af05ae4feafd878203b526da8c5.tar.gz tdenetwork-2bc1d72869b62af05ae4feafd878203b526da8c5.zip |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kget')
-rw-r--r-- | kget/dlgAdvanced.cpp | 4 | ||||
-rw-r--r-- | kget/dlgAdvanced.h | 2 | ||||
-rw-r--r-- | kget/dlgAutomation.cpp | 4 | ||||
-rw-r--r-- | kget/dlgAutomation.h | 2 | ||||
-rw-r--r-- | kget/dlgConnection.cpp | 4 | ||||
-rw-r--r-- | kget/dlgConnection.h | 2 | ||||
-rw-r--r-- | kget/dlgDirectories.cpp | 4 | ||||
-rw-r--r-- | kget/dlgDirectories.h | 2 | ||||
-rw-r--r-- | kget/dlgLimits.cpp | 4 | ||||
-rw-r--r-- | kget/dlgLimits.h | 2 | ||||
-rw-r--r-- | kget/dlgPreferences.cpp | 4 | ||||
-rw-r--r-- | kget/dlgPreferences.h | 2 | ||||
-rw-r--r-- | kget/dlgSystem.cpp | 4 | ||||
-rw-r--r-- | kget/dlgSystem.h | 2 | ||||
-rw-r--r-- | kget/dockindividual.cpp | 2 | ||||
-rw-r--r-- | kget/dockindividual.h | 2 | ||||
-rw-r--r-- | kget/docking.cpp | 20 | ||||
-rw-r--r-- | kget/docking.h | 6 | ||||
-rw-r--r-- | kget/droptarget.cpp | 8 | ||||
-rw-r--r-- | kget/droptarget.h | 4 | ||||
-rw-r--r-- | kget/kget_plug_in/kget_linkview.cpp | 8 | ||||
-rw-r--r-- | kget/kget_plug_in/kget_linkview.h | 4 | ||||
-rw-r--r-- | kget/kget_plug_in/kget_plug_in.cpp | 16 | ||||
-rw-r--r-- | kget/kget_plug_in/kget_plug_in.h | 6 | ||||
-rw-r--r-- | kget/logwindow.cpp | 2 | ||||
-rw-r--r-- | kget/logwindow.h | 2 | ||||
-rw-r--r-- | kget/transferlist.cpp | 6 | ||||
-rw-r--r-- | kget/transferlist.h | 2 |
28 files changed, 65 insertions, 65 deletions
diff --git a/kget/dlgAdvanced.cpp b/kget/dlgAdvanced.cpp index 1fb2ebaa..e4dee980 100644 --- a/kget/dlgAdvanced.cpp +++ b/kget/dlgAdvanced.cpp @@ -38,8 +38,8 @@ -DlgAdvanced::DlgAdvanced(TQWidget * tqparent) - : DlgAdvancedBase(tqparent) +DlgAdvanced::DlgAdvanced(TQWidget * parent) + : DlgAdvancedBase(parent) { cb_partial->hide(); } diff --git a/kget/dlgAdvanced.h b/kget/dlgAdvanced.h index c7fdb797..7d426503 100644 --- a/kget/dlgAdvanced.h +++ b/kget/dlgAdvanced.h @@ -36,7 +36,7 @@ class DlgAdvanced : public DlgAdvancedBase public: - DlgAdvanced(TQWidget * tqparent); + DlgAdvanced(TQWidget * parent); ~DlgAdvanced() {} void applyData(); diff --git a/kget/dlgAutomation.cpp b/kget/dlgAutomation.cpp index 01762aa1..779cacf3 100644 --- a/kget/dlgAutomation.cpp +++ b/kget/dlgAutomation.cpp @@ -42,8 +42,8 @@ #include "dlgAutomation.h" -DlgAutomation::DlgAutomation(TQWidget * tqparent) - : DlgAutomationBase(tqparent) +DlgAutomation::DlgAutomation(TQWidget * parent) + : DlgAutomationBase(parent) { } diff --git a/kget/dlgAutomation.h b/kget/dlgAutomation.h index ada27c45..8a3025dd 100644 --- a/kget/dlgAutomation.h +++ b/kget/dlgAutomation.h @@ -41,7 +41,7 @@ class DlgAutomation:public DlgAutomationBase public: - DlgAutomation(TQWidget * tqparent); + DlgAutomation(TQWidget * parent); ~DlgAutomation() {} void applyData(); void setData(); diff --git a/kget/dlgConnection.cpp b/kget/dlgConnection.cpp index 0fa68b09..5530953b 100644 --- a/kget/dlgConnection.cpp +++ b/kget/dlgConnection.cpp @@ -42,8 +42,8 @@ #include "dlgConnection.h" -DlgConnection::DlgConnection(TQWidget * tqparent) - :DlgConnectionBase(tqparent, "", 0) +DlgConnection::DlgConnection(TQWidget * parent) + :DlgConnectionBase(parent, "", 0) { // TODO: these are not supported yet, so hide them gb_timeout->hide(); diff --git a/kget/dlgConnection.h b/kget/dlgConnection.h index 73229d61..0a8c2b72 100644 --- a/kget/dlgConnection.h +++ b/kget/dlgConnection.h @@ -40,7 +40,7 @@ class DlgConnection : public DlgConnectionBase public: - DlgConnection(TQWidget * tqparent); + DlgConnection(TQWidget * parent); ~DlgConnection() {} void applyData(); void setData(); diff --git a/kget/dlgDirectories.cpp b/kget/dlgDirectories.cpp index acd8f6fb..29d11dc0 100644 --- a/kget/dlgDirectories.cpp +++ b/kget/dlgDirectories.cpp @@ -42,8 +42,8 @@ #include "dlgDirectories.h" #include <kapplication.h> -DlgDirectories::DlgDirectories(TQWidget * tqparent) - : DlgDirectoriesBase(tqparent) +DlgDirectories::DlgDirectories(TQWidget * parent) + : DlgDirectoriesBase(parent) { connect( le_ext, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotDirectoryChanged( ) ) ); connect( le_dir, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotDirectoryChanged( ) ) ); diff --git a/kget/dlgDirectories.h b/kget/dlgDirectories.h index 77e19a55..b7484580 100644 --- a/kget/dlgDirectories.h +++ b/kget/dlgDirectories.h @@ -38,7 +38,7 @@ class DlgDirectories : public DlgDirectoriesBase public: - DlgDirectories(TQWidget * tqparent); + DlgDirectories(TQWidget * parent); ~DlgDirectories() {} void applyData(); void setData(); diff --git a/kget/dlgLimits.cpp b/kget/dlgLimits.cpp index c37c0023..8c6ded6d 100644 --- a/kget/dlgLimits.cpp +++ b/kget/dlgLimits.cpp @@ -37,8 +37,8 @@ #include "dlgLimits.h" -DlgLimits::DlgLimits(TQWidget * tqparent) - : DlgLimitsBase(tqparent) +DlgLimits::DlgLimits(TQWidget * parent) + : DlgLimitsBase(parent) { // TODO: these are not supported yet, so hide them lb_maxband->hide(); diff --git a/kget/dlgLimits.h b/kget/dlgLimits.h index b8a25a79..dd9b3b35 100644 --- a/kget/dlgLimits.h +++ b/kget/dlgLimits.h @@ -38,7 +38,7 @@ class DlgLimits : public DlgLimitsBase public: - DlgLimits(TQWidget * tqparent); + DlgLimits(TQWidget * parent); ~DlgLimits() {} void applyData(); void setData(); diff --git a/kget/dlgPreferences.cpp b/kget/dlgPreferences.cpp index 40ba314d..cc5ebb43 100644 --- a/kget/dlgPreferences.cpp +++ b/kget/dlgPreferences.cpp @@ -49,8 +49,8 @@ #include "dlgPreferences.h" -DlgPreferences::DlgPreferences(TQWidget * tqparent): - KDialogBase(Tabbed, i18n("Configure"), Ok|Apply|Help|Cancel, Ok, tqparent, "DlgPreferences", true) +DlgPreferences::DlgPreferences(TQWidget * parent): + KDialogBase(Tabbed, i18n("Configure"), Ok|Apply|Help|Cancel, Ok, parent, "DlgPreferences", true) { // add pages TQFrame *page = addPage(i18n("Connection")); diff --git a/kget/dlgPreferences.h b/kget/dlgPreferences.h index aa6596f5..e984af73 100644 --- a/kget/dlgPreferences.h +++ b/kget/dlgPreferences.h @@ -49,7 +49,7 @@ class DlgPreferences:public KDialogBase public: - DlgPreferences(TQWidget * tqparent); + DlgPreferences(TQWidget * parent); ~DlgPreferences() {} diff --git a/kget/dlgSystem.cpp b/kget/dlgSystem.cpp index 293b6c7a..af33f966 100644 --- a/kget/dlgSystem.cpp +++ b/kget/dlgSystem.cpp @@ -42,8 +42,8 @@ #include <tqlabel.h> -DlgSystem::DlgSystem(TQWidget * tqparent) - : DlgSystemBase(tqparent) +DlgSystem::DlgSystem(TQWidget * parent) + : DlgSystemBase(parent) { bg_window->hide(); textLabel4->hide(); diff --git a/kget/dlgSystem.h b/kget/dlgSystem.h index b72d479a..2e332bcc 100644 --- a/kget/dlgSystem.h +++ b/kget/dlgSystem.h @@ -38,7 +38,7 @@ class DlgSystem : public DlgSystemBase TQ_OBJECT public: - DlgSystem(TQWidget * tqparent); + DlgSystem(TQWidget * parent); ~DlgSystem() {} void applyData(); diff --git a/kget/dockindividual.cpp b/kget/dockindividual.cpp index 9aecd6ea..e8f02645 100644 --- a/kget/dockindividual.cpp +++ b/kget/dockindividual.cpp @@ -29,7 +29,7 @@ #include <kpopupmenu.h> #include "dockindividual.h" -DockIndividual::DockIndividual(TQWidget *tqparent, const char *name ) : KSystemTray(tqparent,name) +DockIndividual::DockIndividual(TQWidget *parent, const char *name ) : KSystemTray(parent,name) { nPic=0; setPixmap( loadIcon("bar0") ); diff --git a/kget/dockindividual.h b/kget/dockindividual.h index ff65e46d..9325226d 100644 --- a/kget/dockindividual.h +++ b/kget/dockindividual.h @@ -37,7 +37,7 @@ class DockIndividual : public KSystemTray { Q_OBJECT TQ_OBJECT public: - DockIndividual(TQWidget *tqparent=0, const char *name=0); + DockIndividual(TQWidget *parent=0, const char *name=0); ~DockIndividual(); int nPic; void setTip(const TQString &); diff --git a/kget/docking.cpp b/kget/docking.cpp index cc5a8044..c637303d 100644 --- a/kget/docking.cpp +++ b/kget/docking.cpp @@ -40,17 +40,17 @@ DockWidget::DockWidget(KMainWidget * _parent):KSystemTray(_parent) { - tqparent = _parent; + parent = _parent; setPixmap( loadIcon( "kget_dock" )); // popup menu for right mouse button KPopupMenu *popupMenu = contextMenu(); - tqparent->action("paste_transfer")->plug(popupMenu); - tqparent->action("drop_target")->plug(popupMenu); - tqparent->action("konqueror_integration")->plug(popupMenu); + parent->action("paste_transfer")->plug(popupMenu); + parent->action("drop_target")->plug(popupMenu); + parent->action("konqueror_integration")->plug(popupMenu); popupMenu->insertSeparator(); - tqparent->m_paPreferences->plug(popupMenu); + parent->m_paPreferences->plug(popupMenu); // Enable dropping setAcceptDrops(true); @@ -81,9 +81,9 @@ void DockWidget::dropEvent(TQDropEvent * event) TQString str; if (KURLDrag::decode(event, list)) { - tqparent->addTransfers(list); + parent->addTransfers(list); } else if (TQTextDrag::decode(event, str)) { - tqparent->addTransfer(str); + parent->addTransfer(str); } } @@ -91,7 +91,7 @@ void DockWidget::dropEvent(TQDropEvent * event) void DockWidget::mousePressEvent(TQMouseEvent * e) { if (e->button() == Qt::MidButton) { - tqparent->slotPasteTransfer(); + parent->slotPasteTransfer(); } else { KSystemTray::mousePressEvent(e); } @@ -110,8 +110,8 @@ void DockWidget::changeIcon( const TQString& icon ) } -DynamicTip::DynamicTip( TQWidget * tqparent ) - : TQToolTip( tqparent ) +DynamicTip::DynamicTip( TQWidget * parent ) + : TQToolTip( parent ) { // no explicit initialization needed } diff --git a/kget/docking.h b/kget/docking.h index a18f0eb6..7d866c88 100644 --- a/kget/docking.h +++ b/kget/docking.h @@ -41,7 +41,7 @@ class KMainWidget; class DynamicTip : public TQToolTip { public: - DynamicTip( TQWidget * tqparent ); + DynamicTip( TQWidget * parent ); virtual ~DynamicTip() {}//TODO workaround for qt-bug, can be removed after 4.0 void settqStatus( const TQString & _status ); @@ -58,7 +58,7 @@ class DockWidget:public KSystemTray TQ_OBJECT public: - DockWidget(KMainWidget * tqparent); + DockWidget(KMainWidget * parent); ~DockWidget(); /** No descriptions */ void updateToolTip( const TQString& ); @@ -75,7 +75,7 @@ protected: void dropEvent(TQDropEvent *); private: - KMainWidget *tqparent; + KMainWidget *parent; DynamicTip * dtip; }; diff --git a/kget/droptarget.cpp b/kget/droptarget.cpp index 419de737..5bc91256 100644 --- a/kget/droptarget.cpp +++ b/kget/droptarget.cpp @@ -77,10 +77,10 @@ DropTarget::DropTarget(KMainWindow * mainWin):TQWidget() // setup pixmaps - if (!bgnd.tqmask()) - kdError(5001) << "Drop target pixmap has no tqmask!\n"; + if (!bgnd.mask()) + kdError(5001) << "Drop target pixmap has no mask!\n"; else - tqmask = *bgnd.tqmask(); + mask = *bgnd.mask(); setBackgroundPixmap( bgnd ); @@ -144,7 +144,7 @@ DropTarget::mousePressEvent(TQMouseEvent * e) void DropTarget::resizeEvent(TQResizeEvent *) { #ifdef TQ_WS_X11 - XShapeCombineMask(x11Display(), winId(), ShapeBounding, 0, 0, tqmask.handle(), ShapeSet); + XShapeCombineMask(x11Display(), winId(), ShapeBounding, 0, 0, mask.handle(), ShapeSet); #endif } diff --git a/kget/droptarget.h b/kget/droptarget.h index 84ae0ea2..5c7c932c 100644 --- a/kget/droptarget.h +++ b/kget/droptarget.h @@ -65,7 +65,7 @@ private slots: private: KPopupMenu * popupMenu; - KMainWidget *tqparent; + KMainWidget *parent; bool b_sticky; @@ -75,7 +75,7 @@ private: int size[4]; - TQBitmap tqmask; + TQBitmap mask; public: // Public attributes /** */ // int oldX; diff --git a/kget/kget_plug_in/kget_linkview.cpp b/kget/kget_plug_in/kget_linkview.cpp index 295d04b4..69a3cfc1 100644 --- a/kget/kget_plug_in/kget_linkview.cpp +++ b/kget/kget_plug_in/kget_linkview.cpp @@ -18,8 +18,8 @@ #define COL_MIME 2 #define COL_URL 3 -LinkViewItem::LinkViewItem( TQListView *tqparent, const LinkItem *lnk ) - : TQListViewItem( tqparent ), +LinkViewItem::LinkViewItem( TQListView *parent, const LinkItem *lnk ) + : TQListViewItem( parent ), link( lnk ) { TQString file = link->url.fileName(); @@ -37,8 +37,8 @@ LinkViewItem::LinkViewItem( TQListView *tqparent, const LinkItem *lnk ) /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// -KGetLinkView::KGetLinkView( TQWidget *tqparent, const char *name ) - : KMainWindow( tqparent, name ) +KGetLinkView::KGetLinkView( TQWidget *parent, const char *name ) + : KMainWindow( parent, name ) { setPlainCaption( i18n( "KGet" ) ); diff --git a/kget/kget_plug_in/kget_linkview.h b/kget/kget_plug_in/kget_linkview.h index b09e902d..34bf046b 100644 --- a/kget/kget_plug_in/kget_linkview.h +++ b/kget/kget_plug_in/kget_linkview.h @@ -19,7 +19,7 @@ class LinkViewItem : public TQListViewItem { public: - LinkViewItem( TQListView *tqparent, const LinkItem * lnk ); + LinkViewItem( TQListView *parent, const LinkItem * lnk ); const LinkItem *link; }; @@ -30,7 +30,7 @@ class KGetLinkView : public KMainWindow TQ_OBJECT public: - KGetLinkView( TQWidget *tqparent = 0L, const char *name = 0L ); + KGetLinkView( TQWidget *parent = 0L, const char *name = 0L ); ~KGetLinkView(); void setLinks( TQPtrList<LinkItem>& links ); diff --git a/kget/kget_plug_in/kget_plug_in.cpp b/kget/kget_plug_in/kget_plug_in.cpp index 78ef597e..c73406a2 100644 --- a/kget/kget_plug_in/kget_plug_in.cpp +++ b/kget/kget_plug_in/kget_plug_in.cpp @@ -44,8 +44,8 @@ #include "links.h" #include "kget_linkview.h" -KGet_plug_in::KGet_plug_in( TQObject* tqparent, const char* name ) - : Plugin( tqparent, name ) +KGet_plug_in::KGet_plug_in( TQObject* parent, const char* name ) + : Plugin( parent, name ) { TQPixmap pix = KGlobal::iconLoader()->loadIcon("kget", KIcon::MainToolbar); @@ -104,10 +104,10 @@ void KGet_plug_in::slotShowDrop() void KGet_plug_in::slotShowLinks() { - if ( !tqparent() || !tqparent()->inherits( "KHTMLPart" ) ) + if ( !parent() || !parent()->inherits( "KHTMLPart" ) ) return; - KHTMLPart *htmlPart = static_cast<KHTMLPart*>( tqparent() ); + KHTMLPart *htmlPart = static_cast<KHTMLPart*>( parent() ); KParts::Part *activePart = 0L; if ( htmlPart->partManager() ) { @@ -157,15 +157,15 @@ void KGet_plug_in::slotShowLinks() view->show(); } -KPluginFactory::KPluginFactory( TQObject* tqparent, const char* name ) - : KLibFactory( tqparent, name ) +KPluginFactory::KPluginFactory( TQObject* parent, const char* name ) + : KLibFactory( parent, name ) { s_instance = new KInstance("KPluginFactory"); } -TQObject* KPluginFactory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & ) +TQObject* KPluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) { - TQObject *obj = new KGet_plug_in( tqparent, name ); + TQObject *obj = new KGet_plug_in( parent, name ); return obj; } diff --git a/kget/kget_plug_in/kget_plug_in.h b/kget/kget_plug_in/kget_plug_in.h index 6cca1390..237c33d9 100644 --- a/kget/kget_plug_in/kget_plug_in.h +++ b/kget/kget_plug_in/kget_plug_in.h @@ -29,7 +29,7 @@ class KGet_plug_in : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - KGet_plug_in( TQObject* tqparent = 0, const char* name = 0 ); + KGet_plug_in( TQObject* parent = 0, const char* name = 0 ); KToggleAction *m_paToggleDropTarget ; DCOPClient* p_dcopServer; virtual ~KGet_plug_in(); @@ -46,10 +46,10 @@ class KPluginFactory : public KLibFactory Q_OBJECT TQ_OBJECT public: - KPluginFactory( TQObject *tqparent = 0, const char *name = 0 ); + KPluginFactory( TQObject *parent = 0, const char *name = 0 ); ~KPluginFactory() ; - virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); diff --git a/kget/logwindow.cpp b/kget/logwindow.cpp index b87743ed..30c6d486 100644 --- a/kget/logwindow.cpp +++ b/kget/logwindow.cpp @@ -77,7 +77,7 @@ static TQString removeHTML(const TQString & str) } -SeparatedLog::SeparatedLog(TQWidget * tqparent):TQWidget(tqparent) +SeparatedLog::SeparatedLog(TQWidget * parent):TQWidget(parent) { idSelected = 0; diff --git a/kget/logwindow.h b/kget/logwindow.h index 46d18439..bc806bb5 100644 --- a/kget/logwindow.h +++ b/kget/logwindow.h @@ -41,7 +41,7 @@ class SeparatedLog:public TQWidget Q_OBJECT TQ_OBJECT public: - SeparatedLog(TQWidget * tqparent); + SeparatedLog(TQWidget * parent); ~SeparatedLog() {} void addLog(uint id, const TQString & filename, const TQString & message); diff --git a/kget/transferlist.cpp b/kget/transferlist.cpp index 2686d168..71a48dec 100644 --- a/kget/transferlist.cpp +++ b/kget/transferlist.cpp @@ -52,8 +52,8 @@ static int defaultColumnWidth[] = { }; -TransferList::TransferList(TQWidget * tqparent, const char *name) - : KListView(tqparent, name) +TransferList::TransferList(TQWidget * parent, const char *name) + : KListView(parent, name) { // enable selection of more than one item setSelectionMode( TQListView::Extended ); @@ -229,7 +229,7 @@ void TransferList::readTransfers(const KURL& file) { TQString tmpFile; - if (KIO::NetAccess::download(file, tmpFile, (TQWidget*)tqparent())) { + if (KIO::NetAccess::download(file, tmpFile, (TQWidget*)parent())) { KSimpleConfig config(tmpFile); config.setGroup("Common"); diff --git a/kget/transferlist.h b/kget/transferlist.h index c20ce411..ae3fd6d8 100644 --- a/kget/transferlist.h +++ b/kget/transferlist.h @@ -61,7 +61,7 @@ class TransferList:public KListView public: - TransferList(TQWidget * tqparent = 0, const char *name = 0); + TransferList(TQWidget * parent = 0, const char *name = 0); virtual ~ TransferList(); Transfer *addTransfer(const KURL & _source, const KURL & _dest, |