From 3910136896f8ab8cd885c9fe36b51103df499ef2 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sat, 3 Oct 2026 17:46:37 -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 --- kipi-plugins/acquireimages/acquireimagedialog.cpp | 4 +- kipi-plugins/acquireimages/acquireimagedialog.h | 2 +- kipi-plugins/acquireimages/screenshotdialog.cpp | 6 +- kipi-plugins/acquireimages/screenshotdialog.h | 2 +- .../batchprocessimagesdialog.cpp | 10 +-- .../batchprocessimages/batchprocessimagesdialog.h | 2 +- .../batchprocessimages/batchprocessimageslist.cpp | 2 +- .../batchprocessimages/batchprocessimageslist.h | 2 +- .../batchprocessimages/borderimagesdialog.cpp | 2 +- .../batchprocessimages/borderimagesdialog.h | 2 +- .../batchprocessimages/borderoptionsdialog.h | 2 +- .../batchprocessimages/colorimagesdialog.cpp | 2 +- .../batchprocessimages/colorimagesdialog.h | 2 +- .../batchprocessimages/coloroptionsdialog.h | 2 +- .../batchprocessimages/convertimagesdialog.cpp | 2 +- .../batchprocessimages/convertimagesdialog.h | 2 +- .../batchprocessimages/convertoptionsdialog.h | 2 +- .../batchprocessimages/effectimagesdialog.cpp | 2 +- .../batchprocessimages/effectimagesdialog.h | 2 +- .../batchprocessimages/effectoptionsdialog.h | 2 +- .../batchprocessimages/filterimagesdialog.cpp | 2 +- .../batchprocessimages/filterimagesdialog.h | 2 +- .../batchprocessimages/filteroptionsdialog.h | 2 +- kipi-plugins/batchprocessimages/imagepreview.cpp | 2 +- kipi-plugins/batchprocessimages/imagepreview.h | 4 +- kipi-plugins/batchprocessimages/outputdialog.cpp | 2 +- kipi-plugins/batchprocessimages/outputdialog.h | 2 +- .../batchprocessimages/recompressimagesdialog.cpp | 2 +- .../batchprocessimages/recompressimagesdialog.h | 2 +- .../batchprocessimages/recompressoptionsdialog.h | 2 +- .../batchprocessimages/renameimagesdialog.cpp | 2 +- .../batchprocessimages/renameimageswidget.cpp | 2 +- .../batchprocessimages/resizeimagesdialog.cpp | 2 +- .../batchprocessimages/resizeimagesdialog.h | 2 +- .../batchprocessimages/resizeoptionsdialog.h | 2 +- kipi-plugins/calendar/calevents.h | 2 +- kipi-plugins/calendar/calpainter.cpp | 4 +- kipi-plugins/calendar/calselect.h | 2 +- kipi-plugins/calendar/calsettings.cpp | 4 +- kipi-plugins/calendar/caltemplate.cpp | 6 +- kipi-plugins/calendar/caltemplate.h | 2 +- kipi-plugins/calendar/calwidget.cpp | 4 +- kipi-plugins/calendar/calwizard.cpp | 14 ++-- kipi-plugins/calendar/calwizard.h | 2 +- kipi-plugins/cdarchiving/cdarchiving.cpp | 2 +- kipi-plugins/cdarchiving/cdarchiving.h | 4 +- kipi-plugins/cdarchiving/cdarchivingdialog.cpp | 2 +- kipi-plugins/cdarchiving/cdarchivingdialog.h | 2 +- kipi-plugins/cdarchiving/plugin_cdarchiving.cpp | 4 +- kipi-plugins/common/include/kpaboutdata.h | 4 +- kipi-plugins/common/libkipiplugins/kpaboutdata.cpp | 2 +- kipi-plugins/findimages/displaycompare.cpp | 4 +- kipi-plugins/findimages/finddupplicatedialog.cpp | 2 +- kipi-plugins/findimages/finddupplicatedialog.h | 2 +- kipi-plugins/findimages/finddupplicateimages.cpp | 4 +- kipi-plugins/findimages/finddupplicateimages.h | 2 +- kipi-plugins/findimages/fuzzycompare.cpp | 4 +- kipi-plugins/flickrexport/flickrtalker.cpp | 18 ++--- kipi-plugins/flickrexport/flickrwidget.cpp | 2 +- kipi-plugins/flickrexport/flickrwindow.cpp | 8 +-- kipi-plugins/flickrexport/imageslist.cpp | 10 +-- kipi-plugins/flickrexport/login.cpp | 4 +- kipi-plugins/galleryexport/galleries.cpp | 2 +- kipi-plugins/galleryexport/galleryconfig.cpp | 4 +- kipi-plugins/galleryexport/gallerylist.cpp | 6 +- kipi-plugins/galleryexport/gallerytalker.cpp | 12 ++-- kipi-plugins/galleryexport/gallerywidget.h | 2 +- kipi-plugins/galleryexport/gallerywindow.cpp | 6 +- .../galleryexport/plugin_galleryexport.cpp | 2 +- kipi-plugins/gpssync/gpseditdialog.cpp | 16 ++--- kipi-plugins/gpssync/gpssyncdialog.cpp | 24 +++---- kipi-plugins/gpssync/kmlexportconfig.cpp | 4 +- kipi-plugins/gpssync/kmlexportconfig.h | 2 +- kipi-plugins/gpssync/plugin_gpssync.cpp | 6 +- kipi-plugins/htmlexport/generator.cpp | 2 +- kipi-plugins/htmlexport/plugin.cpp | 2 +- kipi-plugins/htmlexport/theme.cpp | 2 +- kipi-plugins/htmlexport/wizard.cpp | 4 +- kipi-plugins/htmlexport/xmlutils.h | 6 +- kipi-plugins/imageviewer/plugin_viewer.cpp | 2 +- kipi-plugins/imageviewer/viewerwidget.cpp | 2 +- kipi-plugins/ipodexport/imagelist.cpp | 2 +- kipi-plugins/ipodexport/imagelist.h | 2 +- kipi-plugins/ipodexport/ipodexportdialog.cpp | 42 ++++++------ kipi-plugins/ipodexport/ipodexportdialog.h | 2 +- kipi-plugins/ipodexport/ipodheader.h | 2 +- kipi-plugins/jpeglossless/plugin_jpeglossless.cpp | 26 +++---- kipi-plugins/kameraklient/camerafolderview.cpp | 12 ++-- kipi-plugins/kameraklient/cameraiconitem.cpp | 4 +- kipi-plugins/kameraklient/cameralist.cpp | 6 +- kipi-plugins/kameraklient/cameraselection.cpp | 4 +- kipi-plugins/kameraklient/cameraselection.h | 2 +- kipi-plugins/kameraklient/cameraui.cpp | 4 +- kipi-plugins/kameraklient/dmessagebox.cpp | 8 +-- kipi-plugins/kameraklient/gpcamera.cpp | 80 +++++++++++----------- kipi-plugins/kameraklient/gpcontroller.cpp | 18 ++--- kipi-plugins/kameraklient/gpfileitemcontainer.cpp | 6 +- kipi-plugins/kameraklient/gpfileitemcontainer.h | 2 +- kipi-plugins/kameraklient/gpfileiteminfo.cpp | 6 +- kipi-plugins/kameraklient/gpfileiteminfodlg.cpp | 4 +- kipi-plugins/kameraklient/gpfileiteminfodlg.h | 2 +- kipi-plugins/kameraklient/gpmessages.cpp | 4 +- kipi-plugins/kameraklient/gpstatus.cpp | 8 +-- kipi-plugins/kameraklient/savefiledialog.h | 2 +- kipi-plugins/kameraklient/setupcamera.cpp | 2 +- kipi-plugins/kameraklient/setupcamera.h | 2 +- kipi-plugins/kameraklient/thumbitem.cpp | 18 ++--- kipi-plugins/kameraklient/thumbview.cpp | 78 ++++++++++----------- kipi-plugins/kameraklient/thumbview.h | 2 +- kipi-plugins/metadataedit/commenteditdialog.cpp | 14 ++-- kipi-plugins/metadataedit/commentremovedialog.cpp | 14 ++-- kipi-plugins/metadataedit/exifadjust.cpp | 24 +++---- kipi-plugins/metadataedit/exifcaption.cpp | 26 +++---- kipi-plugins/metadataedit/exifdatetime.cpp | 30 ++++---- kipi-plugins/metadataedit/exifdevice.cpp | 48 ++++++------- kipi-plugins/metadataedit/exifeditdialog.cpp | 38 +++++----- kipi-plugins/metadataedit/exiflens.cpp | 20 +++--- kipi-plugins/metadataedit/exiflight.cpp | 16 ++--- kipi-plugins/metadataedit/iptccaption.cpp | 22 +++--- kipi-plugins/metadataedit/iptccategories.cpp | 14 ++-- kipi-plugins/metadataedit/iptccredits.cpp | 24 +++---- kipi-plugins/metadataedit/iptcdatetime.cpp | 38 +++++----- kipi-plugins/metadataedit/iptceditdialog.cpp | 42 ++++++------ kipi-plugins/metadataedit/iptckeywords.cpp | 10 +-- kipi-plugins/metadataedit/iptcorigin.cpp | 26 +++---- kipi-plugins/metadataedit/iptcstatus.cpp | 20 +++--- kipi-plugins/metadataedit/iptcsubjects.cpp | 10 +-- kipi-plugins/metadataedit/plugin_metadataedit.cpp | 18 ++--- kipi-plugins/mpegencoder/checkbinprog.h | 2 +- kipi-plugins/mpegencoder/kimg2mpg.cpp | 18 ++--- kipi-plugins/mpegencoder/kimg2mpg.h | 4 +- kipi-plugins/mpegencoder/optionsdialog.h | 2 +- kipi-plugins/picasawebexport/picasaweblogin.cpp | 4 +- kipi-plugins/picasawebexport/picasawebtalker.cpp | 16 ++--- kipi-plugins/picasawebexport/picasawebwidget.h | 2 +- kipi-plugins/picasawebexport/picasawebwindow.cpp | 10 +-- kipi-plugins/printwizard/frmprintwizard.cpp | 26 +++---- kipi-plugins/printwizard/frmprintwizard.h | 2 +- kipi-plugins/printwizard/tphoto.cpp | 4 +- kipi-plugins/rawconverter/batchdialog.cpp | 14 ++-- kipi-plugins/rawconverter/previewwidget.cpp | 6 +- kipi-plugins/rawconverter/rawdecodingiface.cpp | 10 +-- kipi-plugins/rawconverter/savesettingswidget.cpp | 14 ++-- kipi-plugins/rawconverter/singledialog.cpp | 4 +- kipi-plugins/sendimages/plugin_sendimages.cpp | 2 +- kipi-plugins/sendimages/sendimages.h | 2 +- kipi-plugins/sendimages/sendimagesdialog.cpp | 10 +-- kipi-plugins/sendimages/sendimagesdialog.h | 2 +- kipi-plugins/simpleviewerexport/firstrundlg.cpp | 8 +-- kipi-plugins/simpleviewerexport/firstrundlg.h | 2 +- .../simpleviewerexport/simpleviewerexport.cpp | 6 +- .../simpleviewerexport/simpleviewerexport.h | 4 +- kipi-plugins/simpleviewerexport/svedialog.cpp | 6 +- kipi-plugins/simpleviewerexport/svedialog.h | 2 +- kipi-plugins/slideshow/kbeffect.cpp | 4 +- kipi-plugins/slideshow/listimageitems.cpp | 2 +- kipi-plugins/slideshow/listimageitems.h | 2 +- kipi-plugins/slideshow/plugin_slideshow.cpp | 2 +- kipi-plugins/slideshow/slideshow.cpp | 12 ++-- kipi-plugins/slideshow/slideshowconfig.cpp | 12 ++-- kipi-plugins/slideshow/slideshowgl.cpp | 4 +- kipi-plugins/slideshow/slideshowkb.cpp | 10 +-- kipi-plugins/sync/sinklist.cpp | 4 +- kipi-plugins/sync/sinks/gallery/gallerysink.cpp | 2 +- kipi-plugins/timeadjust/timeadjustdialog.cpp | 46 ++++++------- kipi-plugins/wallpaper/plugin_wallpaper.cpp | 2 +- 166 files changed, 700 insertions(+), 700 deletions(-) diff --git a/kipi-plugins/acquireimages/acquireimagedialog.cpp b/kipi-plugins/acquireimages/acquireimagedialog.cpp index 837f09b1..552dc3e6 100644 --- a/kipi-plugins/acquireimages/acquireimagedialog.cpp +++ b/kipi-plugins/acquireimages/acquireimagedialog.cpp @@ -108,7 +108,7 @@ AcquireImageDialog::AcquireImageDialog( KIPI::Interface* interface, TQWidget *pa // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Acquire images"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin to acquire images"), "(c) 2003-2008, Gilles Caulier"); @@ -545,7 +545,7 @@ bool AcquireImageDialog::TQImageToTiff(const TQImage& image, const TQString& dst TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, TIFFDefaultStripSize(tif, 0)); data = new unsigned char[image.width()*3]; - unsigned char *dptr = 0; + unsigned char *dptr = nullptr; for (y = 0 ; y < image.height() ; ++y) { diff --git a/kipi-plugins/acquireimages/acquireimagedialog.h b/kipi-plugins/acquireimages/acquireimagedialog.h index ef191f4c..e7ab301b 100644 --- a/kipi-plugins/acquireimages/acquireimagedialog.h +++ b/kipi-plugins/acquireimages/acquireimagedialog.h @@ -68,7 +68,7 @@ class AcquireImageDialog : public KDialogBase public: - AcquireImageDialog( KIPI::Interface* interface, TQWidget *parent=0, const TQImage &img=0); + AcquireImageDialog( KIPI::Interface* interface, TQWidget *parent=nullptr, const TQImage &img=nullptr); ~AcquireImageDialog(); private slots: diff --git a/kipi-plugins/acquireimages/screenshotdialog.cpp b/kipi-plugins/acquireimages/screenshotdialog.cpp index df11f5c0..ebebce48 100644 --- a/kipi-plugins/acquireimages/screenshotdialog.cpp +++ b/kipi-plugins/acquireimages/screenshotdialog.cpp @@ -111,7 +111,7 @@ ScreenGrabDialog::ScreenGrabDialog( KIPI::Interface* interface, TQWidget *parent //--------------------------------------------- - m_grabber = new TQWidget( 0, 0, WStyle_Customize | WX11BypassWM ); + m_grabber = new TQWidget( nullptr, nullptr, WStyle_Customize | WX11BypassWM ); m_grabber->move( -4000, -4000 ); m_grabber->installEventFilter( this ); @@ -155,7 +155,7 @@ ScreenGrabDialog::ScreenGrabDialog( KIPI::Interface* interface, TQWidget *parent I18N_NOOP("A Kipi plugin to acquire images"), TDEAboutData::License_GPL, "(c) 2003-2008, Gilles Caulier", - 0, + nullptr, "http://extragear.kde.org/apps/kipi"); about->addAuthor("Gilles Caulier", I18N_NOOP("Author and maintainer"), @@ -204,7 +204,7 @@ void ScreenGrabDialog::slotGrab() TQWidgetList *list = TQApplication::topLevelWidgets(); TQWidgetListIt it( *list ); TQWidget * w; - while ( (w=it.current()) != 0 ) + while ( (w=it.current()) != nullptr ) { ++it; if ( w->isVisible()) diff --git a/kipi-plugins/acquireimages/screenshotdialog.h b/kipi-plugins/acquireimages/screenshotdialog.h index 4f4b1bad..5149d657 100644 --- a/kipi-plugins/acquireimages/screenshotdialog.h +++ b/kipi-plugins/acquireimages/screenshotdialog.h @@ -68,7 +68,7 @@ class ScreenGrabDialog : public KDialogBase public: ScreenGrabDialog( KIPI::Interface* interface, - TQWidget *parent=0, const char *name=0); + TQWidget *parent=nullptr, const char *name=nullptr); ~ScreenGrabDialog(); private slots: diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp index 14b3bb82..bd20aef4 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp @@ -109,8 +109,8 @@ BatchProcessImagesDialog::BatchProcessImagesDialog( KURL::List urlList, KIPI::In m_convertStatus = NO_PROCESS; m_progressStatus = 0; - m_ProcessusProc = 0; - m_PreviewProc = 0; + m_ProcessusProc = nullptr; + m_PreviewProc = nullptr; KImageIO::registerFormats(); @@ -382,10 +382,10 @@ void BatchProcessImagesDialog::closeEvent ( TQCloseEvent *e ) { if (!e) return; - if ( m_PreviewProc != 0 ) + if ( m_PreviewProc ) if ( m_PreviewProc->isRunning() ) m_PreviewProc->kill(SIGTERM); - if ( m_ProcessusProc != 0 ) + if ( m_ProcessusProc ) if ( m_ProcessusProc->isRunning() ) m_ProcessusProc->kill(SIGTERM); e->accept(); @@ -762,7 +762,7 @@ void BatchProcessImagesDialog::slotPreview(void) { kdWarning() << "BatchProcessImagesDialog::slotPreview" << endl; - if ( m_listFiles->currentItem() == 0 ) + if ( !m_listFiles->currentItem() ) { KMessageBox::error(this, i18n("You must select an item from the list to calculate the preview.")); return; diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h index afa6f155..c59090f9 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h +++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h @@ -83,7 +83,7 @@ TQ_OBJECT // Don't forget to add the 'm_Type' and 'm_labelType' implementation in the constructor of // children dialog class. - BatchProcessImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQString caption, TQWidget *parent=0 ); + BatchProcessImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQString caption, TQWidget *parent=nullptr ); ~BatchProcessImagesDialog(); protected slots: diff --git a/kipi-plugins/batchprocessimages/batchprocessimageslist.cpp b/kipi-plugins/batchprocessimages/batchprocessimageslist.cpp index 3b9b4881..46ed306d 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimageslist.cpp +++ b/kipi-plugins/batchprocessimages/batchprocessimageslist.cpp @@ -95,7 +95,7 @@ void BatchProcessImagesList::droppedImagesItems(TQDropEvent *e) TQStrListIterator it(strList); char *str; - while ( (str = it.current()) != 0 ) + while ( (str = it.current()) != nullptr ) { TQString filePath = TQUriDrag::uriToLocalFile(str); TQFileInfo fileInfo(filePath); diff --git a/kipi-plugins/batchprocessimages/batchprocessimageslist.h b/kipi-plugins/batchprocessimages/batchprocessimageslist.h index 5ab45911..94f5464c 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimageslist.h +++ b/kipi-plugins/batchprocessimages/batchprocessimageslist.h @@ -40,7 +40,7 @@ TQ_OBJECT public: - BatchProcessImagesList(TQWidget *parent=0, const char *name=0); + BatchProcessImagesList(TQWidget *parent=nullptr, const char *name=nullptr); signals: void addedDropItems(TQStringList filesPath); diff --git a/kipi-plugins/batchprocessimages/borderimagesdialog.cpp b/kipi-plugins/batchprocessimages/borderimagesdialog.cpp index f94aebd1..201ba4aa 100644 --- a/kipi-plugins/batchprocessimages/borderimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/borderimagesdialog.cpp @@ -61,7 +61,7 @@ BorderImagesDialog::BorderImagesDialog( KURL::List urlList, KIPI::Interface* int // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Batch Image-bordering"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin for batch bordering images\n" "This plugin use the \"convert\" program from \"ImageMagick\" package."), diff --git a/kipi-plugins/batchprocessimages/borderimagesdialog.h b/kipi-plugins/batchprocessimages/borderimagesdialog.h index efebcf65..5b49d08d 100644 --- a/kipi-plugins/batchprocessimages/borderimagesdialog.h +++ b/kipi-plugins/batchprocessimages/borderimagesdialog.h @@ -40,7 +40,7 @@ TQ_OBJECT public: - BorderImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *parent=0 ); + BorderImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *parent=nullptr ); ~BorderImagesDialog(); private slots: diff --git a/kipi-plugins/batchprocessimages/borderoptionsdialog.h b/kipi-plugins/batchprocessimages/borderoptionsdialog.h index e259549d..4c3f5a33 100644 --- a/kipi-plugins/batchprocessimages/borderoptionsdialog.h +++ b/kipi-plugins/batchprocessimages/borderoptionsdialog.h @@ -39,7 +39,7 @@ TQ_OBJECT public: - BorderOptionsDialog(TQWidget *parent=0, int BorderType = 0); + BorderOptionsDialog(TQWidget *parent=nullptr, int BorderType = 0); ~BorderOptionsDialog(); KIntNumInput *m_solidBorderWidth; diff --git a/kipi-plugins/batchprocessimages/colorimagesdialog.cpp b/kipi-plugins/batchprocessimages/colorimagesdialog.cpp index 8a9e6a69..95c08369 100644 --- a/kipi-plugins/batchprocessimages/colorimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/colorimagesdialog.cpp @@ -60,7 +60,7 @@ ColorImagesDialog::ColorImagesDialog( KURL::List urlList, KIPI::Interface* inter // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Batch image-color enhancement"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin for batch image-color enhancement\n" "This plugin use the \"convert\" program from \"ImageMagick\" package."), diff --git a/kipi-plugins/batchprocessimages/colorimagesdialog.h b/kipi-plugins/batchprocessimages/colorimagesdialog.h index 712a40bd..b4e37834 100644 --- a/kipi-plugins/batchprocessimages/colorimagesdialog.h +++ b/kipi-plugins/batchprocessimages/colorimagesdialog.h @@ -41,7 +41,7 @@ TQ_OBJECT public: - ColorImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *parent=0 ); + ColorImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *parent=nullptr ); ~ColorImagesDialog(); private slots: diff --git a/kipi-plugins/batchprocessimages/coloroptionsdialog.h b/kipi-plugins/batchprocessimages/coloroptionsdialog.h index 9cabc1ce..b2d40be0 100644 --- a/kipi-plugins/batchprocessimages/coloroptionsdialog.h +++ b/kipi-plugins/batchprocessimages/coloroptionsdialog.h @@ -44,7 +44,7 @@ TQ_OBJECT public: - ColorOptionsDialog(TQWidget *parent=0, int ColorType = 0); + ColorOptionsDialog(TQWidget *parent=nullptr, int ColorType = 0); ~ColorOptionsDialog(); TQComboBox *m_depthValue; diff --git a/kipi-plugins/batchprocessimages/convertimagesdialog.cpp b/kipi-plugins/batchprocessimages/convertimagesdialog.cpp index 999c42b5..e707e733 100644 --- a/kipi-plugins/batchprocessimages/convertimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/convertimagesdialog.cpp @@ -66,7 +66,7 @@ ConvertImagesDialog::ConvertImagesDialog( KURL::List urlList, KIPI::Interface* i // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Batch convert images"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin for batch converting images\n" "This plugin uses the \"convert\" program from \"ImageMagick\" package."), diff --git a/kipi-plugins/batchprocessimages/convertimagesdialog.h b/kipi-plugins/batchprocessimages/convertimagesdialog.h index 78534e80..0bb17c00 100644 --- a/kipi-plugins/batchprocessimages/convertimagesdialog.h +++ b/kipi-plugins/batchprocessimages/convertimagesdialog.h @@ -41,7 +41,7 @@ TQ_OBJECT public: - ConvertImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *parent=0 ); + ConvertImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *parent=nullptr ); ~ConvertImagesDialog(); private slots: diff --git a/kipi-plugins/batchprocessimages/convertoptionsdialog.h b/kipi-plugins/batchprocessimages/convertoptionsdialog.h index e1f1cbde..f135177b 100644 --- a/kipi-plugins/batchprocessimages/convertoptionsdialog.h +++ b/kipi-plugins/batchprocessimages/convertoptionsdialog.h @@ -46,7 +46,7 @@ TQ_OBJECT public: - ConvertOptionsDialog(TQWidget *parent=0, int ImageFormatType = 0); + ConvertOptionsDialog(TQWidget *parent=nullptr, int ImageFormatType = 0); ~ConvertOptionsDialog(); TQLabel *m_label_imageCompression; diff --git a/kipi-plugins/batchprocessimages/effectimagesdialog.cpp b/kipi-plugins/batchprocessimages/effectimagesdialog.cpp index c591ec90..42acc8d9 100644 --- a/kipi-plugins/batchprocessimages/effectimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/effectimagesdialog.cpp @@ -60,7 +60,7 @@ EffectImagesDialog::EffectImagesDialog( KURL::List urlList, KIPI::Interface* int // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Batch image effects"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin for batch image-effect transformations\n" "This plugin uses the \"convert\" program from \"ImageMagick\" package."), diff --git a/kipi-plugins/batchprocessimages/effectimagesdialog.h b/kipi-plugins/batchprocessimages/effectimagesdialog.h index ab79c032..2b36dd7e 100644 --- a/kipi-plugins/batchprocessimages/effectimagesdialog.h +++ b/kipi-plugins/batchprocessimages/effectimagesdialog.h @@ -40,7 +40,7 @@ TQ_OBJECT public: - EffectImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *parent=0 ); + EffectImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *parent=nullptr ); ~EffectImagesDialog(); private slots: diff --git a/kipi-plugins/batchprocessimages/effectoptionsdialog.h b/kipi-plugins/batchprocessimages/effectoptionsdialog.h index 0757fd4a..a2a0cd3c 100644 --- a/kipi-plugins/batchprocessimages/effectoptionsdialog.h +++ b/kipi-plugins/batchprocessimages/effectoptionsdialog.h @@ -42,7 +42,7 @@ TQ_OBJECT public: - EffectOptionsDialog(TQWidget *parent=0, int EffectType = 0); + EffectOptionsDialog(TQWidget *parent=nullptr, int EffectType = 0); ~EffectOptionsDialog(); KIntNumInput *m_latWidth; diff --git a/kipi-plugins/batchprocessimages/filterimagesdialog.cpp b/kipi-plugins/batchprocessimages/filterimagesdialog.cpp index 812ebc86..6d97670c 100644 --- a/kipi-plugins/batchprocessimages/filterimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/filterimagesdialog.cpp @@ -60,7 +60,7 @@ FilterImagesDialog::FilterImagesDialog( KURL::List urlList, KIPI::Interface* int // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Batch image filtering"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin to batch filter images\n" "This plugin uses the \"convert\" program from \"ImageMagick\" package."), diff --git a/kipi-plugins/batchprocessimages/filterimagesdialog.h b/kipi-plugins/batchprocessimages/filterimagesdialog.h index 2490d136..5696baf1 100644 --- a/kipi-plugins/batchprocessimages/filterimagesdialog.h +++ b/kipi-plugins/batchprocessimages/filterimagesdialog.h @@ -40,7 +40,7 @@ TQ_OBJECT public: - FilterImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *parent=0 ); + FilterImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *parent=nullptr ); ~FilterImagesDialog(); private slots: diff --git a/kipi-plugins/batchprocessimages/filteroptionsdialog.h b/kipi-plugins/batchprocessimages/filteroptionsdialog.h index 9ff60f97..934bb691 100644 --- a/kipi-plugins/batchprocessimages/filteroptionsdialog.h +++ b/kipi-plugins/batchprocessimages/filteroptionsdialog.h @@ -44,7 +44,7 @@ TQ_OBJECT public: - FilterOptionsDialog(TQWidget *parent=0, int FilterType = 0); + FilterOptionsDialog(TQWidget *parent=nullptr, int FilterType = 0); ~FilterOptionsDialog(); TQComboBox *m_noiseType; diff --git a/kipi-plugins/batchprocessimages/imagepreview.cpp b/kipi-plugins/batchprocessimages/imagepreview.cpp index 3e06dbde..e9bbb64c 100644 --- a/kipi-plugins/batchprocessimages/imagepreview.cpp +++ b/kipi-plugins/batchprocessimages/imagepreview.cpp @@ -85,7 +85,7 @@ ImagePreview::ImagePreview(const TQString &fileOrig, const TQString &fileDest, c // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Batch process images"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("An interface to preview the \"Batch Process Images\" " "Kipi plugin.\n" diff --git a/kipi-plugins/batchprocessimages/imagepreview.h b/kipi-plugins/batchprocessimages/imagepreview.h index 3f3ffce2..8d5fcf03 100644 --- a/kipi-plugins/batchprocessimages/imagepreview.h +++ b/kipi-plugins/batchprocessimages/imagepreview.h @@ -57,7 +57,7 @@ TQ_OBJECT public: - PixmapView(bool cropAction, TQWidget *parent=0, const char *name=0); + PixmapView(bool cropAction, TQWidget *parent=nullptr, const char *name=nullptr); ~PixmapView(); void setImage(const TQString &ImagePath, const TQString &tmpPath); @@ -113,7 +113,7 @@ public: ImagePreview(const TQString &fileOrig, const TQString &fileDest, const TQString &tmpPath, bool cropActionOrig, bool cropActionDest, const TQString &EffectName, - const TQString &FileName, TQWidget *parent=0); + const TQString &FileName, TQWidget *parent=nullptr); ~ImagePreview(); private slots: diff --git a/kipi-plugins/batchprocessimages/outputdialog.cpp b/kipi-plugins/batchprocessimages/outputdialog.cpp index c513079f..851cf516 100644 --- a/kipi-plugins/batchprocessimages/outputdialog.cpp +++ b/kipi-plugins/batchprocessimages/outputdialog.cpp @@ -53,7 +53,7 @@ OutputDialog::OutputDialog(TQWidget* parent, TQString caption, TQString Messages // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Batch processes images"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("An interface to show the output of the \"Batch Process " "Images\" Kipi plugin.\n" diff --git a/kipi-plugins/batchprocessimages/outputdialog.h b/kipi-plugins/batchprocessimages/outputdialog.h index 95038ac0..f841ef73 100644 --- a/kipi-plugins/batchprocessimages/outputdialog.h +++ b/kipi-plugins/batchprocessimages/outputdialog.h @@ -48,7 +48,7 @@ TQ_OBJECT public: - OutputDialog( TQWidget* parent=0, TQString caption=TQString(), + OutputDialog( TQWidget* parent=nullptr, TQString caption=TQString(), TQString Messages=TQString(), TQString Header=TQString() ); ~OutputDialog(); diff --git a/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp b/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp index c4b18ede..0b5efb70 100644 --- a/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp @@ -59,7 +59,7 @@ RecompressImagesDialog::RecompressImagesDialog( KURL::List urlList, KIPI::Interf // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Batch recompress images"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin to batch recompress images\n" "This plugin uses the \"convert\" program from \"ImageMagick\" package."), diff --git a/kipi-plugins/batchprocessimages/recompressimagesdialog.h b/kipi-plugins/batchprocessimages/recompressimagesdialog.h index 3f33788b..c5275da4 100644 --- a/kipi-plugins/batchprocessimages/recompressimagesdialog.h +++ b/kipi-plugins/batchprocessimages/recompressimagesdialog.h @@ -40,7 +40,7 @@ TQ_OBJECT public: - RecompressImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *parent=0 ); + RecompressImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *parent=nullptr ); ~RecompressImagesDialog(); private slots: diff --git a/kipi-plugins/batchprocessimages/recompressoptionsdialog.h b/kipi-plugins/batchprocessimages/recompressoptionsdialog.h index d5a6fc9d..97c9cbe6 100644 --- a/kipi-plugins/batchprocessimages/recompressoptionsdialog.h +++ b/kipi-plugins/batchprocessimages/recompressoptionsdialog.h @@ -46,7 +46,7 @@ TQ_OBJECT public: - RecompressOptionsDialog(TQWidget *parent=0); + RecompressOptionsDialog(TQWidget *parent=nullptr); ~RecompressOptionsDialog(); TQLabel *m_label_JPEGimageCompression; diff --git a/kipi-plugins/batchprocessimages/renameimagesdialog.cpp b/kipi-plugins/batchprocessimages/renameimagesdialog.cpp index ba702264..a6293f4c 100644 --- a/kipi-plugins/batchprocessimages/renameimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/renameimagesdialog.cpp @@ -54,7 +54,7 @@ RenameImagesDialog::RenameImagesDialog(const KURL::List& images, // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Batch-rename images"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin to batch-rename images"), "(c) 2003-2007, Gilles Caulier"); diff --git a/kipi-plugins/batchprocessimages/renameimageswidget.cpp b/kipi-plugins/batchprocessimages/renameimageswidget.cpp index b32dbcf3..1cd7e46d 100644 --- a/kipi-plugins/batchprocessimages/renameimageswidget.cpp +++ b/kipi-plugins/batchprocessimages/renameimageswidget.cpp @@ -128,7 +128,7 @@ RenameImagesWidget::RenameImagesWidget(TQWidget *parent, TQ_SLOT(moveCurrentItemDown()) ); m_timer = new TQTimer(this); - m_progress = new TQProgressDialog(this, 0, true); + m_progress = new TQProgressDialog(this, nullptr, true); connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotNext())); connect(m_progress, TQ_SIGNAL(canceled()), diff --git a/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp b/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp index b8cbe298..5aaf454e 100644 --- a/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp @@ -61,7 +61,7 @@ ResizeImagesDialog::ResizeImagesDialog( KURL::List urlList, KIPI::Interface* int // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Batch resize images"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin to batch-resize images\n" "This plugin uses the \"convert\" program from \"ImageMagick\" package."), diff --git a/kipi-plugins/batchprocessimages/resizeimagesdialog.h b/kipi-plugins/batchprocessimages/resizeimagesdialog.h index 80570a21..fa55600f 100644 --- a/kipi-plugins/batchprocessimages/resizeimagesdialog.h +++ b/kipi-plugins/batchprocessimages/resizeimagesdialog.h @@ -40,7 +40,7 @@ TQ_OBJECT public: - ResizeImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *parent=0 ); + ResizeImagesDialog( KURL::List images, KIPI::Interface* interface, TQWidget *parent=nullptr ); ~ResizeImagesDialog(); private slots: diff --git a/kipi-plugins/batchprocessimages/resizeoptionsdialog.h b/kipi-plugins/batchprocessimages/resizeoptionsdialog.h index 23fd2be4..04a8c16e 100644 --- a/kipi-plugins/batchprocessimages/resizeoptionsdialog.h +++ b/kipi-plugins/batchprocessimages/resizeoptionsdialog.h @@ -48,7 +48,7 @@ TQ_OBJECT public: - ResizeOptionsDialog(TQWidget *parent=0, int ResizeType = 0); + ResizeOptionsDialog(TQWidget *parent=nullptr, int ResizeType = 0); ~ResizeOptionsDialog(); TQLabel *m_label_size; diff --git a/kipi-plugins/calendar/calevents.h b/kipi-plugins/calendar/calevents.h index 0afd78b0..f8e7bbd5 100644 --- a/kipi-plugins/calendar/calevents.h +++ b/kipi-plugins/calendar/calevents.h @@ -37,7 +37,7 @@ class CalEvents : public CalEventsBase TQ_OBJECT public: - CalEvents(TQWidget *parent = 0, const char *name = 0); + CalEvents(TQWidget *parent = nullptr, const char *name = nullptr); ~CalEvents(); diff --git a/kipi-plugins/calendar/calpainter.cpp b/kipi-plugins/calendar/calpainter.cpp index 3beafa46..7e23f8d4 100644 --- a/kipi-plugins/calendar/calpainter.cpp +++ b/kipi-plugins/calendar/calpainter.cpp @@ -569,8 +569,8 @@ CalBlockPainter::CalBlockPainter(TQObject *parent, int year, int month, } else { - image_ = 0; - blocks_ = 0; + image_ = nullptr; + blocks_ = nullptr; painter->fillRect(rImage, TQt::blue); } } diff --git a/kipi-plugins/calendar/calselect.h b/kipi-plugins/calendar/calselect.h index 82eda4e4..d70e9632 100644 --- a/kipi-plugins/calendar/calselect.h +++ b/kipi-plugins/calendar/calselect.h @@ -45,7 +45,7 @@ class CalSelect : public TQWidget public: - CalSelect( KIPI::Interface* interface, TQWidget *parent, const char* name=0); + CalSelect( KIPI::Interface* interface, TQWidget *parent, const char* name=nullptr); ~CalSelect(); private: diff --git a/kipi-plugins/calendar/calsettings.cpp b/kipi-plugins/calendar/calsettings.cpp index c25191f1..eee9c6cc 100644 --- a/kipi-plugins/calendar/calsettings.cpp +++ b/kipi-plugins/calendar/calsettings.cpp @@ -32,7 +32,7 @@ namespace KIPICalendarPlugin { -CalSettings* CalSettings::instance_ = 0; +CalSettings* CalSettings::instance_ = nullptr; CalSettings::CalSettings() { @@ -42,7 +42,7 @@ CalSettings::CalSettings() CalSettings::~CalSettings() { - instance_ = 0; + instance_ = nullptr; } CalSettings* CalSettings::instance() diff --git a/kipi-plugins/calendar/caltemplate.cpp b/kipi-plugins/calendar/caltemplate.cpp index 501038fd..6eb9454f 100644 --- a/kipi-plugins/calendar/caltemplate.cpp +++ b/kipi-plugins/calendar/caltemplate.cpp @@ -83,7 +83,7 @@ CalTemplate::CalTemplate(TQWidget* parent, const char* name) // --------------------------------------------------------------- - TQHBoxLayout *hlayout = new TQHBoxLayout( 0, 0, 5 ); + TQHBoxLayout *hlayout = new TQHBoxLayout( nullptr, 0, 5 ); hlayout->addWidget( new TQLabel(i18n("Paper size:"), gbox) ); comboPaperSize_ = new TQComboBox(false, gbox); @@ -131,7 +131,7 @@ CalTemplate::CalTemplate(TQWidget* parent, const char* name) // --------------------------------------------------------------- - hlayout = new TQHBoxLayout( 0, 0, 5 ); + hlayout = new TQHBoxLayout( nullptr, 0, 5 ); hlayout->addWidget(new TQLabel(i18n("Image to text ratio:"), gbox)); @@ -145,7 +145,7 @@ CalTemplate::CalTemplate(TQWidget* parent, const char* name) // --------------------------------------------------------------- - hlayout = new TQHBoxLayout( 0, 0, 5 ); + hlayout = new TQHBoxLayout( nullptr, 0, 5 ); hlayout->addWidget(new TQLabel(i18n("Font:"), gbox)); diff --git a/kipi-plugins/calendar/caltemplate.h b/kipi-plugins/calendar/caltemplate.h index f0c4df58..c1586954 100644 --- a/kipi-plugins/calendar/caltemplate.h +++ b/kipi-plugins/calendar/caltemplate.h @@ -48,7 +48,7 @@ class CalTemplate : public TQWidget public: - CalTemplate(TQWidget* parent, const char* name=0); + CalTemplate(TQWidget* parent, const char* name=nullptr); ~CalTemplate(); private: diff --git a/kipi-plugins/calendar/calwidget.cpp b/kipi-plugins/calendar/calwidget.cpp index c3315f6e..0d20030e 100644 --- a/kipi-plugins/calendar/calwidget.cpp +++ b/kipi-plugins/calendar/calwidget.cpp @@ -46,10 +46,10 @@ namespace KIPICalendarPlugin { CalWidget::CalWidget(TQWidget *parent) - : TQWidget(parent,0,TQt::WRepaintNoErase|TQt::WResizeNoErase) + : TQWidget(parent,nullptr,TQt::WRepaintNoErase|TQt::WResizeNoErase) { setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); - calPainter_ = 0; + calPainter_ = nullptr; pix_ = new TQPixmap(); } diff --git a/kipi-plugins/calendar/calwizard.cpp b/kipi-plugins/calendar/calwizard.cpp index e889037d..a3227200 100644 --- a/kipi-plugins/calendar/calwizard.cpp +++ b/kipi-plugins/calendar/calwizard.cpp @@ -68,7 +68,7 @@ namespace KIPICalendarPlugin { CalWizard::CalWizard( KIPI::Interface* interface, TQWidget *parent ) - : KWizard(parent, 0, false, TQt::WDestructiveClose), + : KWizard(parent, nullptr, false, TQt::WDestructiveClose), interface_( interface ) { cSettings_ = new CalSettings(); @@ -112,13 +112,13 @@ CalWizard::CalWizard( KIPI::Interface* interface, TQWidget *parent ) wFinishLabel_ = new TQLabel(wFinish_); wFinishLayout->addWidget(wFinishLabel_); - TQHBoxLayout *hboxlayout = new TQHBoxLayout(0, 5, 5); + TQHBoxLayout *hboxlayout = new TQHBoxLayout(nullptr, 5, 5); hboxlayout->addWidget(new TQLabel(i18n("Current Page"), wFinish_)); wFinishProgressCurrent_ = new TQProgressBar(wFinish_); hboxlayout->addWidget(wFinishProgressCurrent_); wFinishLayout->addLayout(hboxlayout); - hboxlayout = new TQHBoxLayout(0, 5, 5); + hboxlayout = new TQHBoxLayout(nullptr, 5, 5); hboxlayout->addWidget(new TQLabel(i18n("Total Pages"), wFinish_)); wFinishProgressTotal_ = new TQProgressBar(wFinish_); hboxlayout->addWidget(wFinishProgressTotal_); @@ -134,7 +134,7 @@ CalWizard::CalWizard( KIPI::Interface* interface, TQWidget *parent ) // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Calendar"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin to create a calendar"), "(c) 2003-2004, Renchi Raju, (c) 2006 Tom Albers"); @@ -153,8 +153,8 @@ CalWizard::CalWizard( KIPI::Interface* interface, TQWidget *parent ) // ------------------------------------------ - printer_ = 0; - painter_ = 0; + printer_ = nullptr; + painter_ = nullptr; formatter_ = new CalFormatter(); @@ -297,7 +297,7 @@ void CalWizard::slotPrintOnePage() wFinishProgressTotal_->setProgress(totPages_,totPages_); painter_->end(); delete painter_; - painter_ = 0; + painter_ = nullptr; setBackEnabled(wFinish_, true); setFinishEnabled(wFinish_, true); wFinishLabel_->setText(i18n("Printing Complete")); diff --git a/kipi-plugins/calendar/calwizard.h b/kipi-plugins/calendar/calwizard.h index f96720ba..3f981305 100644 --- a/kipi-plugins/calendar/calwizard.h +++ b/kipi-plugins/calendar/calwizard.h @@ -64,7 +64,7 @@ class CalWizard : public KWizard public: - CalWizard( KIPI::Interface* interface, TQWidget *parent=0L ); + CalWizard( KIPI::Interface* interface, TQWidget *parent=nullptr ); ~CalWizard(); private: diff --git a/kipi-plugins/cdarchiving/cdarchiving.cpp b/kipi-plugins/cdarchiving/cdarchiving.cpp index e952604a..fb1de0f2 100644 --- a/kipi-plugins/cdarchiving/cdarchiving.cpp +++ b/kipi-plugins/cdarchiving/cdarchiving.cpp @@ -788,7 +788,7 @@ void CDArchiving::createBody(TQTextStream& stream, // Table with images int imgIndex = 0; - EventData* d = 0; + EventData* d = nullptr; // preliminary unique name generation TQStringList fileNameList; diff --git a/kipi-plugins/cdarchiving/cdarchiving.h b/kipi-plugins/cdarchiving/cdarchiving.h index 9e9ae658..dbaee52d 100644 --- a/kipi-plugins/cdarchiving/cdarchiving.h +++ b/kipi-plugins/cdarchiving/cdarchiving.h @@ -70,8 +70,8 @@ class CDArchiving : public TQObject public: - CDArchiving( KIPI::Interface* interface, TQObject *parent=0, - TDEAction *action_cdarchiving=0 ); + CDArchiving( KIPI::Interface* interface, TQObject *parent=nullptr, + TDEAction *action_cdarchiving=nullptr ); ~CDArchiving(); bool prepare(void); diff --git a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp index 32ae7219..0784ece9 100644 --- a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp +++ b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp @@ -99,7 +99,7 @@ CDArchivingDialog::CDArchivingDialog( KIPI::Interface* interface, TQWidget *pare // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("CD/DVD Archiving"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("An Album CD/DVD Archiving Kipi plugin.\n" "This plugin use K3b CD/DVD burning software available at\n" diff --git a/kipi-plugins/cdarchiving/cdarchivingdialog.h b/kipi-plugins/cdarchiving/cdarchivingdialog.h index 99cd5b2d..e15eab52 100644 --- a/kipi-plugins/cdarchiving/cdarchivingdialog.h +++ b/kipi-plugins/cdarchiving/cdarchivingdialog.h @@ -74,7 +74,7 @@ class CDArchivingDialog : public KDialogBase public: - CDArchivingDialog( KIPI::Interface* interface, TQWidget *parent=0); + CDArchivingDialog( KIPI::Interface* interface, TQWidget *parent=nullptr); ~CDArchivingDialog(); TQString getK3bBinPathName() const; diff --git a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp index fc2d9209..76c973a3 100644 --- a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp +++ b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp @@ -66,7 +66,7 @@ void Plugin_CDArchiving::setup( TQWidget* widget ) "cd_archiving"); addAction( m_action_cdarchiving ); - m_cdarchiving = 0; + m_cdarchiving = nullptr; } @@ -83,7 +83,7 @@ Plugin_CDArchiving::~Plugin_CDArchiving() void Plugin_CDArchiving::slotActivate() { - m_progressDlg = 0; + m_progressDlg = nullptr; KIPI::Interface* interface = dynamic_cast< KIPI::Interface* >( parent() ); diff --git a/kipi-plugins/common/include/kpaboutdata.h b/kipi-plugins/common/include/kpaboutdata.h index 97ea75c1..1cb009e0 100644 --- a/kipi-plugins/common/include/kpaboutdata.h +++ b/kipi-plugins/common/include/kpaboutdata.h @@ -38,9 +38,9 @@ namespace KIPIPlugins public: KPAboutData(const char *pluginName, - const char *pluginVersion=0, + const char *pluginVersion=nullptr, int licenseType=License_Unknown, - const char *pluginDescription=0, + const char *pluginDescription=nullptr, const char *copyrightStatement="Copyright 2003-2007, kipi-plugins team"); }; diff --git a/kipi-plugins/common/libkipiplugins/kpaboutdata.cpp b/kipi-plugins/common/libkipiplugins/kpaboutdata.cpp index 590c3ece..541f5560 100644 --- a/kipi-plugins/common/libkipiplugins/kpaboutdata.cpp +++ b/kipi-plugins/common/libkipiplugins/kpaboutdata.cpp @@ -38,7 +38,7 @@ namespace KIPIPlugins const char *pluginDescription, const char *copyrightStatement) : TDEAboutData ("kipi-plugins", pluginName, pluginVersion, - 0, licenseType, + nullptr, licenseType, copyrightStatement, pluginDescription, "http://www.kipi-plugins.org") diff --git a/kipi-plugins/findimages/displaycompare.cpp b/kipi-plugins/findimages/displaycompare.cpp index 2f41e348..ab3ce2f1 100644 --- a/kipi-plugins/findimages/displaycompare.cpp +++ b/kipi-plugins/findimages/displaycompare.cpp @@ -124,7 +124,7 @@ private: DisplayCompare::DisplayCompare(TQWidget* parent, KIPI::Interface* interface, const TQDict < TQPtrVector < TQFile > >& cmp ) - : KDialogBase( parent, "DisplayCompare", true, 0, + : KDialogBase( parent, "DisplayCompare", true, nullptr, Help|User1|Close, Close, false, i18n("Delete")), m_cmp(cmp), m_interface( interface ) { @@ -133,7 +133,7 @@ DisplayCompare::DisplayCompare(TQWidget* parent, KIPI::Interface* interface, // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Find Duplicate Images"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin to find duplicate images\n" "This plugin is based on ShowImg implementation algorithm"), diff --git a/kipi-plugins/findimages/finddupplicatedialog.cpp b/kipi-plugins/findimages/finddupplicatedialog.cpp index 36692eaf..5f28ae11 100644 --- a/kipi-plugins/findimages/finddupplicatedialog.cpp +++ b/kipi-plugins/findimages/finddupplicatedialog.cpp @@ -87,7 +87,7 @@ FindDuplicateDialog::FindDuplicateDialog( KIPI::Interface* interface, TQWidget * // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Find Duplicate Images"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin to find duplicate images\n" "This plugin is based on ShowImg implementation algorithm"), diff --git a/kipi-plugins/findimages/finddupplicatedialog.h b/kipi-plugins/findimages/finddupplicatedialog.h index c0e7c25e..069d8c9a 100644 --- a/kipi-plugins/findimages/finddupplicatedialog.h +++ b/kipi-plugins/findimages/finddupplicatedialog.h @@ -63,7 +63,7 @@ class FindDuplicateDialog : public KDialogBase public: - FindDuplicateDialog( KIPI::Interface* interface, TQWidget *parent=0); + FindDuplicateDialog( KIPI::Interface* interface, TQWidget *parent=nullptr); ~FindDuplicateDialog(); int getFindMethod() const; diff --git a/kipi-plugins/findimages/finddupplicateimages.cpp b/kipi-plugins/findimages/finddupplicateimages.cpp index ed4a0602..ed3f0478 100644 --- a/kipi-plugins/findimages/finddupplicateimages.cpp +++ b/kipi-plugins/findimages/finddupplicateimages.cpp @@ -77,7 +77,7 @@ namespace KIPIFindDupplicateImagesPlugin FindDuplicateImages::FindDuplicateImages( KIPI::Interface* interface, TQObject *parent) : TQObject(parent), TQThread(), m_interface( interface ), m_cacheDir(TDEGlobal::dirs()->saveLocation("cache", "kipi-findduplicate/")), - m_compareOp( 0 ) + m_compareOp( nullptr ) { KImageIO::registerFormats(); parent_ = parent; @@ -308,7 +308,7 @@ void FindDuplicateImages::updateCache(TQString fromDir) TQFileInfoListIterator it( *list ); TQFileInfo *fi; - while ( (fi = it.current()) != 0 ) + while ( (fi = it.current()) != nullptr ) { tdeApp->processEvents(); TQString fCache=fi->absFilePath(); diff --git a/kipi-plugins/findimages/finddupplicateimages.h b/kipi-plugins/findimages/finddupplicateimages.h index 320a8333..b1b2eb8b 100644 --- a/kipi-plugins/findimages/finddupplicateimages.h +++ b/kipi-plugins/findimages/finddupplicateimages.h @@ -59,7 +59,7 @@ class FindDuplicateImages : public TQObject, public TQThread public: - FindDuplicateImages( KIPI::Interface* interface, TQObject *parent=0); + FindDuplicateImages( KIPI::Interface* interface, TQObject *parent=nullptr); ~FindDuplicateImages(); virtual void run(); diff --git a/kipi-plugins/findimages/fuzzycompare.cpp b/kipi-plugins/findimages/fuzzycompare.cpp index e55f138f..142a812a 100644 --- a/kipi-plugins/findimages/fuzzycompare.cpp +++ b/kipi-plugins/findimages/fuzzycompare.cpp @@ -204,7 +204,7 @@ KIPIFindDupplicateImagesPlugin::ImageSimilarityData* KIPIFindDupplicateImagesPlu pixbuf = new TQImage(filename); if ( !sd || !pixbuf ) - return 0L; + return nullptr; KImageEffect::equalize(*pixbuf); @@ -218,7 +218,7 @@ KIPIFindDupplicateImagesPlugin::ImageSimilarityData* KIPIFindDupplicateImagesPlu y_inc = h / PAS; if ( x_inc < 1 || y_inc < 1 ) - return 0L; + return nullptr; j = 0; diff --git a/kipi-plugins/flickrexport/flickrtalker.cpp b/kipi-plugins/flickrexport/flickrtalker.cpp index 2baffc6d..084580ad 100644 --- a/kipi-plugins/flickrexport/flickrtalker.cpp +++ b/kipi-plugins/flickrexport/flickrtalker.cpp @@ -80,7 +80,7 @@ namespace KIPIFlickrExportPlugin FlickrTalker::FlickrTalker(TQWidget* parent) { m_parent = parent; - m_job = 0; + m_job = nullptr; m_apikey = "49d585bafa0758cb5c58ab67198bf632"; m_secret = "34b39925e6273ffd"; @@ -120,7 +120,7 @@ void FlickrTalker::getFrob() if (m_job) { m_job->kill(); - m_job = 0; + m_job = nullptr; } KURL url("http://www.flickr.com/services/rest/"); @@ -153,7 +153,7 @@ void FlickrTalker::checkToken(const TQString& token) if (m_job) { m_job->kill(); - m_job = 0; + m_job = nullptr; } KURL url("http://www.flickr.com/services/rest/"); @@ -187,7 +187,7 @@ void FlickrTalker::slotAuthenticate() if (m_job) { m_job->kill(); - m_job = 0; + m_job = nullptr; } KURL url("http://www.flickr.com/services/auth/"); @@ -223,7 +223,7 @@ void FlickrTalker::getToken() if (m_job) { m_job->kill(); - m_job = 0; + m_job = nullptr; } KURL url("http://www.flickr.com/services/rest/"); @@ -281,7 +281,7 @@ void FlickrTalker::getPhotoProperty(const TQString& method, const TQStringList& if (m_job) { m_job->kill(); - m_job = 0; + m_job = nullptr; } KURL url("http://www.flickr.com/services/rest/"); @@ -333,7 +333,7 @@ bool FlickrTalker::addPhoto(const TQString& photoPath, const FPhotoInfo& info, if (m_job) { m_job->kill(); - m_job = 0; + m_job = nullptr; } KURL url("http://www.flickr.com/services/upload/"); @@ -464,7 +464,7 @@ void FlickrTalker::cancel() if (m_job) { m_job->kill(); - m_job = 0; + m_job = nullptr; } if (m_authProgressDlg && !m_authProgressDlg->isHidden()) @@ -549,7 +549,7 @@ void FlickrTalker::slotError(const TQString& error) void FlickrTalker::slotResult(TDEIO::Job *job) { - m_job = 0; + m_job = nullptr; emit signalBusy(false); if (job->error()) diff --git a/kipi-plugins/flickrexport/flickrwidget.cpp b/kipi-plugins/flickrexport/flickrwidget.cpp index 4ee56ad9..3ab62e09 100644 --- a/kipi-plugins/flickrexport/flickrwidget.cpp +++ b/kipi-plugins/flickrexport/flickrwidget.cpp @@ -69,7 +69,7 @@ FlickrWidget::FlickrWidget(TQWidget* parent, KIPI::Interface *iface) TQVBoxLayout* flickrWidgetLayout = new TQVBoxLayout(this, 5, 5); - m_photoView = 0; //new TDEHTMLPart(splitter); + m_photoView = nullptr; //new TDEHTMLPart(splitter); KSeparator *line = new KSeparator(Horizontal, this); m_tab = new KTabWidget(this); KActiveLabel *headerLabel = new KActiveLabel(this); diff --git a/kipi-plugins/flickrexport/flickrwindow.cpp b/kipi-plugins/flickrexport/flickrwindow.cpp index c20caf66..6fdc4443 100644 --- a/kipi-plugins/flickrexport/flickrwindow.cpp +++ b/kipi-plugins/flickrexport/flickrwindow.cpp @@ -72,7 +72,7 @@ namespace KIPIFlickrExportPlugin { FlickrWindow::FlickrWindow(KIPI::Interface* interface, const TQString &tmpFolder, TQWidget *parent) - : KDialogBase(parent, 0, false, i18n("Export to Flickr Web Service"), + : KDialogBase(parent, nullptr, false, i18n("Export to Flickr Web Service"), Help|User1|Close, Close, false) { m_tmp = tmpFolder; @@ -110,7 +110,7 @@ FlickrWindow::FlickrWindow(KIPI::Interface* interface, const TQString &tmpFolder // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Flickr Export"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin to export image collection to " "Flickr web service."), @@ -155,7 +155,7 @@ FlickrWindow::FlickrWindow(KIPI::Interface* interface, const TQString &tmpFolder // -------------------------------------------------------------------------- - m_progressDlg = new TQProgressDialog(this, 0, true); + m_progressDlg = new TQProgressDialog(this, nullptr, true); m_progressDlg->setAutoReset(true); m_progressDlg->setAutoClose(true); @@ -181,7 +181,7 @@ FlickrWindow::FlickrWindow(KIPI::Interface* interface, const TQString &tmpFolder readSettings(); - m_authProgressDlg = new TQProgressDialog(this, 0, true); + m_authProgressDlg = new TQProgressDialog(this, nullptr, true); m_authProgressDlg->setAutoReset(true); m_authProgressDlg->setAutoClose(true); diff --git a/kipi-plugins/flickrexport/imageslist.cpp b/kipi-plugins/flickrexport/imageslist.cpp index 3fd6b53e..73bf7c4a 100644 --- a/kipi-plugins/flickrexport/imageslist.cpp +++ b/kipi-plugins/flickrexport/imageslist.cpp @@ -123,7 +123,7 @@ void ImagesListView::dropEvent(TQDropEvent *e) TQStrListIterator it(strList); char *str; - while ((str = it.current()) != 0) + while ((str = it.current()) != nullptr) { TQString filePath = TQUriDrag::uriToLocalFile(str); TQFileInfo fileInfo(filePath); @@ -146,10 +146,10 @@ public: ImagesPagePriv() { - listView = 0; - addButton = 0; - removeButton = 0; - iface = 0; + listView = nullptr; + addButton = nullptr; + removeButton = nullptr; + iface = nullptr; } TQPushButton *addButton; diff --git a/kipi-plugins/flickrexport/login.cpp b/kipi-plugins/flickrexport/login.cpp index b9b4828e..2414e9b0 100644 --- a/kipi-plugins/flickrexport/login.cpp +++ b/kipi-plugins/flickrexport/login.cpp @@ -55,7 +55,7 @@ FlickrLogin::FlickrLogin(TQWidget* parent, const TQString& header, hline->setFrameShape(TQFrame::HLine); hline->setFrameShadow(TQFrame::Sunken); - TQGridLayout* centerLayout = new TQGridLayout(0, 1, 1, 5, 5); + TQGridLayout* centerLayout = new TQGridLayout(nullptr, 1, 1, 5, 5); m_nameEdit = new TQLineEdit(this); m_passwdEdit = new TQLineEdit(this); @@ -72,7 +72,7 @@ FlickrLogin::FlickrLogin(TQWidget* parent, const TQString& header, centerLayout->addWidget(nameLabel, 0, 0); centerLayout->addWidget(passwdLabel, 1, 0); - TQHBoxLayout* btnLayout = new TQHBoxLayout(0, 0, 5); + TQHBoxLayout* btnLayout = new TQHBoxLayout(nullptr, 0, 5); btnLayout->addItem(new TQSpacerItem(20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); TQPushButton *okBtn = new TQPushButton(this); diff --git a/kipi-plugins/galleryexport/galleries.cpp b/kipi-plugins/galleryexport/galleries.cpp index 7bc41aa4..e4de6bd2 100644 --- a/kipi-plugins/galleryexport/galleries.cpp +++ b/kipi-plugins/galleryexport/galleries.cpp @@ -94,7 +94,7 @@ void GalleryTQListViewItem::Refresh() Galleries::Galleries() - : mpWallet(0), + : mpWallet(nullptr), mMaxGalleryId(0) { } diff --git a/kipi-plugins/galleryexport/galleryconfig.cpp b/kipi-plugins/galleryexport/galleryconfig.cpp index 9fd31ca7..5fca5585 100644 --- a/kipi-plugins/galleryexport/galleryconfig.cpp +++ b/kipi-plugins/galleryexport/galleryconfig.cpp @@ -59,7 +59,7 @@ namespace KIPIGalleryExportPlugin GalleryEdit::GalleryEdit(TQWidget* pParent, Gallery* pGallery, TQString title) - : KDialogBase(pParent, 0, true, title, Ok|Cancel, Ok, false), + : KDialogBase(pParent, nullptr, true, title, Ok|Cancel, Ok, false), mpGallery(pGallery) { setButtonGuiItem( Ok, KStdGuiItem::save() ); @@ -85,7 +85,7 @@ GalleryEdit::GalleryEdit(TQWidget* pParent, hline->setFrameShape(TQFrame::HLine); vbox->addWidget(hline); - TQGridLayout* centerLayout = new TQGridLayout(0, 1, 1, 5, 5); + TQGridLayout* centerLayout = new TQGridLayout(nullptr, 1, 1, 5, 5); mpNameEdit = new TQLineEdit( this ); centerLayout->addWidget(mpNameEdit, 0, 1); diff --git a/kipi-plugins/galleryexport/gallerylist.cpp b/kipi-plugins/galleryexport/gallerylist.cpp index 4218cc43..1394f0f4 100644 --- a/kipi-plugins/galleryexport/gallerylist.cpp +++ b/kipi-plugins/galleryexport/gallerylist.cpp @@ -47,11 +47,11 @@ namespace KIPIGalleryExportPlugin { GalleryList::GalleryList(TQWidget *pParent, Galleries* pGalleries, bool blnShowOpen) - : KDialogBase(pParent, 0, true, i18n("Remote Galleries"), + : KDialogBase(pParent, nullptr, true, i18n("Remote Galleries"), Ok|Close|User1|User2|User3, Close, false), mpGalleries(pGalleries), - mpCurrentGallery(0) + mpCurrentGallery(nullptr) { if (!blnShowOpen) showButtonOK(false); @@ -116,7 +116,7 @@ void GalleryList::selectionChanged() } else { - mpCurrentGallery = 0; + mpCurrentGallery = nullptr; } } diff --git a/kipi-plugins/galleryexport/gallerytalker.cpp b/kipi-plugins/galleryexport/gallerytalker.cpp index f3cd3872..5cced308 100644 --- a/kipi-plugins/galleryexport/gallerytalker.cpp +++ b/kipi-plugins/galleryexport/gallerytalker.cpp @@ -46,7 +46,7 @@ namespace KIPIGalleryExportPlugin { GalleryTalker::GalleryTalker( TQWidget* parent ) - : m_parent( parent ), m_job( 0 ), m_loggedIn( false ) + : m_parent( parent ), m_job( nullptr ), m_loggedIn( false ) { } @@ -123,7 +123,7 @@ void GalleryTalker::listPhotos( const TQString& albumName ) if (m_job) { m_job->kill(); - m_job = 0; + m_job = nullptr; } GalleryMPForm form; @@ -156,7 +156,7 @@ void GalleryTalker::createAlbum( const TQString& parentAlbumName, if (m_job) { m_job->kill(); - m_job = 0; + m_job = nullptr; } GalleryMPForm form; @@ -196,7 +196,7 @@ bool GalleryTalker::addPhoto( const TQString& albumName, if (m_job) { m_job->kill(); - m_job = 0; + m_job = nullptr; } TQString path = photoPath; @@ -269,7 +269,7 @@ void GalleryTalker::cancel() if (m_job) { m_job->kill(); - m_job = 0; + m_job = nullptr; } } @@ -285,7 +285,7 @@ void GalleryTalker::data(TDEIO::Job*, const TQByteArray& data) void GalleryTalker::slotResult(TDEIO::Job *job) { - m_job = 0; + m_job = nullptr; emit signalBusy( false ); if ( job->error() ) diff --git a/kipi-plugins/galleryexport/gallerywidget.h b/kipi-plugins/galleryexport/gallerywidget.h index 4cd5e1f1..6c592b70 100644 --- a/kipi-plugins/galleryexport/gallerywidget.h +++ b/kipi-plugins/galleryexport/gallerywidget.h @@ -37,7 +37,7 @@ class GalleryWidget : public TQWidget public: - GalleryWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + GalleryWidget( TQWidget* parent = nullptr, const char* name = nullptr, WFlags fl = 0 ); ~GalleryWidget(); private slots: diff --git a/kipi-plugins/galleryexport/gallerywindow.cpp b/kipi-plugins/galleryexport/gallerywindow.cpp index cb9d124e..6c30d358 100644 --- a/kipi-plugins/galleryexport/gallerywindow.cpp +++ b/kipi-plugins/galleryexport/gallerywindow.cpp @@ -69,7 +69,7 @@ namespace KIPIGalleryExportPlugin { GalleryWindow::GalleryWindow(KIPI::Interface* interface, TQWidget *parent, Galleries* pGalleries) - : KDialogBase(parent, 0, true, i18n("Gallery Export"), Help|Close, Close, false), + : KDialogBase(parent, nullptr, true, i18n("Gallery Export"), Help|Close, Close, false), m_interface(interface), mpGalleries(pGalleries) { @@ -79,7 +79,7 @@ GalleryWindow::GalleryWindow(KIPI::Interface* interface, TQWidget *parent, Galle // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Gallery Export"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin to export image collection to remote Gallery server."), "(c) 2003-2005, Renchi Raju"); @@ -114,7 +114,7 @@ GalleryWindow::GalleryWindow(KIPI::Interface* interface, TQWidget *parent, Galle m_newAlbumBtn->setEnabled( false ); m_addPhotoBtn->setEnabled( false ); - m_progressDlg = new TQProgressDialog( this, 0, true ); + m_progressDlg = new TQProgressDialog( this, nullptr, true ); m_progressDlg->setAutoReset( true ); m_progressDlg->setAutoClose( true ); diff --git a/kipi-plugins/galleryexport/plugin_galleryexport.cpp b/kipi-plugins/galleryexport/plugin_galleryexport.cpp index 4958a441..444f6ccb 100644 --- a/kipi-plugins/galleryexport/plugin_galleryexport.cpp +++ b/kipi-plugins/galleryexport/plugin_galleryexport.cpp @@ -51,7 +51,7 @@ Plugin_GalleryExport::Plugin_GalleryExport(TQObject *parent, const char*, const TQStringList&) : KIPI::Plugin(Factory::instance(), parent, "GalleryExport"), - mpGalleries(0) + mpGalleries(nullptr) { kdDebug(51001) << "Plugin_GalleryExport plugin loaded" << endl; diff --git a/kipi-plugins/gpssync/gpseditdialog.cpp b/kipi-plugins/gpssync/gpseditdialog.cpp index 52233dbf..727425de 100644 --- a/kipi-plugins/gpssync/gpseditdialog.cpp +++ b/kipi-plugins/gpssync/gpseditdialog.cpp @@ -59,12 +59,12 @@ public: GPSEditDialogDialogPrivate() { - altitudeInput = 0; - latitudeInput = 0; - longitudeInput = 0; - worldMap = 0; - about = 0; - goButton = 0; + altitudeInput = nullptr; + latitudeInput = nullptr; + longitudeInput = nullptr; + worldMap = nullptr; + about = nullptr; + goButton = nullptr; hasGPSInfo = false; } @@ -87,7 +87,7 @@ GPSEditDialog::GPSEditDialog(TQWidget* parent, const GPSDataContainer& gpsData, const TQString& fileName, bool hasGPSInfo) : KDialogBase(Plain, i18n("%1 - Edit Geographical Coordinates").arg(fileName), Help|Ok|Cancel, Ok, - parent, 0, true, false) + parent, nullptr, true, false) { d = new GPSEditDialogDialogPrivate; d->hasGPSInfo = hasGPSInfo; @@ -142,7 +142,7 @@ GPSEditDialog::GPSEditDialog(TQWidget* parent, const GPSDataContainer& gpsData, // About data and help button. d->about = new KIPIPlugins::KPAboutData(I18N_NOOP("GPS Sync"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Plugin to synchronize pictures metadata with a GPS device"), "(c) 2006-2008, Gilles Caulier"); diff --git a/kipi-plugins/gpssync/gpssyncdialog.cpp b/kipi-plugins/gpssync/gpssyncdialog.cpp index d801b857..b315f0b5 100644 --- a/kipi-plugins/gpssync/gpssyncdialog.cpp +++ b/kipi-plugins/gpssync/gpssyncdialog.cpp @@ -70,16 +70,16 @@ public: GPSSyncDialogPriv() { - listView = 0; - interface = 0; - maxGapInput = 0; - gpxFileName = 0; - gpxPointsLabel = 0; - timeZoneCB = 0; - interpolateBox = 0; - maxTimeInput = 0; - maxTimeLabel = 0; - about = 0; + listView = nullptr; + interface = nullptr; + maxGapInput = nullptr; + gpxFileName = nullptr; + gpxPointsLabel = nullptr; + timeZoneCB = nullptr; + interpolateBox = nullptr; + maxTimeInput = nullptr; + maxTimeLabel = nullptr; + about = nullptr; } TQLabel *gpxPointsLabel; @@ -106,7 +106,7 @@ public: GPSSyncDialog::GPSSyncDialog( KIPI::Interface* interface, TQWidget* parent) : KDialogBase(Plain, i18n("Geolocation"), Help|User1|User2|User3|Apply|Close, Close, - parent, 0, true, false) + parent, nullptr, true, false) { d = new GPSSyncDialogPriv; d->interface = interface; @@ -246,7 +246,7 @@ GPSSyncDialog::GPSSyncDialog( KIPI::Interface* interface, TQWidget* parent) // About data and help button. d->about = new KIPIPlugins::KPAboutData(I18N_NOOP("GPS Sync"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A plugin to synchronize images' metadata with a GPS device"), "(c) 2006-2008, Gilles Caulier"); diff --git a/kipi-plugins/gpssync/kmlexportconfig.cpp b/kipi-plugins/gpssync/kmlexportconfig.cpp index 8b414ed6..152c4b87 100644 --- a/kipi-plugins/gpssync/kmlexportconfig.cpp +++ b/kipi-plugins/gpssync/kmlexportconfig.cpp @@ -65,7 +65,7 @@ namespace KIPIGPSSyncPlugin KMLExportConfig::KMLExportConfig( TQWidget* parent, const char* name) : KDialogBase(Plain, i18n("KML Export"), Help|Ok|Cancel, Ok, - parent, 0, true, false) + parent, nullptr, true, false) { if ( !name ) setName( "KMLExportConfig" ); setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, @@ -279,7 +279,7 @@ KMLExportConfig::KMLExportConfig( TQWidget* parent, const char* name) // -------------------------------------------------------------- // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("KML Export"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin for kml exporting"), "(c) 2006-2007, Stéphane Pontier"); diff --git a/kipi-plugins/gpssync/kmlexportconfig.h b/kipi-plugins/gpssync/kmlexportconfig.h index f6a03381..7a97a7f3 100644 --- a/kipi-plugins/gpssync/kmlexportconfig.h +++ b/kipi-plugins/gpssync/kmlexportconfig.h @@ -56,7 +56,7 @@ class KMLExportConfig : public KDialogBase public: - explicit KMLExportConfig( TQWidget* parent = 0, const char* name = 0); + explicit KMLExportConfig( TQWidget* parent = nullptr, const char* name = nullptr); ~KMLExportConfig(); public: diff --git a/kipi-plugins/gpssync/plugin_gpssync.cpp b/kipi-plugins/gpssync/plugin_gpssync.cpp index d19f7e66..b5364c6f 100644 --- a/kipi-plugins/gpssync/plugin_gpssync.cpp +++ b/kipi-plugins/gpssync/plugin_gpssync.cpp @@ -71,7 +71,7 @@ void Plugin_GPSSync::setup( TQWidget* widget ) KIPI::Plugin::setup( widget ); m_action_geolocation = new TDEActionMenu(i18n("Geolocation"), - 0, + nullptr, actionCollection(), "geolocation"); @@ -84,7 +84,7 @@ void Plugin_GPSSync::setup( TQWidget* widget ) "gpssync")); m_action_geolocation->insert(new TDEAction (i18n("Edit Coordinates..."), - 0, + nullptr, 0, this, TQ_SLOT(slotGPSEdit()), @@ -92,7 +92,7 @@ void Plugin_GPSSync::setup( TQWidget* widget ) "gpsedit")); m_action_geolocation->insert(new TDEAction (i18n("Remove Coordinates..."), - 0, + nullptr, 0, this, TQ_SLOT(slotGPSRemove()), diff --git a/kipi-plugins/htmlexport/generator.cpp b/kipi-plugins/htmlexport/generator.cpp index fdd40bcd..ee97a5d4 100644 --- a/kipi-plugins/htmlexport/generator.cpp +++ b/kipi-plugins/htmlexport/generator.cpp @@ -430,7 +430,7 @@ struct Generator::Private { *ptr=it.data().data(); ++ptr; } - *ptr=0; + *ptr=nullptr; // Move to the destination dir, so that external documents get correctly // produced diff --git a/kipi-plugins/htmlexport/plugin.cpp b/kipi-plugins/htmlexport/plugin.cpp index 45400b52..cfff56b4 100644 --- a/kipi-plugins/htmlexport/plugin.cpp +++ b/kipi-plugins/htmlexport/plugin.cpp @@ -52,7 +52,7 @@ Plugin::Plugin(TQObject *parent, const char*, const TQStringList&) : KIPI::Plugin(Factory::instance(), parent, "HTMLExport") { d=new Private; - d->mAction=0; + d->mAction=nullptr; } diff --git a/kipi-plugins/htmlexport/theme.cpp b/kipi-plugins/htmlexport/theme.cpp index 8ee9e849..876bc2d6 100644 --- a/kipi-plugins/htmlexport/theme.cpp +++ b/kipi-plugins/htmlexport/theme.cpp @@ -164,7 +164,7 @@ Theme::Ptr Theme::findByInternalName(const TQString& internalName) { return theme; } } - return 0; + return nullptr; } diff --git a/kipi-plugins/htmlexport/wizard.cpp b/kipi-plugins/htmlexport/wizard.cpp index 48e1d5a5..efb15885 100644 --- a/kipi-plugins/htmlexport/wizard.cpp +++ b/kipi-plugins/htmlexport/wizard.cpp @@ -104,7 +104,7 @@ struct Wizard::Private { if (content->layout()) { // Setting recursiveSearch to false is very important, if we don't // we will end up deleting subwidgets of our child widgets - TQObjectList* list = content->queryList("TQWidget", 0 /*objName*/, + TQObjectList* list = content->queryList("TQWidget", nullptr /*objName*/, false /*regexpMatch*/, false /*recursiveSearch*/); TQObjectListIterator it(*list); for( ; it.current(); ++it) { @@ -172,7 +172,7 @@ Wizard::Wizard(TQWidget* parent, KIPI::Interface* interface, GalleryInfo* info) // About data d->mAbout = new KIPIPlugins::KPAboutData(I18N_NOOP("HTML Export"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A KIPI plugin to export image collections to HTML pages"), "(c) 2006, Aurelien Gateau"); diff --git a/kipi-plugins/htmlexport/xmlutils.h b/kipi-plugins/htmlexport/xmlutils.h index 0293f510..3ebefd6f 100644 --- a/kipi-plugins/htmlexport/xmlutils.h +++ b/kipi-plugins/htmlexport/xmlutils.h @@ -34,7 +34,7 @@ namespace KIPIHTMLExport { template class CWrapper { public: - CWrapper() : mPtr(0) {} + CWrapper() : mPtr(nullptr) {} CWrapper(Ptr ptr) : mPtr(ptr) {} @@ -72,7 +72,7 @@ public: int rc=xmlTextWriterStartDocument(ptr, nullptr, "UTF-8", nullptr); if (rc<0) { - mWriter.assign(0); + mWriter.assign(nullptr); return false; } @@ -132,7 +132,7 @@ private: */ class XMLElement { public: - XMLElement(XMLWriter& writer, const TQString& element, const XMLAttributeList* attributeList=0) + XMLElement(XMLWriter& writer, const TQString& element, const XMLAttributeList* attributeList=nullptr) : mWriter(writer) { xmlTextWriterStartElement(writer, BAD_CAST element.ascii()); diff --git a/kipi-plugins/imageviewer/plugin_viewer.cpp b/kipi-plugins/imageviewer/plugin_viewer.cpp index 8b793463..0d4b4f72 100644 --- a/kipi-plugins/imageviewer/plugin_viewer.cpp +++ b/kipi-plugins/imageviewer/plugin_viewer.cpp @@ -64,7 +64,7 @@ void Plugin_viewer::setup( TQWidget* widget ) actionCollection(), "viewer"); addAction(actionViewer); - widget=0; + widget=nullptr; } KIPI::Category Plugin_viewer::category( TDEAction* action ) const diff --git a/kipi-plugins/imageviewer/viewerwidget.cpp b/kipi-plugins/imageviewer/viewerwidget.cpp index 356447af..acd87944 100644 --- a/kipi-plugins/imageviewer/viewerwidget.cpp +++ b/kipi-plugins/imageviewer/viewerwidget.cpp @@ -349,7 +349,7 @@ void ViewerWidget::keyPressEvent(TQKeyEvent *k) //key is not bound to any action, therefore show help dialog to enlighten the user default: - TQDialog * h = new HelpDialog(0,0,TQt::WStyle_StaysOnTop); + TQDialog * h = new HelpDialog(nullptr,nullptr,TQt::WStyle_StaysOnTop); h->show(); } } diff --git a/kipi-plugins/ipodexport/imagelist.cpp b/kipi-plugins/ipodexport/imagelist.cpp index 934b72b3..67124f3a 100644 --- a/kipi-plugins/ipodexport/imagelist.cpp +++ b/kipi-plugins/ipodexport/imagelist.cpp @@ -129,7 +129,7 @@ void ImageList::droppedImagesItems( TQDropEvent *e ) TQStrListIterator it(strList); char *str; - while ( (str = it.current()) != 0 ) + while ( (str = it.current()) != nullptr ) { TQString filePath = TQUriDrag::uriToLocalFile(str); TQFileInfo fileInfo(filePath); diff --git a/kipi-plugins/ipodexport/imagelist.h b/kipi-plugins/ipodexport/imagelist.h index 8d57ebd8..44d448b6 100644 --- a/kipi-plugins/ipodexport/imagelist.h +++ b/kipi-plugins/ipodexport/imagelist.h @@ -37,7 +37,7 @@ class ImageList : public TDEListView public: enum ListType { UploadType, IpodType }; - ImageList( ListType=UploadType, TQWidget *parent=0, const char *name=0 ); + ImageList( ListType=UploadType, TQWidget *parent=nullptr, const char *name=nullptr ); ListType getType() const { return m_type; } diff --git a/kipi-plugins/ipodexport/ipodexportdialog.cpp b/kipi-plugins/ipodexport/ipodexportdialog.cpp index 165b86d5..fb4dd7a9 100644 --- a/kipi-plugins/ipodexport/ipodexportdialog.cpp +++ b/kipi-plugins/ipodexport/ipodexportdialog.cpp @@ -51,7 +51,7 @@ using namespace IpodExport; -UploadDialog *UploadDialog::s_instance = 0; +UploadDialog *UploadDialog::s_instance = nullptr; UploadDialog::UploadDialog( #if KIPI_PLUGIN @@ -63,12 +63,12 @@ UploadDialog::UploadDialog( #if KIPI_PLUGIN , m_interface( interface ) #endif - , m_itdb( 0 ) - , m_ipodInfo( 0 ) - , m_ipodHeader( 0 ) + , m_itdb( nullptr ) + , m_ipodInfo( nullptr ) + , m_ipodHeader( nullptr ) , m_transferring( false ) - , m_destinationAlbum( 0 ) - , m_ipodAlbumList( 0 ) + , m_destinationAlbum( nullptr ) + , m_ipodAlbumList( nullptr ) , m_mountPoint( TQString() ) , m_deviceNode( TQString() ) { @@ -201,7 +201,7 @@ UploadDialog::getIpodAlbums() while( m_ipodAlbumList->firstChild() ) delete m_ipodAlbumList->firstChild(); - IpodAlbumItem *last = 0; + IpodAlbumItem *last = nullptr; for( GList *it = m_itdb->photoalbums; it; it = it->next ) { Itdb_PhotoAlbum *ipodAlbum = (Itdb_PhotoAlbum *)it->data; @@ -218,7 +218,7 @@ UploadDialog::getIpodAlbumPhotos( IpodAlbumItem *item, Itdb_PhotoAlbum *album ) if( !item || !album || !m_itdb ) return; - IpodPhotoItem *last = 0; + IpodPhotoItem *last = nullptr; for( GList *it = album->members; it; it = it->next ) { Itdb_Artwork *photo = (Itdb_Artwork*)it->data; @@ -237,7 +237,7 @@ UploadDialog::reloadIpodAlbum( IpodAlbumItem *item, Itdb_PhotoAlbum *album ) while( item->firstChild() ) delete item->firstChild(); // clear the items, so we can reload them again - Itdb_PhotoAlbum *ipodAlbum = 0; + Itdb_PhotoAlbum *ipodAlbum = nullptr; for( GList *it = m_itdb->photoalbums; it; it = it->next ) { ipodAlbum = (Itdb_PhotoAlbum *)it->data; @@ -291,7 +291,7 @@ UploadDialog::startTransfer() enableButton( KDialogBase::User1, false ); enableButton( KDialogBase::Close, false ); - GError *err = 0; + GError *err = nullptr; while( TQListViewItem *item = m_uploadList->firstChild() ) { @@ -305,7 +305,7 @@ UploadDialog::startTransfer() { debug() << "Error adding photo " << item->pathSrc() << " to database:" << err->message << endl; - err = 0; + err = nullptr; } } else @@ -474,7 +474,7 @@ UploadDialog::createIpodAlbum() m_ipodAlbumList->setSelected( i, true ); // commit the changes to the iPod - GError *err = 0; + GError *err = nullptr; itdb_photodb_write( m_itdb, &err ); } } @@ -496,7 +496,7 @@ UploadDialog::renameIpodAlbum() // change the name on the ipod, and rename the listviewitem selected->setName( newName ); // commit changes to the iPod - GError *err = 0; + GError *err = nullptr; itdb_photodb_write( m_itdb, &err ); } } @@ -571,7 +571,7 @@ UploadDialog::deleteIpodAlbum() if( result ) //selected item may have been deleted by deleteIpodPhoto delete selected; - GError *err = 0; + GError *err = nullptr; itdb_photodb_write( m_itdb, &err ); } @@ -667,7 +667,7 @@ UploadDialog::openDevice() /// Here, we have found an ipod, but we are not sure if the photo db exists. /// Try and parse it to determine whether we have initialised the iPod. ipodFound = true; - GError *err = 0; + GError *err = nullptr; m_itdb = itdb_photodb_parse( TQFile::encodeName( mountpoint ), &err ); if( err ) { @@ -675,7 +675,7 @@ UploadDialog::openDevice() if( m_itdb ) { itdb_photodb_free( m_itdb ); - m_itdb = 0; + m_itdb = nullptr; } } break; @@ -687,7 +687,7 @@ UploadDialog::openDevice() if( m_itdb ) { itdb_photodb_free( m_itdb ); - m_itdb = 0; + m_itdb = nullptr; } return false; } @@ -715,7 +715,7 @@ UploadDialog::openDevice() return false; } - GError *err = 0; + GError *err = nullptr; itdb_photodb_write( m_itdb, &err ); } else @@ -729,18 +729,18 @@ Itdb_Artwork * UploadDialog::photoFromId( const uint id ) { if( !m_itdb ) - return 0; + return nullptr; for( GList *it = m_itdb->photos; it; it=it->next ) { Itdb_Artwork *photo = (Itdb_Artwork*)it->data; if( !photo ) - return 0; + return nullptr; if( photo->id == id ) return photo; } - return 0; + return nullptr; } TQString UploadDialog::ipodModel() const diff --git a/kipi-plugins/ipodexport/ipodexportdialog.h b/kipi-plugins/ipodexport/ipodexportdialog.h index 112f7c77..63b44c4f 100644 --- a/kipi-plugins/ipodexport/ipodexportdialog.h +++ b/kipi-plugins/ipodexport/ipodexportdialog.h @@ -53,7 +53,7 @@ class UploadDialog : public KDialogBase #if KIPI_PLUGIN KIPI::Interface* interface, #endif - TQString caption, TQWidget *parent=0 ); + TQString caption, TQWidget *parent=nullptr ); ~UploadDialog() { diff --git a/kipi-plugins/ipodexport/ipodheader.h b/kipi-plugins/ipodexport/ipodheader.h index 7b47ab92..ccd7f0f6 100644 --- a/kipi-plugins/ipodexport/ipodheader.h +++ b/kipi-plugins/ipodexport/ipodheader.h @@ -28,7 +28,7 @@ class IpodHeader : public TQFrame public: - IpodHeader( TQWidget *parent=0, const char *name=0, WFlags f=0 ); + IpodHeader( TQWidget *parent=nullptr, const char *name=nullptr, WFlags f=0 ); ~IpodHeader() { } enum ViewType { NoIpod, IncompatibleIpod, ValidIpod }; diff --git a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp index 87544f17..3f5457d9 100644 --- a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp +++ b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp @@ -64,12 +64,12 @@ Plugin_JPEGLossless::Plugin_JPEGLossless(TQObject *parent, const char*, const TQ { m_total = 0; m_current = 0; - m_action_Convert2GrayScale = 0; - m_action_AutoExif = 0; - m_action_RotateImage = 0; - m_action_FlipImage = 0; - m_progressDlg = 0; - m_thread = 0; + m_action_Convert2GrayScale = nullptr; + m_action_AutoExif = nullptr; + m_action_RotateImage = nullptr; + m_action_FlipImage = nullptr; + m_progressDlg = nullptr; + m_thread = nullptr; m_failed = false; kdDebug( 51001 ) << "Plugin_JPEGLossless plugin loaded" << endl; @@ -80,7 +80,7 @@ void Plugin_JPEGLossless::setup( TQWidget* widget ) KIPI::Plugin::setup( widget ); m_action_AutoExif = new TDEAction(i18n("Auto Rotate/Flip Using Exif Information"), - 0, 0, + nullptr, 0, this, TQ_SLOT(slotRotate()), actionCollection(), @@ -112,7 +112,7 @@ void Plugin_JPEGLossless::setup( TQWidget* widget ) "jpeglossless_flip"); m_action_FlipImage->insert( new TDEAction(i18n("Horizontally"), - 0, + nullptr, CTRL+Key_Asterisk, this, TQ_SLOT(slotFlip()), @@ -120,7 +120,7 @@ void Plugin_JPEGLossless::setup( TQWidget* widget ) "flip_horizontal") ); m_action_FlipImage->insert( new TDEAction(i18n("Vertically"), - 0, + nullptr, CTRL+Key_Slash, this, TQ_SLOT(slotFlip()), @@ -209,7 +209,7 @@ void Plugin_JPEGLossless::slotFlip() if (m_progressDlg) { delete m_progressDlg; - m_progressDlg = 0; + m_progressDlg = nullptr; } m_progressDlg = new KIPI::BatchProgressDialog(tdeApp->activeWindow(), @@ -265,7 +265,7 @@ void Plugin_JPEGLossless::slotRotate() if (m_progressDlg) { delete m_progressDlg; - m_progressDlg = 0; + m_progressDlg = nullptr; } m_progressDlg = new KIPI::BatchProgressDialog(tdeApp->activeWindow(), @@ -298,7 +298,7 @@ void Plugin_JPEGLossless::slotConvert2GrayScale() if (m_progressDlg) { delete m_progressDlg; - m_progressDlg = 0; + m_progressDlg = nullptr; } m_progressDlg = new KIPI::BatchProgressDialog(tdeApp->activeWindow(), @@ -447,7 +447,7 @@ void Plugin_JPEGLossless::customEvent(TQCustomEvent *event) { slotCancel(); m_progressDlg->close(); - m_progressDlg = 0; + m_progressDlg = nullptr; } KIPI::Interface* interface = dynamic_cast( parent() ); diff --git a/kipi-plugins/kameraklient/camerafolderview.cpp b/kipi-plugins/kameraklient/camerafolderview.cpp index eacf96b6..f68f0820 100644 --- a/kipi-plugins/kameraklient/camerafolderview.cpp +++ b/kipi-plugins/kameraklient/camerafolderview.cpp @@ -37,8 +37,8 @@ CameraFolderView::CameraFolderView(TQWidget* parent) : TDEListView(parent) { setDropHighlighter(false); setAcceptDrops(true); cameraName_ = "Camera"; - virtualFolder_ = 0; - rootFolder_ = 0; + virtualFolder_ = nullptr; + rootFolder_ = nullptr; setupConnections(); } @@ -73,7 +73,7 @@ CameraFolderItem* CameraFolderView::addFolder(const TQString& folder, const TQSt item->setOpen(true); return item; } else { - return 0; + return nullptr; } } @@ -85,7 +85,7 @@ CameraFolderItem* CameraFolderView::findFolder(const TQString& folderPath) { return item; } } - return 0; + return nullptr; } void CameraFolderView::slotSelectionChanged(TQListViewItem* item) { @@ -105,8 +105,8 @@ CameraFolderItem* CameraFolderView::rootFolder() { void CameraFolderView::clear() { TDEListView::clear(); - virtualFolder_ = 0; - rootFolder_ = 0; + virtualFolder_ = nullptr; + rootFolder_ = nullptr; emit signalCleared(); } diff --git a/kipi-plugins/kameraklient/cameraiconitem.cpp b/kipi-plugins/kameraklient/cameraiconitem.cpp index d8f03369..84f665e2 100644 --- a/kipi-plugins/kameraklient/cameraiconitem.cpp +++ b/kipi-plugins/kameraklient/cameraiconitem.cpp @@ -58,7 +58,7 @@ const char* CameraIconItem::new_xpm[] = { " @ "}; -TQPixmap* CameraIconItem::newEmblem = 0; +TQPixmap* CameraIconItem::newEmblem = nullptr; CameraIconItem::CameraIconItem(ThumbView* parent, const GPFileItemInfo* fileInfo, const TQPixmap& pixmap) : ThumbItem(parent, fileInfo->name, pixmap), fileInfo_(fileInfo) { @@ -70,7 +70,7 @@ CameraIconItem::CameraIconItem(ThumbView* parent, const GPFileItemInfo* fileInfo CameraIconItem::~CameraIconItem() { if(newEmblem) { delete newEmblem; - newEmblem = 0; + newEmblem = nullptr; } } diff --git a/kipi-plugins/kameraklient/cameralist.cpp b/kipi-plugins/kameraklient/cameralist.cpp index 455ba264..2421f442 100644 --- a/kipi-plugins/kameraklient/cameralist.cpp +++ b/kipi-plugins/kameraklient/cameralist.cpp @@ -31,7 +31,7 @@ namespace KIPIKameraKlientPlugin { -CameraList* CameraList::instance_ = 0; +CameraList* CameraList::instance_ = nullptr; CameraList* CameraList::instance() { return instance_; @@ -56,7 +56,7 @@ CameraList::~CameraList() { close(); d->clist.clear(); delete d; - instance_ = 0; + instance_ = nullptr; } bool CameraList::load() { @@ -156,7 +156,7 @@ CameraType* CameraList::find(const TQString& model) { return ctype; } } - return 0; + return nullptr; } void CameraList::clear() { diff --git a/kipi-plugins/kameraklient/cameraselection.cpp b/kipi-plugins/kameraklient/cameraselection.cpp index 3f7e457f..70d35e8e 100644 --- a/kipi-plugins/kameraklient/cameraselection.cpp +++ b/kipi-plugins/kameraklient/cameraselection.cpp @@ -52,13 +52,13 @@ namespace KIPIKameraKlientPlugin { CameraSelection::CameraSelection(TQWidget* parent) - : KDialogBase(parent, 0, true, i18n("Camera Selection"), + : KDialogBase(parent, nullptr, true, i18n("Camera Selection"), Help|Ok|Cancel, Ok, true) { // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("KameraKlient"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Digital camera interface Kipi plugin"), "(c) 2003-2004, Renchi Raju\n" diff --git a/kipi-plugins/kameraklient/cameraselection.h b/kipi-plugins/kameraklient/cameraselection.h index 314ebfd0..90804665 100644 --- a/kipi-plugins/kameraklient/cameraselection.h +++ b/kipi-plugins/kameraklient/cameraselection.h @@ -48,7 +48,7 @@ class CameraSelection : public KDialogBase public: - CameraSelection( TQWidget* parent = 0 ); + CameraSelection( TQWidget* parent = nullptr ); ~CameraSelection(); void setCamera(const TQString& model, const TQString& port); diff --git a/kipi-plugins/kameraklient/cameraui.cpp b/kipi-plugins/kameraklient/cameraui.cpp index 9a6b6014..a0821db4 100644 --- a/kipi-plugins/kameraklient/cameraui.cpp +++ b/kipi-plugins/kameraklient/cameraui.cpp @@ -145,7 +145,7 @@ CameraUI::CameraUI() : TQWidget() mBtnBoxLayout->addWidget(mhelpButton); m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("KameraKlient"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Digital camera interface Kipi plugin"), "(c) 2003-2004, Renchi Raju\n" @@ -494,7 +494,7 @@ void CameraUI::slotCameraDeleteSelected() { void CameraUI::slotCameraUpload() { TQString reason; if (! cameraReadyForUpload(reason) ) { - KMessageBox::error(0, reason); + KMessageBox::error(nullptr, reason); return; } CameraFolderItem *folderItem = static_cast(mFolderView->selectedItem()); diff --git a/kipi-plugins/kameraklient/dmessagebox.cpp b/kipi-plugins/kameraklient/dmessagebox.cpp index 3c1f4cb0..409fe2f7 100644 --- a/kipi-plugins/kameraklient/dmessagebox.cpp +++ b/kipi-plugins/kameraklient/dmessagebox.cpp @@ -41,9 +41,9 @@ namespace KIPIKameraKlientPlugin { -DMessageBox* DMessageBox::s_instance = 0; +DMessageBox* DMessageBox::s_instance = nullptr; -DMessageBox::DMessageBox() : TQWidget(0, 0, WShowModal | WStyle_DialogBorder| WDestructiveClose) { +DMessageBox::DMessageBox() : TQWidget(nullptr, nullptr, WShowModal | WStyle_DialogBorder| WDestructiveClose) { setCaption(i18n("Error")); s_instance = this; count_ = 0; @@ -55,7 +55,7 @@ DMessageBox::DMessageBox() : TQWidget(0, 0, WShowModal | WStyle_DialogBorder| WD TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, - 0, true); + nullptr, true); TQLabel *pixLabel = new TQLabel(hbox); pixLabel->setPixmap(pix); pixLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); @@ -81,7 +81,7 @@ DMessageBox::DMessageBox() : TQWidget(0, 0, WShowModal | WStyle_DialogBorder| WD } DMessageBox::~DMessageBox() { - s_instance = 0; + s_instance = nullptr; } void DMessageBox::appendMsg(const TQString& msg) { diff --git a/kipi-plugins/kameraklient/gpcamera.cpp b/kipi-plugins/kameraklient/gpcamera.cpp index 22cc20b1..afb7cab0 100644 --- a/kipi-plugins/kameraklient/gpcamera.cpp +++ b/kipi-plugins/kameraklient/gpcamera.cpp @@ -57,9 +57,9 @@ public: }; GPCamera::GPCamera(const TQString& model, const TQString& port) { - status = 0; + status = nullptr; d = new GPCameraPrivate; - d->camera = 0; + d->camera = nullptr; d->model = model; d->port = port; d->cameraSetup = false; @@ -75,7 +75,7 @@ GPCamera::GPCamera(const TQString& model, const TQString& port) { GPCamera::~GPCamera() { if (d->camera) { gp_camera_unref(d->camera); - d->camera = 0; + d->camera = nullptr; } delete d; } @@ -83,7 +83,7 @@ GPCamera::~GPCamera() { int GPCamera::setup() { if (d->camera) { gp_camera_unref(d->camera); - d->camera = 0; + d->camera = nullptr; } CameraAbilitiesList *abilList; GPPortInfoList *infoList; @@ -93,7 +93,7 @@ int GPCamera::setup() { if (status) { delete status; - status = 0; + status = nullptr; } status = new GPStatus(); @@ -104,7 +104,7 @@ int GPCamera::setup() { gp_port_info_list_load(infoList); delete status; - status = 0; + status = nullptr; int modelNum = -1, portNum = -1; modelNum = gp_abilities_list_lookup_model(abilList, d->model.latin1()); @@ -114,7 +114,7 @@ int GPCamera::setup() { if (gp_camera_set_abilities(d->camera, d->cameraAbilities) != GP_OK) { gp_camera_unref(d->camera); - d->camera = 0; + d->camera = nullptr; gp_abilities_list_free(abilList); gp_port_info_list_free(infoList); return GPSetup; @@ -123,7 +123,7 @@ int GPCamera::setup() { gp_port_info_list_get_info(infoList, portNum, &info); if (gp_camera_set_port_info(d->camera, info) != GP_OK) { gp_camera_unref(d->camera); - d->camera = 0; + d->camera = nullptr; gp_abilities_list_free (abilList); gp_port_info_list_free (infoList); return GPSetup; @@ -159,19 +159,19 @@ int GPCamera::initialize() { } if (status) { delete status; - status = 0; + status = nullptr; } status = new GPStatus(); // Try and initialize the camera to see if its connected if (gp_camera_init(d->camera, status->context) != GP_OK) { gp_camera_unref(d->camera); - d->camera = 0; + d->camera = nullptr; delete status; - status = 0; + status = nullptr; return GPInit; } delete status; - status = 0; + status = nullptr; d->cameraInitialized = true; return GPSuccess; } @@ -208,17 +208,17 @@ int GPCamera::getSubFolders(const TQString& folder, TQValueList& subFo gp_list_new(&clist); if (status) { delete status; - status = 0; + status = nullptr; } status = new GPStatus(); if (gp_camera_folder_list_folders(d->camera, folder.latin1(), clist, status->context) != GP_OK) { gp_list_unref(clist); delete status; - status = 0; + status = nullptr; return GPError; } delete status; - status = 0; + status = nullptr; int count = gp_list_count(clist); for (int i=0; icamera, folder.latin1(), clist, status->context) != GP_OK) { gp_list_unref(clist); delete status; - status = 0; + status = nullptr; return GPError; } int count = gp_list_count(clist); @@ -271,7 +271,7 @@ int GPCamera::getItemsInfo(const TQString& folder, GPFileItemInfoList& infoList) if (gp_list_get_name(clist, i, &cname) != GP_OK) { gp_list_unref(clist); delete status; - status = 0; + status = nullptr; return GPError; } GPFileItemInfo camFileInfo; @@ -325,7 +325,7 @@ int GPCamera::getItemsInfo(const TQString& folder, GPFileItemInfoList& infoList) } gp_list_unref(clist); delete status; - status = 0; + status = nullptr; return GPSuccess; } @@ -336,17 +336,17 @@ int GPCamera::getThumbnail(const TQString& folder, const TQString& imageName, TQ gp_file_new(&cfile); if (status) { delete status; - status = 0; + status = nullptr; } status = new GPStatus; if (gp_camera_file_get(d->camera, folder.latin1(), imageName.latin1(), GP_FILE_TYPE_PREVIEW, cfile, status->context) != GP_OK) { gp_file_unref(cfile); delete status; - status = 0; + status = nullptr; return GPError; } delete status; - status = 0; + status = nullptr; gp_file_get_data_and_size(cfile, &data, &size); thumbnail.loadFromData((const uchar*) data, (uint) size); gp_file_unref (cfile); @@ -358,17 +358,17 @@ int GPCamera::downloadItem(const TQString& folder, const TQString& itemName, con gp_file_new(&cfile); if (status) { delete status; - status = 0; + status = nullptr; } status = new GPStatus; if (gp_camera_file_get(d->camera, folder.latin1(), itemName.latin1(), GP_FILE_TYPE_NORMAL, cfile, status->context) != GP_OK) { gp_file_unref(cfile); delete status; - status = 0; + status = nullptr; return GPError; } delete status; - status = 0; + status = nullptr; if (gp_file_save(cfile, saveFile.latin1()) != GP_OK) { gp_file_unref(cfile); return GPError; @@ -380,16 +380,16 @@ int GPCamera::downloadItem(const TQString& folder, const TQString& itemName, con int GPCamera::deleteItem(const TQString& folder, const TQString& itemName) { if (status) { delete status; - status = 0; + status = nullptr; } status = new GPStatus; if(gp_camera_file_delete(d->camera, folder.latin1(), itemName.latin1(), status->context) != GP_OK) { delete status; - status = 0; + status = nullptr; return GPError; } delete status; - status = 0; + status = nullptr; return GPSuccess; } @@ -411,16 +411,16 @@ int GPCamera::deleteAllItems(const TQString& folder) { } if (status) { delete status; - status = 0; + status = nullptr; } status = new GPStatus; if (gp_camera_folder_delete_all(d->camera, folder.latin1(), status->context) != GP_OK) { delete status; - status = 0; + status = nullptr; return GPError; } delete status; - status = 0; + status = nullptr; return GPSuccess; } @@ -434,7 +434,7 @@ int GPCamera::uploadItem(const TQString& folder, const TQString& itemName, const gp_file_set_name(cfile, TQFile::encodeName( itemName )); if (status) { delete status; - status = 0; + status = nullptr; } status = new GPStatus; if (gp_camera_folder_put_file(d->camera, TQFile::encodeName( folder ), @@ -444,12 +444,12 @@ int GPCamera::uploadItem(const TQString& folder, const TQString& itemName, const cfile, status->context) != GP_OK) { gp_file_unref(cfile); delete status; - status = 0; + status = nullptr; return GPError; } gp_file_unref(cfile); delete status; - status = 0; + status = nullptr; return GPSuccess; } @@ -457,39 +457,39 @@ void GPCamera::cameraSummary(TQString& summary) { CameraText sum; if (status) { delete status; - status = 0; + status = nullptr; } status = new GPStatus; gp_camera_get_summary(d->camera, &sum, status->context); summary = TQString(sum.text); delete status; - status = 0; + status = nullptr; } void GPCamera::cameraManual(TQString& manual) { CameraText man; if (status) { delete status; - status = 0; + status = nullptr; } status = new GPStatus; gp_camera_get_manual(d->camera, &man, status->context); manual = TQString(man.text); delete status; - status = 0; + status = nullptr; } void GPCamera::cameraAbout(TQString& about) { CameraText abt; if (status) { delete status; - status = 0; + status = nullptr; } status = new GPStatus; gp_camera_get_about(d->camera, &abt, status->context); about = TQString(abt.text); delete status; - status = 0; + status = nullptr; } // Static functions diff --git a/kipi-plugins/kameraklient/gpcontroller.cpp b/kipi-plugins/kameraklient/gpcontroller.cpp index a90cdb9e..90cbdc40 100644 --- a/kipi-plugins/kameraklient/gpcontroller.cpp +++ b/kipi-plugins/kameraklient/gpcontroller.cpp @@ -145,49 +145,49 @@ void GPController::run() { GPCommandGetSubFolders *command = static_cast(cmd); getSubFolders(command->folder()); delete command; - cmd = 0; + cmd = nullptr; break; } case(GPCommand::GetItemsInfo): { GPCommandGetItemsInfo *command = static_cast(cmd); getItemsInfo(command->folder()); delete command; - cmd = 0; + cmd = nullptr; break; } case(GPCommand::GetAllItemsInfo): { GPCommandGetAllItemsInfo *command = static_cast(cmd); getAllItemsInfo(command->folder()); delete command; - cmd = 0; + cmd = nullptr; break; } case(GPCommand::GetThumbnail): { GPCommandGetThumbnail *command = static_cast(cmd); getThumbnail(command->folder(), command->imageName()); delete command; - cmd = 0; + cmd = nullptr; break; } case(GPCommand::DownloadItem): { GPCommandDownloadItem *command = static_cast(cmd); downloadItem(command->folder(), command->itemName(), command->saveFile()); delete command; - cmd = 0; + cmd = nullptr; break; } case(GPCommand::DeleteItem): { GPCommandDeleteItem *command = static_cast(cmd); deleteItem(command->folder(), command->itemName()); delete command; - cmd = 0; + cmd = nullptr; break; } case(GPCommand::UploadItem): { GPCommandUploadItem *command = static_cast(cmd); uploadItem(command->folder(), command->uploadName(), command->localFile()); delete command; - cmd = 0; + cmd = nullptr; break; } case(GPCommand::OpenItem): { @@ -195,7 +195,7 @@ void GPController::run() { openItem(command->folder(), command->itemName(), command->saveFile()); delete command; - cmd = 0; + cmd = nullptr; break; } case(GPCommand::OpenItemWithService): { @@ -205,7 +205,7 @@ void GPController::run() { command->saveFile(), command->serviceName()); delete command; - cmd = 0; + cmd = nullptr; break; } default: diff --git a/kipi-plugins/kameraklient/gpfileitemcontainer.cpp b/kipi-plugins/kameraklient/gpfileitemcontainer.cpp index 9a421a29..f2ba3972 100644 --- a/kipi-plugins/kameraklient/gpfileitemcontainer.cpp +++ b/kipi-plugins/kameraklient/gpfileitemcontainer.cpp @@ -196,13 +196,13 @@ CameraIconItem* GPFileItemContainer::findItem(const TQString& folder, const TQSt GPFolder *folderItem = folderDict_.find(folder); if (!folderItem) { kdWarning() << "GPFileItemContainer: " << "Couldn't find Folder in Dict: " << folder << endl; - return 0; + return nullptr; } GPFileDict* fileDict = folderItem->fileDict; GPFileItemInfo* fileInfo = fileDict->find(name); if (!fileInfo) { kdWarning() << "GPFileItemContainer: " << "Couldn't File Item to Delete in Dict: " << name << endl; - return 0; + return nullptr; } return (CameraIconItem*) fileInfo->viewItem; } @@ -233,7 +233,7 @@ void GPFileItemContainer::slotIconViewCleared() { GPFileDictIterator iter(*(folderItem->fileDict)); for (; iter.current(); ++iter) { GPFileItemInfo *fileInfo = iter.current(); - fileInfo->viewItem = 0; + fileInfo->viewItem = nullptr; } } } diff --git a/kipi-plugins/kameraklient/gpfileitemcontainer.h b/kipi-plugins/kameraklient/gpfileitemcontainer.h index 8bfafafc..1f1d0762 100644 --- a/kipi-plugins/kameraklient/gpfileitemcontainer.h +++ b/kipi-plugins/kameraklient/gpfileitemcontainer.h @@ -68,7 +68,7 @@ private: class GPFolder { public: GPFolder() { - viewItem = 0; + viewItem = nullptr; fileDict = new GPFileDict(307); fileDict->setAutoDelete(true); } diff --git a/kipi-plugins/kameraklient/gpfileiteminfo.cpp b/kipi-plugins/kameraklient/gpfileiteminfo.cpp index c0d6617d..85609aaa 100644 --- a/kipi-plugins/kameraklient/gpfileiteminfo.cpp +++ b/kipi-plugins/kameraklient/gpfileiteminfo.cpp @@ -51,7 +51,7 @@ GPFileItemInfo::GPFileItemInfo() { audioSize = -1; audioDownloaded = -1; // ---------------------------------------------------------- - viewItem = 0; + viewItem = nullptr; } GPFileItemInfo::~GPFileItemInfo() { @@ -83,7 +83,7 @@ GPFileItemInfo::GPFileItemInfo(const GPFileItemInfo& info) { audioSize = info.audioSize; audioDownloaded = info.audioDownloaded; // ---------------------------------------------------------- - viewItem = 0; + viewItem = nullptr; } GPFileItemInfo& GPFileItemInfo::operator=(const GPFileItemInfo& info) { @@ -113,7 +113,7 @@ GPFileItemInfo& GPFileItemInfo::operator=(const GPFileItemInfo& info) { audioSize = info.audioSize; audioDownloaded = info.audioDownloaded; // ---------------------------------------------------------- - viewItem = 0; + viewItem = nullptr; } return *this; } diff --git a/kipi-plugins/kameraklient/gpfileiteminfodlg.cpp b/kipi-plugins/kameraklient/gpfileiteminfodlg.cpp index fa62b299..e6478d1a 100644 --- a/kipi-plugins/kameraklient/gpfileiteminfodlg.cpp +++ b/kipi-plugins/kameraklient/gpfileiteminfodlg.cpp @@ -39,7 +39,7 @@ namespace KIPIKameraKlientPlugin GPFileItemInfoDlg::GPFileItemInfoDlg(const GPFileItemInfo& info, TQPixmap *pixmap ) - : KDialogBase(0L, "GPFileItemInfoDlg", true, + : KDialogBase(nullptr, "GPFileItemInfoDlg", true, info.name, Ok, Ok, true) { @@ -83,7 +83,7 @@ GPFileItemInfoDlg::GPFileItemInfoDlg(const GPFileItemInfo& info, // ---------------------------------------------------- - TQLabel *l = 0; + TQLabel *l = nullptr; int currRow = 2; TQString value; diff --git a/kipi-plugins/kameraklient/gpfileiteminfodlg.h b/kipi-plugins/kameraklient/gpfileiteminfodlg.h index 7e85344f..38af76be 100644 --- a/kipi-plugins/kameraklient/gpfileiteminfodlg.h +++ b/kipi-plugins/kameraklient/gpfileiteminfodlg.h @@ -36,7 +36,7 @@ class GPFileItemInfoDlg : public KDialogBase public: GPFileItemInfoDlg(const GPFileItemInfo& info, - TQPixmap *pixmap=0); + TQPixmap *pixmap=nullptr); ~GPFileItemInfoDlg(); }; diff --git a/kipi-plugins/kameraklient/gpmessages.cpp b/kipi-plugins/kameraklient/gpmessages.cpp index 39003fb5..74e201d2 100644 --- a/kipi-plugins/kameraklient/gpmessages.cpp +++ b/kipi-plugins/kameraklient/gpmessages.cpp @@ -21,7 +21,7 @@ namespace KIPIKameraKlientPlugin { -GPMessages* GPMessages::gpMessages=0; +GPMessages* GPMessages::gpMessages=nullptr; GPMessages* GPMessages::gpMessagesWrapper() { if (!gpMessages) { @@ -33,7 +33,7 @@ GPMessages* GPMessages::gpMessagesWrapper() { void GPMessages::deleteMessagesWrapper() { if (gpMessages) { delete gpMessages; - gpMessages=0; + gpMessages=nullptr; } } diff --git a/kipi-plugins/kameraklient/gpstatus.cpp b/kipi-plugins/kameraklient/gpstatus.cpp index 0beb39cd..87a7e71f 100644 --- a/kipi-plugins/kameraklient/gpstatus.cpp +++ b/kipi-plugins/kameraklient/gpstatus.cpp @@ -32,10 +32,10 @@ bool GPStatus::cancel = false; GPStatus::GPStatus() : TQObject() { context = gp_context_new(); cancel = false; - gp_context_set_cancel_func(context, cancel_func, 0); - gp_context_set_error_func(context, error_func, 0); - gp_context_set_status_func(context, status_func, 0); - gp_context_set_progress_funcs(context, progress_start_func, progress_update_func, progress_stop_func, 0); + gp_context_set_cancel_func(context, cancel_func, nullptr); + gp_context_set_error_func(context, error_func, nullptr); + gp_context_set_status_func(context, status_func, nullptr); + gp_context_set_progress_funcs(context, progress_start_func, progress_update_func, progress_stop_func, nullptr); } GPStatus::~GPStatus() { diff --git a/kipi-plugins/kameraklient/savefiledialog.h b/kipi-plugins/kameraklient/savefiledialog.h index 9dc897bd..c51aa21b 100644 --- a/kipi-plugins/kameraklient/savefiledialog.h +++ b/kipi-plugins/kameraklient/savefiledialog.h @@ -32,7 +32,7 @@ TQ_OBJECT public: enum Operation { Rename, Skip, SkipAll, Overwrite, OverwriteAll, None }; - SavefileDialog(const TQString& file, TQWidget *parent=0, const char* name=0, bool modal=true); + SavefileDialog(const TQString& file, TQWidget *parent=nullptr, const char* name=nullptr, bool modal=true); ~SavefileDialog(); Operation saveFileOperation(); TQString renameFile(); diff --git a/kipi-plugins/kameraklient/setupcamera.cpp b/kipi-plugins/kameraklient/setupcamera.cpp index 980e5a92..88a4fb93 100644 --- a/kipi-plugins/kameraklient/setupcamera.cpp +++ b/kipi-plugins/kameraklient/setupcamera.cpp @@ -63,7 +63,7 @@ SetupCamera::SetupCamera(TQWidget* parent, const char* name) // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("KameraKlient"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("An Digital camera interface Kipi plugin"), "(c) 2003-2004, Renchi Raju\n" diff --git a/kipi-plugins/kameraklient/setupcamera.h b/kipi-plugins/kameraklient/setupcamera.h index 61d3eb14..db8c05a3 100644 --- a/kipi-plugins/kameraklient/setupcamera.h +++ b/kipi-plugins/kameraklient/setupcamera.h @@ -44,7 +44,7 @@ class SetupCamera : public KDialogBase public: - SetupCamera(TQWidget* parent = 0, const char* name = 0); + SetupCamera(TQWidget* parent = nullptr, const char* name = nullptr); ~SetupCamera(); void applySettings(); diff --git a/kipi-plugins/kameraklient/thumbitem.cpp b/kipi-plugins/kameraklient/thumbitem.cpp index 50d3b97b..699066e2 100644 --- a/kipi-plugins/kameraklient/thumbitem.cpp +++ b/kipi-plugins/kameraklient/thumbitem.cpp @@ -90,9 +90,9 @@ class ThumbItemPrivate { ThumbItem::ThumbItem(ThumbView* parent, const TQString& text, const TQPixmap& pixmap) { view = parent; - next = 0; - prev = 0; - renameBox = 0; + next = nullptr; + prev = nullptr; + renameBox = nullptr; d = new ThumbItemPrivate; d->text = text; @@ -281,7 +281,7 @@ bool ThumbItem::isSelected() { void ThumbItem::setPixmap(const TQPixmap& pixmap) { if (d->pixmap) { delete d->pixmap; - d->pixmap = 0; + d->pixmap = nullptr; } d->pixmap = new TQPixmap(pixmap); @@ -329,7 +329,7 @@ ThumbView* ThumbItem::iconView() { void ThumbItem::rename() { if (renameBox) { delete renameBox; - renameBox = 0; + renameBox = nullptr; } renameBox = new ThumbItemLineEdit(d->text, view->viewport(), this); TQRect tr(textRect(false)); @@ -350,12 +350,12 @@ void ThumbItem::renameItem() { bool resetFocus = view->viewport()->focusProxy() == renameBox; delete renameBox; - renameBox = 0; + renameBox = nullptr; if (resetFocus) { view->viewport()->setFocusProxy(view); view->setFocus(); } - view->renamingItem = 0; + view->renamingItem = nullptr; view->emitRenamed(this); } @@ -364,12 +364,12 @@ void ThumbItem::cancelRenameItem() { bool resetFocus = view->viewport()->focusProxy() == renameBox; delete renameBox; - renameBox = 0; + renameBox = nullptr; if (resetFocus) { view->viewport()->setFocusProxy(view); view->setFocus(); } - view->renamingItem = 0; + view->renamingItem = nullptr; } int ThumbItem::compare(ThumbItem *item) { diff --git a/kipi-plugins/kameraklient/thumbview.cpp b/kipi-plugins/kameraklient/thumbview.cpp index 5ef93faf..fd76314f 100644 --- a/kipi-plugins/kameraklient/thumbview.cpp +++ b/kipi-plugins/kameraklient/thumbview.cpp @@ -97,20 +97,20 @@ ThumbView::ThumbView(TQWidget* parent, const char* name, WFlags fl) : TQScrollVi viewport()->setBackgroundMode(TQt::NoBackground); viewport()->setFocusProxy(this); viewport()->setFocusPolicy(TQWidget::TabFocus); - renamingItem = 0; + renamingItem = nullptr; d = new ThumbViewPrivate; - d->firstItem = 0; - d->lastItem = 0; + d->firstItem = nullptr; + d->lastItem = nullptr; d->spacing = 5; d->count = 0; d->clearing = false; d->pressedMoved = false; - d->rubber = 0; - d->firstContainer = 0; - d->lastContainer = 0; + d->rubber = nullptr; + d->firstContainer = nullptr; + d->lastContainer = nullptr; d->selectedItems.setAutoDelete(false); d->updateTimer = new TQTimer(this); - d->startDragItem = 0; + d->startDragItem = nullptr; connect(d->updateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdate())); } @@ -125,7 +125,7 @@ ThumbView::~ThumbView() { void ThumbView::clear(bool update) { d->clearing = true; - renamingItem = 0; + renamingItem = nullptr; deleteContainers(); d->selectedItems.clear(); emit signalSelectionChanged(); @@ -135,8 +135,8 @@ void ThumbView::clear(bool update) { delete item; item = tmp; } - d->firstItem = 0; - d->lastItem = 0; + d->firstItem = nullptr; + d->lastItem = nullptr; viewport()->setUpdatesEnabled(false); resizeContents(0, 0); viewport()->setUpdatesEnabled(true); @@ -184,12 +184,12 @@ void ThumbView::insertItem(ThumbItem *item) { if (!d->firstItem) { d->firstItem = item; d->lastItem = item; - item->prev = 0; - item->next = 0; + item->prev = nullptr; + item->next = nullptr; } else { d->lastItem->next = item; item->prev = d->lastItem; - item->next = 0; + item->next = nullptr; d->lastItem = item; } d->count++; @@ -213,16 +213,16 @@ void ThumbView::takeItem(ThumbItem *item) { if (item == d->firstItem) { d->firstItem = d->firstItem->next; if (d->firstItem) { - d->firstItem->prev = 0; + d->firstItem->prev = nullptr; } else { - d->firstItem = d->lastItem = 0; + d->firstItem = d->lastItem = nullptr; } } else if (item == d->lastItem) { d->lastItem = d->lastItem->prev; if ( d->lastItem ) { - d->lastItem->next = 0; + d->lastItem->next = nullptr; } else { - d->firstItem = d->lastItem = 0; + d->firstItem = d->lastItem = nullptr; } } else { ThumbItem *i = item; @@ -255,8 +255,8 @@ void ThumbView::sort() { items[ i++ ].item = item; } qsort( items, count(), sizeof( ThumbViewPrivate::SortableItem ), cmpItems ); - ThumbItem *prev = 0; - item = 0; + ThumbItem *prev = nullptr; + item = nullptr; for (i = 0; i < (int)count(); ++i) { item = items[ i ].item; if ( item ) { @@ -264,7 +264,7 @@ void ThumbView::sort() { if (item->prev) { item->prev->next = item; } - item->next = 0; + item->next = nullptr; } if (i == 0) { d->firstItem = item; @@ -344,7 +344,7 @@ void ThumbView::rearrangeItems(bool update) { } ThumbItem* ThumbView::makeRow(ThumbItem *begin, int &y, bool &changed) { - ThumbItem *end = 0; + ThumbItem *end = nullptr; changed = false; // first calculate the row height int h = 0; @@ -411,7 +411,7 @@ void ThumbView::contentsMousePressEvent(TQMouseEvent *e) { drawRubber(&p); p.end(); delete d->rubber; - d->rubber = 0; + d->rubber = nullptr; } d->dragStartPos = e->pos(); ThumbItem *item = findItem(e->pos()); @@ -420,7 +420,7 @@ void ThumbView::contentsMousePressEvent(TQMouseEvent *e) { item->setSelected(!item->isSelected(), false); } else if (e->state() & TQt::ShiftButton) { // different selection mode than the Trolls - ThumbItem *lastSelectedItem = 0; + ThumbItem *lastSelectedItem = nullptr; bool bwdSelection = false; // first go backwards for (ThumbItem *it = item->prev; it; it = it->prev) { @@ -474,7 +474,7 @@ void ThumbView::contentsMousePressEvent(TQMouseEvent *e) { // If not item then initiate rubber if ( d->rubber ) { delete d->rubber; - d->rubber = 0; + d->rubber = nullptr; } d->rubber = new TQRect( e->x(), e->y(), 0, 0 ); TQPainter p; @@ -563,7 +563,7 @@ void ThumbView::contentsMouseReleaseEvent(TQMouseEvent *e) { if (!e) { return; } - d->startDragItem = 0; + d->startDragItem = nullptr; if (d->rubber) { TQPainter p; p.begin( viewport() ); @@ -573,7 +573,7 @@ void ThumbView::contentsMouseReleaseEvent(TQMouseEvent *e) { drawRubber( &p ); p.end(); delete d->rubber; - d->rubber = 0; + d->rubber = nullptr; } if (e->button() == TQt::RightButton) { ThumbItem *item = findItem(e->pos()); @@ -645,10 +645,10 @@ void ThumbView::appendContainer() { TQSize s; s = TQSize(INT_MAX - 1, RECT_EXTENSION ); if (!d->firstContainer) { - d->firstContainer = new ThumbViewPrivate::ItemContainer(0, 0, TQRect(TQPoint(0, 0), s)); + d->firstContainer = new ThumbViewPrivate::ItemContainer(nullptr, nullptr, TQRect(TQPoint(0, 0), s)); d->lastContainer = d->firstContainer; } else { - d->lastContainer = new ThumbViewPrivate::ItemContainer(d->lastContainer, 0, TQRect(d->lastContainer->rect.bottomLeft(), s)); + d->lastContainer = new ThumbViewPrivate::ItemContainer(d->lastContainer, nullptr, TQRect(d->lastContainer->rect.bottomLeft(), s)); } } @@ -659,7 +659,7 @@ void ThumbView::deleteContainers() { delete c; c = tmpc; } - d->firstContainer = d->lastContainer = 0; + d->firstContainer = d->lastContainer = nullptr; } void ThumbView::updateItemContainer(ThumbItem *item) { @@ -707,7 +707,7 @@ void ThumbView::updateItemContainer(ThumbItem *item) { ThumbItem* ThumbView::findItem(const TQPoint& pos) { if (!d->firstItem) { - return 0; + return nullptr; } ThumbViewPrivate::ItemContainer *c = d->lastContainer; for (; c; c = c->prev) { @@ -720,15 +720,15 @@ ThumbItem* ThumbView::findItem(const TQPoint& pos) { } } } - return 0; + return nullptr; } ThumbItem* ThumbView::findItem(const TQString& text) { if (!d->firstItem) { - return 0; + return nullptr; } bool found = false; - ThumbItem *item = 0; + ThumbItem *item = nullptr; for (item = d->firstItem; item; item = item->next) { if (item->text() == text) { found = true; @@ -738,7 +738,7 @@ ThumbItem* ThumbView::findItem(const TQString& text) { if (found) { return item; } else { - return 0; + return nullptr; } } @@ -821,7 +821,7 @@ void ThumbView::startDrag() { return; } drag->setPixmap(*d->startDragItem->pixmap()); - d->startDragItem = 0; + d->startDragItem = nullptr; drag->dragCopy(); } @@ -884,7 +884,7 @@ void ThumbView::keyPressEvent(TQKeyEvent *e) { case Key_Up: { int x = currItem->x() + currItem->width()/2; int y = currItem->y() - d->spacing*2; - ThumbItem *item = 0; + ThumbItem *item = nullptr; while (!item && y > 0) { item = findItem(TQPoint(x,y)); y -= d->spacing * 2; @@ -899,7 +899,7 @@ void ThumbView::keyPressEvent(TQKeyEvent *e) { case Key_Down: { int x = currItem->x() + currItem->width()/2; int y = currItem->y() + currItem->height() + d->spacing * 2; - ThumbItem *item = 0; + ThumbItem *item = nullptr; while (!item && y < contentsHeight()) { item = findItem(TQPoint(x,y)); y += d->spacing * 2; @@ -961,7 +961,7 @@ void ThumbView::ensureItemVisible(ThumbItem *item) { ThumbItem* ThumbView::findFirstVisibleItem(const TQRect &r ) const { ThumbViewPrivate::ItemContainer *c = d->firstContainer; - ThumbItem *i = 0; + ThumbItem *i = nullptr; bool alreadyIntersected = false; for ( ; c; c = c->next ) { if ( c->rect.intersects( r ) ) { @@ -993,7 +993,7 @@ ThumbItem* ThumbView::findFirstVisibleItem(const TQRect &r ) const { ThumbItem* ThumbView::findLastVisibleItem(const TQRect &r ) const { ThumbViewPrivate::ItemContainer *c = d->firstContainer; - ThumbItem *i = 0; + ThumbItem *i = nullptr; bool alreadyIntersected = false; for ( ; c; c = c->next ) { if ( c->rect.intersects( r ) ) { diff --git a/kipi-plugins/kameraklient/thumbview.h b/kipi-plugins/kameraklient/thumbview.h index bf295ed2..be9077a5 100644 --- a/kipi-plugins/kameraklient/thumbview.h +++ b/kipi-plugins/kameraklient/thumbview.h @@ -39,7 +39,7 @@ class ThumbView : public TQScrollView { public: - ThumbView(TQWidget* parent=0, const char* name=0, + ThumbView(TQWidget* parent=nullptr, const char* name=nullptr, WFlags fl=0); ~ThumbView(); diff --git a/kipi-plugins/metadataedit/commenteditdialog.cpp b/kipi-plugins/metadataedit/commenteditdialog.cpp index f2c9a293..f4b7adf8 100644 --- a/kipi-plugins/metadataedit/commenteditdialog.cpp +++ b/kipi-plugins/metadataedit/commenteditdialog.cpp @@ -57,11 +57,11 @@ public: CommentEditDialogDialogPrivate() { - userCommentEdit = 0; - about = 0; - syncJFIFCommentCheck = 0; - syncEXIFCommentCheck = 0; - syncIPTCCaptionCheck = 0; + userCommentEdit = nullptr; + about = nullptr; + syncJFIFCommentCheck = nullptr; + syncEXIFCommentCheck = nullptr; + syncIPTCCaptionCheck = nullptr; } TQCheckBox *syncJFIFCommentCheck; @@ -76,7 +76,7 @@ public: CommentEditDialog::CommentEditDialog(TQWidget* parent) : KDialogBase(Plain, i18n("Edit Image Caption"), Help|Ok|Cancel, Ok, - parent, 0, true, true) + parent, nullptr, true, true) { d = new CommentEditDialogDialogPrivate; @@ -84,7 +84,7 @@ CommentEditDialog::CommentEditDialog(TQWidget* parent) // About data and help button. d->about = new KIPIPlugins::KPAboutData(I18N_NOOP("Edit Metadata"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Plugin to edit images' metadata"), "(c) 2006-2008, Gilles Caulier"); diff --git a/kipi-plugins/metadataedit/commentremovedialog.cpp b/kipi-plugins/metadataedit/commentremovedialog.cpp index 63db7bd8..1f479c60 100644 --- a/kipi-plugins/metadataedit/commentremovedialog.cpp +++ b/kipi-plugins/metadataedit/commentremovedialog.cpp @@ -56,11 +56,11 @@ public: CommentRemoveDialogDialogPrivate() { - about = 0; - removeHOSTCommentCheck = 0; - removeJFIFCommentCheck = 0; - removeEXIFCommentCheck = 0; - removeIPTCCaptionCheck = 0; + about = nullptr; + removeHOSTCommentCheck = nullptr; + removeJFIFCommentCheck = nullptr; + removeEXIFCommentCheck = nullptr; + removeIPTCCaptionCheck = nullptr; } TQCheckBox *removeHOSTCommentCheck; @@ -74,7 +74,7 @@ public: CommentRemoveDialog::CommentRemoveDialog(TQWidget* parent) : KDialogBase(Plain, i18n("Remove Image Captions"), Help|Ok|Cancel, Ok, - parent, 0, true, true) + parent, nullptr, true, true) { d = new CommentRemoveDialogDialogPrivate; @@ -82,7 +82,7 @@ CommentRemoveDialog::CommentRemoveDialog(TQWidget* parent) // About data and help button. d->about = new KIPIPlugins::KPAboutData(I18N_NOOP("Edit Metadata"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Plugin to edit pictures metadata"), "(c) 2006-2008, Gilles Caulier"); diff --git a/kipi-plugins/metadataedit/exifadjust.cpp b/kipi-plugins/metadataedit/exifadjust.cpp index 66d27892..03daa88a 100644 --- a/kipi-plugins/metadataedit/exifadjust.cpp +++ b/kipi-plugins/metadataedit/exifadjust.cpp @@ -56,18 +56,18 @@ public: EXIFAdjustPriv() { - brightnessCheck = 0; - gainControlCheck = 0; - contrastCheck = 0; - saturationCheck = 0; - sharpnessCheck = 0; - customRenderedCheck = 0; - brightnessEdit = 0; - gainControlCB = 0; - contrastCB = 0; - saturationCB = 0; - sharpnessCB = 0; - customRenderedCB = 0; + brightnessCheck = nullptr; + gainControlCheck = nullptr; + contrastCheck = nullptr; + saturationCheck = nullptr; + sharpnessCheck = nullptr; + customRenderedCheck = nullptr; + brightnessEdit = nullptr; + gainControlCB = nullptr; + contrastCB = nullptr; + saturationCB = nullptr; + sharpnessCB = nullptr; + customRenderedCB = nullptr; } TQCheckBox *brightnessCheck; diff --git a/kipi-plugins/metadataedit/exifcaption.cpp b/kipi-plugins/metadataedit/exifcaption.cpp index db9237ba..9a37150c 100644 --- a/kipi-plugins/metadataedit/exifcaption.cpp +++ b/kipi-plugins/metadataedit/exifcaption.cpp @@ -59,19 +59,19 @@ public: EXIFCaptionPriv() { - documentNameEdit = 0; - imageDescEdit = 0; - artistEdit = 0; - copyrightEdit = 0; - userCommentEdit = 0; - userCommentCheck = 0; - documentNameCheck = 0; - imageDescCheck = 0; - artistCheck = 0; - copyrightCheck = 0; - syncJFIFCommentCheck = 0; - syncHOSTCommentCheck = 0; - syncIPTCCaptionCheck = 0; + documentNameEdit = nullptr; + imageDescEdit = nullptr; + artistEdit = nullptr; + copyrightEdit = nullptr; + userCommentEdit = nullptr; + userCommentCheck = nullptr; + documentNameCheck = nullptr; + imageDescCheck = nullptr; + artistCheck = nullptr; + copyrightCheck = nullptr; + syncJFIFCommentCheck = nullptr; + syncHOSTCommentCheck = nullptr; + syncIPTCCaptionCheck = nullptr; } TQCheckBox *documentNameCheck; diff --git a/kipi-plugins/metadataedit/exifdatetime.cpp b/kipi-plugins/metadataedit/exifdatetime.cpp index 010ef1b8..3d2b7300 100644 --- a/kipi-plugins/metadataedit/exifdatetime.cpp +++ b/kipi-plugins/metadataedit/exifdatetime.cpp @@ -56,21 +56,21 @@ public: EXIFDateTimePriv() { - dateCreatedSel = 0; - dateOriginalSel = 0; - dateDigitalizedSel = 0; - dateCreatedSubSecEdit = 0; - dateOriginalSubSecEdit = 0; - dateDigitalizedSubSecEdit = 0; - - dateCreatedCheck = 0; - dateOriginalCheck = 0; - dateDigitalizedCheck = 0; - dateCreatedSubSecCheck = 0; - dateOriginalSubSecCheck = 0; - dateDigitalizedSubSecCheck = 0; - syncHOSTDateCheck = 0; - syncIPTCDateCheck = 0; + dateCreatedSel = nullptr; + dateOriginalSel = nullptr; + dateDigitalizedSel = nullptr; + dateCreatedSubSecEdit = nullptr; + dateOriginalSubSecEdit = nullptr; + dateDigitalizedSubSecEdit = nullptr; + + dateCreatedCheck = nullptr; + dateOriginalCheck = nullptr; + dateDigitalizedCheck = nullptr; + dateCreatedSubSecCheck = nullptr; + dateOriginalSubSecCheck = nullptr; + dateDigitalizedSubSecCheck = nullptr; + syncHOSTDateCheck = nullptr; + syncIPTCDateCheck = nullptr; } TQCheckBox *dateCreatedCheck; diff --git a/kipi-plugins/metadataedit/exifdevice.cpp b/kipi-plugins/metadataedit/exifdevice.cpp index 56aeb209..18fd46e5 100644 --- a/kipi-plugins/metadataedit/exifdevice.cpp +++ b/kipi-plugins/metadataedit/exifdevice.cpp @@ -60,30 +60,30 @@ public: EXIFDevicePriv() { - makeCheck = 0; - modelCheck = 0; - deviceTypeCheck = 0; - exposureTimeCheck = 0; - exposureProgramCheck = 0; - exposureModeCheck = 0; - exposureBiasCheck = 0; - ISOSpeedCheck = 0; - meteringModeCheck = 0; - sensingMethodCheck = 0; - sceneTypeCheck = 0; - subjectDistanceTypeCheck = 0; - exposureProgramCB = 0; - exposureModeCB = 0; - ISOSpeedCB = 0; - meteringModeCB = 0; - sensingMethodCB = 0; - sceneTypeCB = 0; - subjectDistanceTypeCB = 0; - exposureTimeNumEdit = 0; - exposureTimeDenEdit = 0; - exposureBiasEdit = 0; - makeEdit = 0; - modelEdit = 0; + makeCheck = nullptr; + modelCheck = nullptr; + deviceTypeCheck = nullptr; + exposureTimeCheck = nullptr; + exposureProgramCheck = nullptr; + exposureModeCheck = nullptr; + exposureBiasCheck = nullptr; + ISOSpeedCheck = nullptr; + meteringModeCheck = nullptr; + sensingMethodCheck = nullptr; + sceneTypeCheck = nullptr; + subjectDistanceTypeCheck = nullptr; + exposureProgramCB = nullptr; + exposureModeCB = nullptr; + ISOSpeedCB = nullptr; + meteringModeCB = nullptr; + sensingMethodCB = nullptr; + sceneTypeCB = nullptr; + subjectDistanceTypeCB = nullptr; + exposureTimeNumEdit = nullptr; + exposureTimeDenEdit = nullptr; + exposureBiasEdit = nullptr; + makeEdit = nullptr; + modelEdit = nullptr; } TQCheckBox *makeCheck; diff --git a/kipi-plugins/metadataedit/exifeditdialog.cpp b/kipi-plugins/metadataedit/exifeditdialog.cpp index 596f49c0..ba90f8c3 100644 --- a/kipi-plugins/metadataedit/exifeditdialog.cpp +++ b/kipi-plugins/metadataedit/exifeditdialog.cpp @@ -72,23 +72,23 @@ public: { modified = false; isReadOnly = false; - interface = 0; - - about = 0; - - page_caption = 0; - page_datetime = 0; - page_lens = 0; - page_device = 0; - page_light = 0; - page_adjust = 0; - - captionPage = 0; - datetimePage = 0; - lensPage = 0; - devicePage = 0; - lightPage = 0; - adjustPage = 0; + interface = nullptr; + + about = nullptr; + + page_caption = nullptr; + page_datetime = nullptr; + page_lens = nullptr; + page_device = nullptr; + page_light = nullptr; + page_adjust = nullptr; + + captionPage = nullptr; + datetimePage = nullptr; + lensPage = nullptr; + devicePage = nullptr; + lightPage = nullptr; + adjustPage = nullptr; } bool modified; @@ -124,7 +124,7 @@ EXIFEditDialog::EXIFEditDialog(TQWidget* parent, KURL::List urls, KIPI::Interfac : KDialogBase(IconList, TQString(), urls.count() > 1 ? Help|User1|User2|Stretch|Ok|Apply|Close : Help|Stretch|Ok|Apply|Close, - Ok, parent, 0, true, true, + Ok, parent, nullptr, true, true, KStdGuiItem::guiItem(KStdGuiItem::Forward), KStdGuiItem::guiItem(KStdGuiItem::Back) ) { @@ -163,7 +163,7 @@ EXIFEditDialog::EXIFEditDialog(TQWidget* parent, KURL::List urls, KIPI::Interfac // About data and help button. d->about = new KIPIPlugins::KPAboutData(I18N_NOOP("Edit Metadata"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Plugin to edit pictures metadata"), "(c) 2006-2008, Gilles Caulier"); diff --git a/kipi-plugins/metadataedit/exiflens.cpp b/kipi-plugins/metadataedit/exiflens.cpp index fdb6180b..beed3819 100644 --- a/kipi-plugins/metadataedit/exiflens.cpp +++ b/kipi-plugins/metadataedit/exiflens.cpp @@ -56,16 +56,16 @@ public: EXIFLensPriv() { - apertureCheck = 0; - maxApertureCheck = 0; - focalLength35mmCheck = 0; - focalLengthCheck = 0; - digitalZoomRatioCheck = 0; - apertureCB = 0; - maxApertureCB = 0; - focalLength35mmEdit = 0; - focalLengthEdit = 0; - digitalZoomRatioEdit = 0; + apertureCheck = nullptr; + maxApertureCheck = nullptr; + focalLength35mmCheck = nullptr; + focalLengthCheck = nullptr; + digitalZoomRatioCheck = nullptr; + apertureCB = nullptr; + maxApertureCB = nullptr; + focalLength35mmEdit = nullptr; + focalLengthEdit = nullptr; + digitalZoomRatioEdit = nullptr; apertureValues.append("f/1.0"); apertureValues.append("f/1.1"); diff --git a/kipi-plugins/metadataedit/exiflight.cpp b/kipi-plugins/metadataedit/exiflight.cpp index 65545d68..94d261cf 100644 --- a/kipi-plugins/metadataedit/exiflight.cpp +++ b/kipi-plugins/metadataedit/exiflight.cpp @@ -73,14 +73,14 @@ public: EXIFLightPriv() { - lightSourceCheck = 0; - flashModeCheck = 0; - flashEnergyCheck = 0; - whiteBalanceCheck = 0; - lightSourceCB = 0; - flashEnergyEdit = 0; - flashModeCB = 0; - whiteBalanceCB = 0; + lightSourceCheck = nullptr; + flashModeCheck = nullptr; + flashEnergyCheck = nullptr; + whiteBalanceCheck = nullptr; + lightSourceCB = nullptr; + flashEnergyEdit = nullptr; + flashModeCB = nullptr; + whiteBalanceCB = nullptr; flashModeMap.insert(0, FlashMode( 0x00, i18n("No flash") )); flashModeMap.insert(1, FlashMode( 0x01, i18n("Fired") )); diff --git a/kipi-plugins/metadataedit/iptccaption.cpp b/kipi-plugins/metadataedit/iptccaption.cpp index 8f8d76aa..a14cd18d 100644 --- a/kipi-plugins/metadataedit/iptccaption.cpp +++ b/kipi-plugins/metadataedit/iptccaption.cpp @@ -59,17 +59,17 @@ public: IPTCCaptionPriv() { - captionEdit = 0; - writerEdit = 0; - headlineEdit = 0; - specialInstructionEdit = 0; - captionCheck = 0; - specialInstructionCheck = 0; - writerCheck = 0; - headlineCheck = 0; - syncJFIFCommentCheck = 0; - syncHOSTCommentCheck = 0; - syncEXIFCommentCheck = 0; + captionEdit = nullptr; + writerEdit = nullptr; + headlineEdit = nullptr; + specialInstructionEdit = nullptr; + captionCheck = nullptr; + specialInstructionCheck = nullptr; + writerCheck = nullptr; + headlineCheck = nullptr; + syncJFIFCommentCheck = nullptr; + syncHOSTCommentCheck = nullptr; + syncEXIFCommentCheck = nullptr; } TQCheckBox *captionCheck; diff --git a/kipi-plugins/metadataedit/iptccategories.cpp b/kipi-plugins/metadataedit/iptccategories.cpp index dfb9a5bf..8ad229c0 100644 --- a/kipi-plugins/metadataedit/iptccategories.cpp +++ b/kipi-plugins/metadataedit/iptccategories.cpp @@ -56,13 +56,13 @@ public: IPTCCategoriesPriv() { - addSubCategoryButton = 0; - delSubCategoryButton = 0; - subCategoriesBox = 0; - subCategoriesCheck = 0; - categoryCheck = 0; - categoryEdit = 0; - subCategoryEdit = 0; + addSubCategoryButton = nullptr; + delSubCategoryButton = nullptr; + subCategoriesBox = nullptr; + subCategoriesCheck = nullptr; + categoryCheck = nullptr; + categoryEdit = nullptr; + subCategoryEdit = nullptr; } TQStringList oldSubCategories; diff --git a/kipi-plugins/metadataedit/iptccredits.cpp b/kipi-plugins/metadataedit/iptccredits.cpp index 75d53a1b..0e8c5f29 100644 --- a/kipi-plugins/metadataedit/iptccredits.cpp +++ b/kipi-plugins/metadataedit/iptccredits.cpp @@ -55,18 +55,18 @@ public: IPTCCreditsPriv() { - copyrightEdit = 0; - bylineEdit = 0; - bylineTitleEdit = 0; - creditEdit = 0; - sourceEdit = 0; - contactEdit = 0; - copyrightCheck = 0; - bylineCheck = 0; - bylineTitleCheck = 0; - creditCheck = 0; - sourceCheck = 0; - contactCheck = 0; + copyrightEdit = nullptr; + bylineEdit = nullptr; + bylineTitleEdit = nullptr; + creditEdit = nullptr; + sourceEdit = nullptr; + contactEdit = nullptr; + copyrightCheck = nullptr; + bylineCheck = nullptr; + bylineTitleCheck = nullptr; + creditCheck = nullptr; + sourceCheck = nullptr; + contactCheck = nullptr; } TQCheckBox *copyrightCheck; diff --git a/kipi-plugins/metadataedit/iptcdatetime.cpp b/kipi-plugins/metadataedit/iptcdatetime.cpp index e63c74db..74c5e3e3 100644 --- a/kipi-plugins/metadataedit/iptcdatetime.cpp +++ b/kipi-plugins/metadataedit/iptcdatetime.cpp @@ -57,25 +57,25 @@ public: IPTCDateTimePriv() { - dateCreatedSel = 0; - dateReleasedSel = 0; - dateExpiredSel = 0; - dateDigitalizedSel = 0; - timeCreatedSel = 0; - timeReleasedSel = 0; - timeExpiredSel = 0; - timeDigitalizedSel = 0; - - dateCreatedCheck = 0; - dateReleasedCheck = 0; - dateExpiredCheck = 0; - dateDigitalizedCheck = 0; - timeCreatedCheck = 0; - timeReleasedCheck = 0; - timeExpiredCheck = 0; - timeDigitalizedCheck = 0; - syncHOSTDateCheck = 0; - syncEXIFDateCheck = 0; + dateCreatedSel = nullptr; + dateReleasedSel = nullptr; + dateExpiredSel = nullptr; + dateDigitalizedSel = nullptr; + timeCreatedSel = nullptr; + timeReleasedSel = nullptr; + timeExpiredSel = nullptr; + timeDigitalizedSel = nullptr; + + dateCreatedCheck = nullptr; + dateReleasedCheck = nullptr; + dateExpiredCheck = nullptr; + dateDigitalizedCheck = nullptr; + timeCreatedCheck = nullptr; + timeReleasedCheck = nullptr; + timeExpiredCheck = nullptr; + timeDigitalizedCheck = nullptr; + syncHOSTDateCheck = nullptr; + syncEXIFDateCheck = nullptr; } TQCheckBox *dateCreatedCheck; diff --git a/kipi-plugins/metadataedit/iptceditdialog.cpp b/kipi-plugins/metadataedit/iptceditdialog.cpp index 4bee1dce..7b7919c2 100644 --- a/kipi-plugins/metadataedit/iptceditdialog.cpp +++ b/kipi-plugins/metadataedit/iptceditdialog.cpp @@ -74,25 +74,25 @@ public: { modified = false; isReadOnly = false; - page_caption = 0; - page_datetime = 0; - page_subjects = 0; - page_keywords = 0; - page_categories = 0; - page_credits = 0; - page_status = 0; - page_origin = 0; - - about = 0; - - captionPage = 0; - datetimePage = 0; - subjectsPage = 0; - keywordsPage = 0; - categoriesPage = 0; - creditsPage = 0; - statusPage = 0; - originPage = 0; + page_caption = nullptr; + page_datetime = nullptr; + page_subjects = nullptr; + page_keywords = nullptr; + page_categories = nullptr; + page_credits = nullptr; + page_status = nullptr; + page_origin = nullptr; + + about = nullptr; + + captionPage = nullptr; + datetimePage = nullptr; + subjectsPage = nullptr; + keywordsPage = nullptr; + categoriesPage = nullptr; + creditsPage = nullptr; + statusPage = nullptr; + originPage = nullptr; } bool modified; @@ -132,7 +132,7 @@ IPTCEditDialog::IPTCEditDialog(TQWidget* parent, KURL::List urls, KIPI::Interfac : KDialogBase(IconList, TQString(), urls.count() > 1 ? Help|User1|User2|Stretch|Ok|Apply|Close : Help|Stretch|Ok|Apply|Close, - Ok, parent, 0, true, true, + Ok, parent, nullptr, true, true, KStdGuiItem::guiItem(KStdGuiItem::Forward), KStdGuiItem::guiItem(KStdGuiItem::Back) ) { @@ -179,7 +179,7 @@ IPTCEditDialog::IPTCEditDialog(TQWidget* parent, KURL::List urls, KIPI::Interfac // About data and help button. d->about = new KIPIPlugins::KPAboutData(I18N_NOOP("Edit Metadata"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Plugin to edit image metadata"), "(c) 2006-2008, Gilles Caulier"); diff --git a/kipi-plugins/metadataedit/iptckeywords.cpp b/kipi-plugins/metadataedit/iptckeywords.cpp index 4f896388..751896af 100644 --- a/kipi-plugins/metadataedit/iptckeywords.cpp +++ b/kipi-plugins/metadataedit/iptckeywords.cpp @@ -56,11 +56,11 @@ public: IPTCKeywordsPriv() { - addKeywordButton = 0; - delKeywordButton = 0; - keywordsBox = 0; - keywordsCheck = 0; - keywordEdit = 0; + addKeywordButton = nullptr; + delKeywordButton = nullptr; + keywordsBox = nullptr; + keywordsCheck = nullptr; + keywordEdit = nullptr; } TQStringList oldKeywords; diff --git a/kipi-plugins/metadataedit/iptcorigin.cpp b/kipi-plugins/metadataedit/iptcorigin.cpp index 30cff209..2cce09be 100644 --- a/kipi-plugins/metadataedit/iptcorigin.cpp +++ b/kipi-plugins/metadataedit/iptcorigin.cpp @@ -57,19 +57,19 @@ public: IPTCOriginPriv() { - objectNameEdit = 0; - cityEdit = 0; - sublocationEdit = 0; - provinceEdit = 0; - locationEdit = 0; - originalTransEdit = 0; - objectNameCheck = 0; - cityCheck = 0; - sublocationCheck = 0; - provinceCheck = 0; - countryCheck = 0; - locationCheck = 0; - originalTransCheck = 0; + objectNameEdit = nullptr; + cityEdit = nullptr; + sublocationEdit = nullptr; + provinceEdit = nullptr; + locationEdit = nullptr; + originalTransEdit = nullptr; + objectNameCheck = nullptr; + cityCheck = nullptr; + sublocationCheck = nullptr; + provinceCheck = nullptr; + countryCheck = nullptr; + locationCheck = nullptr; + originalTransCheck = nullptr; // Standard ISO 3166 country codes. diff --git a/kipi-plugins/metadataedit/iptcstatus.cpp b/kipi-plugins/metadataedit/iptcstatus.cpp index 1922b4df..1de87666 100644 --- a/kipi-plugins/metadataedit/iptcstatus.cpp +++ b/kipi-plugins/metadataedit/iptcstatus.cpp @@ -57,16 +57,16 @@ public: IPTCStatusPriv() { - priorityCB = 0; - objectCycleCB = 0; - objectTypeCB = 0; - statusEdit = 0; - JobIDEdit = 0; - priorityCheck = 0; - objectCycleCheck = 0; - objectTypeCheck = 0; - statusCheck = 0; - JobIDCheck = 0; + priorityCB = nullptr; + objectCycleCB = nullptr; + objectTypeCB = nullptr; + statusEdit = nullptr; + JobIDEdit = nullptr; + priorityCheck = nullptr; + objectCycleCheck = nullptr; + objectTypeCheck = nullptr; + statusCheck = nullptr; + JobIDCheck = nullptr; } TQCheckBox *statusCheck; diff --git a/kipi-plugins/metadataedit/iptcsubjects.cpp b/kipi-plugins/metadataedit/iptcsubjects.cpp index 7bdeb8e6..bf6b988a 100644 --- a/kipi-plugins/metadataedit/iptcsubjects.cpp +++ b/kipi-plugins/metadataedit/iptcsubjects.cpp @@ -56,11 +56,11 @@ public: IPTCSubjectsPriv() { - addSubjectButton = 0; - delSubjectButton = 0; - subjectsBox = 0; - subjectsCheck = 0; - subjectEdit = 0; + addSubjectButton = nullptr; + delSubjectButton = nullptr; + subjectsBox = nullptr; + subjectsCheck = nullptr; + subjectEdit = nullptr; } TQStringList oldSubjects; diff --git a/kipi-plugins/metadataedit/plugin_metadataedit.cpp b/kipi-plugins/metadataedit/plugin_metadataedit.cpp index 1841b2d9..3c956908 100644 --- a/kipi-plugins/metadataedit/plugin_metadataedit.cpp +++ b/kipi-plugins/metadataedit/plugin_metadataedit.cpp @@ -66,12 +66,12 @@ void Plugin_MetadataEdit::setup( TQWidget* widget ) KIPI::Plugin::setup( widget ); m_actionMetadataEdit = new TDEActionMenu(i18n("Metadata"), - 0, + nullptr, actionCollection(), "metadataedit"); m_actionMetadataEdit->insert(new TDEAction (i18n("Edit EXIF..."), - 0, + nullptr, 0, this, TQ_SLOT(slotEditExif()), @@ -79,7 +79,7 @@ void Plugin_MetadataEdit::setup( TQWidget* widget ) "editexif")); m_actionMetadataEdit->insert(new TDEAction (i18n("Remove EXIF..."), - 0, + nullptr, 0, this, TQ_SLOT(slotRemoveExif()), @@ -87,7 +87,7 @@ void Plugin_MetadataEdit::setup( TQWidget* widget ) "removeexif")); m_actionMetadataEdit->insert(new TDEAction (i18n("Import EXIF..."), - 0, + nullptr, 0, this, TQ_SLOT(slotImportExif()), @@ -97,7 +97,7 @@ void Plugin_MetadataEdit::setup( TQWidget* widget ) m_actionMetadataEdit->popupMenu()->insertSeparator(); m_actionMetadataEdit->insert(new TDEAction (i18n("Edit IPTC..."), - 0, + nullptr, 0, this, TQ_SLOT(slotEditIptc()), @@ -105,7 +105,7 @@ void Plugin_MetadataEdit::setup( TQWidget* widget ) "editiptc")); m_actionMetadataEdit->insert(new TDEAction (i18n("Remove IPTC..."), - 0, + nullptr, 0, this, TQ_SLOT(slotRemoveIptc()), @@ -113,7 +113,7 @@ void Plugin_MetadataEdit::setup( TQWidget* widget ) "removeiptc")); m_actionMetadataEdit->insert(new TDEAction (i18n("Import IPTC..."), - 0, + nullptr, 0, this, TQ_SLOT(slotImportIptc()), @@ -123,7 +123,7 @@ void Plugin_MetadataEdit::setup( TQWidget* widget ) m_actionMetadataEdit->popupMenu()->insertSeparator(); m_actionMetadataEdit->insert(new TDEAction (i18n("Edit Captions..."), - 0, + nullptr, 0, this, TQ_SLOT(slotEditComments()), @@ -131,7 +131,7 @@ void Plugin_MetadataEdit::setup( TQWidget* widget ) "editcomments")); m_actionMetadataEdit->insert(new TDEAction (i18n("Remove Captions..."), - 0, + nullptr, 0, this, TQ_SLOT(slotRemoveComments()), diff --git a/kipi-plugins/mpegencoder/checkbinprog.h b/kipi-plugins/mpegencoder/checkbinprog.h index 9c0c5474..0ec4afe0 100644 --- a/kipi-plugins/mpegencoder/checkbinprog.h +++ b/kipi-plugins/mpegencoder/checkbinprog.h @@ -37,7 +37,7 @@ TQ_OBJECT public: - CheckBinProg(TQObject *parent=0); + CheckBinProg(TQObject *parent=nullptr); virtual ~CheckBinProg(); int findExecutables( void ); diff --git a/kipi-plugins/mpegencoder/kimg2mpg.cpp b/kipi-plugins/mpegencoder/kimg2mpg.cpp index 511a79ee..1d026df0 100644 --- a/kipi-plugins/mpegencoder/kimg2mpg.cpp +++ b/kipi-plugins/mpegencoder/kimg2mpg.cpp @@ -158,7 +158,7 @@ void ListImageItems::dropEvent(TQDropEvent *e) TQStrListIterator it(strList); char *str; - while ( (str = it.current()) != 0 ) + while ( (str = it.current()) != nullptr ) { TQString filePath = TQUriDrag::uriToLocalFile(str); TQFileInfo fileInfo(filePath); @@ -183,8 +183,8 @@ KImg2mpgData::KImg2mpgData(KIPI::Interface* interface, TQWidget *parent, const c : KImg2mpgBase(parent, name), m_interface( interface ) { m_TmpFolderConfig = ""; - m_Proc = 0L; - m_thumbJob = 0L; + m_Proc = nullptr; + m_thumbJob = nullptr; m_Encoding = false; m_Abort = false; @@ -244,7 +244,7 @@ KImg2mpgData::KImg2mpgData(KIPI::Interface* interface, TQWidget *parent, const c m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("MPEG Slideshow"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin for encoding images to an MPEG file."), "(c) 2003-2004, Gilles Caulier"); @@ -395,7 +395,7 @@ void KImg2mpgData::slotImagesFilesButtonUp( void ) TQString name(pitem->name()); TQString album(pitem->album()); m_ImagesFilesListBox->removeItem(Index); - ImageItem *item = new ImageItem( 0, name, comment, path, album ); + ImageItem *item = new ImageItem( nullptr, name, comment, path, album ); item->setName( name ); m_ImagesFilesListBox->insertItem(item, Index-1); m_ImagesFilesListBox->setSelected(Index-1, true); @@ -442,7 +442,7 @@ void KImg2mpgData::slotImagesFilesSelected( TQListBoxItem *item ) void KImg2mpgData::slotGotPreview(const KFileItem*, const TQPixmap &pixmap) { m_ImageLabel->setPixmap(pixmap); - m_thumbJob = 0L; + m_thumbJob = nullptr; } @@ -450,7 +450,7 @@ void KImg2mpgData::slotGotPreview(const KFileItem*, const TQPixmap &pixmap) void KImg2mpgData::slotFailedPreview(const KFileItem*) { - m_thumbJob = 0L; + m_thumbJob = nullptr; } @@ -484,7 +484,7 @@ void KImg2mpgData::slotImagesFilesButtonDown( void ) TQString name(pitem->name()); TQString album(pitem->name()); m_ImagesFilesListBox->removeItem(Index); - ImageItem *item = new ImageItem( 0, name, comment, path, album ); + ImageItem *item = new ImageItem( nullptr, name, comment, path, album ); item->setName( name ); m_ImagesFilesListBox->insertItem(item, Index+1); m_ImagesFilesListBox->setSelected(Index+1, true); @@ -1005,7 +1005,7 @@ void KImg2mpgData::reset() } delete m_Proc; - m_Proc = 0L; + m_Proc = nullptr; m_progress->setValue(0); m_frame->clear(); diff --git a/kipi-plugins/mpegencoder/kimg2mpg.h b/kipi-plugins/mpegencoder/kimg2mpg.h index ad55d7a2..ba07269c 100644 --- a/kipi-plugins/mpegencoder/kimg2mpg.h +++ b/kipi-plugins/mpegencoder/kimg2mpg.h @@ -80,7 +80,7 @@ TQ_OBJECT public: - ListImageItems(TQWidget *parent=0, const char *name=0); + ListImageItems(TQWidget *parent=nullptr, const char *name=nullptr); signals: void addedDropItems(KURL::List filesUrl); @@ -98,7 +98,7 @@ TQ_OBJECT public: - KImg2mpgData( KIPI::Interface* interface, TQWidget* parent = 0, const char * name = 0 ); + KImg2mpgData( KIPI::Interface* interface, TQWidget* parent = nullptr, const char * name = nullptr ); virtual ~KImg2mpgData(); void show(); diff --git a/kipi-plugins/mpegencoder/optionsdialog.h b/kipi-plugins/mpegencoder/optionsdialog.h index 81fd51b0..e0e455fe 100644 --- a/kipi-plugins/mpegencoder/optionsdialog.h +++ b/kipi-plugins/mpegencoder/optionsdialog.h @@ -44,7 +44,7 @@ TQ_OBJECT public: - OptionsDialog(TQWidget *parent=0); + OptionsDialog(TQWidget *parent=nullptr); ~OptionsDialog(); KLineEdit* IMBinFolderEditFilename; diff --git a/kipi-plugins/picasawebexport/picasaweblogin.cpp b/kipi-plugins/picasawebexport/picasaweblogin.cpp index d8fdf748..7931570a 100644 --- a/kipi-plugins/picasawebexport/picasaweblogin.cpp +++ b/kipi-plugins/picasawebexport/picasaweblogin.cpp @@ -61,7 +61,7 @@ PicasawebLogin::PicasawebLogin(TQWidget* parent, const TQString& header, hline->setFrameShape( TQFrame::HLine ); vbox->addWidget( hline ); - TQGridLayout* centerLayout = new TQGridLayout(0, 1, 1, 5, 5); + TQGridLayout* centerLayout = new TQGridLayout(nullptr, 1, 1, 5, 5); m_nameEdit = new TQLineEdit( this ); centerLayout->addWidget(m_nameEdit, 0, 1); @@ -80,7 +80,7 @@ PicasawebLogin::PicasawebLogin(TQWidget* parent, const TQString& header, vbox->addLayout( centerLayout ); - TQHBoxLayout* btnLayout = new TQHBoxLayout(0, 0, 5); + TQHBoxLayout* btnLayout = new TQHBoxLayout(nullptr, 0, 5); btnLayout->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ) ); diff --git a/kipi-plugins/picasawebexport/picasawebtalker.cpp b/kipi-plugins/picasawebexport/picasawebtalker.cpp index 6e452c6a..69bdf36f 100644 --- a/kipi-plugins/picasawebexport/picasawebtalker.cpp +++ b/kipi-plugins/picasawebexport/picasawebtalker.cpp @@ -83,7 +83,7 @@ namespace KIPIPicasawebExportPlugin { PicasawebTalker::PicasawebTalker( TQWidget* parent ) - : m_parent( parent ), m_job( 0 ) + : m_parent( parent ), m_job( nullptr ) { m_apikey="49d585bafa0758cb5c58ab67198bf632"; m_secret="34b39925e6273ffd"; @@ -123,7 +123,7 @@ void PicasawebTalker::getToken(const TQString& username, const TQString& passwor if (m_job) { m_job->kill(); - m_job = 0; + m_job = nullptr; } TQString url = "https://www.google.com/accounts/ClientLogin"; @@ -214,7 +214,7 @@ void PicasawebTalker::checkToken(const TQString& /*token*/) if (m_job) { m_job->kill(); - m_job = 0; + m_job = nullptr; } TQString url = "https://www.google.com/accounts/ClientLogin"; @@ -250,7 +250,7 @@ void PicasawebTalker::listAllAlbums() { if (m_job) { m_job->kill(); - m_job = 0; + m_job = nullptr; } TQString url = "http://picasaweb.google.com/data/feed/api/user/" + m_username + "?kind=album"; @@ -278,7 +278,7 @@ void PicasawebTalker::getPhotoProperty(const TQString& method,const TQString& ar if (m_job) { m_job->kill(); - m_job = 0; + m_job = nullptr; } TQString url="http://www.picasaweb.com/services/rest/?"; @@ -357,7 +357,7 @@ void PicasawebTalker::createAlbum(const TQString& albumTitle, const TQString& al if (m_job) { m_job->kill(); - m_job = 0; + m_job = nullptr; } TQString newAlbumXML = TQString("kill(); - m_job = 0; + m_job = nullptr; } if (authProgressDlg && !authProgressDlg->isHidden()) @@ -599,7 +599,7 @@ void PicasawebTalker::slotError(const TQString & error) void PicasawebTalker::slotResult(TDEIO::Job *job) { - m_job = 0; + m_job = nullptr; emit signalBusy(false); if (job->error()) diff --git a/kipi-plugins/picasawebexport/picasawebwidget.h b/kipi-plugins/picasawebexport/picasawebwidget.h index a25155e8..68923e4e 100644 --- a/kipi-plugins/picasawebexport/picasawebwidget.h +++ b/kipi-plugins/picasawebexport/picasawebwidget.h @@ -52,7 +52,7 @@ class PicasawebWidget : public UploadWidget public: - PicasawebWidget(TQWidget* parent=0, const char* name=0, WFlags fl= 0); + PicasawebWidget(TQWidget* parent=nullptr, const char* name=nullptr, WFlags fl= 0); ~PicasawebWidget(); private slots: diff --git a/kipi-plugins/picasawebexport/picasawebwindow.cpp b/kipi-plugins/picasawebexport/picasawebwindow.cpp index e6f4d6ba..4b6b8d3f 100644 --- a/kipi-plugins/picasawebexport/picasawebwindow.cpp +++ b/kipi-plugins/picasawebexport/picasawebwindow.cpp @@ -78,13 +78,13 @@ namespace KIPIPicasawebExportPlugin { PicasawebWindow::PicasawebWindow(KIPI::Interface* interface, const TQString &tmpFolder, TQWidget* /*parent*/) - : KDialogBase(0, 0, false, i18n("Export to Picasa Web Service"), Help|Close, Close, false), + : KDialogBase(nullptr, nullptr, false, i18n("Export to Picasa Web Service"), Help|Close, Close, false), m_tmp(tmpFolder) { m_interface = interface; m_uploadCount = 0; m_uploadTotal = 0; - m_urls = 0; + m_urls = nullptr; m_widget = new PicasawebWidget(this); m_tagView = m_widget->m_tagView; m_photoView = m_widget->m_photoView; @@ -111,7 +111,7 @@ PicasawebWindow::PicasawebWindow(KIPI::Interface* interface, const TQString &tmp // ------------------------------------------------------------ m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Picasaweb Export"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin to export image collection to " "Picasaweb web service."), @@ -153,7 +153,7 @@ PicasawebWindow::PicasawebWindow(KIPI::Interface* interface, const TQString &tmp // ------------------------------------------------------------ - m_progressDlg = new TQProgressDialog(this, 0, true); + m_progressDlg = new TQProgressDialog(this, nullptr, true); m_progressDlg->setAutoReset(true); m_progressDlg->setAutoClose(true); @@ -199,7 +199,7 @@ PicasawebWindow::PicasawebWindow(KIPI::Interface* interface, const TQString &tmp // ------------------------------------------------------------ - m_authProgressDlg = new TQProgressDialog( this, 0, true ); + m_authProgressDlg = new TQProgressDialog( this, nullptr, true ); m_authProgressDlg->setAutoReset( true ); m_authProgressDlg->setAutoClose( true ); diff --git a/kipi-plugins/printwizard/frmprintwizard.cpp b/kipi-plugins/printwizard/frmprintwizard.cpp index 869181cd..4f988806 100644 --- a/kipi-plugins/printwizard/frmprintwizard.cpp +++ b/kipi-plugins/printwizard/frmprintwizard.cpp @@ -89,7 +89,7 @@ FrmPrintWizard::FrmPrintWizard(TQWidget *parent, const char *name ) // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Print Wizard"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A KIPI plugin to print images"), "(c) 2003-2004, Todd Shoemaker\n(c) 2007-2008, Angelo Naselli"); @@ -266,10 +266,10 @@ void FrmPrintWizard::setBtnCropEnabled() void FrmPrintWizard::BtnCropNext_clicked() { - TPhoto *photo = 0; + TPhoto *photo = nullptr; photo = m_photos.next(); setBtnCropEnabled(); - if (photo == 0) + if (!photo) { m_photos.last(); return; @@ -286,12 +286,12 @@ void FrmPrintWizard::updateCropFrame(TPhoto *photo, int photoIndex) void FrmPrintWizard::BtnCropPrev_clicked() { - TPhoto *photo = 0; + TPhoto *photo = nullptr; photo = m_photos.prev(); setBtnCropEnabled(); - if (photo == 0) + if (!photo) { m_photos.first(); return; @@ -328,7 +328,7 @@ void FrmPrintWizard::FrmPrintWizardBaseSelected(const TQString &) // set the default crop regions if not already set TPhotoSize *s = m_photoSizes.at(ListPhotoSizes->currentItem()); int i = 0; - for (TPhoto *photo = m_photos.first(); photo != 0; photo = m_photos.next()) + for (TPhoto *photo = m_photos.first(); photo; photo = m_photos.next()) { if (photo->cropRegion == TQRect(-1, -1, -1, -1)) cropFrame->init(photo, getLayout(i)->width(), getLayout(i)->height(), s->autoRotate); @@ -409,7 +409,7 @@ double getMaxDPI(TQPtrList photos, TQPtrList layouts, unsigned i maxDPI = dpi; // iterate to the next position layout = layouts.next(); - if (layout == 0) + if (!layout) { break; } @@ -740,7 +740,7 @@ bool FrmPrintWizard::paintOnePage(TQPainter &p, TQPtrList photos, TQPtrL // iterate to the next position layout = layouts.next(); - if (layout == 0) + if (!layout) { current++; break; @@ -927,7 +927,7 @@ bool FrmPrintWizard::paintOnePage(TQImage &p, TQPtrList photos, TQPtrLis // iterate to the next position layout = layouts.next(); - if (layout == 0) + if (!layout) { current++; break; @@ -965,7 +965,7 @@ void FrmPrintWizard::previewPhotos() int count = 0; int page = 0; unsigned int current = 0; - for (TPhoto *photo = m_photos.first(); photo != 0; photo = m_photos.next()) + for (TPhoto *photo = m_photos.first(); photo; photo = m_photos.next()) { if (page == m_currentPreviewPage) { photo->cropRegion.setRect(-1, -1, -1, -1); @@ -1003,7 +1003,7 @@ void FrmPrintWizard::previewPhotos() void FrmPrintWizard::ListPhotoSizes_highlighted ( int ) { m_currentPreviewPage = 0; - for (TPhoto *photo = m_photos.first(); photo != 0; photo = m_photos.next()) + for (TPhoto *photo = m_photos.first(); photo; photo = m_photos.next()) { photo->cropRegion.setRect(-1, -1, -1, -1); photo->rotation = 0; @@ -1117,7 +1117,7 @@ void FrmPrintWizard::EditCopies_valueChanged( int copies ) LblPhotoCount->setText(TQString::number(m_photos.count())); int index = 0; - for (TPhoto *pPhoto = m_photos.first(); pPhoto != 0; pPhoto = m_photos.next(), index++) + for (TPhoto *pPhoto = m_photos.first(); pPhoto; pPhoto = m_photos.next(), index++) { if (pPhoto->filename == fileName) { @@ -1965,7 +1965,7 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize) // load the photo sizes into the listbox ListPhotoSizes->clear(); - for (TPhotoSize *s = m_photoSizes.first(); s != 0; s = m_photoSizes.next()) + for (TPhotoSize *s = m_photoSizes.first(); s; s = m_photoSizes.next()) ListPhotoSizes->insertItem(s->label); ListPhotoSizes->setCurrentItem(0); } diff --git a/kipi-plugins/printwizard/frmprintwizard.h b/kipi-plugins/printwizard/frmprintwizard.h index ee41c036..8d335140 100644 --- a/kipi-plugins/printwizard/frmprintwizard.h +++ b/kipi-plugins/printwizard/frmprintwizard.h @@ -113,7 +113,7 @@ private: public: - FrmPrintWizard(TQWidget *parent=0, const char *name=0); + FrmPrintWizard(TQWidget *parent=nullptr, const char *name=nullptr); ~FrmPrintWizard(); void print( KURL::List fileList, TQString tempPath); TQRect * getLayout(int photoIndex); diff --git a/kipi-plugins/printwizard/tphoto.cpp b/kipi-plugins/printwizard/tphoto.cpp index 314c4611..221311d5 100644 --- a/kipi-plugins/printwizard/tphoto.cpp +++ b/kipi-plugins/printwizard/tphoto.cpp @@ -55,7 +55,7 @@ namespace KIPIPrintWizardPlugin TPhoto::TPhoto(int thumbnailSize) { - m_size = 0; + m_size = nullptr; cropRegion = TQRect(-1, -1, -1, -1); rotation = 0; copies = 1; @@ -122,7 +122,7 @@ TQImage TPhoto::loadPhoto() TQSize & TPhoto::size() // private { - if (m_size == 0) + if (!m_size) loadCache(); return *m_size; } diff --git a/kipi-plugins/rawconverter/batchdialog.cpp b/kipi-plugins/rawconverter/batchdialog.cpp index 088d93b9..2e4cb385 100644 --- a/kipi-plugins/rawconverter/batchdialog.cpp +++ b/kipi-plugins/rawconverter/batchdialog.cpp @@ -84,12 +84,12 @@ namespace KIPIRawConverterPlugin { BatchDialog::BatchDialog(TQWidget* /*parent*/) - : KDialogBase(0, 0, false, i18n("Raw Images Batch Converter"), + : KDialogBase(nullptr, nullptr, false, i18n("Raw Images Batch Converter"), Help|Default|User1|User2|Close, Close, true, i18n("Con&vert"), i18n("&Abort")) { - m_currentConvertItem = 0; - m_thread = 0; + m_currentConvertItem = nullptr; + m_thread = nullptr; m_page = new TQWidget( this ); setMainWidget( m_page ); TQGridLayout *mainLayout = new TQGridLayout(m_page, 2, 1, 0, spacingHint()); @@ -134,7 +134,7 @@ BatchDialog::BatchDialog(TQWidget* /*parent*/) // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("RAW Image Converter"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin to batch convert Raw images"), "(c) 2003-2005, Renchi Raju\n" @@ -300,7 +300,7 @@ void BatchDialog::slotUser1() CListViewItem *item = (CListViewItem*) it.current(); if (item->isEnabled()) { - item->setPixmap(1, 0); + item->setPixmap(1, nullptr); m_fileList.append(item->rawItem->directory + TQString("/") + item->rawItem->src); } ++it; @@ -560,7 +560,7 @@ void BatchDialog::processed(const TQString& file, const TQString& tmpFile) } m_progressBar->advance(1); - m_currentConvertItem = 0; + m_currentConvertItem = nullptr; } void BatchDialog::processingFailed(const TQString& file) @@ -568,7 +568,7 @@ void BatchDialog::processingFailed(const TQString& file) TQString filename = TQFileInfo(file).fileName(); m_currentConvertItem->viewItem->setPixmap(1, SmallIcon("no")); m_progressBar->advance(1); - m_currentConvertItem = 0; + m_currentConvertItem = nullptr; } void BatchDialog::customEvent(TQCustomEvent *event) diff --git a/kipi-plugins/rawconverter/previewwidget.cpp b/kipi-plugins/rawconverter/previewwidget.cpp index db512e50..ffa71857 100644 --- a/kipi-plugins/rawconverter/previewwidget.cpp +++ b/kipi-plugins/rawconverter/previewwidget.cpp @@ -48,8 +48,8 @@ public: PreviewWidgetPriv() { - pix = 0; - timer = 0; + pix = nullptr; + timer = nullptr; } TQPixmap *pix; @@ -63,7 +63,7 @@ public: }; PreviewWidget::PreviewWidget(TQWidget *parent) - : TQFrame(parent, 0, TQt::WRepaintNoErase) + : TQFrame(parent, nullptr, TQt::WRepaintNoErase) { d = new PreviewWidgetPriv; setFrameStyle(TQFrame::GroupBoxPanel|TQFrame::Plain); diff --git a/kipi-plugins/rawconverter/rawdecodingiface.cpp b/kipi-plugins/rawconverter/rawdecodingiface.cpp index d01d0796..0e6cc5c7 100644 --- a/kipi-plugins/rawconverter/rawdecodingiface.cpp +++ b/kipi-plugins/rawconverter/rawdecodingiface.cpp @@ -193,7 +193,7 @@ bool RawDecodingIface::loadedFromDcraw(const TQString& filePath, TQString soft = TQString("Kipi-plugins v.%1").arg(kipiplugins_version); TQFileInfo fi(filePath); destPath = fi.dirPath(true) + TQString("/") + ".kipi-rawconverter-tmp-" - + TQString::number(::time(0)); + + TQString::number(::time(nullptr)); // Metadata restoration and update. KExiv2Iface::KExiv2 exiv2Iface; @@ -216,7 +216,7 @@ bool RawDecodingIface::loadedFromDcraw(const TQString& filePath, { case SaveSettingsWidget::OUTPUT_JPEG: { - FILE* f = 0; + FILE* f = nullptr; f = fopen(TQFile::encodeName(destPath), "wb"); if (!f) @@ -277,7 +277,7 @@ bool RawDecodingIface::loadedFromDcraw(const TQString& filePath, case SaveSettingsWidget::OUTPUT_PNG: { - FILE* f = 0; + FILE* f = nullptr; f = fopen(TQFile::encodeName(destPath), "wb"); if (!f) @@ -355,8 +355,8 @@ bool RawDecodingIface::loadedFromDcraw(const TQString& filePath, case SaveSettingsWidget::OUTPUT_TIFF: { - TIFF *tif=0; - unsigned char *data=0; + TIFF *tif=nullptr; + unsigned char *data=nullptr; int y; int w; diff --git a/kipi-plugins/rawconverter/savesettingswidget.cpp b/kipi-plugins/rawconverter/savesettingswidget.cpp index 29040c18..4dc901e6 100644 --- a/kipi-plugins/rawconverter/savesettingswidget.cpp +++ b/kipi-plugins/rawconverter/savesettingswidget.cpp @@ -49,12 +49,12 @@ public: SaveSettingsWidgetPriv() { - formatLabel = 0; - conflictLabel = 0; - conflictButtonGroup = 0; - formatComboBox = 0; - overwriteButton = 0; - promptButton = 0; + formatLabel = nullptr; + conflictLabel = nullptr; + conflictButtonGroup = nullptr; + formatComboBox = nullptr; + overwriteButton = nullptr; + promptButton = nullptr; } TQLabel *formatLabel; @@ -69,7 +69,7 @@ public: }; SaveSettingsWidget::SaveSettingsWidget(TQWidget *parent) - : TQWidget(parent, 0, TQt::WDestructiveClose) + : TQWidget(parent, nullptr, TQt::WDestructiveClose) { d = new SaveSettingsWidgetPriv; TQGridLayout* settingsBoxLayout = new TQGridLayout(this, 3, 1, KDialog::spacingHint()); diff --git a/kipi-plugins/rawconverter/singledialog.cpp b/kipi-plugins/rawconverter/singledialog.cpp index a7ed7158..5fad82aa 100644 --- a/kipi-plugins/rawconverter/singledialog.cpp +++ b/kipi-plugins/rawconverter/singledialog.cpp @@ -80,7 +80,7 @@ namespace KIPIRawConverterPlugin { SingleDialog::SingleDialog(const TQString& file, TQWidget */*parent*/) - : KDialogBase(0, 0, false, i18n("Raw Image Converter"), + : KDialogBase(nullptr, nullptr, false, i18n("Raw Image Converter"), Help|Default|User1|User2|User3|Close, Close, true, i18n("&Preview"), i18n("Con&vert"), i18n("&Abort")) { @@ -114,7 +114,7 @@ SingleDialog::SingleDialog(const TQString& file, TQWidget */*parent*/) // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("RAW Image Converter"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin to convert a Raw image"), "(c) 2003-2005, Renchi Raju\n" diff --git a/kipi-plugins/sendimages/plugin_sendimages.cpp b/kipi-plugins/sendimages/plugin_sendimages.cpp index f58d4a90..da1a2bb1 100644 --- a/kipi-plugins/sendimages/plugin_sendimages.cpp +++ b/kipi-plugins/sendimages/plugin_sendimages.cpp @@ -103,7 +103,7 @@ Plugin_SendImages::~Plugin_SendImages() void Plugin_SendImages::slotActivate() { - m_progressDlg = 0; + m_progressDlg = nullptr; KIPI::Interface* interface = dynamic_cast( parent() ); if ( !interface ) diff --git a/kipi-plugins/sendimages/sendimages.h b/kipi-plugins/sendimages/sendimages.h index 2d66889b..2f902384 100644 --- a/kipi-plugins/sendimages/sendimages.h +++ b/kipi-plugins/sendimages/sendimages.h @@ -59,7 +59,7 @@ public: ///Constructor: saves system handoff parameters in member variables SendImages(KIPI::Interface* interface, const TQString &tmpFolder, - const KIPI::ImageCollection& imagesCollection, TQObject *parent=0); + const KIPI::ImageCollection& imagesCollection, TQObject *parent=nullptr); ///Destructor ~SendImages(); diff --git a/kipi-plugins/sendimages/sendimagesdialog.cpp b/kipi-plugins/sendimages/sendimagesdialog.cpp index c9f1c105..47fc2038 100644 --- a/kipi-plugins/sendimages/sendimagesdialog.cpp +++ b/kipi-plugins/sendimages/sendimagesdialog.cpp @@ -120,7 +120,7 @@ void ListImageItems::dropEvent(TQDropEvent *e) TQStrListIterator it(strList); char *str; - while ( (str = it.current()) != 0 ) + while ( (str = it.current()) != nullptr ) { TQString filePath = TQUriDrag::uriToLocalFile(str); TQFileInfo fileInfo(filePath); @@ -141,7 +141,7 @@ SendImagesDialog::SendImagesDialog(TQWidget *parent, KIPI::Interface* interface, Ok, parent, "SendImagesDialog", false, true ) { m_interface = interface; - m_thumbJob = 0; + m_thumbJob = nullptr; setupImagesList(); setupEmailOptions(); @@ -156,7 +156,7 @@ SendImagesDialog::SendImagesDialog(TQWidget *parent, KIPI::Interface* interface, // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Send Images"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin for emailing images"), "(c) 2003-2007, Gilles Caulier"); @@ -639,12 +639,12 @@ void SendImagesDialog::slotImageSelected( TQListBoxItem * item ) void SendImagesDialog::slotGotPreview(const KFileItem*, const TQPixmap &pixmap) { m_imageLabel->setPixmap(pixmap); - m_thumbJob = 0L; + m_thumbJob = nullptr; } void SendImagesDialog::slotFailedPreview(const KFileItem*) { - m_thumbJob = 0L; + m_thumbJob = nullptr; } void SendImagesDialog::slotOk() diff --git a/kipi-plugins/sendimages/sendimagesdialog.h b/kipi-plugins/sendimages/sendimagesdialog.h index 565a7d55..b8a08a71 100644 --- a/kipi-plugins/sendimages/sendimagesdialog.h +++ b/kipi-plugins/sendimages/sendimagesdialog.h @@ -69,7 +69,7 @@ class ListImageItems : public TDEListBox public: - ListImageItems(TQWidget *parent=0, const char *name=0); + ListImageItems(TQWidget *parent=nullptr, const char *name=nullptr); signals: diff --git a/kipi-plugins/simpleviewerexport/firstrundlg.cpp b/kipi-plugins/simpleviewerexport/firstrundlg.cpp index 4d084873..f68eb244 100644 --- a/kipi-plugins/simpleviewerexport/firstrundlg.cpp +++ b/kipi-plugins/simpleviewerexport/firstrundlg.cpp @@ -55,7 +55,7 @@ namespace KIPISimpleViewerExportPlugin { FirstRunDlg::FirstRunDlg(TQWidget *parent) - : KDialogBase(parent, 0, true, i18n("Flash Export"), + : KDialogBase(parent, nullptr, true, i18n("Flash Export"), Help|Ok|Cancel, Ok, true) { enableButtonOK(false); @@ -63,7 +63,7 @@ FirstRunDlg::FirstRunDlg(TQWidget *parent) // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Flash Export"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin to export images to Flash using Simple Viewer component"), "(c) 2005-2006, Joern Ahrens\n" @@ -79,12 +79,12 @@ FirstRunDlg::FirstRunDlg(TQWidget *parent) m_about->addCredit("Felix Turner", "Author of the Simple Viewer Flash component", - 0, + nullptr, "http://www.airtightinteractive.com/simpleviewer"); m_about->addCredit("Mikkel B. Stegmann", "Basis for the index.html template", - 0, + nullptr, "http://www.stegmann.dk/mikkel/porta"); KHelpMenu* helpMenu = new KHelpMenu(this, m_about, false); diff --git a/kipi-plugins/simpleviewerexport/firstrundlg.h b/kipi-plugins/simpleviewerexport/firstrundlg.h index af649aa9..47e76fbd 100644 --- a/kipi-plugins/simpleviewerexport/firstrundlg.h +++ b/kipi-plugins/simpleviewerexport/firstrundlg.h @@ -57,7 +57,7 @@ class FirstRunDlg : public KDialogBase public: - FirstRunDlg(TQWidget *parent=0); + FirstRunDlg(TQWidget *parent=nullptr); ~FirstRunDlg(); /** diff --git a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp index 28eb3ea3..c89768a4 100644 --- a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp +++ b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp @@ -102,12 +102,12 @@ SimpleViewerExport::SimpleViewerExport(KIPI::Interface* interface, TQObject *par : TQObject(parent) { m_interface = interface; - m_configDlg = 0; + m_configDlg = nullptr; m_totalActions = 0; m_action = 0; m_canceled = true; m_dataLocal = locateLocal("data", "kipiplugin_simpleviewerexport/simpleviewer/", true); - m_tempDir = 0; + m_tempDir = nullptr; m_simpleViewerFiles.append(viewer); m_simpleViewerFiles.append("swfobject.js"); @@ -609,7 +609,7 @@ bool SimpleViewerExport::upload() m_progressDlg->addedAction(i18n("Uploading gallery..."), KIPI::StartingMessage); - if(!TDEIO::NetAccess::dircopy(m_tempDir->name() + "./", m_configDlg->exportURL(), 0)) + if(!TDEIO::NetAccess::dircopy(m_tempDir->name() + "./", m_configDlg->exportURL(), nullptr)) return false; m_progressDlg->addedAction(i18n("Gallery uploaded..."), KIPI::SuccessMessage); diff --git a/kipi-plugins/simpleviewerexport/simpleviewerexport.h b/kipi-plugins/simpleviewerexport/simpleviewerexport.h index a13846d7..fb21ad35 100644 --- a/kipi-plugins/simpleviewerexport/simpleviewerexport.h +++ b/kipi-plugins/simpleviewerexport/simpleviewerexport.h @@ -60,11 +60,11 @@ class SimpleViewerExport : public TQObject public: - static void run( KIPI::Interface* interface, TQObject *parent=0 ); + static void run( KIPI::Interface* interface, TQObject *parent=nullptr ); private: - SimpleViewerExport( KIPI::Interface* interface, TQObject *parent=0 ); + SimpleViewerExport( KIPI::Interface* interface, TQObject *parent=nullptr ); ~SimpleViewerExport(); bool configure(); diff --git a/kipi-plugins/simpleviewerexport/svedialog.cpp b/kipi-plugins/simpleviewerexport/svedialog.cpp index 7e737dfa..0a4d4dd2 100644 --- a/kipi-plugins/simpleviewerexport/svedialog.cpp +++ b/kipi-plugins/simpleviewerexport/svedialog.cpp @@ -79,7 +79,7 @@ SVEDialog::SVEDialog(KIPI::Interface* interface, TQWidget *parent) // About data and help button. m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Flash Export"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin to export images to Flash using Simple Viewer component"), "(c) 2005-2006, Joern Ahrens\n" @@ -95,12 +95,12 @@ SVEDialog::SVEDialog(KIPI::Interface* interface, TQWidget *parent) m_about->addCredit("Felix Turner", "Author of the Simple Viewer Flash component", - 0, + nullptr, "http://www.airtightinteractive.com/simpleviewer"); m_about->addCredit("Mikkel B. Stegmann", "Basis for the index.html template", - 0, + nullptr, "http://www.stegmann.dk/mikkel/porta"); KHelpMenu* helpMenu = new KHelpMenu(this, m_about, false); diff --git a/kipi-plugins/simpleviewerexport/svedialog.h b/kipi-plugins/simpleviewerexport/svedialog.h index 9f114251..e24a63a6 100644 --- a/kipi-plugins/simpleviewerexport/svedialog.h +++ b/kipi-plugins/simpleviewerexport/svedialog.h @@ -61,7 +61,7 @@ class SVEDialog : public KDialogBase public: - SVEDialog( KIPI::Interface* interface, TQWidget *parent=0); + SVEDialog( KIPI::Interface* interface, TQWidget *parent=nullptr); ~SVEDialog(); void readConfig(); diff --git a/kipi-plugins/slideshow/kbeffect.cpp b/kipi-plugins/slideshow/kbeffect.cpp index 4204bb5f..f28dfc9e 100644 --- a/kipi-plugins/slideshow/kbeffect.cpp +++ b/kipi-plugins/slideshow/kbeffect.cpp @@ -142,7 +142,7 @@ BlendKBEffect::BlendKBEffect(SlideShowKB *parent, bool needFadeIn): KBEffect(parent, needFadeIn) { m_img[0] = image(0); - m_img[1] = 0; + m_img[1] = nullptr; } @@ -179,7 +179,7 @@ void BlendKBEffect::advanceTime(float step) { m_img[0]->m_opacity = (1.0 - m_img[0]->m_pos) * 10; - if (m_img[1] == 0) { + if (!m_img[1]) { setupNewImage(1); m_img[1] = image(1); m_img[1]->m_opacity = 1.0; diff --git a/kipi-plugins/slideshow/listimageitems.cpp b/kipi-plugins/slideshow/listimageitems.cpp index e5d20aed..29e7c0ff 100644 --- a/kipi-plugins/slideshow/listimageitems.cpp +++ b/kipi-plugins/slideshow/listimageitems.cpp @@ -66,7 +66,7 @@ void ListImageItems::dropEvent(TQDropEvent *e) TQStrListIterator it(strList); char *str; - while ( (str = it.current()) != 0 ) + while ( (str = it.current()) != nullptr ) { TQString filePath = TQUriDrag::uriToLocalFile(str); TQFileInfo fileInfo(filePath); diff --git a/kipi-plugins/slideshow/listimageitems.h b/kipi-plugins/slideshow/listimageitems.h index c16daaee..2107a2cf 100644 --- a/kipi-plugins/slideshow/listimageitems.h +++ b/kipi-plugins/slideshow/listimageitems.h @@ -68,7 +68,7 @@ class ListImageItems : public TDEListBox public: - ListImageItems(TQWidget *parent=0, const char *name=0); + ListImageItems(TQWidget *parent=nullptr, const char *name=nullptr); signals: diff --git a/kipi-plugins/slideshow/plugin_slideshow.cpp b/kipi-plugins/slideshow/plugin_slideshow.cpp index 2068c7c1..10850965 100644 --- a/kipi-plugins/slideshow/plugin_slideshow.cpp +++ b/kipi-plugins/slideshow/plugin_slideshow.cpp @@ -210,7 +210,7 @@ void Plugin_SlideShow::slotSlideShow() if (shuffle) { struct timeval tv; - gettimeofday(&tv, 0); + gettimeofday(&tv, nullptr); srand(tv.tv_sec); FileList::iterator it = fileList.begin(); diff --git a/kipi-plugins/slideshow/slideshow.cpp b/kipi-plugins/slideshow/slideshow.cpp index 770b4e59..ed1e3ec5 100644 --- a/kipi-plugins/slideshow/slideshow.cpp +++ b/kipi-plugins/slideshow/slideshow.cpp @@ -59,7 +59,7 @@ namespace KIPISlideShowPlugin { SlideShow::SlideShow(const FileList& fileList, const TQStringList& commentsList, bool ImagesHasComments) - : TQWidget(0, 0, WStyle_StaysOnTop | WType_Popup | WX11BypassWM | WDestructiveClose) + : TQWidget(nullptr, nullptr, WStyle_StaysOnTop | WType_Popup | WX11BypassWM | WDestructiveClose) { TQRect deskRect = TDEGlobalSettings::desktopGeometry(this); m_deskX = deskRect.x(); @@ -94,11 +94,11 @@ SlideShow::SlideShow(const FileList& fileList, const TQStringList& commentsList, // --------------------------------------------------------------- - m_currImage = 0; + m_currImage = nullptr; m_fileIndex = -1; // start with -1 - m_effect = 0; + m_effect = nullptr; m_effectRunning = false; - m_intArray = 0; + m_intArray = nullptr; m_endOfShow = false; m_timer = new TQTimer(); @@ -310,7 +310,7 @@ void SlideShow::loadNextImage() { if (m_currImage) delete m_currImage; - m_currImage = 0; + m_currImage = nullptr; m_fileIndex++; m_imageLoader->next(); @@ -363,7 +363,7 @@ void SlideShow::loadPrevImage() { if (m_currImage) delete m_currImage; - m_currImage = 0; + m_currImage = nullptr; m_fileIndex--; m_imageLoader->prev(); diff --git a/kipi-plugins/slideshow/slideshowconfig.cpp b/kipi-plugins/slideshow/slideshowconfig.cpp index 00a13a94..2ccd8a0c 100644 --- a/kipi-plugins/slideshow/slideshowconfig.cpp +++ b/kipi-plugins/slideshow/slideshowconfig.cpp @@ -82,7 +82,7 @@ SlideShowConfig::SlideShowConfig(bool allowSelectedOnly, KIPI::Interface * inter // About data and help button. KIPIPlugins::KPAboutData * about = new KIPIPlugins::KPAboutData(I18N_NOOP("Slide Show"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin for image slideshow"), "(c) 2003-2004, Renchi Raju\n(c) 2007, Valerio Fuoglio"); @@ -139,7 +139,7 @@ SlideShowConfig::SlideShowConfig(bool allowSelectedOnly, KIPI::Interface * inter connect(m_cacheCheckBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotCacheToggled())); - m_thumbJob = 0L; + m_thumbJob = nullptr; // Configuration file management @@ -676,7 +676,7 @@ void SlideShowConfig::slotImagesFilesButtonUp( void ) TQString name(pitem->name()); TQString album(pitem->album()); m_ImagesFilesListBox->removeItem(Index); - ImageItem *item = new ImageItem( 0, name, comment, path, album ); + ImageItem *item = new ImageItem( nullptr, name, comment, path, album ); item->setName( name ); m_ImagesFilesListBox->insertItem(item, Index-1); m_ImagesFilesListBox->setSelected(Index-1, true); @@ -711,7 +711,7 @@ void SlideShowConfig::slotImagesFilesButtonDown( void ) TQString name(pitem->name()); TQString album(pitem->name()); m_ImagesFilesListBox->removeItem(Index); - ImageItem *item = new ImageItem( 0, name, comment, path, album ); + ImageItem *item = new ImageItem( nullptr, name, comment, path, album ); item->setName( name ); m_ImagesFilesListBox->insertItem(item, Index+1); m_ImagesFilesListBox->setSelected(Index+1, true); @@ -743,12 +743,12 @@ void SlideShowConfig::ShowNumberImages( int Number ) void SlideShowConfig::slotGotPreview(const KFileItem*, const TQPixmap &pixmap) { m_ImageLabel->setPixmap(pixmap); - m_thumbJob = 0L; + m_thumbJob = nullptr; } void SlideShowConfig::slotFailedPreview(const KFileItem*) { - m_thumbJob = 0L; + m_thumbJob = nullptr; } void SlideShowConfig::SlotPortfolioDurationChanged ( int ) diff --git a/kipi-plugins/slideshow/slideshowgl.cpp b/kipi-plugins/slideshow/slideshowgl.cpp index 9e31d2bd..a403edbc 100644 --- a/kipi-plugins/slideshow/slideshowgl.cpp +++ b/kipi-plugins/slideshow/slideshowgl.cpp @@ -48,7 +48,7 @@ namespace KIPISlideShowPlugin SlideShowGL::SlideShowGL(const TQValueList >& fileList, const TQStringList& commentsList, bool ImagesHasComments) - : TQGLWidget(0, 0, 0, WStyle_StaysOnTop | WType_Popup | + : TQGLWidget(nullptr, nullptr, nullptr, WStyle_StaysOnTop | WType_Popup | WX11BypassWM | WDestructiveClose) { TQRect deskRect = TDEGlobalSettings::desktopGeometry(this); @@ -545,7 +545,7 @@ void SlideShowGL::montage(TQImage& top, TQImage& bot) unsigned int *tdata = (unsigned int*) top.scanLine(0); - unsigned int *bdata = 0; + unsigned int *bdata = nullptr; for (int y = sh; y < eh; y++) { diff --git a/kipi-plugins/slideshow/slideshowkb.cpp b/kipi-plugins/slideshow/slideshowkb.cpp index 32e524d4..d0b1524e 100644 --- a/kipi-plugins/slideshow/slideshowkb.cpp +++ b/kipi-plugins/slideshow/slideshowkb.cpp @@ -138,7 +138,7 @@ namespace KIPISlideShowPlugin // ------------------------------------------------------------------------- SlideShowKB::SlideShowKB(const TQValueList >& fileList, const TQStringList& commentsList, bool ImagesHasComments) - : TQGLWidget(0, 0, 0, WStyle_StaysOnTop | WType_Popup | + : TQGLWidget(nullptr, nullptr, nullptr, WStyle_StaysOnTop | WType_Popup | WX11BypassWM | WDestructiveClose) { TQRect deskRect = TDEGlobalSettings::desktopGeometry(this); @@ -172,9 +172,9 @@ namespace KIPISlideShowPlugin else frameRate = m_forceFrameRate; - m_image[0] = new Image(0); - m_image[1] = new Image(0); - m_effect = 0; + m_image[0] = new Image(nullptr); + m_image[1] = new Image(nullptr); + m_effect = nullptr; m_step = 1.0 / ((float) (m_delay * frameRate)); m_zoomIn = rand() < RAND_MAX / 2; m_initialized = false; @@ -230,7 +230,7 @@ namespace KIPISlideShowPlugin void SlideShowKB::setNewKBEffect() { KBEffect::Type type; - bool needFadeIn = (m_effect == 0 || m_effect->type() == KBEffect::Fade); + bool needFadeIn = (!m_effect || m_effect->type() == KBEffect::Fade); // we currently only have two effects if (m_disableFadeInOut) diff --git a/kipi-plugins/sync/sinklist.cpp b/kipi-plugins/sync/sinklist.cpp index 3a295f24..ca787914 100644 --- a/kipi-plugins/sync/sinklist.cpp +++ b/kipi-plugins/sync/sinklist.cpp @@ -37,7 +37,7 @@ namespace KIPISyncPlugin SinkList::SinkList(TQWidget *pParent, Sinks* pSinks, bool blnShowOpen) : SinkListBase(pParent), mpSinks(pSinks), - mpCurrentSink(0) + mpCurrentSink(nullptr) { buttonOpen->setEnabled(blnShowOpen); buttonRemove->setEnabled(false); @@ -73,7 +73,7 @@ void SinkList::selectionChanged() } else { - mpCurrentSink = 0; + mpCurrentSink = nullptr; } } diff --git a/kipi-plugins/sync/sinks/gallery/gallerysink.cpp b/kipi-plugins/sync/sinks/gallery/gallerysink.cpp index c376fa7f..b72bf516 100644 --- a/kipi-plugins/sync/sinks/gallery/gallerysink.cpp +++ b/kipi-plugins/sync/sinks/gallery/gallerysink.cpp @@ -48,7 +48,7 @@ GallerySink::GallerySink(unsigned int sinkId, TQString name, TDEConfig* pConfig, : Sink(sinkId, name, pConfig, pWallet), mVersion(version), mAuthToken(""), - mpJob(0), + mpJob(nullptr), m_loggedIn(false) { TQString tmp = pConfig->readEntry(TQString("URL%1").arg(sinkId)); diff --git a/kipi-plugins/timeadjust/timeadjustdialog.cpp b/kipi-plugins/timeadjust/timeadjustdialog.cpp index 9391b6f0..71e18e69 100644 --- a/kipi-plugins/timeadjust/timeadjustdialog.cpp +++ b/kipi-plugins/timeadjust/timeadjustdialog.cpp @@ -88,27 +88,27 @@ public: TimeAdjustDialogPrivate() { - add = 0; - subtract = 0; - exif = 0; - custom = 0; - syncEXIFDateCheck = 0; - syncIPTCDateCheck = 0; - exampleBox = 0; - adjustValGrp = 0; - adjustTypeGrp = 0; - infoLabel = 0; - exampleAdj = 0; - secs = 0; - minutes = 0; - hours = 0; - days = 0; - months = 0; - years = 0; - dateCreatedSel = 0; - interface = 0; - about = 0; - todayBtn = 0; + add = nullptr; + subtract = nullptr; + exif = nullptr; + custom = nullptr; + syncEXIFDateCheck = nullptr; + syncIPTCDateCheck = nullptr; + exampleBox = nullptr; + adjustValGrp = nullptr; + adjustTypeGrp = nullptr; + infoLabel = nullptr; + exampleAdj = nullptr; + secs = nullptr; + minutes = nullptr; + hours = nullptr; + days = nullptr; + months = nullptr; + years = nullptr; + dateCreatedSel = nullptr; + interface = nullptr; + about = nullptr; + todayBtn = nullptr; } TQRadioButton *add; @@ -148,7 +148,7 @@ public: TimeAdjustDialog::TimeAdjustDialog(KIPI::Interface* interface, TQWidget* parent) : KDialogBase(Plain, i18n("Adjust Time & Date"), Help|Ok|Cancel, - Ok, parent, 0, true, true) + Ok, parent, nullptr, true, true) { d = new TimeAdjustDialogPrivate; d->interface = interface; @@ -158,7 +158,7 @@ TimeAdjustDialog::TimeAdjustDialog(KIPI::Interface* interface, TQWidget* parent) // -- About data and help button ---------------------------------------- d->about = new KIPIPlugins::KPAboutData(I18N_NOOP("Time Adjust"), - 0, + nullptr, TDEAboutData::License_GPL, I18N_NOOP("A Kipi plugin for adjusting time stamp of picture files"), "(c) 2003-2005, Jesper K. Pedersen\n" diff --git a/kipi-plugins/wallpaper/plugin_wallpaper.cpp b/kipi-plugins/wallpaper/plugin_wallpaper.cpp index 6964828a..dcffecfb 100644 --- a/kipi-plugins/wallpaper/plugin_wallpaper.cpp +++ b/kipi-plugins/wallpaper/plugin_wallpaper.cpp @@ -240,7 +240,7 @@ void Plugin_WallPaper::setWallpaper(int layout) path = KFileDialog::getSaveFileName(url.fileName(), TQString(), tdeApp->activeWindow()); if (path.isNull()) return; - TDEIO::NetAccess::download(url, path, 0L); + TDEIO::NetAccess::download(url, path, nullptr); } TQString cmd = TQString("dcop kdesktop KBackgroundIface setWallpaper '%1' %2") -- cgit v1.2.3