From 519858b71abdb94e0fa2292b3b88e4693ed346a6 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sun, 20 Sep 2026 15:48:36 -0300 Subject: Replace zero pointer constants with nullptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- katapult/common/actionregistry.cpp | 6 ++-- katapult/common/cachedcatalog.cpp | 8 ++--- katapult/common/imagedisplay.cpp | 42 +++++++++++----------- katapult/common/katapultcatalog.cpp | 2 +- katapult/common/katapultdisplay.cpp | 8 ++--- katapult/common/match.cpp | 2 +- katapult/katapult/katapult.cpp | 40 ++++++++++----------- katapult/katapult/katapultconfigdlg.cpp | 14 ++++---- katapult/katapult/katapultsettings.cpp | 20 +++++------ katapult/katapult/main.cpp | 6 ++-- .../catalogs/bookmarkcatalog/bookmarkcatalog.cpp | 2 +- .../catalogs/calculatorcatalog/actionevalexpr.cpp | 2 +- .../calculatorcatalog/calculatorcatalog.cpp | 4 +-- .../plugins/catalogs/documentcatalog/document.cpp | 4 +-- .../catalogs/documentcatalog/documentcatalog.cpp | 12 +++---- .../plugins/catalogs/execcatalog/actionrun.cpp | 2 +- .../catalogs/googlecatalog/actionsearch.cpp | 2 +- .../catalogs/programcatalog/actionrunprogram.cpp | 2 +- .../catalogs/programcatalog/programcatalog.cpp | 2 +- .../catalogs/spellcatalog/actioncopyspelling.cpp | 2 +- .../plugins/catalogs/spellcatalog/spelling.cpp | 2 +- 21 files changed, 92 insertions(+), 92 deletions(-) diff --git a/katapult/common/actionregistry.cpp b/katapult/common/actionregistry.cpp index 707ab43..5644fe2 100644 --- a/katapult/common/actionregistry.cpp +++ b/katapult/common/actionregistry.cpp @@ -22,7 +22,7 @@ #include "katapultaction.h" #include "katapultitem.h" -static ActionRegistry * actionRegistryInstance = 0; +static ActionRegistry * actionRegistryInstance = nullptr; ActionRegistry::ActionRegistry() { @@ -35,7 +35,7 @@ ActionRegistry::~ActionRegistry() ActionRegistry * ActionRegistry::self() { - if(actionRegistryInstance == 0) + if(actionRegistryInstance == nullptr) actionRegistryInstance = new ActionRegistry(); return actionRegistryInstance; } @@ -50,7 +50,7 @@ TQPtrList ActionRegistry::actionsForItem(const KatapultItem *ite TQPtrList result; TQPtrListIterator it(actions); KatapultAction *action; - while((action = it.current()) != 0) { + while((action = it.current()) != nullptr) { ++it; if(action->accepts(item)) result.append(action); diff --git a/katapult/common/cachedcatalog.cpp b/katapult/common/cachedcatalog.cpp index 5409784..f79314b 100644 --- a/katapult/common/cachedcatalog.cpp +++ b/katapult/common/cachedcatalog.cpp @@ -61,7 +61,7 @@ void CachedCatalog::queryChanged() TQPtrListIterator it(results); KatapultItem *item; - while((item = it.current())!=0) + while((item=it.current())!=nullptr) { ++it; Match match = queryItem(item, query()); @@ -75,7 +75,7 @@ void CachedCatalog::queryChanged() TQPtrListIterator it(cache); KatapultItem *item; - while((item=it.current())!=0) + while((item=it.current())!=nullptr) { ++it; Match match = queryItem(item, query()); @@ -156,13 +156,13 @@ const KatapultItem * CachedCatalog::findExact(TQString text) const text = text.lower(); KatapultItem *item; TQPtrListIterator it(cache); - while((item=it.current())!=0) + while((item=it.current())!=nullptr) { ++it; if(item->text().lower() == text) return item; } - return 0; + return nullptr; } void CachedCatalog::addItem(KatapultItem *item) diff --git a/katapult/common/imagedisplay.cpp b/katapult/common/imagedisplay.cpp index 858f9b2..ad54916 100644 --- a/katapult/common/imagedisplay.cpp +++ b/katapult/common/imagedisplay.cpp @@ -53,8 +53,8 @@ ImageDisplay::ImageDisplay(TQObject *, const char *name, const TQStringList&) setBackgroundMode(NoBackground); setFocusPolicy(TQWidget::StrongFocus); - singlebg = 0; - doublebg = 0; + singlebg = nullptr; + doublebg = nullptr; singlesize[0] = 0; singlesize[1] = 0; @@ -67,10 +67,10 @@ ImageDisplay::ImageDisplay(TQObject *, const char *name, const TQStringList&) margin[3] = 0; iconsize = 0; - bgSngl = 0; - bgDbl = 0; + bgSngl = nullptr; + bgDbl = nullptr; - fadeImg = 0; + fadeImg = nullptr; alpha = 0; fadeTimer = new TQTimer(this); @@ -84,15 +84,15 @@ ImageDisplay::ImageDisplay(TQObject *, const char *name, const TQStringList&) ImageDisplay::~ImageDisplay() { - if(singlebg != 0) + if(singlebg != nullptr) delete singlebg; - if(doublebg != 0) + if(doublebg != nullptr) delete doublebg; - if(bgSngl != 0) + if(bgSngl != nullptr) delete bgSngl; - if(bgDbl != 0) + if(bgDbl != nullptr) delete bgDbl; - if(fadeImg != 0) + if(fadeImg != nullptr) delete fadeImg; } @@ -119,10 +119,10 @@ void ImageDisplay::continueFade() { alpha = 100; fadeTimer->stop(); - if(fadeImg != 0) + if(fadeImg != nullptr) { delete fadeImg; - fadeImg = 0; + fadeImg = nullptr; } } } @@ -134,15 +134,15 @@ void ImageDisplay::showEvent(TQShowEvent *) // set back the display-size, because if it wouldn't be done this could be a problem-source. displaySize = 0; - if(bgSngl != 0) + if(bgSngl != nullptr) delete bgSngl; - if(bgDbl != 0) + if(bgDbl != nullptr) delete bgDbl; bgSngl = new TQPixmap(TQPixmap::grabWindow(tqt_xrootwin(), (desktopSize.width() - singlesize[0])/2 + desktopSize.left(), (desktopSize.height() - singlesize[1])/2 + desktopSize.top(), singlesize[0], singlesize[1])); bgDbl = new TQPixmap(TQPixmap::grabWindow(tqt_xrootwin(), (desktopSize.width() - doublesize[0])/2 + desktopSize.left(), (desktopSize.height() - doublesize[1])/2 + desktopSize.top(), doublesize[0], doublesize[1])); - if(fadeImg != 0) + if(fadeImg != nullptr) delete fadeImg; if(fadeTime <= 1) { @@ -160,14 +160,14 @@ void ImageDisplay::hide() { if(alpha == 0) { - if(fadeImg != 0) + if(fadeImg != nullptr) { delete fadeImg; - fadeImg = 0; + fadeImg = nullptr; } KatapultDisplay::hide(); } else { - if(fadeImg != 0) + if(fadeImg != nullptr) delete fadeImg; fadeImg = new TQImage(getDisplay().convertToImage()); fadeOut = true; @@ -231,7 +231,7 @@ TQPixmap ImageDisplay::getDisplay() int itemSpace = (doublesize[0]-offset[0]-offset[2]-padding)/2; const KatapultItem *_item = item(); - if(_item != 0) + if(_item != nullptr) { icon = _item->icon(iconsize); painter.drawPixmap(offset[0]+(itemSpace-iconsize)/2, offset[1], icon); @@ -239,7 +239,7 @@ TQPixmap ImageDisplay::getDisplay() } const KatapultAction *_action = action(); - if(_action != 0) + if(_action != nullptr) { int x = offset[0]+itemSpace+padding+padding; icon = _action->icon(iconsize); @@ -319,7 +319,7 @@ void ImageDisplay::paintEvent(TQPaintEvent *) bitBlt(this, 0, 0, bgDbl); else bitBlt(this, 0, 0, bgSngl); - } else if(fadeImg != 0) { + } else if(fadeImg != nullptr) { TQImage buffer; if(displaySize == 2) buffer = bgDbl->convertToImage(); diff --git a/katapult/common/katapultcatalog.cpp b/katapult/common/katapultcatalog.cpp index 7ffe8c8..8db27cd 100644 --- a/katapult/common/katapultcatalog.cpp +++ b/katapult/common/katapultcatalog.cpp @@ -85,6 +85,6 @@ void KatapultCatalog::writeSettings(TDEConfigBase *) TQWidget * KatapultCatalog::configure() { - return 0; + return nullptr; } diff --git a/katapult/common/katapultdisplay.cpp b/katapult/common/katapultdisplay.cpp index 5102496..51e18ff 100644 --- a/katapult/common/katapultdisplay.cpp +++ b/katapult/common/katapultdisplay.cpp @@ -23,11 +23,11 @@ #include "katapultdisplay.h" KatapultDisplay::KatapultDisplay(const char *name, WFlags f) - : TQWidget(0, name, f) + : TQWidget(nullptr, name, f) { _query = ""; - _item = 0; - _action = 0; + _item = nullptr; + _action = nullptr; _status = 0; _selectionLength = 0; } @@ -111,6 +111,6 @@ void KatapultDisplay::writeSettings(TDEConfigBase *) TQWidget * KatapultDisplay::configure() { - return 0; + return nullptr; } diff --git a/katapult/common/match.cpp b/katapult/common/match.cpp index 4a86925..ee2d831 100644 --- a/katapult/common/match.cpp +++ b/katapult/common/match.cpp @@ -25,7 +25,7 @@ Match::Match() { this->_rank = 0; - this->_item = 0; + this->_item = nullptr; this->_matched = 0; this->_null = true; } diff --git a/katapult/katapult/katapult.cpp b/katapult/katapult/katapult.cpp index 5156338..90dcafe 100644 --- a/katapult/katapult/katapult.cpp +++ b/katapult/katapult/katapult.cpp @@ -45,7 +45,7 @@ Katapult::Katapult() : DCOPObject("Katapult"), - KSystemTray(0, "katapultSysTray") + KSystemTray(nullptr, "katapultSysTray") { // Register with DCOP tdeApp->dcopClient()->registerAs("katapult", false); @@ -53,10 +53,10 @@ Katapult::Katapult() setPixmap(TDEGlobal::iconLoader()->loadIcon("katapult", TDEIcon::Small)); - display = 0; - globalAccel = 0; - actions = 0; - action = 0; + display = nullptr; + globalAccel = nullptr; + actions = nullptr; + action = nullptr; executing = false; _query = ""; @@ -85,15 +85,15 @@ Katapult::Katapult() if (!settings->hideNotification()) { TQString msg = i18n("Application successfully started !\nPress %1 to use it...") .arg(globalAccel->shortcut("show_katapult").toString()); - KPassivePopup::message(i18n("Katapult Notification"), msg, tdeApp->miniIcon(), this, 0, settings->notificationTimeout()); + KPassivePopup::message(i18n("Katapult Notification"), msg, tdeApp->miniIcon(), this, nullptr, settings->notificationTimeout()); } } Katapult::~Katapult() { - if(globalAccel != 0) + if(globalAccel != nullptr) delete globalAccel; - if(actions != 0) + if(actions != nullptr) delete actions; delete settings; } @@ -106,7 +106,7 @@ void Katapult::loadCatalogPlugins() void Katapult::initDisplay() { display = settings->display(); - if(display == 0) { + if(display == nullptr) { initAccel(this); } else { initAccel(display); @@ -170,22 +170,22 @@ void Katapult::setQuery(TQString _query) bestMatch = Match(); this->_query = _query; - if(display != 0) + if(display != nullptr) display->setQuery(_query); if(_query == "") { TQDictIterator it(catalogs); KatapultCatalog *catalog; - while((catalog = it.current()) != 0) + while((catalog = it.current()) != nullptr) { ++it; catalog->setQuery(""); } - display->setItem(0); - display->setAction(0); + display->setItem(nullptr); + display->setAction(nullptr); display->setStatus(0); display->setSelected(0); - action = 0; + action = nullptr; } else if(catalogs.count() == 0) { allStatus = S_Active | S_NoResults; display->setStatus(allStatus); @@ -194,7 +194,7 @@ void Katapult::setQuery(TQString _query) KatapultCatalog *catalog; int status; - while((catalog = it.current()) != 0) + while((catalog = it.current()) != nullptr) { ++it; catalog->setQuery(_query); @@ -258,11 +258,11 @@ void Katapult::showAboutDialog() void Katapult::updateDisplay() { - if(display != 0 && !executing) + if(display != nullptr && !executing) { display->setItem(bestMatch.item()); if(bestMatch.isNull()) { - display->setAction(0); + display->setAction(nullptr); display->setSelected(0); } else { display->setAction(action); @@ -275,7 +275,7 @@ void Katapult::updateDisplay() void Katapult::showLauncher() { - if(!settings->isConfiguring() && display != 0) + if(!settings->isConfiguring() && display != nullptr) { setQuery(""); display->setStatus(0); @@ -288,7 +288,7 @@ void Katapult::showLauncher() void Katapult::hideLauncher() { - if(display != 0) + if(display != nullptr) display->hide(); setQuery(""); } @@ -306,7 +306,7 @@ void Katapult::showGlobalShortcutsDialog() void Katapult::execute() { executing = true; - if(action == 0) + if(action == nullptr) { display->setStatus(S_Active | S_NoResults); display->update(); diff --git a/katapult/katapult/katapultconfigdlg.cpp b/katapult/katapult/katapultconfigdlg.cpp index 03773f3..f4c28b0 100644 --- a/katapult/katapult/katapultconfigdlg.cpp +++ b/katapult/katapult/katapultconfigdlg.cpp @@ -76,7 +76,7 @@ KatapultConfigDlg::KatapultConfigDlg(KatapultSettings *settings) catalogs = settings->activeCatalogs(); TQDictIterator it(catalogs); KatapultCatalog *catalog; - while((catalog = it.current()) != 0) + while((catalog = it.current()) != nullptr) { TQString catalogName = it.currentKey(); addCatalogPage(catalogName, catalog); @@ -92,7 +92,7 @@ KatapultConfigDlg::KatapultConfigDlg(KatapultSettings *settings) TQStringList displays = settings->displayNames(); display->displayName->insertStringList(displays); display->displayName->setCurrentItem(settings->displayNumber()); - displayConfig = 0; + displayConfig = nullptr; addDisplaySettings(); unfoldTreeList(true); @@ -132,7 +132,7 @@ void KatapultConfigDlg::activateCatalog(TQListBoxItem *i) { settings->activateCatalog(i->text()); KatapultCatalog *catalog = settings->catalog(i->text()); - if(catalog != 0) + if(catalog != nullptr) addCatalogPage(i->text(), catalog); } @@ -151,7 +151,7 @@ void KatapultConfigDlg::activateDisplay(int index) void KatapultConfigDlg::addCatalogPage(TQString name, KatapultCatalog *catalog) { TQWidget *catalogConfig = catalog->configure(); - if(catalogConfig != 0) + if(catalogConfig != nullptr) { TQStringList path; path << i18n("Catalogs") << name; @@ -164,13 +164,13 @@ void KatapultConfigDlg::addCatalogPage(TQString name, KatapultCatalog *catalog) void KatapultConfigDlg::addDisplaySettings() { - if(displayConfig != 0) + if(displayConfig != nullptr) { delete displayConfig; - displayConfig = 0; + displayConfig = nullptr; } displayConfig = settings->display()->configure(); - if(displayConfig != 0) + if(displayConfig != nullptr) { displayConfig->reparent((TQWidget *) display->displaySettings, TQPoint(0, 0)); display->displaySettings->layout()->add(displayConfig); diff --git a/katapult/katapult/katapultsettings.cpp b/katapult/katapult/katapultsettings.cpp index a4d0402..df6313f 100644 --- a/katapult/katapult/katapultsettings.cpp +++ b/katapult/katapult/katapultsettings.cpp @@ -41,7 +41,7 @@ KatapultSettings::KatapultSettings() readSettings(); _isConfiguring = false; _activeCatalogs.setAutoDelete(true); - _display = 0; + _display = nullptr; loadCatalogPlugins(); loadDisplayPlugins(); @@ -53,7 +53,7 @@ KatapultSettings::~KatapultSettings() if (_forceWrite) writeSettings(); - if(_display != 0) + if(_display != nullptr) delete _display; } @@ -107,14 +107,14 @@ void KatapultSettings::writeSettings() TQDictIterator it(_activeCatalogs); KatapultCatalog *catalog; - while((catalog = it.current()) != 0) + while((catalog = it.current()) != nullptr) { TDEConfigGroup group(config, TQString("Catalogs/%1").arg(it.currentKey())); catalog->writeSettings(&group); ++it; } - if(_display != 0) + if(_display != nullptr) { TDEConfigGroup group(config, TQString("Displays/%1").arg(_displayName)); _display->writeSettings(&group); @@ -320,8 +320,8 @@ void KatapultSettings::loadCatalogPlugins() { int errCode = 0; catalog = KParts::ComponentFactory::createInstanceFromService - (service, 0, 0, TQStringList(), &errCode); - if(catalog != 0) + (service, nullptr, nullptr, TQStringList(), &errCode); + if(catalog != nullptr) { TDEConfigGroup group(tdeApp->config(), TQString("Catalogs/%1").arg(id)); catalog->readSettings(&group); @@ -334,10 +334,10 @@ void KatapultSettings::loadCatalogPlugins() void KatapultSettings::loadDisplayPlugins() { - if(_display != 0) + if(_display != nullptr) { delete _display; - _display = 0; + _display = nullptr; } _displayNames.clear(); @@ -359,10 +359,10 @@ void KatapultSettings::loadDisplayPlugins() { int errCode = 0; _display = KParts::ComponentFactory::createInstanceFromService - (service, 0, 0, TQStringList(), &errCode); + (service, nullptr, nullptr, TQStringList(), &errCode); } } - if(_display != 0) + if(_display != nullptr) { TDEConfigGroup group(tdeApp->config(), TQString("Displays/%1").arg(_displayName)); _display->readSettings(&group); diff --git a/katapult/katapult/main.cpp b/katapult/katapult/main.cpp index 323bfb6..3f3a1b8 100644 --- a/katapult/katapult/main.cpp +++ b/katapult/katapult/main.cpp @@ -39,13 +39,13 @@ static TDECmdLineOptions options[] = int main(int argc, char **argv) { TDEAboutData about("katapult", I18N_NOOP("Katapult"), version, description, - TDEAboutData::License_GPL, I18N_NOOP("(C) until 2005, Joe Ferris\n(C) 2005, the Katapult development team"), 0, 0, "dev@thekatapult.org.uk"); + TDEAboutData::License_GPL, I18N_NOOP("(C) until 2005, Joe Ferris\n(C) 2005, the Katapult development team"), nullptr, nullptr, "dev@thekatapult.org.uk"); about.addAuthor( "Martin Meredith" , I18N_NOOP("Project Manager"), "mez@thekatapult.org.uk"); about.addAuthor( "Bastian Holst", I18N_NOOP("Lead Developer"), "oculus@thekatapult.org.uk" ); about.addAuthor( "Tobi Vollebregt", I18N_NOOP("Developer"), "tobi@thekatapult.org.uk" ); about.addAuthor( "Lee Olson", I18N_NOOP("Graphics"), "clearbeast@gmail.com" ); - about.addAuthor( "Jean-Remy Falleri", 0, "jr.falleri@gmail.com" ); - about.addAuthor( "Jonathan Riddell", 0, "jriddell@ubuntu.com" ); + about.addAuthor( "Jean-Remy Falleri", nullptr, "jr.falleri@gmail.com" ); + about.addAuthor( "Jonathan Riddell", nullptr, "jriddell@ubuntu.com" ); about.addAuthor( "Joe Ferris", I18N_NOOP("Original Author"), "jferris@optimistictech.com" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp index 1484489..9cedce1 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp +++ b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp @@ -59,7 +59,7 @@ BookmarkCatalog::~BookmarkCatalog() void BookmarkCatalog::initialize() { - if(manager != 0) + if(manager != nullptr) cacheBookmarkList(manager->root()); if(_mozEnabled) cacheMozillaBookmarks(); diff --git a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp index 9f19b52..40b37a0 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp +++ b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp @@ -42,7 +42,7 @@ static TQString formatNumber(const TQString& numStr) } ActionEvaluateExpression::ActionEvaluateExpression() - : KatapultAction(), _expr(0) + : KatapultAction(), _expr(nullptr) { } diff --git a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp index 45d2ec6..83384f9 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp +++ b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp @@ -95,7 +95,7 @@ const CalculatorCatalog::Function CalculatorCatalog::radiansFunctionTable[] = { "frac", 4, frac }, { "round", 5, round }, { "int", 3, trunc }, - { 0, 0, 0 } + { nullptr, 0, nullptr } }; const CalculatorCatalog::Function CalculatorCatalog::degreesFunctionTable[] = @@ -120,7 +120,7 @@ const CalculatorCatalog::Function CalculatorCatalog::degreesFunctionTable[] = { "frac", 4, frac }, { "round", 5, round }, { "int", 3, trunc }, - { 0, 0, 0 } + { nullptr, 0, nullptr } }; diff --git a/katapult/plugins/catalogs/documentcatalog/document.cpp b/katapult/plugins/catalogs/documentcatalog/document.cpp index ee87f4c..8253f7e 100644 --- a/katapult/plugins/catalogs/documentcatalog/document.cpp +++ b/katapult/plugins/catalogs/documentcatalog/document.cpp @@ -54,11 +54,11 @@ TQPixmap Document::icon(int size) const TQ_SLOT(gotPreview(const KFileItem*, const TQPixmap&))); if(this->_gotpix)return this->_pix; - return KMimeType::pixmapForURL(u,0, TDEIcon::NoGroup, size, TDEIcon::DefaultState, 0L); + return KMimeType::pixmapForURL(u,0, TDEIcon::NoGroup, size, TDEIcon::DefaultState, nullptr); } else { - return KMimeType::pixmapForURL(u,0, TDEIcon::NoGroup, size, TDEIcon::DefaultState, 0L); + return KMimeType::pixmapForURL(u,0, TDEIcon::NoGroup, size, TDEIcon::DefaultState, nullptr); } } diff --git a/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp b/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp index 6e55b0e..bba05af 100644 --- a/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp +++ b/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp @@ -45,7 +45,7 @@ DocumentCatalog::DocumentCatalog(TQObject *, const char *, const TQStringList&) { _minQueryLen = 1; currentPath = ""; - currentDirDoc = 0; + currentDirDoc = nullptr; queryMatched = 0; filesListed = false; files.setAutoDelete(true); @@ -67,7 +67,7 @@ void DocumentCatalog::refreshFolders() { folders.clear(); files.clear(); - currentDirDoc = 0; + currentDirDoc = nullptr; filesListed = false; TQStringList folderNames = dir.entryList(TQDir::Dirs); for(TQStringList::Iterator it = folderNames.begin(); it != folderNames.end(); ++it) { @@ -147,13 +147,13 @@ void DocumentCatalog::queryChanged() refreshFiles(); } if(!path.isEmpty()) { - if(currentDirDoc != 0) { + if(currentDirDoc != nullptr) { files.removeRef(currentDirDoc); - currentDirDoc = 0; + currentDirDoc = nullptr; } TQPtrListIterator it(files); Document *document; - while((document = it.current()) != 0) { + while((document = it.current()) != nullptr) { ++it; if(document->name().lower().startsWith(path)) { int rank = 100*query().length()/document->text().length(); @@ -166,7 +166,7 @@ void DocumentCatalog::queryChanged() } } - if(currentDirDoc != 0 && path.isEmpty()) + if(currentDirDoc != nullptr && path.isEmpty()) newBestMatch = Match(currentDirDoc, 100, currentPath.length()); newStatus |= S_Active; diff --git a/katapult/plugins/catalogs/execcatalog/actionrun.cpp b/katapult/plugins/catalogs/execcatalog/actionrun.cpp index ef99b85..afc67aa 100644 --- a/katapult/plugins/catalogs/execcatalog/actionrun.cpp +++ b/katapult/plugins/catalogs/execcatalog/actionrun.cpp @@ -36,7 +36,7 @@ #include "actionrun.h" ActionRun::ActionRun() - : KatapultAction(), _command(0) + : KatapultAction(), _command(nullptr) { } diff --git a/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp b/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp index b69bc3f..9b41d37 100644 --- a/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp +++ b/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp @@ -37,7 +37,7 @@ #include "actionsearch.h" ActionSearch::ActionSearch() - : KatapultAction(), _searchquery(0) + : KatapultAction(), _searchquery(nullptr) { } diff --git a/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp b/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp index b5c080d..a03db81 100644 --- a/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp +++ b/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp @@ -53,7 +53,7 @@ void ActionRunProgram::execute(const KatapultItem *item) const if(strcmp(item->className(), "Program") == 0) { const Program *program = (const Program *) item; KService *service = program->service(); - if(service != 0) + if(service != nullptr) KRun::run(*service, KURL::List()); //TODO: report error running program } diff --git a/katapult/plugins/catalogs/programcatalog/programcatalog.cpp b/katapult/plugins/catalogs/programcatalog/programcatalog.cpp index 7c2797f..51c21cc 100644 --- a/katapult/plugins/catalogs/programcatalog/programcatalog.cpp +++ b/katapult/plugins/catalogs/programcatalog/programcatalog.cpp @@ -70,7 +70,7 @@ void ProgramCatalog::cacheProgramList(TQString relPath) { KSycocaEntry *e = *it; - if(e != 0) { + if(e != nullptr) { if(e->isType(KST_KServiceGroup)) { KServiceGroup::Ptr g(static_cast(e)); diff --git a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp b/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp index 5dc5b0c..a068416 100644 --- a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp +++ b/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp @@ -34,7 +34,7 @@ #include "actioncopyspelling.h" ActionCopySpelling::ActionCopySpelling() - : KatapultAction(), _spelling(0) + : KatapultAction(), _spelling(nullptr) { } diff --git a/katapult/plugins/catalogs/spellcatalog/spelling.cpp b/katapult/plugins/catalogs/spellcatalog/spelling.cpp index 4159b9d..292d17d 100644 --- a/katapult/plugins/catalogs/spellcatalog/spelling.cpp +++ b/katapult/plugins/catalogs/spellcatalog/spelling.cpp @@ -34,7 +34,7 @@ Spelling::Spelling(SpellCatalog* catalog, const TQString& text): KatapultItem(), _catalog(catalog), _text(text) { - spellChecker = new KSpell( 0, "caption", this, TQ_SLOT(spellCheckerReady()) ); + spellChecker = new KSpell( nullptr, "caption", this, TQ_SLOT(spellCheckerReady()) ); connect( spellChecker, TQ_SIGNAL(misspelling(const TQString&, const TQStringList&, unsigned int)), this, TQ_SLOT(spellCheckerMisspelling(const TQString&, const TQStringList&, unsigned int)) ); -- cgit v1.2.3