From 3109eb451687492c46bd38173a872906e583e81f Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sun, 4 Oct 2026 06:47:28 -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 --- src/app/bookmarkviewcontroller.cpp | 6 +++--- src/app/main.cpp | 14 ++++++------ src/app/mainwindow.cpp | 18 ++++++++-------- src/app/treeview.cpp | 12 +++++------ src/gvcore/clicklineedit.h | 2 +- src/gvcore/cursortracker.cpp | 2 +- src/gvcore/document.cpp | 2 +- src/gvcore/dragpixmapgenerator.h | 2 +- src/gvcore/externaltooldialog.cpp | 10 ++++----- src/gvcore/filedetailview.cpp | 20 +++++++++--------- src/gvcore/filedetailview.h | 2 +- src/gvcore/fileoperation.h | 18 ++++++++-------- src/gvcore/fileopobject.cpp | 2 +- src/gvcore/fileopobject.h | 32 ++++++++++++++-------------- src/gvcore/filethumbnailview.cpp | 34 ++++++++++++++--------------- src/gvcore/filethumbnailviewitem.cpp | 2 +- src/gvcore/fileviewbase.h | 2 +- src/gvcore/fileviewcontroller.cpp | 26 +++++++++++------------ src/gvcore/imageview.cpp | 24 ++++++++++----------- src/gvcore/imageviewcontroller.cpp | 16 +++++++------- src/gvcore/jpegformattype.cpp | 4 ++-- src/gvcore/pngformattype.cpp | 40 +++++++++++++++++------------------ src/gvcore/printdialog.h | 2 +- src/gvcore/qxcfi.cpp | 14 ++++++------ src/gvcore/qxcfi.h | 8 +++---- src/gvcore/thumbnaildetailsdialog.cpp | 2 +- src/gvcore/thumbnailloadjob.cpp | 22 +++++++++---------- src/gvcore/xcursor.cpp | 2 +- src/gvcore/xpm.cpp | 6 +++--- src/gvdirpart/gvdirpart.cpp | 4 ++-- src/gvdirpart/gvdirpart.h | 2 +- src/gvimagepart/gvimagepart.cpp | 4 ++-- src/gvimagepart/gvimagepart.h | 2 +- 33 files changed, 179 insertions(+), 179 deletions(-) diff --git a/src/app/bookmarkviewcontroller.cpp b/src/app/bookmarkviewcontroller.cpp index 2229a2f..8f6eb30 100644 --- a/src/app/bookmarkviewcontroller.cpp +++ b/src/app/bookmarkviewcontroller.cpp @@ -117,8 +117,8 @@ struct BookmarkViewController::Private { template void addGroup(ItemParent* itemParent, const KBookmarkGroup& group) { KBookmark bookmark=group.first(); - BookmarkItem* previousItem=0; - BookmarkItem* item=0; + BookmarkItem* previousItem=nullptr; + BookmarkItem* item=nullptr; for (;!bookmark.isNull(); bookmark=group.next(bookmark) ) { if (bookmark.isSeparator()) continue; @@ -176,7 +176,7 @@ BookmarkViewController::BookmarkViewController(TQWidget* parent) : TQObject(parent) { d=new Private; - d->mManager=0; + d->mManager=nullptr; d->mBox=new TQVBox(parent); diff --git a/src/app/main.cpp b/src/app/main.cpp index af9044f..c649e34 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -33,12 +33,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. namespace Gwenview { static TDECmdLineOptions options[] = { - { "f", I18N_NOOP("Start in fullscreen mode"), 0 }, - { "filter-type ", I18N_NOOP("Filter by file type"), 0 }, - { "filter-name ", I18N_NOOP("Filter by file pattern (*.jpg, 01*...)"), 0 }, - { "filter-from ", I18N_NOOP("Only show files newer or equal to "), 0 }, - { "filter-to ", I18N_NOOP("Only show files older or equal to "), 0 }, - { "+[file or folder]", I18N_NOOP("A starting file or folder"), 0 }, + { "f", I18N_NOOP("Start in fullscreen mode"), nullptr }, + { "filter-type ", I18N_NOOP("Filter by file type"), nullptr }, + { "filter-name ", I18N_NOOP("Filter by file pattern (*.jpg, 01*...)"), nullptr }, + { "filter-from ", I18N_NOOP("Only show files newer or equal to "), nullptr }, + { "filter-to ", I18N_NOOP("Only show files older or equal to "), nullptr }, + { "+[file or folder]", I18N_NOOP("A starting file or folder"), nullptr }, TDECmdLineLastOption }; @@ -106,7 +106,7 @@ extern "C" TDE_EXPORT int kdemain (int argc, char *argv[]) { TDEAboutData aboutData("gwenview", I18N_NOOP("Gwenview"), version, I18N_NOOP("An image viewer for TDE"), TDEAboutData::License_GPL, - "Copyright 2000-2006, The Gwenview developers",0,"http://gwenview.sourceforge.net"); + "Copyright 2000-2006, The Gwenview developers",nullptr,"http://gwenview.sourceforge.net"); aboutData.addAuthor("Aurélien Gâteau", I18N_NOOP("Main developer"), "aurelien.gateau@free.fr"); aboutData.addAuthor("Luboš Luňák", I18N_NOOP("Developer"), "l.lunak@suse.cz"); diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index 5ae19e4..a601b0c 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -163,7 +163,7 @@ static bool urlIsDirectory(TQWidget* parent, const KURL& url) { MainWindow::MainWindow() : TDEMainWindow() #ifdef GV_HAVE_KIPI -, mPluginLoader(0) +, mPluginLoader(nullptr) #endif { // Backend @@ -539,7 +539,7 @@ void MainWindow::hideToolBars() { TQPtrListIterator it=toolBarIterator(); TDEToolBar* bar; - for(;it.current()!=0L; ++it) { + for(;it.current(); ++it) { bar=it.current(); if (bar->area()) { bar->area()->hide(); @@ -555,7 +555,7 @@ void MainWindow::showToolBars() { TDEToolBar* bar; - for(;it.current()!=0L; ++it) { + for(;it.current(); ++it) { bar=it.current(); if (bar->area()) { bar->area()->show(); @@ -991,9 +991,9 @@ void MainWindow::createActions() { mReload=new TDEAction(i18n("Reload"), "reload", Key_F5, mDocument, TQ_SLOT(reload()), actionCollection(), "reload"); mReload->setEnabled(false); - mToggleFullScreen= KStdAction::fullScreen(this,TQ_SLOT(toggleFullScreen()),actionCollection(),0); + mToggleFullScreen= KStdAction::fullScreen(this,TQ_SLOT(toggleFullScreen()),actionCollection(),nullptr); mToggleSlideShow=new TDEAction(i18n("Slide Show"),"slideshow_play",0,this,TQ_SLOT(toggleSlideShow()),actionCollection(),"slideshow"); - mFullScreenLabelAction=new TDEToolBarLabelAction("", 0, 0, 0, actionCollection(), "fullscreen_label"); + mFullScreenLabelAction=new TDEToolBarLabelAction("", 0, nullptr, nullptr, actionCollection(), "fullscreen_label"); // Go mGoUp=new TDEToolBarPopupAction(i18n("Up"), "go-up", ALT + Key_Up, this, TQ_SLOT(goUp()), actionCollection(), "go_up"); @@ -1079,7 +1079,7 @@ void MainWindow::createObjectInteractions() { BookmarkOwner* bookmarkOwner=new BookmarkOwner(this); TDEActionMenu* bookmark=new TDEActionMenu(i18n( "&Bookmarks" ), "bookmark", actionCollection(), "bookmarks" ); - new KBookmarkMenu(manager, bookmarkOwner, bookmark->popupMenu(), 0, true); + new KBookmarkMenu(manager, bookmarkOwner, bookmark->popupMenu(), nullptr, true); connect(bookmarkOwner,TQ_SIGNAL(openURL(const KURL&)), mFileViewController,TQ_SLOT(setDirURL(const KURL&)) ); @@ -1097,7 +1097,7 @@ void MainWindow::createHideShowAction(KDockWidget* dock) { caption=i18n("Show %1").arg(dock->caption()); } - TDEAction* action=new TDEAction(caption, 0, dock, TQ_SLOT(changeHideShowState()), (TQObject*)0 ); + TDEAction* action=new TDEAction(caption, 0, dock, TQ_SLOT(changeHideShowState()), (TQObject*)nullptr ); if (dock->icon()) { action->setIconSet( TQIconSet(*dock->icon()) ); } @@ -1225,7 +1225,7 @@ void MainWindow::createLocationToolBar() { mURLEdit->setAutoDeleteCompletionObject(true); KWidgetAction* comboAction=new KWidgetAction( mURLEdit, i18n("Location Bar"), 0, - 0, 0, actionCollection(), "location_url"); + nullptr, nullptr, actionCollection(), "location_url"); comboAction->setShortcutConfigurable(false); comboAction->setAutoSized(true); @@ -1318,7 +1318,7 @@ void MainWindow::slotReplug() { } // Create a dummy "no plugin" action list - TDEAction* noPlugin=new TDEAction(i18n("No Plugin"), 0, 0, 0, actionCollection(), "no_plugin"); + TDEAction* noPlugin=new TDEAction(i18n("No Plugin"), 0, nullptr, nullptr, actionCollection(), "no_plugin"); noPlugin->setShortcutConfigurable(false); noPlugin->setEnabled(false); TQPtrList noPluginList; diff --git a/src/app/treeview.cpp b/src/app/treeview.cpp index 77a44f8..a2a4017 100644 --- a/src/app/treeview.cpp +++ b/src/app/treeview.cpp @@ -62,7 +62,7 @@ struct TreeView::Private { return static_cast(item); } } - return 0L; + return nullptr; } void setURLInternal(const KURL& url) { @@ -117,8 +117,8 @@ TreeView::TreeView(TQWidget* parent) : KFileTreeView(parent) { d=new Private; d->mView=this; - d->mBranch=0; - d->mDropTarget=0; + d->mBranch=nullptr; + d->mDropTarget=nullptr; d->mAutoOpenTimer=new TQTimer(this); // Look @@ -270,7 +270,7 @@ void TreeView::contentsDragMoveEvent(TQDragMoveEvent* event) { d->mAutoOpenTimer->stop(); if (d->mDropTarget) { stopAnimation(d->mDropTarget); - d->mDropTarget=0L; + d->mDropTarget=nullptr; } return; } @@ -293,7 +293,7 @@ void TreeView::contentsDragLeaveEvent(TQDragLeaveEvent*) { d->mAutoOpenTimer->stop(); if (d->mDropTarget) { stopAnimation(d->mDropTarget); - d->mDropTarget=0L; + d->mDropTarget=nullptr; } } @@ -328,7 +328,7 @@ void TreeView::contentsDropEvent(TQDropEvent* event) { // Reset drop target if (d->mDropTarget) { stopAnimation(d->mDropTarget); - d->mDropTarget=0L; + d->mDropTarget=nullptr; } } diff --git a/src/gvcore/clicklineedit.h b/src/gvcore/clicklineedit.h index dea9996..00a20fa 100644 --- a/src/gvcore/clicklineedit.h +++ b/src/gvcore/clicklineedit.h @@ -38,7 +38,7 @@ class ClickLineEdit : public KLineEdit TQ_PROPERTY( TQString clickMessage READ clickMessage WRITE setClickMessage ) public: - ClickLineEdit(TQWidget *parent, const char* name = 0 ); + ClickLineEdit(TQWidget *parent, const char* name = nullptr ); void setClickMessage( const TQString &msg ); TQString clickMessage() const { return mClickMessage; } diff --git a/src/gvcore/cursortracker.cpp b/src/gvcore/cursortracker.cpp index 914093c..091764c 100644 --- a/src/gvcore/cursortracker.cpp +++ b/src/gvcore/cursortracker.cpp @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. namespace Gwenview { CursorTracker::CursorTracker(const TQString& txt, TQWidget* reference) -: TQLabel(txt, 0, "", WX11BypassWM) { +: TQLabel(txt, nullptr, "", WX11BypassWM) { reference->setMouseTracking(true); reference->installEventFilter(this); } diff --git a/src/gvcore/document.cpp b/src/gvcore/document.cpp index d40e74a..1454e4f 100644 --- a/src/gvcore/document.cpp +++ b/src/gvcore/document.cpp @@ -106,7 +106,7 @@ Document::Document(TQObject* parent) d=new DocumentPrivate; d->mModified=false; d->mImpl=new DocumentEmptyImpl(this); - d->mStatJob=0L; + d->mStatJob=nullptr; d->mFileSize=-1; // Register formats here to make sure they are always enabled diff --git a/src/gvcore/dragpixmapgenerator.h b/src/gvcore/dragpixmapgenerator.h index 192736b..6a5f776 100644 --- a/src/gvcore/dragpixmapgenerator.h +++ b/src/gvcore/dragpixmapgenerator.h @@ -41,7 +41,7 @@ template class DragPixmapItemDrawer { public: DragPixmapItemDrawer() - : mGenerator(0) {} + : mGenerator(nullptr) {} virtual ~DragPixmapItemDrawer() {} virtual void setGenerator(DragPixmapGenerator* generator) { mGenerator = generator; diff --git a/src/gvcore/externaltooldialog.cpp b/src/gvcore/externaltooldialog.cpp index e0aadb4..807dadd 100644 --- a/src/gvcore/externaltooldialog.cpp +++ b/src/gvcore/externaltooldialog.cpp @@ -51,7 +51,7 @@ enum { ID_ALL_IMAGES=0, ID_ALL_FILES, ID_CUSTOM }; class ToolListViewItem : public TDEListViewItem { public: ToolListViewItem(TDEListView* parent, const TQString& label) - : TDEListViewItem(parent, label), mDesktopFile(0L) {} + : TDEListViewItem(parent, label), mDesktopFile(nullptr) {} void setDesktopFile(TDEDesktopFile* df) { mDesktopFile=df; @@ -73,7 +73,7 @@ struct ExternalToolDialogPrivate { ExternalToolDialogPrivate() - : mSelectedItem(0L) {} + : mSelectedItem(nullptr) {} void fillMimeTypeListView() { TQStringList mimeTypes=MimeTypeUtils::rasterImageMimeTypes(); @@ -204,7 +204,7 @@ struct ExternalToolDialogPrivate { void updateDetails() { - mContent->mDetails->setEnabled(mSelectedItem!=0); + mContent->mDetails->setEnabled(mSelectedItem!=nullptr); if (mSelectedItem) { TDEDesktopFile* desktopFile=mSelectedItem->desktopFile(); @@ -255,7 +255,7 @@ public: ExternalToolDialog::ExternalToolDialog(TQWidget* parent) : KDialogBase( - parent,0, false, TQString(), KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel, + parent,nullptr, false, TQString(), KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel, KDialogBase::Ok, true) { setWFlags(getWFlags() | TQt::WDestructiveClose); @@ -335,7 +335,7 @@ void ExternalToolDialog::deleteTool() { TDEDesktopFile* desktopFile=item->desktopFile(); delete item; d->mDeletedTools.append(desktopFile); - d->mSelectedItem=0L; + d->mSelectedItem=nullptr; d->updateDetails(); } diff --git a/src/gvcore/filedetailview.cpp b/src/gvcore/filedetailview.cpp index a8e2679..c543131 100644 --- a/src/gvcore/filedetailview.cpp +++ b/src/gvcore/filedetailview.cpp @@ -154,7 +154,7 @@ KFileItem * FileDetailView::currentFileItem() const FileDetailViewItem *current = static_cast( currentItem() ); if ( current ) return current->fileInfo(); - return 0L; + return nullptr; } void FileDetailView::clearSelection() @@ -175,7 +175,7 @@ void FileDetailView::invertSelection() void FileDetailView::slotActivateMenu (TQListViewItem *item,const TQPoint& pos ) { if ( !item ) { - sig->activateMenu( 0, pos ); + sig->activateMenu( nullptr, pos ); return; } FileDetailViewItem *i = (FileDetailViewItem*) item; @@ -185,7 +185,7 @@ void FileDetailView::slotActivateMenu (TQListViewItem *item,const TQPoint& pos ) void FileDetailView::clearView() { mResolver->m_lstPendingMimeIconItems.clear(); - mShownFileItem=0L; + mShownFileItem=nullptr; TDEListView::clear(); } @@ -291,7 +291,7 @@ void FileDetailView::removeItem( const KFileItem *i ) FileDetailViewItem *item = viewItem(i); mResolver->m_lstPendingMimeIconItems.remove( item ); - if(mShownFileItem==i) mShownFileItem=0L; + if(mShownFileItem==i) mShownFileItem=nullptr; delete item; KFileView::removeItem( i ); @@ -395,14 +395,14 @@ void FileDetailView::ensureItemVisible( const KFileItem *i ) // we're in multiselection mode void FileDetailView::slotSelectionChanged() { - sig->highlightFile( 0L ); + sig->highlightFile( nullptr ); } KFileItem * FileDetailView::firstFileItem() const { FileDetailViewItem *item = static_cast( firstChild() ); if ( item ) return item->fileInfo(); - return 0L; + return nullptr; } KFileItem * FileDetailView::nextItem( const KFileItem *fileItem ) const @@ -412,7 +412,7 @@ KFileItem * FileDetailView::nextItem( const KFileItem *fileItem ) const if ( item && item->itemBelow() ) return ((FileDetailViewItem*) item->itemBelow())->fileInfo(); else - return 0L; + return nullptr; } else return firstFileItem(); @@ -425,7 +425,7 @@ KFileItem * FileDetailView::prevItem( const KFileItem *fileItem ) const if ( item && item->itemAbove() ) return ((FileDetailViewItem*) item->itemAbove())->fileInfo(); else - return 0L; + return nullptr; } else return firstFileItem(); @@ -509,7 +509,7 @@ void FileDetailView::startDrag() return; } - TQDragObject* drag=new KURLDrag(urls, this, 0); + TQDragObject* drag=new KURLDrag(urls, this, nullptr); TQPixmap dragPixmap = generator.generate(); drag->setPixmap( dragPixmap, TQPoint(-generator.DRAG_OFFSET, -generator.DRAG_OFFSET)); @@ -539,7 +539,7 @@ bool FileDetailView::acceptDrag(TQDropEvent* event) const { } void FileDetailView::contentsDropEvent(TQDropEvent *event) { - KFileItem* fileItem=0L; + KFileItem* fileItem=nullptr; TQListViewItem *item=itemAt(contentsToViewport(event->pos() ) ); if (item) { diff --git a/src/gvcore/filedetailview.h b/src/gvcore/filedetailview.h index aced4ba..884d01e 100644 --- a/src/gvcore/filedetailview.h +++ b/src/gvcore/filedetailview.h @@ -117,7 +117,7 @@ private: FileDetailViewItem* viewItem( const KFileItem* item ) const { if (item) return (FileDetailViewItem*)item->extraData(this); - return 0L; + return nullptr; } void setSortingKey(FileDetailViewItem* item, const KFileItem* i); diff --git a/src/gvcore/fileoperation.h b/src/gvcore/fileoperation.h index 550dafb..b38701d 100644 --- a/src/gvcore/fileoperation.h +++ b/src/gvcore/fileoperation.h @@ -38,14 +38,14 @@ namespace Gwenview { */ namespace FileOperation { -LIBGWENVIEW_EXPORT void copyTo(const KURL::List&,TQWidget* parent=0L); -LIBGWENVIEW_EXPORT void moveTo(const KURL::List&,TQWidget* parent,TQObject* receiver=0L,const char* slot=0L); +LIBGWENVIEW_EXPORT void copyTo(const KURL::List&,TQWidget* parent=nullptr); +LIBGWENVIEW_EXPORT void moveTo(const KURL::List&,TQWidget* parent,TQObject* receiver=nullptr,const char* slot=nullptr); LIBGWENVIEW_EXPORT void linkTo(const KURL::List& srcURL,TQWidget* parent); -LIBGWENVIEW_EXPORT void makeDir(const KURL& parentURL, TQWidget* parent, TQObject* receiver=0L, const char* slot=0L); -LIBGWENVIEW_EXPORT void del(const KURL::List&,TQWidget* parent,TQObject* receiver=0L,const char* slot=0L); -LIBGWENVIEW_EXPORT void trash(const KURL::List&,TQWidget* parent,TQObject* receiver=0L,const char* slot=0L); -LIBGWENVIEW_EXPORT void realDelete(const KURL::List&,TQWidget* parent,TQObject* receiver=0L,const char* slot=0L); -LIBGWENVIEW_EXPORT void rename(const KURL&,TQWidget* parent,TQObject* receiver=0L,const char* slot=0L); +LIBGWENVIEW_EXPORT void makeDir(const KURL& parentURL, TQWidget* parent, TQObject* receiver=nullptr, const char* slot=nullptr); +LIBGWENVIEW_EXPORT void del(const KURL::List&,TQWidget* parent,TQObject* receiver=nullptr,const char* slot=nullptr); +LIBGWENVIEW_EXPORT void trash(const KURL::List&,TQWidget* parent,TQObject* receiver=nullptr,const char* slot=nullptr); +LIBGWENVIEW_EXPORT void realDelete(const KURL::List&,TQWidget* parent,TQObject* receiver=nullptr,const char* slot=nullptr); +LIBGWENVIEW_EXPORT void rename(const KURL&,TQWidget* parent,TQObject* receiver=nullptr,const char* slot=nullptr); /** @@ -85,8 +85,8 @@ private: }; -LIBGWENVIEW_EXPORT void fillDropURLMenu(TQPopupMenu*, const KURL::List&, const KURL& target, bool* wasMoved=0L); -LIBGWENVIEW_EXPORT void openDropURLMenu(TQWidget* parent, const KURL::List&, const KURL& target, bool* wasMoved=0L); +LIBGWENVIEW_EXPORT void fillDropURLMenu(TQPopupMenu*, const KURL::List&, const KURL& target, bool* wasMoved=nullptr); +LIBGWENVIEW_EXPORT void openDropURLMenu(TQWidget* parent, const KURL::List&, const KURL& target, bool* wasMoved=nullptr); } // namespace diff --git a/src/gvcore/fileopobject.cpp b/src/gvcore/fileopobject.cpp index 3d6dfd8..412afb8 100644 --- a/src/gvcore/fileopobject.cpp +++ b/src/gvcore/fileopobject.cpp @@ -57,7 +57,7 @@ public: setMode(KFile::Directory | KFile::ExistingOnly); // Cast to avoid gcc being confused - setPreviewWidget(static_cast(0)); + setPreviewWidget(static_cast(nullptr)); } }; diff --git a/src/gvcore/fileopobject.h b/src/gvcore/fileopobject.h index b7994d3..db4d87a 100644 --- a/src/gvcore/fileopobject.h +++ b/src/gvcore/fileopobject.h @@ -45,8 +45,8 @@ class FileOpObject : public TQObject { TQ_OBJECT public: - FileOpObject(const KURL&,TQWidget* parent=0L); - FileOpObject(const KURL::List&,TQWidget* parent=0L); + FileOpObject(const KURL&,TQWidget* parent=nullptr); + FileOpObject(const KURL::List&,TQWidget* parent=nullptr); virtual void operator()()=0; signals: @@ -67,8 +67,8 @@ class FileOpCopyToObject : public FileOpObject { TQ_OBJECT public: - FileOpCopyToObject(const KURL& url,TQWidget* parent=0L) : FileOpObject(url,parent) {} - FileOpCopyToObject(const KURL::List& urlList,TQWidget* parent=0L) : FileOpObject(urlList,parent) {} + FileOpCopyToObject(const KURL& url,TQWidget* parent=nullptr) : FileOpObject(url,parent) {} + FileOpCopyToObject(const KURL::List& urlList,TQWidget* parent=nullptr) : FileOpObject(urlList,parent) {} void operator()(); }; @@ -76,8 +76,8 @@ class FileOpLinkToObject : public FileOpObject { TQ_OBJECT public: - FileOpLinkToObject(const KURL& url,TQWidget* parent=0L) : FileOpObject(url,parent) {} - FileOpLinkToObject(const KURL::List& urlList,TQWidget* parent=0L) : FileOpObject(urlList,parent) {} + FileOpLinkToObject(const KURL& url,TQWidget* parent=nullptr) : FileOpObject(url,parent) {} + FileOpLinkToObject(const KURL::List& urlList,TQWidget* parent=nullptr) : FileOpObject(urlList,parent) {} void operator()(); }; @@ -85,8 +85,8 @@ class FileOpMoveToObject : public FileOpObject { TQ_OBJECT public: - FileOpMoveToObject(const KURL& url,TQWidget* parent=0L) : FileOpObject(url,parent) {} - FileOpMoveToObject(const KURL::List& urlList,TQWidget* parent=0L) : FileOpObject(urlList,parent) {} + FileOpMoveToObject(const KURL& url,TQWidget* parent=nullptr) : FileOpObject(url,parent) {} + FileOpMoveToObject(const KURL::List& urlList,TQWidget* parent=nullptr) : FileOpObject(urlList,parent) {} void operator()(); }; @@ -94,7 +94,7 @@ class FileOpMakeDirObject : public FileOpObject { TQ_OBJECT public: - FileOpMakeDirObject(const KURL& url, TQWidget* parent=0L) : FileOpObject(url, parent) {} + FileOpMakeDirObject(const KURL& url, TQWidget* parent=nullptr) : FileOpObject(url, parent) {} void operator()(); }; @@ -102,8 +102,8 @@ class FileOpDelObject : public FileOpObject { TQ_OBJECT public: - FileOpDelObject(const KURL& url,TQWidget* parent=0L) : FileOpObject(url,parent) {} - FileOpDelObject(const KURL::List& urlList,TQWidget* parent=0L) : FileOpObject(urlList,parent) {} + FileOpDelObject(const KURL& url,TQWidget* parent=nullptr) : FileOpObject(url,parent) {} + FileOpDelObject(const KURL::List& urlList,TQWidget* parent=nullptr) : FileOpObject(urlList,parent) {} void operator()(); }; @@ -112,8 +112,8 @@ class FileOpTrashObject : public FileOpObject { TQ_OBJECT public: - FileOpTrashObject(const KURL& url,TQWidget* parent=0L) : FileOpObject(url,parent) {} - FileOpTrashObject(const KURL::List& urlList,TQWidget* parent=0L) : FileOpObject(urlList,parent) {} + FileOpTrashObject(const KURL& url,TQWidget* parent=nullptr) : FileOpObject(url,parent) {} + FileOpTrashObject(const KURL::List& urlList,TQWidget* parent=nullptr) : FileOpObject(urlList,parent) {} void operator()(); }; @@ -122,8 +122,8 @@ class FileOpRealDeleteObject : public FileOpObject { TQ_OBJECT public: - FileOpRealDeleteObject(const KURL& url,TQWidget* parent=0L) : FileOpObject(url,parent) {} - FileOpRealDeleteObject(const KURL::List& urlList,TQWidget* parent=0L) : FileOpObject(urlList,parent) {} + FileOpRealDeleteObject(const KURL& url,TQWidget* parent=nullptr) : FileOpObject(url,parent) {} + FileOpRealDeleteObject(const KURL::List& urlList,TQWidget* parent=nullptr) : FileOpObject(urlList,parent) {} void operator()(); }; @@ -132,7 +132,7 @@ class FileOpRenameObject : public FileOpObject { TQ_OBJECT public: - FileOpRenameObject(const KURL& url,TQWidget* parent=0L) : FileOpObject(url,parent) {} + FileOpRenameObject(const KURL& url,TQWidget* parent=nullptr) : FileOpObject(url,parent) {} void operator()(); signals: diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp index 1f7f288..58d9918 100644 --- a/src/gvcore/filethumbnailview.cpp +++ b/src/gvcore/filethumbnailview.cpp @@ -153,7 +153,7 @@ struct FileThumbnailView::Private { static FileThumbnailViewItem* viewItem(const FileThumbnailView* view, const KFileItem* fileItem) { - if (!fileItem) return 0L; + if (!fileItem) return nullptr; return static_cast( const_cast(fileItem->extraData(view) ) ); } @@ -163,15 +163,15 @@ FileThumbnailView::FileThumbnailView(TQWidget* parent) { d=new Private; d->mUpdateThumbnailsOnNextShow=false; - d->mThumbnailLoadJob=0L; + d->mThumbnailLoadJob=nullptr; d->mWaitPixmap=TQPixmap(::locate("appdata", "thumbnail/wait.png")); - d->mProgressWidget=0L; + d->mProgressWidget=nullptr; d->mThumbnailUpdateTimer=new TQTimer(this); d->mMarginSize=FileViewConfig::thumbnailMarginSize(); d->mItemDetails=FileViewConfig::thumbnailDetails(); d->mPrefetch = nullptr; d->mThumbnailSize = 0; - d->mThumbnailsDetailDialog = 0; + d->mThumbnailsDetailDialog = nullptr; setItemTextPos( TQIconView::ItemTextPos(FileViewConfig::thumbnailTextPos()) ); setAutoArrange(true); @@ -399,7 +399,7 @@ void FileThumbnailView::stopThumbnailUpdate() { void FileThumbnailView::slotUpdateEnded() { Q_ASSERT(d->mProgressWidget); delete d->mProgressWidget; - d->mProgressWidget=0L; + d->mProgressWidget=nullptr; BusyLevelManager::instance()->setBusyLevel( this, BUSY_NONE ); // Besides thumbnails the job loads image dimensions and this may mess up the grid @@ -441,7 +441,7 @@ void FileThumbnailView::slotBusyLevelChanged(BusyLevel level) { //----------------------------------------------------------------------------- void FileThumbnailView::clearView() { stopThumbnailUpdate(); - mShownFileItem=0L; + mShownFileItem=nullptr; TQIconView::clear(); } @@ -516,7 +516,7 @@ void FileThumbnailView::removeItem(const KFileItem* fileItem) { if (!d->mThumbnailLoadJob.isNull()) d->mThumbnailLoadJob->itemRemoved(fileItem); - if (fileItem==mShownFileItem) mShownFileItem=0L; + if (fileItem==mShownFileItem) mShownFileItem=nullptr; // Remove it from our view FileThumbnailViewItem* iconItem=viewItem(this, fileItem); @@ -528,17 +528,17 @@ void FileThumbnailView::removeItem(const KFileItem* fileItem) { KFileItem* FileThumbnailView::firstFileItem() const { FileThumbnailViewItem* iconItem=static_cast(firstItem()); - if (!iconItem) return 0L; + if (!iconItem) return nullptr; return iconItem->fileItem(); } KFileItem* FileThumbnailView::prevItem(const KFileItem* fileItem) const { const FileThumbnailViewItem* iconItem=viewItem(this, fileItem); - if (!iconItem) return 0L; + if (!iconItem) return nullptr; iconItem=static_cast(iconItem->prevItem()); - if (!iconItem) return 0L; + if (!iconItem) return nullptr; return iconItem->fileItem(); } @@ -546,7 +546,7 @@ KFileItem* FileThumbnailView::prevItem(const KFileItem* fileItem) const { KFileItem* FileThumbnailView::currentFileItem() const { const TQIconViewItem* iconItem=currentItem(); - if (!iconItem) return 0L; + if (!iconItem) return nullptr; return static_cast(iconItem)->fileItem(); } @@ -554,10 +554,10 @@ KFileItem* FileThumbnailView::currentFileItem() const { KFileItem* FileThumbnailView::nextItem(const KFileItem* fileItem) const { const FileThumbnailViewItem* iconItem=viewItem(this, fileItem); - if (!iconItem) return 0L; + if (!iconItem) return nullptr; iconItem=static_cast(iconItem->nextItem()); - if (!iconItem) return 0L; + if (!iconItem) return nullptr; return iconItem->fileItem(); } @@ -588,7 +588,7 @@ void FileThumbnailView::contentsDragEnterEvent(TQDragEnterEvent* event) { void FileThumbnailView::slotDropped(TQDropEvent* event) { - emit dropped(event,0L); + emit dropped(event,nullptr); } @@ -831,11 +831,11 @@ void FileThumbnailView::startDrag() { TQPixmap* pixmapFromFileItem(KFileItem* fileItem) { FileThumbnailViewItem* iconItem = viewItem(mView, fileItem); Q_ASSERT(iconItem); - if (!iconItem) return 0; + if (!iconItem) return nullptr; TQPixmap* pix = iconItem->pixmap(); Q_ASSERT(pix); - if (!pix) return 0; + if (!pix) return nullptr; return pix; } @@ -860,7 +860,7 @@ void FileThumbnailView::startDrag() { return; } - TQDragObject* drag=new KURLDrag(urls, this, 0); + TQDragObject* drag=new KURLDrag(urls, this, nullptr); TQPixmap dragPixmap = generator.generate(); drag->setPixmap( dragPixmap, TQPoint(generator.DRAG_OFFSET, -generator.DRAG_OFFSET)); diff --git a/src/gvcore/filethumbnailviewitem.cpp b/src/gvcore/filethumbnailviewitem.cpp index 46a79ca..9f8f906 100644 --- a/src/gvcore/filethumbnailviewitem.cpp +++ b/src/gvcore/filethumbnailviewitem.cpp @@ -136,7 +136,7 @@ class FileThumbnailViewItem::WrappedLine : public FileThumbnailViewItem::Line { public: WrappedLine(const TQIconViewItem* item, const TQString& txt) : Line(item, txt) - , mWordWrap(0) {} + , mWordWrap(nullptr) {} ~WrappedLine() { delete mWordWrap; diff --git a/src/gvcore/fileviewbase.h b/src/gvcore/fileviewbase.h index 8d22182..2cdb795 100644 --- a/src/gvcore/fileviewbase.h +++ b/src/gvcore/fileviewbase.h @@ -30,7 +30,7 @@ namespace Gwenview { class FileViewBase : public KFileView { public: - FileViewBase() : mShownFileItem(0L) {} + FileViewBase() : mShownFileItem(nullptr) {} KFileItem* shownFileItem() const { return mShownFileItem; } virtual void setShownFileItem(KFileItem* fileItem) { mShownFileItem=fileItem; } diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp index 716e49a..8033646 100644 --- a/src/gvcore/fileviewcontroller.cpp +++ b/src/gvcore/fileviewcontroller.cpp @@ -321,7 +321,7 @@ FileViewController::FileViewController(TQWidget* parent,TDEActionCollection* act connect(mSizeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateThumbnailSize(int)) ); connect(mListMode, TQ_SIGNAL(toggled(bool)), mSizeSlider, TQ_SLOT(setDisabled(bool)) ); - TDEAction* sliderAction=new KWidgetAction(mSizeSlider, i18n("Thumbnail Size"), 0, 0, 0, actionCollection, "size_slider"); + TDEAction* sliderAction=new KWidgetAction(mSizeSlider, i18n("Thumbnail Size"), 0, nullptr, nullptr, actionCollection, "size_slider"); d->mSliderTracker=new TipTracker("", mSizeSlider); // /Size slider @@ -524,7 +524,7 @@ void FileViewController::setDirURL(const KURL& url) { } mDirLister->clearError(); - currentFileView()->setShownFileItem(0L); + currentFileView()->setShownFileItem(nullptr); mFileNameToSelect=TQString(); mDirLister->openURL(mDirURL); emit urlChanged(mDirURL); @@ -817,12 +817,12 @@ void FileViewController::setSorting() { // //----------------------------------------------------------------------- void FileViewController::openContextMenu(TDEListView*,TQListViewItem* item,const TQPoint& pos) { - emit requestContextMenu(pos, item!=0); + emit requestContextMenu(pos, item!=nullptr); } void FileViewController::openContextMenu(TQIconViewItem* item,const TQPoint& pos) { - emit requestContextMenu(pos, item!=0); + emit requestContextMenu(pos, item!=nullptr); } @@ -977,7 +977,7 @@ void FileViewController::setMode(FileViewController::Mode mode) { // Set the new view to the same state as the old items=oldView->selectedItems(); - for(KFileItemListIterator it(*items);it.current()!=0L;++it) { + for(KFileItemListIterator it(*items);it.current();++it) { newView->setSelected(it.current(), true); } newView->setShownFileItem(oldView->shownFileItem()); @@ -985,7 +985,7 @@ void FileViewController::setMode(FileViewController::Mode mode) { // Remove references to the old view from KFileItems items=oldView->items(); - for(KFileItemListIterator it(*items);it.current()!=0L;++it) { + for(KFileItemListIterator it(*items);it.current();++it) { it.current()->removeExtraData(oldView); } @@ -1022,7 +1022,7 @@ void FileViewController::retryURL() { // //----------------------------------------------------------------------- void FileViewController::dirListerDeleteItem(KFileItem* item) { - KFileItem* newShownItem=0L; + KFileItem* newShownItem=nullptr; const KFileItem* shownItem=currentFileView()->shownFileItem(); if (shownItem==item) { newShownItem=findNextImage(); @@ -1062,7 +1062,7 @@ void FileViewController::dirListerNewItems(const KFileItemList& items) { void FileViewController::dirListerRefreshItems(const KFileItemList& list) { LOG(""); KFileItemListIterator it(list); - for (; *it!=0L; ++it) { + for (; *it; ++it) { updateViewItem(*it); } @@ -1311,7 +1311,7 @@ KFileItem* FileViewController::findLastImage() const { KFileItem* FileViewController::findPreviousImage() const { KFileItem* item=currentFileView()->shownFileItem(); - if (!item) return 0L; + if (!item) return nullptr; do { item=currentFileView()->prevItem(item); } while (item && Archive::fileItemIsDirOrArchive(item)); @@ -1320,7 +1320,7 @@ KFileItem* FileViewController::findPreviousImage() const { KFileItem* FileViewController::findNextImage() const { KFileItem* item=currentFileView()->shownFileItem(); - if (!item) return 0L; + if (!item) return nullptr; do { item=currentFileView()->nextItem(item); } while (item && Archive::fileItemIsDirOrArchive(item)); @@ -1329,14 +1329,14 @@ KFileItem* FileViewController::findNextImage() const { KFileItem* FileViewController::findItemByFileName(const TQString& fileName) const { KFileItem *item; - if (fileName.isEmpty()) return 0L; + if (fileName.isEmpty()) return nullptr; for (item=currentFileView()->firstFileItem(); item; item=currentFileView()->nextItem(item) ) { if (item->name()==fileName) return item; } - return 0L; + return nullptr; } //----------------------------------------------------------------------------- @@ -1389,7 +1389,7 @@ void FileViewController::stopMetaInfoUpdate() { d->mMetaInfoTodo.clear(); if(d->mMetaInfoJob) { d->mMetaInfoJob->kill(); - d->mMetaInfoJob = 0; + d->mMetaInfoJob = nullptr; } } diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp index c1738a9..dbb827b 100644 --- a/src/gvcore/imageview.cpp +++ b/src/gvcore/imageview.cpp @@ -290,7 +290,7 @@ public: ImageView::ImageView(TQWidget* parent,Document* document, TDEActionCollection* actionCollection) -: TQScrollView(parent,0L,WResizeNoErase|WRepaintNoErase|WPaintClever) +: TQScrollView(parent,nullptr,WResizeNoErase|WRepaintNoErase|WPaintClever) { d=new Private; d->mDocument=document; @@ -308,7 +308,7 @@ ImageView::ImageView(TQWidget* parent,Document* document, TDEActionCollection* a d->mGamma = 100; d->mBrightness = 0; d->mContrast = 100; - d->mBCGDialog = 0; + d->mBCGDialog = nullptr; viewport()->setFocusPolicy(TQWidget::WheelFocus); setFrameStyle(NoFrame); @@ -326,10 +326,10 @@ ImageView::ImageView(TQWidget* parent,Document* document, TDEActionCollection* a d->mZoomToFit=new TDEToggleAction(i18n("Fit to &Window"),"zoom-fit-best",0,d->mActionCollection,"view_zoom_to_fit"); connect(d->mZoomToFit,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setZoomToFit(bool)) ); - d->mZoomToWidth=new TDEToggleAction(i18n("Fit to &Width"),0,0,d->mActionCollection,"view_zoom_to_width"); + d->mZoomToWidth=new TDEToggleAction(i18n("Fit to &Width"),nullptr,0,d->mActionCollection,"view_zoom_to_width"); connect(d->mZoomToWidth,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setZoomToWidth(bool)) ); - d->mZoomToHeight=new TDEToggleAction(i18n("Fit to &Height"),0,0,d->mActionCollection,"view_zoom_to_height"); + d->mZoomToHeight=new TDEToggleAction(i18n("Fit to &Height"),nullptr,0,d->mActionCollection,"view_zoom_to_height"); connect(d->mZoomToHeight,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setZoomToHeight(bool)) ); @@ -351,7 +351,7 @@ ImageView::ImageView(TQWidget* parent,Document* document, TDEActionCollection* a connect(d->mZoomCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSelectZoom()) ); - d->mZoomComboAction=new KWidgetAction(d->mZoomCombo, i18n("Zoom"), 0, 0, 0, d->mActionCollection, "view_zoom_to"); + d->mZoomComboAction=new KWidgetAction(d->mZoomCombo, i18n("Zoom"), 0, nullptr, nullptr, d->mActionCollection, "view_zoom_to"); d->mZoomComboActions.append(d->mZoomToFit); d->mZoomComboActions.append(d->mZoomToWidth); @@ -363,17 +363,17 @@ ImageView::ImageView(TQWidget* parent,Document* document, TDEActionCollection* a d->mAdjustBCG=new TDEAction(i18n("Adjust Brightness/Contrast/Gamma"), "colorize", 0, this, TQ_SLOT(showBCGDialog()), d->mActionCollection, "adjust_bcg"); - d->mIncreaseGamma=new TDEAction(i18n("Increase Gamma"),0,CTRL+Key_G, + d->mIncreaseGamma=new TDEAction(i18n("Increase Gamma"),nullptr,CTRL+Key_G, this, TQ_SLOT(increaseGamma()),d->mActionCollection,"increase_gamma"); - d->mDecreaseGamma=new TDEAction(i18n("Decrease Gamma"),0,SHIFT+CTRL+Key_G, + d->mDecreaseGamma=new TDEAction(i18n("Decrease Gamma"),nullptr,SHIFT+CTRL+Key_G, this, TQ_SLOT(decreaseGamma()),d->mActionCollection,"decrease_gamma"); - d->mIncreaseBrightness=new TDEAction(i18n("Increase Brightness" ),0,CTRL+Key_B, + d->mIncreaseBrightness=new TDEAction(i18n("Increase Brightness" ),nullptr,CTRL+Key_B, this, TQ_SLOT(increaseBrightness()),d->mActionCollection,"increase_brightness"); - d->mDecreaseBrightness=new TDEAction(i18n("Decrease Brightness" ),0,SHIFT+CTRL+Key_B, + d->mDecreaseBrightness=new TDEAction(i18n("Decrease Brightness" ),nullptr,SHIFT+CTRL+Key_B, this, TQ_SLOT(decreaseBrightness()),d->mActionCollection,"decrease_brightness"); - d->mIncreaseContrast=new TDEAction(i18n("Increase Contrast" ),0,CTRL+Key_C, + d->mIncreaseContrast=new TDEAction(i18n("Increase Contrast" ),nullptr,CTRL+Key_C, this, TQ_SLOT(increaseContrast()),d->mActionCollection,"increase_contrast"); - d->mDecreaseContrast=new TDEAction(i18n("Decrease Contrast" ),0,SHIFT+CTRL+Key_C, + d->mDecreaseContrast=new TDEAction(i18n("Decrease Contrast" ),nullptr,SHIFT+CTRL+Key_C, this, TQ_SLOT(decreaseContrast()),d->mActionCollection,"decrease_contrast"); // Connect to some interesting signals @@ -520,7 +520,7 @@ void ImageView::updateZoom(ZoomMode zoomMode, double value, int centerX, int cen ZoomMode oldZoomMode = d->mZoomMode; double oldZoom=d->mZoom; d->mZoomMode=zoomMode; - TDEAction* checkedZoomAction=0; + TDEAction* checkedZoomAction=nullptr; viewport()->setUpdatesEnabled(false); diff --git a/src/gvcore/imageviewcontroller.cpp b/src/gvcore/imageviewcontroller.cpp index 5b93645..f82acfe 100644 --- a/src/gvcore/imageviewcontroller.cpp +++ b/src/gvcore/imageviewcontroller.cpp @@ -69,7 +69,7 @@ public: if (element.tagName().lower() == "toolbar") { return KXMLGUIBuilder::createContainer(parent, index, element, id); } else { - return 0; + return nullptr; } } }; @@ -138,10 +138,10 @@ struct ImageViewController::Private { void createPlayerPart(void) { if (mPlayerPart) { - setXMLGUIClient(0); + setXMLGUIClient(nullptr); delete mPlayerPart; } - mPlayerPart=0; + mPlayerPart=nullptr; TQString mimeType=KMimeType::findByURL(mDocument->url())->name(); KService::Ptr service = KServiceTypeProfile::preferredService(mimeType, "KParts/ReadOnlyPart"); @@ -153,7 +153,7 @@ struct ImageViewController::Private { TQString library=service->library(); Q_ASSERT(!library.isNull()); LOG("Library:" << library); - mPlayerPart = KParts::ComponentFactory::createPartInstanceFromService(service, mStack, 0, mStack, 0); + mPlayerPart = KParts::ComponentFactory::createPartInstanceFromService(service, mStack, nullptr, mStack, nullptr); if (!mPlayerPart) { kdWarning() << "Failed to instantiate KPart from library " << library << endl; return; @@ -193,9 +193,9 @@ struct ImageViewController::Private { } if (mPlayerPart) { - setXMLGUIClient(0); + setXMLGUIClient(nullptr); delete mPlayerPart; - mPlayerPart=0; + mPlayerPart=nullptr; } plugImageViewActions(); mStack->raiseWidget(mImageView); @@ -286,12 +286,12 @@ ImageViewController::ImageViewController(TQWidget* parent, Document* document, T tdeApp->installEventFilter(this); - d->mPlayerPart=0; + d->mPlayerPart=nullptr; d->mBuilder=new XMLGUIBuilder(d->mToolBar); d->mFactory=new KXMLGUIFactory(d->mBuilder, this); d->mFullScreen=false; - d->mFullScreenBar=0; + d->mFullScreenBar=nullptr; connect(d->mDocument,TQ_SIGNAL(loaded(const KURL&)), this,TQ_SLOT(slotLoaded()) ); diff --git a/src/gvcore/jpegformattype.cpp b/src/gvcore/jpegformattype.cpp index ea5cdaa..4d2f41d 100644 --- a/src/gvcore/jpegformattype.cpp +++ b/src/gvcore/jpegformattype.cpp @@ -505,7 +505,7 @@ again: // //----------------------------------------------------------------------------- TQImageFormat* JPEGFormatType::decoderFor(const uchar* buffer, int length) { - if(length < 3) return 0; + if(length < 3) return nullptr; if(buffer[0] == 0377 && buffer[1] == 0330 && @@ -513,7 +513,7 @@ TQImageFormat* JPEGFormatType::decoderFor(const uchar* buffer, int length) { return new JPEGFormat; } - return 0; + return nullptr; } const char* JPEGFormatType::formatName() const { diff --git a/src/gvcore/pngformattype.cpp b/src/gvcore/pngformattype.cpp index 2e03c63..97ec93d 100644 --- a/src/gvcore/pngformattype.cpp +++ b/src/gvcore/pngformattype.cpp @@ -130,7 +130,7 @@ private: TQImageFormat* PNGFormatType::decoderFor( const uchar* buffer, int length) { - if (length < 8) return 0; + if (length < 8) return nullptr; if (buffer[0]==137 && buffer[1]=='P' && buffer[2]=='N' @@ -140,7 +140,7 @@ TQImageFormat* PNGFormatType::decoderFor( && buffer[6]==26 && buffer[7]==10) return new PNGFormat; - return 0; + return nullptr; } const char* PNGFormatType::formatName() const @@ -207,7 +207,7 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr ) int bit_depth; int color_type; png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, - 0, 0, 0); + nullptr, nullptr, nullptr); if ( color_type == PNG_COLOR_TYPE_GRAY ) { // Black & White or 8-bit grayscale @@ -273,7 +273,7 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr ) png_set_packing( png_ptr ); png_read_update_info( png_ptr, info_ptr ); png_get_IHDR(png_ptr, info_ptr, - &width, &height, &bit_depth, &color_type, 0, 0, 0); + &width, &height, &bit_depth, &color_type, nullptr, nullptr, nullptr); if (!image.create(width, height, bit_depth, num_palette, TQImage::BigEndian)) return; @@ -362,8 +362,8 @@ PNGFormat::PNGFormat() first_frame = 1; base_offx = 0; base_offy = 0; - png_ptr = 0; - info_ptr = 0; + png_ptr = nullptr; + info_ptr = nullptr; } @@ -373,7 +373,7 @@ PNGFormat::PNGFormat() PNGFormat::~PNGFormat() { if ( png_ptr ) - png_destroy_read_struct(&png_ptr, &info_ptr, 0); + png_destroy_read_struct(&png_ptr, &info_ptr, nullptr); } @@ -389,26 +389,26 @@ int PNGFormat::decode(TQImage& img, TQImageConsumer* cons, image = &img; if ( state != Inside ) { - png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0); + png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr); if (!png_ptr) { - info_ptr = 0; - image = 0; + info_ptr = nullptr; + image = nullptr; return -1; } - png_set_error_fn(png_ptr, 0, 0, qt_png_warning); + png_set_error_fn(png_ptr, nullptr, nullptr, qt_png_warning); png_set_compression_level(png_ptr, 9); info_ptr = png_create_info_struct(png_ptr); if (!info_ptr) { - png_destroy_read_struct(&png_ptr, &info_ptr, 0); - image = 0; + png_destroy_read_struct(&png_ptr, &info_ptr, nullptr); + image = nullptr; return -1; } if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_read_struct(&png_ptr, &info_ptr, 0); - image = 0; + png_destroy_read_struct(&png_ptr, &info_ptr, nullptr); + image = nullptr; return -1; } @@ -435,8 +435,8 @@ int PNGFormat::decode(TQImage& img, TQImageConsumer* cons, if ( !png_ptr ) return 0; if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_read_struct(&png_ptr, &info_ptr, 0); - image = 0; + png_destroy_read_struct(&png_ptr, &info_ptr, nullptr); + image = nullptr; state = MovieStart; return -1; } @@ -451,10 +451,10 @@ int PNGFormat::decode(TQImage& img, TQImageConsumer* cons, if ( state != Inside ) { if ( png_ptr ) - png_destroy_read_struct(&png_ptr, &info_ptr, 0); + png_destroy_read_struct(&png_ptr, &info_ptr, nullptr); } - image = 0; + image = nullptr; return l; } @@ -490,7 +490,7 @@ void PNGFormat::end(png_structp png, png_infop info) int num_text=0; png_get_text(png,info,&text_ptr,&num_text); while (num_text--) { - image->setText(text_ptr->key,0,text_ptr->text); + image->setText(text_ptr->key,nullptr,text_ptr->text); text_ptr++; } if( !changed_rect.isNull()) { diff --git a/src/gvcore/printdialog.h b/src/gvcore/printdialog.h index d21c3c2..06816bd 100644 --- a/src/gvcore/printdialog.h +++ b/src/gvcore/printdialog.h @@ -50,7 +50,7 @@ class LIBGWENVIEW_EXPORT PrintDialogPage : public KPrintDialogPage { public: - PrintDialogPage( Document* document, TQWidget *parent = 0L, const char *name = 0 ); + PrintDialogPage( Document* document, TQWidget *parent = nullptr, const char *name = nullptr ); ~PrintDialogPage(); virtual void getOptions(TQMap& opts, bool incldef = false); diff --git a/src/gvcore/qxcfi.cpp b/src/gvcore/qxcfi.cpp index e07fd4a..730e2d9 100644 --- a/src/gvcore/qxcfi.cpp +++ b/src/gvcore/qxcfi.cpp @@ -380,12 +380,12 @@ XCFImageFormat::XCFImageFormat() { bool XCFImageFormat::installIOHandler ( const TQString& ) { - TQImageIO::defineIOHandler( "XCF", "gimp xcf", 0, + TQImageIO::defineIOHandler( "XCF", "gimp xcf", nullptr, &XCFImageFormat::readXCF, #ifdef TMP_WRITE &XCFImageFormat::writeXCF ); #else - 0 ); + nullptr ); #endif return true; } @@ -393,7 +393,7 @@ bool XCFImageFormat::installIOHandler ( const TQString& ) { void XCFImageFormat::registerFormat() { TQImageIO::defineIOHandler( "XCF","^gimp xcf", - 0,XCFImageFormat::readXCF,0L); + nullptr,XCFImageFormat::readXCF,nullptr); } @@ -801,7 +801,7 @@ bool XCFImageFormat::loadImageProperties ( SafeDataStream& xcf_io, property >> flags >> data; if ( strcmp( tag, "gimp-comment" ) == 0 ) - xcf_image.image.setText( "Comment", 0, data ); + xcf_image.image.setText( "Comment", nullptr, data ); delete[] tag; delete[] data; @@ -850,7 +850,7 @@ bool XCFImageFormat::loadLayer ( SafeDataStream& xcf_io, XCFImage& xcf_image ) { Layer& layer( xcf_image.layer ); - if ( layer.name != 0 ) delete[] layer.name; + if ( layer.name ) delete[] layer.name; xcf_io >> layer.width >> layer.height >> layer.type >> layer.name; @@ -1522,7 +1522,7 @@ void XCFImageFormat::copyLayerToImage ( XCFImage& xcf_image ) Layer& layer( xcf_image.layer ); TQImage& image( xcf_image.image ); - PixelCopyOperation copy = 0; + PixelCopyOperation copy = nullptr; switch ( layer.type ) { case RGB_GIMAGE: @@ -1787,7 +1787,7 @@ void XCFImageFormat::mergeLayerIntoImage ( XCFImage& xcf_image ) Layer& layer( xcf_image.layer ); TQImage& image( xcf_image.image ); - PixelMergeOperation merge = 0; + PixelMergeOperation merge = nullptr; switch ( layer.type ) { case RGB_GIMAGE: diff --git a/src/gvcore/qxcfi.h b/src/gvcore/qxcfi.h index 031c008..daeb779 100644 --- a/src/gvcore/qxcfi.h +++ b/src/gvcore/qxcfi.h @@ -60,11 +60,11 @@ public: *this >> len; if (mFailed) return *this; if ( len == 0 ) { - value = 0; + value = nullptr; return *this; } if (mDevice->atEnd() ) { - value = 0; + value = nullptr; mFailed=true; return *this; } @@ -173,9 +173,9 @@ class XCFImageFormat : public TQImageFormatPlugin { void (*assignBytes)( Layer& layer, uint i, uint j ); //! Construct a layer. - Layer ( void ) : name( 0 ) {} + Layer ( void ) : name( nullptr ) {} //! Destruct the layer. - ~Layer ( void ) { if ( name != 0 ) delete[] name; } + ~Layer ( void ) { if ( name ) delete[] name; } }; /*! diff --git a/src/gvcore/thumbnaildetailsdialog.cpp b/src/gvcore/thumbnaildetailsdialog.cpp index 9fa3276..bcd510a 100644 --- a/src/gvcore/thumbnaildetailsdialog.cpp +++ b/src/gvcore/thumbnaildetailsdialog.cpp @@ -37,7 +37,7 @@ struct ThumbnailDetailsDialog::Private { ThumbnailDetailsDialog::ThumbnailDetailsDialog(FileThumbnailView* view) : KDialogBase( - view, 0, false /* modal */, TQString(), KDialogBase::Close, + view, nullptr, false /* modal */, TQString(), KDialogBase::Close, KDialogBase::Close, true /* separator */) , d(new ThumbnailDetailsDialog::Private) { diff --git a/src/gvcore/thumbnailloadjob.cpp b/src/gvcore/thumbnailloadjob.cpp index 0621ee1..5bcab54 100644 --- a/src/gvcore/thumbnailloadjob.cpp +++ b/src/gvcore/thumbnailloadjob.cpp @@ -175,13 +175,13 @@ void ThumbnailThread::loadThumbnail() { if( testCancel()) return; if( mStoreThumbnailsInCache && needCaching ) { - mImage.setText("Thumb::URI", 0, mOriginalURI); - mImage.setText("Thumb::MTime", 0, TQString::number(mOriginalTime)); - mImage.setText("Thumb::Size", 0, TQString::number(mOriginalSize)); - mImage.setText("Thumb::Mimetype", 0, mOriginalMimeType); - mImage.setText("Thumb::Image::Width", 0, TQString::number(mOriginalWidth)); - mImage.setText("Thumb::Image::Height", 0, TQString::number(mOriginalHeight)); - mImage.setText("Software", 0, "Gwenview"); + mImage.setText("Thumb::URI", nullptr, mOriginalURI); + mImage.setText("Thumb::MTime", nullptr, TQString::number(mOriginalTime)); + mImage.setText("Thumb::Size", nullptr, TQString::number(mOriginalSize)); + mImage.setText("Thumb::Mimetype", nullptr, mOriginalMimeType); + mImage.setText("Thumb::Image::Width", nullptr, TQString::number(mOriginalWidth)); + mImage.setText("Thumb::Image::Height", nullptr, TQString::number(mOriginalHeight)); + mImage.setText("Software", nullptr, "Gwenview"); TQString thumbnailDir = ThumbnailLoadJob::thumbnailBaseDir(mThumbnailSize); TDEStandardDirs::makeDir(thumbnailDir, 0700); @@ -652,15 +652,15 @@ void ThumbnailLoadJob::checkThumbnail() { TQImage thumb; if ( thumb.load(mThumbnailPath) ) { - if (thumb.text("Thumb::URI", 0) == mOriginalURI && - thumb.text("Thumb::MTime", 0).toInt() == mOriginalTime ) + if (thumb.text("Thumb::URI", nullptr) == mOriginalURI && + thumb.text("Thumb::MTime", nullptr).toInt() == mOriginalTime ) { int width=0, height=0; TQSize size; bool ok; - width=thumb.text("Thumb::Image::Width", 0).toInt(&ok); - if (ok) height=thumb.text("Thumb::Image::Height", 0).toInt(&ok); + width=thumb.text("Thumb::Image::Width", nullptr).toInt(&ok); + if (ok) height=thumb.text("Thumb::Image::Height", nullptr).toInt(&ok); if (ok) { size=TQSize(width, height); } else { diff --git a/src/gvcore/xcursor.cpp b/src/gvcore/xcursor.cpp index d00c3b2..4771f75 100644 --- a/src/gvcore/xcursor.cpp +++ b/src/gvcore/xcursor.cpp @@ -178,7 +178,7 @@ TQImageFormat* XCursorFormatType::decoderFor( Q_UNUSED( buffer ); Q_UNUSED( length ); #endif - return 0; + return nullptr; } const char* XCursorFormatType::formatName() const diff --git a/src/gvcore/xpm.cpp b/src/gvcore/xpm.cpp index b499919..7401389 100644 --- a/src/gvcore/xpm.cpp +++ b/src/gvcore/xpm.cpp @@ -155,14 +155,14 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc TQImage & image) { TQCString buf; - TQIODevice *d = 0; + TQIODevice *d = nullptr; buf.resize( 200 ); int i, cpp, ncols, w, h, index = 0; if ( iio ) { iio->setStatus( 1 ); - d = iio ? iio->ioDevice() : 0; + d = iio ? iio->ioDevice() : nullptr; d->readLine( buf.data(), buf.size() ); // "/* XPM */" TQRegExp r( TQString::fromLatin1("/\\*.XPM.\\*/") ); if ( buf.find(r) == -1 ) @@ -299,7 +299,7 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc static void read_xpm_image( TQImageIO * iio ) { TQImage i; - (void)read_xpm_image_or_array( iio, 0, i ); + (void)read_xpm_image_or_array( iio, nullptr, i ); return; } diff --git a/src/gvdirpart/gvdirpart.cpp b/src/gvdirpart/gvdirpart.cpp index 49bde8f..341283f 100644 --- a/src/gvdirpart/gvdirpart.cpp +++ b/src/gvdirpart/gvdirpart.cpp @@ -160,7 +160,7 @@ bool GVDirPart::openURL(const KURL& url) { return false; } - emit started( 0 ); + emit started( nullptr ); m_url = url; m_url.adjustPath(1); @@ -269,7 +269,7 @@ void GVDirPartBrowserExtension::openFileViewContextMenu(const TQPoint& pos, bool const KFileItemList* items = mGVDirPart->fileViewController()->currentFileView()->selectedItems(); emit popupMenu(pos, *items); } else { - emit popupMenu(pos, mGVDirPart->fileViewController()->dirURL(), 0); + emit popupMenu(pos, mGVDirPart->fileViewController()->dirURL(), nullptr); } } diff --git a/src/gvdirpart/gvdirpart.h b/src/gvdirpart/gvdirpart.h index 1bea0b0..c9fac81 100644 --- a/src/gvdirpart/gvdirpart.h +++ b/src/gvdirpart/gvdirpart.h @@ -47,7 +47,7 @@ class GVDirPartBrowserExtension: public KParts::BrowserExtension { public: - GVDirPartBrowserExtension(GVDirPart* viewPart, const char* name=0L); + GVDirPartBrowserExtension(GVDirPart* viewPart, const char* name=nullptr); ~GVDirPartBrowserExtension(); public slots: diff --git a/src/gvimagepart/gvimagepart.cpp b/src/gvimagepart/gvimagepart.cpp index 95405fd..227bc84 100644 --- a/src/gvimagepart/gvimagepart.cpp +++ b/src/gvimagepart/gvimagepart.cpp @@ -97,7 +97,7 @@ GVImagePart::GVImagePart(TQWidget* parentWidget, const char* /*widgetName*/, TQO setWidget(mImageView); mDirLister = new KDirLister; - mDirLister->setAutoErrorHandlingEnabled( false, 0 ); + mDirLister->setAutoErrorHandlingEnabled( false, nullptr ); mDirLister->setMainWindow(tdeApp->mainWidget()); connect( mDirLister, TQ_SIGNAL( clear()), TQ_SLOT( dirListerClear())); connect( mDirLister, TQ_SIGNAL( newItems( const KFileItemList& )), @@ -168,7 +168,7 @@ bool GVImagePart::openURL(const KURL& url) { newURLDir.setFileName( TQString() ); bool sameDir = oldURLDir == newURLDir; m_url = url; - emit started( 0 ); + emit started( nullptr ); if( mDocument->url() == url ) { // reload button in Konqy - setURL would return immediately mDocument->reload(); } else { diff --git a/src/gvimagepart/gvimagepart.h b/src/gvimagepart/gvimagepart.h index 68db9b1..5b0fd00 100644 --- a/src/gvimagepart/gvimagepart.h +++ b/src/gvimagepart/gvimagepart.h @@ -48,7 +48,7 @@ class GVImagePartBrowserExtension: public KParts::BrowserExtension { public: - GVImagePartBrowserExtension(GVImagePart* viewPart, const char* name=0L); + GVImagePartBrowserExtension(GVImagePart* viewPart, const char* name=nullptr); ~GVImagePartBrowserExtension(); public slots: -- cgit v1.2.3