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 | 32b67ac0690de411b26b1d5e715b188c27442248 (patch) | |
tree | 43167816a3df6b3a877d71c9a7963ed270dcc8c9 /vcs | |
parent | 330c33ab6f97b279737bf9527c9add7bb1475450 (diff) | |
download | tdevelop-32b67ac0690de411b26b1d5e715b188c27442248.tar.gz tdevelop-32b67ac0690de411b26b1d5e715b188c27442248.zip |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'vcs')
83 files changed, 175 insertions, 175 deletions
diff --git a/vcs/clearcase/clearcasefileinfoprovider.cpp b/vcs/clearcase/clearcasefileinfoprovider.cpp index 200f7448..d4733285 100644 --- a/vcs/clearcase/clearcasefileinfoprovider.cpp +++ b/vcs/clearcase/clearcasefileinfoprovider.cpp @@ -16,14 +16,14 @@ #include <kprocess.h> #include <tqapplication.h> -ClearcaseFileinfoProvider::ClearcaseFileinfoProvider(ClearcasePart *tqparent) - : KDevVCSFileInfoProvider( (KDevVersionControl*) tqparent, "clearcasefileinfoprovider") +ClearcaseFileinfoProvider::ClearcaseFileinfoProvider(ClearcasePart *parent) + : KDevVCSFileInfoProvider( (KDevVersionControl*) parent, "clearcasefileinfoprovider") { vcsInfo_ = NULL; - connect(tqparent, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void*)), TQT_SIGNAL(triggerUpdate(const VCSFileInfoMap&, void*))); + connect(parent, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void*)), TQT_SIGNAL(triggerUpdate(const VCSFileInfoMap&, void*))); - kdevVCS_ = tqparent; + kdevVCS_ = parent; } diff --git a/vcs/clearcase/clearcasefileinfoprovider.h b/vcs/clearcase/clearcasefileinfoprovider.h index f4ac08f2..dcb1d26f 100644 --- a/vcs/clearcase/clearcasefileinfoprovider.h +++ b/vcs/clearcase/clearcasefileinfoprovider.h @@ -24,7 +24,7 @@ class ClearcaseFileinfoProvider : public KDevVCSFileInfoProvider Q_OBJECT TQ_OBJECT public: - ClearcaseFileinfoProvider(ClearcasePart *tqparent); + ClearcaseFileinfoProvider(ClearcasePart *parent); virtual ~ClearcaseFileinfoProvider(); diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp index 69e25513..9b1cd67b 100644 --- a/vcs/clearcase/clearcasepart.cpp +++ b/vcs/clearcase/clearcasepart.cpp @@ -42,8 +42,8 @@ static const KDevPluginInfo data("kdevclearcase"); typedef KDevGenericFactory<ClearcasePart> ClearcaseFactory; K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( data ) ) -ClearcasePart::ClearcasePart( TQObject *tqparent, const char *name, const TQStringList & ) - : KDevVersionControl( &data, tqparent, name ? name : "ClearcasePart" ), +ClearcasePart::ClearcasePart( TQObject *parent, const char *name, const TQStringList & ) + : KDevVersionControl( &data, parent, name ? name : "ClearcasePart" ), default_checkin(""), default_checkout(""), default_uncheckout("-rm"), diff --git a/vcs/clearcase/clearcasepart.h b/vcs/clearcase/clearcasepart.h index 956fc214..cf5dae5b 100644 --- a/vcs/clearcase/clearcasepart.h +++ b/vcs/clearcase/clearcasepart.h @@ -22,7 +22,7 @@ class ClearcasePart : public KDevVersionControl { TQ_OBJECT public: - ClearcasePart( TQObject *tqparent, const char *name, const TQStringList & ); + ClearcasePart( TQObject *parent, const char *name, const TQStringList & ); ~ClearcasePart(); const TQString default_checkin; diff --git a/vcs/clearcase/integrator/ccintegratordlg.cpp b/vcs/clearcase/integrator/ccintegratordlg.cpp index 3f6f8d0e..8e89cf94 100644 --- a/vcs/clearcase/integrator/ccintegratordlg.cpp +++ b/vcs/clearcase/integrator/ccintegratordlg.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include "ccintegratordlg.h" -CCIntegratorDlg::CCIntegratorDlg(TQWidget *tqparent, const char *name) - :CCIntegratorDlgBase(tqparent, name) +CCIntegratorDlg::CCIntegratorDlg(TQWidget *parent, const char *name) + :CCIntegratorDlgBase(parent, name) { } diff --git a/vcs/clearcase/integrator/ccintegratordlg.h b/vcs/clearcase/integrator/ccintegratordlg.h index 37d73885..674e7815 100644 --- a/vcs/clearcase/integrator/ccintegratordlg.h +++ b/vcs/clearcase/integrator/ccintegratordlg.h @@ -27,7 +27,7 @@ class CCIntegratorDlg: public CCIntegratorDlgBase, public VCSDialog { Q_OBJECT TQ_OBJECT public: - CCIntegratorDlg(TQWidget *tqparent = 0, const char *name = 0); + CCIntegratorDlg(TQWidget *parent = 0, const char *name = 0); virtual void accept(); virtual void init(const TQString &projectName, const TQString &projectLocation); diff --git a/vcs/clearcase/integrator/clearcaseintegrator.cpp b/vcs/clearcase/integrator/clearcaseintegrator.cpp index d076abc9..4e8c1a0b 100644 --- a/vcs/clearcase/integrator/clearcaseintegrator.cpp +++ b/vcs/clearcase/integrator/clearcaseintegrator.cpp @@ -28,10 +28,10 @@ static const KDevPluginInfo data("kdevclearcaseintegrator"); typedef KDevGenericFactory<ClearcaseIntegrator> ClearcaseIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libclearcaseintegrator, ClearcaseIntegratorFactory(data) ) -ClearcaseIntegrator::ClearcaseIntegrator(TQObject* tqparent, const char* name, +ClearcaseIntegrator::ClearcaseIntegrator(TQObject* parent, const char* name, const TQStringList // args ) - :KDevVCSIntegrator(tqparent, name) + :KDevVCSIntegrator(parent, name) { } @@ -39,15 +39,15 @@ ClearcaseIntegrator::~ClearcaseIntegrator() { } -VCSDialog* ClearcaseIntegrator::fetcher(TQWidget* // tqparent +VCSDialog* ClearcaseIntegrator::fetcher(TQWidget* // parent ) { return 0; } -VCSDialog* ClearcaseIntegrator::integrator(TQWidget* tqparent) +VCSDialog* ClearcaseIntegrator::integrator(TQWidget* parent) { - CCIntegratorDlg *dlg = new CCIntegratorDlg(tqparent); + CCIntegratorDlg *dlg = new CCIntegratorDlg(parent); return dlg; } diff --git a/vcs/clearcase/integrator/clearcaseintegrator.h b/vcs/clearcase/integrator/clearcaseintegrator.h index 197638bf..9dc67e47 100644 --- a/vcs/clearcase/integrator/clearcaseintegrator.h +++ b/vcs/clearcase/integrator/clearcaseintegrator.h @@ -29,11 +29,11 @@ class ClearcaseIntegrator : public KDevVCSIntegrator Q_OBJECT TQ_OBJECT public: - ClearcaseIntegrator(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); + ClearcaseIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~ClearcaseIntegrator(); - virtual VCSDialog* fetcher(TQWidget* tqparent); - virtual VCSDialog* integrator(TQWidget* tqparent); + virtual VCSDialog* fetcher(TQWidget* parent); + virtual VCSDialog* integrator(TQWidget* parent); }; diff --git a/vcs/cvsservice/annotatedialog.cpp b/vcs/cvsservice/annotatedialog.cpp index d61aeb72..2937b2bb 100644 --- a/vcs/cvsservice/annotatedialog.cpp +++ b/vcs/cvsservice/annotatedialog.cpp @@ -23,9 +23,9 @@ #include "annotatedialog.h" #include "annotatepage.h" -AnnotateDialog::AnnotateDialog( CvsService_stub *cvsService, TQWidget *tqparent, const char *name, int ) +AnnotateDialog::AnnotateDialog( CvsService_stub *cvsService, TQWidget *parent, const char *name, int ) : KDialogBase( Tabbed, i18n("CVS Annotate Dialog"), Close, Close, - tqparent, name? name : "annotateformdialog", false /*modal*/, true /*separator*/ ), + parent, name? name : "annotateformdialog", false /*modal*/, true /*separator*/ ), m_cvsService( cvsService ) { setWFlags( getWFlags() | WDestructiveClose ); diff --git a/vcs/cvsservice/annotatedialog.h b/vcs/cvsservice/annotatedialog.h index c6866967..b0229b9c 100644 --- a/vcs/cvsservice/annotatedialog.h +++ b/vcs/cvsservice/annotatedialog.h @@ -32,7 +32,7 @@ class AnnotateDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - AnnotateDialog( CvsService_stub *cvsService, TQWidget *tqparent=0, const char *name=0, int flags=0 ); + AnnotateDialog( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); virtual ~AnnotateDialog(); /** diff --git a/vcs/cvsservice/annotatepage.cpp b/vcs/cvsservice/annotatepage.cpp index 68e12f6d..4c838cf9 100644 --- a/vcs/cvsservice/annotatepage.cpp +++ b/vcs/cvsservice/annotatepage.cpp @@ -32,9 +32,9 @@ #include "annotatepage.h" #include "annotateview.h" -AnnotatePage::AnnotatePage( CvsService_stub *cvsService, TQWidget *tqparent, const char *name, int ) +AnnotatePage::AnnotatePage( CvsService_stub *cvsService, TQWidget *parent, const char *name, int ) : DCOPObject( "CvsAnnotatePageDCOPIface" ), - TQWidget( tqparent, name? name : "annotateformpage" ), + TQWidget( parent, name? name : "annotateformpage" ), m_cvsService( cvsService ), m_cvsAnnotateJob( 0 ) { kdDebug(9006) << "AnnotatePage::AnnotatePage()" << endl; diff --git a/vcs/cvsservice/annotatepage.h b/vcs/cvsservice/annotatepage.h index 27a75314..ef2c2faa 100644 --- a/vcs/cvsservice/annotatepage.h +++ b/vcs/cvsservice/annotatepage.h @@ -43,7 +43,7 @@ class AnnotatePage : public TQWidget, virtual public CVSServiceDCOPIface friend class AnnotateView; public: - AnnotatePage( CvsService_stub *cvsService, TQWidget *tqparent=0, const char *name=0, int flags=0 ); + AnnotatePage( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); virtual ~AnnotatePage(); /** diff --git a/vcs/cvsservice/annotateview.cpp b/vcs/cvsservice/annotateview.cpp index 30e80a21..597415f1 100644 --- a/vcs/cvsservice/annotateview.cpp +++ b/vcs/cvsservice/annotateview.cpp @@ -32,7 +32,7 @@ class AnnotateViewItem : public TQListViewItem public: enum { LineNumberColumn, AuthorColumn, DateColumn,ContentColumn }; - AnnotateViewItem(AnnotateView *tqparent, TQString rev, TQString author, + AnnotateViewItem(AnnotateView *parent, TQString rev, TQString author, TQDateTime date, TQString content, TQString comment, bool odd, int linenumber); @@ -57,10 +57,10 @@ private: const int AnnotateViewItem::BORDER = 4; -AnnotateViewItem::AnnotateViewItem(AnnotateView *tqparent, TQString rev, +AnnotateViewItem::AnnotateViewItem(AnnotateView *parent, TQString rev, TQString author, TQDateTime date, TQString content, TQString comment, bool odd, int linenumber) - : TQListViewItem(tqparent) + : TQListViewItem(parent) , m_revision(rev) , m_author(author) , m_content(content) @@ -140,9 +140,9 @@ int AnnotateViewItem::width(const TQFontMetrics &fm, const TQListView *, int col /*****************Definition of class AnnotateView ****************************/ /******************************************************************************/ -AnnotateView::AnnotateView(AnnotatePage *tqparent, const char *name) - : KListView(tqparent, name), TQToolTip( viewport() ), - m_page(tqparent) +AnnotateView::AnnotateView(AnnotatePage *parent, const char *name) + : KListView(parent, name), TQToolTip( viewport() ), + m_page(parent) { setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); setAllColumnsShowFocus(true); diff --git a/vcs/cvsservice/annotateview.h b/vcs/cvsservice/annotateview.h index 99d222a3..956c0251 100644 --- a/vcs/cvsservice/annotateview.h +++ b/vcs/cvsservice/annotateview.h @@ -37,7 +37,7 @@ class AnnotateView : public KListView, public TQToolTip public: - explicit AnnotateView(AnnotatePage *tqparent, const char *name=0 ); + explicit AnnotateView(AnnotatePage *parent, const char *name=0 ); void addLine(TQString rev, TQString author, TQDateTime date, TQString content, TQString comment, bool odd); diff --git a/vcs/cvsservice/checkoutdialog.cpp b/vcs/cvsservice/checkoutdialog.cpp index 098dd98e..be20d977 100644 --- a/vcs/cvsservice/checkoutdialog.cpp +++ b/vcs/cvsservice/checkoutdialog.cpp @@ -68,9 +68,9 @@ public: /////////////////////////////////////////////////////////////////////////////// CheckoutDialog::CheckoutDialog( CvsService_stub *cvsService, - TQWidget *tqparent, const char *name, WFlags ) : + TQWidget *parent, const char *name, WFlags ) : DCOPObject( "CheckoutDialogDCOPIface" ), - KDialogBase( tqparent, name? name : "checkoutdialog", true, i18n("CVS Checkout"), + KDialogBase( parent, name? name : "checkoutdialog", true, i18n("CVS Checkout"), Ok | Cancel, Ok, true ), m_service( cvsService ), m_job( 0 ) { diff --git a/vcs/cvsservice/checkoutdialog.h b/vcs/cvsservice/checkoutdialog.h index 422290d0..5d15b09b 100644 --- a/vcs/cvsservice/checkoutdialog.h +++ b/vcs/cvsservice/checkoutdialog.h @@ -32,7 +32,7 @@ class CheckoutDialog : public KDialogBase, virtual public CVSServiceDCOPIface Q_OBJECT TQ_OBJECT public: - CheckoutDialog( CvsService_stub *cvsService, TQWidget *tqparent = 0, + CheckoutDialog( CvsService_stub *cvsService, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); virtual ~CheckoutDialog(); diff --git a/vcs/cvsservice/commitdlg.cpp b/vcs/cvsservice/commitdlg.cpp index 9bed1119..a3988c06 100644 --- a/vcs/cvsservice/commitdlg.cpp +++ b/vcs/cvsservice/commitdlg.cpp @@ -30,8 +30,8 @@ /////////////////////////////////////////////////////////////////////////////// -CommitDialog::CommitDialog( const TQString &changeLogfileNamePath, TQWidget *tqparent ) - : CommitDialogBase( tqparent, "commitdialog", true ) +CommitDialog::CommitDialog( const TQString &changeLogfileNamePath, TQWidget *parent ) + : CommitDialogBase( parent, "commitdialog", true ) { connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); diff --git a/vcs/cvsservice/commitdlg.h b/vcs/cvsservice/commitdlg.h index edc27a64..e3406340 100644 --- a/vcs/cvsservice/commitdlg.h +++ b/vcs/cvsservice/commitdlg.h @@ -26,7 +26,7 @@ class CommitDialog : public CommitDialogBase Q_OBJECT TQ_OBJECT public: - CommitDialog( const TQString &changeLogfileNamePath, TQWidget *tqparent = 0 ); + CommitDialog( const TQString &changeLogfileNamePath, TQWidget *parent = 0 ); //! Returns the text of the log TQStringList logMessage() const; diff --git a/vcs/cvsservice/cvsdiffpage.cpp b/vcs/cvsservice/cvsdiffpage.cpp index 2f174155..7777760a 100644 --- a/vcs/cvsservice/cvsdiffpage.cpp +++ b/vcs/cvsservice/cvsdiffpage.cpp @@ -33,10 +33,10 @@ /////////////////////////////////////////////////////////////////////////////// CVSDiffPage::CVSDiffPage( CvsService_stub *cvsService, - TQWidget *tqparent, const char *name, int ) + TQWidget *parent, const char *name, int ) // Leaving it anonymous let us to have multiple objects at the same time! : DCOPObject(), // "CVSDiffPageDCOPIface" - TQWidget( tqparent, name? name : "logformdialog" ), + TQWidget( parent, name? name : "logformdialog" ), m_diffText( 0 ), m_cvsService( cvsService ), m_cvsDiffJob( 0 ) { TQLayout *thisLayout = new TQVBoxLayout( this ); diff --git a/vcs/cvsservice/cvsdiffpage.h b/vcs/cvsservice/cvsdiffpage.h index 879b28b2..17444ad2 100644 --- a/vcs/cvsservice/cvsdiffpage.h +++ b/vcs/cvsservice/cvsdiffpage.h @@ -31,7 +31,7 @@ class CVSDiffPage : public TQWidget, virtual public CVSServiceDCOPIface Q_OBJECT TQ_OBJECT public: - CVSDiffPage( CvsService_stub *cvsService, TQWidget *tqparent=0, const char *name=0, int flags=0 ); + CVSDiffPage( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); virtual ~CVSDiffPage(); void startDiff( const TQString &fileName, const TQString &v1, const TQString &v2 ); diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp index 7830f643..3c20af0c 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.cpp +++ b/vcs/cvsservice/cvsfileinfoprovider.cpp @@ -31,8 +31,8 @@ // class CVSFileInfoProvider /////////////////////////////////////////////////////////////////////////////// -CVSFileInfoProvider::CVSFileInfoProvider( CvsServicePart *tqparent, CvsService_stub *cvsService ) - : KDevVCSFileInfoProvider( tqparent, "cvsfileinfoprovider" ), +CVSFileInfoProvider::CVSFileInfoProvider( CvsServicePart *parent, CvsService_stub *cvsService ) + : KDevVCSFileInfoProvider( parent, "cvsfileinfoprovider" ), m_requestStatusJob( 0 ), m_cvsService( cvsService ), m_cachedDirEntries( 0 ) { connect( this, TQT_SIGNAL(needStatusUpdate(const CVSDir&)), this, TQT_SLOT(updateStatusFor(const CVSDir&))); diff --git a/vcs/cvsservice/cvsfileinfoprovider.h b/vcs/cvsservice/cvsfileinfoprovider.h index 72f3cff0..ead2d113 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.h +++ b/vcs/cvsservice/cvsfileinfoprovider.h @@ -33,7 +33,7 @@ class CVSFileInfoProvider : public KDevVCSFileInfoProvider, virtual public CVSSe Q_OBJECT TQ_OBJECT public: - CVSFileInfoProvider( CvsServicePart *tqparent, CvsService_stub *cvsService ); + CVSFileInfoProvider( CvsServicePart *parent, CvsService_stub *cvsService ); virtual ~CVSFileInfoProvider(); // -- Sync interface diff --git a/vcs/cvsservice/cvsform.cpp b/vcs/cvsservice/cvsform.cpp index e1423ef6..ef0521c8 100644 --- a/vcs/cvsservice/cvsform.cpp +++ b/vcs/cvsservice/cvsform.cpp @@ -19,8 +19,8 @@ // class CvsForm /////////////////////////////////////////////////////////////////////////////// -CvsForm::CvsForm( TQWidget *tqparent, const char *name, WFlags f ) - : CvsFormBase( tqparent, name, f ) +CvsForm::CvsForm( TQWidget *parent, const char *name, WFlags f ) + : CvsFormBase( parent, name, f ) { setWFlags( getWFlags() | WDestructiveClose ); } diff --git a/vcs/cvsservice/cvsform.h b/vcs/cvsservice/cvsform.h index 8a9a4ef7..7973eb0e 100644 --- a/vcs/cvsservice/cvsform.h +++ b/vcs/cvsservice/cvsform.h @@ -23,7 +23,7 @@ class CvsForm : public CvsFormBase Q_OBJECT TQ_OBJECT public: - CvsForm( TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 ); + CvsForm( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); virtual ~CvsForm(); TQString module() const; diff --git a/vcs/cvsservice/cvslogdialog.cpp b/vcs/cvsservice/cvslogdialog.cpp index 5bd230c3..86ad3cbe 100644 --- a/vcs/cvsservice/cvslogdialog.cpp +++ b/vcs/cvsservice/cvslogdialog.cpp @@ -32,9 +32,9 @@ // class CVSLogDialog /////////////////////////////////////////////////////////////////////////////// -CVSLogDialog::CVSLogDialog( CvsService_stub *cvsService, TQWidget *tqparent, const char *name, int ) +CVSLogDialog::CVSLogDialog( CvsService_stub *cvsService, TQWidget *parent, const char *name, int ) : KDialogBase( Tabbed, i18n("CVS Log & Diff Dialog"), Close, Close, - tqparent, name? name : "logformdialog", false /*modal*/, true /*separator*/ ), + parent, name? name : "logformdialog", false /*modal*/, true /*separator*/ ), m_cvsLogPage( 0 ), m_cvsService( cvsService ) { setWFlags( getWFlags() | WDestructiveClose ); diff --git a/vcs/cvsservice/cvslogdialog.h b/vcs/cvsservice/cvslogdialog.h index 9f3518aa..694e610c 100644 --- a/vcs/cvsservice/cvslogdialog.h +++ b/vcs/cvsservice/cvslogdialog.h @@ -28,7 +28,7 @@ class CVSLogDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - CVSLogDialog( CvsService_stub *cvsService, TQWidget *tqparent=0, const char *name=0, int flags=0 ); + CVSLogDialog( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); virtual ~CVSLogDialog(); void startLog( const TQString &workDir, const TQString &pathName ); diff --git a/vcs/cvsservice/cvslogpage.cpp b/vcs/cvsservice/cvslogpage.cpp index 07e59ce7..f50afdc5 100644 --- a/vcs/cvsservice/cvslogpage.cpp +++ b/vcs/cvsservice/cvslogpage.cpp @@ -32,9 +32,9 @@ // class CVSLogPage /////////////////////////////////////////////////////////////////////////////// -CVSLogPage::CVSLogPage( CvsService_stub *cvsService, TQWidget *tqparent, const char *name, int ) +CVSLogPage::CVSLogPage( CvsService_stub *cvsService, TQWidget *parent, const char *name, int ) : DCOPObject( "CvsLogPageDCOPIface" ), - TQWidget( tqparent, name? name : "logformpage" ), + TQWidget( parent, name? name : "logformpage" ), m_cvsService( cvsService ), m_cvsLogJob( 0 ) { TQLayout *thisLayout = new TQVBoxLayout( this ); diff --git a/vcs/cvsservice/cvslogpage.h b/vcs/cvsservice/cvslogpage.h index 27fbd3d2..d7e7ede2 100644 --- a/vcs/cvsservice/cvslogpage.h +++ b/vcs/cvsservice/cvslogpage.h @@ -30,7 +30,7 @@ class CVSLogPage : public TQWidget, virtual public CVSServiceDCOPIface Q_OBJECT TQ_OBJECT public: - CVSLogPage( CvsService_stub *cvsService, TQWidget *tqparent=0, const char *name=0, int flags=0 ); + CVSLogPage( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); virtual ~CVSLogPage(); void startLog( const TQString &workDir, const TQString &pathName ); diff --git a/vcs/cvsservice/cvsoptionswidget.cpp b/vcs/cvsservice/cvsoptionswidget.cpp index eb66b773..32044dd3 100644 --- a/vcs/cvsservice/cvsoptionswidget.cpp +++ b/vcs/cvsservice/cvsoptionswidget.cpp @@ -24,8 +24,8 @@ // class DiffDialog /////////////////////////////////////////////////////////////////////////////// -CvsOptionsWidget::CvsOptionsWidget( TQWidget *tqparent, const char *name ) - : CvsOptionsWidgetBase( tqparent, name ) +CvsOptionsWidget::CvsOptionsWidget( TQWidget *parent, const char *name ) + : CvsOptionsWidgetBase( parent, name ) { readConfig(); } diff --git a/vcs/cvsservice/cvsoptionswidget.h b/vcs/cvsservice/cvsoptionswidget.h index 0dcfbba0..0384597c 100644 --- a/vcs/cvsservice/cvsoptionswidget.h +++ b/vcs/cvsservice/cvsoptionswidget.h @@ -25,7 +25,7 @@ class CvsOptionsWidget : public CvsOptionsWidgetBase Q_OBJECT TQ_OBJECT public: - CvsOptionsWidget( TQWidget *tqparent, const char *name=0 ); + CvsOptionsWidget( TQWidget *parent, const char *name=0 ); virtual ~CvsOptionsWidget(); bool pruneEmptyDirWhenUpdating() const; diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp index c95d5e2e..17eb8998 100644 --- a/vcs/cvsservice/cvspart.cpp +++ b/vcs/cvsservice/cvspart.cpp @@ -80,8 +80,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( data ) ) // class CvsServicePart /////////////////////////////////////////////////////////////////////////////// -CvsServicePart::CvsServicePart( TQObject *tqparent, const char *name, const TQStringList & ) - : KDevVersionControl( &data, tqparent, +CvsServicePart::CvsServicePart( TQObject *parent, const char *name, const TQStringList & ) + : KDevVersionControl( &data, parent, name ? name : "CvsService" ), actionCommit( 0 ), actionDiff( 0 ), actionLog( 0 ), actionAnnotate(0), actionAdd( 0 ), actionAddBinary( 0 ), actionRemove( 0 ), actionUpdate( 0 ), @@ -283,9 +283,9 @@ void CvsServicePart::projectConfigWidget( KDialogBase *dlg ) /////////////////////////////////////////////////////////////////////////////// -TQWidget* CvsServicePart::newProjectWidget( TQWidget *tqparent ) +TQWidget* CvsServicePart::newProjectWidget( TQWidget *parent ) { - m_cvsConfigurationForm = new CvsForm( tqparent, "cvsform" ); + m_cvsConfigurationForm = new CvsForm( parent, "cvsform" ); return m_cvsConfigurationForm; } @@ -361,7 +361,7 @@ void CvsServicePart::contextMenu( TQPopupMenu *popup, const Context *context ) id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) ); subMenu->tqsetWhatsThis(id, i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file.")); - // Now insert in tqparent menu + // Now insert in parent menu popup->insertItem( i18n("CvsService"), subMenu ); // If the current project doesn't support CVS, we don't diff --git a/vcs/cvsservice/cvspart.h b/vcs/cvsservice/cvspart.h index 886d13b2..c6c4e2dd 100644 --- a/vcs/cvsservice/cvspart.h +++ b/vcs/cvsservice/cvspart.h @@ -43,15 +43,15 @@ class CvsServicePart : public KDevVersionControl public: //! Standard constructor. - CvsServicePart( TQObject *tqparent, const char *name, const TQStringList & ); + CvsServicePart( TQObject *parent, const char *name, const TQStringList & ); //! Destructor. virtual ~CvsServicePart(); /** * Returns the configuration widget (for properly configuring the project to - * use CVS), child of @p tqparent. + * use CVS), child of @p parent. */ - virtual TQWidget *newProjectWidget( TQWidget *tqparent ); + virtual TQWidget *newProjectWidget( TQWidget *parent ); /** * Setup a directory tree for use with CVS. */ diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp index 319fcfe6..0eeba29e 100644 --- a/vcs/cvsservice/cvsprocesswidget.cpp +++ b/vcs/cvsservice/cvsprocesswidget.cpp @@ -43,9 +43,9 @@ int g_dcopErrCounter = 0; #endif -CvsProcessWidget::CvsProcessWidget( CvsService_stub *service, CvsServicePart *part, TQWidget *tqparent, const char *name ) +CvsProcessWidget::CvsProcessWidget( CvsService_stub *service, CvsServicePart *part, TQWidget *parent, const char *name ) : DCOPObject( "CvsProcessWidgetDCOPIface" ), - TQTextEdit( tqparent, name ), + TQTextEdit( parent, name ), m_part( part ), m_service( service ), m_job( 0 ) { setReadOnly( true ); diff --git a/vcs/cvsservice/cvsprocesswidget.h b/vcs/cvsservice/cvsprocesswidget.h index 2377ee97..62f73668 100644 --- a/vcs/cvsservice/cvsprocesswidget.h +++ b/vcs/cvsservice/cvsprocesswidget.h @@ -30,7 +30,7 @@ class CvsProcessWidget : public TQTextEdit, virtual public CVSServiceDCOPIface TQ_OBJECT public: CvsProcessWidget( CvsService_stub *service, CvsServicePart *part, - TQWidget *tqparent, const char *name ); + TQWidget *parent, const char *name ); virtual ~CvsProcessWidget(); bool startJob( const DCOPRef &aJob ); diff --git a/vcs/cvsservice/diffdialog.cpp b/vcs/cvsservice/diffdialog.cpp index fd4ca8ef..a141d2a8 100644 --- a/vcs/cvsservice/diffdialog.cpp +++ b/vcs/cvsservice/diffdialog.cpp @@ -20,8 +20,8 @@ // class DiffDialog /////////////////////////////////////////////////////////////////////////////// -DiffDialog::DiffDialog( const CVSEntry &entry, TQWidget *tqparent, const char *name, WFlags f ) - : DiffDialogBase( tqparent, name, true, f) +DiffDialog::DiffDialog( const CVSEntry &entry, TQWidget *parent, const char *name, WFlags f ) + : DiffDialogBase( parent, name, true, f) { m_entry = entry; TQString currentRevision = entry.revision(); diff --git a/vcs/cvsservice/diffdialog.h b/vcs/cvsservice/diffdialog.h index 8870ff1e..c729f6cb 100644 --- a/vcs/cvsservice/diffdialog.h +++ b/vcs/cvsservice/diffdialog.h @@ -25,7 +25,7 @@ class DiffDialog : public DiffDialogBase Q_OBJECT TQ_OBJECT public: - DiffDialog(const CVSEntry &entry, TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 ); + DiffDialog(const CVSEntry &entry, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); virtual ~DiffDialog(); TQString revA() const; diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp index 8c5c53c6..972d90d6 100644 --- a/vcs/cvsservice/diffwidget.cpp +++ b/vcs/cvsservice/diffwidget.cpp @@ -39,7 +39,7 @@ static const int POPUP_BASE = 130977; TQStringList KDiffTextEdit::extParts; TQStringList KDiffTextEdit::extPartsTranslated; -KDiffTextEdit::KDiffTextEdit( TQWidget* tqparent, const char* name ): TQTextEdit( tqparent, name ) +KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( parent, name ) { KConfig* config = kapp->config(); config->setGroup( "Diff" ); @@ -174,8 +174,8 @@ void KDiffTextEdit::popupActivated( int id ) emit externalPartRequested( extParts[ id ] ); } -DiffWidget::DiffWidget( TQWidget *tqparent, const char *name, WFlags f ): - TQWidget( tqparent, name, f ), tempFile( 0 ) +DiffWidget::DiffWidget( TQWidget *parent, const char *name, WFlags f ): + TQWidget( parent, name, f ), tempFile( 0 ) { job = 0; extPart = 0; diff --git a/vcs/cvsservice/diffwidget.h b/vcs/cvsservice/diffwidget.h index 48b6447d..fe8c49a0 100644 --- a/vcs/cvsservice/diffwidget.h +++ b/vcs/cvsservice/diffwidget.h @@ -34,7 +34,7 @@ class KDiffTextEdit: public TQTextEdit Q_OBJECT TQ_OBJECT public: - KDiffTextEdit( TQWidget* tqparent = 0, const char* name = 0 ); + KDiffTextEdit( TQWidget* parent = 0, const char* name = 0 ); virtual ~KDiffTextEdit(); void applySyntaxHighlight(); void clearSyntaxHighlight(); @@ -64,7 +64,7 @@ class DiffWidget : public TQWidget TQ_OBJECT public: - DiffWidget( TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 ); + DiffWidget( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); virtual ~DiffWidget(); public slots: diff --git a/vcs/cvsservice/editorsdialog.cpp b/vcs/cvsservice/editorsdialog.cpp index 9b796254..79695840 100644 --- a/vcs/cvsservice/editorsdialog.cpp +++ b/vcs/cvsservice/editorsdialog.cpp @@ -24,8 +24,8 @@ #include <cvsjob_stub.h> #include <cvsservice_stub.h> -EditorsDialog::EditorsDialog(CvsService_stub *cvsService, TQWidget *tqparent, const char *name) - : DCOPObject( "CvsEditorsDCOPIface"), EditorsDialogBase(tqparent, name, TRUE, TQt::WDestructiveClose), +EditorsDialog::EditorsDialog(CvsService_stub *cvsService, TQWidget *parent, const char *name) + : DCOPObject( "CvsEditorsDCOPIface"), EditorsDialogBase(parent, name, TRUE, TQt::WDestructiveClose), m_cvsService(cvsService), m_cvsJob(0) { } diff --git a/vcs/cvsservice/editorsdialog.h b/vcs/cvsservice/editorsdialog.h index ffb8b555..f02f47b8 100644 --- a/vcs/cvsservice/editorsdialog.h +++ b/vcs/cvsservice/editorsdialog.h @@ -24,7 +24,7 @@ class EditorsDialog: public EditorsDialogBase, virtual public CVSServiceDCOPIfac Q_OBJECT TQ_OBJECT public: - EditorsDialog(CvsService_stub *cvsService, TQWidget *tqparent = 0, const char *name = 0); + EditorsDialog(CvsService_stub *cvsService, TQWidget *parent = 0, const char *name = 0); virtual ~EditorsDialog(); void startjob(TQString strDir); diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.cpp b/vcs/cvsservice/integrator/cvsserviceintegrator.cpp index 13cc370e..1bbc3b11 100644 --- a/vcs/cvsservice/integrator/cvsserviceintegrator.cpp +++ b/vcs/cvsservice/integrator/cvsserviceintegrator.cpp @@ -28,9 +28,9 @@ static const KDevPluginInfo data("kdevcvsserviceintegrator"); typedef KDevGenericFactory<CVSServiceIntegrator> CVSIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libcvsserviceintegrator, CVSIntegratorFactory(data) ) -CVSServiceIntegrator::CVSServiceIntegrator(TQObject* tqparent, const char* name, +CVSServiceIntegrator::CVSServiceIntegrator(TQObject* parent, const char* name, const TQStringList args) - :KDevVCSIntegrator(tqparent, name) + :KDevVCSIntegrator(parent, name) { } @@ -38,14 +38,14 @@ CVSServiceIntegrator::~CVSServiceIntegrator( ) { } -VCSDialog* CVSServiceIntegrator::fetcher(TQWidget* tqparent) +VCSDialog* CVSServiceIntegrator::fetcher(TQWidget* parent) { return 0; } -VCSDialog* CVSServiceIntegrator::integrator(TQWidget* tqparent) +VCSDialog* CVSServiceIntegrator::integrator(TQWidget* parent) { - IntegratorDlg *dlg = new IntegratorDlg(this, tqparent); + IntegratorDlg *dlg = new IntegratorDlg(this, parent); return dlg; } diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.h b/vcs/cvsservice/integrator/cvsserviceintegrator.h index 02c94430..ea45a8a2 100644 --- a/vcs/cvsservice/integrator/cvsserviceintegrator.h +++ b/vcs/cvsservice/integrator/cvsserviceintegrator.h @@ -28,11 +28,11 @@ class CVSServiceIntegrator: public KDevVCSIntegrator { Q_OBJECT TQ_OBJECT public: - CVSServiceIntegrator(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); + CVSServiceIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); virtual ~CVSServiceIntegrator(); - virtual VCSDialog* fetcher(TQWidget* tqparent); - virtual VCSDialog* integrator(TQWidget* tqparent); + virtual VCSDialog* fetcher(TQWidget* parent); + virtual VCSDialog* integrator(TQWidget* parent); }; diff --git a/vcs/cvsservice/integrator/integratordlg.cpp b/vcs/cvsservice/integrator/integratordlg.cpp index 3561f7ad..4f833220 100644 --- a/vcs/cvsservice/integrator/integratordlg.cpp +++ b/vcs/cvsservice/integrator/integratordlg.cpp @@ -40,8 +40,8 @@ #include "initdlg.h" -IntegratorDlg::IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *tqparent, const char *name) - :IntegratorDlgBase(tqparent, name), m_integrator(integrator) +IntegratorDlg::IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *parent, const char *name) + :IntegratorDlgBase(parent, name), m_integrator(integrator) { TQFile cvspass(TQDir::homeDirPath() + "/.cvspass"); if (cvspass.open(IO_ReadOnly)) diff --git a/vcs/cvsservice/integrator/integratordlg.h b/vcs/cvsservice/integrator/integratordlg.h index 72ae30fd..711c972f 100644 --- a/vcs/cvsservice/integrator/integratordlg.h +++ b/vcs/cvsservice/integrator/integratordlg.h @@ -29,7 +29,7 @@ class IntegratorDlg: public IntegratorDlgBase, public VCSDialog { Q_OBJECT TQ_OBJECT public: - IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *tqparent = 0, const char *name = 0); + IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *parent = 0, const char *name = 0); virtual TQWidget *self(); virtual void init(const TQString &projectName, const TQString &projectLocation); diff --git a/vcs/cvsservice/releaseinputdialog.cpp b/vcs/cvsservice/releaseinputdialog.cpp index 83df254c..151c921b 100644 --- a/vcs/cvsservice/releaseinputdialog.cpp +++ b/vcs/cvsservice/releaseinputdialog.cpp @@ -20,8 +20,8 @@ // class ReleaseInputDialog /////////////////////////////////////////////////////////////////////////////// -ReleaseInputDialog::ReleaseInputDialog( TQWidget* tqparent) - : ReleaseInputDialogBase( tqparent, "releaseinputdialog", true, 0 ) +ReleaseInputDialog::ReleaseInputDialog( TQWidget* parent) + : ReleaseInputDialogBase( parent, "releaseinputdialog", true, 0 ) { } diff --git a/vcs/cvsservice/releaseinputdialog.h b/vcs/cvsservice/releaseinputdialog.h index ef8757bb..0d3c05c6 100644 --- a/vcs/cvsservice/releaseinputdialog.h +++ b/vcs/cvsservice/releaseinputdialog.h @@ -26,9 +26,9 @@ class ReleaseInputDialog : public ReleaseInputDialogBase public: /** * C-tor - * @param tqparent + * @param parent */ - ReleaseInputDialog( TQWidget* tqparent = 0 ); + ReleaseInputDialog( TQWidget* parent = 0 ); /** * Destructor */ diff --git a/vcs/cvsservice/tagdialog.cpp b/vcs/cvsservice/tagdialog.cpp index b3d3a42e..33aca057 100644 --- a/vcs/cvsservice/tagdialog.cpp +++ b/vcs/cvsservice/tagdialog.cpp @@ -18,8 +18,8 @@ // class TagDialog /////////////////////////////////////////////////////////////////////////////// -TagDialog::TagDialog( const TQString &caption, TQWidget *tqparent, const char *name ) - : TagDialogBase( tqparent, name ? name : "tagdialog", true ) +TagDialog::TagDialog( const TQString &caption, TQWidget *parent, const char *name ) + : TagDialogBase( parent, name ? name : "tagdialog", true ) { if (!caption.isEmpty()) { diff --git a/vcs/cvsservice/tagdialog.h b/vcs/cvsservice/tagdialog.h index e58b912d..54db2bb1 100644 --- a/vcs/cvsservice/tagdialog.h +++ b/vcs/cvsservice/tagdialog.h @@ -25,7 +25,7 @@ class TagDialog : public TagDialogBase Q_OBJECT TQ_OBJECT public: - TagDialog( const TQString &caption, TQWidget *tqparent = 0, const char *name = 0 ); + TagDialog( const TQString &caption, TQWidget *parent = 0, const char *name = 0 ); virtual ~TagDialog(); /** diff --git a/vcs/perforce/commitdlg.cpp b/vcs/perforce/commitdlg.cpp index 6bb3c08d..c3b94071 100644 --- a/vcs/perforce/commitdlg.cpp +++ b/vcs/perforce/commitdlg.cpp @@ -28,8 +28,8 @@ #include "execcommand.h" -CommitDialog::CommitDialog( TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, i18n("Perforce Submit"), Ok|Cancel|Details ) +CommitDialog::CommitDialog( TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, i18n("Perforce Submit"), Ok|Cancel|Details ) { TQWidget *w = new TQWidget( this, "main widget" ); setMainWidget( w ); diff --git a/vcs/perforce/commitdlg.h b/vcs/perforce/commitdlg.h index ddca48a2..a1642fd2 100644 --- a/vcs/perforce/commitdlg.h +++ b/vcs/perforce/commitdlg.h @@ -26,7 +26,7 @@ class CommitDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - CommitDialog( TQWidget *tqparent = 0, const char *name = 0 ); + CommitDialog( TQWidget *parent = 0, const char *name = 0 ); ~CommitDialog(); TQString logMessage() const { return edit->text(); } diff --git a/vcs/perforce/integrator/perforceintegrator.cpp b/vcs/perforce/integrator/perforceintegrator.cpp index ec9802c9..bc7c0988 100644 --- a/vcs/perforce/integrator/perforceintegrator.cpp +++ b/vcs/perforce/integrator/perforceintegrator.cpp @@ -28,10 +28,10 @@ static const KDevPluginInfo data("kdevperforceintegrator"); typedef KDevGenericFactory<PerforceIntegrator> PerforceIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libperforceintegrator, PerforceIntegratorFactory(data) ) -PerforceIntegrator::PerforceIntegrator(TQObject* tqparent, const char* name, +PerforceIntegrator::PerforceIntegrator(TQObject* parent, const char* name, const TQStringList // args ) - :KDevVCSIntegrator(tqparent, name) + :KDevVCSIntegrator(parent, name) { } @@ -39,15 +39,15 @@ PerforceIntegrator::~PerforceIntegrator() { } -VCSDialog* PerforceIntegrator::fetcher(TQWidget* // tqparent +VCSDialog* PerforceIntegrator::fetcher(TQWidget* // parent ) { return 0; } -VCSDialog* PerforceIntegrator::integrator(TQWidget* tqparent) +VCSDialog* PerforceIntegrator::integrator(TQWidget* parent) { - PFIntegratorDlg *dlg = new PFIntegratorDlg(tqparent); + PFIntegratorDlg *dlg = new PFIntegratorDlg(parent); return dlg; } diff --git a/vcs/perforce/integrator/perforceintegrator.h b/vcs/perforce/integrator/perforceintegrator.h index b76f8de8..875d9a73 100644 --- a/vcs/perforce/integrator/perforceintegrator.h +++ b/vcs/perforce/integrator/perforceintegrator.h @@ -29,11 +29,11 @@ class PerforceIntegrator : public KDevVCSIntegrator Q_OBJECT TQ_OBJECT public: - PerforceIntegrator(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); + PerforceIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~PerforceIntegrator(); - virtual VCSDialog* fetcher(TQWidget* tqparent); - virtual VCSDialog* integrator(TQWidget* tqparent); + virtual VCSDialog* fetcher(TQWidget* parent); + virtual VCSDialog* integrator(TQWidget* parent); }; diff --git a/vcs/perforce/integrator/pfintegratordlg.cpp b/vcs/perforce/integrator/pfintegratordlg.cpp index 90e66923..8685b2f4 100644 --- a/vcs/perforce/integrator/pfintegratordlg.cpp +++ b/vcs/perforce/integrator/pfintegratordlg.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include "pfintegratordlg.h" -PFIntegratorDlg::PFIntegratorDlg(TQWidget *tqparent, const char *name) - :PFIntegratorDlgBase(tqparent, name) +PFIntegratorDlg::PFIntegratorDlg(TQWidget *parent, const char *name) + :PFIntegratorDlgBase(parent, name) { } diff --git a/vcs/perforce/integrator/pfintegratordlg.h b/vcs/perforce/integrator/pfintegratordlg.h index a4f515bf..d20bd74c 100644 --- a/vcs/perforce/integrator/pfintegratordlg.h +++ b/vcs/perforce/integrator/pfintegratordlg.h @@ -27,7 +27,7 @@ class PFIntegratorDlg: public PFIntegratorDlgBase, public VCSDialog { Q_OBJECT TQ_OBJECT public: - PFIntegratorDlg(TQWidget *tqparent = 0, const char *name = 0); + PFIntegratorDlg(TQWidget *parent = 0, const char *name = 0); virtual void accept(); virtual void init(const TQString &projectName, const TQString &projectLocation); diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp index 2bd60c76..dd950121 100644 --- a/vcs/perforce/perforcepart.cpp +++ b/vcs/perforce/perforcepart.cpp @@ -38,8 +38,8 @@ static const KDevPluginInfo data("kdevperforce"); typedef KDevGenericFactory<PerforcePart> PerforceFactory; K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( data ) ) -PerforcePart::PerforcePart( TQObject *tqparent, const char *name, const TQStringList & ) - : KDevVersionControl( &data, tqparent, name ? name : "PerforcePart" ) +PerforcePart::PerforcePart( TQObject *parent, const char *name, const TQStringList & ) + : KDevVersionControl( &data, parent, name ? name : "PerforcePart" ) { setInstance(PerforceFactory::instance()); setupActions(); diff --git a/vcs/perforce/perforcepart.h b/vcs/perforce/perforcepart.h index 18994e0d..f7991438 100644 --- a/vcs/perforce/perforcepart.h +++ b/vcs/perforce/perforcepart.h @@ -26,7 +26,7 @@ class PerforcePart : public KDevVersionControl TQ_OBJECT public: - PerforcePart( TQObject *tqparent, const char *name, const TQStringList & ); + PerforcePart( TQObject *parent, const char *name, const TQStringList & ); ~PerforcePart(); virtual TQString shortDescription() const diff --git a/vcs/subversion/commitdlg.cpp b/vcs/subversion/commitdlg.cpp index 54c6c4f2..be54cabb 100644 --- a/vcs/subversion/commitdlg.cpp +++ b/vcs/subversion/commitdlg.cpp @@ -22,8 +22,8 @@ #include <tqevent.h> #include <ktextedit.h> -CommitDlg::CommitDlg( TQWidget* tqparent ) - : CommitDlgBase( tqparent ) +CommitDlg::CommitDlg( TQWidget* parent ) + : CommitDlgBase( parent ) { textMessage->installEventFilter(this); } diff --git a/vcs/subversion/integrator/subversionintegrator.cpp b/vcs/subversion/integrator/subversionintegrator.cpp index 8c0c4ef9..32d28d27 100644 --- a/vcs/subversion/integrator/subversionintegrator.cpp +++ b/vcs/subversion/integrator/subversionintegrator.cpp @@ -28,10 +28,10 @@ static const KDevPluginInfo data("kdevsubversionintegrator"); typedef KDevGenericFactory<SubversionIntegrator> SubversionIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libsubversionintegrator, SubversionIntegratorFactory(data) ) -SubversionIntegrator::SubversionIntegrator(TQObject* tqparent, const char* name, +SubversionIntegrator::SubversionIntegrator(TQObject* parent, const char* name, const TQStringList // args ) - :KDevVCSIntegrator(tqparent, name) + :KDevVCSIntegrator(parent, name) { } @@ -39,15 +39,15 @@ SubversionIntegrator::~SubversionIntegrator() { } -VCSDialog* SubversionIntegrator::fetcher(TQWidget* // tqparent +VCSDialog* SubversionIntegrator::fetcher(TQWidget* // parent ) { return 0; } -VCSDialog* SubversionIntegrator::integrator(TQWidget* tqparent) +VCSDialog* SubversionIntegrator::integrator(TQWidget* parent) { - SvnIntegratorDlg *dlg = new SvnIntegratorDlg(tqparent); + SvnIntegratorDlg *dlg = new SvnIntegratorDlg(parent); return dlg; } diff --git a/vcs/subversion/integrator/subversionintegrator.h b/vcs/subversion/integrator/subversionintegrator.h index d5ae7fad..1113c18e 100644 --- a/vcs/subversion/integrator/subversionintegrator.h +++ b/vcs/subversion/integrator/subversionintegrator.h @@ -29,11 +29,11 @@ class SubversionIntegrator : public KDevVCSIntegrator Q_OBJECT TQ_OBJECT public: - SubversionIntegrator(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); + SubversionIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~SubversionIntegrator(); - virtual VCSDialog* fetcher(TQWidget* tqparent); - virtual VCSDialog* integrator(TQWidget* tqparent); + virtual VCSDialog* fetcher(TQWidget* parent); + virtual VCSDialog* integrator(TQWidget* parent); }; diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp index cc074f8b..05572278 100644 --- a/vcs/subversion/integrator/svnintegratordlg.cpp +++ b/vcs/subversion/integrator/svnintegratordlg.cpp @@ -38,8 +38,8 @@ using namespace KIO; -SvnIntegratorDlg::SvnIntegratorDlg( TQWidget *tqparent, const char *name ) - : SvnIntegratorDlgBase( tqparent, name ) +SvnIntegratorDlg::SvnIntegratorDlg( TQWidget *parent, const char *name ) + : SvnIntegratorDlgBase( parent, name ) { repos1->setMode( KFile::Directory ); } diff --git a/vcs/subversion/integrator/svnintegratordlg.h b/vcs/subversion/integrator/svnintegratordlg.h index 3e464f3e..404ac6de 100644 --- a/vcs/subversion/integrator/svnintegratordlg.h +++ b/vcs/subversion/integrator/svnintegratordlg.h @@ -27,7 +27,7 @@ class SvnIntegratorDlg: public SvnIntegratorDlgBase, public VCSDialog { Q_OBJECT TQ_OBJECT public: - SvnIntegratorDlg(TQWidget *tqparent = 0, const char *name = 0); + SvnIntegratorDlg(TQWidget *parent = 0, const char *name = 0); virtual void accept(); virtual void init(const TQString &projectName, const TQString &projectLocation); diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp index 57238227..21b84400 100644 --- a/vcs/subversion/kdevsvnd.cpp +++ b/vcs/subversion/kdevsvnd.cpp @@ -257,7 +257,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg) // external++; // } // } -// if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //tqparent has a .svn ? +// if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //parent has a .svn ? // parentshavesvn++; // } // if ( files > 0 ) diff --git a/vcs/subversion/kdevsvnd.h b/vcs/subversion/kdevsvnd.h index 4d292b02..fa56be30 100644 --- a/vcs/subversion/kdevsvnd.h +++ b/vcs/subversion/kdevsvnd.h @@ -33,7 +33,7 @@ Q_OBJECT K_DCOP - //note: InSVN means tqparent is added. InRepos means itself is added + //note: InSVN means parent is added. InRepos means itself is added enum { SomeAreFiles = 1, SomeAreFolders = 2, SomeAreInParentsEntries = 4, SomeParentsHaveSvn = 8, SomeHaveSvn = 16, SomeAreExternalToParent = 32, AllAreInParentsEntries = 64, AllParentsHaveSvn = 128, AllHaveSvn = 256, AllAreExternalToParent = 512, AllAreFolders = 1024 }; public: KDevSvnd(const TQCString &); diff --git a/vcs/subversion/kdevsvnd_widgets.cpp b/vcs/subversion/kdevsvnd_widgets.cpp index abbd46cf..8fd05950 100644 --- a/vcs/subversion/kdevsvnd_widgets.cpp +++ b/vcs/subversion/kdevsvnd_widgets.cpp @@ -18,8 +18,8 @@ #include <tqlabel.h> #include <klocale.h> -SvnSSLTrustPrompt::SvnSSLTrustPrompt( TQWidget* tqparent, const char* name, bool modal, WFlags f ) - :SvnSSLTrustPromptBase( tqparent, name, modal, f ) +SvnSSLTrustPrompt::SvnSSLTrustPrompt( TQWidget* parent, const char* name, bool modal, WFlags f ) + :SvnSSLTrustPromptBase( parent, name, modal, f ) , m_code(-1) { listView1->setColumnText( 0, "Items" ); diff --git a/vcs/subversion/kdevsvnd_widgets.h b/vcs/subversion/kdevsvnd_widgets.h index c23514c1..9ec98cd6 100644 --- a/vcs/subversion/kdevsvnd_widgets.h +++ b/vcs/subversion/kdevsvnd_widgets.h @@ -21,7 +21,7 @@ class SvnSSLTrustPrompt : public SvnSSLTrustPromptBase{ Q_OBJECT TQ_OBJECT public: - SvnSSLTrustPrompt( TQWidget* tqparent=0, const char* name=0, bool modal=true, WFlags f=0 ); + SvnSSLTrustPrompt( TQWidget* parent=0, const char* name=0, bool modal=true, WFlags f=0 ); ~SvnSSLTrustPrompt(); void setupCertInfo( TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert ); void setupFailedReasonMsg( TQString msg ); diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp index 021860bd..d8b1230a 100644 --- a/vcs/subversion/subversion_fileinfo.cpp +++ b/vcs/subversion/subversion_fileinfo.cpp @@ -32,11 +32,11 @@ #include <kio/netaccess.h> #include <klocale.h> -SVNFileInfoProvider::SVNFileInfoProvider(subversionPart *tqparent, const char *name) - : KDevVCSFileInfoProvider( tqparent, "svnfileinfoprovider" ), +SVNFileInfoProvider::SVNFileInfoProvider(subversionPart *parent, const char *name) + : KDevVCSFileInfoProvider( parent, "svnfileinfoprovider" ), m_cachedDirEntries( 0 ), m_recursiveDirEntries(0) { Q_UNUSED(name); - m_part = tqparent; + m_part = parent; } SVNFileInfoProvider::~SVNFileInfoProvider() { diff --git a/vcs/subversion/subversion_fileinfo.h b/vcs/subversion/subversion_fileinfo.h index 50e6a209..dc1bfe1e 100644 --- a/vcs/subversion/subversion_fileinfo.h +++ b/vcs/subversion/subversion_fileinfo.h @@ -41,7 +41,7 @@ class SVNFileInfoProvider : public KDevVCSFileInfoProvider, public DCOPObject/*, K_DCOP public: - SVNFileInfoProvider( subversionPart *tqparent, const char *name = 0); + SVNFileInfoProvider( subversionPart *parent, const char *name = 0); virtual ~SVNFileInfoProvider(); // -- Sync interface diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp index d9869854..a98f2298 100644 --- a/vcs/subversion/subversion_part.cpp +++ b/vcs/subversion/subversion_part.cpp @@ -63,8 +63,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( data ) ) //bool g_projectWasJustCreated = false; -subversionPart::subversionPart(TQObject *tqparent, const char *name, const TQStringList& ) - : KDevVersionControl(&data, tqparent, name ? name : "Subversion" ) { +subversionPart::subversionPart(TQObject *parent, const char *name, const TQStringList& ) + : KDevVersionControl(&data, parent, name ? name : "Subversion" ) { setInstance(subversionFactory::instance()); m_projWidget = 0; @@ -159,9 +159,9 @@ void subversionPart::setupActions() { this, TQT_SLOT(slotMerge()), actionCollection(), "subversion_merge" ); } -TQWidget* subversionPart::newProjectWidget( TQWidget* tqparent ) { +TQWidget* subversionPart::newProjectWidget( TQWidget* parent ) { if ( !m_projWidget ) - m_projWidget = new subversionProjectWidget(tqparent,"projectwidget"); + m_projWidget = new subversionProjectWidget(parent,"projectwidget"); return m_projWidget; } @@ -257,7 +257,7 @@ if(!project()) id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) ); subMenu->tqsetWhatsThis(id, i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s).")); */ - // Now insert in tqparent menu + // Now insert in parent menu popup->insertItem( i18n("Subversion"), subMenu ); } } diff --git a/vcs/subversion/subversion_part.h b/vcs/subversion/subversion_part.h index decd355f..bc24a814 100644 --- a/vcs/subversion/subversion_part.h +++ b/vcs/subversion/subversion_part.h @@ -42,11 +42,11 @@ class subversionPart : public KDevVersionControl TQ_OBJECT public: - subversionPart(TQObject *tqparent, const char *name, const TQStringList &); + subversionPart(TQObject *parent, const char *name, const TQStringList &); virtual ~subversionPart(); void setupActions(); - TQWidget* newProjectWidget( TQWidget* tqparent ); + TQWidget* newProjectWidget( TQWidget* parent ); void createNewProject( const TQString& dirname ); bool fetchFromRepository(); KDevVCSFileInfoProvider * fileInfoProvider() const; diff --git a/vcs/subversion/subversion_widget.cpp b/vcs/subversion/subversion_widget.cpp index 96f7d7f4..c27f845e 100644 --- a/vcs/subversion/subversion_widget.cpp +++ b/vcs/subversion/subversion_widget.cpp @@ -29,8 +29,8 @@ #include <tqtoolbutton.h> #include <tqpushbutton.h> -subversionWidget::subversionWidget( subversionPart *part, TQWidget *tqparent, const char* name ) - : KTabWidget(tqparent) +subversionWidget::subversionWidget( subversionPart *part, TQWidget *parent, const char* name ) + : KTabWidget(parent) { m_part = part; m_edit = new KTextEdit( this ); @@ -87,8 +87,8 @@ void subversionWidget::closeCurrentTab() //////////////////////////////////////////////////////////////////////// -SvnIntSortListItem::SvnIntSortListItem( TQListView* tqparent ) - :TQListViewItem(tqparent) +SvnIntSortListItem::SvnIntSortListItem( TQListView* parent ) + :TQListViewItem(parent) {} SvnIntSortListItem::~SvnIntSortListItem() {} @@ -103,8 +103,8 @@ int SvnIntSortListItem::compare( TQListViewItem *item, int col, bool ascending ) return 0; } -SvnLogViewItem::SvnLogViewItem( TQListView * tqparent ) - :SvnIntSortListItem( tqparent ) +SvnLogViewItem::SvnLogViewItem( TQListView * parent ) + :SvnIntSortListItem( parent ) { m_pathList = ""; m_message = ""; diff --git a/vcs/subversion/subversion_widget.h b/vcs/subversion/subversion_widget.h index 0108da81..6418ba40 100644 --- a/vcs/subversion/subversion_widget.h +++ b/vcs/subversion/subversion_widget.h @@ -43,7 +43,7 @@ class subversionWidget : public KTabWidget Q_OBJECT TQ_OBJECT public: - subversionWidget(subversionPart *part, TQWidget *tqparent, const char* name); + subversionWidget(subversionPart *part, TQWidget *parent, const char* name); ~subversionWidget(); // append what?. Append any text status outputs @@ -67,7 +67,7 @@ private: */ class SvnIntSortListItem : public TQListViewItem { public: - SvnIntSortListItem ( TQListView* tqparent=0 ); + SvnIntSortListItem ( TQListView* parent=0 ); ~SvnIntSortListItem (); /** Returns < 0 if this item is less than i, 0 if they are equal and > 0 if this item is greater than i. */ @@ -76,7 +76,7 @@ public: class SvnLogViewItem : public SvnIntSortListItem { public: - SvnLogViewItem( TQListView* tqparent ); + SvnLogViewItem( TQListView* parent ); ~SvnLogViewItem(); TQString m_pathList; diff --git a/vcs/subversion/svn_blamewidget.cpp b/vcs/subversion/svn_blamewidget.cpp index 5d80f997..b4095389 100644 --- a/vcs/subversion/svn_blamewidget.cpp +++ b/vcs/subversion/svn_blamewidget.cpp @@ -24,8 +24,8 @@ #include <klocale.h> #include <kmessagebox.h> -SvnBlameWidget::SvnBlameWidget( TQWidget *tqparent, const char* name, bool modal, WFlags f ) - :TQWidget( tqparent ) +SvnBlameWidget::SvnBlameWidget( TQWidget *parent, const char* name, bool modal, WFlags f ) + :TQWidget( parent ) { m_layout = new TQVBoxLayout( this, 1, 1 ); m_layout->setMargin(1); @@ -84,8 +84,8 @@ TQListView* SvnBlameWidget::outView() ///////////////////////////////////////////////////////////// -SvnBlameFileSelectDlg::SvnBlameFileSelectDlg( TQWidget *tqparent ) - : TQDialog( tqparent ) +SvnBlameFileSelectDlg::SvnBlameFileSelectDlg( TQWidget *parent ) + : TQDialog( parent ) { m_selected = ""; setCaption( i18n("Select one file to view annotation") ); diff --git a/vcs/subversion/svn_blamewidget.h b/vcs/subversion/svn_blamewidget.h index 7cba3077..b20499f2 100644 --- a/vcs/subversion/svn_blamewidget.h +++ b/vcs/subversion/svn_blamewidget.h @@ -42,7 +42,7 @@ class SvnBlameWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - SvnBlameWidget( TQWidget * tqparent = 0, const char * name = 0, bool modal = FALSE, WFlags f = 0 ); + SvnBlameWidget( TQWidget * parent = 0, const char * name = 0, bool modal = FALSE, WFlags f = 0 ); virtual ~SvnBlameWidget(); void copyBlameData( TQValueList<SvnBlameHolder> *blamelist ); void show(); @@ -58,7 +58,7 @@ class SvnBlameFileSelectDlg : public TQDialog { Q_OBJECT TQ_OBJECT public: - SvnBlameFileSelectDlg( TQWidget *tqparent = 0L ); + SvnBlameFileSelectDlg( TQWidget *parent = 0L ); virtual ~SvnBlameFileSelectDlg(); void setCandidate( TQStringList *modifies ); TQString selected(); diff --git a/vcs/subversion/svn_copywidget.cpp b/vcs/subversion/svn_copywidget.cpp index e781ca10..30b25fd7 100644 --- a/vcs/subversion/svn_copywidget.cpp +++ b/vcs/subversion/svn_copywidget.cpp @@ -7,8 +7,8 @@ #include <kcombobox.h> #include <tqradiobutton.h> -SvnCopyDialog::SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *tqparent ) - : SvnCopyDialogBase( tqparent ) +SvnCopyDialog::SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *parent ) + : SvnCopyDialogBase( parent ) , m_holder(holder) { reqEdit->setText( reqPath ); diff --git a/vcs/subversion/svn_copywidget.h b/vcs/subversion/svn_copywidget.h index eb29ca39..6e71b168 100644 --- a/vcs/subversion/svn_copywidget.h +++ b/vcs/subversion/svn_copywidget.h @@ -14,7 +14,7 @@ class SvnCopyDialog : public SvnCopyDialogBase Q_OBJECT TQ_OBJECT public: - SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *tqparent ); + SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *parent ); ~SvnCopyDialog(); KURL sourceUrl(); diff --git a/vcs/subversion/svn_fileselectdlg_commit.cpp b/vcs/subversion/svn_fileselectdlg_commit.cpp index 1b4d9c83..25149483 100644 --- a/vcs/subversion/svn_fileselectdlg_commit.cpp +++ b/vcs/subversion/svn_fileselectdlg_commit.cpp @@ -34,8 +34,8 @@ #include <kdevproject.h> -SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart *part, TQWidget* tqparent) - :SvnCommitDlgBase( tqparent, "svnfileselectcommitdlg", true ) +SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart *part, TQWidget* parent) + :SvnCommitDlgBase( parent, "svnfileselectcommitdlg", true ) ,m_part(part) { this->setCaption(i18n("Select Files to Commit")); diff --git a/vcs/subversion/svn_fileselectdlg_commit.h b/vcs/subversion/svn_fileselectdlg_commit.h index 1a3cf74a..629b5063 100644 --- a/vcs/subversion/svn_fileselectdlg_commit.h +++ b/vcs/subversion/svn_fileselectdlg_commit.h @@ -36,7 +36,7 @@ Q_OBJECT TQ_OBJECT public: - SVNFileSelectDlgCommit( KURL::List&, subversionPart* part, TQWidget* tqparent = 0 ); + SVNFileSelectDlgCommit( KURL::List&, subversionPart* part, TQWidget* parent = 0 ); ~SVNFileSelectDlgCommit(); void insertItem( TQString status, KURL url ); KURL::List checkedUrls(); diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp index c8f33e66..541d1674 100644 --- a/vcs/subversion/svn_logviewwidget.cpp +++ b/vcs/subversion/svn_logviewwidget.cpp @@ -38,8 +38,8 @@ #include <tqlayout.h> #include <tqstringlist.h> -SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *tqparent) - :TQWidget(tqparent), m_part(part) +SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) + :TQWidget(parent), m_part(part) { m_layout = new TQGridLayout( this, 1, 1, 11, 6, "SvnLogViewWidgetBaseLayout"); @@ -188,8 +188,8 @@ void SvnLogViewWidget::diffToPrevious() true/*recurse*/, true/*peg_diff*/ ); } -SvnLogViewOptionDlg::SvnLogViewOptionDlg( TQWidget *tqparent, const char* name, bool modal, WFlags f ) -: SvnLogViewOptionDlgBase( tqparent, name, modal,f ) +SvnLogViewOptionDlg::SvnLogViewOptionDlg( TQWidget *parent, const char* name, bool modal, WFlags f ) +: SvnLogViewOptionDlgBase( parent, name, modal,f ) { // radio1->setChecked(true); //repository log radio4->setChecked(true); //start revistion by revision keyword diff --git a/vcs/subversion/svn_logviewwidget.h b/vcs/subversion/svn_logviewwidget.h index 04c18249..42a0822c 100644 --- a/vcs/subversion/svn_logviewwidget.h +++ b/vcs/subversion/svn_logviewwidget.h @@ -49,7 +49,7 @@ class SvnLogViewWidget : public /*SvnLogViewWidgetBase*/ TQWidget { Q_OBJECT TQ_OBJECT public: - SvnLogViewWidget(subversionPart *part, TQWidget *tqparent); + SvnLogViewWidget(subversionPart *part, TQWidget *parent); virtual ~SvnLogViewWidget(); void setLogResult( TQValueList<SvnLogHolder> *loglist ); void setRequestedUrl( TQString url ); @@ -76,7 +76,7 @@ class SvnLogViewOptionDlg : public SvnLogViewOptionDlgBase { Q_OBJECT TQ_OBJECT public: - SvnLogViewOptionDlg(TQWidget *tqparent=0, const char* name=0, bool modal=TRUE, WFlags f=0); + SvnLogViewOptionDlg(TQWidget *parent=0, const char* name=0, bool modal=TRUE, WFlags f=0); ~SvnLogViewOptionDlg(); int revstart(); TQString revKindStart(); diff --git a/vcs/subversion/svn_mergewidget.cpp b/vcs/subversion/svn_mergewidget.cpp index 8d3e5158..50731690 100644 --- a/vcs/subversion/svn_mergewidget.cpp +++ b/vcs/subversion/svn_mergewidget.cpp @@ -28,8 +28,8 @@ using namespace SvnGlobal; -SvnMergeDialog::SvnMergeDialog( const KURL &wcTarget, TQWidget *tqparent ) - : SvnMergeOptionDialogBase( tqparent ) +SvnMergeDialog::SvnMergeDialog( const KURL &wcTarget, TQWidget *parent ) + : SvnMergeOptionDialogBase( parent ) { dest->setURL( wcTarget.prettyURL() ); diff --git a/vcs/subversion/svn_mergewidget.h b/vcs/subversion/svn_mergewidget.h index da2a46dc..7f4a25fe 100644 --- a/vcs/subversion/svn_mergewidget.h +++ b/vcs/subversion/svn_mergewidget.h @@ -34,7 +34,7 @@ class SvnMergeDialog : public SvnMergeOptionDialogBase Q_OBJECT TQ_OBJECT public: - SvnMergeDialog( const KURL &wcTarget, TQWidget *tqparent = NULL ); + SvnMergeDialog( const KURL &wcTarget, TQWidget *parent = NULL ); virtual ~SvnMergeDialog(); KURL source1(); diff --git a/vcs/subversion/svn_switchwidget.cpp b/vcs/subversion/svn_switchwidget.cpp index 97744b06..7149cce2 100644 --- a/vcs/subversion/svn_switchwidget.cpp +++ b/vcs/subversion/svn_switchwidget.cpp @@ -7,8 +7,8 @@ #include "subversion_global.h" SvnSwitchDlg::SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder, - const TQString &wcPath, TQWidget *tqparent ) - : SvnSwitchDlgBase( tqparent ) + const TQString &wcPath, TQWidget *parent ) + : SvnSwitchDlgBase( parent ) , m_info( holder ) { connect( switchOnlyRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetCurrentRepositoryUrlEdit()) ); diff --git a/vcs/subversion/svn_switchwidget.h b/vcs/subversion/svn_switchwidget.h index 1d06f303..d78adcd6 100644 --- a/vcs/subversion/svn_switchwidget.h +++ b/vcs/subversion/svn_switchwidget.h @@ -14,7 +14,7 @@ class SvnSwitchDlg : public SvnSwitchDlgBase TQ_OBJECT public: SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder, - const TQString &wcPath, TQWidget *tqparent = NULL ); + const TQString &wcPath, TQWidget *parent = NULL ); virtual ~SvnSwitchDlg(); const TQString currentUrl(); |