From b136e966439953a9088fcee48dde4d22c7fd35c0 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sat, 3 Oct 2026 17:49:18 -0300 Subject: Replace zero pointer constants with nullptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- src/askpass/tdesvn-askpass.cpp | 4 +- src/helpers/sshagent.cpp | 4 +- src/helpers/sshagent.h | 2 +- src/ksvnwidgets/authdialogimpl.h | 2 +- src/ksvnwidgets/depthselector.cpp | 4 +- src/ksvnwidgets/depthselector.h | 2 +- src/ksvnwidgets/diffbrowser.h | 2 +- src/ksvnwidgets/diffbrowserdata.cpp | 4 +- src/ksvnwidgets/encodingselector_impl.h | 2 +- src/ksvnwidgets/logmsg_impl.cpp | 20 ++-- src/ksvnwidgets/logmsg_impl.h | 16 +-- src/ksvnwidgets/pwstorage.cpp | 8 +- src/ksvnwidgets/revertform_impl.h | 2 +- src/ksvnwidgets/ssltrustprompt_impl.cpp | 2 +- src/ksvnwidgets/ssltrustprompt_impl.h | 2 +- src/main.cpp | 20 ++-- src/settings/cmdexecsettings_impl.h | 2 +- src/settings/diffmergesettings_impl.h | 2 +- src/settings/dispcolorsettings_impl.h | 2 +- src/settings/displaysettings_impl.h | 2 +- src/settings/revisiontreesettingsdlg_impl.h | 2 +- src/settings/subversionsettings_impl.h | 2 +- src/svnfrontend/blamedisplay_impl.cpp | 16 +-- src/svnfrontend/blamedisplay_impl.h | 6 +- src/svnfrontend/ccontextlistener.cpp | 4 +- src/svnfrontend/ccontextlistener.h | 2 +- src/svnfrontend/commandexec.cpp | 16 +-- src/svnfrontend/copymoveview_impl.h | 2 +- src/svnfrontend/createrepo_impl.h | 2 +- src/svnfrontend/dummydisplay.cpp | 6 +- src/svnfrontend/dumprepo_impl.h | 2 +- src/svnfrontend/editproperty_impl.h | 2 +- src/svnfrontend/filelistviewitem.cpp | 2 +- src/svnfrontend/filelistviewitem.h | 2 +- src/svnfrontend/fillcachethread.cpp | 6 +- src/svnfrontend/fronthelpers/checkoutinfo_impl.h | 2 +- src/svnfrontend/fronthelpers/propertylist.cpp | 2 +- src/svnfrontend/fronthelpers/propertylist.h | 4 +- src/svnfrontend/fronthelpers/rangeinput_impl.h | 2 +- src/svnfrontend/fronthelpers/revisionbuttonimpl.h | 2 +- src/svnfrontend/graphtree/drawparams.cpp | 10 +- src/svnfrontend/graphtree/drawparams.h | 6 +- src/svnfrontend/graphtree/graphtreelabel.cpp | 2 +- src/svnfrontend/graphtree/pannerview.h | 2 +- src/svnfrontend/graphtree/revgraphview.cpp | 32 +++--- src/svnfrontend/graphtree/revgraphview.h | 2 +- src/svnfrontend/graphtree/revisiontree.cpp | 18 +-- src/svnfrontend/graphtree/revisiontree.h | 2 +- src/svnfrontend/graphtree/revtreewidget.h | 2 +- src/svnfrontend/hotcopydlg_impl.h | 2 +- src/svnfrontend/importdir_logmsg.cpp | 2 +- src/svnfrontend/importdir_logmsg.h | 2 +- src/svnfrontend/loaddmpdlg_impl.h | 2 +- src/svnfrontend/mergedlg_impl.cpp | 2 +- src/svnfrontend/mergedlg_impl.h | 4 +- src/svnfrontend/modifiedthread.cpp | 6 +- src/svnfrontend/opencontextmenu.cpp | 2 +- src/svnfrontend/propertiesdlg.cpp | 2 +- src/svnfrontend/propertiesdlg.h | 2 +- src/svnfrontend/stopdlg.cpp | 8 +- src/svnfrontend/stopdlg.h | 4 +- src/svnfrontend/svnactions.cpp | 124 ++++++++++---------- src/svnfrontend/svnactions.h | 8 +- src/svnfrontend/svnfiletip.cpp | 16 +-- src/svnfrontend/svnfiletip.h | 2 +- src/svnfrontend/svnitem.cpp | 6 +- src/svnfrontend/svnitem.h | 4 +- src/svnfrontend/svnlogdlgimp.cpp | 18 +-- src/svnfrontend/svnlogdlgimp.h | 2 +- src/svnfrontend/tcontextlistener.h | 2 +- src/svnfrontend/tdesvnfilelist.cpp | 132 +++++++++++----------- src/svnfrontend/tdesvnfilelist.h | 8 +- src/svnfrontend/threadcontextlistenerdata.h | 2 +- src/svnqt/cache/LogCache.cpp | 18 +-- src/svnqt/cache/ReposLog.cpp | 2 +- src/svnqt/client.cpp | 4 +- src/svnqt/client_cat.cpp | 6 +- src/svnqt/client_impl.cpp | 2 +- src/svnqt/client_ls.cpp | 10 +- src/svnqt/client_merge.cpp | 6 +- src/svnqt/client_modify.cpp | 20 ++-- src/svnqt/client_property.cpp | 8 +- src/svnqt/client_status.cpp | 10 +- src/svnqt/commititem.h | 2 +- src/svnqt/conflictresult.cpp | 2 +- src/svnqt/contextdata.cpp | 56 ++++----- src/svnqt/diff_data.cpp | 14 +-- src/svnqt/diffoptions.cpp | 4 +- src/svnqt/dirent.cpp | 2 +- src/svnqt/entry.cpp | 8 +- src/svnqt/entry.h | 2 +- src/svnqt/exception.cpp | 4 +- src/svnqt/log_entry.cpp | 12 +- src/svnqt/path.cpp | 10 +- src/svnqt/repository.cpp | 10 +- src/svnqt/repositorydata.cpp | 18 +-- src/svnqt/shared_pointer.h | 12 +- src/svnqt/smart_pointer.h | 6 +- src/svnqt/status.cpp | 4 +- src/svnqt/stringarray.cpp | 2 +- src/svnqt/svnfilestream.h | 4 +- src/svnqt/svnstream.cpp | 6 +- src/svnqt/svnstream.h | 4 +- src/svnqt/url.cpp | 4 +- src/svnqt/wc.cpp | 12 +- src/tdeiosvn/tdeiobytestream.cpp | 4 +- src/tdeiosvn/tdeiosvn.cpp | 10 +- src/tdesvn.cpp | 6 +- src/tdesvn_part.cpp | 36 +++--- src/tdesvnd/tdesvnd_dcop.cpp | 8 +- src/tdesvnview.cpp | 8 +- src/tdesvnview.h | 2 +- src/urldlg.cpp | 2 +- src/urldlg.h | 4 +- 114 files changed, 495 insertions(+), 495 deletions(-) diff --git a/src/askpass/tdesvn-askpass.cpp b/src/askpass/tdesvn-askpass.cpp index 1b03eee..39453a9 100644 --- a/src/askpass/tdesvn-askpass.cpp +++ b/src/askpass/tdesvn-askpass.cpp @@ -27,7 +27,7 @@ #include static TDECmdLineOptions options[] = { - { "+[prompt]", I18N_NOOP("prompt"), 0 }, + { "+[prompt]", I18N_NOOP("prompt"), nullptr }, TDECmdLineLastOption }; @@ -54,7 +54,7 @@ int main(int argc, char** argv) } TQString pw; KPasswordDialog::disableCoreDumps(); - if (KPasswordDialog::getPassword(pw,prompt,0)==KPasswordDialog::Accepted) { + if (KPasswordDialog::getPassword(pw,prompt,nullptr)==KPasswordDialog::Accepted) { std::cout << pw.local8Bit().data() << std::endl; /* cleanup memory */ pw.replace(0,pw.length(),"0"); diff --git a/src/helpers/sshagent.cpp b/src/helpers/sshagent.cpp index 2f06e97..65de22d 100644 --- a/src/helpers/sshagent.cpp +++ b/src/helpers/sshagent.cpp @@ -55,7 +55,7 @@ bool SshAgent::querySshAgent() // Did the user already start a ssh-agent process? char* pid; - if( (pid = ::getenv("SSH_AGENT_PID")) != 0 ) + if( (pid = ::getenv("SSH_AGENT_PID")) != nullptr ) { m_pid = TQString::fromLocal8Bit(pid); @@ -120,7 +120,7 @@ bool SshAgent::addSshIdentities(bool force) kdDebug()<<"Using test askpass"<1|| svn::Version::version_minor()>4 ) { - m_recurse = 0L; + m_recurse = nullptr; m_DepthCombo->setCurrentItem(3); } else { delete m_DepthCombo; - m_DepthCombo=0; + m_DepthCombo=nullptr; DepthFormLayout->removeItem(m_leftspacer); m_recurse = new TQCheckBox( this, "m_RecursiveButton" ); m_recurse->setChecked( true ); diff --git a/src/ksvnwidgets/depthselector.h b/src/ksvnwidgets/depthselector.h index ea76862..4a4d204 100644 --- a/src/ksvnwidgets/depthselector.h +++ b/src/ksvnwidgets/depthselector.h @@ -30,7 +30,7 @@ class DepthSelector: public DepthSettings { TQ_OBJECT public: - DepthSelector(TQWidget *parent = 0, const char *name = 0); + DepthSelector(TQWidget *parent = nullptr, const char *name = nullptr); virtual ~DepthSelector(); svn::Depth getDepth()const; void addItemWidget(TQWidget*); diff --git a/src/ksvnwidgets/diffbrowser.h b/src/ksvnwidgets/diffbrowser.h index 896eab0..887ac2d 100644 --- a/src/ksvnwidgets/diffbrowser.h +++ b/src/ksvnwidgets/diffbrowser.h @@ -33,7 +33,7 @@ class DiffBrowser : public KTextBrowser public: - DiffBrowser(TQWidget*parent=0,const char*name=0); + DiffBrowser(TQWidget*parent=nullptr,const char*name=nullptr); virtual ~DiffBrowser(); public slots: diff --git a/src/ksvnwidgets/diffbrowserdata.cpp b/src/ksvnwidgets/diffbrowserdata.cpp index 5eac74a..cd325ea 100644 --- a/src/ksvnwidgets/diffbrowserdata.cpp +++ b/src/ksvnwidgets/diffbrowserdata.cpp @@ -25,8 +25,8 @@ */ DiffBrowserData::DiffBrowserData() { - m_Syntax=0; - srchdialog=0; + m_Syntax=nullptr; + srchdialog=nullptr; last_search = NONE; last_finished_search = NONE; cs = false; diff --git a/src/ksvnwidgets/encodingselector_impl.h b/src/ksvnwidgets/encodingselector_impl.h index 48b0573..918fad1 100644 --- a/src/ksvnwidgets/encodingselector_impl.h +++ b/src/ksvnwidgets/encodingselector_impl.h @@ -28,7 +28,7 @@ class EncodingSelector_impl: public EncodingSelector { TQ_OBJECT public: - EncodingSelector_impl(const TQString&cur, TQWidget *parent = 0, const char *name = 0); + EncodingSelector_impl(const TQString&cur, TQWidget *parent = nullptr, const char *name = nullptr); virtual ~EncodingSelector_impl(){} protected slots: diff --git a/src/ksvnwidgets/logmsg_impl.cpp b/src/ksvnwidgets/logmsg_impl.cpp index f4debfb..d6a4129 100644 --- a/src/ksvnwidgets/logmsg_impl.cpp +++ b/src/ksvnwidgets/logmsg_impl.cpp @@ -74,11 +74,11 @@ Logmsg_impl::Logmsg_impl(TQWidget *parent, const char *name) hideButtons(true); m_MainSplitter->moveToFirst(m_EditFrame); delete m_ReviewFrame; - m_Reviewlabel=0; - m_ReviewList=0; - m_MarkUnversioned=0; - m_UnmarkUnversioned=0; - m_DiffItem=0; + m_Reviewlabel=nullptr; + m_ReviewList=nullptr; + m_MarkUnversioned=nullptr; + m_UnmarkUnversioned=nullptr; + m_DiffItem=nullptr; } Logmsg_impl::Logmsg_impl(const svn::CommitItemList&_items,TQWidget *parent, const char *name) @@ -284,7 +284,7 @@ TQString Logmsg_impl::getLogmessage(bool*ok,svn::Depth*rec,bool*keep_locks,TQWid svn::Depth _depth = svn::DepthUnknown; TQString msg(""); - Logmsg_impl*ptr=0; + Logmsg_impl*ptr=nullptr; KDialogBase dlg(parent,name,true,i18n("Commit log"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,true); @@ -323,7 +323,7 @@ TQString Logmsg_impl::getLogmessage(const svn::CommitItemList&items,bool*ok,svn: svn::Depth _depth = svn::DepthUnknown; TQString msg(""); - Logmsg_impl*ptr=0; + Logmsg_impl*ptr=nullptr; KDialogBase dlg(parent,name,true,i18n("Commit log"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,true); @@ -365,7 +365,7 @@ TQString Logmsg_impl::getLogmessage(const TQMap&items, svn::Depth _depth = svn::DepthUnknown; TQString msg(""); - Logmsg_impl*ptr=0; + Logmsg_impl*ptr=nullptr; KDialogBase dlg(parent,name,true,i18n("Commit log"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,true); @@ -409,7 +409,7 @@ TQString Logmsg_impl::getLogmessage(const logActionEntries&_on, bool _ok,_keep_locks; TQString msg(""); - Logmsg_impl*ptr=0; + Logmsg_impl*ptr=nullptr; KDialogBase dlg(parent,name,true,i18n("Commit log"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,true); @@ -522,7 +522,7 @@ void Logmsg_impl::slotMarkUnversioned() void Logmsg_impl::slotDiffSelected() { - TQListViewItem * it=0; + TQListViewItem * it=nullptr; if (!m_ReviewList || !(it=m_ReviewList->selectedItem())) { return; diff --git a/src/ksvnwidgets/logmsg_impl.h b/src/ksvnwidgets/logmsg_impl.h index 60698f5..85302a8 100644 --- a/src/ksvnwidgets/logmsg_impl.h +++ b/src/ksvnwidgets/logmsg_impl.h @@ -46,12 +46,12 @@ public: typedef TQValueList logActionEntries; - 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&_items,TQWidget *parent=0, const char *name=0); + Logmsg_impl(TQWidget *parent = nullptr, const char *name = nullptr); + Logmsg_impl(const svn::CommitItemList&_items,TQWidget *parent=nullptr, const char *name=nullptr); + Logmsg_impl(const TQMap&_items,TQWidget *parent=nullptr, const char *name=nullptr); Logmsg_impl(const logActionEntries&, const logActionEntries&, - TQWidget *parent = 0, const char *name = 0); + TQWidget *parent = nullptr, const char *name = nullptr); 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*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&,bool*ok,svn::Depth*rec,bool*keep_locks,TQWidget*parent=0,const char*name=0); + static TQString getLogmessage(bool*ok,svn::Depth*rec,bool*keeps_locks,TQWidget*parent=nullptr,const char*name=nullptr); + static TQString getLogmessage(const svn::CommitItemList&,bool*ok,svn::Depth*rec,bool*keep_locks,TQWidget*parent=nullptr,const char*name=nullptr); + static TQString getLogmessage(const TQMap&,bool*ok,svn::Depth*rec,bool*keep_locks,TQWidget*parent=nullptr,const char*name=nullptr); static TQString getLogmessage(const logActionEntries&, const logActionEntries&, TQObject*callback, logActionEntries&, - bool*ok,bool*keep_locks,TQWidget*parent=0,const char*name=0); + bool*ok,bool*keep_locks,TQWidget*parent=nullptr,const char*name=nullptr); void addItemWidget(TQWidget*); diff --git a/src/ksvnwidgets/pwstorage.cpp b/src/ksvnwidgets/pwstorage.cpp index 1a0a654..b2cbd20 100644 --- a/src/ksvnwidgets/pwstorage.cpp +++ b/src/ksvnwidgets/pwstorage.cpp @@ -34,13 +34,13 @@ class PwStorageData public: PwStorageData(){ - m_Wallet=0; + m_Wallet=nullptr; } ~PwStorageData() { delete m_Wallet; - m_Wallet=0; + m_Wallet=nullptr; } TDEWallet::Wallet*getWallet(); @@ -97,7 +97,7 @@ TDEWallet::Wallet*PwStorageData::getWallet() PwStorage*PwStorage::self() { - static PwStorage*_me = 0; + static PwStorage*_me = nullptr; if (!_me) { _me = new PwStorage(); } @@ -127,7 +127,7 @@ PwStorage::~PwStorage() */ bool PwStorage::connectWallet() { - return mData->getWallet()!=0L; + return mData->getWallet()!=nullptr; } /*! diff --git a/src/ksvnwidgets/revertform_impl.h b/src/ksvnwidgets/revertform_impl.h index 9e82024..9f7677e 100644 --- a/src/ksvnwidgets/revertform_impl.h +++ b/src/ksvnwidgets/revertform_impl.h @@ -30,7 +30,7 @@ class RevertFormImpl:public RevertForm TQ_OBJECT public: - RevertFormImpl(TQWidget*parent=0,const char*name=0); + RevertFormImpl(TQWidget*parent=nullptr,const char*name=nullptr); 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 e8c80d1..d3b217f 100644 --- a/src/ksvnwidgets/ssltrustprompt_impl.cpp +++ b/src/ksvnwidgets/ssltrustprompt_impl.cpp @@ -46,7 +46,7 @@ SslTrustPrompt_impl::SslTrustPrompt_impl(const TQString&host,TQWidget *parent, c */ bool SslTrustPrompt_impl::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) { - SslTrustPrompt_impl*ptr=0; + SslTrustPrompt_impl*ptr=nullptr; KDialogBase dlg(i18n("Trust ssl certificate")); dlg.setButtonText(KDialogBase::Yes,i18n("Accept permanently")); dlg.setButtonText(KDialogBase::No,i18n("Accept temporarily")); diff --git a/src/ksvnwidgets/ssltrustprompt_impl.h b/src/ksvnwidgets/ssltrustprompt_impl.h index 8414a26..dc025cb 100644 --- a/src/ksvnwidgets/ssltrustprompt_impl.h +++ b/src/ksvnwidgets/ssltrustprompt_impl.h @@ -26,7 +26,7 @@ class SslTrustPrompt_impl: public SslTrustPrompt { TQ_OBJECT public: - SslTrustPrompt_impl(const TQString&,TQWidget *parent = 0, const char *name = 0); + SslTrustPrompt_impl(const TQString&,TQWidget *parent = nullptr, const char *name = nullptr); 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/main.cpp b/src/main.cpp index 08fe514..8faf108 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -35,22 +35,22 @@ static const char version[] = VERSION; static TDECmdLineOptions options[] = { - { "r startrev[:endrev]",I18N_NOOP("Execute single subversion command on specific revision(-range)"),0}, - {"R",I18N_NOOP("Ask for revision when executing single command"),0}, - {"f",I18N_NOOP("Force operation"),0}, - {"o ",I18N_NOOP("Save output of subversion command (eg \"cat\") into file "),0}, - {"l ",I18N_NOOP("Limit log output to "),0}, - { "+exec ",I18N_NOOP("Execute subversion command (\"exec help\" for more information)"),0}, - { "+[URL]", I18N_NOOP( "Document to open" ), 0 }, + { "r startrev[:endrev]",I18N_NOOP("Execute single subversion command on specific revision(-range)"),nullptr}, + {"R",I18N_NOOP("Ask for revision when executing single command"),nullptr}, + {"f",I18N_NOOP("Force operation"),nullptr}, + {"o ",I18N_NOOP("Save output of subversion command (eg \"cat\") into file "),nullptr}, + {"l ",I18N_NOOP("Limit log output to "),nullptr}, + { "+exec ",I18N_NOOP("Execute subversion command (\"exec help\" for more information)"),nullptr}, + { "+[URL]", I18N_NOOP( "Document to open" ), nullptr }, TDECmdLineLastOption }; int main(int argc, char **argv) { TDEAboutData about("tdesvn", I18N_NOOP("tdesvn"), version, description, - TDEAboutData::License_GPL, "(C) 2005-2007 Rajko Albrecht",0, - 0, "ral@alwins-world.de"); - about.addAuthor( "Rajko Albrecht", 0, "ral@alwins-world.de" ); + TDEAboutData::License_GPL, "(C) 2005-2007 Rajko Albrecht",nullptr, + nullptr, "ral@alwins-world.de"); + about.addAuthor( "Rajko Albrecht", nullptr, "ral@alwins-world.de" ); about.setHomepage("http://tdesvn.alwins-world.de/"); about.setBugAddress("tdesvn-bugs@alwins-world.de"); diff --git a/src/settings/cmdexecsettings_impl.h b/src/settings/cmdexecsettings_impl.h index 021c8f8..dafc512 100644 --- a/src/settings/cmdexecsettings_impl.h +++ b/src/settings/cmdexecsettings_impl.h @@ -29,7 +29,7 @@ class CmdExecSettings_impl : public CmdExecSettings public: - CmdExecSettings_impl(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + CmdExecSettings_impl(TQWidget* parent = nullptr, const char* name = nullptr, WFlags fl = 0 ); ~CmdExecSettings_impl(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/src/settings/diffmergesettings_impl.h b/src/settings/diffmergesettings_impl.h index 6c5bd11..978927f 100644 --- a/src/settings/diffmergesettings_impl.h +++ b/src/settings/diffmergesettings_impl.h @@ -26,7 +26,7 @@ class DiffMergeSettings_impl: public DiffMergeSettings { TQ_OBJECT public: - DiffMergeSettings_impl(TQWidget *parent = 0, const char *name = 0); + DiffMergeSettings_impl(TQWidget *parent = nullptr, const char *name = nullptr); virtual ~DiffMergeSettings_impl(); protected slots: virtual void diffDispChanged(bool); diff --git a/src/settings/dispcolorsettings_impl.h b/src/settings/dispcolorsettings_impl.h index d53673c..14709c0 100644 --- a/src/settings/dispcolorsettings_impl.h +++ b/src/settings/dispcolorsettings_impl.h @@ -26,7 +26,7 @@ class DispColorSettings_impl: public DispColorSettings { TQ_OBJECT public: - DispColorSettings_impl(TQWidget *parent = 0, const char *name = 0); + DispColorSettings_impl(TQWidget *parent = nullptr, const char *name = nullptr); virtual ~DispColorSettings_impl(); protected slots: virtual void coloredStateToggled(bool); diff --git a/src/settings/displaysettings_impl.h b/src/settings/displaysettings_impl.h index 0c5124f..349a831 100644 --- a/src/settings/displaysettings_impl.h +++ b/src/settings/displaysettings_impl.h @@ -26,7 +26,7 @@ class DisplaySettings_impl: public DisplaySettings { TQ_OBJECT public: - DisplaySettings_impl(TQWidget *parent = 0, const char *name = 0); + DisplaySettings_impl(TQWidget *parent = nullptr, const char *name = nullptr); virtual ~DisplaySettings_impl(); protected slots: virtual void dispFileInfotoggled(bool); diff --git a/src/settings/revisiontreesettingsdlg_impl.h b/src/settings/revisiontreesettingsdlg_impl.h index 18ac7aa..7b73ea0 100644 --- a/src/settings/revisiontreesettingsdlg_impl.h +++ b/src/settings/revisiontreesettingsdlg_impl.h @@ -27,7 +27,7 @@ class RevisiontreeSettingsDlg_impl: public RevisiontreeSettingsDlg TQ_OBJECT public: - RevisiontreeSettingsDlg_impl(TQWidget *parent = 0, const char *name = 0); + RevisiontreeSettingsDlg_impl(TQWidget *parent = nullptr, const char *name = nullptr); virtual ~RevisiontreeSettingsDlg_impl(); }; diff --git a/src/settings/subversionsettings_impl.h b/src/settings/subversionsettings_impl.h index 226c7d5..4488b2a 100644 --- a/src/settings/subversionsettings_impl.h +++ b/src/settings/subversionsettings_impl.h @@ -29,7 +29,7 @@ class SubversionSettings_impl : public SubversionSettings public: - SubversionSettings_impl(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + SubversionSettings_impl(TQWidget* parent = nullptr, const char* name = nullptr, WFlags fl = 0 ); ~SubversionSettings_impl(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/src/svnfrontend/blamedisplay_impl.cpp b/src/svnfrontend/blamedisplay_impl.cpp index 6a37dff..a976cd1 100644 --- a/src/svnfrontend/blamedisplay_impl.cpp +++ b/src/svnfrontend/blamedisplay_impl.cpp @@ -81,7 +81,7 @@ public: const TQString& tAuthor()const{return m_tAuthor;} const TQString& tLine()const{return m_tLine;} - static void reset_codec(){codec_searched = false; cc=0;} + static void reset_codec(){codec_searched = false; cc=nullptr;} protected: TQString m_tAuthor,m_tLine; @@ -90,7 +90,7 @@ protected: static TQTextCodec * cc; }; -TQTextCodec* LocalizedAnnotatedLine::cc = 0; +TQTextCodec* LocalizedAnnotatedLine::cc = nullptr; bool LocalizedAnnotatedLine::codec_searched = false; class BlameDisplayItem:public TDEListViewItem @@ -225,8 +225,8 @@ class BlameDisplayData min=INT_MAX-1; rev_count=0; up=false; - m_cb=0;m_File=""; - m_dlg = 0; + m_cb=nullptr;m_File=""; + m_dlg = nullptr; } ~BlameDisplayData(){} svn_revnum_t max,min; @@ -378,7 +378,7 @@ void BlameDisplay_impl::slotGoLine() void BlameDisplay_impl::slotContextMenuRequested(TDEListView*,TQListViewItem*item, const TQPoint&pos) { - if (item==0||item->rtti()!=1000) return; + if (!item||item->rtti()!=1000) return; BlameDisplayItem*bit = static_cast(item); TQPopupMenu popup; popup.insertItem(i18n("Log message for revision"),101); @@ -426,7 +426,7 @@ void BlameDisplay_impl::showCommit(BlameDisplayItem*bit) void BlameDisplay_impl::slotShowCurrentCommit() { TQListViewItem*item = m_BlameList->selectedItem(); - if (item==0||item->rtti()!=1000) return; + if (!item||item->rtti()!=1000) return; BlameDisplayItem*bit = static_cast(item); showCommit(bit); } @@ -435,7 +435,7 @@ void BlameDisplay_impl::slotSelectionChanged() { if (!m_Data->m_dlg) return; TQListViewItem*item = m_BlameList->selectedItem(); - if (item==0||item->rtti()!=1000) { + if (!item||item->rtti()!=1000) { m_Data->m_dlg->enableButton(KDialogBase::User2,false); } else { m_Data->m_dlg->enableButton(KDialogBase::User2,true); @@ -467,7 +467,7 @@ void BlameDisplay_impl::displayBlame(SimpleLogCb*_cb,const TQString&item,const s void BlameDisplay_impl::slotItemDoubleClicked(TQListViewItem*item) { - if (item==0||item->rtti()!=1000) return; + if (!item||item->rtti()!=1000) return; BlameDisplayItem*bit = static_cast(item); showCommit(bit); } diff --git a/src/svnfrontend/blamedisplay_impl.h b/src/svnfrontend/blamedisplay_impl.h index 43b6708..0cd6247 100644 --- a/src/svnfrontend/blamedisplay_impl.h +++ b/src/svnfrontend/blamedisplay_impl.h @@ -33,8 +33,8 @@ class BlameDisplay_impl:public BlameDisplay TQ_OBJECT public: - BlameDisplay_impl(const TQString&,const svn::AnnotatedFile&,TQWidget*parent=0,const char*name=0); - BlameDisplay_impl(TQWidget*parent=0,const char*name=0); + BlameDisplay_impl(const TQString&,const svn::AnnotatedFile&,TQWidget*parent=nullptr,const char*name=nullptr); + BlameDisplay_impl(TQWidget*parent=nullptr,const char*name=nullptr); 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*parent=0,const char*name=0); + static void displayBlame(SimpleLogCb*,const TQString&,const svn::AnnotatedFile&,TQWidget*parent=nullptr,const char*name=nullptr); public slots: virtual void slotGoLine(); diff --git a/src/svnfrontend/ccontextlistener.cpp b/src/svnfrontend/ccontextlistener.cpp index 629b872..f0f15d5 100644 --- a/src/svnfrontend/ccontextlistener.cpp +++ b/src/svnfrontend/ccontextlistener.cpp @@ -234,7 +234,7 @@ bool CContextListener::contextGetLogMessage (TQString & msg,const svn::CommitIte { bool isOk = false; emit waitShow(true); - TQString logMessage = Logmsg_impl::getLogmessage(items,&isOk,0,0,0); + TQString logMessage = Logmsg_impl::getLogmessage(items,&isOk,nullptr,nullptr,nullptr); if (isOk) { msg = logMessage; } @@ -272,7 +272,7 @@ bool CContextListener::contextSslClientCertPrompt (TQString & certFile) emit waitShow(true); TQString afile = KFileDialog::getOpenFileName(TQString(), TQString(), - 0, + nullptr, i18n("Open a file with a #PKCS12 certificate")); emit waitShow(false); if (afile.isEmpty()) { diff --git a/src/svnfrontend/ccontextlistener.h b/src/svnfrontend/ccontextlistener.h index b5f0966..9798afe 100644 --- a/src/svnfrontend/ccontextlistener.h +++ b/src/svnfrontend/ccontextlistener.h @@ -36,7 +36,7 @@ class CContextListener : public TQObject, public svn::ContextListener,public svn TQ_OBJECT public: - CContextListener(TQObject *parent = 0, const char *name = 0); + CContextListener(TQObject *parent = nullptr, const char *name = nullptr); virtual ~CContextListener(); /* context-listener methods */ diff --git a/src/svnfrontend/commandexec.cpp b/src/svnfrontend/commandexec.cpp index c4ce055..7d41658 100644 --- a/src/svnfrontend/commandexec.cpp +++ b/src/svnfrontend/commandexec.cpp @@ -74,7 +74,7 @@ public: pCPart::pCPart() :cmd(""),url(),ask_revision(false),rev_set(false),outfile_set(false),single_revision(false),log_limit(0) { - m_SvnWrapper = 0; + m_SvnWrapper = nullptr; start = svn::Revision::UNDEFINED; end = svn::Revision::UNDEFINED; toStdout.open(IO_WriteOnly, stdout); @@ -82,7 +82,7 @@ pCPart::pCPart() Stdout.setDevice(&toStdout); Stderr.setDevice(&toStderr); disp = new DummyDisplay(); - m_SvnWrapper = new SvnActions(disp,0,true); + m_SvnWrapper = new SvnActions(disp,nullptr,true); } pCPart::~pCPart() @@ -212,7 +212,7 @@ int CommandExec::exec() bool found = connect(this,TQ_SIGNAL(executeMe()),this,slotCmd.ascii()); if (!found) { slotCmd=i18n("Command \"%1\" not implemented or known").arg(m_pCPart->cmd); - KMessageBox::sorry(0,slotCmd,i18n("SVN Error")); + KMessageBox::sorry(nullptr,slotCmd,i18n("SVN Error")); return -1; } @@ -338,7 +338,7 @@ int CommandExec::exec() void CommandExec::clientException(const TQString&what) { m_pCPart->Stderr<m_SvnWrapper->slotMakeCat( (m_pCPart->rev_set?m_pCPart->start:m_pCPart->end),m_pCPart->url[0],m_pCPart->url[0] - ,(m_pCPart->rev_set?m_pCPart->start:m_pCPart->end),0); + ,(m_pCPart->rev_set?m_pCPart->start:m_pCPart->end),nullptr); } void CommandExec::slotCmd_get() @@ -513,7 +513,7 @@ void CommandExec::slotCmd_copy() if (m_pCPart->url.count()<2) { bool force_move,ok; target = CopyMoveView_impl::getMoveCopyTo(&ok,&force_move,false, - m_pCPart->url[0],"",0,"move_name"); + m_pCPart->url[0],"",nullptr,"move_name"); if (!ok) { return; } @@ -536,7 +536,7 @@ void CommandExec::slotCmd_move() TQString target; if (m_pCPart->url.count()<2) { target = CopyMoveView_impl::getMoveCopyTo(&ok,&force_move,true, - m_pCPart->url[0],"",0,"move_name"); + m_pCPart->url[0],"",nullptr,"move_name"); if (!ok) { return; } @@ -598,7 +598,7 @@ bool CommandExec::askRevision() { TQString _head = m_pCPart->cmd+" - Revision"; KDialogBase dlg( - 0, + nullptr, "Revisiondlg", true, _head, diff --git a/src/svnfrontend/copymoveview_impl.h b/src/svnfrontend/copymoveview_impl.h index c4f8376..01def3a 100644 --- a/src/svnfrontend/copymoveview_impl.h +++ b/src/svnfrontend/copymoveview_impl.h @@ -29,7 +29,7 @@ class CopyMoveView_impl : public CopyMoveView public: - CopyMoveView_impl(const TQString&baseName,const TQString&sourceName,bool move,TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + CopyMoveView_impl(const TQString&baseName,const TQString&sourceName,bool move,TQWidget* parent = nullptr, const char* name = nullptr, WFlags fl = 0 ); ~CopyMoveView_impl(); virtual TQString newName(); bool force(); diff --git a/src/svnfrontend/createrepo_impl.h b/src/svnfrontend/createrepo_impl.h index 547d18b..8bcdc25 100644 --- a/src/svnfrontend/createrepo_impl.h +++ b/src/svnfrontend/createrepo_impl.h @@ -26,7 +26,7 @@ class Createrepo_impl: public CreateRepo_Dlg { TQ_OBJECT public: - Createrepo_impl(bool enable_compat13,bool enable_compat14, TQWidget *parent = 0, const char *name = 0); + Createrepo_impl(bool enable_compat13,bool enable_compat14, TQWidget *parent = nullptr, const char *name = nullptr); TQString targetDir(); TQString fsType(); bool disableFsync(); diff --git a/src/svnfrontend/dummydisplay.cpp b/src/svnfrontend/dummydisplay.cpp index 045bc84..6dc2bf1 100644 --- a/src/svnfrontend/dummydisplay.cpp +++ b/src/svnfrontend/dummydisplay.cpp @@ -31,12 +31,12 @@ DummyDisplay::~DummyDisplay() TQWidget*DummyDisplay::realWidget() { - return 0L; + return nullptr; } SvnItem*DummyDisplay::Selected() { - return 0L; + return nullptr; } void DummyDisplay::SelectionList(TQPtrList*) @@ -50,6 +50,6 @@ bool DummyDisplay::openURL( const KURL &,bool) SvnItem*DummyDisplay::SelectedOrMain() { - return 0; + return nullptr; } diff --git a/src/svnfrontend/dumprepo_impl.h b/src/svnfrontend/dumprepo_impl.h index 0ba89a1..e618be5 100644 --- a/src/svnfrontend/dumprepo_impl.h +++ b/src/svnfrontend/dumprepo_impl.h @@ -26,7 +26,7 @@ class DumpRepo_impl: public DumpRepoDlg { TQ_OBJECT public: - DumpRepo_impl(TQWidget *parent = 0, const char *name = 0); + DumpRepo_impl(TQWidget *parent = nullptr, const char *name = nullptr); TQString reposPath(); TQString targetFile(); bool incremental(); diff --git a/src/svnfrontend/editproperty_impl.h b/src/svnfrontend/editproperty_impl.h index ca1bbce..a46ec21 100644 --- a/src/svnfrontend/editproperty_impl.h +++ b/src/svnfrontend/editproperty_impl.h @@ -29,7 +29,7 @@ class EditProperty_impl: public EditPropsDlgData { TQ_OBJECT public: - EditProperty_impl(TQWidget *parent = 0, const char *name = 0); + EditProperty_impl(TQWidget *parent = nullptr, const char *name = nullptr); ~EditProperty_impl(); TQString propName()const; diff --git a/src/svnfrontend/filelistviewitem.cpp b/src/svnfrontend/filelistviewitem.cpp index 0eee5bc..da9ee3b 100644 --- a/src/svnfrontend/filelistviewitem.cpp +++ b/src/svnfrontend/filelistviewitem.cpp @@ -318,5 +318,5 @@ FileListViewItem*FileListViewItem::findChild(const TQString&aName) } _item = (FileListViewItem*)_item->nextSibling(); } - return 0L; + return nullptr; } diff --git a/src/svnfrontend/filelistviewitem.h b/src/svnfrontend/filelistviewitem.h index 4f130c9..2fb3263 100644 --- a/src/svnfrontend/filelistviewitem.h +++ b/src/svnfrontend/filelistviewitem.h @@ -45,7 +45,7 @@ public: virtual int compare( TQListViewItem* i, int col, bool ascending ) const; virtual void updateStatus(const svn::StatusPtr&s); - virtual void refreshStatus(bool childs=false,TQPtrList *exclude = 0,bool depsonly=false); + virtual void refreshStatus(bool childs=false,TQPtrList *exclude = nullptr,bool depsonly=false); #if 0 virtual void refreshMe(); diff --git a/src/svnfrontend/fillcachethread.cpp b/src/svnfrontend/fillcachethread.cpp index 574c808..886b4fb 100644 --- a/src/svnfrontend/fillcachethread.cpp +++ b/src/svnfrontend/fillcachethread.cpp @@ -31,7 +31,7 @@ #include FillCacheThread::FillCacheThread(TQObject*_parent,const TQString&reposRoot) - : TQThread(),mutex(),m_SvnContextListener(0) + : TQThread(),mutex(),m_SvnContextListener(nullptr) { m_Parent = _parent; m_CurrentContext = new svn::Context(); @@ -46,9 +46,9 @@ FillCacheThread::FillCacheThread(TQObject*_parent,const TQString&reposRoot) FillCacheThread::~FillCacheThread() { - m_CurrentContext->setListener(0); + m_CurrentContext->setListener(nullptr); delete m_Svnclient; - m_SvnContextListener=0; + m_SvnContextListener=nullptr; } const TQString&FillCacheThread::reposRoot()const diff --git a/src/svnfrontend/fronthelpers/checkoutinfo_impl.h b/src/svnfrontend/fronthelpers/checkoutinfo_impl.h index 8836ba0..75dbc70 100644 --- a/src/svnfrontend/fronthelpers/checkoutinfo_impl.h +++ b/src/svnfrontend/fronthelpers/checkoutinfo_impl.h @@ -29,7 +29,7 @@ class CheckoutInfo_impl: public CheckoutInfo { TQ_OBJECT public: - CheckoutInfo_impl(TQWidget *parent = 0, const char *name = 0); + CheckoutInfo_impl(TQWidget *parent = nullptr, const char *name = nullptr); virtual ~CheckoutInfo_impl(); svn::Revision toRevision(); diff --git a/src/svnfrontend/fronthelpers/propertylist.cpp b/src/svnfrontend/fronthelpers/propertylist.cpp index 3c09c39..a6ae448 100644 --- a/src/svnfrontend/fronthelpers/propertylist.cpp +++ b/src/svnfrontend/fronthelpers/propertylist.cpp @@ -131,7 +131,7 @@ void Propertylist::slotItemRenamed(TQListViewItem*_item,const TQString & text,in bool Propertylist::checkExisting(const TQString&aName,TQListViewItem*it) { if (!it) { - return findItem(aName,0)!=0; + return findItem(aName,0)!=nullptr; } TQListViewItemIterator iter(this); while ( iter.current() ) { diff --git a/src/svnfrontend/fronthelpers/propertylist.h b/src/svnfrontend/fronthelpers/propertylist.h index a777db0..cca6ca3 100644 --- a/src/svnfrontend/fronthelpers/propertylist.h +++ b/src/svnfrontend/fronthelpers/propertylist.h @@ -31,10 +31,10 @@ class Propertylist : public TDEListView TQ_OBJECT public: - Propertylist(TQWidget *parent = 0, const char *name = 0); + Propertylist(TQWidget *parent = nullptr, const char *name = nullptr); ~Propertylist(); - bool checkExisting(const TQString&aName,TQListViewItem*it=0); + bool checkExisting(const TQString&aName,TQListViewItem*it=nullptr); bool commitchanges()const{return m_commitit;} void setCommitchanges(bool how){m_commitit=how;} void addCallback(TQObject*); diff --git a/src/svnfrontend/fronthelpers/rangeinput_impl.h b/src/svnfrontend/fronthelpers/rangeinput_impl.h index eab11e3..64def43 100644 --- a/src/svnfrontend/fronthelpers/rangeinput_impl.h +++ b/src/svnfrontend/fronthelpers/rangeinput_impl.h @@ -28,7 +28,7 @@ class Rangeinput_impl: public RangeInputDlg { TQ_OBJECT public: - Rangeinput_impl(TQWidget *parent = 0, const char *name = 0); + Rangeinput_impl(TQWidget *parent = nullptr, const char *name = nullptr); virtual ~Rangeinput_impl(); typedef TQPair revision_range; diff --git a/src/svnfrontend/fronthelpers/revisionbuttonimpl.h b/src/svnfrontend/fronthelpers/revisionbuttonimpl.h index 04a04a0..8c84cd1 100644 --- a/src/svnfrontend/fronthelpers/revisionbuttonimpl.h +++ b/src/svnfrontend/fronthelpers/revisionbuttonimpl.h @@ -28,7 +28,7 @@ class RevisionButtonImpl: public RevisionButton { public: - RevisionButtonImpl(TQWidget *parent = 0, const char *name = 0); + RevisionButtonImpl(TQWidget *parent = nullptr, const char *name = nullptr); virtual ~RevisionButtonImpl(); virtual void setRevision(const svn::Revision&aRev); diff --git a/src/svnfrontend/graphtree/drawparams.cpp b/src/svnfrontend/graphtree/drawparams.cpp index 5dc6f6e..113d703 100644 --- a/src/svnfrontend/graphtree/drawparams.cpp +++ b/src/svnfrontend/graphtree/drawparams.cpp @@ -105,7 +105,7 @@ int StoredDrawParams::maxLines(int f) const const TQFont& StoredDrawParams::font() const { - static TQFont* f = 0; + static TQFont* f = nullptr; if (!f) f = new TQFont(TQApplication::font()); return *f; @@ -113,7 +113,7 @@ const TQFont& StoredDrawParams::font() const void StoredDrawParams::ensureField(int f) { - static Field* def = 0; + static Field* def = nullptr; if (!def) { def = new Field(); def->pos = Default; @@ -178,8 +178,8 @@ void StoredDrawParams::setMaxLines(int f, int m) RectDrawing::RectDrawing(TQRect r) { - _fm = 0; - _dp = 0; + _fm = nullptr; + _dp = nullptr; setRect(r); } @@ -377,7 +377,7 @@ bool RectDrawing::drawField(TQPainter* p, int f, DrawParams* dp) bool isBottom = false; bool isCenter = false; bool isRight = false; - int* used = 0; + int* used = nullptr; switch(pos) { case DrawParams::TopLeft: used = &_usedTopLeft; diff --git a/src/svnfrontend/graphtree/drawparams.h b/src/svnfrontend/graphtree/drawparams.h index 966541d..872f6b5 100644 --- a/src/svnfrontend/graphtree/drawparams.h +++ b/src/svnfrontend/graphtree/drawparams.h @@ -173,18 +173,18 @@ public: void setDrawParams(DrawParams*); // draw on a given TQPainter, use this class as info provider per default - void drawBack(TQPainter*, DrawParams* dp = 0); + void drawBack(TQPainter*, DrawParams* dp = nullptr); /* Draw field at position() from pixmap()/text() with maxLines(). * Returns true if something was drawn */ - bool drawField(TQPainter*, int f, DrawParams* dp = 0); + bool drawField(TQPainter*, int f, DrawParams* dp = nullptr); // resets rectangle for free space void setRect(TQRect); // Returns the rectangle area still free of text/pixmaps after // a number of drawText() calls. - TQRect remainingRect(DrawParams* dp = 0); + TQRect remainingRect(DrawParams* dp = nullptr); private: int _usedTopLeft, _usedTopCenter, _usedTopRight; diff --git a/src/svnfrontend/graphtree/graphtreelabel.cpp b/src/svnfrontend/graphtree/graphtreelabel.cpp index 4d29e6d..1e44662 100644 --- a/src/svnfrontend/graphtree/graphtreelabel.cpp +++ b/src/svnfrontend/graphtree/graphtreelabel.cpp @@ -158,7 +158,7 @@ GraphEdge*GraphEdgeArrow::edge() } /* taken from KCacheGrind project */ -TQPixmap*GraphMark::_p=0; +TQPixmap*GraphMark::_p=nullptr; GraphMark::GraphMark(GraphTreeLabel*n,TQCanvas*c) : TQCanvasRectangle(c) diff --git a/src/svnfrontend/graphtree/pannerview.h b/src/svnfrontend/graphtree/pannerview.h index 77fc724..e97a3c8 100644 --- a/src/svnfrontend/graphtree/pannerview.h +++ b/src/svnfrontend/graphtree/pannerview.h @@ -30,7 +30,7 @@ class PannerView : public TQCanvasView TQ_OBJECT public: - PannerView(TQWidget* parent=0, const char* name=0); + PannerView(TQWidget* parent=nullptr, const char* name=nullptr); virtual ~PannerView(); void setZoomRect(const TQRect& theValue); diff --git a/src/svnfrontend/graphtree/revgraphview.cpp b/src/svnfrontend/graphtree/revgraphview.cpp index 1a69323..100a8e8 100644 --- a/src/svnfrontend/graphtree/revgraphview.cpp +++ b/src/svnfrontend/graphtree/revgraphview.cpp @@ -79,13 +79,13 @@ void GraphViewTip::maybeTip( const TQPoint & pos) RevGraphView::RevGraphView(TQObject*aListener,svn::Client*_client,TQWidget * parent, const char * name, WFlags f) : TQCanvasView(parent,name,f) { - m_Canvas = 0L; + m_Canvas = nullptr; m_Client = _client; m_Listener = aListener; - dotTmpFile = 0; - m_Selected = 0; - renderProcess = 0; - m_Marker = 0; + dotTmpFile = nullptr; + m_Selected = nullptr; + renderProcess = nullptr; + m_Marker = nullptr; m_Tip = new GraphViewTip(this); m_CompleteView = new PannerView(this); m_CompleteView->setVScrollBarMode(TQScrollView::AlwaysOff); @@ -106,7 +106,7 @@ RevGraphView::RevGraphView(TQObject*aListener,svn::Client*_client,TQWidget * par RevGraphView::~RevGraphView() { - setCanvas(0); + setCanvas(nullptr); delete m_Canvas; delete dotTmpFile; delete m_CompleteView; @@ -133,18 +133,18 @@ void RevGraphView::clear() { if (m_Selected) { m_Selected->setSelected(false); - m_Selected=0; + m_Selected=nullptr; } if (m_Marker) { m_Marker->hide(); delete m_Marker; - m_Marker=0; + m_Marker=nullptr; } if (!m_Canvas) return; delete m_Canvas; - m_Canvas = 0; - setCanvas(0); - m_CompleteView->setCanvas(0); + m_Canvas = nullptr; + setCanvas(nullptr); + m_CompleteView->setCanvas(nullptr); } void RevGraphView::beginInsert() @@ -335,7 +335,7 @@ void RevGraphView::dotExit(TDEProcess*p) } endInsert(); delete p; - renderProcess=0; + renderProcess=nullptr; } bool RevGraphView::isStart(const TQString&nodeName)const @@ -505,7 +505,7 @@ void RevGraphView::dumpRevtree() } TQString error = i18n("Could not start process \"%1\".").arg(arguments); showText(error); - renderProcess=0; + renderProcess=nullptr; //delete renderProcess;< } } @@ -720,7 +720,7 @@ void RevGraphView::makeSelected(GraphTreeLabel*gtl) if (m_Marker) { m_Marker->hide(); delete m_Marker; - m_Marker=0; + m_Marker=nullptr; } if (gtl) { m_Marker = new GraphMark(gtl,m_Canvas); @@ -784,7 +784,7 @@ void RevGraphView::contentsContextMenuEvent(TQContextMenuEvent* e) { if (!m_Canvas) return; TQCanvasItemList l = canvas()->collisions(e->pos()); - TQCanvasItem* i = (l.count() == 0) ? 0 : l.first(); + TQCanvasItem* i = (l.count() == 0) ? nullptr : l.first(); TQPopupMenu popup; if (i && i->rtti()==GRAPHTREE_LABEL) { @@ -876,7 +876,7 @@ void RevGraphView::contentsContextMenuEvent(TQContextMenuEvent* e) } break; case 401: - makeSelected(0); + makeSelected(nullptr); break; case 402: makeSelected((GraphTreeLabel*)i); diff --git a/src/svnfrontend/graphtree/revgraphview.h b/src/svnfrontend/graphtree/revgraphview.h index 9e9b577..54b3382 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 * parent = 0, const char * name = 0, WFlags f = 0); + RevGraphView(TQObject*,svn::Client*,TQWidget * parent = nullptr, const char * name = nullptr, 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 1530a91..5bfdda8 100644 --- a/src/svnfrontend/graphtree/revisiontree.cpp +++ b/src/svnfrontend/graphtree/revisiontree.cpp @@ -74,11 +74,11 @@ public: RtreeData::RtreeData() : max_rev(-1),min_rev(-1) { - progress=0; - m_TreeDisplay = 0; - m_Client = 0; - dlgParent = 0; - m_Listener = 0; + progress=nullptr; + m_TreeDisplay = nullptr; + m_Client = nullptr; + dlgParent = nullptr; + m_Listener = nullptr; } RtreeData::~RtreeData() @@ -94,7 +94,7 @@ bool RtreeData::getLogs(const TQString&reposRoot,const svn::Revision&startr,cons try { CursorStack a(TQt::BusyCursor); StopDlg sdlg(m_Listener,dlgParent, - 0,"Logs",i18n("Getting logs - hit cancel for abort")); + nullptr,"Logs",i18n("Getting logs - hit cancel for abort")); if (svn::Url::isLocal(reposRoot) ) { m_Client->log(reposRoot,endr,startr,m_OldHistory,startr,true,false,0); } else { @@ -104,13 +104,13 @@ bool RtreeData::getLogs(const TQString&reposRoot,const svn::Revision&startr,cons } else if (Kdesvnsettings::network_on()) { m_Client->log(reposRoot,endr,startr,m_OldHistory,startr,true,false,0); } else { - KMessageBox::error(0,i18n("Could not retrieve logs, reason:\n%1").arg(i18n("No logcache possible due broken database and networking not allowed."))); + KMessageBox::error(nullptr,i18n("Could not retrieve logs, reason:\n%1").arg(i18n("No logcache possible due broken database and networking not allowed."))); return false; } } } catch (const svn::Exception&ce) { kdDebug()<m_TreeDisplay->dumpRevtree(); } else { delete m_Data->m_TreeDisplay; - m_Data->m_TreeDisplay = 0; + m_Data->m_TreeDisplay = nullptr; } } } else { diff --git a/src/svnfrontend/graphtree/revisiontree.h b/src/svnfrontend/graphtree/revisiontree.h index 211e3d4..278b69c 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*parent=0); + TQWidget*parent=nullptr); virtual ~RevisionTree(); bool isValid()const; diff --git a/src/svnfrontend/graphtree/revtreewidget.h b/src/svnfrontend/graphtree/revtreewidget.h index cecda25..4a6b35c 100644 --- a/src/svnfrontend/graphtree/revtreewidget.h +++ b/src/svnfrontend/graphtree/revtreewidget.h @@ -46,7 +46,7 @@ class RevTreeWidget : public TQWidget public: - RevTreeWidget(TQObject*,svn::Client*,TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + RevTreeWidget(TQObject*,svn::Client*,TQWidget* parent = nullptr, const char* name = nullptr, WFlags fl = 0 ); ~RevTreeWidget(); TQSplitter* m_Splitter; diff --git a/src/svnfrontend/hotcopydlg_impl.h b/src/svnfrontend/hotcopydlg_impl.h index 7d2857f..91fe01f 100644 --- a/src/svnfrontend/hotcopydlg_impl.h +++ b/src/svnfrontend/hotcopydlg_impl.h @@ -26,7 +26,7 @@ class HotcopyDlg_impl: public HotcopyDlg { TQ_OBJECT public: - HotcopyDlg_impl(TQWidget *parent = 0, const char *name = 0); + HotcopyDlg_impl(TQWidget *parent = nullptr, const char *name = nullptr); virtual ~HotcopyDlg_impl(); TQString srcPath()const; diff --git a/src/svnfrontend/importdir_logmsg.cpp b/src/svnfrontend/importdir_logmsg.cpp index ecf8e47..23fb527 100644 --- a/src/svnfrontend/importdir_logmsg.cpp +++ b/src/svnfrontend/importdir_logmsg.cpp @@ -53,7 +53,7 @@ Importdir_logmsg::Importdir_logmsg(TQWidget *parent, const char *name) tmpLayout->addWidget(m_ignoreUnknownNodes); //addItemWidget(m_ignoreUnknownNodes); } else { - m_ignoreUnknownNodes=0; + m_ignoreUnknownNodes=nullptr; } TQSpacerItem* m_leftspacer = new TQSpacerItem( 40, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); tmpLayout->addItem(m_leftspacer); diff --git a/src/svnfrontend/importdir_logmsg.h b/src/svnfrontend/importdir_logmsg.h index e07f4ae..ea1c170 100644 --- a/src/svnfrontend/importdir_logmsg.h +++ b/src/svnfrontend/importdir_logmsg.h @@ -31,7 +31,7 @@ class Importdir_logmsg : public Logmsg_impl TQ_OBJECT public: - Importdir_logmsg(TQWidget *parent = 0, const char *name = 0); + Importdir_logmsg(TQWidget *parent = nullptr, const char *name = nullptr); virtual ~Importdir_logmsg(); diff --git a/src/svnfrontend/loaddmpdlg_impl.h b/src/svnfrontend/loaddmpdlg_impl.h index f20f373..4a1dfd7 100644 --- a/src/svnfrontend/loaddmpdlg_impl.h +++ b/src/svnfrontend/loaddmpdlg_impl.h @@ -26,7 +26,7 @@ class LoadDmpDlg_impl: public LoadDmpDlg { TQ_OBJECT public: - LoadDmpDlg_impl(TQWidget *parent = 0, const char *name = 0); + LoadDmpDlg_impl(TQWidget *parent = nullptr, const char *name = nullptr); virtual ~LoadDmpDlg_impl(); bool usePost()const; bool usePre()const; diff --git a/src/svnfrontend/mergedlg_impl.cpp b/src/svnfrontend/mergedlg_impl.cpp index b046043..e7e2af8 100644 --- a/src/svnfrontend/mergedlg_impl.cpp +++ b/src/svnfrontend/mergedlg_impl.cpp @@ -183,7 +183,7 @@ bool MergeDlg_impl::getMergeRange(Rangeinput_impl::revision_range&range,bool*for bool*useExternal, TQWidget*parent,const char*name) { - MergeDlg_impl*ptr = 0; + MergeDlg_impl*ptr = nullptr; KDialogBase dlg(parent,name,true,i18n("Enter merge range"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Help, KDialogBase::Ok,true); diff --git a/src/svnfrontend/mergedlg_impl.h b/src/svnfrontend/mergedlg_impl.h index d070fc9..420d6f0 100644 --- a/src/svnfrontend/mergedlg_impl.h +++ b/src/svnfrontend/mergedlg_impl.h @@ -27,7 +27,7 @@ class MergeDlg_impl: public MergeDlg { TQ_OBJECT public: - MergeDlg_impl(TQWidget *parent = 0, const char *name = 0,bool src1=true,bool src2=true,bool out=true); + MergeDlg_impl(TQWidget *parent = nullptr, const char *name = nullptr,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*parent=0,const char*name=0); + bool*force,bool*recursive,bool*ignorerelated,bool*dry,bool*useExternal,TQWidget*parent=nullptr,const char*name=nullptr); protected slots: virtual void externDisplayToggled(bool); diff --git a/src/svnfrontend/modifiedthread.cpp b/src/svnfrontend/modifiedthread.cpp index 74bff8e..d396ee5 100644 --- a/src/svnfrontend/modifiedthread.cpp +++ b/src/svnfrontend/modifiedthread.cpp @@ -28,7 +28,7 @@ #include CheckModifiedThread::CheckModifiedThread(TQObject*_parent,const TQString&what,bool _updates) - : TQThread(),mutex(),m_ContextListener(0) + : TQThread(),mutex(),m_ContextListener(nullptr) { m_Parent = _parent; m_CurrentContext = new svn::Context(); @@ -43,9 +43,9 @@ CheckModifiedThread::CheckModifiedThread(TQObject*_parent,const TQString&what,bo CheckModifiedThread::~CheckModifiedThread() { - m_CurrentContext->setListener(0); + m_CurrentContext->setListener(nullptr); delete m_Svnclient; - m_ContextListener=0; + m_ContextListener=nullptr; } void CheckModifiedThread::cancelMe() diff --git a/src/svnfrontend/opencontextmenu.cpp b/src/svnfrontend/opencontextmenu.cpp index b30956e..da73c56 100644 --- a/src/svnfrontend/opencontextmenu.cpp +++ b/src/svnfrontend/opencontextmenu.cpp @@ -54,7 +54,7 @@ void OpenContextmenu::setup() if (m_List.count()>0) { insertSeparator( ); } - act = new TDEAction(i18n("Other..."),0, 0, + act = new TDEAction(i18n("Other..."),nullptr, 0, this, TQ_SLOT( slotOpenWith() ),this,"openwith"); act->plug(this); } diff --git a/src/svnfrontend/propertiesdlg.cpp b/src/svnfrontend/propertiesdlg.cpp index 1060363..666ab63 100644 --- a/src/svnfrontend/propertiesdlg.cpp +++ b/src/svnfrontend/propertiesdlg.cpp @@ -67,7 +67,7 @@ PropertiesDlg::PropertiesDlg(SvnItem*which, svn::Client*aClient, const svn::Revi m_PropertiesListview->setFullWidth( true ); PropertiesDlgLayout->addWidget( m_PropertiesListview); - m_rightLayout = new TQVBoxLayout(0, marginHint(), spacingHint(), "m_rightLayout"); + m_rightLayout = new TQVBoxLayout(nullptr, marginHint(), spacingHint(), "m_rightLayout"); m_AddButton = new KPushButton(m, "m_AddButton" ); m_rightLayout->addWidget( m_AddButton ); m_ModifyButton = new KPushButton(m, "m_ModifyButton" ); diff --git a/src/svnfrontend/propertiesdlg.h b/src/svnfrontend/propertiesdlg.h index fc0d289..e396098 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* parent = 0, const char* name = 0, bool modal = true); + TQWidget* parent = nullptr, const char* name = nullptr, bool modal = true); ~PropertiesDlg(); bool hasChanged()const; diff --git a/src/svnfrontend/stopdlg.cpp b/src/svnfrontend/stopdlg.cpp index 1a5b11e..0adb200 100644 --- a/src/svnfrontend/stopdlg.cpp +++ b/src/svnfrontend/stopdlg.cpp @@ -37,7 +37,7 @@ 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) + cstack(nullptr) { KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon()); m_lastLogLines = 0; @@ -60,7 +60,7 @@ StopDlg::StopDlg(TQObject*listener,TQWidget *parent, const char *name,const TQSt layout->addWidget(m_NetBar); mWait = false; - m_LogWindow = 0; + m_LogWindow = nullptr; connect(mShowTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoShow())); if (m_Context) { @@ -82,7 +82,7 @@ void StopDlg::showEvent( TQShowEvent*) void StopDlg::hideEvent(TQHideEvent*) { - delete cstack; cstack = 0; + delete cstack; cstack = nullptr; } void StopDlg::slotWait(bool how) @@ -198,7 +198,7 @@ void StopDlg::slotNetProgres(long long int current, long long int max) } StopSimpleDlg::StopSimpleDlg(TQWidget *parent, const char *name,const TQString&caption,const TQString&text) - : StopDlg(0,parent,name,caption,text),cancelld(false) + : StopDlg(nullptr,parent,name,caption,text),cancelld(false) { connect(this,TQ_SIGNAL(sigCancel(bool)),this,TQ_SLOT(slotSimpleCancel(bool))); } diff --git a/src/svnfrontend/stopdlg.h b/src/svnfrontend/stopdlg.h index fbddd8e..a6584d0 100644 --- a/src/svnfrontend/stopdlg.h +++ b/src/svnfrontend/stopdlg.h @@ -43,7 +43,7 @@ class StopDlg : public KDialogBase TQ_OBJECT public: - StopDlg(TQObject*,TQWidget *parent = 0, const char *name = 0,const TQString&caption=TQString(),const TQString&text=TQString()); + StopDlg(TQObject*,TQWidget *parent = nullptr, const char *name = nullptr,const TQString&caption=TQString(),const TQString&text=TQString()); virtual ~StopDlg(); bool cancelld(); @@ -89,7 +89,7 @@ class StopSimpleDlg:public StopDlg TQ_OBJECT public: - StopSimpleDlg(TQWidget *parent = 0, const char *name = 0,const TQString&caption=TQString(),const TQString&text=TQString()); + StopSimpleDlg(TQWidget *parent = nullptr, const char *name = nullptr,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 61da436..9cbe21a 100644 --- a/src/svnfrontend/svnactions.cpp +++ b/src/svnfrontend/svnactions.cpp @@ -101,8 +101,8 @@ class SvnActionsData:public svn::ref_count public: SvnActionsData():ref_count() { - m_Svnclient = svn::Client::getobject(0,0); - m_CurrentContext = 0; + m_Svnclient = svn::Client::getobject(nullptr,0); + m_CurrentContext = nullptr; } virtual ~SvnActionsData() @@ -126,11 +126,11 @@ public: for (it=m_tempdirlist.begin();it!=m_tempdirlist.end();++it) { for (TQStringList::iterator it2 = (*it).begin(); it2 != (*it).end();++it2) { - TDEIO::NetAccess::del((*it2),0); + TDEIO::NetAccess::del((*it2),nullptr); } } delete m_Svnclient; - m_Svnclient = 0L; + m_Svnclient = nullptr; } bool isExternalDiff() @@ -157,12 +157,12 @@ public: if (m_DiffDialog) { m_DiffDialog->saveDialogSize(*(Kdesvnsettings::self()->config()),"diff_display",false); delete m_DiffDialog; - m_DiffDialog=0; + m_DiffDialog=nullptr; } if (m_LogDialog) { m_LogDialog->saveSize(); delete m_LogDialog; - m_LogDialog=0; + m_LogDialog=nullptr; } } @@ -200,11 +200,11 @@ public: #define DIALOGS_SIZES "display_dialogs_sizes" SvnActions::SvnActions(ItemDisplay *parent, const char *name,bool processes_blocked) - : TQObject(parent?parent->realWidget():0, name),SimpleLogCb() + : TQObject(parent?parent->realWidget():nullptr, name),SimpleLogCb() { - m_CThread = 0; - m_UThread = 0; - m_FCThread = 0; + m_CThread = nullptr; + m_UThread = nullptr; + m_FCThread = nullptr; m_Data = new SvnActionsData(); m_Data->m_ParentList = parent; m_Data->m_SvnContextListener = new CContextListener(this); @@ -233,7 +233,7 @@ void SvnActions::reInitClient() { m_Data->clearCaches(); m_Data->cleanDialogs(); - if (m_Data->m_CurrentContext) m_Data->m_CurrentContext->setListener(0L); + if (m_Data->m_CurrentContext) m_Data->m_CurrentContext->setListener(nullptr); m_Data->m_CurrentContext = new svn::Context(); m_Data->m_CurrentContext->setListener(m_Data->m_SvnContextListener); m_Data->m_Svnclient->setContext(m_Data->m_CurrentContext); @@ -252,7 +252,7 @@ template KDialogBase* SvnActions::createDialog(T**ptr,const TQString&_h buttons = buttons|KDialogBase::User1; } KDialogBase * dlg = new KDialogBase( - modal?TDEApplication::activeModalWidget():0, // parent + modal?TDEApplication::activeModalWidget():nullptr, // parent name, // name modal, // modal _head, // caption @@ -283,13 +283,13 @@ svn::SharedPointer SvnActions::getLog(const svn::Revision&st int limit,TQWidget*parent) { svn::SharedPointer logs = new svn::LogEntriesMap; - if (!m_Data->m_CurrentContext) return 0; + if (!m_Data->m_CurrentContext) return nullptr; bool follow = Kdesvnsettings::log_follows_nodes(); kdDebug()<<"Get logs for "<< which<m_SvnContextListener,(parent?parent:m_Data->m_ParentList->realWidget()),0,"Logs", + StopDlg sdlg(m_Data->m_SvnContextListener,(parent?parent:m_Data->m_ParentList->realWidget()),nullptr,"Logs", i18n("Getting logs - hit cancel for abort")); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); if (doNetworking()) { @@ -297,7 +297,7 @@ svn::SharedPointer SvnActions::getLog(const svn::Revision&st } else { svn::InfoEntry e; if (!singleInfo(m_Data->m_ParentList->baseUri(),svn::Revision::BASE,e)) { - return 0; + return nullptr; } if (svn::Url::isLocal(e.reposRoot())) { m_Data->m_Svnclient->log(which,start,end,*logs,peg,list_files,!follow,limit); @@ -316,11 +316,11 @@ svn::SharedPointer SvnActions::getLog(const svn::Revision&st } } catch (const svn::Exception&e) { emit clientException(e.msg()); - return 0; + return nullptr; } if (!logs) { emit clientException(i18n("Got no logs")); - return 0; + return nullptr; } return logs; } @@ -483,9 +483,9 @@ void SvnActions::makeLog(const svn::Revision&start,const svn::Revision&end,const kdDebug()<<"getting logs..."< logs = getLog(start,end,peg,which,list_files,limit); if (!logs) return; - bool need_modal = m_Data->runblocked||TDEApplication::activeModalWidget()!=0; + bool need_modal = m_Data->runblocked||TDEApplication::activeModalWidget(); if (need_modal||!m_Data->m_LogDialog) { - m_Data->m_LogDialog=new SvnLogDlgImp(this,0,"logdialog",need_modal); + m_Data->m_LogDialog=new SvnLogDlgImp(this,nullptr,"logdialog",need_modal); connect(m_Data->m_LogDialog,TQ_SIGNAL(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), this,TQ_SLOT(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*))); connect(m_Data->m_LogDialog,TQ_SIGNAL(makeCat(const svn::Revision&, const TQString&,const TQString&,const svn::Revision&,TQWidget*)), @@ -527,7 +527,7 @@ void SvnActions::makeBlame(const svn::Revision&start, const svn::Revision&end,co try { CursorStack a(TQt::BusyCursor); - StopDlg sdlg(m_Data->m_SvnContextListener,_parent,0,"Annotate",i18n("Annotate lines - hit cancel for abort")); + StopDlg sdlg(m_Data->m_SvnContextListener,_parent,nullptr,"Annotate",i18n("Annotate lines - hit cancel for abort")); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->annotate(blame,p,start,end,peg); } catch (const svn::Exception&e) { @@ -553,7 +553,7 @@ bool SvnActions::makeGet(const svn::Revision&start, const TQString&what, const T svn::Path p(what); try { StopDlg sdlg(m_Data->m_SvnContextListener,dlgp, - 0,"Content get",i18n("Getting content - hit cancel for abort")); + nullptr,"Content get",i18n("Getting content - hit cancel for abort")); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->get(p,target,start,peg); } catch (const svn::Exception&e) { @@ -671,7 +671,7 @@ TQString SvnActions::getInfo(const TQString& _what,const svn::Revision&rev,const svn::InfoEntries entries; if (recursive) { try { - StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,"Details", + StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),nullptr,"Details", i18n("Retrieving infos - hit cancel for abort")); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); svn::InfoEntries e; @@ -883,7 +883,7 @@ void SvnActions::slotProperties() bool SvnActions::changeProperties(const svn::PropertiesMap&setList,const TQValueList&delList,const TQString&path) { try { - StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,"Applying properties","
Applying
hit cancel for abort
"); + StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),nullptr,"Applying properties","
Applying
hit cancel for abort
"); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); unsigned int pos; for (pos = 0; posm_ParentList->relativePath(cur) @@ -963,7 +963,7 @@ bool SvnActions::makeCommit(const svn::Targets&targets) for (unsigned j = 0; j < targets.size(); ++j) { svn::Revision where = svn::Revision::HEAD; try { - StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Status / List"),i18n("Creating list / check status")); + StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),nullptr,i18n("Status / List"),i18n("Creating list / check status")); _Cache = m_Data->m_Svnclient->status(targets.target(j).path(),svn::DepthInfinity,false,false,false,where); } catch (const svn::Exception&e) { emit clientException(e.msg()); @@ -1022,7 +1022,7 @@ bool SvnActions::makeCommit(const svn::Targets&targets) } try { - StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Commiting"), + StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),nullptr,i18n("Commiting"), i18n("Commiting - hit cancel for abort")); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); nnum = m_Data->m_Svnclient->commit(_targets,msg,depth,keeplocks); @@ -1068,7 +1068,7 @@ void SvnActions::procClosed(TDEProcess*proc) if ( (it=m_Data->m_tempdirlist.find(proc))!=m_Data->m_tempdirlist.end()) { for (TQStringList::iterator it2 = (*it).begin(); it2 != (*it).end();++it2) { - TDEIO::NetAccess::del((*it2),0); + TDEIO::NetAccess::del((*it2),nullptr); } m_Data->m_tempdirlist.erase(it); } @@ -1083,7 +1083,7 @@ bool SvnActions::get(const TQString&what,const TQString& to,const svn::Revision& } try { - StopDlg sdlg(m_Data->m_SvnContextListener,p?p:m_Data->m_ParentList->realWidget(),0,"Downloading", + StopDlg sdlg(m_Data->m_SvnContextListener,p?p:m_Data->m_ParentList->realWidget(),nullptr,"Downloading", i18n("Download - hit cancel for abort")); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->get(svn::Path(what), @@ -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,parent,0,"Diffing", + StopDlg sdlg(m_Data->m_SvnContextListener,parent,nullptr,"Diffing", i18n("Diffing - hit cancel for abort")); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); if (p1==p2 && (r1.isRemote()||r2.isRemote())) { @@ -1299,7 +1299,7 @@ void SvnActions::makeNorecDiff(const TQString&p1,const svn::Revision&r1,const TQ TQString tn = TQString("%1/%2").arg(tdir.name()).arg("/svndiff"); bool ignore_content = Kdesvnsettings::diff_ignore_content(); try { - StopDlg sdlg(m_Data->m_SvnContextListener,_p?_p:m_Data->m_ParentList->realWidget(),0,"Diffing","Diffing - hit cancel for abort"); + StopDlg sdlg(m_Data->m_SvnContextListener,_p?_p:m_Data->m_ParentList->realWidget(),nullptr,"Diffing","Diffing - hit cancel for abort"); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); ex = m_Data->m_Svnclient->diff(svn::Path(tn), svn::Path(p1),svn::Path(p2),svn::Path(), @@ -1356,7 +1356,7 @@ void SvnActions::dispDiff(const TQByteArray&ex) } delete proc; } - bool need_modal = m_Data->runblocked||TDEApplication::activeModalWidget()!=0; + bool need_modal = m_Data->runblocked||TDEApplication::activeModalWidget(); if (need_modal||!m_Data->m_DiffBrowserPtr||!m_Data->m_DiffDialog) { DiffBrowser*ptr; @@ -1407,7 +1407,7 @@ void SvnActions::makeUpdate(const TQStringList&what,const svn::Revision&rev,bool svn::Revisions ret; stopCheckUpdateThread(); try { - StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,"Making update", + StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),nullptr,"Making update", i18n("Making update - hit cancel for abort")); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); svn::Targets pathes(what); @@ -1445,7 +1445,7 @@ void SvnActions::prepareUpdate(bool ask) } else { SvnItemListIterator liter(k); SvnItem*cur; - while ((cur=liter.current())!=0){ + while ((cur=liter.current()) != nullptr){ ++liter; what.append(cur->fullName()); } @@ -1507,7 +1507,7 @@ void SvnActions::makeAdd(bool rec) TQValueList items; SvnItemListIterator liter(lst); SvnItem*cur; - while ((cur=liter.current())!=0){ + while ((cur=liter.current()) != nullptr){ ++liter; if (cur->isVersioned()) { KMessageBox::error(m_Data->m_ParentList->realWidget(),i18n("
The entry
%1
is versioned - break.
") @@ -1519,14 +1519,14 @@ void SvnActions::makeAdd(bool rec) addItems(items,rec?svn::DepthInfinity:svn::DepthEmpty); liter.toFirst(); #if 0 - while ((cur=liter.current())!=0){ + while ((cur=liter.current()) != nullptr){ ++liter; //cur->refreshStatus(); //emit sigRefreshCurrent(static_cast(cur->parent())); } #else - emit sigRefreshCurrent(0); + emit sigRefreshCurrent(nullptr); #endif } @@ -1556,7 +1556,7 @@ bool SvnActions::addItems(const TQValueList &items,svn::Depth depth) bool SvnActions::makeDelete(const TQStringList&w) { - int answer = KMessageBox::questionYesNoList(0,i18n("Really delete these entries?"),w,i18n("Delete from repository")); + int answer = KMessageBox::questionYesNoList(nullptr,i18n("Really delete these entries?"),w,i18n("Delete from repository")); if (answer!=KMessageBox::Yes) { return false; } @@ -1619,7 +1619,7 @@ void SvnActions::CheckoutExport(bool _exp) _exp, openit, ignoreExternal, - ptr->overwrite(),0); + ptr->overwrite(),nullptr); } dlg->saveDialogSize(*(Kdesvnsettings::self()->config()),"checkout_export_dialog",false); delete dlg; @@ -1640,7 +1640,7 @@ void SvnActions::CheckoutExport(const TQString&what,bool _exp,bool urlisTarget) svn::Revision r = ptr->toRevision(); bool openIt = ptr->openAfterJob(); bool ignoreExternal = ptr->ignoreExternals(); - makeCheckout(ptr->reposURL(),ptr->targetDir(),r,r,ptr->getDepth(),_exp,openIt,ignoreExternal,ptr->overwrite(),0); + makeCheckout(ptr->reposURL(),ptr->targetDir(),r,r,ptr->getDepth(),_exp,openIt,ignoreExternal,ptr->overwrite(),nullptr); } delete dlg; } @@ -1688,7 +1688,7 @@ bool SvnActions::makeCheckout(const TQString&rUrl,const TQString&tPath,const svn } if (!_exp||!m_Data->m_CurrentContext) reInitClient(); try { - StopDlg sdlg(m_Data->m_SvnContextListener,_p?_p:m_Data->m_ParentList->realWidget(),0,_exp?i18n("Export"):i18n("Checkout"),_exp?i18n("Exporting"):i18n("Checking out")); + StopDlg sdlg(m_Data->m_SvnContextListener,_p?_p:m_Data->m_ParentList->realWidget(),nullptr,_exp?i18n("Export"):i18n("Checkout"),_exp?i18n("Exporting"):i18n("Checking out")); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); if (_exp) { /// @todo setup parameter for export operation @@ -1718,7 +1718,7 @@ void SvnActions::slotRevert() SvnItemListIterator liter(lst); SvnItem*cur; if (lst.count()>0) { - while ((cur=liter.current())!=0){ + while ((cur=liter.current()) != nullptr){ if (!cur->isVersioned()) { KMessageBox::error(m_Data->m_ParentList->realWidget(),i18n("
The entry
%1
is not versioned - break.
") .arg(cur->fullName())); @@ -1761,7 +1761,7 @@ void SvnActions::slotRevertItems(const TQStringList&displist) TQString ex; try { - StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Revert"),i18n("Reverting items")); + StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),nullptr,i18n("Revert"),i18n("Reverting items")); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); svn::Targets target(items); m_Data->m_Svnclient->revert(target,depth); @@ -1787,7 +1787,7 @@ bool SvnActions::makeSwitch(const TQString&rUrl,const TQString&tPath,const svn:: } svn::Path p(tPath); try { - StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Switch url"),i18n("Switching url")); + StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),nullptr,i18n("Switch url"),i18n("Switching url")); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->doSwitch(p,fUrl,r,depth,peg,stickydepth,ignore_externals,allow_unversioned); } catch (const svn::Exception&e) { @@ -1812,7 +1812,7 @@ bool SvnActions::makeRelocate(const TQString&fUrl,const TQString&tUrl,const TQSt } svn::Path p(path); try { - StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Relocate url"),i18n("Relocate repository to new URL")); + StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),nullptr,i18n("Relocate url"),i18n("Relocate repository to new URL")); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->relocate(p,_f,_t,rec); } catch (const svn::Exception&e) { @@ -1832,14 +1832,14 @@ void SvnActions::slotSwitch() m_Data->m_ParentList->SelectionList(&lst); if (lst.count()>1) { - KMessageBox::error(0,i18n("Can only switch one item at time")); + KMessageBox::error(nullptr,i18n("Can only switch one item at time")); return; } SvnItem*k; k = m_Data->m_ParentList->SelectedOrMain(); if (!k) { - KMessageBox::error(0,i18n("Error getting entry to switch")); + KMessageBox::error(nullptr,i18n("Error getting entry to switch")); return; } TQString path,what; @@ -1874,7 +1874,7 @@ bool SvnActions::makeCleanup(const TQString&path) { if (!m_Data->m_CurrentContext) return false; try { - StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Cleanup"),i18n("Cleaning up folder")); + StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),nullptr,i18n("Cleanup"),i18n("Cleaning up folder")); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->cleanup(svn::Path(path)); } catch (const svn::Exception&e) { @@ -1888,7 +1888,7 @@ void SvnActions::slotResolved(const TQString&path) { if (!m_Data->m_CurrentContext) return; try { - StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Resolve"),i18n("Marking resolved")); + StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),nullptr,i18n("Resolve"),i18n("Marking resolved")); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->resolve(svn::Path(path),svn::DepthEmpty); } catch (const svn::Exception&e) { @@ -1955,7 +1955,7 @@ void SvnActions::slotImport(const TQString&path,const TQString&target,const TQSt { if (!m_Data->m_CurrentContext) return; try { - StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Import"),i18n("Importing items")); + StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),nullptr,i18n("Import"),i18n("Importing items")); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->import(svn::Path(path),target,message,depth,noIgnore,noUnknown); } catch (const svn::Exception&e) { @@ -2049,7 +2049,7 @@ void SvnActions::slotMergeExternal(const TQString&_src1,const TQString&_src2, co true, false, false, - false,0)) { + false,nullptr)) { return; } } else { @@ -2064,7 +2064,7 @@ void SvnActions::slotMergeExternal(const TQString&_src1,const TQString&_src2, co if (isDir) { if (!makeCheckout(src2,second,rev2,svn::Revision::UNDEFINED, rec?svn::DepthInfinity:svn::DepthFiles, - true,false,false,false,0)) { + true,false,false,false,nullptr)) { return; } } else { @@ -2146,7 +2146,7 @@ void SvnActions::slotMerge(const TQString&src1,const TQString&src2, const TQStri } } try { - StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Merge"),i18n("Merging items")); + StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),nullptr,i18n("Merge"),i18n("Merging items")); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); if (pegged_merge) { m_Data->m_Svnclient->merge_peg(p1,ranges,svn::Revision::HEAD,svn::Path(target),rec?svn::DepthUnknown:svn::DepthFiles, @@ -2170,7 +2170,7 @@ bool SvnActions::makeMove(const TQString&Old,const TQString&New,bool force) if (!m_Data->m_CurrentContext) return false; svn::Revision nnum; try { - StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Move"),i18n("Moving/Rename item ")); + StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),nullptr,i18n("Move"),i18n("Moving/Rename item ")); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); nnum = m_Data->m_Svnclient->move(svn::Path(Old),svn::Path(New),force); } catch (const svn::Exception&e) { @@ -2188,7 +2188,7 @@ bool SvnActions::makeMove(const KURL::List&Old,const TQString&New,bool force) { svn::Revision nnum; try { - StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Move"),i18n("Moving entries")); + StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),nullptr,i18n("Move"),i18n("Moving entries")); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); KURL::List::ConstIterator it = Old.begin(); bool local = false; @@ -2215,7 +2215,7 @@ bool SvnActions::makeCopy(const TQString&Old,const TQString&New,const svn::Revis { if (!m_Data->m_CurrentContext) return false; try { - StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Copy / Move"),i18n("Copy or Moving entries")); + StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),nullptr,i18n("Copy / Move"),i18n("Copy or Moving entries")); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->copy(svn::Path(Old),rev,svn::Path(New)); } catch (const svn::Exception&e) { @@ -2240,7 +2240,7 @@ bool SvnActions::makeCopy(const KURL::List&Old,const TQString&New,const svn::Rev svn::Targets t(p); try { - StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Copy / Move"),i18n("Copy or Moving entries")); + StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),nullptr,i18n("Copy / Move"),i18n("Copy or Moving entries")); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); KURL::List::ConstIterator it = Old.begin(); m_Data->m_Svnclient->copy(t,rev,rev,svn::Path(New),true); @@ -2309,7 +2309,7 @@ bool SvnActions::makeStatus(const TQString&what, svn::StatusEntries&dlist, svn:: TQString ex; svn::Depth _d=rec?svn::DepthInfinity:svn::DepthImmediates; try { - StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Status / List"),i18n("Creating list / check status")); + StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),nullptr,i18n("Status / List"),i18n("Creating list / check status")); connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); // rec all up noign dlist = m_Data->m_Svnclient->status(what,_d,all,updates,display_ignores,where,disp_remote_details,false); @@ -2374,7 +2374,7 @@ void SvnActions::stopCheckModThread() m_CThread->wait(MAX_THREAD_WAITTIME); } delete m_CThread; - m_CThread=0; + m_CThread=nullptr; } } @@ -2388,7 +2388,7 @@ void SvnActions::stopCheckUpdateThread() m_UThread->wait(MAX_THREAD_WAITTIME); } delete m_UThread; - m_UThread=0; + m_UThread=nullptr; } } @@ -2401,7 +2401,7 @@ void SvnActions::stopFillCache() m_FCThread->wait(MAX_THREAD_WAITTIME); } delete m_FCThread; - m_FCThread = 0; + m_FCThread = nullptr; emit sigCacheStatus(-1,-1); } } @@ -2458,7 +2458,7 @@ void SvnActions::checkModthread() } } delete m_CThread; - m_CThread = 0; + m_CThread = nullptr; emit sigRefreshIcons(false); } @@ -2497,7 +2497,7 @@ void SvnActions::checkUpdateThread() emit sendNotify(i18n("There are new items in repository")); } delete m_UThread; - m_UThread = 0; + m_UThread = nullptr; } void SvnActions::getaddedItems(const TQString&path,svn::StatusEntries&target) diff --git a/src/svnfrontend/svnactions.h b/src/svnfrontend/svnactions.h index f5a79e0..30812ee 100644 --- a/src/svnfrontend/svnactions.h +++ b/src/svnfrontend/svnactions.h @@ -71,7 +71,7 @@ public: checkmodifiedthread }; - SvnActions(ItemDisplay *parent, const char *name = 0,bool processes_blocked=false); + SvnActions(ItemDisplay *parent, const char *name = nullptr,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*dlgparent=0); + const svn::Revision&peg=svn::Revision::UNDEFINED,TQWidget*dlgparent=nullptr); bool addItems(const TQValueList &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 getLog(const svn::Revision&start,const svn::Revision& end,const svn::Revision&peg,const TQString&,bool list_files, int limit,TQWidget*parent=0); + svn::SharedPointer getLog(const svn::Revision&start,const svn::Revision& end,const svn::Revision&peg,const TQString&,bool list_files, int limit,TQWidget*parent=nullptr); 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*parent=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=nullptr,const svn::Revision&peg=svn::Revision::UNDEFINED,SimpleLogCb*_acb=nullptr); 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); diff --git a/src/svnfrontend/svnfiletip.cpp b/src/svnfrontend/svnfiletip.cpp index 3b42575..20bcbfd 100644 --- a/src/svnfrontend/svnfiletip.cpp +++ b/src/svnfrontend/svnfiletip.cpp @@ -34,15 +34,15 @@ #include SvnFileTip::SvnFileTip(TQScrollView*parent) - : TQFrame( 0, 0, WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop | WX11BypassWM ), + : TQFrame( nullptr, nullptr, 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( parent ), - m_svnitem( 0 ), - m_previewJob( 0 ) + m_svnitem( nullptr ), + m_previewJob( nullptr ) { m_iconLabel = new TQLabel(this); m_textLabel = new TQLabel(this); @@ -67,7 +67,7 @@ SvnFileTip::~SvnFileTip() { if ( m_previewJob ) { m_previewJob->kill(); - m_previewJob = 0; + m_previewJob = nullptr; } } @@ -95,7 +95,7 @@ void SvnFileTip::setItem(SvnItem*item, const TQRect &rect, const TQPixmap *pixma if ( m_previewJob ) { m_previewJob->kill(); - m_previewJob = 0; + m_previewJob = nullptr; } m_rect = rect; @@ -164,7 +164,7 @@ void SvnFileTip::reposition() void SvnFileTip::gotPreview( const KFileItem* item, const TQPixmap& pixmap ) { - m_previewJob = 0; + m_previewJob = nullptr; if (!m_svnitem || item != m_svnitem->fileItem()) return; m_iconLabel -> setPixmap(pixmap); @@ -172,7 +172,7 @@ void SvnFileTip::gotPreview( const KFileItem* item, const TQPixmap& pixmap ) void SvnFileTip::gotPreviewResult() { - m_previewJob = 0; + m_previewJob = nullptr; } void SvnFileTip::drawContents( TQPainter *p ) @@ -268,7 +268,7 @@ void SvnFileTip::startDelayed() KFileItemList oneItem; oneItem.append( m_svnitem->fileItem() ); - m_previewJob = TDEIO::filePreview( oneItem, 256, 256, 64, 70, true, true, 0); + m_previewJob = TDEIO::filePreview( oneItem, 256, 256, 64, 70, true, true, nullptr); connect( m_previewJob, TQ_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ), this, TQ_SLOT( gotPreview( const KFileItem *, const TQPixmap & ) ) ); connect( m_previewJob, TQ_SIGNAL( result( TDEIO::Job * ) ), diff --git a/src/svnfrontend/svnfiletip.h b/src/svnfrontend/svnfiletip.h index 65486cc..82e0943 100644 --- a/src/svnfrontend/svnfiletip.h +++ b/src/svnfrontend/svnfiletip.h @@ -59,7 +59,7 @@ public: @param pixmap the pixmap to be shown. If 0, no pixmap is shown */ void setItem(SvnItem*item, const TQRect &rect = TQRect(), - const TQPixmap *pixmap = 0 ); + const TQPixmap *pixmap = nullptr ); virtual bool eventFilter( TQObject *, TQEvent *e ); diff --git a/src/svnfrontend/svnitem.cpp b/src/svnfrontend/svnitem.cpp index bfe5b8b..dd1ac73 100644 --- a/src/svnfrontend/svnitem.cpp +++ b/src/svnfrontend/svnitem.cpp @@ -88,7 +88,7 @@ void SvnItem_p::init() { m_full = m_Stat->path(); m_kdename=""; - mptr = 0; + mptr = nullptr; lRev=svn::Revision::UNDEFINED; while (m_full.endsWith("/")) { /* dir name possible */ @@ -104,7 +104,7 @@ void SvnItem_p::init() m_url = m_Stat->entry().url(); m_fullDate = svn::DateTime(m_Stat->entry().cmtDate()); m_infoText = TQString(); - m_fitem = 0; + m_fitem = nullptr; } KMimeType::Ptr SvnItem_p::mimeType(bool dir) @@ -148,7 +148,7 @@ KFileItem*SvnItem_p::createItem(const svn::Revision&peg) { if (!m_fitem||!(peg==lRev) ) { delete m_fitem; - m_fitem=0; + m_fitem=nullptr; m_fitem=new KFileItem(KFileItem::Unknown,KFileItem::Unknown,kdeName(peg)); } return m_fitem; diff --git a/src/svnfrontend/svnitem.h b/src/svnfrontend/svnitem.h index 73b7c9a..328e2a6 100644 --- a/src/svnfrontend/svnitem.h +++ b/src/svnfrontend/svnitem.h @@ -68,12 +68,12 @@ public: virtual TQString getParentDir()const=0; virtual SvnItem* getParentItem()const=0; virtual const svn::Revision&correctPeg()const=0; - virtual void refreshStatus(bool childs=false,TQPtrList *exclude = 0,bool depsonly=false)=0; + virtual void refreshStatus(bool childs=false,TQPtrList *exclude = nullptr,bool depsonly=false)=0; TQPixmap getPixmap(int size,bool overlay=true); TQPixmap getPixmap(const TQPixmap&,int size,bool overlay=true); - virtual FileListViewItem*fItem(){return 0;} + virtual FileListViewItem*fItem(){return nullptr;} virtual void setStat(const svn::StatusPtr&); virtual const svn::StatusPtr& stat()const; virtual bool isModified()const; diff --git a/src/svnfrontend/svnlogdlgimp.cpp b/src/svnfrontend/svnlogdlgimp.cpp index 095c6fc..9d56f61 100644 --- a/src/svnfrontend/svnlogdlgimp.cpp +++ b/src/svnfrontend/svnlogdlgimp.cpp @@ -197,8 +197,8 @@ SvnLogDlgImp::SvnLogDlgImp(SvnActions*ac,TQWidget *parent, const char *name,bool m_LogView->setSortOrder(TQt::Descending); resize(dialogSize()); m_ControlKeyDown = false; - m_first = 0; - m_second = 0; + m_first = nullptr; + m_second = nullptr; if (Kdesvnsettings::self()->log_always_list_changed_files()) { buttonListFiles->hide(); @@ -238,7 +238,7 @@ void SvnLogDlgImp::dispLog(const svn::SharedPointer&_log,con { m_peg = peg; m_PegUrl = pegUrl; - m_first = m_second = 0; + m_first = m_second = nullptr; m_startRevButton->setNoWorking(m_PegUrl.isUrl()); m_endRevButton->setNoWorking(m_PegUrl.isUrl()); if (!m_PegUrl.isUrl() || Kdesvnsettings::remote_special_properties()) { @@ -258,7 +258,7 @@ void SvnLogDlgImp::dispLog(const svn::SharedPointer&_log,con } } _base = root; - m_first = m_second = 0; + m_first = m_second = nullptr; m_Entries = _log; kdDebug()<<"What: "<setText(0,""); if (m_first == which) { - m_first = 0; + m_first = nullptr; } else { m_first = which; m_first->setText(0,"1"); } if (m_first==m_second) { - m_second = 0; + m_second = nullptr; } m_startRevButton->setRevision(which->rev()); @@ -488,17 +488,17 @@ void SvnLogDlgImp::slotItemClicked(int button,TQListViewItem*item,const TQPoint } else { if (m_second) m_second->setText(0,""); if (m_second == which) { - m_second = 0; + m_second = nullptr; } else { m_second = which; m_second->setText(0,"2"); } if (m_first==m_second) { - m_first = 0; + m_first = nullptr; } m_endRevButton->setRevision(which->rev()); } - m_DispSpecDiff->setEnabled(m_first!=0 && m_second!=0); + m_DispSpecDiff->setEnabled(m_first!=nullptr && m_second!=nullptr); } void SvnLogDlgImp::slotRevisionSelected() diff --git a/src/svnfrontend/svnlogdlgimp.h b/src/svnfrontend/svnlogdlgimp.h index dbbffb3..a1a249f 100644 --- a/src/svnfrontend/svnlogdlgimp.h +++ b/src/svnfrontend/svnlogdlgimp.h @@ -37,7 +37,7 @@ class SvnLogDlgImp: public SvnLogDialogData,public SimpleLogCb TQ_OBJECT public: - SvnLogDlgImp(SvnActions*,TQWidget *parent = 0, const char *name = 0,bool modal=true); + SvnLogDlgImp(SvnActions*,TQWidget *parent = nullptr, const char *name = nullptr,bool modal=true); virtual ~SvnLogDlgImp(); void dispLog(const svn::SharedPointer&,const TQString&,const TQString&,const svn::Revision&peg,const TQString&pegUrl); void saveSize(); diff --git a/src/svnfrontend/tcontextlistener.h b/src/svnfrontend/tcontextlistener.h index 097ce57..b740ae9 100644 --- a/src/svnfrontend/tcontextlistener.h +++ b/src/svnfrontend/tcontextlistener.h @@ -38,7 +38,7 @@ class ThreadContextListener : public CContextListener TQ_OBJECT public: - ThreadContextListener(TQObject* parent, const char* name=0); + ThreadContextListener(TQObject* parent, const char* name=nullptr); virtual ~ThreadContextListener(); diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp index 3735b76..1630089 100644 --- a/src/svnfrontend/tdesvnfilelist.cpp +++ b/src/svnfrontend/tdesvnfilelist.cpp @@ -159,10 +159,10 @@ private: }; KdesvnFileListPrivate::KdesvnFileListPrivate() - : dragOverItem(0),dragOverPoint(TQPoint(0,0)),mOldDropHighlighter() + : dragOverItem(nullptr),dragOverPoint(TQPoint(0,0)),mOldDropHighlighter() { m_remoteRevision = svn::Revision::HEAD; - m_DirWatch = 0; + m_DirWatch = nullptr; intern_dropRunning=false; mousePressed = false; readSettings(); @@ -192,7 +192,7 @@ bool KdesvnFileListPrivate::reReadSettings() tdesvnfilelist::tdesvnfilelist(TDEActionCollection*aCollect,TQWidget *parent, const char *name) : TDEListView(parent, name),ItemDisplay(),m_SvnWrapper(new SvnActions(this)) { - m_SelectedItems = 0; + m_SelectedItems = nullptr; m_pList = new KdesvnFileListPrivate; m_filesAction = aCollect; m_pList->m_fileTip=new SvnFileTip(this); @@ -430,7 +430,7 @@ void tdesvnfilelist::SelectionList(SvnItemList*target) if (!m_SelectedItems||!target) return; FileListViewItemListIterator iter(*m_SelectedItems); FileListViewItem*cur; - while ( (cur=iter.current())!=0) { + while ( (cur=iter.current()) != nullptr) { ++iter; target->append(cur); } @@ -438,13 +438,13 @@ void tdesvnfilelist::SelectionList(SvnItemList*target) SvnItem*tdesvnfilelist::SelectedOrMain() { - if (singleSelected()!=0) { + if (singleSelected()) { return singleSelected(); } if (isWorkingCopy()&&firstChild()) { return static_cast(firstChild()); } - return 0; + return nullptr; } KURL::List tdesvnfilelist::selectedUrls() @@ -453,7 +453,7 @@ KURL::List tdesvnfilelist::selectedUrls() FileListViewItemList*ls = allSelected(); FileListViewItemListIterator it(*ls); FileListViewItem*cur; - while ( (cur=it.current())!=0) { + while ( (cur=it.current()) != nullptr) { ++it; /* for putting it to outside we must convert it to TDEIO urls */ lst.append(cur->kdeName(m_pList->m_remoteRevision)); @@ -471,7 +471,7 @@ FileListViewItem* tdesvnfilelist::singleSelected() if (m_SelectedItems && m_SelectedItems->count()==1) { return m_SelectedItems->at(0); } - return 0; + return nullptr; } SvnItem*tdesvnfilelist::Selected() @@ -497,7 +497,7 @@ bool tdesvnfilelist::openURL( const KURL &url,bool noReinit ) } m_LastException=""; delete m_pList->m_DirWatch; - m_pList->m_DirWatch=0; + m_pList->m_DirWatch=nullptr; m_pList->dirItems.clear(); m_pList->stopDirTimer(); @@ -595,7 +595,7 @@ bool tdesvnfilelist::openURL( const KURL &url,bool noReinit ) m_pList->m_DirWatch->startScan(true); } } - bool result = checkDirs(baseUri(),0); + bool result = checkDirs(baseUri(),nullptr); if (result && isWorkingCopy()) { chdir(baseUri().local8Bit()); if (firstChild()) firstChild()->setOpen(true); @@ -642,8 +642,8 @@ void tdesvnfilelist::closeMe() enableActions(); m_SvnWrapper->reInitClient(); delete m_pList->m_DirWatch; - m_pList->m_DirWatch = 0; - m_pList->m_fileTip->setItem(0); + m_pList->m_DirWatch = nullptr; + m_pList->m_fileTip->setItem(nullptr); } bool tdesvnfilelist::checkDirs(const TQString&_what,FileListViewItem * _parent) @@ -675,7 +675,7 @@ bool tdesvnfilelist::checkDirs(const TQString&_what,FileListViewItem * _parent) ownupdates=false; } svn::StatusEntries::iterator it = dlist.begin(); - FileListViewItem * pitem = 0; + FileListViewItem * pitem = nullptr; bool main_found = false; for (;it!=dlist.end();++it) { //kdDebug() << "iterate over it: " << (*it)->entry().url() << endl; @@ -774,7 +774,7 @@ void tdesvnfilelist::slotDirAdded(const TQString&newdir,FileListViewItem*k) delete temp; } m_Dirsread.clear(); - checkDirs(baseUri(),0); + checkDirs(baseUri(),nullptr); return; } svn::StatusPtr stat; @@ -791,7 +791,7 @@ void tdesvnfilelist::slotDirAdded(const TQString&newdir,FileListViewItem*k) if (!pitem) { pitem = (FileListViewItem*)firstChild(); if (pitem->fullName()!=baseUri()) { - pitem = 0; + pitem = nullptr; } } if (!pitem) { @@ -876,7 +876,7 @@ void tdesvnfilelist::enableActions() } bool conflicted = single && allSelected()->at(0)->isConflicted(); - TDEAction * temp = 0; + TDEAction * temp = nullptr; /* local and remote actions */ /* 1. actions on dirs AND files */ temp = filesActions()->action("make_svn_log"); @@ -912,7 +912,7 @@ void tdesvnfilelist::enableActions() m_DelCurrent->setEnabled( (multi||single)); m_LockAction->setEnabled( (multi||single)); m_UnlockAction->setEnabled( (multi||single)); - m_IgnoreAction->setEnabled((single)&&singleSelected()->parent()!=0&&!singleSelected()->isRealVersioned()); + m_IgnoreAction->setEnabled((single)&&singleSelected()->parent()!=nullptr&&!singleSelected()->isRealVersioned()); m_RenameAction->setEnabled(single && (!isWorkingCopy()||singleSelected()!=firstChild())); m_CopyAction->setEnabled(single && (!isWorkingCopy()||singleSelected()!=firstChild())); @@ -1020,7 +1020,7 @@ void tdesvnfilelist::enableActions() void tdesvnfilelist::slotSelectionChanged() { m_pList->stopProptimer(); - if (m_SelectedItems==0) { + if (!m_SelectedItems) { m_SelectedItems = new FileListViewItemList; m_SelectedItems->setAutoDelete(false); } @@ -1199,7 +1199,7 @@ void tdesvnfilelist::slotImportIntoCurrent(bool dirs) void tdesvnfilelist::slotImportIntoDir(const KURL&importUrl,const TQString&target,bool dirs) { Logmsg_impl*ptr; - Importdir_logmsg*ptr2 = 0; + Importdir_logmsg*ptr2 = nullptr; KDialogBase*dlg; KURL uri = importUrl; @@ -1267,7 +1267,7 @@ void tdesvnfilelist::refreshCurrentTree() FileListViewItem*item = static_cast(firstChild()); if (!item) return; //m_pList->stopScan(); - m_pList->m_fileTip->setItem(0); + m_pList->m_fileTip->setItem(nullptr); tdeApp->processEvents(); setUpdatesEnabled(false); if (item->fullName()==baseUri()) { @@ -1279,7 +1279,7 @@ void tdesvnfilelist::refreshCurrentTree() refreshRecursive(item); } } else { - refreshRecursive(0); + refreshRecursive(nullptr); } if (isWorkingCopy()) { m_SvnWrapper->createModifiedCache(baseUri()); @@ -1324,7 +1324,7 @@ bool tdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down) item = static_cast(item->nextSibling()); } - TQString what = (_parent!=0?_parent->fullName():baseUri()); + TQString what = (_parent ?_parent->fullName():baseUri()); svn::StatusEntries dlist; if (!m_SvnWrapper->makeStatus(what,dlist,m_pList->m_remoteRevision)) { @@ -1490,8 +1490,8 @@ void tdesvnfilelist::slotContextMenuRequested(TQListViewItem */* _item */, const } TDETrader::OfferList offers; - OpenContextmenu*me=0; - TDEAction*temp = 0; + OpenContextmenu*me=nullptr; + TDEAction*temp = nullptr; int id = -1; @@ -1501,7 +1501,7 @@ void tdesvnfilelist::slotContextMenuRequested(TQListViewItem */* _item */, const temp = filesActions()->action("openwith"); if (offers.count()>0) { svn::Revision rev(isWorkingCopy()?svn::Revision::UNDEFINED:m_pList->m_remoteRevision); - me= new OpenContextmenu(l.at(0)->kdeName(rev),offers,0,0); + me= new OpenContextmenu(l.at(0)->kdeName(rev),offers,nullptr,nullptr); id = popup->insertItem(i18n("Open With..."),me); } else { temp = filesActions()->action("openwith"); @@ -1537,15 +1537,15 @@ void tdesvnfilelist::contentsDragEnterEvent(TQDragEnterEvent *event) //void tdesvnfilelist::startDrag() TQDragObject* tdesvnfilelist::dragObject() { - m_pList->m_fileTip->setItem(0); + m_pList->m_fileTip->setItem(nullptr); TQListViewItem * m_pressedItem = currentItem(); if (!m_pressedItem) { - return 0; + return nullptr; } TQPixmap pixmap2; KURL::List urls = selectedUrls(); if (urls.count()==0) { - return 0; + return nullptr; } if (!viewport()->hasFocus()) { kdDebug()<<"Set focus"<m_remoteRevision!=svn::Revision::HEAD) { - item = 0; + item = nullptr; return false; } } bool ok = false; - item = 0; + item = nullptr; if (KURLDrag::canDecode(event)) { KURL::List urlList; KURLDrag::decode( event, urlList ); @@ -1615,7 +1615,7 @@ bool tdesvnfilelist::validDropEvent(TQDropEvent*event,TQListViewItem*&item) ok = true; } else { TQPoint vp = contentsToViewport( event->pos() ); - item = isExecuteArea( vp ) ? itemAt( vp ) : 0L; + item = isExecuteArea( vp ) ? itemAt( vp ) : nullptr; FileListViewItem*which=static_cast(item); if (!isWorkingCopy()) { if (event->source()!=viewport()){ @@ -1634,7 +1634,7 @@ bool tdesvnfilelist::validDropEvent(TQDropEvent*event,TQListViewItem*&item) void tdesvnfilelist::contentsDropEvent(TQDropEvent * event) { - TQListViewItem *item = 0; + TQListViewItem *item = nullptr; bool ok = validDropEvent(event,item); cleanHighLighter(); if (ok) { @@ -1653,7 +1653,7 @@ void tdesvnfilelist::contentsDragMoveEvent( TQDragMoveEvent* event) TQPoint vp = contentsToViewport( event->pos() ); m_pList->dragOverItem=item; m_pList->dragOverPoint = vp; - TQRect tmpRect = drawItemHighlighter(0, m_pList->dragOverItem); + TQRect tmpRect = drawItemHighlighter(nullptr, m_pList->dragOverItem); if (tmpRect!=m_pList->mOldDropHighlighter) { cleanHighLighter(); m_pList->mOldDropHighlighter=tmpRect; @@ -1813,7 +1813,7 @@ void tdesvnfilelist::slotDropped(TQDropEvent* event,TQListViewItem*item) slotImportIntoDir(urlList[0],tdir,fi.isDir()); } else { //m_pList->stopScan(); - TDEIO::Job * job = 0L; + TDEIO::Job * job = nullptr; job = TDEIO::copy(urlList,tdir); connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),TQ_SLOT( slotCopyFinished( TDEIO::Job * ) ) ); dispDummy(); @@ -1932,7 +1932,7 @@ void tdesvnfilelist::slotCat() FileListViewItem*k = singleSelected(); if (!k) return; m_SvnWrapper->slotMakeCat(isWorkingCopy()?svn::Revision::HEAD:m_pList->m_remoteRevision, k->fullName(),k->text(0), - isWorkingCopy()?svn::Revision::HEAD:m_pList->m_remoteRevision,0); + isWorkingCopy()?svn::Revision::HEAD:m_pList->m_remoteRevision,nullptr); } @@ -1984,12 +1984,12 @@ void tdesvnfilelist::slotDelete() FileListViewItemListIterator liter(*lst); FileListViewItem*cur; //m_pList->stopScan(); - m_pList->m_fileTip->setItem(0); + m_pList->m_fileTip->setItem(nullptr); TQValueList items; TQStringList displist; KURL::List tdeioList; - while ((cur=liter.current())!=0){ + while ((cur=liter.current()) != nullptr){ ++liter; if (!cur->isRealVersioned()) { KURL _uri; _uri.setPath(cur->fullName()); @@ -2035,7 +2035,7 @@ void tdesvnfilelist::slotDeleteFinished(TDEIO::Job*job) void tdesvnfilelist::dispDummy() { // wait for job - TQLabel dummy(this,0,WStyle_NoBorder|WShowModal); + TQLabel dummy(this,nullptr,WStyle_NoBorder|WShowModal); TQSize csize = size(); dummy.setText(i18n("Please wait until job is finished")); dummy.resize(dummy.minimumSizeHint()); @@ -2083,7 +2083,7 @@ void tdesvnfilelist::slotLock() ptr->saveHistory(false); TQStringList displist; - while ((cur=liter.current())!=0){ + while ((cur=liter.current()) != nullptr){ ++liter; displist.append(cur->fullName()); } @@ -2111,7 +2111,7 @@ void tdesvnfilelist::slotUnlock() bool breakit = res==KMessageBox::Yes; TQStringList displist; - while ((cur=liter.current())!=0){ + while ((cur=liter.current()) != nullptr){ ++liter; displist.append(cur->fullName()); } @@ -2253,7 +2253,7 @@ void tdesvnfilelist::slotDiffPathes() if (lst->count()!=2 || !uniqueTypeSelected()) { return; } - m_pList->m_fileTip->setItem(0); + m_pList->m_fileTip->setItem(nullptr); FileListViewItem*k1,*k2; k1 = lst->at(0); @@ -2283,7 +2283,7 @@ void tdesvnfilelist::slotMkdir() TQString parentDir; if (k) { if (!k->isDir()) { - KMessageBox::sorry(0,i18n("May not make subdirs of a file")); + KMessageBox::sorry(nullptr,i18n("May not make subdirs of a file")); return; } parentDir=k->fullName(); @@ -2310,7 +2310,7 @@ void tdesvnfilelist::slotMkBaseDirs() TQString msg = i18n("Automatic generated base layout by tdesvn"); isopen = m_SvnWrapper->makeMkdir(targets,msg); if (isopen) { - slotDirAdded(targets[0],0); + slotDirAdded(targets[0],nullptr); // slotDirAdded(targets[1],0); // slotDirAdded(targets[2],0); } @@ -2361,7 +2361,7 @@ void tdesvnfilelist::slotSelectBrowsingRevision() Rangeinput_impl::revision_range r = rdlg->getRange(); m_pList->m_remoteRevision= r.first; if (childCount()==0) { - checkDirs(baseUri(),0); + checkDirs(baseUri(),nullptr); } else { refreshCurrentTree(); } @@ -2385,7 +2385,7 @@ void tdesvnfilelist::slotRevisionCat() rdlg->setStartOnly(true); if (dlg->exec()==TQDialog::Accepted) { Rangeinput_impl::revision_range r = rdlg->getRange(); - m_SvnWrapper->slotMakeCat(r.first, k->fullName(),k->shortName(),r.first,0); + m_SvnWrapper->slotMakeCat(r.first, k->fullName(),k->shortName(),r.first,nullptr); } dlg->saveDialogSize(*(Kdesvnsettings::self()->config()),"revisions_dlg",false); delete dlg; @@ -2532,7 +2532,7 @@ void tdesvnfilelist::_dirwatchTimeout() { kdDebug()<<"dirtimer"<::Iterator it; - m_pList->m_fileTip->setItem(0); + m_pList->m_fileTip->setItem(nullptr); viewport()->setUpdatesEnabled(false); bool repaintit=false; for (it=m_pList->dirItems.begin();it!=m_pList->dirItems.end();++it) @@ -2579,7 +2579,7 @@ void tdesvnfilelist::_dirwatchTimeout() FileListViewItem*p = static_cast(item->parent()); delete item; repaintit=true; - item = 0; + item = nullptr; if (p && p->isVersioned()) { p->update(); updateParents(p); @@ -2610,7 +2610,7 @@ void tdesvnfilelist::_dirwatchTimeout() void tdesvnfilelist::slotDirItemDeleted(const TQString&what) { m_pList->stopDirTimer(); - m_pList->m_fileTip->setItem(0); + m_pList->m_fileTip->setItem(nullptr); TQMap::Iterator it = m_pList->dirItems.find(what); if (it!=m_pList->dirItems.end() && m_pList->dirItems[what]=='A') { m_pList->dirItems.erase(it); @@ -2642,7 +2642,7 @@ void tdesvnfilelist::gotPreviewResult() FileListViewItem* tdesvnfilelist::findEntryItem(const TQString&what,FileListViewItem*startAt) { - if (!startAt && !what.startsWith(baseUri())) return 0; + if (!startAt && !what.startsWith(baseUri())) return nullptr; TQString _what = what; FileListViewItem*_s,*_temp; if (!startAt) { @@ -2653,7 +2653,7 @@ FileListViewItem* tdesvnfilelist::findEntryItem(const TQString&what,FileListView } else { _s = static_cast(startAt->firstChild()); } - _temp = 0; + _temp = nullptr; while (_s) { if (_s->fullName()==_what) { return _s; @@ -2666,7 +2666,7 @@ FileListViewItem* tdesvnfilelist::findEntryItem(const TQString&what,FileListView } _s = static_cast(_s->nextSibling()); } - return 0; + return nullptr; } @@ -2680,7 +2680,7 @@ void tdesvnfilelist::contentsMouseMoveEvent( TQMouseEvent *e ) if (Kdesvnsettings::display_file_tips()) { TQPoint vp = contentsToViewport( e->pos() ); - FileListViewItem*item = isExecuteArea( vp ) ? static_cast(itemAt( vp )) : 0L; + FileListViewItem*item = isExecuteArea( vp ) ? static_cast(itemAt( vp )) : nullptr; if (item) { vp.setY( itemRect( item ).y() ); @@ -2690,11 +2690,11 @@ void tdesvnfilelist::contentsMouseMoveEvent( TQMouseEvent *e ) &&Kdesvnsettings::display_previews_in_file_tips()); setShowToolTips(false); } else { - m_pList->m_fileTip->setItem(0); + m_pList->m_fileTip->setItem(nullptr); setShowToolTips(true); } } else { - m_pList->m_fileTip->setItem(0); + m_pList->m_fileTip->setItem(nullptr); setShowToolTips(true); } } @@ -2702,7 +2702,7 @@ void tdesvnfilelist::contentsMouseMoveEvent( TQMouseEvent *e ) { if (( m_pList->presspos - e->pos() ).manhattanLength() > TQApplication::startDragDistance()) { - m_pList->m_fileTip->setItem(0); + m_pList->m_fileTip->setItem(nullptr); m_pList->mousePressed=false; //beginDrag(); } @@ -2713,7 +2713,7 @@ void tdesvnfilelist::contentsMouseMoveEvent( TQMouseEvent *e ) void tdesvnfilelist::contentsMousePressEvent(TQMouseEvent*e) { TDEListView::contentsMousePressEvent(e); - m_pList->m_fileTip->setItem(0); + m_pList->m_fileTip->setItem(nullptr); TQPoint p(contentsToViewport( e->pos())); TQListViewItem *i = itemAt( p ); // this is from tqt the example - hopefully I got my problems with drag&drop fixed. @@ -2741,13 +2741,13 @@ void tdesvnfilelist::contentsMouseReleaseEvent(TQMouseEvent*e) void tdesvnfilelist::contentsWheelEvent( TQWheelEvent * e ) { // when scrolling with mousewheel, stop possible pending filetip - m_pList->m_fileTip->setItem(0); + m_pList->m_fileTip->setItem(nullptr); TDEListView::contentsWheelEvent( e ); } void tdesvnfilelist::leaveEvent(TQEvent*e) { - m_pList->m_fileTip->setItem( 0 ); + m_pList->m_fileTip->setItem( nullptr ); TDEListView::leaveEvent( e ); } @@ -2776,7 +2776,7 @@ void tdesvnfilelist::slotRelocate() if (!isWorkingCopy()) return; SvnItem*k = SelectedOrMain(); if (!k) { - KMessageBox::error(0,i18n("Error getting entry to relocate")); + KMessageBox::error(nullptr,i18n("Error getting entry to relocate")); return; } TQString path,fromUrl; @@ -2824,7 +2824,7 @@ void tdesvnfilelist::checkUnversionedDirs( FileListViewItem * _parent ) svn::StatusEntries nonversioned_list; // FIXME: create a dlist and feed to insertDirs, mean while .. we are copying insertDirs since we weren't able to set svn_node_kind into appropriate value - while ( (fi = nonversioned_it.current()) != 0 ) { + while ( (fi = nonversioned_it.current()) != nullptr) { if ((fi->fileName()!=".") && (fi->fileName()!="..")) { // trying to set entry->kind // svn_wc_status2_t wc_stat; @@ -2909,7 +2909,7 @@ void tdesvnfilelist::rescanIconsRec(FileListViewItem*startAt,bool checkNewer,boo void tdesvnfilelist::slotRescanIcons(bool checkNewer) { - rescanIconsRec(0L,checkNewer); + rescanIconsRec(nullptr,checkNewer); } @@ -2919,16 +2919,16 @@ void tdesvnfilelist::slotRescanIcons(bool checkNewer) void tdesvnfilelist::slotCheckNewItems() { if (!isWorkingCopy()) { - KMessageBox::sorry(0,i18n("Only in working copy possible."),i18n("Error")); + KMessageBox::sorry(nullptr,i18n("Only in working copy possible."),i18n("Error")); return; } if (allSelected()->count()>1) { - KMessageBox::sorry(0,i18n("Only on single folder possible"),i18n("Error")); + KMessageBox::sorry(nullptr,i18n("Only on single folder possible"),i18n("Error")); return; } SvnItem*w = SelectedOrMain(); if (!w) { - KMessageBox::sorry(0,i18n("Sorry - internal error!"),i18n("Error")); + KMessageBox::sorry(nullptr,i18n("Sorry - internal error!"),i18n("Error")); return; } m_SvnWrapper->checkAddItems(w->fullName(),true); @@ -3057,7 +3057,7 @@ void tdesvnfilelist::slotOpenWith() void tdesvnfilelist::slotUnfoldTree() { - StopSimpleDlg sdlg(0,0,i18n("Unfold tree"),i18n("Unfold all folder")); + StopSimpleDlg sdlg(nullptr,nullptr,i18n("Unfold tree"),i18n("Unfold all folder")); connect(this,TQ_SIGNAL(sigListError()), &sdlg,TQ_SLOT(makeCancel())); @@ -3117,7 +3117,7 @@ bool tdesvnfilelist::uniqueTypeSelected() return false; } bool dir = cur->isDir(); - while ( (cur=it.current())!=0) { + while ( (cur=it.current()) != nullptr) { ++it; if (cur->isDir()!=dir) { return false; diff --git a/src/svnfrontend/tdesvnfilelist.h b/src/svnfrontend/tdesvnfilelist.h index f41c1cc..8c0c894 100644 --- a/src/svnfrontend/tdesvnfilelist.h +++ b/src/svnfrontend/tdesvnfilelist.h @@ -56,7 +56,7 @@ class tdesvnfilelist : public TDEListView,public ItemDisplay friend class FileListViewItem; public: - tdesvnfilelist(TDEActionCollection*,TQWidget *parent = 0, const char *name = 0); + tdesvnfilelist(TDEActionCollection*,TQWidget *parent = nullptr, const char *name = nullptr); virtual ~tdesvnfilelist(); virtual bool openURL( const KURL &url,bool noReinit=false ); @@ -103,7 +103,7 @@ protected: ); FileListViewItemList* m_SelectedItems; - FileListViewItem* findEntryItem(const TQString&,FileListViewItem*startAt=0); + FileListViewItem* findEntryItem(const TQString&,FileListViewItem*startAt=nullptr); virtual bool refreshRecursive(FileListViewItem*,bool down=true); virtual void updateParents(FileListViewItem*); @@ -121,7 +121,7 @@ protected: virtual TQDragObject* dragObject(); void dispDummy(); - void reinitItems(FileListViewItem*_item = 0); + void reinitItems(FileListViewItem*_item = nullptr); KURL::List selectedUrls(); virtual void contentsMouseMoveEvent( TQMouseEvent *e ); @@ -129,7 +129,7 @@ protected: virtual void contentsMouseReleaseEvent(TQMouseEvent*e); virtual void contentsWheelEvent( TQWheelEvent * e ); virtual void leaveEvent(TQEvent*e); - virtual void rescanIconsRec(FileListViewItem*_parent=0,bool checkNewer=false,bool no_update=false); + virtual void rescanIconsRec(FileListViewItem*_parent=nullptr,bool checkNewer=false,bool no_update=false); TDETrader::OfferList offersList(SvnItem*item,bool execOnly=false); diff --git a/src/svnfrontend/threadcontextlistenerdata.h b/src/svnfrontend/threadcontextlistenerdata.h index e8d50f6..428cc16 100644 --- a/src/svnfrontend/threadcontextlistenerdata.h +++ b/src/svnfrontend/threadcontextlistenerdata.h @@ -62,7 +62,7 @@ public: TQString msg; bool ok; const svn::CommitItemList*_items; - slog_message(){_items = 0;} + slog_message(){_items = nullptr;} }; struct scert_pw diff --git a/src/svnqt/cache/LogCache.cpp b/src/svnqt/cache/LogCache.cpp index f6b7b3b..e5a0dd7 100644 --- a/src/svnqt/cache/LogCache.cpp +++ b/src/svnqt/cache/LogCache.cpp @@ -21,16 +21,16 @@ namespace svn { namespace cache { -LogCache* LogCache::mSelf = 0; +LogCache* LogCache::mSelf = nullptr; class ThreadDBStore { public: ThreadDBStore(){ - m_DB=0; + m_DB=nullptr; } ~ThreadDBStore(){ - m_DB=0; + m_DB=nullptr; TQSqlDatabase::removeDatabase(key); TQMap::Iterator it; for (it=reposCacheNames.begin();it!=reposCacheNames.end();++it) { @@ -53,7 +53,7 @@ public: LogCacheData(){} ~LogCacheData(){ if (m_mainDB.hasLocalData()) { - m_mainDB.setLocalData(0L); + m_mainDB.setLocalData(nullptr); } } @@ -122,7 +122,7 @@ public: TQDataBase getReposDB(const svn::Path&reposroot) { if (!getMainDB()) { - return 0; + return nullptr; } bool checkDone = false; // make sure path is correct eg. without traling slashes. @@ -143,7 +143,7 @@ public: if (dbFile.isEmpty()) { dbFile = createReposDB(reposroot); if (dbFile.isEmpty()) { - return 0; + return nullptr; } checkDone=true; } @@ -158,14 +158,14 @@ public: // tqDebug("The repository key is now: %s",_key.TOUTF8().data()); TQDataBase _db = TQSqlDatabase::addDatabase(SQLTYPE,_key); if (!_db) { - return 0; + return nullptr; } TQString fulldb = m_BasePath+"/"+dbFile+".db"; _db->setDatabaseName(fulldb); // tqDebug("try database open %s",fulldb.TOUTF8().data()); if (!checkReposDb(_db)) { tqDebug("no DB opened"); - _db = 0; + _db = nullptr; } else { tqDebug("Insert into map"); m_mainDB.localData()->reposCacheNames[dbFile]=_key; @@ -196,7 +196,7 @@ public: if (m_mainDB.hasLocalData()) { return m_mainDB.localData()->m_DB; } else { - return 0; + return nullptr; } } TQString m_BasePath; diff --git a/src/svnqt/cache/ReposLog.cpp b/src/svnqt/cache/ReposLog.cpp index 81b022b..46281cd 100644 --- a/src/svnqt/cache/ReposLog.cpp +++ b/src/svnqt/cache/ReposLog.cpp @@ -14,7 +14,7 @@ */ svn::cache::ReposLog::ReposLog(svn::Client*aClient,const TQString&aRepository) :m_Client(), - m_Database(0), + m_Database(nullptr), m_ReposRoot(aRepository),m_latestHead(svn::Revision::UNDEFINED) { m_Client=aClient; diff --git a/src/svnqt/client.cpp b/src/svnqt/client.cpp index cc5ded0..90b615a 100644 --- a/src/svnqt/client.cpp +++ b/src/svnqt/client.cpp @@ -60,7 +60,7 @@ namespace svn }; SvnInit::SvnInit() { - svn_cmdline_init("svnqt",0); + svn_cmdline_init("svnqt",nullptr); tqDebug("svn_cmdline_init done"); TQString BasePath=TQDir::HOMEDIR(); TQDir d; @@ -93,6 +93,6 @@ namespace svn default: break; } - return 0L; + return nullptr; } } diff --git a/src/svnqt/client_cat.cpp b/src/svnqt/client_cat.cpp index fd9fabb..0f53e19 100644 --- a/src/svnqt/client_cat.cpp +++ b/src/svnqt/client_cat.cpp @@ -53,7 +53,7 @@ namespace svn { svn::stream::SvnByteStream buffer(*m_context); svn_error_t * error = internal_cat(path,revision,peg_revision,buffer); - if (error != 0) + if (error) throw ClientException (error); return buffer.content(); @@ -66,7 +66,7 @@ namespace svn const Revision & peg_revision) { svn_error_t * error = internal_cat(path,revision,peg_revision,buffer); - if (error != 0) + if (error) throw ClientException (error); } @@ -78,7 +78,7 @@ namespace svn { svn::stream::SvnFileOStream buffer(target,*m_context); svn_error_t * error = internal_cat(path,revision,peg_revision,buffer); - if (error != 0) + if (error) throw ClientException (error); } diff --git a/src/svnqt/client_impl.cpp b/src/svnqt/client_impl.cpp index 4e790ca..a9f04aa 100644 --- a/src/svnqt/client_impl.cpp +++ b/src/svnqt/client_impl.cpp @@ -139,7 +139,7 @@ namespace svn apr_hash_t * Client_impl::map2hash(const PropertiesMap&aMap,const Pool&pool) { if (aMap.count()==0) { - return 0; + return nullptr; } apr_hash_t * hash = apr_hash_make(pool); PropertiesMap::ConstIterator it; diff --git a/src/svnqt/client_ls.cpp b/src/svnqt/client_ls.cpp index 477b856..2ac3386 100644 --- a/src/svnqt/client_ls.cpp +++ b/src/svnqt/client_ls.cpp @@ -70,7 +70,7 @@ namespace svn *m_context, pool); - if (error != 0) + if (error) throw ClientException (error); apr_array_header_t * @@ -119,7 +119,7 @@ namespace svn *m_context, pool); - if (error != 0) + if (error) throw ClientException (error); apr_array_header_t * @@ -155,7 +155,7 @@ namespace svn { Q_UNUSED(abs_path); if (!baton || !path || !dirent) { - return 0; + return nullptr; } /* check every loop for cancel of operation */ Client_impl::sBaton * l_baton = (Client_impl::sBaton*)baton; @@ -166,7 +166,7 @@ namespace svn SVN_ERR(ctx->cancel_func(ctx->cancel_baton)); } entries->push_back(new DirEntry(TQString::FROMUTF8(path),dirent,lock)); - return 0; + return nullptr; } #endif @@ -209,7 +209,7 @@ namespace svn pool ); #endif - if (error != 0) { + if (error) { throw ClientException (error); } return entries; diff --git a/src/svnqt/client_merge.cpp b/src/svnqt/client_merge.cpp index feb846c..c937d54 100644 --- a/src/svnqt/client_merge.cpp +++ b/src/svnqt/client_merge.cpp @@ -25,7 +25,7 @@ void Client_impl::merge (const Path & path1, const Revision & revision1, ) { Pool pool; - svn_error_t * error = 0; + svn_error_t * error = nullptr; #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1) error = svn_client_merge3(path1.cstr (), revision1.revision (), @@ -72,7 +72,7 @@ void Client_impl::merge (const Path & path1, const Revision & revision1, #endif #endif - if(error != 0) { + if(error) { throw ClientException (error); } } @@ -109,7 +109,7 @@ void Client_impl::merge (const Path & path1, const Revision & revision1, *m_context, pool ); - if(error != 0) { + if(error) { throw ClientException (error); } #else diff --git a/src/svnqt/client_modify.cpp b/src/svnqt/client_modify.cpp index 7c6efd0..86002b7 100644 --- a/src/svnqt/client_modify.cpp +++ b/src/svnqt/client_modify.cpp @@ -58,7 +58,7 @@ namespace svn Pool subPool; svn_revnum_t revnum = 0; Path up(url); - svn_error_t * error = 0; + svn_error_t * error = nullptr; #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1) error = svn_client_checkout3(&revnum, up.cstr(), @@ -105,7 +105,7 @@ namespace svn { Pool pool; - svn_commit_info_t *commit_info = 0; + svn_commit_info_t *commit_info = nullptr; svn_error_t * error = #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1) @@ -128,7 +128,7 @@ namespace svn Q_UNUSED(keep_local); Q_UNUSED(revProps); #endif - if(error != 0) { + if(error) { throw ClientException (error); } if (commit_info) { @@ -300,7 +300,7 @@ namespace svn } #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1) Pool pool; - svn_commit_info_t *commit_info = 0L; + svn_commit_info_t *commit_info = nullptr; apr_array_header_t * sources = apr_array_make(pool,srcPaths.size(),sizeof(svn_client_copy_source_t *)); for (size_t j=0;j= 5)) || (SVN_VER_MAJOR > 1) Pool pool; - svn_commit_info_t *commit_info = 0; + svn_commit_info_t *commit_info = nullptr; svn_error_t * error = svn_client_move5( &commit_info, srcPaths.array(pool), @@ -432,7 +432,7 @@ namespace svn *m_context, pool ); - if (error!=0) { + if (error) { throw ClientException (error); } if (commit_info) { @@ -485,7 +485,7 @@ namespace svn svn_commit_info_t *commit_info = nullptr; - svn_error_t * error = 0; + svn_error_t * error = nullptr; #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1) error = svn_client_mkdir3 @@ -612,7 +612,7 @@ namespace svn { Pool pool; svn_revnum_t revnum = 0; - svn_error_t * error = 0; + svn_error_t * error = nullptr; #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1) error = svn_client_switch2( @@ -685,7 +685,7 @@ namespace svn /* important! otherwise next op on repository uses that logmessage again! */ m_context->setLogMessage(TQString()); - if(error != 0) { + if(error) { throw ClientException (error); } if (commit_info) { diff --git a/src/svnqt/client_property.cpp b/src/svnqt/client_property.cpp index 4d8ccce..27729a5 100644 --- a/src/svnqt/client_property.cpp +++ b/src/svnqt/client_property.cpp @@ -73,7 +73,7 @@ namespace svn TQString::FROMUTF8( ((const svn_string_t *)val)->data ); } mapList->push_back(PathPropertiesMapEntry(TQString::FROMUTF8(path), prop_map )); - return 0; + return nullptr; } PathPropertiesMapListPtr @@ -227,12 +227,12 @@ namespace svn const svn_string_t * propval; if (propValue.isNull()) { - propval=0; + propval=nullptr; } else { propval = svn_string_create (propValue.TOUTF8(),pool); } - svn_error_t * error = 0; + svn_error_t * error = nullptr; #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1) svn_commit_info_t * commit_info; svn_client_propset3( @@ -428,7 +428,7 @@ namespace svn svn_error_t * error = svn_client_revprop_set ( propName.TOUTF8(), - 0, // value = NULL + nullptr, // value = NULL path.cstr (), revision.revision (), &revnum, diff --git a/src/svnqt/client_status.cpp b/src/svnqt/client_status.cpp index 4ea8ee3..d9afdd1 100644 --- a/src/svnqt/client_status.cpp +++ b/src/svnqt/client_status.cpp @@ -229,9 +229,9 @@ namespace svn apr_hash_t* hash; Context*m_Context; StatusEntriesBaton() { - pool = 0; - hash = 0; - m_Context = 0; + pool = nullptr; + hash = nullptr; + m_Context = nullptr; } }; @@ -435,7 +435,7 @@ namespace svn update, // check for updates false, // hide ignored files or not false, // hide external - 0, + nullptr, *context, //client ctx pool); #else @@ -661,7 +661,7 @@ namespace svn baton.pool = pool; baton.m_Context=m_context; svn_opt_revision_t pegr; - const char *truepath = 0; + const char *truepath = nullptr; bool internal_peg = false; TQByteArray _buf = _p.cstr(); diff --git a/src/svnqt/commititem.h b/src/svnqt/commititem.h index 3b65df5..4cec506 100644 --- a/src/svnqt/commititem.h +++ b/src/svnqt/commititem.h @@ -52,7 +52,7 @@ protected: public: //! constructor - CommitItem(const svn_client_commit_item_t*aSource=0); + CommitItem(const svn_client_commit_item_t*aSource=nullptr); //! constructor /*! * This one will only do something if build against subversion 1.3 diff --git a/src/svnqt/conflictresult.cpp b/src/svnqt/conflictresult.cpp index f65bec2..03cd006 100644 --- a/src/svnqt/conflictresult.cpp +++ b/src/svnqt/conflictresult.cpp @@ -124,7 +124,7 @@ namespace svn const svn_wc_conflict_result_t*ConflictResult::result(const Pool&pool)const { - svn_wc_conflict_result_t*result=0; + svn_wc_conflict_result_t*result=nullptr; assignResult(&result,pool); return result; } diff --git a/src/svnqt/contextdata.cpp b/src/svnqt/contextdata.cpp index 7bbb27d..6048fa8 100644 --- a/src/svnqt/contextdata.cpp +++ b/src/svnqt/contextdata.cpp @@ -30,10 +30,10 @@ namespace svn { ContextData::ContextData(const TQString & configDir_) - : listener (0), logIsSet (false), + : listener (nullptr), logIsSet (false), m_promptCounter (0), m_ConfigDir(configDir_) { - const char * c_configDir = 0; + const char * c_configDir = nullptr; if( m_ConfigDir.length () > 0 ) { c_configDir = m_ConfigDir.TOUTF8(); @@ -240,7 +240,7 @@ void ContextData::notify(const char *path, svn_wc_notify_state_t prop_state, svn_revnum_t revision) { - if (listener != 0) { + if (listener) { listener->contextNotify (path, action, kind, mime_type, content_state, prop_state, revision); } @@ -248,14 +248,14 @@ void ContextData::notify(const char *path, void ContextData::notify (const svn_wc_notify_t *action) { - if (listener != 0) { + if (listener) { listener->contextNotify(action); } } bool ContextData::cancel() { - if (listener != 0) { + if (listener) { return listener->contextCancel (); } else { // don't cancel if no listener @@ -278,7 +278,7 @@ bool ContextData::retrieveLogin (const char * username_, { bool ok; - if (listener == 0) + if (!listener) return false; username = TQString::FROMUTF8(username_); @@ -294,7 +294,7 @@ bool ContextData::retrieveSavedLogin (const char * username_, bool ok; may_save = false; - if (listener == 0) + if (!listener) return false; username = TQString::FROMUTF8(username_); @@ -309,7 +309,7 @@ bool ContextData::retrieveCachedLogin (const char * username_, bool ok; may_save = false; - if (listener == 0) + if (!listener) return false; username = TQString::FROMUTF8(username_); @@ -336,7 +336,7 @@ ContextData::getContextData (void * baton, ContextData ** data) ContextData * data_ = static_cast (baton); - if (data_->listener == 0) + if (!data_->listener) return svn_error_create (SVN_ERR_CANCELLED, nullptr, "invalid listener"); @@ -346,7 +346,7 @@ ContextData::getContextData (void * baton, ContextData ** data) void ContextData::setAuthCache(bool value) { - void *param = 0; + void *param = nullptr; if (!value) { param = (void *)"1"; } @@ -379,7 +379,7 @@ svn_error_t *ContextData::onLogMsg (const char **log_msg, void *baton, apr_pool_t * pool) { - ContextData * data = 0; + ContextData * data = nullptr; SVN_ERR (getContextData (baton, &data)); TQString msg; @@ -407,7 +407,7 @@ svn_error_t *ContextData::onLogMsg2 (const char **log_msg, void *baton, apr_pool_t * pool) { - ContextData * data = 0; + ContextData * data = nullptr; SVN_ERR (getContextData (baton, &data)); TQString msg; @@ -437,7 +437,7 @@ svn_error_t *ContextData::onLogMsg3 (const char **log_msg, void *baton, apr_pool_t * pool) { - ContextData * data = 0; + ContextData * data = nullptr; SVN_ERR (getContextData (baton, &data)); TQString msg; @@ -470,7 +470,7 @@ void ContextData::onNotify (void * baton, svn_wc_notify_state_t prop_state, svn_revnum_t revision) { - if (baton == 0) + if (!baton) return; ContextData * data = static_cast (baton); data->notify (path, action, kind, mime_type, content_state, @@ -486,7 +486,7 @@ void ContextData::onNotify2(void*baton,const svn_wc_notify_t *action,apr_pool_t svn_error_t * ContextData::onCancel (void * baton) { - if (baton == 0) return SVN_NO_ERROR; + if (!baton) return SVN_NO_ERROR; ContextData * data = static_cast (baton); if( data->cancel () ) return data->generate_cancel_error(); @@ -501,7 +501,7 @@ svn_error_t *ContextData::onCachedPrompt(svn_auth_cred_simple_t **cred, svn_boolean_t _may_save, apr_pool_t *pool) { - ContextData * data = 0; + ContextData * data = nullptr; SVN_ERR (getContextData (baton, &data)); bool may_save = _may_save != 0; if (!data->retrieveCachedLogin (username, realm, may_save )) @@ -528,7 +528,7 @@ svn_error_t *ContextData::onSavedPrompt(svn_auth_cred_simple_t **cred, svn_boolean_t _may_save, apr_pool_t *pool) { - ContextData * data = 0; + ContextData * data = nullptr; SVN_ERR (getContextData (baton, &data)); bool may_save = _may_save != 0; if (!data->retrieveSavedLogin (username, realm, may_save )) @@ -555,7 +555,7 @@ svn_error_t *ContextData::onSimplePrompt (svn_auth_cred_simple_t **cred, svn_boolean_t _may_save, apr_pool_t *pool) { - ContextData * data = 0; + ContextData * data = nullptr; SVN_ERR (getContextData (baton, &data)); bool may_save = _may_save != 0; if (!data->retrieveLogin (username, realm, may_save )) @@ -584,7 +584,7 @@ svn_error_t * ContextData::onSslServerTrustPrompt (svn_auth_cred_ssl_server_trus svn_boolean_t may_save, apr_pool_t *pool) { - ContextData * data = 0; + ContextData * data = nullptr; SVN_ERR (getContextData (baton, &data)); ContextListener::SslServerTrustData trustData (failures); @@ -603,7 +603,7 @@ svn_error_t * ContextData::onSslServerTrustPrompt (svn_auth_cred_ssl_server_trus trustData, acceptedFailures ); if(answer == ContextListener::DONT_ACCEPT) { - *cred = 0L; + *cred = nullptr; } else { svn_auth_cred_ssl_server_trust_t *cred_ = @@ -627,7 +627,7 @@ svn_error_t * ContextData::onSslClientCertPrompt (svn_auth_cred_ssl_client_cert_ void *baton, apr_pool_t *pool) { - ContextData * data = 0; + ContextData * data = nullptr; SVN_ERR (getContextData (baton, &data)); TQString certFile; @@ -651,7 +651,7 @@ svn_error_t *ContextData::onFirstSslClientCertPw ( svn_boolean_t maySave, apr_pool_t *pool) { - ContextData * data = 0; + ContextData * data = nullptr; SVN_ERR (getContextData (baton, &data)); TQString password; @@ -677,7 +677,7 @@ svn_error_t * ContextData::onSslClientCertPwPrompt( svn_boolean_t maySave, apr_pool_t *pool) { - ContextData * data = 0; + ContextData * data = nullptr; SVN_ERR (getContextData (baton, &data)); TQString password; @@ -714,12 +714,12 @@ void ContextData::reset() svn_error_t * ContextData::generate_cancel_error() { - return svn_error_create (SVN_ERR_CANCELLED, 0, listener->translate(TQString::FROMUTF8("Cancelled by user.")).TOUTF8()); + return svn_error_create (SVN_ERR_CANCELLED, nullptr, listener->translate(TQString::FROMUTF8("Cancelled by user.")).TOUTF8()); } void ContextData::onProgress(apr_off_t progress, apr_off_t total, void*baton, apr_pool_t*) { - ContextData * data = 0; + ContextData * data = nullptr; if (getContextData (baton, &data)!=SVN_NO_ERROR) { return; @@ -732,13 +732,13 @@ void ContextData::initMimeTypes() { // code take from subversion 1.5 commandline client const char *mimetypes_file; - svn_error_t * err = 0L; + svn_error_t * err = nullptr; svn_config_t * cfg = (svn_config_t *)apr_hash_get(m_ctx->config, SVN_CONFIG_CATEGORY_CONFIG, APR_HASH_KEY_STRING); svn_config_get(cfg, &mimetypes_file, SVN_CONFIG_SECTION_MISCELLANY, - SVN_CONFIG_OPTION_MIMETYPES_FILE, 0); + SVN_CONFIG_OPTION_MIMETYPES_FILE, nullptr); if (mimetypes_file && *mimetypes_file) { if ((err = svn_io_parse_mimetypes_file(&(m_ctx->mimetypes_map), mimetypes_file, pool))) { @@ -751,7 +751,7 @@ void ContextData::initMimeTypes() svn_error_t* ContextData::onWcConflictResolver(svn_wc_conflict_result_t**result,const svn_wc_conflict_description_t *description, void *baton, apr_pool_t *pool) { #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5) || (SVN_VER_MAJOR > 2)) - ContextData * data = 0; + ContextData * data = nullptr; SVN_ERR (getContextData (baton, &data)); ConflictResult cresult; if (!data->getListener()->contextConflictResolve(cresult,description)) { diff --git a/src/svnqt/diff_data.cpp b/src/svnqt/diff_data.cpp index f9f21d8..ad53d7c 100644 --- a/src/svnqt/diff_data.cpp +++ b/src/svnqt/diff_data.cpp @@ -31,7 +31,7 @@ namespace svn { DiffData::DiffData(const Path&aTmpPath,const Path&_p1,const Revision&_r1,const Path&_p2,const Revision&_r2) :m_Pool(),m_tmpPath(aTmpPath), - m_outFile(0),m_errFile(0),m_outFileName(0),m_errFileName(0), + m_outFile(nullptr),m_errFile(nullptr),m_outFileName(nullptr),m_errFileName(nullptr), m_p1(_p1),m_p2(_p2),m_r1(_r1),m_r2(_r2), m_working_copy_present(false),m_url_is_present(false) { @@ -52,7 +52,7 @@ namespace svn ".tmp", false, m_Pool); #endif - if (error!=0) { + if (error) { clean(); throw ClientException (error); } @@ -67,7 +67,7 @@ namespace svn ".tmp", false, m_Pool); #endif - if (error!=0) { + if (error) { clean(); throw ClientException (error); } @@ -112,13 +112,13 @@ namespace svn void DiffData::close() { - if (m_outFile != 0) { + if (m_outFile) { svn_io_file_close(m_outFile,m_Pool); - m_outFile=0; + m_outFile=nullptr; } - if (m_errFile != 0) { + if (m_errFile) { svn_io_file_close(m_errFile,m_Pool); - m_errFile=0; + m_errFile=nullptr; } } diff --git a/src/svnqt/diffoptions.cpp b/src/svnqt/diffoptions.cpp index 499ff22..1572740 100644 --- a/src/svnqt/diffoptions.cpp +++ b/src/svnqt/diffoptions.cpp @@ -124,7 +124,7 @@ namespace svn return _diffopts; #else Q_UNUSED(pool); - return 0; + return nullptr; #endif } @@ -139,6 +139,6 @@ namespace svn DiffOptions::~DiffOptions() { delete m_data; - m_data=0; + m_data=nullptr; } } diff --git a/src/svnqt/dirent.cpp b/src/svnqt/dirent.cpp index 19316f8..a678e5a 100644 --- a/src/svnqt/dirent.cpp +++ b/src/svnqt/dirent.cpp @@ -60,7 +60,7 @@ namespace svn hasProps (dirEntry->has_props != 0), createdRev (dirEntry->created_rev), time (dirEntry->time), m_Lock() { - lastAuthor = dirEntry->last_author == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(dirEntry->last_author); + lastAuthor = !dirEntry->last_author ? TQString::fromLatin1("") : TQString::FROMUTF8(dirEntry->last_author); } DirEntry_Data (const DirEntry & src) diff --git a/src/svnqt/entry.cpp b/src/svnqt/entry.cpp index ae29781..291b684 100644 --- a/src/svnqt/entry.cpp +++ b/src/svnqt/entry.cpp @@ -167,7 +167,7 @@ namespace svn void Entry_private::init(const TQString&url,const DirEntryPtr&dirEntry) { - init(0); + init(nullptr); _url = url; if (dirEntry) { _name=dirEntry->name(); @@ -186,7 +186,7 @@ namespace svn void Entry_private::init(const TQString&url,const InfoEntry&src) { - init(0); + init(nullptr); _name = src.Name(); _url = url; _revision = src.revision(); @@ -213,7 +213,7 @@ namespace svn if (src.m_Data) { m_Data->init(*(src.m_Data)); } else { - m_Data->init(0); + m_Data->init(nullptr); } } @@ -242,7 +242,7 @@ namespace svn if (src.m_Data) { m_Data->init(*(src.m_Data)); } else { - m_Data->init(0); + m_Data->init(nullptr); } return *this; } diff --git a/src/svnqt/entry.h b/src/svnqt/entry.h index 8e8da87..13d291d 100644 --- a/src/svnqt/entry.h +++ b/src/svnqt/entry.h @@ -64,7 +64,7 @@ namespace svn * * @param src another entry to copy from */ - Entry (const svn_wc_entry_t * src = 0); + Entry (const svn_wc_entry_t * src = nullptr); /** * copy constructor diff --git a/src/svnqt/exception.cpp b/src/svnqt/exception.cpp index ebd7c59..a3859f3 100644 --- a/src/svnqt/exception.cpp +++ b/src/svnqt/exception.cpp @@ -108,7 +108,7 @@ namespace svn TQString Exception::error2msg(svn_error_t*error) { TQString message = ""; - if (error==0) { + if (!error) { return message; } svn_error_t * next = error->child; @@ -149,7 +149,7 @@ namespace svn : Exception ("") { init(); - if (error == 0) + if (!error) return; m->apr_err = error->apr_err; diff --git a/src/svnqt/log_entry.cpp b/src/svnqt/log_entry.cpp index d168b49..af5a4b8 100644 --- a/src/svnqt/log_entry.cpp +++ b/src/svnqt/log_entry.cpp @@ -96,8 +96,8 @@ namespace svn const char *message_; svn_compat_log_revprops_out(&author_, &date_, &message_, log_entry->revprops); - author = author_ == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(author_); - message = message_ == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(message_); + author = !author_ ? TQString::fromLatin1("") : TQString::FROMUTF8(author_); + message = !message_ ? TQString::fromLatin1("") : TQString::FROMUTF8(message_); setDate(date_); revision = log_entry->revision; if (log_entry->changed_paths) { @@ -125,18 +125,18 @@ namespace svn setDate(date_); revision = revision_; - author = author_ == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(author_); - message = message_ == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(message_); + author = !author_ ? TQString::fromLatin1("") : TQString::FROMUTF8(author_); + message = !message_ ? TQString::fromLatin1("") : TQString::FROMUTF8(message_); } void LogEntry::setDate(const char*date_) { apr_time_t date__ = 0; - if (date_ != 0) + if (date_) { Pool pool; - if (svn_time_from_cstring (&date__, date_, pool) != 0) + if (svn_time_from_cstring (&date__, date_, pool)) date__ = 0; } date = date__; diff --git a/src/svnqt/path.cpp b/src/svnqt/path.cpp index 0a09bd6..ca3e95f 100644 --- a/src/svnqt/path.cpp +++ b/src/svnqt/path.cpp @@ -225,12 +225,12 @@ namespace svn Path Path::getTempDir () { - const char * tempdir = 0; + const char * tempdir = nullptr; Pool pool; if (apr_temp_dir_get (&tempdir, pool) != APR_SUCCESS) { - tempdir = 0; + tempdir = nullptr; } return tempdir; @@ -239,14 +239,14 @@ namespace svn void Path::parsePeg(const TQString&pathorurl,Path&_path,svn::Revision&_peg) { - const char *truepath = 0; + const char *truepath = nullptr; svn_opt_revision_t pegr; - svn_error_t *error = 0; + svn_error_t *error = nullptr; TQByteArray _buf = pathorurl.TOUTF8(); Pool pool; error = svn_opt_parse_path(&pegr, &truepath,_buf,pool); - if (error != 0) { + if (error) { throw ClientException (error); } tqDebug("Path: %s",truepath); diff --git a/src/svnqt/repository.cpp b/src/svnqt/repository.cpp index ed8d9b3..b24dff3 100644 --- a/src/svnqt/repository.cpp +++ b/src/svnqt/repository.cpp @@ -42,7 +42,7 @@ Repository::~Repository() void Repository::Open(const TQString&name) { svn_error_t * error = m_Data->Open(name); - if (error!=0) { + if (error) { throw ClientException (error); } } @@ -50,7 +50,7 @@ void Repository::Open(const TQString&name) void Repository::CreateOpen(const TQString&path, const TQString&fstype, bool _bdbnosync, bool _bdbautologremove, bool _pre_1_4_compat, bool _pre_1_5_compat) { svn_error_t * error = m_Data->CreateOpen(path,fstype,_bdbnosync,_bdbautologremove,_pre_1_4_compat,_pre_1_5_compat); - if (error!=0) { + if (error) { throw ClientException (error); } } @@ -62,7 +62,7 @@ void Repository::CreateOpen(const TQString&path, const TQString&fstype, bool _bd void Repository::dump(const TQString&output,const svn::Revision&start,const svn::Revision&end, bool incremental, bool use_deltas) { svn_error_t * error = m_Data->dump(output,start,end,incremental,use_deltas); - if (error!=0) { + if (error) { throw ClientException (error); } } @@ -83,7 +83,7 @@ void Repository::loaddump(const TQString&dump,LOAD_UUID uuida, const TQString&pa break; } svn_error_t * error = m_Data->loaddump(dump,uuid_action,parentFolder,usePre,usePost); - if (error!=0) { + if (error) { throw ClientException (error); } } @@ -94,7 +94,7 @@ void Repository::loaddump(const TQString&dump,LOAD_UUID uuida, const TQString&pa void Repository::hotcopy(const TQString&src,const TQString&dest,bool cleanlogs) { svn_error_t * error = RepositoryData::hotcopy(src,dest,cleanlogs); - if (error!=0) { + if (error) { throw ClientException (error); } } diff --git a/src/svnqt/repositorydata.cpp b/src/svnqt/repositorydata.cpp index 9619cc3..e539ca0 100644 --- a/src/svnqt/repositorydata.cpp +++ b/src/svnqt/repositorydata.cpp @@ -61,7 +61,7 @@ long RepoOutStream::write(const char*data,const unsigned long max) RepositoryData::RepositoryData(RepositoryListener*aListener) { - m_Repository = 0; + m_Repository = nullptr; m_Listener = aListener; } @@ -92,7 +92,7 @@ svn_error_t*RepositoryData::cancel_func(void*baton) { RepositoryListener*m_L = (RepositoryListener*)baton; if (m_L && m_L->isCanceld()) { - return svn_error_create (SVN_ERR_CANCELLED, 0, TQString::FROMUTF8("Cancelled by user.").TOUTF8()); + return svn_error_create (SVN_ERR_CANCELLED, nullptr, TQString::FROMUTF8("Cancelled by user.").TOUTF8()); } return SVN_NO_ERROR; } @@ -103,7 +103,7 @@ svn_error_t*RepositoryData::cancel_func(void*baton) void RepositoryData::Close() { m_Pool.renew(); - m_Repository = 0; + m_Repository = nullptr; } @@ -114,8 +114,8 @@ svn_error_t * RepositoryData::Open(const TQString&path) { Close(); svn_error_t * error = svn_repos_open(&m_Repository,path.TOUTF8(),m_Pool); - if (error!=0L) { - m_Repository=0; + if (error) { + m_Repository=nullptr; return error; } svn_fs_set_warning_func(svn_repos_fs(m_Repository), RepositoryData::warning_func, this); @@ -171,7 +171,7 @@ svn_error_t * RepositoryData::CreateOpen(const TQString&path, const TQString&fst #endif /// @todo config as extra paramter? Meanwhile default config only /// (see svn::ContextData) - SVN_ERR(svn_config_get_config(&config, 0, m_Pool)); + SVN_ERR(svn_config_get_config(&config, nullptr, m_Pool)); const char*repository_path = apr_pstrdup (m_Pool,path.TOUTF8()); repository_path = svn_path_internal_style(repository_path, m_Pool); @@ -195,7 +195,7 @@ svn_error_t * RepositoryData::CreateOpen(const TQString&path, const TQString&fst svn_error_t* RepositoryData::dump(const TQString&output,const svn::Revision&start,const svn::Revision&end, bool incremental, bool use_deltas) { if (!m_Repository) { - return svn_error_create(SVN_ERR_CANCELLED,0,"No repository selected."); + return svn_error_create(SVN_ERR_CANCELLED,nullptr,"No repository selected."); } Pool pool; svn::stream::SvnFileOStream out(output); @@ -212,7 +212,7 @@ svn_error_t* RepositoryData::dump(const TQString&output,const svn::Revision&star svn_error_t* RepositoryData::loaddump(const TQString&dump,svn_repos_load_uuid uuida, const TQString&parentFolder, bool usePre, bool usePost) { if (!m_Repository) { - return svn_error_create(SVN_ERR_CANCELLED,0,"No repository selected."); + return svn_error_create(SVN_ERR_CANCELLED,nullptr,"No repository selected."); } svn::stream::SvnFileIStream infile(dump); RepoOutStream backstream(this); @@ -220,7 +220,7 @@ svn_error_t* RepositoryData::loaddump(const TQString&dump,svn_repos_load_uuid uu const char*src_path = apr_pstrdup (pool,dump.TOUTF8()); const char*dest_path; if (parentFolder.isEmpty()) { - dest_path=0; + dest_path=nullptr; } else { dest_path=apr_pstrdup (pool,parentFolder.TOUTF8()); } diff --git a/src/svnqt/shared_pointer.h b/src/svnqt/shared_pointer.h index fa9aa2f..cc1652d 100644 --- a/src/svnqt/shared_pointer.h +++ b/src/svnqt/shared_pointer.h @@ -79,12 +79,12 @@ template class SharedPointer if (!data->Shared()) { delete data; } - data = 0; + data = nullptr; } } public: //! empty constructor - SharedPointer():data(0){} + SharedPointer():data(nullptr){} //! copy constructor /*! * \param p Data to increase reference for @@ -169,23 +169,23 @@ public: /*! * \return true if content set and not a null-pointer, otherwise false */ - operator bool () const { return (data != 0 && data->data != 0); } + operator bool () const { return (data && data->data); } //! Bool operator /*! * \return true if content set and not a null-pointer, otherwise false */ - operator bool () { return ( data != 0 && data->data != 0 );} + operator bool () { return (data && data->data);} //! Negation operator /*! * \return true if content not set or a null-pointer, otherwise false */ - bool operator! () const { return (data == 0 || data->data == 0); } + bool operator! () const { return (!data || !data->data); } //! Negation operator /*! * \return true if content not set or a null-pointer, otherwise false */ - bool operator! () { return (data == 0 || data->data == 0); } + bool operator! () { return (!data || !data->data); } }; } diff --git a/src/svnqt/smart_pointer.h b/src/svnqt/smart_pointer.h index 5d6dd63..555f404 100644 --- a/src/svnqt/smart_pointer.h +++ b/src/svnqt/smart_pointer.h @@ -82,7 +82,7 @@ template class smart_pointer { T *ptr; public: //! standart constructor - smart_pointer() { ptr = 0; } + smart_pointer() { ptr = nullptr; } //! standart destructor /*! * release the reference, if it were the last reference, destroys @@ -134,12 +134,12 @@ public: //! supports "if (pointer)" operator bool () const { return (ptr != 0); } //! "if (pointer)" as non const - operator bool () { return ptr != 0;} + operator bool () { return ptr != nullptr;} //! support if (!pointer)" bool operator! () const { return (ptr == 0); } //! support if (!pointer)" as non const - bool operator! () { return (ptr == 0); } + bool operator! () { return (ptr == nullptr); } }; } // namespace svn diff --git a/src/svnqt/status.cpp b/src/svnqt/status.cpp index 54170b8..73bb174 100644 --- a/src/svnqt/status.cpp +++ b/src/svnqt/status.cpp @@ -183,7 +183,7 @@ namespace svn if (src.m_Data) { m_Data->init (src.m_Data->m_Path, *(src.m_Data)); } else { - m_Data->init(src.m_Data->m_Path,0); + m_Data->init(src.m_Data->m_Path,nullptr); } } } @@ -225,7 +225,7 @@ namespace svn if (status.m_Data) { m_Data->init (status.m_Data->m_Path, *(status.m_Data)); } else { - m_Data->init(status.m_Data->m_Path,0); + m_Data->init(status.m_Data->m_Path,nullptr); } return *this; } diff --git a/src/svnqt/stringarray.cpp b/src/svnqt/stringarray.cpp index db6209e..830e9b4 100644 --- a/src/svnqt/stringarray.cpp +++ b/src/svnqt/stringarray.cpp @@ -89,7 +89,7 @@ const TQString& svn::StringArray::operator[](size_t which) apr_array_header_t * svn::StringArray::array (const Pool & pool) const { if (isNull()) { - return 0; + return nullptr; } TQStringList::const_iterator it; diff --git a/src/svnqt/svnfilestream.h b/src/svnqt/svnfilestream.h index cd46b65..155004f 100644 --- a/src/svnqt/svnfilestream.h +++ b/src/svnqt/svnfilestream.h @@ -35,7 +35,7 @@ class SvnFileStream_private; class SVNTQT_EXPORT SvnFileOStream : public SvnStream { public: - SvnFileOStream(const TQString&fn,svn_client_ctx_t*ctx=0); + SvnFileOStream(const TQString&fn,svn_client_ctx_t*ctx=nullptr); virtual ~SvnFileOStream(); @@ -52,7 +52,7 @@ private: class SVNTQT_EXPORT SvnFileIStream : public SvnStream { public: - SvnFileIStream(const TQString&fn,svn_client_ctx_t*ctx=0); + SvnFileIStream(const TQString&fn,svn_client_ctx_t*ctx=nullptr); virtual ~SvnFileIStream(); virtual bool isOk() const; diff --git a/src/svnqt/svnstream.cpp b/src/svnqt/svnstream.cpp index ca4563a..031b2d6 100644 --- a/src/svnqt/svnstream.cpp +++ b/src/svnqt/svnstream.cpp @@ -36,7 +36,7 @@ namespace stream { class SVNTQT_NOEXPORT SvnStream_private { public: - SvnStream_private(){m_Stream=0;m_LastError="";_context=0;cancel_timeout.start();} + SvnStream_private(){m_Stream=nullptr;m_LastError="";_context=nullptr;cancel_timeout.start();} ~SvnStream_private(){tqDebug("Time elapsed: %i ",cancel_timeout.elapsed());} static svn_error_t * stream_write(void*baton,const char*data,apr_size_t*len); @@ -63,7 +63,7 @@ svn_error_t * SvnStream_private::stream_read(void*baton,char*data,apr_size_t*len if (res<0) { *len = 0; - return svn_error_create(SVN_ERR_MALFORMED_FILE,0L,b->lastError().TOUTF8()); + return svn_error_create(SVN_ERR_MALFORMED_FILE,nullptr,b->lastError().TOUTF8()); } *len = res; return SVN_NO_ERROR; @@ -83,7 +83,7 @@ svn_error_t * SvnStream_private::stream_write(void*baton,const char*data,apr_siz long res = b->isOk()?b->write(data,*len):-1; if (res<0) { *len = 0; - return svn_error_create(SVN_ERR_MALFORMED_FILE,0L,b->lastError().TOUTF8()); + return svn_error_create(SVN_ERR_MALFORMED_FILE,nullptr,b->lastError().TOUTF8()); } *len = res; return SVN_NO_ERROR; diff --git a/src/svnqt/svnstream.h b/src/svnqt/svnstream.h index e71034b..11fb06c 100644 --- a/src/svnqt/svnstream.h +++ b/src/svnqt/svnstream.h @@ -48,7 +48,7 @@ public: * \param ctx a client context for calls to cancel_func inside. you should this only set with functions not using it itself * like svn_client_cat2: */ - SvnStream(bool readit, bool writeit, svn_client_ctx_t * ctx = 0); + SvnStream(bool readit, bool writeit, svn_client_ctx_t * ctx = nullptr); //! frees all structures and releases memory pool. virtual ~SvnStream(); @@ -129,7 +129,7 @@ public: * \param ctx a client context for calls to cancel_func inside. you should this only set with functions not using it itself * like svn_client_cat2: */ - SvnByteStream(svn_client_ctx_t * ctx = 0); + SvnByteStream(svn_client_ctx_t * ctx = nullptr); //! release internal buffer virtual ~SvnByteStream(); //! fill internal buffer with data diff --git a/src/svnqt/url.cpp b/src/svnqt/url.cpp index 0e32af0..27ea7f6 100644 --- a/src/svnqt/url.cpp +++ b/src/svnqt/url.cpp @@ -50,7 +50,7 @@ namespace svn "http","https","file", "svn","svn+ssh","svn+http","svn+https","svn+file", "ksvn","ksvn+ssh","ksvn+http","ksvn+https","ksvn+file","ksvn", - 0 + nullptr }; static bool mSchemasInitialized = false; @@ -78,7 +78,7 @@ namespace svn { TQString urlTest(url); unsigned int index = 0; - while (VALID_SCHEMAS[index]!=0) + while (VALID_SCHEMAS[index]) { TQString schema = TQString::FROMUTF8(VALID_SCHEMAS[index]); TQString urlComp = urlTest.mid(0, schema.length()); diff --git a/src/svnqt/wc.cpp b/src/svnqt/wc.cpp index 77a3c22..6f66a81 100644 --- a/src/svnqt/wc.cpp +++ b/src/svnqt/wc.cpp @@ -52,7 +52,7 @@ namespace svn path.path().TOUTF8(), &wc, pool); - if ((error) || (wc == 0)) + if (error || wc == 0) { return false; } @@ -83,19 +83,19 @@ namespace svn { Pool pool; Path itemPath(path); - svn_error_t * error = 0; + svn_error_t * error = nullptr; svn_wc_adm_access_t *adm_access; const svn_wc_entry_t *entry; - error = svn_wc_adm_probe_open2(&adm_access,0,itemPath.path().TOUTF8(),false,0,pool); - if (error!=0) { + error = svn_wc_adm_probe_open2(&adm_access,nullptr,itemPath.path().TOUTF8(),false,0,pool); + if (error) { throw ClientException(error); } error = svn_wc_entry(&entry,itemPath.path().TOUTF8(),adm_access,false,pool); - if (error!=0) { + if (error) { throw ClientException(error); } error = svn_wc_adm_close(adm_access); - if (error!=0) { + if (error) { throw ClientException(error); } return entry; diff --git a/src/tdeiosvn/tdeiobytestream.cpp b/src/tdeiosvn/tdeiobytestream.cpp index fe3c3a9..5df6d24 100644 --- a/src/tdeiosvn/tdeiobytestream.cpp +++ b/src/tdeiosvn/tdeiobytestream.cpp @@ -20,7 +20,7 @@ #include "tdeiobytestream.h" KioByteStream::KioByteStream(StreamWrittenCb*aCb,const TQString&filename) - : svn::stream::SvnStream(false,true,0L), + : svn::stream::SvnStream(false,true,nullptr), m_Cb(aCb),m_Written(0), m_mimeSend(false),m_Filename(filename) { @@ -33,7 +33,7 @@ KioByteStream::~KioByteStream() bool KioByteStream::isOk() const { - return m_Cb != 0; + return m_Cb != nullptr; } long KioByteStream::write(const char* data, const unsigned long max) diff --git a/src/tdeiosvn/tdeiosvn.cpp b/src/tdeiosvn/tdeiosvn.cpp index 7e88cca..2bb87b6 100644 --- a/src/tdeiosvn/tdeiosvn.cpp +++ b/src/tdeiosvn/tdeiosvn.cpp @@ -86,8 +86,8 @@ public: KioSvnData::KioSvnData(tdeio_svnProtocol*par) : m_Listener(par),first_done(false) { - m_Svnclient=svn::Client::getobject(0,0); - m_CurrentContext = 0; + m_Svnclient=svn::Client::getobject(nullptr,0); + m_CurrentContext = nullptr; dispProgress = false; reInitClient(); } @@ -112,8 +112,8 @@ KioSvnData::~KioSvnData() /* wait a little bit */ sleep(1); delete m_Svnclient; - m_CurrentContext->setListener(0L); - m_CurrentContext = 0; + m_CurrentContext->setListener(nullptr); + m_CurrentContext = nullptr; } svn::Revision KioSvnData::urlToRev(const KURL&url) @@ -760,7 +760,7 @@ void tdeio_svnProtocol::svnlog(int revstart,const TQString&revstringstart,int re svn::LogEntriesPtr logs; for (unsigned j = 0; jm_Svnclient->log(makeSvnUrl(urls[j]),start,end,svn::Revision::UNDEFINED,true,true,0); } catch (const svn::ClientException&e) { diff --git a/src/tdesvn.cpp b/src/tdesvn.cpp index ca98b94..6d13802 100644 --- a/src/tdesvn.cpp +++ b/src/tdesvn.cpp @@ -62,10 +62,10 @@ #endif tdesvn::tdesvn() - : KParts::MainWindow( 0, "tdesvn" ), + : KParts::MainWindow( nullptr, "tdesvn" ), KBookmarkOwner() { - m_part = 0; + m_part = nullptr; #ifdef TESTING_RC setXMLFile(TESTING_RC); kdDebug()<<"Using test rc file in " << TESTING_RC << endl; @@ -192,7 +192,7 @@ void tdesvn::load(const KURL& url,bool addRescent) { if (m_part) { bool ret = m_part->openURL(url); - TDERecentFilesAction*rac = 0; + TDERecentFilesAction*rac = nullptr; if (addRescent) { TDEAction * ac = actionCollection()->action("file_open_recent"); if (ac) { diff --git a/src/tdesvn_part.cpp b/src/tdesvn_part.cpp index dda541f..cd0dd11 100644 --- a/src/tdesvn_part.cpp +++ b/src/tdesvn_part.cpp @@ -74,7 +74,7 @@ tdesvnPart::tdesvnPart(TQWidget *parentWidget, const char *widgetName, void tdesvnPart::init( TQWidget *parentWidget, const char *widgetName,bool full) { - m_aboutDlg = 0; + m_aboutDlg = nullptr; TDEGlobal::locale()->insertCatalogue("tdesvn"); // we need an instance setInstance( tdesvnPartFactory::instance() ); @@ -135,7 +135,7 @@ bool tdesvnPart::openURL(const KURL&url) return false; } m_url = _url; - emit started(0); + emit started(nullptr); bool ret = m_view->openURL(m_url); if (ret) { emit completed(); @@ -159,9 +159,9 @@ TDEAboutData* tdesvnPart::createAboutData() m_Extratext+=TQString(I18N_NOOP("Running Subversion library: %1")).arg(svn::Version::running_version()); TDEAboutData*about = new TDEAboutData("tdesvnpart", I18N_NOOP("tdesvn Part"), version, description, - TDEAboutData::License_GPL, "(C) 2005-2007 Rajko Albrecht",0, - 0, "ral@alwins-world.de"); - about->addAuthor( "Rajko Albrecht", 0, "ral@alwins-world.de" ); + TDEAboutData::License_GPL, "(C) 2005-2007 Rajko Albrecht",nullptr, + nullptr, "ral@alwins-world.de"); + about->addAuthor( "Rajko Albrecht", nullptr, "ral@alwins-world.de" ); about->setOtherText(m_Extratext.ascii()); about->setHomepage("http://tdesvn.alwins-world.de/"); about->setBugAddress("tdesvn-bugs@alwins-world.de"); @@ -211,7 +211,7 @@ void tdesvnPart::setupActions() if (TQString(tdeApp->instanceName())!=TQString("tdesvn")) { (void)new TDEAction(i18n("&About tdesvn part"), "tdesvn", 0, this, TQ_SLOT(showAboutApplication()), actionCollection(), "help_about_tdesvnpart"); (void)new TDEAction(i18n("Tdesvn &Handbook"), "help", 0, this, TQ_SLOT(appHelpActivated()), actionCollection(), "help_tdesvn"); - (void)new TDEAction(i18n("Send Bugreport for tdesvn"), 0, 0, this, TQ_SLOT(reportBug()), actionCollection(), "report_bug"); + (void)new TDEAction(i18n("Send Bugreport for tdesvn"), nullptr, 0, this, TQ_SLOT(reportBug()), actionCollection(), "report_bug"); } actionCollection()->setHighlightingEnabled(true); } @@ -320,7 +320,7 @@ void tdesvnPart::reportBug() void tdesvnPart::showAboutApplication() { if (!m_aboutDlg) m_aboutDlg = new TDEAboutApplication(createAboutData(), (TQWidget *)0, (const char *)0, false); - if(m_aboutDlg == 0) + if(!m_aboutDlg) return; if(!m_aboutDlg->isVisible()) m_aboutDlg->show(); @@ -351,17 +351,17 @@ void tdesvnPart::slotShowSettings() Kdesvnsettings::self(), KDialogBase::IconList); dialog->setHelp("setup","tdesvn"); - dialog->addPage(new DisplaySettings_impl(0,"general_items"), + dialog->addPage(new DisplaySettings_impl(nullptr,"general_items"), i18n("General"),"configure",i18n("General"),true); - dialog->addPage(new SubversionSettings_impl(0,"subversion_items"), + dialog->addPage(new SubversionSettings_impl(nullptr,"subversion_items"), i18n("Subversion"),"tdesvn",i18n("Subversion Settings"),true); - dialog->addPage(new DiffMergeSettings_impl(0,"diffmerge_items"), + dialog->addPage(new DiffMergeSettings_impl(nullptr,"diffmerge_items"), i18n("Diff & Merge"),"tdesvnmerge",i18n("Settings for diff and merge"),true); - dialog->addPage(new DispColorSettings_impl(0,"color_items"), + dialog->addPage(new DispColorSettings_impl(nullptr,"color_items"), i18n("Colors"),"colorize",i18n("Color Settings"),true); - dialog->addPage(new RevisiontreeSettingsDlg_impl(0,"revisiontree_items"), + dialog->addPage(new RevisiontreeSettingsDlg_impl(nullptr,"revisiontree_items"), i18n("Revision tree"),"configure",i18n("Revision tree Settings"),true); - dialog->addPage(new CmdExecSettings_impl(0,"cmdexec_items"), + dialog->addPage(new CmdExecSettings_impl(nullptr,"cmdexec_items"), "TDEIO/"+i18n("Commandline"),"terminal",i18n("Settings for commandline and TDEIO execution"),true); connect(dialog,TQ_SIGNAL(settingsChanged()),this,TQ_SLOT(slotSettingsChanged())); @@ -395,9 +395,9 @@ void tdesvnPart::slotSettingsChanged() /* * we may not use generic factory 'cause we make some specials */ -TDEInstance* cFactory::s_instance = 0L; -TDEAboutData* cFactory::s_about = 0L; -commandline_part* cFactory::s_cline = 0L; +TDEInstance* cFactory::s_instance = nullptr; +TDEAboutData* cFactory::s_about = nullptr; +commandline_part* cFactory::s_cline = nullptr; KParts::Part* cFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, @@ -425,8 +425,8 @@ cFactory::~cFactory() delete s_about; delete s_cline; - s_instance = 0L; - s_cline = 0L; + s_instance = nullptr; + s_cline = nullptr; } TDEInstance* cFactory::instance() diff --git a/src/tdesvnd/tdesvnd_dcop.cpp b/src/tdesvnd/tdesvnd_dcop.cpp index 2bc7173..8f4107e 100644 --- a/src/tdesvnd/tdesvnd_dcop.cpp +++ b/src/tdesvnd/tdesvnd_dcop.cpp @@ -95,7 +95,7 @@ protected: IListener::IListener(tdesvnd_dcop*p) :svn::ContextListener() { - m_Svnclient = svn::Client::getobject(0,0); + m_Svnclient = svn::Client::getobject(nullptr,0); m_back=p; m_CurrentContext = new svn::Context(); m_CurrentContext->setListener(this); @@ -255,7 +255,7 @@ TQString tdesvnd_dcop::get_sslclientcertfile() { TQString afile = KFileDialog::getOpenFileName(TQString(), TQString(), - 0, + nullptr, i18n("Open a file with a #PKCS12 certificate")); return afile; } @@ -264,7 +264,7 @@ TQStringList tdesvnd_dcop::get_logmsg() { TQStringList res; bool ok; - TQString logMessage = Logmsg_impl::getLogmessage(&ok,0,0,0,"logmsg_impl"); + TQString logMessage = Logmsg_impl::getLogmessage(&ok,nullptr,nullptr,nullptr,"logmsg_impl"); if (!ok) { return res; } @@ -276,7 +276,7 @@ TQStringList tdesvnd_dcop::get_logmsg(TQMap list) { TQStringList res; bool ok; - TQString logMessage = Logmsg_impl::getLogmessage(list,&ok,0,0,0,"logmsg_impl"); + TQString logMessage = Logmsg_impl::getLogmessage(list,&ok,nullptr,nullptr,nullptr,"logmsg_impl"); if (!ok) { return res; } diff --git a/src/tdesvnview.cpp b/src/tdesvnview.cpp index ab5c67b..d14035f 100644 --- a/src/tdesvnview.cpp +++ b/src/tdesvnview.cpp @@ -64,7 +64,7 @@ tdesvnView::tdesvnView(TDEActionCollection*aCollection,TQWidget *parent,const ch { Q_UNUSED(full); setupActions(); - m_CacheProgressBar=0; + m_CacheProgressBar=nullptr; m_topLayout = new TQVBoxLayout(this); @@ -360,7 +360,7 @@ void tdesvnView::slotLoaddump() break; } try { - StopDlg sdlg(this,this,0,"Load Dump",i18n("Loading a dump into a repository.")); + StopDlg sdlg(this,this,nullptr,"Load Dump",i18n("Loading a dump into a repository.")); _rep.loaddump(ptr->dumpFile(),_act,ptr->parentPath(),ptr->usePre(),ptr->usePost()); slotAppendLog(i18n("Loading dump finished.")); }catch (const svn::ClientException&e) { @@ -421,7 +421,7 @@ void tdesvnView::slotDumpRepo() } try { - StopDlg sdlg(this,this,0,"Dump",i18n("Dumping a repository")); + StopDlg sdlg(this,this,nullptr,"Dump",i18n("Dumping a repository")); _rep->dump(out,st,en,incr,diffs); slotAppendLog(i18n("Dump finished.")); }catch (const svn::ClientException&e) { @@ -478,7 +478,7 @@ void tdesvnView::fillCacheStatus(TQ_LONG current,TQ_LONG max) m_CacheProgressBar->setValue((int)current); } else { delete m_CacheProgressBar; - m_CacheProgressBar=0; + m_CacheProgressBar=nullptr; } } diff --git a/src/tdesvnview.h b/src/tdesvnview.h index 36ab5f3..1518888 100644 --- a/src/tdesvnview.h +++ b/src/tdesvnview.h @@ -57,7 +57,7 @@ public: /** * Default constructor */ - tdesvnView(TDEActionCollection*,TQWidget *parent,const char*name=0,bool full=false); + tdesvnView(TDEActionCollection*,TQWidget *parent,const char*name=nullptr,bool full=false); /** * Destructor diff --git a/src/urldlg.cpp b/src/urldlg.cpp index cace72b..c22016e 100644 --- a/src/urldlg.cpp +++ b/src/urldlg.cpp @@ -52,7 +52,7 @@ void UrlDlg::init_dlg() TQLabel * label = new TQLabel(i18n("Open repository or working copy") , plainPage()); topLayout->addWidget(label); - KHistoryCombo * combo = new KHistoryCombo(0,"history_combo"); + KHistoryCombo * combo = new KHistoryCombo(nullptr,"history_combo"); combo->setDuplicatesEnabled(false); TDEConfig *kc = TDEGlobal::config(); TDEConfigGroupSaver ks( kc, TQString::fromLatin1("Open-repository settings") ); diff --git a/src/urldlg.h b/src/urldlg.h index e0aa2aa..bc81abb 100644 --- a/src/urldlg.h +++ b/src/urldlg.h @@ -33,10 +33,10 @@ class UrlDlg : public KDialogBase TQ_OBJECT public: - UrlDlg(TQWidget *parent = 0, const char *name = 0); + UrlDlg(TQWidget *parent = nullptr, const char *name = nullptr); ~UrlDlg(); KURL selectedURL(); - static KURL getURL(TQWidget*parent=0); + static KURL getURL(TQWidget*parent=nullptr); protected: virtual void init_dlg(); KURLRequester*urlRequester_; -- cgit v1.2.3