diff options
105 files changed, 303 insertions, 303 deletions
diff --git a/src/commandline_part.cpp b/src/commandline_part.cpp index 46a02b0..33b7e53 100644 --- a/src/commandline_part.cpp +++ b/src/commandline_part.cpp @@ -23,8 +23,8 @@ #include <kstandarddirs.h> -commandline_part::commandline_part(TQObject *tqparent, const char *name,KCmdLineArgs *args) - : TQObject(tqparent, name) +commandline_part::commandline_part(TQObject *parent, const char *name,KCmdLineArgs *args) + : TQObject(parent, name) { KGlobal::locale()->insertCatalogue("kdesvn"); KInstance * inst = kdesvnPartFactory::instance(); diff --git a/src/commandline_part.h b/src/commandline_part.h index 74aebda..784ebe9 100644 --- a/src/commandline_part.h +++ b/src/commandline_part.h @@ -33,7 +33,7 @@ class commandline_part : public TQObject Q_OBJECT TQ_OBJECT public: - commandline_part(TQObject *tqparent, const char *name, KCmdLineArgs *args); + commandline_part(TQObject *parent, const char *name, KCmdLineArgs *args); virtual ~commandline_part(); virtual int exec(); private: diff --git a/src/helpers/sshagent.cpp b/src/helpers/sshagent.cpp index c4fee85..635e1b7 100644 --- a/src/helpers/sshagent.cpp +++ b/src/helpers/sshagent.cpp @@ -38,8 +38,8 @@ TQString SshAgent::m_authSock = TQString(); TQString SshAgent::m_pid = TQString(); -SshAgent::SshAgent(TQObject* tqparent, const char* name) - : TQObject(tqparent, name) +SshAgent::SshAgent(TQObject* parent, const char* name) + : TQObject(parent, name) { } diff --git a/src/helpers/sshagent.h b/src/helpers/sshagent.h index ed9ff1a..4c79d95 100644 --- a/src/helpers/sshagent.h +++ b/src/helpers/sshagent.h @@ -34,7 +34,7 @@ class SshAgent : public TQObject TQ_OBJECT public: - SshAgent(TQObject* tqparent = 0, const char* name = 0); + SshAgent(TQObject* parent = 0, const char* name = 0); ~SshAgent(); bool querySshAgent(); diff --git a/src/kdesvn_part.cpp b/src/kdesvn_part.cpp index 0aae6db..7d041fb 100644 --- a/src/kdesvn_part.cpp +++ b/src/kdesvn_part.cpp @@ -60,15 +60,15 @@ static const char description[] = I18N_NOOP("A Subversion Client for KDE (dynamic Part component)"); kdesvnPart::kdesvnPart( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name , const TQStringList&) - : KParts::ReadOnlyPart(tqparent, name) + TQObject *parent, const char *name , const TQStringList&) + : KParts::ReadOnlyPart(parent, name) { init(parentWidget,widgetName,false); } kdesvnPart::kdesvnPart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name,bool ownapp, const TQStringList&) - : KParts::ReadOnlyPart(tqparent, name) + TQObject *parent, const char *name,bool ownapp, const TQStringList&) + : KParts::ReadOnlyPart(parent, name) { init(parentWidget,widgetName,ownapp); } @@ -302,7 +302,7 @@ void KdesvnBrowserExtension::setPropertiesActionEnabled(bool enabled) void KdesvnBrowserExtension::properties() { - static_cast<kdesvnPart*>(tqparent())->slotFileProperties(); + static_cast<kdesvnPart*>(parent())->slotFileProperties(); } @@ -401,21 +401,21 @@ KAboutData* cFactory::s_about = 0L; commandline_part* cFactory::s_cline = 0L; KParts::Part* cFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const char *classname, const TQStringList &args ) { Q_UNUSED(classname); // Create an instance of our Part - return new kdesvnPart( parentWidget, widgetName, tqparent, name, args ); + return new kdesvnPart( parentWidget, widgetName, parent, name, args ); } KParts::Part* cFactory::createAppPart( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const char *classname, const TQStringList &args ) { Q_UNUSED(classname); // Create an instance of our Part - kdesvnPart* obj = new kdesvnPart( parentWidget, widgetName, tqparent, name, false, args); + kdesvnPart* obj = new kdesvnPart( parentWidget, widgetName, parent, name, false, args); emit objectCreated( obj ); return obj; } @@ -439,11 +439,11 @@ KInstance* cFactory::instance() return s_instance; } -commandline_part*cFactory::createCommandIf(TQObject*tqparent,const char*name, KCmdLineArgs *args) +commandline_part*cFactory::createCommandIf(TQObject*parent,const char*name, KCmdLineArgs *args) { if (!s_cline) { // no emit of creation - we will delete this object in destructor - s_cline = new commandline_part(tqparent,name,args); + s_cline = new commandline_part(parent,name,args); } return s_cline; } diff --git a/src/kdesvn_part.h b/src/kdesvn_part.h index b8fb7a3..558ea81 100644 --- a/src/kdesvn_part.h +++ b/src/kdesvn_part.h @@ -52,10 +52,10 @@ public: * Default constructor */ kdesvnPart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, const TQStringList&); + TQObject *parent, const char *name, const TQStringList&); kdesvnPart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name,bool ownapp, const TQStringList&); + TQObject *parent, const char *name,bool ownapp, const TQStringList&); /** * Destructor @@ -117,12 +117,12 @@ public: cFactory():KParts::Factory(){} virtual ~cFactory(); virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const char *classname, const TQStringList &args ); virtual KParts::Part* createAppPart( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const char *classname, const TQStringList &args ); - virtual commandline_part*createCommandIf(TQObject*tqparent,const char*name, KCmdLineArgs *args); + virtual commandline_part*createCommandIf(TQObject*parent,const char*name, KCmdLineArgs *args); static KInstance* instance(); private: diff --git a/src/kdesvnview.cpp b/src/kdesvnview.cpp index 87db570..fa26536 100644 --- a/src/kdesvnview.cpp +++ b/src/kdesvnview.cpp @@ -58,8 +58,8 @@ #include <kdialogbase.h> #include <kprogress.h> -kdesvnView::kdesvnView(KActionCollection*aCollection,TQWidget *tqparent,const char*name,bool full) - : TQWidget(tqparent,name),svn::repository::RepositoryListener(),m_Collection(aCollection), +kdesvnView::kdesvnView(KActionCollection*aCollection,TQWidget *parent,const char*name,bool full) + : TQWidget(parent,name),svn::repository::RepositoryListener(),m_Collection(aCollection), m_currentURL("") { Q_UNUSED(full); @@ -89,7 +89,7 @@ kdesvnView::kdesvnView(KActionCollection*aCollection,TQWidget *tqparent,const ch connect(m_flist,TQT_SIGNAL(sigLogMessage(const TQString&)),this,TQT_SLOT(slotAppendLog(const TQString&))); connect(m_flist,TQT_SIGNAL(changeCaption(const TQString&)),this,TQT_SLOT(slotSetTitle(const TQString&))); connect(m_flist,TQT_SIGNAL(sigShowPopup(const TQString&,TQWidget**)),this,TQT_SLOT(slotDispPopup(const TQString&,TQWidget**))); - connect(m_flist,TQT_SIGNAL(sigUrlOpend(bool)),tqparent,TQT_SLOT(slotUrlOpened(bool))); + connect(m_flist,TQT_SIGNAL(sigUrlOpend(bool)),parent,TQT_SLOT(slotUrlOpened(bool))); connect(m_flist,TQT_SIGNAL(sigSwitchUrl(const KURL&)),this,TQT_SIGNAL(sigSwitchUrl(const KURL&))); connect(m_flist,TQT_SIGNAL(sigUrlChanged( const TQString& )),this,TQT_SLOT(slotUrlChanged(const TQString&))); connect(m_flist,TQT_SIGNAL(sigCachetqStatus(TQ_LONG,TQ_LONG)),this,TQT_SLOT(fillCachetqStatus(TQ_LONG,TQ_LONG))); diff --git a/src/kdesvnview.h b/src/kdesvnview.h index a0d4089..a152562 100644 --- a/src/kdesvnview.h +++ b/src/kdesvnview.h @@ -57,7 +57,7 @@ public: /** * Default constructor */ - kdesvnView(KActionCollection*,TQWidget *tqparent,const char*name=0,bool full=false); + kdesvnView(KActionCollection*,TQWidget *parent,const char*name=0,bool full=false); /** * Destructor diff --git a/src/ksvnwidgets/authdialogimpl.cpp b/src/ksvnwidgets/authdialogimpl.cpp index 07ed908..87db6b4 100644 --- a/src/ksvnwidgets/authdialogimpl.cpp +++ b/src/ksvnwidgets/authdialogimpl.cpp @@ -26,8 +26,8 @@ #include <tqcheckbox.h> #include <tqlabel.h> -AuthDialogImpl::AuthDialogImpl(const TQString & realm,const TQString&user,TQWidget *tqparent, const char *name) - :AuthDialogData(tqparent, name),curPass("") +AuthDialogImpl::AuthDialogImpl(const TQString & realm,const TQString&user,TQWidget *parent, const char *name) + :AuthDialogData(parent, name),curPass("") { m_UsernameEdit->setText(user); m_PasswordEdit->setText(""); diff --git a/src/ksvnwidgets/authdialogimpl.h b/src/ksvnwidgets/authdialogimpl.h index 7b8d03e..1fba3f2 100644 --- a/src/ksvnwidgets/authdialogimpl.h +++ b/src/ksvnwidgets/authdialogimpl.h @@ -27,7 +27,7 @@ class AuthDialogImpl: public AuthDialogData { Q_OBJECT TQ_OBJECT public: - AuthDialogImpl(const TQString & realm = "",const TQString&user="", TQWidget *tqparent = 0, const char *name = 0); + AuthDialogImpl(const TQString & realm = "",const TQString&user="", TQWidget *parent = 0, const char *name = 0); const TQString Username()const; const TQString Password(); diff --git a/src/ksvnwidgets/depthselector.cpp b/src/ksvnwidgets/depthselector.cpp index a732716..9b721a2 100644 --- a/src/ksvnwidgets/depthselector.cpp +++ b/src/ksvnwidgets/depthselector.cpp @@ -28,8 +28,8 @@ #include <tqcombobox.h> -DepthSelector::DepthSelector(TQWidget *tqparent, const char *name) - :DepthSettings(tqparent, name) +DepthSelector::DepthSelector(TQWidget *parent, const char *name) + :DepthSettings(parent, name) { if (svn::Version::version_major()>1|| svn::Version::version_minor()>4 ) { m_recurse = 0L; diff --git a/src/ksvnwidgets/depthselector.h b/src/ksvnwidgets/depthselector.h index f6b9e2b..2a78df9 100644 --- a/src/ksvnwidgets/depthselector.h +++ b/src/ksvnwidgets/depthselector.h @@ -30,7 +30,7 @@ class DepthSelector: public DepthSettings { Q_OBJECT TQ_OBJECT public: - DepthSelector(TQWidget *tqparent = 0, const char *name = 0); + DepthSelector(TQWidget *parent = 0, const char *name = 0); virtual ~DepthSelector(); svn::Depth getDepth()const; void addItemWidget(TQWidget*); diff --git a/src/ksvnwidgets/diffbrowser.cpp b/src/ksvnwidgets/diffbrowser.cpp index 08bf89f..3743243 100644 --- a/src/ksvnwidgets/diffbrowser.cpp +++ b/src/ksvnwidgets/diffbrowser.cpp @@ -36,10 +36,10 @@ #include <tqtextcodec.h> /*! - \fn DiffBrowser::DiffBrowser(TQWidget*tqparent=0,const char*name=0) + \fn DiffBrowser::DiffBrowser(TQWidget*parent=0,const char*name=0) */ -DiffBrowser::DiffBrowser(TQWidget*tqparent,const char*name) - : KTextBrowser( tqparent, name) +DiffBrowser::DiffBrowser(TQWidget*parent,const char*name) + : KTextBrowser( parent, name) { setTextFormat(TQt::PlainText); setFont(KGlobalSettings::fixedFont()); @@ -171,11 +171,11 @@ void DiffBrowser::doSearch(const TQString&to_find_string,bool case_sensitive,boo m_Data->pattern=to_find_string; break; } - TQWidget * _tqparent = m_Data->srchdialog->isVisible()?m_Data->srchdialog:parentWidget(); + TQWidget * _parent = m_Data->srchdialog->isVisible()?m_Data->srchdialog:parentWidget(); if (!m_Data->srchdialog->get_direction()) { // forward int query = KMessageBox::questionYesNo( - _tqparent, + _parent, i18n("End of document reached.\n"\ "Continue from the beginning?"), i18n("Find"),KStdGuiItem::cont(),i18n("Stop")); @@ -188,7 +188,7 @@ void DiffBrowser::doSearch(const TQString&to_find_string,bool case_sensitive,boo } } else { int query = KMessageBox::questionYesNo( - _tqparent, + _parent, i18n("Beginning of document reached.\n"\ "Continue from the end?"), i18n("Find"),KStdGuiItem::cont(),i18n("Stop")); diff --git a/src/ksvnwidgets/diffbrowser.h b/src/ksvnwidgets/diffbrowser.h index 4793afe..8f74b8b 100644 --- a/src/ksvnwidgets/diffbrowser.h +++ b/src/ksvnwidgets/diffbrowser.h @@ -33,7 +33,7 @@ class DiffBrowser : public KTextBrowser TQ_OBJECT public: - DiffBrowser(TQWidget*tqparent=0,const char*name=0); + DiffBrowser(TQWidget*parent=0,const char*name=0); virtual ~DiffBrowser(); public slots: diff --git a/src/ksvnwidgets/encodingselector_impl.cpp b/src/ksvnwidgets/encodingselector_impl.cpp index 77142f2..c34e15e 100644 --- a/src/ksvnwidgets/encodingselector_impl.cpp +++ b/src/ksvnwidgets/encodingselector_impl.cpp @@ -24,8 +24,8 @@ #include <tqcombobox.h> -EncodingSelector_impl::EncodingSelector_impl(const TQString&cur,TQWidget *tqparent, const char *name) - :EncodingSelector(tqparent, name) +EncodingSelector_impl::EncodingSelector_impl(const TQString&cur,TQWidget *parent, const char *name) + :EncodingSelector(parent, name) { m_encodingList->insertStringList( KGlobal::charsets()->availableEncodingNames()); diff --git a/src/ksvnwidgets/encodingselector_impl.h b/src/ksvnwidgets/encodingselector_impl.h index 7a6bf3e..6e7655a 100644 --- a/src/ksvnwidgets/encodingselector_impl.h +++ b/src/ksvnwidgets/encodingselector_impl.h @@ -28,7 +28,7 @@ class EncodingSelector_impl: public EncodingSelector { Q_OBJECT TQ_OBJECT public: - EncodingSelector_impl(const TQString&cur, TQWidget *tqparent = 0, const char *name = 0); + EncodingSelector_impl(const TQString&cur, TQWidget *parent = 0, const char *name = 0); virtual ~EncodingSelector_impl(){} protected slots: diff --git a/src/ksvnwidgets/logmsg_impl.cpp b/src/ksvnwidgets/logmsg_impl.cpp index fb053c6..7d1e837 100644 --- a/src/ksvnwidgets/logmsg_impl.cpp +++ b/src/ksvnwidgets/logmsg_impl.cpp @@ -64,8 +64,8 @@ public: virtual int compare( TQListViewItem* item, int col, bool ascending ) const; }; -Logmsg_impl::Logmsg_impl(TQWidget *tqparent, const char *name) - :LogmessageData(tqparent, name) +Logmsg_impl::Logmsg_impl(TQWidget *parent, const char *name) + :LogmessageData(parent, name) { m_LogEdit->setFocus(); m_Reviewlabel->hide(); @@ -81,8 +81,8 @@ Logmsg_impl::Logmsg_impl(TQWidget *tqparent, const char *name) m_DiffItem=0; } -Logmsg_impl::Logmsg_impl(const svn::CommitItemList&_items,TQWidget *tqparent, const char *name) - :LogmessageData(tqparent, name) +Logmsg_impl::Logmsg_impl(const svn::CommitItemList&_items,TQWidget *parent, const char *name) + :LogmessageData(parent, name) { m_LogEdit->setFocus(); m_ReviewList->setColumnText(1,i18n("Items to commit")); @@ -108,8 +108,8 @@ Logmsg_impl::Logmsg_impl(const svn::CommitItemList&_items,TQWidget *tqparent, co checkSplitterSize(); } -Logmsg_impl::Logmsg_impl(const TQMap<TQString,TQString>&_items,TQWidget *tqparent, const char *name) - :LogmessageData(tqparent, name) +Logmsg_impl::Logmsg_impl(const TQMap<TQString,TQString>&_items,TQWidget *parent, const char *name) + :LogmessageData(parent, name) { m_LogEdit->setFocus(); m_ReviewList->setColumnText(1,i18n("Items to commit")); @@ -134,8 +134,8 @@ Logmsg_impl::Logmsg_impl(const TQMap<TQString,TQString>&_items,TQWidget *tqparen Logmsg_impl::Logmsg_impl(const logActionEntries&_activatedList, const logActionEntries&_notActivatedList, - TQWidget *tqparent, const char *name) - :LogmessageData(tqparent, name) + TQWidget *parent, const char *name) + :LogmessageData(parent, name) { m_LogEdit->setFocus(); m_hidden=false; @@ -278,14 +278,14 @@ void Logmsg_impl::saveHistory(bool canceld) } } -TQString Logmsg_impl::getLogmessage(bool*ok,svn::Depth*rec,bool*keep_locks,TQWidget*tqparent,const char*name) +TQString Logmsg_impl::getLogmessage(bool*ok,svn::Depth*rec,bool*keep_locks,TQWidget*parent,const char*name) { bool _ok,_keep_locks; svn::Depth _depth = svn::DepthUnknown; TQString msg(""); Logmsg_impl*ptr=0; - KDialogBase dlg(tqparent,name,true,i18n("Commit log"), + KDialogBase dlg(parent,name,true,i18n("Commit log"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,true); TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); @@ -317,14 +317,14 @@ TQString Logmsg_impl::getLogmessage(bool*ok,svn::Depth*rec,bool*keep_locks,TQWid return msg; } -TQString Logmsg_impl::getLogmessage(const svn::CommitItemList&items,bool*ok,svn::Depth*rec,bool*keep_locks,TQWidget*tqparent,const char*name) +TQString Logmsg_impl::getLogmessage(const svn::CommitItemList&items,bool*ok,svn::Depth*rec,bool*keep_locks,TQWidget*parent,const char*name) { bool _ok,_keep_locks; svn::Depth _depth = svn::DepthUnknown; TQString msg(""); Logmsg_impl*ptr=0; - KDialogBase dlg(tqparent,name,true,i18n("Commit log"), + KDialogBase dlg(parent,name,true,i18n("Commit log"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,true); TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); @@ -359,14 +359,14 @@ TQString Logmsg_impl::getLogmessage(const svn::CommitItemList&items,bool*ok,svn: } TQString Logmsg_impl::getLogmessage(const TQMap<TQString,TQString>&items, - bool*ok,svn::Depth*rec,bool*keep_locks,TQWidget*tqparent,const char*name) + bool*ok,svn::Depth*rec,bool*keep_locks,TQWidget*parent,const char*name) { bool _ok,_rec,_keep_locks; svn::Depth _depth = svn::DepthUnknown; TQString msg(""); Logmsg_impl*ptr=0; - KDialogBase dlg(tqparent,name,true,i18n("Commit log"), + KDialogBase dlg(parent,name,true,i18n("Commit log"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,true); TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); @@ -404,13 +404,13 @@ TQString Logmsg_impl::getLogmessage(const logActionEntries&_on, const logActionEntries&_off, TQObject*callback, logActionEntries&_result, - bool*ok,bool*keep_locks,TQWidget*tqparent,const char*name) + bool*ok,bool*keep_locks,TQWidget*parent,const char*name) { bool _ok,_keep_locks; TQString msg(""); Logmsg_impl*ptr=0; - KDialogBase dlg(tqparent,name,true,i18n("Commit log"), + KDialogBase dlg(parent,name,true,i18n("Commit log"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,true); TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); @@ -484,8 +484,8 @@ Logmsg_impl::logActionEntry::logActionEntry() { } -SvnCheckListItem::SvnCheckListItem(TQListView*tqparent,const Logmsg_impl::logActionEntry&content) - :TQCheckListItem(tqparent,content._name,TQCheckListItem::CheckBox),m_Content(content) +SvnCheckListItem::SvnCheckListItem(TQListView*parent,const Logmsg_impl::logActionEntry&content) + :TQCheckListItem(parent,content._name,TQCheckListItem::CheckBox),m_Content(content) { setTristate(FALSE); setText(1,m_Content._actionDesc); diff --git a/src/ksvnwidgets/logmsg_impl.h b/src/ksvnwidgets/logmsg_impl.h index 30d11cd..ef92258 100644 --- a/src/ksvnwidgets/logmsg_impl.h +++ b/src/ksvnwidgets/logmsg_impl.h @@ -46,12 +46,12 @@ public: typedef TQValueList<logActionEntry> logActionEntries; - Logmsg_impl(TQWidget *tqparent = 0, const char *name = 0); - Logmsg_impl(const svn::CommitItemList&_items,TQWidget *tqparent=0, const char *name=0); - Logmsg_impl(const TQMap<TQString,TQString>&_items,TQWidget *tqparent=0, const char *name=0); + Logmsg_impl(TQWidget *parent = 0, const char *name = 0); + Logmsg_impl(const svn::CommitItemList&_items,TQWidget *parent=0, const char *name=0); + Logmsg_impl(const TQMap<TQString,TQString>&_items,TQWidget *parent=0, const char *name=0); Logmsg_impl(const logActionEntries&, const logActionEntries&, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); virtual ~Logmsg_impl(); TQString getMessage()const; @@ -59,15 +59,15 @@ public: void initHistory(); void saveHistory(bool canceld); - static TQString getLogmessage(bool*ok,svn::Depth*rec,bool*keeps_locks,TQWidget*tqparent=0,const char*name=0); - static TQString getLogmessage(const svn::CommitItemList&,bool*ok,svn::Depth*rec,bool*keep_locks,TQWidget*tqparent=0,const char*name=0); - static TQString getLogmessage(const TQMap<TQString,TQString>&,bool*ok,svn::Depth*rec,bool*keep_locks,TQWidget*tqparent=0,const char*name=0); + static TQString getLogmessage(bool*ok,svn::Depth*rec,bool*keeps_locks,TQWidget*parent=0,const char*name=0); + static TQString getLogmessage(const svn::CommitItemList&,bool*ok,svn::Depth*rec,bool*keep_locks,TQWidget*parent=0,const char*name=0); + static TQString getLogmessage(const TQMap<TQString,TQString>&,bool*ok,svn::Depth*rec,bool*keep_locks,TQWidget*parent=0,const char*name=0); static TQString getLogmessage(const logActionEntries&, const logActionEntries&, TQObject*callback, logActionEntries&, - bool*ok,bool*keep_locks,TQWidget*tqparent=0,const char*name=0); + bool*ok,bool*keep_locks,TQWidget*parent=0,const char*name=0); void addItemWidget(TQWidget*); diff --git a/src/ksvnwidgets/revertform_impl.cpp b/src/ksvnwidgets/revertform_impl.cpp index 19a8a18..91ad876 100644 --- a/src/ksvnwidgets/revertform_impl.cpp +++ b/src/ksvnwidgets/revertform_impl.cpp @@ -24,10 +24,10 @@ #include <tqlistbox.h> /*! - \fn RevertFormImpl::RevertFormImpl(TQWidget*tqparent,const char*name) + \fn RevertFormImpl::RevertFormImpl(TQWidget*parent,const char*name) */ - RevertFormImpl::RevertFormImpl(TQWidget*tqparent,const char*name) - :RevertForm(tqparent,name) + RevertFormImpl::RevertFormImpl(TQWidget*parent,const char*name) + :RevertForm(parent,name) { setMinimumSize(tqminimumSizeHint()); } diff --git a/src/ksvnwidgets/revertform_impl.h b/src/ksvnwidgets/revertform_impl.h index 52de65e..6e6eed0 100644 --- a/src/ksvnwidgets/revertform_impl.h +++ b/src/ksvnwidgets/revertform_impl.h @@ -30,7 +30,7 @@ class RevertFormImpl:public RevertForm Q_OBJECT TQ_OBJECT public: - RevertFormImpl(TQWidget*tqparent=0,const char*name=0); + RevertFormImpl(TQWidget*parent=0,const char*name=0); virtual ~RevertFormImpl(); svn::Depth getDepth()const; void setDispList(const TQStringList&_list); diff --git a/src/ksvnwidgets/ssltrustprompt_impl.cpp b/src/ksvnwidgets/ssltrustprompt_impl.cpp index 84b0d15..53b51c8 100644 --- a/src/ksvnwidgets/ssltrustprompt_impl.cpp +++ b/src/ksvnwidgets/ssltrustprompt_impl.cpp @@ -32,8 +32,8 @@ #include <kdialogbase.h> #include <ktextbrowser.h> -SslTrustPrompt_impl::SslTrustPrompt_impl(const TQString&host,TQWidget *tqparent, const char *name) - :SslTrustPrompt(tqparent, name) +SslTrustPrompt_impl::SslTrustPrompt_impl(const TQString&host,TQWidget *parent, const char *name) + :SslTrustPrompt(parent, name) { m_MainLabel->setText("<p align=\"center\"><b>"+ i18n("Error validating server certificate for '%1'").tqarg(host)+ diff --git a/src/ksvnwidgets/ssltrustprompt_impl.h b/src/ksvnwidgets/ssltrustprompt_impl.h index 5d4d492..4c6a5b1 100644 --- a/src/ksvnwidgets/ssltrustprompt_impl.h +++ b/src/ksvnwidgets/ssltrustprompt_impl.h @@ -26,7 +26,7 @@ class SslTrustPrompt_impl: public SslTrustPrompt { Q_OBJECT TQ_OBJECT public: - SslTrustPrompt_impl(const TQString&,TQWidget *tqparent = 0, const char *name = 0); + SslTrustPrompt_impl(const TQString&,TQWidget *parent = 0, const char *name = 0); static bool sslTrust(const TQString&host,const TQString&fingerprint,const TQString&validFrom,const TQString&validUntil,const TQString&issuerName,const TQString&realm,const TQStringList&reasons,bool*ok,bool*saveit); }; diff --git a/src/settings/cmdexecsettings_impl.cpp b/src/settings/cmdexecsettings_impl.cpp index 07fe43d..0984818 100644 --- a/src/settings/cmdexecsettings_impl.cpp +++ b/src/settings/cmdexecsettings_impl.cpp @@ -26,8 +26,8 @@ #include <tqcheckbox.h> #include <klineedit.h> -CmdExecSettings_impl::CmdExecSettings_impl(TQWidget* tqparent, const char* name, WFlags fl) -: CmdExecSettings(tqparent,name,fl) +CmdExecSettings_impl::CmdExecSettings_impl(TQWidget* parent, const char* name, WFlags fl) +: CmdExecSettings(parent,name,fl) { kcfg_cmdline_log_minline->setSpecialValueText(i18n("No minimum")); kcfg_cmdline_log_minline->setEnabled(kcfg_cmdline_show_logwindow->isChecked()); diff --git a/src/settings/cmdexecsettings_impl.h b/src/settings/cmdexecsettings_impl.h index 23f2098..13e61d9 100644 --- a/src/settings/cmdexecsettings_impl.h +++ b/src/settings/cmdexecsettings_impl.h @@ -29,7 +29,7 @@ class CmdExecSettings_impl : public CmdExecSettings TQ_OBJECT public: - CmdExecSettings_impl(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + CmdExecSettings_impl(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~CmdExecSettings_impl(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/src/settings/diffmergesettings_impl.cpp b/src/settings/diffmergesettings_impl.cpp index bec03b6..b72c4af 100644 --- a/src/settings/diffmergesettings_impl.cpp +++ b/src/settings/diffmergesettings_impl.cpp @@ -26,8 +26,8 @@ #include <klineedit.h> #include <kdebug.h> -DiffMergeSettings_impl::DiffMergeSettings_impl(TQWidget *tqparent, const char *name) - :DiffMergeSettings(tqparent, name) +DiffMergeSettings_impl::DiffMergeSettings_impl(TQWidget *parent, const char *name) + :DiffMergeSettings(parent, name) { kcfg_external_diff_display->setEnabled(Kdesvnsettings::use_external_diff()); } diff --git a/src/settings/diffmergesettings_impl.h b/src/settings/diffmergesettings_impl.h index 815b4f5..198ffe6 100644 --- a/src/settings/diffmergesettings_impl.h +++ b/src/settings/diffmergesettings_impl.h @@ -26,7 +26,7 @@ class DiffMergeSettings_impl: public DiffMergeSettings { Q_OBJECT TQ_OBJECT public: - DiffMergeSettings_impl(TQWidget *tqparent = 0, const char *name = 0); + DiffMergeSettings_impl(TQWidget *parent = 0, const char *name = 0); virtual ~DiffMergeSettings_impl(); protected slots: virtual void diffDispChanged(bool); diff --git a/src/settings/dispcolorsettings_impl.cpp b/src/settings/dispcolorsettings_impl.cpp index b81854b..5dc6605 100644 --- a/src/settings/dispcolorsettings_impl.cpp +++ b/src/settings/dispcolorsettings_impl.cpp @@ -21,8 +21,8 @@ #include <kcolorbutton.h> #include <tqcheckbox.h> -DispColorSettings_impl::DispColorSettings_impl(TQWidget *tqparent, const char *name) - :DispColorSettings(tqparent, name) +DispColorSettings_impl::DispColorSettings_impl(TQWidget *parent, const char *name) + :DispColorSettings(parent, name) { coloredStateToggled(kcfg_colored_state->isChecked()); } diff --git a/src/settings/dispcolorsettings_impl.h b/src/settings/dispcolorsettings_impl.h index 62dd36f..dd97247 100644 --- a/src/settings/dispcolorsettings_impl.h +++ b/src/settings/dispcolorsettings_impl.h @@ -26,7 +26,7 @@ class DispColorSettings_impl: public DispColorSettings { Q_OBJECT TQ_OBJECT public: - DispColorSettings_impl(TQWidget *tqparent = 0, const char *name = 0); + DispColorSettings_impl(TQWidget *parent = 0, const char *name = 0); virtual ~DispColorSettings_impl(); protected slots: virtual void coloredStateToggled(bool); diff --git a/src/settings/displaysettings_impl.cpp b/src/settings/displaysettings_impl.cpp index e50a484..da068fd 100644 --- a/src/settings/displaysettings_impl.cpp +++ b/src/settings/displaysettings_impl.cpp @@ -26,8 +26,8 @@ #include <klineedit.h> #include <kdebug.h> -DisplaySettings_impl::DisplaySettings_impl(TQWidget *tqparent, const char *name) - :DisplaySettings(tqparent, name) +DisplaySettings_impl::DisplaySettings_impl(TQWidget *parent, const char *name) + :DisplaySettings(parent, name) { kcfg_display_previews_in_file_tips->setEnabled(kcfg_display_file_tips->isChecked()); } diff --git a/src/settings/displaysettings_impl.h b/src/settings/displaysettings_impl.h index 947c007..7b731c0 100644 --- a/src/settings/displaysettings_impl.h +++ b/src/settings/displaysettings_impl.h @@ -26,7 +26,7 @@ class DisplaySettings_impl: public DisplaySettings { Q_OBJECT TQ_OBJECT public: - DisplaySettings_impl(TQWidget *tqparent = 0, const char *name = 0); + DisplaySettings_impl(TQWidget *parent = 0, const char *name = 0); virtual ~DisplaySettings_impl(); protected slots: virtual void dispFileInfotoggled(bool); diff --git a/src/settings/revisiontreesettingsdlg_impl.cpp b/src/settings/revisiontreesettingsdlg_impl.cpp index 6b5256f..5162d76 100644 --- a/src/settings/revisiontreesettingsdlg_impl.cpp +++ b/src/settings/revisiontreesettingsdlg_impl.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include "src/settings/revisiontreesettingsdlg_impl.h" -RevisiontreeSettingsDlg_impl::RevisiontreeSettingsDlg_impl(TQWidget *tqparent, const char *name) - :RevisiontreeSettingsDlg(tqparent, name) +RevisiontreeSettingsDlg_impl::RevisiontreeSettingsDlg_impl(TQWidget *parent, const char *name) + :RevisiontreeSettingsDlg(parent, name) { } diff --git a/src/settings/revisiontreesettingsdlg_impl.h b/src/settings/revisiontreesettingsdlg_impl.h index 63f021b..dcf69c2 100644 --- a/src/settings/revisiontreesettingsdlg_impl.h +++ b/src/settings/revisiontreesettingsdlg_impl.h @@ -27,7 +27,7 @@ class RevisiontreeSettingsDlg_impl: public RevisiontreeSettingsDlg Q_OBJECT TQ_OBJECT public: - RevisiontreeSettingsDlg_impl(TQWidget *tqparent = 0, const char *name = 0); + RevisiontreeSettingsDlg_impl(TQWidget *parent = 0, const char *name = 0); virtual ~RevisiontreeSettingsDlg_impl(); }; diff --git a/src/settings/subversionsettings_impl.cpp b/src/settings/subversionsettings_impl.cpp index e3536d5..d0674e0 100644 --- a/src/settings/subversionsettings_impl.cpp +++ b/src/settings/subversionsettings_impl.cpp @@ -21,8 +21,8 @@ #include "subversionsettings_impl.h" -SubversionSettings_impl::SubversionSettings_impl(TQWidget* tqparent, const char* name, WFlags fl) -: SubversionSettings(tqparent,name,fl) +SubversionSettings_impl::SubversionSettings_impl(TQWidget* parent, const char* name, WFlags fl) +: SubversionSettings(parent,name,fl) { } diff --git a/src/settings/subversionsettings_impl.h b/src/settings/subversionsettings_impl.h index 1a069ea..5bb84c2 100644 --- a/src/settings/subversionsettings_impl.h +++ b/src/settings/subversionsettings_impl.h @@ -29,7 +29,7 @@ class SubversionSettings_impl : public SubversionSettings TQ_OBJECT public: - SubversionSettings_impl(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + SubversionSettings_impl(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~SubversionSettings_impl(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/src/svnfrontend/blamedisplay_impl.cpp b/src/svnfrontend/blamedisplay_impl.cpp index 7365079..3427f05 100644 --- a/src/svnfrontend/blamedisplay_impl.cpp +++ b/src/svnfrontend/blamedisplay_impl.cpp @@ -243,15 +243,15 @@ class BlameDisplayData TQString reposRoot; }; -BlameDisplay_impl::BlameDisplay_impl(TQWidget*tqparent,const char*name) - : BlameDisplay(tqparent,name) +BlameDisplay_impl::BlameDisplay_impl(TQWidget*parent,const char*name) + : BlameDisplay(parent,name) { m_Data = new BlameDisplayData(); connect(m_BlameList,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotSelectionChanged())); } -BlameDisplay_impl::BlameDisplay_impl(const TQString&what,const svn::AnnotatedFile&blame,TQWidget*tqparent,const char*name) - : BlameDisplay(tqparent,name) +BlameDisplay_impl::BlameDisplay_impl(const TQString&what,const svn::AnnotatedFile&blame,TQWidget*parent,const char*name) + : BlameDisplay(parent,name) { m_Data = new BlameDisplayData(); connect(m_BlameList,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotSelectionChanged())); diff --git a/src/svnfrontend/blamedisplay_impl.h b/src/svnfrontend/blamedisplay_impl.h index a07f035..69df0a8 100644 --- a/src/svnfrontend/blamedisplay_impl.h +++ b/src/svnfrontend/blamedisplay_impl.h @@ -33,8 +33,8 @@ class BlameDisplay_impl:public BlameDisplay Q_OBJECT TQ_OBJECT public: - BlameDisplay_impl(const TQString&,const svn::AnnotatedFile&,TQWidget*tqparent=0,const char*name=0); - BlameDisplay_impl(TQWidget*tqparent=0,const char*name=0); + BlameDisplay_impl(const TQString&,const svn::AnnotatedFile&,TQWidget*parent=0,const char*name=0); + BlameDisplay_impl(TQWidget*parent=0,const char*name=0); virtual ~BlameDisplay_impl(); virtual void setContent(const TQString&,const svn::AnnotatedFile&); @@ -42,7 +42,7 @@ public: const TQColor rev2color(svn_revnum_t)const; - static void displayBlame(SimpleLogCb*,const TQString&,const svn::AnnotatedFile&,TQWidget*tqparent=0,const char*name=0); + static void displayBlame(SimpleLogCb*,const TQString&,const svn::AnnotatedFile&,TQWidget*parent=0,const char*name=0); public slots: virtual void slotGoLine(); diff --git a/src/svnfrontend/ccontextlistener.cpp b/src/svnfrontend/ccontextlistener.cpp index ddcdaa4..4526edc 100644 --- a/src/svnfrontend/ccontextlistener.cpp +++ b/src/svnfrontend/ccontextlistener.cpp @@ -113,8 +113,8 @@ TQString CContextListener::NotifyState(svn_wc_notify_state_t state) return notify_state_strings[state].isEmpty()?TQString():i18n(notify_state_strings[state]); } -CContextListener::CContextListener(TQObject *tqparent, const char *name) - : TQObject(tqparent, name), svn::ContextListener(),ref_count() +CContextListener::CContextListener(TQObject *parent, const char *name) + : TQObject(parent, name), svn::ContextListener(),ref_count() { m_Data = new CContextListenerData(); } diff --git a/src/svnfrontend/ccontextlistener.h b/src/svnfrontend/ccontextlistener.h index 3bb48bd..9508068 100644 --- a/src/svnfrontend/ccontextlistener.h +++ b/src/svnfrontend/ccontextlistener.h @@ -36,7 +36,7 @@ class CContextListener : public TQObject, public svn::ContextListener,public svn Q_OBJECT TQ_OBJECT public: - CContextListener(TQObject *tqparent = 0, const char *name = 0); + CContextListener(TQObject *parent = 0, const char *name = 0); virtual ~CContextListener(); /* context-listener methods */ diff --git a/src/svnfrontend/commandexec.cpp b/src/svnfrontend/commandexec.cpp index d255794..fe2f3f7 100644 --- a/src/svnfrontend/commandexec.cpp +++ b/src/svnfrontend/commandexec.cpp @@ -91,8 +91,8 @@ pCPart::~pCPart() delete disp; } -CommandExec::CommandExec(TQObject*tqparent, const char *name,KCmdLineArgs *args) - : TQObject(tqparent,name) +CommandExec::CommandExec(TQObject*parent, const char *name,KCmdLineArgs *args) + : TQObject(parent,name) { m_pCPart = new pCPart; m_pCPart->args = args; diff --git a/src/svnfrontend/commandexec.h b/src/svnfrontend/commandexec.h index ec66fe7..f92389c 100644 --- a/src/svnfrontend/commandexec.h +++ b/src/svnfrontend/commandexec.h @@ -39,7 +39,7 @@ class CommandExec : public TQObject Q_OBJECT TQ_OBJECT public: - CommandExec(TQObject*tqparent,const char *name,KCmdLineArgs *args); + CommandExec(TQObject*parent,const char *name,KCmdLineArgs *args); virtual ~CommandExec(); virtual int exec(); diff --git a/src/svnfrontend/copymoveview_impl.cpp b/src/svnfrontend/copymoveview_impl.cpp index bfcd2ea..98e3d60 100644 --- a/src/svnfrontend/copymoveview_impl.cpp +++ b/src/svnfrontend/copymoveview_impl.cpp @@ -28,8 +28,8 @@ #include <kdialogbase.h> #include <tqvbox.h> -CopyMoveView_impl::CopyMoveView_impl(const TQString&baseName,const TQString&sourceName,bool move,TQWidget* tqparent, const char* name, WFlags fl) -: CopyMoveView(tqparent,name,fl) +CopyMoveView_impl::CopyMoveView_impl(const TQString&baseName,const TQString&sourceName,bool move,TQWidget* parent, const char* name, WFlags fl) +: CopyMoveView(parent,name,fl) { m_BaseName = baseName; if (m_BaseName.length()>0 && !m_BaseName.endsWith("/")) { @@ -80,9 +80,9 @@ bool CopyMoveView_impl::force() \fn CopyMoveView_impl::getMoveCopyTo(bool*ok,bool*force,const TQString&old,const TQString&base,TQWidget*) */ TQString CopyMoveView_impl::getMoveCopyTo(bool*ok,bool*force,bool move, - const TQString&old,const TQString&base,TQWidget*tqparent,const char*name) + const TQString&old,const TQString&base,TQWidget*parent,const char*name) { - KDialogBase dlg(tqparent,name,true,(move?i18n("Move/Rename file/dir"):i18n("Copy file/dir")), + KDialogBase dlg(parent,name,true,(move?i18n("Move/Rename file/dir"):i18n("Copy file/dir")), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::NoDefault); TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); diff --git a/src/svnfrontend/copymoveview_impl.h b/src/svnfrontend/copymoveview_impl.h index c6871f5..7bb6b13 100644 --- a/src/svnfrontend/copymoveview_impl.h +++ b/src/svnfrontend/copymoveview_impl.h @@ -29,7 +29,7 @@ class CopyMoveView_impl : public CopyMoveView TQ_OBJECT public: - CopyMoveView_impl(const TQString&baseName,const TQString&sourceName,bool move,TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + CopyMoveView_impl(const TQString&baseName,const TQString&sourceName,bool move,TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~CopyMoveView_impl(); virtual TQString newName(); bool force(); diff --git a/src/svnfrontend/createrepo_impl.cpp b/src/svnfrontend/createrepo_impl.cpp index 5fdd126..d1e4c0a 100644 --- a/src/svnfrontend/createrepo_impl.cpp +++ b/src/svnfrontend/createrepo_impl.cpp @@ -34,8 +34,8 @@ public: ~RecurseCheck(){value = false;} }; -Createrepo_impl::Createrepo_impl(bool enable_compat13, bool enable_compat14, TQWidget *tqparent, const char *name) - :CreateRepo_Dlg(tqparent, name) +Createrepo_impl::Createrepo_impl(bool enable_compat13, bool enable_compat14, TQWidget *parent, const char *name) + :CreateRepo_Dlg(parent, name) { inChangeCompat=true; m_DisableFsync->setEnabled(false); diff --git a/src/svnfrontend/createrepo_impl.h b/src/svnfrontend/createrepo_impl.h index 6fab516..097b1b5 100644 --- a/src/svnfrontend/createrepo_impl.h +++ b/src/svnfrontend/createrepo_impl.h @@ -26,7 +26,7 @@ class Createrepo_impl: public CreateRepo_Dlg { Q_OBJECT TQ_OBJECT public: - Createrepo_impl(bool enable_compat13,bool enable_compat14, TQWidget *tqparent = 0, const char *name = 0); + Createrepo_impl(bool enable_compat13,bool enable_compat14, TQWidget *parent = 0, const char *name = 0); TQString targetDir(); TQString fsType(); bool disableFsync(); diff --git a/src/svnfrontend/dumprepo_impl.cpp b/src/svnfrontend/dumprepo_impl.cpp index 577c0bd..f03b50c 100644 --- a/src/svnfrontend/dumprepo_impl.cpp +++ b/src/svnfrontend/dumprepo_impl.cpp @@ -27,8 +27,8 @@ #include <tqcheckbox.h> -DumpRepo_impl::DumpRepo_impl(TQWidget *tqparent, const char *name) - :DumpRepoDlg(tqparent, name) +DumpRepo_impl::DumpRepo_impl(TQWidget *parent, const char *name) + :DumpRepoDlg(parent, name) { } diff --git a/src/svnfrontend/dumprepo_impl.h b/src/svnfrontend/dumprepo_impl.h index 8b947d7..3dda03a 100644 --- a/src/svnfrontend/dumprepo_impl.h +++ b/src/svnfrontend/dumprepo_impl.h @@ -26,7 +26,7 @@ class DumpRepo_impl: public DumpRepoDlg { Q_OBJECT TQ_OBJECT public: - DumpRepo_impl(TQWidget *tqparent = 0, const char *name = 0); + DumpRepo_impl(TQWidget *parent = 0, const char *name = 0); TQString reposPath(); TQString targetFile(); bool incremental(); diff --git a/src/svnfrontend/editproperty_impl.cpp b/src/svnfrontend/editproperty_impl.cpp index 626c122..00fb964 100644 --- a/src/svnfrontend/editproperty_impl.cpp +++ b/src/svnfrontend/editproperty_impl.cpp @@ -30,8 +30,8 @@ #include "editproperty_impl.h" -EditProperty_impl::EditProperty_impl(TQWidget *tqparent, const char *name) - :EditPropsDlgData(tqparent, name) +EditProperty_impl::EditProperty_impl(TQWidget *parent, const char *name) + :EditPropsDlgData(parent, name) { /// @TODO Read these values from a text or config file fileProperties += ("svn:eol-style"); diff --git a/src/svnfrontend/editproperty_impl.h b/src/svnfrontend/editproperty_impl.h index 6bf220b..60c3256 100644 --- a/src/svnfrontend/editproperty_impl.h +++ b/src/svnfrontend/editproperty_impl.h @@ -29,7 +29,7 @@ class EditProperty_impl: public EditPropsDlgData { Q_OBJECT TQ_OBJECT public: - EditProperty_impl(TQWidget *tqparent = 0, const char *name = 0); + EditProperty_impl(TQWidget *parent = 0, const char *name = 0); ~EditProperty_impl(); TQString propName()const; diff --git a/src/svnfrontend/filelistviewitem.cpp b/src/svnfrontend/filelistviewitem.cpp index ba7ce12..4747bfd 100644 --- a/src/svnfrontend/filelistviewitem.cpp +++ b/src/svnfrontend/filelistviewitem.cpp @@ -46,21 +46,21 @@ const int FileListViewItem::COL_IS_LOCKED = 5; //const int FileListViewItem::COL_CURRENT_REV = 5; -FileListViewItem::FileListViewItem(kdesvnfilelist*_tqparent,const svn::StatusPtr&_stat) - : KListViewItem(_tqparent),SvnItem(_stat), +FileListViewItem::FileListViewItem(kdesvnfilelist*_parent,const svn::StatusPtr&_stat) + : KListViewItem(_parent),SvnItem(_stat), sortChar(0), - m_Ksvnfilelist(_tqparent) + m_Ksvnfilelist(_parent) { - m_SvnWrapper = _tqparent->m_SvnWrapper; + m_SvnWrapper = _parent->m_SvnWrapper; init(); } -FileListViewItem::FileListViewItem(kdesvnfilelist*_tqparent,FileListViewItem*_parentItem,const svn::StatusPtr&_stat) +FileListViewItem::FileListViewItem(kdesvnfilelist*_parent,FileListViewItem*_parentItem,const svn::StatusPtr&_stat) : KListViewItem(_parentItem),SvnItem(_stat), sortChar(0), - m_Ksvnfilelist(_tqparent) + m_Ksvnfilelist(_parent) { - m_SvnWrapper = _tqparent->m_SvnWrapper; + m_SvnWrapper = _parent->m_SvnWrapper; init(); } @@ -130,7 +130,7 @@ void FileListViewItem::refreshtqStatus(bool childs,TQPtrList<SvnItem>*exclude,bo if (!isValid()) { return; } - it = static_cast<FileListViewItem*>(tqparent()); + it = static_cast<FileListViewItem*>(parent()); if (!childs) { if (it && (!exclude || exclude->find(it)==-1)) { it->refreshtqStatus(false,exclude); @@ -174,7 +174,7 @@ bool FileListViewItem::isParent(TQListViewItem*which) { if (!which) return false; TQListViewItem*item = this; - while ( (item=item->tqparent())) { + while ( (item=item->parent())) { if (item==which) { return true; } @@ -235,7 +235,7 @@ void FileListViewItem::updatetqStatus(const svn::StatusPtr&s) SvnItem* FileListViewItem::getParentItem()const { - return static_cast<FileListViewItem*>(tqparent()); + return static_cast<FileListViewItem*>(parent()); } /*! \fn FileListViewItem::getParentDir()const diff --git a/src/svnfrontend/fillcachethread.cpp b/src/svnfrontend/fillcachethread.cpp index 4930cce..56458c3 100644 --- a/src/svnfrontend/fillcachethread.cpp +++ b/src/svnfrontend/fillcachethread.cpp @@ -30,10 +30,10 @@ #include <kapplication.h> #include <klocale.h> -FillCacheThread::FillCacheThread(TQObject*_tqparent,const TQString&reposRoot) +FillCacheThread::FillCacheThread(TQObject*_parent,const TQString&reposRoot) : TQThread(),mutex(),m_SvnContextListener(0) { - m_Parent = _tqparent; + m_Parent = _parent; m_CurrentContext = new svn::Context(); m_SvnContextListener = new ThreadContextListener(m_Parent); diff --git a/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp b/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp index 46b6452..0340049 100644 --- a/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp +++ b/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp @@ -31,8 +31,8 @@ #include <klocale.h> #include <kdebug.h> -CheckoutInfo_impl::CheckoutInfo_impl(TQWidget *tqparent, const char *name) - :CheckoutInfo(tqparent, name) +CheckoutInfo_impl::CheckoutInfo_impl(TQWidget *parent, const char *name) + :CheckoutInfo(parent, name) { m_RangeInput->setStartOnly(true); m_RangeInput->setHeadDefault(); diff --git a/src/svnfrontend/fronthelpers/checkoutinfo_impl.h b/src/svnfrontend/fronthelpers/checkoutinfo_impl.h index 1816c74..64743f7 100644 --- a/src/svnfrontend/fronthelpers/checkoutinfo_impl.h +++ b/src/svnfrontend/fronthelpers/checkoutinfo_impl.h @@ -29,7 +29,7 @@ class CheckoutInfo_impl: public CheckoutInfo { Q_OBJECT TQ_OBJECT public: - CheckoutInfo_impl(TQWidget *tqparent = 0, const char *name = 0); + CheckoutInfo_impl(TQWidget *parent = 0, const char *name = 0); virtual ~CheckoutInfo_impl(); svn::Revision toRevision(); diff --git a/src/svnfrontend/fronthelpers/propertyitem.cpp b/src/svnfrontend/fronthelpers/propertyitem.cpp index 2e48324..3539fd7 100644 --- a/src/svnfrontend/fronthelpers/propertyitem.cpp +++ b/src/svnfrontend/fronthelpers/propertyitem.cpp @@ -2,16 +2,16 @@ #include <klocale.h> #include <kiconloader.h> -PropertyListViewItem::PropertyListViewItem(KListView *tqparent,const TQString&aName,const TQString&aValue) - : KListViewItem(tqparent),m_currentName(aName),m_startName(aName),m_currentValue(aValue),m_startValue(aValue),m_deleted(false) +PropertyListViewItem::PropertyListViewItem(KListView *parent,const TQString&aName,const TQString&aValue) + : KListViewItem(parent),m_currentName(aName),m_startName(aName),m_currentValue(aValue),m_startValue(aValue),m_deleted(false) { setMultiLinesEnabled(true); setText(0,startName()); setText(1,startValue()); } -PropertyListViewItem::PropertyListViewItem(KListView *tqparent) - : KListViewItem(tqparent),m_currentName(""),m_startName(""),m_currentValue(""),m_startValue(""),m_deleted(false) +PropertyListViewItem::PropertyListViewItem(KListView *parent) + : KListViewItem(parent),m_currentName(""),m_startName(""),m_currentValue(""),m_startValue(""),m_deleted(false) { setMultiLinesEnabled(true); setText(0,startName()); diff --git a/src/svnfrontend/fronthelpers/propertyitem.h b/src/svnfrontend/fronthelpers/propertyitem.h index c72af05..4a826b0 100644 --- a/src/svnfrontend/fronthelpers/propertyitem.h +++ b/src/svnfrontend/fronthelpers/propertyitem.h @@ -13,8 +13,8 @@ class PropertyListViewItem:public KListViewItem public: static const int _RTTI_ = 1001; - PropertyListViewItem(KListView *tqparent,const TQString&,const TQString&); - PropertyListViewItem(KListView *tqparent); + PropertyListViewItem(KListView *parent,const TQString&,const TQString&); + PropertyListViewItem(KListView *parent); virtual ~PropertyListViewItem(); const TQString&startName()const{return m_startName;} diff --git a/src/svnfrontend/fronthelpers/propertylist.cpp b/src/svnfrontend/fronthelpers/propertylist.cpp index 3f74410..0c7c705 100644 --- a/src/svnfrontend/fronthelpers/propertylist.cpp +++ b/src/svnfrontend/fronthelpers/propertylist.cpp @@ -25,8 +25,8 @@ #include <kmessagebox.h> -Propertylist::Propertylist(TQWidget *tqparent, const char *name) - : KListView(tqparent, name),m_commitit(false) +Propertylist::Propertylist(TQWidget *parent, const char *name) + : KListView(parent, name),m_commitit(false) { addColumn(i18n("Property")); addColumn(i18n("Value")); diff --git a/src/svnfrontend/fronthelpers/propertylist.h b/src/svnfrontend/fronthelpers/propertylist.h index be4cd81..5751340 100644 --- a/src/svnfrontend/fronthelpers/propertylist.h +++ b/src/svnfrontend/fronthelpers/propertylist.h @@ -31,7 +31,7 @@ class Propertylist : public KListView Q_OBJECT TQ_OBJECT public: - Propertylist(TQWidget *tqparent = 0, const char *name = 0); + Propertylist(TQWidget *parent = 0, const char *name = 0); ~Propertylist(); bool checkExisting(const TQString&aName,TQListViewItem*it=0); diff --git a/src/svnfrontend/fronthelpers/rangeinput_impl.cpp b/src/svnfrontend/fronthelpers/rangeinput_impl.cpp index e05e968..e21eaca 100644 --- a/src/svnfrontend/fronthelpers/rangeinput_impl.cpp +++ b/src/svnfrontend/fronthelpers/rangeinput_impl.cpp @@ -29,8 +29,8 @@ #include <klocale.h> #include <kdebug.h> -Rangeinput_impl::Rangeinput_impl(TQWidget *tqparent, const char *name) - :RangeInputDlg(tqparent, name) +Rangeinput_impl::Rangeinput_impl(TQWidget *parent, const char *name) + :RangeInputDlg(parent, name) { m_startRevInput->setRange(0,INT_MAX,1,false); m_endRevInput->setRange(0,INT_MAX,1,false); diff --git a/src/svnfrontend/fronthelpers/rangeinput_impl.h b/src/svnfrontend/fronthelpers/rangeinput_impl.h index 8be32c9..e43e2b3 100644 --- a/src/svnfrontend/fronthelpers/rangeinput_impl.h +++ b/src/svnfrontend/fronthelpers/rangeinput_impl.h @@ -28,7 +28,7 @@ class Rangeinput_impl: public RangeInputDlg { Q_OBJECT TQ_OBJECT public: - Rangeinput_impl(TQWidget *tqparent = 0, const char *name = 0); + Rangeinput_impl(TQWidget *parent = 0, const char *name = 0); virtual ~Rangeinput_impl(); typedef TQPair<svn::Revision,svn::Revision> revision_range; diff --git a/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp b/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp index 3d97dce..91a72bb 100644 --- a/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp +++ b/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp @@ -29,8 +29,8 @@ #include <tqvbox.h> -RevisionButtonImpl::RevisionButtonImpl(TQWidget *tqparent, const char *name) - :RevisionButton(tqparent, name),m_Rev(svn::Revision::UNDEFINED),m_noWorking(false) +RevisionButtonImpl::RevisionButtonImpl(TQWidget *parent, const char *name) + :RevisionButton(parent, name),m_Rev(svn::Revision::UNDEFINED),m_noWorking(false) { } diff --git a/src/svnfrontend/fronthelpers/revisionbuttonimpl.h b/src/svnfrontend/fronthelpers/revisionbuttonimpl.h index a2265b4..b8918c8 100644 --- a/src/svnfrontend/fronthelpers/revisionbuttonimpl.h +++ b/src/svnfrontend/fronthelpers/revisionbuttonimpl.h @@ -28,7 +28,7 @@ class RevisionButtonImpl: public RevisionButton { TQ_OBJECT public: - RevisionButtonImpl(TQWidget *tqparent = 0, const char *name = 0); + RevisionButtonImpl(TQWidget *parent = 0, const char *name = 0); virtual ~RevisionButtonImpl(); virtual void setRevision(const svn::Revision&aRev); diff --git a/src/svnfrontend/graphtree/graphtreelabel.cpp b/src/svnfrontend/graphtree/graphtreelabel.cpp index cf51c9b..56bfa04 100644 --- a/src/svnfrontend/graphtree/graphtreelabel.cpp +++ b/src/svnfrontend/graphtree/graphtreelabel.cpp @@ -137,8 +137,8 @@ int GraphEdge::rtti()const return GRAPHTREE_LINE; } -GraphEdgeArrow::GraphEdgeArrow(GraphEdge*_tqparent,TQCanvas*c) - : TQCanvasPolygon(c),_edge(_tqparent) +GraphEdgeArrow::GraphEdgeArrow(GraphEdge*_parent,TQCanvas*c) + : TQCanvasPolygon(c),_edge(_parent) { } diff --git a/src/svnfrontend/graphtree/pannerview.cpp b/src/svnfrontend/graphtree/pannerview.cpp index e1dc0a6..5731f5d 100644 --- a/src/svnfrontend/graphtree/pannerview.cpp +++ b/src/svnfrontend/graphtree/pannerview.cpp @@ -20,8 +20,8 @@ #include "pannerview.h" #include <tqpainter.h> -PannerView::PannerView(TQWidget* tqparent, const char* name) - : TQCanvasView(tqparent, name,WNoAutoErase | WStaticContents ) +PannerView::PannerView(TQWidget* parent, const char* name) + : TQCanvasView(parent, name,WNoAutoErase | WStaticContents ) { m_Moving = false; viewport()->setBackgroundMode(TQt::NoBackground); diff --git a/src/svnfrontend/graphtree/pannerview.h b/src/svnfrontend/graphtree/pannerview.h index 026488d..9997123 100644 --- a/src/svnfrontend/graphtree/pannerview.h +++ b/src/svnfrontend/graphtree/pannerview.h @@ -30,7 +30,7 @@ class PannerView : public TQCanvasView Q_OBJECT TQ_OBJECT public: - PannerView(TQWidget* tqparent=0, const char* name=0); + PannerView(TQWidget* parent=0, const char* name=0); virtual ~PannerView(); void setZoomRect(const TQRect& theValue); diff --git a/src/svnfrontend/graphtree/revgraphview.cpp b/src/svnfrontend/graphtree/revgraphview.cpp index c5214db..f98064a 100644 --- a/src/svnfrontend/graphtree/revgraphview.cpp +++ b/src/svnfrontend/graphtree/revgraphview.cpp @@ -76,8 +76,8 @@ void GraphViewTip::maybeTip( const TQPoint & pos) } } -RevGraphView::RevGraphView(TQObject*aListener,svn::Client*_client,TQWidget * tqparent, const char * name, WFlags f) - : TQCanvasView(tqparent,name,f) +RevGraphView::RevGraphView(TQObject*aListener,svn::Client*_client,TQWidget * parent, const char * name, WFlags f) + : TQCanvasView(parent,name,f) { m_Canvas = 0L; m_Client = _client; diff --git a/src/svnfrontend/graphtree/revgraphview.h b/src/svnfrontend/graphtree/revgraphview.h index dcfc007..32839ba 100644 --- a/src/svnfrontend/graphtree/revgraphview.h +++ b/src/svnfrontend/graphtree/revgraphview.h @@ -50,7 +50,7 @@ public: /* avoid large copy operations */ friend class RevisionTree; - RevGraphView(TQObject*,svn::Client*,TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0); + RevGraphView(TQObject*,svn::Client*,TQWidget * parent = 0, const char * name = 0, WFlags f = 0); virtual ~RevGraphView(); void showText(const TQString&s); diff --git a/src/svnfrontend/graphtree/revisiontree.cpp b/src/svnfrontend/graphtree/revisiontree.cpp index 2f84179..7a2833a 100644 --- a/src/svnfrontend/graphtree/revisiontree.cpp +++ b/src/svnfrontend/graphtree/revisiontree.cpp @@ -122,13 +122,13 @@ RevisionTree::RevisionTree(svn::Client*aClient, const svn::Revision&startr,const svn::Revision&endr, const TQString&origin, const svn::Revision& baserevision, - TQWidget*treeParent,TQWidget*tqparent) + TQWidget*treeParent,TQWidget*parent) :m_InitialRevsion(0),m_Path(origin),m_Valid(false) { m_Data = new RtreeData; m_Data->m_Client=aClient; m_Data->m_Listener=aListener; - m_Data->dlgParent=tqparent; + m_Data->dlgParent=parent; if (!m_Data->getLogs(reposRoot,startr,endr,origin)) { return; @@ -138,7 +138,7 @@ RevisionTree::RevisionTree(svn::Client*aClient, kdDebug()<<"Origin: "<<origin << endl; m_Data->progress=new KProgressDialog( - tqparent,"progressdlg",i18n("Scanning logs"),i18n("Scanning the logs for %1").tqarg(origin),true); + parent,"progressdlg",i18n("Scanning logs"),i18n("Scanning the logs for %1").tqarg(origin),true); m_Data->progress->setMinimumDuration(100); m_Data->progress->show(); m_Data->progress->setAllowCancel(true); diff --git a/src/svnfrontend/graphtree/revisiontree.h b/src/svnfrontend/graphtree/revisiontree.h index 175754d..5ce1cb6 100644 --- a/src/svnfrontend/graphtree/revisiontree.h +++ b/src/svnfrontend/graphtree/revisiontree.h @@ -49,7 +49,7 @@ public: const TQString& reposRoot, const svn::Revision&startr,const svn::Revision&endr, const TQString&,const svn::Revision& baserevision,TQWidget*treeParent, - TQWidget*tqparent=0); + TQWidget*parent=0); virtual ~RevisionTree(); bool isValid()const; diff --git a/src/svnfrontend/graphtree/revtreewidget.cpp b/src/svnfrontend/graphtree/revtreewidget.cpp index eaf6fcc..3c8d63e 100644 --- a/src/svnfrontend/graphtree/revtreewidget.cpp +++ b/src/svnfrontend/graphtree/revtreewidget.cpp @@ -30,11 +30,11 @@ #include "ktextbrowser.h" /* - * Constructs a RevTreeWidget as a child of 'tqparent', with the + * Constructs a RevTreeWidget as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -RevTreeWidget::RevTreeWidget(TQObject*lt,svn::Client*cl, TQWidget* tqparent, const char* name, WFlags fl ) - : TQWidget( tqparent, name, fl ) +RevTreeWidget::RevTreeWidget(TQObject*lt,svn::Client*cl, TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "RevTreeWidget" ); diff --git a/src/svnfrontend/graphtree/revtreewidget.h b/src/svnfrontend/graphtree/revtreewidget.h index 61e4753..d4a8bfc 100644 --- a/src/svnfrontend/graphtree/revtreewidget.h +++ b/src/svnfrontend/graphtree/revtreewidget.h @@ -46,7 +46,7 @@ class RevTreeWidget : public TQWidget TQ_OBJECT public: - RevTreeWidget(TQObject*,svn::Client*,TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + RevTreeWidget(TQObject*,svn::Client*,TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~RevTreeWidget(); TQSplitter* m_Splitter; diff --git a/src/svnfrontend/hotcopydlg_impl.cpp b/src/svnfrontend/hotcopydlg_impl.cpp index 67ef264..27f0346 100644 --- a/src/svnfrontend/hotcopydlg_impl.cpp +++ b/src/svnfrontend/hotcopydlg_impl.cpp @@ -23,8 +23,8 @@ #include <kurl.h> #include <kurlrequester.h> -HotcopyDlg_impl::HotcopyDlg_impl(TQWidget *tqparent, const char *name) - :HotcopyDlg(tqparent, name) +HotcopyDlg_impl::HotcopyDlg_impl(TQWidget *parent, const char *name) + :HotcopyDlg(parent, name) { } diff --git a/src/svnfrontend/hotcopydlg_impl.h b/src/svnfrontend/hotcopydlg_impl.h index fcfb9f7..adf8545 100644 --- a/src/svnfrontend/hotcopydlg_impl.h +++ b/src/svnfrontend/hotcopydlg_impl.h @@ -26,7 +26,7 @@ class HotcopyDlg_impl: public HotcopyDlg { Q_OBJECT TQ_OBJECT public: - HotcopyDlg_impl(TQWidget *tqparent = 0, const char *name = 0); + HotcopyDlg_impl(TQWidget *parent = 0, const char *name = 0); virtual ~HotcopyDlg_impl(); TQString srcPath()const; diff --git a/src/svnfrontend/importdir_logmsg.cpp b/src/svnfrontend/importdir_logmsg.cpp index 9300d59..0b89a77 100644 --- a/src/svnfrontend/importdir_logmsg.cpp +++ b/src/svnfrontend/importdir_logmsg.cpp @@ -30,8 +30,8 @@ #include <tqtooltip.h> -Importdir_logmsg::Importdir_logmsg(TQWidget *tqparent, const char *name) - : Logmsg_impl(tqparent, name) +Importdir_logmsg::Importdir_logmsg(TQWidget *parent, const char *name) + : Logmsg_impl(parent, name) { m_createDirBox = new TQCheckBox("",this,"create_dir_checkbox"); m_keepLocksButton->hide(); diff --git a/src/svnfrontend/importdir_logmsg.h b/src/svnfrontend/importdir_logmsg.h index a32ca1b..c13120f 100644 --- a/src/svnfrontend/importdir_logmsg.h +++ b/src/svnfrontend/importdir_logmsg.h @@ -31,7 +31,7 @@ class Importdir_logmsg : public Logmsg_impl Q_OBJECT TQ_OBJECT public: - Importdir_logmsg(TQWidget *tqparent = 0, const char *name = 0); + Importdir_logmsg(TQWidget *parent = 0, const char *name = 0); virtual ~Importdir_logmsg(); diff --git a/src/svnfrontend/kdesvnfilelist.cpp b/src/svnfrontend/kdesvnfilelist.cpp index 52f8ee0..f089782 100644 --- a/src/svnfrontend/kdesvnfilelist.cpp +++ b/src/svnfrontend/kdesvnfilelist.cpp @@ -189,8 +189,8 @@ bool KdesvnFileListPrivate::reReadSettings() _unknown != mdisp_unknown_files); } -kdesvnfilelist::kdesvnfilelist(KActionCollection*aCollect,TQWidget *tqparent, const char *name) - : KListView(tqparent, name),ItemDisplay(),m_SvnWrapper(new SvnActions(this)) +kdesvnfilelist::kdesvnfilelist(KActionCollection*aCollect,TQWidget *parent, const char *name) + : KListView(parent, name),ItemDisplay(),m_SvnWrapper(new SvnActions(this)) { m_SelectedItems = 0; m_pList = new KdesvnFileListPrivate; @@ -646,7 +646,7 @@ void kdesvnfilelist::closeMe() m_pList->m_fileTip->setItem(0); } -bool kdesvnfilelist::checkDirs(const TQString&_what,FileListViewItem * _tqparent) +bool kdesvnfilelist::checkDirs(const TQString&_what,FileListViewItem * _parent) { TQString what = _what; svn::StatusEntries dlist; @@ -654,13 +654,13 @@ bool kdesvnfilelist::checkDirs(const TQString&_what,FileListViewItem * _tqparent what.truncate(what.length()-1); } // prevent this from checking unversioned folder. FIXME: what happen when we do open url on a non-working-copy folder?? - if (!isWorkingCopy()|| (!_tqparent) || ((_tqparent) && (_tqparent->isVersioned()))) { + if (!isWorkingCopy()|| (!_parent) || ((_parent) && (_parent->isVersioned()))) { if (!m_SvnWrapper->maketqStatus(what,dlist,m_pList->m_remoteRevision) ) { kdDebug() << "unable maketqStatus" <<endl; return false; } } else { - checkUnversionedDirs(_tqparent); + checkUnversionedDirs(_parent); return true; } svn::StatusEntries neweritems; @@ -682,15 +682,15 @@ bool kdesvnfilelist::checkDirs(const TQString&_what,FileListViewItem * _tqparent // current item is not versioned if (!(*it)->isVersioned() && !filterOut((*it))) { - // if empty, we may want to create a default svn::tqStatus for each folder inside this _tqparent + // if empty, we may want to create a default svn::tqStatus for each folder inside this _parent // iterate over TQDir and create new filelistviewitem - checkUnversionedDirs(_tqparent); + checkUnversionedDirs(_parent); } if ((*it)->path()==what||TQString::compare((*it)->entry().url(),what)==0){ - if (!_tqparent) { + if (!_parent) { pitem = new FileListViewItem(this,*it); - //kdDebug()<< "CheckDirs::creating new FileListViewitem as tqparent " + (*it)->path() << endl; + //kdDebug()<< "CheckDirs::creating new FileListViewitem as parent " + (*it)->path() << endl; m_Dirsread[pitem->fullName()]=true; pitem->setDropEnabled(true); } @@ -699,8 +699,8 @@ bool kdesvnfilelist::checkDirs(const TQString&_what,FileListViewItem * _tqparent break; } } - if (_tqparent) { - pitem = _tqparent; + if (_parent) { + pitem = _parent; } insertDirs(pitem,dlist); if (ownupdates) { @@ -711,7 +711,7 @@ bool kdesvnfilelist::checkDirs(const TQString&_what,FileListViewItem * _tqparent return true; } -void kdesvnfilelist::insertDirs(FileListViewItem * _tqparent,svn::StatusEntries&dlist) +void kdesvnfilelist::insertDirs(FileListViewItem * _parent,svn::StatusEntries&dlist) { svn::StatusEntries::iterator it; #if 0 @@ -732,13 +732,13 @@ void kdesvnfilelist::insertDirs(FileListViewItem * _tqparent,svn::StatusEntries& continue; } FileListViewItem * item; - if (!_tqparent) { + if (!_parent) { item = new FileListViewItem(this,*it); } else { - if ( (item = _tqparent->findChild( (*it)->path() )) ) { + if ( (item = _parent->findChild( (*it)->path() )) ) { delete item; } - item = new FileListViewItem(this,_tqparent,*it); + item = new FileListViewItem(this,_parent,*it); } if (item->isDir()) { m_Dirsread[item->fullName()]=false; @@ -912,7 +912,7 @@ void kdesvnfilelist::enableActions() m_DelCurrent->setEnabled( (multi||single)); m_LockAction->setEnabled( (multi||single)); m_UnlockAction->setEnabled( (multi||single)); - m_IgnoreAction->setEnabled((single)&&singleSelected()->tqparent()!=0&&!singleSelected()->isRealVersioned()); + m_IgnoreAction->setEnabled((single)&&singleSelected()->parent()!=0&&!singleSelected()->isRealVersioned()); m_RenameAction->setEnabled(single && (!isWorkingCopy()||singleSelected()!=firstChild())); m_CopyAction->setEnabled(single && (!isWorkingCopy()||singleSelected()!=firstChild())); @@ -1304,11 +1304,11 @@ void kdesvnfilelist::refreshCurrent(SvnItem*cur) viewport()->tqrepaint(); } -bool kdesvnfilelist::refreshRecursive(FileListViewItem*_tqparent,bool down) +bool kdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down) { FileListViewItem*item; - if (_tqparent) { - item = static_cast<FileListViewItem*>(_tqparent->firstChild()); + if (_parent) { + item = static_cast<FileListViewItem*>(_parent->firstChild()); } else { item = static_cast<FileListViewItem*>(firstChild()); } @@ -1324,7 +1324,7 @@ bool kdesvnfilelist::refreshRecursive(FileListViewItem*_tqparent,bool down) item = static_cast<FileListViewItem*>(item->nextSibling()); } - TQString what = (_tqparent!=0?_tqparent->fullName():baseUri()); + TQString what = (_parent!=0?_parent->fullName():baseUri()); svn::StatusEntries dlist; if (!m_SvnWrapper->maketqStatus(what,dlist,m_pList->m_remoteRevision)) { @@ -1363,10 +1363,10 @@ bool kdesvnfilelist::refreshRecursive(FileListViewItem*_tqparent,bool down) if (!gotit &&!filterOut((*it)) ) { dispchanged = true; FileListViewItem * item; - if (!_tqparent) { + if (!_parent) { item = new FileListViewItem(this,*it); } else { - item = new FileListViewItem(this,_tqparent,*it); + item = new FileListViewItem(this,_parent,*it); } if (item->isDir()) { m_Dirsread[item->fullName()]=false; @@ -1400,8 +1400,8 @@ bool kdesvnfilelist::refreshRecursive(FileListViewItem*_tqparent,bool down) kdDebug() << "Selected items " << m_SelectedItems->count() << endl; #endif } - if (_tqparent) { - item = static_cast<FileListViewItem*>(_tqparent->firstChild()); + if (_parent) { + item = static_cast<FileListViewItem*>(_parent->firstChild()); } else { item = static_cast<FileListViewItem*>(firstChild()); } @@ -2486,8 +2486,8 @@ void kdesvnfilelist::slotDirItemCreated(const TQString&what) void kdesvnfilelist::updateParents(FileListViewItem*item) { - if (!item || !item->tqparent()) return; - FileListViewItem*it = static_cast<FileListViewItem*>(item->tqparent()); + if (!item || !item->parent()) return; + FileListViewItem*it = static_cast<FileListViewItem*>(item->parent()); it->update(); updateParents(it); } @@ -2564,7 +2564,7 @@ void kdesvnfilelist::_dirwatchTimeout() checkUnversionedDirs(item); } } - updateParents(static_cast<FileListViewItem*>(item->tqparent())); + updateParents(static_cast<FileListViewItem*>(item->parent())); } else if (c=='D') { if (item->isDir()) { m_pList->m_DirWatch->removeDir(what); @@ -2576,7 +2576,7 @@ void kdesvnfilelist::_dirwatchTimeout() } else if (!item->isMissing()) { TQFileInfo fi(what); if (!fi.exists()) { - FileListViewItem*p = static_cast<FileListViewItem*>(item->tqparent()); + FileListViewItem*p = static_cast<FileListViewItem*>(item->parent()); delete item; repaintit=true; item = 0; @@ -2804,11 +2804,11 @@ void kdesvnfilelist::slotRelocate() refreshItem(k->fItem()); } -void kdesvnfilelist::checkUnversionedDirs( FileListViewItem * _tqparent ) +void kdesvnfilelist::checkUnversionedDirs( FileListViewItem * _parent ) { TQDir d; - if (_tqparent) - d.setPath(_tqparent->fullName()); //FIXME: this one is not reliable, what if _tqparent == 0?? + if (_parent) + d.setPath(_parent->fullName()); //FIXME: this one is not reliable, what if _parent == 0?? // else // d.setPath(this->firstChild()->fullName()); @@ -2845,12 +2845,12 @@ void kdesvnfilelist::checkUnversionedDirs( FileListViewItem * _tqparent ) // start copying insertDirs FileListViewItem * item; - if (!_tqparent) { + if (!_parent) { item = new FileListViewItem(this, stat); kdDebug()<< "creating new FileListViewitem " + item->fullName() << endl; } else { - item = new FileListViewItem(this,_tqparent, stat); - kdDebug()<< "creating new FileListViewitem (with tqparent) " + item->fullName() << endl; + item = new FileListViewItem(this,_parent, stat); + kdDebug()<< "creating new FileListViewitem (with parent) " + item->fullName() << endl; } if (fi->isDir()) { m_Dirsread[item->fullName()]=false; @@ -2872,7 +2872,7 @@ void kdesvnfilelist::checkUnversionedDirs( FileListViewItem * _tqparent ) } // uncomment this if you've ben able to set svn_node_kind (see above) - //this->insertDirs(_tqparent, nonversioned_list); + //this->insertDirs(_parent, nonversioned_list); } void kdesvnfilelist::rescanIconsRec(FileListViewItem*startAt,bool checkNewer,bool no_update) @@ -3098,7 +3098,7 @@ void kdesvnfilelist::slotFoldTree() while (TQListViewItem* item = it.current()) { // don't close the top level directory - if (item->isExpandable() && item->tqparent()) + if (item->isExpandable() && item->parent()) item->setOpen(false); ++it; diff --git a/src/svnfrontend/kdesvnfilelist.h b/src/svnfrontend/kdesvnfilelist.h index 0056cd7..73cc3ae 100644 --- a/src/svnfrontend/kdesvnfilelist.h +++ b/src/svnfrontend/kdesvnfilelist.h @@ -56,7 +56,7 @@ class kdesvnfilelist : public KListView,public ItemDisplay TQ_OBJECT friend class FileListViewItem; public: - kdesvnfilelist(KActionCollection*,TQWidget *tqparent = 0, const char *name = 0); + kdesvnfilelist(KActionCollection*,TQWidget *parent = 0, const char *name = 0); virtual ~kdesvnfilelist(); virtual bool openURL( const KURL &url,bool noReinit=false ); @@ -85,9 +85,9 @@ protected: SvnActions*m_SvnWrapper; - /* the tqparent entry must removed from list before */ - void insertDirs(FileListViewItem * _tqparent,svn::StatusEntries&); - bool checkDirs(const TQString&,FileListViewItem * _tqparent); + /* the parent entry must removed from list before */ + void insertDirs(FileListViewItem * _parent,svn::StatusEntries&); + bool checkDirs(const TQString&,FileListViewItem * _parent); void setupActions(); svn::Client*svnclient(); @@ -107,7 +107,7 @@ protected: virtual bool refreshRecursive(FileListViewItem*,bool down=true); virtual void updateParents(FileListViewItem*); - virtual void checkUnversionedDirs( FileListViewItem * _tqparent ); + virtual void checkUnversionedDirs( FileListViewItem * _parent ); /** * Overridden virtuals for TQt drag 'n drop (XDND) @@ -129,7 +129,7 @@ protected: virtual void contentsMouseReleaseEvent(TQMouseEvent*e); virtual void contentsWheelEvent( TQWheelEvent * e ); virtual void leaveEvent(TQEvent*e); - virtual void rescanIconsRec(FileListViewItem*_tqparent=0,bool checkNewer=false,bool no_update=false); + virtual void rescanIconsRec(FileListViewItem*_parent=0,bool checkNewer=false,bool no_update=false); KTrader::OfferList offersList(SvnItem*item,bool execOnly=false); diff --git a/src/svnfrontend/keystatus.h b/src/svnfrontend/keystatus.h index eec7505..75fd3a9 100644 --- a/src/svnfrontend/keystatus.h +++ b/src/svnfrontend/keystatus.h @@ -25,7 +25,7 @@ class KeyState public: KeyState(){} ~KeyState(){} - static void keystate(int*,int*,int*,int*,unsigned int*tqmask); + static void keystate(int*,int*,int*,int*,unsigned int*mask); }; diff --git a/src/svnfrontend/loaddmpdlg_impl.cpp b/src/svnfrontend/loaddmpdlg_impl.cpp index bf53aa6..ffb91ab 100644 --- a/src/svnfrontend/loaddmpdlg_impl.cpp +++ b/src/svnfrontend/loaddmpdlg_impl.cpp @@ -27,8 +27,8 @@ #include <tqradiobutton.h> #include <tqcheckbox.h> -LoadDmpDlg_impl::LoadDmpDlg_impl(TQWidget *tqparent, const char *name) - :LoadDmpDlg(tqparent, name) +LoadDmpDlg_impl::LoadDmpDlg_impl(TQWidget *parent, const char *name) + :LoadDmpDlg(parent, name) { } diff --git a/src/svnfrontend/loaddmpdlg_impl.h b/src/svnfrontend/loaddmpdlg_impl.h index 42baf6f..867e655 100644 --- a/src/svnfrontend/loaddmpdlg_impl.h +++ b/src/svnfrontend/loaddmpdlg_impl.h @@ -26,7 +26,7 @@ class LoadDmpDlg_impl: public LoadDmpDlg { Q_OBJECT TQ_OBJECT public: - LoadDmpDlg_impl(TQWidget *tqparent = 0, const char *name = 0); + LoadDmpDlg_impl(TQWidget *parent = 0, const char *name = 0); virtual ~LoadDmpDlg_impl(); bool usePost()const; bool usePre()const; diff --git a/src/svnfrontend/mergedlg_impl.cpp b/src/svnfrontend/mergedlg_impl.cpp index ae45803..44e620a 100644 --- a/src/svnfrontend/mergedlg_impl.cpp +++ b/src/svnfrontend/mergedlg_impl.cpp @@ -31,8 +31,8 @@ #include <tqcheckbox.h> #include <tqvbox.h> -MergeDlg_impl::MergeDlg_impl(TQWidget *tqparent, const char *name,bool src1,bool src2,bool out) - :MergeDlg(tqparent, name) +MergeDlg_impl::MergeDlg_impl(TQWidget *parent, const char *name,bool src1,bool src2,bool out) + :MergeDlg(parent, name) { m_SrcOneInput->setMode(KFile::Directory|KFile::File); if (!src1) { @@ -181,10 +181,10 @@ Rangeinput_impl::revision_range MergeDlg_impl::getRange()const */ bool MergeDlg_impl::getMergeRange(Rangeinput_impl::revision_range&range,bool*force,bool*recursive,bool*ignorerelated,bool*dry, bool*useExternal, - TQWidget*tqparent,const char*name) + TQWidget*parent,const char*name) { MergeDlg_impl*ptr = 0; - KDialogBase dlg(tqparent,name,true,i18n("Enter merge range"), + KDialogBase dlg(parent,name,true,i18n("Enter merge range"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Help, KDialogBase::Ok,true); dlg.setHelp("merging-items","kdesvn"); diff --git a/src/svnfrontend/mergedlg_impl.h b/src/svnfrontend/mergedlg_impl.h index 1a2df6f..8fc82b9 100644 --- a/src/svnfrontend/mergedlg_impl.h +++ b/src/svnfrontend/mergedlg_impl.h @@ -27,7 +27,7 @@ class MergeDlg_impl: public MergeDlg { Q_OBJECT TQ_OBJECT public: - MergeDlg_impl(TQWidget *tqparent = 0, const char *name = 0,bool src1=true,bool src2=true,bool out=true); + MergeDlg_impl(TQWidget *parent = 0, const char *name = 0,bool src1=true,bool src2=true,bool out=true); virtual ~MergeDlg_impl(); bool recursive()const; @@ -46,7 +46,7 @@ public: void setDest(const TQString&); static bool getMergeRange(Rangeinput_impl::revision_range&range, - bool*force,bool*recursive,bool*ignorerelated,bool*dry,bool*useExternal,TQWidget*tqparent=0,const char*name=0); + bool*force,bool*recursive,bool*ignorerelated,bool*dry,bool*useExternal,TQWidget*parent=0,const char*name=0); protected slots: virtual void externDisplayToggled(bool); diff --git a/src/svnfrontend/modifiedthread.cpp b/src/svnfrontend/modifiedthread.cpp index 21b71d5..3169f1e 100644 --- a/src/svnfrontend/modifiedthread.cpp +++ b/src/svnfrontend/modifiedthread.cpp @@ -27,10 +27,10 @@ #include <kdebug.h> #include <kapplication.h> -CheckModifiedThread::CheckModifiedThread(TQObject*_tqparent,const TQString&what,bool _updates) +CheckModifiedThread::CheckModifiedThread(TQObject*_parent,const TQString&what,bool _updates) : TQThread(),mutex(),m_ContextListener(0) { - m_Parent = _tqparent; + m_Parent = _parent; m_CurrentContext = new svn::Context(); m_ContextListener = new ThreadContextListener(m_Parent); TQObject::connect(m_ContextListener,TQT_SIGNAL(sendNotify(const TQString&)),m_Parent,TQT_SLOT(slotNotifyMessage(const TQString&))); diff --git a/src/svnfrontend/opencontextmenu.cpp b/src/svnfrontend/opencontextmenu.cpp index 039e1b8..10a561f 100644 --- a/src/svnfrontend/opencontextmenu.cpp +++ b/src/svnfrontend/opencontextmenu.cpp @@ -22,8 +22,8 @@ #include <krun.h> #include <klocale.h> -OpenContextmenu::OpenContextmenu(const KURL&aPath,const KTrader::OfferList&aList,TQWidget* tqparent, const char* name) - : TQPopupMenu(tqparent, name),m_Path(aPath),m_List(aList) +OpenContextmenu::OpenContextmenu(const KURL&aPath,const KTrader::OfferList&aList,TQWidget* parent, const char* name) + : TQPopupMenu(parent, name),m_Path(aPath),m_List(aList) { setup(); } diff --git a/src/svnfrontend/opencontextmenu.h b/src/svnfrontend/opencontextmenu.h index 682e278..5f22115 100644 --- a/src/svnfrontend/opencontextmenu.h +++ b/src/svnfrontend/opencontextmenu.h @@ -34,7 +34,7 @@ class OpenContextmenu : public TQPopupMenu Q_OBJECT TQ_OBJECT public: - OpenContextmenu(const KURL&,const KTrader::OfferList&,TQWidget* tqparent, const char* name); + OpenContextmenu(const KURL&,const KTrader::OfferList&,TQWidget* parent, const char* name); virtual ~OpenContextmenu(); protected: KURL m_Path; diff --git a/src/svnfrontend/propertiesdlg.cpp b/src/svnfrontend/propertiesdlg.cpp index 7bef811..4829a8a 100644 --- a/src/svnfrontend/propertiesdlg.cpp +++ b/src/svnfrontend/propertiesdlg.cpp @@ -38,15 +38,15 @@ #include <kdebug.h> /* - * Constructs a PropertiesDlg as a child of 'tqparent', with the + * Constructs a PropertiesDlg as a child of 'parent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -PropertiesDlg::PropertiesDlg(SvnItem*which, svn::Client*aClient, const svn::Revision&aRev, TQWidget* tqparent, const char* name, bool modal) +PropertiesDlg::PropertiesDlg(SvnItem*which, svn::Client*aClient, const svn::Revision&aRev, TQWidget* parent, const char* name, bool modal) : - KDialogBase(tqparent,name,modal,i18n("Modify properties"),Ok|Cancel/*|Help|User1|User2*/, Ok, + KDialogBase(parent,name,modal,i18n("Modify properties"),Ok|Cancel/*|Help|User1|User2*/, Ok, true/*, KStdGuiItem::add(),KStdGuiItem::remove() */), m_Item(which),m_changed(false), m_Client(aClient),m_Rev(aRev) diff --git a/src/svnfrontend/propertiesdlg.h b/src/svnfrontend/propertiesdlg.h index 9805f32..f9a69f1 100644 --- a/src/svnfrontend/propertiesdlg.h +++ b/src/svnfrontend/propertiesdlg.h @@ -52,7 +52,7 @@ class PropertiesDlg : public KDialogBase public: PropertiesDlg(SvnItem*, svn::Client*, const svn::Revision&aRev=svn::Revision(svn_opt_revision_working), - TQWidget* tqparent = 0, const char* name = 0, bool modal = true); + TQWidget* parent = 0, const char* name = 0, bool modal = true); ~PropertiesDlg(); bool hasChanged()const; diff --git a/src/svnfrontend/stopdlg.cpp b/src/svnfrontend/stopdlg.cpp index d2ef8f7..84e40d4 100644 --- a/src/svnfrontend/stopdlg.cpp +++ b/src/svnfrontend/stopdlg.cpp @@ -34,8 +34,8 @@ #include <kdebug.h> #include <ktextbrowser.h> -StopDlg::StopDlg(TQObject*listener,TQWidget *tqparent, const char *name,const TQString&caption,const TQString&text) - : KDialogBase(KDialogBase::Plain,caption,KDialogBase::Cancel, KDialogBase::Cancel,tqparent, name,true) +StopDlg::StopDlg(TQObject*listener,TQWidget *parent, const char *name,const TQString&caption,const TQString&text) + : KDialogBase(KDialogBase::Plain,caption,KDialogBase::Cancel, KDialogBase::Cancel,parent, name,true) ,m_Context(listener),m_MinDuration(1000),mCancelled(false),mShown(false),m_BarShown(false), cstack(0) { @@ -197,8 +197,8 @@ void StopDlg::slotNetProgres(long long int current, long long int max) } } -StopSimpleDlg::StopSimpleDlg(TQWidget *tqparent, const char *name,const TQString&caption,const TQString&text) - : StopDlg(0,tqparent,name,caption,text),cancelld(false) +StopSimpleDlg::StopSimpleDlg(TQWidget *parent, const char *name,const TQString&caption,const TQString&text) + : StopDlg(0,parent,name,caption,text),cancelld(false) { connect(this,TQT_SIGNAL(sigCancel(bool)),this,TQT_SLOT(slotSimpleCancel(bool))); } diff --git a/src/svnfrontend/stopdlg.h b/src/svnfrontend/stopdlg.h index 1a9813d..0194fcc 100644 --- a/src/svnfrontend/stopdlg.h +++ b/src/svnfrontend/stopdlg.h @@ -43,7 +43,7 @@ class StopDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - StopDlg(TQObject*,TQWidget *tqparent = 0, const char *name = 0,const TQString&caption=TQString(),const TQString&text=TQString()); + StopDlg(TQObject*,TQWidget *parent = 0, const char *name = 0,const TQString&caption=TQString(),const TQString&text=TQString()); virtual ~StopDlg(); bool cancelld(); @@ -89,7 +89,7 @@ class StopSimpleDlg:public StopDlg Q_OBJECT TQ_OBJECT public: - StopSimpleDlg(TQWidget *tqparent = 0, const char *name = 0,const TQString&caption=TQString(),const TQString&text=TQString()); + StopSimpleDlg(TQWidget *parent = 0, const char *name = 0,const TQString&caption=TQString(),const TQString&text=TQString()); virtual ~StopSimpleDlg(){} bool isCanceld()const{return cancelld;} diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp index 9ecb6bc..222d6f1 100644 --- a/src/svnfrontend/svnactions.cpp +++ b/src/svnfrontend/svnactions.cpp @@ -199,14 +199,14 @@ public: #define EMIT_REFRESH emit sigRefreshAll() #define DIALOGS_SIZES "display_dialogs_sizes" -SvnActions::SvnActions(ItemDisplay *tqparent, const char *name,bool processes_blocked) - : TQObject(tqparent?tqparent->realWidget():0, name),SimpleLogCb() +SvnActions::SvnActions(ItemDisplay *parent, const char *name,bool processes_blocked) + : TQObject(parent?parent->realWidget():0, name),SimpleLogCb() { m_CThread = 0; m_UThread = 0; m_FCThread = 0; m_Data = new SvnActionsData(); - m_Data->m_ParentList = tqparent; + m_Data->m_ParentList = parent; m_Data->m_SvnContextListener = new CContextListener(this); m_Data->runblocked = processes_blocked; connect(m_Data->m_SvnContextListener,TQT_SIGNAL(sendNotify(const TQString&)),this,TQT_SLOT(slotNotifyMessage(const TQString&))); @@ -252,11 +252,11 @@ template<class T> KDialogBase* SvnActions::createDialog(T**ptr,const TQString&_h buttons = buttons|KDialogBase::User1; } KDialogBase * dlg = new KDialogBase( - modal?TQT_TQWIDGET(TQT_TQWIDGET(KApplication::activeModalWidget())):0, // tqparent + modal?TQT_TQWIDGET(TQT_TQWIDGET(KApplication::activeModalWidget())):0, // parent name, // name modal, // modal _head, // caption - buttons, // buttontqmask + buttons, // buttonmask KDialogBase::Ok, // defaultButton false , // separator (u1.text().isEmpty()?KGuiItem():u1) //user1 @@ -280,7 +280,7 @@ void SvnActions::makeLog(const svn::Revision&start,const svn::Revision&end,const } svn::SharedPointer<svn::LogEntriesMap> SvnActions::getLog(const svn::Revision&start,const svn::Revision&end,const svn::Revision&peg,const TQString&which,bool list_files, - int limit,TQWidget*tqparent) + int limit,TQWidget*parent) { svn::SharedPointer<svn::LogEntriesMap> logs = new svn::LogEntriesMap; if (!m_Data->m_CurrentContext) return 0; @@ -289,7 +289,7 @@ svn::SharedPointer<svn::LogEntriesMap> SvnActions::getLog(const svn::Revision&st kdDebug()<<"Get logs for "<< which<<endl; try { - StopDlg sdlg(m_Data->m_SvnContextListener,(tqparent?tqparent:m_Data->m_ParentList->realWidget()),0,"Logs", + StopDlg sdlg(m_Data->m_SvnContextListener,(parent?parent:m_Data->m_ParentList->realWidget()),0,"Logs", i18n("Getting logs - hit cancel for abort")); connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); if (doNetworking()) { @@ -522,12 +522,12 @@ void SvnActions::makeBlame(const svn::Revision&start, const svn::Revision&end,co svn::AnnotatedFile blame; TQString ex; svn::Path p(k); - TQWidget*_tqparent = _p?_p:m_Data->m_ParentList->realWidget(); + TQWidget*_parent = _p?_p:m_Data->m_ParentList->realWidget(); svn::Revision peg = _peg==svn::Revision::UNDEFINED?end:_peg; try { CursorStack a(TQt::BusyCursor); - StopDlg sdlg(m_Data->m_SvnContextListener,_tqparent,0,"Annotate",i18n("Annotate lines - hit cancel for abort")); + StopDlg sdlg(m_Data->m_SvnContextListener,_parent,0,"Annotate",i18n("Annotate lines - hit cancel for abort")); connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->annotate(blame,p,start,end,peg); } catch (const svn::Exception&e) { @@ -544,11 +544,11 @@ void SvnActions::makeBlame(const svn::Revision&start, const svn::Revision&end,co } bool SvnActions::makeGet(const svn::Revision&start, const TQString&what, const TQString&target, - const svn::Revision&peg,TQWidget*_dlgtqparent) + const svn::Revision&peg,TQWidget*_dlgparent) { if (!m_Data->m_CurrentContext) return false; CursorStack a(TQt::BusyCursor); - TQWidget*dlgp=_dlgtqparent?_dlgtqparent:m_Data->m_ParentList->realWidget(); + TQWidget*dlgp=_dlgparent?_dlgparent:m_Data->m_ParentList->realWidget(); TQString ex; svn::Path p(what); try { @@ -567,11 +567,11 @@ bool SvnActions::makeGet(const svn::Revision&start, const TQString&what, const T return true; } -void SvnActions::slotMakeCat(const svn::Revision&start, const TQString&what, const TQString&disp,const svn::Revision&peg,TQWidget*_dlgtqparent) +void SvnActions::slotMakeCat(const svn::Revision&start, const TQString&what, const TQString&disp,const svn::Revision&peg,TQWidget*_dlgparent) { KTempFile content; content.setAutoDelete(true); - if (!makeGet(start,what,content.name(),peg,_dlgtqparent)) { + if (!makeGet(start,what,content.name(),peg,_dlgparent)) { return; } EMIT_FINISHED; @@ -609,7 +609,7 @@ void SvnActions::slotMakeCat(const svn::Revision&start, const TQString&what, con delete dlg; } } else { - KMessageBox::information(_dlgtqparent?_dlgtqparent:m_Data->m_ParentList->realWidget(), + KMessageBox::information(_dlgparent?_dlgparent:m_Data->m_ParentList->realWidget(), i18n("Got no content.")); } } @@ -1234,7 +1234,7 @@ void SvnActions::makeDiffinternal(const TQString&p1,const svn::Revision&r1,const tdir.setAutoDelete(true); TQString tn = TQString("%1/%2").tqarg(tdir.name()).tqarg("/svndiff"); bool ignore_content = Kdesvnsettings::diff_ignore_content(); - TQWidget*tqparent = p?p:m_Data->m_ParentList->realWidget(); + TQWidget*parent = p?p:m_Data->m_ParentList->realWidget(); TQStringList extraOptions; if (Kdesvnsettings::diff_ignore_spaces()) { @@ -1247,7 +1247,7 @@ void SvnActions::makeDiffinternal(const TQString&p1,const svn::Revision&r1,const svn::Revision peg = _peg==svn::Revision::UNDEFINED?r2:_peg; try { - StopDlg sdlg(m_Data->m_SvnContextListener,tqparent,0,"Diffing", + StopDlg sdlg(m_Data->m_SvnContextListener,parent,0,"Diffing", i18n("Diffing - hit cancel for abort")); connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); if (p1==p2 && (r1.isRemote()||r2.isRemote())) { @@ -1523,7 +1523,7 @@ void SvnActions::makeAdd(bool rec) ++liter; //cur->refreshtqStatus(); - //emit sigRefreshCurrent(static_cast<FileListViewItem*>(cur->tqparent())); + //emit sigRefreshCurrent(static_cast<FileListViewItem*>(cur->parent())); } #else emit sigRefreshCurrent(0); diff --git a/src/svnfrontend/svnactions.h b/src/svnfrontend/svnactions.h index 783d36a..13c8793 100644 --- a/src/svnfrontend/svnactions.h +++ b/src/svnfrontend/svnactions.h @@ -71,7 +71,7 @@ public: checkmodifiedthread }; - SvnActions(ItemDisplay *tqparent, const char *name = 0,bool processes_blocked=false); + SvnActions(ItemDisplay *parent, const char *name = 0,bool processes_blocked=false); ~SvnActions(); void reInitClient(); //svn::Client&svnClient(){return m_Svnclient;} @@ -83,7 +83,7 @@ public: const KGuiItem&u1 = KGuiItem()); bool makeGet(const svn::Revision&start, const TQString&what,const TQString&target, - const svn::Revision&peg=svn::Revision::UNDEFINED,TQWidget*dlgtqparent=0); + const svn::Revision&peg=svn::Revision::UNDEFINED,TQWidget*dlgparent=0); bool addItems(const TQValueList<svn::Path> &items,svn::Depth depth=svn::DepthEmpty); @@ -128,11 +128,11 @@ public: const svn::Revision&endr=svn::Revision::HEAD); void makeLog(const svn::Revision&start,const svn::Revision&end,const svn::Revision&peg,SvnItem*k,bool list_files=false,int limit = 0); void makeLog(const svn::Revision&start,const svn::Revision&end,const svn::Revision&peg,const TQString&,bool list_files=false, int limit=0); - svn::SharedPointer<svn::LogEntriesMap> getLog(const svn::Revision&start,const svn::Revision& end,const svn::Revision&peg,const TQString&,bool list_files, int limit,TQWidget*tqparent=0); + svn::SharedPointer<svn::LogEntriesMap> getLog(const svn::Revision&start,const svn::Revision& end,const svn::Revision&peg,const TQString&,bool list_files, int limit,TQWidget*parent=0); virtual bool getSingleLog(svn::LogEntry&,const svn::Revision&,const TQString&,const svn::Revision&,TQString&root); void makeBlame(const svn::Revision&start, const svn::Revision&end, SvnItem*k); - void makeBlame(const svn::Revision&start, const svn::Revision&end, const TQString&,TQWidget*tqparent=0,const svn::Revision&peg=svn::Revision::UNDEFINED,SimpleLogCb*_acb=0); + void makeBlame(const svn::Revision&start, const svn::Revision&end, const TQString&,TQWidget*parent=0,const svn::Revision&peg=svn::Revision::UNDEFINED,SimpleLogCb*_acb=0); void makeUpdate(const TQStringList&what,const svn::Revision&rev,bool recurse); bool makeSwitch(const TQString&rUrl,const TQString&tPath,const svn::Revision&r,svn::Depth depth,const svn::Revision&peg,bool stickydepth,bool ignore_externals,bool allow_unversioned); bool makeSwitch(const TQString&path,const TQString&what); @@ -228,7 +228,7 @@ public slots: virtual void slotMergeExternal(const TQString&src1,const TQString&src2, const TQString&target, const svn::Revision&rev1,const svn::Revision&rev2,const svn::Revision&_peg,bool); virtual void slotExtraLogMsg(const TQString&); - virtual void slotMakeCat(const svn::Revision&start, const TQString&what,const TQString&disp,const svn::Revision&peg,TQWidget*dlgtqparent); + virtual void slotMakeCat(const svn::Revision&start, const TQString&what,const TQString&disp,const svn::Revision&peg,TQWidget*dlgparent); virtual void slotCancel(bool); diff --git a/src/svnfrontend/svnfiletip.cpp b/src/svnfrontend/svnfiletip.cpp index c7388d3..3619f7e 100644 --- a/src/svnfrontend/svnfiletip.cpp +++ b/src/svnfrontend/svnfiletip.cpp @@ -33,14 +33,14 @@ #include <tqscrollview.h> #include <tqtimer.h> -SvnFileTip::SvnFileTip(TQScrollView*tqparent) +SvnFileTip::SvnFileTip(TQScrollView*parent) : TQFrame( 0, 0, WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop | WX11BypassWM ), m_on( false ), m_preview( false ), m_filter( false ), m_corner( 0 ), m_num( 0 ), - m_view( tqparent ), + m_view( parent ), m_svnitem( 0 ), m_previewJob( 0 ) { diff --git a/src/svnfrontend/svnfiletip.h b/src/svnfrontend/svnfiletip.h index e275d2d..27a50ae 100644 --- a/src/svnfrontend/svnfiletip.h +++ b/src/svnfrontend/svnfiletip.h @@ -42,7 +42,7 @@ class SvnFileTip : public TQFrame Q_OBJECT TQ_OBJECT public: - SvnFileTip(TQScrollView*tqparent); + SvnFileTip(TQScrollView*parent); virtual ~SvnFileTip(); void setPreview(bool on); diff --git a/src/svnfrontend/svnitem.cpp b/src/svnfrontend/svnitem.cpp index 2daa080..60a687d 100644 --- a/src/svnfrontend/svnitem.cpp +++ b/src/svnfrontend/svnitem.cpp @@ -212,7 +212,7 @@ TQPixmap SvnItem::internalTransform(const TQPixmap&first,int size) if (result.isNull()) { return result; } - const TQBitmap * b = first.tqmask(); + const TQBitmap * b = first.mask(); result.fill(TQt::white); if (b) { result.setMask(*b); diff --git a/src/svnfrontend/svnlogdlgimp.cpp b/src/svnfrontend/svnlogdlgimp.cpp index d3dbb2d..b408610 100644 --- a/src/svnfrontend/svnlogdlgimp.cpp +++ b/src/svnfrontend/svnlogdlgimp.cpp @@ -49,7 +49,7 @@ const char* SvnLogDlgImp::groupName = "log_dialog_size"; class LogListViewItem:public KListViewItem { public: - LogListViewItem (KListView *tqparent,const svn::LogEntry&); + LogListViewItem (KListView *parent,const svn::LogEntry&); virtual int compare( TQListViewItem* i, int col, bool ascending ) const; static const int COL_MARKER,COL_REV,COL_AUTHOR,COL_DATE,COL_MSG; @@ -80,7 +80,7 @@ const int LogListViewItem::COL_MSG = 4; class LogChangePathItem:public KListViewItem { public: - LogChangePathItem(KListView*tqparent,const svn::LogChangePathEntry&); + LogChangePathItem(KListView*parent,const svn::LogChangePathEntry&); virtual ~LogChangePathItem(){} TQChar action() const{return _action;} @@ -94,8 +94,8 @@ protected: svn_revnum_t _revision; }; -LogListViewItem::LogListViewItem(KListView*_tqparent,const svn::LogEntry&_entry) - : KListViewItem(_tqparent),_realName(TQString()) +LogListViewItem::LogListViewItem(KListView*_parent,const svn::LogEntry&_entry) + : KListViewItem(_parent),_realName(TQString()) { setMultiLinesEnabled(false); _revision=_entry.revision; @@ -143,8 +143,8 @@ void LogListViewItem::showChangedEntries(KListView*where) } } -LogChangePathItem::LogChangePathItem(KListView*tqparent,const svn::LogChangePathEntry&e) - :KListViewItem(tqparent) +LogChangePathItem::LogChangePathItem(KListView*parent,const svn::LogChangePathEntry&e) + :KListViewItem(parent) { _action = TQChar(e.action); setText(0,_action); @@ -190,8 +190,8 @@ bool LogListViewItem::isParent(const TQString&_par,const TQString&tar) return tar.startsWith(par); } -SvnLogDlgImp::SvnLogDlgImp(SvnActions*ac,TQWidget *tqparent, const char *name,bool modal) - :SvnLogDialogData(tqparent, name,modal),_name("") +SvnLogDlgImp::SvnLogDlgImp(SvnActions*ac,TQWidget *parent, const char *name,bool modal) + :SvnLogDialogData(parent, name,modal),_name("") { m_LogView->setSorting(LogListViewItem::COL_REV); m_LogView->setSortOrder(TQt::Descending); diff --git a/src/svnfrontend/svnlogdlgimp.h b/src/svnfrontend/svnlogdlgimp.h index e467aa3..9cd5011 100644 --- a/src/svnfrontend/svnlogdlgimp.h +++ b/src/svnfrontend/svnlogdlgimp.h @@ -37,7 +37,7 @@ class SvnLogDlgImp: public SvnLogDialogData,public SimpleLogCb Q_OBJECT TQ_OBJECT public: - SvnLogDlgImp(SvnActions*,TQWidget *tqparent = 0, const char *name = 0,bool modal=true); + SvnLogDlgImp(SvnActions*,TQWidget *parent = 0, const char *name = 0,bool modal=true); virtual ~SvnLogDlgImp(); void dispLog(const svn::SharedPointer<svn::LogEntriesMap>&,const TQString&,const TQString&,const svn::Revision&peg,const TQString&pegUrl); void saveSize(); diff --git a/src/svnfrontend/tcontextlistener.cpp b/src/svnfrontend/tcontextlistener.cpp index ffa0e4e..315daed 100644 --- a/src/svnfrontend/tcontextlistener.cpp +++ b/src/svnfrontend/tcontextlistener.cpp @@ -30,8 +30,8 @@ #include <kdebug.h> #include <klocale.h> -ThreadContextListener::ThreadContextListener(TQObject* tqparent, const char* name) - : CContextListener(tqparent, name) +ThreadContextListener::ThreadContextListener(TQObject* parent, const char* name) + : CContextListener(parent, name) { m_Data = new ThreadContextListenerData; } diff --git a/src/svnfrontend/tcontextlistener.h b/src/svnfrontend/tcontextlistener.h index df01d20..28691f2 100644 --- a/src/svnfrontend/tcontextlistener.h +++ b/src/svnfrontend/tcontextlistener.h @@ -38,7 +38,7 @@ class ThreadContextListener : public CContextListener Q_OBJECT TQ_OBJECT public: - ThreadContextListener(TQObject* tqparent, const char* name=0); + ThreadContextListener(TQObject* parent, const char* name=0); virtual ~ThreadContextListener(); diff --git a/src/svnqt/cache/ReposLog.cpp b/src/svnqt/cache/ReposLog.cpp index 54c4622..d63d1d3 100644 --- a/src/svnqt/cache/ReposLog.cpp +++ b/src/svnqt/cache/ReposLog.cpp @@ -410,7 +410,7 @@ bool svn::cache::ReposLog::log(const svn::Path&what,const svn::Revision&_start, */ bool svn::cache::ReposLog::itemExists(const svn::Revision&peg,const svn::Path&path) { - /// @todo this moment I have no idea how to check real with all moves and deletes of tqparent folders without a hell of sql statements so we make it quite simple: it exists if we found it. + /// @todo this moment I have no idea how to check real with all moves and deletes of parent folders without a hell of sql statements so we make it quite simple: it exists if we found it. #if 0 diff --git a/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp b/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp index 6a8bea2..408cb32 100644 --- a/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp +++ b/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp @@ -250,14 +250,14 @@ int TQSQLite3Result::numRowsAffected() ///////////////////////////////////////////////////////// -TQSQLite3Driver::TQSQLite3Driver(TQObject * tqparent, const char *name) - : TQSqlDriver(tqparent, name) +TQSQLite3Driver::TQSQLite3Driver(TQObject * parent, const char *name) + : TQSqlDriver(parent, name) { d = new TQSQLite3DriverPrivate(); } -TQSQLite3Driver::TQSQLite3Driver(sqlite3 *connection, TQObject *tqparent, const char *name) - : TQSqlDriver(tqparent, name) +TQSQLite3Driver::TQSQLite3Driver(sqlite3 *connection, TQObject *parent, const char *name) + : TQSqlDriver(parent, name) { d = new TQSQLite3DriverPrivate(); d->access = connection; diff --git a/src/svnqt/cache/sqlite3/qsql_sqlite3.h b/src/svnqt/cache/sqlite3/qsql_sqlite3.h index 85cc22f..7c474ca 100644 --- a/src/svnqt/cache/sqlite3/qsql_sqlite3.h +++ b/src/svnqt/cache/sqlite3/qsql_sqlite3.h @@ -54,8 +54,8 @@ class TQSQLite3Driver : public TQSqlDriver { friend class TQSQLite3Result; public: - TQSQLite3Driver(TQObject *tqparent = 0, const char *name = 0); - TQSQLite3Driver(sqlite3 *connection, TQObject *tqparent = 0, const char *name = 0); + TQSQLite3Driver(TQObject *parent = 0, const char *name = 0); + TQSQLite3Driver(sqlite3 *connection, TQObject *parent = 0, const char *name = 0); ~TQSQLite3Driver(); bool hasFeature(DriverFeature f) const; bool open(const TQString & db, diff --git a/src/svnqt/client.hpp b/src/svnqt/client.hpp index 95b7461..bffd219 100644 --- a/src/svnqt/client.hpp +++ b/src/svnqt/client.hpp @@ -373,7 +373,7 @@ namespace svn * * @param path * @param message log message. if it is TQString() asks when working on repository - * @param makeParent create tqparent folders if not existant (only when build with svn 1.5 or above) + * @param makeParent create parent folders if not existant (only when build with svn 1.5 or above) * @exception ClientException */ virtual svn::Revision @@ -390,7 +390,7 @@ namespace svn * * @param targets encoded pathes to create * @param message log message. if it is TQString() asks when working on repository - * @param makeParent create tqparent folders if not existant (only when build with svn 1.5 or above) + * @param makeParent create parent folders if not existant (only when build with svn 1.5 or above) * @exception ClientException */ virtual svn::Revision diff --git a/src/svnqt/path.hpp b/src/svnqt/path.hpp index b9cc73f..9592aca 100644 --- a/src/svnqt/path.hpp +++ b/src/svnqt/path.hpp @@ -131,7 +131,7 @@ namespace svn void addComponent (const TQString & component); - /** Reduce path to its tqparent folder. + /** Reduce path to its parent folder. * If the path length is 1 (eg., only "/") it will cleared so * path length will get zero. * @sa svn_path_remove_component diff --git a/src/svnqt/pool.cpp b/src/svnqt/pool.cpp index 0f624b4..34ef947 100644 --- a/src/svnqt/pool.cpp +++ b/src/svnqt/pool.cpp @@ -37,17 +37,17 @@ namespace svn bool Pool::s_initialized = false; apr_pool_t * - Pool::pool_create (apr_pool_t * tqparent) + Pool::pool_create (apr_pool_t * parent) { if (!s_initialized) { apr_pool_initialize(); s_initialized=true; } - return svn_pool_create (tqparent); + return svn_pool_create (parent); } - Pool::Pool (apr_pool_t * tqparent) - : m_tqparent (tqparent), m_pool (pool_create (tqparent)) + Pool::Pool (apr_pool_t * parent) + : m_parent (parent), m_pool (pool_create (parent)) { } @@ -72,7 +72,7 @@ namespace svn { svn_pool_destroy (m_pool); } - m_pool = pool_create (m_tqparent); + m_pool = pool_create (m_parent); } //TODO diff --git a/src/svnqt/pool.hpp b/src/svnqt/pool.hpp index 46e0a8e..accdd75 100644 --- a/src/svnqt/pool.hpp +++ b/src/svnqt/pool.hpp @@ -46,9 +46,9 @@ namespace svn /** * creates a subpool new pool to an existing pool * - * @param tqparent NULL -> global pool + * @param parent NULL -> global pool */ - Pool (apr_pool_t * tqparent = (apr_pool_t *)0); + Pool (apr_pool_t * parent = (apr_pool_t *)0); virtual ~ Pool (); @@ -71,7 +71,7 @@ namespace svn */ void renew (); private: - apr_pool_t * m_tqparent; + apr_pool_t * m_parent; apr_pool_t * m_pool; Pool& operator=(const Pool&); @@ -79,7 +79,7 @@ namespace svn Pool (const Pool &); static bool s_initialized; - static apr_pool_t * pool_create (apr_pool_t * tqparent); + static apr_pool_t * pool_create (apr_pool_t * parent); }; } diff --git a/src/urldlg.cpp b/src/urldlg.cpp index 3507983..c1ae158 100644 --- a/src/urldlg.cpp +++ b/src/urldlg.cpp @@ -30,8 +30,8 @@ #include <tqlabel.h> -UrlDlg::UrlDlg(TQWidget *tqparent, const char *name) - : KDialogBase(Plain, TQString(), Ok|Cancel|User1, Ok, tqparent, name, +UrlDlg::UrlDlg(TQWidget *parent, const char *name) + : KDialogBase(Plain, TQString(), Ok|Cancel|User1, Ok, parent, name, true,true, KStdGuiItem::clear()) { init_dlg(); @@ -132,11 +132,11 @@ KURL UrlDlg::selectedURL() /*! - \fn UrlDlg::getURL(TQWidget*tqparent) + \fn UrlDlg::getURL(TQWidget*parent) */ -KURL UrlDlg::getURL(TQWidget*tqparent) +KURL UrlDlg::getURL(TQWidget*parent) { - UrlDlg dlg(tqparent); + UrlDlg dlg(parent); dlg.setCaption(i18n("Open")); dlg.exec(); const KURL& url = dlg.selectedURL(); diff --git a/src/urldlg.h b/src/urldlg.h index caff0eb..1c81c7a 100644 --- a/src/urldlg.h +++ b/src/urldlg.h @@ -33,10 +33,10 @@ class UrlDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - UrlDlg(TQWidget *tqparent = 0, const char *name = 0); + UrlDlg(TQWidget *parent = 0, const char *name = 0); ~UrlDlg(); KURL selectedURL(); - static KURL getURL(TQWidget*tqparent=0); + static KURL getURL(TQWidget*parent=0); protected: virtual void init_dlg(); KURLRequester*urlRequester_; |