From 4ea405580c3b25d256944c6603d4f6a31bcc393d Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sun, 8 Nov 2026 08:05:39 -0300 Subject: Replace zero pointer constants in calendar components MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- kalarm/alarmcalendar.cpp | 36 +++--- kalarm/alarmevent.cpp | 8 +- kalarm/alarmevent.h | 10 +- kalarm/alarmlistview.cpp | 4 +- kalarm/alarmlistview.h | 2 +- kalarm/alarmtext.h | 2 +- kalarm/alarmtimewidget.cpp | 4 +- kalarm/alarmtimewidget.h | 6 +- kalarm/birthdaydlg.cpp | 8 +- kalarm/birthdaydlg.h | 8 +- kalarm/daemon.cpp | 22 ++-- kalarm/daemon.h | 2 +- kalarm/deferdlg.h | 2 +- kalarm/editdlg.cpp | 42 +++---- kalarm/editdlg.h | 8 +- kalarm/editdlgprivate.h | 4 +- kalarm/emailidcombo.h | 2 +- kalarm/eventlistviewbase.cpp | 12 +- kalarm/eventlistviewbase.h | 2 +- kalarm/find.cpp | 8 +- kalarm/fontcolour.cpp | 6 +- kalarm/fontcolour.h | 2 +- kalarm/fontcolourbutton.cpp | 2 +- kalarm/fontcolourbutton.h | 4 +- kalarm/functions.cpp | 8 +- kalarm/functions.h | 18 +-- kalarm/kalarmapp.cpp | 62 +++++----- kalarm/kalarmapp.h | 4 +- kalarm/kalarmd/adapp.cpp | 4 +- kalarm/kalarmd/adcalendar.cpp | 4 +- kalarm/kalarmd/admain.cpp | 4 +- kalarm/kalarmd/alarmdaemon.cpp | 4 +- kalarm/kalarmd/alarmdaemon.h | 2 +- kalarm/kalarmd/clientinfo.cpp | 6 +- kalarm/kalarmd/clientinfo.h | 2 +- kalarm/kamail.cpp | 10 +- kalarm/kamail.h | 2 +- kalarm/latecancel.h | 2 +- kalarm/lib/buttongroup.h | 8 +- kalarm/lib/checkbox.cpp | 4 +- kalarm/lib/checkbox.h | 4 +- kalarm/lib/colourcombo.h | 2 +- kalarm/lib/combobox.h | 4 +- kalarm/lib/dateedit.h | 2 +- kalarm/lib/label.cpp | 22 ++-- kalarm/lib/label.h | 8 +- kalarm/lib/lineedit.h | 4 +- kalarm/lib/messagebox.cpp | 2 +- kalarm/lib/messagebox.h | 2 +- kalarm/lib/pushbutton.h | 6 +- kalarm/lib/radiobutton.cpp | 4 +- kalarm/lib/radiobutton.h | 4 +- kalarm/lib/slider.h | 6 +- kalarm/lib/spinbox.cpp | 2 +- kalarm/lib/spinbox.h | 4 +- kalarm/lib/spinbox2.cpp | 4 +- kalarm/lib/spinbox2.h | 8 +- kalarm/lib/spinbox2private.h | 6 +- kalarm/lib/synchtimer.cpp | 6 +- kalarm/lib/synchtimer.h | 10 +- kalarm/lib/timeedit.cpp | 2 +- kalarm/lib/timeedit.h | 2 +- kalarm/lib/timeperiod.h | 2 +- kalarm/lib/timespinbox.cpp | 2 +- kalarm/lib/timespinbox.h | 4 +- kalarm/main.cpp | 130 ++++++++++----------- kalarm/mainwindow.cpp | 38 +++--- kalarm/mainwindow.h | 8 +- kalarm/mainwindowbase.h | 2 +- kalarm/messagewin.cpp | 96 +++++++-------- kalarm/pickfileradio.cpp | 4 +- kalarm/pickfileradio.h | 6 +- kalarm/prefdlg.cpp | 8 +- kalarm/preferences.cpp | 2 +- kalarm/recurrenceedit.cpp | 26 ++--- kalarm/recurrenceedit.h | 4 +- kalarm/recurrenceeditprivate.h | 20 ++-- kalarm/reminder.cpp | 2 +- kalarm/reminder.h | 2 +- kalarm/repetition.cpp | 4 +- kalarm/repetition.h | 4 +- kalarm/sounddlg.cpp | 12 +- kalarm/sounddlg.h | 2 +- kalarm/soundpicker.cpp | 2 +- kalarm/soundpicker.h | 2 +- kalarm/specialactions.h | 6 +- kalarm/startdaytimer.cpp | 2 +- kalarm/startdaytimer.h | 2 +- kalarm/templatedlg.cpp | 12 +- kalarm/templatedlg.h | 4 +- kalarm/templatelistview.h | 2 +- kalarm/templatemenuaction.h | 2 +- kalarm/templatepickdlg.h | 2 +- kalarm/timeselector.cpp | 2 +- kalarm/timeselector.h | 2 +- kalarm/traywindow.cpp | 8 +- kalarm/traywindow.h | 2 +- kalarm/undo.cpp | 46 ++++---- karm/csvexportdialog.h | 4 +- karm/edittaskdialog.cpp | 8 +- karm/edittaskdialog.h | 2 +- karm/idletimedetector.cpp | 2 +- karm/karm_part.cpp | 8 +- karm/karmstorage.cpp | 16 +-- karm/ktimewidget.cpp | 4 +- karm/ktimewidget.h | 2 +- karm/main.cpp | 24 ++-- karm/mainwindow.cpp | 6 +- karm/plannerparser.cpp | 2 +- karm/preferences.cpp | 4 +- karm/print.cpp | 2 +- karm/printdialog.cpp | 2 +- karm/task.cpp | 4 +- karm/task.h | 8 +- karm/taskview.cpp | 40 +++---- karm/taskview.h | 4 +- karm/tdeaccelmenuwatch.cpp | 4 +- karm/tdeaccelmenuwatch.h | 2 +- karm/test/runscripts.cpp | 2 +- karm/test/script.cpp | 4 +- karm/tray.cpp | 8 +- kdgantt/KDGanttMinimizeSplitter.cpp | 14 +-- kdgantt/KDGanttMinimizeSplitter.h | 6 +- kdgantt/KDGanttSemiSizingControl.cpp | 8 +- kdgantt/KDGanttSemiSizingControl.h | 10 +- kdgantt/KDGanttSizingControl.h | 2 +- kdgantt/KDGanttView.cpp | 34 +++--- kdgantt/KDGanttView.h | 6 +- kdgantt/KDGanttViewEventItem.cpp | 2 +- kdgantt/KDGanttViewItem.cpp | 62 +++++----- kdgantt/KDGanttViewSubwidgets.cpp | 120 +++++++++---------- kdgantt/KDGanttViewSubwidgets.h | 4 +- kdgantt/KDGanttViewSummaryItem.cpp | 4 +- kdgantt/KDGanttViewTaskItem.cpp | 2 +- kdgantt/KDGanttViewTaskLink.cpp | 18 +-- kdgantt/KDGanttViewTaskLinkGroup.cpp | 4 +- kgantt/kgantt/KGantt.cpp | 4 +- kgantt/kgantt/KGantt.h | 6 +- kgantt/kgantt/KGanttBarConfig.h | 2 +- kgantt/kgantt/KGanttItem.cpp | 10 +- kgantt/kgantt/xQGanttBarView.h | 4 +- kgantt/kgantt/xQGanttBarViewPort.cpp | 20 ++-- kgantt/kgantt/xQGanttBarViewPort.h | 6 +- kgantt/kgantt/xQGanttListView.h | 4 +- kgantt/kgantt/xQGanttListViewPort.cpp | 2 +- kgantt/kgantt/xQGanttListViewPort.h | 4 +- korganizer/aboutdata.cpp | 2 +- korganizer/actionmanager.cpp | 38 +++--- korganizer/agendaview.h | 2 +- korganizer/archivedialog.h | 2 +- korganizer/calendarview.cpp | 62 +++++----- korganizer/calendarview.h | 24 ++-- korganizer/datechecker.cpp | 4 +- korganizer/datechecker.h | 2 +- korganizer/datenavigator.h | 2 +- korganizer/datenavigatorcontainer.cpp | 2 +- korganizer/datenavigatorcontainer.h | 2 +- korganizer/docprefs.cpp | 2 +- korganizer/eventarchiver.h | 2 +- korganizer/exportwebdialog.h | 4 +- korganizer/filtereditdialog.cpp | 14 +-- korganizer/filtereditdialog.h | 2 +- korganizer/freebusymanager.cpp | 14 +-- korganizer/freebusymanager.h | 2 +- korganizer/freebusyurldialog.h | 8 +- korganizer/history.cpp | 12 +- korganizer/importdialog.cpp | 4 +- korganizer/incidencechanger.cpp | 8 +- .../interfaces/calendar/calendardecoration.h | 2 +- korganizer/interfaces/calendar/plugin.h | 2 +- korganizer/interfaces/korganizer/baseview.h | 4 +- .../interfaces/korganizer/incidencechangerbase.h | 2 +- korganizer/interfaces/korganizer/part.h | 6 +- korganizer/interfaces/korganizer/printplugin.h | 4 +- korganizer/journalentry.cpp | 20 ++-- korganizer/kdatenavigator.h | 2 +- korganizer/koagenda.cpp | 80 ++++++------- korganizer/koagenda.h | 8 +- korganizer/koagendaitem.cpp | 78 ++++++------- korganizer/koagendaitem.h | 14 +-- korganizer/koagendaview.cpp | 16 +-- korganizer/koagendaview.h | 10 +- korganizer/koattendeeeditor.cpp | 6 +- korganizer/koattendeeeditor.h | 4 +- korganizer/kocore.cpp | 38 +++--- korganizer/kodaymatrix.cpp | 8 +- korganizer/kodialogmanager.cpp | 16 +-- korganizer/koeditoralarms.cpp | 6 +- korganizer/koeditoralarms.h | 4 +- korganizer/koeditorattachments.cpp | 14 +-- korganizer/koeditorattachments.h | 8 +- korganizer/koeditordetails.cpp | 6 +- korganizer/koeditordetails.h | 4 +- korganizer/koeditorfreebusy.cpp | 16 +-- korganizer/koeditorfreebusy.h | 4 +- korganizer/koeditorgeneral.cpp | 12 +- korganizer/koeditorgeneral.h | 2 +- korganizer/koeditorgeneralevent.cpp | 10 +- korganizer/koeditorgeneralevent.h | 2 +- korganizer/koeditorgeneraljournal.cpp | 2 +- korganizer/koeditorgeneraljournal.h | 2 +- korganizer/koeditorgeneraltodo.cpp | 12 +- korganizer/koeditorgeneraltodo.h | 2 +- korganizer/koeditorrecurrence.cpp | 28 ++--- korganizer/koeditorrecurrence.h | 28 ++--- korganizer/koeventeditor.cpp | 8 +- korganizer/koeventpopupmenu.cpp | 4 +- korganizer/koeventview.cpp | 4 +- korganizer/koeventview.h | 2 +- korganizer/koeventviewer.cpp | 6 +- korganizer/koeventviewer.h | 2 +- korganizer/koeventviewerdialog.h | 4 +- korganizer/koglobals.cpp | 4 +- korganizer/kogroupware.cpp | 6 +- korganizer/koidentitymanager.h | 2 +- korganizer/koincidenceeditor.cpp | 10 +- korganizer/koincidencetooltip.h | 10 +- korganizer/kojournaleditor.cpp | 6 +- korganizer/kojournalview.cpp | 6 +- korganizer/kojournalview.h | 4 +- korganizer/kolistview.cpp | 10 +- korganizer/kolistview.h | 4 +- korganizer/komailclient.cpp | 2 +- korganizer/komonthview.cpp | 26 ++--- korganizer/komonthview.h | 4 +- korganizer/koprefs.cpp | 6 +- korganizer/koprefsdialog.cpp | 4 +- korganizer/koprefsdialog.h | 2 +- korganizer/korgac/alarmdialog.cpp | 4 +- korganizer/korgac/alarmdialog.h | 2 +- korganizer/korgac/alarmdockwindow.cpp | 2 +- korganizer/korgac/alarmdockwindow.h | 2 +- korganizer/korgac/koalarmclient.cpp | 2 +- korganizer/korgac/koalarmclient.h | 2 +- korganizer/korgac/korgacmain.cpp | 6 +- korganizer/korganizer.cpp | 4 +- korganizer/korganizer.h | 2 +- korganizer/korganizer_options.h | 14 +-- korganizer/korganizer_part.cpp | 2 +- korganizer/korganizerifaceimpl.h | 2 +- korganizer/kotimelineview.cpp | 18 +-- korganizer/kotimelineview.h | 4 +- korganizer/kotodoeditor.cpp | 12 +- korganizer/kotodoeditor.h | 2 +- korganizer/kotodoview.cpp | 50 ++++---- korganizer/kotodoview.h | 4 +- korganizer/kotodoviewitem.cpp | 2 +- korganizer/koviewmanager.cpp | 32 ++--- korganizer/kowhatsnextview.cpp | 6 +- korganizer/kowhatsnextview.h | 4 +- korganizer/kowindowlist.cpp | 6 +- korganizer/kowindowlist.h | 2 +- korganizer/multiagendaview.cpp | 22 ++-- korganizer/multiagendaview.h | 4 +- korganizer/navigatorbar.h | 4 +- korganizer/plugins/datenums/configdialog.h | 2 +- korganizer/plugins/exchange/exchange.cpp | 10 +- korganizer/plugins/exchange/exchangeconfig.h | 2 +- korganizer/plugins/exchange/exchangedialog.h | 2 +- korganizer/plugins/hebrew/configdialog.h | 2 +- korganizer/previewdialog.cpp | 8 +- korganizer/printing/calprinter.cpp | 2 +- korganizer/printing/calprinter.h | 2 +- korganizer/printing/calprintpluginbase.cpp | 12 +- korganizer/printing/calprintpluginbase.h | 2 +- korganizer/publishdialog.h | 2 +- korganizer/resourceview.cpp | 10 +- korganizer/resourceview.h | 2 +- korganizer/searchdialog.cpp | 2 +- korganizer/searchdialog.h | 2 +- korganizer/statusdialog.h | 2 +- korganizer/stdcalendar.cpp | 6 +- korganizer/templatemanagementdialog.cpp | 2 +- korganizer/timelabels.cpp | 2 +- korganizer/timelabels.h | 2 +- korganizer/timelineitem.cpp | 4 +- libkcal/assignmentvisitor.cpp | 24 ++-- libkcal/attachment.cpp | 4 +- libkcal/attachmenthandler.cpp | 24 ++-- libkcal/calendar.cpp | 10 +- libkcal/calendarlocal.cpp | 8 +- libkcal/calendarlocal.h | 4 +- libkcal/calendarnull.cpp | 2 +- libkcal/calendarnull.h | 6 +- libkcal/calendarresources.cpp | 26 ++--- libkcal/calendarresources.h | 10 +- libkcal/calformat.cpp | 4 +- libkcal/calhelper.cpp | 8 +- libkcal/calselectdialog.cpp | 2 +- libkcal/comparisonvisitor.cpp | 14 +-- libkcal/compat.cpp | 4 +- libkcal/confirmsavedialog.h | 2 +- libkcal/dndfactory.cpp | 14 +-- libkcal/dndfactory.h | 4 +- libkcal/filestorage.cpp | 2 +- libkcal/filestorage.h | 2 +- libkcal/freebusy.cpp | 2 +- libkcal/freebusyurlstore.cpp | 2 +- libkcal/icaldrag.h | 2 +- libkcal/icalformat.cpp | 30 ++--- libkcal/icalformatimpl.cpp | 42 +++---- libkcal/icalformatimpl.h | 4 +- libkcal/incidence.cpp | 22 ++-- libkcal/incidencebase.cpp | 6 +- libkcal/incidenceformatter.cpp | 34 +++--- libkcal/incidenceformatter.h | 2 +- libkcal/recurrence.cpp | 8 +- libkcal/recurrencerule.cpp | 4 +- libkcal/recurrencerule.h | 2 +- libkcal/resourcecached.cpp | 4 +- libkcal/resourcecachedconfig.h | 4 +- libkcal/resourcecalendar.cpp | 4 +- libkcal/resourcecalendar.h | 2 +- libkcal/resourcelocal.cpp | 4 +- libkcal/resourcelocalconfig.h | 2 +- libkcal/resourcelocaldir.cpp | 4 +- libkcal/resourcelocaldirconfig.h | 2 +- libkcal/scheduler.cpp | 26 ++--- libkcal/tests/readandwrite.cpp | 6 +- libkcal/tests/testcalendar.cpp | 2 +- libkcal/tests/testcalselectdialog.cpp | 2 +- libkcal/tests/testfields.cpp | 2 +- libkcal/tests/testincidence.cpp | 2 +- libkcal/tests/testrecurprevious.cpp | 8 +- libkcal/tests/testrecurrence.cpp | 8 +- libkcal/tests/testrecurrencetype.cpp | 8 +- libkcal/tests/testrecurson.cpp | 8 +- libkcal/tests/testresource.cpp | 10 +- libkcal/tests/testvcalexport.cpp | 6 +- libkcal/vcaldrag.h | 2 +- libkcal/vcalformat.cpp | 126 ++++++++++---------- 331 files changed, 1581 insertions(+), 1581 deletions(-) diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp index 31d8898d7..e26f36403 100644 --- a/kalarm/alarmcalendar.cpp +++ b/kalarm/alarmcalendar.cpp @@ -75,7 +75,7 @@ static const TQString calendarNames[AlarmCalendar::NCALS] = { }; static KStaticDeleter calendarDeleter[AlarmCalendar::NCALS]; // ensure that the calendar destructors are called -AlarmCalendar* AlarmCalendar::mCalendars[NCALS] = { 0, 0, 0, 0 }; +AlarmCalendar* AlarmCalendar::mCalendars[NCALS] = { nullptr, nullptr, nullptr, nullptr }; /****************************************************************************** @@ -177,7 +177,7 @@ void AlarmCalendar::terminateCalendars() for (int i = 0; i < NCALS; ++i) { calendarDeleter[i].destructObject(); - mCalendars[i] = 0; + mCalendars[i] = nullptr; } } @@ -190,11 +190,11 @@ AlarmCalendar* AlarmCalendar::calendarOpen(CalID id) { AlarmCalendar* cal = mCalendars[id]; if (!cal->mPurgeDays) - return 0; // all events are automatically purged from the calendar + return nullptr; // all events are automatically purged from the calendar if (cal->open()) return cal; kdError(5950) << "AlarmCalendar::calendarOpen(" << calendarNames[id] << "): open error" << endl; - return 0; + return nullptr; } /****************************************************************************** @@ -204,7 +204,7 @@ AlarmCalendar* AlarmCalendar::calendarOpen(CalID id) const KCal::Event* AlarmCalendar::getEvent(const TQString& uniqueID) { if (uniqueID.isEmpty()) - return 0; + return nullptr; CalID calID; switch (KAEvent::uidStatus(uniqueID)) { @@ -213,11 +213,11 @@ const KCal::Event* AlarmCalendar::getEvent(const TQString& uniqueID) case KAEvent::EXPIRED: calID = EXPIRED; break; case KAEvent::DISPLAYING: calID = DISPLAY; break; default: - return 0; + return nullptr; } AlarmCalendar* cal = calendarOpen(calID); if (!cal) - return 0; + return nullptr; return cal->event(uniqueID); } @@ -230,7 +230,7 @@ const KCal::Event* AlarmCalendar::getEvent(const TQString& uniqueID) */ AlarmCalendar::AlarmCalendar(const TQString& path, CalID type, const TQString& icalPath, const TQString& configKey) - : mCalendar(0), + : mCalendar(nullptr), mConfigKey(icalPath.isNull() ? TQString() : configKey), mType(eventTypes[type]), mPurgeDays(-1), // default to not purging @@ -284,7 +284,7 @@ bool AlarmCalendar::open() if (!mOpen) { delete mCalendar; - mCalendar = 0; + mCalendar = nullptr; } return mOpen; } @@ -321,7 +321,7 @@ int AlarmCalendar::load() if (!TDEIO::NetAccess::download(mUrl, tmpFile, MainWindow::mainMainWindow())) { kdError(5950) << "AlarmCalendar::load(): Load failure" << endl; - KMessageBox::error(0, i18n("Cannot open calendar:\n%1").arg(mUrl.prettyURL())); + KMessageBox::error(nullptr, i18n("Cannot open calendar:\n%1").arg(mUrl.prettyURL())); return -1; } kdDebug(5950) << "AlarmCalendar::load(): --- Downloaded to " << tmpFile << endl; @@ -338,11 +338,11 @@ int AlarmCalendar::load() if (!fi.size()) return 0; // file is zero length kdError(5950) << "AlarmCalendar::load(): Error loading calendar file '" << tmpFile << "'" << endl; - KMessageBox::error(0, i18n("Error loading calendar:\n%1\n\nPlease fix or delete the file.").arg(mUrl.prettyURL())); + KMessageBox::error(nullptr, i18n("Error loading calendar:\n%1\n\nPlease fix or delete the file.").arg(mUrl.prettyURL())); // load() could have partially populated the calendar, so clear it out mCalendar->close(); delete mCalendar; - mCalendar = 0; + mCalendar = nullptr; return -1; } if (!mLocalFile.isEmpty()) @@ -383,7 +383,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile) if (!mCalendar->save(saveFilename, new ICalFormat)) { kdError(5950) << "AlarmCalendar::saveCal(" << saveFilename << "): failed." << endl; - KMessageBox::error(0, i18n("Failed to save calendar to\n'%1'").arg(mICalUrl.prettyURL())); + KMessageBox::error(nullptr, i18n("Failed to save calendar to\n'%1'").arg(mICalUrl.prettyURL())); return false; } @@ -392,7 +392,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile) if (!TDEIO::NetAccess::upload(saveFilename, mICalUrl, MainWindow::mainMainWindow())) { kdError(5950) << "AlarmCalendar::saveCal(" << saveFilename << "): upload failed." << endl; - KMessageBox::error(0, i18n("Cannot upload calendar to\n'%1'").arg(mICalUrl.prettyURL())); + KMessageBox::error(nullptr, i18n("Cannot upload calendar to\n'%1'").arg(mICalUrl.prettyURL())); return false; } } @@ -431,7 +431,7 @@ void AlarmCalendar::close() { mCalendar->close(); delete mCalendar; - mCalendar = 0; + mCalendar = nullptr; } mOpen = false; } @@ -500,7 +500,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent) bool saveTemplate = false; AlarmCalendar* active = activeCalendar(); AlarmCalendar* expired = expiredCalendar(); - AlarmCalendar* templat = 0; + AlarmCalendar* templat = nullptr; AlarmCalendar* acal; Event::List events = cal.rawEvents(); for (Event::List::ConstIterator it = events.begin(); it != events.end(); ++it) @@ -730,7 +730,7 @@ void AlarmCalendar::startPurgeTimer() Event* AlarmCalendar::addEvent(KAEvent& event, bool useEventID) { if (!mOpen) - return 0; + return nullptr; TQString id = event.id(); Event* kcalEvent = new Event; if (mType == KAEvent::ACTIVE) @@ -817,7 +817,7 @@ void AlarmCalendar::emitEmptyStatus() */ KCal::Event* AlarmCalendar::event(const TQString& uniqueID) { - return mCalendar ? mCalendar->event(uniqueID) : 0; + return mCalendar ? mCalendar->event(uniqueID) : nullptr; } /****************************************************************************** diff --git a/kalarm/alarmevent.cpp b/kalarm/alarmevent.cpp index db345243f..0cfcff864 100644 --- a/kalarm/alarmevent.cpp +++ b/kalarm/alarmevent.cpp @@ -200,7 +200,7 @@ void KAEvent::copy(const KAEvent& event) if (event.mRecurrence) mRecurrence = new KARecurrence(*event.mRecurrence); else - mRecurrence = 0; + mRecurrence = nullptr; } /****************************************************************************** @@ -2192,7 +2192,7 @@ void KAEvent::setRecurrence(const KARecurrence& recurrence) mRecurrence->setFloats(mStartDateTime.isDateOnly()); } else - mRecurrence = 0; + mRecurrence = nullptr; // Adjust sub-repetition values to fit the recurrence setRepetition(mRepeatInterval, mRepeatCount); @@ -2408,7 +2408,7 @@ bool KAEvent::setRecur(RecurrenceRule::PeriodType recurType, int freq, int count void KAEvent::clearRecur() { delete mRecurrence; - mRecurrence = 0; + mRecurrence = nullptr; mRepeatInterval = 0; mRepeatCount = 0; mNextRepeat = 0; @@ -3194,7 +3194,7 @@ void KAAlarm::dumpDebug() const { kdDebug(5950) << "KAAlarm dump:" << endl; KAAlarmEventBase::dumpDebug(); - const char* altype = 0; + const char* altype = nullptr; switch (mType) { case MAIN__ALARM: altype = "MAIN"; break; diff --git a/kalarm/alarmevent.h b/kalarm/alarmevent.h index 6bda36d95..537c62e1c 100644 --- a/kalarm/alarmevent.h +++ b/kalarm/alarmevent.h @@ -309,11 +309,11 @@ class KAEvent : public KAAlarmEventBase LIMIT_REMINDER }; - KAEvent() : mRevision(0), mRecurrence(0), mAlarmCount(0) { } + KAEvent() : mRevision(0), mRecurrence(nullptr), mAlarmCount(0) { } KAEvent(const TQDateTime& dt, const TQString& message, const TQColor& bg, const TQColor& fg, const TQFont& f, Action action, int lateCancel, int flags) - : mRecurrence(0) { set(dt, message, bg, fg, f, action, lateCancel, flags); } - explicit KAEvent(const KCal::Event& e) : mRecurrence(0) { set(e); } - KAEvent(const KAEvent& e) : KAAlarmEventBase(e), mRecurrence(0) { copy(e); } + : mRecurrence(nullptr) { set(dt, message, bg, fg, f, action, lateCancel, flags); } + explicit KAEvent(const KCal::Event& e) : mRecurrence(nullptr) { set(e); } + KAEvent(const KAEvent& e) : KAAlarmEventBase(e), mRecurrence(nullptr) { copy(e); } ~KAEvent() { delete mRecurrence; } KAEvent& operator=(const KAEvent& e) { if (&e != this) copy(e); return *this; } void set(const KCal::Event&); @@ -377,7 +377,7 @@ class KAEvent : public KAAlarmEventBase bool reminderDeferral() const { return mDeferral == REMINDER_DEFERRAL; } int reminderArchived() const { return mArchiveReminderMinutes; } DateTime deferDateTime() const { return mDeferralTime; } - DateTime deferralLimit(DeferLimitType* = 0) const; + DateTime deferralLimit(DeferLimitType* = nullptr) const; int deferDefaultMinutes() const { return mDeferDefaultMinutes; } DateTime displayDateTime() const; const TQString& messageFileOrCommand() const { return mText; } diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp index d0e5ab0f5..b7cb8fa79 100644 --- a/kalarm/alarmlistview.cpp +++ b/kalarm/alarmlistview.cpp @@ -155,7 +155,7 @@ AlarmListView::AlarmListView(const TQValueList& order, TQWidget* parent, co AlarmListView::~AlarmListView() { delete mTooltip; - mTooltip = 0; + mTooltip = nullptr; mInstanceList.remove(this); } @@ -280,7 +280,7 @@ void AlarmListView::addEvent(const KAEvent& event, EventListViewBase* view) AlarmListViewItem* AlarmListView::addEntry(const KAEvent& event, const TQDateTime& now, bool setSize, bool reselect) { if (!mShowExpired && event.expired()) - return 0; + return nullptr; AlarmListViewItem* item = new AlarmListViewItem(this, event, now); return static_cast(EventListViewBase::addEntry(item, setSize, reselect)); } diff --git a/kalarm/alarmlistview.h b/kalarm/alarmlistview.h index 9da667ed1..4c8904569 100644 --- a/kalarm/alarmlistview.h +++ b/kalarm/alarmlistview.h @@ -71,7 +71,7 @@ class AlarmListView : public EventListViewBase COLUMN_COUNT }; - AlarmListView(const TQValueList& order, TQWidget* parent = 0, const char* name = 0); + AlarmListView(const TQValueList& order, TQWidget* parent = nullptr, const char* name = nullptr); ~AlarmListView(); void showExpired(bool show) { mShowExpired = show; } bool showingExpired() const { return mShowExpired; } diff --git a/kalarm/alarmtext.h b/kalarm/alarmtext.h index e5eb7d974..af2b82eef 100644 --- a/kalarm/alarmtext.h +++ b/kalarm/alarmtext.h @@ -46,7 +46,7 @@ class AlarmText bool isEmail() const { return mIsEmail; } bool isScript() const { return mIsScript; } unsigned long kmailSerialNumber() const { return mKMailSerialNum; } - static TQString summary(const KAEvent&, int maxLines = 1, bool* truncated = 0); + static TQString summary(const KAEvent&, int maxLines = 1, bool* truncated = nullptr); static bool checkIfEmail(const TQString&); static TQString emailHeaders(const TQString&, bool subjectOnly); static TQString fromCalendarText(const TQString&, bool& email); diff --git a/kalarm/alarmtimewidget.cpp b/kalarm/alarmtimewidget.cpp index 6586b8968..4e8151756 100644 --- a/kalarm/alarmtimewidget.cpp +++ b/kalarm/alarmtimewidget.cpp @@ -122,7 +122,7 @@ void AlarmTimeWidget::init(int mode) if (mode & DEFER_TIME) { mAnyTimeAllowed = false; - mAnyTimeCheckBox = 0; + mAnyTimeCheckBox = nullptr; } else { @@ -224,7 +224,7 @@ DateTime AlarmTimeWidget::getDateTime(int* minsFromNow, bool checkExpired, bool if (minsFromNow) *minsFromNow = 0; if (errorWidget) - *errorWidget = 0; + *errorWidget = nullptr; TQTime nowt = TQTime::currentTime(); TQDateTime now(TQDate::currentDate(), TQTime(nowt.hour(), nowt.minute())); if (mAtTimeRadio->isOn()) diff --git a/kalarm/alarmtimewidget.h b/kalarm/alarmtimewidget.h index d384c0542..bdf5a8a6f 100644 --- a/kalarm/alarmtimewidget.h +++ b/kalarm/alarmtimewidget.h @@ -41,9 +41,9 @@ class AlarmTimeWidget : public ButtonGroup DEFER_TIME = 0x01, // "Defer to ..." NARROW = 0x02 // make a narrow widget }; - AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidget* parent = 0, const char* name = 0); - AlarmTimeWidget(int mode, TQWidget* parent = 0, const char* name = 0); - DateTime getDateTime(int* minsFromNow = 0, bool checkExpired = true, bool showErrorMessage = true, TQWidget** errorWidget = 0) const; + AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidget* parent = nullptr, const char* name = nullptr); + AlarmTimeWidget(int mode, TQWidget* parent = nullptr, const char* name = nullptr); + DateTime getDateTime(int* minsFromNow = nullptr, bool checkExpired = true, bool showErrorMessage = true, TQWidget** errorWidget = nullptr) const; void setDateTime(const DateTime&); void setMinDateTimeIsCurrent(); void setMinDateTime(const TQDateTime& = TQDateTime()); diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp index 02ba99870..b7f9de748 100644 --- a/kalarm/birthdaydlg.cpp +++ b/kalarm/birthdaydlg.cpp @@ -67,12 +67,12 @@ class AddresseeItem : public TQListViewItem }; -const TDEABC::AddressBook* BirthdayDlg::mAddressBook = 0; +const TDEABC::AddressBook* BirthdayDlg::mAddressBook = nullptr; BirthdayDlg::BirthdayDlg(TQWidget* parent) : KDialogBase(KDialogBase::Plain, i18n("Import Birthdays From KAddressBook"), Ok|Cancel, Ok, parent, "BirthdayDlg"), - mSpecialActionsButton(0) + mSpecialActionsButton(nullptr) { TQWidget* topWidget = plainPage(); TQBoxLayout* topLayout = new TQVBoxLayout(topWidget); @@ -213,7 +213,7 @@ void BirthdayDlg::close() if (mAddressBook) { TDEABC::StdAddressBook::close(); - mAddressBook = 0; + mAddressBook = nullptr; } } @@ -253,7 +253,7 @@ void BirthdayDlg::updateSelectionList() bool alarmExists = (messageList.find(text) != messageList.end()); // Check if the birthday is already in the selection list bool inSelectionList = false; - AddresseeItem* item = 0; + AddresseeItem* item = nullptr; for (TQListViewItem* qitem = mAddresseeList->firstChild(); qitem; qitem = qitem->nextSibling()) { item = dynamic_cast(qitem); diff --git a/kalarm/birthdaydlg.h b/kalarm/birthdaydlg.h index aa7c66aec..352003fb4 100644 --- a/kalarm/birthdaydlg.h +++ b/kalarm/birthdaydlg.h @@ -45,7 +45,7 @@ class BirthdayDlg : public KDialogBase TQ_OBJECT public: - BirthdayDlg(TQWidget* parent = 0); + BirthdayDlg(TQWidget* parent = nullptr); TQValueList events() const; static void close(); @@ -82,9 +82,9 @@ class BLineEdit : public TQLineEdit TQ_OBJECT public: - BLineEdit(TQWidget* parent = 0, const char* name = 0) + BLineEdit(TQWidget* parent = nullptr, const char* name = nullptr) : TQLineEdit(parent, name) {} - BLineEdit(const TQString& text, TQWidget* parent = 0, const char* name = 0) + BLineEdit(const TQString& text, TQWidget* parent = nullptr, const char* name = nullptr) : TQLineEdit(text, parent, name) {} signals: void focusLost(); @@ -97,7 +97,7 @@ class BListView : public TDEListView TQ_OBJECT public: - BListView(TQWidget* parent = 0, const char* name = 0); + BListView(TQWidget* parent = nullptr, const char* name = nullptr); public slots: virtual void slotSelectAll() { selectAll(true); } virtual void slotDeselect() { selectAll(false); } diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp index cecb15a79..df30f1e6a 100644 --- a/kalarm/daemon.cpp +++ b/kalarm/daemon.cpp @@ -64,13 +64,13 @@ class NotificationHandler : public TQObject, virtual public AlarmGuiIface }; -Daemon* Daemon::mInstance = 0; -NotificationHandler* Daemon::mDcopHandler = 0; +Daemon* Daemon::mInstance = nullptr; +NotificationHandler* Daemon::mDcopHandler = nullptr; TQValueList Daemon::mQueuedEvents; TQValueList Daemon::mSavingEvents; -TQTimer* Daemon::mStartTimer = 0; -TQTimer* Daemon::mRegisterTimer = 0; -TQTimer* Daemon::mStatusTimer = 0; +TQTimer* Daemon::mStartTimer = nullptr; +TQTimer* Daemon::mRegisterTimer = nullptr; +TQTimer* Daemon::mStatusTimer = nullptr; int Daemon::mStatusTimerCount = 0; int Daemon::mStatusTimerInterval; int Daemon::mStartTimeout = 0; @@ -137,7 +137,7 @@ bool Daemon::start() TQString execStr = locate("exe", TQString::fromLatin1(DAEMON_APP_NAME)); if (execStr.isEmpty()) { - KMessageBox::error(0, i18n("Alarm daemon not found.")); + KMessageBox::error(nullptr, i18n("Alarm daemon not found.")); kdError() << "Daemon::startApp(): " DAEMON_APP_NAME " not found" << endl; return false; } @@ -213,7 +213,7 @@ void Daemon::registrationResult(bool reregister, int result, int version) { kdDebug(5950) << "Daemon::registrationResult(" << reregister << ") version: " << version << endl; delete mRegisterTimer; - mRegisterTimer = 0; + mRegisterTimer = nullptr; bool failed = false; TQString errmsg; if (version && version != DAEMON_VERSION_NUM) @@ -234,7 +234,7 @@ void Daemon::registrationResult(bool reregister, int result, int version) // find the KAlarm executable so won't be able to restart KAlarm if // KAlarm exits. kdError(5950) << "Daemon::registrationResult(" << reregister << "): registerApp dcop call: " << tdeApp->aboutData()->appName() << " not found" << endl; - KMessageBox::error(0, i18n("Alarms will be disabled if you stop KAlarm.\n" + KMessageBox::error(nullptr, i18n("Alarms will be disabled if you stop KAlarm.\n" "(Installation or configuration error: %1 cannot locate %2 executable.)") .arg(TQString::fromLatin1(DAEMON_APP_NAME)) .arg(tdeApp->aboutData()->appName())); @@ -263,7 +263,7 @@ void Daemon::registrationResult(bool reregister, int result, int version) if (!mRegisterFailMsg) { mRegisterFailMsg = true; - KMessageBox::error(0, errmsg); + KMessageBox::error(nullptr, errmsg); } } return; @@ -300,11 +300,11 @@ void Daemon::checkIfStarted() break; } delete mStartTimer; - mStartTimer = 0; + mStartTimer = nullptr; if (err) { kdError(5950) << "Daemon::checkIfStarted(): failed to start daemon" << endl; - KMessageBox::error(0, i18n("Cannot enable alarms:\nFailed to start Alarm Daemon (%1)").arg(TQString::fromLatin1(DAEMON_APP_NAME))); + KMessageBox::error(nullptr, i18n("Cannot enable alarms:\nFailed to start Alarm Daemon (%1)").arg(TQString::fromLatin1(DAEMON_APP_NAME))); } } diff --git a/kalarm/daemon.h b/kalarm/daemon.h index b74410389..0238de0e7 100644 --- a/kalarm/daemon.h +++ b/kalarm/daemon.h @@ -122,7 +122,7 @@ class AlarmEnableAction : public TDEToggleAction TQ_OBJECT public: - AlarmEnableAction(int accel, TQObject* parent, const char* name = 0); + AlarmEnableAction(int accel, TQObject* parent, const char* name = nullptr); public slots: void setCheckedActual(bool); // set state and emit switched() signal virtual void setChecked(bool); // request state change and emit userClicked() signal diff --git a/kalarm/deferdlg.h b/kalarm/deferdlg.h index 70fb1e6eb..e4a51e89f 100644 --- a/kalarm/deferdlg.h +++ b/kalarm/deferdlg.h @@ -33,7 +33,7 @@ class DeferAlarmDlg : public KDialogBase public: DeferAlarmDlg(const TQString& caption, const DateTime& initialDT, - bool cancelButton, TQWidget* parent = 0, const char* name = 0); + bool cancelButton, TQWidget* parent = nullptr, const char* name = nullptr); void setLimit(const DateTime&); DateTime setLimit(const TQString& eventID); const DateTime& getDateTime() const { return mAlarmDateTime; } diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp index 5652ba660..c1746e4dc 100644 --- a/kalarm/editdlg.cpp +++ b/kalarm/editdlg.cpp @@ -97,7 +97,7 @@ static const int maxDelayTime = 99*60 + 59; // < 100 hours class PickAlarmFileRadio : public PickFileRadio { public: - PickAlarmFileRadio(const TQString& text, TQButtonGroup* parent, const char* name = 0) + PickAlarmFileRadio(const TQString& text, TQButtonGroup* parent, const char* name = nullptr) : PickFileRadio(text, parent, name) { } virtual TQString pickFile() // called when browse button is pressed to select a file to display { @@ -114,7 +114,7 @@ class PickAlarmFileRadio : public PickFileRadio class PickLogFileRadio : public PickFileRadio { public: - PickLogFileRadio(TQPushButton* b, LineEdit* e, const TQString& text, TQButtonGroup* parent, const char* name = 0) + PickLogFileRadio(TQPushButton* b, LineEdit* e, const TQString& text, TQButtonGroup* parent, const char* name = nullptr) : PickFileRadio(b, e, text, parent, name) { } virtual TQString pickFile() // called when browse button is pressed to select a log file { @@ -173,19 +173,19 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par mMainPageShown(false), mRecurPageShown(false), mRecurSetDefaultEndDate(true), - mTemplateName(0), - mSpecialActionsButton(0), + mTemplateName(nullptr), + mSpecialActionsButton(nullptr), mReminderDeferral(false), mReminderArchived(false), - mEmailRemoveButton(0), - mDeferGroup(0), - mTimeWidget(0), - mShowInKorganizer(0), + mEmailRemoveButton(nullptr), + mDeferGroup(nullptr), + mTimeWidget(nullptr), + mShowInKorganizer(nullptr), mDeferGroupHeight(0), mTemplate(Template), mDesiredReadOnly(readOnly), mReadOnly(readOnly), - mSavedEvent(0) + mSavedEvent(nullptr) { setButtonText(Default, i18n("Load Template...")); TQVBox* mainWidget = new TQVBox(this); @@ -397,7 +397,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par mTemplateName->setFocus(); // Save the initial state of all controls so that we can later tell if they have changed - saveState((event && (mTemplate || !event->isTemplate())) ? event : 0); + saveState((event && (mTemplate || !event->isTemplate())) ? event : nullptr); // Note the current desktop so that the dialog can be shown on it. // If a main window is visible, the dialog will by KDE default always appear on its @@ -446,7 +446,7 @@ void EditAlarmDlg::initDisplayAlarms(TQWidget* parent) mFontColourButton->setMaximumHeight(mFontColourButton->sizeHint().height()); frameLayout->addWidget(mFontColourButton); - TQHBoxLayout* layout = new TQHBoxLayout(frameLayout, 0, 0); + TQHBoxLayout* layout = new TQHBoxLayout(frameLayout, 0, nullptr); mBgColourBox = new TQHBox(mDisplayAlarmsFrame); mBgColourBox->setSpacing(spacingHint()); layout->addWidget(mBgColourBox); @@ -564,7 +564,7 @@ void EditAlarmDlg::initEmail(TQWidget* parent) TQGridLayout* grid = new TQGridLayout(layout, 3, 3, spacingHint()); grid->setColStretch(1, 1); - mEmailFromList = 0; + mEmailFromList = nullptr; if (Preferences::emailFrom() == Preferences::MAIL_FROM_KMAIL) { // Email sender identity @@ -986,7 +986,7 @@ CheckBox* EditAlarmDlg::createConfirmAckCheckbox(TQWidget* parent, const char* n void EditAlarmDlg::saveState(const KAEvent* event) { delete mSavedEvent; - mSavedEvent = 0; + mSavedEvent = nullptr; if (event) mSavedEvent = new KAEvent(*event); if (mTemplate) @@ -1025,7 +1025,7 @@ void EditAlarmDlg::saveState(const KAEvent* event) mSavedEmailAttach += mEmailAttachList->text(i); mSavedEmailBcc = mEmailBcc->isChecked(); if (mTimeWidget) - mSavedDateTime = mTimeWidget->getDateTime(0, false, false); + mSavedDateTime = mTimeWidget->getDateTime(nullptr, false, false); mSavedLateCancel = mLateCancel->minutes(); mSavedAutoClose = mLateCancel->isAutoClose(); if (mShowInKorganizer) @@ -1057,7 +1057,7 @@ bool EditAlarmDlg::stateChanged() const return true; } else - if (mSavedDateTime != mTimeWidget->getDateTime(0, false, false)) + if (mSavedDateTime != mTimeWidget->getDateTime(nullptr, false, false)) return true; if (mSavedTypeRadio != mActionGroup->selected() || mSavedLateCancel != mLateCancel->minutes() @@ -1364,7 +1364,7 @@ void EditAlarmDlg::slotOk() else { TQWidget* errWidget; - mAlarmDateTime = mTimeWidget->getDateTime(0, !timedRecurrence, false, &errWidget); + mAlarmDateTime = mTimeWidget->getDateTime(nullptr, !timedRecurrence, false, &errWidget); if (errWidget) { // It's more than just an existing deferral being changed, so the time matters @@ -1486,7 +1486,7 @@ void EditAlarmDlg::slotTry() { theApp()->commandMessage((ShellProcess*)proc, this); KMessageBox::information(this, i18n("Command executed:\n%1").arg(text)); - theApp()->commandMessage((ShellProcess*)proc, 0); + theApp()->commandMessage((ShellProcess*)proc, nullptr); } else if (mEmailRadio->isOn()) { @@ -1529,7 +1529,7 @@ void EditAlarmDlg::slotEditDeferral() int repeatInterval; int repeatCount = mRecurrenceEdit->subRepeatCount(&repeatInterval); DateTime start = mSavedEvent->recurs() ? (mExpiredRecurrence ? DateTime() : mSavedEvent->mainDateTime()) - : mTimeWidget->getDateTime(0, !repeatCount, !mExpiredRecurrence); + : mTimeWidget->getDateTime(nullptr, !repeatCount, !mExpiredRecurrence); if (!start.isValid()) { if (!mExpiredRecurrence) @@ -1611,7 +1611,7 @@ void EditAlarmDlg::slotShowRecurrenceEdit() if (!mReadOnly && !mTemplate) { TQDateTime now = TQDateTime::currentDateTime(); - mAlarmDateTime = mTimeWidget->getDateTime(0, false, false); + mAlarmDateTime = mTimeWidget->getDateTime(nullptr, false, false); bool expired = (mAlarmDateTime.dateTime() < now); if (mRecurSetDefaultEndDate) { @@ -1641,7 +1641,7 @@ void EditAlarmDlg::slotRecurTypeChange(int repeatType) mTimeWidget->enableAnyTime(!recurs || repeatType != RecurrenceEdit::SUBDAILY); if (atLogin) { - mAlarmDateTime = mTimeWidget->getDateTime(0, false, false); + mAlarmDateTime = mTimeWidget->getDateTime(nullptr, false, false); mRecurrenceEdit->setEndDateTime(mAlarmDateTime.dateTime()); } mReminder->enableOnceOnly(recurs && !atLogin); @@ -1773,7 +1773,7 @@ bool EditAlarmDlg::checkEmailData() void EditAlarmDlg::slotAlarmTypeChanged(int) { bool displayAlarm = false; - TQWidget* focus = 0; + TQWidget* focus = nullptr; if (mMessageRadio->isOn()) { mFileBox->hide(); diff --git a/kalarm/editdlg.h b/kalarm/editdlg.h index f6e2b16a3..25da9d720 100644 --- a/kalarm/editdlg.h +++ b/kalarm/editdlg.h @@ -63,13 +63,13 @@ class EditAlarmDlg : public KDialogBase enum MessageType { MESSAGE, FILE }; enum CmdLogType { DISCARD_OUTPUT, LOG_TO_FILE, EXEC_IN_TERMINAL }; - EditAlarmDlg(bool Template, const TQString& caption, TQWidget* parent = 0, const char* name = 0, - const KAEvent* = 0, bool readOnly = false); + EditAlarmDlg(bool Template, const TQString& caption, TQWidget* parent = nullptr, const char* name = nullptr, + const KAEvent* = nullptr, bool readOnly = false); virtual ~EditAlarmDlg(); bool getEvent(KAEvent&); void setAction(KAEvent::Action, const AlarmText& = AlarmText()); - static CheckBox* createConfirmAckCheckbox(TQWidget* parent, const char* name = 0); + static CheckBox* createConfirmAckCheckbox(TQWidget* parent, const char* name = nullptr); static TQString i18n_ConfirmAck(); // plain text of 'Confirm acknowledgement' checkbox static TQString i18n_k_ConfirmAck(); // text of 'Confirm acknowledgement' checkbox, with 'k' shortcut @@ -122,7 +122,7 @@ class EditAlarmDlg : public KDialogBase int getAlarmFlags() const; bool checkText(TQString& result, bool showErrorMessage = true) const; void setSoundPicker(); - void setRecurTabTitle(const KAEvent* = 0); + void setRecurTabTitle(const KAEvent* = nullptr); bool checkCommandData(); bool checkEmailData(); diff --git a/kalarm/editdlgprivate.h b/kalarm/editdlgprivate.h index f44824fb8..8cb80bf43 100644 --- a/kalarm/editdlgprivate.h +++ b/kalarm/editdlgprivate.h @@ -29,7 +29,7 @@ class PageFrame : public TQFrame TQ_OBJECT public: - PageFrame(TQWidget* parent = 0, const char* name = 0) : TQFrame(parent, name) { } + PageFrame(TQWidget* parent = nullptr, const char* name = nullptr) : TQFrame(parent, name) { } protected: virtual void showEvent(TQShowEvent*) { emit shown(); } signals: @@ -41,7 +41,7 @@ class TextEdit : public KTextEdit TQ_OBJECT public: - TextEdit(TQWidget* parent, const char* name = 0); + TextEdit(TQWidget* parent, const char* name = nullptr); protected: virtual void dragEnterEvent(TQDragEnterEvent*); }; diff --git a/kalarm/emailidcombo.h b/kalarm/emailidcombo.h index 630212d5a..058507b7c 100644 --- a/kalarm/emailidcombo.h +++ b/kalarm/emailidcombo.h @@ -30,7 +30,7 @@ class EmailIdCombo : public KPIM::IdentityCombo TQ_OBJECT public: - explicit EmailIdCombo(KPIM::IdentityManager*, TQWidget* parent = 0, const char* name = 0); + explicit EmailIdCombo(KPIM::IdentityManager*, TQWidget* parent = nullptr, const char* name = nullptr); void setReadOnly(bool ro) { mReadOnly = ro; } protected: virtual void mousePressEvent(TQMouseEvent*); diff --git a/kalarm/eventlistviewbase.cpp b/kalarm/eventlistviewbase.cpp index 2425a11b7..37642c89a 100644 --- a/kalarm/eventlistviewbase.cpp +++ b/kalarm/eventlistviewbase.cpp @@ -47,7 +47,7 @@ class EventListWhatsThisBase : public TQWhatsThis EventListViewBase::EventListViewBase(TQWidget* parent, const char* name) : TDEListView(parent, name), - mFind(0), + mFind(nullptr), mLastColumn(-1), mLastColumnHeaderWidth(0) { @@ -95,7 +95,7 @@ EventListViewItemBase* EventListViewBase::getEntry(const TQString& eventID) cons if (item->event().id() == eventID) return item; } - return 0; + return nullptr; } /****************************************************************************** @@ -150,7 +150,7 @@ void EventListViewBase::deleteEvent(const TQString& eventID, const InstanceList& EventListViewItemBase* EventListViewBase::addEntry(const KAEvent& event, bool setSize, bool reselect) { if (!shouldShowEvent(event)) - return 0; + return nullptr; return addEntry(createItem(event), setSize, reselect); } @@ -251,7 +251,7 @@ bool EventListViewBase::anySelected() const const KAEvent* EventListViewBase::selectedEvent() const { EventListViewItemBase* sel = selectedItem(); - return sel ? &sel->event() : 0; + return sel ? &sel->event() : nullptr; } /****************************************************************************** @@ -265,13 +265,13 @@ EventListViewItemBase* EventListViewBase::selectedItem() const if (selectionMode() == TQListView::Single) return (EventListViewItemBase*)TDEListView::selectedItem(); - TQListViewItem* item = 0; + TQListViewItem* item = nullptr; for (TQListViewItem* it = firstChild(); it; it = it->nextSibling()) { if (isSelected(it)) { if (item) - return 0; + return nullptr; item = it; } } diff --git a/kalarm/eventlistviewbase.h b/kalarm/eventlistviewbase.h index 18d1a7716..6e5b9cbc0 100644 --- a/kalarm/eventlistviewbase.h +++ b/kalarm/eventlistviewbase.h @@ -42,7 +42,7 @@ class EventListViewBase : public TDEListView typedef TQValueListIterator InstanceListIterator; typedef TQValueListConstIterator InstanceListConstIterator; - EventListViewBase(TQWidget* parent = 0, const char* name = 0); + EventListViewBase(TQWidget* parent = nullptr, const char* name = nullptr); virtual ~EventListViewBase() { } EventListViewItemBase* getEntry(const TQString& eventID) const; void addEvent(const KAEvent& e) { addEvent(e, instances(), this); } diff --git a/kalarm/find.cpp b/kalarm/find.cpp index 9e30388ed..4e6a896e8 100644 --- a/kalarm/find.cpp +++ b/kalarm/find.cpp @@ -52,8 +52,8 @@ static long FIND_KALARM_OPTIONS = FIND_LIVE | FIND_EXPIRED | FIND_MESSAGE | FIND Find::Find(EventListViewBase* parent) : TQObject(parent), mListView(parent), - mDialog(0), - mFind(0), + mDialog(nullptr), + mFind(nullptr), mOptions(0) { } @@ -62,7 +62,7 @@ Find::~Find() { delete mDialog; // automatically set to 0 delete mFind; - mFind = 0; + mFind = nullptr; } /****************************************************************************** @@ -284,7 +284,7 @@ void Find::findNext(bool forward, bool sort, bool checkEnd, bool fromCurrent) if (sort) mListView->sort(); // ensure the whole list is sorted, not just the visible items - EventListViewItemBase* item = mNoCurrentItem ? 0 : mListView->currentItem(); + EventListViewItemBase* item = mNoCurrentItem ? nullptr : mListView->currentItem(); if (!fromCurrent) item = nextItem(item, forward); diff --git a/kalarm/fontcolour.cpp b/kalarm/fontcolour.cpp index 64a8cdce5..0cf314549 100644 --- a/kalarm/fontcolour.cpp +++ b/kalarm/fontcolour.cpp @@ -43,8 +43,8 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name, const TQString& frameLabel, bool editColours, bool fg, bool defaultFont, int visibleListSize) : TQWidget(parent, name), - mFgColourButton(0), - mRemoveColourButton(0), + mFgColourButton(nullptr), + mRemoveColourButton(nullptr), mColourList(Preferences::messageColours()), mReadOnly(false) { @@ -114,7 +114,7 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name, layout->addWidget(new TQWidget(page)); // left adjust the widget } else - mDefaultFont = 0; + mDefaultFont = nullptr; mFontChooser = new TDEFontChooser(page, name, onlyFixed, fontList, false, visibleListSize); mFontChooser->installEventFilter(this); // for read-only mode diff --git a/kalarm/fontcolour.h b/kalarm/fontcolour.h index 4a4eb52bd..860ab77b9 100644 --- a/kalarm/fontcolour.h +++ b/kalarm/fontcolour.h @@ -36,7 +36,7 @@ class FontColourChooser : public TQWidget TQ_OBJECT public: - explicit FontColourChooser(TQWidget* parent = 0, const char* name = 0, + explicit FontColourChooser(TQWidget* parent = nullptr, const char* name = nullptr, bool onlyFixed = false, const TQStringList& fontList = TQStringList(), const TQString& frameLabel = i18n("Requested font"), diff --git a/kalarm/fontcolourbutton.cpp b/kalarm/fontcolourbutton.cpp index a291a3769..cb3c3aa66 100644 --- a/kalarm/fontcolourbutton.cpp +++ b/kalarm/fontcolourbutton.cpp @@ -126,7 +126,7 @@ FontColourDlg::FontColourDlg(const TQColor& bgColour, const TQColor& fgColour, c TQWidget* page = new TQWidget(this); setMainWidget(page); TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint()); - mChooser = new FontColourChooser(page, 0, false, TQStringList(), TQString(), false, true, true); + mChooser = new FontColourChooser(page, nullptr, false, TQStringList(), TQString(), false, true, true); mChooser->setBgColour(bgColour); mChooser->setFgColour(fgColour); if (defaultFont) diff --git a/kalarm/fontcolourbutton.h b/kalarm/fontcolourbutton.h index efe799d41..8966d5cd9 100644 --- a/kalarm/fontcolourbutton.h +++ b/kalarm/fontcolourbutton.h @@ -36,7 +36,7 @@ class FontColourButton : public TQFrame TQ_OBJECT public: - FontColourButton(TQWidget* parent = 0, const char* name = 0); + FontColourButton(TQWidget* parent = nullptr, const char* name = nullptr); void setDefaultFont(); void setFont(const TQFont&); void setBgColour(const TQColor&); @@ -71,7 +71,7 @@ class FontColourDlg : public KDialogBase public: FontColourDlg(const TQColor& bg, const TQColor& fg, const TQFont&, bool defaultFont, - const TQString& caption, TQWidget* parent = 0, const char* name = 0); + const TQString& caption, TQWidget* parent = nullptr, const char* name = nullptr); bool defaultFont() const { return mDefaultFont; } TQFont font() const { return mFont; } TQColor bgColour() const { return mBgColour; } diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index 11c576ed0..a475f0fa9 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -180,9 +180,9 @@ bool addExpiredEvent(KAEvent& event) // Update window lists if (!archiving) - AlarmListView::addEvent(event, 0); + AlarmListView::addEvent(event, nullptr); else if (kcalEvent) - AlarmListView::modifyEvent(KAEvent(*kcalEvent), 0); + AlarmListView::modifyEvent(KAEvent(*kcalEvent), nullptr); return true; } @@ -830,9 +830,9 @@ FileType fileType(const TQString& mimetype) { static const char* applicationTypes[] = { "x-shellscript", "x-nawk", "x-awk", "x-perl", "x-python", - "x-desktop", "x-troff", 0 }; + "x-desktop", "x-troff", nullptr }; static const char* formattedTextTypes[] = { - "html", "xml", 0 }; + "html", "xml", nullptr }; if (mimetype.startsWith(TQString::fromLatin1("image/"))) return Image; diff --git a/kalarm/functions.h b/kalarm/functions.h index ab97c6ec9..4b4bceb13 100644 --- a/kalarm/functions.h +++ b/kalarm/functions.h @@ -72,12 +72,12 @@ FileType fileType(const TQString& mimetype); /** Return current KAlarm version number */ int Version(); inline int Version(int major, int minor, int rev) { return major*10000 + minor*100 + rev; } -int getVersionNumber(const TQString& version, TQString* subVersion = 0); +int getVersionNumber(const TQString& version, TQString* subVersion = nullptr); /** Return which version of KAlarm was the first to use the current calendar/event format */ inline int currentCalendarVersion() { return KAEvent::calVersion(); } inline TQString currentCalendarVersionString() { return KAEvent::calVersionString(); } TQString browseFile(const TQString& caption, TQString& defaultDir, const TQString& initialFile = TQString(), - const TQString& filter = TQString(), int mode = 0, TQWidget* parent = 0, const char* name = 0); + const TQString& filter = TQString(), int mode = 0, TQWidget* parent = nullptr, const char* name = nullptr); bool edit(const TQString& eventID); bool editNew(const TQString& templateName = TQString()); /** Create a "New Alarm" TDEAction */ @@ -88,19 +88,19 @@ TemplateMenuAction* createNewFromTemplateAction(const TQString& label, TQObject* * If shell commands are disabled, command alarm templates are omitted. */ TQValueList templateList(); -void outputAlarmWarnings(TQWidget* parent, const KAEvent* = 0); +void outputAlarmWarnings(TQWidget* parent, const KAEvent* = nullptr); void resetDaemon(); void resetDaemonIfQueued(); // must only be called from KAlarmApp::processQueue() TQString runKMail(bool minimise); bool runProgram(const TQCString& program, const TQCString& windowName, TQCString& dcopName, TQString& errorMessage); -UpdateStatus addEvent(KAEvent&, AlarmListView* selectionView, TQWidget* errmsgParent = 0, bool useEventID = false, bool allowKOrgUpdate = true); +UpdateStatus addEvent(KAEvent&, AlarmListView* selectionView, TQWidget* errmsgParent = nullptr, bool useEventID = false, bool allowKOrgUpdate = true); bool addExpiredEvent(KAEvent&); -UpdateStatus addTemplate(KAEvent&, TemplateListView* selectionView, TQWidget* errmsgParent = 0); -UpdateStatus modifyEvent(KAEvent& oldEvent, const KAEvent& newEvent, AlarmListView* selectionView, TQWidget* errmsgParent = 0); -UpdateStatus updateEvent(KAEvent&, AlarmListView* selectionView, TQWidget* errmsgParent = 0, bool archiveOnDelete = true, bool incRevision = true); -UpdateStatus updateTemplate(const KAEvent&, TemplateListView* selectionView, TQWidget* errmsgParent = 0); -UpdateStatus deleteEvent(KAEvent&, bool archive = true, TQWidget* errmsgParent = 0); +UpdateStatus addTemplate(KAEvent&, TemplateListView* selectionView, TQWidget* errmsgParent = nullptr); +UpdateStatus modifyEvent(KAEvent& oldEvent, const KAEvent& newEvent, AlarmListView* selectionView, TQWidget* errmsgParent = nullptr); +UpdateStatus updateEvent(KAEvent&, AlarmListView* selectionView, TQWidget* errmsgParent = nullptr, bool archiveOnDelete = true, bool incRevision = true); +UpdateStatus updateTemplate(const KAEvent&, TemplateListView* selectionView, TQWidget* errmsgParent = nullptr); +UpdateStatus deleteEvent(KAEvent&, bool archive = true, TQWidget* errmsgParent = nullptr); UpdateStatus deleteTemplate(const KAEvent&); void deleteDisplayEvent(const TQString& eventID); UpdateStatus reactivateEvent(KAEvent&, AlarmListView* selectionView, bool useEventID = false); diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp index 4c98477c6..c99e68650 100644 --- a/kalarm/kalarmapp.cpp +++ b/kalarm/kalarmapp.cpp @@ -84,7 +84,7 @@ static inline int maxLateness(int lateCancel) } -KAlarmApp* KAlarmApp::theInstance = 0; +KAlarmApp* KAlarmApp::theInstance = nullptr; int KAlarmApp::mActiveCount = 0; int KAlarmApp::mFatalError = 0; TQString KAlarmApp::mFatalMessage; @@ -100,7 +100,7 @@ KAlarmApp::KAlarmApp() #ifdef OLD_DCOP mDcopHandlerOld(new DcopHandlerOld()), #endif - mTrayWindow(0), + mTrayWindow(nullptr), mPendingQuit(false), mProcessingQueue(false), mCheckingSystemTray(false), @@ -201,7 +201,7 @@ bool KAlarmApp::restoreSession() quitIf(1, true); // error opening the main calendar - quit return true; } - MainWindow* trayParent = 0; + MainWindow* trayParent = nullptr; for (int i = 1; TDEMainWindow::canBeRestored(i); ++i) { TQString type = TDEMainWindow::classNameOfToplevel(i); @@ -324,7 +324,7 @@ int KAlarmApp::newInstance() kdDebug(5950)<<"KAlarmApp::newInstance(): handle event" << endl; EventFunc function = EVENT_HANDLE; int count = 0; - const char* option = 0; + const char* option = nullptr; if (args->isSet("handleEvent")) { function = EVENT_HANDLE; option = "handleEvent"; ++count; } if (args->isSet("triggerEvent")) { function = EVENT_TRIGGER; option = "triggerEvent"; ++count; } if (args->isSet("cancelEvent")) { function = EVENT_CANCEL; option = "cancelEvent"; ++count; } @@ -785,7 +785,7 @@ void KAlarmApp::quitIf(int exitCode, bool force) if (mActiveCount > 0 || MessageWin::instanceCount()) return; int mwcount = MainWindow::count(); - MainWindow* mw = mwcount ? MainWindow::firstWindow() : 0; + MainWindow* mw = mwcount ? MainWindow::firstWindow() : nullptr; if (mwcount > 1 || (mwcount && (!mw->isHidden() || !mw->isTrayParent()))) return; // There are no windows left except perhaps a main window which is a hidden tray icon parent @@ -865,7 +865,7 @@ void KAlarmApp::quitFatal() return; case 1: mFatalError = 2; - KMessageBox::error(0, mFatalMessage); + KMessageBox::error(nullptr, mFatalMessage); mFatalError = 3; // fall through to '3' case 3: @@ -911,7 +911,7 @@ void KAlarmApp::processQueue() execAlarm(entry.event, entry.event.firstAlarm(), false); break; case EVENT_HANDLE: - KAlarm::addEvent(entry.event, 0); + KAlarm::addEvent(entry.event, nullptr); break; case EVENT_CANCEL: break; @@ -966,7 +966,7 @@ void KAlarmApp::redisplayAlarms() */ void KAlarmApp::removeWindow(TrayWindow*) { - mTrayWindow = 0; + mTrayWindow = nullptr; quitIf(); } @@ -1004,7 +1004,7 @@ bool KAlarmApp::displayTrayIcon(bool show, MainWindow* parent) else if (mTrayWindow) { delete mTrayWindow; - mTrayWindow = 0; + mTrayWindow = nullptr; } return true; } @@ -1063,7 +1063,7 @@ bool KAlarmApp::checkSystemTray() */ MainWindow* KAlarmApp::trayMainWindow() const { - return mTrayWindow ? mTrayWindow->assocMainWindow() : 0; + return mTrayWindow ? mTrayWindow->assocMainWindow() : nullptr; } /****************************************************************************** @@ -1076,9 +1076,9 @@ void KAlarmApp::slotPreferencesChanged() { // The system tray run mode has changed ++mActiveCount; // prevent the application from quitting - MainWindow* win = mTrayWindow ? mTrayWindow->assocMainWindow() : 0; + MainWindow* win = mTrayWindow ? mTrayWindow->assocMainWindow() : nullptr; delete mTrayWindow; // remove the system tray icon if it is currently shown - mTrayWindow = 0; + mTrayWindow = nullptr; mOldRunInSystemTray = newRunInSysTray; if (!newRunInSysTray) { @@ -1416,7 +1416,7 @@ bool KAlarmApp::handleEvent(const TQString& eventID, EventFunc function) execAlarm(event, alarm, false); } if (updateCalAndDisplay) - KAlarm::updateEvent(event, 0); // update the window lists and calendar file + KAlarm::updateEvent(event, nullptr); // update the window lists and calendar file else if (function != EVENT_TRIGGER) { kdDebug(5950) << "KAlarmApp::handleEvent(): no action" << endl; @@ -1474,7 +1474,7 @@ void KAlarmApp::alarmCompleted(const KAEvent& event) { TQString command = event.postAction(); kdDebug(5950) << "KAlarmApp::alarmCompleted(" << event.id() << "): " << command << endl; - doShellCommand(command, event, 0, ProcData::POST_ACTION); + doShellCommand(command, event, nullptr, ProcData::POST_ACTION); } } @@ -1539,7 +1539,7 @@ void KAlarmApp::rescheduleAlarm(KAEvent& event, const KAAlarm& alarm, bool updat if (update) { event.cancelCancelledDeferral(); - KAlarm::updateEvent(event, 0); // update the window lists and calendar file + KAlarm::updateEvent(event, nullptr); // update the window lists and calendar file } } @@ -1562,7 +1562,7 @@ void KAlarmApp::cancelAlarm(KAEvent& event, KAAlarm::Type alarmType, bool update if (!event.alarmCount()) KAlarm::deleteEvent(event, false); else if (updateCalAndDisplay) - KAlarm::updateEvent(event, 0); // update the window lists and calendar file + KAlarm::updateEvent(event, nullptr); // update the window lists and calendar file } /****************************************************************************** @@ -1578,7 +1578,7 @@ void* KAlarmApp::execAlarm(KAEvent& event, const KAAlarm& alarm, bool reschedule // The event is disabled. if (reschedule) rescheduleAlarm(event, alarm, true); - return 0; + return nullptr; } void* result = (void*)1; @@ -1650,7 +1650,7 @@ void* KAlarmApp::execAlarm(KAEvent& event, const KAAlarm& alarm, bool reschedule kdDebug(5950) << "KAlarmApp::execAlarm(): COMMAND: (script)" << endl; TQString tmpfile = createTempScriptFile(command, false, event, alarm); if (tmpfile.isEmpty()) - result = 0; + result = nullptr; else result = doShellCommand(tmpfile, event, &alarm, (flags | ProcData::TEMP_FILE)); } @@ -1668,7 +1668,7 @@ void* KAlarmApp::execAlarm(KAEvent& event, const KAAlarm& alarm, bool reschedule kdDebug(5950) << "KAlarmApp::execAlarm(): EMAIL to: " << event.emailAddresses(", ") << endl; TQStringList errmsgs; if (!KAMail::send(event, errmsgs, (reschedule || allowDefer))) - result = 0; + result = nullptr; if (!errmsgs.isEmpty()) { // Some error occurred, although the email may have been sent successfully @@ -1683,7 +1683,7 @@ void* KAlarmApp::execAlarm(KAEvent& event, const KAAlarm& alarm, bool reschedule break; } default: - return 0; + return nullptr; } return result; } @@ -1714,7 +1714,7 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent& { tmpXtermFile = createTempScriptFile(command, true, event, *alarm); if (tmpXtermFile.isEmpty()) - return 0; + return nullptr; cmd.replace("%C", tmpXtermFile); // %C indicates where to insert the command } } @@ -1724,7 +1724,7 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent& // with a sleep after the command is executed tmpXtermFile = createTempScriptFile(command + TQString::fromLatin1("\nsleep 86400\n"), true, event, *alarm); if (tmpXtermFile.isEmpty()) - return 0; + return nullptr; cmd.replace("%W", tmpXtermFile); // %w indicates where to insert the command } else if (cmd.find("%w") >= 0) @@ -1752,7 +1752,7 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent& } ShellProcess* proc = new ShellProcess(cmd); connect(proc, TQ_SIGNAL(shellExited(ShellProcess*)), TQ_SLOT(slotCommandExited(ShellProcess*))); - TQGuardedPtr logproc = 0; + TQGuardedPtr logproc = nullptr; if (comms == TDEProcess::AllOutput && !event.logFile().isEmpty()) { // Output is to be appended to a log file. @@ -1774,7 +1774,7 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent& heading = "\n******* KAlarm *******\n"; logproc->writeStdin(heading, heading.length()+1); } - ProcData* pd = new ProcData(proc, logproc, new KAEvent(event), (alarm ? new KAAlarm(*alarm) : 0), flags); + ProcData* pd = new ProcData(proc, logproc, new KAEvent(event), (alarm ? new KAAlarm(*alarm) : nullptr), flags); if (flags & ProcData::TEMP_FILE) pd->tempFiles += command; if (!tmpXtermFile.isEmpty()) @@ -1788,7 +1788,7 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent& commandErrorMsg(proc, event, alarm, flags); mCommandProcesses.remove(pd); delete pd; - return 0; + return nullptr; } /****************************************************************************** @@ -1871,7 +1871,7 @@ void KAlarmApp::slotCommandExited(ShellProcess* proc) if (pd->messageBoxParent) { // Close the existing informational KMessageBox for this process - TQObjectList* dialogs = pd->messageBoxParent->queryList("KDialogBase", 0, false, true); + TQObjectList* dialogs = pd->messageBoxParent->queryList("KDialogBase", nullptr, false, true); KDialogBase* dialog = (KDialogBase*)dialogs->getFirst(); delete dialog; delete dialogs; @@ -2007,7 +2007,7 @@ static bool convWakeTime(const TQCString& timeParam, TQDateTime& dateTime, bool& char* s; char* end; // Get the minute value - if ((s = strchr(timeStr, ':')) == 0) + if ((s = strchr(timeStr, ':')) == nullptr) noTime = true; else { @@ -2017,7 +2017,7 @@ static bool convWakeTime(const TQCString& timeParam, TQDateTime& dateTime, bool& if (end == s || *end || dt[4] >= 60) return false; // Get the hour value - if ((s = strrchr(timeStr, '-')) == 0) + if ((s = strrchr(timeStr, '-')) == nullptr) s = timeStr; else *s++ = 0; @@ -2030,7 +2030,7 @@ static bool convWakeTime(const TQCString& timeParam, TQDateTime& dateTime, bool& { dateSet = true; // Get the day value - if ((s = strrchr(timeStr, '-')) == 0) + if ((s = strrchr(timeStr, '-')) == nullptr) s = timeStr; else *s++ = 0; @@ -2040,7 +2040,7 @@ static bool convWakeTime(const TQCString& timeParam, TQDateTime& dateTime, bool& if (s != timeStr) { // Get the month value - if ((s = strrchr(timeStr, '-')) == 0) + if ((s = strrchr(timeStr, '-')) == nullptr) s = timeStr; else *s++ = 0; @@ -2166,7 +2166,7 @@ KAlarmApp::ProcData::ProcData(ShellProcess* p, ShellProcess* logp, KAEvent* e, K logProcess(logp), event(e), alarm(a), - messageBoxParent(0), + messageBoxParent(nullptr), flags(f) { } diff --git a/kalarm/kalarmapp.h b/kalarm/kalarmapp.h index 52359ef03..3d9142259 100644 --- a/kalarm/kalarmapp.h +++ b/kalarm/kalarmapp.h @@ -68,9 +68,9 @@ class KAlarmApp : public TDEUniqueApplication void removeWindow(TrayWindow*); TrayWindow* trayWindow() const { return mTrayWindow; } MainWindow* trayMainWindow() const; - bool displayTrayIcon(bool show, MainWindow* = 0); + bool displayTrayIcon(bool show, MainWindow* = nullptr); bool trayIconDisplayed() const { return !!mTrayWindow; } - bool editNewAlarm(MainWindow* = 0); + bool editNewAlarm(MainWindow* = nullptr); virtual void commitData(TQSessionManager&); void* execAlarm(KAEvent&, const KAAlarm&, bool reschedule, bool allowDefer = true, bool noPreAction = false); diff --git a/kalarm/kalarmd/adapp.cpp b/kalarm/kalarmd/adapp.cpp index 3d5f22981..5488f53d6 100644 --- a/kalarm/kalarmd/adapp.cpp +++ b/kalarm/kalarmd/adapp.cpp @@ -31,7 +31,7 @@ AlarmDaemonApp::AlarmDaemonApp() : TDEUniqueApplication(false, false), - mAd(0) + mAd(nullptr) { disableSessionManagement(); } @@ -65,7 +65,7 @@ int AlarmDaemonApp::newInstance() args->clear(); // free up memory } - mAd = new AlarmDaemon(autostart, 0, DAEMON_DCOP_OBJECT); + mAd = new AlarmDaemon(autostart, nullptr, DAEMON_DCOP_OBJECT); return 0; } diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp index 839f64167..67abeaa0f 100644 --- a/kalarm/kalarmd/adcalendar.cpp +++ b/kalarm/kalarmd/adcalendar.cpp @@ -107,7 +107,7 @@ void ADCalendar::slotDownloadJobResult(TDEIO::Job *job) { KURL url(mUrlString); kdDebug(5900) << "Error downloading calendar from " << url.prettyURL() << endl; - job->showErrorDialog(0); + job->showErrorDialog(nullptr); } else { @@ -249,5 +249,5 @@ ADCalendar* ADCalendar::getCalendar(const TQString& calendarURL) return *it; } } - return 0; + return nullptr; } diff --git a/kalarm/kalarmd/admain.cpp b/kalarm/kalarmd/admain.cpp index b1533e4a5..7883cf455 100644 --- a/kalarm/kalarmd/admain.cpp +++ b/kalarm/kalarmd/admain.cpp @@ -33,7 +33,7 @@ static const TDECmdLineOptions options[] = { - { "autostart", "", 0 }, + { "autostart", "", nullptr }, TDECmdLineLastOption }; @@ -41,7 +41,7 @@ int main(int argc, char** argv) { TDEAboutData aboutData(DAEMON_APP_NAME, I18N_NOOP("KAlarm Daemon"), DAEMON_VERSION, I18N_NOOP("KAlarm Alarm Daemon"), TDEAboutData::License_GPL, - "Copyright 1997-1999 Preston Brown\nCopyright 2000-2001 Cornelius Schumacher\nCopyright 2001,2004-2007 David Jarvie", 0, + "Copyright 1997-1999 Preston Brown\nCopyright 2000-2001 Cornelius Schumacher\nCopyright 2001,2004-2007 David Jarvie", nullptr, "http://www.astrojar.org.uk/kalarm"); aboutData.addAuthor("David Jarvie", I18N_NOOP("Maintainer"), "software@astrojar.org.uk"); aboutData.addAuthor("Cornelius Schumacher", I18N_NOOP("Author"), "schumacher@kde.org"); diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp index 5de17379f..4d5af8688 100644 --- a/kalarm/kalarmd/alarmdaemon.cpp +++ b/kalarm/kalarmd/alarmdaemon.cpp @@ -61,7 +61,7 @@ static const TQString AUTOSTART_TRAY(TQString::fromLatin1("AutostartTray")); AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name) : DCOPObject(name), TQObject(parent, name), - mAlarmTimer(0) + mAlarmTimer(nullptr) { kdDebug(5900) << "AlarmDaemon::AlarmDaemon()" << endl; ADConfigData::readConfig(); @@ -271,7 +271,7 @@ void AlarmDaemon::registerApp(const TQCString& appName, const TQString& appTitle } else { - ADCalendar* keepCal = 0; + ADCalendar* keepCal = nullptr; ClientInfo* client = ClientInfo::get(appName); if (client) { diff --git a/kalarm/kalarmd/alarmdaemon.h b/kalarm/kalarmd/alarmdaemon.h index 85509ebd3..253a80386 100644 --- a/kalarm/kalarmd/alarmdaemon.h +++ b/kalarm/kalarmd/alarmdaemon.h @@ -34,7 +34,7 @@ class AlarmDaemon : public TQObject, virtual public AlarmDaemonIface TQ_OBJECT public: - AlarmDaemon(bool autostart, TQObject* parent = 0, const char* name = 0); + AlarmDaemon(bool autostart, TQObject* parent = nullptr, const char* name = nullptr); private slots: //#ifdef AUTOSTART_KALARM diff --git a/kalarm/kalarmd/clientinfo.cpp b/kalarm/kalarmd/clientinfo.cpp index e8c5ea6c7..9e15bd1e4 100644 --- a/kalarm/kalarmd/clientinfo.cpp +++ b/kalarm/kalarmd/clientinfo.cpp @@ -71,10 +71,10 @@ ADCalendar* ClientInfo::setCalendar(const TQString& url) ClientInfo* ClientInfo::get(const TQCString& appName) { if (appName.isEmpty()) - return 0; + return nullptr; TQMap::ConstIterator it = mClients.find(appName); if (it == mClients.end()) - return 0; + return nullptr; return it.data(); } @@ -86,7 +86,7 @@ ClientInfo* ClientInfo::get(const ADCalendar* cal) for (ClientInfo::ConstIterator it = ClientInfo::begin(); it != ClientInfo::end(); ++it) if (it.data()->calendar() == cal) return it.data(); - return 0; + return nullptr; } /****************************************************************************** diff --git a/kalarm/kalarmd/clientinfo.h b/kalarm/kalarmd/clientinfo.h index d679669ec..ba3ba806d 100644 --- a/kalarm/kalarmd/clientinfo.h +++ b/kalarm/kalarmd/clientinfo.h @@ -44,7 +44,7 @@ class ClientInfo ADCalendar* calendar, bool startClient); ~ClientInfo(); ADCalendar* setCalendar(const TQString& url); - void detachCalendar() { mCalendar = 0; } + void detachCalendar() { mCalendar = nullptr; } void setStartClient(bool start) { mStartClient = start; } TQCString appName() const { return mAppName; } diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp index 349727496..e0ef48ea3 100644 --- a/kalarm/kamail.cpp +++ b/kalarm/kamail.cpp @@ -88,7 +88,7 @@ TQString KAMail::i18n_NeedFromEmailAddress() TQString KAMail::i18n_sent_mail() { return i18n("KMail folder name: this should be translated the same as in kmail", "sent-mail"); } -KPIM::IdentityManager* KAMail::mIdentityManager = 0; +KPIM::IdentityManager* KAMail::mIdentityManager = nullptr; KPIM::IdentityManager* KAMail::identityManager() { if (!mIdentityManager) @@ -380,7 +380,7 @@ TQString KAMail::initHeaders(const KAMailData& data, bool dateId) if (dateId) { struct timeval tod; - gettimeofday(&tod, 0); + gettimeofday(&tod, nullptr); time_t timenow = tod.tv_sec; char buff[64]; strftime(buff, sizeof(buff), "Date: %a, %d %b %Y %H:%M:%S %z", localtime(&timenow)); @@ -409,7 +409,7 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event) "application/x-sh", "application/x-csh", "application/x-shellscript", "application/x-nawk", "application/x-gawk", "application/x-awk", "application/x-perl", "application/x-desktop", - 0 + nullptr }; TQStringList attachments = event.emailAttachments(); if (!attachments.count()) @@ -539,7 +539,7 @@ void KAMail::notifyQueued(const KAEvent& event) TQString text = (Preferences::emailClient() == Preferences::KMAIL) ? i18n("An email has been queued to be sent by KMail") : i18n("An email has been queued to be sent"); - KMessageBox::information(0, text, TQString(), Preferences::EMAIL_QUEUED_NOTIFY); + KMessageBox::information(nullptr, text, TQString(), Preferences::EMAIL_QUEUED_NOTIFY); return; } } @@ -891,7 +891,7 @@ char* KAMail::base64Encode(const char* in, TQIODevice::Offset size, TQIODevice:: if (outIndex >= size*2) { delete[] out; - return 0; + return nullptr; } for (int i = 0; i < 4; ++i) { diff --git a/kalarm/kamail.h b/kalarm/kamail.h index e62ab8f63..4bc7387d8 100644 --- a/kalarm/kamail.h +++ b/kalarm/kamail.h @@ -37,7 +37,7 @@ class KAMail public: static bool send(const KAEvent&, TQStringList& errmsgs, bool allowNotify = true); static int checkAddress(TQString& address); - static int checkAttachment(TQString& attachment, KURL* = 0); + static int checkAttachment(TQString& attachment, KURL* = nullptr); static bool checkAttachment(const KURL&); static TQString convertAddresses(const TQString& addresses, EmailAddressList&); static TQString convertAttachments(const TQString& attachments, TQStringList& list); diff --git a/kalarm/latecancel.h b/kalarm/latecancel.h index 7baefb42e..fe55c290f 100644 --- a/kalarm/latecancel.h +++ b/kalarm/latecancel.h @@ -35,7 +35,7 @@ class LateCancelSelector : public TQFrame TQ_OBJECT public: - LateCancelSelector(bool allowHourMinute, TQWidget* parent, const char* name = 0); + LateCancelSelector(bool allowHourMinute, TQWidget* parent, const char* name = nullptr); int minutes() const; void setMinutes(int Minutes, bool dateOnly, TimePeriod::Units defaultUnits); void setDateOnly(bool dateOnly); diff --git a/kalarm/lib/buttongroup.h b/kalarm/lib/buttongroup.h index f26ab26da..09e1774b2 100644 --- a/kalarm/lib/buttongroup.h +++ b/kalarm/lib/buttongroup.h @@ -44,20 +44,20 @@ class ButtonGroup : public TQButtonGroup * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit ButtonGroup(TQWidget* parent, const char* name = 0); + explicit ButtonGroup(TQWidget* parent, const char* name = nullptr); /** Constructor. * @param title The title displayed for this button group. * @param parent The parent object of this widget. * @param name The name of this widget. */ - ButtonGroup(const TQString& title, TQWidget* parent, const char* name = 0); + ButtonGroup(const TQString& title, TQWidget* parent, const char* name = nullptr); /** Constructor. * @param strips The number of rows or columns of buttons. * @param orient The orientation (TQt::Horizontal or TQt::Vertical) of the button group. * @param parent The parent object of this widget. * @param name The name of this widget. */ - ButtonGroup(int strips, TQt::Orientation orient, TQWidget* parent, const char* name = 0); + ButtonGroup(int strips, TQt::Orientation orient, TQWidget* parent, const char* name = nullptr); /** Constructor. * @param strips The number of rows or columns of buttons. * @param orient The orientation (TQt::Horizontal or TQt::Vertical) of the button group. @@ -65,7 +65,7 @@ class ButtonGroup : public TQButtonGroup * @param parent The parent object of this widget. * @param name The name of this widget. */ - ButtonGroup(int strips, TQt::Orientation orient, const TQString& title, TQWidget* parent, const char* name = 0); + ButtonGroup(int strips, TQt::Orientation orient, const TQString& title, TQWidget* parent, const char* name = nullptr); /** Inserts a button in the group. * This overrides the insert() method of TQButtonGroup, which should really be a virtual method... * @param button The button to insert. diff --git a/kalarm/lib/checkbox.cpp b/kalarm/lib/checkbox.cpp index 4b29d927a..b08b427b3 100644 --- a/kalarm/lib/checkbox.cpp +++ b/kalarm/lib/checkbox.cpp @@ -24,14 +24,14 @@ CheckBox::CheckBox(TQWidget* parent, const char* name) : TQCheckBox(parent, name), mFocusPolicy(focusPolicy()), - mFocusWidget(0), + mFocusWidget(nullptr), mReadOnly(false) { } CheckBox::CheckBox(const TQString& text, TQWidget* parent, const char* name) : TQCheckBox(text, parent, name), mFocusPolicy(focusPolicy()), - mFocusWidget(0), + mFocusWidget(nullptr), mReadOnly(false) { } diff --git a/kalarm/lib/checkbox.h b/kalarm/lib/checkbox.h index eb9afc88a..73078eb8c 100644 --- a/kalarm/lib/checkbox.h +++ b/kalarm/lib/checkbox.h @@ -48,13 +48,13 @@ class CheckBox : public TQCheckBox * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit CheckBox(TQWidget* parent, const char* name = 0); + explicit CheckBox(TQWidget* parent, const char* name = nullptr); /** Constructor. * @param text Text to display. * @param parent The parent object of this widget. * @param name The name of this widget. */ - CheckBox(const TQString& text, TQWidget* parent, const char* name = 0); + CheckBox(const TQString& text, TQWidget* parent, const char* name = nullptr); /** Returns true if the widget is read only. */ bool isReadOnly() const { return mReadOnly; } /** Sets whether the check box is read-only for the user. If read-only, diff --git a/kalarm/lib/colourcombo.h b/kalarm/lib/colourcombo.h index d6c003437..c1e47dcd5 100644 --- a/kalarm/lib/colourcombo.h +++ b/kalarm/lib/colourcombo.h @@ -51,7 +51,7 @@ class ColourCombo : public TQComboBox * @param name The name of this widget. * @param defaultColour The colour which is selected by default. */ - explicit ColourCombo(TQWidget* parent = 0, const char* name = 0, const TQColor& defaultColour = 0xFFFFFF); + explicit ColourCombo(TQWidget* parent = nullptr, const char* name = nullptr, const TQColor& defaultColour = 0xFFFFFF); /** Returns the selected colour. */ TQColor color() const { return mSelectedColour; } /** Returns the selected colour. */ diff --git a/kalarm/lib/combobox.h b/kalarm/lib/combobox.h index cc915f0d9..17ff218b4 100644 --- a/kalarm/lib/combobox.h +++ b/kalarm/lib/combobox.h @@ -43,13 +43,13 @@ class ComboBox : public TQComboBox * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit ComboBox(TQWidget* parent = 0, const char* name = 0); + explicit ComboBox(TQWidget* parent = nullptr, const char* name = nullptr); /** Constructor. * @param rw True for a read-write combo box, false for a read-only combo box. * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit ComboBox(bool rw, TQWidget* parent = 0, const char* name = 0); + explicit ComboBox(bool rw, TQWidget* parent = nullptr, const char* name = nullptr); /** Returns true if the widget is read only. */ bool isReadOnly() const { return mReadOnly; } /** Sets whether the combo box is read-only for the user. If read-only, diff --git a/kalarm/lib/dateedit.h b/kalarm/lib/dateedit.h index 47a040cb1..ffd65fa2b 100644 --- a/kalarm/lib/dateedit.h +++ b/kalarm/lib/dateedit.h @@ -43,7 +43,7 @@ class DateEdit : public KDateEdit * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit DateEdit(TQWidget* parent = 0, const char* name = 0); + explicit DateEdit(TQWidget* parent = nullptr, const char* name = nullptr); /** Returns true if the widget contains a valid date. */ bool isValid() const { return date().isValid(); } /** Returns the earliest date which can be entered. diff --git a/kalarm/lib/label.cpp b/kalarm/lib/label.cpp index 8a41d624b..2e9684ed5 100644 --- a/kalarm/lib/label.cpp +++ b/kalarm/lib/label.cpp @@ -25,20 +25,20 @@ Label::Label(TQWidget* parent, const char* name, WFlags f) : TQLabel(parent, name, f), - mRadioButton(0), - mFocusWidget(0) + mRadioButton(nullptr), + mFocusWidget(nullptr) { } Label::Label(const TQString& text, TQWidget* parent, const char* name, WFlags f) : TQLabel(text, parent, name, f), - mRadioButton(0), - mFocusWidget(0) + mRadioButton(nullptr), + mFocusWidget(nullptr) { } Label::Label(TQWidget* buddy, const TQString& text, TQWidget* parent, const char* name, WFlags f) : TQLabel(buddy, text, parent, name, f), - mRadioButton(0), - mFocusWidget(0) + mRadioButton(nullptr), + mFocusWidget(nullptr) { } /****************************************************************************** @@ -57,15 +57,15 @@ void Label::setBuddy(TQWidget* bud) while (w->focusProxy()) w = w->focusProxy(); if (!w->inherits("TQRadioButton")) - w = 0; + w = nullptr; } if (!w) { // The buddy widget isn't a radio button TQLabel::setBuddy(bud); delete mFocusWidget; - mFocusWidget = 0; - mRadioButton = 0; + mFocusWidget = nullptr; + mRadioButton = nullptr; } else { @@ -81,8 +81,8 @@ void Label::setBuddy(TQWidget* bud) void Label::buddyDead() { delete mFocusWidget; - mFocusWidget = 0; - mRadioButton = 0; + mFocusWidget = nullptr; + mRadioButton = nullptr; } /****************************************************************************** diff --git a/kalarm/lib/label.h b/kalarm/lib/label.h index deae350f2..f389924b9 100644 --- a/kalarm/lib/label.h +++ b/kalarm/lib/label.h @@ -49,14 +49,14 @@ class Label : public TQLabel * @param name The name of this widget. * @param f Flags. See TQWidget constructor for details. */ - explicit Label(TQWidget* parent, const char* name = 0, WFlags f = 0); + explicit Label(TQWidget* parent, const char* name = nullptr, WFlags f = 0); /** Constructs a label that displays @p text. * @param text Text string to display. * @param parent The parent object of this widget. * @param name The name of this widget. * @param f Flags. See TQWidget constructor for details. */ - Label(const TQString& text, TQWidget* parent, const char* name = 0, WFlags f = 0); + Label(const TQString& text, TQWidget* parent, const char* name = nullptr, WFlags f = 0); /** Constructs a label, with a buddy widget, that displays @p text. * @param buddy Buddy widget which receives the keyboard focus when the * label's accelerator key is pressed. If @p buddy is a radio @@ -67,7 +67,7 @@ class Label : public TQLabel * @param name The name of this widget. * @param f Flags. See TQWidget constructor for details. */ - Label(TQWidget* buddy, const TQString& text, TQWidget* parent, const char* name = 0, WFlags f = 0); + Label(TQWidget* buddy, const TQString& text, TQWidget* parent, const char* name = nullptr, WFlags f = 0); /** Sets the label's buddy widget which receives the keyboard focus when the * label's accelerator key is pressed. If @p buddy is a radio button, * @p buddy is in addition selected when the accelerator key is pressed. @@ -90,7 +90,7 @@ class LabelFocusWidget : public TQWidget TQ_OBJECT public: - LabelFocusWidget(TQWidget* parent, const char* name = 0); + LabelFocusWidget(TQWidget* parent, const char* name = nullptr); protected: virtual void focusInEvent(TQFocusEvent*); }; diff --git a/kalarm/lib/lineedit.h b/kalarm/lib/lineedit.h index d715770f9..0773126ac 100644 --- a/kalarm/lib/lineedit.h +++ b/kalarm/lib/lineedit.h @@ -65,12 +65,12 @@ class LineEdit : public KLineEdit * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit LineEdit(Type type, TQWidget* parent = 0, const char* name = 0); + explicit LineEdit(Type type, TQWidget* parent = nullptr, const char* name = nullptr); /** Constructs a line edit whose content type is Text. * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit LineEdit(TQWidget* parent = 0, const char* name = 0); + explicit LineEdit(TQWidget* parent = nullptr, const char* name = nullptr); /** Prevents the line edit's contents being selected when the widget receives focus. */ void setNoSelect() { mNoSelect = true; } /** Sets whether the cursor should be set at the beginning or end of the text when diff --git a/kalarm/lib/messagebox.cpp b/kalarm/lib/messagebox.cpp index 4e78ef085..0aaad529f 100644 --- a/kalarm/lib/messagebox.cpp +++ b/kalarm/lib/messagebox.cpp @@ -23,7 +23,7 @@ #include "messagebox.h" -TDEConfig* MessageBox::mConfig = 0; +TDEConfig* MessageBox::mConfig = nullptr; TQMap MessageBox::mContinueDefaults; diff --git a/kalarm/lib/messagebox.h b/kalarm/lib/messagebox.h index 5baccca0a..451a74021 100644 --- a/kalarm/lib/messagebox.h +++ b/kalarm/lib/messagebox.h @@ -117,7 +117,7 @@ class MessageBox : public KMessageBox static void setDontShowAskAgainConfig(TDEConfig* cfg) { mConfig = cfg; } private: - static void saveDontShowAgain(const TQString& dontShowAgainName, bool yesno, bool dontShow, const char* yesnoResult = 0); + static void saveDontShowAgain(const TQString& dontShowAgainName, bool yesno, bool dontShow, const char* yesnoResult = nullptr); static TDEConfig* mConfig; static TQMap mContinueDefaults; }; diff --git a/kalarm/lib/pushbutton.h b/kalarm/lib/pushbutton.h index 091060af2..ec7ca23d4 100644 --- a/kalarm/lib/pushbutton.h +++ b/kalarm/lib/pushbutton.h @@ -44,20 +44,20 @@ class PushButton : public TQPushButton * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit PushButton(TQWidget* parent, const char* name = 0); + explicit PushButton(TQWidget* parent, const char* name = nullptr); /** Constructor for a push button which displays a text. * @param text The text to show on the button. * @param parent The parent object of this widget. * @param name The name of this widget. */ - PushButton(const TQString& text, TQWidget* parent, const char* name = 0); + PushButton(const TQString& text, TQWidget* parent, const char* name = nullptr); /** Constructor for a push button which displays an icon and a text. * @param icon The icon to show on the button. * @param text The text to show on the button. * @param parent The parent object of this widget. * @param name The name of this widget. */ - PushButton(const TQIconSet& icon, const TQString& text, TQWidget* parent, const char* name = 0); + PushButton(const TQIconSet& icon, const TQString& text, TQWidget* parent, const char* name = nullptr); /** Sets whether the push button is read-only for the user. * @param readOnly True to set the widget read-only, false to enable its action. */ diff --git a/kalarm/lib/radiobutton.cpp b/kalarm/lib/radiobutton.cpp index 62fb9b630..37a01dc78 100644 --- a/kalarm/lib/radiobutton.cpp +++ b/kalarm/lib/radiobutton.cpp @@ -24,14 +24,14 @@ RadioButton::RadioButton(TQWidget* parent, const char* name) : TQRadioButton(parent, name), mFocusPolicy(focusPolicy()), - mFocusWidget(0), + mFocusWidget(nullptr), mReadOnly(false) { } RadioButton::RadioButton(const TQString& text, TQWidget* parent, const char* name) : TQRadioButton(text, parent, name), mFocusPolicy(focusPolicy()), - mFocusWidget(0), + mFocusWidget(nullptr), mReadOnly(false) { } diff --git a/kalarm/lib/radiobutton.h b/kalarm/lib/radiobutton.h index d3b477854..3769e6fb4 100644 --- a/kalarm/lib/radiobutton.h +++ b/kalarm/lib/radiobutton.h @@ -48,13 +48,13 @@ class RadioButton : public TQRadioButton * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit RadioButton(TQWidget* parent, const char* name = 0); + explicit RadioButton(TQWidget* parent, const char* name = nullptr); /** Constructor. * @param text Text to display. * @param parent The parent object of this widget. * @param name The name of this widget. */ - RadioButton(const TQString& text, TQWidget* parent, const char* name = 0); + RadioButton(const TQString& text, TQWidget* parent, const char* name = nullptr); /** Returns true if the widget is read only. */ bool isReadOnly() const { return mReadOnly; } /** Sets whether the radio button is read-only for the user. If read-only, diff --git a/kalarm/lib/slider.h b/kalarm/lib/slider.h index dc36e3ced..39927d12d 100644 --- a/kalarm/lib/slider.h +++ b/kalarm/lib/slider.h @@ -44,13 +44,13 @@ class Slider : public TQSlider * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit Slider(TQWidget* parent = 0, const char* name = 0); + explicit Slider(TQWidget* parent = nullptr, const char* name = nullptr); /** Constructor. * @param orient The orientation of the slider, either TQt::Horizonal or TQt::Vertical. * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit Slider(TQt::Orientation orient, TQWidget* parent = 0, const char* name = 0); + explicit Slider(TQt::Orientation orient, TQWidget* parent = nullptr, const char* name = nullptr); /** Constructor. * @param minValue The minimum value which the slider can have. * @param maxValue The maximum value which the slider can have. @@ -61,7 +61,7 @@ class Slider : public TQSlider * @param name The name of this widget. */ Slider(int minValue, int maxValue, int pageStep, int value, TQt::Orientation orient, - TQWidget* parent = 0, const char* name = 0); + TQWidget* parent = nullptr, const char* name = nullptr); /** Returns true if the slider is read only. */ bool isReadOnly() const { return mReadOnly; } /** Sets whether the slider is read-only for the user. diff --git a/kalarm/lib/spinbox.cpp b/kalarm/lib/spinbox.cpp index 96fd3a8cb..d412916bc 100644 --- a/kalarm/lib/spinbox.cpp +++ b/kalarm/lib/spinbox.cpp @@ -55,7 +55,7 @@ void SpinBox::init() // Find the spin widgets which are part of the spin boxes, in order to // handle their shift-button presses. - TQObjectList* spinwidgets = queryList("TQSpinWidget", 0, false, true); + TQObjectList* spinwidgets = queryList("TQSpinWidget", nullptr, false, true); TQSpinWidget* spin = (TQSpinWidget*)spinwidgets->getFirst(); if (spin) spin->installEventFilter(this); // handle shift-button presses diff --git a/kalarm/lib/spinbox.h b/kalarm/lib/spinbox.h index 930e8235b..da74c4d1f 100644 --- a/kalarm/lib/spinbox.h +++ b/kalarm/lib/spinbox.h @@ -48,7 +48,7 @@ class SpinBox : public TQSpinBox * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit SpinBox(TQWidget* parent = 0, const char* name = 0); + explicit SpinBox(TQWidget* parent = nullptr, const char* name = nullptr); /** Constructor. * @param minValue The minimum value which the spin box can have. * @param maxValue The maximum value which the spin box can have. @@ -56,7 +56,7 @@ class SpinBox : public TQSpinBox * @param parent The parent object of this widget. * @param name The name of this widget. */ - SpinBox(int minValue, int maxValue, int step = 1, TQWidget* parent = 0, const char* name = 0); + SpinBox(int minValue, int maxValue, int step = 1, TQWidget* parent = nullptr, const char* name = nullptr); /** Returns true if the widget is read only. */ bool isReadOnly() const { return mReadOnly; } /** Sets whether the spin box can be changed by the user. diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp index 328813e22..b60fd1f35 100644 --- a/kalarm/lib/spinbox2.cpp +++ b/kalarm/lib/spinbox2.cpp @@ -41,7 +41,7 @@ */ static const char* mirrorStyles[] = { "PlastikStyle", - 0 // list terminator + nullptr // list terminator }; static bool mirrorStyle(const TQStyle&); @@ -403,7 +403,7 @@ SpinMirror::SpinMirror(SpinBox* spinbox, TQFrame* spinFrame, TQWidget* parent, c // Find the spin widget which is part of the spin box, in order to // pass on its shift-button presses. - TQObjectList* spinwidgets = spinbox->queryList("TQSpinWidget", 0, false, true); + TQObjectList* spinwidgets = spinbox->queryList("TQSpinWidget", nullptr, false, true); mSpinWidget = (SpinBox*)spinwidgets->getFirst(); delete spinwidgets; } diff --git a/kalarm/lib/spinbox2.h b/kalarm/lib/spinbox2.h index c63f91526..57274969e 100644 --- a/kalarm/lib/spinbox2.h +++ b/kalarm/lib/spinbox2.h @@ -62,7 +62,7 @@ class SpinBox2 : public TQFrame * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit SpinBox2(TQWidget* parent = 0, const char* name = 0); + explicit SpinBox2(TQWidget* parent = nullptr, const char* name = nullptr); /** Constructor. * @param minValue The minimum value which the spin box can have. * @param maxValue The maximum value which the spin box can have. @@ -72,7 +72,7 @@ class SpinBox2 : public TQFrame * @param name The name of this widget. */ SpinBox2(int minValue, int maxValue, int step = 1, int step2 = 1, - TQWidget* parent = 0, const char* name = 0); + TQWidget* parent = nullptr, const char* name = nullptr); /** Sets whether the spin box can be changed by the user. * @param readOnly True to set the widget read-only, false to set it read-write. */ @@ -282,9 +282,9 @@ class SpinBox2 : public TQFrame class MainSpinBox : public SpinBox { public: - MainSpinBox(SpinBox2* sb2, TQWidget* parent, const char* name = 0) + MainSpinBox(SpinBox2* sb2, TQWidget* parent, const char* name = nullptr) : SpinBox(parent, name), owner(sb2) { } - MainSpinBox(int minValue, int maxValue, int step, SpinBox2* sb2, TQWidget* parent, const char* name = 0) + MainSpinBox(int minValue, int maxValue, int step, SpinBox2* sb2, TQWidget* parent, const char* name = nullptr) : SpinBox(minValue, maxValue, step, parent, name), owner(sb2) { } void setAlignment(int a) { editor()->setAlignment(a); } virtual TQString mapValueToText(int v) { return owner->mapValueToText(v); } diff --git a/kalarm/lib/spinbox2private.h b/kalarm/lib/spinbox2private.h index 2aac3f6b2..d24c953c7 100644 --- a/kalarm/lib/spinbox2private.h +++ b/kalarm/lib/spinbox2private.h @@ -36,9 +36,9 @@ class ExtraSpinBox : public SpinBox TQ_OBJECT public: - explicit ExtraSpinBox(TQWidget* parent, const char* name = 0) + explicit ExtraSpinBox(TQWidget* parent, const char* name = nullptr) : SpinBox(parent, name), mNewStylePending(false) { } - ExtraSpinBox(int minValue, int maxValue, int step, TQWidget* parent, const char* name = 0) + ExtraSpinBox(int minValue, int maxValue, int step, TQWidget* parent, const char* name = nullptr) : SpinBox(minValue, maxValue, step, parent, name), mNewStylePending(false) { } signals: void styleUpdated(); @@ -63,7 +63,7 @@ class SpinMirror : public TQCanvasView TQ_OBJECT public: - explicit SpinMirror(SpinBox*, TQFrame* spinFrame, TQWidget* parent = 0, const char* name = 0); + explicit SpinMirror(SpinBox*, TQFrame* spinFrame, TQWidget* parent = nullptr, const char* name = nullptr); void setReadOnly(bool ro) { mReadOnly = ro; } bool isReadOnly() const { return mReadOnly; } void setNormalButtons(const TQPixmap&); diff --git a/kalarm/lib/synchtimer.cpp b/kalarm/lib/synchtimer.cpp index e32cf659c..fa83ac1d6 100644 --- a/kalarm/lib/synchtimer.cpp +++ b/kalarm/lib/synchtimer.cpp @@ -37,7 +37,7 @@ SynchTimer::SynchTimer() SynchTimer::~SynchTimer() { delete mTimer; - mTimer = 0; + mTimer = nullptr; } /****************************************************************************** @@ -91,7 +91,7 @@ void SynchTimer::disconnecT(TQObject* receiver, const char* member) = Application-wide timer synchronised to the minute boundary. =============================================================================*/ -MinuteTimer* MinuteTimer::mInstance = 0; +MinuteTimer* MinuteTimer::mInstance = nullptr; MinuteTimer* MinuteTimer::instance() { @@ -140,7 +140,7 @@ DailyTimer* DailyTimer::fixedInstance(const TQTime& timeOfDay, bool create) for (TQValueList::Iterator it = mFixedTimers.begin(); it != mFixedTimers.end(); ++it) if ((*it)->mTime == timeOfDay) return *it; - return create ? new DailyTimer(timeOfDay, true) : 0; + return create ? new DailyTimer(timeOfDay, true) : nullptr; } /****************************************************************************** diff --git a/kalarm/lib/synchtimer.h b/kalarm/lib/synchtimer.h index 2263589cd..0c38c5bc9 100644 --- a/kalarm/lib/synchtimer.h +++ b/kalarm/lib/synchtimer.h @@ -53,7 +53,7 @@ class SynchTimer : public TQObject SynchTimer(); virtual void start() = 0; void connecT(TQObject* receiver, const char* member); - void disconnecT(TQObject* receiver, const char* member = 0); + void disconnecT(TQObject* receiver, const char* member = nullptr); bool hasConnections() const { return !mConnections.isEmpty(); } TQTimer* mTimer; @@ -79,7 +79,7 @@ class MinuteTimer : public SynchTimer TQ_OBJECT public: - virtual ~MinuteTimer() { mInstance = 0; } + virtual ~MinuteTimer() { mInstance = nullptr; } /** Connect to the timer signal. * @param receiver Receiving object. * @param member Slot to activate. @@ -91,7 +91,7 @@ class MinuteTimer : public SynchTimer * @param member Slot to disconnect. If null, all slots belonging to * @p receiver will be disconnected. */ - static void disconnect(TQObject* receiver, const char* member = 0) + static void disconnect(TQObject* receiver, const char* member = nullptr) { if (mInstance) mInstance->disconnecT(receiver, member); } protected: @@ -135,7 +135,7 @@ class DailyTimer : public SynchTimer * @param member Slot to disconnect. If null, all slots belonging to * @p receiver will be disconnected. */ - static void disconnect(const TQTime& timeOfDay, TQObject* receiver, const char* member = 0); + static void disconnect(const TQTime& timeOfDay, TQObject* receiver, const char* member = nullptr); /** Change the time at which this variable timer triggers. * @param newTimeOfDay New time at which the timer should trigger. * @param triggerMissed If true, and if @p newTimeOfDay < @p oldTimeOfDay, and if the current @@ -192,7 +192,7 @@ class MidnightTimer * @param member Slot to disconnect. If null, all slots belonging to * @p receiver will be disconnected. */ - static void disconnect(TQObject* receiver, const char* member = 0) + static void disconnect(TQObject* receiver, const char* member = nullptr) { DailyTimer::disconnect(TQTime(0,0), receiver, member); } }; diff --git a/kalarm/lib/timeedit.cpp b/kalarm/lib/timeedit.cpp index 21215a6c5..d20c0cc1d 100644 --- a/kalarm/lib/timeedit.cpp +++ b/kalarm/lib/timeedit.cpp @@ -30,7 +30,7 @@ TimeEdit::TimeEdit(TQWidget* parent, const char* name) : TQHBox(parent, name), - mAmPm(0), + mAmPm(nullptr), mAmIndex(-1), mPmIndex(-1), mReadOnly(false) diff --git a/kalarm/lib/timeedit.h b/kalarm/lib/timeedit.h index cfe9185bb..c85ea2dc1 100644 --- a/kalarm/lib/timeedit.h +++ b/kalarm/lib/timeedit.h @@ -56,7 +56,7 @@ class TimeEdit : public TQHBox * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit TimeEdit(TQWidget* parent = 0, const char* name = 0); + explicit TimeEdit(TQWidget* parent = nullptr, const char* name = nullptr); /** Returns true if the widget is read only. */ bool isReadOnly() const { return mReadOnly; } /** Sets whether the widget is read-only for the user. If read-only, diff --git a/kalarm/lib/timeperiod.h b/kalarm/lib/timeperiod.h index e5cacc9b6..423c9d600 100644 --- a/kalarm/lib/timeperiod.h +++ b/kalarm/lib/timeperiod.h @@ -68,7 +68,7 @@ class TimePeriod : public TQHBox * @param parent The parent object of this widget. * @param name The name of this widget. */ - TimePeriod(bool allowMinute, TQWidget* parent, const char* name = 0); + TimePeriod(bool allowMinute, TQWidget* parent, const char* name = nullptr); /** Returns true if the widget is read only. */ bool isReadOnly() const { return mReadOnly; } /** Sets whether the widget is read-only for the user. If read-only, diff --git a/kalarm/lib/timespinbox.cpp b/kalarm/lib/timespinbox.cpp index db3d54002..0fa65d629 100644 --- a/kalarm/lib/timespinbox.cpp +++ b/kalarm/lib/timespinbox.cpp @@ -30,7 +30,7 @@ class TimeSpinBox::TimeValidator : public TQValidator { public: - TimeValidator(int minMin, int maxMin, TQWidget* parent, const char* name = 0) + TimeValidator(int minMin, int maxMin, TQWidget* parent, const char* name = nullptr) : TQValidator(parent, name), minMinute(minMin), maxMinute(maxMin), m12Hour(false), mPm(false) { } virtual State validate(TQString&, int&) const; diff --git a/kalarm/lib/timespinbox.h b/kalarm/lib/timespinbox.h index 564828753..cb0efbd72 100644 --- a/kalarm/lib/timespinbox.h +++ b/kalarm/lib/timespinbox.h @@ -53,14 +53,14 @@ class TimeSpinBox : public SpinBox2 * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit TimeSpinBox(bool use24hour, TQWidget* parent = 0, const char* name = 0); + explicit TimeSpinBox(bool use24hour, TQWidget* parent = nullptr, const char* name = nullptr); /** Constructor for a non-wrapping time spin box which can be used to enter a length of time. * @param minMinute The minimum value which the spin box can hold, in minutes. * @param maxMinute The maximum value which the spin box can hold, in minutes. * @param parent The parent object of this widget. * @param name The name of this widget. */ - TimeSpinBox(int minMinute, int maxMinute, TQWidget* parent = 0, const char* name = 0); + TimeSpinBox(int minMinute, int maxMinute, TQWidget* parent = nullptr, const char* name = nullptr); /** Returns true if the spin box holds a valid value. * An invalid value is displayed as asterisks. */ diff --git a/kalarm/main.cpp b/kalarm/main.cpp index dee6051af..6e6e76d1c 100644 --- a/kalarm/main.cpp +++ b/kalarm/main.cpp @@ -33,74 +33,74 @@ static TDECmdLineOptions options[] = { - { "a", 0, 0 }, - { "ack-confirm", I18N_NOOP("Prompt for confirmation when alarm is acknowledged"), 0 }, - { "A", 0, 0 }, - { "attach ", I18N_NOOP("Attach file to email (repeat as needed)"), 0 }, - { "auto-close", I18N_NOOP("Auto-close alarm window after --late-cancel period"), 0 }, - { "bcc", I18N_NOOP("Blind copy email to self"), 0 }, - { "b", 0, 0 }, - { "beep", I18N_NOOP("Beep when message is displayed"), 0 }, - { "colour", 0, 0 }, - { "c", 0, 0 }, - { "color ", I18N_NOOP("Message background color (name or hex 0xRRGGBB)"), 0 }, - { "colourfg", 0, 0 }, - { "C", 0, 0 }, - { "colorfg ", I18N_NOOP("Message foreground color (name or hex 0xRRGGBB)"), 0 }, - { "calendarURL ", I18N_NOOP("URL of calendar file"), 0 }, - { "cancelEvent ", I18N_NOOP("Cancel alarm with the specified event ID"), 0 }, - { "d", 0, 0 }, - { "disable", I18N_NOOP("Disable the alarm"), 0 }, - { "e", 0, 0 }, - { "!exec ", I18N_NOOP("Execute a shell command line"), 0 }, - { "edit ", I18N_NOOP("Display the alarm edit dialog to edit the specified alarm"), 0 }, - { "n", 0, 0 }, - { "edit-new", I18N_NOOP("Display the alarm edit dialog to edit a new alarm"), 0 }, - { "edit-new-preset ", I18N_NOOP("Display the alarm edit dialog, preset with a template"), 0 }, - { "f", 0, 0 }, - { "file ", I18N_NOOP("File to display"), 0 }, - { "F", 0, 0 }, - { "from-id ", I18N_NOOP("KMail identity to use as sender of email"), 0 }, - { "handleEvent ", I18N_NOOP("Trigger or cancel alarm with the specified event ID"), 0 }, - { "i", 0, 0 }, - { "interval ", I18N_NOOP("Interval between alarm repetitions"), 0 }, - { "k", 0, 0 }, - { "korganizer", I18N_NOOP("Show alarm as an event in KOrganizer"), 0 }, - { "l", 0, 0 }, + { "a", nullptr, nullptr }, + { "ack-confirm", I18N_NOOP("Prompt for confirmation when alarm is acknowledged"), nullptr }, + { "A", nullptr, nullptr }, + { "attach ", I18N_NOOP("Attach file to email (repeat as needed)"), nullptr }, + { "auto-close", I18N_NOOP("Auto-close alarm window after --late-cancel period"), nullptr }, + { "bcc", I18N_NOOP("Blind copy email to self"), nullptr }, + { "b", nullptr, nullptr }, + { "beep", I18N_NOOP("Beep when message is displayed"), nullptr }, + { "colour", nullptr, nullptr }, + { "c", nullptr, nullptr }, + { "color ", I18N_NOOP("Message background color (name or hex 0xRRGGBB)"), nullptr }, + { "colourfg", nullptr, nullptr }, + { "C", nullptr, nullptr }, + { "colorfg ", I18N_NOOP("Message foreground color (name or hex 0xRRGGBB)"), nullptr }, + { "calendarURL ", I18N_NOOP("URL of calendar file"), nullptr }, + { "cancelEvent ", I18N_NOOP("Cancel alarm with the specified event ID"), nullptr }, + { "d", nullptr, nullptr }, + { "disable", I18N_NOOP("Disable the alarm"), nullptr }, + { "e", nullptr, nullptr }, + { "!exec ", I18N_NOOP("Execute a shell command line"), nullptr }, + { "edit ", I18N_NOOP("Display the alarm edit dialog to edit the specified alarm"), nullptr }, + { "n", nullptr, nullptr }, + { "edit-new", I18N_NOOP("Display the alarm edit dialog to edit a new alarm"), nullptr }, + { "edit-new-preset ", I18N_NOOP("Display the alarm edit dialog, preset with a template"), nullptr }, + { "f", nullptr, nullptr }, + { "file ", I18N_NOOP("File to display"), nullptr }, + { "F", nullptr, nullptr }, + { "from-id ", I18N_NOOP("KMail identity to use as sender of email"), nullptr }, + { "handleEvent ", I18N_NOOP("Trigger or cancel alarm with the specified event ID"), nullptr }, + { "i", nullptr, nullptr }, + { "interval ", I18N_NOOP("Interval between alarm repetitions"), nullptr }, + { "k", nullptr, nullptr }, + { "korganizer", I18N_NOOP("Show alarm as an event in KOrganizer"), nullptr }, + { "l", nullptr, nullptr }, { "late-cancel ", I18N_NOOP("Cancel alarm if more than 'period' late when triggered"), "1" }, - { "L", 0, 0 }, - { "login", I18N_NOOP("Repeat alarm at every login"), 0 }, - { "m", 0, 0 }, - { "mail
", I18N_NOOP("Send an email to the given address (repeat as needed)"), 0 }, - { "p", 0, 0 }, - { "play ", I18N_NOOP("Audio file to play once"), 0 }, + { "L", nullptr, nullptr }, + { "login", I18N_NOOP("Repeat alarm at every login"), nullptr }, + { "m", nullptr, nullptr }, + { "mail
", I18N_NOOP("Send an email to the given address (repeat as needed)"), nullptr }, + { "p", nullptr, nullptr }, + { "play ", I18N_NOOP("Audio file to play once"), nullptr }, #ifndef WITHOUT_ARTS - { "P", 0, 0 }, - { "play-repeat ", I18N_NOOP("Audio file to play repeatedly"), 0 }, + { "P", nullptr, nullptr }, + { "play-repeat ", I18N_NOOP("Audio file to play repeatedly"), nullptr }, #endif - { "recurrence ", I18N_NOOP("Specify alarm recurrence using iCalendar syntax"), 0 }, - { "R", 0, 0 }, - { "reminder ", I18N_NOOP("Display reminder in advance of alarm"), 0 }, - { "reminder-once ", I18N_NOOP("Display reminder once, before first alarm recurrence"), 0 }, - { "r", 0, 0 }, - { "repeat ", I18N_NOOP("Number of times to repeat alarm (including initial occasion)"), 0 }, - { "reset", I18N_NOOP("Reset the alarm scheduling daemon"), 0 }, - { "s", 0, 0 }, - { "speak", I18N_NOOP("Speak the message when it is displayed"), 0 }, - { "stop", I18N_NOOP("Stop the alarm scheduling daemon"), 0 }, - { "S", 0, 0 }, - { "subject", I18N_NOOP("Email subject line"), 0 }, - { "t", 0, 0 }, - { "time