src/gvcore/filethumbnailview: replace NULL -> nullptr

Signed-off-by: Alexander Golubev <[email protected]>

2 files changed, 12 insertions, 15 deletions

diff --git a/src/app/configimagelistpage.ui b/src/app/configimagelistpage.ui
index 828119e..96bfcc5 100644
--- a/src/app/configimagelistpage.ui
+++ b/src/app/configimagelistpage.ui
@@ -215,9 +215,6 @@ In thumbnail view with text on the right, this is always displayed.&lt;/p&gt;</s
                     <property name="text">
                         <string>&amp;Image size</string>
                     </property>
-                    <property name="toolTip" stdset="0">
-                        <string></string>
-                    </property>
                     <property name="whatsThis" stdset="0">
                         <string>&lt;p&gt;Whether to display the image dimensions in thumbnail view with information on the bottom if available.&lt;/p&gt;
 &lt;p&gt;
diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp
index 16e491d..543fa78 100644
--- a/src/gvcore/filethumbnailview.cpp
+++ b/src/gvcore/filethumbnailview.cpp
@@ -169,7 +169,7 @@ FileThumbnailView::FileThumbnailView(TQWidget* parent)
 	d->mThumbnailUpdateTimer=new TQTimer(this);
 	d->mMarginSize=FileViewConfig::thumbnailMarginSize();
 	d->mItemDetails=FileViewConfig::thumbnailDetails();
-	d->mPrefetch = NULL;
+	d->mPrefetch = nullptr;
 	d->mThumbnailSize = 0;
 	d->mThumbnailsDetailDialog = 0;
 
@@ -388,7 +388,7 @@ void FileThumbnailView::doStartThumbnailUpdate(const KFileItemList* list) {
 void FileThumbnailView::stopThumbnailUpdate() {
 	if (!d->mThumbnailLoadJob.isNull()) {
 		d->mThumbnailLoadJob->kill(false);
-		d->mThumbnailLoadJob=NULL;
+		d->mThumbnailLoadJob=nullptr;
 	}
 }
 
@@ -679,11 +679,11 @@ void FileThumbnailView::slotCurrentChanged(TQIconViewItem* item ) {
 	prefetchDone();
 	// if the first image is selected, no matter how, preload the next one
 	for( TQIconViewItem* pos = item;
-	     pos != NULL;
+	     pos != nullptr;
 	     pos = pos->nextItem()) {
 		FileThumbnailViewItem* cur = static_cast< FileThumbnailViewItem* >( pos );
 		if( cur->fileItem()->isDir() || Archive::fileItemIsArchive(cur->fileItem())) continue;
-		if( pos == item && pos->nextItem() != NULL ) {
+		if( pos == item && pos->nextItem() != nullptr ) {
 			d->mPrefetch = ImageLoader::loader(
 				static_cast<const FileThumbnailViewItem*>( cur->nextItem() )->fileItem()->url(),
 				this, BUSY_PRELOADING );
@@ -703,7 +703,7 @@ void FileThumbnailView::updateVisibilityInfo( int x, int y ) {
 	TQRect rect( x, y, visibleWidth(), visibleHeight());
 	FileThumbnailViewItem* first = static_cast< FileThumbnailViewItem* >( findFirstVisibleItem( rect ));
 	if (!first) {
-		d->mThumbnailLoadJob->setPriorityItems(NULL,NULL,NULL);
+		d->mThumbnailLoadJob->setPriorityItems(nullptr,nullptr,nullptr);
 		return;
 	}
 	
@@ -732,8 +732,8 @@ void FileThumbnailView::keyPressEvent( TQKeyEvent* e ) {
 
 	TQIconViewItem* current = currentItem();
 	TDEIconView::keyPressEvent( e );
-	TQIconViewItem* next = NULL;
-	if( current != currentItem() && currentItem() != NULL ) { // it actually moved
+	TQIconViewItem* next = nullptr;
+	if( current != currentItem() && currentItem() != nullptr ) { // it actually moved
 		switch( e->key()) {
 			case Key_Left:
 				next = currentItem()->prevItem();
@@ -744,13 +744,13 @@ void FileThumbnailView::keyPressEvent( TQKeyEvent* e ) {
 			case Key_Up:
 			// This relies on the thumbnails being in a grid ( x() == x() )
 				for( next = currentItem()->prevItem();
-				     next != NULL && next->x() != currentItem()->x();
+				     next != nullptr && next->x() != currentItem()->x();
 				     next = next->prevItem())
 					;
 				break;
 			case Key_Down:
 				for( next = currentItem()->nextItem();
-				     next != NULL && next->x() != currentItem()->x();
+				     next != nullptr && next->x() != currentItem()->x();
 				     next = next->nextItem())
 					;
 				break;
@@ -758,7 +758,7 @@ void FileThumbnailView::keyPressEvent( TQKeyEvent* e ) {
 
 	}
 	prefetchDone();
-	if( next != NULL ) {
+	if( next != nullptr ) {
 		d->mPrefetch = ImageLoader::loader(
 			static_cast<const FileThumbnailViewItem*>( next )->fileItem()->url(),
 			this, BUSY_PRELOADING );
@@ -767,9 +767,9 @@ void FileThumbnailView::keyPressEvent( TQKeyEvent* e ) {
 }
 
 void FileThumbnailView::prefetchDone() {
-	if( d->mPrefetch != NULL ) {
+	if( d->mPrefetch != nullptr ) {
 		d->mPrefetch->release( this );
-		d->mPrefetch = NULL;
+		d->mPrefetch = nullptr;
 	}
 }