From 843ed64967636e68f84fb17ecd6c91d9d8c02110 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sat, 3 Oct 2026 17:36:05 -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 --- kcron/ctcron.cpp | 4 +- kcron/ctcron.h | 2 +- kcron/cthost.cpp | 6 +- kcron/ktlisttask.cpp | 2 +- kcron/ktlisttasks.cpp | 4 +- kcron/ktlistvar.cpp | 2 +- kcron/ktlistvars.cpp | 4 +- kcron/ktprint.cpp | 2 +- kcron/ktprint.h | 2 +- kcron/ktprintopt.cpp | 2 +- kcron/kttask.cpp | 6 +- kcron/kttask.h | 2 +- kcron/ktvariable.cpp | 2 +- kcron/ktvariable.h | 2 +- kcron/ktview.cpp | 42 ++++---- kcron/ktview.h | 6 +- kcron/main.cpp | 8 +- kdat/Archive.cpp | 18 ++-- kdat/ArchiveInfoWidget.cpp | 2 +- kdat/ArchiveInfoWidget.h | 2 +- kdat/BackupDlg.cpp | 2 +- kdat/BackupDlg.h | 2 +- kdat/BackupOptDlg.h | 2 +- kdat/BackupProfileInfoWidget.cpp | 2 +- kdat/BackupProfileInfoWidget.h | 2 +- kdat/BackupProfileManager.cpp | 4 +- kdat/BackupProfileWidget.cpp | 2 +- kdat/BackupProfileWidget.h | 2 +- kdat/FileInfoWidget.h | 2 +- kdat/FormatOptDlg.h | 2 +- kdat/ImageCache.cpp | 4 +- kdat/IndexDlg.h | 2 +- kdat/InfoShellWidget.h | 2 +- kdat/KDatMainWindow.cpp | 28 ++--- kdat/LoggerWidget.h | 2 +- kdat/Node.cpp | 20 ++-- kdat/Options.cpp | 4 +- kdat/OptionsDlg.cpp | 4 +- kdat/OptionsDlg.h | 2 +- kdat/Tape.cpp | 4 +- kdat/TapeDrive.cpp | 8 +- kdat/TapeFileInfoWidget.h | 2 +- kdat/TapeInfoWidget.cpp | 2 +- kdat/TapeInfoWidget.h | 2 +- kdat/TapeManager.cpp | 8 +- kdat/VerifyDlg.h | 2 +- kdat/VerifyOptDlg.h | 2 +- kdat/ktreeview.cpp | 120 ++++++++++----------- kdat/ktreeview.h | 6 +- kdat/main.cpp | 2 +- knetworkconf/knetworkconf/kadddevicecontainer.cpp | 2 +- knetworkconf/knetworkconf/kadddevicecontainer.h | 2 +- knetworkconf/knetworkconf/knetworkconf.cpp | 36 +++---- knetworkconf/knetworkconf/knetworkconf.h | 2 +- knetworkconf/knetworkconf/knetworkconfigparser.cpp | 32 +++--- knetworkconf/knetworkconf/knetworkconfmodule.cpp | 2 +- .../knetworkconf/kprofileslistviewtooltip.h | 2 +- knetworkconf/knetworkconf/main.cpp | 2 +- kpackage/debAptInterface.cpp | 6 +- kpackage/debInterface.cpp | 26 ++--- kpackage/debInterface.h | 2 +- kpackage/fbsdInterface.cpp | 12 +-- kpackage/findf.h | 2 +- kpackage/gentooInterface.cpp | 12 +-- kpackage/kissInterface.cpp | 26 ++--- kpackage/kpPty.cpp | 10 +- kpackage/kpPty.h | 2 +- kpackage/kpTerm.h | 4 +- kpackage/kpackage.cpp | 8 +- kpackage/kplview.cpp | 20 ++-- kpackage/kplview.h | 20 ++-- kpackage/main.cpp | 12 +-- kpackage/managementWidget.cpp | 32 +++--- kpackage/options.cpp | 4 +- kpackage/options.h | 2 +- kpackage/packageDisplay.cpp | 4 +- kpackage/packageDisplay.h | 2 +- kpackage/packageInfo.cpp | 6 +- kpackage/packageProperties.cpp | 4 +- kpackage/packageProperties.h | 2 +- kpackage/pkgInterface.cpp | 24 ++--- kpackage/pkgOptions.cpp | 8 +- kpackage/pkgOptions.h | 6 +- kpackage/procbuf.cpp | 8 +- kpackage/rpmInterface.cpp | 8 +- kpackage/search.cpp | 4 +- kpackage/search.h | 2 +- kpackage/slackInterface.cpp | 14 +-- kpackage/tdeio.cpp | 4 +- kpackage/updateLoc.cpp | 24 ++--- kpackage/updateLoc.h | 10 +- ksysv/OldView.cpp | 14 +-- ksysv/OldView.h | 2 +- ksysv/RunlevelAuthIcon.h | 2 +- ksysv/ServiceDlg.h | 2 +- ksysv/SpinBox.h | 2 +- ksysv/TopWidget.cpp | 40 +++---- ksysv/kdltooltip.h | 2 +- ksysv/kscroller.cpp | 12 +-- ksysv/kscroller.h | 2 +- ksysv/ksv_core.cpp | 2 +- ksysv/ksv_service.cpp | 2 +- ksysv/ksvconfigwizard.h | 2 +- ksysv/ksvdrag.cpp | 2 +- ksysv/ksvdrag.h | 4 +- ksysv/ksvdraglist.cpp | 30 +++--- ksysv/ksvdraglist.h | 6 +- ksysv/ksvlookandfeel.h | 2 +- ksysv/ksvmiscconfig.h | 2 +- ksysv/ksvpathconfig.h | 2 +- ksysv/main.cpp | 2 +- ksysv/trash.h | 2 +- kuser/addUser.cpp | 16 +-- kuser/addUser.h | 2 +- kuser/delUser.h | 2 +- kuser/editDefaults.cpp | 2 +- kuser/editDefaults.h | 2 +- kuser/editGroup.cpp | 8 +- kuser/kgroup.cpp | 14 +-- kuser/kgroupfiles.cpp | 30 +++--- kuser/kgroupldap.cpp | 16 +-- kuser/kgroupsystem.cpp | 4 +- kuser/kgroupvw.cpp | 2 +- kuser/kgroupvw.h | 2 +- kuser/kuser.cpp | 68 ++++++------ kuser/kuserfiles.cpp | 40 +++---- kuser/kuserldap.cpp | 16 +-- kuser/kusersystem.cpp | 4 +- kuser/kuservw.cpp | 2 +- kuser/kuservw.h | 2 +- kuser/main.cpp | 4 +- kuser/mainView.cpp | 30 +++--- kuser/mainView.h | 2 +- kuser/mainWidget.cpp | 8 +- kuser/mainWidget.h | 2 +- kuser/misc.cpp | 8 +- kuser/propdlg.cpp | 22 ++-- kuser/propdlg.h | 4 +- kuser/pwddlg.cpp | 2 +- kuser/selectconn.cpp | 4 +- kuser/tdeglobal.cpp | 6 +- lilo-config/common/String.cpp | 16 +-- lilo-config/common/lilo.cpp | 4 +- lilo-config/kde-qt-common/EditWidget.cpp | 6 +- lilo-config/kde-qt-common/EditWidget.h | 2 +- lilo-config/kde-qt-common/expert.h | 2 +- lilo-config/kde-qt-common/general.h | 2 +- lilo-config/kde-qt-common/images.h | 2 +- lilo-config/kde-qt-common/mainwidget.h | 2 +- lilo-config/kde/Details.h | 2 +- lilo-config/kde/InputBox.h | 2 +- lilo-config/kde/kcontrol.cpp | 4 +- secpolicy/main.cpp | 2 +- secpolicy/pamview.cpp | 2 +- secpolicy/pamview.h | 2 +- secpolicy/secpolicywin.cpp | 2 +- secpolicy/secpolicywin.h | 2 +- tdefile-plugins/deb/tdefile_deb.cpp | 2 +- tdefile-plugins/rpm/tdefile_rpm.cpp | 2 +- 159 files changed, 648 insertions(+), 648 deletions(-) diff --git a/kcron/ctcron.cpp b/kcron/ctcron.cpp index 488cc45..ec874d6 100644 --- a/kcron/ctcron.cpp +++ b/kcron/ctcron.cpp @@ -99,7 +99,7 @@ CTCron::CTCron(bool _syscron, string _login) : CTCron::CTCron(const struct passwd *pwd) : syscron(false) { - Q_ASSERT(pwd != 0L); + Q_ASSERT(pwd); KTempFile tmp; tmp.setAutoDelete(true); @@ -131,7 +131,7 @@ CTCron::CTCron(const struct passwd *pwd) : bool CTCron::initFromPasswd(const struct passwd *pwd) { - if (pwd == 0) + if (!pwd) { return false; } diff --git a/kcron/ctcron.h b/kcron/ctcron.h index dd8170a..1ce7d98 100644 --- a/kcron/ctcron.h +++ b/kcron/ctcron.h @@ -48,7 +48,7 @@ public: * If you already have a struct passwd, use it instead. This * is never used for the system crontab. */ - CTCron(const struct passwd * _login = 0L); + CTCron(const struct passwd * _login = nullptr); /** * Copy one user's tasks and environement variables to another user. diff --git a/kcron/cthost.cpp b/kcron/cthost.cpp index b368b77..6d00250 100644 --- a/kcron/cthost.cpp +++ b/kcron/cthost.cpp @@ -27,7 +27,7 @@ using namespace std; CTHost::CTHost() { - struct passwd *pwd = 0L; + struct passwd *pwd = nullptr; // If it is the root user if (getuid() == 0) @@ -92,7 +92,7 @@ CTCron* CTHost::createCTCron(bool _syscron, string _login) { error = p->errorMessage(); delete p; - return 0; + return nullptr; } cron.push_back(p); return p; @@ -105,7 +105,7 @@ CTCron* CTHost::createCTCron(const struct passwd *pwd) { error = p->errorMessage(); delete p; - return 0; + return nullptr; } cron.push_back(p); return p; diff --git a/kcron/ktlisttask.cpp b/kcron/ktlisttask.cpp index e86b497..c40654c 100644 --- a/kcron/ktlisttask.cpp +++ b/kcron/ktlisttask.cpp @@ -20,7 +20,7 @@ KTListTask::KTListTask(KTListItem* parent, CTCron* _ctcron, CTTask* _cttask) : - KTListItem(parent, 0, _ctcron), + KTListItem(parent, nullptr, _ctcron), cttask(_cttask) { diff --git a/kcron/ktlisttasks.cpp b/kcron/ktlisttasks.cpp index 65e909b..37a0668 100644 --- a/kcron/ktlisttasks.cpp +++ b/kcron/ktlisttasks.cpp @@ -25,13 +25,13 @@ #include "ktprint.h" KTListTasks::KTListTasks(KTListItem* parent, CTCron* _ctcron) : - KTListItem(parent, 0, _ctcron) + KTListItem(parent, nullptr, _ctcron) { refresh(); } KTListTasks::KTListTasks(TQListView* parent, CTCron* _ctcron) : - KTListItem(parent, 0, _ctcron) + KTListItem(parent, nullptr, _ctcron) { refresh(); } diff --git a/kcron/ktlistvar.cpp b/kcron/ktlistvar.cpp index 3805658..db4d753 100644 --- a/kcron/ktlistvar.cpp +++ b/kcron/ktlistvar.cpp @@ -21,7 +21,7 @@ KTListVar::KTListVar(KTListItem* parent, CTCron* _ctcron, CTVariable* _ctvariable) : - KTListItem(parent, 0, _ctcron), + KTListItem(parent, nullptr, _ctcron), ctvar(_ctvariable) { refresh(); diff --git a/kcron/ktlistvars.cpp b/kcron/ktlistvars.cpp index 1369507..09ea8e1 100644 --- a/kcron/ktlistvars.cpp +++ b/kcron/ktlistvars.cpp @@ -26,13 +26,13 @@ #include "ktprint.h" KTListVars::KTListVars(KTListItem* parent, CTCron* _ctcron) : - KTListItem(parent, 0, _ctcron) + KTListItem(parent, nullptr, _ctcron) { refresh(); } KTListVars::KTListVars(TQListView* parent, CTCron* _ctcron) : - KTListItem(parent, 0, _ctcron) + KTListItem(parent, nullptr, _ctcron) { refresh(); } diff --git a/kcron/ktprint.cpp b/kcron/ktprint.cpp index b85d10a..f4a30ab 100644 --- a/kcron/ktprint.cpp +++ b/kcron/ktprint.cpp @@ -78,7 +78,7 @@ bool KTPrint:: start () prnt->setDocName("Cron Tab"); prnt->addDialogPage(new KTPrintOpt(root)); - if (prnt->setup(0L, i18n("Print Cron Tab"))) { //Setup a printer + if (prnt->setup(nullptr, i18n("Print Cron Tab"))) { //Setup a printer if (paint) delete paint; paint = new TQPainter (); paint->begin(prnt); diff --git a/kcron/ktprint.h b/kcron/ktprint.h index 16c13b1..bab0ed6 100644 --- a/kcron/ktprint.h +++ b/kcron/ktprint.h @@ -51,7 +51,7 @@ public: rightMargin (defaultRightMargin), topMargin(defaultTopMargin), bottomMargin(defaultBottomMargin), - paint(0), + paint(nullptr), root(_root) { prnt = new KPrinter; diff --git a/kcron/ktprintopt.cpp b/kcron/ktprintopt.cpp index a6a12c6..726d5f3 100644 --- a/kcron/ktprintopt.cpp +++ b/kcron/ktprintopt.cpp @@ -21,7 +21,7 @@ #include "ktprintopt.h" KTPrintOpt::KTPrintOpt(bool root) : - KPrintDialogPage(0, "ktprintopt") + KPrintDialogPage(nullptr, "ktprintopt") { m_title = i18n("Cron Options"); diff --git a/kcron/kttask.cpp b/kcron/kttask.cpp index 34d7ce1..42dd229 100644 --- a/kcron/kttask.cpp +++ b/kcron/kttask.cpp @@ -36,7 +36,7 @@ class KTPushButton : public TQPushButton { public: - KTPushButton(TQWidget * parent, const char * name = 0 ) + KTPushButton(TQWidget * parent, const char * name = nullptr ) : TQPushButton(parent, name), isSelected(false), isDirty(false) { updatePalette(); @@ -98,7 +98,7 @@ public: }; KTTask::KTTask(CTTask* _cttask, const TQString & _caption) - :KDialog( 0, "kttask", true, WStyle_DialogBorder ) + :KDialog( nullptr, "kttask", true, WStyle_DialogBorder ) { cttask = _cttask; @@ -207,7 +207,7 @@ KTTask::KTTask(CTTask* _cttask, const TQString & _caption) TQVBoxLayout *vdays = new TQVBoxLayout( bgDayOfMonth, KDialogBase::spacingHint() ); vdays->addSpacing( 2 * KDialogBase::spacingHint() ); - TQHBoxLayout *hdays = 0; + TQHBoxLayout *hdays = nullptr; for (int dm = 1; dm <= 31; dm++) { diff --git a/kcron/kttask.h b/kcron/kttask.h index c77c008..047e06c 100644 --- a/kcron/kttask.h +++ b/kcron/kttask.h @@ -38,7 +38,7 @@ public: /** * Initialize from CTTask. */ - KTTask(CTTask* _cttask = 0, const TQString &_caption=""); + KTTask(CTTask* _cttask = nullptr, const TQString &_caption=""); /** * Destroy. diff --git a/kcron/ktvariable.cpp b/kcron/ktvariable.cpp index 47950fe..b364d4b 100644 --- a/kcron/ktvariable.cpp +++ b/kcron/ktvariable.cpp @@ -23,7 +23,7 @@ #include "kticon.h" KTVariable::KTVariable(CTVariable* _ctvar,const TQString &_caption) : - KDialogBase(0, "ktvariable", true, _caption, Ok|Cancel, Ok, true), + KDialogBase(nullptr, "ktvariable", true, _caption, Ok|Cancel, Ok, true), ctvar( _ctvar) { TQFrame *page = makeMainWidget(); diff --git a/kcron/ktvariable.h b/kcron/ktvariable.h index 38adc08..97ce26e 100644 --- a/kcron/ktvariable.h +++ b/kcron/ktvariable.h @@ -40,7 +40,7 @@ public: /** * Initialize from CTVariable. */ - KTVariable(CTVariable* _ctvar = 0, const TQString &_caption=""); + KTVariable(CTVariable* _ctvar = nullptr, const TQString &_caption=""); /** * Destroy. diff --git a/kcron/ktview.cpp b/kcron/ktview.cpp index b9c3869..ce977e6 100644 --- a/kcron/ktview.cpp +++ b/kcron/ktview.cpp @@ -48,14 +48,14 @@ KTView::KTView(TQWidget *parent, const char* name) : TQWidget(parent, name), - listView(0), - currentCTCron(0), + listView(nullptr), + currentCTCron(nullptr), currentIsTask(true), - currentCTTask(0), - currentCTVariable(0), + currentCTTask(nullptr), + currentCTVariable(nullptr), clipboardIsTask(true), - clipboardCTTask(0), - clipboardCTVariable(0) + clipboardCTTask(nullptr), + clipboardCTVariable(nullptr) { ktapp = (KTApp*)parentWidget(); setBackgroundMode(PaletteBase); @@ -112,8 +112,8 @@ void KTView::refresh() { CTCron* ctcron((CTCron*)*i); - KTListVars* variables(0); - KTListTasks* tasks(0); + KTListVars* variables(nullptr); + KTListTasks* tasks(nullptr); if (cth.root()) { @@ -312,13 +312,13 @@ void KTView::copy() if (clipboardCTTask) { delete clipboardCTTask; - clipboardCTTask = 0; + clipboardCTTask = nullptr; } if (clipboardCTVariable) { delete clipboardCTVariable; - clipboardCTVariable = 0; + clipboardCTVariable = nullptr; } if (currentIsTask) @@ -385,7 +385,7 @@ void KTView::remove() { currentCTCron->task.erase(i); delete currentCTTask; - currentCTTask = 0; + currentCTTask = nullptr; break; } } @@ -403,7 +403,7 @@ void KTView::remove() { currentCTCron->variable.erase(j); delete currentCTVariable; - currentCTVariable = 0; + currentCTVariable = nullptr; break; } } @@ -473,7 +473,7 @@ void KTView::enable(bool enable) void KTView::slotMenu(TQListViewItem* qlvi, const TQPoint& qp, int /*i*/) { - if (qlvi !=0 ) { + if (qlvi ) { listView->setSelected(qlvi, true); slotSetCurrent(qlvi); ktapp->slotEdit(qp); @@ -493,8 +493,8 @@ void KTView::slotSetCurrent (TQListViewItem* qlvi) { // variable label currentCTCron = ((KTListCron*)qlvi)->getCTCron(); - currentCTVariable = 0; - currentCTTask = 0; + currentCTVariable = nullptr; + currentCTTask = nullptr; currentIsTask = false; emit(enableModificationButtons(false)); emit(enablePaste(clipboardCTVariable)); @@ -506,8 +506,8 @@ void KTView::slotSetCurrent (TQListViewItem* qlvi) { // task label currentCTCron = ((KTListCron*)qlvi)->getCTCron(); - currentCTVariable = 0; - currentCTTask = 0; + currentCTVariable = nullptr; + currentCTTask = nullptr; currentIsTask = true; emit(enableModificationButtons(false)); @@ -523,7 +523,7 @@ void KTView::slotSetCurrent (TQListViewItem* qlvi) // variable currentCTCron = ((KTListVar*)qlvi)->getCTCron(); currentCTVariable = ((KTListVar*)qlvi)->getCTVariable(); - currentCTTask = 0; + currentCTTask = nullptr; currentIsTask = false; emit(enableModificationButtons(true)); @@ -535,7 +535,7 @@ void KTView::slotSetCurrent (TQListViewItem* qlvi) { // task currentCTCron = ((KTListTask*)qlvi)->getCTCron(); - currentCTVariable = 0; + currentCTVariable = nullptr; currentCTTask = ((KTListTask*)qlvi)->getCTTask(); currentIsTask = true; @@ -550,8 +550,8 @@ void KTView::slotSetCurrent (TQListViewItem* qlvi) { // user currentCTCron = ((KTListCron*)qlvi)->getCTCron(); - currentCTVariable = 0; - currentCTTask = 0; + currentCTVariable = nullptr; + currentCTTask = nullptr; currentIsTask = true; emit(enableModificationButtons(true)); diff --git a/kcron/ktview.h b/kcron/ktview.h index da16550..c0edd50 100644 --- a/kcron/ktview.h +++ b/kcron/ktview.h @@ -41,7 +41,7 @@ public: /** * Initializes view. */ - KTView (TQWidget* parent = 0, const char* name=0); + KTView (TQWidget* parent = nullptr, const char* name=nullptr); /** * Destructor. @@ -138,7 +138,7 @@ public slots: /** * Default action, edit. */ - void slotEdit(TQListViewItem* qlvi = 0); + void slotEdit(TQListViewItem* qlvi = nullptr); protected slots: @@ -152,7 +152,7 @@ protected: /** * Resize view contents. */ - virtual void resizeEvent (TQResizeEvent* = 0); + virtual void resizeEvent (TQResizeEvent* = nullptr); private: diff --git a/kcron/main.cpp b/kcron/main.cpp index a9358e6..b5ce80d 100644 --- a/kcron/main.cpp +++ b/kcron/main.cpp @@ -23,10 +23,10 @@ int main(int argc, char* argv[]) VERSION, description, TDEAboutData::License_GPL, "(c) 1999-2000, Gary Meyer"); - aboutData.addAuthor("Gary Meyer", 0, "gary@meyer.net"); - aboutData.addAuthor("Robert Berry", 0, "rjmber@ntlworld.com"); - aboutData.addAuthor("James Ots", 0, "code@jamesots.com"); - aboutData.addAuthor("Alberto G. Hierro", 0, "alberto.hierro@kdemail.net"); + aboutData.addAuthor("Gary Meyer", nullptr, "gary@meyer.net"); + aboutData.addAuthor("Robert Berry", nullptr, "rjmber@ntlworld.com"); + aboutData.addAuthor("James Ots", nullptr, "code@jamesots.com"); + aboutData.addAuthor("Alberto G. Hierro", nullptr, "alberto.hierro@kdemail.net"); TDECmdLineArgs::init(argc, argv, &aboutData); diff --git a/kdat/Archive.cpp b/kdat/Archive.cpp index bf51e2e..2334371 100644 --- a/kdat/Archive.cpp +++ b/kdat/Archive.cpp @@ -28,7 +28,7 @@ Archive::Archive( Tape* tape, int ctime, const TQString & name ) : _stubbed( false ), - _fptr( 0 ), + _fptr( nullptr ), _offset( 0 ), _name( name ), _tape( tape ) @@ -100,7 +100,7 @@ void Archive::read( int version ) //===== Read files ===== for ( int count = ival; count > 0; count-- ) { fread( &ival, sizeof( ival ), 1, _fptr ); - addChild( new File( 0, _fptr, ival ) ); + addChild( new File( nullptr, _fptr, ival ) ); } } @@ -276,10 +276,10 @@ File* Archive::addFile( int size, int mtime, int startRecord, int endRecord, con path.remove(path.last()); } - File* file = 0; + File* file = nullptr; if ( path.count() == 0 ) { // Top level file/directory. - file = new File( 0, size, mtime, startRecord, endRecord, fn ); + file = new File( nullptr, size, mtime, startRecord, endRecord, fn ); addChild( file ); return file; @@ -289,7 +289,7 @@ File* Archive::addFile( int size, int mtime, int startRecord, int endRecord, con //path.remove(path.first()); path.remove(path.begin()); TQPtrListIterator i( getChildren() ); - File* parent = 0; + File* parent = nullptr; for ( ; i.current() ; ++i ) { if ( i.current()->getName() == dir ) { parent = i.current(); @@ -297,8 +297,8 @@ File* Archive::addFile( int size, int mtime, int startRecord, int endRecord, con } } - if ( parent == 0 ) { - parent = new File( 0, 0, 0, startRecord, endRecord, dir ); + if ( !parent ) { + parent = new File( nullptr, 0, 0, startRecord, endRecord, dir ); addChild( parent ); } @@ -308,14 +308,14 @@ File* Archive::addFile( int size, int mtime, int startRecord, int endRecord, con TQString dir = *j; File* pparent = parent; TQPtrListIterator i( pparent->getChildren() ); - for ( parent = 0; i.current() ; ++i ) { + for ( parent = nullptr; i.current() ; ++i ) { if ( i.current()->getName() == dir ) { parent = i.current(); break; } } - if ( parent == 0 ) { + if ( !parent ) { parent = new File( pparent, 0, 0, 0, 0, dir ); pparent->addChild( parent ); } diff --git a/kdat/ArchiveInfoWidget.cpp b/kdat/ArchiveInfoWidget.cpp index e5b31c8..9ab05a2 100644 --- a/kdat/ArchiveInfoWidget.cpp +++ b/kdat/ArchiveInfoWidget.cpp @@ -37,7 +37,7 @@ ArchiveInfoWidget::ArchiveInfoWidget( TQWidget* parent, const char* name ) : TQWidget( parent, name ), - _archive( 0 ) + _archive( nullptr ) { TQLabel* lbl1 = new TQLabel( i18n( "Archive name:" ), this ); TQLabel* lbl2 = new TQLabel( i18n( "Created on:" ), this ); diff --git a/kdat/ArchiveInfoWidget.h b/kdat/ArchiveInfoWidget.h index b24bfff..7384cdc 100644 --- a/kdat/ArchiveInfoWidget.h +++ b/kdat/ArchiveInfoWidget.h @@ -45,7 +45,7 @@ public: /** * Create a new archive info widget. */ - ArchiveInfoWidget( TQWidget* parent = 0, const char* name = 0 ); + ArchiveInfoWidget( TQWidget* parent = nullptr, const char* name = nullptr ); /** * Destroy the archive info widget. diff --git a/kdat/BackupDlg.cpp b/kdat/BackupDlg.cpp index 4dbf4eb..81aab3d 100644 --- a/kdat/BackupDlg.cpp +++ b/kdat/BackupDlg.cpp @@ -345,7 +345,7 @@ void BackupDlg::slotStdout( TDEProcess*, char* buf, int len ) _proc->kill(); } - slotProcessExited( 0 ); + slotProcessExited( nullptr ); } } diff --git a/kdat/BackupDlg.h b/kdat/BackupDlg.h index 57103ee..6a8319c 100644 --- a/kdat/BackupDlg.h +++ b/kdat/BackupDlg.h @@ -98,7 +98,7 @@ public: */ BackupDlg( const TQString & archiveName, const TQString & workingDir, const TQStringList& files, bool oneFilesystem, bool incremental, const TQString & snapshot, bool removeSnapshot, int archiveSize, Tape* tape, - TQWidget* parent = 0, const char* name = 0 ); + TQWidget* parent = nullptr, const char* name = nullptr ); /** * Destroy the backup dialog. diff --git a/kdat/BackupOptDlg.h b/kdat/BackupOptDlg.h index 528772d..cb53b45 100644 --- a/kdat/BackupOptDlg.h +++ b/kdat/BackupOptDlg.h @@ -37,7 +37,7 @@ public: * * @param backupProfile The backup profile. */ - BackupOptDlg( BackupProfile* backupProfile, TQWidget* parent=0, const char* name=0 ); + BackupOptDlg( BackupProfile* backupProfile, TQWidget* parent=nullptr, const char* name=nullptr ); /** * Destroy the backup options dialog. diff --git a/kdat/BackupProfileInfoWidget.cpp b/kdat/BackupProfileInfoWidget.cpp index e4059e1..870c603 100644 --- a/kdat/BackupProfileInfoWidget.cpp +++ b/kdat/BackupProfileInfoWidget.cpp @@ -38,7 +38,7 @@ BackupProfileInfoWidget::BackupProfileInfoWidget( TQWidget* parent, const char* name ) : TQWidget( parent, name ), - _backupProfile( 0 ) + _backupProfile( nullptr ) { TQLabel* lbl1 = new TQLabel( i18n( "Backup profile name:" ), this ); diff --git a/kdat/BackupProfileInfoWidget.h b/kdat/BackupProfileInfoWidget.h index 8ff1bd0..ce87dd6 100644 --- a/kdat/BackupProfileInfoWidget.h +++ b/kdat/BackupProfileInfoWidget.h @@ -45,7 +45,7 @@ public: /** * Create a new backup profile info widget. */ - BackupProfileInfoWidget( TQWidget* parent = 0, const char* name = 0 ); + BackupProfileInfoWidget( TQWidget* parent = nullptr, const char* name = nullptr ); /** * Destroy the backup profile widget. diff --git a/kdat/BackupProfileManager.cpp b/kdat/BackupProfileManager.cpp index 868a9c5..a464943 100644 --- a/kdat/BackupProfileManager.cpp +++ b/kdat/BackupProfileManager.cpp @@ -51,11 +51,11 @@ BackupProfileManager::~BackupProfileManager() { } -BackupProfileManager* BackupProfileManager::_instance = 0; +BackupProfileManager* BackupProfileManager::_instance = nullptr; BackupProfileManager* BackupProfileManager::instance() { - if ( _instance == 0 ) { + if ( !_instance ) { _instance = new BackupProfileManager(); } diff --git a/kdat/BackupProfileWidget.cpp b/kdat/BackupProfileWidget.cpp index e535a31..68188e4 100644 --- a/kdat/BackupProfileWidget.cpp +++ b/kdat/BackupProfileWidget.cpp @@ -224,7 +224,7 @@ TQString BackupProfileWidget::getWorkingDirectory() if ( _workingDir->count() > 0 ) { return _workingDir->currentText(); } else { - return 0; + return nullptr; } } diff --git a/kdat/BackupProfileWidget.h b/kdat/BackupProfileWidget.h index 9272727..de0edd6 100644 --- a/kdat/BackupProfileWidget.h +++ b/kdat/BackupProfileWidget.h @@ -60,7 +60,7 @@ public: * @param parent The parent widget of this dialog. * @param name The widget name of this dialog. */ - BackupProfileWidget( TQWidget* parent=0, const char* name=0 ); + BackupProfileWidget( TQWidget* parent=nullptr, const char* name=nullptr ); /** * Destroy the backup profile widget. diff --git a/kdat/FileInfoWidget.h b/kdat/FileInfoWidget.h index 618ba06..4cf8866 100644 --- a/kdat/FileInfoWidget.h +++ b/kdat/FileInfoWidget.h @@ -43,7 +43,7 @@ public: * @param parent The parent widget. * @param name The name of this widget. */ - FileInfoWidget( TQWidget* parent = 0, const char* name = 0 ); + FileInfoWidget( TQWidget* parent = nullptr, const char* name = nullptr ); /** * Destroy the file info widget. diff --git a/kdat/FormatOptDlg.h b/kdat/FormatOptDlg.h index 9186202..7e4b91f 100644 --- a/kdat/FormatOptDlg.h +++ b/kdat/FormatOptDlg.h @@ -46,7 +46,7 @@ public: * @param parent The parent widget for the dialog. * @param name The name for the dialog. */ - FormatOptDlg( const TQString & def, TQWidget* parent=0, const char* name=0 ); + FormatOptDlg( const TQString & def, TQWidget* parent=nullptr, const char* name=nullptr ); /** * Destroy the format options dialog. diff --git a/kdat/ImageCache.cpp b/kdat/ImageCache.cpp index 780a24d..ca45021 100644 --- a/kdat/ImageCache.cpp +++ b/kdat/ImageCache.cpp @@ -60,11 +60,11 @@ ImageCache::~ImageCache() delete _verify; } -ImageCache* ImageCache::_instance = 0; +ImageCache* ImageCache::_instance = nullptr; ImageCache* ImageCache::instance() { - if ( _instance == 0 ) { + if ( !_instance ) { _instance = new ImageCache(); } diff --git a/kdat/IndexDlg.h b/kdat/IndexDlg.h index 14d6eb7..054d778 100644 --- a/kdat/IndexDlg.h +++ b/kdat/IndexDlg.h @@ -82,7 +82,7 @@ public: * @param parent The parent widget for this dialog. * @param name The name of this dialog. */ - IndexDlg( Tape* tape, TQWidget* parent = 0, const char* name = 0 ); + IndexDlg( Tape* tape, TQWidget* parent = nullptr, const char* name = nullptr ); /** * Destroy the tape index dialog. diff --git a/kdat/InfoShellWidget.h b/kdat/InfoShellWidget.h index ad0ded6..164c31d 100644 --- a/kdat/InfoShellWidget.h +++ b/kdat/InfoShellWidget.h @@ -34,7 +34,7 @@ public: * @param parent The parent widget. * @param name The name of this widget. */ - InfoShellWidget( TQWidget* parent = 0, const char* name = 0 ); + InfoShellWidget( TQWidget* parent = nullptr, const char* name = nullptr ); /** * Destroy the info shell widget. diff --git a/kdat/KDatMainWindow.cpp b/kdat/KDatMainWindow.cpp index 76de3a9..37875b6 100644 --- a/kdat/KDatMainWindow.cpp +++ b/kdat/KDatMainWindow.cpp @@ -73,11 +73,11 @@ #include "KDatMainWindow.moc" -KDatMainWindow* KDatMainWindow::_instance = 0; +KDatMainWindow* KDatMainWindow::_instance = nullptr; KDatMainWindow* KDatMainWindow::getInstance() { - if ( _instance == 0 ) { + if ( !_instance ) { _instance = new KDatMainWindow(); } return _instance; @@ -220,7 +220,7 @@ KDatMainWindow::KDatMainWindow() connect( TapeManager::instance(), TQ_SIGNAL( sigTapeMounted() ) , this, TQ_SLOT( slotTapeMounted() ) ); connect( TapeManager::instance(), TQ_SIGNAL( sigTapeUnmounted() ), this, TQ_SLOT( slotTapeUnmounted() ) ); - configureUI( 0 ); + configureUI( nullptr ); } KDatMainWindow::~KDatMainWindow() @@ -273,7 +273,7 @@ void KDatMainWindow::popupMountedTapeFileMenu( const TQPoint& p ) void KDatMainWindow::popupLocalFileMenu( const TQPoint& p ) { // Configure menu before popping up. - _localFileMenu->setItemEnabled( _localFileMenu->idAt( 0 ), ( TapeManager::instance()->getMountedTape() != 0 ) && ( !TapeDrive::instance()->isReadOnly() ) ); + _localFileMenu->setItemEnabled( _localFileMenu->idAt( 0 ), ( TapeManager::instance()->getMountedTape() != nullptr ) && ( !TapeDrive::instance()->isReadOnly() ) ); _localFileMenu->popup( p ); } @@ -291,7 +291,7 @@ void KDatMainWindow::popupBackupProfileRootMenu( const TQPoint& p ) void KDatMainWindow::popupBackupProfileMenu( const TQPoint& p ) { // Configure menu before popping up. - _backupProfileMenu->setItemEnabled( _backupProfileMenu->idAt( 0 ), ( TapeManager::instance()->getMountedTape() != 0 ) && ( !TapeDrive::instance()->isReadOnly() ) ); + _backupProfileMenu->setItemEnabled( _backupProfileMenu->idAt( 0 ), ( TapeManager::instance()->getMountedTape() != nullptr ) && ( !TapeDrive::instance()->isReadOnly() ) ); _backupProfileMenu->popup( p ); } @@ -550,10 +550,10 @@ void KDatMainWindow::fileVerify() void KDatMainWindow::doVerify( bool restore ) { - RangeableNode* rangeableNode = 0; - MountedArchiveNode* archiveNode = 0; + RangeableNode* rangeableNode = nullptr; + MountedArchiveNode* archiveNode = nullptr; TQStringList files; - Archive* archive = 0; + Archive* archive = nullptr; // Check for marked files first. for ( int i = _tapeDriveNode->childCount() - 1; i >= 0; i-- ) { if ( ( ((SelectableNode*)_tapeDriveNode->childAt( i ))->isSelected() ) || @@ -636,7 +636,7 @@ void KDatMainWindow::doVerify( bool restore ) for ( int i = archiveNode->childCount() - 1; i >= 0; i-- ) { stack.push( (RangeableNode*)archiveNode->childAt( i ) ); } - RangeableNode* sel = 0; + RangeableNode* sel = nullptr; while ( stack.count() > 0 ) { sel = stack.pop(); if ( sel->isSelected() ) { @@ -749,7 +749,7 @@ void KDatMainWindow::fileDeleteArchive() } // Find the selected archive and see if it has any archives after it. - Archive* archive = 0; + Archive* archive = nullptr; if ( sel->isType( Node::ArchiveNodeType ) ) { archive = ((ArchiveNode*)sel)->getArchive(); } else if ( sel->isType( Node::MountedArchiveNodeType ) ) { @@ -1158,7 +1158,7 @@ void KDatMainWindow::getBackupFiles( TQStringList& files ) // Compile a list of files to backup. TQPtrStack stack; stack.push( _rootNode ); - ArchiveableNode* sel = 0; + ArchiveableNode* sel = nullptr; while ( stack.count() > 0 ) { sel = stack.pop(); if ( sel->isSelected() ) { @@ -1184,7 +1184,7 @@ void KDatMainWindow::setBackupFiles( const TQStringList& files ) while ( n ) { if ( n->getFullPath() == *it ) { n->setSelected( true ); - n = 0; + n = nullptr; } else { if ( n->childCount() == 0 ) { bool dummy = true; @@ -1199,7 +1199,7 @@ void KDatMainWindow::setBackupFiles( const TQStringList& files ) } } if ( i < 0 ) { - n = 0; + n = nullptr; } } } @@ -1218,7 +1218,7 @@ void KDatMainWindow::slotTapeMounted() void KDatMainWindow::slotTapeUnmounted() { - configureUI( 0 ); + configureUI( nullptr ); } void KDatMainWindow::configureUI( Tape* tape ) diff --git a/kdat/LoggerWidget.h b/kdat/LoggerWidget.h index 221962b..97608c2 100644 --- a/kdat/LoggerWidget.h +++ b/kdat/LoggerWidget.h @@ -38,7 +38,7 @@ public: * @param parent The parent widget. * @param name The name of this widget. */ - LoggerWidget( const TQString & title, TQWidget* parent = 0, const char* name = 0 ); + LoggerWidget( const TQString & title, TQWidget* parent = nullptr, const char* name = nullptr ); /** * Destroy the logging widget. diff --git a/kdat/Node.cpp b/kdat/Node.cpp index 8f9cabe..489caf9 100644 --- a/kdat/Node.cpp +++ b/kdat/Node.cpp @@ -52,7 +52,7 @@ Node::~Node() void Node::insertNode( Node* child ) { - static Node* lastParent = 0; + static Node* lastParent = nullptr; static uint lastDirIndex = 0; if ( lastParent != this ) { @@ -233,7 +233,7 @@ void TapeNode::popupMenu( const TQPoint& p ) ArchiveNode* TapeNode::findArchiveNode( Archive* archive ) { - ArchiveNode* n = 0; + ArchiveNode* n = nullptr; for ( uint i = 0; i < childCount(); i++ ) { if ( ((ArchiveNode*)childAt( i ))->getArchive() == archive ) { n = (ArchiveNode*)childAt( i ); @@ -476,7 +476,7 @@ const TQPixmap* SelectableNode::getSelectPixmap() const return ImageCache::instance()->getSelectSome(); default: - return 0; + return nullptr; } } @@ -749,7 +749,7 @@ void MountedTapeDirectoryNode::setSelected( bool select ) if ( select ) { // Deselect all other archives. Node* parent = (Node*)getParent(); - Node* arcNode = 0; + Node* arcNode = nullptr; while ( !parent->isType( TapeDriveNodeType ) ) { if ( parent->isType( MountedArchiveNodeType ) ) { arcNode = parent; @@ -855,7 +855,7 @@ void MountedTapeFileNode::setSelected( bool select ) if ( select ) { // Deselect all other archives. Node* parent = (Node*)getParent(); - Node* arcNode = 0; + Node* arcNode = nullptr; while ( !parent->isType( TapeDriveNodeType ) ) { if ( parent->isType( MountedArchiveNodeType ) ) { arcNode = parent; @@ -1320,7 +1320,7 @@ void TapeDriveNode::slotTapeModified( Tape* tape ) MountedArchiveNode* TapeDriveNode::findArchiveNode( Archive* archive ) { - MountedArchiveNode* n = 0; + MountedArchiveNode* n = nullptr; for ( uint i = 0; i < childCount(); i++ ) { if ( ((MountedArchiveNode*)childAt( i ))->getArchive() == archive ) { n = (MountedArchiveNode*)childAt( i ); @@ -1415,7 +1415,7 @@ void TapeIndexRootNode::slotTapeModified( Tape* tape ) TapeNode* TapeIndexRootNode::findTapeNode( Tape* tape ) { - TapeNode* n = 0; + TapeNode* n = nullptr; for ( uint i = 0; i < childCount(); i++ ) { n = (TapeNode*)childAt( i ); if ( n->getTape() == tape ) { @@ -1423,7 +1423,7 @@ TapeNode* TapeIndexRootNode::findTapeNode( Tape* tape ) } } - return 0; + return nullptr; } BackupProfileNode::BackupProfileNode( BackupProfile* backupProfile ) @@ -1573,7 +1573,7 @@ void BackupProfileRootNode::slotBackupProfileModified( BackupProfile* backupProf BackupProfileNode* BackupProfileRootNode::findBackupProfileNode( BackupProfile* backupProfile ) { - BackupProfileNode* n = 0; + BackupProfileNode* n = nullptr; for ( uint i = 0; i < childCount(); i++ ) { n = (BackupProfileNode*)childAt( i ); if ( n->getBackupProfile() == backupProfile ) { @@ -1581,5 +1581,5 @@ BackupProfileNode* BackupProfileRootNode::findBackupProfileNode( BackupProfile* } } - return 0; + return nullptr; } diff --git a/kdat/Options.cpp b/kdat/Options.cpp index 0fa747e..f591bee 100644 --- a/kdat/Options.cpp +++ b/kdat/Options.cpp @@ -23,7 +23,7 @@ #include "Options.moc" -Options* Options::_instance = 0; +Options* Options::_instance = nullptr; Options::Options() { @@ -41,7 +41,7 @@ Options::Options() Options* Options::instance() { - if ( _instance == 0 ) { + if ( !_instance ) { _instance = new Options(); } return _instance; diff --git a/kdat/OptionsDlg.cpp b/kdat/OptionsDlg.cpp index 22d7304..ea7bfb5 100644 --- a/kdat/OptionsDlg.cpp +++ b/kdat/OptionsDlg.cpp @@ -36,9 +36,9 @@ #include "OptionsDlg.moc" OptionsDlg::OptionsDlg( TQWidget* parent, const char* name ) : KDialogBase( Swallow, i18n ("Options"), Ok | Apply | Cancel, - Ok, parent, name, true, true ), apply (0) + Ok, parent, name, true, true ), apply (nullptr) { - _baseWidget = new OptionsDlgWidget ( 0 ); + _baseWidget = new OptionsDlgWidget ( nullptr ); setMainWidget (_baseWidget); connect( _baseWidget, TQ_SIGNAL( valueChanged () ), this, TQ_SLOT( slotChanged() ) ); diff --git a/kdat/OptionsDlg.h b/kdat/OptionsDlg.h index 9359639..a1d69e5 100644 --- a/kdat/OptionsDlg.h +++ b/kdat/OptionsDlg.h @@ -42,7 +42,7 @@ public: * @param parent The parent widget of the dialog. * @param name The name of the dialog. */ - OptionsDlg( TQWidget* parent = 0, const char* name = 0 ); + OptionsDlg( TQWidget* parent = nullptr, const char* name = nullptr ); /** * Destroy the options dialog. diff --git a/kdat/Tape.cpp b/kdat/Tape.cpp index c95476f..2d703b3 100644 --- a/kdat/Tape.cpp +++ b/kdat/Tape.cpp @@ -41,7 +41,7 @@ Tape::Tape() : _stubbed( false ), _name( i18n( "New Tape" ) ), _size( Options::instance()->getDefaultTapeSize() ), - _fptr( 0 ) + _fptr( nullptr ) { char buffer[1024]; gethostname( buffer, 1024 ); @@ -60,7 +60,7 @@ Tape::Tape( const char * id ) _mtime( -1 ), _name( "" ), _size( -1 ), - _fptr( 0 ) + _fptr( nullptr ) { } diff --git a/kdat/TapeDrive.cpp b/kdat/TapeDrive.cpp index 18686f8..f414104 100644 --- a/kdat/TapeDrive.cpp +++ b/kdat/TapeDrive.cpp @@ -39,7 +39,7 @@ #include "TapeDrive.moc" -TapeDrive* TapeDrive::_instance = 0; +TapeDrive* TapeDrive::_instance = nullptr; TapeDrive* TapeDrive::instance() { @@ -53,9 +53,9 @@ TapeDrive* TapeDrive::instance() TapeDrive::TapeDrive() : _fd ( -1 ), _readOnly( true ), - _tape( 0 ), - _writeBuf( 0 ), - _readBuf( 0 ), + _tape( nullptr ), + _writeBuf( nullptr ), + _readBuf( nullptr ), _writeBufIdx( 0 ), _readBufIdx( Options::instance()->getTapeBlockSize() ) { diff --git a/kdat/TapeFileInfoWidget.h b/kdat/TapeFileInfoWidget.h index c5b3bf9..6faad19 100644 --- a/kdat/TapeFileInfoWidget.h +++ b/kdat/TapeFileInfoWidget.h @@ -44,7 +44,7 @@ public: * @param parent The parent widget. * @param name The name of this widget. */ - TapeFileInfoWidget( TQWidget* parent = 0, const char* name = 0 ); + TapeFileInfoWidget( TQWidget* parent = nullptr, const char* name = nullptr ); /** * Destroy the tape file info widget. diff --git a/kdat/TapeInfoWidget.cpp b/kdat/TapeInfoWidget.cpp index 3889fda..aad0f59 100644 --- a/kdat/TapeInfoWidget.cpp +++ b/kdat/TapeInfoWidget.cpp @@ -39,7 +39,7 @@ TapeInfoWidget::TapeInfoWidget( TQWidget* parent, const char* name ) : TQWidget( parent, name ), - _tape( 0 ) + _tape( nullptr ) { TQLabel* lbl1 = new TQLabel( i18n( "Tape name:" ), this ); TQLabel* lbl2 = new TQLabel( i18n( "Tape size:" ), this ); diff --git a/kdat/TapeInfoWidget.h b/kdat/TapeInfoWidget.h index 4d9cf0a..abf743d 100644 --- a/kdat/TapeInfoWidget.h +++ b/kdat/TapeInfoWidget.h @@ -54,7 +54,7 @@ public: /** * Create a new tape info widget. */ - TapeInfoWidget( TQWidget* parent = 0, const char* name = 0 ); + TapeInfoWidget( TQWidget* parent = nullptr, const char* name = nullptr ); /** * Destroy the tape info widget. diff --git a/kdat/TapeManager.cpp b/kdat/TapeManager.cpp index c305bdd..3f9726c 100644 --- a/kdat/TapeManager.cpp +++ b/kdat/TapeManager.cpp @@ -31,7 +31,7 @@ #include "TapeManager.moc" TapeManager::TapeManager() - : _mountedTape( 0 ) + : _mountedTape( nullptr ) { _tapes.setAutoDelete( true ); @@ -57,11 +57,11 @@ TapeManager::~TapeManager() { } -TapeManager* TapeManager::_instance = 0; +TapeManager* TapeManager::_instance = nullptr; TapeManager* TapeManager::instance() { - if ( _instance == 0 ) { + if ( !_instance ) { _instance = new TapeManager(); } @@ -140,7 +140,7 @@ void TapeManager::mountTape( Tape* tape ) void TapeManager::unmountTape() { emit sigTapeUnmounted(); - _mountedTape = 0; + _mountedTape = nullptr; } Tape* TapeManager::getMountedTape() diff --git a/kdat/VerifyDlg.h b/kdat/VerifyDlg.h index 0d8062f..c1bd0d2 100644 --- a/kdat/VerifyDlg.h +++ b/kdat/VerifyDlg.h @@ -84,7 +84,7 @@ public: * @param name The name of this widget. */ VerifyDlg( const TQString & workingDir, int fileno, const RangeList& ranges, - bool restore = false, TQWidget* parent = 0, const char* name = 0 ); + bool restore = false, TQWidget* parent = nullptr, const char* name = nullptr ); /** * Destroy the verify/restore dialog. diff --git a/kdat/VerifyOptDlg.h b/kdat/VerifyOptDlg.h index 0e53d45..bbd03fc 100644 --- a/kdat/VerifyOptDlg.h +++ b/kdat/VerifyOptDlg.h @@ -49,7 +49,7 @@ public: * @param parent The parent widget for the dialog. * @param name The name for the dialog. */ - VerifyOptDlg( const TQString & def, const TQStringList& files, bool restore = false, TQWidget* parent = 0, const char* name = 0 ); + VerifyOptDlg( const TQString & def, const TQStringList& files, bool restore = false, TQWidget* parent = nullptr, const char* name = nullptr ); /** * Destroy the verify/restore options dialog. diff --git a/kdat/ktreeview.cpp b/kdat/ktreeview.cpp index 3934117..f0a729a 100644 --- a/kdat/ktreeview.cpp +++ b/kdat/ktreeview.cpp @@ -41,16 +41,16 @@ // constructor KTreeViewItem::KTreeViewItem(const TQString& theText) : - owner(0), + owner(nullptr), numChildren(0), doExpandButton(true), expanded(false), delayedExpanding(false), doTree(true), doText(true), - child(0), - parent(0), - sibling(0), + child(nullptr), + parent(nullptr), + sibling(nullptr), deleteChildren(false) { text = theText; @@ -59,16 +59,16 @@ KTreeViewItem::KTreeViewItem(const TQString& theText) : // constructor that takes a pixmap KTreeViewItem::KTreeViewItem(const TQString& theText, const TQPixmap& thePixmap) : - owner(0), + owner(nullptr), numChildren(0), doExpandButton(true), expanded(false), delayedExpanding(false), doTree(true), doText(true), - child(0), - parent(0), - sibling(0), + child(nullptr), + parent(nullptr), + sibling(nullptr), deleteChildren(false) { text = theText; @@ -104,7 +104,7 @@ void KTreeViewItem::appendChild(KTreeViewItem* newChild) } lastChild->sibling = newChild; } - newChild->sibling = 0; + newChild->sibling = nullptr; numChildren++; } @@ -124,9 +124,9 @@ TQRect KTreeViewItem::boundingRect(int indent) const KTreeViewItem* KTreeViewItem::childAt(int index) const { if (!hasChild()) - return 0; + return nullptr; KTreeViewItem* item = getChild(); - while (index > 0 && item != 0) { + while (index > 0 && item) { item = item->getSibling(); index--; } @@ -145,11 +145,11 @@ int KTreeViewItem::childIndex(KTreeViewItem* searched) const assert(searched != 0); int index = 0; KTreeViewItem* item = getChild(); - while (item != 0 && item != searched) { + while (item && item != searched) { item = item->getSibling(); index++; } - return item == 0 ? -1 : index; + return item == nullptr ? -1 : index; } // indicates whether mouse press is in expand button @@ -196,19 +196,19 @@ const TQString& KTreeViewItem::getText() const // indicates whether this item has any children bool KTreeViewItem::hasChild() const { - return child != 0; + return child != nullptr; } // indicates whether this item has a parent bool KTreeViewItem::hasParent() const { - return parent != 0; + return parent != nullptr; } // indicates whether this item has a sibling below it bool KTreeViewItem::hasSibling() const { - return sibling != 0; + return sibling != nullptr; } int KTreeViewItem::height() const @@ -269,7 +269,7 @@ bool KTreeViewItem::isExpanded() const // returns true if all ancestors are expanded bool KTreeViewItem::isVisible() const { - for (KTreeViewItem* p = getParent(); p != 0; p = p->getParent()) { + for (KTreeViewItem* p = getParent(); p; p = p->getParent()) { if (!p->isExpanded()) return false; } @@ -395,7 +395,7 @@ void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const * If this is not the first item in the tree draw the line up * towards parent or sibling. */ - if (parent->parent != 0 || parent->getChild() != this) + if (parent->parent || parent->getChild() != this) p->drawLine(parentLeaderX, 0, parentLeaderX, cellCenterY); // draw the line down towards sibling @@ -408,7 +408,7 @@ void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const * item out to the left. */ if (sibling || (doExpandButton && (child || delayedExpanding)) || - parent->parent != 0 || + parent->parent || /* * The following handles the case of an item at the end of the * topmost level which doesn't have children. @@ -423,7 +423,7 @@ void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const * branches that extend through this cell. */ KTreeViewItem* prevRoot = parent; - while (prevRoot->getParent() != 0) { /* while not root item */ + while (prevRoot->getParent()) { /* while not root item */ if (prevRoot->hasSibling()) { int sibLeaderX = owner->indentation(prevRoot) - (22 / 2); p->drawLine(sibLeaderX, 0, sibLeaderX, cellBottomY); @@ -436,7 +436,7 @@ void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const bool KTreeViewItem::removeChild(KTreeViewItem* theChild) { // search item in list of children - KTreeViewItem* prevItem = 0; + KTreeViewItem* prevItem = nullptr; KTreeViewItem* toRemove = getChild(); while (toRemove && toRemove != theChild) { prevItem = toRemove; @@ -445,13 +445,13 @@ bool KTreeViewItem::removeChild(KTreeViewItem* theChild) if (toRemove) { // found it! - if (prevItem == 0) { + if (!prevItem) { child = toRemove->getSibling(); } else { prevItem->sibling = toRemove->getSibling(); } numChildren--; - toRemove->owner = 0; + toRemove->owner = nullptr; } assert((numChildren == 0) == (child == 0)); @@ -460,7 +460,7 @@ bool KTreeViewItem::removeChild(KTreeViewItem* theChild) owner->update(); } - return toRemove != 0; + return toRemove != nullptr; } // sets the delayed-expanding flag @@ -528,7 +528,7 @@ void KTreeViewItem::synchNumChildren() { numChildren = 0; KTreeViewItem* item = getChild(); - while (item != 0) { + while (item) { numChildren++; item = item->getSibling(); } @@ -586,7 +586,7 @@ KTreeView::KTreeView(TQWidget *parent, itemIndent(22), showText(true), itemCapacity(500), - visibleItems(0), + visibleItems(nullptr), rubberband_mode(false) { setCellHeight(0); @@ -613,7 +613,7 @@ KTreeView::KTreeView(TQWidget *parent, visibleItems = new KTreeViewItem*[itemCapacity]; // clear those pointers for (int j = itemCapacity-1; j >= 0; j--) { - visibleItems[j] = 0; + visibleItems[j] = nullptr; } } @@ -735,7 +735,7 @@ void KTreeView::clear() stack.push(item); stack.push(item->getSibling()); } - else if(item->getParent() != 0) { + else if(item->getParent()) { takeItem(item); delete item; } @@ -802,13 +802,13 @@ void KTreeView::expandOrCollapseItem(int index) // if user supplied function returns true, traversal ends and function returns bool KTreeView::forEveryItem(KForEvery func, void* user, KTreeViewItem* item) { - if (item == 0) { + if (!item) { item = treeRoot; } assert(item->owner == this); item = item->getChild(); - while (item != 0) { + while (item) { // visit the siblings if ((*func)(item, user)) { return true; @@ -830,7 +830,7 @@ bool KTreeView::forEveryItem(KForEvery func, void* user, KTreeViewItem* item) bool KTreeView::forEveryVisibleItem(KForEvery func, void *user, KTreeViewItem* item) { - if (item == 0) { + if (!item) { item = treeRoot; } else { // children are invisible (hence, nothing to do) @@ -842,7 +842,7 @@ bool KTreeView::forEveryVisibleItem(KForEvery func, void *user, assert(item->owner == this); item = item->getChild(); - while (item != 0) { + while (item) { // visit the siblings if ((*func)(item, user)) { return true; @@ -861,7 +861,7 @@ bool KTreeView::forEveryVisibleItem(KForEvery func, void *user, // or 0 if no current item KTreeViewItem *KTreeView::getCurrentItem() { - if(current == -1) return 0; + if(current == -1) return nullptr; return itemAt(current); } @@ -940,7 +940,7 @@ bool KTreeView::insertItem(KTreeViewItem* newItem, KTreeViewItem* KTreeView::itemAt(int row) { if (row < 0 || row >= numRows()) { - return 0; + return nullptr; } else { // lookup the item in the list of visible items @@ -956,7 +956,7 @@ KTreeViewItem* KTreeView::itemAt(int row) KTreeViewItem* KTreeView::itemAt(const KPath& path) { if (path.isEmpty()) - return 0; + return nullptr; // need a copy of the path because recursiveFind will destroy it KPath pathCopy; @@ -971,7 +971,7 @@ KTreeViewItem* KTreeView::itemAt(const KPath& path) void KTreeView::itemPath(int row, KPath& path) { KTreeViewItem* item = itemAt(row); - if (item != 0) { + if (item) { itemPath(item, path); } } @@ -1111,7 +1111,7 @@ void KTreeView::setExpandButtonDrawing(bool enable) if(drawExpandButton == enable) return; drawExpandButton = enable; - forEveryItem(&KTreeView::setItemExpandButtonDrawing, 0); + forEveryItem(&KTreeView::setItemExpandButtonDrawing, nullptr); if(autoUpdate() && isVisible()) repaint(); } @@ -1124,7 +1124,7 @@ void KTreeView::setExpandLevel(int level) return; expansion = level; KTreeViewItem *item = getCurrentItem(); - forEveryItem(&KTreeView::setItemExpanded, 0); + forEveryItem(&KTreeView::setItemExpanded, nullptr); while(item) { if(item->getParent()->isExpanded()) break; @@ -1158,7 +1158,7 @@ void KTreeView::setShowItemText(bool enable) if(showText == enable) return; showText = enable; - forEveryItem(&KTreeView::setItemShowText, 0); + forEveryItem(&KTreeView::setItemShowText, nullptr); if(autoUpdate() && isVisible()) repaint(); } @@ -1175,7 +1175,7 @@ void KTreeView::setTreeDrawing(bool enable) if(drawTree == enable) return; drawTree = enable; - forEveryItem(&KTreeView::setItemTreeDrawing, 0); + forEveryItem(&KTreeView::setItemTreeDrawing, nullptr); if(autoUpdate() && isVisible()) repaint(); } @@ -1291,13 +1291,13 @@ void KTreeView::collapseSubTree(KTreeViewItem* subRoot) assert(subRoot->owner == this); // must move the current item if it is visible - KTreeViewItem* cur = current >= 0 ? itemAt(current) : 0; + KTreeViewItem* cur = current >= 0 ? itemAt(current) : nullptr; subRoot->setExpanded(false); if (subRoot->isVisible()) { updateVisibleItems(); // re-seat current item - if (cur != 0) { + if (cur) { setCurrentItem(itemRow(cur)); } } @@ -1341,7 +1341,7 @@ void KTreeView::expandSubTree(KTreeViewItem* subRoot) assert(subRoot->owner == this); // must move the current item if it is visible - KTreeViewItem* cur = current >= 0 ? itemAt(current) : 0; + KTreeViewItem* cur = current >= 0 ? itemAt(current) : nullptr; bool allow = true; @@ -1356,7 +1356,7 @@ void KTreeView::expandSubTree(KTreeViewItem* subRoot) if (subRoot->isVisible()) { updateVisibleItems(); // re-seat current item - if (cur != 0) { + if (cur) { setCurrentItem(itemRow(cur)); } } @@ -1370,8 +1370,8 @@ void KTreeView::expandSubTree(KTreeViewItem* subRoot) // fix up branch levels out of whack from split/join operations on the tree void KTreeView::fixChildren(KTreeViewItem *parentItem) { - KTreeViewItem* childItem = 0; - KTreeViewItem* siblingItem = 0; + KTreeViewItem* childItem = nullptr; + KTreeViewItem* siblingItem = nullptr; // int childBranch = parentItem->getBranch() + 1; if(parentItem->hasChild()) { childItem = parentItem->getChild(); @@ -1633,7 +1633,7 @@ int KTreeView::level(KTreeViewItem* item) const assert(item != treeRoot); int l = 0; item = item->parent->parent; /* since item != treeRoot, there is a parent */ - while (item != 0) { + while (item) { item = item->parent; l++; } @@ -1855,7 +1855,7 @@ void KTreeView::move_rubberband(const TQPoint& where) void KTreeView::paintCell(TQPainter* p, int row, int) { KTreeViewItem* item = itemAt(row); - if (item == 0) + if (!item) return; p->setClipRect(cellRect(), TQPainter::CoordPainter ); @@ -1893,14 +1893,14 @@ KTreeViewItem* KTreeView::recursiveFind(KPath& path) // find the parent item KTreeViewItem* parent = recursiveFind(path); - if (parent == 0) - return 0; + if (!parent) + return nullptr; /* * Iterate through the parent's children searching for searchString. */ KTreeViewItem* sibling = parent->getChild(); - while (sibling != 0) { + while (sibling) { if (*searchString == sibling->getText()) { break; /* found it! */ } @@ -1981,22 +1981,22 @@ void KTreeView::takeItem(KTreeViewItem* item) * below the taken-out subtree, we must move it up a number of rows if * the taken-out subtree is at least partially visible. */ - KTreeViewItem* cur = current >= 0 ? itemAt(current) : 0; - if (wasVisible && cur != 0) { + KTreeViewItem* cur = current >= 0 ? itemAt(current) : nullptr; + if (wasVisible && cur) { KTreeViewItem* c = cur; - while (c != 0 && c != item) { + while (c && c != item) { c = c->getParent(); } - if (c != 0) { + if (c) { // move current item to parent cur = item->getParent(); if (cur == treeRoot) - cur = 0; + cur = nullptr; } } KTreeViewItem* parentItem = item->getParent(); parentItem->removeChild(item); - item->sibling = 0; + item->sibling = nullptr; if (wasVisible || parentItem->childCount() == 0) { bool autoU = autoUpdate(); setAutoUpdate(false); @@ -2008,7 +2008,7 @@ void KTreeView::takeItem(KTreeViewItem* item) } // re-seat the current item - setCurrentItem(cur != 0 ? itemRow(cur) : -1); + setCurrentItem(cur ? itemRow(cur) : -1); } // visits each item, calculates the maximum width @@ -2056,7 +2056,7 @@ void KTreeView::updateVisibleItemRec(KTreeViewItem* item, int& index, int& count KTreeViewItem** newItems = new KTreeViewItem*[newCapacity]; // clear the unneeded space for (int i = index; i < newCapacity; i++) { - newItems[i] = 0; + newItems[i] = nullptr; } // move already accumulated items over for (int i = index-1; i >= 0; i--) { @@ -2067,7 +2067,7 @@ void KTreeView::updateVisibleItemRec(KTreeViewItem* item, int& index, int& count itemCapacity = newCapacity; } // insert children - for (KTreeViewItem* i = item->getChild(); i != 0; i = i->getSibling()) { + for (KTreeViewItem* i = item->getChild(); i; i = i->getSibling()) { visibleItems[index++] = i; updateVisibleItemRec(i, index, count); } diff --git a/kdat/ktreeview.h b/kdat/ktreeview.h index e72a2f6..31fa2e5 100644 --- a/kdat/ktreeview.h +++ b/kdat/ktreeview.h @@ -407,7 +407,7 @@ public: * current item to -1, and sets default values for scroll bars (both * auto). */ - KTreeView(TQWidget* parent = 0, const char* name = 0, WFlags f = 0); + KTreeView(TQWidget* parent = nullptr, const char* name = nullptr, WFlags f = 0); /* * Desctructor. Deletes all items from the topmost level that have been @@ -541,14 +541,14 @@ public: * return value is also true. */ bool forEveryItem(KForEvery func, void* user, - KTreeViewItem* root = 0); + KTreeViewItem* root = nullptr); /** * Same as above, but only iterates visible items, in order. If the * specified root item is invisible no items are visited. */ bool forEveryVisibleItem(KForEvery func, void *user, - KTreeViewItem* root = 0); + KTreeViewItem* root = nullptr); /** Returns a pointer to the current item if there is one, or 0. diff --git a/kdat/main.cpp b/kdat/main.cpp index 1ebe62c..feef17f 100644 --- a/kdat/main.cpp +++ b/kdat/main.cpp @@ -73,7 +73,7 @@ int main( int argc, char** argv ) /* 2002-01-28 LEW */ TDECmdLineArgs::init( argc, argv, &aboutData ); - aboutData.addAuthor( "Lawrence Widman", 0, "kdat@cardiothink.com"); + aboutData.addAuthor( "Lawrence Widman", nullptr, "kdat@cardiothink.com"); // TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. TDEApplication app; diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.cpp b/knetworkconf/knetworkconf/kadddevicecontainer.cpp index b3f4294..1f86b77 100644 --- a/knetworkconf/knetworkconf/kadddevicecontainer.cpp +++ b/knetworkconf/knetworkconf/kadddevicecontainer.cpp @@ -35,7 +35,7 @@ KAddDeviceContainer::KAddDeviceContainer(TQWidget *parent, const char *name) mainLayout = new TQVBoxLayout( this, 10, 2, "mainLayout"); //Create the Addvanced settings, Ok and Cancel buttons and add them to a TQHBoxLayout - buttonsLayout = new TQHBoxLayout( 0, 0, 4, "buttonsLayout"); + buttonsLayout = new TQHBoxLayout( nullptr, 0, 4, "buttonsLayout"); kpbAdvanced = new KPushButton( this, "kpbAdvanced" ); buttonsLayout->addWidget( kpbAdvanced ); buttonsSpacer = new TQSpacerItem( 70, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.h b/knetworkconf/knetworkconf/kadddevicecontainer.h index 8eca304..4774afc 100644 --- a/knetworkconf/knetworkconf/kadddevicecontainer.h +++ b/knetworkconf/knetworkconf/kadddevicecontainer.h @@ -48,7 +48,7 @@ class KAddDeviceContainer : public KDialog TQ_OBJECT public: - KAddDeviceContainer(TQWidget *parent = 0, const char *name = 0); + KAddDeviceContainer(TQWidget *parent = nullptr, const char *name = nullptr); ~KAddDeviceContainer(); KPushButton* kpbAdvanced; diff --git a/knetworkconf/knetworkconf/knetworkconf.cpp b/knetworkconf/knetworkconf/knetworkconf.cpp index 53bd6d0..f4c210e 100644 --- a/knetworkconf/knetworkconf/knetworkconf.cpp +++ b/knetworkconf/knetworkconf/knetworkconf.cpp @@ -22,7 +22,7 @@ KNetworkConf::KNetworkConf(TQWidget *parent, const char *name) : DCOPObject("KNetworkConfIface"), KNetworkConfDlg(parent, name) { - netInfo = 0L; + netInfo = nullptr; config = new KNetworkConfigParser(); klvCardList->setAllColumnsShowFocus(true); klvKnownHosts->setAllColumnsShowFocus(true); @@ -104,9 +104,9 @@ void KNetworkConf::loadNetworkDevicesInfo() { if ( device->getType() != "loopback" ) { - if (klvCardList->findItem(device->getDeviceName(),0,CaseSensitive|ExactMatch) == 0) + if (!klvCardList->findItem(device->getDeviceName(),0,CaseSensitive|ExactMatch)) { - TQListViewItem * item = new TQListViewItem( klvCardList, 0 ); + TQListViewItem * item = new TQListViewItem( klvCardList, nullptr ); if (device->isActive()) { @@ -188,7 +188,7 @@ void KNetworkConf::enableButtonsSlot(){ } /** opens the add server dialog. */ void KNetworkConf::addServerSlot(){ - KAddDNSServerDlg addDlg(this, 0); + KAddDNSServerDlg addDlg(this, nullptr); addDlg.exec(); if(addDlg.modified()) { @@ -199,7 +199,7 @@ void KNetworkConf::addServerSlot(){ } /** opens the edit server dialog. */ void KNetworkConf::editServerSlot(){ - KAddDNSServerDlg dlg(this, 0); + KAddDNSServerDlg dlg(this, nullptr); if (klbDomainServerList->currentItem() >= 0) { int currentPos = klbDomainServerList->currentItem(); @@ -225,7 +225,7 @@ void KNetworkConf::configureDeviceSlot(){ KWirelessInterface *wifiDev = nullptr; //KAddDeviceContainer *configDlg = new KAddDeviceContainer(this,0); - KAddDeviceContainer configDlg(this,0); + KAddDeviceContainer configDlg(this,nullptr); if (item) { @@ -367,7 +367,7 @@ KNetworkInterface * KNetworkConf::getDeviceInfo(TQString device){ TQPtrList deviceList = netInfo->getDeviceList(); TQPtrListIterator i(deviceList); KNetworkInterface *temp; - while ((temp = i.current()) != 0) + while ((temp = i.current()) != nullptr) { if (temp->getDeviceName() == device) { @@ -383,7 +383,7 @@ TQString KNetworkConf::getDeviceName(TQString ipAddr){ TQPtrList deviceList = netInfo->getDeviceList(); TQPtrListIterator i(deviceList); KNetworkInterface *temp; - while ((temp = i.current()) != 0) + while ((temp = i.current()) != nullptr) { if (temp->getIpAddress().compare(ipAddr) == 0) { @@ -455,12 +455,12 @@ void KNetworkConf::loadDNSInfo(){ knownHostsList = dnsInfo->getKnownHostsList(); TQPtrListIterator it(knownHostsList); KKnownHostInfo *host; - while ((host = it.current()) != 0) + while ((host = it.current()) != nullptr) { ++it; if (!(host->getIpAddress().isEmpty())) { - TQListViewItem * item = new TQListViewItem( klvKnownHosts, 0 ); + TQListViewItem * item = new TQListViewItem( klvKnownHosts, nullptr ); item->setText(0,host->getIpAddress()); TQStringList aliasesList = host->getAliases(); TQString aliases; @@ -479,12 +479,12 @@ void KNetworkConf::loadNetworkProfiles(){ KNetworkInfo *profile = nullptr; klvProfilesList->clear(); - while ((profile = it.current()) != 0) + while ((profile = it.current()) != nullptr) { ++it; if (!profile->getProfileName().isEmpty()) { - TQListViewItem * item = new TQListViewItem( klvProfilesList, 0 ); + TQListViewItem * item = new TQListViewItem( klvProfilesList, nullptr ); item->setText(0,profile->getProfileName()); } } @@ -497,7 +497,7 @@ void KNetworkConf::helpSlot(){ /** No descriptions */ void KNetworkConf::aboutSlot(){ - TDEAboutApplication *about = new TDEAboutApplication(tdeApp->aboutData(),0); + TDEAboutApplication *about = new TDEAboutApplication(tdeApp->aboutData(),nullptr); // about->setLogo(locate("icon","knetworkconf.png")); //tqDebug("locate icon= %s",locate("icon","knetworkconf.png").latin1()); @@ -849,7 +849,7 @@ void KNetworkConf::disableInterfaceSlot() /** Adds a new host to the TDEListView that has the known hosts. */ void KNetworkConf::addKnownHostSlot(){ - KAddKnownHostDlg dlg(this,0); + KAddKnownHostDlg dlg(this,nullptr); dlg.setCaption(i18n("Add New Static Host")); TQString aliases; @@ -857,7 +857,7 @@ void KNetworkConf::addKnownHostSlot(){ if (!dlg.kleIpAddress->text().isEmpty() && dlg.klbAliases->firstItem() ) { - TQListViewItem * item = new TQListViewItem( klvKnownHosts, 0 ); + TQListViewItem * item = new TQListViewItem( klvKnownHosts, nullptr ); item->setText(0,dlg.kleIpAddress->text()); @@ -872,7 +872,7 @@ void KNetworkConf::addKnownHostSlot(){ /** Removes a known host from the list view */ void KNetworkConf::removeKnownHostSlot() { - if (klvKnownHosts->currentItem() != 0) + if (klvKnownHosts->currentItem()) { klvKnownHosts->removeItem(klvKnownHosts->currentItem()); enableApplyButtonSlot(); @@ -882,7 +882,7 @@ void KNetworkConf::removeKnownHostSlot() /** Edits the info about a known host. */ void KNetworkConf::editKnownHostSlot() { - KAddKnownHostDlg dlg(this,0); + KAddKnownHostDlg dlg(this,nullptr); dlg.setCaption(i18n("Edit Static Host")); TQListViewItem *item = klvKnownHosts->currentItem(); dlg.kleIpAddress->setText(item->text(0)); @@ -1031,7 +1031,7 @@ KNetworkInfo *KNetworkConf::getProfile(TQPtrList profilesList, TQS TQPtrListIterator it(profilesList); KNetworkInfo *net = nullptr; - while ((net = it.current()) != 0) + while ((net = it.current()) != nullptr) { ++it; if (net->getProfileName() == selectedProfile) diff --git a/knetworkconf/knetworkconf/knetworkconf.h b/knetworkconf/knetworkconf/knetworkconf.h index 6c6080d..b1b5301 100644 --- a/knetworkconf/knetworkconf/knetworkconf.h +++ b/knetworkconf/knetworkconf/knetworkconf.h @@ -78,7 +78,7 @@ class KNetworkConf : public KNetworkConfDlg, public DCOPObject public: /** construtor */ - KNetworkConf(TQWidget* parent=0, const char *name=0); + KNetworkConf(TQWidget* parent=nullptr, const char *name=nullptr); /** destructor */ ~KNetworkConf(); /** Puts the application in read-only mode. This happens when the user runing the application isn't root. */ diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.cpp b/knetworkconf/knetworkconf/knetworkconfigparser.cpp index 863f8e6..a2ce11d 100644 --- a/knetworkconf/knetworkconf/knetworkconfigparser.cpp +++ b/knetworkconf/knetworkconf/knetworkconfigparser.cpp @@ -31,13 +31,13 @@ KNetworkConfigParser::KNetworkConfigParser(){ } /** Runs the gst backend to get network values. You can pass to the script a specific platform to load using the platform parameter. */ void KNetworkConfigParser::runDetectionScript(TQString platform){ - KDetectDistroDlg* dialog = new KDetectDistroDlg(0, 0); + KDetectDistroDlg* dialog = new KDetectDistroDlg(nullptr, nullptr); dialog->show(); procDetect = new TQProcess(this); TQString pathToProgram = locate("data",BACKEND_PATH); if (pathToProgram.isEmpty()) { - KMessageBox::error(0, + KMessageBox::error(nullptr, i18n("Could not find the backend script for the network configuration detection. Something is wrong with your installation.\n Please check that \n{TDE_PATH}/%1 \nfile is present.").arg(BACKEND_PATH), i18n("Could Not Find Network Configuration Backend Script")); dialog->close(); @@ -61,7 +61,7 @@ void KNetworkConfigParser::runDetectionScript(TQString platform){ if ( !procDetect->start() ) { // error handling - KMessageBox::error(0, + KMessageBox::error(nullptr, i18n("Could not execute backend script for the network configuration detection. Something is wrong with your installation."), i18n("Could Not Launch Network Configuration Backend Script")); dialog->close(); @@ -91,7 +91,7 @@ void KNetworkConfigParser::listIfaces(const TQString &platform){ if ( !procDetect->start() ) { // error handling - KMessageBox::error(0, + KMessageBox::error(nullptr, i18n("Could not execute backend script for the network configuration detection. Something is wrong with your installation."), i18n("Could Not Launch Network Configuration Backend Script")); } @@ -109,7 +109,7 @@ void KNetworkConfigParser::readListIfacesSlot(){ TQDomDocument doc( "network-ifaces"); if ( !doc.setContent( xmlOuput.utf8(),false,&err,&x,&y ) ) { - KMessageBox::error(0, + KMessageBox::error(nullptr, i18n("Could not parse the XML output from the network configuration backend."), i18n("Error While Listing Network Interfaces")); // tqDebug("error: %s %d,%d",err.latin1(),x,y); @@ -187,7 +187,7 @@ void KNetworkConfigParser::loadRoutingInfo( KRoutingInfo *routingInfo){ TQFile f( "/proc/net/route"); if ( !f.open(IO_ReadOnly) ) { - KMessageBox::error(0, + KMessageBox::error(nullptr, i18n("Could not open file /proc/net/route."), i18n("Could Not Open File")); } @@ -299,7 +299,7 @@ void KNetworkConfigParser::saveNetworkInfo(KNetworkInfo *networkInfo) procSaveNetworkInfo->addArgument( "--set" ); // KDetectDistroDlg* dialog = new KDetectDistroDlg(0, 0, true,TQDialog::WStyle_Customize|TQDialog::WStyle_NormalBorder|TQDialog::WStyle_Title|TQDialog::WStyle_SysMenu); //made it semi-modal - KDetectDistroDlg* dialog = new KDetectDistroDlg((TQWidget*)parent(), 0, true); + KDetectDistroDlg* dialog = new KDetectDistroDlg((TQWidget*)parent(), nullptr, true); dialog->setCaption(i18n("Reloading Network")); dialog->text->setText(i18n("%1Please wait while saving the network settings...%2").arg("
").arg("
")); dialog->show(); @@ -316,7 +316,7 @@ void KNetworkConfigParser::saveNetworkInfo(KNetworkInfo *networkInfo) if ( !procSaveNetworkInfo->start() ) { - KMessageBox::error(0, + KMessageBox::error(nullptr, i18n("Could not execute backend script for the network configuration detection. Something is wrong with your installation."), i18n("Could Not Launch Network Configuration Backend Script")); } @@ -340,7 +340,7 @@ void KNetworkConfigParser::addNetworkProfilesToXMLDoc(TQDomDocument *doc, TQDomN TQDomElement tag = doc->createElement( "profiledb" ); root->appendChild( tag ); - while ( (profile = profileIt.current()) != 0) + while ((profile = profileIt.current()) != nullptr) { ++profileIt; TQPtrList devList = profile->getDeviceList(); @@ -371,7 +371,7 @@ void KNetworkConfigParser::addNetworkInterfacesToXMLDoc(TQDomDocument *doc, TQDo cfg.setGroup("Interfaces"); //Add the network interfaces list - while ( (device = devIt.current()) != 0 ) + while ((device = devIt.current()) != nullptr) { ++devIt; // if protocol is not specified, then should not have entry in config @@ -527,7 +527,7 @@ void KNetworkConfigParser::addDNSInfoToXMLDoc(TQDomDocument *doc, TQDomNode *roo } //Add the list of static hosts - while ( (host = knownHostsIt.current()) != 0 ) + while ((host = knownHostsIt.current()) != nullptr) { ++knownHostsIt; tag = doc->createElement( "statichost" ); @@ -833,7 +833,7 @@ void KNetworkConfigParser::readNetworkInfo() TQDomDocument doc( "network"); if ( !doc.setContent( xmlOuput.utf8(),false,&err,&x,&y ) ) { - KMessageBox::error(0, + KMessageBox::error(nullptr, i18n("Could not parse the XML output from the network configuration backend."), i18n("Error Loading The Network Configuration")); // tqDebug("error: %s %d,%d",err.latin1(),x,y); @@ -1012,7 +1012,7 @@ void KNetworkConfigParser::loadSupportedPlatforms(){ if ( !procDetect->start() ) { // error handling - KMessageBox::error(0, + KMessageBox::error(nullptr, i18n("Could not execute backend script for the network configuration detection. Something is wrong with your installation."), i18n("Could Not Launch Network Configuration Backend Script")); } @@ -1026,7 +1026,7 @@ void KNetworkConfigParser::readSupportedPlatformsSlot(){ TQDomDocument doc( "platforms" ); if ( !doc.setContent( xmlOuput.utf8() ) ) { - KMessageBox::error(0, + KMessageBox::error(nullptr, i18n("Could not parse the list of supported platforms from the network configuration backend."), i18n("Error Obtaining Supported Platforms List")); } @@ -1073,7 +1073,7 @@ TQString KNetworkConfigParser::getPlatformInfo(TQDomElement platform){ } /** Shows the dialog with all the supported platforms by GST. */ void KNetworkConfigParser::showSupportedPlatformsDialogSlot(){ - TDESelectDistroDlg* dialog = new TDESelectDistroDlg(0, 0); + TDESelectDistroDlg* dialog = new TDESelectDistroDlg(nullptr, nullptr); for ( TQStringList::Iterator it = supportedPlatformsList.begin(); it != supportedPlatformsList.end(); ++it ) { @@ -1227,7 +1227,7 @@ KNetworkInterface * KNetworkConfigParser::getDeviceInfo(TQString device){ TQPtrList deviceList = networkInfo->getDeviceList(); TQPtrListIterator i(deviceList); KNetworkInterface *temp; - while ((temp = i.current()) != 0) + while ((temp = i.current()) != nullptr) { if (temp->getDeviceName() == device) { diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.cpp b/knetworkconf/knetworkconf/knetworkconfmodule.cpp index 4e3d520..e68da59 100644 --- a/knetworkconf/knetworkconf/knetworkconfmodule.cpp +++ b/knetworkconf/knetworkconf/knetworkconfmodule.cpp @@ -93,7 +93,7 @@ TDEAboutData* KNetworkConfModule::aboutData() const TDEAboutData *aboutData = new TDEAboutData( "knetworkconf", I18N_NOOP("KNetworkConf"), VERSION, description, TDEAboutData::License_GPL, - "(c) 2003 - 2005, Juan Luis Baptiste", 0, "http://www.merlinux.org/knetworkconf/", "juan.baptiste@kdemail.net"); + "(c) 2003 - 2005, Juan Luis Baptiste", nullptr, "http://www.merlinux.org/knetworkconf/", "juan.baptiste@kdemail.net"); aboutData->addAuthor("Juan Luis Baptiste",I18N_NOOP("Lead Developer"), "juan.baptiste@kdemail.net"); aboutData->addCredit("Carlos Garnacho and the Gnome System Tools Team",I18N_NOOP("Provided the Network backend which KNetworkConf relies on."), diff --git a/knetworkconf/knetworkconf/kprofileslistviewtooltip.h b/knetworkconf/knetworkconf/kprofileslistviewtooltip.h index 06459f3..8537e49 100644 --- a/knetworkconf/knetworkconf/kprofileslistviewtooltip.h +++ b/knetworkconf/knetworkconf/kprofileslistviewtooltip.h @@ -127,7 +127,7 @@ inline KNetworkInfo *KProfilesListViewToolTip::getProfile(TQPtrList it(profilesList); KNetworkInfo *net = nullptr; - while ((net = it.current()) != 0) + while ((net = it.current()) != nullptr) { ++it; if (net->getProfileName() == selectedProfile) diff --git a/knetworkconf/knetworkconf/main.cpp b/knetworkconf/knetworkconf/main.cpp index 6baba68..848ebc7 100644 --- a/knetworkconf/knetworkconf/main.cpp +++ b/knetworkconf/knetworkconf/main.cpp @@ -31,7 +31,7 @@ static TDECmdLineOptions options[] = { - { 0, 0, 0 } + { nullptr, nullptr, nullptr } // INSERT YOUR COMMANDLINE OPTIONS HERE }; /*typedef KGenericFactory KDEDFactory; diff --git a/kpackage/debAptInterface.cpp b/kpackage/debAptInterface.cpp index 58752a5..46e1411 100644 --- a/kpackage/debAptInterface.cpp +++ b/kpackage/debAptInterface.cpp @@ -427,7 +427,7 @@ TQString DEBAPT::install(int installFlags, TQPtrList *p, TQString files = ""; packageInfo *i; - for (i = p->first(); i!= 0; i = p->next()) { + for (i = p->first(); i; i = p->next()) { TQString file = i->getFilename(); TQString fname = i->fetchFilename(); @@ -486,7 +486,7 @@ TQStringList DEBAPT::readAptS() } return list; } else { - return 0; + return nullptr; } } @@ -505,7 +505,7 @@ TQStringList DEBAPT::readAptF() file.close(); return lines; } else { - return 0; + return nullptr; } } diff --git a/kpackage/debInterface.cpp b/kpackage/debInterface.cpp index a66d7b7..813f311 100644 --- a/kpackage/debInterface.cpp +++ b/kpackage/debInterface.cpp @@ -66,7 +66,7 @@ DEB::DEB():pkgInterface() packagePattern = "*.deb"; typeID = "/deb"; - locatedialog = 0; + locatedialog = nullptr; } ////////////////////////////////////////////////////////////////////////////// @@ -101,7 +101,7 @@ void DEB::listUnIPackages(TQPtrList *pki, LcacheObj *pCache) TQString s; cacheObj *cp; - for (cp = pCache->first(); cp != 0; cp = pCache->next()) { + for (cp = pCache->first(); cp; cp = pCache->next()) { kdDebug() << cp->base << ":: " << cp->option << "\n"; if (!cp->option.isEmpty()) { distPackages(pki, cp); @@ -140,7 +140,7 @@ bool DEB::parseName(const TQString &name, TQString *n, TQString *v) void DEB::listInstalledPackages(TQPtrList *pki) { - listPackList(pki,STATUS,0); + listPackList(pki,STATUS,nullptr); } void DEB::listPackList(TQPtrList *pki, const TQString &fname, cacheObj *cp) @@ -172,7 +172,7 @@ void DEB::listPackList(TQPtrList *pki, const TQString &fname, cache } else { p = collectInfo(list); if (p) { - if (!p->pkgInsert(pki, typeID, cp == 0)) { + if (!p->pkgInsert(pki, typeID, !cp)) { delete p; } else if (cp) { p->info.insert("base", cp->base); @@ -205,7 +205,7 @@ packageInfo *DEB::getPackageInfo(char mode, const TQString &name, const TQString packageInfo *DEB::getIPackageInfo( const TQString &name) { // query an installed package! - packageInfo *pki = 0; + packageInfo *pki = nullptr; TQString search; TQStringList list; @@ -241,7 +241,7 @@ packageInfo *DEB::getIPackageInfo( const TQString &name) packageInfo *DEB::getIRPackageInfo( const TQString &name) { // query an remote installed package - packageInfo *pki = 0; + packageInfo *pki = nullptr; TQString s = "dpkg --status "; s += name; @@ -272,7 +272,7 @@ packageInfo *DEB::getIRPackageInfo( const TQString &name) packageInfo *DEB::getUPackageInfo( const TQString &name) { // query an uninstalled package - packageInfo *pki = 0; + packageInfo *pki = nullptr; TQString s = "dpkg --info "; s += TDEProcess::quote(name); @@ -355,7 +355,7 @@ packageInfo *DEB::collectInfo(TQStringList &ln, pkgInterface *pkgInt) a.insert("group", val); } else if (key == "status") { if ((val.find("not-installed") >= 0) || (val.find("config-files") >= 0)) { - return 0; + return nullptr; } if (val != "install ok installed" && val != "deinstall ok installed" && @@ -388,7 +388,7 @@ packageInfo *DEB::collectInfo(TQStringList &ln, pkgInterface *pkgInt) i->fixup(); return i; } else { - return 0; + return nullptr; } } @@ -397,7 +397,7 @@ packageInfo *DEB::collectInfo(TQStringList &ln, pkgInterface *pkgInt) TQStringList DEB::getChangeLog(packageInfo *p) { TQString fn( p->getFilename()); if(!fn.isEmpty()) - return 0; + return nullptr; else return getIChangeLog(p); } @@ -425,7 +425,7 @@ TQStringList DEB::getIChangeLog(packageInfo *p) if (!kpty->Result) return ret; else - return 0; + return nullptr; } } @@ -549,7 +549,7 @@ TQString DEB::uninstall(int uninstallFlags, TQPtrList *p, TQString packs = ""; packageInfo *i; - for (i = p->first(); i!= 0; i = p->next()) { + for (i = p->first(); i; i = p->next()) { packs += i->getProperty("name"); packs += " "; } @@ -563,7 +563,7 @@ TQString DEB::install(int installFlags, TQPtrList *p, TQString packs = ""; packageInfo *i; - for (i = p->first(); i!= 0; i = p->next()) { + for (i = p->first(); i; i = p->next()) { TQString fname = i->fetchFilename(); if (!fname.isEmpty()) { packs += TDEProcess::quote(fname); diff --git a/kpackage/debInterface.h b/kpackage/debInterface.h index 155c069..8f440d0 100644 --- a/kpackage/debInterface.h +++ b/kpackage/debInterface.h @@ -78,7 +78,7 @@ public: virtual TQStringList FindFile(const TQString &name, bool seachAll=false); virtual bool parseName(const TQString &name, TQString *n, TQString *v); - virtual packageInfo* collectInfo(TQStringList &ln, pkgInterface *pkgInt = 0); + virtual packageInfo* collectInfo(TQStringList &ln, pkgInterface *pkgInt = nullptr); TQString uninstall(int uninstallFlags, TQPtrList *p, bool &test); diff --git a/kpackage/fbsdInterface.cpp b/kpackage/fbsdInterface.cpp index b0a752c..a658df4 100644 --- a/kpackage/fbsdInterface.cpp +++ b/kpackage/fbsdInterface.cpp @@ -206,7 +206,7 @@ packageInfo *fbsdInterface::getPackageInfo(char mode, const TQString &pname, con a["description"] = desc; } else { kpackage->setStatus(TQString()); - return 0; + return nullptr; } packageInfo *ret = new packageInfo(a, this); @@ -218,7 +218,7 @@ packageInfo *fbsdInterface::getPackageInfo(char mode, const TQString &pname, con } TQStringList fbsdInterface::getChangeLog(packageInfo *) { - return 0; + return nullptr; } @@ -318,7 +318,7 @@ TQString fbsdInterface::uninstall(int uninstallFlags, TQPtrList *p, TQString packs ; packageInfo *i; - for (i = p->first(); i!= 0; i = p->next()) { + for (i = p->first(); i; i = p->next()) { packs += i->getProperty("name"); TQString vers( i->getProperty("version")); if (vers.length() != 0) packs += "-" + vers; @@ -368,7 +368,7 @@ void fbsdInterface::setAvail(LcacheObj *slist) { cacheObj *cp = packageLoc->first(); if (cp && !cp->location.isEmpty()) { - for (; cp != 0; cp = packageLoc->next()) { + for (; cp; cp = packageLoc->next()) { TQString oldloc = cp->location; cp->location += "/INDEX"; TQString s = getPackList(cp); @@ -626,14 +626,14 @@ void bsdPortsIndexItem::processFile(fbsdInterface *parent, const TQString &fname // Go through each line and create a new bsdPortsIndexItem. char *line = strtok(index, "\n"); - while (line != 0) { + while (line) { bsdPortsIndexItem *i = new bsdPortsIndexItem(parent, line, binaries, dname + "/All"); if (i->fields[NAME].isEmpty()) { delete i; } else { parent->ports.insert(i->fields[NAME] , i); } - line = strtok(0, "\n"); + line = strtok(nullptr, "\n"); } } diff --git a/kpackage/findf.h b/kpackage/findf.h index 41d5ecb..6eef67d 100644 --- a/kpackage/findf.h +++ b/kpackage/findf.h @@ -56,7 +56,7 @@ class FindF : public KDialogBase public: - FindF ( TQWidget *parent = 0); + FindF ( TQWidget *parent = nullptr); ~FindF(); void resizeEvent(TQResizeEvent *); void dropEvent(TQDropEvent *); diff --git a/kpackage/gentooInterface.cpp b/kpackage/gentooInterface.cpp index 9e02035..eb97b17 100644 --- a/kpackage/gentooInterface.cpp +++ b/kpackage/gentooInterface.cpp @@ -219,7 +219,7 @@ void Gentoo::listInstalledPackages(TQPtrList *pki) // mode: i = query installed u = query uninstalled packageInfo *Gentoo::getPackageInfo(char mode, const TQString &name, const TQString &version) { - packageInfo *pki = 0; + packageInfo *pki = nullptr; TQString vb,search; switch(mode) @@ -249,7 +249,7 @@ packageInfo *Gentoo::collectInstalledInfo(const TQString& name, const TQString& TQIODevice* iod(KFilterDev::deviceForFile("/var/db/pkg/"+category+"/"+name+"/environment.bz2","application/x-bzip2", true)); TQString line; if (!iod->open(IO_ReadOnly)) - return 0; + return nullptr; TQTextStream stream( iod ); TQString n, version, description; while (!stream.atEnd()) @@ -299,7 +299,7 @@ packageInfo *Gentoo::collectUninstalledInfo(const TQString& name, const TQString if (!f.open(IO_ReadOnly)) { kdDebug() << "Couldn't read: " << name << "-" << version << endl; - return 0; + return nullptr; } // Dep format: @@ -343,7 +343,7 @@ packageInfo *Gentoo::collectUninstalledInfo(const TQString& name, const TQString if (!works) { // kdDebug() << name << "-" << version << ": Doesn't contain working arch" << endl; - return 0; + return nullptr; } packageInfo *i = new packageInfo(a,this); @@ -416,7 +416,7 @@ TQString Gentoo::uninstall(int , TQPtrList *plist, bool &test) else cmd = "NOCOLOR=\"true\" emerge unmerge "; - for (pk = plist->first(); pk != 0; pk = plist->next()) { + for (pk = plist->first(); pk; pk = plist->next()) { cmd += "=" + pk->getProperty("group") + "/" + pk->getProperty("name") + "-" + pk->getProperty("version") + " "; } @@ -434,7 +434,7 @@ TQString Gentoo::install(int, TQPtrList *plist, bool &test) else cmd = "NOCOLOR=\"true\" emerge "; - for (pk = plist->first(); pk != 0; pk = plist->next()) { + for (pk = plist->first(); pk; pk = plist->next()) { cmd += "=" + pk->getProperty("group") + "/" + pk->getProperty("name") + "-" + pk->getProperty("version") + " "; } diff --git a/kpackage/kissInterface.cpp b/kpackage/kissInterface.cpp index 834569e..85545c8 100644 --- a/kpackage/kissInterface.cpp +++ b/kpackage/kissInterface.cpp @@ -82,11 +82,11 @@ KISS::KISS():pkgInterface() procMsg = i18n("KPackage: Waiting on KISS"); param paramsInst[] = { - param(0,false,false,0) + param(nullptr,false,false,nullptr) }; param paramsUninst[] = { - param(0,false,false,0) + param(nullptr,false,false,nullptr) }; hasProgram = ifExe("kiss"); } @@ -140,7 +140,7 @@ void KISS::listInstalledPackages(TQPtrList *pki) reader.setup("kiss"); *reader.proc << "-qq"; - if (!reader.start(0,false)) + if (!reader.start(nullptr,false)) return; kpackage->setStatus(sline); @@ -169,7 +169,7 @@ void KISS::listInstalledPackages(TQPtrList *pki) // mode: i = query installed u = query uninstalled packageInfo *KISS::getPackageInfo(char mode, const TQString &name, const TQString &) { - packageInfo *pki = 0; + packageInfo *pki = nullptr; TQString vb,search; switch(mode) @@ -179,7 +179,7 @@ packageInfo *KISS::getPackageInfo(char mode, const TQString &name, const TQStrin case 'i': reader.setup("kiss"); *reader.proc << "-q" << name; - if (reader.start(0,false)) { + if (reader.start(nullptr,false)) { reader.buf += "package: " + name + "\n"; pki = collectInfo(reader.buf.ascii()); } @@ -190,7 +190,7 @@ packageInfo *KISS::getPackageInfo(char mode, const TQString &name, const TQStrin case 'u': reader.setup("perl"); *reader.proc << name << "-q"; - if (reader.start(0,true)) { + if (reader.start(nullptr,true)) { pki = collectInfo(reader.buf.ascii()); TQFileInfo fi(name); @@ -270,7 +270,7 @@ packageInfo *KISS::collectInfo(const char *_inp) ////////////////////////////////////////////////////////////////////////////// TQStringList KISS::getChangeLog(packageInfo *) { - return 0; + return nullptr; } @@ -306,7 +306,7 @@ TQStringList KISS::getFileList(packageInfo *p) reader.setup("kiss"); *reader.proc << "-f" << name; - if (reader.start(0,false)) { + if (reader.start(nullptr,false)) { char *buffer = tqstrdup(reader.buf.ascii()); char *str = strtok(buffer,"\n"); if (str) { @@ -323,7 +323,7 @@ TQStringList KISS::getFileList(packageInfo *p) case 'u': reader.setup("perl"); *reader.proc << fn << "-f"; - if (reader.start(0,true)) { + if (reader.start(nullptr,true)) { char *buffer = tqstrdup(reader.buf.ascii()); char *str = strtok(buffer,"\n"); if (str) { @@ -348,11 +348,11 @@ TQString KISS::uninstall(int uninstallFlags, TQPtrList *plist, bool TQString packs; packageInfo *pk; - for (pk = plist->first(); pk != 0; pk = plist->next()) { + for (pk = plist->first(); pk; pk = plist->next()) { packs = pk->getProperty("name"); doUninstall(uninstallFlags, packs, test); } - return 0; + return nullptr; } TQString KISS::doUninstall(int, const TQString &packs, bool &) @@ -368,14 +368,14 @@ TQString KISS::install(int installFlags, TQPtrList *plist, bool &te { packageInfo *pk; int i = 0; - for (pk = plist->first(); pk != 0; pk = plist->next()) { + for (pk = plist->first(); pk; pk = plist->next()) { TQString fname = pk->fetchFilename(); if (!fname.isEmpty()) { doInstall(installFlags, fname, test); i++; } } - return 0; + return nullptr; } TQString KISS::doInstall(int, const TQString &packs, bool &) diff --git a/kpackage/kpPty.cpp b/kpackage/kpPty.cpp index 2530297..b4917ea 100644 --- a/kpackage/kpPty.cpp +++ b/kpackage/kpPty.cpp @@ -193,7 +193,7 @@ bool kpPty::startSession(bool needRoot) int res; interact = true; // kdDebug() << "H=" << hostName << " PH=" << passwords[hostName] << " PT=" << passwordTried <<"\n"; - if (passwords[hostName] != 0 && !passwordTried) { + if (passwords[hostName] != nullptr && !passwordTried) { pass = passwords[hostName]; res = 1; } else { @@ -291,7 +291,7 @@ TQStringList kpPty::run(const TQString &cmd, bool inLoop, bool needRoot) pty->setEnvironment("TERM", "dumb"); if (!pty->sstart(TDEProcess::NotifyOnExit)) { kdDebug() << " kpPty::run execute=0\n"; - return 0; + return nullptr; } } else { if (startSession(needRoot)) { @@ -301,7 +301,7 @@ TQStringList kpPty::run(const TQString &cmd, bool inLoop, bool needRoot) kdDebug() << " kpPty::run session\n"; } else { kdDebug() << " kpPty::run other=0\n"; - return 0; + return nullptr; } } @@ -313,7 +313,7 @@ TQStringList kpPty::run(const TQString &cmd, bool inLoop, bool needRoot) return retList; } else { - return 0; + return nullptr; } } @@ -346,7 +346,7 @@ void kpPty::finish(int ret) int p; l = retList.fromLast(); if ((p = (*l).find("RESULT=")) >= 0) { - ret = (*l).mid(p+7).toInt(0,10); + ret = (*l).mid(p+7).toInt(nullptr,10); retList.remove(l); // Remove return code } else { ret = 666; diff --git a/kpackage/kpPty.h b/kpackage/kpPty.h index 88d5ba7..cab0a38 100644 --- a/kpackage/kpPty.h +++ b/kpackage/kpPty.h @@ -44,7 +44,7 @@ class kpKProcIO: public TDEProcIO public: - kpKProcIO ( TQTextCodec *_codec = 0); + kpKProcIO ( TQTextCodec *_codec = nullptr); ~kpKProcIO(); bool sstart (RunMode runmode); diff --git a/kpackage/kpTerm.h b/kpackage/kpTerm.h index 74031f6..cee39b0 100644 --- a/kpackage/kpTerm.h +++ b/kpackage/kpTerm.h @@ -48,7 +48,7 @@ class kpTerm: public TQTextEdit public: - kpTerm(kpPty *pt, TQWidget * parent=0, const char * name=0); + kpTerm(kpPty *pt, TQWidget * parent=nullptr, const char * name=nullptr); void keyPressEvent ( TQKeyEvent * e ); bool run(const TQString &cmd, TQStringList &r); void doConnect(); @@ -76,7 +76,7 @@ class kpRun: public KDialogBase public: - kpRun(TQWidget *parent = 0); + kpRun(TQWidget *parent = nullptr); bool run(TQString cmd, TQString title); void addText(const TQStringList &ret); diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp index 5c94cbc..d82ec5b 100644 --- a/kpackage/kpackage.cpp +++ b/kpackage/kpackage.cpp @@ -490,7 +490,7 @@ pkgInterface *KPACKAGE::pkType(const TQString &fname) KpMsgE(i18n("File not found: %1").arg(fname),true); } - return 0; + return nullptr; } ///////////////////////////////////////////////////////////////////////// @@ -510,7 +510,7 @@ void KPACKAGE::openNetFiles (const TQStringList &urls, bool install ) int i; int index; TQPtrList **lst = new TQPtrList*[kpinterfaceN]; - packageInfo *pk = 0; + packageInfo *pk = nullptr; kdDebug() << "openNetFiles\n"; @@ -529,7 +529,7 @@ void KPACKAGE::openNetFiles (const TQStringList &urls, bool install ) pkgInterface *type = pkType(*t); index = typeIndex(type); if (index >= 0) { - pk = type->getPackageInfo('u', *t, 0); + pk = type->getPackageInfo('u', *t, nullptr); if (pk) { pk->pkgFileIns(*t); lst[index]->insert(0,pk); @@ -543,7 +543,7 @@ void KPACKAGE::openNetFiles (const TQStringList &urls, bool install ) if ( lst[i]->count() > 0) { kpinterface[i]->installation->setup(lst[i],kpinterface[i]->head); if (kpinterface[i]->installation->exec()) { - for (packageInfo *inf = lst[i]->first(); inf != 0; inf = lst[i]->next()) { + for (packageInfo *inf = lst[i]->first(); inf; inf = lst[i]->next()) { kpackage->management->updatePackage(inf,true); } } diff --git a/kpackage/kplview.cpp b/kpackage/kplview.cpp index 12c9345..925a71b 100644 --- a/kpackage/kplview.cpp +++ b/kpackage/kplview.cpp @@ -46,7 +46,7 @@ KpTreeList::KpTreeList( TQWidget *parent ) : TDEListView (parent) { - markPkg = 0; + markPkg = nullptr; setShowSortIndicator(true); TQPtrStack stack(); @@ -78,7 +78,7 @@ TDEListView (parent) void KpTreeList::clear() { - markPkg = 0; + markPkg = nullptr; emit cleared(); TDEListView::clear(); } @@ -353,7 +353,7 @@ void KpTreeList::packageHighlighted(TQListViewItem *item, packageDisplayWidget * KpTreeListItem *sel = (KpTreeListItem *)item; if (!sel || sel->childCount()) { - packageDisplay->changePackage(0); + packageDisplay->changePackage(nullptr); } else if (sel) { if (!notPress) { int n = stack.at(); @@ -391,32 +391,32 @@ KpTreeListItem *KpTreeList::search(const TQString &str, const TQString &head, searchSkip = false; searchSubstr = false; searchStr = str; - searchResult = 0; + searchResult = nullptr; do { if (item->text(0) == head) { searchChild(item->firstChild()); - if (searchResult != 0) + if (searchResult) return searchResult; } } while ((item = item->nextSibling())); - return 0; + return nullptr; } KpTreeListItem *KpTreeList::search(const TQString &str, bool subStr, bool wrap, bool start=false) { if (!firstChild()) - return 0; + return nullptr; if (start) - searchCitem = 0; + searchCitem = nullptr; else searchCitem = currentItem(); searchSkip = !wrap; searchSubstr = subStr; searchStr = str; - searchResult = 0; + searchResult = nullptr; searchChild(firstChild()); @@ -472,7 +472,7 @@ KpTreeListItem *KpTreeList::changePack(KpTreeListItem *searchResult, bool push) ensureItemVisible(searchResult); return searchResult; } else { - return 0; + return nullptr; } } diff --git a/kpackage/kplview.h b/kpackage/kplview.h index 4f5eb57..d4c11fc 100644 --- a/kpackage/kplview.h +++ b/kpackage/kplview.h @@ -53,7 +53,7 @@ class KpTreeList: public TDEListView public: - KpTreeList ( TQWidget * parent = 0); + KpTreeList ( TQWidget * parent = nullptr); void contentsMousePressEvent ( TQMouseEvent * e ); @@ -100,7 +100,7 @@ public: // A package has been highlighted in the list tree KpTreeListItem *search(const TQString &str, const TQString &head, - KpTreeListItem *start = 0); + KpTreeListItem *start = nullptr); KpTreeListItem *search(const TQString &str, bool subStr, bool wrap, bool start); // search for a package in tree KpTreeListItem *changePack(KpTreeListItem *searchResult, bool push = true); @@ -158,18 +158,18 @@ class KpTreeListItem : public TQListViewItem public: KpTreeListItem( TQListViewItem *parent, packageInfo* pinfo, const TQPixmap& thePixmap, - TQString label1 = 0, TQString label2 = 0, - TQString label3 = 0, TQString label4 = 0, - TQString label5 = 0, TQString label6 = 0, - TQString label7 = 0, TQString label8 = 0); + TQString label1 = nullptr, TQString label2 = nullptr, + TQString label3 = nullptr, TQString label4 = nullptr, + TQString label5 = nullptr, TQString label6 = nullptr, + TQString label7 = nullptr, TQString label8 = nullptr); KpTreeListItem( TDEListView *parent, packageInfo* pinfo, const TQPixmap& thePixmap, - TQString label1 = 0, TQString label2 = 0, - TQString label3 = 0, TQString label4 = 0, - TQString label5 = 0, TQString label6 = 0, - TQString label7 = 0, TQString label8 = 0); + TQString label1 = nullptr, TQString label2 = nullptr, + TQString label3 = nullptr, TQString label4 = nullptr, + TQString label5 = nullptr, TQString label6 = nullptr, + TQString label7 = nullptr, TQString label8 = nullptr); KpTreeListItem *firstChild(); diff --git a/kpackage/main.cpp b/kpackage/main.cpp index 68779f6..90926f2 100644 --- a/kpackage/main.cpp +++ b/kpackage/main.cpp @@ -60,9 +60,9 @@ static const char description[] = static TDECmdLineOptions options[] = { - { "remote ", I18N_NOOP("Remote host for Debian APT, via SSH"), 0 }, - { "r ", 0, 0}, - { "+[Package]", I18N_NOOP("Package to install"), 0 }, + { "remote ", I18N_NOOP("Remote host for Debian APT, via SSH"), nullptr }, + { "r ", nullptr, nullptr}, + { "+[Package]", I18N_NOOP("Package to install"), nullptr }, TDECmdLineLastOption }; @@ -85,11 +85,11 @@ int main(int argc, char **argv) // VERSION, description, 0, "(c) 1999-2001, Toivo Pedaste"); TDECmdLineArgs::init( argc, argv, &aboutData ); - aboutData.addAuthor( "Toivo Pedaste",0, "toivo@ucs.uwa.edu.au"); + aboutData.addAuthor( "Toivo Pedaste",nullptr, "toivo@ucs.uwa.edu.au"); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. TDEApplication app; - kpkg = 0; + kpkg = nullptr; int j = 0; // Make sure PATH has the right directories in it @@ -111,7 +111,7 @@ int main(int argc, char **argv) kpstart = new kpRun(); for (int i = 0; i < kpinterfaceN; i++) { - kpinterface[i] = 0; + kpinterface[i] = nullptr; } kdDebug() << "Hostname=" << hostName << "\n"; diff --git a/kpackage/managementWidget.cpp b/kpackage/managementWidget.cpp index 7fa0c6b..ffecd7f 100644 --- a/kpackage/managementWidget.cpp +++ b/kpackage/managementWidget.cpp @@ -75,8 +75,8 @@ void KpListViewSearchLine::updateSearch(const TQString &s) managementWidget::managementWidget(TQWidget *parent) : TQFrame(parent) { - install_action = 0; - uninstall_action = 0; + install_action = nullptr; + uninstall_action = nullptr; allPackages = new TQPtrList; @@ -319,7 +319,7 @@ void managementWidget::collectData(bool refresh) connect(treeList, TQ_SIGNAL(selectionChanged(TQListViewItem *)), TQ_SLOT(packageHighlighted(TQListViewItem *))); - packageDisplay->changePackage(0); + packageDisplay->changePackage(nullptr); // Delete old list if necessary if(allPackages) { @@ -363,7 +363,7 @@ void managementWidget::rebuildListTree() if (incr == 0) incr = 1; - for(i=allPackages->first(); i!=0; i=allPackages->next()) + for(i=allPackages->first(); i; i=allPackages->next()) { i->place(treeList,true); @@ -418,7 +418,7 @@ void managementWidget::installSingleClicked() interface->installation->modified) { // it was accepted, so the package has been installed packageInfo *inf; - for (inf = plist.first(); inf != 0; inf = plist.next()) { + for (inf = plist.first(); inf; inf = plist.next()) { updatePackage(inf,true); } @@ -426,7 +426,7 @@ void managementWidget::installSingleClicked() KpTreeListItem *p = treeList->currentItem(); packageDisplay->changePackage(p->info); } else { - packageDisplay->changePackage(0); // change package to no package + packageDisplay->changePackage(nullptr); // change package to no package } setupInstButton(); } @@ -465,7 +465,7 @@ void managementWidget::installMultClicked() for (i = 0; i < kpinterfaceN; i++) { if (kpinterface[i]) { lst[i] = new TQPtrList; - for (it = selList.first(); it != 0; it = selList.next()) { + for (it = selList.first(); it; it = selList.next()) { if (it->info->interface == kpinterface[i] && it->childCount() == 0 && (it->info->packageState == packageInfo::UPDATED || @@ -484,7 +484,7 @@ void managementWidget::installMultClicked() if (kpinterface[i]->installation->setup(lst[i],kpinterface[i]->head)) { if (kpinterface[i]->installation->exec() || kpinterface[i]->installation->modified) { - for (inf = lst[i]->first(); inf != 0; inf = lst[i]->next()) { + for (inf = lst[i]->first(); inf; inf = lst[i]->next()) { updatePackage(inf,true); } } @@ -520,7 +520,7 @@ void managementWidget::uninstallSingleClicked() if(result == TQDialog::Accepted || interface->installation->modified) { packageInfo *inf; - for (inf = plist.first(); inf != 0; inf = plist.next()) { + for (inf = plist.first(); inf; inf = plist.next()) { updatePackage(inf,false); } @@ -528,7 +528,7 @@ void managementWidget::uninstallSingleClicked() KpTreeListItem *p = treeList->currentItem(); packageDisplay->changePackage(p->info); } else { - packageDisplay->changePackage(0); // change package to no package + packageDisplay->changePackage(nullptr); // change package to no package } setupInstButton(); } @@ -552,7 +552,7 @@ void managementWidget::uninstallMultClicked() for (i = 0; i < kpinterfaceN; i++) { if (kpinterface[i]) { lst[i] = new TQPtrList; - for (it = selList.first(); it != 0; it = selList.next()) { + for (it = selList.first(); it; it = selList.next()) { if (it->info->interface == kpinterface[i] && it->childCount() == 0 && (it->info->packageState == packageInfo::INSTALLED || @@ -571,7 +571,7 @@ void managementWidget::uninstallMultClicked() if (kpinterface[i]->uninstallation->setup(lst[i],kpinterface[i]->head)) { if (kpinterface[i]->uninstallation->exec()|| kpinterface[i]->installation->modified ) { - for (inf = lst[i]->first(); inf != 0; inf = lst[i]->next()) { + for (inf = lst[i]->first(); inf; inf = lst[i]->next()) { updatePackage(inf,false); } } @@ -628,7 +628,7 @@ KpTreeListItem *managementWidget::updatePackage(packageInfo *pki, bool install) if (ptree) { if (ptree->getItem()) { delete ptree->getItem(); - ptree->item = 0; + ptree->item = nullptr; } } @@ -637,7 +637,7 @@ KpTreeListItem *managementWidget::updatePackage(packageInfo *pki, bool install) ptree->packageState = packageInfo::HIDDEN; if (ptree->getItem()) { delete ptree->getItem(); - ptree->item = 0; + ptree->item = nullptr; } } } @@ -660,7 +660,7 @@ KpTreeListItem *managementWidget::updatePackage(packageInfo *pki, bool install) treeList->stackRemove(qt); treeList->setSelected(qt,false); if (treeList->markPkg == qt) - treeList->markPkg = 0; + treeList->markPkg = nullptr; delete qt; } else { kdDebug() << "DEL=" << name << endl; @@ -682,7 +682,7 @@ KpTreeListItem *managementWidget::updatePackage(packageInfo *pki, bool install) } } - return 0; + return nullptr; } /////////////////////////////////////////////////////////////////////////// diff --git a/kpackage/options.cpp b/kpackage/options.cpp index 65bc800..5c2e1d4 100644 --- a/kpackage/options.cpp +++ b/kpackage/options.cpp @@ -54,7 +54,7 @@ extern Opts *opts; ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// Options::Options(TQWidget *parent) - : KDialogBase(Tabbed, i18n("Options"), Ok | Cancel, Ok, parent, 0, false){ + : KDialogBase(Tabbed, i18n("Options"), Ok | Cancel, Ok, parent, nullptr, false){ fRemote = false; @@ -105,7 +105,7 @@ Options::Options(TQWidget *parent) locate[i] = new TQPushButton(i18n("Location of Packages"),packageBox[i]); connect(locate[i], TQ_SIGNAL(clicked()), kpinterface[i], TQ_SLOT(setLocation())); } else { - packageHandle[i] = 0; + packageHandle[i] = nullptr; } } } diff --git a/kpackage/options.h b/kpackage/options.h index 63a37a3..136a985 100644 --- a/kpackage/options.h +++ b/kpackage/options.h @@ -66,7 +66,7 @@ class Options : public KDialogBase public: - Options ( TQWidget *parent = 0); + Options ( TQWidget *parent = nullptr); ~Options(); void restore(); diff --git a/kpackage/packageDisplay.cpp b/kpackage/packageDisplay.cpp index a4766ba..f3656ea 100644 --- a/kpackage/packageDisplay.cpp +++ b/kpackage/packageDisplay.cpp @@ -188,7 +188,7 @@ void packageDisplayWidget::changePackage(packageInfo *p) if (package && package != p) { if (!package->getItem() && !kpackage->management->allPackages->find(package)) { delete package; - package = 0; + package = nullptr; } } @@ -198,7 +198,7 @@ void packageDisplayWidget::changePackage(packageInfo *p) } else { TQString u = package->getFilename(); if (!package->updated && !u.isEmpty()) { - packageInfo *np = package->interface->getPackageInfo('u', u, 0); + packageInfo *np = package->interface->getPackageInfo('u', u, nullptr); if (np) { TQMap::Iterator it; // update info entries in p diff --git a/kpackage/packageDisplay.h b/kpackage/packageDisplay.h index 2402c87..b2b5796 100644 --- a/kpackage/packageDisplay.h +++ b/kpackage/packageDisplay.h @@ -91,7 +91,7 @@ class packageDisplayWidget : public TQTabWidget friend class kpFileList; ///////////// METHODS ------------------------------------------------------ public: - packageDisplayWidget(TQWidget *parent=0); + packageDisplayWidget(TQWidget *parent=nullptr); // Constructor ~packageDisplayWidget(); diff --git a/kpackage/packageInfo.cpp b/kpackage/packageInfo.cpp index d3f819c..fff1dd2 100644 --- a/kpackage/packageInfo.cpp +++ b/kpackage/packageInfo.cpp @@ -415,9 +415,9 @@ KpTreeListItem *packageInfo::place(KpTreeList *tree, bool insertI) search = group->firstChild(); } else { if (parent) { - group = new KpTreeListItem(parent, 0, interface->folder, *it); + group = new KpTreeListItem(parent, nullptr, interface->folder, *it); } else { - group = new KpTreeListItem(tree, 0, interface->folder, *it); + group = new KpTreeListItem(tree, nullptr, interface->folder, *it); } parent = group; parent->setOpen(true); @@ -491,7 +491,7 @@ KpTreeListItem *packageInfo::place(KpTreeList *tree, bool insertI) return item; } else { - return 0; + return nullptr; } } diff --git a/kpackage/packageProperties.cpp b/kpackage/packageProperties.cpp index cf6143f..f2e4afb 100644 --- a/kpackage/packageProperties.cpp +++ b/kpackage/packageProperties.cpp @@ -264,12 +264,12 @@ void packagePropertiesWidget::setSource(const TQString &name) { TQString ind = s + package->interface->typeID; packageInfo *p = kpackage->management->dirInstPackages->find(ind); if (p) { - kpackage->management->treeList->changePack(p->getItem(), package->getItem() != 0); + kpackage->management->treeList->changePack(p->getItem(), package->getItem() != nullptr); } else { kdDebug() << "nfound=" << ind << endl; p = kpackage->management->dirUninstPackages->find(ind); if (p) { - kpackage->management->treeList->changePack(p->getItem(), package->getItem() != 0); + kpackage->management->treeList->changePack(p->getItem(), package->getItem() != nullptr); } else { kdDebug() << "Nfound=" << ind << endl; } diff --git a/kpackage/packageProperties.h b/kpackage/packageProperties.h index 6de512d..105c2c3 100644 --- a/kpackage/packageProperties.h +++ b/kpackage/packageProperties.h @@ -56,7 +56,7 @@ class packagePropertiesWidget : public KTextBrowser ///////////// METHODS ------------------------------------------------------ public: - packagePropertiesWidget(TQWidget *parent=0); + packagePropertiesWidget(TQWidget *parent=nullptr); // constructor ~packagePropertiesWidget(); diff --git a/kpackage/pkgInterface.cpp b/kpackage/pkgInterface.cpp index e1d6710..bd6f381 100644 --- a/kpackage/pkgInterface.cpp +++ b/kpackage/pkgInterface.cpp @@ -66,7 +66,7 @@ param::~param() ////////////////////////////////////////////////////////////////////////////// pkgInterface::pkgInterface( ) : TQObject(), new_pict(), updated_pict() { - packageLoc = 0; + packageLoc = nullptr; DELMSG = i18n("'Delete this window to continue'"); @@ -100,10 +100,10 @@ void pkgInterface::setMenu(TDEActionCollection*, bool ) } ////////////////////////////////////////////////////////////////////////////// -TQStringList pkgInterface::depends(const TQString &, int ) {return 0;} +TQStringList pkgInterface::depends(const TQString &, int ) {return nullptr;} -TQString pkgInterface::doUninstall(int, const TQString &, bool &) {return 0;} -TQString pkgInterface::doInstall(int, const TQString &, bool &) {return 0;} +TQString pkgInterface::doUninstall(int, const TQString &, bool &) {return nullptr;} +TQString pkgInterface::doInstall(int, const TQString &, bool &) {return nullptr;} //////////////////////////////////////////////////////////////////////////// @@ -122,7 +122,7 @@ void pkgInterface::listPackages(TQPtrList *pki) { listInstalledPackages(pki); if (packageLoc) { - for (cacheObj *cp = packageLoc->first(); cp != 0; cp = packageLoc->next()) { + for (cacheObj *cp = packageLoc->first(); cp; cp = packageLoc->next()) { TQString s = getDir(cp); if (!s.isEmpty()) listDir(pki, s, cp->location, cp->subdirs); @@ -179,7 +179,7 @@ void pkgInterface::listDir(TQPtrList *pki, const TQString &fname, c if (opts->PkgRead) { rfile = fname + "/"; rfile += fi->fileName(); - p = getPackageInfo('u',rfile, 0); + p = getPackageInfo('u',rfile, nullptr); if (p) { p->info.insert("filename", fi->fileName()); p->info.insert("base", dir); @@ -242,7 +242,7 @@ packageInfo *pkgInterface::collectDir(const TQString &name, const TQString &size // i->packageState = packageInfo::NEW; return i; } - return 0; + return nullptr; } TQString pkgInterface::getPackList(cacheObj *cp) @@ -253,7 +253,7 @@ TQString pkgInterface::getPackList(cacheObj *cp) kdDebug() << "pkgInterface::getPackList " << url << " " << cp->cacheFile << "\n"; if ((res = cacheObj::newDCache(url, cp->cacheFile, tmpf))) { if (res < 0) - return 0; + return nullptr; unlink(TQFile::encodeName(tmpf)); if (kpkg) @@ -365,7 +365,7 @@ TQString pkgInterface::uninstall(int uninstallFlags, TQPtrList *p, TQString packs; packageInfo *i; - for (i = p->first(); i!= 0; i = p->next()) { + for (i = p->first(); i; i = p->next()) { packs += i->getProperty("name"); packs += " "; } @@ -386,7 +386,7 @@ TQString pkgInterface::install(int installFlags, TQPtrList *p, bool TQString packs = ""; packageInfo *i; - for (i = p->first(); i!= 0; i = p->next()) { + for (i = p->first(); i; i = p->next()) { TQString fname = i->fetchFilename(); if (!fname.isEmpty()) { packs += fname; @@ -412,7 +412,7 @@ TQString pkgInterface::setOptions(int flags, TQPtrList ¶ms) param *p; i = 0; - for ( p=params.first(); p != 0; p=params.next(), i++ ) { + for ( p=params.first(); p; p=params.next(), i++ ) { if ((flags>>i & 1) ^ p->invert) { s += p->flag + " "; } else { @@ -425,7 +425,7 @@ TQString pkgInterface::setOptions(int flags, TQPtrList ¶ms) TQStringList pkgInterface::readApt() { - return 0; + return nullptr; } void pkgInterface::writeApt(const TQStringList &) diff --git a/kpackage/pkgOptions.cpp b/kpackage/pkgOptions.cpp index 5dec101..1f32fa0 100644 --- a/kpackage/pkgOptions.cpp +++ b/kpackage/pkgOptions.cpp @@ -48,7 +48,7 @@ /////////////////////////////////////////////////////////////////////////// pkgOptions::pkgOptions(pkgInterface *pki, TQWidget *parent, const TQString &caption) - : KDialog(parent,0,true) + : KDialog(parent,nullptr,true) { // setFrameStyle(TQFrame::Raised | TQFrame::Panel); @@ -88,7 +88,7 @@ void pkgOptions::setupWidgets(TQPtrList &pars) Boxs = new TQCheckBox *[bnumber]; param *p; i = 0; - for ( p=pars.first(); p != 0; p=pars.next(), i++ ) { + for ( p=pars.first(); p; p=pars.next(), i++ ) { Boxs[i] = new TQCheckBox(p->name, this); Boxs[i]->setChecked(p->init); } @@ -164,7 +164,7 @@ bool pkgOptions::setup(TQPtrList *pl, const TQString &) TQStringList plist, rlist, clist; TQDict dict; TQString mark("x"); - for ( p = pl->first(); p != 0; p = pl->next() ) { + for ( p = pl->first(); p; p = pl->next() ) { TQString file = p->getFilename(); plist += p->getProperty("name"); if (file.isEmpty()) { @@ -256,7 +256,7 @@ void pkgOptions::slotSearch(TQListViewItem *item) kdDebug() << "searchI=" << s << "h=" << pkgInt->head <<"\n"; packageInfo *p; - for ( p = packList->first(); p != 0; p = packList->next() ) { + for ( p = packList->first(); p; p = packList->next() ) { if (s == p->getProperty("name")) { kpackage->management->doChangePackage(p); break; diff --git a/kpackage/pkgOptions.h b/kpackage/pkgOptions.h index 22a8c8e..2a8dbcd 100644 --- a/kpackage/pkgOptions.h +++ b/kpackage/pkgOptions.h @@ -54,7 +54,7 @@ class pkgOptions : public KDialog TQ_OBJECT public: - pkgOptions( pkgInterface *pki, TQWidget *parent=0, const TQString &caption=TQString()); + pkgOptions( pkgInterface *pki, TQWidget *parent=nullptr, const TQString &caption=TQString()); ~pkgOptions(); bool setup(TQPtrList *pl, const TQString &type); @@ -136,7 +136,7 @@ class pkgOptionsI: public pkgOptions TQ_OBJECT public: - pkgOptionsI(pkgInterface *pkg, TQWidget *parent = 0); + pkgOptionsI(pkgInterface *pkg, TQWidget *parent = nullptr); TQString doPackages(int installFlags, TQPtrList *p, bool &test); }; @@ -147,7 +147,7 @@ class pkgOptionsU: public pkgOptions TQ_OBJECT public: - pkgOptionsU(pkgInterface *pkg, TQWidget *parent = 0); + pkgOptionsU(pkgInterface *pkg, TQWidget *parent = nullptr); TQString doPackages(int installFlags, TQPtrList *p, bool &test); }; diff --git a/kpackage/procbuf.cpp b/kpackage/procbuf.cpp index cb23f57..f5af4cb 100644 --- a/kpackage/procbuf.cpp +++ b/kpackage/procbuf.cpp @@ -125,7 +125,7 @@ int procbuf::start (TQString msg, bool errorDlg, m = new Modal(msg,kpkg, "wait"); m->exec(); delete m; - m = 0; + m = nullptr; } kdDebug() << command @@ -135,18 +135,18 @@ int procbuf::start (TQString msg, bool errorDlg, if (timed) { kdDebug() << "timeout..................\n"; KpMsg("Error",i18n("Timeout: %1").arg(timeMsg), true); - delete proc; proc = 0; + delete proc; proc = nullptr; return 0; } else { if (!proc->normalExit() || proc->exitStatus()) { if (errorDlg) { KpMsg("Error",i18n("TDEProcess error:%1").arg(buf), true); } - delete proc; proc = 0; + delete proc; proc = nullptr; return 0; } } - delete proc; proc = 0; + delete proc; proc = nullptr; return 1; } diff --git a/kpackage/rpmInterface.cpp b/kpackage/rpmInterface.cpp index 0015e97..8d88c7e 100644 --- a/kpackage/rpmInterface.cpp +++ b/kpackage/rpmInterface.cpp @@ -283,7 +283,7 @@ packageInfo* RPM::collectInfo(TQStringList &ln) { i->fixup(); return i; } else { - return 0; + return nullptr; } } @@ -496,7 +496,7 @@ TQString RPM::uninstall(int uninstallFlags, TQPtrList *plist, bool TQStringList files; packageInfo *pk; - for (pk = plist->first(); pk != 0; pk = plist->next()) { + for (pk = plist->first(); pk; pk = plist->next()) { files.append( pk->getProperty("name") ); } @@ -545,7 +545,7 @@ TQString RPM::install(int installFlags, TQPtrList *plist, bool &tes { TQStringList files; - for (packageInfo *pk = plist->first(); pk != 0; pk = plist->next()) { + for (packageInfo *pk = plist->first(); pk; pk = plist->next()) { TQString fname( pk->fetchFilename() ); if (!fname.isEmpty()) { files.append(quotePath(fname)); @@ -622,7 +622,7 @@ TQString RPM::quotePath( const TQString &path) { } ////////////////////////////////////////////////////////////////////////////// - TQStringList RPM::depends(const TQString &, int){return 0;} + TQStringList RPM::depends(const TQString &, int){return nullptr;} TQString RPM::doUninst(int, const TQStringList &, bool &){return "0=";} TQString RPM::doinst(int, const TQStringList &, bool &){return "0=";} diff --git a/kpackage/search.cpp b/kpackage/search.cpp index 9d2bba7..44b67f2 100644 --- a/kpackage/search.cpp +++ b/kpackage/search.cpp @@ -98,11 +98,11 @@ void Search::ok_slot() pkg = kpackage->management->search(to_find, substr->isChecked(),false,false); - if (pkg == 0 && wrap->isChecked()) { + if (!pkg && wrap->isChecked()) { pkg = kpackage->management->search(to_find, substr->isChecked(),true,false); } - if (pkg == 0) + if (!pkg) KpMsg(i18n("Note"), i18n("%1 was not found.").arg(to_find),true); } diff --git a/kpackage/search.h b/kpackage/search.h index 1207336..fd7c418 100644 --- a/kpackage/search.h +++ b/kpackage/search.h @@ -50,7 +50,7 @@ class Search : public KDialogBase public: - Search ( TQWidget *parent = 0, const char * name=0); + Search ( TQWidget *parent = nullptr, const char * name=nullptr); ~Search(); private: diff --git a/kpackage/slackInterface.cpp b/kpackage/slackInterface.cpp index 983a8ec..456087b 100644 --- a/kpackage/slackInterface.cpp +++ b/kpackage/slackInterface.cpp @@ -75,7 +75,7 @@ SLACK::SLACK():pkgInterface() packagePattern = "*.tgz *.tar.gz *.txz"; typeID = "/slack"; - locatedialog = 0; + locatedialog = nullptr; queryMsg = i18n("Querying SLACK package list: "); procMsg = i18n("KPackage: Waiting on SLACK"); @@ -164,7 +164,7 @@ void SLACK::listPackages(TQPtrList *pki) cacheObj *cp; if (packageLoc) { - for (cp = packageLoc->first(); cp != 0; cp = packageLoc->next()) { + for (cp = packageLoc->first(); cp; cp = packageLoc->next()) { // first entry is special if (cp->cacheFile == "SLACK_0_0") { s = getPackList(cp); @@ -178,7 +178,7 @@ void SLACK::listPackages(TQPtrList *pki) listInstalledPackages(pki); if (packageLoc) { - for (cp = packageLoc->first(); cp != 0; cp = packageLoc->next()) { + for (cp = packageLoc->first(); cp; cp = packageLoc->next()) { if (cp->cacheFile == "SLACK_0_0") { // already done } else if ( !cp->base.isEmpty() ) { @@ -307,7 +307,7 @@ void SLACK::listPackList(TQPtrList *pki, const TQString &s, cacheO packageInfo *SLACK::getPackageInfo(char mode, const TQString &name, const TQString &) { char linebuf[1024]; - packageInfo *pki = 0; + packageInfo *pki = nullptr; TQString vb, search, fn; TQString n,v; FILE *file; @@ -477,7 +477,7 @@ packageInfo *SLACK::collectInfo(const char *_inp, int insState) delete [] inp; if (a["name"].isEmpty()) { - return 0; + return nullptr; } else { packageInfo *i = new packageInfo(a,this); i->packageState = packageInfo::INSTALLED; @@ -490,7 +490,7 @@ packageInfo *SLACK::collectInfo(const char *_inp, int insState) ////////////////////////////////////////////////////////////////////////////// TQStringList SLACK::getChangeLog(packageInfo *) { - return 0; + return nullptr; } bool SLACK::filesTab(packageInfo *) { @@ -585,7 +585,7 @@ TQString SLACK::install(int installFlags, TQPtrList *plist, bool &t packageInfo *pk; int i = 0; TQString packs = ""; - for (pk = plist->first(); pk != 0; pk = plist->next()) { + for (pk = plist->first(); pk; pk = plist->next()) { TQString fname = pk->fetchFilename(); if ( !fname.isEmpty() ) { packs += fname + " "; diff --git a/kpackage/tdeio.cpp b/kpackage/tdeio.cpp index 50ef5cf..386ddf7 100644 --- a/kpackage/tdeio.cpp +++ b/kpackage/tdeio.cpp @@ -51,8 +51,8 @@ void Kio::slotIOJobFinished( TDEIO::Job * job) Kiod::Kiod() { - file=0L; - fileT = 0L; + file=nullptr; + fileT = nullptr; } Kiod::~Kiod() diff --git a/kpackage/updateLoc.cpp b/kpackage/updateLoc.cpp index 2cdbc30..e932457 100644 --- a/kpackage/updateLoc.cpp +++ b/kpackage/updateLoc.cpp @@ -44,7 +44,7 @@ apanel::apanel( TQWidget *parent, const char * name ) : TQWidget( parent, name ) { - puse = 0; + puse = nullptr; pack = new TQHBoxLayout(this); { @@ -102,8 +102,8 @@ void apanel::clear() dpanel::dpanel( TQWidget *parent, const char * name ) : TQWidget( parent, name ) { - puse = 0; - psubdirs = 0; + puse = nullptr; + psubdirs = nullptr; pack = new TQHBoxLayout(this); { @@ -124,8 +124,8 @@ dpanel::dpanel(dpanel *basep, const TQString &Pfilter, bool bsubdirs, : TQWidget( parent, name ) { filter = Pfilter; - puse = 0; - psubdirs = 0; + puse = nullptr; + psubdirs = nullptr; base = basep; @@ -221,7 +221,7 @@ void dpanel::fileOpen() } KURL url = KFileDialog::getOpenURL - (st, filter, 0, i18n("Package File")); + (st, filter, nullptr, i18n("Package File")); if( url.isEmpty() ) return; @@ -240,7 +240,7 @@ void dpanel::dirOpen() } KURL url = KFileDialog::getExistingURL - (st, 0, i18n("Package Archive")); + (st, nullptr, i18n("Package Archive")); if( url.isEmpty() ) @@ -268,7 +268,7 @@ updateLoc::~updateLoc() void updateLoc::doBase(const TQString & bmsg) { - base = 0; + base = nullptr; if (haveBase) { fbase = new TQGroupBox(bmsg, this); fbase->setColumnLayout(0, TQt::Vertical ); @@ -295,7 +295,7 @@ aUpdateLoc::aUpdateLoc(TQWidget *p, int panelNumber, pkgInterface *inter, const else numLines = numberLines; - ap[0] = 0; + ap[0] = nullptr; TQGroupBox *floc = new TQGroupBox(1,TQt::Vertical, label, this); vf->addWidget(floc,1); @@ -391,7 +391,7 @@ pdUpdateLoc::pdUpdateLoc(TQWidget *p, int panelNumber, pkgInterface *inter, cons haveBase = !bmsg.isNull(); - dp[0] = 0; + dp[0] = nullptr; TQString pn; pn.setNum(panNumber); @@ -524,7 +524,7 @@ cUpdateLoc::cUpdateLoc(TQWidget *p, int panelNumber, pkgInterface *inter, const haveBase = !baseMsg.isNull(); - combo[0] = 0; + combo[0] = nullptr; TQString pn; pn.setNum(panNumber); @@ -643,7 +643,7 @@ void cUpdateLoc::writeSettings() ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// Locations::Locations(const TQString &msg) - : KDialogBase(Tabbed, msg, Ok | Cancel, Ok, 0, "Locations", false) + : KDialogBase(Tabbed, msg, Ok | Cancel, Ok, nullptr, "Locations", false) { numPanels = 0; diff --git a/kpackage/updateLoc.h b/kpackage/updateLoc.h index ddea958..3ddd620 100644 --- a/kpackage/updateLoc.h +++ b/kpackage/updateLoc.h @@ -63,9 +63,9 @@ class dpanel : public TQWidget public: - dpanel(TQWidget *parent, const char * name = 0); + dpanel(TQWidget *parent, const char * name = nullptr); dpanel(dpanel *basep, const TQString &Pfilter, bool bsubdirs, - TQWidget *parent, const char * name = 0); + TQWidget *parent, const char * name = nullptr); ~dpanel(); @@ -101,7 +101,7 @@ class apanel : public TQWidget public: - apanel( TQWidget *parent, const char * name = 0 ); + apanel( TQWidget *parent, const char * name = nullptr ); ~apanel(); @@ -207,7 +207,7 @@ public: pdUpdateLoc (TQWidget *p, int panelNumber, pkgInterface *inter, const TQString &iname, int numberLines, const TQString &filter, - const TQString &lmsg, TQString bmsg = 0, + const TQString &lmsg, TQString bmsg = nullptr, bool subdirs = false); ~pdUpdateLoc(); @@ -299,7 +299,7 @@ public: void pLocations(int numberDirs, int numberLines, pkgInterface *inter, const TQString &iname, const TQString &label, const TQString &filter, - const TQString &packMsg, TQString baseMsg = 0, + const TQString &packMsg, TQString baseMsg = nullptr, bool subdirs=false); void cLocations(int numberDirs, int numberLines, diff --git a/ksysv/OldView.cpp b/ksysv/OldView.cpp index 7fa7baa..43ee0ce 100644 --- a/ksysv/OldView.cpp +++ b/ksysv/OldView.cpp @@ -77,9 +77,9 @@ KSVContent::KSVContent (TDEPopupMenu* openWithMenu, KSVTopLevel* parent, const c startRL (new KSVDragList*[ksv::runlevelNumber]), stopRL (new KSVDragList*[ksv::runlevelNumber]), conf(KSVConfig::self()), - mScriptBox (0L), + mScriptBox (nullptr), mRunlevels (new TQVBox*[ksv::runlevelNumber]), - mOrigin (0L), + mOrigin (nullptr), mOpenWithMenu (openWithMenu), m_buffer( TQCString() ) { setOpaqueResize( TDEGlobalSettings::opaqueResize() ); @@ -482,7 +482,7 @@ void KSVContent::slotWriteSysV() clearRL(i); // rm changed/deleted entries // process "Start" - KSVItem* item = 0L; + KSVItem* item = nullptr; for (TQListViewItemIterator it (startRL[i]); (item = static_cast (it.current())); ++it) @@ -529,7 +529,7 @@ void KSVContent::clearRL(int _rl) TQDir dir (path); - KSVData* d = 0L; + KSVData* d = nullptr; for (TQPtrListIterator it (startRL[_rl]->getDeletedItems()); (d = it.current()); @@ -858,7 +858,7 @@ void KSVContent::pasteAppend() if (KSVDrag::decodeNative (tdeApp->clipboard()->data(), data)) { - KSVAction* action = 0L; + KSVAction* action = nullptr; if (list->insert (data, list->lastItem(), action)) { @@ -909,7 +909,7 @@ void KSVContent::multiplexEnabled (bool val) if (list) { list->clearSelection(); - list->setCurrentItem (0L); + list->setCurrentItem (nullptr); } @@ -924,7 +924,7 @@ void KSVContent::multiplexEnabled (bool val) if (!val) { - mOrigin = 0L; + mOrigin = nullptr; emit newOrigin (); KSVConfig *config = KSVConfig::self(); diff --git a/ksysv/OldView.h b/ksysv/OldView.h index 617eb88..d2487c6 100644 --- a/ksysv/OldView.h +++ b/ksysv/OldView.h @@ -50,7 +50,7 @@ class KSVContent : public TQSplitter public: - KSVContent (TDEPopupMenu* openWithMenu, KSVTopLevel* parent = 0, const char* name = 0); + KSVContent (TDEPopupMenu* openWithMenu, KSVTopLevel* parent = nullptr, const char* name = nullptr); ~KSVContent(); KSVDragList* getOrigin(); diff --git a/ksysv/RunlevelAuthIcon.h b/ksysv/RunlevelAuthIcon.h index 323fef4..109741a 100644 --- a/ksysv/RunlevelAuthIcon.h +++ b/ksysv/RunlevelAuthIcon.h @@ -15,7 +15,7 @@ class RunlevelAuthIcon : public KAuthIcon public: RunlevelAuthIcon (const TQString& scriptPath, const TQString& runlevelPath, - TQWidget* parent = 0L, const char* name = 0L); + TQWidget* parent = nullptr, const char* name = nullptr); virtual ~RunlevelAuthIcon (); diff --git a/ksysv/ServiceDlg.h b/ksysv/ServiceDlg.h index 2c1f622..0e3b3e9 100644 --- a/ksysv/ServiceDlg.h +++ b/ksysv/ServiceDlg.h @@ -30,7 +30,7 @@ class ServiceDlg : public KDialogBase public: ServiceDlg (const TQString& action, const TQString& label, - TQWidget* parent = 0, const char* name = 0); + TQWidget* parent = nullptr, const char* name = nullptr); virtual ~ServiceDlg(); int count() const; diff --git a/ksysv/SpinBox.h b/ksysv/SpinBox.h index 55aae77..c815f9e 100644 --- a/ksysv/SpinBox.h +++ b/ksysv/SpinBox.h @@ -13,7 +13,7 @@ class KSVSpinBox : public TQSpinBox, public TDECompletionBase public: - KSVSpinBox (TQWidget* parent, const char* name = 0L); + KSVSpinBox (TQWidget* parent, const char* name = nullptr); virtual ~KSVSpinBox (); virtual bool eventFilter (TQObject*, TQEvent*); diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp index 43f043a..748ce0f 100644 --- a/ksysv/TopWidget.cpp +++ b/ksysv/TopWidget.cpp @@ -95,23 +95,23 @@ namespace Status } // namespace Status KSVTopLevel::KSVTopLevel() - : TDEMainWindow(0, 0L, WStyle_ContextHelp|WDestructiveClose), + : TDEMainWindow(nullptr, nullptr, WStyle_ContextHelp|WDestructiveClose), mConfig(KSVConfig::self()), - mView (0L), - mPreferences (0L), + mView (nullptr), + mPreferences (nullptr), - mEditUndo (0L), mEditCut (0L), mEditCopy (0L), mEditPaste (0L), - mEditProperties (0L), + mEditUndo (nullptr), mEditCut (nullptr), mEditCopy (nullptr), mEditPaste (nullptr), + mEditProperties (nullptr), - mFileRevert (0L), mFileLoad (0L), mFilePrint (0L), mFilePrintLog (0L), - mFileSave (0L), mFileSaveAs (0L), mFileSaveLog(0L), mFileQuit (0L), + mFileRevert (nullptr), mFileLoad (nullptr), mFilePrint (nullptr), mFilePrintLog (nullptr), + mFileSave (nullptr), mFileSaveAs (nullptr), mFileSaveLog(nullptr), mFileQuit (nullptr), - mToolsStartService (0L), mToolsStopService (0L), - mToolsRestartService (0L), mToolsEditService (0L), + mToolsStartService (nullptr), mToolsStopService (nullptr), + mToolsRestartService (nullptr), mToolsEditService (nullptr), - mOptionsToggleLog (0L), + mOptionsToggleLog (nullptr), - mOpenWith (0L), mOpenDefault (0L), + mOpenWith (nullptr), mOpenDefault (nullptr), mUndoList (new ActionList (this, "UndoList")), mRedoList (new ActionList (this, "RedoList")), @@ -507,7 +507,7 @@ void KSVTopLevel::editCut() { if (list && list->currentItem()) { - KSVDrag* mime = new KSVDrag (*list->currentItem()->data(), 0L, 0L); + KSVDrag* mime = new KSVDrag (*list->currentItem()->data(), nullptr, nullptr); tdeApp->clipboard()->setData (mime); KSVData data = *list->currentItem()->data(); @@ -524,7 +524,7 @@ void KSVTopLevel::editCopy() if (list) { - KSVDrag* mime = new KSVDrag (*static_cast (list->currentItem()), 0L, 0L); + KSVDrag* mime = new KSVDrag (*static_cast (list->currentItem()), nullptr, nullptr); tdeApp->clipboard()->setData (mime); } } @@ -539,7 +539,7 @@ void KSVTopLevel::editPaste() if (KSVDrag::decodeNative (tdeApp->clipboard()->data(), data)) { - KSVAction* action = 0L; + KSVAction* action = nullptr; if (list->insert (data, list->currentItem(), action)) { @@ -771,7 +771,7 @@ void KSVTopLevel::printLog() rheading.setWidth (&p, width); int tmp_h = rheading.height(); TQRegion region (0, y, width, tmp_h); - rheading.draw (&p, 0, y, region, colorGroup(), 0L); + rheading.draw (&p, 0, y, region, colorGroup(), nullptr); y += tmp_h; @@ -781,7 +781,7 @@ void KSVTopLevel::printLog() rdate.setWidth (&p, width); tmp_h = rdate.height(); TQRegion r2 (0, y, width, tmp_h); - rdate.draw (&p, 0, y, r2, colorGroup(), 0L); + rdate.draw (&p, 0, y, r2, colorGroup(), nullptr); y += tmp_h; } @@ -799,7 +799,7 @@ void KSVTopLevel::printLog() break; TQRegion region (0, y, width, tmp_h); - rich.draw (&p, 0, y, region, colorGroup(), 0L); + rich.draw (&p, 0, y, region, colorGroup(), nullptr); y += tmp_h; ++line; @@ -924,7 +924,7 @@ void KSVTopLevel::slotSaveLog() { static const TQString& filter = ksv::logFileFilter(); static const TQString& ext = ksv::logFileExtension(); - TQString filename = KFileDialog::getSaveFileName(0L, filter, this); + TQString filename = KFileDialog::getSaveFileName(nullptr, filter, this); if (filename.isEmpty()) return; @@ -1036,7 +1036,7 @@ void KSVTopLevel::saveAs () { static const TQString& filter = ksv::nativeFileFilter(); static const TQString& ext = ksv::nativeFileExtension(); - TQString filename = KFileDialog::getSaveFileName(0L, filter, this); + TQString filename = KFileDialog::getSaveFileName(nullptr, filter, this); if (filename.isEmpty()) return; @@ -1067,7 +1067,7 @@ void KSVTopLevel::saveAs () void KSVTopLevel::load () { static const TQString& filter = ksv::nativeFileFilter(); - TQString filename = KFileDialog::getOpenFileName(0L, filter, this); + TQString filename = KFileDialog::getOpenFileName(nullptr, filter, this); if (filename.isEmpty()) return; diff --git a/ksysv/kdltooltip.h b/ksysv/kdltooltip.h index a1b45b4..693549f 100644 --- a/ksysv/kdltooltip.h +++ b/ksysv/kdltooltip.h @@ -26,7 +26,7 @@ class KSVDragList; class KDLToolTip : public TQToolTip { public: - KDLToolTip (KSVDragList *parent, TQToolTipGroup* group = 0L); + KDLToolTip (KSVDragList *parent, TQToolTipGroup* group = nullptr); virtual ~KDLToolTip(); protected: diff --git a/ksysv/kscroller.cpp b/ksysv/kscroller.cpp index 013cb07..0a727d5 100644 --- a/ksysv/kscroller.cpp +++ b/ksysv/kscroller.cpp @@ -14,7 +14,7 @@ class KScroller::KScrollerPrivate { public: KScrollerPrivate () - : setCornerWidget (0L) + : setCornerWidget (nullptr) { } @@ -29,7 +29,7 @@ KScroller::KScroller (TQWidget* parent, const char* name) mVertical (new TQScrollBar (TQt::Vertical, this)), mHorizontal (new TQScrollBar (TQt::Horizontal, this)), mCornerWidget (new TQWidget (this)), - mContent (0L), + mContent (nullptr), mVerticalOld (0), mHorizontalOld (0) { @@ -88,7 +88,7 @@ TQSize KScroller::minimumSizeHint() const TQSize KScroller::sizeHint() const { TQSize size = mContent->minimumSize(); - int extra = tdeApp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); + int extra = tdeApp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, nullptr ); size += TQSize( extra, extra ); return size; } @@ -113,7 +113,7 @@ void KScroller::setupHorizontal (int cw, int, int w, int h) if (cw > w) { - int extra = tdeApp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); + int extra = tdeApp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, nullptr ); if (!mVertical->isHidden()) w -= extra; @@ -139,7 +139,7 @@ void KScroller::setupVertical (int, int ch, int w, int h) if (ch > h) { - int extra = tdeApp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); + int extra = tdeApp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, nullptr ); mVertical->setRange (0, ch - h); mVertical->setPageStep (h); mVertical->setLineStep (25); @@ -175,7 +175,7 @@ void KScroller::setupCornerWidget (int w, int h) { if (!mVertical->isHidden() && !mHorizontal->isHidden()) { - int extra = tdeApp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); + int extra = tdeApp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, nullptr ); mCornerWidget->raise(); mCornerWidget->setGeometry (w - extra, h - extra, extra, extra); diff --git a/ksysv/kscroller.h b/ksysv/kscroller.h index bc59b69..0c308d2 100644 --- a/ksysv/kscroller.h +++ b/ksysv/kscroller.h @@ -25,7 +25,7 @@ public: * @param parent the parent of this widget (passed on as ususal). * @param name the name of this widget (as above). */ - KScroller (TQWidget* parent = 0L, const char* name = 0L); + KScroller (TQWidget* parent = nullptr, const char* name = nullptr); /** * Destructor. diff --git a/ksysv/ksv_core.cpp b/ksysv/ksv_core.cpp index 3268bb4..6206e38 100644 --- a/ksysv/ksv_core.cpp +++ b/ksysv/ksv_core.cpp @@ -27,7 +27,7 @@ #include "ksv_core.h" const int ksv::runlevelNumber = 7; -TDEAboutData* ksv::about = 0L; +TDEAboutData* ksv::about = nullptr; bool ksv::getServiceDescription (const TQString& path, TQString& res) { diff --git a/ksysv/ksv_service.cpp b/ksysv/ksv_service.cpp index 0aa8ffb..0372eb3 100644 --- a/ksysv/ksv_service.cpp +++ b/ksysv/ksv_service.cpp @@ -40,7 +40,7 @@ KSVService* KSVService::newService (const TQString &name, const TQString &basedi } else { - return 0L; + return nullptr; } } diff --git a/ksysv/ksvconfigwizard.h b/ksysv/ksvconfigwizard.h index fbba75c..848c2c7 100644 --- a/ksysv/ksvconfigwizard.h +++ b/ksysv/ksvconfigwizard.h @@ -35,7 +35,7 @@ class KSVConfigWizard : public ConfigWizard public: - KSVConfigWizard( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); + KSVConfigWizard( TQWidget* parent = nullptr, const char* name = nullptr, bool modal = false, WFlags fl = 0 ); ~KSVConfigWizard(); public: diff --git a/ksysv/ksvdrag.cpp b/ksysv/ksvdrag.cpp index 7d94536..a412f9d 100644 --- a/ksysv/ksvdrag.cpp +++ b/ksysv/ksvdrag.cpp @@ -61,7 +61,7 @@ const char* KSVDrag::format (int i) const break; default: - return 0L; + return nullptr; } } diff --git a/ksysv/ksvdrag.h b/ksysv/ksvdrag.h index ac2c368..5527a4b 100644 --- a/ksysv/ksvdrag.h +++ b/ksysv/ksvdrag.h @@ -15,8 +15,8 @@ class KSVDrag : public TQDragObject public: - KSVDrag (const KSVData& item, TQWidget* dragSource = 0L, const char* name = 0L); - KSVDrag (const KSVItem& item, TQWidget* dragSource = 0L, const char* name = 0L); + KSVDrag (const KSVData& item, TQWidget* dragSource = nullptr, const char* name = nullptr); + KSVDrag (const KSVItem& item, TQWidget* dragSource = nullptr, const char* name = nullptr); virtual ~KSVDrag(); virtual const char* format (int i) const; diff --git a/ksysv/ksvdraglist.cpp b/ksysv/ksvdraglist.cpp index 0168aae..727ca91 100644 --- a/ksysv/ksvdraglist.cpp +++ b/ksysv/ksvdraglist.cpp @@ -311,7 +311,7 @@ void KSVItem::setOriginalRunlevel (const TQString& rl) KSVDragList::KSVDragList ( TQWidget* parent, const char* name ) : TDEListView (parent, name), - mItemToDrag (0L), + mItemToDrag (nullptr), mDragMenu (new TDEPopupMenu (this)), mDragCopyMenu (new TDEPopupMenu (this)), mDragMoveMenu (new TDEPopupMenu (this)), @@ -496,7 +496,7 @@ void KSVDragList::setChangedSelectedColor (const TQColor& col) KSVItem* KSVDragList::match (const KSVData& data) { - KSVItem* res = 0L; + KSVItem* res = nullptr; for (TQListViewItemIterator it (this); (res = static_cast (it.current())); @@ -505,7 +505,7 @@ KSVItem* KSVDragList::match (const KSVData& data) if (*res->data() == data) break; else - res = 0L; + res = nullptr; } return res; @@ -546,7 +546,7 @@ TQDragObject* KSVDragList::dragObject () return new KSVDrag (*mItemToDrag, this); } else - return 0L; + return nullptr; } bool KSVDragList::acceptDrag (TQDropEvent* e) const @@ -573,7 +573,7 @@ void KSVDragList::clearRMList() bool KSVDragList::removeFromRMList (const KSVData& item) { - KSVData* res = 0L; + KSVData* res = nullptr; for (TQPtrListIterator it (mRMList); it.current(); @@ -584,7 +584,7 @@ bool KSVDragList::removeFromRMList (const KSVData& item) if (*res == item) break; else - res = 0L; + res = nullptr; } if (res) @@ -615,24 +615,24 @@ bool KSVDragList::insert (const KSVData& data, const KSVData* above, const KSVDa bool KSVDragList::insert (const KSVData& data, const KSVItem* where, KSVAction*& action) { - const KSVData* above = 0L; - const KSVData* below = 0L; + const KSVData* above = nullptr; + const KSVData* below = nullptr; if (where) { above = where->data(); KSVItem* tmp = static_cast (where->nextSibling()); - below = tmp ? tmp->data() : 0L; + below = tmp ? tmp->data() : nullptr; } else { KSVItem* tmp = static_cast (firstChild()); - below = tmp ? tmp->data() : 0L; + below = tmp ? tmp->data() : nullptr; } bool success = false; KSVItem* exists = match (data); - action = 0L; + action = nullptr; if (exists) { @@ -670,7 +670,7 @@ void KSVDragList::drop (TQDropEvent* e, TQListViewItem* after) { KSVData data; KSVDragList* source = static_cast (e->source()); - TQPopupMenu* menu = 0L; + TQPopupMenu* menu = nullptr; // hack to empty the cursor stack after DND TQApplication::restoreOverrideCursor(); @@ -698,7 +698,7 @@ void KSVDragList::drop (TQDropEvent* e, TQListViewItem* after) const bool move = res == Move; KSVItem* tmp = static_cast (after); - KSVAction* action = 0L; + KSVAction* action = nullptr; if (insert (data, tmp, action)) { if (move && source != this) @@ -718,7 +718,7 @@ void KSVDragList::drop (TQDropEvent* e, TQListViewItem* after) bool KSVDragList::addToRMList (const KSVData& item) { - KSVData* res = 0L; + KSVData* res = nullptr; for (TQPtrListIterator it (mRMList); it.current(); @@ -729,7 +729,7 @@ bool KSVDragList::addToRMList (const KSVData& item) if (*res == item) break; else - res = 0L; + res = nullptr; } if (!res) diff --git a/ksysv/ksvdraglist.h b/ksysv/ksvdraglist.h index 842c685..04a7386 100644 --- a/ksysv/ksvdraglist.h +++ b/ksysv/ksvdraglist.h @@ -155,7 +155,7 @@ class KSVDragList : public TDEListView public: - KSVDragList ( TQWidget* parent = 0, const char* name = 0 ); + KSVDragList ( TQWidget* parent = nullptr, const char* name = nullptr ); virtual ~KSVDragList(); virtual void clear(); @@ -182,7 +182,7 @@ public: /** * @return true if the insertion was successful. */ - bool insert (const KSVData& data, const KSVData* above = 0L, const KSVData* below = 0L); + bool insert (const KSVData& data, const KSVData* above = nullptr, const KSVData* below = nullptr); bool insert (const KSVData& data, const KSVItem* where, KSVAction*& action); @@ -268,7 +268,7 @@ signals: class KServiceDragList : public KSVDragList { public: - KServiceDragList (TQWidget* parent = 0L, const char* name = 0L); + KServiceDragList (TQWidget* parent = nullptr, const char* name = nullptr); virtual ~KServiceDragList (); protected: diff --git a/ksysv/ksvlookandfeel.h b/ksysv/ksvlookandfeel.h index fc1e32a..003934c 100644 --- a/ksysv/ksvlookandfeel.h +++ b/ksysv/ksvlookandfeel.h @@ -15,7 +15,7 @@ class KSVLookAndFeel : public LookAndFeel public: - KSVLookAndFeel( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + KSVLookAndFeel( TQWidget* parent = nullptr, const char* name = nullptr, WFlags fl = 0 ); ~KSVLookAndFeel(); inline const TQFont& serviceFont() const { return mServiceFont; } diff --git a/ksysv/ksvmiscconfig.h b/ksysv/ksvmiscconfig.h index a11dbbd..bcc134c 100644 --- a/ksysv/ksvmiscconfig.h +++ b/ksysv/ksvmiscconfig.h @@ -33,7 +33,7 @@ class KSVMiscConfig : public MiscConfiguration public: - KSVMiscConfig( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + KSVMiscConfig( TQWidget* parent = nullptr, const char* name = nullptr, WFlags fl = 0 ); ~KSVMiscConfig(); signals: diff --git a/ksysv/ksvpathconfig.h b/ksysv/ksvpathconfig.h index 8ae2c34..23d2e26 100644 --- a/ksysv/ksvpathconfig.h +++ b/ksysv/ksvpathconfig.h @@ -33,7 +33,7 @@ class KSVPathConfig : public PathConfiguration public: - KSVPathConfig( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + KSVPathConfig( TQWidget* parent = nullptr, const char* name = nullptr, WFlags fl = 0 ); ~KSVPathConfig(); signals: diff --git a/ksysv/main.cpp b/ksysv/main.cpp index d1b87d9..159b957 100644 --- a/ksysv/main.cpp +++ b/ksysv/main.cpp @@ -83,7 +83,7 @@ int main( int argc, char **argv ) { KSVConfig* conf = KSVConfig::self(); if (!conf->isConfigured()) { - KSVConfigWizard* w = new KSVConfigWizard(0, "ConfigWizard", true); + KSVConfigWizard* w = new KSVConfigWizard(nullptr, "ConfigWizard", true); w->exec(); conf->setConfigured(true); diff --git a/ksysv/trash.h b/ksysv/trash.h index da6423a..a28d876 100644 --- a/ksysv/trash.h +++ b/ksysv/trash.h @@ -31,7 +31,7 @@ class KSVTrash : public TQFrame public: - KSVTrash (TQWidget* parent = 0, const char* name = 0); + KSVTrash (TQWidget* parent = nullptr, const char* name = nullptr); virtual ~KSVTrash(); virtual TQSize sizeHint() const; diff --git a/kuser/addUser.cpp b/kuser/addUser.cpp index ed154d5..1f141a9 100644 --- a/kuser/addUser.cpp +++ b/kuser/addUser.cpp @@ -65,14 +65,14 @@ void addUser::slotOk() if ( ( user->getCaps() & KU::KUser::Cap_POSIX ) && kug->getUsers().lookup( user->getUID() ) ) { - KMessageBox::sorry( 0, i18n("User with UID %1 already exists.").arg( user->getUID() ) ); + KMessageBox::sorry( nullptr, i18n("User with UID %1 already exists.").arg( user->getUID() ) ); return; } if ( ( kug->getUsers().getCaps() & KU::KUsers::Cap_Samba ) && ( user->getCaps() & KU::KUser::Cap_Samba ) ) { if ( kug->getUsers().lookup_sam( user->getSID().getRID() ) ) { - KMessageBox::sorry( 0, i18n("User with RID %1 already exists.").arg( user->getSID().getRID() ) ); + KMessageBox::sorry( nullptr, i18n("User with RID %1 already exists.").arg( user->getSID().getRID() ) ); return; } } @@ -113,7 +113,7 @@ bool addUser::checkHome() if (r == 0) { if (S_ISDIR(s.st_mode)) { if ( KMessageBox:: - warningContinueCancel ( 0, + warningContinueCancel ( nullptr, i18n("Folder %1 already exists!\n%2 may become owner and permissions may change.\nDo you really want to use %3?"). arg(h_dir).arg(user->getName()).arg(h_dir), TQString(), KStdGuiItem::cont() ) == KMessageBox::Cancel ) @@ -121,9 +121,9 @@ bool addUser::checkHome() else return true; } else - KMessageBox::error( 0, i18n("%1 is not a folder.").arg(h_dir) ); + KMessageBox::error( nullptr, i18n("%1 is not a folder.").arg(h_dir) ); } else - KMessageBox::error( 0, i18n("stat() failed on %1.").arg(h_dir) ); + KMessageBox::error( nullptr, i18n("stat() failed on %1.").arg(h_dir) ); return false; } @@ -144,14 +144,14 @@ bool addUser::checkMailBox() if (r == 0) if (S_ISREG(s.st_mode)) - KMessageBox::error( 0, i18n("Mailbox %1 already exists (uid=%2).") + KMessageBox::error( nullptr, i18n("Mailbox %1 already exists (uid=%2).") .arg(mailboxpath) .arg(s.st_uid) ); else - KMessageBox::error( 0, i18n("%1 exists but is not a regular file.") + KMessageBox::error( nullptr, i18n("%1 exists but is not a regular file.") .arg(mailboxpath) ); else - KMessageBox::error( 0, i18n("stat() failed on %1.").arg(mailboxpath) ); + KMessageBox::error( nullptr, i18n("stat() failed on %1.").arg(mailboxpath) ); return false; } diff --git a/kuser/addUser.h b/kuser/addUser.h index 181d598..2fb2b41 100644 --- a/kuser/addUser.h +++ b/kuser/addUser.h @@ -29,7 +29,7 @@ class addUser: public propdlg { public: addUser(KU::KUser *AUser, bool useprivategroup, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *parent = nullptr, const char *name = nullptr ); void setCreateHomeDir(bool b) { createhome->setChecked(b); } diff --git a/kuser/delUser.h b/kuser/delUser.h index 37f2ded..cec23c1 100644 --- a/kuser/delUser.h +++ b/kuser/delUser.h @@ -29,7 +29,7 @@ class delUser: public KDialogBase { TQ_OBJECT public: - delUser(KU::KUser *AUser, TQWidget *parent = 0, const char *name = 0); + delUser(KU::KUser *AUser, TQWidget *parent = nullptr, const char *name = nullptr); bool getDeleteHomeDir() { return m_deleteHomeDir->isChecked(); } diff --git a/kuser/editDefaults.cpp b/kuser/editDefaults.cpp index 37e2a63..c93107f 100644 --- a/kuser/editDefaults.cpp +++ b/kuser/editDefaults.cpp @@ -112,7 +112,7 @@ void editDefaults::slotQueryClicked() connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( loadResult( TDEIO::Job* ) ) ); - mProg = new KProgressDialog( this, 0, i18n("LDAP Query"), _url.prettyURL(), true ); + mProg = new KProgressDialog( this, nullptr, i18n("LDAP Query"), _url.prettyURL(), true ); mProg->progressBar()->setValue( 0 ); mProg->progressBar()->setTotalSteps( 1 ); mProg->exec(); diff --git a/kuser/editDefaults.h b/kuser/editDefaults.h index 95c4c54..3ff3c22 100644 --- a/kuser/editDefaults.h +++ b/kuser/editDefaults.h @@ -41,7 +41,7 @@ class editDefaults : public TDEConfigDialog { TQ_OBJECT public: - editDefaults( TDEConfigSkeleton *config, TQWidget* parent, const char * name = 0 ); + editDefaults( TDEConfigSkeleton *config, TQWidget* parent, const char * name = nullptr ); private: KProgressDialog *mProg; LdapSamba *page3c; diff --git a/kuser/editGroup.cpp b/kuser/editGroup.cpp index c5de11e..192f374 100644 --- a/kuser/editGroup.cpp +++ b/kuser/editGroup.cpp @@ -265,7 +265,7 @@ void editGroup::slotOk() } if ( legrpname->text().isEmpty() ) { - KMessageBox::sorry( 0, + KMessageBox::sorry( nullptr, i18n("You need to type a group name.") ); return; } @@ -273,19 +273,19 @@ void editGroup::slotOk() if ( legrpname->text() != mOldName && kug->getGroups().lookup( legrpname->text() ) ) { - KMessageBox::sorry( 0, + KMessageBox::sorry( nullptr, i18n("Group with name %1 already exists.").arg(legrpname->text()) ); return; } if ( mAdd ) { if ( mSamba && !cbsamba->isChecked() && kug->getGroups().lookup_sam( sid ) ) { - KMessageBox::sorry( 0, + KMessageBox::sorry( nullptr, i18n("Group with SID %1 already exists.").arg( sid.getSID() ) ); return; } if (kug->getGroups().lookup(s.toInt())) { - KMessageBox::sorry( 0, + KMessageBox::sorry( nullptr, i18n("Group with gid %1 already exists.").arg(s.toInt()) ); return; } diff --git a/kuser/kgroup.cpp b/kuser/kgroup.cpp index 1e8e719..03123a0 100644 --- a/kuser/kgroup.cpp +++ b/kuser/kgroup.cpp @@ -183,7 +183,7 @@ KU::KGroup *KU::KGroups::lookup(const TQString &name) KU::KGroup *group; TQPtrListIterator it( mGroups ); - while ( (group = it.current()) != 0 && group->getName() != name ) ++it; + while ( (group = it.current()) != nullptr && group->getName() != name ) ++it; return group; } @@ -192,7 +192,7 @@ KU::KGroup *KU::KGroups::lookup(gid_t gid) KU::KGroup *group; TQPtrListIterator it( mGroups ); - while ( (group = it.current()) != 0 && group->getGID() != gid ) ++it; + while ( (group = it.current()) != nullptr && group->getGID() != gid ) ++it; return group; } @@ -201,7 +201,7 @@ KU::KGroup *KU::KGroups::lookup_sam( const SID &sid ) KU::KGroup *group; TQPtrListIterator it( mGroups ); - while ( (group = it.current()) != 0 && group->getSID() != sid ) ++it; + while ( (group = it.current()) != nullptr && group->getSID() != sid ) ++it; return group; } @@ -210,7 +210,7 @@ KU::KGroup *KU::KGroups::lookup_sam( const TQString &sid ) KU::KGroup *group; TQPtrListIterator it( mGroups ); - while ( (group = it.current()) != 0 && group->getSID().getSID() != sid ) ++it; + while ( (group = it.current()) != nullptr && group->getSID().getSID() != sid ) ++it; return group; } @@ -219,7 +219,7 @@ KU::KGroup *KU::KGroups::lookup_sam( uint rid ) KU::KGroup *group; TQPtrListIterator it( mGroups ); - while ( (group = it.current()) != 0 && group->getSID().getRID() != rid ) ++it; + while ( (group = it.current()) != nullptr && group->getSID().getRID() != rid ) ++it; return group; } @@ -305,11 +305,11 @@ void KU::KGroups::commit() *(mit.key()) = mit.data(); mit++; } - while ( (group = dit.current()) != 0 ) { + while ((group = dit.current()) != nullptr) { ++dit; mGroups.remove( group ); } - while ( (group = ait.current()) != 0 ) { + while ((group = ait.current()) != nullptr) { ++ait; mGroups.append( group ); } diff --git a/kuser/kgroupfiles.cpp b/kuser/kgroupfiles.cpp index 0cac37c..40e60fc 100644 --- a/kuser/kgroupfiles.cpp +++ b/kuser/kgroupfiles.cpp @@ -67,7 +67,7 @@ KGroupFiles::~KGroupFiles() bool KGroupFiles::reload() { struct group *p; - KU::KGroup *tmpKG = 0; + KU::KGroup *tmpKG = nullptr; struct stat st; TQString filename; TQString group_filename; @@ -94,7 +94,7 @@ bool KGroupFiles::reload() for(int k = 0; k < MAXFILES; k++) { rc = stat(TQFile::encodeName(filename), &st); if(rc != 0) { - KMessageBox::error( 0, i18n("stat call on file %1 failed: %2\nCheck KUser settings."). + KMessageBox::error( nullptr, i18n("stat call on file %1 failed: %2\nCheck KUser settings."). arg(filename).arg(TQString::fromLatin1(strerror(errno))) ); if( (processing_file & GROUP) != 0 ) { group_errno = errno; @@ -121,7 +121,7 @@ bool KGroupFiles::reload() FILE *fgrp = fopen(TQFile::encodeName(filename), "r"); TQString tmp; if (!fgrp) { - KMessageBox::error( 0, i18n("Error opening %1 for reading.").arg(filename) ); + KMessageBox::error( nullptr, i18n("Error opening %1 for reading.").arg(filename) ); return false; } @@ -137,7 +137,7 @@ bool KGroupFiles::reload() char *u_name; int i = 0; - while ((u_name = p->gr_mem[i])!=0) { + while ((u_name = p->gr_mem[i]) != nullptr) { tmpKG->addUser(TQString::fromLocal8Bit(u_name)); i++; } @@ -233,14 +233,14 @@ bool KGroupFiles::save() if(!group_filename.isEmpty()) { if(!(group_fd = fopen(TQFile::encodeName(new_group_filename), "w"))) { - KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(new_group_filename) ); + KMessageBox::error( nullptr, i18n("Error opening %1 for writing.").arg(new_group_filename) ); return false; } } if(!gshadow_filename.isEmpty()) { if(!(gshadow_fd = fopen(TQFile::encodeName(new_gshadow_filename), "w"))) { - KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(new_gshadow_filename) ); + KMessageBox::error( nullptr, i18n("Error opening %1 for writing.").arg(new_gshadow_filename) ); if ( group_fd ) fclose ( group_fd ); return false; } @@ -248,7 +248,7 @@ bool KGroupFiles::save() if(!nisgroup_filename.isEmpty() && (nisgroup_filename != group_filename)) { if(!(nisgroup_fd = fopen(TQFile::encodeName(new_nisgroup_filename), "w"))) { - KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(new_nisgroup_filename) ); + KMessageBox::error( nullptr, i18n("Error opening %1 for writing.").arg(new_nisgroup_filename) ); if ( group_fd ) fclose ( group_fd ); if ( gshadow_fd ) fclose ( gshadow_fd ); return false; @@ -263,12 +263,12 @@ bool KGroupFiles::save() while (true) { - if ( gr == 0 ) { + if ( !gr ) { if ( addok ) break; it = TQPtrListIterator ( mAdd ); gr = (*it); addok = true; - if ( gr == 0 ) break; + if ( !gr ) break; }; if ( mDel.containsRef( gr ) ) { @@ -305,7 +305,7 @@ bool KGroupFiles::save() } tmpGe += '\n'; tmpSe += '\n'; - if( (nisgroup_fd != 0) && (mingid != 0) ) { + if(nisgroup_fd && mingid != 0) { if(mingid <= tmp_gid) { fputs(tmpGe.local8Bit(), nisgroup_fd); nis_groups_written++; @@ -315,11 +315,11 @@ bool KGroupFiles::save() } } - if( (nisgroup_fd != 0) && (mingid == 0) ) { + if(nisgroup_fd && mingid == 0) { errors_found = errors_found | NOMINGID; } - if( (nisgroup_fd == 0) && (mingid != 0) ) { + if(!nisgroup_fd && mingid != 0) { errors_found = errors_found | NONISGROUP; } @@ -354,17 +354,17 @@ bool KGroupFiles::save() } if( (errors_found & NOMINGID) != 0 ) { - KMessageBox::error( 0, i18n("Unable to process NIS group file without a minimum GID specified.\nPlease update KUser settings (File Source Settings).") ); + KMessageBox::error( nullptr, i18n("Unable to process NIS group file without a minimum GID specified.\nPlease update KUser settings (File Source Settings).") ); } if( (errors_found & NONISGROUP) != 0 ) { - KMessageBox::error( 0, i18n("Specifying NIS minimum GID requires NIS file(s).\nPlease update KUser settings (File Source Settings).") ); + KMessageBox::error( nullptr, i18n("Specifying NIS minimum GID requires NIS file(s).\nPlease update KUser settings (File Source Settings).") ); } #ifdef GRMKDB if( (nis_groups_written > 0) || (nisgroup_filename == group_filename) ) { if (system(GRMKDB) != 0) { - KMessageBox::error( 0, i18n("Unable to build NIS group databases.") ); + KMessageBox::error( nullptr, i18n("Unable to build NIS group databases.") ); return false; } } diff --git a/kuser/kgroupldap.cpp b/kuser/kgroupldap.cpp index a567831..0417484 100644 --- a/kuser/kgroupldap.cpp +++ b/kuser/kgroupldap.cpp @@ -90,9 +90,9 @@ void KGroupLDAP::result( TDEIO::Job *job ) TQString errstr = job->errorString(); if ( !errstr.isEmpty() ) { if ( ldif.isEmpty() ) - KMessageBox::error( 0, errstr ); + KMessageBox::error( nullptr, errstr ); else - KMessageBox::detailedError( 0, errstr, TQString::fromUtf8( ldif, ldif.size()-1 ) ); + KMessageBox::detailedError( nullptr, errstr, TQString::fromUtf8( ldif, ldif.size()-1 ) ); } mOk = false; } else { @@ -161,7 +161,7 @@ bool KGroupLDAP::reload() mGroup = new KU::KGroup(); mParser.startParsing(); - mProg = new KProgressDialog( 0, "", "", i18n("Loading Groups From LDAP"), true ); + mProg = new KProgressDialog( nullptr, "", "", i18n("Loading Groups From LDAP"), true ); mProg->setAutoClose( false ); mProg->progressBar()->setFormat( "" ); mProg->progressBar()->setTotalSteps( 100 ); @@ -188,10 +188,10 @@ bool KGroupLDAP::dbcommit() mModSucc.clear(); mAdd.first(); mDel.first(); - mAddGroup = 0; mDelGroup = 0; mGroup = 0; + mAddGroup = nullptr; mDelGroup = nullptr; mGroup = nullptr; ldif = ""; - mProg = new KProgressDialog( 0, "", i18n("LDAP Operation"), "", true ); + mProg = new KProgressDialog( nullptr, "", i18n("LDAP Operation"), "", true ); TDEIO::Job *job = TDEIO::put( mUrl, -1, false, false, false ); connect( job, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), this, TQ_SLOT( putData( TDEIO::Job*, TQByteArray& ) ) ); @@ -208,18 +208,18 @@ void KGroupLDAP::putData( TDEIO::Job*, TQByteArray& data ) if ( mAddGroup ) { mAddSucc.append( mAddGroup ); mAdd.remove(); - mAddGroup = 0; + mAddGroup = nullptr; } if ( mDelGroup ) { mDelSucc.append( mDelGroup ); mDel.remove(); - mDelGroup = 0; + mDelGroup = nullptr; } if ( mGroup ) { mModSucc.insert( mGroup, mit.data() ); mMod.remove( mit ); mit = mMod.begin(); - mGroup = 0; + mGroup = nullptr; } if ( (mAddGroup = mAdd.current()) ) { diff --git a/kuser/kgroupsystem.cpp b/kuser/kgroupsystem.cpp index 3177d75..a3c5c5e 100644 --- a/kuser/kgroupsystem.cpp +++ b/kuser/kgroupsystem.cpp @@ -46,7 +46,7 @@ KGroupSystem::~KGroupSystem() bool KGroupSystem::reload() { struct group *p; - KU::KGroup *tmpKG = 0; + KU::KGroup *tmpKG = nullptr; setgrent(); while ((p = getgrent()) != nullptr) { @@ -57,7 +57,7 @@ bool KGroupSystem::reload() char *u_name; int i = 0; - while ((u_name = p->gr_mem[i])!=0) { + while ((u_name = p->gr_mem[i]) != nullptr) { tmpKG->addUser(TQString::fromLocal8Bit(u_name)); i++; } diff --git a/kuser/kgroupvw.cpp b/kuser/kgroupvw.cpp index c9df471..17d87ef 100644 --- a/kuser/kgroupvw.cpp +++ b/kuser/kgroupvw.cpp @@ -137,7 +137,7 @@ void KGroupView::init() KU::KGroup *KGroupView::getCurrentGroup() { KGroupViewItem *groupItem = (KGroupViewItem *)currentItem(); - if (!groupItem) return 0; + if (!groupItem) return nullptr; return groupItem->group(); } diff --git a/kuser/kgroupvw.h b/kuser/kgroupvw.h index 33d5a7e..32e7ea3 100644 --- a/kuser/kgroupvw.h +++ b/kuser/kgroupvw.h @@ -45,7 +45,7 @@ class KGroupView : public TDEListView public: - KGroupView( TQWidget* parent = 0, const char* name = 0 ); + KGroupView( TQWidget* parent = nullptr, const char* name = nullptr ); virtual ~KGroupView(); diff --git a/kuser/kuser.cpp b/kuser/kuser.cpp index 4c5c794..56deb11 100644 --- a/kuser/kuser.cpp +++ b/kuser/kuser.cpp @@ -548,24 +548,24 @@ int KU::KUser::createHome() { if(p_dir.isNull() || p_dir.isEmpty()) { - KMessageBox::sorry( 0, i18n("Cannot create home folder for %1: it is null or empty.").arg(p_name) ); + KMessageBox::sorry( nullptr, i18n("Cannot create home folder for %1: it is null or empty.").arg(p_name) ); return(0); } if (mkdir(TQFile::encodeName(p_dir), 0700) != 0) { if (errno != EEXIST) { - KMessageBox::error( 0, i18n("Cannot create home folder %1.\nError: %2").arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) ); + KMessageBox::error( nullptr, i18n("Cannot create home folder %1.\nError: %2").arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) ); return(0); } } if (chown(TQFile::encodeName(p_dir), p_uid, p_gid) != 0) { - KMessageBox::error( 0, i18n("Cannot change owner of home folder %1.\nError: %2").arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) ); + KMessageBox::error( nullptr, i18n("Cannot change owner of home folder %1.\nError: %2").arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) ); return(1); } if (chmod(TQFile::encodeName(p_dir), KU_HOMEDIR_PERM) != 0) { - KMessageBox::error( 0, i18n("Cannot change permissions on home folder %1.\nError: %2").arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) ); + KMessageBox::error( nullptr, i18n("Cannot change permissions on home folder %1.\nError: %2").arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) ); return(1); } return(1); @@ -579,34 +579,34 @@ int KU::KUser::tryCreate(const TQString &dir) rc = stat(TQFile::encodeName(dir), &sb); if (rc == 0) { if (S_ISDIR(sb.st_mode)) { - if (KMessageBox::warningContinueCancel( 0, + if (KMessageBox::warningContinueCancel( nullptr, i18n("Folder %1 already exists!\nWill make %2 owner and change permissions.\nDo you want to continue?").arg(dir).arg(p_name), TQString(), KStdGuiItem::cont() ) == KMessageBox::Continue) { if (chown(TQFile::encodeName(dir), p_uid, p_gid) != 0) { - KMessageBox::error( 0, i18n("Cannot change owner of %1 folder.\nError: %2") .arg(dir).arg(TQString::fromLocal8Bit(strerror(errno))) ); + KMessageBox::error( nullptr, i18n("Cannot change owner of %1 folder.\nError: %2") .arg(dir).arg(TQString::fromLocal8Bit(strerror(errno))) ); } return(0); } else { - KMessageBox::information( 0, i18n("Folder %1 left 'as is'.\nVerify ownership and permissions for user %2 who may not be able to log in!").arg(dir).arg(p_name) ); + KMessageBox::information( nullptr, i18n("Folder %1 left 'as is'.\nVerify ownership and permissions for user %2 who may not be able to log in!").arg(dir).arg(p_name) ); return(-1); } } else { - KMessageBox::information( 0, i18n("%1 exists and is not a folder. User %2 will not be able to log in!").arg(dir).arg(p_name) ); + KMessageBox::information( nullptr, i18n("%1 exists and is not a folder. User %2 will not be able to log in!").arg(dir).arg(p_name) ); return(-1); } } else { if (errno == ENOENT) { if (mkdir(TQFile::encodeName(dir), 0700) != 0) { - KMessageBox::error( 0, i18n("Cannot create %1 folder.\nError: %2").arg(dir).arg(TQString::fromLocal8Bit(strerror(errno)))); + KMessageBox::error( nullptr, i18n("Cannot create %1 folder.\nError: %2").arg(dir).arg(TQString::fromLocal8Bit(strerror(errno)))); return(-1); } if (chown(TQFile::encodeName(dir), p_uid, p_gid) != 0) { - KMessageBox::error( 0, i18n("Cannot change owner of %1 folder.\nError: %2").arg(dir).arg(TQString::fromLocal8Bit(strerror(errno))) ); + KMessageBox::error( nullptr, i18n("Cannot change owner of %1 folder.\nError: %2").arg(dir).arg(TQString::fromLocal8Bit(strerror(errno))) ); } return(0); } else { - KMessageBox::error( 0, i18n("stat call on %1 failed.\nError: %2").arg(dir).arg(TQString::fromLocal8Bit(strerror(errno))) ); + KMessageBox::error( nullptr, i18n("stat call on %1 failed.\nError: %2").arg(dir).arg(TQString::fromLocal8Bit(strerror(errno))) ); return(-1); } } @@ -621,7 +621,7 @@ int KU::KUser::createMailBox() S_IRUSR|S_IWUSR)) < 0) { if (errno != EEXIST) { - KMessageBox::error( 0, i18n("Cannot create %1: %2") + KMessageBox::error( nullptr, i18n("Cannot create %1: %2") .arg(mailboxpath) .arg(TQString::fromLocal8Bit(strerror(errno))) ); return -1; @@ -631,13 +631,13 @@ int KU::KUser::createMailBox() close(fd); if (chown(TQFile::encodeName(mailboxpath), p_uid, KU_MAILBOX_GID) != 0) { - KMessageBox::error( 0, i18n("Cannot change owner on mailbox: %1\nError: %2") + KMessageBox::error( nullptr, i18n("Cannot change owner on mailbox: %1\nError: %2") .arg(mailboxpath).arg(TQString::fromLocal8Bit(strerror(errno))) ); return -1; } if (chmod(TQFile::encodeName(mailboxpath), KU_MAILBOX_PERM) != 0) { - KMessageBox::error( 0, i18n("Cannot change permissions on mailbox: %1\nError: %2") + KMessageBox::error( nullptr, i18n("Cannot change permissions on mailbox: %1\nError: %2") .arg(mailboxpath).arg(TQString::fromLocal8Bit(strerror(errno))) ); return -1; } @@ -682,7 +682,7 @@ void KU::KUser::copyDir(const TQString &srcPath, const TQString &dstPath) TQString link = info.readLink(); if (symlink(TQFile::encodeName(link),TQFile::encodeName(d.filePath(name))) != 0) { - KMessageBox::error( 0, i18n("Error creating symlink %1.\nError: %2") + KMessageBox::error( nullptr, i18n("Error creating symlink %1.\nError: %2") .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) ); } } else if ( info.isDir() ) { @@ -692,12 +692,12 @@ void KU::KUser::copyDir(const TQString &srcPath, const TQString &dstPath) copyDir(s.filePath(name), d.filePath(name)); if (chown(TQFile::encodeName(d.filePath(name)), p_uid, p_gid) != 0) { - KMessageBox::error( 0, i18n("Cannot change owner of folder %1.\nError: %2") + KMessageBox::error( nullptr, i18n("Cannot change owner of folder %1.\nError: %2") .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) ); } if (chmod(TQFile::encodeName(d.filePath(name)), mode) != 0) { - KMessageBox::error( 0, i18n("Cannot change permissions on folder %1.\nError: %2") + KMessageBox::error( nullptr, i18n("Cannot change permissions on folder %1.\nError: %2") .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) ); } @@ -707,12 +707,12 @@ void KU::KUser::copyDir(const TQString &srcPath, const TQString &dstPath) } if (chown(TQFile::encodeName(d.filePath(name)), p_uid, p_gid) != 0) { - KMessageBox::error( 0, i18n("Cannot change owner of file %1.\nError: %2") + KMessageBox::error( nullptr, i18n("Cannot change owner of file %1.\nError: %2") .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) ); } if (chmod(TQFile::encodeName(d.filePath(name)), mode) != 0) { - KMessageBox::error( 0, i18n("Cannot change permissions on file %1.\nError: %2") + KMessageBox::error( nullptr, i18n("Cannot change permissions on file %1.\nError: %2") .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) ); } } @@ -726,12 +726,12 @@ int KU::KUser::copySkel() mode_t mode; if (!s.exists()) { - KMessageBox::error( 0, i18n("Folder %1 does not exist, cannot copy skeleton for %2.").arg(s.absPath()).arg(p_name) ); + KMessageBox::error( nullptr, i18n("Folder %1 does not exist, cannot copy skeleton for %2.").arg(s.absPath()).arg(p_name) ); return (-1); } if (!d.exists()) { - KMessageBox::error( 0, i18n("Folder %1 does not exist, cannot copy skeleton.").arg(d.absPath()) ); + KMessageBox::error( nullptr, i18n("Folder %1 does not exist, cannot copy skeleton.").arg(d.absPath()) ); return (-1); } @@ -749,14 +749,14 @@ int KU::KUser::removeHome() if (!stat(TQFile::encodeName(p_dir), &sb)) if (S_ISDIR(sb.st_mode) && sb.st_uid == p_uid) { if (!TDEIO::NetAccess::del(KURL::fromPathOrURL(p_dir), nullptr)) { - KMessageBox::error( 0, i18n("Cannot remove home folder %1.\nError: %2") + KMessageBox::error( nullptr, i18n("Cannot remove home folder %1.\nError: %2") .arg(p_dir).arg(TDEIO::NetAccess::lastErrorString()) ); } } else { - KMessageBox::error( 0, i18n("Removal of home folder %1 failed (uid = %2, gid = %3).").arg(p_dir).arg(sb.st_uid).arg(sb.st_gid) ); + KMessageBox::error( nullptr, i18n("Removal of home folder %1 failed (uid = %2, gid = %3).").arg(p_dir).arg(sb.st_uid).arg(sb.st_gid) ); } else { - KMessageBox::error( 0, i18n("stat call on file %1 failed.\nError: %2") + KMessageBox::error( nullptr, i18n("stat call on file %1 failed.\nError: %2") .arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) ); } @@ -774,7 +774,7 @@ int KU::KUser::removeCrontabs() if ( access(TQFile::encodeName(file), F_OK) == 0 ) { command = TQString::fromLatin1("crontab -u %1 -r").arg(TDEProcess::quote(p_name)); if ( system(TQFile::encodeName(command)) != 0 ) { - KMessageBox::error( 0, i18n("Cannot remove crontab %1.\nError: %2") + KMessageBox::error( nullptr, i18n("Cannot remove crontab %1.\nError: %2") .arg(command).arg(TQString::fromLocal8Bit(strerror(errno))) ); } } @@ -788,7 +788,7 @@ int KU::KUser::removeMailBox() file = TQFile::decodeName(MAIL_SPOOL_DIR) + "/" + p_name; if (remove(TQFile::encodeName(file)) != 0) { - KMessageBox::error( 0, i18n("Cannot remove mailbox %1.\nError: %2") + KMessageBox::error( nullptr, i18n("Cannot remove mailbox %1.\nError: %2") .arg(file).arg(TQString::fromLocal8Bit(strerror(errno))) ); } @@ -807,7 +807,7 @@ int KU::KUser::removeProcesses() _exit(0); break; case -1: - KMessageBox::error( 0, + KMessageBox::error( nullptr, i18n("Cannot fork while trying to kill processes for uid %1.").arg(p_uid) ); break; } @@ -914,7 +914,7 @@ KU::KUser *KU::KUsers::lookup(const TQString & name) KU::KUser *user; TQPtrListIterator it( mUsers ); - while ( (user = it.current()) != 0 && user->getName() != name ) ++it; + while ( (user = it.current()) != nullptr && user->getName() != name ) ++it; return user; } @@ -923,7 +923,7 @@ KU::KUser *KU::KUsers::lookup(uid_t uid) KU::KUser *user; TQPtrListIterator it( mUsers ); - while ( (user = it.current()) != 0 && user->getUID() != uid ) ++it; + while ( (user = it.current()) != nullptr && user->getUID() != uid ) ++it; return user; } @@ -932,7 +932,7 @@ KU::KUser *KU::KUsers::lookup_sam( const SID &sid ) KU::KUser *user; TQPtrListIterator it( mUsers ); - while ( (user = it.current()) != 0 && user->getSID() != sid ) ++it; + while ( (user = it.current()) != nullptr && user->getSID() != sid ) ++it; return user; } @@ -941,7 +941,7 @@ KU::KUser *KU::KUsers::lookup_sam( const TQString &sid ) KU::KUser *user; TQPtrListIterator it( mUsers ); - while ( (user = it.current()) != 0 && user->getSID().getSID() != sid ) ++it; + while ( (user = it.current()) != nullptr && user->getSID().getSID() != sid ) ++it; return user; } @@ -950,7 +950,7 @@ KU::KUser *KU::KUsers::lookup_sam( uint rid ) KU::KUser *user; TQPtrListIterator it( mUsers ); - while ( (user = it.current()) != 0 && user->getSID().getRID() != rid ) ++it; + while ( (user = it.current()) != nullptr && user->getSID().getRID() != rid ) ++it; return user; } @@ -1025,13 +1025,13 @@ void KU::KUsers::commit() mit++; } //commit deletes - while ( (user = dit.current()) != 0 ) { + while ((user = dit.current()) != nullptr) { ++dit; doDelete( user ); mUsers.remove( user ); } //commit additions - while ( (user = ait.current()) != 0 ) { + while ((user = ait.current()) != nullptr) { ++ait; doCreate( user ); mUsers.append( user ); diff --git a/kuser/kuserfiles.cpp b/kuser/kuserfiles.cpp index 5a0233c..610495d 100644 --- a/kuser/kuserfiles.cpp +++ b/kuser/kuserfiles.cpp @@ -91,7 +91,7 @@ bool KUserFiles::reload() { bool KUserFiles::loadpwd() { passwd *p; - KU::KUser *tmpKU = 0; + KU::KUser *tmpKU = nullptr; struct stat st; TQString filename; TQString passwd_filename; @@ -115,7 +115,7 @@ bool KUserFiles::loadpwd() mCfg->setPasswdsrc( PASSWORD_FILE ); mCfg->setGroupsrc( GROUP_FILE ); passwd_filename = mCfg->passwdsrc(); - KMessageBox::error( 0, i18n("KUser sources were not configured.\nLocal passwd source set to %1\nLocal group source set to %2.").arg(mCfg->passwdsrc().arg(mCfg->groupsrc())) ); + KMessageBox::error( nullptr, i18n("KUser sources were not configured.\nLocal passwd source set to %1\nLocal group source set to %2.").arg(mCfg->passwdsrc().arg(mCfg->groupsrc())) ); } if(!passwd_filename.isEmpty()) { @@ -128,7 +128,7 @@ bool KUserFiles::loadpwd() for(int i = 0; i < MAXFILES; i++) { rc = stat(TQFile::encodeName(filename), &st); if(rc != 0) { - KMessageBox::error( 0, i18n("Stat call on file %1 failed: %2\nCheck KUser settings.").arg(filename).arg(TQString::fromLocal8Bit(strerror(errno))) ); + KMessageBox::error( nullptr, i18n("Stat call on file %1 failed: %2\nCheck KUser settings.").arg(filename).arg(TQString::fromLocal8Bit(strerror(errno))) ); if( (processing_file & P_PASSWD) != 0 ) { passwd_errno = errno; if(!nispasswd_filename.isEmpty()) { @@ -155,7 +155,7 @@ bool KUserFiles::loadpwd() #ifdef HAVE_FGETPWENT FILE *fpwd = fopen(TQFile::encodeName(filename), "r"); if(!fpwd) { - KMessageBox::error( 0, i18n("Error opening %1 for reading.").arg(filename) ); + KMessageBox::error( nullptr, i18n("Error opening %1 for reading.").arg(filename) ); return false; } @@ -184,7 +184,7 @@ bool KUserFiles::loadpwd() tmpKU->setExpire(p->pw_expire); #endif - if ((p->pw_gecos != 0) && (p->pw_gecos[0] != 0)) + if (p->pw_gecos && p->pw_gecos[0] != 0) fillGecos(tmpKU, p->pw_gecos); mUsers.append(tmpKU); } @@ -238,7 +238,7 @@ bool KUserFiles::loadsdw() FILE *f; kdDebug() << "open shadow file: " << shadow_file << endl; if (!(f = fopen( TQFile::encodeName(shadow_file), "r"))) { - KMessageBox::error( 0, i18n("Error opening %1 for reading.").arg(shadow_file) ); + KMessageBox::error( nullptr, i18n("Error opening %1 for reading.").arg(shadow_file) ); caps &= ~Cap_Shadow; return true; } @@ -250,7 +250,7 @@ bool KUserFiles::loadsdw() kdDebug() << "shadow entry: " << spw->sp_namp << endl; if (!(up = lookup(TQString::fromLocal8Bit(spw->sp_namp)))) { - KMessageBox::error( 0, i18n("No /etc/passwd entry for %1.\nEntry will be removed at the next `Save'-operation.").arg(TQString::fromLocal8Bit(spw->sp_namp)) ); + KMessageBox::error( nullptr, i18n("No /etc/passwd entry for %1.\nEntry will be removed at the next `Save'-operation.").arg(TQString::fromLocal8Bit(spw->sp_namp)) ); continue; } @@ -343,13 +343,13 @@ bool KUserFiles::savepwd() if(!passwd_filename.isEmpty()) { if ((passwd_fd = fopen(TQFile::encodeName(new_passwd_filename),"w")) == nullptr) - KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(passwd_filename) ); + KMessageBox::error( nullptr, i18n("Error opening %1 for writing.").arg(passwd_filename) ); } if(!nispasswd_filename.isEmpty() && (nispasswd_filename != passwd_filename)){ if ((nispasswd_fd = fopen(TQFile::encodeName(new_nispasswd_filename),"w")) == nullptr) - KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(nispasswd_filename) ); + KMessageBox::error( nullptr, i18n("Error opening %1 for writing.").arg(nispasswd_filename) ); } TQPtrListIterator it( mUsers ); @@ -357,12 +357,12 @@ bool KUserFiles::savepwd() bool addok = false; user = (*it); while (true) { - if ( user == 0 ) { + if ( !user ) { if ( addok ) break; it = TQPtrListIterator ( mAdd ); user = (*it); addok = true; - if ( user == 0 ) break; + if ( !user ) break; }; if ( mDel.containsRef( user ) ) { ++it; @@ -431,7 +431,7 @@ bool KUserFiles::savepwd() user->getHomeDir() + ":" + user->getShell() + "\n"; - if( (nispasswd_fd != 0) && (minuid != 0) ) { + if(nispasswd_fd && minuid != 0) { if (minuid <= tmp_uid) { fputs(s.local8Bit().data(), nispasswd_fd); nis_users_written++; @@ -441,11 +441,11 @@ bool KUserFiles::savepwd() } } - if( (nispasswd_fd != 0) && (minuid == 0) ) { + if(nispasswd_fd && minuid == 0) { errors_found = errors_found | NOMINUID; } - if( (nispasswd_fd == 0) && (minuid != 0) ) { + if(!nispasswd_fd && minuid != 0) { errors_found = errors_found | NONISPASSWD; } kdDebug() << s << endl; @@ -472,11 +472,11 @@ bool KUserFiles::savepwd() } if( (errors_found & NOMINUID) != 0 ) { - KMessageBox::error( 0, i18n("Unable to process NIS passwd file without a minimum UID specified.\nPlease update KUser settings (Files).") ); + KMessageBox::error( nullptr, i18n("Unable to process NIS passwd file without a minimum UID specified.\nPlease update KUser settings (Files).") ); } if( (errors_found & NONISPASSWD) != 0 ) { - KMessageBox::error( 0, i18n("Specifying NIS minimum UID requires NIS file(s).\nPlease update KUser settings (Files).") ); + KMessageBox::error( nullptr, i18n("Specifying NIS minimum UID requires NIS file(s).\nPlease update KUser settings (Files).") ); } // need to run a utility program to build /etc/passwd, /etc/pwd.db @@ -489,7 +489,7 @@ bool KUserFiles::savepwd() #else if( (nis_users_written > 0) || (nispasswd_filename == passwd_filename) ) { if (system(PWMKDB) != 0) { - KMessageBox::error( 0, i18n("Unable to build password databases.") ); + KMessageBox::error( nullptr, i18n("Unable to build password databases.") ); return false; } } @@ -523,7 +523,7 @@ bool KUserFiles::savesdw() } if (!(f = fopen(TQFile::encodeName(new_shadow_file), "w"))) { - KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(new_shadow_file) ); + KMessageBox::error( nullptr, i18n("Error opening %1 for writing.").arg(new_shadow_file) ); return false; } @@ -534,12 +534,12 @@ bool KUserFiles::savesdw() up = (*it); while (true) { - if ( up == 0 ) { + if ( !up ) { if ( addok ) break; it = TQPtrListIterator ( mAdd ); up = (*it); addok = true; - if ( up == 0 ) break; + if ( !up ) break; }; if ( mDel.containsRef( up ) ) { diff --git a/kuser/kuserldap.cpp b/kuser/kuserldap.cpp index 5ad7836..ea4faca 100644 --- a/kuser/kuserldap.cpp +++ b/kuser/kuserldap.cpp @@ -84,9 +84,9 @@ void KUserLDAP::result( TDEIO::Job *job ) TQString errstr = job->errorString(); if ( !errstr.isEmpty() ) { if ( ldif.isEmpty() ) - KMessageBox::error( 0, errstr ); + KMessageBox::error( nullptr, errstr ); else - KMessageBox::detailedError( 0, errstr, TQString::fromUtf8( ldif, ldif.size()-1 ) ); + KMessageBox::detailedError( nullptr, errstr, TQString::fromUtf8( ldif, ldif.size()-1 ) ); } mOk = false; } else { @@ -240,7 +240,7 @@ bool KUserLDAP::reload() mUser->setSPwd( "" ); mParser.startParsing(); mCancel = true; - mProg = new KProgressDialog( 0, "", "", i18n("Loading Users From LDAP"), true ); + mProg = new KProgressDialog( nullptr, "", "", i18n("Loading Users From LDAP"), true ); mProg->setAutoClose( false ); mProg->progressBar()->setFormat(""); mProg->progressBar()->setTotalSteps( 100 ); @@ -606,9 +606,9 @@ bool KUserLDAP::dbcommit() mModSucc.clear(); mAdd.first(); mDel.first(); - mAddUser = 0; mDelUser = 0; mUser = 0; + mAddUser = nullptr; mDelUser = nullptr; mUser = nullptr; - mProg = new KProgressDialog( 0, "", i18n("LDAP Operation"), "", true ); + mProg = new KProgressDialog( nullptr, "", i18n("LDAP Operation"), "", true ); TDEIO::Job *job = TDEIO::put( mUrl, -1, false, false, false ); connect( job, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), this, TQ_SLOT( putData( TDEIO::Job*, TQByteArray& ) ) ); @@ -625,7 +625,7 @@ void KUserLDAP::putData( TDEIO::Job *, TQByteArray& data ) if ( mAddUser ) { mAddSucc.append( mAddUser ); mAdd.remove(); - mAddUser = 0; + mAddUser = nullptr; } if ( mDelUser ) { kdDebug() << "delete ok for: " << mDelUser->getName() << endl; @@ -635,13 +635,13 @@ void KUserLDAP::putData( TDEIO::Job *, TQByteArray& data ) mObjectClasses.remove( mDelUser ); } mDel.remove(); - mDelUser = 0; + mDelUser = nullptr; } if ( mUser ) { mModSucc.insert( mUser, mit.data() ); mMod.remove( mit ); mit = mMod.begin(); - mUser = 0; + mUser = nullptr; } if ( (mAddUser = mAdd.current()) ) { diff --git a/kuser/kusersystem.cpp b/kuser/kusersystem.cpp index d938b74..d38643d 100644 --- a/kuser/kusersystem.cpp +++ b/kuser/kusersystem.cpp @@ -69,7 +69,7 @@ bool KUserSystem::reload() bool KUserSystem::loadpwd() { passwd *p; - KU::KUser *tmpKU = 0; + KU::KUser *tmpKU = nullptr; TQString tmp; setpwent(); //This should be enough for BSDs @@ -93,7 +93,7 @@ bool KUserSystem::loadpwd() tmpKU->setExpire(p->pw_expire); #endif - if ((p->pw_gecos != 0) && (p->pw_gecos[0] != 0)) + if (p->pw_gecos && p->pw_gecos[0] != 0) fillGecos(tmpKU, p->pw_gecos); mUsers.append(tmpKU); } diff --git a/kuser/kuservw.cpp b/kuser/kuservw.cpp index 9fae9d5..f21bc0a 100644 --- a/kuser/kuservw.cpp +++ b/kuser/kuservw.cpp @@ -137,7 +137,7 @@ void KUserView::init() KU::KUser *KUserView::getCurrentUser() { KUserViewItem *userItem = (KUserViewItem *)currentItem(); - if (!userItem) return 0; + if (!userItem) return nullptr; return userItem->user(); } diff --git a/kuser/kuservw.h b/kuser/kuservw.h index b5c330c..1cc10f6 100644 --- a/kuser/kuservw.h +++ b/kuser/kuservw.h @@ -46,7 +46,7 @@ class KUserView : public TDEListView public: - KUserView( TQWidget* parent = 0, const char* name = 0 ); + KUserView( TQWidget* parent = nullptr, const char* name = nullptr ); virtual ~KUserView(); diff --git a/kuser/main.cpp b/kuser/main.cpp index 06e3ad6..27bffda 100644 --- a/kuser/main.cpp +++ b/kuser/main.cpp @@ -35,7 +35,7 @@ static const char *description = I18N_NOOP("TDE User Editor"); -KUserGlobals *kug = 0; +KUserGlobals *kug = nullptr; int main(int argc, char **argv) { @@ -48,7 +48,7 @@ int main(int argc, char **argv) aboutData.addAuthor("Szombathelyi György", I18N_NOOP("kuser author"), "gyurco@freemail.hu"); TDECmdLineArgs::init(argc, argv, &aboutData); - mainWidget *mw = 0; + mainWidget *mw = nullptr; TDEApplication a; diff --git a/kuser/mainView.cpp b/kuser/mainView.cpp index 948ff92..040387f 100644 --- a/kuser/mainView.cpp +++ b/kuser/mainView.cpp @@ -145,7 +145,7 @@ void mainView::userdel() kug->getUsers().del( user ); if ( !updateUsers() ) return; - KU::KGroup *group = 0; + KU::KGroup *group = nullptr; group = kug->getGroups().first(); while ( group ) { kdDebug() << "group: " << group->getName() << endl; @@ -163,7 +163,7 @@ void mainView::userdel() group = kug->getGroups().lookup( gid ); if ( group && - KMessageBox::questionYesNo( 0, i18n("You are using private groups.\n" + KMessageBox::questionYesNo( nullptr, i18n("You are using private groups.\n" "Do you want to delete the user's private group '%1'?") .arg(group->getName()), TQString(), KStdGuiItem::del(), i18n("Do Not Delete")) == KMessageBox::Yes) { @@ -185,7 +185,7 @@ void mainView::useradd() bool samba = kug->getUsers().getCaps() & KU::KUsers::Cap_Samba; if ((uid = kug->getUsers().first_free()) == KU::KUsers::NO_FREE) { - KMessageBox::sorry( 0, i18n("You have run out of uid space.") ); + KMessageBox::sorry( nullptr, i18n("You have run out of uid space.") ); return; } /* @@ -203,7 +203,7 @@ void mainView::useradd() if ( !ok ) return; if ( kug->getUsers().lookup( name ) ) { - KMessageBox::sorry( 0, i18n("User with name %1 already exists.").arg( name ) ); + KMessageBox::sorry( nullptr, i18n("User with name %1 already exists.").arg( name ) ); return; } @@ -253,9 +253,9 @@ void mainView::useradd() if ( privgroup ) { KU::KGroup *tg; - if ((tg = kug->getGroups().lookup(tk->getName())) == 0) { + if (!(tg = kug->getGroups().lookup(tk->getName()))) { gid_t gid; - if ( kug->getGroups().lookup( tk->getUID() ) == 0 ) { + if (!kug->getGroups().lookup( tk->getUID() )) { gid = tk->getUID(); } else { gid = kug->getGroups().first_free(); @@ -303,7 +303,7 @@ void mainView::setpwd() int count = lbusers->selectedItems().count(); if ( count == 0 ) return; if ( count > 1 ) { - if ( KMessageBox::questionYesNo( 0, + if ( KMessageBox::questionYesNo( nullptr, i18n("You have selected %1 users. Do you really want to change the password for all the selected users?") .arg( count ), TQString(), i18n("Change"), i18n("Do Not Change") ) == KMessageBox::No ) return; } @@ -393,7 +393,7 @@ void mainView::grpadd() if ( (gid = kug->getGroups().first_free()) == KU::KGroups::NO_FREE ) { - KMessageBox::sorry( 0, i18n("You have run out of gid space.") ); + KMessageBox::sorry( nullptr, i18n("You have run out of gid space.") ); return; } /* @@ -444,7 +444,7 @@ void mainView::grpdel() KU::KUser *user = kug->getUsers().first(); while ( user ) { if ( user->getGID() == group->getGID() ) { - KMessageBox::error( 0, i18n( "The group '%1' is the primary group of one or more users (such as '%2'); it cannot be deleted." ).arg( group->getName() ).arg( user->getName() ) ); + KMessageBox::error( nullptr, i18n( "The group '%1' is the primary group of one or more users (such as '%2'); it cannot be deleted." ).arg( group->getName() ).arg( user->getName() ) ); return; } user = kug->getUsers().next(); @@ -456,12 +456,12 @@ void mainView::grpdel() switch ( selected ) { case 0: return; case 1: - if (KMessageBox::warningContinueCancel( 0, + if (KMessageBox::warningContinueCancel( nullptr, i18n("Do you really want to delete the group '%1'?").arg(group->getName()), TQString(), KStdGuiItem::del()) != KMessageBox::Continue) return; break; default: - if (KMessageBox::warningContinueCancel( 0, + if (KMessageBox::warningContinueCancel( nullptr, i18n("Do you really want to delete the %1 selected groups?").arg(selected), TQString(), KStdGuiItem::del()) != KMessageBox::Continue) return; } @@ -487,11 +487,11 @@ bool mainView::updateGroups() KU::KGroups::DelIt dit( kug->getGroups().mDelSucc ); KU::KGroups::AddIt ait( kug->getGroups().mAddSucc ); - while ( (group = dit.current()) != 0 ) { + while ((group = dit.current()) != nullptr) { ++dit; lbgroups->removeItem( group ); } - while ( (group = ait.current()) != 0 ) { + while ((group = ait.current()) != nullptr) { ++ait; lbgroups->insertItem( group ); } @@ -510,11 +510,11 @@ bool mainView::updateUsers() KU::KUsers::DelIt dit( kug->getUsers().mDelSucc ); KU::KUsers::AddIt ait( kug->getUsers().mAddSucc ); - while ( (user = dit.current()) != 0 ) { + while ((user = dit.current()) != nullptr) { ++dit; lbusers->removeItem( user ); } - while ( (user = ait.current()) != 0 ) { + while ((user = ait.current()) != nullptr) { ++ait; lbusers->insertItem( user ); } diff --git a/kuser/mainView.h b/kuser/mainView.h index c4bf047..a85fe96 100644 --- a/kuser/mainView.h +++ b/kuser/mainView.h @@ -36,7 +36,7 @@ class mainView : public TQTabWidget { TQ_OBJECT public: - mainView(TQWidget *parent = 0); + mainView(TQWidget *parent = nullptr); ~mainView(); void init(); diff --git a/kuser/mainWidget.cpp b/kuser/mainWidget.cpp index 9e6fa54..7b1602e 100644 --- a/kuser/mainWidget.cpp +++ b/kuser/mainWidget.cpp @@ -38,7 +38,7 @@ #include "selectconn.h" #include "mainView.h" -mainWidget::mainWidget(const char *name) : TDEMainWindow(0,name) +mainWidget::mainWidget(const char *name) : TDEMainWindow(nullptr,name) { md = new mainView(this); @@ -106,7 +106,7 @@ void mainWidget::setupActions() TQ_SLOT(selectconn()), actionCollection(), "select_conn"); mShowSys = new TDEToggleAction(i18n("Show System Users/Groups"), - 0, 0, this, + nullptr, 0, this, TQ_SLOT(showSys()), actionCollection(), "show_sys"); mShowSys->setCheckedState(i18n("Hide System Users/Groups")); mShowSys->setChecked( kug->kcfg()->showsys() ); @@ -154,7 +154,7 @@ void mainWidget::init() connect( md, TQ_SIGNAL(userSelected(bool)), actionCollection()->action("set_password_user"), TQ_SLOT(setEnabled(bool)) ); } else { - disconnect( md, TQ_SIGNAL(userSelected(bool)), 0, 0 ); + disconnect( md, TQ_SIGNAL(userSelected(bool)), nullptr, nullptr ); } rw = ! ( kug->getGroups().getCaps() & KU::KGroups::Cap_ReadOnly ); @@ -168,7 +168,7 @@ void mainWidget::init() connect( md, TQ_SIGNAL(groupSelected(bool)), actionCollection()->action("delete_group"), TQ_SLOT(setEnabled(bool)) ); } else { - disconnect( md, TQ_SIGNAL(groupSelected(bool)), 0, 0 ); + disconnect( md, TQ_SIGNAL(groupSelected(bool)), nullptr, nullptr ); } md->reloadUsers(); md->reloadGroups(); diff --git a/kuser/mainWidget.h b/kuser/mainWidget.h index 6454e36..7d7ea6c 100644 --- a/kuser/mainWidget.h +++ b/kuser/mainWidget.h @@ -31,7 +31,7 @@ class mainWidget : public TDEMainWindow { TQ_OBJECT public: - mainWidget(const char *name = 0); + mainWidget(const char *name = nullptr); ~mainWidget(); bool queryClose(); diff --git a/kuser/misc.cpp b/kuser/misc.cpp index f1d4994..d408c3a 100644 --- a/kuser/misc.cpp +++ b/kuser/misc.cpp @@ -43,7 +43,7 @@ bool backup(const TQString & name) if (copyFile(TQFile::encodeName(name), TQFile::encodeName(tmp)) == -1) { TQString str; - KMessageBox::error( 0, i18n("Can't create backup file for %1").arg(name) ); + KMessageBox::error( nullptr, i18n("Can't create backup file for %1").arg(name) ); return false; } return true; @@ -68,17 +68,17 @@ int copyFile(const TQString & from, const TQString & to) fo.setName(to); if (!fi.exists()) { - KMessageBox::error( 0, i18n("File %1 does not exist.").arg(from) ); + KMessageBox::error( nullptr, i18n("File %1 does not exist.").arg(from) ); return (-1); } if (!fi.open(IO_ReadOnly)) { - KMessageBox::error( 0, i18n("Cannot open file %1 for reading.").arg(from) ); + KMessageBox::error( nullptr, i18n("Cannot open file %1 for reading.").arg(from) ); return (-1); } if (!fo.open(IO_Raw | IO_WriteOnly | IO_Truncate)) { - KMessageBox::error( 0, i18n("Cannot open file %1 for writing.").arg(to) ); + KMessageBox::error( nullptr, i18n("Cannot open file %1 for writing.").arg(to) ); return (-1); } diff --git a/kuser/propdlg.cpp b/kuser/propdlg.cpp index 7693d6d..ba04359 100644 --- a/kuser/propdlg.cpp +++ b/kuser/propdlg.cpp @@ -211,7 +211,7 @@ void propdlg::initDlg() connect(cbposix, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(cbposixChanged())); addRow(frame, layout, row++, cbposix, i18n("Disable &POSIX account information"), whatstr); } else { - cbposix = 0; + cbposix = nullptr; } frontrow = row; } @@ -643,7 +643,7 @@ void propdlg::setpgroup() isgchanged = true; TQCheckListItem *item; item = (TQCheckListItem *) lstgrp->selectedItem(); - if ( item == 0 || item->text() == primaryGroup ) + if ( !item || item->text() == primaryGroup ) return; bool prevPrimaryGroupWasOn = primaryGroupWasOn; @@ -688,14 +688,14 @@ void propdlg::gchanged() TQString propdlg::mergeLE( KLineEdit *le, const TQString &val, bool one ) { - TQCheckBox *cb = 0; + TQCheckBox *cb = nullptr; if ( mNoChanges.contains( le ) ) cb = mNoChanges[ le ]; return ( one || ( cb && !cb->isChecked() ) ) ? le->text() : val; } int propdlg::mergeSB( KIntSpinBox *sb, int val, bool one ) { - TQCheckBox *cb = 0; + TQCheckBox *cb = nullptr; if ( mNoChanges.contains( sb ) ) cb = mNoChanges[ sb ]; return ( one || ( cb && !cb->isChecked() ) ) ? sb->value() : val; } @@ -879,25 +879,25 @@ bool propdlg::check() bool posix = !( kug->getUsers().getCaps() & KU::KUsers::Cap_Disable_POSIX ) || !( cbposix->isChecked() ); if ( one && posix && leid->text().isEmpty() ) { - KMessageBox::sorry( 0, i18n("You need to specify an UID.") ); + KMessageBox::sorry( nullptr, i18n("You need to specify an UID.") ); return false; } if ( one && posix && lehome->text().isEmpty() ) { - KMessageBox::sorry( 0, i18n("You must specify a home directory.") ); + KMessageBox::sorry( nullptr, i18n("You must specify a home directory.") ); return false; } if ( kug->getUsers().getCaps() & KU::KUsers::Cap_InetOrg ) { if ( one && lesurname->text().isEmpty() ) { - KMessageBox::sorry( 0, i18n("You must fill the surname field.") ); + KMessageBox::sorry( nullptr, i18n("You must fill the surname field.") ); return false; } } if ( kug->getUsers().getCaps() & KU::KUsers::Cap_Samba ) { if ( one && lerid->text().isEmpty() && !( cbsamba->isChecked() ) ) { - KMessageBox::sorry( 0, i18n("You need to specify a samba RID.") ); + KMessageBox::sorry( nullptr, i18n("You need to specify a samba RID.") ); return false; } } @@ -940,7 +940,7 @@ void propdlg::slotOk() && olduid != newuid ) { if (kug->getUsers().lookup(newuid)) { - KMessageBox::sorry( 0, + KMessageBox::sorry( nullptr, i18n("User with UID %1 already exists").arg(newuid) ); return; } @@ -950,7 +950,7 @@ void propdlg::slotOk() uint newrid = lerid->text().toInt(); if ( oldrid != newrid ) { if (kug->getUsers().lookup_sam(newrid)) { - KMessageBox::sorry( 0, + KMessageBox::sorry( nullptr, i18n("User with RID %1 already exists").arg(newrid) ); return; } @@ -964,7 +964,7 @@ void propdlg::slotOk() if (oldshell != newshell) { if (!checkShell(newshell)) { - int result = KMessageBox::warningYesNoCancel( 0, + int result = KMessageBox::warningYesNoCancel( nullptr, i18n("

The shell %1 is not yet listed in the file %2. " "In order to use this shell you must add it to " "this file first." diff --git a/kuser/propdlg.h b/kuser/propdlg.h index 2ee6f25..e683832 100644 --- a/kuser/propdlg.h +++ b/kuser/propdlg.h @@ -46,9 +46,9 @@ class propdlg : public KDialogBase public: propdlg( const TQPtrList &users, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *parent = nullptr, const char *name = nullptr ); propdlg( KU::KUser *AUser, bool fixedprivgroup, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *parent = nullptr, const char *name = nullptr ); ~propdlg(); void mergeUser( KU::KUser *user, KU::KUser *newuser ); diff --git a/kuser/pwddlg.cpp b/kuser/pwddlg.cpp index 2fda099..236682f 100644 --- a/kuser/pwddlg.cpp +++ b/kuser/pwddlg.cpp @@ -71,7 +71,7 @@ pwddlg::~pwddlg() void pwddlg::slotOk() { if ( lepw1->text() != lepw2->text() ) { - KMessageBox::sorry( 0, i18n("Passwords are not identical.\nTry again.") ); + KMessageBox::sorry( nullptr, i18n("Passwords are not identical.\nTry again.") ); lepw1->clear(); lepw2->clear(); lepw1->setFocus(); diff --git a/kuser/selectconn.cpp b/kuser/selectconn.cpp index 67a38cb..2759e44 100644 --- a/kuser/selectconn.cpp +++ b/kuser/selectconn.cpp @@ -81,7 +81,7 @@ void SelectConn::slotUser3() i18n("Please type the name of the new connection:") ); if ( newconn.isEmpty() ) return; if ( tdeApp->sharedConfig()->groupList().contains( "connection-" + newconn ) ) { - KMessageBox::sorry( 0, i18n("A connection with this name already exists.") ); + KMessageBox::sorry( nullptr, i18n("A connection with this name already exists.") ); return; } @@ -119,7 +119,7 @@ void SelectConn::slotUser2() void SelectConn::slotUser1() { TQString conn = connSelected(); - if ( KMessageBox::warningContinueCancel( 0, i18n("Do you really want to delete the connection '%1'?"). + if ( KMessageBox::warningContinueCancel( nullptr, i18n("Do you really want to delete the connection '%1'?"). arg( conn ),i18n("Delete Connection"),KStdGuiItem::del() ) == KMessageBox::Cancel ) return; tdeApp->sharedConfig()->deleteGroup( "connection-" + conn, true ); diff --git a/kuser/tdeglobal.cpp b/kuser/tdeglobal.cpp index 479125c..e4b452f 100644 --- a/kuser/tdeglobal.cpp +++ b/kuser/tdeglobal.cpp @@ -30,10 +30,10 @@ KUserGlobals::KUserGlobals() { - cfg = 0; + cfg = nullptr; - users = 0; - groups = 0; + users = nullptr; + groups = nullptr; } void KUserGlobals::initCfg( const TQString &connection ) diff --git a/lilo-config/common/String.cpp b/lilo-config/common/String.cpp index d2b6e37..58ddb95 100644 --- a/lilo-config/common/String.cpp +++ b/lilo-config/common/String.cpp @@ -41,7 +41,7 @@ void String::sprintf(const char *format, ...) { va_list arg; va_start(arg, format); - char *buf=0; + char *buf=nullptr; int size=vsnprintf(buf, 0, format, arg); if(size==-1) { /* ARGH!!! */ cerr << "WARNING: Your C library (libc) does not conform to the ISO C99 standard!" << endl << "Consider upgrading to glibc 2.1 or higher!" << endl; @@ -258,7 +258,7 @@ String String::escapeForRegExp(String const &s) int i = 0; while ( i < (int) quoted.length() ) { - if ( strchr(meta, quoted.at(i)) != 0 ) + if (strchr(meta, quoted.at(i))) quoted.insert( i++, "\\" ); i++; } @@ -357,22 +357,22 @@ String const &StringList::grep(String const &s) const } int __stringlist_compare(const void *a, const void *b) { - if(a==0 && b==0) + if(!a && !b) return 0; - else if(a==0) + else if(!a) return 1; - else if(b==0) + else if(!b) return -1; else return strcmp((const char *)a,(const char *)b); } int __stringlist_compare_noncs(const void *a, const void *b) { - if(a==0 && b==0) + if(!a && !b) return 0; - else if(a==0) + else if(!a) return 1; - else if(b==0) + else if(!b) return -1; else return strcasecmp((const char *)a,(const char *)b); diff --git a/lilo-config/common/lilo.cpp b/lilo-config/common/lilo.cpp index f7f0a2b..bc751b4 100644 --- a/lilo-config/common/lilo.cpp +++ b/lilo-config/common/lilo.cpp @@ -57,7 +57,7 @@ liloimage *liloimages::find(String const &s) const if(!(*it).grep(regex).empty()) return (liloimage*)&(*it); } - return 0; + return nullptr; } void liloimages::remove(String const &s) { @@ -91,7 +91,7 @@ void liloconf::set(StringList const &s) checked=false; bool inHeader=true; bool start; - liloimage *image=0; + liloimage *image=nullptr; for(StringList::const_iterator it=s.begin(); it!=s.end(); it++) { String s=*it; start=false; diff --git a/lilo-config/kde-qt-common/EditWidget.cpp b/lilo-config/kde-qt-common/EditWidget.cpp index 173aeea..a243229 100644 --- a/lilo-config/kde-qt-common/EditWidget.cpp +++ b/lilo-config/kde-qt-common/EditWidget.cpp @@ -45,7 +45,7 @@ EditWidget::EditWidget(TQString const label, TQString const text, bool isFile, T select->resize(select->minimumSizeHint()); setStretchFactor(select, 0); } else - select=0; + select=nullptr; } void EditWidget::selectFileClicked() { @@ -59,7 +59,7 @@ TQSize EditWidget::sizeHint() const int h=lbl->sizeHint().height(); if(hsizeHint().height()) h=line->sizeHint().height(); - if(select!=0) { + if(select) { w+=SPACE_INSIDE+select->sizeHint().width(); if(hsizeHint().height()) h=select->sizeHint().height(); @@ -72,7 +72,7 @@ TQSize EditWidget::minimumSizeHint() const int h=lbl->minimumSizeHint().height(); if(hminimumSizeHint().height()) h=line->minimumSizeHint().height(); - if(select!=0) { + if(select) { w+=SPACE_INSIDE+select->minimumSizeHint().width(); if(hminimumSizeHint().height()) h=select->minimumSizeHint().height(); diff --git a/lilo-config/kde-qt-common/EditWidget.h b/lilo-config/kde-qt-common/EditWidget.h index 800a59a..75043d4 100644 --- a/lilo-config/kde-qt-common/EditWidget.h +++ b/lilo-config/kde-qt-common/EditWidget.h @@ -37,7 +37,7 @@ class EditWidget:public TQHBox TQ_OBJECT public: - EditWidget(TQString const label="", TQString const text="", bool isFile=false, TQWidget *parent=0, const char *name=0, WFlags f=0, bool allowLines=true); + EditWidget(TQString const label="", TQString const text="", bool isFile=false, TQWidget *parent=nullptr, const char *name=nullptr, WFlags f=0, bool allowLines=true); void setLabel(TQString const &label) { lbl->setText(label); }; TQString text() const { return line->text(); }; TQString displayText() const { return line->displayText(); }; diff --git a/lilo-config/kde-qt-common/expert.h b/lilo-config/kde-qt-common/expert.h index 7316690..3ebd965 100644 --- a/lilo-config/kde-qt-common/expert.h +++ b/lilo-config/kde-qt-common/expert.h @@ -37,7 +37,7 @@ class Expert:public TQWidget TQ_OBJECT public: - Expert(liloconf *l=0, TQWidget *parent=0, const char *name=0); + Expert(liloconf *l=nullptr, TQWidget *parent=nullptr, const char *name=nullptr); ~Expert(); void setCfg(liloconf *l) { lilo=l; }; void makeReadOnly(); diff --git a/lilo-config/kde-qt-common/general.h b/lilo-config/kde-qt-common/general.h index cc8bb8d..b7ac838 100644 --- a/lilo-config/kde-qt-common/general.h +++ b/lilo-config/kde-qt-common/general.h @@ -38,7 +38,7 @@ class General:public TQWidget TQ_OBJECT public: - General(liloconf *l=0, TQWidget *parent=0, const char *name=0); + General(liloconf *l=nullptr, TQWidget *parent=nullptr, const char *name=nullptr); void makeReadOnly(); signals: void configChanged(); diff --git a/lilo-config/kde-qt-common/images.h b/lilo-config/kde-qt-common/images.h index 99db7d7..4046c19 100644 --- a/lilo-config/kde-qt-common/images.h +++ b/lilo-config/kde-qt-common/images.h @@ -41,7 +41,7 @@ class Images:public TQWidget TQ_OBJECT public: - Images(liloconf *l=0, TQWidget *parent=0, const char *name=0); + Images(liloconf *l=nullptr, TQWidget *parent=nullptr, const char *name=nullptr); ~Images(); void setCfg(liloconf *l) { lilo=l; }; void makeReadOnly(); diff --git a/lilo-config/kde-qt-common/mainwidget.h b/lilo-config/kde-qt-common/mainwidget.h index a48d29f..50f587e 100644 --- a/lilo-config/kde-qt-common/mainwidget.h +++ b/lilo-config/kde-qt-common/mainwidget.h @@ -40,7 +40,7 @@ class MainWidget: public TQTabWidget { TQ_OBJECT public: - MainWidget(TQWidget *parent, const char *name=0); + MainWidget(TQWidget *parent, const char *name=nullptr); void arrangeWidgets(); void makeReadOnly(); public slots: diff --git a/lilo-config/kde/Details.h b/lilo-config/kde/Details.h index 9053e31..817cbc4 100644 --- a/lilo-config/kde/Details.h +++ b/lilo-config/kde/Details.h @@ -39,7 +39,7 @@ class Details:public KDialogBase TQ_OBJECT public: - Details(liloimage *lilo, TQWidget *parent=0, const char *name=0, WFlags f=0); + Details(liloimage *lilo, TQWidget *parent=nullptr, const char *name=nullptr, WFlags f=0); bool isReadOnly() const { return readonly->isChecked(); }; TQString vgaMode() const; bool isUnsafe() const { return unsafe->isChecked(); }; diff --git a/lilo-config/kde/InputBox.h b/lilo-config/kde/InputBox.h index ceeb361..c5ecc17 100644 --- a/lilo-config/kde/InputBox.h +++ b/lilo-config/kde/InputBox.h @@ -43,7 +43,7 @@ class InputBox:public KDialogBase public: typedef struct { TQString label; TQString dflt; bool isFile; TQString help; } entry; typedef std::list entries; - InputBox(entries e, TQWidget *parent=0, const char *name=0, bool hasCancel=true, WFlags f=0); + InputBox(entries e, TQWidget *parent=nullptr, const char *name=nullptr, bool hasCancel=true, WFlags f=0); TQStringList const text() const { TQStringList s; for(std::list::const_iterator it=edit.begin(); it!=edit.end(); it++) s << (*it)->text(); return s; }; private: std::list edit; diff --git a/lilo-config/kde/kcontrol.cpp b/lilo-config/kde/kcontrol.cpp index 2fb40c6..b570d8a 100644 --- a/lilo-config/kde/kcontrol.cpp +++ b/lilo-config/kde/kcontrol.cpp @@ -46,9 +46,9 @@ KControl::KControl(TQWidget *parent, const char *name) m->makeReadOnly(); } TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmlilo"), I18N_NOOP("LILO Configuration"), - 0, 0, TDEAboutData::License_GPL, + nullptr, nullptr, TDEAboutData::License_GPL, I18N_NOOP("(c) 2000, Bernhard Rosenkraenzer")); - about->addAuthor("Bernhard \"Bero\" Rosenkraenzer", 0, "bero@redhat.com"); + about->addAuthor("Bernhard \"Bero\" Rosenkraenzer", nullptr, "bero@redhat.com"); setAboutData(about); } diff --git a/secpolicy/main.cpp b/secpolicy/main.cpp index 5b82ee5..9d644a0 100644 --- a/secpolicy/main.cpp +++ b/secpolicy/main.cpp @@ -42,7 +42,7 @@ int main(int argc, char **argv) version, description, TDEAboutData::License_GPL, "(c) 1999 by Preston Brown"); TDECmdLineArgs::init( argc, argv, &aboutData ); - aboutData.addAuthor( "Preston Brown", 0, "pbrown@kde.org"); + aboutData.addAuthor( "Preston Brown", nullptr, "pbrown@kde.org"); if (!TDEUniqueApplication::start()) exit(0); diff --git a/secpolicy/pamview.cpp b/secpolicy/pamview.cpp index 45116c8..f9b1fd6 100644 --- a/secpolicy/pamview.cpp +++ b/secpolicy/pamview.cpp @@ -88,7 +88,7 @@ void PamView::initServices() const TQFileInfoList *list = d.entryInfoList(); TQFileInfoListIterator it(*list); TQFileInfo *fi; - while ((fi = it.current()) != 0) { + while ((fi = it.current()) != nullptr) { servicesLB->insertItem(fi->fileName()); TQFile f(fi->filePath()); if (f.open(IO_ReadOnly)) { diff --git a/secpolicy/pamview.h b/secpolicy/pamview.h index 30e19eb..9c4a1d8 100644 --- a/secpolicy/pamview.h +++ b/secpolicy/pamview.h @@ -35,7 +35,7 @@ class PamView : public TQWidget TQ_OBJECT public: - PamView(TQWidget *parent = 0, const char *name = 0); + PamView(TQWidget *parent = nullptr, const char *name = nullptr); virtual ~PamView(); protected: diff --git a/secpolicy/secpolicywin.cpp b/secpolicy/secpolicywin.cpp index 3ebf6e2..c667215 100644 --- a/secpolicy/secpolicywin.cpp +++ b/secpolicy/secpolicywin.cpp @@ -35,7 +35,7 @@ #include "secpolicywin.h" SecPolicyWin::SecPolicyWin(const char *name) - : TDEMainWindow(0,name) + : TDEMainWindow(nullptr,name) { view = new PamView(this); setCentralWidget(view); diff --git a/secpolicy/secpolicywin.h b/secpolicy/secpolicywin.h index 912d149..71f1aed 100644 --- a/secpolicy/secpolicywin.h +++ b/secpolicy/secpolicywin.h @@ -32,7 +32,7 @@ class PamView; class SecPolicyWin : public TDEMainWindow { public: - SecPolicyWin(const char *name = 0); + SecPolicyWin(const char *name = nullptr); ~SecPolicyWin(); protected: diff --git a/tdefile-plugins/deb/tdefile_deb.cpp b/tdefile-plugins/deb/tdefile_deb.cpp index 959bdb2..1e67fd4 100644 --- a/tdefile-plugins/deb/tdefile_deb.cpp +++ b/tdefile-plugins/deb/tdefile_deb.cpp @@ -49,7 +49,7 @@ KDebPlugin::KDebPlugin(TQObject *parent, const char *name, : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-deb" ); - KFileMimeTypeInfo::GroupInfo* group = 0L; + KFileMimeTypeInfo::GroupInfo* group = nullptr; group = addGroupInfo(info, "General", i18n("General")); KFileMimeTypeInfo::ItemInfo* item; diff --git a/tdefile-plugins/rpm/tdefile_rpm.cpp b/tdefile-plugins/rpm/tdefile_rpm.cpp index 777600f..14c3099 100644 --- a/tdefile-plugins/rpm/tdefile_rpm.cpp +++ b/tdefile-plugins/rpm/tdefile_rpm.cpp @@ -37,7 +37,7 @@ KRpmPlugin::KRpmPlugin(TQObject *parent, const char *name, : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-rpm" ); - KFileMimeTypeInfo::GroupInfo* group = 0L; + KFileMimeTypeInfo::GroupInfo* group = nullptr; group = addGroupInfo(info, "General", i18n("General")); KFileMimeTypeInfo::ItemInfo* item; -- cgit v1.2.3