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/subversion | |
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/subversion')
27 files changed, 62 insertions, 62 deletions
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(); |