From 572f57748c780a16df9200780fa86c5ed4736253 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sun, 20 Sep 2026 16:09:19 -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 --- configdialog/kbfxconfigapp.cpp | 2 +- configdialog/kbfxconfigapp.h | 2 +- configdialog/main.cpp | 12 ++--- kbfxlib/common/kbfxconfig.cpp | 6 +-- kbfxlib/common/kbfxfontchooser.h | 2 +- kbfxlib/common/kbfxkiodownload.h | 2 +- kbfxlib/common/kbfxpixmaplabel.h | 2 +- kbfxlib/common/kbfxplasmapixmapprovider.cpp | 2 +- kbfxlib/common/kbfxpushbutton.h | 2 +- kbfxlib/common/kbfxthemesdata.cpp | 4 +- kbfxlib/data/kbfxdatagroup.cpp | 2 +- kbfxlib/data/kbfxplasmapluginloader.cpp | 10 ++--- kbfxlib/data/kbfxplugin.cpp | 4 +- plugins/applications/kbfxplasmadataplugin.cpp | 4 +- plugins/plasmoids/kbfxplasmadatapluginplosmoid.cpp | 4 +- plugins/recentstuff/kbfxplasmarecentstuff.cpp | 4 +- plugins/settings/kbfxplasmadatapluginsettings.cpp | 2 +- plugins/strigi/kbfxstrigiplugin.cpp | 2 +- src/kbfxbutton.cpp | 2 +- src/kbfxbutton.h | 2 +- src/kbfxplasmacanvasabstractitem.cpp | 4 +- src/kbfxplasmacanvasabstractitem.h | 2 +- src/kbfxplasmacanvasgroup.cpp | 6 +-- src/kbfxplasmacanvasgroupview.cpp | 2 +- src/kbfxplasmacanvasitem.cpp | 6 +-- src/kbfxplasmacanvasitem_events.cpp | 2 +- src/kbfxplasmacanvasitemwrapper.cpp | 4 +- src/kbfxplasmacanvasstack.cpp | 2 +- src/kbfxplasmacanvasview.cpp | 52 +++++++++++----------- src/kbfxplasmacanvasview.h | 2 +- src/kbfxplasmaindexview.cpp | 22 ++++----- src/kbfxplasmaindexview.h | 2 +- src/kbfxspinx.cpp | 2 +- src/kbfxspinx.h | 4 +- src/kbfxspinxmenu.h | 2 +- src/kbfxspinxpopup.cpp | 2 +- src/kbfxspinxpopup.h | 2 +- src/kbfxspinxscrollbar.h | 2 +- src/kbfxspinxtoolbar.h | 2 +- src/kbfxspinxtoolbutton.cpp | 6 +-- src/kbfxspinxtoolbutton.h | 2 +- src/kbfxspinxtop.h | 2 +- src/kbfxspinxview.h | 2 +- src/kbfxtooltip.h | 2 +- 44 files changed, 104 insertions(+), 104 deletions(-) diff --git a/configdialog/kbfxconfigapp.cpp b/configdialog/kbfxconfigapp.cpp index d176612..9445893 100644 --- a/configdialog/kbfxconfigapp.cpp +++ b/configdialog/kbfxconfigapp.cpp @@ -249,7 +249,7 @@ void KbfxConfigApp::btn_DefaultClicked() } case ABOUT: /* About page */ { - KMessageBox::information ( 0, tr2i18n ( "No default settings here ;)" ) ); + KMessageBox::information ( nullptr, tr2i18n ( "No default settings here ;)" ) ); break; } default: /* Default Action Switch should never be reached */ diff --git a/configdialog/kbfxconfigapp.h b/configdialog/kbfxconfigapp.h index d600297..efb75f3 100644 --- a/configdialog/kbfxconfigapp.h +++ b/configdialog/kbfxconfigapp.h @@ -94,7 +94,7 @@ class KbfxConfigApp : public KbfxConfigDlgMain /** * Default Constructor */ - KbfxConfigApp ( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + KbfxConfigApp ( TQWidget* parent = nullptr, const char* name = nullptr, WFlags fl = 0 ); /** * Default Destructor diff --git a/configdialog/main.cpp b/configdialog/main.cpp index 2a1f37e..0938dcc 100644 --- a/configdialog/main.cpp +++ b/configdialog/main.cpp @@ -43,7 +43,7 @@ static const TDECmdLineOptions options[] = TDECmdLineLastOption }; -static KbfxConfigApp *mainWin = 0; +static KbfxConfigApp *mainWin = nullptr; class KbfxConfigApplication : public TDEUniqueApplication { @@ -75,7 +75,7 @@ class KbfxConfigApplication : public TDEUniqueApplication if ( !ThemeArchive.open ( IO_WriteOnly ) ) { - KMessageBox::sorry ( 0, + KMessageBox::sorry ( nullptr, tr2i18n ( "

Could not create this KBFX theme package.

" ) ); kdDebug() << "Error creating theme file: " @@ -86,7 +86,7 @@ class KbfxConfigApplication : public TDEUniqueApplication { ThemeArchive.addLocalDirectory ( m_KbfxThemeFolderUrl,theme_name ); ThemeArchive.close (); - KMessageBox::information ( 0, + KMessageBox::information ( nullptr, tr2i18n ( "

KBFX Theme %1 prepared.

" ).arg ( theme_name ), tr2i18n ( "KBFX Theme Ready" ) ); kdDebug() << "KBFX theme file ready: " @@ -137,10 +137,10 @@ int main ( int argc, char **argv ) description, TDEAboutData::License_GPL, "(C) 2006 PhobosK", - 0, - 0, + nullptr, + nullptr, "phobosk@mail.kbfx.net" ); - about.addAuthor ( "PhobosK", 0, "phobosk@mail.kbfx.net" ); + about.addAuthor ( "PhobosK", nullptr, "phobosk@mail.kbfx.net" ); TDECmdLineArgs::init( argc, argv, &about ); TDEUniqueApplication::addCmdLineOptions(); diff --git a/kbfxlib/common/kbfxconfig.cpp b/kbfxlib/common/kbfxconfig.cpp index 75ed103..4839fcf 100644 --- a/kbfxlib/common/kbfxconfig.cpp +++ b/kbfxlib/common/kbfxconfig.cpp @@ -298,7 +298,7 @@ void KbfxConfig::readThemeInfo ( TQString &themePath, TQString &themeName ) setThemeInfoDefault(); TQFileInfo * info_theme = new TQFileInfo ( themePath + themeName + "/" + m_KbfxThemesVersion ); - TDEConfig * infoconfig = 0; + TDEConfig * infoconfig = nullptr; if ( info_theme->exists() ) { @@ -414,7 +414,7 @@ void KbfxConfig::readFontrc ( TQString & themePath, TQString & themeName, bool u TQString _abs_path = ""; TQFileInfo * info = new TQFileInfo ( themePath + themeName + "/kbfxfontrc" ); TQFileInfo * info_theme = new TQFileInfo ( KbfxThemeRcDestination + "/" + themeName + "_fontrc" ); - TDEConfig * fontconfig = 0; + TDEConfig * fontconfig = nullptr; /* if theme kbfxfontrc exists, make its configuration as default values - prefer users' configuration */ if ( info_theme->exists() || info->exists() ) @@ -529,7 +529,7 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us TQString _abs_path = ""; TQFileInfo * info = new TQFileInfo ( themePath + themeName + "/kbfxlayoutrc" ); TQFileInfo * info_theme = new TQFileInfo ( KbfxThemeRcDestination + "/" + themeName + "_layoutrc" ); - TDEConfig *layoutconfig = 0; + TDEConfig *layoutconfig = nullptr; /* if theme kbfxlayoutrc exists, make its configuration as default values - prefer users' configuration */ if ( info_theme->exists() || info->exists() ) diff --git a/kbfxlib/common/kbfxfontchooser.h b/kbfxlib/common/kbfxfontchooser.h index 28c2c60..b673b08 100644 --- a/kbfxlib/common/kbfxfontchooser.h +++ b/kbfxlib/common/kbfxfontchooser.h @@ -45,7 +45,7 @@ class KBFXFontChooser : public TQWidget TQ_PROPERTY ( TQFont font READ font WRITE setFont ) public: - KBFXFontChooser ( TQWidget *parent = 0, const char *name = 0 ); + KBFXFontChooser ( TQWidget *parent = nullptr, const char *name = nullptr ); ~KBFXFontChooser(); TQFont font() const { return m_font; }; diff --git a/kbfxlib/common/kbfxkiodownload.h b/kbfxlib/common/kbfxkiodownload.h index 9ebbb67..f5ad6e9 100644 --- a/kbfxlib/common/kbfxkiodownload.h +++ b/kbfxlib/common/kbfxkiodownload.h @@ -35,7 +35,7 @@ class KbfxKioDownload : public TQObject public: - KbfxKioDownload ( TQObject * parent = 0, const char * name = 0 ); + KbfxKioDownload ( TQObject * parent = nullptr, const char * name = nullptr ); ~KbfxKioDownload(); /* KbfxKioDownload invocation - pass an url as TQString */ diff --git a/kbfxlib/common/kbfxpixmaplabel.h b/kbfxlib/common/kbfxpixmaplabel.h index 53c24be..e8e3ecb 100644 --- a/kbfxlib/common/kbfxpixmaplabel.h +++ b/kbfxlib/common/kbfxpixmaplabel.h @@ -33,7 +33,7 @@ class KbfxPixmapLabel : public TQLabel public: - KbfxPixmapLabel ( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); + KbfxPixmapLabel ( TQWidget *parent = nullptr, const char *name = nullptr, WFlags f = 0 ); ~KbfxPixmapLabel (); void dragEnterEvent ( TQDragEnterEvent *mouseDragEnterEvent ); diff --git a/kbfxlib/common/kbfxplasmapixmapprovider.cpp b/kbfxlib/common/kbfxplasmapixmapprovider.cpp index 178dc1f..9a0649e 100644 --- a/kbfxlib/common/kbfxplasmapixmapprovider.cpp +++ b/kbfxlib/common/kbfxplasmapixmapprovider.cpp @@ -25,7 +25,7 @@ int KbfxPlasmaPixmapProvider::addPixmap ( TQString pixmapname ) { TQString lFileName = PixmapPath( pixmapname ); - TQPixmap * lPixmapPtr = 0; + TQPixmap * lPixmapPtr = nullptr; if ( ( lPixmapPtr = TQPixmapCache::find ( pixmapname ) ) == nullptr ) { diff --git a/kbfxlib/common/kbfxpushbutton.h b/kbfxlib/common/kbfxpushbutton.h index 57c81c7..0438ad5 100644 --- a/kbfxlib/common/kbfxpushbutton.h +++ b/kbfxlib/common/kbfxpushbutton.h @@ -32,7 +32,7 @@ class KbfxPushButton: public KPushButton public: - KbfxPushButton ( TQWidget *parent = 0, const char *name = 0 ); + KbfxPushButton ( TQWidget *parent = nullptr, const char *name = nullptr ); ~KbfxPushButton(); void enterEvent ( TQEvent * ); diff --git a/kbfxlib/common/kbfxthemesdata.cpp b/kbfxlib/common/kbfxthemesdata.cpp index 174d8f9..604f8f4 100644 --- a/kbfxlib/common/kbfxthemesdata.cpp +++ b/kbfxlib/common/kbfxthemesdata.cpp @@ -33,7 +33,7 @@ ThemesMap KbfxThemesData::setThemeList ( TQString path ) { TQString m_KbfxThemesVersion = ConfigInit().m_KbfxThemesVersion; bool m_KbfxShowOldThemes = ConfigInit().m_KbfxShowOldThemes; - TQFileInfo *fi=0, *f=0; + TQFileInfo *fi=nullptr, *f=nullptr; m_themesMap.clear(); @@ -58,7 +58,7 @@ ThemesMap KbfxThemesData::setThemeList ( TQString path ) const TQFileInfoList *list = d.entryInfoList(); TQFileInfoListIterator it ( *list ); - while ( ( fi = it.current() ) != 0 ) + while ( ( fi = it.current() ) != nullptr ) { if ( !fi->fileName().startsWith ( "." ) ) { diff --git a/kbfxlib/data/kbfxdatagroup.cpp b/kbfxlib/data/kbfxdatagroup.cpp index a321f8e..6d3937f 100644 --- a/kbfxlib/data/kbfxdatagroup.cpp +++ b/kbfxlib/data/kbfxdatagroup.cpp @@ -59,7 +59,7 @@ KbfxDataGroup::lookup ( TQString str ) void KbfxDataGroup::addItem ( KbfxDataSource * item ) { - if ( item == 0 ) + if ( item == nullptr ) return ; m_data[item->name() ] = item; m_index[m_count] = item; diff --git a/kbfxlib/data/kbfxplasmapluginloader.cpp b/kbfxlib/data/kbfxplasmapluginloader.cpp index 531d9b3..dbcd9ad 100644 --- a/kbfxlib/data/kbfxplasmapluginloader.cpp +++ b/kbfxlib/data/kbfxplasmapluginloader.cpp @@ -29,7 +29,7 @@ KbfxPlasmaPluginLoader::KbfxPlasmaPluginLoader() { - m_plugin = 0; + m_plugin = nullptr; init(); } @@ -56,9 +56,9 @@ KbfxPlasmaPluginLoader::init() const TQFileInfoList *list = _dir->entryInfoList(); TQFileInfoListIterator it ( *list ); - TQFileInfo *fi=0; + TQFileInfo *fi=nullptr; int _index =0; - while ( ( fi = it.current() ) != 0 ) + while ( ( fi = it.current() ) != nullptr ) { TQString * path = new TQString ( libprefix+"/kbfx/plugins/"+fi->fileName() ); TQLibrary * _l = new TQLibrary ( *path ); @@ -105,7 +105,7 @@ KbfxPlasmaPluginLoader::getView ( TQString name ) init(); KbfxDataStack * stack = pluginMap() [name] ? pluginMap() [name]->data() : nullptr; - if (stack == 0 ) { + if (stack == nullptr ) { return new KbfxDataStack(); } @@ -133,7 +133,7 @@ KbfxPlasmaPluginLoader::search ( TQString pname,TQString keyword ) KbfxPlasmaPluginLoader::PluginMap& KbfxPlasmaPluginLoader::pluginMap() { - static PluginMap * map = 0; + static PluginMap * map = nullptr; if ( !map ) map = new PluginMap(); return *map; diff --git a/kbfxlib/data/kbfxplugin.cpp b/kbfxlib/data/kbfxplugin.cpp index 816b5a9..a515475 100644 --- a/kbfxlib/data/kbfxplugin.cpp +++ b/kbfxlib/data/kbfxplugin.cpp @@ -67,7 +67,7 @@ KbfxDataStack * KbfxPlugin::data() { typedef KbfxDataStack * ( *KbfxPluginView ) (); - KbfxDataStack * m_stack =0; + KbfxDataStack * m_stack =nullptr; KbfxPluginView m_hook; TQLibrary * m_plugin = new TQLibrary ( m_libName ); @@ -96,7 +96,7 @@ KbfxPlugin::search ( TQString keyword ) typedef KbfxDataGroup * ( *KbfxPluginSearch ) ( TQString key ); - KbfxDataGroup * m_group =0; + KbfxDataGroup * m_group =nullptr; KbfxPluginSearch m_hook; TQLibrary * m_plugin = new TQLibrary ( m_libName ); m_hook = ( KbfxPluginSearch ) m_plugin->resolve ( "search" ); diff --git a/plugins/applications/kbfxplasmadataplugin.cpp b/plugins/applications/kbfxplasmadataplugin.cpp index 73af688..eab6885 100644 --- a/plugins/applications/kbfxplasmadataplugin.cpp +++ b/plugins/applications/kbfxplasmadataplugin.cpp @@ -98,7 +98,7 @@ view () KServiceGroup::Ptr service = KServiceGroup::group ( "/" ); if ( service == nullptr) { - int messageBoxUserResReturn = KMessageBox::questionYesNo ( 0, + int messageBoxUserResReturn = KMessageBox::questionYesNo ( nullptr, tr2i18n ( "

There is a problem in TDE Menu services!
KBFX can try to autorepair this problem.
Should KBFX autorepair this problem?

" ), tr2i18n ( "Problem in TDE Menu Services" ), tr2i18n ( "Do Autorepair" ), @@ -216,7 +216,7 @@ search ( TQString _keyword ) break; } - if ( sPtr != 0 ) + if ( sPtr != nullptr ) delete sPtr; } delete count; diff --git a/plugins/plasmoids/kbfxplasmadatapluginplosmoid.cpp b/plugins/plasmoids/kbfxplasmadatapluginplosmoid.cpp index 3936c3a..5374be6 100644 --- a/plugins/plasmoids/kbfxplasmadatapluginplosmoid.cpp +++ b/plugins/plasmoids/kbfxplasmadatapluginplosmoid.cpp @@ -60,7 +60,7 @@ view () const TQFileInfoList *list = d.entryInfoList (); TQFileInfoListIterator it ( *list ); TQFileInfo *fi; - while ( ( fi = it.current () ) != 0 ) + while ( ( fi = it.current () ) != nullptr ) { TDEDesktopFile *desktop = new TDEDesktopFile ( fi->filePath () ); @@ -129,7 +129,7 @@ search ( TQString _keyword ) TQFileInfoListIterator it ( *list ); TQFileInfo *fi; - while ( ( fi = it.current () ) != 0 ) + while ( ( fi = it.current () ) != nullptr ) { if ( fi->fileName ().contains ( _keyword ) > 0 ) { diff --git a/plugins/recentstuff/kbfxplasmarecentstuff.cpp b/plugins/recentstuff/kbfxplasmarecentstuff.cpp index 185a4b2..79d9d72 100644 --- a/plugins/recentstuff/kbfxplasmarecentstuff.cpp +++ b/plugins/recentstuff/kbfxplasmarecentstuff.cpp @@ -55,7 +55,7 @@ view () TQFileInfoListIterator it ( *list ); TQFileInfo *fi; - while ( ( fi = it.current () ) != 0 ) + while ( ( fi = it.current () ) != nullptr ) { TDEDesktopFile *desktop = new TDEDesktopFile ( fi->filePath () ); @@ -126,7 +126,7 @@ search ( TQString _keyword ) TQFileInfoListIterator it ( *list ); TQFileInfo *fi; - while ( ( fi = it.current () ) != 0 ) + while ( ( fi = it.current () ) != nullptr ) { if ( fi->fileName ().contains ( _keyword ) > 0 ) { diff --git a/plugins/settings/kbfxplasmadatapluginsettings.cpp b/plugins/settings/kbfxplasmadatapluginsettings.cpp index 6cf6d40..b909217 100644 --- a/plugins/settings/kbfxplasmadatapluginsettings.cpp +++ b/plugins/settings/kbfxplasmadatapluginsettings.cpp @@ -99,7 +99,7 @@ view () KServiceGroup::Ptr service = KServiceGroup::baseGroup ( "settings" );//KServiceGroup::group ("/"); if ( service == nullptr) { - int messageBoxUserResReturn = KMessageBox::questionYesNo ( 0, + int messageBoxUserResReturn = KMessageBox::questionYesNo ( nullptr, tr2i18n ( "

There is a problem in TDE Menu services!
KBFX can try to autorepair this problem.
Should KBFX autorepair this problem?

" ), tr2i18n ( "Problem in TDE Menu Services" ), tr2i18n ( "Do Autorepair" ), diff --git a/plugins/strigi/kbfxstrigiplugin.cpp b/plugins/strigi/kbfxstrigiplugin.cpp index 11030ca..2b86934 100644 --- a/plugins/strigi/kbfxstrigiplugin.cpp +++ b/plugins/strigi/kbfxstrigiplugin.cpp @@ -152,7 +152,7 @@ search ( TQString _keyword ) struct timespec sleeptime; sleeptime.tv_sec = 0; sleeptime.tv_nsec = 1; - nanosleep ( &sleeptime, 0 ); + nanosleep ( &sleeptime, nullptr ); } hits = socket.getHits (); diff --git a/src/kbfxbutton.cpp b/src/kbfxbutton.cpp index 9a9b21a..9b5bba4 100644 --- a/src/kbfxbutton.cpp +++ b/src/kbfxbutton.cpp @@ -396,7 +396,7 @@ void KbfxButton::dropEvent ( TQDropEvent * e ) _normal_pix.isNull () || _pressed_pix.isNull () ) { - KMessageBox::error ( 0, + KMessageBox::error ( nullptr, tr2i18n ( "Invalid images were dropped!" "\nCannot set the KBFX button to use these images!" ), tr2i18n ( "Error setting KBFX button images" ) ); diff --git a/src/kbfxbutton.h b/src/kbfxbutton.h index 731e864..f9bc24b 100644 --- a/src/kbfxbutton.h +++ b/src/kbfxbutton.h @@ -51,7 +51,7 @@ class KbfxButton:public TQLabel public: - KbfxButton ( TQWidget * parent, const char * name = 0 ); + KbfxButton ( TQWidget * parent, const char * name = nullptr ); ~KbfxButton(); void kbfx_vista_button_setFx ( bool choice ); virtual void paintEvent ( TQPaintEvent *pe ); diff --git a/src/kbfxplasmacanvasabstractitem.cpp b/src/kbfxplasmacanvasabstractitem.cpp index 76ab05a..24beb99 100644 --- a/src/kbfxplasmacanvasabstractitem.cpp +++ b/src/kbfxplasmacanvasabstractitem.cpp @@ -39,7 +39,7 @@ KbfxPlasmaCanvasAbstractItem::KbfxPlasmaCanvasAbstractItem ( TQCanvasPixmapArray : TQCanvasSprite ( a,canvas ) { - m_source=0; + m_source=nullptr; } @@ -90,7 +90,7 @@ void KbfxPlasmaCanvasAbstractItem::mouseReleaseEvent ( TQMouseEvent * e ) void KbfxPlasmaCanvasAbstractItem::exec() { - if ( m_source == 0 ) + if ( m_source == nullptr ) return; diff --git a/src/kbfxplasmacanvasabstractitem.h b/src/kbfxplasmacanvasabstractitem.h index f0d3439..408b6fb 100644 --- a/src/kbfxplasmacanvasabstractitem.h +++ b/src/kbfxplasmacanvasabstractitem.h @@ -49,7 +49,7 @@ class KbfxPlasmaCanvasAbstractItem:public TQObject,public TQCanvasSprite virtual Type type() { return m_type; } virtual void setType ( Type t ) { m_type = t;} - TQString name() { if ( m_source != 0 ) return m_source->name(); else return TQString ( "Not Set" );}; + TQString name() { if ( m_source != nullptr ) return m_source->name(); else return TQString ( "Not Set" );}; void setSource ( KbfxDataSource src ); bool isCurrent(); diff --git a/src/kbfxplasmacanvasgroup.cpp b/src/kbfxplasmacanvasgroup.cpp index 1a28f08..c7a830a 100644 --- a/src/kbfxplasmacanvasgroup.cpp +++ b/src/kbfxplasmacanvasgroup.cpp @@ -40,7 +40,7 @@ KbfxPlasmaCanvasGroup::~KbfxPlasmaCanvasGroup () // if(*it) // delete (*it); // itemListMap ().remove (*it); - if ( ( *it ) != 0 ) + if ( ( *it ) != nullptr ) if ( !deleteItem ( ( *it ) ) ) { tqDebug ( "Deleting failed" ); @@ -53,7 +53,7 @@ KbfxPlasmaCanvasGroup::~KbfxPlasmaCanvasGroup () KbfxPlasmaCanvasGroup::ItemListMap & KbfxPlasmaCanvasGroup::itemListMap () { static ItemListMap * - map = 0; + map = nullptr; if ( !map ) map = new ItemListMap (); return *map; @@ -310,7 +310,7 @@ KbfxPlasmaCanvasGroup::groupContaining ( KbfxPlasmaCanvasAbstractItem * item ) { ItemListMap::ConstIterator it = itemListMap ().find ( item ); if ( it == itemListMap ().end () ) - return 0; + return nullptr; else return *it; } diff --git a/src/kbfxplasmacanvasgroupview.cpp b/src/kbfxplasmacanvasgroupview.cpp index b566510..5d1f7e9 100644 --- a/src/kbfxplasmacanvasgroupview.cpp +++ b/src/kbfxplasmacanvasgroupview.cpp @@ -77,7 +77,7 @@ KbfxPlasmaCanvasGroupView * KbfxPlasmaCanvasGroupView::contains ( KbfxPlasmaCanvasGroup * ) { //maybe I don't need this - return 0; + return nullptr; } diff --git a/src/kbfxplasmacanvasitem.cpp b/src/kbfxplasmacanvasitem.cpp index ae41db1..1392405 100644 --- a/src/kbfxplasmacanvasitem.cpp +++ b/src/kbfxplasmacanvasitem.cpp @@ -25,7 +25,7 @@ KbfxPlasmaCanvasItem::KbfxPlasmaCanvasItem ( TQCanvasPixmapArray * a , TQCanvas { this->setItemMode ( 1 ); setAnimated ( false ); - m_desktopFile = 0L; + m_desktopFile = nullptr; m_isCurrent = false; // m_pixmapArray = a; TQPixmap * _img = this->image ( 0 ); @@ -36,7 +36,7 @@ KbfxPlasmaCanvasItem::KbfxPlasmaCanvasItem ( TQCanvasPixmapArray * a , TQCanvas m_type = OTHER; // ConfigInit().read(); m_noComments = ConfigInit().m_noComments; - m_source = 0; + m_source = nullptr; m_margin = ConfigInit().m_commentMargine; m_lineColor = ConfigInit().m_lineColor; m_iconSize = ConfigInit().m_iconSize; @@ -51,7 +51,7 @@ KbfxPlasmaCanvasItem::KbfxPlasmaCanvasItem ( TQCanvasPixmapArray * a , TQCanvas KbfxPlasmaCanvasItem::~KbfxPlasmaCanvasItem() { - setCanvas ( 0L ); + setCanvas ( nullptr ); } /* TQCanvasPixmapArray * KbfxPlasmaCanvasItem::getPixmapArray() diff --git a/src/kbfxplasmacanvasitem_events.cpp b/src/kbfxplasmacanvasitem_events.cpp index 97cb56b..28c0ae1 100644 --- a/src/kbfxplasmacanvasitem_events.cpp +++ b/src/kbfxplasmacanvasitem_events.cpp @@ -58,7 +58,7 @@ void KbfxPlasmaCanvasItem::exec() { - if ( m_source == 0 ) + if ( m_source == nullptr ) return; diff --git a/src/kbfxplasmacanvasitemwrapper.cpp b/src/kbfxplasmacanvasitemwrapper.cpp index 08c8ec5..49a74be 100644 --- a/src/kbfxplasmacanvasitemwrapper.cpp +++ b/src/kbfxplasmacanvasitemwrapper.cpp @@ -76,7 +76,7 @@ KbfxPlasmaCanvasItemWrapper::item ( KbfxPlasmaCanvasItem::Type __type ) } - return 0; + return nullptr; } @@ -119,7 +119,7 @@ KbfxPlasmaCanvasItemWrapper::itemIndex ( KbfxPlasmaCanvasItem::Type __type ) return ( TQCanvasItem * ) _ret; } - return 0; + return nullptr; } #include "kbfxplasmacanvasitemwrapper.moc" diff --git a/src/kbfxplasmacanvasstack.cpp b/src/kbfxplasmacanvasstack.cpp index 27d9642..ad312cd 100644 --- a/src/kbfxplasmacanvasstack.cpp +++ b/src/kbfxplasmacanvasstack.cpp @@ -24,7 +24,7 @@ KbfxPlasmaCanvasStack::KbfxPlasmaCanvasStack() { - m_current= 0;//set to NULL + m_current= nullptr;//set to NULL m_count = 0; m_height = 0; m_width = 0; diff --git a/src/kbfxplasmacanvasview.cpp b/src/kbfxplasmacanvasview.cpp index cb3367c..661185e 100644 --- a/src/kbfxplasmacanvasview.cpp +++ b/src/kbfxplasmacanvasview.cpp @@ -31,14 +31,14 @@ KbfxPlasmaCanvasView::KbfxPlasmaCanvasView ( TQWidget * parent, this->setVScrollBarMode ( TQScrollView::AlwaysOff ); this->setHScrollBarMode ( TQScrollView::AlwaysOff ); setFrameShape ( TQFrame::NoFrame ); - m_currentItem = 0L; - m_stack = 0; + m_currentItem = nullptr; + m_stack = nullptr; m_currentView = new KbfxPlasmaCanvasGroupView (); m_lastSignalData = ""; - gstack = 0; - m_exeCandidate = 0; + gstack = nullptr; + m_exeCandidate = nullptr; m_findDone = true; - m_selectedItem = 0L; + m_selectedItem = nullptr; m_search = new TQCanvas ( this->width (), this->height () ); m_scrollbar_top = new KbfxSpinxScrollBar ( this ); @@ -80,7 +80,7 @@ KbfxPlasmaCanvasView::execFirst () // return; // } tqDebug("_____----------------------------------------"); - if ( m_exeCandidate != 0 ) + if ( m_exeCandidate != nullptr ) m_exeCandidate->exec (); } @@ -120,7 +120,7 @@ KbfxPlasmaCanvasView::execAt ( int i ) return; KbfxPlasmaCanvasItem *tmp = m_searchMap[e]; - if ( tmp == 0 ) + if ( tmp == nullptr ) return; else tmp->exec (); @@ -151,7 +151,7 @@ KbfxPlasmaCanvasView::mouseMoveEvent ( TQMouseEvent * me ) TQCanvasItemList l = canvas ()->collisions ( p ); for ( TQCanvasItemList::Iterator it = l.begin (); it != l.end (); ++it ) { - if ( *it == 0 ) + if ( *it == nullptr ) return; if ( ( *it )->rtti () == CANVASITEM ) { @@ -189,7 +189,7 @@ KbfxPlasmaCanvasView::contentsMouseMoveEvent ( TQMouseEvent * me ) for ( TQCanvasItemList::Iterator it = l.begin (); it != l.end (); ++it ) { - if ( *it == 0 ) + if ( *it == nullptr ) return; if ( ( *it )->rtti () == CANVASITEM ) { @@ -211,7 +211,7 @@ KbfxPlasmaCanvasView::contentsMouseMoveEvent ( TQMouseEvent * me ) void KbfxPlasmaCanvasView::contentsMousePressEvent ( TQMouseEvent * me ) { - KbfxPlasmaCanvasGroup *tmp = 0; + KbfxPlasmaCanvasGroup *tmp = nullptr; TQCanvasItemList l = canvas ()->collisions ( me->pos () ); for ( TQCanvasItemList::Iterator it = l.begin (); it != l.end (); ++it ) { @@ -223,7 +223,7 @@ KbfxPlasmaCanvasView::contentsMousePressEvent ( TQMouseEvent * me ) tmp = KbfxPlasmaCanvasGroup::groupContaining ( t ); } } - if ( tmp != 0 ) + if ( tmp != nullptr ) tmp->shade (); m_clickPos = me->pos (); @@ -236,11 +236,11 @@ KbfxPlasmaCanvasView::contentsMousePressEvent ( TQMouseEvent * me ) void KbfxPlasmaCanvasView::startDrag () { - if ( m_currentItem != 0 ) + if ( m_currentItem != nullptr ) { KbfxDataSource *src = new KbfxDataSource (); src = m_currentItem->source (); - if ( src == 0 ) + if ( src == nullptr ) { tqDebug ( "null source" ); return; @@ -268,7 +268,7 @@ void KbfxPlasmaCanvasView::enterEvent ( TQEvent * e ) { e = e; - if ( canvas () == 0 ) + if ( canvas () == nullptr ) return; // KbfxPlasmaCanvasGroup *tmp = 0; @@ -277,7 +277,7 @@ KbfxPlasmaCanvasView::enterEvent ( TQEvent * e ) for ( TQCanvasItemList::Iterator it = l.begin (); it != l.end (); ++it ) { - if ( *it == 0 ) + if ( *it == nullptr ) break; if ( ( *it )->rtti () == CANVASITEM ) { @@ -312,7 +312,7 @@ KbfxPlasmaCanvasView::clearAll () { // KbfxPlasmaCanvasItem *t = (KbfxPlasmaCanvasItem *) (*it); m_search->removeItem ( ( *it ) ); - ( *it )->setCanvas ( 0L ); + ( *it )->setCanvas ( nullptr ); // delete (*it); } } @@ -338,7 +338,7 @@ KbfxPlasmaCanvasView::setKbfxCanvas ( TQCanvas * cnv ) void KbfxPlasmaCanvasView::expandAll () { - if ( m_currentView != 0 ) + if ( m_currentView != nullptr ) { if ( !ConfigInit().m_startHidden ) m_currentView->unfoldGroupAll (); @@ -352,7 +352,7 @@ KbfxPlasmaCanvasView::handleLoadRequest ( KbfxSignal signal ) TQString tm = signal.name (); KbfxDataStack *_stack = m_dataStack[signal.name () ]; - if ( _stack == 0 ) + if ( _stack == nullptr ) { tqDebug ( "Empty Stack" ); return; @@ -440,7 +440,7 @@ KbfxPlasmaCanvasView::clearSearch () searchMap::Iterator it; for ( it = m_searchMap.begin (); it != m_searchMap.end (); ++it ) { - if ( it != 0 ) + if ( it != nullptr ) m_searchMap.remove ( it ); } } @@ -452,8 +452,8 @@ KbfxPlasmaCanvasView::search_R ( const TQString name ) gstack = new KbfxPlasmaCanvasStack (); KbfxPlasmaCanvasGroup *visualGroup = new KbfxPlasmaCanvasGroup (); KbfxPlasmaCanvasGroupView *glist = new KbfxPlasmaCanvasGroupView (); - KbfxPlasmaCanvasItem *box = 0; - KbfxPlasmaCanvasItemWrapper *boxwrapper = 0; + KbfxPlasmaCanvasItem *box = nullptr; + KbfxPlasmaCanvasItemWrapper *boxwrapper = nullptr; glist->setName ( "Search Result" ); @@ -582,18 +582,18 @@ void KbfxPlasmaCanvasView::loadGroup ( KbfxDataGroupList * src, KbfxPlasmaCanvasGroupView * dest ) { - if ( src == 0 ) + if ( src == nullptr ) return ; KbfxDataGroupList::GroupList list = src->getGroup (); dest->setName ( src->name () ); - KbfxPlasmaCanvasItem *box = 0; - KbfxPlasmaCanvasItemWrapper *boxwrapper = 0; - KbfxPlasmaCanvasGroup *appGroup = 0; //new KbfxPlasmaCanvasGroup (); + KbfxPlasmaCanvasItem *box = nullptr; + KbfxPlasmaCanvasItemWrapper *boxwrapper = nullptr; + KbfxPlasmaCanvasGroup *appGroup = nullptr; //new KbfxPlasmaCanvasGroup (); TQString l_lastAdd = ""; for ( int i = 0; i < src->count (); i++ ) { - if ( list.at ( i ) != 0 ) + if ( list.at ( i ) != nullptr ) { if ( list.at ( i )->count () <= 0 ) continue; diff --git a/src/kbfxplasmacanvasview.h b/src/kbfxplasmacanvasview.h index d71b6b8..9527e98 100644 --- a/src/kbfxplasmacanvasview.h +++ b/src/kbfxplasmacanvasview.h @@ -59,7 +59,7 @@ class KbfxPlasmaCanvasView : public TQCanvasView typedef TQMap dataStack; typedef TQMap searchMap; - KbfxPlasmaCanvasView ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); + KbfxPlasmaCanvasView ( TQWidget * parent = nullptr, const char * name = nullptr, WFlags f = 0 ); virtual ~KbfxPlasmaCanvasView(); void addStack ( KbfxPlasmaCanvasStack*stk,TQString name ); void addStack ( KbfxDataStack*stk,TQString name ); diff --git a/src/kbfxplasmaindexview.cpp b/src/kbfxplasmaindexview.cpp index e940c8e..57e0b78 100644 --- a/src/kbfxplasmaindexview.cpp +++ b/src/kbfxplasmaindexview.cpp @@ -40,12 +40,12 @@ KbfxPlasmaIndexView::KbfxPlasmaIndexView ( TQWidget * parent, const char *name, this->setVScrollBarMode ( TQScrollView::AlwaysOff ); this->setHScrollBarMode ( TQScrollView::AlwaysOff ); setFrameShape ( TQFrame::NoFrame ); - m_currentItem = 0L; - m_selectedItem = 0L; + m_currentItem = nullptr; + m_selectedItem = nullptr; // m_pluginList = ""; connect ( this, TQ_SIGNAL ( clicked ( KbfxPlasmaIndexItem * ) ), this, TQ_SLOT ( slotClicked ( KbfxPlasmaIndexItem * ) ) ); - m_currentView = 0; + m_currentView = nullptr; setDragAutoScroll ( true ); } @@ -57,7 +57,7 @@ KbfxPlasmaIndexView::~KbfxPlasmaIndexView () void KbfxPlasmaIndexView::checkMousePos () { - KbfxPlasmaCanvasGroup *tmp = 0; + KbfxPlasmaCanvasGroup *tmp = nullptr; if ( TQCursor::pos () == mapToGlobal ( contentsToViewport ( m_currentPos ) ) ) { TQMouseEvent me ( TQEvent::MouseButtonPress, @@ -196,8 +196,8 @@ KbfxPlasmaIndexView::loadList ( KbfxDataStack * stkPtr ) int _height = 0; - KbfxPlasmaCanvasItem *box = 0; - KbfxPlasmaCanvasItemWrapper *boxwrapper = 0; + KbfxPlasmaCanvasItem *box = nullptr; + KbfxPlasmaCanvasItemWrapper *boxwrapper = nullptr; KbfxPlasmaCanvasItemWrapper *indexitemwrap = new KbfxPlasmaCanvasItemWrapper ( canvas () ); @@ -223,7 +223,7 @@ KbfxPlasmaIndexView::loadList ( KbfxDataStack * stkPtr ) ( KbfxPlasmaIndexItem * ) indexitemwrap-> itemIndex ( KbfxPlasmaCanvasItem::INDEX ); - if ( item == 0 ) + if ( item == nullptr ) return; item->setType ( KbfxPlasmaCanvasItem::INDEX ); @@ -279,7 +279,7 @@ KbfxPlasmaIndexView::loadPlugin ( TQString name, KbfxPlasmaCanvasView * view ) if ( m_stack_R == nullptr ) return; - if ( m_currentView != 0 ) + if ( m_currentView != nullptr ) view->addStack ( m_stack_R, name ); this->loadList ( m_stack_R ); @@ -339,7 +339,7 @@ KbfxPlasmaIndexView::contentsMouseMoveEvent ( TQMouseEvent * me ) for ( TQCanvasItemList::Iterator it = l.begin (); it != l.end (); ++it ) { - if ( *it == 0 ) + if ( *it == nullptr ) return; if ( ( *it )->rtti () == CANVASITEM ) { @@ -367,7 +367,7 @@ KbfxPlasmaIndexView::contentsMousePressEvent ( TQMouseEvent * me ) this->setCursor ( TQCursor ( TQt::WaitCursor ) ); - KbfxPlasmaCanvasGroup *tmp = 0; + KbfxPlasmaCanvasGroup *tmp = nullptr; TQCanvasItemList l = canvas ()->collisions ( me->pos () ); for ( TQCanvasItemList::Iterator it = l.begin (); it != l.end (); ++it ) { @@ -388,7 +388,7 @@ KbfxPlasmaIndexView::contentsMousePressEvent ( TQMouseEvent * me ) // groupContaining ((KbfxPlasmaCanvasItem *) l.first ()); } } - if ( tmp != 0 ) + if ( tmp != nullptr ) tmp->shade (); // m_clickPos = me->pos (); diff --git a/src/kbfxplasmaindexview.h b/src/kbfxplasmaindexview.h index eb3c22c..7dedbde 100644 --- a/src/kbfxplasmaindexview.h +++ b/src/kbfxplasmaindexview.h @@ -47,7 +47,7 @@ class KbfxPlasmaIndexView : public TQCanvasView public: - KbfxPlasmaIndexView ( TQWidget * parent = 0, const char * name = 0, WFlags l = 0 ); + KbfxPlasmaIndexView ( TQWidget * parent = nullptr, const char * name = nullptr, WFlags l = 0 ); virtual ~KbfxPlasmaIndexView(); void loadList ( KbfxDataStack * stkPtr ); int count() { return m_itemGroup->count() ; } diff --git a/src/kbfxspinx.cpp b/src/kbfxspinx.cpp index 9331882..9b8e7e5 100644 --- a/src/kbfxspinx.cpp +++ b/src/kbfxspinx.cpp @@ -44,7 +44,7 @@ void KbfxSpinx::dirtyReaload(const TQString & dir) void KbfxSpinx::createKbfx() { - m_menu = 0; // Set to NULL + m_menu = nullptr; // Set to NULL m_tooltip = ConfigInit().m_ToolTip; m_kicker_auto_adjust = ConfigInit().m_ToolBarResize; m_KbfxWatcher = ConfigInit().m_KbfxWatcher; diff --git a/src/kbfxspinx.h b/src/kbfxspinx.h index 205080d..4ff8905 100644 --- a/src/kbfxspinx.h +++ b/src/kbfxspinx.h @@ -22,7 +22,7 @@ #ifndef KBFX_SPINX_H #define KBFX_SPINX_H -#define zap(x) if(x){delete(x); x=0;} +#define zap(x) if(x){delete(x); x=nullptr;} #include @@ -67,7 +67,7 @@ class KbfxSpinx : public KPanelApplet,public DCOPObject public: KbfxSpinx ( const TQString& configFile, Type t = Normal, int actions = 0, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *parent = nullptr, const char *name = nullptr ); ~KbfxSpinx(); virtual int widthForHeight ( int height ) const; diff --git a/src/kbfxspinxmenu.h b/src/kbfxspinxmenu.h index b740856..495f56a 100644 --- a/src/kbfxspinxmenu.h +++ b/src/kbfxspinxmenu.h @@ -64,7 +64,7 @@ class KbfxSpinxMenuWidget:public TQWidget TQ_OBJECT public : - KbfxSpinxMenuWidget ( TQWidget * parent = 0, const char * name = 0,WFlags fl =0 ); + KbfxSpinxMenuWidget ( TQWidget * parent = nullptr, const char * name = nullptr,WFlags fl =0 ); virtual ~KbfxSpinxMenuWidget(); // virtual void mouseMoveEvent(TQMouseEvent * me); // virtual void focusInEvent ( TQFocusEvent * ) ; diff --git a/src/kbfxspinxpopup.cpp b/src/kbfxspinxpopup.cpp index 7de1e7a..4cdf90d 100644 --- a/src/kbfxspinxpopup.cpp +++ b/src/kbfxspinxpopup.cpp @@ -34,7 +34,7 @@ KbfxSpinxPopUp::KbfxSpinxPopUp ( TQWidget * parent, const char * name ) :TQPopupMenu ( parent,name ) { - m_mainItem = 0L; + m_mainItem = nullptr; } diff --git a/src/kbfxspinxpopup.h b/src/kbfxspinxpopup.h index e837cad..bdca041 100644 --- a/src/kbfxspinxpopup.h +++ b/src/kbfxspinxpopup.h @@ -47,7 +47,7 @@ class KbfxSpinxPopUp : public TQPopupMenu public: - KbfxSpinxPopUp ( TQWidget * parent = 0, const char * name = 0 ) ; + KbfxSpinxPopUp ( TQWidget * parent = nullptr, const char * name = nullptr ) ; ~KbfxSpinxPopUp(); virtual void keyPressEvent ( TQKeyEvent * ke ); diff --git a/src/kbfxspinxscrollbar.h b/src/kbfxspinxscrollbar.h index c0b074f..3fd9335 100644 --- a/src/kbfxspinxscrollbar.h +++ b/src/kbfxspinxscrollbar.h @@ -41,7 +41,7 @@ class KbfxSpinxScrollBar:public TQWidget public: typedef enum {UP,DOWN,LEFT,RIGHT} Direction; - KbfxSpinxScrollBar ( TQWidget * parent = 0,const char * name = 0,int type = 0 ); + KbfxSpinxScrollBar ( TQWidget * parent = nullptr,const char * name = nullptr,int type = 0 ); ~KbfxSpinxScrollBar(); virtual void paintEvent ( TQPaintEvent * ev ); virtual void mousePressEvent ( TQMouseEvent * me ); diff --git a/src/kbfxspinxtoolbar.h b/src/kbfxspinxtoolbar.h index f62c3dd..5c977f9 100644 --- a/src/kbfxspinxtoolbar.h +++ b/src/kbfxspinxtoolbar.h @@ -38,7 +38,7 @@ class KbfxSpinxToolBar:public TQWidget TQ_OBJECT public: - KbfxSpinxToolBar ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); + KbfxSpinxToolBar ( TQWidget * parent = nullptr, const char * name = nullptr, WFlags f = 0 ); virtual ~KbfxSpinxToolBar(); virtual void paintEvent ( TQPaintEvent * pe ); diff --git a/src/kbfxspinxtoolbutton.cpp b/src/kbfxspinxtoolbutton.cpp index afe3c52..3afae93 100644 --- a/src/kbfxspinxtoolbutton.cpp +++ b/src/kbfxspinxtoolbutton.cpp @@ -23,8 +23,8 @@ KbfxSpinxToolButton::KbfxSpinxToolButton ( TQWidget * parent , const char * name ) :TQLabel ( parent,name,TQt::WStaticContents | TQt::WNoAutoErase |TQt::WPaintDesktop ) { - m_dataSource = 0; - m_dataGroup = 0; + m_dataSource = nullptr; + m_dataGroup = nullptr; m_fadeTime = ConfigInit().m_fadeTime; fade_timer = new TQTimer ( this,"Fade Timer" ); @@ -128,7 +128,7 @@ void KbfxSpinxToolButton::mouseReleaseEvent ( TQMouseEvent * me ) { me = me; - if ( m_dataSource == 0 ) + if ( m_dataSource == nullptr ) return; else KRun::runCommand ( m_dataSource->command() ); diff --git a/src/kbfxspinxtoolbutton.h b/src/kbfxspinxtoolbutton.h index 660207a..d618dc0 100644 --- a/src/kbfxspinxtoolbutton.h +++ b/src/kbfxspinxtoolbutton.h @@ -48,7 +48,7 @@ class KbfxSpinxToolButton:public TQLabel public: typedef enum{SINGLE=0,EXPANDABLE} ButtonType; - KbfxSpinxToolButton ( TQWidget * parent = 0, const char * name = 0 ); + KbfxSpinxToolButton ( TQWidget * parent = nullptr, const char * name = nullptr ); virtual ~KbfxSpinxToolButton(); virtual void paintEvent ( TQPaintEvent * pe ); diff --git a/src/kbfxspinxtop.h b/src/kbfxspinxtop.h index 79b079a..bc303de 100644 --- a/src/kbfxspinxtop.h +++ b/src/kbfxspinxtop.h @@ -40,7 +40,7 @@ class KbfxSpinxTop:public TQWidget public: - KbfxSpinxTop ( TQWidget * parent = 0,const char * name = 0 ); + KbfxSpinxTop ( TQWidget * parent = nullptr,const char * name = nullptr ); virtual ~KbfxSpinxTop(); virtual void paintEvent ( TQPaintEvent * ); diff --git a/src/kbfxspinxview.h b/src/kbfxspinxview.h index 2ef048f..77cce09 100644 --- a/src/kbfxspinxview.h +++ b/src/kbfxspinxview.h @@ -31,7 +31,7 @@ class KbfxSpinxView:public TQFrame public: - KbfxSpinxView ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); + KbfxSpinxView ( TQWidget * parent = nullptr, const char * name = nullptr, WFlags f = 0 ); ~KbfxSpinxView(); public slots: diff --git a/src/kbfxtooltip.h b/src/kbfxtooltip.h index 2813e53..2c0bcab 100644 --- a/src/kbfxtooltip.h +++ b/src/kbfxtooltip.h @@ -48,7 +48,7 @@ class KbfxToolTip:public TQWidget TQ_OBJECT public: - KbfxToolTip ( TQWidget * parent=0,const char * name=0,WFlags fl=WType_TopLevel ); + KbfxToolTip ( TQWidget * parent=nullptr,const char * name=nullptr,WFlags fl=WType_TopLevel ); ~KbfxToolTip(); void setStartPos ( int x=0, int y=0 ); virtual void paintEvent ( TQPaintEvent *pe ); -- cgit v1.2.3