From 2fced7583757acefe2e62550a095d88874a71d6f Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sun, 4 Oct 2026 06:48:08 -0300 Subject: Replace zero pointer constants with nullptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- src/fmt_filters.cpp | 16 ++++++------ src/fmt_filters.h | 2 +- src/imageedit/sq_bcglabel.h | 2 +- src/imageedit/sq_converter.cpp | 8 +++--- src/imageedit/sq_label.h | 2 +- src/ksquirrel-libs-configurator/main.cpp | 2 +- src/ksquirrel.cpp | 42 +++++++++++++++---------------- src/ksquirrelpart/fmt_filters.cpp | 16 ++++++------ src/ksquirrelpart/fmt_filters.h | 2 +- src/ksquirrelpart/ksquirrelpart.cpp | 6 ++--- src/ksquirrelpart/ksquirrelpart.h | 2 +- src/ksquirrelpart/sq_bcglabel.h | 2 +- src/ksquirrelpart/sq_config.cpp | 2 +- src/ksquirrelpart/sq_config.h | 8 +++--- src/ksquirrelpart/sq_diroperator.cpp | 2 +- src/ksquirrelpart/sq_diroperator.h | 4 +-- src/ksquirrelpart/sq_downloader.cpp | 4 +-- src/ksquirrelpart/sq_downloader.h | 2 +- src/ksquirrelpart/sq_errorstring.cpp | 2 +- src/ksquirrelpart/sq_errorstring.h | 2 +- src/ksquirrelpart/sq_externaltool.cpp | 8 +++--- src/ksquirrelpart/sq_externaltool.h | 2 +- src/ksquirrelpart/sq_glparts.cpp | 8 +++--- src/ksquirrelpart/sq_glparts.h | 6 ++--- src/ksquirrelpart/sq_glview.cpp | 2 +- src/ksquirrelpart/sq_glview.h | 2 +- src/ksquirrelpart/sq_glwidget.cpp | 12 ++++----- src/ksquirrelpart/sq_glwidget.h | 2 +- src/ksquirrelpart/sq_glwidget_helpers.cpp | 2 +- src/ksquirrelpart/sq_glwidget_helpers.h | 2 +- src/ksquirrelpart/sq_glwidget_stuff.cpp | 16 ++++++------ src/ksquirrelpart/sq_iconloader.cpp | 4 +-- src/ksquirrelpart/sq_iconloader.h | 2 +- src/ksquirrelpart/sq_label.h | 2 +- src/ksquirrelpart/sq_library.h | 2 +- src/ksquirrelpart/sq_libraryhandler.cpp | 12 ++++----- src/ksquirrelpart/sq_libraryhandler.h | 2 +- src/ksquirrelpart/sq_popupmenu.h | 2 +- src/ksquirrelpart/sq_utils.cpp | 4 +-- src/main.cpp | 28 ++++++++++----------- src/sidebar/sq_categoriesview.cpp | 6 ++--- src/sidebar/sq_categoriesview.h | 4 +-- src/sidebar/sq_categorybrowsermenu.cpp | 8 +++--- src/sidebar/sq_categorybrowsermenu.h | 2 +- src/sidebar/sq_directorybasket.cpp | 14 +++++------ src/sidebar/sq_directorybasket.h | 4 +-- src/sidebar/sq_imagebasket.cpp | 12 ++++----- src/sidebar/sq_imagebasket.h | 2 +- src/sidebar/sq_mountview.cpp | 2 +- src/sidebar/sq_mountview.h | 2 +- src/sidebar/sq_multibar.cpp | 2 +- src/sidebar/sq_multibar.h | 2 +- src/sidebar/sq_previewwidget.cpp | 14 +++++------ src/sidebar/sq_previewwidget.h | 2 +- src/sidebar/sq_threaddirlister.cpp | 4 +-- src/sidebar/sq_treeview.cpp | 12 ++++----- src/sidebar/sq_treeview.h | 2 +- src/sidebar/sq_treeviewmenu.cpp | 2 +- src/sidebar/sq_treeviewmenu.h | 2 +- src/sq_archivehandler.cpp | 2 +- src/sq_archivehandler.h | 2 +- src/sq_bookmarkowner.cpp | 2 +- src/sq_bookmarkowner.h | 2 +- src/sq_config.cpp | 2 +- src/sq_config.h | 8 +++--- src/sq_diroperator.cpp | 28 ++++++++++----------- src/sq_diroperator.h | 2 +- src/sq_dirthumbs.cpp | 10 ++++---- src/sq_downloader.cpp | 4 +-- src/sq_downloader.h | 2 +- src/sq_dragprovider.cpp | 4 +-- src/sq_errorstring.cpp | 2 +- src/sq_errorstring.h | 2 +- src/sq_externaltool.cpp | 8 +++--- src/sq_externaltool.h | 2 +- src/sq_filedetailview.cpp | 6 ++--- src/sq_fileiconview.h | 2 +- src/sq_fileiconviewbase.cpp | 8 +++--- src/sq_fileiconviewbase.h | 2 +- src/sq_filethumbview.h | 2 +- src/sq_glparts.cpp | 8 +++--- src/sq_glparts.h | 6 ++--- src/sq_glview.cpp | 12 ++++----- src/sq_glview.h | 2 +- src/sq_glwidget.cpp | 12 ++++----- src/sq_glwidget.h | 2 +- src/sq_glwidget_helpers.cpp | 2 +- src/sq_glwidget_helpers.h | 2 +- src/sq_glwidget_stuff.cpp | 18 ++++++------- src/sq_hloptions.cpp | 2 +- src/sq_iconlistbox.cpp | 4 +-- src/sq_iconlistbox.h | 2 +- src/sq_iconlistitem.cpp | 4 +-- src/sq_iconloader.cpp | 4 +-- src/sq_iconloader.h | 2 +- src/sq_imageloader.cpp | 12 ++++----- src/sq_imageloader.h | 2 +- src/sq_library.h | 2 +- src/sq_libraryhandler.cpp | 12 ++++----- src/sq_libraryhandler.h | 2 +- src/sq_navigatordropmenu.cpp | 10 ++++---- src/sq_navigatordropmenu.h | 2 +- src/sq_pixmapcache.cpp | 2 +- src/sq_popupmenu.h | 2 +- src/sq_progress.cpp | 4 +-- src/sq_progress.h | 2 +- src/sq_progressbox.h | 2 +- src/sq_slideshowwidget.cpp | 8 +++--- src/sq_slideshowwidget.h | 2 +- src/sq_splashscreen.cpp | 4 +-- src/sq_splashscreen.h | 2 +- src/sq_thumbnailloadjob.cpp | 2 +- src/sq_thumbnailsize.cpp | 2 +- src/sq_thumbnailsunused.cpp | 2 +- src/sq_thumbnailsunused.h | 2 +- src/sq_utils.cpp | 6 ++--- src/sq_widgetstack.cpp | 2 +- src/sq_widgetstack.h | 2 +- 118 files changed, 309 insertions(+), 309 deletions(-) diff --git a/src/fmt_filters.cpp b/src/fmt_filters.cpp index 9f6222c..0cc33d0 100644 --- a/src/fmt_filters.cpp +++ b/src/fmt_filters.cpp @@ -940,13 +940,13 @@ void blur(const image &im, double radius, double sigma) if(sigma == 0.0) return; - kernel = 0; + kernel = nullptr; if(radius > 0) width = getBlurKernel((s32)(2*ceil(radius)+1), sigma, &kernel); else { - double *last_kernel = 0; + double *last_kernel = nullptr; width = getBlurKernel(3, sigma, &kernel); @@ -956,7 +956,7 @@ void blur(const image &im, double radius, double sigma) delete [] last_kernel; last_kernel = kernel; - kernel = 0; + kernel = nullptr; width = getBlurKernel(width+2, sigma, &kernel); } @@ -1255,7 +1255,7 @@ void edge(image &im, double radius) double *kernel; int width; long i; - rgba *dest = 0; + rgba *dest = nullptr; width = getOptimalKernelWidth(radius, 0.5); @@ -1299,7 +1299,7 @@ void emboss(image &im, double radius, double sigma) double alpha, *kernel; int j, width; long i, u, v; - rgba *dest = 0; + rgba *dest = nullptr; if(sigma == 0.0) return; @@ -1361,7 +1361,7 @@ void sharpen(image &im, double radius, double sigma) double alpha, normalize, *kernel; int width; long i, u, v; - rgba *dest = 0; + rgba *dest = nullptr; if(sigma == 0.0) sigma = 0.01; @@ -1423,7 +1423,7 @@ void oil(const image &im, double radius) int width; int x, y, mx, my, sx, sy; int mcx, mcy; - rgba *s = 0, *q; + rgba *s = nullptr, *q; scaleDown(radius, 1.0, 5.0); @@ -2169,7 +2169,7 @@ static void hull(const s32 x_offset, const s32 y_offset, const s32 polarity, con u8 *p, *q, *r, *s; u32 v; - if(f == 0 || g == 0) + if(!f || !g) return; p = f+(columns+2); diff --git a/src/fmt_filters.h b/src/fmt_filters.h index 9f6cb5d..8390190 100644 --- a/src/fmt_filters.h +++ b/src/fmt_filters.h @@ -98,7 +98,7 @@ namespace fmt_filters struct image { - image() : data(0), w(0), h(0), rw(0), rh(0) + image() : data(nullptr), w(0), h(0), rw(0), rh(0) {} image(unsigned char *d, int _w, int _h) : data(d), w(_w), h(_h), rw(_w), rh(_h) diff --git a/src/imageedit/sq_bcglabel.h b/src/imageedit/sq_bcglabel.h index d8546a9..c432af4 100644 --- a/src/imageedit/sq_bcglabel.h +++ b/src/imageedit/sq_bcglabel.h @@ -27,7 +27,7 @@ class SQ_BCGLabel : public TQLabel { public: - SQ_BCGLabel(TQWidget *parent, const char *name = 0, WFlags f = 0); + SQ_BCGLabel(TQWidget *parent, const char *name = nullptr, WFlags f = 0); ~SQ_BCGLabel(); }; diff --git a/src/imageedit/sq_converter.cpp b/src/imageedit/sq_converter.cpp index ebe8e72..67e4a15 100644 --- a/src/imageedit/sq_converter.cpp +++ b/src/imageedit/sq_converter.cpp @@ -42,7 +42,7 @@ #include "sq_imageloader.h" #include "sq_imageconvert.h" -SQ_Converter * SQ_Converter::m_sing = 0; +SQ_Converter * SQ_Converter::m_sing = nullptr; SQ_Converter::SQ_Converter(TQObject *parent) : TQObject(parent) { @@ -53,7 +53,7 @@ SQ_Converter::SQ_Converter(TQObject *parent) : TQObject(parent) special_action = i18n("Converting"); - image = 0; + image = nullptr; } SQ_Converter::~SQ_Converter() @@ -314,7 +314,7 @@ void SQ_Converter::decodingCycle() if(image) { free(image); - image = 0; + image = nullptr; } delete convert; @@ -330,7 +330,7 @@ int SQ_Converter::manipAndWriteDecodedImage(const TQString &name, fmt_image *im) { int passes = opt.interlaced ? lw->opt.passes : 1; int s, j, err; - RGBA *scan = 0; + RGBA *scan = nullptr; scan = new RGBA [im->w]; diff --git a/src/imageedit/sq_label.h b/src/imageedit/sq_label.h index 6d0edd5..1b131da 100644 --- a/src/imageedit/sq_label.h +++ b/src/imageedit/sq_label.h @@ -23,7 +23,7 @@ class SQ_Label : public TQWidget { public: - SQ_Label(TQWidget *parent = 0, const char *name = 0); + SQ_Label(TQWidget *parent = nullptr, const char *name = nullptr); ~SQ_Label(); void setText(const TQString <, const TQString &rt); diff --git a/src/ksquirrel-libs-configurator/main.cpp b/src/ksquirrel-libs-configurator/main.cpp index cf1f931..83fb39a 100644 --- a/src/ksquirrel-libs-configurator/main.cpp +++ b/src/ksquirrel-libs-configurator/main.cpp @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) TDEGlobal::locale()->insertCatalogue("ksquirrel"); TDEGlobal::locale()->setActiveCatalogue("ksquirrel"); - KLC *klc = new KLC(0, App); + KLC *klc = new KLC(nullptr, App); app.setMainWidget(klc); diff --git a/src/ksquirrel.cpp b/src/ksquirrel.cpp index 59211c9..43df592 100644 --- a/src/ksquirrel.cpp +++ b/src/ksquirrel.cpp @@ -122,7 +122,7 @@ static const int menuParam = 100000; -KSquirrel * KSquirrel::m_instance = 0; +KSquirrel * KSquirrel::m_instance = nullptr; KSquirrel::KSquirrel(TQWidget *parent, const char *name) : TDEMainWindow (parent, name), DCOPObject(name) @@ -152,9 +152,9 @@ KSquirrel::KSquirrel(TQWidget *parent, const char *name) SQ_ThumbnailSize::Large))); thumbSize->setExtended(tdeconf->readBoolEntry("extended", false)); - sqFiltersName = 0; - pCurrentURL = 0; - mainPage = 0; + sqFiltersName = nullptr; + pCurrentURL = nullptr; + mainPage = nullptr; SQ_SplashScreen::advance(); @@ -455,7 +455,7 @@ void KSquirrel::initFilterMenu() actionFilterMenu->setItemParameter(id, i++); } - disconnect(actionFilterMenu, TQ_SIGNAL(activated(int)), 0, 0); + disconnect(actionFilterMenu, TQ_SIGNAL(activated(int)), nullptr, nullptr); connect(actionFilterMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetFilter(int))); // finally, set current filter @@ -799,29 +799,29 @@ void KSquirrel::createActions() pAOpenAndSet = new TDEAction(i18n("Open file and change directory"), "document-open", CTRL+ALT+TQt::Key_O, this, TQ_SLOT(slotOpenFileAndSet()), actionCollection(), "SQ open and set"); pAOpen = new TDEAction(i18n("Open file"), "document-open", CTRL+TQt::Key_O, this, TQ_SLOT(slotOpenFile()), actionCollection(), "SQ open file"); pATCMaster = new TDEAction(i18n("Thumbnail cache manager..."), "cache", 0, this, TQ_SLOT(slotTCMaster()), actionCollection(), "SQ TC Master"); - pASelectAll = KStdAction::selectAll(0, 0, actionCollection(), "SQ Select All"); - pADeselectAll = KStdAction::deselect(0, 0, actionCollection(), "SQ Deselect All"); + pASelectAll = KStdAction::selectAll(nullptr, nullptr, actionCollection(), "SQ Select All"); + pADeselectAll = KStdAction::deselect(nullptr, nullptr, actionCollection(), "SQ Deselect All"); pARaiseListView = new TDERadioAction(i18n("List"), "view_multicolumn", 0, this, TQ_SLOT(slotRaiseListView()), actionCollection(), "SQ raise list view"); pARaiseIconView = new TDERadioAction(i18n("Icons"), "view_icon", 0, this, TQ_SLOT(slotRaiseIconView()), actionCollection(), "SQ raise icon view"); pARaiseDetailView = new TDERadioAction(i18n("Details"), "view_detailed", 0, this, TQ_SLOT(slotRaiseDetailView()), actionCollection(), "SQ raise detailed view"); pARaiseThumbView = new TDERadioAction(i18n("Thumbnails"), "view_icon", 0, this, TQ_SLOT(slotRaiseThumbView()), actionCollection(), "SQ raise thumbs view"); - pAURL = new TDEToggleAction(i18n("Show URL box"), "history", CTRL+TQt::Key_U, 0, 0, actionCollection(), "SQ toggle url box"); + pAURL = new TDEToggleAction(i18n("Show URL box"), "history", CTRL+TQt::Key_U, nullptr, nullptr, actionCollection(), "SQ toggle url box"); pASlideShow = new TDEAction(i18n("Slideshow"), "folder_video", CTRL+TQt::Key_S, this, TQ_SLOT(slotSlideShowStart()), actionCollection(), "SQ Slideshow"); - pASlideShowDialog = new TDEAction(i18n("Slideshow advanced"), 0, CTRL+ALT+TQt::Key_S, this, TQ_SLOT(slotSlideShowDialog()), actionCollection(), "SQ SlideShow Dialog"); + pASlideShowDialog = new TDEAction(i18n("Slideshow advanced"), nullptr, CTRL+ALT+TQt::Key_S, this, TQ_SLOT(slotSlideShowDialog()), actionCollection(), "SQ SlideShow Dialog"); pARename = new TDEAction(i18n("Rename"), "file_move", TQt::Key_F2, this, TQ_SLOT(slotRename()), actionCollection(), "SQ Rename"); pAPluginsInfo = new TDEAction(i18n("Codec information..."), "application-vnd.tde.info", 0, this, TQ_SLOT(slotPluginsInfo()), actionCollection(), "SQ Plugins Info"); - pAPluginsDel = new TDEAction(i18n("Codec manager..."), 0, 0, this, TQ_SLOT(slotPluginsDel()), actionCollection(), "SQ Plugins Deleter"); - pAGLInfo = new TDEAction(i18n("OpenGL information..."), 0, 0, this, TQ_SLOT(slotGLInfo()), actionCollection(), "SQ OpenGL Info"); + pAPluginsDel = new TDEAction(i18n("Codec manager..."), nullptr, 0, this, TQ_SLOT(slotPluginsDel()), actionCollection(), "SQ Plugins Deleter"); + pAGLInfo = new TDEAction(i18n("OpenGL information..."), nullptr, 0, this, TQ_SLOT(slotGLInfo()), actionCollection(), "SQ OpenGL Info"); pAThumb1 = new TDERadioAction(i18n("Medium thumbnails"), locate("data", "images/thumbs/thumbs_medium.png"), 0, this, TQ_SLOT(slotThumbsMedium()), actionCollection(), "SQ thumbs1"); pAThumb2 = new TDERadioAction(i18n("Large thumbnails"), locate("data", "images/thumbs/thumbs_large.png"), 0, this, TQ_SLOT(slotThumbsLarge()), actionCollection(), "SQ thumbs2"); pAThumb3 = new TDERadioAction(i18n("Huge thumbnails"), locate("data", "images/thumbs/thumbs_huge.png"), 0, this, TQ_SLOT(slotThumbsHuge()), actionCollection(), "SQ thumbs3"); - pASelectGroup = new TDEAction(i18n("Select group"), "zoom-in", CTRL+TQt::Key_Plus, 0, 0, actionCollection(), "SQ Select Group"); - pADeselectGroup = new TDEAction(i18n("Deselect group"), "zoom-out", CTRL+TQt::Key_Minus, 0, 0, actionCollection(), "SQ Deselect Group"); + pASelectGroup = new TDEAction(i18n("Select group"), "zoom-in", CTRL+TQt::Key_Plus, nullptr, nullptr, actionCollection(), "SQ Select Group"); + pADeselectGroup = new TDEAction(i18n("Deselect group"), "zoom-out", CTRL+TQt::Key_Minus, nullptr, nullptr, actionCollection(), "SQ Deselect Group"); const TQString thumbs_size__ = TQString::fromLatin1("thumbs_size__"); pAThumb1->setExclusiveGroup(thumbs_size__); @@ -841,7 +841,7 @@ void KSquirrel::createActions() pAThumbs->insert(pAThumb3); pAThumbs->insert(new TDEActionSeparator(actionCollection())); - pAThumbsE = new TDEToggleAction(i18n("Extended thumbnails"), "", CTRL+TQt::Key_E, 0, 0, actionCollection(), "SQ Extended thumbs"); + pAThumbsE = new TDEToggleAction(i18n("Extended thumbnails"), "", CTRL+TQt::Key_E, nullptr, nullptr, actionCollection(), "SQ Extended thumbs"); tdeconf->setGroup("Thumbnails"); pAThumbsE->setChecked(tdeconf->readBoolEntry("extended", false)); connect(pAThumbsE, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotExtendedToggled(bool))); @@ -1137,7 +1137,7 @@ void KSquirrel::slotRescan() void KSquirrel::createPostSplash() { TQColor cc(255,255,255); - TQHBox *hbox = new TQHBox(0, 0, TQt::WStyle_StaysOnTop | TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WX11BypassWM); + TQHBox *hbox = new TQHBox(nullptr, nullptr, TQt::WStyle_StaysOnTop | TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WX11BypassWM); hbox->setFrameShape(TQFrame::Box); TQLabel *pp = new TQLabel(hbox); @@ -1252,7 +1252,7 @@ void KSquirrel::preCreate() connect(down, TQ_SIGNAL(result(const KURL &)), this, TQ_SLOT(slotDownloaderResult(const KURL &))); - SQ_SlideShowWidget *sls = new SQ_SlideShowWidget(0, "ksquirrel-slideshow"); + SQ_SlideShowWidget *sls = new SQ_SlideShowWidget(nullptr, "ksquirrel-slideshow"); connect(sls, TQ_SIGNAL(stopSlideShow()), this, TQ_SLOT(slotStopSlideShow())); connect(sls, TQ_SIGNAL(pause()), this, TQ_SLOT(slotPauseSlideShow())); @@ -1705,9 +1705,9 @@ void KSquirrel::printDCOP() void KSquirrel::navigatorSend(const TQString &command) { if(command == "next") - pWidgetStack->moveTo(SQ_WidgetStack::Next, 0, false); + pWidgetStack->moveTo(SQ_WidgetStack::Next, nullptr, false); else if(command == "previous") - pWidgetStack->moveTo(SQ_WidgetStack::Previous, 0, false); + pWidgetStack->moveTo(SQ_WidgetStack::Previous, nullptr, false); else if(command == "execute") { KFileItem *fi = pWidgetStack->diroperator()->view()->currentFileItem(); @@ -1868,7 +1868,7 @@ void KSquirrel::slotSlideShowJobResult(TDEIO::Job *job) if(!job->error()) slideShowPrivate(); - listing = 0; + listing = nullptr; } // Invoke dialog for advanced slideshow @@ -1889,7 +1889,7 @@ void KSquirrel::slideShowPrivate() slideShowInit = true; slideShowDirection = KSquirrel::Default; - disconnect(slideShowTimer, TQ_SIGNAL(timeout()), 0, 0); + disconnect(slideShowTimer, TQ_SIGNAL(timeout()), nullptr, nullptr); connect(slideShowTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSlideShowNextImage())); tdeconf->setGroup("Slideshow"); @@ -1956,7 +1956,7 @@ void KSquirrel::slideShowDetermine() if(!slideShowRepeat) { // nice hack to make final delay - disconnect(slideShowTimer, TQ_SIGNAL(timeout()), 0, 0); + disconnect(slideShowTimer, TQ_SIGNAL(timeout()), nullptr, nullptr); connect(slideShowTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotStopSlideShow())); slideShowTimer->start(slideShowDelay, true); return; diff --git a/src/ksquirrelpart/fmt_filters.cpp b/src/ksquirrelpart/fmt_filters.cpp index 860cdeb..275c6e0 100644 --- a/src/ksquirrelpart/fmt_filters.cpp +++ b/src/ksquirrelpart/fmt_filters.cpp @@ -939,13 +939,13 @@ void blur(const image &im, double radius, double sigma) if(sigma == 0.0) return; - kernel = 0; + kernel = nullptr; if(radius > 0) width = getBlurKernel((s32)(2*ceil(radius)+1), sigma, &kernel); else { - double *last_kernel = 0; + double *last_kernel = nullptr; width = getBlurKernel(3, sigma, &kernel); @@ -955,7 +955,7 @@ void blur(const image &im, double radius, double sigma) delete [] last_kernel; last_kernel = kernel; - kernel = 0; + kernel = nullptr; width = getBlurKernel(width+2, sigma, &kernel); } @@ -1254,7 +1254,7 @@ void edge(image &im, double radius) double *kernel; int width; long i; - rgba *dest = 0; + rgba *dest = nullptr; width = getOptimalKernelWidth(radius, 0.5); @@ -1298,7 +1298,7 @@ void emboss(image &im, double radius, double sigma) double alpha, *kernel; int j, width; long i, u, v; - rgba *dest = 0; + rgba *dest = nullptr; if(sigma == 0.0) return; @@ -1360,7 +1360,7 @@ void sharpen(image &im, double radius, double sigma) double alpha, normalize, *kernel; int width; long i, u, v; - rgba *dest = 0; + rgba *dest = nullptr; if(sigma == 0.0) sigma = 0.01; @@ -1422,7 +1422,7 @@ void oil(const image &im, double radius) int width; int x, y, mx, my, sx, sy; int mcx, mcy; - rgba *s = 0, *q; + rgba *s = nullptr, *q; scaleDown(radius, 1.0, 5.0); @@ -2168,7 +2168,7 @@ static void hull(const s32 x_offset, const s32 y_offset, const s32 polarity, con u8 *p, *q, *r, *s; u32 v; - if(f == 0 || g == 0) + if(!f || !g) return; p = f+(columns+2); diff --git a/src/ksquirrelpart/fmt_filters.h b/src/ksquirrelpart/fmt_filters.h index 9f6cb5d..8390190 100644 --- a/src/ksquirrelpart/fmt_filters.h +++ b/src/ksquirrelpart/fmt_filters.h @@ -98,7 +98,7 @@ namespace fmt_filters struct image { - image() : data(0), w(0), h(0), rw(0), rh(0) + image() : data(nullptr), w(0), h(0), rw(0), rh(0) {} image(unsigned char *d, int _w, int _h) : data(d), w(_w), h(_h), rw(_w), rh(_h) diff --git a/src/ksquirrelpart/ksquirrelpart.cpp b/src/ksquirrelpart/ksquirrelpart.cpp index c65dc3b..1b91a1f 100644 --- a/src/ksquirrelpart/ksquirrelpart.cpp +++ b/src/ksquirrelpart/ksquirrelpart.cpp @@ -152,11 +152,11 @@ KSquirrelPart::KSquirrelPart(TQWidget *parentWidget, const char *, TQString group = "selection_group"; - ar = new TDEToggleAction(i18n("Rectangle"), "rectangle", TDEShortcut(TQt::Key_R+CTRL), 0, 0, actionCollection(), "ksquirrelpart rectangle"); + ar = new TDEToggleAction(i18n("Rectangle"), "rectangle", TDEShortcut(TQt::Key_R+CTRL), nullptr, nullptr, actionCollection(), "ksquirrelpart rectangle"); ar->setExclusiveGroup(group); connect(ar, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSelectionRect(bool))); - ae = new TDEToggleAction(i18n("Ellipse"), "circle", TDEShortcut(TQt::Key_E+CTRL), 0, 0, actionCollection(), "ksquirrelpart ellipse"); + ae = new TDEToggleAction(i18n("Ellipse"), "circle", TDEShortcut(TQt::Key_E+CTRL), nullptr, nullptr, actionCollection(), "ksquirrelpart ellipse"); ae->setExclusiveGroup(group); connect(ae, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSelectionEllipse(bool))); @@ -214,7 +214,7 @@ TDEAboutData* KSquirrelPart::createAboutData() bool KSquirrelPart::openFile() { - emit started(0); + emit started(nullptr); KFileItem fi(KFileItem::Unknown, KFileItem::Unknown, m_url); SQ_DirOperator::instance()->execute(&fi); diff --git a/src/ksquirrelpart/ksquirrelpart.h b/src/ksquirrelpart/ksquirrelpart.h index 0c2a91f..58730cf 100644 --- a/src/ksquirrelpart/ksquirrelpart.h +++ b/src/ksquirrelpart/ksquirrelpart.h @@ -34,7 +34,7 @@ class KSquirrelPartBrowserExtension: public KParts::BrowserExtension public: - KSquirrelPartBrowserExtension(KSquirrelPart* viewPart, const char *name = 0); + KSquirrelPartBrowserExtension(KSquirrelPart* viewPart, const char *name = nullptr); ~KSquirrelPartBrowserExtension(); public slots: diff --git a/src/ksquirrelpart/sq_bcglabel.h b/src/ksquirrelpart/sq_bcglabel.h index d8546a9..c432af4 100644 --- a/src/ksquirrelpart/sq_bcglabel.h +++ b/src/ksquirrelpart/sq_bcglabel.h @@ -27,7 +27,7 @@ class SQ_BCGLabel : public TQLabel { public: - SQ_BCGLabel(TQWidget *parent, const char *name = 0, WFlags f = 0); + SQ_BCGLabel(TQWidget *parent, const char *name = nullptr, WFlags f = 0); ~SQ_BCGLabel(); }; diff --git a/src/ksquirrelpart/sq_config.cpp b/src/ksquirrelpart/sq_config.cpp index ea0fc4b..8df8cc2 100644 --- a/src/ksquirrelpart/sq_config.cpp +++ b/src/ksquirrelpart/sq_config.cpp @@ -21,7 +21,7 @@ #include "sq_config.h" -SQ_Config * SQ_Config::m_instance = 0; +SQ_Config * SQ_Config::m_instance = nullptr; SQ_Config::SQ_Config(TQObject *parent) : TQObject(parent) { diff --git a/src/ksquirrelpart/sq_config.h b/src/ksquirrelpart/sq_config.h index 73cf0c4..f57fad3 100644 --- a/src/ksquirrelpart/sq_config.h +++ b/src/ksquirrelpart/sq_config.h @@ -30,7 +30,7 @@ class TDEConfig; class SQ_Config : public TQObject { public: - SQ_Config(TQObject *parent = 0); + SQ_Config(TQObject *parent = nullptr); ~SQ_Config(); static SQ_Config* instance() { return m_instance; } @@ -44,9 +44,9 @@ class SQ_Config : public TQObject TQStringList readListEntry( const TQString& pKey, char sep = ',' ) const; int readNumEntry( const TQString& pKey, int nDefault = 0 ) const; bool readBoolEntry( const TQString& pKey, bool bDefault = false ) const; - TQRect readRectEntry( const TQString& pKey, const TQRect* pDefault = 0L ) const; - TQPoint readPointEntry( const TQString& pKey, const TQPoint* pDefault = 0L ) const; - TQSize readSizeEntry( const TQString& pKey, const TQSize* pDefault = 0L ) const; + TQRect readRectEntry( const TQString& pKey, const TQRect* pDefault = nullptr ) const; + TQPoint readPointEntry( const TQString& pKey, const TQPoint* pDefault = nullptr ) const; + TQSize readSizeEntry( const TQString& pKey, const TQSize* pDefault = nullptr ) const; double readDoubleNumEntry( const TQString& pKey, double nDefault = 0.0 ) const; TQValueList readIntListEntry( const TQString& pKey ) const; diff --git a/src/ksquirrelpart/sq_diroperator.cpp b/src/ksquirrelpart/sq_diroperator.cpp index bf2232f..1e33a69 100644 --- a/src/ksquirrelpart/sq_diroperator.cpp +++ b/src/ksquirrelpart/sq_diroperator.cpp @@ -23,7 +23,7 @@ #include "sq_downloader.h" #include "sq_glwidget.h" -SQ_DirOperator * SQ_DirOperator::m_inst = 0; +SQ_DirOperator * SQ_DirOperator::m_inst = nullptr; SQ_DirOperator::SQ_DirOperator(TQObject *parent) : TQObject(parent) { diff --git a/src/ksquirrelpart/sq_diroperator.h b/src/ksquirrelpart/sq_diroperator.h index 73eceac..f83b4ed 100644 --- a/src/ksquirrelpart/sq_diroperator.h +++ b/src/ksquirrelpart/sq_diroperator.h @@ -32,14 +32,14 @@ class SQ_DirOperator : public TQObject public: - SQ_DirOperator(TQObject *parent = 0); + SQ_DirOperator(TQObject *parent = nullptr); ~SQ_DirOperator(); static SQ_DirOperator* instance() { return m_inst; } void execute(KFileItem *item); - void del(const KURL &u, TQWidget *parent = 0); + void del(const KURL &u, TQWidget *parent = nullptr); private: void executePrivate(KFileItem *); diff --git a/src/ksquirrelpart/sq_downloader.cpp b/src/ksquirrelpart/sq_downloader.cpp index e877850..69b6214 100644 --- a/src/ksquirrelpart/sq_downloader.cpp +++ b/src/ksquirrelpart/sq_downloader.cpp @@ -30,7 +30,7 @@ #define SQ_PREDOWNLOAD_SIZE 50 -SQ_Downloader::SQ_Downloader(TQObject *parent, const char *name) : TQObject(parent, name), job(0), m_error(false) +SQ_Downloader::SQ_Downloader(TQObject *parent, const char *name) : TQObject(parent, name), job(nullptr), m_error(false) { tmp = new KTempFile; tmp->setAutoDelete(true); @@ -108,7 +108,7 @@ void SQ_Downloader::slotData(TDEIO::Job *job, const TQByteArray &ba) void SQ_Downloader::slotDataResult(TDEIO::Job *cpjob) { - job = 0; + job = nullptr; // job error if(cpjob->error() && cpjob->error() != TDEIO::ERR_USER_CANCELED) diff --git a/src/ksquirrelpart/sq_downloader.h b/src/ksquirrelpart/sq_downloader.h index 6b91a3f..762e220 100644 --- a/src/ksquirrelpart/sq_downloader.h +++ b/src/ksquirrelpart/sq_downloader.h @@ -34,7 +34,7 @@ class SQ_Downloader : public TQObject public: - SQ_Downloader(TQObject *parent = 0, const char *name = 0); + SQ_Downloader(TQObject *parent = nullptr, const char *name = nullptr); ~SQ_Downloader(); void start(KFileItem *fi); diff --git a/src/ksquirrelpart/sq_errorstring.cpp b/src/ksquirrelpart/sq_errorstring.cpp index f762ee3..c278719 100644 --- a/src/ksquirrelpart/sq_errorstring.cpp +++ b/src/ksquirrelpart/sq_errorstring.cpp @@ -23,7 +23,7 @@ #include -SQ_ErrorString * SQ_ErrorString::m_instance = 0; +SQ_ErrorString * SQ_ErrorString::m_instance = nullptr; SQ_ErrorString::SQ_ErrorString(TQObject *parent) : TQObject(parent) { diff --git a/src/ksquirrelpart/sq_errorstring.h b/src/ksquirrelpart/sq_errorstring.h index 400451d..21c66d4 100644 --- a/src/ksquirrelpart/sq_errorstring.h +++ b/src/ksquirrelpart/sq_errorstring.h @@ -33,7 +33,7 @@ class SQ_ErrorString : public TQObject { public: - SQ_ErrorString(TQObject *parent = 0); + SQ_ErrorString(TQObject *parent = nullptr); ~SQ_ErrorString(); /* diff --git a/src/ksquirrelpart/sq_externaltool.cpp b/src/ksquirrelpart/sq_externaltool.cpp index ca3650b..0af7e26 100644 --- a/src/ksquirrelpart/sq_externaltool.cpp +++ b/src/ksquirrelpart/sq_externaltool.cpp @@ -33,7 +33,7 @@ #include "sq_popupmenu.h" #include "sq_config.h" -SQ_ExternalTool * SQ_ExternalTool::m_instance = 0; +SQ_ExternalTool * SQ_ExternalTool::m_instance = nullptr; Tool::Tool() {} @@ -48,7 +48,7 @@ Tool::Tool(const TQString &pix, const TQString &nam, const TQString &com) SQ_ExternalTool::SQ_ExternalTool(TQObject *parent) : TQObject(parent), TQValueVector() { m_instance = this; - menu = new SQ_PopupMenu(0, "External tools"); + menu = new SQ_PopupMenu(nullptr, "External tools"); connect(menu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotAboutToShowMenu())); connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivateTool(int))); @@ -208,12 +208,12 @@ void SQ_ExternalTool::slotActivateTool(int id) // %F = multiple files if(per_f && per_F) { - KMessageBox::error(0, i18n("Command cannot contain both \"%f\" and \"%F\""), i18n("Error processing command")); + KMessageBox::error(nullptr, i18n("Command cannot contain both \"%f\" and \"%F\""), i18n("Error processing command")); return; } else if(!per_f && !per_F) { - KMessageBox::error(0, i18n("Command should contain \"%f\" or \"%F\""), i18n("Error processing command")); + KMessageBox::error(nullptr, i18n("Command should contain \"%f\" or \"%F\""), i18n("Error processing command")); return; } else if(per_f) diff --git a/src/ksquirrelpart/sq_externaltool.h b/src/ksquirrelpart/sq_externaltool.h index 12e6858..cdcacf1 100644 --- a/src/ksquirrelpart/sq_externaltool.h +++ b/src/ksquirrelpart/sq_externaltool.h @@ -46,7 +46,7 @@ class SQ_ExternalTool : public TQObject, public TQValueVector public: - SQ_ExternalTool(TQObject *parent = 0); + SQ_ExternalTool(TQObject *parent = nullptr); ~SQ_ExternalTool(); /* diff --git a/src/ksquirrelpart/sq_glparts.cpp b/src/ksquirrelpart/sq_glparts.cpp index ec55d89..63799c2 100644 --- a/src/ksquirrelpart/sq_glparts.cpp +++ b/src/ksquirrelpart/sq_glparts.cpp @@ -22,7 +22,7 @@ /* ***************************************************************************************** */ -Parts::Parts() : w(0), h(0), realw(0), realh(0), m_parts(0), buffer(0) +Parts::Parts() : w(0), h(0), realw(0), realh(0), m_parts(0), buffer(nullptr) {} Part::Part() : x1(0), y1(0), x2(0), y2(0), tex(0), list(0) @@ -30,7 +30,7 @@ Part::Part() : x1(0), y1(0), x2(0), y2(0), tex(0), list(0) /* ***************************************************************************************** */ -memoryPart::memoryPart(const int sz) : m_size(sz), m_data(0) +memoryPart::memoryPart(const int sz) : m_size(sz), m_data(nullptr) {} memoryPart::~memoryPart() @@ -188,8 +188,8 @@ void Tab::empty() orient = -1; rotate = 0; fmt_size = 0; - lib = 0; - codeK = 0; + lib = nullptr; + codeK = nullptr; current = 0; curangle = 0; total = 0; diff --git a/src/ksquirrelpart/sq_glparts.h b/src/ksquirrelpart/sq_glparts.h index 24c538c..aa28a72 100644 --- a/src/ksquirrelpart/sq_glparts.h +++ b/src/ksquirrelpart/sq_glparts.h @@ -60,13 +60,13 @@ inline void memoryPart::del() { delete [] m_data; - m_data = 0; + m_data = nullptr; } inline bool memoryPart::valid() const { - return m_data != 0; + return m_data != nullptr; } /* *************************************************************** */ @@ -103,7 +103,7 @@ inline void Parts::deleteBuffer() { delete buffer; - buffer = 0; + buffer = nullptr; } /* *************************************************************** */ diff --git a/src/ksquirrelpart/sq_glview.cpp b/src/ksquirrelpart/sq_glview.cpp index 64911bb..491f0ca 100644 --- a/src/ksquirrelpart/sq_glview.cpp +++ b/src/ksquirrelpart/sq_glview.cpp @@ -19,7 +19,7 @@ #include "sq_glview.h" -SQ_GLView * SQ_GLView::m_inst = 0; +SQ_GLView * SQ_GLView::m_inst = nullptr; /***************************************/ diff --git a/src/ksquirrelpart/sq_glview.h b/src/ksquirrelpart/sq_glview.h index 01973d2..506ff3f 100644 --- a/src/ksquirrelpart/sq_glview.h +++ b/src/ksquirrelpart/sq_glview.h @@ -28,7 +28,7 @@ class SQ_TextSetter : public TQObject public: - SQ_TextSetter(TQObject *parent = 0); + SQ_TextSetter(TQObject *parent = nullptr); ~SQ_TextSetter(); void setText(const TQString &); diff --git a/src/ksquirrelpart/sq_glwidget.cpp b/src/ksquirrelpart/sq_glwidget.cpp index 0985b0b..0602110 100644 --- a/src/ksquirrelpart/sq_glwidget.cpp +++ b/src/ksquirrelpart/sq_glwidget.cpp @@ -91,7 +91,7 @@ /* ***************************************************************************************** */ -SQ_GLWidget * SQ_GLWidget::m_instance = 0; +SQ_GLWidget * SQ_GLWidget::m_instance = nullptr; static const int timer_delay_file = 5; static const double rad_const = 3.14159265358979323846 / 180.0; @@ -116,10 +116,10 @@ SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent connect(&t_glv, TQ_SIGNAL(message(const TQString &)), this, TQ_SIGNAL(message(const TQString &))); #endif - zoomMenu = 0; - selectionMenu = 0; - images = 0; - parts_broken = 0; + zoomMenu = nullptr; + selectionMenu = nullptr; + images = nullptr; + parts_broken = nullptr; ac = new TDEActionCollection(this, this, "GLWidget actionCollection"); changed = blocked = decoded = reset_mode = false; @@ -1873,7 +1873,7 @@ void SQ_GLWidget::decodeFailedOn0(const int err_code) decoded = (bool)tabs.size(); reset_mode = false; tab->broken = true; - tab->lib = 0; + tab->lib = nullptr; useBrokenImage(err_code); } diff --git a/src/ksquirrelpart/sq_glwidget.h b/src/ksquirrelpart/sq_glwidget.h index be4903f..e2405d8 100644 --- a/src/ksquirrelpart/sq_glwidget.h +++ b/src/ksquirrelpart/sq_glwidget.h @@ -127,7 +127,7 @@ class SQ_GLWidget : public TQGLWidget public: - SQ_GLWidget(TQWidget *parent = 0, const char *name = 0); + SQ_GLWidget(TQWidget *parent = nullptr, const char *name = nullptr); ~SQ_GLWidget(); void setDownloadPercents(int); diff --git a/src/ksquirrelpart/sq_glwidget_helpers.cpp b/src/ksquirrelpart/sq_glwidget_helpers.cpp index 0dd96c0..6f5d994 100644 --- a/src/ksquirrelpart/sq_glwidget_helpers.cpp +++ b/src/ksquirrelpart/sq_glwidget_helpers.cpp @@ -38,7 +38,7 @@ #include "sq_glwidget_helpers.h" SQ_ToolButtonPopup::SQ_ToolButtonPopup(const TQPixmap &pix, const TQString &textLabel, TDEToolBar *parent) - : TDEToolBarButton(pix, -1, parent, 0, textLabel) + : TDEToolBarButton(pix, -1, parent, nullptr, textLabel) { setFixedWidth(SQ_ToolButton::fixedWidth()); } diff --git a/src/ksquirrelpart/sq_glwidget_helpers.h b/src/ksquirrelpart/sq_glwidget_helpers.h index f8cfbd3..d7e499a 100644 --- a/src/ksquirrelpart/sq_glwidget_helpers.h +++ b/src/ksquirrelpart/sq_glwidget_helpers.h @@ -37,7 +37,7 @@ class SQ_ToolButton : public TQToolButton { public: SQ_ToolButton(const TQIconSet &iconSet, const TQString &textLabel, TQObject *receiver, - const char *slot, TDEToolBar *parent, const char *name = 0); + const char *slot, TDEToolBar *parent, const char *name = nullptr); ~SQ_ToolButton(); static int fixedWidth(); diff --git a/src/ksquirrelpart/sq_glwidget_stuff.cpp b/src/ksquirrelpart/sq_glwidget_stuff.cpp index dde9927..1200fd5 100644 --- a/src/ksquirrelpart/sq_glwidget_stuff.cpp +++ b/src/ksquirrelpart/sq_glwidget_stuff.cpp @@ -80,16 +80,16 @@ void SQ_GLWidget::createActions() { pASelectionRect = new TDEToggleAction(i18n("Rectangle"), TQPixmap(locate("data", "images/actions/glselection_rect.png")), 0, this, TQ_SLOT(slotSelectionRect()), ac, "SQ Selection Rect"); pASelectionEllipse = new TDEToggleAction(i18n("Ellipse"), TQPixmap(locate("data", "images/actions/glselection_ellipse.png")), 0, this, TQ_SLOT(slotSelectionEllipse()), ac, "SQ Selection Ellipse"); - pASelectionClear = new TDEAction(i18n("Clear"), 0, 0, this, TQ_SLOT(slotSelectionClear()), ac, "SQ Selection Clear"); + pASelectionClear = new TDEAction(i18n("Clear"), nullptr, 0, this, TQ_SLOT(slotSelectionClear()), ac, "SQ Selection Clear"); pAZoomW = new TDEToggleAction(i18n("Fit width"), TQPixmap(locate("data", "images/actions/zoomW.png")), 0, this, TQ_SLOT(slotZoomW()), ac, "SQ ZoomW"); pAZoomH = new TDEToggleAction(i18n("Fit height"), TQPixmap(locate("data", "images/actions/zoomH.png")), 0, this, TQ_SLOT(slotZoomH()), ac, "SQ ZoomH"); pAZoomWH = new TDEToggleAction(i18n("Fit image"), TQPixmap(locate("data", "images/actions/zoomWH.png")), 0, this, TQ_SLOT(slotZoomWH()), ac, "SQ ZoomWH"); pAZoom100 = new TDEToggleAction(i18n("Zoom 100%"), TQPixmap(locate("data", "images/actions/zoom100.png")), 0, this, TQ_SLOT(slotZoom100()), ac, "SQ Zoom100"); pAZoomLast = new TDEToggleAction(i18n("Leave previous zoom"), TQPixmap(locate("data", "images/actions/zoomlast.png")), 0, this, TQ_SLOT(slotZoomLast()), ac, "SQ ZoomLast"); - pAIfLess = new TDEToggleAction(i18n("Ignore, if image is smaller than window"), TQPixmap(locate("data", "images/actions/ifless.png")), 0, 0, 0, ac, "if less"); + pAIfLess = new TDEToggleAction(i18n("Ignore, if image is smaller than window"), TQPixmap(locate("data", "images/actions/ifless.png")), 0, nullptr, nullptr, ac, "if less"); - pAFull = new TDEToggleAction(TQString(), 0, 0, 0, ac, "SQ GL Full"); + pAFull = new TDEToggleAction(TQString(), 0, nullptr, nullptr, ac, "SQ GL Full"); TQString squirrel_zoom_actions = TQString::fromLatin1("squirrel_zoom_actions"); pAZoomW->setExclusiveGroup(squirrel_zoom_actions); @@ -642,7 +642,7 @@ void SQ_GLWidget::toClipboard() if(!decoded || tab->broken) return; - TQImage im((uchar *)tab->parts[tab->current].buffer->data(), tab->parts[tab->current].realw, tab->parts[tab->current].realh, 32, 0, 0, TQImage::LittleEndian); + TQImage im((uchar *)tab->parts[tab->current].buffer->data(), tab->parts[tab->current].realw, tab->parts[tab->current].realh, 32, nullptr, 0, TQImage::LittleEndian); im = im.swapRGB(); @@ -691,7 +691,7 @@ void SQ_GLWidget::filter() void SQ_GLWidget::slotFilter(SQ_ImageFilterOptions *filtopt) { - TQImage im((uchar *)tab->parts[tab->current].buffer->data(), tab->parts[tab->current].realw, tab->parts[tab->current].realh, 32, 0, 0, TQImage::LittleEndian); + TQImage im((uchar *)tab->parts[tab->current].buffer->data(), tab->parts[tab->current].realw, tab->parts[tab->current].realh, 32, nullptr, 0, TQImage::LittleEndian); TQImage img = gls->valid() ? im.copy(tab->sx, tab->sy, tab->sw, tab->sh) : im; fmt_filters::image image = @@ -735,7 +735,7 @@ void SQ_GLWidget::slotFilter(SQ_ImageFilterOptions *filtopt) void SQ_GLWidget::slotBCG(SQ_ImageBCGOptions *bcgopt) { - TQImage im((uchar *)tab->parts[tab->current].buffer->data(), tab->parts[tab->current].realw, tab->parts[tab->current].realh, 32, 0, 0, TQImage::LittleEndian); + TQImage im((uchar *)tab->parts[tab->current].buffer->data(), tab->parts[tab->current].realw, tab->parts[tab->current].realh, 32, nullptr, 0, TQImage::LittleEndian); TQImage img = gls->valid() ? im.copy(tab->sx, tab->sy, tab->sw, tab->sh) : im; fmt_filters::image image = @@ -807,7 +807,7 @@ bool SQ_GLWidget::calcSelection() TQImage SQ_GLWidget::generatePreview() { - TQImage im((uchar *)tab->parts[tab->current].buffer->data(), tab->parts[tab->current].realw, tab->parts[tab->current].realh, 32, 0, 0, TQImage::LittleEndian); + TQImage im((uchar *)tab->parts[tab->current].buffer->data(), tab->parts[tab->current].realw, tab->parts[tab->current].realh, 32, nullptr, 0, TQImage::LittleEndian); TQImage img, ret; if(gls->valid() && calcSelection()) @@ -1731,7 +1731,7 @@ void SQ_GLWidget::slotPrint() if(!decoded || tab->broken) return; - TQImage im((uchar *)tab->parts[tab->current].buffer->data(), tab->parts[tab->current].realw, tab->parts[tab->current].realh, 32, 0, 0, TQImage::LittleEndian); + TQImage im((uchar *)tab->parts[tab->current].buffer->data(), tab->parts[tab->current].realw, tab->parts[tab->current].realh, 32, nullptr, 0, TQImage::LittleEndian); TQImage img; if(gls->valid() && calcSelection()) diff --git a/src/ksquirrelpart/sq_iconloader.cpp b/src/ksquirrelpart/sq_iconloader.cpp index c8c9ec8..5fc008d 100644 --- a/src/ksquirrelpart/sq_iconloader.cpp +++ b/src/ksquirrelpart/sq_iconloader.cpp @@ -25,7 +25,7 @@ #include "sq_iconloader.h" #include "sq_iconloader_pixmaps.h" -SQ_IconLoader * SQ_IconLoader::m_instance = 0; +SQ_IconLoader * SQ_IconLoader::m_instance = nullptr; SQ_IconLoader::SQ_IconLoader(TQObject *parent) : TQObject(parent) { @@ -40,7 +40,7 @@ SQ_IconLoader::~SQ_IconLoader() TQPixmap SQ_IconLoader::loadIcon(const TQString& name, TDEIcon::Group group, int size) const { // try to load from installed icon theme - TQPixmap p = TDEGlobal::iconLoader()->loadIcon(name, group, size, TDEIcon::DefaultState, 0, true); + TQPixmap p = TDEGlobal::iconLoader()->loadIcon(name, group, size, TDEIcon::DefaultState, nullptr, true); // requested pixmap not found, let's // try to find it in our pixmaps diff --git a/src/ksquirrelpart/sq_iconloader.h b/src/ksquirrelpart/sq_iconloader.h index dec6a6e..a9df924 100644 --- a/src/ksquirrelpart/sq_iconloader.h +++ b/src/ksquirrelpart/sq_iconloader.h @@ -32,7 +32,7 @@ class SQ_IconLoader : public TQObject { public: - SQ_IconLoader(TQObject *parent = 0); + SQ_IconLoader(TQObject *parent = nullptr); ~SQ_IconLoader(); TQPixmap loadIcon(const TQString &name, TDEIcon::Group group = TDEIcon::Desktop, int size = 16) const; diff --git a/src/ksquirrelpart/sq_label.h b/src/ksquirrelpart/sq_label.h index 6d0edd5..1b131da 100644 --- a/src/ksquirrelpart/sq_label.h +++ b/src/ksquirrelpart/sq_label.h @@ -23,7 +23,7 @@ class SQ_Label : public TQWidget { public: - SQ_Label(TQWidget *parent = 0, const char *name = 0); + SQ_Label(TQWidget *parent = nullptr, const char *name = nullptr); ~SQ_Label(); void setText(const TQString <, const TQString &rt); diff --git a/src/ksquirrelpart/sq_library.h b/src/ksquirrelpart/sq_library.h index cf350d6..38b8fe1 100644 --- a/src/ksquirrelpart/sq_library.h +++ b/src/ksquirrelpart/sq_library.h @@ -41,7 +41,7 @@ class fmt_codec_base; struct SQ_LIBRARY { - SQ_LIBRARY() : lib(0), codec(0), codec_il(0), tmp(0), tmp_il(0) + SQ_LIBRARY() : lib(nullptr), codec(nullptr), codec_il(nullptr), tmp(nullptr), tmp_il(nullptr) {} // pointer to library diff --git a/src/ksquirrelpart/sq_libraryhandler.cpp b/src/ksquirrelpart/sq_libraryhandler.cpp index ecc4a83..01455fa 100644 --- a/src/ksquirrelpart/sq_libraryhandler.cpp +++ b/src/ksquirrelpart/sq_libraryhandler.cpp @@ -48,7 +48,7 @@ static const int buffer_size = 10; -SQ_LibraryHandler * SQ_LibraryHandler::m_instance = 0; +SQ_LibraryHandler * SQ_LibraryHandler::m_instance = nullptr; // SQ_LibraryHandler SQ_LibraryHandler::SQ_LibraryHandler(TQObject *parent) @@ -82,7 +82,7 @@ SQ_LIBRARY* SQ_LibraryHandler::libraryForFile(const KURL &url) iterator itEnd = end(); - SQ_LIBRARY *l = 0; + SQ_LIBRARY *l = nullptr; // go through array and compare names for(iterator it = begin();it != itEnd;++it) @@ -230,7 +230,7 @@ void SQ_LibraryHandler::clear() (*it).codec_destroy((*it).codec_il); (*it).codec_destroy((*it).codec); delete (*it).lib; - (*it).lib = 0; + (*it).lib = nullptr; } TQValueVector::clear(); @@ -294,7 +294,7 @@ void SQ_LibraryHandler::add(TQStringList &foundLibraries) libtmp.readable = o.readable; libtmp.canbemultiple = o.canbemultiple; libtmp.needtempfile = o.needtempfile; - libtmp.tmp = 0; + libtmp.tmp = nullptr; libtmp.codec_il = libtmp.codec_create(); @@ -413,7 +413,7 @@ SQ_LIBRARY* SQ_LibraryHandler::libraryByName(const TQString &name) return l; } - return 0; + return nullptr; } void SQ_LibraryHandler::writeSettings(SQ_LIBRARY *lib) @@ -527,7 +527,7 @@ void SQ_LibraryHandler::load() TQFileInfoListIterator it(*list); TQFileInfo *fi; - while((fi = it.current()) != 0) + while((fi = it.current()) != nullptr) { libs.append(fi->absFilePath()); ++it; diff --git a/src/ksquirrelpart/sq_libraryhandler.h b/src/ksquirrelpart/sq_libraryhandler.h index 8a3b25d..9fad62a 100644 --- a/src/ksquirrelpart/sq_libraryhandler.h +++ b/src/ksquirrelpart/sq_libraryhandler.h @@ -37,7 +37,7 @@ class KURL; class SQ_LibraryHandler : public TQObject, public TQValueVector { public: - SQ_LibraryHandler(TQObject *parent = 0); + SQ_LibraryHandler(TQObject *parent = nullptr); ~SQ_LibraryHandler(); enum Support { Maybe = 0, Yes, No }; diff --git a/src/ksquirrelpart/sq_popupmenu.h b/src/ksquirrelpart/sq_popupmenu.h index efc12f2..1db2e6b 100644 --- a/src/ksquirrelpart/sq_popupmenu.h +++ b/src/ksquirrelpart/sq_popupmenu.h @@ -27,7 +27,7 @@ class SQ_PopupMenu : public TDEPopupMenu { public: - SQ_PopupMenu(TQWidget *parent = 0, const char *name = 0); + SQ_PopupMenu(TQWidget *parent = nullptr, const char *name = nullptr); ~SQ_PopupMenu(); void insertTitle(const TQString &t); diff --git a/src/ksquirrelpart/sq_utils.cpp b/src/ksquirrelpart/sq_utils.cpp index 20eea42..63faa41 100644 --- a/src/ksquirrelpart/sq_utils.cpp +++ b/src/ksquirrelpart/sq_utils.cpp @@ -83,12 +83,12 @@ TQImage SQ_Utils::scaleImage(unsigned char *im, int w, int h, int fitwithin) { if(w <= fitwithin && h <= fitwithin) { - TQImage scaled(im, w, h, 32, 0, 0, TQImage::LittleEndian); + TQImage scaled(im, w, h, 32, nullptr, 0, TQImage::LittleEndian); scaled.setAlphaBuffer(true); return scaled.copy(); } - TQImage orig(im, w, h, 32, 0, 0, TQImage::LittleEndian); + TQImage orig(im, w, h, 32, nullptr, 0, TQImage::LittleEndian); orig.setAlphaBuffer(true); // return scaled image diff --git a/src/main.cpp b/src/main.cpp index 9b8c707..7c6795c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -43,14 +43,14 @@ // Our command line options static TDECmdLineOptions options[] = { - {"+[file to open]", I18N_NOOP("File to be opened at startup."), 0}, - {"l", I18N_NOOP("Print found libraries and exit."), 0}, - {"d", 0, 0}, - {"print-dcop", I18N_NOOP("Print available DCOP parameters"), 0}, - {"nodirectorybasket", I18N_NOOP("Folder basket"), 0}, - {"noimagebasket", I18N_NOOP("Image basket"), 0}, - {"nocategories", I18N_NOOP("Categories"), 0}, - {"nomountview", I18N_NOOP("Mount view"), 0}, + {"+[file to open]", I18N_NOOP("File to be opened at startup."), nullptr}, + {"l", I18N_NOOP("Print found libraries and exit."), nullptr}, + {"d", nullptr, nullptr}, + {"print-dcop", I18N_NOOP("Print available DCOP parameters"), nullptr}, + {"nodirectorybasket", I18N_NOOP("Folder basket"), nullptr}, + {"noimagebasket", I18N_NOOP("Image basket"), nullptr}, + {"nocategories", I18N_NOOP("Categories"), nullptr}, + {"nomountview", I18N_NOOP("Mount view"), nullptr}, TDECmdLineLastOption }; @@ -77,11 +77,11 @@ int main(int argc, char *argv[]) aboutData.addCredit("Andrey Rahmatullin aka wrar", I18N_NOOP("Bug reports, patches"), "wrar@altlinux.ru"); aboutData.addCredit("SeaJey", I18N_NOOP("Testing"), "seajey.serg@gmail.com"); aboutData.addCredit("JaguarWan", I18N_NOOP("Bug reports"), "jaguarwan@gmail.com"); - aboutData.addCredit("NightGoblin", I18N_NOOP("Translation help"), 0, "http://nightgoblin.info"); + aboutData.addCredit("NightGoblin", I18N_NOOP("Translation help"), nullptr, "http://nightgoblin.info"); aboutData.addCredit(I18N_NOOP("TiamaT"), I18N_NOOP("Initial artwork for edit tools"), "plasticfantasy@tut.by", "http://www.livejournal.com/users/tiamatik/"); aboutData.addCredit(I18N_NOOP("Fera"), I18N_NOOP("Great artwork for edit tools"), "morrigan171@mail.ru"); - aboutData.addCredit(I18N_NOOP("OpenGL forum at"), 0, 0, "http://opengl.org"); - aboutData.addCredit(I18N_NOOP("GameDev forum at"), 0, 0, "http://gamedev.ru"); + aboutData.addCredit(I18N_NOOP("OpenGL forum at"), nullptr, nullptr, "http://opengl.org"); + aboutData.addCredit(I18N_NOOP("GameDev forum at"), nullptr, nullptr, "http://gamedev.ru"); // parse command line TDECmdLineArgs::init(argc, argv, &aboutData); @@ -152,7 +152,7 @@ int main(int argc, char *argv[]) TDEGlobal::dirs()->addResourceType("data", TDEStandardDirs::kde_default("data") + TQString::fromLatin1("ksquirrel")); - SQ_SplashScreen *splash = 0; + SQ_SplashScreen *splash = nullptr; // should we show a splash screen ? TDEConfig *config = new TDEConfig("ksquirrelrc"); @@ -160,7 +160,7 @@ int main(int argc, char *argv[]) if(config->readBoolEntry("splash", true)) { - splash = new SQ_SplashScreen(0, "ksquirrel-splash-screen"); + splash = new SQ_SplashScreen(nullptr, "ksquirrel-splash-screen"); if(!high->showLibsAndExit) splash->show(); // don't show splash when -l TDEApplication::flush(); } @@ -173,7 +173,7 @@ int main(int argc, char *argv[]) a.dcopClient()->registerAs(App, false); // create an instance - SQ = new KSquirrel(0, App); + SQ = new KSquirrel(nullptr, App); if(printDCOP) SQ->printDCOP(); diff --git a/src/sidebar/sq_categoriesview.cpp b/src/sidebar/sq_categoriesview.cpp index 0508e8d..ba9fa89 100644 --- a/src/sidebar/sq_categoriesview.cpp +++ b/src/sidebar/sq_categoriesview.cpp @@ -47,7 +47,7 @@ #include "sq_diroperator.h" #include "sq_treeviewmenu.h" -SQ_CategoriesBox * SQ_CategoriesBox::sing = 0; +SQ_CategoriesBox * SQ_CategoriesBox::sing = nullptr; /* *************************************************************************************** */ @@ -162,7 +162,7 @@ SQ_CategoriesBox::SQ_CategoriesBox(TQWidget *parent, const char *name) : TQVBox( connect(view, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*))); - menu = new SQ_CategoryBrowserMenu(view->dir()->root(), 0, "Categories menu"); + menu = new SQ_CategoryBrowserMenu(view->dir()->root(), nullptr, "Categories menu"); toolbar->setIconSize(TDEIcon::SizeSmall); @@ -289,7 +289,7 @@ void SQ_CategoriesBox::slotDeleteItem() // remove this item manually delete cur; - cur = 0; + cur = nullptr; // physically remove file from storage TDEIO::del(tmp, false, false); diff --git a/src/sidebar/sq_categoriesview.h b/src/sidebar/sq_categoriesview.h index 4fba48a..8ecc8a9 100644 --- a/src/sidebar/sq_categoriesview.h +++ b/src/sidebar/sq_categoriesview.h @@ -53,7 +53,7 @@ class SQ_CategoriesView : public KFileTreeView public: - SQ_CategoriesView(TQWidget *parent = 0, const char *name = 0); + SQ_CategoriesView(TQWidget *parent = nullptr, const char *name = nullptr); ~SQ_CategoriesView(); SQ_TreeViewMenu *popupMenu() const; @@ -91,7 +91,7 @@ class SQ_CategoriesBox : public TQVBox public: - SQ_CategoriesBox(TQWidget *parent = 0, const char *name = 0); + SQ_CategoriesBox(TQWidget *parent = nullptr, const char *name = nullptr); ~SQ_CategoriesBox(); /* diff --git a/src/sidebar/sq_categorybrowsermenu.cpp b/src/sidebar/sq_categorybrowsermenu.cpp index 9b74c1d..e66ecf0 100644 --- a/src/sidebar/sq_categorybrowsermenu.cpp +++ b/src/sidebar/sq_categorybrowsermenu.cpp @@ -59,11 +59,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define CICON(a) (*_icons)[a] -TQMap *SQ_CategoryBrowserMenu::_icons = 0; +TQMap *SQ_CategoryBrowserMenu::_icons = nullptr; SQ_CategoryBrowserMenu::SQ_CategoryBrowserMenu(TQString path, TQWidget *parent, const char *name, int startid) : KPanelMenu(path, parent, name) - , _mimecheckTimer(0) + , _mimecheckTimer(nullptr) , _startid(startid) , _dirty(false) { @@ -204,7 +204,7 @@ void SQ_CategoryBrowserMenu::initialize() c.setDesktopGroup(); icon = TDEGlobal::iconLoader()->loadIcon(c.readEntry("Icon"), TDEIcon::Small, TDEIcon::SizeSmall, - TDEIcon::DefaultState, 0, true); + TDEIcon::DefaultState, nullptr, true); if(icon.isNull()) icon = CICON("folder"); name = c.readEntry("Name", name); @@ -307,7 +307,7 @@ void SQ_CategoryBrowserMenu::initialize() ++it; if( it.current() ) { insertSeparator(); - append(CICON("folder_open"), i18n("More..."), new SQ_CategoryBrowserMenu(path(), this, 0, run_id)); + append(CICON("folder_open"), i18n("More..."), new SQ_CategoryBrowserMenu(path(), this, nullptr, run_id)); } break; } diff --git a/src/sidebar/sq_categorybrowsermenu.h b/src/sidebar/sq_categorybrowsermenu.h index c2e0b77..785680f 100644 --- a/src/sidebar/sq_categorybrowsermenu.h +++ b/src/sidebar/sq_categorybrowsermenu.h @@ -42,7 +42,7 @@ class SQ_CategoryBrowserMenu : public KPanelMenu public: - SQ_CategoryBrowserMenu(TQString path, TQWidget *parent = 0, const char *name = 0, int startid = 0); + SQ_CategoryBrowserMenu(TQString path, TQWidget *parent = nullptr, const char *name = nullptr, int startid = 0); ~SQ_CategoryBrowserMenu(); void append(const TQPixmap &pixmap, const TQString &title, const TQString &filename, bool mimecheck); diff --git a/src/sidebar/sq_directorybasket.cpp b/src/sidebar/sq_directorybasket.cpp index 30690fb..7df8fd5 100644 --- a/src/sidebar/sq_directorybasket.cpp +++ b/src/sidebar/sq_directorybasket.cpp @@ -44,11 +44,11 @@ #include "sq_navigatordropmenu.h" #include "sq_dir.h" -SQ_DirectoryBasket * SQ_DirectoryBasket::m_inst = 0; +SQ_DirectoryBasket * SQ_DirectoryBasket::m_inst = nullptr; /* ******************************************************************************* */ -SQ_DBMenu::SQ_DBMenu(TQWidget *parent, const char *name) : SQ_TreeViewMenu(parent, name), item(0) +SQ_DBMenu::SQ_DBMenu(TQWidget *parent, const char *name) : SQ_TreeViewMenu(parent, name), item(nullptr) { insertSeparator(); id_icon = insertItem(i18n("Change icon"), this, TQ_SLOT(slotChangeIcon())); @@ -141,7 +141,7 @@ SQ_DirectoryBasketBranch::~SQ_DirectoryBasketBranch() KFileTreeViewItem* SQ_DirectoryBasketBranch::createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem) { if(!parent || !fileItem) - return 0; + return nullptr; // hehe... fileItem->setMimeType("inode/directory"); @@ -204,7 +204,7 @@ SQ_DirectoryBasket::SQ_DirectoryBasket(TQWidget *parent, const char *name) : KFi { m_inst = this; - progressAdd = new KProgress(0, "progress add", TQt::WStyle_StaysOnTop | TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WX11BypassWM); + progressAdd = new KProgress(nullptr, "progress add", TQt::WStyle_StaysOnTop | TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WX11BypassWM); menu = new SQ_DBMenu(this); @@ -237,7 +237,7 @@ SQ_DirectoryBasket::SQ_DirectoryBasket(TQWidget *parent, const char *name) : KFi addBranch(root); - disconnect(root, TQ_SIGNAL(refreshItems(const KFileItemList &)), 0, 0); + disconnect(root, TQ_SIGNAL(refreshItems(const KFileItemList &)), nullptr, nullptr); header()->hide(); addColumn(i18n("File")); @@ -331,7 +331,7 @@ void SQ_DirectoryBasket::slotDropped(TQDropEvent *e, TQListViewItem *_parent, TQ if(it != root->root()) moveItem(tomove, parent, it); else - moveItem(tomove, parent, 0); + moveItem(tomove, parent, nullptr); emit moved(); @@ -443,7 +443,7 @@ struct SortableItem SortableItem(TQListViewItem *i, int ind) : item(i), index(ind) {} - SortableItem() : item(0), index(0) + SortableItem() : item(nullptr), index(0) {} bool operator< (const SortableItem &i) diff --git a/src/sidebar/sq_directorybasket.h b/src/sidebar/sq_directorybasket.h index 6f2858d..df90658 100644 --- a/src/sidebar/sq_directorybasket.h +++ b/src/sidebar/sq_directorybasket.h @@ -38,7 +38,7 @@ class SQ_DBMenu : public SQ_TreeViewMenu public: - SQ_DBMenu(TQWidget *parent = 0, const char *name = 0); + SQ_DBMenu(TQWidget *parent = nullptr, const char *name = nullptr); ~SQ_DBMenu(); virtual void updateDirActions(bool, bool isroot = false); @@ -161,7 +161,7 @@ class SQ_DirectoryBasket : public KFileTreeView public: - SQ_DirectoryBasket(TQWidget *parent = 0, const char *name = 0); + SQ_DirectoryBasket(TQWidget *parent = nullptr, const char *name = nullptr); ~SQ_DirectoryBasket(); void add(const KFileItemList &list); diff --git a/src/sidebar/sq_imagebasket.cpp b/src/sidebar/sq_imagebasket.cpp index 70985cd..4373736 100644 --- a/src/sidebar/sq_imagebasket.cpp +++ b/src/sidebar/sq_imagebasket.cpp @@ -45,13 +45,13 @@ SQ_ImageBasket::SQ_ImageBasket(TQWidget *parent, const char *name) : KDirOperato connect(this, TQ_SIGNAL(dropped(const KFileItem *, TQDropEvent*, const KURL::List&)), this, TQ_SLOT(slotDropped(const KFileItem *, TQDropEvent*, const KURL::List&))); - disconnect(dirLister(), TQ_SIGNAL(refreshItems(const KFileItemList &)), 0, 0); + disconnect(dirLister(), TQ_SIGNAL(refreshItems(const KFileItemList &)), nullptr, nullptr); // redirect "Properties" dialog - disconnect(actionCollection()->action("properties"), 0, 0, 0); + disconnect(actionCollection()->action("properties"), nullptr, nullptr, nullptr); connect(actionCollection()->action("properties"), TQ_SIGNAL(activated()), this, TQ_SLOT(slotBasketProperties())); - disconnect(dirLister(), TQ_SIGNAL(newItems(const KFileItemList &)), 0, 0); + disconnect(dirLister(), TQ_SIGNAL(newItems(const KFileItemList &)), nullptr, nullptr); connect(dirLister(), TQ_SIGNAL(newItems(const KFileItemList &)), this, TQ_SLOT(insertNewFiles(const KFileItemList &))); connect(this, TQ_SIGNAL(viewChanged(KFileView *)), this, TQ_SLOT(slotViewChanged(KFileView *))); @@ -168,7 +168,7 @@ void SQ_ImageBasket::slotBasketProperties() if(fileView) { KFileItemList newlist; - KFileItem *item = 0; + KFileItem *item = nullptr; newlist.setAutoDelete(true); @@ -197,7 +197,7 @@ KFileItemList SQ_ImageBasket::realItems() const if(fileView) { - KFileItem *item = 0; + KFileItem *item = nullptr; for((item = fileView->firstFileItem()); item; item = fileView->nextItem(item)) { @@ -217,7 +217,7 @@ void SQ_ImageBasket::slotSync() if(fileView) { - KFileItem *item = 0; + KFileItem *item = nullptr; KURL path; TDEIO::UDSEntry entry; diff --git a/src/sidebar/sq_imagebasket.h b/src/sidebar/sq_imagebasket.h index 406b3c4..360827b 100644 --- a/src/sidebar/sq_imagebasket.h +++ b/src/sidebar/sq_imagebasket.h @@ -32,7 +32,7 @@ class SQ_ImageBasket : public KDirOperator public: - SQ_ImageBasket(TQWidget *parent = 0, const char *name = 0); + SQ_ImageBasket(TQWidget *parent = nullptr, const char *name = nullptr); ~SQ_ImageBasket(); void add(const KFileItemList &); diff --git a/src/sidebar/sq_mountview.cpp b/src/sidebar/sq_mountview.cpp index c52b199..16b50fb 100644 --- a/src/sidebar/sq_mountview.cpp +++ b/src/sidebar/sq_mountview.cpp @@ -32,7 +32,7 @@ #include "sq_iconloader.h" #include "sq_config.h" -SQ_MountView * SQ_MountView::m_inst = 0; +SQ_MountView * SQ_MountView::m_inst = nullptr; SQ_MountView::SQ_MountView(TQWidget *parent, const char *name) : TDEListView(parent, name), m_columns(-1) { diff --git a/src/sidebar/sq_mountview.h b/src/sidebar/sq_mountview.h index d14aa13..bed2021 100644 --- a/src/sidebar/sq_mountview.h +++ b/src/sidebar/sq_mountview.h @@ -36,7 +36,7 @@ class SQ_MountView : public TDEListView public: - SQ_MountView(TQWidget *parent = 0, const char *name = 0); + SQ_MountView(TQWidget *parent = nullptr, const char *name = nullptr); ~SQ_MountView(); enum { OPT_COL_MOUNTPOINT = 1, OPT_COL_DEVICE = 2, OPT_COL_FSTYPE = 4, OPT_COL_OPTIONS = 8 }; diff --git a/src/sidebar/sq_multibar.cpp b/src/sidebar/sq_multibar.cpp index 399929d..ca4b351 100644 --- a/src/sidebar/sq_multibar.cpp +++ b/src/sidebar/sq_multibar.cpp @@ -32,7 +32,7 @@ #include "sq_multibar.h" #include "sq_config.h" -SQ_MultiBar * SQ_MultiBar::m_inst = 0; +SQ_MultiBar * SQ_MultiBar::m_inst = nullptr; SQ_MultiBar::SQ_MultiBar(TQWidget *parent, const char *name) : TQHBox(parent, name) { diff --git a/src/sidebar/sq_multibar.h b/src/sidebar/sq_multibar.h index 12ce455..357d7f0 100644 --- a/src/sidebar/sq_multibar.h +++ b/src/sidebar/sq_multibar.h @@ -59,7 +59,7 @@ class SQ_MultiBar : public TQHBox public: - SQ_MultiBar(TQWidget *parent = 0, const char *name = 0); + SQ_MultiBar(TQWidget *parent = nullptr, const char *name = nullptr); ~SQ_MultiBar(); /* diff --git a/src/sidebar/sq_previewwidget.cpp b/src/sidebar/sq_previewwidget.cpp index ca9f668..35119b1 100644 --- a/src/sidebar/sq_previewwidget.cpp +++ b/src/sidebar/sq_previewwidget.cpp @@ -46,10 +46,10 @@ #include "sq_utils.h" #endif -SQ_PreviewWidget * SQ_PreviewWidget::m_inst = 0; +SQ_PreviewWidget * SQ_PreviewWidget::m_inst = nullptr; SQ_PreviewWidget::SQ_PreviewWidget(TQWidget *parent, const char *name) - : TQWidget(parent, name, TQt::WNoAutoErase), all(0), small(0), m_ignore(true) + : TQWidget(parent, name, TQt::WNoAutoErase), all(nullptr), small(nullptr), m_ignore(true) { m_inst = this; @@ -175,7 +175,7 @@ bool SQ_PreviewWidget::fit() return false; delete small; - small = 0; + small = nullptr; if(all->width() > width() || all->height() > height()) { @@ -213,7 +213,7 @@ void SQ_PreviewWidget::rereadColor() void SQ_PreviewWidget::slotBackground() { - KColorDialog dlg(KSquirrel::app(), 0, true); + KColorDialog dlg(KSquirrel::app(), nullptr, true); dlg.setColor(color); @@ -227,7 +227,7 @@ void SQ_PreviewWidget::slotBackground() void SQ_PreviewWidget::slotText() { - KColorDialog dlg(KSquirrel::app(), 0, true); + KColorDialog dlg(KSquirrel::app(), nullptr, true); dlg.setColor(colorText); @@ -275,7 +275,7 @@ void SQ_PreviewWidget::slotDownloadResult(const KURL &url) delete small; delete all; - all = small = 0; + all = small = nullptr; pixmap = TQPixmap(); int w = finfo->image[0].w; @@ -292,7 +292,7 @@ void SQ_PreviewWidget::slotDownloadResult(const KURL &url) (bits+i)->b = t; } - all = new TQImage((uchar *)bits, w, h, 32, 0, 0, TQImage::LittleEndian); + all = new TQImage((uchar *)bits, w, h, 32, nullptr, 0, TQImage::LittleEndian); all->setAlphaBuffer(true); #ifdef SQ_HAVE_KEXIF diff --git a/src/sidebar/sq_previewwidget.h b/src/sidebar/sq_previewwidget.h index 25e8c37..ce7931a 100644 --- a/src/sidebar/sq_previewwidget.h +++ b/src/sidebar/sq_previewwidget.h @@ -40,7 +40,7 @@ class SQ_PreviewWidget : public TQWidget public: - SQ_PreviewWidget(TQWidget *parent = 0, const char *name = 0); + SQ_PreviewWidget(TQWidget *parent = nullptr, const char *name = nullptr); ~SQ_PreviewWidget(); void rereadColor(); diff --git a/src/sidebar/sq_threaddirlister.cpp b/src/sidebar/sq_threaddirlister.cpp index 0115586..d95391a 100644 --- a/src/sidebar/sq_threaddirlister.cpp +++ b/src/sidebar/sq_threaddirlister.cpp @@ -35,7 +35,7 @@ SQ_ThreadDirLister::SQ_ThreadDirLister(TQObject *o) : TQThread(), obj(o) { cache = new TDEConfig("ksquirrel-tree-cache"); - dir = 0; + dir = nullptr; } SQ_ThreadDirLister::~SQ_ThreadDirLister() @@ -140,6 +140,6 @@ void SQ_ThreadDirLister::closeDir() if(dir) { closedir(dir); - dir = 0; + dir = nullptr; } } diff --git a/src/sidebar/sq_treeview.cpp b/src/sidebar/sq_treeview.cpp index 22207a9..7628d65 100644 --- a/src/sidebar/sq_treeview.cpp +++ b/src/sidebar/sq_treeview.cpp @@ -43,7 +43,7 @@ #include "sq_directorybasket.h" -SQ_TreeView * SQ_TreeView::m_instance = 0; +SQ_TreeView * SQ_TreeView::m_instance = nullptr; SQ_FileTreeViewBranch::SQ_FileTreeViewBranch(KFileTreeView *parent, const KURL &url, const TQString &name, const TQPixmap &pix) : KFileTreeBranch(parent, url, name, pix) @@ -54,7 +54,7 @@ SQ_FileTreeViewBranch::~SQ_FileTreeViewBranch() KFileTreeViewItem* SQ_FileTreeViewBranch::createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem) { - KFileTreeViewItem *tvi = 0; + KFileTreeViewItem *tvi = nullptr; if(parent && fileItem) tvi = new SQ_TreeViewItem(parent, fileItem, this); @@ -68,7 +68,7 @@ SQ_TreeView::SQ_TreeView(TQWidget *parent, const char *name) : KFileTreeView(par { m_instance = this; - itemToBeOpened = 0; + itemToBeOpened = nullptr; m_animTimer = new TQTimer(this); scanTimer = new TQTimer(this); m_ignoreClick = false; @@ -76,7 +76,7 @@ SQ_TreeView::SQ_TreeView(TQWidget *parent, const char *name) : KFileTreeView(par connect(m_animTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAnimation())); connect(scanTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDelayedScan())); - dw = 0; + dw = nullptr; m_recurs = No; lister = new SQ_ThreadDirLister(this); setupRecursion(); @@ -217,7 +217,7 @@ void SQ_TreeView::setRecursion(int b) else { delete dw; - dw = 0; + dw = nullptr; m_recurs = b; while(it.current()) @@ -378,7 +378,7 @@ bool SQ_TreeView::doSearch() // all items are opened if(paths.empty()) { - itemToBeOpened = 0; + itemToBeOpened = nullptr; return false; } diff --git a/src/sidebar/sq_treeview.h b/src/sidebar/sq_treeview.h index dd39480..0adf8d8 100644 --- a/src/sidebar/sq_treeview.h +++ b/src/sidebar/sq_treeview.h @@ -53,7 +53,7 @@ class SQ_TreeView : public KFileTreeView public: - SQ_TreeView(TQWidget *parent = 0, const char *name = 0); + SQ_TreeView(TQWidget *parent = nullptr, const char *name = nullptr); ~SQ_TreeView(); enum Recursion { No = 0, Files, Dirs, FilesDirs }; diff --git a/src/sidebar/sq_treeviewmenu.cpp b/src/sidebar/sq_treeviewmenu.cpp index 3b21e60..2e52621 100644 --- a/src/sidebar/sq_treeviewmenu.cpp +++ b/src/sidebar/sq_treeviewmenu.cpp @@ -42,7 +42,7 @@ void SQ_TreeViewMenu::reconnect(Element elem, TQObject *receiver, const char *me else id = id_prop; - disconnectItem(id, 0, 0); + disconnectItem(id, nullptr, nullptr); connectItem(id, receiver, member); } diff --git a/src/sidebar/sq_treeviewmenu.h b/src/sidebar/sq_treeviewmenu.h index 72d900a..0b80e20 100644 --- a/src/sidebar/sq_treeviewmenu.h +++ b/src/sidebar/sq_treeviewmenu.h @@ -14,7 +14,7 @@ class SQ_TreeViewMenu : public TDEPopupMenu public: - SQ_TreeViewMenu(TQWidget *parent = 0, const char *name = 0); + SQ_TreeViewMenu(TQWidget *parent = nullptr, const char *name = nullptr); virtual ~SQ_TreeViewMenu(); enum Element { New, Rename, Delete, Properties, Clear }; diff --git a/src/sq_archivehandler.cpp b/src/sq_archivehandler.cpp index dd6a045..c055f41 100644 --- a/src/sq_archivehandler.cpp +++ b/src/sq_archivehandler.cpp @@ -19,7 +19,7 @@ #include "sq_archivehandler.h" -SQ_ArchiveHandler * SQ_ArchiveHandler::m_instance = 0; +SQ_ArchiveHandler * SQ_ArchiveHandler::m_instance = nullptr; SQ_ArchiveHandler::SQ_ArchiveHandler(TQObject * parent, const char *name) : TQObject(parent, name), TQMap() diff --git a/src/sq_archivehandler.h b/src/sq_archivehandler.h index bc46a48..6c66595 100644 --- a/src/sq_archivehandler.h +++ b/src/sq_archivehandler.h @@ -29,7 +29,7 @@ class SQ_ArchiveHandler : public TQObject, TQMap public: - SQ_ArchiveHandler(TQObject *parent = 0, const char *name = 0); + SQ_ArchiveHandler(TQObject *parent = nullptr, const char *name = nullptr); ~SQ_ArchiveHandler(); /* diff --git a/src/sq_bookmarkowner.cpp b/src/sq_bookmarkowner.cpp index 24b6d86..5ba85e2 100644 --- a/src/sq_bookmarkowner.cpp +++ b/src/sq_bookmarkowner.cpp @@ -21,7 +21,7 @@ #include "sq_bookmarkowner.h" -SQ_BookmarkOwner * SQ_BookmarkOwner::m_instance = 0; +SQ_BookmarkOwner * SQ_BookmarkOwner::m_instance = nullptr; SQ_BookmarkOwner::SQ_BookmarkOwner(TQWidget *parent) : TQObject(parent) { diff --git a/src/sq_bookmarkowner.h b/src/sq_bookmarkowner.h index 93dc62f..eca1d39 100644 --- a/src/sq_bookmarkowner.h +++ b/src/sq_bookmarkowner.h @@ -35,7 +35,7 @@ class SQ_BookmarkOwner : public TQObject, public KBookmarkOwner public: - SQ_BookmarkOwner(TQWidget *parent = 0); + SQ_BookmarkOwner(TQWidget *parent = nullptr); virtual ~SQ_BookmarkOwner(); /* diff --git a/src/sq_config.cpp b/src/sq_config.cpp index ea0fc4b..8df8cc2 100644 --- a/src/sq_config.cpp +++ b/src/sq_config.cpp @@ -21,7 +21,7 @@ #include "sq_config.h" -SQ_Config * SQ_Config::m_instance = 0; +SQ_Config * SQ_Config::m_instance = nullptr; SQ_Config::SQ_Config(TQObject *parent) : TQObject(parent) { diff --git a/src/sq_config.h b/src/sq_config.h index 73cf0c4..f57fad3 100644 --- a/src/sq_config.h +++ b/src/sq_config.h @@ -30,7 +30,7 @@ class TDEConfig; class SQ_Config : public TQObject { public: - SQ_Config(TQObject *parent = 0); + SQ_Config(TQObject *parent = nullptr); ~SQ_Config(); static SQ_Config* instance() { return m_instance; } @@ -44,9 +44,9 @@ class SQ_Config : public TQObject TQStringList readListEntry( const TQString& pKey, char sep = ',' ) const; int readNumEntry( const TQString& pKey, int nDefault = 0 ) const; bool readBoolEntry( const TQString& pKey, bool bDefault = false ) const; - TQRect readRectEntry( const TQString& pKey, const TQRect* pDefault = 0L ) const; - TQPoint readPointEntry( const TQString& pKey, const TQPoint* pDefault = 0L ) const; - TQSize readSizeEntry( const TQString& pKey, const TQSize* pDefault = 0L ) const; + TQRect readRectEntry( const TQString& pKey, const TQRect* pDefault = nullptr ) const; + TQPoint readPointEntry( const TQString& pKey, const TQPoint* pDefault = nullptr ) const; + TQSize readSizeEntry( const TQString& pKey, const TQSize* pDefault = nullptr ) const; double readDoubleNumEntry( const TQString& pKey, double nDefault = 0.0 ) const; TQValueList readIntListEntry( const TQString& pKey ) const; diff --git a/src/sq_diroperator.cpp b/src/sq_diroperator.cpp index 398d859..f5a75c8 100644 --- a/src/sq_diroperator.cpp +++ b/src/sq_diroperator.cpp @@ -93,8 +93,8 @@ SQ_DirOperator::SQ_DirOperator(const KURL &url, ViewT type_, TQWidget *parent, c setAcceptDrops(true); - fileview = 0; - oldCurrentItem = 0; + fileview = nullptr; + oldCurrentItem = nullptr; fireDiskSize(url); @@ -293,7 +293,7 @@ void SQ_DirOperator::slotSelectionChanged() TQPixmap px; TDEIO::filesize_t sz = static_cast(0); int add = 0; - KFileItem *fi = 0; + KFileItem *fi = nullptr; // which items are selected ? for(KFileItem *it = fileview->firstFileItem();it;it = fileview->nextItem(it)) @@ -349,7 +349,7 @@ void SQ_DirOperator::slotDropped(const KFileItem *i, TQDropEvent*, const KURL::L // Insert new actions in context menu. void SQ_DirOperator::setupActionsMy() { - new TDEAction(i18n("Edit file type"), 0, 0, this, TQ_SLOT(slotEditMime()), actionCollection(), "dirop_edit_mime"); + new TDEAction(i18n("Edit file type"), nullptr, 0, this, TQ_SLOT(slotEditMime()), actionCollection(), "dirop_edit_mime"); if(SQ_HLOptions::instance()->have_imagebasket) new TDEAction(i18n("Add to Basket"), "folder_image", CTRL+TQt::Key_B, this, TQ_SLOT(slotAddToBasket()), actionCollection(), "dirop_tobasket"); @@ -372,20 +372,20 @@ void SQ_DirOperator::setupActionsMy() file->insert(new TDEAction(i18n("Cut"), "edit-cut", TDEStdAccel::cut(), SQ_WidgetStack::instance(), TQ_SLOT(slotFileCut()), actionCollection(), "dirop_cut")); file->insert(new TDEAction(i18n("Paste"), "edit-paste", TDEStdAccel::paste(), SQ_WidgetStack::instance(), TQ_SLOT(slotFilePaste()), actionCollection(), "dirop_paste")); file->insert(sep); - file->insert(new TDEAction(i18n("Copy to..."), 0, TQt::Key_F5, SQ_WidgetStack::instance(), TQ_SLOT(slotFileCopyTo()), actionCollection(), "dirop_copyto")); - file->insert(new TDEAction(i18n("Move to..."), 0, TQt::Key_F6, SQ_WidgetStack::instance(), TQ_SLOT(slotFileMoveTo()),actionCollection(), "dirop_cutto")); - file->insert(new TDEAction(i18n("Link to..."), 0, TQt::Key_F7, SQ_WidgetStack::instance(), TQ_SLOT(slotFileLinkTo()), actionCollection(), "dirop_linkto")); + file->insert(new TDEAction(i18n("Copy to..."), nullptr, TQt::Key_F5, SQ_WidgetStack::instance(), TQ_SLOT(slotFileCopyTo()), actionCollection(), "dirop_copyto")); + file->insert(new TDEAction(i18n("Move to..."), nullptr, TQt::Key_F6, SQ_WidgetStack::instance(), TQ_SLOT(slotFileMoveTo()),actionCollection(), "dirop_cutto")); + file->insert(new TDEAction(i18n("Link to..."), nullptr, TQt::Key_F7, SQ_WidgetStack::instance(), TQ_SLOT(slotFileLinkTo()), actionCollection(), "dirop_linkto")); file->insert(sep); file->insert(new TDEAction(i18n("Run"), "launch", CTRL+Key_J, SQ_WidgetStack::instance(), TQ_SLOT(slotRunSeparately()), actionCollection(), "dirop_runsepar")); file->insert(new TDEAction(i18n("Repeat (nothing to repeat)"), "go-down", TQt::Key_F10, KSquirrel::app(), TQ_SLOT(slotRepeat()), actionCollection(), "dirop_repeat")); - file->insert(new TDEAction(i18n("Convert..."), 0, CTRL+TQt::Key_K, SQ_Converter::instance(), TQ_SLOT(slotStartEdit()), actionCollection(), "dirop_convert")); + file->insert(new TDEAction(i18n("Convert..."), nullptr, CTRL+TQt::Key_K, SQ_Converter::instance(), TQ_SLOT(slotStartEdit()), actionCollection(), "dirop_convert")); file->insert(sep); file->insert(new TDEAction(i18n("Recreate selected thumbnails"), "reload", CTRL+TQt::Key_R, SQ_WidgetStack::instance(), TQ_SLOT(slotRecreateThumbnail()), actionCollection(), "dirop_recreate_thumbnails")); file->insert(sep); - file->insert(new TDEAction(i18n("Copy file path"), 0, TQt::Key_F8, this, TQ_SLOT(slotCopyPath()), actionCollection(), "dirop_copypath")); - file->insert(new TDEAction(i18n("Copy file url"), 0, TQt::Key_F9, this, TQ_SLOT(slotCopyURL()), actionCollection(), "dirop_copyurl")); + file->insert(new TDEAction(i18n("Copy file path"), nullptr, TQt::Key_F8, this, TQ_SLOT(slotCopyPath()), actionCollection(), "dirop_copypath")); + file->insert(new TDEAction(i18n("Copy file url"), nullptr, TQt::Key_F9, this, TQ_SLOT(slotCopyURL()), actionCollection(), "dirop_copyurl")); if(reload) reload->setShortcut(CTRL+TQt::Key_F5); } @@ -834,7 +834,7 @@ void SQ_DirOperator::disableSpecificActions(KFileIconView *v) void SQ_DirOperator::slotPreview() { - KFileItem *fi = fileview ? fileview->currentFileItem() : 0; + KFileItem *fi = fileview ? fileview->currentFileItem() : nullptr; if(fi) SQ_PreviewWidget::instance()->load(fi->url()); } @@ -848,7 +848,7 @@ void SQ_DirOperator::slotNewItems(const KFileItemList &list) KFileItemListIterator it(list); KFileItem *fi; - while((fi = it.current()) != 0) + while((fi = it.current()) != nullptr) { ++it; if(fi->isFile()) totalSize += fi->size(); @@ -868,7 +868,7 @@ void SQ_DirOperator::slotNewItems(const KFileItemList &list) void SQ_DirOperator::slotRefreshItems(const KFileItemList &list) { KFileItemListIterator it(list); - KFileItem *fci = fileview ? fileview->currentFileItem() : 0; + KFileItem *fci = fileview ? fileview->currentFileItem() : nullptr; KFileItem *fi; // refresh image been previewed @@ -1001,7 +1001,7 @@ void SQ_DirOperator::calcTotalSize() KFileItemListIterator it(*list); KFileItem *fi; - while((fi = it.current()) != 0) + while((fi = it.current()) != nullptr) { ++it; diff --git a/src/sq_diroperator.h b/src/sq_diroperator.h index 98ffc9f..038b942 100644 --- a/src/sq_diroperator.h +++ b/src/sq_diroperator.h @@ -54,7 +54,7 @@ class SQ_DirOperator : public KDirOperator * View type is determined by 'type_'. */ SQ_DirOperator(const KURL &url = KURL(), ViewT type_ = SQ_DirOperator::TypeList, - TQWidget *parent = 0, const char *name = 0); + TQWidget *parent = nullptr, const char *name = nullptr); ~SQ_DirOperator(); diff --git a/src/sq_dirthumbs.cpp b/src/sq_dirthumbs.cpp index e4881ae..afc495e 100644 --- a/src/sq_dirthumbs.cpp +++ b/src/sq_dirthumbs.cpp @@ -52,11 +52,11 @@ void SQ_DirThumbs::saveThumbnail(const KURL &url, SQ_Thumbnail &thumb) if(!thumb.thumbnail.isNull() && needUpdate(ab, thumb.originalTime)) { // thumbnail standard tags - thumb.thumbnail.setText("Thumb::Image::Width", 0, TQString::number(thumb.w)); - thumb.thumbnail.setText("Thumb::Image::Height", 0, TQString::number(thumb.h)); - thumb.thumbnail.setText("Thumb::URI", 0, url.prettyURL()); - thumb.thumbnail.setText("Thumb::MTime", 0, TQString::number(thumb.originalTime)); - thumb.thumbnail.setText("Software", 0, "KSquirrel"); + thumb.thumbnail.setText("Thumb::Image::Width", nullptr, TQString::number(thumb.w)); + thumb.thumbnail.setText("Thumb::Image::Height", nullptr, TQString::number(thumb.h)); + thumb.thumbnail.setText("Thumb::URI", nullptr, url.prettyURL()); + thumb.thumbnail.setText("Thumb::MTime", nullptr, TQString::number(thumb.originalTime)); + thumb.thumbnail.setText("Software", nullptr, "KSquirrel"); thumb.thumbnail.save(ab, sqdirThumbFormat, sqdirThumbQuality); diff --git a/src/sq_downloader.cpp b/src/sq_downloader.cpp index e877850..69b6214 100644 --- a/src/sq_downloader.cpp +++ b/src/sq_downloader.cpp @@ -30,7 +30,7 @@ #define SQ_PREDOWNLOAD_SIZE 50 -SQ_Downloader::SQ_Downloader(TQObject *parent, const char *name) : TQObject(parent, name), job(0), m_error(false) +SQ_Downloader::SQ_Downloader(TQObject *parent, const char *name) : TQObject(parent, name), job(nullptr), m_error(false) { tmp = new KTempFile; tmp->setAutoDelete(true); @@ -108,7 +108,7 @@ void SQ_Downloader::slotData(TDEIO::Job *job, const TQByteArray &ba) void SQ_Downloader::slotDataResult(TDEIO::Job *cpjob) { - job = 0; + job = nullptr; // job error if(cpjob->error() && cpjob->error() != TDEIO::ERR_USER_CANCELED) diff --git a/src/sq_downloader.h b/src/sq_downloader.h index 6b91a3f..762e220 100644 --- a/src/sq_downloader.h +++ b/src/sq_downloader.h @@ -34,7 +34,7 @@ class SQ_Downloader : public TQObject public: - SQ_Downloader(TQObject *parent = 0, const char *name = 0); + SQ_Downloader(TQObject *parent = nullptr, const char *name = nullptr); ~SQ_Downloader(); void start(KFileItem *fi); diff --git a/src/sq_dragprovider.cpp b/src/sq_dragprovider.cpp index 6ae0ada..7feb56a 100644 --- a/src/sq_dragprovider.cpp +++ b/src/sq_dragprovider.cpp @@ -38,9 +38,9 @@ #define SQ_THUMB_SIZE 96 -SQ_DragProvider * SQ_DragProvider::m_inst = 0; +SQ_DragProvider * SQ_DragProvider::m_inst = nullptr; -SQ_DragProvider::SQ_DragProvider(TQObject *parent) : TQObject(parent), source(0) +SQ_DragProvider::SQ_DragProvider(TQObject *parent) : TQObject(parent), source(nullptr) { m_inst = this; } diff --git a/src/sq_errorstring.cpp b/src/sq_errorstring.cpp index f762ee3..c278719 100644 --- a/src/sq_errorstring.cpp +++ b/src/sq_errorstring.cpp @@ -23,7 +23,7 @@ #include -SQ_ErrorString * SQ_ErrorString::m_instance = 0; +SQ_ErrorString * SQ_ErrorString::m_instance = nullptr; SQ_ErrorString::SQ_ErrorString(TQObject *parent) : TQObject(parent) { diff --git a/src/sq_errorstring.h b/src/sq_errorstring.h index 400451d..21c66d4 100644 --- a/src/sq_errorstring.h +++ b/src/sq_errorstring.h @@ -33,7 +33,7 @@ class SQ_ErrorString : public TQObject { public: - SQ_ErrorString(TQObject *parent = 0); + SQ_ErrorString(TQObject *parent = nullptr); ~SQ_ErrorString(); /* diff --git a/src/sq_externaltool.cpp b/src/sq_externaltool.cpp index ca3650b..0af7e26 100644 --- a/src/sq_externaltool.cpp +++ b/src/sq_externaltool.cpp @@ -33,7 +33,7 @@ #include "sq_popupmenu.h" #include "sq_config.h" -SQ_ExternalTool * SQ_ExternalTool::m_instance = 0; +SQ_ExternalTool * SQ_ExternalTool::m_instance = nullptr; Tool::Tool() {} @@ -48,7 +48,7 @@ Tool::Tool(const TQString &pix, const TQString &nam, const TQString &com) SQ_ExternalTool::SQ_ExternalTool(TQObject *parent) : TQObject(parent), TQValueVector() { m_instance = this; - menu = new SQ_PopupMenu(0, "External tools"); + menu = new SQ_PopupMenu(nullptr, "External tools"); connect(menu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotAboutToShowMenu())); connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivateTool(int))); @@ -208,12 +208,12 @@ void SQ_ExternalTool::slotActivateTool(int id) // %F = multiple files if(per_f && per_F) { - KMessageBox::error(0, i18n("Command cannot contain both \"%f\" and \"%F\""), i18n("Error processing command")); + KMessageBox::error(nullptr, i18n("Command cannot contain both \"%f\" and \"%F\""), i18n("Error processing command")); return; } else if(!per_f && !per_F) { - KMessageBox::error(0, i18n("Command should contain \"%f\" or \"%F\""), i18n("Error processing command")); + KMessageBox::error(nullptr, i18n("Command should contain \"%f\" or \"%F\""), i18n("Error processing command")); return; } else if(per_f) diff --git a/src/sq_externaltool.h b/src/sq_externaltool.h index 12e6858..cdcacf1 100644 --- a/src/sq_externaltool.h +++ b/src/sq_externaltool.h @@ -46,7 +46,7 @@ class SQ_ExternalTool : public TQObject, public TQValueVector public: - SQ_ExternalTool(TQObject *parent = 0); + SQ_ExternalTool(TQObject *parent = nullptr); ~SQ_ExternalTool(); /* diff --git a/src/sq_filedetailview.cpp b/src/sq_filedetailview.cpp index 71eebb2..f52038b 100644 --- a/src/sq_filedetailview.cpp +++ b/src/sq_filedetailview.cpp @@ -54,8 +54,8 @@ SQ_FileDetailView::SQ_FileDetailView(TQWidget* parent, const char* name) toolTip = new KonqFileTip(this); slotResetToolTip(); - disconnect(this, TQ_SIGNAL(onViewport()), this, 0); - disconnect(this, TQ_SIGNAL(onItem(TQListViewItem *)), this, 0); + disconnect(this, TQ_SIGNAL(onViewport()), this, nullptr); + disconnect(this, TQ_SIGNAL(onItem(TQListViewItem *)), this, nullptr); connect(this, TQ_SIGNAL(onViewport()), this, TQ_SLOT(slotRemoveToolTip())); connect(this, TQ_SIGNAL(onItem(TQListViewItem *)), this, TQ_SLOT(slotShowToolTip(TQListViewItem *))); } @@ -113,7 +113,7 @@ bool SQ_FileDetailView::eventFilter(TQObject *o, TQEvent *e) */ void SQ_FileDetailView::slotRemoveToolTip() { - toolTip->setItem(0); + toolTip->setItem(nullptr); } /* diff --git a/src/sq_fileiconview.h b/src/sq_fileiconview.h index 6f45cac..5751cd1 100644 --- a/src/sq_fileiconview.h +++ b/src/sq_fileiconview.h @@ -51,7 +51,7 @@ class SQ_FileIconView : public SQ_FileIconViewBase public: - SQ_FileIconView(TQWidget *parent = 0, const char *name = ""); + SQ_FileIconView(TQWidget *parent = nullptr, const char *name = ""); ~SQ_FileIconView(); /* diff --git a/src/sq_fileiconviewbase.cpp b/src/sq_fileiconviewbase.cpp index f0e2a78..1472ce8 100644 --- a/src/sq_fileiconviewbase.cpp +++ b/src/sq_fileiconviewbase.cpp @@ -38,8 +38,8 @@ SQ_FileIconViewBase::SQ_FileIconViewBase(TQWidget *parent, const char *name) toolTip = new KonqFileTip(this); slotResetToolTip(); - disconnect(this, TQ_SIGNAL(onViewport()), this, 0); - disconnect(this, TQ_SIGNAL(onItem(TQIconViewItem *)), this, 0); + disconnect(this, TQ_SIGNAL(onViewport()), this, nullptr); + disconnect(this, TQ_SIGNAL(onItem(TQIconViewItem *)), this, nullptr); connect(this, TQ_SIGNAL(onViewport()), this, TQ_SLOT(slotRemoveToolTip())); connect(this, TQ_SIGNAL(onItem(TQIconViewItem *)), this, TQ_SLOT(slotShowToolTip(TQIconViewItem *))); } @@ -97,7 +97,7 @@ bool SQ_FileIconViewBase::eventFilter(TQObject *o, TQEvent *e) */ void SQ_FileIconViewBase::slotRemoveToolTip() { - toolTip->setItem(0); + toolTip->setItem(nullptr); } // Accept drag @@ -134,7 +134,7 @@ void SQ_FileIconViewBase::updateView(const KFileItem *i) KFileIconViewItem* SQ_FileIconViewBase::viewItem(const KFileItem *item) { - return item ? reinterpret_cast((void *)item->extraData(this)) : 0; + return item ? reinterpret_cast((void *)item->extraData(this)) : nullptr; } void SQ_FileIconViewBase::initItemMy(KFileIconViewItem *item, const KFileItem *i, bool upd) diff --git a/src/sq_fileiconviewbase.h b/src/sq_fileiconviewbase.h index 014110b..b3a55f1 100644 --- a/src/sq_fileiconviewbase.h +++ b/src/sq_fileiconviewbase.h @@ -33,7 +33,7 @@ class SQ_FileIconViewBase : public KFileIconView public: - SQ_FileIconViewBase(TQWidget *parent = 0, const char *name = 0); + SQ_FileIconViewBase(TQWidget *parent = nullptr, const char *name = nullptr); virtual ~SQ_FileIconViewBase(); virtual void insertCdUpItem(const KURL &base) = 0; diff --git a/src/sq_filethumbview.h b/src/sq_filethumbview.h index b6e8481..1b77edd 100644 --- a/src/sq_filethumbview.h +++ b/src/sq_filethumbview.h @@ -43,7 +43,7 @@ class SQ_FileThumbView : public SQ_FileIconViewBase public: - SQ_FileThumbView(TQWidget *parent = 0, const char *name = ""); + SQ_FileThumbView(TQWidget *parent = nullptr, const char *name = ""); ~SQ_FileThumbView(); bool lazy() const; diff --git a/src/sq_glparts.cpp b/src/sq_glparts.cpp index ec55d89..63799c2 100644 --- a/src/sq_glparts.cpp +++ b/src/sq_glparts.cpp @@ -22,7 +22,7 @@ /* ***************************************************************************************** */ -Parts::Parts() : w(0), h(0), realw(0), realh(0), m_parts(0), buffer(0) +Parts::Parts() : w(0), h(0), realw(0), realh(0), m_parts(0), buffer(nullptr) {} Part::Part() : x1(0), y1(0), x2(0), y2(0), tex(0), list(0) @@ -30,7 +30,7 @@ Part::Part() : x1(0), y1(0), x2(0), y2(0), tex(0), list(0) /* ***************************************************************************************** */ -memoryPart::memoryPart(const int sz) : m_size(sz), m_data(0) +memoryPart::memoryPart(const int sz) : m_size(sz), m_data(nullptr) {} memoryPart::~memoryPart() @@ -188,8 +188,8 @@ void Tab::empty() orient = -1; rotate = 0; fmt_size = 0; - lib = 0; - codeK = 0; + lib = nullptr; + codeK = nullptr; current = 0; curangle = 0; total = 0; diff --git a/src/sq_glparts.h b/src/sq_glparts.h index 24c538c..aa28a72 100644 --- a/src/sq_glparts.h +++ b/src/sq_glparts.h @@ -60,13 +60,13 @@ inline void memoryPart::del() { delete [] m_data; - m_data = 0; + m_data = nullptr; } inline bool memoryPart::valid() const { - return m_data != 0; + return m_data != nullptr; } /* *************************************************************** */ @@ -103,7 +103,7 @@ inline void Parts::deleteBuffer() { delete buffer; - buffer = 0; + buffer = nullptr; } /* *************************************************************** */ diff --git a/src/sq_glview.cpp b/src/sq_glview.cpp index 93e5b73..5bd7fda 100644 --- a/src/sq_glview.cpp +++ b/src/sq_glview.cpp @@ -44,7 +44,7 @@ #include "ksquirrel.h" #include "sq_widgetstack.h" -SQ_GLView * SQ_GLView::m_instance = 0; +SQ_GLView * SQ_GLView::m_instance = nullptr; SQ_GLView::SQ_GLView(TQWidget *parent) : TQVBox(parent, "ksquirrel-image-window") { @@ -103,16 +103,16 @@ void SQ_GLView::createContent() TQLabel *sqSBDecoded = new TQLabel(TQString(), sqSBDecodedBox, "SBDecoded"); names.insert("SBDecoded", sqSBDecoded); - TQLabel *sqSBGLZoom = new TQLabel(TQString(), 0, "SBGLZoom"); + TQLabel *sqSBGLZoom = new TQLabel(TQString(), nullptr, "SBGLZoom"); names.insert("SBGLZoom", sqSBGLZoom); - TQLabel *sqSBGLAngle = new TQLabel(TQString(), 0, "SBGLAngle"); + TQLabel *sqSBGLAngle = new TQLabel(TQString(), nullptr, "SBGLAngle"); names.insert("SBGLAngle", sqSBGLAngle); - TQLabel *sqSBLoaded = new TQLabel(TQString(), 0, "SBLoaded"); + TQLabel *sqSBLoaded = new TQLabel(TQString(), nullptr, "SBLoaded"); TQToolTip::add(sqSBLoaded, i18n("Loading time")); names.insert("SBLoaded", sqSBLoaded); - TQLabel *sqSBFrame = new TQLabel(TQString(), 0, "SBFrame"); + TQLabel *sqSBFrame = new TQLabel(TQString(), nullptr, "SBFrame"); names.insert("SBFrame", sqSBFrame); - TQLabel *sqSBFile = new KSqueezedTextLabel(TQString(), 0, "SBFile"); + TQLabel *sqSBFile = new KSqueezedTextLabel(TQString(), nullptr, "SBFile"); names.insert("SBFile", sqSBFile); sqSBFrame->setAlignment(TQt::AlignHCenter | TQt::AlignVCenter | TQt::ExpandTabs); diff --git a/src/sq_glview.h b/src/sq_glview.h index 25b6fc2..ec69dba 100644 --- a/src/sq_glview.h +++ b/src/sq_glview.h @@ -75,7 +75,7 @@ class SQ_GLView : public TQVBox public: - SQ_GLView(TQWidget *parent = 0); + SQ_GLView(TQWidget *parent = nullptr); ~SQ_GLView(); void leftTab(); diff --git a/src/sq_glwidget.cpp b/src/sq_glwidget.cpp index 0985b0b..0602110 100644 --- a/src/sq_glwidget.cpp +++ b/src/sq_glwidget.cpp @@ -91,7 +91,7 @@ /* ***************************************************************************************** */ -SQ_GLWidget * SQ_GLWidget::m_instance = 0; +SQ_GLWidget * SQ_GLWidget::m_instance = nullptr; static const int timer_delay_file = 5; static const double rad_const = 3.14159265358979323846 / 180.0; @@ -116,10 +116,10 @@ SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent connect(&t_glv, TQ_SIGNAL(message(const TQString &)), this, TQ_SIGNAL(message(const TQString &))); #endif - zoomMenu = 0; - selectionMenu = 0; - images = 0; - parts_broken = 0; + zoomMenu = nullptr; + selectionMenu = nullptr; + images = nullptr; + parts_broken = nullptr; ac = new TDEActionCollection(this, this, "GLWidget actionCollection"); changed = blocked = decoded = reset_mode = false; @@ -1873,7 +1873,7 @@ void SQ_GLWidget::decodeFailedOn0(const int err_code) decoded = (bool)tabs.size(); reset_mode = false; tab->broken = true; - tab->lib = 0; + tab->lib = nullptr; useBrokenImage(err_code); } diff --git a/src/sq_glwidget.h b/src/sq_glwidget.h index be4903f..e2405d8 100644 --- a/src/sq_glwidget.h +++ b/src/sq_glwidget.h @@ -127,7 +127,7 @@ class SQ_GLWidget : public TQGLWidget public: - SQ_GLWidget(TQWidget *parent = 0, const char *name = 0); + SQ_GLWidget(TQWidget *parent = nullptr, const char *name = nullptr); ~SQ_GLWidget(); void setDownloadPercents(int); diff --git a/src/sq_glwidget_helpers.cpp b/src/sq_glwidget_helpers.cpp index 0dd96c0..6f5d994 100644 --- a/src/sq_glwidget_helpers.cpp +++ b/src/sq_glwidget_helpers.cpp @@ -38,7 +38,7 @@ #include "sq_glwidget_helpers.h" SQ_ToolButtonPopup::SQ_ToolButtonPopup(const TQPixmap &pix, const TQString &textLabel, TDEToolBar *parent) - : TDEToolBarButton(pix, -1, parent, 0, textLabel) + : TDEToolBarButton(pix, -1, parent, nullptr, textLabel) { setFixedWidth(SQ_ToolButton::fixedWidth()); } diff --git a/src/sq_glwidget_helpers.h b/src/sq_glwidget_helpers.h index f8cfbd3..d7e499a 100644 --- a/src/sq_glwidget_helpers.h +++ b/src/sq_glwidget_helpers.h @@ -37,7 +37,7 @@ class SQ_ToolButton : public TQToolButton { public: SQ_ToolButton(const TQIconSet &iconSet, const TQString &textLabel, TQObject *receiver, - const char *slot, TDEToolBar *parent, const char *name = 0); + const char *slot, TDEToolBar *parent, const char *name = nullptr); ~SQ_ToolButton(); static int fixedWidth(); diff --git a/src/sq_glwidget_stuff.cpp b/src/sq_glwidget_stuff.cpp index dde9927..22b186e 100644 --- a/src/sq_glwidget_stuff.cpp +++ b/src/sq_glwidget_stuff.cpp @@ -80,16 +80,16 @@ void SQ_GLWidget::createActions() { pASelectionRect = new TDEToggleAction(i18n("Rectangle"), TQPixmap(locate("data", "images/actions/glselection_rect.png")), 0, this, TQ_SLOT(slotSelectionRect()), ac, "SQ Selection Rect"); pASelectionEllipse = new TDEToggleAction(i18n("Ellipse"), TQPixmap(locate("data", "images/actions/glselection_ellipse.png")), 0, this, TQ_SLOT(slotSelectionEllipse()), ac, "SQ Selection Ellipse"); - pASelectionClear = new TDEAction(i18n("Clear"), 0, 0, this, TQ_SLOT(slotSelectionClear()), ac, "SQ Selection Clear"); + pASelectionClear = new TDEAction(i18n("Clear"), nullptr, 0, this, TQ_SLOT(slotSelectionClear()), ac, "SQ Selection Clear"); pAZoomW = new TDEToggleAction(i18n("Fit width"), TQPixmap(locate("data", "images/actions/zoomW.png")), 0, this, TQ_SLOT(slotZoomW()), ac, "SQ ZoomW"); pAZoomH = new TDEToggleAction(i18n("Fit height"), TQPixmap(locate("data", "images/actions/zoomH.png")), 0, this, TQ_SLOT(slotZoomH()), ac, "SQ ZoomH"); pAZoomWH = new TDEToggleAction(i18n("Fit image"), TQPixmap(locate("data", "images/actions/zoomWH.png")), 0, this, TQ_SLOT(slotZoomWH()), ac, "SQ ZoomWH"); pAZoom100 = new TDEToggleAction(i18n("Zoom 100%"), TQPixmap(locate("data", "images/actions/zoom100.png")), 0, this, TQ_SLOT(slotZoom100()), ac, "SQ Zoom100"); pAZoomLast = new TDEToggleAction(i18n("Leave previous zoom"), TQPixmap(locate("data", "images/actions/zoomlast.png")), 0, this, TQ_SLOT(slotZoomLast()), ac, "SQ ZoomLast"); - pAIfLess = new TDEToggleAction(i18n("Ignore, if image is smaller than window"), TQPixmap(locate("data", "images/actions/ifless.png")), 0, 0, 0, ac, "if less"); + pAIfLess = new TDEToggleAction(i18n("Ignore, if image is smaller than window"), TQPixmap(locate("data", "images/actions/ifless.png")), 0, nullptr, nullptr, ac, "if less"); - pAFull = new TDEToggleAction(TQString(), 0, 0, 0, ac, "SQ GL Full"); + pAFull = new TDEToggleAction(TQString(), 0, nullptr, nullptr, ac, "SQ GL Full"); TQString squirrel_zoom_actions = TQString::fromLatin1("squirrel_zoom_actions"); pAZoomW->setExclusiveGroup(squirrel_zoom_actions); @@ -642,7 +642,7 @@ void SQ_GLWidget::toClipboard() if(!decoded || tab->broken) return; - TQImage im((uchar *)tab->parts[tab->current].buffer->data(), tab->parts[tab->current].realw, tab->parts[tab->current].realh, 32, 0, 0, TQImage::LittleEndian); + TQImage im((uchar *)tab->parts[tab->current].buffer->data(), tab->parts[tab->current].realw, tab->parts[tab->current].realh, 32, nullptr, 0, TQImage::LittleEndian); im = im.swapRGB(); @@ -691,7 +691,7 @@ void SQ_GLWidget::filter() void SQ_GLWidget::slotFilter(SQ_ImageFilterOptions *filtopt) { - TQImage im((uchar *)tab->parts[tab->current].buffer->data(), tab->parts[tab->current].realw, tab->parts[tab->current].realh, 32, 0, 0, TQImage::LittleEndian); + TQImage im((uchar *)tab->parts[tab->current].buffer->data(), tab->parts[tab->current].realw, tab->parts[tab->current].realh, 32, nullptr, 0, TQImage::LittleEndian); TQImage img = gls->valid() ? im.copy(tab->sx, tab->sy, tab->sw, tab->sh) : im; fmt_filters::image image = @@ -735,7 +735,7 @@ void SQ_GLWidget::slotFilter(SQ_ImageFilterOptions *filtopt) void SQ_GLWidget::slotBCG(SQ_ImageBCGOptions *bcgopt) { - TQImage im((uchar *)tab->parts[tab->current].buffer->data(), tab->parts[tab->current].realw, tab->parts[tab->current].realh, 32, 0, 0, TQImage::LittleEndian); + TQImage im((uchar *)tab->parts[tab->current].buffer->data(), tab->parts[tab->current].realw, tab->parts[tab->current].realh, 32, nullptr, 0, TQImage::LittleEndian); TQImage img = gls->valid() ? im.copy(tab->sx, tab->sy, tab->sw, tab->sh) : im; fmt_filters::image image = @@ -807,7 +807,7 @@ bool SQ_GLWidget::calcSelection() TQImage SQ_GLWidget::generatePreview() { - TQImage im((uchar *)tab->parts[tab->current].buffer->data(), tab->parts[tab->current].realw, tab->parts[tab->current].realh, 32, 0, 0, TQImage::LittleEndian); + TQImage im((uchar *)tab->parts[tab->current].buffer->data(), tab->parts[tab->current].realw, tab->parts[tab->current].realh, 32, nullptr, 0, TQImage::LittleEndian); TQImage img, ret; if(gls->valid() && calcSelection()) @@ -1409,7 +1409,7 @@ void SQ_GLWidget::slotCloseRequest(int index) (*it).clearParts(); tabs.erase(it); - tab = 0; + tab = nullptr; gls->setVisible(false); @@ -1731,7 +1731,7 @@ void SQ_GLWidget::slotPrint() if(!decoded || tab->broken) return; - TQImage im((uchar *)tab->parts[tab->current].buffer->data(), tab->parts[tab->current].realw, tab->parts[tab->current].realh, 32, 0, 0, TQImage::LittleEndian); + TQImage im((uchar *)tab->parts[tab->current].buffer->data(), tab->parts[tab->current].realw, tab->parts[tab->current].realh, 32, nullptr, 0, TQImage::LittleEndian); TQImage img; if(gls->valid() && calcSelection()) diff --git a/src/sq_hloptions.cpp b/src/sq_hloptions.cpp index d7d8fe2..e6c3484 100644 --- a/src/sq_hloptions.cpp +++ b/src/sq_hloptions.cpp @@ -21,7 +21,7 @@ #include "sq_hloptions.h" -SQ_HLOptions * SQ_HLOptions::m_instance = 0; +SQ_HLOptions * SQ_HLOptions::m_instance = nullptr; SQ_HLOptions::SQ_HLOptions() : showLibsAndExit(false), diff --git a/src/sq_iconlistbox.cpp b/src/sq_iconlistbox.cpp index dd6cc35..8ab825b 100644 --- a/src/sq_iconlistbox.cpp +++ b/src/sq_iconlistbox.cpp @@ -34,13 +34,13 @@ void SQ_IconListBox::updateWidth() { int maxWidth = 10, w; - for(TQListBoxItem *i = item(0); i != 0; i = i->next()) + for(TQListBoxItem *i = item(0); i; i = i->next()) { w = ((SQ_IconListItem *)i)->width(this); maxWidth = TQMAX(w, maxWidth); } - for(TQListBoxItem *i = item(0); i != 0; i = i->next()) + for(TQListBoxItem *i = item(0); i; i = i->next()) ((SQ_IconListItem *)i)->expandMinimumWidth(maxWidth + 30); if(verticalScrollBar()->isVisible()) diff --git a/src/sq_iconlistbox.h b/src/sq_iconlistbox.h index 3fc7b68..9bb4be6 100644 --- a/src/sq_iconlistbox.h +++ b/src/sq_iconlistbox.h @@ -29,7 +29,7 @@ class SQ_IconListBox : public TDEListBox { public: - SQ_IconListBox(TQWidget * = 0, const char * = 0, WFlags = 0); + SQ_IconListBox(TQWidget * = nullptr, const char * = nullptr, WFlags = 0); void updateAndInstall(TQObject *); diff --git a/src/sq_iconlistitem.cpp b/src/sq_iconlistitem.cpp index 7bf06b3..e5ea38c 100644 --- a/src/sq_iconlistitem.cpp +++ b/src/sq_iconlistitem.cpp @@ -47,9 +47,9 @@ int SQ_IconListItem::expandMinimumWidth( int width ) const TQPixmap& SQ_IconListItem::defaultPixmap() { - static TQPixmap *pix=0; + static TQPixmap *pix=nullptr; - if(pix == 0) + if(!pix) { pix = new TQPixmap( 32, 32 ); TQPainter p(pix); diff --git a/src/sq_iconloader.cpp b/src/sq_iconloader.cpp index c8c9ec8..5fc008d 100644 --- a/src/sq_iconloader.cpp +++ b/src/sq_iconloader.cpp @@ -25,7 +25,7 @@ #include "sq_iconloader.h" #include "sq_iconloader_pixmaps.h" -SQ_IconLoader * SQ_IconLoader::m_instance = 0; +SQ_IconLoader * SQ_IconLoader::m_instance = nullptr; SQ_IconLoader::SQ_IconLoader(TQObject *parent) : TQObject(parent) { @@ -40,7 +40,7 @@ SQ_IconLoader::~SQ_IconLoader() TQPixmap SQ_IconLoader::loadIcon(const TQString& name, TDEIcon::Group group, int size) const { // try to load from installed icon theme - TQPixmap p = TDEGlobal::iconLoader()->loadIcon(name, group, size, TDEIcon::DefaultState, 0, true); + TQPixmap p = TDEGlobal::iconLoader()->loadIcon(name, group, size, TDEIcon::DefaultState, nullptr, true); // requested pixmap not found, let's // try to find it in our pixmaps diff --git a/src/sq_iconloader.h b/src/sq_iconloader.h index dec6a6e..a9df924 100644 --- a/src/sq_iconloader.h +++ b/src/sq_iconloader.h @@ -32,7 +32,7 @@ class SQ_IconLoader : public TQObject { public: - SQ_IconLoader(TQObject *parent = 0); + SQ_IconLoader(TQObject *parent = nullptr); ~SQ_IconLoader(); TQPixmap loadIcon(const TQString &name, TDEIcon::Group group = TDEIcon::Desktop, int size = 16) const; diff --git a/src/sq_imageloader.cpp b/src/sq_imageloader.cpp index f818db7..8962b85 100644 --- a/src/sq_imageloader.cpp +++ b/src/sq_imageloader.cpp @@ -32,14 +32,14 @@ #include #include -SQ_ImageLoader * SQ_ImageLoader::m_instance = 0; +SQ_ImageLoader * SQ_ImageLoader::m_instance = nullptr; SQ_ImageLoader::SQ_ImageLoader(TQObject *parent) : TQObject(parent), m_errors(0) { m_instance = this; - m_image = 0; - dumbscan = 0; + m_image = nullptr; + dumbscan = nullptr; finfo = new fmt_info; } @@ -242,8 +242,8 @@ void SQ_ImageLoader::cleanup(bool del) if(dumbscan) free(dumbscan); if(del && m_image) free(m_image); - dumbscan = 0; - m_image = 0; + dumbscan = nullptr; + m_image = nullptr; } /* @@ -251,7 +251,7 @@ void SQ_ImageLoader::cleanup(bool del) */ TQImage SQ_ImageLoader::image() const { - TQImage image((unsigned char*)bits(), finfo->image[0].w, finfo->image[0].h, 32, 0, 0, TQImage::LittleEndian); + TQImage image((unsigned char*)bits(), finfo->image[0].w, finfo->image[0].h, 32, nullptr, 0, TQImage::LittleEndian); // if the image has alpha channel, let TQImage know it if(finfo->image[0].hasalpha) diff --git a/src/sq_imageloader.h b/src/sq_imageloader.h index 409b293..358e50d 100644 --- a/src/sq_imageloader.h +++ b/src/sq_imageloader.h @@ -52,7 +52,7 @@ class SQ_ImageLoader : public TQObject /* * Try to determine image dimensions. */ - bool tasteImage(const TQString &path, int *w, int *h, SQ_LIBRARY *_lib = 0); + bool tasteImage(const TQString &path, int *w, int *h, SQ_LIBRARY *_lib = nullptr); /* * Remove any previously saved data. diff --git a/src/sq_library.h b/src/sq_library.h index cf350d6..38b8fe1 100644 --- a/src/sq_library.h +++ b/src/sq_library.h @@ -41,7 +41,7 @@ class fmt_codec_base; struct SQ_LIBRARY { - SQ_LIBRARY() : lib(0), codec(0), codec_il(0), tmp(0), tmp_il(0) + SQ_LIBRARY() : lib(nullptr), codec(nullptr), codec_il(nullptr), tmp(nullptr), tmp_il(nullptr) {} // pointer to library diff --git a/src/sq_libraryhandler.cpp b/src/sq_libraryhandler.cpp index ecc4a83..01455fa 100644 --- a/src/sq_libraryhandler.cpp +++ b/src/sq_libraryhandler.cpp @@ -48,7 +48,7 @@ static const int buffer_size = 10; -SQ_LibraryHandler * SQ_LibraryHandler::m_instance = 0; +SQ_LibraryHandler * SQ_LibraryHandler::m_instance = nullptr; // SQ_LibraryHandler SQ_LibraryHandler::SQ_LibraryHandler(TQObject *parent) @@ -82,7 +82,7 @@ SQ_LIBRARY* SQ_LibraryHandler::libraryForFile(const KURL &url) iterator itEnd = end(); - SQ_LIBRARY *l = 0; + SQ_LIBRARY *l = nullptr; // go through array and compare names for(iterator it = begin();it != itEnd;++it) @@ -230,7 +230,7 @@ void SQ_LibraryHandler::clear() (*it).codec_destroy((*it).codec_il); (*it).codec_destroy((*it).codec); delete (*it).lib; - (*it).lib = 0; + (*it).lib = nullptr; } TQValueVector::clear(); @@ -294,7 +294,7 @@ void SQ_LibraryHandler::add(TQStringList &foundLibraries) libtmp.readable = o.readable; libtmp.canbemultiple = o.canbemultiple; libtmp.needtempfile = o.needtempfile; - libtmp.tmp = 0; + libtmp.tmp = nullptr; libtmp.codec_il = libtmp.codec_create(); @@ -413,7 +413,7 @@ SQ_LIBRARY* SQ_LibraryHandler::libraryByName(const TQString &name) return l; } - return 0; + return nullptr; } void SQ_LibraryHandler::writeSettings(SQ_LIBRARY *lib) @@ -527,7 +527,7 @@ void SQ_LibraryHandler::load() TQFileInfoListIterator it(*list); TQFileInfo *fi; - while((fi = it.current()) != 0) + while((fi = it.current()) != nullptr) { libs.append(fi->absFilePath()); ++it; diff --git a/src/sq_libraryhandler.h b/src/sq_libraryhandler.h index 8a3b25d..9fad62a 100644 --- a/src/sq_libraryhandler.h +++ b/src/sq_libraryhandler.h @@ -37,7 +37,7 @@ class KURL; class SQ_LibraryHandler : public TQObject, public TQValueVector { public: - SQ_LibraryHandler(TQObject *parent = 0); + SQ_LibraryHandler(TQObject *parent = nullptr); ~SQ_LibraryHandler(); enum Support { Maybe = 0, Yes, No }; diff --git a/src/sq_navigatordropmenu.cpp b/src/sq_navigatordropmenu.cpp index efd629b..c427501 100644 --- a/src/sq_navigatordropmenu.cpp +++ b/src/sq_navigatordropmenu.cpp @@ -28,27 +28,27 @@ #include "sq_popupmenu.h" #include "sq_navigatordropmenu.h" -SQ_NavigatorDropMenu * SQ_NavigatorDropMenu::m_instance= 0; +SQ_NavigatorDropMenu * SQ_NavigatorDropMenu::m_instance= nullptr; SQ_NavigatorDropMenu::SQ_NavigatorDropMenu(TQObject *parent) : TQObject(parent) { m_instance = this; - TDEActionCollection *ac = new TDEActionCollection(0, this, "Actions for drop menu"); + TDEActionCollection *ac = new TDEActionCollection(nullptr, this, "Actions for drop menu"); - dropmenu = new SQ_PopupMenu(0); + dropmenu = new SQ_PopupMenu(nullptr); // "copy" action TDEAction *pACopy = new TDEAction(i18n("Copy here"), "edit-paste", 0, this, TQ_SLOT(slotCopy()), ac, "sq_copy"); // "move" action - TDEAction *pAMove = new TDEAction(i18n("Move here"), 0, 0, this, TQ_SLOT(slotMove()), ac, "sq_move"); + TDEAction *pAMove = new TDEAction(i18n("Move here"), nullptr, 0, this, TQ_SLOT(slotMove()), ac, "sq_move"); // "link" action TDEAction *pALink = new TDEAction(i18n("Link here"), "www", 0, this, TQ_SLOT(slotLink()), ac, "sq_link"); // "cancel" action, this action will do nothing - just close popup menu - TDEAction *pACancel = new TDEAction(i18n("Cancel"), 0, 0, 0, 0, ac, "sq_cancel"); + TDEAction *pACancel = new TDEAction(i18n("Cancel"), nullptr, 0, nullptr, nullptr, ac, "sq_cancel"); // plug all actions to popup menu dropmenu->insertTitle(TQString()); diff --git a/src/sq_navigatordropmenu.h b/src/sq_navigatordropmenu.h index 11bef69..3a1daf6 100644 --- a/src/sq_navigatordropmenu.h +++ b/src/sq_navigatordropmenu.h @@ -49,7 +49,7 @@ class SQ_NavigatorDropMenu : public TQObject public: - SQ_NavigatorDropMenu(TQObject *parent = 0); + SQ_NavigatorDropMenu(TQObject *parent = nullptr); ~SQ_NavigatorDropMenu(); static SQ_NavigatorDropMenu* instance() { return m_instance; } diff --git a/src/sq_pixmapcache.cpp b/src/sq_pixmapcache.cpp index 6710420..4450b3f 100644 --- a/src/sq_pixmapcache.cpp +++ b/src/sq_pixmapcache.cpp @@ -23,7 +23,7 @@ #include "sq_thumbnailsize.h" #include "sq_dirthumbs.h" -SQ_PixmapCache * SQ_PixmapCache::m_instance = 0; +SQ_PixmapCache * SQ_PixmapCache::m_instance = nullptr; SQ_PixmapCache::SQ_PixmapCache(TQObject *parent, int limit) : TQObject(parent), TQMap() diff --git a/src/sq_popupmenu.h b/src/sq_popupmenu.h index efc12f2..1db2e6b 100644 --- a/src/sq_popupmenu.h +++ b/src/sq_popupmenu.h @@ -27,7 +27,7 @@ class SQ_PopupMenu : public TDEPopupMenu { public: - SQ_PopupMenu(TQWidget *parent = 0, const char *name = 0); + SQ_PopupMenu(TQWidget *parent = nullptr, const char *name = nullptr); ~SQ_PopupMenu(); void insertTitle(const TQString &t); diff --git a/src/sq_progress.cpp b/src/sq_progress.cpp index e22455c..f6c5003 100644 --- a/src/sq_progress.cpp +++ b/src/sq_progress.cpp @@ -30,7 +30,7 @@ #include "sq_progress.h" SQ_Progress::SQ_Progress(TQWidget *parent, const char *name) - : TQLabel(parent, name, TQt::WNoAutoErase), m_text(true), painter(0) + : TQLabel(parent, name, TQt::WNoAutoErase), m_text(true), painter(nullptr) {} SQ_Progress::~SQ_Progress() @@ -100,7 +100,7 @@ void SQ_Progress::advance(int step_new) void SQ_Progress::flush() { delete painter; - painter = 0; + painter = nullptr; } void SQ_Progress::paintEvent(TQPaintEvent *) diff --git a/src/sq_progress.h b/src/sq_progress.h index b6f884a..0615752 100644 --- a/src/sq_progress.h +++ b/src/sq_progress.h @@ -30,7 +30,7 @@ class TQPainter; class SQ_Progress : public TQLabel { public: - SQ_Progress(TQWidget *parent = 0, const char *name = 0); + SQ_Progress(TQWidget *parent = nullptr, const char *name = nullptr); ~SQ_Progress(); void setTotalSteps(int totalSteps); diff --git a/src/sq_progressbox.h b/src/sq_progressbox.h index 35075df..b1ffd75 100644 --- a/src/sq_progressbox.h +++ b/src/sq_progressbox.h @@ -27,7 +27,7 @@ class TQPushButton; class SQ_ProgressBox : public TQHBox { public: - SQ_ProgressBox(TQWidget * parent = 0, const char * name = 0); + SQ_ProgressBox(TQWidget * parent = nullptr, const char * name = nullptr); ~SQ_ProgressBox(); SQ_Progress* progressBar() const; diff --git a/src/sq_slideshowwidget.cpp b/src/sq_slideshowwidget.cpp index 167fb44..88599c7 100644 --- a/src/sq_slideshowwidget.cpp +++ b/src/sq_slideshowwidget.cpp @@ -48,7 +48,7 @@ #include #endif -SQ_SlideShowWidget * SQ_SlideShowWidget::m_inst = 0; +SQ_SlideShowWidget * SQ_SlideShowWidget::m_inst = nullptr; SQ_SlideShowWidget::SQ_SlideShowWidget(TQWidget *parent, const char *name) : TQWidget(parent,name, TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_StaysOnTop | TQt::WNoAutoErase) @@ -182,9 +182,9 @@ void SQ_SlideShowWidget::loadImage(const TQString &_path, int _current) int w = finfo->image[0].w; int h = finfo->image[0].h; - TQImage *all = 0, *small = 0; + TQImage *all = nullptr, *small = nullptr; - all = new TQImage((uchar *)bits, w, h, 32, 0, 0, TQImage::LittleEndian); + all = new TQImage((uchar *)bits, w, h, 32, nullptr, 0, TQImage::LittleEndian); all->setAlphaBuffer(true); // scale down to fit into window @@ -194,7 +194,7 @@ void SQ_SlideShowWidget::loadImage(const TQString &_path, int _current) *small = SQ_Utils::scale(*all, width(), height(), SQ_Utils::SMOOTH_FAST, TQImage::ScaleMin); delete all; - all = 0; + all = nullptr; if(small->isNull()) { diff --git a/src/sq_slideshowwidget.h b/src/sq_slideshowwidget.h index d708964..f18ab67 100644 --- a/src/sq_slideshowwidget.h +++ b/src/sq_slideshowwidget.h @@ -41,7 +41,7 @@ class SQ_SlideShowWidget : public TQWidget public: - SQ_SlideShowWidget(TQWidget *parent = 0, const char *name = 0); + SQ_SlideShowWidget(TQWidget *parent = nullptr, const char *name = nullptr); ~SQ_SlideShowWidget(); void beginSlideShow(int totl); diff --git a/src/sq_splashscreen.cpp b/src/sq_splashscreen.cpp index 6f2d8a8..57f35cc 100644 --- a/src/sq_splashscreen.cpp +++ b/src/sq_splashscreen.cpp @@ -46,7 +46,7 @@ #include "sq_splashscreen.h" #include "sq_progress.h" -SQ_SplashScreen * SQ_SplashScreen::m_inst = 0; +SQ_SplashScreen * SQ_SplashScreen::m_inst = nullptr; SQ_SplashScreen::SQ_SplashScreen(TQWidget * parent, const char *name) : TQWidget(parent, name, @@ -81,7 +81,7 @@ SQ_SplashScreen::~SQ_SplashScreen() { kdDebug() << "-SQ_SplashScreen" << endl; - m_inst = 0; + m_inst = nullptr; } void SQ_SplashScreen::finish() diff --git a/src/sq_splashscreen.h b/src/sq_splashscreen.h index 9473c71..1ad14e8 100644 --- a/src/sq_splashscreen.h +++ b/src/sq_splashscreen.h @@ -44,7 +44,7 @@ class SQ_Progress; class SQ_SplashScreen : public TQWidget { public: - SQ_SplashScreen(TQWidget *parent = 0, const char *name = 0); + SQ_SplashScreen(TQWidget *parent = nullptr, const char *name = nullptr); ~SQ_SplashScreen(); static void advance(); diff --git a/src/sq_thumbnailloadjob.cpp b/src/sq_thumbnailloadjob.cpp index 6f88341..89e725d 100644 --- a/src/sq_thumbnailloadjob.cpp +++ b/src/sq_thumbnailloadjob.cpp @@ -161,7 +161,7 @@ void SQ_ThumbnailLoadJob::determineNextIcon() if(donothing) return; - KFileItem *item = 0; + KFileItem *item = nullptr; SQ_FileThumbViewItem *tfi; while(true) diff --git a/src/sq_thumbnailsize.cpp b/src/sq_thumbnailsize.cpp index ff15fcd..6e183f7 100644 --- a/src/sq_thumbnailsize.cpp +++ b/src/sq_thumbnailsize.cpp @@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "sq_thumbnailsize.h" -SQ_ThumbnailSize * SQ_ThumbnailSize::m_instance = 0; +SQ_ThumbnailSize * SQ_ThumbnailSize::m_instance = nullptr; SQ_ThumbnailSize::SQ_ThumbnailSize(TQObject *parent, Size value) : TQObject(parent), mValue(value), m_extended(false), m_margin(16) diff --git a/src/sq_thumbnailsunused.cpp b/src/sq_thumbnailsunused.cpp index 59957bb..bea7975 100644 --- a/src/sq_thumbnailsunused.cpp +++ b/src/sq_thumbnailsunused.cpp @@ -19,7 +19,7 @@ #include "sq_thumbnailsunused.h" -SQ_ThumbnailsUnused * SQ_ThumbnailsUnused::m_instance = 0; +SQ_ThumbnailsUnused * SQ_ThumbnailsUnused::m_instance = nullptr; SQ_ThumbnailsUnused::SQ_ThumbnailsUnused(TQObject *parent) : TQObject(parent), TQMap() { diff --git a/src/sq_thumbnailsunused.h b/src/sq_thumbnailsunused.h index 7c2da3e..a1410fb 100644 --- a/src/sq_thumbnailsunused.h +++ b/src/sq_thumbnailsunused.h @@ -37,7 +37,7 @@ class TDEConfig; class SQ_ThumbnailsUnused : public TQObject, public TQMap { public: - SQ_ThumbnailsUnused(TQObject *parent = 0); + SQ_ThumbnailsUnused(TQObject *parent = nullptr); ~SQ_ThumbnailsUnused(); bool needUpdate(const KURL &u, time_t t); diff --git a/src/sq_utils.cpp b/src/sq_utils.cpp index 20eea42..4772d4e 100644 --- a/src/sq_utils.cpp +++ b/src/sq_utils.cpp @@ -83,12 +83,12 @@ TQImage SQ_Utils::scaleImage(unsigned char *im, int w, int h, int fitwithin) { if(w <= fitwithin && h <= fitwithin) { - TQImage scaled(im, w, h, 32, 0, 0, TQImage::LittleEndian); + TQImage scaled(im, w, h, 32, nullptr, 0, TQImage::LittleEndian); scaled.setAlphaBuffer(true); return scaled.copy(); } - TQImage orig(im, w, h, 32, 0, 0, TQImage::LittleEndian); + TQImage orig(im, w, h, 32, nullptr, 0, TQImage::LittleEndian); orig.setAlphaBuffer(true); // return scaled image @@ -98,7 +98,7 @@ TQImage SQ_Utils::scaleImage(unsigned char *im, int w, int h, int fitwithin) #ifndef KSQUIRREL_PART bool SQ_Utils::loadThumbnail(const KURL &pixPath, SQ_Thumbnail &t) { - SQ_LIBRARY *lib = 0; + SQ_LIBRARY *lib = nullptr; #ifdef SQ_HAVE_KEXIF lib = SQ_LibraryHandler::instance()->libraryForFile(pixPath.path()); diff --git a/src/sq_widgetstack.cpp b/src/sq_widgetstack.cpp index 2e1a38a..d06abd8 100644 --- a/src/sq_widgetstack.cpp +++ b/src/sq_widgetstack.cpp @@ -58,7 +58,7 @@ #include "sq_selectdeselectgroup.h" #include "sq_navigatordropmenu.h" -SQ_WidgetStack * SQ_WidgetStack::m_instance = 0; +SQ_WidgetStack * SQ_WidgetStack::m_instance = nullptr; SQ_WidgetStack::SQ_WidgetStack(TQWidget *parent, const int id) : TQObject(parent) { diff --git a/src/sq_widgetstack.h b/src/sq_widgetstack.h index 410e20d..a56d339 100644 --- a/src/sq_widgetstack.h +++ b/src/sq_widgetstack.h @@ -187,7 +187,7 @@ class SQ_WidgetStack : public TQObject * Do nothing, if no more supported images found in given * direction. */ - int moveTo(Direction direction, KFileItem *it = 0, bool useSupported = true); + int moveTo(Direction direction, KFileItem *it = nullptr, bool useSupported = true); /* * Get current filter. -- cgit v1.2.3