From 8e518251f70cc69071ebdbf4c2cc87fb800fa992 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sun, 20 Sep 2026 16:59:23 -0300 Subject: Replace NULL pointer constants with nullptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- src/menuhandler.cpp | 34 +++++++++++++++++----------------- src/tastylistview.cpp | 4 ++-- src/tastylistview.h | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/menuhandler.cpp b/src/menuhandler.cpp index 81b2728..30c6256 100644 --- a/src/menuhandler.cpp +++ b/src/menuhandler.cpp @@ -141,7 +141,7 @@ MenuHandler::MenuHandler( TQWidget *parent, Prefs *prefs, char *name, WFlags fl) initializeRecentlyUsed( ); - populateList( service, menu->rootList, NULL, false ); + populateList( service, menu->rootList, nullptr, false ); //left/middle mouse button connect (menu->dynamicList, @@ -345,7 +345,7 @@ bool MenuHandler::eventFilter( TQObject *o, TQEvent * e ) if( o != menu->searchLine ) return false; - TQListViewItem *listItem = NULL; + TQListViewItem *listItem = nullptr; //execute the only list item when there is exactly one TQListViewItemIterator it( menu->dynamicList, TQListViewItemIterator::Visible); @@ -473,7 +473,7 @@ void MenuHandler::readConfig() } else //strigi { - menu->searchLine->setListView(NULL); + menu->searchLine->setListView(nullptr); menu->searchLine->setEnabled(true); disconnect(menu->searchLine, TQ_SIGNAL(textChanged( const TQString &)), this, TQ_SLOT (initializeSearch( const TQString &)) ); @@ -497,7 +497,7 @@ void MenuHandler::updateConfig() menuModeChanged( _menuMode ); KServiceGroup::Ptr service = KServiceGroup::root(); menu->rootList->clear(); - populateList( service, menu->rootList, NULL, false ); + populateList( service, menu->rootList, nullptr, false ); } @@ -701,7 +701,7 @@ void MenuHandler::populateList( KServiceGroup *serviceGroup, TastyListView *list KServiceGroup::List list = serviceGroup->entries(true, true, true, false); - TastyListViewItem *prevListItem = NULL; + TastyListViewItem *prevListItem = nullptr; for (KServiceGroup::List::ConstIterator it = list.begin (); it != list.end (); it++) @@ -785,7 +785,7 @@ void MenuHandler::populateList( KServiceGroup *serviceGroup, TastyListView *list listItemFather->insertItem( listItem ); if( recursive ) - populateList( g, NULL, listItem, true, query); + populateList( g, nullptr, listItem, true, query); //the left column is always open if( listView == menu->dynamicList || @@ -804,10 +804,10 @@ void MenuHandler::populateList( KServiceGroup *serviceGroup, TastyListView *list else if( recursive ) { if( listView ) - populateList( g, listView, NULL, true, query); + populateList( g, listView, nullptr, true, query); else if(listItemFather) - populateList( g, NULL, listItemFather, true, query); + populateList( g, nullptr, listItemFather, true, query); delete listItem; } @@ -835,7 +835,7 @@ void MenuHandler::populateList( KServiceGroup *serviceGroup, TastyListView *list } //Have we done a query? (this improves query speed) - if( query != NULL + if( query != nullptr && !itemName.contains(query, false) && !subText.contains(query, false) ) continue; @@ -958,7 +958,7 @@ void MenuHandler::fillRecentDocuments( ) TQStringList recentDocsList = TDERecentDocument::recentDocuments(); - TastyListViewItem *listItem = NULL; + TastyListViewItem *listItem = nullptr; if( recentDocsList.isEmpty() ) return; @@ -1002,7 +1002,7 @@ void MenuHandler::fillMoreUsed( ) int iteration = 0; - TastyListViewItem *listItem = NULL; + TastyListViewItem *listItem = nullptr; for (TQStringList::Iterator it = moreUsedList.begin(); it != moreUsedList.end(); ++it ) @@ -1051,7 +1051,7 @@ void MenuHandler::fillRecentlyUsed( ) setupDynList( RecentlyUsed ); int iteration = 0; - TastyListViewItem *listItem = NULL; + TastyListViewItem *listItem = nullptr; for (RecentlyUsedMap::Iterator it = recentlyUsedMap.begin(); it != recentlyUsedMap.end(); ++it ) @@ -1100,7 +1100,7 @@ void MenuHandler::fillFavourites( ) menu->dynamicList->clear(); setupDynList( Favourites ); - TastyListViewItem *listItem = NULL; + TastyListViewItem *listItem = nullptr; for (TQStringList::Iterator it = favouriteList.begin(); it != favouriteList.end(); ++it ) @@ -1202,7 +1202,7 @@ void MenuHandler::slotUpdateApplications() menu->rootList->clear(); KServiceGroup::Ptr service = KServiceGroup::root(); - populateList( service, menu->rootList, NULL, false ); + populateList( service, menu->rootList, nullptr, false ); } void MenuHandler::listClicked( TastyListViewItem * listItem, const TQPoint & coord ) @@ -1310,7 +1310,7 @@ void MenuHandler::listClicked( TastyListViewItem * listItem, const TQPoint & coo if( serviceGroup ) { menu->childList->clear(); - populateList( serviceGroup, menu->childList, NULL, true ); + populateList( serviceGroup, menu->childList, nullptr, true ); } break; } @@ -1584,14 +1584,14 @@ void MenuHandler::initializeSearch( const TQString & query ) KServiceGroup::Ptr service = KServiceGroup::root(); menu->dynamicList->clear(); setCursor(TQCursor(TQt::BusyCursor)); - populateList( service, menu->dynamicList, NULL, true, query ); + populateList( service, menu->dynamicList, nullptr, true, query ); setCursor(TQCursor(TQt::ArrowCursor)); } else if( query.length() < 3 ) { if( menu->searchLine->listView() ) { - menu->searchLine->setListView(NULL); + menu->searchLine->setListView(nullptr); menu->searchLine->setEnabled(true); menu->searchLine->setFocus(); menu->searchLine->setContextMenuEnabled(false); diff --git a/src/tastylistview.cpp b/src/tastylistview.cpp index dabaf4c..9545903 100644 --- a/src/tastylistview.cpp +++ b/src/tastylistview.cpp @@ -36,7 +36,7 @@ TastyListView::TastyListView( TQWidget * parent, const char * name) { onItemTimer = new TQTimer(this, "onItemTimer"); - underCursorItem = openItem = NULL; + underCursorItem = openItem = nullptr; mouseDown = false; actionIconSize = 16; actionIconSpace = 32; @@ -109,7 +109,7 @@ void TastyListView::contentsMouseMoveEvent( TQMouseEvent * e ) mouseDown = (e->state() & TQt::LeftButton); if( itemAt( contentsToViewport(TQPoint(e->x(), e->y()))) == 0 ) - underCursorItem = NULL; + underCursorItem = nullptr; } void TastyListView::leaveEvent( TQEvent * e ) diff --git a/src/tastylistview.h b/src/tastylistview.h index 5148057..04a63f0 100644 --- a/src/tastylistview.h +++ b/src/tastylistview.h @@ -88,7 +88,7 @@ public: void setOpenItem( TQListViewItem * listItem ){openItem = listItem;} public slots: - virtual void clear(){openItem = underCursorItem = NULL; TDEListView::clear();} + virtual void clear(){openItem = underCursorItem = nullptr; TDEListView::clear();} protected: -- cgit v1.2.3