From baaa8e32074c7d57ba614e45aedfc93d8f3fcedb Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sat, 3 Oct 2026 17:45:49 -0300 Subject: Replace NULL 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 --- ark/arkapp.cpp | 4 +- ark/arkwidget.cpp | 24 +++--- ark/compressedfile.cpp | 6 +- ark/tar.cpp | 16 ++-- ark/tarlistingthread.cpp | 2 +- kcalc/kcalc.cpp | 4 +- kcalc/kcalc_core.cpp | 28 +++--- kgpg/keygener.cpp | 8 +- kgpg/keyservers.cpp | 2 +- kgpg/kgpginterface.cpp | 20 ++--- kgpg/kgpgview.cpp | 2 +- kgpg/listkeys.cpp | 48 +++++------ kgpg/popuppublic.cpp | 10 +-- khexedit/hextoolwidget.cpp | 4 +- klaptopdaemon/acpi_helper.cpp | 2 +- klaptopdaemon/daemondock.cpp | 12 +-- klaptopdaemon/kpcmcia.cpp | 4 +- klaptopdaemon/kpcmciainfo.h | 4 +- klaptopdaemon/laptop_daemon.cpp | 4 +- klaptopdaemon/portable.cpp | 16 ++-- klaptopdaemon/warning.cpp | 2 +- klaptopdaemon/xautolock.cpp | 6 +- kmilo/asus/asus.cpp | 6 +- kmilo/generic/generic_monitor.cpp | 2 +- kmilo/kmilo_kvaio/kvaio.cpp | 2 +- kmilo/thinkpad/kcmthinkpad/main.cpp | 4 +- kmilo/thinkpad/thinkpad.cpp | 16 ++-- ksim/monitors/cpu/ksimcpu.cpp | 2 +- ksim/monitors/disk/ksimdisk.cpp | 2 +- ksim/monitors/filesystem/filesystemstats.cpp | 2 +- ksim/monitors/lm_sensors/sensorbase.cpp | 4 +- ksim/monitors/net/ksimnet.cpp | 16 ++-- ksim/monitors/net/netdialog.cpp | 6 +- ksim/systeminfo.cpp | 16 ++-- superkaramba/src/bar_python.cpp | 24 +++--- superkaramba/src/config_python.cpp | 22 ++--- superkaramba/src/cpusensor.cpp | 4 +- superkaramba/src/graph_python.cpp | 8 +- superkaramba/src/imagelabel_python.cpp | 62 +++++++------- superkaramba/src/input_python.cpp | 76 ++++++++--------- superkaramba/src/karamba.cpp | 12 +-- superkaramba/src/karamba_python.cpp | 22 ++--- superkaramba/src/memsensor.cpp | 20 ++--- superkaramba/src/menu_python.cpp | 12 +-- superkaramba/src/meter_python.cpp | 74 ++++++++-------- superkaramba/src/misc_python.cpp | 122 +++++++++++++-------------- superkaramba/src/networksensor.cpp | 6 +- superkaramba/src/richtextlabel_python.cpp | 28 +++--- superkaramba/src/sensor.cpp | 2 +- superkaramba/src/svcgrp_python.cpp | 32 +++---- superkaramba/src/systray_python.cpp | 26 +++--- superkaramba/src/task_python.cpp | 4 +- superkaramba/src/taskmanager.cpp | 2 +- superkaramba/src/textlabel_python.cpp | 44 +++++----- superkaramba/src/themelocale.cpp | 24 +++--- superkaramba/src/uptimesensor.cpp | 2 +- superkaramba/src/widget_python.cpp | 30 +++---- 57 files changed, 482 insertions(+), 482 deletions(-) diff --git a/ark/arkapp.cpp b/ark/arkapp.cpp index 7fc9efe8..1b419934 100644 --- a/ark/arkapp.cpp +++ b/ark/arkapp.cpp @@ -36,7 +36,7 @@ #include "arkapp.h" -ArkApplication *ArkApplication::mInstance = NULL; +ArkApplication *ArkApplication::mInstance = nullptr; // a helper function to follow a symlink and obtain the real filename // Used in the ArkApplication functions that use the archive filename @@ -98,7 +98,7 @@ static TQString resolveFilename(const TQString & _arkname) ArkApplication * ArkApplication::getInstance() { - if (mInstance == NULL) + if (!mInstance) { mInstance = new ArkApplication(); } diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp index 1e1d488e..d9f198ea 100644 --- a/ark/arkwidget.cpp +++ b/ark/arkwidget.cpp @@ -106,10 +106,10 @@ static void viewInExternalViewer( ArkWidget* parent, const KURL& filename ) ArkWidget::ArkWidget( TQWidget *parent, const char *name ) : TQVBox(parent, name), m_bBusy( false ), m_bBusyHold( false ), m_extractOnly( false ), m_extractRemote(false), - m_openAsMimeType(TQString()), m_pTempAddList(NULL), + m_openAsMimeType(TQString()), m_pTempAddList(nullptr), m_bArchivePopupEnabled( false ), - m_convert_tmpDir( NULL ), m_convertSuccess( false ), - m_createRealArchTmpDir( NULL ), m_extractRemoteTmpDir( NULL ), + m_convert_tmpDir( nullptr ), m_convertSuccess( false ), + m_createRealArchTmpDir( nullptr ), m_extractRemoteTmpDir( nullptr ), m_modified( false ), m_searchToolBar( 0 ), m_searchBar( 0 ), arch( 0 ), m_archType( UNKNOWN_FORMAT ), m_fileListView( 0 ), m_nSizeOfFiles( 0 ), m_nSizeOfSelectedFiles( 0 ), m_nNumFiles( 0 ), @@ -124,7 +124,7 @@ ArkWidget::ArkWidget( TQWidget *parent, const char *name ) { kdWarning( 1601 ) << "Could not create a temporary directory. status() returned " << m_tmpDir->status() << "." << endl; - m_tmpDir = NULL; + m_tmpDir = nullptr; } m_searchToolBar = new TDEToolBar( this, "searchBar" ); @@ -168,7 +168,7 @@ void ArkWidget::cleanArkTmpDir() { m_tmpDir->unlink(); delete m_tmpDir; - m_tmpDir = NULL; + m_tmpDir = nullptr; } } @@ -377,7 +377,7 @@ ArkWidget::convertFinish() { kdDebug( 1601 ) << k_funcinfo << endl; delete m_convert_tmpDir; - m_convert_tmpDir = NULL; + m_convert_tmpDir = nullptr; ready(); if ( m_convertSuccess ) @@ -929,7 +929,7 @@ void ArkWidget::slotExtractRemoteDone(TDEIO::Job *job) { delete m_extractRemoteTmpDir; - m_extractRemoteTmpDir = NULL; + m_extractRemoteTmpDir = nullptr; if ( job->error() ) job->showErrorDialog(); @@ -1045,7 +1045,7 @@ ArkWidget::createRealArchiveSlotAddDone( bool success ) m_createRealArchTmpDir->unlink(); delete m_createRealArchTmpDir; - m_createRealArchTmpDir = NULL; + m_createRealArchTmpDir = nullptr; if ( !success ) @@ -1053,7 +1053,7 @@ ArkWidget::createRealArchiveSlotAddDone( bool success ) ready(); - if ( m_pTempAddList == NULL ) + if ( !m_pTempAddList ) { // now get the files to be added // we don't know which files to add yet @@ -1075,7 +1075,7 @@ ArkWidget::createRealArchiveSlotAddFilesDone( bool success ) disconnect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( createRealArchiveSlotAddFilesDone( bool ) ) ); delete m_pTempAddList; - m_pTempAddList = NULL; + m_pTempAddList = nullptr; emit createRealArchiveDone( success ); } @@ -2063,13 +2063,13 @@ Arch * ArkWidget::getNewArchive( const TQString & _fileName, const TQString& _mi { KMessageBox::error(this, i18n("Unknown archive format or corrupted archive") ); emit request_file_quit(); - return NULL; + return nullptr; } if (!newArch->archUtilityIsAvailable()) { KMessageBox::error(this, i18n("The utility %1 is not in your PATH.\nPlease install it or contact your system administrator.").arg(newArch->getArchUtility())); - return NULL; + return nullptr; } connect( newArch, TQ_SIGNAL(headers(const ColumnList&)), diff --git a/ark/compressedfile.cpp b/ark/compressedfile.cpp index dfd476e0..466af0af 100644 --- a/ark/compressedfile.cpp +++ b/ark/compressedfile.cpp @@ -56,7 +56,7 @@ CompressedFile::CompressedFile( ArkWidget *_gui, const TQString & _fileName, const TQString & _openAsMimeType ) : Arch( _gui, _fileName ) { - m_tempDirectory = NULL; + m_tempDirectory = nullptr; m_openAsMimeType = _openAsMimeType; kdDebug(1601) << "CompressedFile constructor" << endl; m_tempDirectory = new KTempDir( _gui->tmpDir() @@ -185,7 +185,7 @@ void CompressedFile::open() TDEIO::NetAccess::copy( src, target, m_gui ); kdDebug(1601) << "Temp file name is " << target << endl; - if ( !TDEIO::NetAccess::exists( target, true, NULL ) ) + if ( !TDEIO::NetAccess::exists( target, true, nullptr ) ) return; TDEProcess *kp = m_currentProcess = new TDEProcess; @@ -325,7 +325,7 @@ void CompressedFile::addFile( const TQStringList &urls ) if (f_desc != -1) fd = fdopen( f_desc, "w" ); else - fd = NULL; + fd = nullptr; if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { diff --git a/ark/tar.cpp b/ark/tar.cpp index 447a152e..206c7bff 100644 --- a/ark/tar.cpp +++ b/ark/tar.cpp @@ -140,7 +140,7 @@ void TarArch::updateArch() if (f_desc != -1) fd = fdopen( f_desc, "w" ); else - fd = NULL; + fd = nullptr; TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); @@ -316,7 +316,7 @@ void TarArch::slotListingDone(TDEProcess *_kp) { const TQString list = getLastShellOutput(); FileListView *flv = m_gui->fileList(); - if (flv!=NULL && flv->totalFiles()>0) + if (flv && flv->totalFiles()>0) { const TQString firstfile = ((FileLVI *) flv->firstChild())->fileName(); if (list.find(TQRegExp(TQString("\\s\\./%1[/\\n]").arg(firstfile)))>=0) @@ -339,7 +339,7 @@ void TarArch::slotListingDone(TDEProcess *_kp) } delete _kp; - _kp = m_currentProcess = NULL; + _kp = m_currentProcess = nullptr; } void TarArch::create() @@ -388,7 +388,7 @@ void TarArch::createTmp() if (f_desc != -1) fd = fdopen( f_desc, "w" ); else - fd = NULL; + fd = nullptr; TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); @@ -616,7 +616,7 @@ void TarArch::addFinishedUpdateDone() if ( compressed ) disconnect( this, TQ_SIGNAL( updateDone() ), this, TQ_SLOT( addFinishedUpdateDone() ) ); Arch::slotAddExited( m_pTmpProc ); // this will delete _kp - m_pTmpProc = NULL; + m_pTmpProc = nullptr; } void TarArch::unarchFileInternal() @@ -739,7 +739,7 @@ void TarArch::removeUpdateDone() deleteInProgress = false; emit removeDone(); Arch::slotDeleteExited( m_pTmpProc2 ); - m_pTmpProc = NULL; + m_pTmpProc = nullptr; } void TarArch::addDir(const TQString & _dirName) @@ -761,7 +761,7 @@ void TarArch::createTmpFinished( TDEProcess *_kp ) createTmpInProgress = false; fclose(fd); delete _kp; - _kp = m_currentProcess = NULL; + _kp = m_currentProcess = nullptr; emit createTempDone(); } @@ -771,7 +771,7 @@ void TarArch::updateFinished( TDEProcess *_kp ) fclose(fd); updateInProgress = false; delete _kp; - _kp = m_currentProcess = NULL; + _kp = m_currentProcess = nullptr; emit updateDone(); } diff --git a/ark/tarlistingthread.cpp b/ark/tarlistingthread.cpp index 2cd7ef76..c74a69be 100644 --- a/ark/tarlistingthread.cpp +++ b/ark/tarlistingthread.cpp @@ -79,7 +79,7 @@ static char *makeAccessString(mode_t mode) } TarListingThread::TarListingThread( TQObject *parent, const TQString& filename ) - : TQThread(), m_parent( parent ), m_archive(NULL) + : TQThread(), m_parent( parent ), m_archive(nullptr) { Q_ASSERT( m_parent ); m_archiveFileName = filename; diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp index 9bf79da5..af58e0bd 100644 --- a/kcalc/kcalc.cpp +++ b/kcalc/kcalc.cpp @@ -80,7 +80,7 @@ static const char version[] = KCALCVERSION; KCalculator::KCalculator(TQWidget *parent, const char *name) : TDEMainWindow(parent, name), inverse(false), - hyp_mode(false), memory_num(0.0), calc_display(NULL), + hyp_mode(false), memory_num(0.0), calc_display(nullptr), mInternalSpacing(4), core() { /* central widget to contain all the elements */ @@ -2135,7 +2135,7 @@ void KCalculator::UpdateDisplay(bool get_amount_from_core, void KCalculator::set_colors() { - TQPushButton *p = NULL; + TQPushButton *p = nullptr; calc_display->changeSettings(); diff --git a/kcalc/kcalc_core.cpp b/kcalc/kcalc_core.cpp index a02be2ed..3d55a07f 100644 --- a/kcalc/kcalc_core.cpp +++ b/kcalc/kcalc_core.cpp @@ -174,22 +174,22 @@ static KNumber ExecDivideP(const KNumber & left_op, const KNumber & right_op) // build precedence list const struct operator_data CalcEngine::Operator[] = { - { 0, NULL, NULL}, // FUNC_EQUAL - { 0, NULL, NULL}, // FUNC_PERCENT - { 0, NULL, NULL}, // FUNC_BRACKET - { 1, ExecOr, NULL}, // FUNC_OR - { 2, ExecXor, NULL}, // FUNC_XOR - { 3, ExecAnd, NULL}, // FUNC_AND - { 4, ExecLsh, NULL}, // FUNC_LSH - { 4, ExecRsh, NULL}, // FUNC_RSH + { 0, nullptr, nullptr}, // FUNC_EQUAL + { 0, nullptr, nullptr}, // FUNC_PERCENT + { 0, nullptr, nullptr}, // FUNC_BRACKET + { 1, ExecOr, nullptr}, // FUNC_OR + { 2, ExecXor, nullptr}, // FUNC_XOR + { 3, ExecAnd, nullptr}, // FUNC_AND + { 4, ExecLsh, nullptr}, // FUNC_LSH + { 4, ExecRsh, nullptr}, // FUNC_RSH { 5, ExecAdd, ExecAddP}, // FUNC_ADD { 5, ExecSubtract, ExecSubP}, // FUNC_SUBTRACT { 6, ExecMultiply, ExecMultiplyP}, // FUNC_MULTIPLY { 6, ExecDivide, ExecDivideP}, // FUNC_DIVIDE - { 6, ExecMod, NULL}, // FUNC_MOD - { 6, ExecIntDiv, NULL}, // FUNC_INTDIV - { 7, ExecPower, NULL}, // FUNC_POWER - { 7, ExecPwrRoot, NULL} // FUNC_PWR_ROOT + { 6, ExecMod, nullptr}, // FUNC_MOD + { 6, ExecIntDiv, nullptr}, // FUNC_INTDIV + { 7, ExecPower, nullptr}, // FUNC_POWER + { 7, ExecPwrRoot, nullptr} // FUNC_PWR_ROOT }; @@ -210,7 +210,7 @@ CalcEngine::CalcEngine() #ifdef SA_RESTART fpe_trap.sa_flags = SA_RESTART; #endif - sigaction(SIGFPE, &fpe_trap, NULL); + sigaction(SIGFPE, &fpe_trap, nullptr); _last_number = KNumber::Zero; _error = false; @@ -919,7 +919,7 @@ void CalcEngine::TangensHyp(KNumber input) KNumber CalcEngine::evalOperation(KNumber arg1, Operation operation, KNumber arg2) { - if (!_percent_mode || Operator[operation].prcnt_ptr == NULL) + if (!_percent_mode || !Operator[operation].prcnt_ptr) { return (Operator[operation].arith_ptr)(arg1, arg2); } else { diff --git a/kgpg/keygener.cpp b/kgpg/keygener.cpp index bf354edc..de42a8e4 100644 --- a/kgpg/keygener.cpp +++ b/kgpg/keygener.cpp @@ -143,7 +143,7 @@ int keyGenerate::getkeyexp() TQString keyGenerate::getkeynumb() { - if (numb->text()!=NULL) + if (numb->text()!=nullptr) return(numb->text()); else return (""); @@ -151,7 +151,7 @@ TQString keyGenerate::getkeynumb() TQString keyGenerate::getkeyname() { - if (kname->text()!=NULL) + if (kname->text()!=nullptr) return(kname->text()); else return (""); @@ -159,7 +159,7 @@ TQString keyGenerate::getkeyname() TQString keyGenerate::getkeymail() { - if (mail->text()!=NULL) + if (mail->text()!=nullptr) return(mail->text()); else return (""); @@ -167,7 +167,7 @@ TQString keyGenerate::getkeymail() TQString keyGenerate::getkeycomm() { - if (comment->text()!=NULL) + if (comment->text()!=nullptr) return(comment->text()); else return (""); diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp index fee508b7..7a80f8fa 100644 --- a/kgpg/keyservers.cpp +++ b/kgpg/keyservers.cpp @@ -494,7 +494,7 @@ void keyServer::slotsearchresult(TDEProcess *) //listpop->kLVsearch->setColumnText(0,i18n("Found %1 matching keys").arg(nb)); listpop->statusText->setText(i18n("Found %1 matching keys").arg(nb)); - if (listpop->kLVsearch->firstChild()!=NULL) { + if (listpop->kLVsearch->firstChild()) { listpop->kLVsearch->setSelected(listpop->kLVsearch->firstChild(),true); listpop->kLVsearch->setCurrentItem(listpop->kLVsearch->firstChild()); transferKeyID(); diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp index 0b4a534c..dae46cbf 100644 --- a/kgpg/kgpginterface.cpp +++ b/kgpg/kgpginterface.cpp @@ -2034,7 +2034,7 @@ TQString KgpgInterface::getGpgSetting(TQString name,TQString configFile) TQString result; TQTextStream t( &qfile ); result=t.readLine(); - while (result!=NULL) { + while (result!=nullptr) { if (result.stripWhiteSpace().startsWith(name)) { result=result.stripWhiteSpace(); result.remove(0,name.length()); @@ -2061,7 +2061,7 @@ TQString parsedResult=TQString(); TQString result; TQTextStream t( &qfile ); result=t.readLine(); - while (result!=NULL) { + while (result!=nullptr) { if (result.stripWhiteSpace().startsWith(name)) { result=result.stripWhiteSpace(); result.remove(0,name.length()); @@ -2087,7 +2087,7 @@ void KgpgInterface::delGpgGroup(TQString name, TQString configFile) TQString result; TQTextStream t( &qfile ); result=t.readLine(); - while (result!=NULL) { + while (result!=nullptr) { if (result.stripWhiteSpace().startsWith("group ")) { TQString result2=result.stripWhiteSpace(); result2.remove(0,6); @@ -2118,7 +2118,7 @@ void KgpgInterface::setGpgGroupSetting(TQString name,TQStringList values, TQStri TQString result; TQTextStream t( &qfile ); result=t.readLine(); - while (result!=NULL) { + while (result!=nullptr) { if (result.stripWhiteSpace().startsWith("group ")) { TQString result2=result.stripWhiteSpace(); result2.remove(0,6); @@ -2156,7 +2156,7 @@ TQStringList KgpgInterface::getGpgGroupSetting(TQString name,TQString configFile TQString result; TQTextStream t( &qfile ); result=t.readLine(); - while (result!=NULL) { + while (result!=nullptr) { result=result.stripWhiteSpace(); if (result.startsWith("group ")) { kdDebug(2100)<<"Found 1 group"<KgpgSignText(mess,signKeyID,options); diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp index dd9444e1..25bdd24c 100644 --- a/kgpg/listkeys.cpp +++ b/kgpg/listkeys.cpp @@ -376,7 +376,7 @@ void KgpgSelKey::slotpreOk() void KgpgSelKey::slotOk() { - if (keysListpr->currentItem()==NULL) + if (!keysListpr->currentItem()) reject(); else accept(); @@ -384,7 +384,7 @@ void KgpgSelKey::slotOk() void KgpgSelKey::slotSelect(TQListViewItem *item) { - if (item==NULL) + if (!item) return; if (item->depth()!=0) { keysListpr->setSelected(item->parent(),true); @@ -396,7 +396,7 @@ void KgpgSelKey::slotSelect(TQListViewItem *item) TQString KgpgSelKey::getkeyID() { ///// emit selected key - if (keysListpr->currentItem()==NULL) + if (!keysListpr->currentItem()) return(TQString()); TQString result; TQPtrList< TQListViewItem > list = keysListpr->selectedItems(false); @@ -413,7 +413,7 @@ TQString KgpgSelKey::getkeyMail() { TQString username; ///// emit selected key - if (keysListpr->currentItem()==NULL) + if (!keysListpr->currentItem()) return(TQString()); else { username=keysListpr->currentItem()->text(0); @@ -566,7 +566,7 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa keysList2 = new KeyView(this); keysList2->photoKeysList=TQString(); keysList2->groupNb=0; - keyStatusBar=NULL; + keyStatusBar=nullptr; readOptions(); if (showTipOfDay) @@ -892,7 +892,7 @@ void listKeys::slotGotoDefaultKey() void listKeys::refreshKeyFromServer() { // kdDebug(2100) << k_funcinfo << endl; - if (keysList2->currentItem()==NULL) + if (!keysList2->currentItem()) return; TQString keyIDS; keysList=keysList2->selectedItems(); @@ -1369,7 +1369,7 @@ void listKeys::slotSetDefaultKey(TQString newID) void listKeys::slotSetDefaultKey(TQListViewItem *newdef) { //kdDebug(2100)<<"------------------start ------------"<pixmap(2)==NULL)) + if (!newdef || !newdef->pixmap(2)) return; //kdDebug(2100)<text(6)<selectedItems().count()>1) { TQPtrList exportList=keysList2->selectedItems(); bool keyDepth=true; @@ -1542,7 +1542,7 @@ void listKeys::slotexport() { // kdDebug(2100) << k_funcinfo << endl; ///////////////////// export key - if (keysList2->currentItem()==NULL) + if (!keysList2->currentItem()) return; if (keysList2->currentItem()->depth()!=0) return; @@ -1677,7 +1677,7 @@ void listKeys::listsigns() { // kdDebug(2100) << k_funcinfo << endl; //kdDebug(2100)<<"Edit -------------------------------"<currentItem()==NULL) + if (!keysList2->currentItem()) return; if (keysList2->currentItem()->depth()!=0) { if (keysList2->currentItem()->text(0)==i18n("Photo id")) { @@ -1854,7 +1854,7 @@ void listKeys::editGroup() connect(gEdit->availableKeys,TQ_SIGNAL(doubleClicked (TQListViewItem *, const TQPoint &, int)),this,TQ_SLOT(groupAdd())); connect(gEdit->groupKeys,TQ_SIGNAL(doubleClicked (TQListViewItem *, const TQPoint &, int)),this,TQ_SLOT(groupRemove())); TQListViewItem *item=keysList2->firstChild(); - if (item==NULL) + if (!item) return; if (item->pixmap(2)) { if (item->pixmap(2)->serialNumber()==keysList2->trustgood.serialNumber()) @@ -1895,7 +1895,7 @@ void listKeys::signkey() { // kdDebug(2100) << k_funcinfo << endl; /////////////// sign a key - if (keysList2->currentItem()==NULL) + if (!keysList2->currentItem()) return; if (keysList2->currentItem()->depth()!=0) return; @@ -2050,7 +2050,7 @@ void listKeys::signatureResult(int success) void listKeys::importallsignkey() { //// kdDebug(2100) << k_funcinfo << endl; - if (keysList2->currentItem()==NULL) + if (!keysList2->currentItem()) return; if (! keysList2->currentItem()->firstChild()) { keysList2->currentItem()->setOpen(true); @@ -2073,7 +2073,7 @@ void listKeys::importallsignkey() void listKeys::preimportsignkey() { // kdDebug(2100) << k_funcinfo << endl; - if (keysList2->currentItem()==NULL) + if (!keysList2->currentItem()) return; else importsignkey(keysList2->currentItem()->text(6)); @@ -2134,7 +2134,7 @@ void listKeys::delsignkey() { // kdDebug(2100) << k_funcinfo << endl; /////////////// sign a key - if (keysList2->currentItem()==NULL) + if (!keysList2->currentItem()) return; if ( (keysList2->currentItem()->depth()>1 && KgpgInterface::getGpgVersion() < 210 ) || (keysList2->currentItem()->depth()>2 && KgpgInterface::getGpgVersion() >= 210 ) ) { @@ -2685,10 +2685,10 @@ void KeyView::expandKey(TQListViewItem *item) TQString cycle="pub"; bool noID = (KgpgInterface::getGpgVersion() < 210 ) ? false : true; - UpdateViewItem *itemsub=NULL; - UpdateViewItem *itemuid=NULL; - UpdateViewItem *itemsig=NULL; - UpdateViewItem *itemrev=NULL; + UpdateViewItem *itemsub=nullptr; + UpdateViewItem *itemuid=nullptr; + UpdateViewItem *itemsig=nullptr; + UpdateViewItem *itemrev=nullptr; TQPixmap keyPhotoId; int uidNumber=2; @@ -2838,7 +2838,7 @@ void KeyView::refreshkeylist() // kdDebug(2100)<<"Refreshing key list"< hashMap; @@ -2846,7 +2846,7 @@ void KeyView::refreshkeylist() TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); // get current position. TQListViewItem *current = currentItem(); - if(current != NULL) { + if(current) { while(current->depth() > 0) { current = current->parent(); } @@ -2970,7 +2970,7 @@ void KeyView::refreshkeylist() // kdDebug(2100)<<"Finished Groups"<text(6).isEmpty()) newPos = findItem(current->text(6), 6); @@ -2999,7 +2999,7 @@ void KeyView::insertOrphan(TQString currentID) // kdDebug(2100) << k_funcinfo << endl; FILE *fp; char line[300]; - UpdateViewItem *item=NULL; + UpdateViewItem *item=nullptr; bool keyFound=false; TQString currentKey; TQMap hashMap; @@ -3280,7 +3280,7 @@ void KeyView::refreshcurrentkey(TQString currentID) TQMap::Iterator ite; for (ite = hashMap.begin(); ite != hashMap.end(); ite++) { - UpdateViewItem *item=NULL; + UpdateViewItem *item=nullptr; TQStringList::Iterator it; gpgKey pubKey; bool keyFound=false; diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp index 26aefbc0..6b5ac09d 100644 --- a/kgpg/popuppublic.cpp +++ b/kgpg/popuppublic.cpp @@ -236,7 +236,7 @@ accept(); void popupPublic::enable() { TQListViewItem *current = keysList->firstChild(); - if (current==NULL) + if (!current) return; current->setVisible(true); while ( current->nextSibling() ) { @@ -250,7 +250,7 @@ void popupPublic::sort() { bool reselect=false; TQListViewItem *current = keysList->firstChild(); - if (current==NULL) + if (!current) return; if ((untrustedList.find(current->text(2))!=untrustedList.end()) && (!current->text(2).isEmpty())){ @@ -277,7 +277,7 @@ void popupPublic::sort() firstvisible=keysList->firstChild(); while (firstvisible->isVisible()!=true) { firstvisible=firstvisible->nextSibling(); - if (firstvisible==NULL) + if (!firstvisible) return; } keysList->setSelected(firstvisible,true); @@ -428,7 +428,7 @@ void popupPublic::slotpreselect() } } // - TQListViewItem *it=NULL; + TQListViewItem *it=nullptr; if (!keysList->firstChild()) return; if (fmode) it=keysList->findItem(KGpgSettings::defaultKey(),2); if (!trusted) @@ -482,7 +482,7 @@ kdDebug(2100)<<"Ok pressed"<isChecked()) return; - if (CBsymmetric->isChecked()) selectedKeys=NULL; + if (CBsymmetric->isChecked()) selectedKeys=nullptr; // kdDebug(2100)<<"Selected Key:"<setColStretch( 2, 10 ); ValuesBox->setColStretch( 5, 10 ); @@ -91,7 +91,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name ) mUtilBox->addWidget( mText3[i], i, 2 ); } - TQBoxLayout * SettingsBox = new TQHBoxLayout( NULL, 0, KDialog::spacingHint() ); + TQBoxLayout * SettingsBox = new TQHBoxLayout( nullptr, 0, KDialog::spacingHint() ); text = i18n("Show little endian decoding"); mCheckIntelFormat = new TQCheckBox( text, this ); diff --git a/klaptopdaemon/acpi_helper.cpp b/klaptopdaemon/acpi_helper.cpp index cf5c9801..72b594c6 100644 --- a/klaptopdaemon/acpi_helper.cpp +++ b/klaptopdaemon/acpi_helper.cpp @@ -123,7 +123,7 @@ void run_program(const char *path, const int action) } else if (action == 2) { system("/usr/sbin/pmi action sleep"); } else { - ::execl(path, NULL); // this is not KDE environment code + ::execl(path, nullptr); // this is not KDE environment code } exit(0); } diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp index 34207134..57efd005 100644 --- a/klaptopdaemon/daemondock.cpp +++ b/klaptopdaemon/daemondock.cpp @@ -53,7 +53,7 @@ laptop_dock::laptop_dock( laptop_daemon* parent ) { setCaption(i18n("KLaptop Daemon")); TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages - _pcmcia = NULL; + _pcmcia = nullptr; pdaemon = parent; current_code = -1; brightness_widget = 0; @@ -316,7 +316,7 @@ void laptop_dock::rootExited(TDEProcess *p) { void laptop_dock::slotEjectAction(int id) { -KPCMCIACard *f = NULL; +KPCMCIACard *f = nullptr; f = _ejectActions[id]; if (f) f->eject(); @@ -324,7 +324,7 @@ KPCMCIACard *f = NULL; void laptop_dock::slotSuspendAction(int id) { -KPCMCIACard *f = NULL; +KPCMCIACard *f = nullptr; f = _suspendActions[id]; if (f) f->suspend(); @@ -332,7 +332,7 @@ KPCMCIACard *f = NULL; void laptop_dock::slotResumeAction(int id) { -KPCMCIACard *f = NULL; +KPCMCIACard *f = nullptr; f = _resumeActions[id]; if (f) f->resume(); @@ -340,7 +340,7 @@ KPCMCIACard *f = NULL; void laptop_dock::slotResetAction(int id) { -KPCMCIACard *f = NULL; +KPCMCIACard *f = nullptr; f = _resetActions[id]; if (f) f->reset(); @@ -348,7 +348,7 @@ KPCMCIACard *f = NULL; void laptop_dock::slotInsertAction(int id) { -KPCMCIACard *f = NULL; +KPCMCIACard *f = nullptr; f = _insertActions[id]; if (f) f->insert(); diff --git a/klaptopdaemon/kpcmcia.cpp b/klaptopdaemon/kpcmcia.cpp index fc315ab0..44ac0ec5 100644 --- a/klaptopdaemon/kpcmcia.cpp +++ b/klaptopdaemon/kpcmcia.cpp @@ -134,7 +134,7 @@ oldValues._fd = -1; tv.tv_sec = 0; tv.tv_usec = 0; FD_ZERO(&rfds); FD_SET(_fd, &rfds); - rc = select(_fd+1, &rfds, NULL, NULL, &tv); + rc = select(_fd+1, &rfds, nullptr, nullptr, &tv); if (rc > 0) { rc = read(_fd, (void *)&event, 4); if (rc == 4) { @@ -446,7 +446,7 @@ delete _cards; KPCMCIACard* KPCMCIA::getCard(int num) { - if (num >= _cardCnt || num < 0) return NULL; + if (num >= _cardCnt || num < 0) return nullptr; return (*_cards)[num]; } diff --git a/klaptopdaemon/kpcmciainfo.h b/klaptopdaemon/kpcmciainfo.h index 43cefd41..631e6ae1 100644 --- a/klaptopdaemon/kpcmciainfo.h +++ b/klaptopdaemon/kpcmciainfo.h @@ -42,7 +42,7 @@ TQ_OBJECT public: - KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *parent = NULL, const char *name = 0); + KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *parent = nullptr, const char *name = 0); virtual ~KPCMCIAInfo(); void showTab(int num); @@ -80,7 +80,7 @@ class KPCMCIAInfoPage : public TQFrame { TQ_OBJECT public: - KPCMCIAInfoPage(KPCMCIACard *card, TQWidget *parent = NULL, const char *name = 0); + KPCMCIAInfoPage(KPCMCIACard *card, TQWidget *parent = nullptr, const char *name = 0); virtual ~KPCMCIAInfoPage(); public slots: diff --git a/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp index c9c54203..e9ba6c78 100644 --- a/klaptopdaemon/laptop_daemon.cpp +++ b/klaptopdaemon/laptop_daemon.cpp @@ -110,7 +110,7 @@ laptop_daemon::laptop_daemon(const TQCString& obj): KDEDModule(obj) _pcmcia = new KPCMCIA(8, "/var/run/stab"); else if (!access("/var/lib/pcmcia/stab", R_OK|F_OK)) _pcmcia = new KPCMCIA(8, "/var/lib/pcmcia/stab"); - else _pcmcia = NULL; + else _pcmcia = nullptr; if (_pcmcia) connect(_pcmcia, TQ_SIGNAL(cardUpdated(int)), this, TQ_SLOT(updatePCMCIA(int))); @@ -160,7 +160,7 @@ void laptop_daemon::restart() sony_fd = ::open("/dev/sonypi", O_RDONLY|O_NONBLOCK); if (s.sony_enablescrollbar||s.sony_middleemulation) { if (sony_disp == 0 && sony_fd >= 0) - sony_disp = XOpenDisplay(NULL); + sony_disp = XOpenDisplay(nullptr); if (sony_fd < 0 || sony_disp == 0) { s.sony_enablescrollbar = 0; s.sony_middleemulation = 0; diff --git a/klaptopdaemon/portable.cpp b/klaptopdaemon/portable.cpp index 58aec121..8aa9b37e 100644 --- a/klaptopdaemon/portable.cpp +++ b/klaptopdaemon/portable.cpp @@ -125,7 +125,7 @@ apm_read(apm_info *ap) char version[256]; f = fopen("/proc/apm", "r"); - if (f == NULL) + if (!f) return(1); s = fscanf(f, "%255s %d.%d %x %x %x %x %d%% %d %s\n", version, @@ -262,7 +262,7 @@ acpi_ac_status() { DIR *dfd; struct dirent *dp; - FILE *f = NULL; + FILE *f = nullptr; static char buff[NAME_MAX+50]; static bool inited=0; static bool bad=0; @@ -302,11 +302,11 @@ readit: if (f) { for (;;) { char buff2[1024]; - if (fgets(buff2, sizeof(buff), f) == NULL) + if (!fgets(buff2, sizeof(buff), f)) break; - if (strstr(buff2, "Status:") != NULL || - strstr(buff2, "state:") != NULL) { - if (strstr(buff2, "on-line") != NULL) { + if (strstr(buff2, "Status:") || + strstr(buff2, "state:")) { + if (strstr(buff2, "on-line")) { fclose(f); return(1); } @@ -2199,7 +2199,7 @@ void laptop_portable::invoke_standby() if (fd == -1) return; - ioctl(fd, APMIO_STANDBY, NULL); + ioctl(fd, APMIO_STANDBY, nullptr); ::close(fd); return; @@ -2215,7 +2215,7 @@ void laptop_portable::invoke_suspend() if (fd == -1) return; - ioctl(fd, APMIO_SUSPEND, NULL); + ioctl(fd, APMIO_SUSPEND, nullptr); ::close(fd); return; diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp index ab3edc13..990ffe4b 100644 --- a/klaptopdaemon/warning.cpp +++ b/klaptopdaemon/warning.cpp @@ -413,7 +413,7 @@ void WarningConfig::load() void WarningConfig::load(bool useDefaults) { - if (config == NULL) + if (!config) return; my_load(0, useDefaults); my_load(1, useDefaults); diff --git a/klaptopdaemon/xautolock.cpp b/klaptopdaemon/xautolock.cpp index 0c7d7247..16424dbf 100644 --- a/klaptopdaemon/xautolock.cpp +++ b/klaptopdaemon/xautolock.cpp @@ -41,7 +41,7 @@ int xautolock_useXidle = 0; int xautolock_useMit = 0; xautolock_corner_t xautolock_corners[ 4 ]; -static XAutoLock* self = NULL; +static XAutoLock* self = nullptr; static int catchFalseAlarms(Display *, XErrorEvent *) { @@ -95,7 +95,7 @@ XAutoLock::XAutoLock() // XAutoLock::~XAutoLock() { - self = NULL; + self = nullptr; } //--------------------------------------------------------------------------- @@ -172,7 +172,7 @@ void XAutoLock::timerEvent(TQTimerEvent *ev) return; } - int (*oldHandler)(Display *, XErrorEvent *) = NULL; + int (*oldHandler)(Display *, XErrorEvent *) = nullptr; if( !xautolock_useXidle && !xautolock_useMit ) { // only the diy way needs special X handler XSync( tqt_xdisplay(), False ); diff --git a/kmilo/asus/asus.cpp b/kmilo/asus/asus.cpp index e70f3a68..538b12ab 100644 --- a/kmilo/asus/asus.cpp +++ b/kmilo/asus/asus.cpp @@ -163,13 +163,13 @@ bool AsusMonitor::readProc(asus_state_struct* asus_state) int value; size_t value_len = sizeof(value); - if ( sysctl(brightness_mib, 4, &value, &value_len, NULL, 0) != -1 ) + if ( sysctl(brightness_mib, 4, &value, &value_len, nullptr, 0) != -1 ) asus_state->brightness = value; - if ( sysctl(backlight_mib, 4, &value, &value_len, NULL, 0) != -1 ) + if ( sysctl(backlight_mib, 4, &value, &value_len, nullptr, 0) != -1 ) asus_state->lcd = value; - if ( sysctl(video_mib, 4, &value, &value_len, NULL, 0) != -1 ) + if ( sysctl(video_mib, 4, &value, &value_len, nullptr, 0) != -1 ) asus_state->display = value; #else asus_state->brightness = readProcEntry(TQString("brn")); diff --git a/kmilo/generic/generic_monitor.cpp b/kmilo/generic/generic_monitor.cpp index 2c15ad5c..98c9cc2c 100644 --- a/kmilo/generic/generic_monitor.cpp +++ b/kmilo/generic/generic_monitor.cpp @@ -76,7 +76,7 @@ static const ShortcutInfo shortcuts[] = }; GenericMonitor::GenericMonitor(TQObject *parent, const char *name, const TQStringList& args) -: Monitor(parent, name, args), kmixClient(NULL), kmixWindow(NULL), tdepowersave(NULL), +: Monitor(parent, name, args), kmixClient(nullptr), kmixWindow(nullptr), tdepowersave(nullptr), m_progress(0), m_displayType(Monitor::None) { _poll = false; diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp index c9b114d9..7f3bd77f 100644 --- a/kmilo/kmilo_kvaio/kvaio.cpp +++ b/kmilo/kmilo_kvaio/kvaio.cpp @@ -74,7 +74,7 @@ KVaio::KVaio(KMiloKVaio *parent, const char* name) mTimer->start (10000, true); } - mDisp = XOpenDisplay(NULL); + mDisp = XOpenDisplay(nullptr); if(!mDisp) { kdDebug() << "KVaio ctor: Failed to open display. Very strange." diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp index be154017..14deff87 100644 --- a/kmilo/thinkpad/kcmthinkpad/main.cpp +++ b/kmilo/thinkpad/kcmthinkpad/main.cpp @@ -83,8 +83,8 @@ KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const T // Look if the sysctl tree of acpi_ibm is in place u_int n = 0; size_t len = sizeof(n); - if (m_nvramReadable = ( sysctlbyname("dev.acpi_ibm.0.volume", &n, &len, NULL, 0) != -1 )) - m_nvramWriteable = ( sysctlbyname("dev.acpi_ibm.0.volume", NULL, NULL, &n, len) != -1 ); + if (m_nvramReadable = ( sysctlbyname("dev.acpi_ibm.0.volume", &n, &len, nullptr, 0) != -1 )) + m_nvramWriteable = ( sysctlbyname("dev.acpi_ibm.0.volume", nullptr, nullptr, &n, len) != -1 ); if (!m_nvramReadable) { setButtons(buttons() & ~Default); diff --git a/kmilo/thinkpad/thinkpad.cpp b/kmilo/thinkpad/thinkpad.cpp index 50bc5320..3891dfef 100644 --- a/kmilo/thinkpad/thinkpad.cpp +++ b/kmilo/thinkpad/thinkpad.cpp @@ -333,7 +333,7 @@ bool ThinkPadMonitor::getNvramState(thinkpad_state_struct* thinkpad_state) { u_int n = 0; size_t len = sizeof(n); - if ( sysctlbyname("dev.acpi_ibm.0.hotkey", &n, &len, NULL, 0) == -1 ) { + if ( sysctlbyname("dev.acpi_ibm.0.hotkey", &n, &len, nullptr, 0) == -1 ) { kdError() << "Unable to read sysctl: dev.acpi_ibm.0.hotkey" << endl; return false; } @@ -360,36 +360,36 @@ bool ThinkPadMonitor::getNvramState(thinkpad_state_struct* thinkpad_state) { = (thinkpad_state->volume_toggle & ~0x01) | (( n & (1<<11)) >> 11); // Don't fail if the thinklight sysctl is not present. It is generated dynamically - if ( sysctlbyname("dev.acpi_ibm.0.thinklight", &n, &len, NULL, 0) != -1 ) + if ( sysctlbyname("dev.acpi_ibm.0.thinklight", &n, &len, nullptr, 0) != -1 ) thinkpad_state->thinklight_toggle = n; else kdWarning() << "Unable to read sysctl: dev.acpi_ibm.0.thinklight" << endl; - if ( sysctlbyname("dev.acpi_ibm.0.lcd_brightness", &n, &len, NULL, 0) == -1 ) { + if ( sysctlbyname("dev.acpi_ibm.0.lcd_brightness", &n, &len, nullptr, 0) == -1 ) { kdError() << "Unable to read sysctl: dev.acpi_ibm.0.lcd_brightness" << endl; return false; } thinkpad_state->brightness_level = n; - if ( sysctlbyname("dev.acpi_ibm.0.volume", &n, &len, NULL, 0) == -1 ) { + if ( sysctlbyname("dev.acpi_ibm.0.volume", &n, &len, nullptr, 0) == -1 ) { kdError() << "Unable to read sysctl: dev.acpi_ibm.0.volume" << endl; return false; } thinkpad_state->volume_level = n; - if ( sysctlbyname("dev.acpi_ibm.0.mute", &n, &len, NULL, 0) == -1 ) { + if ( sysctlbyname("dev.acpi_ibm.0.mute", &n, &len, nullptr, 0) == -1 ) { kdError() << "Unable to read sysctl: dev.acpi_ibm.0.mute" << endl; return false; } thinkpad_state->mute_toggle = n; // Don't fail if wlan or bluetooth sysctls are not present. They are generated dynamically - if ( sysctlbyname("dev.acpi_ibm.0.wlan", &n, &len, NULL, 0) != -1 ) + if ( sysctlbyname("dev.acpi_ibm.0.wlan", &n, &len, nullptr, 0) != -1 ) thinkpad_state->wireless_toggle = n; else kdWarning() << "Unable to read sysctl: dev.acpi_ibm.0.wlan" << endl; - if ( sysctlbyname("dev.acpi_ibm.0.bluetooth", &n, &len, NULL, 0) != -1 ) + if ( sysctlbyname("dev.acpi_ibm.0.bluetooth", &n, &len, nullptr, 0) != -1 ) thinkpad_state->bluetooth_toggle = n; else kdWarning() << "Unable to read sysctl: dev.acpi_ibm.0.bluetooth" << endl; @@ -546,7 +546,7 @@ void ThinkPadMonitor::setNvramVolume() { #else u_int n = thinkpad_state.volume_level; - if (sysctlbyname("dev.acpi_ibm.0.volume", NULL, NULL, &n, sizeof(n))) + if (sysctlbyname("dev.acpi_ibm.0.volume", nullptr, nullptr, &n, sizeof(n))) kdError() << "Unable to write sysctl: dev.acpi_ibm.0.volume" << endl; #endif } diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp index c3eca2a9..4d54c061 100644 --- a/ksim/monitors/cpu/ksimcpu.cpp +++ b/ksim/monitors/cpu/ksimcpu.cpp @@ -488,7 +488,7 @@ uint CpuConfig::addCpus() int mib[] = { CTL_HW, HW_NCPU }; // hw.ncpu uint cpu; size_t cpuLen = sizeof(cpu); - if (sysctl(mib, 2, &cpu, &cpuLen, NULL, 0) < 0) + if (sysctl(mib, 2, &cpu, &cpuLen, nullptr, 0) < 0) return 0; return cpu; diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp index 47b478a3..b26cc5ad 100644 --- a/ksim/monitors/disk/ksimdisk.cpp +++ b/ksim/monitors/disk/ksimdisk.cpp @@ -369,7 +369,7 @@ void DiskView::updateData(DiskList &disks) long generation; device_selection *deviceSelect = 0; - if (devstat_getdevs(NULL, &diskStats) < 0) + if (devstat_getdevs(nullptr, &diskStats) < 0) return; deviceAmount = diskStats.dinfo->numdevs; diff --git a/ksim/monitors/filesystem/filesystemstats.cpp b/ksim/monitors/filesystem/filesystemstats.cpp index 26f213a5..77a34f64 100644 --- a/ksim/monitors/filesystem/filesystemstats.cpp +++ b/ksim/monitors/filesystem/filesystemstats.cpp @@ -109,7 +109,7 @@ ksim_mntent * ksim_getmntent( FILE * file ) struct mnttab tab; if ( getmntent( file, &tab ) != 0 ) - return NULL; + return nullptr; entry = new ksim_mntent; entry->mnt_dir = tab.mnt_mountp; diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp index d17769f4..bf52ad83 100644 --- a/ksim/monitors/lm_sensors/sensorbase.cpp +++ b/ksim/monitors/lm_sensors/sensorbase.cpp @@ -98,10 +98,10 @@ void SensorBase::update() int currentSensor = 0; int sensor = 0; - while ((chip = m_detectedChips(&sensor)) != NULL) { + while ((chip = m_detectedChips(&sensor))) { int first = 0, second = 0; const FeatureData *sFeature = 0; - while ((sFeature = m_allFeatures(*chip, &first, &second)) != NULL) { + while ((sFeature = m_allFeatures(*chip, &first, &second))) { if (sFeature->mapping == NoMapping) { char *name; double value; diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp index a066c6ec..60bf9ce1 100644 --- a/ksim/monitors/net/ksimnet.cpp +++ b/ksim/monitors/net/ksimnet.cpp @@ -496,22 +496,22 @@ void NetView::netStatistics(const TQString &device, NetData &data) size_t needed; char s[32]; - if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0) + if (sysctl(mib, 6, nullptr, &needed, nullptr, 0) < 0) return; if (m_allocSize < needed) { - if (m_buf != NULL) + if (m_buf) delete[] m_buf; m_buf = new char[needed]; - if (m_buf == NULL) + if (!m_buf) return; m_allocSize = needed; } - if (sysctl(mib, 6, m_buf, &needed, NULL, 0) < 0) + if (sysctl(mib, 6, m_buf, &needed, nullptr, 0) < 0) return; lim = m_buf + needed; @@ -569,22 +569,22 @@ bool NetView::isOnline(const TQString &device) size_t needed; char s[32]; - if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0) + if (sysctl(mib, 6, nullptr, &needed, nullptr, 0) < 0) return false; if (m_allocSize < needed) { - if (m_buf != NULL) + if (m_buf) delete[] m_buf; m_buf = new char[needed]; - if (m_buf == NULL) + if (!m_buf) return false; m_allocSize = needed; } - if (sysctl(mib, 6, m_buf, &needed, NULL, 0) < 0) + if (sysctl(mib, 6, m_buf, &needed, nullptr, 0) < 0) return false; lim = m_buf + needed; diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp index 5066541c..1df7c3f3 100644 --- a/ksim/monitors/net/netdialog.cpp +++ b/ksim/monitors/net/netdialog.cpp @@ -273,19 +273,19 @@ TQStringList NetDialog::createList() const size_t needed; char s[32]; - if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0) + if (sysctl(mib, 6, nullptr, &needed, nullptr, 0) < 0) return TQStringList(); if (alloc < needed) { buf = new char[needed]; - if (buf == NULL) + if (!buf) return TQStringList(); alloc = needed; } - if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) + if (sysctl(mib, 6, buf, &needed, nullptr, 0) < 0) return TQStringList(); lim = buf + needed; diff --git a/ksim/systeminfo.cpp b/ksim/systeminfo.cpp index 567477cc..6ab2f4fa 100644 --- a/ksim/systeminfo.cpp +++ b/ksim/systeminfo.cpp @@ -170,7 +170,7 @@ void System::updateData() size_t size = sizeof(bootTime); if (sysctlbyname("kern.boottime", - &bootTime, &size, NULL, 0) != -1 && bootTime.tv_sec != 0) { + &bootTime, &size, nullptr, 0) != -1 && bootTime.tv_sec != 0) { m_uptime = time(0) - bootTime.tv_sec + 30; } @@ -201,21 +201,21 @@ void System::updateData() unsigned long xused1, xused2; size_t xused1Length = sizeof(xused1); size_t xused2Length = sizeof(xused2); - if (sysctlbyname("vm.stats.vm.v_active_count", &xused1, &xused1Length, NULL, 0) == 0 - && sysctlbyname("vm.stats.vm.v_inactive_count", &xused2, &xused2Length, NULL, 0) == 0) { + if (sysctlbyname("vm.stats.vm.v_active_count", &xused1, &xused1Length, nullptr, 0) == 0 + && sysctlbyname("vm.stats.vm.v_inactive_count", &xused2, &xused2Length, nullptr, 0) == 0) { memXUsed = (xused1 + xused2) << pshift; } unsigned long cacheRam; size_t cacheSize = sizeof(cacheRam); - if (sysctlbyname("vm.stats.vm.v_active_count", &cacheRam, &cacheSize, NULL, 0) == 0) { + if (sysctlbyname("vm.stats.vm.v_active_count", &cacheRam, &cacheSize, nullptr, 0) == 0) { m_cacheram = cacheRam << pshift; } - if (!m_totalram && sysctlbyname("hw.physmem", &memTotal, &memLength, NULL, 0) == 0) + if (!m_totalram && sysctlbyname("hw.physmem", &memTotal, &memLength, nullptr, 0) == 0) m_totalram = memTotal; - if (sysctlbyname("vm.meter", &vmt, &vmtLength, NULL, 0) == 0) + if (sysctlbyname("vm.meter", &vmt, &vmtLength, nullptr, 0) == 0) m_sharedram = vmt.t_rmshr << pshift; if (!initialized) { @@ -251,8 +251,8 @@ void System::updateData() pclose(pipe); strtok(buf, " "); - total = strtok(NULL, " "); - used = strtok(NULL, " "); + total = strtok(nullptr, " "); + used = strtok(nullptr, " "); unsigned long usedSwap = atol(used) * 1024; m_totalswap = atol(total) * 1024; diff --git a/superkaramba/src/bar_python.cpp b/superkaramba/src/bar_python.cpp index a7892393..e846cb23 100644 --- a/superkaramba/src/bar_python.cpp +++ b/superkaramba/src/bar_python.cpp @@ -36,9 +36,9 @@ PyObject* py_createBar(PyObject *, PyObject *args) long widget, x, y, w, h; char *text; if (!PyArg_ParseTuple(args, (char*)"lllll|s", &widget, &x, &y, &w, &h, &text)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; Bar *tmp = new Bar((karamba*)widget, x,y,w,h); if (text && text[0] != '\0') @@ -51,9 +51,9 @@ PyObject* py_deleteBar(PyObject *, PyObject *args) { long widget, meter; if (!PyArg_ParseTuple(args, (char*)"ll", &widget, &meter)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, "Bar")) - return NULL; + return nullptr; ((karamba*)widget)->deleteMeterFromSensors((Meter*)meter); return Py_BuildValue((char*)"l", @@ -129,9 +129,9 @@ PyObject* py_getBarImage(PyObject *, PyObject *args) { long widget, meter; if (!PyArg_ParseTuple(args, (char*)"ll", &widget, &meter)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, "Bar")) - return NULL; + return nullptr; return Py_BuildValue((char*)"s", ((Bar*)meter)->getImage().ascii()); } @@ -140,9 +140,9 @@ PyObject* py_setBarImage(PyObject *, PyObject *args) long widget, meter; char* s; if (!PyArg_ParseTuple(args, (char*)"lls", &widget, &meter, &s)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, "Bar")) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", ((Bar*)meter)->setImage(s)); } @@ -150,9 +150,9 @@ PyObject* py_getBarVertical(PyObject *, PyObject *args) { long widget, meter; if (!PyArg_ParseTuple(args, (char*)"ll", &widget, &meter)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, "Bar")) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", ((Bar*)meter)->getVertical()); } @@ -160,9 +160,9 @@ PyObject* py_setBarVertical(PyObject *, PyObject *args) { long widget, meter, l; if (!PyArg_ParseTuple(args, (char*)"lll", &widget, &meter, &l)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, "Bar")) - return NULL; + return nullptr; ((Bar*)meter)->setVertical(l); return Py_BuildValue((char*)"l", 1); } diff --git a/superkaramba/src/config_python.cpp b/superkaramba/src/config_python.cpp index 1a094ebb..06b7c7ec 100644 --- a/superkaramba/src/config_python.cpp +++ b/superkaramba/src/config_python.cpp @@ -50,9 +50,9 @@ PyObject* py_add_menu_config_option(PyObject *, PyObject *args) PyObject* name; if (!PyArg_ParseTuple(args, (char*)"lsO:addMenuConfigOption", &widget, &key, &name)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; TQString k, n; k.setAscii(key); @@ -75,9 +75,9 @@ PyObject* py_set_menu_config_option(PyObject *, PyObject *args) int value; if (!PyArg_ParseTuple(args, (char*)"lsi:setMenuConfigOption", &widget, &key, &value)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; TQString k; k.setAscii(key); @@ -98,9 +98,9 @@ PyObject* py_read_menu_config_option(PyObject *, PyObject *args) char* key; if (!PyArg_ParseTuple(args, (char*)"ls:readMenuConfigOption", &widget, &key)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; TQString k; k.setAscii(key); @@ -126,9 +126,9 @@ PyObject* py_write_config_entry(PyObject *, PyObject *args) char* value; if (!PyArg_ParseTuple(args, (char*)"lss:writeConfigEntry", &widget, &key, &value)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; TQString k, v; k.setAscii(key); v.setAscii(value); @@ -150,9 +150,9 @@ PyObject* py_read_config_entry(PyObject *, PyObject *args) long widget; char* key; if (!PyArg_ParseTuple(args, (char*)"ls:readConfigEntry", &widget, &key)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; TQString k; k.setAscii(key); @@ -177,6 +177,6 @@ PyObject* py_read_config_entry(PyObject *, PyObject *args) return Py_BuildValue((char*)"s", entry.toString().ascii()); } // Add more types if needed - return NULL; + return nullptr; } diff --git a/superkaramba/src/cpusensor.cpp b/superkaramba/src/cpusensor.cpp index 1cf9a06a..bd3bbd17 100644 --- a/superkaramba/src/cpusensor.cpp +++ b/superkaramba/src/cpusensor.cpp @@ -49,7 +49,7 @@ void CPUSensor::getTicks (long &u,long &s,long &n,long &i) size_t size = sizeof(cp_time); /* get the cp_time array */ - if (sysctlbyname("kern.cp_time", &cp_time, &size, NULL, 0) != -1) { + if (sysctlbyname("kern.cp_time", &cp_time, &size, nullptr, 0) != -1) { u = cp_time[CP_USER]; s = cp_time[CP_SYS] + cp_time[CP_INTR]; n = cp_time[CP_NICE]; @@ -62,7 +62,7 @@ void CPUSensor::getTicks (long &u,long &s,long &n,long &i) size_t size = sizeof(cp_time); /* get the cp_time array */ - if (sysctlbyname("kern.cp_time", &cp_time, &size, NULL, 0) != -1) { + if (sysctlbyname("kern.cp_time", &cp_time, &size, nullptr, 0) != -1) { u = cp_time[CP_USER]; s = cp_time[CP_SYS] + cp_time[CP_INTR]; n = cp_time[CP_NICE]; diff --git a/superkaramba/src/graph_python.cpp b/superkaramba/src/graph_python.cpp index 01830859..14e34041 100644 --- a/superkaramba/src/graph_python.cpp +++ b/superkaramba/src/graph_python.cpp @@ -36,9 +36,9 @@ PyObject* py_createGraph(PyObject *, PyObject *args) long widget, x, y, w, h, points; if (!PyArg_ParseTuple(args, (char*)"llllll", &widget, &x, &y, &w, &h, &points)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; Graph *tmp = new Graph((karamba*)widget, (int)x, (int)y, (int)w, (int)h, (int)points); @@ -50,9 +50,9 @@ PyObject* py_deleteGraph(PyObject *, PyObject *args) { long widget, meter; if (!PyArg_ParseTuple(args, (char*)"ll", &widget, &meter)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, "Graph")) - return NULL; + return nullptr; ((karamba*)widget)->deleteMeterFromSensors((Meter*)meter); return Py_BuildValue((char*)"l", diff --git a/superkaramba/src/imagelabel_python.cpp b/superkaramba/src/imagelabel_python.cpp index 1251cc9a..1c826129 100644 --- a/superkaramba/src/imagelabel_python.cpp +++ b/superkaramba/src/imagelabel_python.cpp @@ -70,9 +70,9 @@ PyObject* py_createImage(PyObject *, PyObject *args) long widget, x, y; char *text; if (!PyArg_ParseTuple(args, (char*)"llls:createImage", &widget, &x, &y, &text)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; ImageLabel *tmp = createImageLabel((karamba*)widget, x, y, text, 0); return (Py_BuildValue((char*)"l", (long)tmp)); @@ -84,9 +84,9 @@ PyObject* py_createBackgroundImage(PyObject *, PyObject *args) char *text; if (!PyArg_ParseTuple(args, (char*)"llls:createBackgroundImage", &widget, &x, &y, &text)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; ImageLabel *tmp = createImageLabel((karamba*)widget, x, y, text, 1); return (Py_BuildValue((char*)"l", (long)tmp)); } @@ -101,9 +101,9 @@ PyObject* py_createTaskIcon(PyObject *, PyObject *args) long widget, x, y; long ctask; if (!PyArg_ParseTuple(args, (char*)"llll:createTaskIcon", &widget, &x, &y, &ctask)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; //get the specified task and insure it exists TaskList taskList = ((karamba*)widget)->taskManager.tasks(); @@ -122,7 +122,7 @@ PyObject* py_createTaskIcon(PyObject *, PyObject *args) { //no task was found tqWarning("Task not found."); - return NULL; + return nullptr; } //retrieve the TQPixmap that represents this image TQPixmap iconPixmap = KWin::icon(currTask->window()); @@ -136,9 +136,9 @@ PyObject* py_deleteImage(PyObject *, PyObject *args) { long widget, meter; if (!PyArg_ParseTuple(args, (char*)"ll:deleteImage", &widget, &meter)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, "ImageLabel")) - return NULL; + return nullptr; ((karamba*)widget)->deleteMeterFromSensors((Meter*)meter); ((karamba*)widget)->clickList->removeRef((Meter*)meter); @@ -201,9 +201,9 @@ PyObject* py_removeImageEffects(PyObject *, PyObject *args) { long widget, meter; if (!PyArg_ParseTuple(args, (char*)"ll:removeImageEffects", &widget, &meter)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, "ImageLabel")) - return NULL; + return nullptr; ((ImageLabel*)meter)->removeEffects(); return Py_BuildValue((char*)"l", 1); } @@ -215,9 +215,9 @@ PyObject* py_changeImageIntensity(PyObject *, PyObject *args) float ratio; if (!PyArg_ParseTuple(args, (char*)"llf|l:changeImageIntensity", &widget, &meter, &ratio, &millisec)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, "ImageLabel")) - return NULL; + return nullptr; ((ImageLabel*)meter)->intensity(ratio, millisec); return Py_BuildValue((char*)"l", 1); } @@ -230,9 +230,9 @@ PyObject* py_changeImageChannelIntensity(PyObject *, PyObject *args) long millisec = 0; if (!PyArg_ParseTuple(args, (char*)"llfs|l:changeImageChannelIntensity", &widget, &meter, &ratio, &channel, &millisec)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, "ImageLabel")) - return NULL; + return nullptr; ((ImageLabel*)meter)->channelIntensity(ratio, channel, millisec); return Py_BuildValue((char*)"l", 1); } @@ -243,9 +243,9 @@ PyObject* py_changeImageToGray(PyObject *, PyObject *args) long millisec = 0; if (!PyArg_ParseTuple(args, (char*)"ll|l:changeImageToGray", &widget, &meter, &millisec)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, "ImageLabel")) - return NULL; + return nullptr; ((ImageLabel*)meter)->toGray(millisec); return Py_BuildValue((char*)"l", 1); } @@ -254,9 +254,9 @@ PyObject* py_removeImageTransformations(PyObject *, PyObject *args) { long widget, meter; if (!PyArg_ParseTuple(args, (char*)"ll:removeImageTransformations", &widget, &meter)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, "ImageLabel")) - return NULL; + return nullptr; ((ImageLabel*)meter)->removeImageTransformations(); return Py_BuildValue((char*)"l", 1); } @@ -266,9 +266,9 @@ PyObject* py_rotateImage(PyObject *, PyObject *args) long widget, meter; long deg; if (!PyArg_ParseTuple(args, (char*)"lll:rotateImage", &widget, &meter, °)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, "ImageLabel")) - return NULL; + return nullptr; ((ImageLabel*)meter)->rotate((int)deg); return Py_BuildValue((char*)"l", 1); } @@ -277,9 +277,9 @@ PyObject* py_getImageHeight(PyObject *, PyObject *args) { long widget, meter; if (!PyArg_ParseTuple(args, (char*)"ll:getImageHeight", &widget, &meter)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, "ImageLabel")) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", ((ImageLabel*)meter)->getHeight()); } @@ -287,9 +287,9 @@ PyObject* py_getImageWidth(PyObject *, PyObject *args) { long widget, meter; if (!PyArg_ParseTuple(args, (char*)"ll:getImageWidth", &widget, &meter)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, "ImageLabel")) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", ((ImageLabel*)meter)->getWidth()); } @@ -299,9 +299,9 @@ PyObject* py_resizeImageSmooth(PyObject *, PyObject *args) long w, h; if (!PyArg_ParseTuple(args, (char*)"llll:resizeImageSmooth", &widget, &meter, &w, &h)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, "ImageLabel")) - return NULL; + return nullptr; ((ImageLabel*)meter)->smoothScale((int)w, (int)h); return Py_BuildValue((char*)"l", 1); } @@ -311,9 +311,9 @@ PyObject* py_resizeImage(PyObject *, PyObject *args) long widget, meter, w, h; if (!PyArg_ParseTuple(args, (char*)"llll:resizeImage", &widget, &meter, &w, &h)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, "ImageLabel")) - return NULL; + return nullptr; ((ImageLabel*)meter)->scale((int)w, (int)h); return Py_BuildValue((char*)"l", 1); } @@ -323,9 +323,9 @@ PyObject* py_addImageTooltip(PyObject *, PyObject *args) long widget, meter; PyObject* t; if (!PyArg_ParseTuple(args, (char*)"llO:addImageTooltip", &widget, &meter, &t)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, "ImageLabel")) - return NULL; + return nullptr; ((ImageLabel*)meter)->setTooltip(PyString2TQString(t)); return Py_BuildValue((char*)"l", 1); } diff --git a/superkaramba/src/input_python.cpp b/superkaramba/src/input_python.cpp index 727daaa0..7979045a 100644 --- a/superkaramba/src/input_python.cpp +++ b/superkaramba/src/input_python.cpp @@ -39,10 +39,10 @@ PyObject* py_createInputBox(PyObject *, PyObject *args) long widget, x, y, w, h; PyObject *text; if (!PyArg_ParseTuple(args, (char*)"lllllO:createInputBox", &widget, &x, &y, &w, &h, &text)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; Input *tmp = new Input((karamba*)widget, (int)x, (int)y, (int)w, (int)h); tmp->setValue(PyString2TQString(text)); @@ -59,10 +59,10 @@ PyObject* py_deleteInputBox(PyObject *, PyObject *args) { long widget, meter; if (!PyArg_ParseTuple(args, (char*)"ll:deleteInputBox", &widget, &meter)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, "Input")) - return NULL; + return nullptr; bool result = ((karamba*)widget)->meterList->removeRef((Meter*)meter); @@ -122,10 +122,10 @@ PyObject* py_setInputBoxFont(PyObject *, PyObject *args) char* text; if (!PyArg_ParseTuple(args, (char*)"lls:changeInputBoxFont", &widget, &inputBox, &text)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, inputBox, "Input")) - return NULL; + return nullptr; ((Input*)inputBox)->setFont(text); return Py_BuildValue((char*)"l", 1); @@ -135,10 +135,10 @@ PyObject* py_getInputBoxFont(PyObject *, PyObject *args) { long widget, inputBox; if (!PyArg_ParseTuple(args, (char*)"ll:getInputBoxFont", &widget, &inputBox)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, inputBox, "Input")) - return NULL; + return nullptr; return Py_BuildValue((char*)"s", ((Input*)inputBox)->getFont().ascii()); } @@ -148,10 +148,10 @@ PyObject* py_setInputBoxFontColor(PyObject *, PyObject *args) long widget, inputBox; long r, g, b; if (!PyArg_ParseTuple(args, (char*)"lllll:changeInputBoxFontColor", &widget, &inputBox, &r, &g, &b)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, inputBox, "Input")) - return NULL; + return nullptr; ((Input*)inputBox)->setFontColor(TQColor(r, g, b)); return Py_BuildValue((char*)"l", 1); @@ -161,10 +161,10 @@ PyObject* py_getInputBoxFontColor(PyObject *, PyObject *args) { long widget, inputBox; if (!PyArg_ParseTuple(args, (char*)"ll:changeInputBoxFontColor", &widget, &inputBox)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, inputBox, "Input")) - return NULL; + return nullptr; TQColor color = ((Input*)inputBox)->getFontColor(); return Py_BuildValue((char*)"(i,i,i)", color.red(), color.green(), color.blue()); @@ -175,10 +175,10 @@ PyObject* py_setInputBoxSelectionColor(PyObject *, PyObject *args) long widget, inputBox; long r, g, b; if (!PyArg_ParseTuple(args, (char*)"lllll:changeInputBoxSelectionColor", &widget, &inputBox, &r, &g, &b)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, inputBox, "Input")) - return NULL; + return nullptr; ((Input*)inputBox)->setSelectionColor(TQColor(r, g, b)); return Py_BuildValue((char*)"l", 1); @@ -188,10 +188,10 @@ PyObject* py_getInputBoxSelectionColor(PyObject *, PyObject *args) { long widget, inputBox; if (!PyArg_ParseTuple(args, (char*)"ll:changeInputBoxSelectionColor", &widget, &inputBox)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, inputBox, "Input")) - return NULL; + return nullptr; TQColor color = ((Input*)inputBox)->getSelectionColor(); return Py_BuildValue((char*)"(i,i,i)", color.red(), color.green(), color.blue()); @@ -202,10 +202,10 @@ PyObject* py_setInputBoxBGColor(PyObject *, PyObject *args) long widget, inputBox; long r, g, b; if (!PyArg_ParseTuple(args, (char*)"lllll:changeInputBoxBackgroundColor", &widget, &inputBox, &r, &g, &b)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, inputBox, "Input")) - return NULL; + return nullptr; ((Input*)inputBox)->setBGColor(TQColor(r, g, b)); return Py_BuildValue((char*)"l", 1); @@ -215,10 +215,10 @@ PyObject* py_getInputBoxBGColor(PyObject *, PyObject *args) { long widget, inputBox; if (!PyArg_ParseTuple(args, (char*)"ll:getInputBoxBackgroundColor", &widget, &inputBox)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, inputBox, "Input")) - return NULL; + return nullptr; TQColor color = ((Input*)inputBox)->getBGColor(); return Py_BuildValue((char*)"(i,i,i)", color.red(), color.green(), color.blue()); @@ -229,10 +229,10 @@ PyObject* py_setInputBoxFrameColor(PyObject *, PyObject *args) long widget, inputBox; long r, g, b; if (!PyArg_ParseTuple(args, (char*)"lllll:changeInputBoxFrameColor", &widget, &inputBox, &r, &g, &b)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, inputBox, "Input")) - return NULL; + return nullptr; ((Input*)inputBox)->setColor(TQColor(r, g, b)); return Py_BuildValue((char*)"l", 1); @@ -242,10 +242,10 @@ PyObject* py_getInputBoxFrameColor(PyObject *, PyObject *args) { long widget, inputBox; if (!PyArg_ParseTuple(args, (char*)"ll:getInputBoxFrameColor", &widget, &inputBox)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, inputBox, "Input")) - return NULL; + return nullptr; TQColor color = ((Input*)inputBox)->getColor(); return Py_BuildValue((char*)"(i,i,i)", color.red(), color.green(), color.blue()); @@ -256,10 +256,10 @@ PyObject* py_setInputBoxSelectedTextColor(PyObject *, PyObject *args) long widget, inputBox; long r, g, b; if (!PyArg_ParseTuple(args, (char*)"lllll:changeInputBoxSelectedTextColor", &widget, &inputBox, &r, &g, &b)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, inputBox, "Input")) - return NULL; + return nullptr; ((Input*)inputBox)->setSelectedTextColor(TQColor(r, g, b)); return Py_BuildValue((char*)"l", 1); @@ -269,10 +269,10 @@ PyObject* py_getInputBoxSelectedTextColor(PyObject *, PyObject *args) { long widget, inputBox; if (!PyArg_ParseTuple(args, (char*)"ll:getInputBoxSelectedTextColor", &widget, &inputBox)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, inputBox, "Input")) - return NULL; + return nullptr; TQColor color = ((Input*)inputBox)->getSelectedTextColor(); return Py_BuildValue((char*)"(i,i,i)", color.red(), color.green(), color.blue()); @@ -284,10 +284,10 @@ PyObject* py_setInputBoxFontSize(PyObject *, PyObject *args) long size; if (!PyArg_ParseTuple(args, (char*)"lll:changeInputBoxFontSize", &widget, &inputBox, &size)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, inputBox, "Input")) - return NULL; + return nullptr; ((Input*)inputBox)->setFontSize( size ); return Py_BuildValue((char*)"l", 1); @@ -297,10 +297,10 @@ PyObject* py_getInputBoxFontSize(PyObject *, PyObject *args) { long widget, inputBox; if (!PyArg_ParseTuple(args, (char*)"ll:getInputBoxFontSize", &widget, &inputBox)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, inputBox, "Input")) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", ((Input*)inputBox)->getFontSize()); } @@ -309,10 +309,10 @@ PyObject* py_setInputFocus(PyObject *, PyObject *args) { long widget, inputBox; if (!PyArg_ParseTuple(args, (char*)"ll:setInputFocus", &widget, &inputBox)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, inputBox, "Input")) - return NULL; + return nullptr; //((karamba*)widget)->setActiveWindow(); @@ -324,10 +324,10 @@ PyObject* py_clearInputFocus(PyObject *, PyObject *args) { long widget, inputBox; if (!PyArg_ParseTuple(args, (char*)"ll:clearInputFocus", &widget, &inputBox)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, inputBox, "Input")) - return NULL; + return nullptr; ((Input*)inputBox)->clearInputFocus(); return Py_BuildValue((char*)"l", 1); @@ -337,10 +337,10 @@ PyObject* py_getInputFocus(PyObject *, PyObject *args) { long widget; if (!PyArg_ParseTuple(args, (char*)"l:getInputFocus", &widget)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; // // FocusWidget() returns the currently focused line edit, diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp index effafda4..6bcf7148 100644 --- a/superkaramba/src/karamba.cpp +++ b/superkaramba/src/karamba.cpp @@ -59,7 +59,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, menuAccColl(0), toggleLocked(0), pythonIface(0), defaultTextField(0), trayMenuSeperatorId(-1), trayMenuQuitId(-1), trayMenuToggleId(-1), trayMenuThemeId(-1), - m_sysTimer(NULL) + m_sysTimer(nullptr) { themeStarted = false; want_right_button = false; @@ -366,7 +366,7 @@ karamba::~karamba() delete widgetMask; delete tWinModule; delete defaultTextField; - if (pythonIface != NULL) + if (pythonIface) delete pythonIface; } @@ -911,7 +911,7 @@ Sensor* karamba::findSensorFromList(Meter* meter) return ((Sensor*)*it); ++it; } - return NULL; + return nullptr; } TQString karamba::getSensor(Meter* meter) @@ -1318,7 +1318,7 @@ void karamba::meterClicked(TQMouseEvent* e, Meter* meter) void karamba::changeInterval(int interval) { - if (m_sysTimer != NULL) + if (m_sysTimer) m_sysTimer->changeInterval(interval); } @@ -1804,7 +1804,7 @@ bool karamba::setMenuConfigOption(TQString key, bool value) { //tqDebug("karamba::setMenuConfigOption"); TDEToggleAction* menuAction = ((TDEToggleAction*)menuAccColl -> action(key.ascii())); - if (menuAction == NULL) + if (!menuAction) { tqWarning("Menu action %s not found.", key.ascii()); return false; @@ -1820,7 +1820,7 @@ bool karamba::readMenuConfigOption(TQString key) { //tqDebug("karamba::readMenuConfigOption"); TDEToggleAction* menuAction = ((TDEToggleAction*)menuAccColl -> action(key.ascii())); - if (menuAction == NULL) + if (!menuAction) { tqWarning("Menu action %s not found.", key.ascii()); return false; diff --git a/superkaramba/src/karamba_python.cpp b/superkaramba/src/karamba_python.cpp index f7325701..7eafbffd 100644 --- a/superkaramba/src/karamba_python.cpp +++ b/superkaramba/src/karamba_python.cpp @@ -57,7 +57,7 @@ static PyObject * error_out(PyObject *m) { struct module_state *st = GETSTATE(m); PyErr_SetString(st->error, "something bad happened in karamba_python.cpp"); - return NULL; + return nullptr; } /******************************************* @@ -348,7 +348,7 @@ static PyMethodDef karamba_methods[] = { {(char*)"getServiceGroups", py_get_service_groups, METH_VARARGS, (char*)"Get KDE Service Groups"}, - {NULL, NULL, 0 ,NULL} + {nullptr, nullptr, 0 ,nullptr} }; static int karamba_traverse(PyObject *m, visitproc visit, void *arg) { @@ -364,16 +364,16 @@ static int karamba_clear(PyObject *m) { static struct PyModuleDef karambadef = { PyModuleDef_HEAD_INIT, "karamba", - NULL, + nullptr, sizeof(struct module_state), karamba_methods, - NULL, + nullptr, karamba_traverse, karamba_clear, - NULL + nullptr }; -#define INITERROR return NULL +#define INITERROR return nullptr PyMODINIT_FUNC PyInit_karamba(void) { @@ -403,10 +403,10 @@ KarambaPython::KarambaPython(const ThemeFile& theme, bool reloading): if (reloading) PyImport_ReloadModule(pModule); - if (pModule != NULL) + if (pModule) { pDict = PyModule_GetDict(pModule); - if (pDict != NULL) + if (pDict) { pythonThemeExtensionLoaded = true; } @@ -465,7 +465,7 @@ PyObject* KarambaPython::getFunc(const char* function) PyObject* pFunc = PyDict_GetItemString(pDict, (char*)function); if (pFunc && PyCallable_Check(pFunc)) return pFunc; - return NULL; + return nullptr; } bool KarambaPython::callObject(const char* func, PyObject* pArgs) @@ -473,11 +473,11 @@ bool KarambaPython::callObject(const char* func, PyObject* pArgs) bool result = false; PyObject* pFunc = getFunc(func); - if (pFunc != NULL) + if (pFunc) { PyObject* pValue = PyObject_CallObject(pFunc, pArgs); - if (pValue != NULL) + if (pValue) { Py_DECREF(pValue); result = true; diff --git a/superkaramba/src/memsensor.cpp b/superkaramba/src/memsensor.cpp index 1aac365b..43f049e5 100644 --- a/superkaramba/src/memsensor.cpp +++ b/superkaramba/src/memsensor.cpp @@ -106,7 +106,7 @@ int MemSensor::getMemTotal() static int mem = 0; size_t size = sizeof(mem); - sysctlbyname("hw.physmem", &mem, &size, NULL, 0); + sysctlbyname("hw.physmem", &mem, &size, nullptr, 0); return (mem / 1024); #else TQRegExp rx( "MemTotal:\\s*(\\d+)" ); @@ -121,7 +121,7 @@ int MemSensor::getMemFree() static int mem = 0; size_t size = sizeof(mem); - sysctlbyname("vm.stats.vm.v_free_count", &mem, &size, NULL, 0); + sysctlbyname("vm.stats.vm.v_free_count", &mem, &size, nullptr, 0); return (pagetok(mem)); #elif defined(Q_OS_NETBSD) struct uvmexp_sysctl uvmexp; @@ -130,7 +130,7 @@ int MemSensor::getMemFree() mib[0] = CTL_VM; mib[1] = VM_UVMEXP2; ssize = sizeof(uvmexp); - sysctl(mib,2,&uvmexp,&ssize,NULL,0); + sysctl(mib,2,&uvmexp,&ssize,nullptr,0); return pagetok(uvmexp.free); #else TQRegExp rx( "MemFree:\\s*(\\d+)" ); @@ -145,13 +145,13 @@ int MemSensor::getBuffers() static int mem = 0; size_t size = sizeof(mem); - sysctlbyname("vfs.bufspace", &mem, &size, NULL, 0); + sysctlbyname("vfs.bufspace", &mem, &size, nullptr, 0); return (mem / 1024); #elif defined(Q_OS_NETBSD) static int buf_mem = 0; size_t size = sizeof(buf_mem); - sysctlbyname("vm.bufmem", &buf_mem, &size, NULL, 0); + sysctlbyname("vm.bufmem", &buf_mem, &size, nullptr, 0); return (buf_mem / 1024); #else TQRegExp rx( "Buffers:\\s*(\\d+)" ); @@ -166,7 +166,7 @@ int MemSensor::getCached() static int mem = 0; size_t size = sizeof(mem); - sysctlbyname("vm.stats.vm.v_cache_count", &mem, &size, NULL, 0); + sysctlbyname("vm.stats.vm.v_cache_count", &mem, &size, nullptr, 0); return (pagetok(mem)); #elif defined(Q_OS_NETBSD) return 0; @@ -188,7 +188,7 @@ int MemSensor::getSwapTotal() int pagesize = getpagesize(); int retavail = 0; - if (kd != NULL) + if (kd) n = kvm_getswapinfo(kd, &swapinfo, 1, 0); if (n < 0 || swapinfo.ksw_total == 0) @@ -210,7 +210,7 @@ int MemSensor::getSwapTotal() mib[1] = VM_UVMEXP; ssize = sizeof(uvmexp); - if (sysctl(mib, 2, &uvmexp, &ssize, NULL, 0) != -1) { + if (sysctl(mib, 2, &uvmexp, &ssize, nullptr, 0) != -1) { pagesize = uvmexp.pagesize; STotal = (pagesize*uvmexp.swpages) >> 10; } @@ -230,7 +230,7 @@ int MemSensor::getSwapFree() int pagesize = getpagesize(); int retfree = 0; - if (kd != NULL) + if (kd) n = kvm_getswapinfo(kd, &swapinfo, 1, 0); if (n < 0 || swapinfo.ksw_total == 0) return(0); @@ -253,7 +253,7 @@ int MemSensor::getSwapFree() mib[1] = VM_UVMEXP; ssize = sizeof(uvmexp); - if (sysctl(mib,2,&uvmexp,&ssize,NULL,0) != -1) { + if (sysctl(mib,2,&uvmexp,&ssize,nullptr,0) != -1) { pagesize = uvmexp.pagesize; STotal = (pagesize*uvmexp.swpages) >> 10; SUsed = (pagesize*uvmexp.swpginuse) >> 10; diff --git a/superkaramba/src/menu_python.cpp b/superkaramba/src/menu_python.cpp index bc5d9e3c..c6cde259 100644 --- a/superkaramba/src/menu_python.cpp +++ b/superkaramba/src/menu_python.cpp @@ -50,7 +50,7 @@ PyObject* py_create_menu(PyObject *, PyObject *args) { long widget; if (!PyArg_ParseTuple(args, (char*)"l:createMenu", &widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", createMenu(widget)); } @@ -95,7 +95,7 @@ PyObject* py_delete_menu(PyObject *, PyObject *args) { long widget, menu; if (!PyArg_ParseTuple(args, (char*)"ll:deleteMenu", &widget, &menu)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", deleteMenu(widget, menu)); } @@ -118,7 +118,7 @@ PyObject* py_add_menu_item(PyObject *, PyObject *args) char* i; PyObject* t; if (!PyArg_ParseTuple(args, (char*)"llOs:addMenuItem", &widget, &menu, &t, &i)) - return NULL; + return nullptr; TQString icon; TQString text; icon.setAscii(i); @@ -145,7 +145,7 @@ PyObject* py_add_menu_separator(PyObject *, PyObject *args) long widget, menu; if (!PyArg_ParseTuple(args, (char*)"ll:addMenuSeparator", &widget, &menu)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", addMenuSeparator(widget, menu)); } @@ -170,7 +170,7 @@ PyObject* py_remove_menu_item(PyObject *, PyObject *args) { long widget, menu, id; if (!PyArg_ParseTuple(args, (char*)"lll:removeMenuItem", &widget, &menu, &id)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", removeMenuItem(widget, menu, id)); } @@ -194,7 +194,7 @@ PyObject* py_popup_menu(PyObject *, PyObject *args) { long widget, menu, x, y; if (!PyArg_ParseTuple(args, (char*)"llll:popupMenu", &widget, &menu, &x, &y)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", popupMenu(widget, menu, x, y)); } diff --git a/superkaramba/src/meter_python.cpp b/superkaramba/src/meter_python.cpp index d3f22932..a0fef0d8 100644 --- a/superkaramba/src/meter_python.cpp +++ b/superkaramba/src/meter_python.cpp @@ -152,14 +152,14 @@ PyObject* py_getThemeMeter(PyObject *, PyObject *args, TQString type) long widget, meter; char* name; if (!PyArg_ParseTuple(args, (char*)"ls", &widget, &name)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; if(!name) - return NULL; + return nullptr; meter = getMeter(widget, name); if (!checkMeter(widget, meter, type.ascii())) - return NULL; + return nullptr; return (Py_BuildValue((char*)"l", meter)); } @@ -168,9 +168,9 @@ PyObject* py_getSize(PyObject *, PyObject *args, TQString type) long widget; long meter; if (!PyArg_ParseTuple(args, (char*)"ll", &widget, &meter)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, type.ascii())) - return NULL; + return nullptr; return Py_BuildValue((char*)"(i,i)", ((Meter*)meter)->getWidth(), ((Meter*)meter)->getHeight()); } @@ -179,9 +179,9 @@ PyObject* py_resize(PyObject *, PyObject *args, TQString type) { long widget, meter, x, y; if (!PyArg_ParseTuple(args, (char*)"llll", &widget, &meter, &x, &y)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, type.ascii())) - return NULL; + return nullptr; ((Meter*)meter)->setSize(((Meter*)meter)->getX(), ((Meter*)meter)->getY(), x, y); return Py_BuildValue((char*)"l", 1); @@ -191,9 +191,9 @@ PyObject* py_getPos(PyObject *, PyObject *args, TQString type) { long widget, meter; if (!PyArg_ParseTuple(args, (char*)"ll", &widget, &meter)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, type.ascii())) - return NULL; + return nullptr; return Py_BuildValue((char*)"(i,i)", ((Meter*)meter)->getX(), ((Meter*)meter)->getY()); } @@ -202,9 +202,9 @@ PyObject* py_move(PyObject *, PyObject *args, TQString type) { long widget, meter, x, y; if (!PyArg_ParseTuple(args, (char*)"llll", &widget, &meter, &x, &y)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, type.ascii())) - return NULL; + return nullptr; ((Meter*)meter)->setSize(x, y, ((Meter*)meter)->getWidth(), ((Meter*)meter)->getHeight()); @@ -215,9 +215,9 @@ PyObject* py_hide(PyObject *, PyObject *args, TQString type) { long widget, meter; if (!PyArg_ParseTuple(args, (char*)"ll", &widget, &meter)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, type.ascii())) - return NULL; + return nullptr; ((Meter*)meter)->hide(); return Py_BuildValue((char*)"l", 1); } @@ -226,9 +226,9 @@ PyObject* py_show(PyObject *, PyObject *args, TQString type) { long widget, meter; if (!PyArg_ParseTuple(args, (char*)"ll", &widget, &meter)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, type.ascii())) - return NULL; + return nullptr; ((Meter*)meter)->show(); return Py_BuildValue((char*)"l", 1); } @@ -237,9 +237,9 @@ PyObject* py_getValue(PyObject *, PyObject *args, TQString type) { long widget, meter; if (!PyArg_ParseTuple(args, (char*)"ll", &widget, &meter)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, type.ascii())) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", ((Meter*)meter)->getValue()); } @@ -247,9 +247,9 @@ PyObject* py_setValue(PyObject *, PyObject *args, TQString type) { long widget, meter, l; if (!PyArg_ParseTuple(args, (char*)"lll", &widget, &meter, &l)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, type.ascii())) - return NULL; + return nullptr; ((Meter*)meter)->setValue(l); return Py_BuildValue((char*)"l", ((long)meter)); } @@ -258,9 +258,9 @@ PyObject* py_getStringValue(PyObject *, PyObject *args, TQString type) { long widget, meter; if (!PyArg_ParseTuple(args, (char*)"ll", &widget, &meter)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, type.ascii())) - return NULL; + return nullptr; return Py_BuildValue((char*)"O", TQString2PyString(((Meter*)meter)->getStringValue())); } @@ -270,11 +270,11 @@ PyObject* py_setStringValue(PyObject *, PyObject *args, TQString type) long widget, meter; PyObject* s; if (!PyArg_ParseTuple(args, (char*)"llO", &widget, &meter, &s)) - return NULL; + return nullptr; if (!s) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, type.ascii())) - return NULL; + return nullptr; ((Meter*)meter)->setValue(PyString2TQString(s)); return Py_BuildValue((char*)"l", ((long)meter)); } @@ -283,9 +283,9 @@ PyObject* py_getMinMax(PyObject *, PyObject *args, TQString type) { long widget, meter; if (!PyArg_ParseTuple(args, (char*)"ll", &widget, &meter)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, type.ascii())) - return NULL; + return nullptr; return Py_BuildValue((char*)"(i,i)", ((Meter*)meter)->getMin(), ((Meter*)meter)->getMax()); } @@ -294,9 +294,9 @@ PyObject* py_setMinMax(PyObject *, PyObject *args, TQString type) { long widget, meter, x, y; if (!PyArg_ParseTuple(args, (char*)"llll", &widget, &meter, &x, &y)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, type.ascii())) - return NULL; + return nullptr; ((Meter*)meter)->setMin(x); ((Meter*)meter)->setMax(y); return Py_BuildValue((char*)"l", 1); @@ -307,9 +307,9 @@ PyObject* py_getSensor(PyObject *, PyObject *args, TQString type) long widget, meter; TQString s; if (!PyArg_ParseTuple(args, (char*)"ll", &widget, &meter)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, type.ascii())) - return NULL; + return nullptr; return Py_BuildValue((char*)"s", ((karamba*)widget)->getSensor((Meter*)meter).ascii()); } @@ -320,9 +320,9 @@ PyObject* py_setSensor(PyObject *, PyObject *args, TQString type) char* s; if (!PyArg_ParseTuple(args, (char*)"lls", &widget, &meter, &s)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, type.ascii())) - return NULL; + return nullptr; ((karamba*)widget)->setSensor(LineParser(s), (Meter*)meter); return Py_BuildValue((char*)"l", 1); } @@ -332,9 +332,9 @@ PyObject* py_setColor(PyObject *, PyObject *args, TQString type) long widget, meter; long r, g, b; if (!PyArg_ParseTuple(args, (char*)"lllll", &widget, &meter, &r, &g, &b)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, type.ascii())) - return NULL; + return nullptr; ((Meter*)meter)->setColor(TQColor(r, g, b)); return Py_BuildValue((char*)"l", 1); } @@ -343,9 +343,9 @@ PyObject* py_getColor(PyObject *, PyObject *args, TQString type) { long widget, meter; if (!PyArg_ParseTuple(args, (char*)"ll", &widget, &meter)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, type.ascii())) - return NULL; + return nullptr; TQColor color = ((Meter*)meter)->getColor(); return Py_BuildValue((char*)"(i,i,i)", color.red(), color.green(), color.blue()); } diff --git a/superkaramba/src/misc_python.cpp b/superkaramba/src/misc_python.cpp index 85dbde0c..fb7a00ee 100644 --- a/superkaramba/src/misc_python.cpp +++ b/superkaramba/src/misc_python.cpp @@ -58,9 +58,9 @@ PyObject* py_accept_drops(PyObject *, PyObject *args) long widget; if (!PyArg_ParseTuple(args, (char*)"l", &widget)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", acceptDrops(widget)); } @@ -72,8 +72,8 @@ PyObject* py_run_command(PyObject*, PyObject* args) char* icon; PyObject *lst; if (!PyArg_ParseTuple(args, (char*)"sssO:run", &name, &command, &icon, &lst) || - lst == NULL || !PyList_Check(lst)) - return NULL; + lst == nullptr || !PyList_Check(lst)) + return nullptr; TQString n; TQString c; @@ -100,7 +100,7 @@ PyObject* py_execute_command(PyObject *, PyObject* args) PyObject* s; if (!PyArg_ParseTuple(args, (char*)"O:execute", &s)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", KRun::runCommand(PyString2TQString(s))); } @@ -120,9 +120,9 @@ PyObject* py_execute_command_interactive(PyObject *, PyObject* args) /* the O! parses for a Python object (listObj) checked to be of type PyList_Type */ if (! PyArg_ParseTuple(args, (char*)"lO!", &widget, &PyList_Type, &listObj)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; karamba* currTheme = (karamba*)widget; @@ -132,7 +132,7 @@ PyObject* py_execute_command_interactive(PyObject *, PyObject* args) numLines = PyList_Size(listObj); /* should raise an error here. */ - if (numLines < 0) return NULL; /* Not a list */ + if (numLines < 0) return nullptr; /* Not a list */ /* iterate over items of the list, grabbing strings, and parsing for numbers */ @@ -202,18 +202,18 @@ PyObject* py_attach_clickArea(PyObject*, PyObject* args, PyObject* dict) { long widget; long meter; - char* LeftButton = NULL; - char* MiddleButton = NULL; - char* RightButton = NULL; + char* LeftButton = nullptr; + char* MiddleButton = nullptr; + char* RightButton = nullptr; const char* mouseButtons[] = {"Widget", "Meter", "LeftButton", "MiddleButton", - "RightButton", NULL}; + "RightButton", nullptr}; if (!PyArg_ParseTupleAndKeywords(args, dict, (char*)"ll|sss:attachClickArea", (char**)mouseButtons, &widget, &meter, &LeftButton, &MiddleButton, &RightButton)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; TQString lB, mB, rB; - if (LeftButton != NULL) + if (LeftButton) { lB.setAscii(LeftButton); } @@ -221,7 +221,7 @@ PyObject* py_attach_clickArea(PyObject*, PyObject* args, PyObject* dict) { lB.setAscii(""); } - if (MiddleButton != NULL) + if (MiddleButton) { mB.setAscii(MiddleButton); } @@ -229,7 +229,7 @@ PyObject* py_attach_clickArea(PyObject*, PyObject* args, PyObject* dict) { mB.setAscii(""); } - if (RightButton != NULL) + if (RightButton) { rB.setAscii(RightButton); } @@ -252,9 +252,9 @@ PyObject* py_toggle_show_desktop(PyObject *, PyObject *args) { long widget; if (!PyArg_ParseTuple(args, (char*)"l:toggleShowDesktop", &widget)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", toggleShowDesktop(widget)); } @@ -269,7 +269,7 @@ PyObject* py_get_pretty_name(PyObject *, PyObject *args) { long widget; if (!PyArg_ParseTuple(args, (char*)"l:getPrettyThemeName", &widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"s", getPrettyName(widget)); } @@ -284,9 +284,9 @@ PyObject* py_get_theme_path(PyObject *, PyObject *args) { long widget; if (!PyArg_ParseTuple(args, (char*)"l:getThemePath", &widget)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"s", getThemePath(widget)); } @@ -294,9 +294,9 @@ PyObject* py_language(PyObject *, PyObject *args) { long widget; if (!PyArg_ParseTuple(args, (char*)"l:language", &widget)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"s", ((karamba*)widget)->theme().locale()->language().ascii()); } @@ -305,9 +305,9 @@ PyObject* py_userLanguage(PyObject *, PyObject *args) { long widget; if (!PyArg_ParseTuple(args, (char*)"l:language", &widget)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"s", TDEGlobal::locale()->language().ascii()); } @@ -315,9 +315,9 @@ PyObject* py_userLanguages(PyObject *, PyObject *args) { long widget; if (!PyArg_ParseTuple(args, (char*)"l:language", &widget)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; unsigned int noOfLangs = TDEGlobal::locale()->languageList().count(); @@ -338,9 +338,9 @@ PyObject* py_read_theme_file(PyObject *, PyObject *args) long widget; char *file; if (!PyArg_ParseTuple(args, (char*)"ls:readThemeFile", &widget, &file)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; karamba* k = (karamba*)widget; TQByteArray ba = k->theme().readThemeFile(file); return PyBytes_FromStringAndSize(ba.data(), ba.size()); @@ -395,7 +395,7 @@ PyObject* py_remove_click_area(PyObject *, PyObject *args) { long widget, click; if (!PyArg_ParseTuple(args, (char*)"ll:removeClickArea", &widget, &click)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", removeClickArea(widget, click)); } @@ -407,7 +407,7 @@ PyObject* py_create_service_click_area(PyObject *, PyObject *args) char *icon; if (!PyArg_ParseTuple(args, (char*)"lllllsss:createServiceClickArea", &widget, &x, &y, &w, &h, &name, &exec, &icon)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", createServiceClickArea(widget, x, y, w, h, name, exec, icon)); } @@ -417,9 +417,9 @@ PyObject* py_create_click_area(PyObject *, PyObject *args) char *text; if (!PyArg_ParseTuple(args, (char*)"llllls:createClickArea", &widget, &x, &y, &w, &h, &text)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", createClickArea(widget, x, y, w, h, text)); } @@ -506,7 +506,7 @@ PyObject* py_get_incoming_data(PyObject *, PyObject *args) { long widget; if (!PyArg_ParseTuple(args, (char*)"l:getIncomingData", &widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"O", TQString2PyString(getIncomingData(widget))); } @@ -516,7 +516,7 @@ PyObject* py_set_incoming_data(PyObject *, PyObject *args) long widget; char *obj; if (!PyArg_ParseTuple(args, (char*)"lss:setIncomingData", &widget, &themePath, &obj)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", setIncomingData(widget, themePath, obj)); } @@ -526,7 +526,7 @@ PyObject* py_call_theme(PyObject *, PyObject *args) char *str; long widget; if (!PyArg_ParseTuple(args, (char*)"lss:callTheme", &widget, &themePath, &str)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", callTheme(widget, themePath, str)); } @@ -536,7 +536,7 @@ PyObject* py_open_named_theme(PyObject *, PyObject *args) char *themeName; long is_sub_theme; if (!PyArg_ParseTuple(args, (char*)"ssl:openNamedTheme", &themePath, &themeName, &is_sub_theme)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", openNamedTheme(themePath, themeName, is_sub_theme ? true : false)); } @@ -544,7 +544,7 @@ PyObject* py_open_theme(PyObject *, PyObject *args) { char *themePath; if (!PyArg_ParseTuple(args, (char*)"s:openTheme", &themePath)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", openTheme(themePath)); } @@ -552,9 +552,9 @@ PyObject* py_reload_theme(PyObject *, PyObject *args) { long widget; if (!PyArg_ParseTuple(args, (char*)"l:reloadTheme", &widget)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; ((karamba*)widget)->reloadConfig(); return Py_BuildValue((char*)"l", 1); } @@ -571,9 +571,9 @@ PyObject* py_get_number_of_desktops(PyObject *, PyObject *args) { long widget; if (!PyArg_ParseTuple(args, (char*)"l:getNumberOfDesktops", &widget)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", getNumberOfDesktops(widget)); } @@ -606,9 +606,9 @@ PyObject* py_translate_all(PyObject *, PyObject *args) long widget; int x, y; if (!PyArg_ParseTuple(args, (char*)"lii:translateAll", &widget, &x, &y)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"lii", translateAll(widget, x, y)); } @@ -624,9 +624,9 @@ PyObject* py_show(PyObject *, PyObject *args) { long widget; if (!PyArg_ParseTuple(args, (char*)"l:show", &widget)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", show(widget)); } @@ -642,9 +642,9 @@ PyObject* py_hide(PyObject *, PyObject *args) { long widget; if (!PyArg_ParseTuple(args, (char*)"l:hide", &widget)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", hide(widget)); } @@ -754,7 +754,7 @@ PyObject* py_set_update_time(PyObject *, PyObject *args) long widget; double time; if (!PyArg_ParseTuple(args, (char*)"ld:setUpdateTime", &widget, &time)) - return NULL; + return nullptr; karamba* currTheme = (karamba*)widget; currTheme->setUpdateTime(time); return Py_BuildValue((char*)"l", 1); @@ -765,7 +765,7 @@ PyObject* py_get_update_time(PyObject *, PyObject *args) long widget; double time; if (!PyArg_ParseTuple(args, (char*)"l:getUpdateTime", &widget, &time)) - return NULL; + return nullptr; karamba* currTheme = (karamba*)widget; return Py_BuildValue((char*)"d", currTheme->getUpdateTime()); } @@ -775,9 +775,9 @@ PyObject* py_get_ip(PyObject *, PyObject *args) long widget; char *interface; if (!PyArg_ParseTuple(args, (char*)"ls:getIp", &widget, &interface)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"O", TQString2PyString(getIp(interface))); } @@ -791,9 +791,9 @@ PyObject* py_management_popup(PyObject *, PyObject *args) { long widget; if (!PyArg_ParseTuple(args, (char*)"l:managementPopup", &widget)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; management_popup(widget); return Py_BuildValue((char*)"l", 1); } @@ -808,9 +808,9 @@ PyObject* py_want_right_button(PyObject *, PyObject *args) { long widget, i; if (!PyArg_ParseTuple(args, (char*)"ll:setWantRightButton", &widget, &i)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; set_want_right_button(widget, i); return Py_BuildValue((char*)"l", 1); } @@ -825,9 +825,9 @@ PyObject* py_want_wheel_event(PyObject *, PyObject *args) { long widget, i; if (!PyArg_ParseTuple(args, (char*)"ll:setWantMeterWheelEvent", &widget, &i)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; set_want_wheel_event(widget, i); return Py_BuildValue((char*)"l", 1); } @@ -842,9 +842,9 @@ PyObject* py_change_interval(PyObject *, PyObject *args) { long widget, i; if (!PyArg_ParseTuple(args, (char*)"ll:changeInterval", &widget, &i)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; changeInterval(widget, i); return Py_BuildValue((char*)"l", 1); } diff --git a/superkaramba/src/networksensor.cpp b/superkaramba/src/networksensor.cpp index 34cff5c6..85da95fd 100644 --- a/superkaramba/src/networksensor.cpp +++ b/superkaramba/src/networksensor.cpp @@ -25,7 +25,7 @@ NetworkSensor::NetworkSensor( TQString dev, int interval ):Sensor( interval ) u_int n = 0; size_t nlen = 0; nlen = sizeof(n); - sysctlbyname("net.link.generic.system.ifcount", &n, &nlen, NULL, 0); + sysctlbyname("net.link.generic.system.ifcount", &n, &nlen, nullptr, 0); size_t if_miblen = 0; if_miblen = sizeof(if_mib); @@ -47,7 +47,7 @@ NetworkSensor::NetworkSensor( TQString dev, int interval ):Sensor( interval ) for (int i = 1; i <= n; ++i) { name[4] = i; /* Get data for iface-number i */ - sysctl(name, 6, (void*)&if_mib, (size_t*)&if_miblen, (void*)NULL, (size_t)0); + sysctl(name, 6, (void*)&if_mib, (size_t*)&if_miblen, (void*)nullptr, (size_t)0); /* We found the right interface? */ if (TQString(if_mib.ifmd_name) == device) { @@ -86,7 +86,7 @@ void NetworkSensor::getInOutBytes ( unsigned long &in,unsigned long &out) const if_number, IFDATA_GENERAL }; - sysctl(name, 6, (void*)&if_mib, (size_t*)&if_miblen, (void*)NULL, (size_t)0); + sysctl(name, 6, (void*)&if_mib, (size_t*)&if_miblen, (void*)nullptr, (size_t)0); in = if_mib.ifmd_data.ifi_ibytes; out = if_mib.ifmd_data.ifi_obytes; diff --git a/superkaramba/src/richtextlabel_python.cpp b/superkaramba/src/richtextlabel_python.cpp index beadc81b..e47cedc8 100644 --- a/superkaramba/src/richtextlabel_python.cpp +++ b/superkaramba/src/richtextlabel_python.cpp @@ -39,9 +39,9 @@ PyObject* py_createRichText(PyObject *, PyObject *args) PyObject *text; if (!PyArg_ParseTuple(args, (char*)"lO|l:createRichText", &widget, &text, &underline)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; RichTextLabel *tmp = new RichTextLabel((karamba*)widget); tmp->setText(PyString2TQString(text), underline); tmp->setTextProps(((karamba*)widget)->getDefaultTextProps()); @@ -54,9 +54,9 @@ PyObject* py_deleteRichText(PyObject *, PyObject *args) { long widget, meter; if (!PyArg_ParseTuple(args, (char*)"ll:deleteRichText", &widget, &meter)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, "RichTextLabel")) - return NULL; + return nullptr; ((karamba*)widget)->deleteMeterFromSensors((Meter*)meter); ((karamba*)widget)->clickList->removeRef((Meter*)meter); @@ -125,9 +125,9 @@ PyObject* py_setRichTextFontSize(PyObject *, PyObject *args) long size; if (!PyArg_ParseTuple(args, (char*)"lll:changeRichTextSize", &widget, &textSensor, &size)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, textSensor, "RichTextLabel")) - return NULL; + return nullptr; ((RichTextLabel*)textSensor)->setFontSize( size ); return Py_BuildValue((char*)"l", 1); } @@ -136,9 +136,9 @@ PyObject* py_getRichTextFontSize(PyObject *, PyObject *args) { long widget, textSensor; if (!PyArg_ParseTuple(args, (char*)"ll:getRichTextSize", &widget, &textSensor)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, textSensor, "RichTextLabel")) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", ((RichTextLabel*)textSensor)->getFontSize()); } @@ -148,9 +148,9 @@ PyObject* py_setRichTextFont(PyObject *, PyObject *args) char* text; if (!PyArg_ParseTuple(args, (char*)"lls:changeRichTextFont", &widget, &textSensor, &text)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, textSensor, "RichTextLabel")) - return NULL; + return nullptr; ((RichTextLabel*)textSensor)->setFont( text ); return Py_BuildValue((char*)"l", 1); } @@ -159,9 +159,9 @@ PyObject* py_getRichTextFont(PyObject *, PyObject *args) { long widget, textSensor; if (!PyArg_ParseTuple(args, (char*)"ll:getRichTextFont", &widget, &textSensor)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, textSensor, "RichTextLabel")) - return NULL; + return nullptr; return Py_BuildValue((char*)"s", ((RichTextLabel*)textSensor)->getFont().ascii()); } @@ -170,9 +170,9 @@ PyObject* py_set_rich_text_width(PyObject*, PyObject* args) { long widget, text, size; if (!PyArg_ParseTuple(args, (char*)"lll:setRichTextWidth", &widget, &text, &size)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, text, "RichTextLabel")) - return NULL; + return nullptr; RichTextLabel* richText = (RichTextLabel*) text; diff --git a/superkaramba/src/sensor.cpp b/superkaramba/src/sensor.cpp index 86557549..2a88ea57 100644 --- a/superkaramba/src/sensor.cpp +++ b/superkaramba/src/sensor.cpp @@ -46,7 +46,7 @@ SensorParams* Sensor::hasMeter( Meter *meter ) } ++it; } - return NULL; + return nullptr; } void Sensor::deleteMeter( Meter *meter ) diff --git a/superkaramba/src/svcgrp_python.cpp b/superkaramba/src/svcgrp_python.cpp index 236d920e..e0ba6c67 100644 --- a/superkaramba/src/svcgrp_python.cpp +++ b/superkaramba/src/svcgrp_python.cpp @@ -29,20 +29,20 @@ static PyObject *get_svc_grp(KServiceGroup::Ptr const& g) //Avoid adding empty groups. KServiceGroup::Ptr subMenuRoot = KServiceGroup::group(g->relPath()); if (subMenuRoot->childCount() == 0) - return NULL; + return nullptr; // Ignore dotfiles. if ((g->name().at(0) == '.')) - return NULL; + return nullptr; PyObject *tuple = PyTuple_New(2); PyObject *dict = PyDict_New(); PyDict_SetItem(dict, PyBytes_FromString("caption"), PyBytes_FromString(g->caption().ascii())); - if (g->comment() != NULL) + if (g->comment() != nullptr) PyDict_SetItem(dict, PyBytes_FromString("comment"), PyBytes_FromString(g->comment().ascii())); - if (g->icon() != NULL) + if (g->icon() != nullptr) PyDict_SetItem(dict, PyBytes_FromString("icon"), PyBytes_FromString(g->icon().ascii())); PyDict_SetItem(dict, PyBytes_FromString("relpath"), @@ -60,31 +60,31 @@ static PyObject *get_svc(KService::Ptr const& g) PyObject *tuple = PyTuple_New(2); PyObject *dict = PyDict_New(); - if (g->exec() != NULL) + if (g->exec() != nullptr) PyDict_SetItem(dict, PyBytes_FromString("exec"), PyBytes_FromString(g->exec().ascii())); - if (g->menuId() != NULL) + if (g->menuId() != nullptr) PyDict_SetItem(dict, PyBytes_FromString("menuid"), PyBytes_FromString(g->menuId().ascii())); - if (g->name() != NULL) + if (g->name() != nullptr) PyDict_SetItem(dict, PyBytes_FromString("name"), PyBytes_FromString(g->name().ascii())); - if (g->path() != NULL) + if (g->path() != nullptr) PyDict_SetItem(dict, PyBytes_FromString("path"), PyBytes_FromString(g->path().ascii())); - if (g->icon() != NULL) + if (g->icon() != nullptr) PyDict_SetItem(dict, PyBytes_FromString("icon"), PyBytes_FromString(g->icon().ascii())); - if (g->library() != NULL) + if (g->library() != nullptr) PyDict_SetItem(dict, PyBytes_FromString("library"), PyBytes_FromString(g->library().ascii())); - if (g->comment() != NULL) + if (g->comment() != nullptr) PyDict_SetItem(dict, PyBytes_FromString("comment"), PyBytes_FromString(g->comment().ascii())); - if (g->type() != NULL) + if (g->type() != nullptr) PyDict_SetItem(dict, PyBytes_FromString("type"), PyBytes_FromString(g->type().ascii())); - if (g->genericName() != NULL) + if (g->genericName() != nullptr) PyDict_SetItem(dict, PyBytes_FromString("genericname"), PyBytes_FromString(g->genericName().ascii())); /* @@ -129,7 +129,7 @@ static PyObject *getServiceGroups(const char *rel_path) { KSycocaEntry * e = *it; - PyObject *tuple = NULL; + PyObject *tuple = nullptr; if (e->isType(KST_KServiceGroup)) { KServiceGroup::Ptr g(static_cast(e)); tuple = get_svc_grp(g); @@ -139,7 +139,7 @@ static PyObject *getServiceGroups(const char *rel_path) tuple = get_svc(g); } - if (tuple != NULL) + if (tuple) PyList_Append(list, tuple); } @@ -150,7 +150,7 @@ PyObject* py_get_service_groups(PyObject *, PyObject *args) { char *rel_path; if (!PyArg_ParseTuple(args, (char*)"s:getServiceGroup", &rel_path)) - return NULL; + return nullptr; return getServiceGroups(rel_path); } diff --git a/superkaramba/src/systray_python.cpp b/superkaramba/src/systray_python.cpp index e0d96a14..27aede9d 100644 --- a/superkaramba/src/systray_python.cpp +++ b/superkaramba/src/systray_python.cpp @@ -50,9 +50,9 @@ PyObject* py_move_systray(PyObject *, PyObject *args) { long widget, x, y, w, h; if (!PyArg_ParseTuple(args, (char*)"lllll:moveSystray", &widget, &x, &y, &w, &h)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", moveSystray(widget, x, y, w, h)); } @@ -72,9 +72,9 @@ PyObject* py_show_systray(PyObject *, PyObject *args) { long widget; if (!PyArg_ParseTuple(args, (char*)"l:showSystray", &widget)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", showSystray(widget)); } @@ -94,9 +94,9 @@ PyObject* py_hide_systray(PyObject *, PyObject *args) { long widget; if (!PyArg_ParseTuple(args, (char*)"l:hideSystray", &widget)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", hideSystray(widget)); } @@ -123,9 +123,9 @@ PyObject* py_create_systray(PyObject *, PyObject *args) { long widget, x, y, w, h; if (!PyArg_ParseTuple(args, (char*)"lllll:createSystray", &widget, &x, &y, &w, &h)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", createSystray(widget, x, y, w, h)); } @@ -148,9 +148,9 @@ PyObject* py_get_current_window_count(PyObject *, PyObject *args) { long widget; if (!PyArg_ParseTuple(args, (char*)"l:getCurrentWindowCount", &widget )) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", getCurrentWindowCount(widget)); } @@ -170,9 +170,9 @@ PyObject* py_update_systray_layout(PyObject *, PyObject *args) { long widget; if (!PyArg_ParseTuple(args, (char*)"l:updateSystrayLayout", &widget )) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", updateSystrayLayout(widget)); } @@ -192,7 +192,7 @@ PyObject* py_get_systray_size(PyObject*, PyObject* args) long widget; if (!PyArg_ParseTuple(args, "l:getSystraySize", &widget)) - return NULL; + return nullptr; return Py_BuildValue("l", getSystraySize(widget)); } diff --git a/superkaramba/src/task_python.cpp b/superkaramba/src/task_python.cpp index e8d1d3e1..4ba62070 100644 --- a/superkaramba/src/task_python.cpp +++ b/superkaramba/src/task_python.cpp @@ -368,8 +368,8 @@ PyObject* py_get_startup_list(PyObject *, PyObject *args) { long widget; if(!PyArg_ParseTuple(args, (char*)"l:getStartupList", &widget)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return getStartupList(widget); } diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp index 099cd15b..1f2f269c 100644 --- a/superkaramba/src/taskmanager.cpp +++ b/superkaramba/src/taskmanager.cpp @@ -49,7 +49,7 @@ template class TQPtrList; TWinModule* twin_module = 0; TaskManager::TaskManager(TQObject *parent, const char *name) - : TQObject(parent, name), _active(0), _startup_info( NULL ) + : TQObject(parent, name), _active(0), _startup_info( nullptr ) { twin_module = new TWinModule(); diff --git a/superkaramba/src/textlabel_python.cpp b/superkaramba/src/textlabel_python.cpp index 3cf6e3e4..b21707dc 100644 --- a/superkaramba/src/textlabel_python.cpp +++ b/superkaramba/src/textlabel_python.cpp @@ -38,9 +38,9 @@ PyObject* py_createText(PyObject *, PyObject *args) long widget, x, y, w, h; PyObject *text; if (!PyArg_ParseTuple(args, (char*)"lllllO:createText", &widget, &x, &y, &w, &h, &text)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; TextLabel *tmp = new TextLabel((karamba*)widget, (int)x, (int)y, (int)w, (int)h); tmp->setValue(PyString2TQString(text)); @@ -53,9 +53,9 @@ PyObject* py_deleteText(PyObject *, PyObject *args) { long widget, meter; if (!PyArg_ParseTuple(args, (char*)"ll:deleteText", &widget, &meter)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, meter, "TextLabel")) - return NULL; + return nullptr; ((karamba*)widget)->deleteMeterFromSensors((Meter*)meter); ((karamba*)widget)->clickList->removeRef((Meter*)meter); @@ -134,9 +134,9 @@ PyObject* py_setTextShadow(PyObject *, PyObject *args) long shadow; if (!PyArg_ParseTuple(args, (char*)"lll:changeTextShadow", &widget, &textSensor, &shadow)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, textSensor, "TextLabel")) - return NULL; + return nullptr; ((TextLabel*)textSensor)->setShadow( shadow ); return Py_BuildValue((char*)"l", 1); } @@ -145,9 +145,9 @@ PyObject* py_getTextShadow(PyObject *, PyObject *args) { long widget, textSensor; if (!PyArg_ParseTuple(args, (char*)"ll:getTextShadow", &widget, &textSensor)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, textSensor, "TextLabel")) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", ((TextLabel*)textSensor)->getShadow()); } @@ -157,9 +157,9 @@ PyObject* py_setTextFontSize(PyObject *, PyObject *args) long size; if (!PyArg_ParseTuple(args, (char*)"lll:changeTextSize", &widget, &textSensor, &size)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, textSensor, "TextLabel")) - return NULL; + return nullptr; ((TextLabel*)textSensor)->setFontSize( size ); return Py_BuildValue((char*)"l", 1); } @@ -168,9 +168,9 @@ PyObject* py_getTextFontSize(PyObject *, PyObject *args) { long widget, textSensor; if (!PyArg_ParseTuple(args, (char*)"ll:getTextSize", &widget, &textSensor)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, textSensor, "TextLabel")) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", ((TextLabel*)textSensor)->getFontSize()); } @@ -180,9 +180,9 @@ PyObject* py_setTextFont(PyObject *, PyObject *args) char* text; if (!PyArg_ParseTuple(args, (char*)"lls:changeTextFont", &widget, &textSensor, &text)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, textSensor, "TextLabel")) - return NULL; + return nullptr; ((TextLabel*)textSensor)->setFont( text ); return Py_BuildValue((char*)"l", 1); } @@ -191,9 +191,9 @@ PyObject* py_getTextFont(PyObject *, PyObject *args) { long widget, textSensor; if (!PyArg_ParseTuple(args, (char*)"ll:getTextFont", &widget, &textSensor)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, textSensor, "TextLabel")) - return NULL; + return nullptr; return Py_BuildValue((char*)"s", ((TextLabel*)textSensor)->getFont().ascii()); } @@ -203,9 +203,9 @@ PyObject* py_setTextAlign(PyObject *, PyObject *args) char* text; if (!PyArg_ParseTuple(args, (char*)"lls:changeTextFont", &widget, &textSensor, &text)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, textSensor, "TextLabel")) - return NULL; + return nullptr; ((TextLabel*)textSensor)->setAlignment( text ); return Py_BuildValue((char*)"l", 1); } @@ -214,9 +214,9 @@ PyObject* py_getTextAlign(PyObject *, PyObject *args) { long widget, textSensor; if (!PyArg_ParseTuple(args, (char*)"ll:getTextFont", &widget, &textSensor)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, textSensor, "TextLabel")) - return NULL; + return nullptr; return Py_BuildValue((char*)"s", ((TextLabel*)textSensor)->getAlignment().ascii()); } @@ -227,9 +227,9 @@ PyObject* py_setTextScroll(PyObject *, PyObject *args) int x=0, y=0, pause=0, gap=0; if (!PyArg_ParseTuple(args, (char*)"lls|llll:setScroll", &widget, &textSensor, &type, &x, &y, &gap, &pause)) - return NULL; + return nullptr; if (!checkKarambaAndMeter(widget, textSensor, "TextLabel")) - return NULL; + return nullptr; ((TextLabel*)textSensor)->setScroll(type, TQPoint(x,y), gap, pause); return Py_BuildValue((char*)"l", 1); } diff --git a/superkaramba/src/themelocale.cpp b/superkaramba/src/themelocale.cpp index 9f77c190..ca4ee1f3 100644 --- a/superkaramba/src/themelocale.cpp +++ b/superkaramba/src/themelocale.cpp @@ -224,15 +224,15 @@ char* tl_nl_find_msg (const struct sk_kde_loaded_l10nfile *domain_file, struct loaded_domain *domain; if (domain_file->decided == 0) - return NULL; + return nullptr; - if (domain_file->data == NULL) - return NULL; + if (!domain_file->data) + return nullptr; domain = (struct loaded_domain *) domain_file->data; /* Locate the MSGID and its translation. */ - if (domain->hash_size > 2 && domain->hash_tab != NULL) + if (domain->hash_size > 2 && domain->hash_tab) { /* Use the hashing table. */ nls_uint32 len = strlen (msgid); @@ -243,7 +243,7 @@ char* tl_nl_find_msg (const struct sk_kde_loaded_l10nfile *domain_file, if (nstr == 0) /* Hash table entry is empty. */ - return NULL; + return nullptr; if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len && strcmp (msgid, @@ -262,7 +262,7 @@ char* tl_nl_find_msg (const struct sk_kde_loaded_l10nfile *domain_file, nstr = W (domain->must_swap, domain->hash_tab[idx]); if (nstr == 0) /* Hash table entry is empty. */ - return NULL; + return nullptr; if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len && strcmp (msgid, @@ -297,7 +297,7 @@ char* tl_nl_find_msg (const struct sk_kde_loaded_l10nfile *domain_file, } /* If an translation is found return this. */ - return bottom >= top ? NULL : (char *) domain->data + return bottom >= top ? nullptr : (char *) domain->data + W (domain->must_swap, domain->trans_tab[act].offset); } @@ -337,13 +337,13 @@ void tl_nl_load_domain (TQIODevice* device, int size, struct loaded_domain *domain; domain_file->decided = 1; - domain_file->data = NULL; + domain_file->data = nullptr; /* If the record does not represent a valid locale the FILENAME might be NULL. This can happen when according to the given specification the locale file name is different for XPG and CEN syntax. */ - if (device == NULL) + if (!device) return; /* Try to open the addressed file. */ @@ -366,7 +366,7 @@ void tl_nl_load_domain (TQIODevice* device, int size, char *read_ptr; data = (struct mo_file_header *) malloc (size); - if (data == NULL) + if (!data) return; to_read = size; @@ -399,7 +399,7 @@ void tl_nl_load_domain (TQIODevice* device, int size, domain_file->data = (struct loaded_domain *) malloc (sizeof (struct loaded_domain)); - if (domain_file->data == NULL) + if (!domain_file->data) return; domain = (struct loaded_domain *) domain_file->data; @@ -426,7 +426,7 @@ void tl_nl_load_domain (TQIODevice* device, int size, /* This is an illegal revision. */ free (data); free (domain); - domain_file->data = NULL; + domain_file->data = nullptr; return; } } diff --git a/superkaramba/src/uptimesensor.cpp b/superkaramba/src/uptimesensor.cpp index 1dcc280a..a4a6c0b7 100644 --- a/superkaramba/src/uptimesensor.cpp +++ b/superkaramba/src/uptimesensor.cpp @@ -52,7 +52,7 @@ void UptimeSensor::update() mib[0] = CTL_KERN; mib[1] = KERN_BOOTTIME; size = sizeof(boottime); - if (sysctl(mib, 2, &boottime, &size, NULL, 0) != -1 && + if (sysctl(mib, 2, &boottime, &size, nullptr, 0) != -1 && boottime.tv_sec != 0) { uptime = now - boottime.tv_sec; if (uptime > 60) diff --git a/superkaramba/src/widget_python.cpp b/superkaramba/src/widget_python.cpp index 0948e391..328ddeaf 100644 --- a/superkaramba/src/widget_python.cpp +++ b/superkaramba/src/widget_python.cpp @@ -51,9 +51,9 @@ PyObject* py_get_widget_position(PyObject *, PyObject *args) { long widget; if(!PyArg_ParseTuple(args, (char*)"l:getWidgetPosition", &widget)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"(i,i)", getWidgetXCoordinate(widget), getWidgetYCoordinate(widget)); } @@ -91,9 +91,9 @@ PyObject* py_create_widget_mask(PyObject *, PyObject *args) long widget; char *text; if (!PyArg_ParseTuple(args, (char*)"ls:createWidgetMask", &widget, &text)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", createWidgetMask(widget, text)); } @@ -109,9 +109,9 @@ PyObject* py_redraw_widget_background(PyObject *, PyObject *args) { long widget; if (!PyArg_ParseTuple(args, (char*)"l:redrawWidgetBackground", &widget)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", redrawWidgetBackground(widget)); } @@ -127,9 +127,9 @@ PyObject* py_redraw_widget(PyObject *, PyObject *args) { long widget; if (!PyArg_ParseTuple(args, (char*)"l:redrawWidget", &widget)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", redrawWidget(widget)); } @@ -147,9 +147,9 @@ PyObject* py_resize_widget(PyObject *, PyObject *args) { long widget, x, y; if (!PyArg_ParseTuple(args, (char*)"lll:resizeWidget", &widget, &x, &y)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", resizeWidget(widget, x, y)); } @@ -165,9 +165,9 @@ PyObject* py_move_widget(PyObject *, PyObject *args) { long widget, x, y; if (!PyArg_ParseTuple(args, (char*)"lll:moveWidget", &widget, &x, &y)) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", moveWidget(widget, x, y)); } @@ -187,7 +187,7 @@ PyObject* py_set_widget_on_top(PyObject *, PyObject *args) long widget; long b; if (!PyArg_ParseTuple(args, (char*)"ll:setWidgetOnTop", &widget, &b )) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", widgetSetOnTop(widget, b)); } @@ -207,8 +207,8 @@ PyObject* py_toggle_widget_redraw(PyObject *, PyObject *args) long widget, b; if (!PyArg_ParseTuple(args, (char*)"ll:toggleWidgetRedraw", &widget, &b )) - return NULL; + return nullptr; if (!checkKaramba(widget)) - return NULL; + return nullptr; return Py_BuildValue((char*)"l", toggleWidgetRedraw(widget, b)); } -- cgit v1.2.3