From b3be81a83112516a54426888da9c1166193bfb4a Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sun, 8 Nov 2026 08:05:41 -0300 Subject: Replace zero pointer constants in resource backends MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- tderesources/birthdays/resourcetdeabc.cpp | 4 +- tderesources/birthdays/resourcetdeabcconfig.h | 2 +- tderesources/blogging/kcal_resourceblogging.cpp | 2 +- tderesources/blogging/xmlrpcjob.cpp | 2 +- tderesources/egroupware/debugdialog.cpp | 8 ++-- tderesources/egroupware/kcal_resourcexmlrpc.cpp | 16 ++++---- .../egroupware/kcal_resourcexmlrpcconfig.h | 2 +- tderesources/egroupware/knotes_resourcexmlrpc.cpp | 12 +++--- .../egroupware/knotes_resourcexmlrpcconfig.h | 2 +- tderesources/egroupware/tdeabc_resourcexmlrpc.cpp | 12 +++--- .../egroupware/tdeabc_resourcexmlrpcconfig.h | 2 +- tderesources/egroupware/xmlrpciface.h | 6 +-- tderesources/exchange/resourceexchange.cpp | 22 +++++------ tderesources/exchange/resourceexchangeconfig.h | 2 +- .../featureplan/kcal_resourcefeatureplanconfig.h | 2 +- tderesources/groupdav/groupdavglobals.cpp | 4 +- tderesources/groupware/kcal_resourcegroupware.cpp | 14 +++---- .../groupware/tdeabc_resourcegroupware.cpp | 14 +++---- tderesources/groupwise/kcal_resourcegroupwise.cpp | 20 +++++----- .../groupwise/kcal_resourcegroupwiseconfig.h | 2 +- .../groupwise/tdeabc_resourcegroupwise.cpp | 34 ++++++++--------- .../groupwise/tdeabc_resourcegroupwiseconfig.h | 2 +- tderesources/groupwise/tdeioslave/groupwise.cpp | 12 +++--- tderesources/kolab/kcal/event.cpp | 2 +- tderesources/kolab/kcal/event.h | 4 +- tderesources/kolab/kcal/incidence.cpp | 2 +- tderesources/kolab/kcal/journal.h | 2 +- tderesources/kolab/kcal/resourcekolab.cpp | 24 ++++++------ tderesources/kolab/kcal/resourcekolab_plugin.cpp | 2 +- tderesources/kolab/kcal/task.cpp | 2 +- tderesources/kolab/kcal/task.h | 4 +- tderesources/kolab/knotes/note.h | 2 +- tderesources/kolab/knotes/resourcekolab.cpp | 4 +- tderesources/kolab/knotes/resourcekolab_plugin.cpp | 2 +- tderesources/kolab/shared/kmailconnection.cpp | 10 ++--- tderesources/kolab/shared/resourcekolabbase.cpp | 2 +- tderesources/kolab/tdeabc/contact.cpp | 6 +-- tderesources/kolab/tdeabc/resourcekolab.cpp | 4 +- tderesources/kolab/tdeabc/resourcekolab_plugin.cpp | 2 +- tderesources/lib/folderconfig.cpp | 2 +- tderesources/lib/folderlister.cpp | 6 +-- tderesources/lib/folderlistview.h | 2 +- tderesources/lib/folderselectdialog.cpp | 2 +- tderesources/lib/groupwaredataadaptor.cpp | 8 ++-- tderesources/lib/groupwaredataadaptor.h | 14 +++---- tderesources/lib/groupwaredownloadjob.cpp | 18 ++++----- tderesources/lib/groupwareuploadjob.cpp | 16 ++++---- tderesources/lib/kcal_cachesettingsdlg.h | 2 +- tderesources/lib/kcal_resourcegroupwarebase.cpp | 20 +++++----- .../lib/kcal_resourcegroupwarebaseconfig.h | 2 +- tderesources/lib/tdeabc_resourcegroupwarebase.cpp | 12 +++--- .../lib/tdeabc_resourcegroupwarebaseconfig.h | 2 +- .../newexchange/exchangeaddressbookadaptor.cpp | 2 +- .../newexchange/exchangecalendaradaptor.cpp | 2 +- .../newexchange/exchangeconvertercalendar.cpp | 2 +- tderesources/remote/resourceremote.cpp | 18 ++++----- tderesources/remote/resourceremoteconfig.h | 2 +- tderesources/scalix/kcal/resourcescalix.cpp | 16 ++++---- tderesources/scalix/kcal/resourcescalix_plugin.cpp | 2 +- tderesources/scalix/knotes/resourcescalix.cpp | 4 +- .../scalix/knotes/resourcescalix_plugin.cpp | 2 +- tderesources/scalix/scalixadmin/delegatedialog.h | 2 +- tderesources/scalix/scalixadmin/delegatepage.cpp | 2 +- tderesources/scalix/scalixadmin/delegatepage.h | 2 +- tderesources/scalix/scalixadmin/delegateview.h | 2 +- tderesources/scalix/scalixadmin/ldapdialog.h | 2 +- tderesources/scalix/scalixadmin/ldapview.h | 2 +- tderesources/scalix/scalixadmin/main.cpp | 2 +- tderesources/scalix/scalixadmin/otheruserpage.cpp | 4 +- tderesources/scalix/scalixadmin/otheruserpage.h | 2 +- tderesources/scalix/scalixadmin/otheruserview.h | 2 +- tderesources/scalix/scalixadmin/outofofficepage.h | 2 +- tderesources/scalix/scalixadmin/passwordpage.cpp | 6 +-- tderesources/scalix/scalixadmin/passwordpage.h | 2 +- tderesources/scalix/scalixadmin/settings.cpp | 2 +- tderesources/scalix/shared/kmailconnection.cpp | 10 ++--- tderesources/scalix/shared/resourcescalixbase.cpp | 2 +- tderesources/scalix/tdeabc/contact.cpp | 2 +- tderesources/scalix/tdeabc/resourcescalix.cpp | 4 +- .../scalix/tdeabc/resourcescalix_plugin.cpp | 2 +- tderesources/scalix/tdeioslave/scalix.cpp | 8 ++-- tderesources/slox/kcalresourceslox.cpp | 44 +++++++++++----------- tderesources/slox/kcalresourcesloxconfig.cpp | 2 +- tderesources/slox/kcalresourcesloxconfig.h | 2 +- tderesources/slox/sloxaccounts.cpp | 6 +-- tderesources/slox/sloxfolder.cpp | 2 +- tderesources/slox/sloxfolderdialog.cpp | 2 +- tderesources/slox/sloxfolderdialog.h | 2 +- tderesources/slox/sloxfoldermanager.cpp | 6 +-- tderesources/slox/tdeabcresourceslox.cpp | 32 ++++++++-------- tderesources/slox/tdeabcresourcesloxconfig.cpp | 2 +- tderesources/slox/tdeabcresourcesloxconfig.h | 2 +- tderesources/tvanytime/kcal_resourcetvanytime.cpp | 20 +++++----- 93 files changed, 306 insertions(+), 306 deletions(-) diff --git a/tderesources/birthdays/resourcetdeabc.cpp b/tderesources/birthdays/resourcetdeabc.cpp index f7d6d7a32..5251f8d4c 100644 --- a/tderesources/birthdays/resourcetdeabc.cpp +++ b/tderesources/birthdays/resourcetdeabc.cpp @@ -80,7 +80,7 @@ ResourceTDEABC::ResourceTDEABC( const TDEConfig* config ) } ResourceTDEABC::ResourceTDEABC() - : ResourceCalendar( 0 ), mCalendar( TQString::fromLatin1( "UTC" ) ), + : ResourceCalendar( nullptr ), mCalendar( TQString::fromLatin1( "UTC" ) ), mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false ) { init(); @@ -99,7 +99,7 @@ void ResourceTDEABC::init() mLock = new TDEABC::LockNull( false ); - mAddressbook = 0; + mAddressbook = nullptr; } void ResourceTDEABC::readConfig( const TDEConfig *config ) diff --git a/tderesources/birthdays/resourcetdeabcconfig.h b/tderesources/birthdays/resourcetdeabcconfig.h index 88ade2687..5765efe79 100644 --- a/tderesources/birthdays/resourcetdeabcconfig.h +++ b/tderesources/birthdays/resourcetdeabcconfig.h @@ -43,7 +43,7 @@ class ResourceTDEABCConfig : public KRES::ConfigWidget TQ_OBJECT public: - ResourceTDEABCConfig( TQWidget* parent = 0, const char* name = 0 ); + ResourceTDEABCConfig( TQWidget* parent = nullptr, const char* name = nullptr ); public slots: virtual void loadSettings( KRES::Resource *resource); diff --git a/tderesources/blogging/kcal_resourceblogging.cpp b/tderesources/blogging/kcal_resourceblogging.cpp index 6f0b1d4bf..9146f3332 100644 --- a/tderesources/blogging/kcal_resourceblogging.cpp +++ b/tderesources/blogging/kcal_resourceblogging.cpp @@ -26,7 +26,7 @@ using namespace KCal; -KBlog::APIBlog *ResourceBlogging::mAPI = 0; +KBlog::APIBlog *ResourceBlogging::mAPI = nullptr; ResourceBlogging::ResourceBlogging() : ResourceGroupwareBase() diff --git a/tderesources/blogging/xmlrpcjob.cpp b/tderesources/blogging/xmlrpcjob.cpp index 70eb1d8cf..e4095ae5d 100644 --- a/tderesources/blogging/xmlrpcjob.cpp +++ b/tderesources/blogging/xmlrpcjob.cpp @@ -96,7 +96,7 @@ kdDebug()<<"XmlrpcJob::XmlrpcJob, method not empty."< #include "debugdialog.h" -DebugDialog* DebugDialog::mSelf = 0; +DebugDialog* DebugDialog::mSelf = nullptr; static KStaticDeleter debugDialogDeleter; DebugDialog::DebugDialog() - : KDialogBase( Plain, WStyle_DialogBorder | WStyle_StaysOnTop, 0, + : KDialogBase( Plain, WStyle_DialogBorder | WStyle_StaysOnTop, nullptr, "Debug Dialog", false, i18n("Debug Dialog"), User1 | User2 | Ok, Ok, true ) { @@ -52,7 +52,7 @@ DebugDialog::DebugDialog() void DebugDialog::init() { if ( !mSelf ) { - if ( getenv( "EGROUPWARE_DEBUG" ) != 0 ) { + if (getenv( "EGROUPWARE_DEBUG" )) { debugDialogDeleter.setObject( mSelf, new DebugDialog ); } } @@ -65,7 +65,7 @@ void DebugDialog::init() DebugDialog::~DebugDialog() { - mSelf = 0; + mSelf = nullptr; } void DebugDialog::addMessage( const TQString &msg, Type type ) diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.cpp b/tderesources/egroupware/kcal_resourcexmlrpc.cpp index 7e63ac420..c13751f44 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpc.cpp +++ b/tderesources/egroupware/kcal_resourcexmlrpc.cpp @@ -104,7 +104,7 @@ static int rights( Incidence *incidence ) } ResourceXMLRPC::ResourceXMLRPC( const TDEConfig* config ) - : ResourceCached( config ), mServer( 0 ), mLock( 0 ) + : ResourceCached( config ), mServer( nullptr ), mLock( nullptr ) { init(); @@ -120,7 +120,7 @@ ResourceXMLRPC::ResourceXMLRPC( const TDEConfig* config ) } ResourceXMLRPC::ResourceXMLRPC( ) - : ResourceCached( 0 ), mServer( 0 ), mLock( 0 ) + : ResourceCached( nullptr ), mServer( nullptr ), mLock( nullptr ) { init(); @@ -134,16 +134,16 @@ ResourceXMLRPC::~ResourceXMLRPC() disableChangeNotification(); delete mServer; - mServer = 0; + mServer = nullptr; delete mLock; - mLock = 0; + mLock = nullptr; delete mPrefs; - mPrefs = 0; + mPrefs = nullptr; delete mSynchronizer; - mSynchronizer = 0; + mSynchronizer = nullptr; } void ResourceXMLRPC::init() @@ -571,7 +571,7 @@ void ResourceXMLRPC::listEventsFinished( const TQValueList& list, readEvent( map, event, uid ); // do we already have this event? - Event *oldEvent = 0; + Event *oldEvent = nullptr; TQString localUid = idMapper().localId( uid ); if ( !localUid.isEmpty() ) oldEvent = mCalendar.event( localUid ); @@ -681,7 +681,7 @@ void ResourceXMLRPC::listTodosFinished( const TQValueList& list, readTodo( map, todo, uid ); // do we already have this todo? - Todo *oldTodo = 0; + Todo *oldTodo = nullptr; TQString localUid = idMapper().localId( uid ); if ( !localUid.isEmpty() ) oldTodo = mCalendar.todo( localUid ); diff --git a/tderesources/egroupware/kcal_resourcexmlrpcconfig.h b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h index 15aded2e7..88632b313 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpcconfig.h +++ b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h @@ -36,7 +36,7 @@ class TDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget public: - ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 ); + ResourceXMLRPCConfig( TQWidget* parent = nullptr, const char* name = nullptr ); public slots: void loadSettings( KRES::Resource* ); diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.cpp b/tderesources/egroupware/knotes_resourcexmlrpc.cpp index 80262ed72..01516457e 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpc.cpp +++ b/tderesources/egroupware/knotes_resourcexmlrpc.cpp @@ -51,7 +51,7 @@ static const TQString LoadNoteCategoriesCommand = "infolog.boinfolog.categories" ResourceXMLRPC::ResourceXMLRPC( const TDEConfig* config ) : ResourceNotes( config ), mCalendar( TQString::fromLatin1("UTC") ), - mServer( 0 ) + mServer( nullptr ) { init(); @@ -65,8 +65,8 @@ ResourceXMLRPC::ResourceXMLRPC( const TDEConfig* config ) } ResourceXMLRPC::ResourceXMLRPC( ) - : ResourceNotes( 0 ), mCalendar( TQString::fromLatin1("UTC") ), - mServer( 0 ) + : ResourceNotes( nullptr ), mCalendar( TQString::fromLatin1("UTC") ), + mServer( nullptr ) { init(); @@ -76,13 +76,13 @@ ResourceXMLRPC::ResourceXMLRPC( ) ResourceXMLRPC::~ResourceXMLRPC() { delete mServer; - mServer = 0; + mServer = nullptr; delete mPrefs; - mPrefs = 0; + mPrefs = nullptr; delete mSynchronizer; - mSynchronizer = 0; + mSynchronizer = nullptr; } void ResourceXMLRPC::init() diff --git a/tderesources/egroupware/knotes_resourcexmlrpcconfig.h b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h index 3693e67c0..5e7453090 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpcconfig.h +++ b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h @@ -36,7 +36,7 @@ class TDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget public: - ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 ); + ResourceXMLRPCConfig( TQWidget* parent = nullptr, const char* name = nullptr ); public slots: void loadSettings( KRES::Resource* ); diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp index 232eb94fd..8c121dbc7 100644 --- a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp +++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp @@ -58,7 +58,7 @@ static int rights( const TDEABC::Addressee &addr ) } ResourceXMLRPC::ResourceXMLRPC( const TDEConfig *config ) - : ResourceCached( config ), mServer( 0 ) + : ResourceCached( config ), mServer( nullptr ) { init(); @@ -75,7 +75,7 @@ ResourceXMLRPC::ResourceXMLRPC( const TDEConfig *config ) ResourceXMLRPC::ResourceXMLRPC( const TQString &url, const TQString &domain, const TQString &user, const TQString &password ) - : ResourceCached( 0 ), mServer( 0 ) + : ResourceCached( nullptr ), mServer( nullptr ) { init(); @@ -113,13 +113,13 @@ ResourceXMLRPC::~ResourceXMLRPC() saveCache(); delete mServer; - mServer = 0; + mServer = nullptr; delete mPrefs; - mPrefs = 0; + mPrefs = nullptr; delete mSynchronizer; - mSynchronizer = 0; + mSynchronizer = nullptr; } void ResourceXMLRPC::writeConfig( TDEConfig *config ) @@ -133,7 +133,7 @@ Ticket *ResourceXMLRPC::requestSaveTicket() { if ( !addressBook() ) { kdDebug(5700) << "no addressbook" << endl; - return 0; + return nullptr; } return createTicket( this ); diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h index 502f05979..c539259c7 100644 --- a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h +++ b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h @@ -35,7 +35,7 @@ class TDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget public: - ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 ); + ResourceXMLRPCConfig( TQWidget* parent = nullptr, const char* name = nullptr ); public slots: void loadSettings( KRES::Resource* ); diff --git a/tderesources/egroupware/xmlrpciface.h b/tderesources/egroupware/xmlrpciface.h index fb2f23df3..46f76d441 100644 --- a/tderesources/egroupware/xmlrpciface.h +++ b/tderesources/egroupware/xmlrpciface.h @@ -38,7 +38,7 @@ namespace KXMLRPC static Query *create( const TQVariant &id = TQVariant(), - TQObject *parent = 0, const char *name = 0 ); + TQObject *parent = nullptr, const char *name = nullptr ); public slots: void call( const TQString &server, const TQString &method, @@ -66,7 +66,7 @@ namespace KXMLRPC TQString marshal( const TQVariant &v ) const; TQVariant demarshal( const TQDomElement &e ) const; - Query( const TQVariant &id, TQObject *parent = 0, const char *name = 0 ); + Query( const TQVariant &id, TQObject *parent = nullptr, const char *name = nullptr ); ~Query(); TQByteArray m_buffer; @@ -81,7 +81,7 @@ namespace KXMLRPC public: Server( const KURL &url = KURL(), - TQObject *parent = 0, const char *name = 0 ); + TQObject *parent = nullptr, const char *name = nullptr ); ~Server(); const KURL &url() const { return m_url; } diff --git a/tderesources/exchange/resourceexchange.cpp b/tderesources/exchange/resourceexchange.cpp index c5ceaa445..24ded6359 100644 --- a/tderesources/exchange/resourceexchange.cpp +++ b/tderesources/exchange/resourceexchange.cpp @@ -73,8 +73,8 @@ public: }; ResourceExchange::ResourceExchange( const TDEConfig *config ) - : ResourceCalendar( config ), mClient(0), mMonitor(0), mCache(0), mDates(0), - mEventDates(0), mCacheDates(0) + : ResourceCalendar( config ), mClient(nullptr), mMonitor(nullptr), mCache(nullptr), mDates(nullptr), + mEventDates(nullptr), mCacheDates(nullptr) { mLock = new TDEABC::LockNull( true ); @@ -103,7 +103,7 @@ ResourceExchange::~ResourceExchange() close(); - delete mAccount; mAccount = 0; + delete mAccount; mAccount = nullptr; } void ResourceExchange::writeConfig( TDEConfig* config ) @@ -163,14 +163,14 @@ void ResourceExchange::doClose() // delete mNewestDate; // delete mOldestDate; - delete mDates; mDates = 0; + delete mDates; mDates = nullptr; // delete mMonitor; mMonitor = 0; - delete mClient; mClient = 0; - delete mEventDates; mEventDates = 0; - delete mCacheDates; mCacheDates = 0; + delete mClient; mClient = nullptr; + delete mEventDates; mEventDates = nullptr; + delete mCacheDates; mCacheDates = nullptr; if (mCache) { mCache->close(); - delete mCache; mCache = 0; + delete mCache; mCache = nullptr; } // setModified( false ); } @@ -308,7 +308,7 @@ Event *ResourceExchange::event( const TQString &uid ) kdDebug(5800) << "ResourceExchange::event(): " << uid << endl; // FIXME: Look in exchange server for uid! - Event *event = 0; + Event *event = nullptr; if ( mCache ) event = mCache->event( uid ); return event; @@ -394,7 +394,7 @@ Todo::List ResourceExchange::rawTodos( TodoSortField /*sortField*/, SortDirectio Todo *ResourceExchange::todo( const TQString &/*uid*/ ) { // We don't handle todos yet - return 0; + return nullptr; /* if ( !mCache ) return 0; else @@ -591,7 +591,7 @@ Journal::List ResourceExchange::journals(const TQDate &/*date*/) Journal *ResourceExchange::journal(const TQString &/*uid*/) { // We don't handle journals yet - return 0; + return nullptr; /* if( !mCache ) return 0; return mCache->journal( uid );*/ diff --git a/tderesources/exchange/resourceexchangeconfig.h b/tderesources/exchange/resourceexchangeconfig.h index f9332bad9..3a3bcb8af 100644 --- a/tderesources/exchange/resourceexchangeconfig.h +++ b/tderesources/exchange/resourceexchangeconfig.h @@ -40,7 +40,7 @@ class ResourceExchangeConfig : public KRES::ConfigWidget public: - ResourceExchangeConfig( TQWidget* parent = 0, const char* name = 0 ); + ResourceExchangeConfig( TQWidget* parent = nullptr, const char* name = nullptr ); public slots: virtual void loadSettings( KRES::Resource *resource); diff --git a/tderesources/featureplan/kcal_resourcefeatureplanconfig.h b/tderesources/featureplan/kcal_resourcefeatureplanconfig.h index 0bd6d4b94..772a06b42 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplanconfig.h +++ b/tderesources/featureplan/kcal_resourcefeatureplanconfig.h @@ -37,7 +37,7 @@ class TDE_EXPORT ResourceFeaturePlanConfig : public KRES::ConfigWidget public: - ResourceFeaturePlanConfig( TQWidget *parent = 0, const char *name = 0 ); + ResourceFeaturePlanConfig( TQWidget *parent = nullptr, const char *name = nullptr ); public slots: void loadSettings( KRES::Resource * ); diff --git a/tderesources/groupdav/groupdavglobals.cpp b/tderesources/groupdav/groupdavglobals.cpp index 43a7bb671..ba0e1fd5f 100644 --- a/tderesources/groupdav/groupdavglobals.cpp +++ b/tderesources/groupdav/groupdavglobals.cpp @@ -141,13 +141,13 @@ kdDebug()<<"GroupDavGlobals::createDownloadJob, url="<url() ); if ( adaptor ) { adaptor->adaptUploadUrl( url ); } - TDEIO::Job *delJob = 0; + TDEIO::Job *delJob = nullptr; if ( !url.isEmpty() ) { kdDebug(5700) << "Delete: " << url.url() << endl; delJob = TDEIO::file_delete( url, false ); diff --git a/tderesources/groupware/kcal_resourcegroupware.cpp b/tderesources/groupware/kcal_resourcegroupware.cpp index 56d61b52a..dc7052b10 100644 --- a/tderesources/groupware/kcal_resourcegroupware.cpp +++ b/tderesources/groupware/kcal_resourcegroupware.cpp @@ -74,13 +74,13 @@ ResourceGroupware::~ResourceGroupware() disableChangeNotification(); delete mPrefs; - mPrefs = 0; + mPrefs = nullptr; } void ResourceGroupware::init() { - mDownloadJob = 0; - mProgress = 0; + mDownloadJob = nullptr; + mProgress = nullptr; mIsShowingError = false; @@ -216,9 +216,9 @@ void ResourceGroupware::slotJobResult( TDEIO::Job *job ) emit resourceLoaded( this ); } - mDownloadJob = 0; + mDownloadJob = nullptr; if ( mProgress ) mProgress->setComplete(); - mProgress = 0; + mProgress = nullptr; } void ResourceGroupware::slotJobData( TDEIO::Job *, const TQByteArray &data ) @@ -296,9 +296,9 @@ TDEABC::Lock *ResourceGroupware::lock() void ResourceGroupware::cancelLoad() { if ( mDownloadJob ) mDownloadJob->kill(); - mDownloadJob = 0; + mDownloadJob = nullptr; if ( mProgress ) mProgress->setComplete(); - mProgress = 0; + mProgress = nullptr; } #include "kcal_resourcegroupware.moc" diff --git a/tderesources/groupware/tdeabc_resourcegroupware.cpp b/tderesources/groupware/tdeabc_resourcegroupware.cpp index b6b259115..a2cd44a5c 100644 --- a/tderesources/groupware/tdeabc_resourcegroupware.cpp +++ b/tderesources/groupware/tdeabc_resourcegroupware.cpp @@ -64,8 +64,8 @@ ResourceGroupware::ResourceGroupware( const KURL &url, void ResourceGroupware::init() { - mDownloadJob = 0; - mProgress = 0; + mDownloadJob = nullptr; + mProgress = nullptr; mPrefs = new GroupwarePrefs; @@ -75,7 +75,7 @@ void ResourceGroupware::init() ResourceGroupware::~ResourceGroupware() { delete mPrefs; - mPrefs = 0; + mPrefs = nullptr; } void ResourceGroupware::readConfig( const TDEConfig * ) @@ -336,9 +336,9 @@ void ResourceGroupware::slotJobResult( TDEIO::Job *job ) emit loadingFinished( this ); - mDownloadJob = 0; + mDownloadJob = nullptr; if ( mProgress ) mProgress->setComplete(); - mProgress = 0; + mProgress = nullptr; } void ResourceGroupware::slotJobData( TDEIO::Job *, const TQByteArray &data ) @@ -357,9 +357,9 @@ void ResourceGroupware::slotJobPercent( TDEIO::Job *, unsigned long percent ) void ResourceGroupware::cancelLoad() { if ( mDownloadJob ) mDownloadJob->kill(); - mDownloadJob = 0; + mDownloadJob = nullptr; if ( mProgress ) mProgress->setComplete(); - mProgress = 0; + mProgress = nullptr; } #include "tdeabc_resourcegroupware.moc" diff --git a/tderesources/groupwise/kcal_resourcegroupwise.cpp b/tderesources/groupwise/kcal_resourcegroupwise.cpp index b75492e14..a01e1d983 100644 --- a/tderesources/groupwise/kcal_resourcegroupwise.cpp +++ b/tderesources/groupwise/kcal_resourcegroupwise.cpp @@ -48,7 +48,7 @@ using namespace KCal; ResourceGroupwise::ResourceGroupwise() - : ResourceCached( 0 ), mLock( true ) + : ResourceCached( nullptr ), mLock( true ) { init(); @@ -70,13 +70,13 @@ ResourceGroupwise::~ResourceGroupwise() disableChangeNotification(); delete mPrefs; - mPrefs = 0; + mPrefs = nullptr; } void ResourceGroupwise::init() { - mDownloadJob = 0; - mProgress = 0; + mDownloadJob = nullptr; + mProgress = nullptr; mIsShowingError = false; @@ -215,9 +215,9 @@ void ResourceGroupwise::slotJobResult( TDEIO::Job *job ) emit resourceLoaded( this ); } - mDownloadJob = 0; + mDownloadJob = nullptr; if ( mProgress ) mProgress->setComplete(); - mProgress = 0; + mProgress = nullptr; } void ResourceGroupwise::slotJobData( TDEIO::Job *, const TQByteArray &data ) @@ -241,7 +241,7 @@ bool ResourceGroupwise::doSave() if ( !confirmSave() ) return false; GroupwiseServer server( mPrefs->url(), mPrefs->user(), mPrefs->password(), - 0 ); + nullptr ); if ( !server.login() ) { kdError() << "Unable to login to server" << endl; @@ -277,7 +277,7 @@ bool ResourceGroupwise::confirmSave() { if ( !hasChanges() ) return true; - ConfirmSaveDialog dlg( resourceName(), 0 ); + ConfirmSaveDialog dlg( resourceName(), nullptr ); dlg.addIncidences( addedIncidences(), i18n("Added") ); dlg.addIncidences( changedIncidences(), i18n("Changed") ); @@ -295,9 +295,9 @@ TDEABC::Lock *ResourceGroupwise::lock() void ResourceGroupwise::cancelLoad() { if ( mDownloadJob ) mDownloadJob->kill(); - mDownloadJob = 0; + mDownloadJob = nullptr; if ( mProgress ) mProgress->setComplete(); - mProgress = 0; + mProgress = nullptr; } bool ResourceGroupwise::userSettings( ngwt__Settings *&settings ) diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.h b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h index a955b0f33..9d519c89b 100644 --- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.h +++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h @@ -44,7 +44,7 @@ class TDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget TQ_OBJECT public: - ResourceGroupwiseConfig( TQWidget *parent = 0, const char *name = 0 ); + ResourceGroupwiseConfig( TQWidget *parent = nullptr, const char *name = nullptr ); public slots: virtual void loadSettings( KRES::Resource *resource ); diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.cpp b/tderesources/groupwise/tdeabc_resourcegroupwise.cpp index 04ecc769d..7915aa1e4 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwise.cpp +++ b/tderesources/groupwise/tdeabc_resourcegroupwise.cpp @@ -51,7 +51,7 @@ ResourceGroupwise::ResourceGroupwise( const KURL &url, const TQString &password, const TQStringList &readAddressBooks, const TQString &writeAddressBook ) - : ResourceCached( 0 ) + : ResourceCached( nullptr ) { init(); @@ -68,10 +68,10 @@ ResourceGroupwise::ResourceGroupwise( const KURL &url, void ResourceGroupwise::init() { - mJob = 0; - mProgress = 0; - mSABProgress = 0; - mUABProgress = 0; + mJob = nullptr; + mProgress = nullptr; + mSABProgress = nullptr; + mUABProgress = nullptr; mServerFirstSequence = 0; mServerLastSequence = 0; mServerLastPORebuildTime = 0; @@ -89,10 +89,10 @@ void ResourceGroupwise::initGroupwise() ResourceGroupwise::~ResourceGroupwise() { delete mServer; - mServer = 0; + mServer = nullptr; delete mPrefs; - mPrefs = 0; + mPrefs = nullptr; } void ResourceGroupwise::readConfig( const TDEConfig * ) @@ -203,7 +203,7 @@ Ticket *ResourceGroupwise::requestSaveTicket() { if ( !addressBook() ) { kdDebug(5700) << "no addressbook" << endl; - return 0; + return nullptr; } return createTicket( this ); @@ -389,7 +389,7 @@ void ResourceGroupwise::fetchSABResult( TDEIO::Job *job ) } mJob->disconnect( this ); - mJob = 0; + mJob = nullptr; mState = SABUptodate; if ( mSABProgress ) mSABProgress->setComplete(); @@ -412,7 +412,7 @@ void ResourceGroupwise::fetchUABResult( TDEIO::Job *job ) } mJob->disconnect( this ); - mJob = 0; + mJob = nullptr; mState = Uptodate; if ( mUABProgress ) mUABProgress->setComplete(); @@ -461,9 +461,9 @@ void ResourceGroupwise::updateSABResult( TDEIO::Job *job ) kdDebug() << "ResourceGroupwise::updateSABResult() " << endl; mSABProgress->setComplete(); - mSABProgress = 0; + mSABProgress = nullptr; mJob->disconnect( this ); - mJob = 0; + mJob = nullptr; int errorCode = job->error(); if ( errorCode != 0 ) { @@ -575,9 +575,9 @@ void ResourceGroupwise::loadCompleted() kdDebug() << "ResourceGroupwise::loadCompleted()" << endl; if ( mProgress ) mProgress->setComplete(); - mProgress = 0; - mSABProgress = 0; - mUABProgress = 0; + mProgress = nullptr; + mSABProgress = nullptr; + mUABProgress = nullptr; mState = Start; if ( appIsWhiteListedForSAB() ) saveCache(); @@ -599,9 +599,9 @@ void ResourceGroupwise::cancelLoad() mJob->disconnect( this ); mJob->kill(); } - mJob = 0; + mJob = nullptr; if ( mProgress ) mProgress->setComplete(); - mProgress = 0; + mProgress = nullptr; mState = Start; } diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h index 3ebdb52c1..f2f3b2623 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h +++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h @@ -42,7 +42,7 @@ class TDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget public: - ResourceGroupwiseConfig( TQWidget* parent = 0, const char* name = 0 ); + ResourceGroupwiseConfig( TQWidget* parent = nullptr, const char* name = nullptr ); public slots: void loadSettings( KRES::Resource* ); diff --git a/tderesources/groupwise/tdeioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp index 2f5f2045c..a3e7f4052 100644 --- a/tderesources/groupwise/tdeioslave/groupwise.cpp +++ b/tderesources/groupwise/tdeioslave/groupwise.cpp @@ -52,9 +52,9 @@ namespace TDEABC { class ResourceMemory : public ResourceCached { public: - ResourceMemory() : ResourceCached( 0 ) {} + ResourceMemory() : ResourceCached( nullptr ) {} - Ticket *requestSaveTicket() { return 0; } + Ticket *requestSaveTicket() { return nullptr; } bool load() { return true; } bool save( Ticket * ) { return true; } void releaseSaveTicket( Ticket * ) {} @@ -186,7 +186,7 @@ void Groupwise::getFreeBusy( const KURL &url ) if ( user.isEmpty() || pass.isEmpty() ) { errorMessage( i18n("Need username and password to read Free/Busy information.") ); } else { - GroupwiseServer server( u, user, pass, 0 ); + GroupwiseServer server( u, user, pass, nullptr ); // FIXME: Read range from configuration or URL parameters. TQDate start = TQDate::currentDate().addDays( -3 ); @@ -238,7 +238,7 @@ void Groupwise::getCalendar( const KURL &url ) debugMessage( "User: " + user ); debugMessage( "Password: " + pass ); - GroupwiseServer server( u, user, pass, 0 ); + GroupwiseServer server( u, user, pass, nullptr ); KCal::CalendarLocal calendar( TQString::fromLatin1("UTC")); @@ -292,7 +292,7 @@ void Groupwise::getAddressbook( const KURL &url ) debugMessage( "IDs: " + ids.join( "," ) ); - GroupwiseServer server( u, user, pass, 0 ); + GroupwiseServer server( u, user, pass, nullptr ); connect( &server, TQ_SIGNAL( readAddressBookTotalSize( int ) ), TQ_SLOT( slotReadAddressBookTotalSize( int ) ) ); @@ -367,7 +367,7 @@ void Groupwise::updateAddressbook( const KURL &url ) debugMessage( "update IDs: " + ids.join( "," ) ); - GroupwiseServer server( u, user, pass, 0 ); + GroupwiseServer server( u, user, pass, nullptr ); connect( &server, TQ_SIGNAL( errorMessage( const TQString &, bool ) ), TQ_SLOT( slotServerErrorMessage( const TQString &, bool ) ) ); connect( &server, TQ_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ), diff --git a/tderesources/kolab/kcal/event.cpp b/tderesources/kolab/kcal/event.cpp index 38b80a27c..39dd4e165 100644 --- a/tderesources/kolab/kcal/event.cpp +++ b/tderesources/kolab/kcal/event.cpp @@ -51,7 +51,7 @@ KCal::Event* Event::xmlToEvent( const TQString& xml, const TQString& tz, KCal::R TQString Event::eventToXML( KCal::Event* kcalEvent, const TQString& tz ) { - Event event( 0, TQString(), 0, tz, kcalEvent ); + Event event( nullptr, TQString(), 0, tz, kcalEvent ); return event.saveXML(); } diff --git a/tderesources/kolab/kcal/event.h b/tderesources/kolab/kcal/event.h index 57aa3358f..c68924b54 100644 --- a/tderesources/kolab/kcal/event.h +++ b/tderesources/kolab/kcal/event.h @@ -53,7 +53,7 @@ class Event : public Incidence { public: /// Use this to parse an xml string to a event entry /// The caller is responsible for deleting the returned event - static KCal::Event* xmlToEvent( const TQString& xml, const TQString& tz, KCal::ResourceKolab* res = 0, + static KCal::Event* xmlToEvent( const TQString& xml, const TQString& tz, KCal::ResourceKolab* res = nullptr, const TQString& subResource = TQString(), TQ_UINT32 sernum = 0 ); /// Use this to get an xml string describing this event entry @@ -61,7 +61,7 @@ public: /// Create a event object and explicit Event( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 sernum, - const TQString& tz, KCal::Event* event = 0 ); + const TQString& tz, KCal::Event* event = nullptr ); virtual ~Event(); void saveTo( KCal::Event* event ); diff --git a/tderesources/kolab/kcal/incidence.cpp b/tderesources/kolab/kcal/incidence.cpp index 68199ae47..3f2362a90 100644 --- a/tderesources/kolab/kcal/incidence.cpp +++ b/tderesources/kolab/kcal/incidence.cpp @@ -465,7 +465,7 @@ void Incidence::loadAlarms( const TQDomElement& element ) TQString tagName = e.tagName(); if ( tagName == "alarm" ) { - KCal::Alarm *a = new KCal::Alarm( 0 ); + KCal::Alarm *a = new KCal::Alarm( nullptr ); a->setEnabled( true ); // default to enabled, unless some XML attribute says otherwise. TQString type = e.attribute( "type" ); if ( type == "display" ) { diff --git a/tderesources/kolab/kcal/journal.h b/tderesources/kolab/kcal/journal.h index cd583c6ca..d81acd6b8 100644 --- a/tderesources/kolab/kcal/journal.h +++ b/tderesources/kolab/kcal/journal.h @@ -59,7 +59,7 @@ public: /// Use this to get an xml string describing this journal entry static TQString journalToXML( KCal::Journal*, const TQString& tz ); - explicit Journal( const TQString& tz, KCal::Journal* journal = 0 ); + explicit Journal( const TQString& tz, KCal::Journal* journal = nullptr ); virtual ~Journal(); virtual TQString type() const { return "Journal"; } diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp index 223bb98e1..3ee1e5264 100644 --- a/tderesources/kolab/kcal/resourcekolab.cpp +++ b/tderesources/kolab/kcal/resourcekolab.cpp @@ -70,7 +70,7 @@ static const char* incidenceInlineMimeType = "text/calendar"; ResourceKolab::ResourceKolab( const TDEConfig *config ) : ResourceCalendar( config ), ResourceKolabBase( "ResourceKolab-libkcal" ), - mCalendar( TQString::fromLatin1("UTC") ), mOpen( false ),mResourceChangedTimer( 0, + mCalendar( TQString::fromLatin1("UTC") ), mOpen( false ),mResourceChangedTimer( nullptr, "mResourceChangedTimer" ), mBatchAddingInProgress( false ) { if ( !config ) { @@ -391,9 +391,9 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subre } const TQString origUid = inc->uid(); Incidence* local = mCalendar.incidence( origUid ); - Incidence* localIncidence = 0; - Incidence* addedIncidence = 0; - Incidence* result = 0; + Incidence* localIncidence = nullptr; + Incidence* addedIncidence = nullptr; + Incidence* result = nullptr; if ( local ) { if ( *local == *inc ) { // real duplicate, remove the second one @@ -421,7 +421,7 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subre localIncidence = local; } else if ( result == inc ) { addedIncidence = inc; - } else if ( result == 0 ) { // take both + } else if (!result) { // take both addedIncidence = inc; addedIncidence->setSummary( i18n("Copy of: %1").arg( addedIncidence->summary() ) ); addedIncidence->setUid( CalFormat::createUniqueId() ); @@ -462,7 +462,7 @@ bool ResourceKolab::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const T TQ_UINT32 sernum ) { const TQString& type = incidencebase->type(); - const char* mimetype = 0; + const char* mimetype = nullptr; TQString data; bool isXMLStorageFormat = kmailStorageFormat( subresource ) == KMailICalIface::StorageXML; if ( type == "Event" ) { @@ -923,7 +923,7 @@ KCal::Alarm::List ResourceKolab::relevantAlarms( const KCal::Alarm::List &alarms const TQString &uid = a->parent()->uid(); if ( mUidMap.contains( uid ) ) { const TQString &sr = mUidMap[ uid ].resource(); - Kolab::SubResource *subResource = 0; + Kolab::SubResource *subResource = nullptr; if ( mEventSubResources.contains( sr ) ) subResource = &( mEventSubResources[ sr ] ); else if ( mTodoSubResources.contains( sr ) ) @@ -1058,8 +1058,8 @@ void ResourceKolab::fromKMailAddSubresource( const TQString& type, const TQString& label, bool writable, bool alarmRelevant ) { - ResourceMap* map = 0; - const char* mimetype = 0; + ResourceMap* map = nullptr; + const char* mimetype = nullptr; if ( type == kmailCalendarContentsType ) { map = &mEventSubResources; mimetype = eventAttachmentMimeType; @@ -1161,8 +1161,8 @@ bool ResourceKolab::subresourceActive( const TQString& subresource ) const void ResourceKolab::setSubresourceActive( const TQString &subresource, bool v ) { - ResourceMap *map = 0; - const char* mimeType = 0; + ResourceMap *map = nullptr; + const char* mimeType = nullptr; if ( mEventSubResources.contains( subresource ) ) { map = &mEventSubResources; mimeType = eventAttachmentMimeType; @@ -1226,7 +1226,7 @@ Kolab::ResourceMap* ResourceKolab::subResourceMap( const TQString& contentsType return &mJournalSubResources; } // Not ours - return 0; + return nullptr; } diff --git a/tderesources/kolab/kcal/resourcekolab_plugin.cpp b/tderesources/kolab/kcal/resourcekolab_plugin.cpp index 7b9e85d04..87489bc89 100644 --- a/tderesources/kolab/kcal/resourcekolab_plugin.cpp +++ b/tderesources/kolab/kcal/resourcekolab_plugin.cpp @@ -42,7 +42,7 @@ public: KRES::ConfigWidget *configWidget( TQWidget* ) { - return 0; + return nullptr; } }; diff --git a/tderesources/kolab/kcal/task.cpp b/tderesources/kolab/kcal/task.cpp index fe75845db..1c871bdb6 100644 --- a/tderesources/kolab/kcal/task.cpp +++ b/tderesources/kolab/kcal/task.cpp @@ -86,7 +86,7 @@ KCal::Todo* Task::xmlToTask( const TQString& xml, const TQString& tz, KCal::Reso TQString Task::taskToXML( KCal::Todo* todo, const TQString& tz ) { - Task task( 0, TQString(), 0, tz, todo ); + Task task( nullptr, TQString(), 0, tz, todo ); return task.saveXML(); } diff --git a/tderesources/kolab/kcal/task.h b/tderesources/kolab/kcal/task.h index 38a12a70e..8c87ef29d 100644 --- a/tderesources/kolab/kcal/task.h +++ b/tderesources/kolab/kcal/task.h @@ -57,14 +57,14 @@ class Task : public Incidence { public: /// Use this to parse an xml string to a task entry /// The caller is responsible for deleting the returned task - static KCal::Todo* xmlToTask( const TQString& xml, const TQString& tz, KCal::ResourceKolab *res = 0, + static KCal::Todo* xmlToTask( const TQString& xml, const TQString& tz, KCal::ResourceKolab *res = nullptr, const TQString& subResource = TQString(), TQ_UINT32 sernum = 0 ); /// Use this to get an xml string describing this task entry static TQString taskToXML( KCal::Todo*, const TQString& tz ); explicit Task( KCal::ResourceKolab *res, const TQString& subResource, TQ_UINT32 sernum, - const TQString& tz, KCal::Todo* todo = 0 ); + const TQString& tz, KCal::Todo* todo = nullptr ); virtual ~Task(); virtual TQString type() const { return "Task"; } diff --git a/tderesources/kolab/knotes/note.h b/tderesources/kolab/knotes/note.h index d61a2009e..ed50ede65 100644 --- a/tderesources/kolab/knotes/note.h +++ b/tderesources/kolab/knotes/note.h @@ -60,7 +60,7 @@ public: static TQString journalToXML( KCal::Journal* ); /// Create a note object and - explicit Note( KCal::Journal* journal = 0 ); + explicit Note( KCal::Journal* journal = nullptr ); virtual ~Note(); void saveTo( KCal::Journal* journal ); diff --git a/tderesources/kolab/knotes/resourcekolab.cpp b/tderesources/kolab/knotes/resourcekolab.cpp index 53f83c637..5c08acce2 100644 --- a/tderesources/kolab/knotes/resourcekolab.cpp +++ b/tderesources/kolab/knotes/resourcekolab.cpp @@ -166,7 +166,7 @@ bool ResourceKolab::addNote( KCal::Journal* journal ) KCal::Journal* ResourceKolab::addNote( const TQString& data, const TQString& subresource, TQ_UINT32 sernum, const TQString &mimetype ) { - KCal::Journal *journal = 0; + KCal::Journal *journal = nullptr; // FIXME: This does not take into account the time zone! KCal::ICalFormat formatter; @@ -188,7 +188,7 @@ KCal::Journal* ResourceKolab::addNote( const TQString& data, const TQString& sub if ( !addedOk ) { delete journal; - journal = 0; + journal = nullptr; } return journal; diff --git a/tderesources/kolab/knotes/resourcekolab_plugin.cpp b/tderesources/kolab/knotes/resourcekolab_plugin.cpp index 0cd126bd8..2758a69c9 100644 --- a/tderesources/kolab/knotes/resourcekolab_plugin.cpp +++ b/tderesources/kolab/knotes/resourcekolab_plugin.cpp @@ -42,7 +42,7 @@ public: KRES::ConfigWidget *configWidget( TQWidget* ) { - return 0; + return nullptr; } }; diff --git a/tderesources/kolab/shared/kmailconnection.cpp b/tderesources/kolab/shared/kmailconnection.cpp index 6b3a0a7de..f7a2490dc 100644 --- a/tderesources/kolab/shared/kmailconnection.cpp +++ b/tderesources/kolab/shared/kmailconnection.cpp @@ -48,7 +48,7 @@ using namespace Kolab; KMailConnection::KMailConnection( ResourceKolabBase* resource, const TQCString& objId ) - : DCOPObject( objId ), mResource( resource ), mKMailIcalIfaceStub( 0 ) + : DCOPObject( objId ), mResource( resource ), mKMailIcalIfaceStub( nullptr ) { // Make the connection to KMail ready mDCOPClient = new DCOPClient(); @@ -64,9 +64,9 @@ KMailConnection::~KMailConnection() { tdeApp->dcopClient()->setNotifications( false ); delete mKMailIcalIfaceStub; - mKMailIcalIfaceStub = 0; + mKMailIcalIfaceStub = nullptr; delete mDCOPClient; - mDCOPClient = 0; + mDCOPClient = nullptr; } static const TQCString dcopObjectId = "KMailICalIface"; @@ -131,7 +131,7 @@ bool KMailConnection::connectToKMail() kdError(5650) << "DCOP connection to asyncLoadResult failed" << endl; } - return ( mKMailIcalIfaceStub != 0 ); + return mKMailIcalIfaceStub != nullptr; } bool KMailConnection::fromKMailAddIncidence( const TQString& type, @@ -332,7 +332,7 @@ void KMailConnection::unregisteredFromDCOP( const TQCString& appId ) // Delete the stub so that the next time we need to talk to kmail, // we'll know that we need to start a new one. delete mKMailIcalIfaceStub; - mKMailIcalIfaceStub = 0; + mKMailIcalIfaceStub = nullptr; } } diff --git a/tderesources/kolab/shared/resourcekolabbase.cpp b/tderesources/kolab/shared/resourcekolabbase.cpp index 600c13931..fb62b3ccf 100644 --- a/tderesources/kolab/shared/resourcekolabbase.cpp +++ b/tderesources/kolab/shared/resourcekolabbase.cpp @@ -255,7 +255,7 @@ TQString ResourceKolabBase::findWritableResource( const ResourceType &type, break; } - KMessageBox::error( 0, errorText ); + KMessageBox::error( nullptr, errorText ); mErrorCode = NoWritableFound; return TQString(); } diff --git a/tderesources/kolab/tdeabc/contact.cpp b/tderesources/kolab/tdeabc/contact.cpp index b0138cdbf..f05b4af36 100644 --- a/tderesources/kolab/tdeabc/contact.cpp +++ b/tderesources/kolab/tdeabc/contact.cpp @@ -987,7 +987,7 @@ static const char* s_knownCustomFields[] = { "X-SpousesName", "X-Anniversary", "DistributionList", - 0 + nullptr }; // The saving is addressee -> Contact -> xml, this is the first part @@ -1268,7 +1268,7 @@ TQImage Contact::loadPictureFromAddressee( const TDEABC::Picture& picture ) TQImage img; if ( !picture.isIntern() && !picture.url().isEmpty() ) { TQString tmpFile; - if ( TDEIO::NetAccess::download( picture.url(), tmpFile, 0 /*no widget known*/ ) ) { + if ( TDEIO::NetAccess::download( picture.url(), tmpFile, nullptr /*no widget known*/ ) ) { img.load( tmpFile ); TDEIO::NetAccess::removeTempFile( tmpFile ); } @@ -1297,7 +1297,7 @@ TQByteArray Kolab::Contact::loadSoundFromAddressee( const TDEABC::Sound& sound ) TQByteArray data; if ( !sound.isIntern() && !sound.url().isEmpty() ) { TQString tmpFile; - if ( TDEIO::NetAccess::download( sound.url(), tmpFile, 0 /*no widget known*/ ) ) { + if ( TDEIO::NetAccess::download( sound.url(), tmpFile, nullptr /*no widget known*/ ) ) { TQFile f( tmpFile ); if ( f.open( IO_ReadOnly ) ) { data = f.readAll(); diff --git a/tderesources/kolab/tdeabc/resourcekolab.cpp b/tderesources/kolab/tdeabc/resourcekolab.cpp index 85fc65652..485496d85 100644 --- a/tderesources/kolab/tdeabc/resourcekolab.cpp +++ b/tderesources/kolab/tdeabc/resourcekolab.cpp @@ -65,7 +65,7 @@ class KolabFactory : public KRES::PluginFactoryBase KRES::ConfigWidget *configWidget( TQWidget* ) { - return 0; + return nullptr; } }; @@ -134,7 +134,7 @@ TDEABC::Ticket * TDEABC::ResourceKolab::requestSaveTicket() { if ( !addressBook() ) { kdError() << "no addressbook" << endl; - return 0; + return nullptr; } mLocked = true; diff --git a/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp b/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp index 67f2408b1..8c4f0e0b5 100644 --- a/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp +++ b/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp @@ -44,7 +44,7 @@ class KolabFactory : public KRES::PluginFactoryBase KRES::ConfigWidget *configWidget( TQWidget* ) { - return 0; + return nullptr; } }; diff --git a/tderesources/lib/folderconfig.cpp b/tderesources/lib/folderconfig.cpp index facdf13be..3fc87aef5 100644 --- a/tderesources/lib/folderconfig.cpp +++ b/tderesources/lib/folderconfig.cpp @@ -42,7 +42,7 @@ using namespace KPIM; FolderConfig::FolderConfig( TQWidget *parent ) - : TQWidget( parent ), mFolderLister( 0 ) + : TQWidget( parent ), mFolderLister( nullptr ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->addSpacing( KDialog::spacingHint() ); diff --git a/tderesources/lib/folderlister.cpp b/tderesources/lib/folderlister.cpp index a455774cb..76d19c77a 100644 --- a/tderesources/lib/folderlister.cpp +++ b/tderesources/lib/folderlister.cpp @@ -34,7 +34,7 @@ using namespace KPIM; FolderLister::FolderLister( Type type ) - : mType( type ), mAdaptor( 0 ) + : mType( type ), mAdaptor( nullptr ) { } @@ -213,7 +213,7 @@ void FolderLister::writeConfig( GroupwarePrefsBase *newprefs ) void FolderLister::setAdaptor( KPIM::GroupwareDataAdaptor *adaptor ) { if ( mAdaptor ) { - disconnect( mAdaptor, 0, this, 0 ); + disconnect( mAdaptor, nullptr, this, nullptr ); } mAdaptor = adaptor; connect( mAdaptor, TQ_SIGNAL( folderInfoRetrieved( const KURL &, @@ -365,7 +365,7 @@ TDEIO::Job *FolderLister::createListFoldersJob( const KURL &url ) // TODO: Error handling should show a message to the user! kdError() << "The FolderLister does not have a GroupwareDataAdaptor, so " "it cannot create the job for the folder list!" << endl; - return 0; + return nullptr; } } diff --git a/tderesources/lib/folderlistview.h b/tderesources/lib/folderlistview.h index a54ffd565..c0072f584 100644 --- a/tderesources/lib/folderlistview.h +++ b/tderesources/lib/folderlistview.h @@ -84,7 +84,7 @@ class FolderListItem : public TQCheckListItem public: FolderListItem( FolderListItem *parent, const KPIM::FolderLister::Entry &folder ) : TQCheckListItem( parent, folder.name, TQCheckListItem::CheckBoxController ), - mFolder( folder ), mFolderListView( parent?(parent->folderListView()):0 ) + mFolder( folder ), mFolderListView( parent?(parent->folderListView()):nullptr ) { setOn( mFolder.active ); } diff --git a/tderesources/lib/folderselectdialog.cpp b/tderesources/lib/folderselectdialog.cpp index 7ffd3e38e..5df06a00b 100644 --- a/tderesources/lib/folderselectdialog.cpp +++ b/tderesources/lib/folderselectdialog.cpp @@ -39,7 +39,7 @@ using namespace KPIM; FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString& label, const TQStringList& list ) - : KDialogBase(0, 0, true, caption, Ok|Cancel, Ok, true) + : KDialogBase(nullptr, nullptr, true, caption, Ok|Cancel, Ok, true) { TQFrame* frame = makeMainWidget(); TQVBoxLayout* layout = new TQVBoxLayout( frame, 0, spacingHint() ); diff --git a/tderesources/lib/groupwaredataadaptor.cpp b/tderesources/lib/groupwaredataadaptor.cpp index e46653153..c914497b6 100644 --- a/tderesources/lib/groupwaredataadaptor.cpp +++ b/tderesources/lib/groupwaredataadaptor.cpp @@ -53,7 +53,7 @@ TDEIO::TransferJob *GroupwareUploadItem::createRawUploadJob( GroupwareDataAdaptor *adaptor, const KURL &/*baseurl*/ ) { Q_ASSERT( adaptor ); - if ( !adaptor ) return 0; + if ( !adaptor ) return nullptr; const TQString dta = data(); //kdDebug(7000) << "Uploading: " << data << endl; KURL upUrl( url() ); @@ -110,7 +110,7 @@ TDEIO::TransferJob *GroupwareUploadItem::createUploadJob( GroupwareDataAdaptor::GroupwareDataAdaptor() - : TQObject(), mFolderLister( 0 ), mIdMapper( 0 ) + : TQObject(), mFolderLister( nullptr ), mIdMapper( nullptr ) { } @@ -138,7 +138,7 @@ TDEIO::TransferJob *GroupwareDataAdaptor::createUploadJob( const KURL &url, TDEIO::TransferJob *job = item->createUploadJob( this, url ); setUidForJob( job, item->uid() ); return job; - } else return 0; + } else return nullptr; } TDEIO::TransferJob *GroupwareDataAdaptor::createUploadNewJob( const KURL &url, @@ -149,7 +149,7 @@ TDEIO::TransferJob *GroupwareDataAdaptor::createUploadNewJob( const KURL &url, TDEIO::TransferJob *job = item->createUploadNewJob( this, url ); setUidForJob( job, item->uid() ); return job; - } else return 0; + } else return nullptr; } void GroupwareDataAdaptor::processDownloadListItem( const KURL &entry, diff --git a/tderesources/lib/groupwaredataadaptor.h b/tderesources/lib/groupwaredataadaptor.h index 51def5c74..201eccf6f 100644 --- a/tderesources/lib/groupwaredataadaptor.h +++ b/tderesources/lib/groupwaredataadaptor.h @@ -250,12 +250,12 @@ TQ_OBJECT * called if the GroupwareDataAdaptor::GWResNeedsLogin flag is set * for the resource. */ virtual TDEIO::Job *createLoginJob( const KURL &, const TQString &/*user*/, - const TQString &/*password*/ ) { return 0; } + const TQString &/*password*/ ) { return nullptr; } /** Creates the TDEIO::Job for logging off the server. This is only * called if the GroupwareDataAdaptor::GWResNeedsLogoff flag is set * for the resource. */ virtual TDEIO::Job *createLogoffJob( const KURL &, const TQString &/*user*/, - const TQString &/*password*/ ) { return 0; } + const TQString &/*password*/ ) { return nullptr; } /** Creates the TDEIO::Job for listing all subfolders of the given url. */ virtual TDEIO::Job *createListFoldersJob ( const KURL & ) = 0; /** Creates the TDEIO::TransferJob for listing all items in the given url. */ @@ -264,25 +264,25 @@ TQ_OBJECT virtual TDEIO::TransferJob *createDownloadJob( const KURL &, FolderLister::ContentType ) = 0; /** Creates the TDEIO::TransferJob for downloading a list of items items. */ - virtual TDEIO::TransferJob *createDownloadJob( const TQMap & ) { return 0; } + virtual TDEIO::TransferJob *createDownloadJob( const TQMap & ) { return nullptr; } /** Create the job to remove the deletedItems from the server. The base URL of the server is passed as uploadurl. */ virtual TDEIO::Job *createRemoveJob( const KURL &, - const KPIM::GroupwareUploadItem::List &/*deletedItems*/ ) { return 0; } + const KPIM::GroupwareUploadItem::List &/*deletedItems*/ ) { return nullptr; } /** Create the job to remove the item from the server. The base URL of the server is passed as uploadurl. */ virtual TDEIO::Job *createRemoveJob( const KURL &, - KPIM::GroupwareUploadItem */*deletedItem*/ ) { return 0; } + KPIM::GroupwareUploadItem */*deletedItem*/ ) { return nullptr; } /** Create the job to change the item on the server (at the given URL) */ virtual TDEIO::TransferJob *createUploadJob( const KURL &, GroupwareUploadItem *item ); /** Create the job to change the items on the server (at the given URL) */ - virtual TDEIO::TransferJob *createUploadJob( const KURL &, const GroupwareUploadItem::List &/*items*/ ) { return 0; } + virtual TDEIO::TransferJob *createUploadJob( const KURL &, const GroupwareUploadItem::List &/*items*/ ) { return nullptr; } /** Create the job to add the item to the server (at the given baseURL) */ virtual TDEIO::TransferJob *createUploadNewJob( const KURL &, GroupwareUploadItem *item ); /** Create the job to add the items to the server (at the given baseURL) */ - virtual TDEIO::TransferJob *createUploadNewJob( const KURL &, const GroupwareUploadItem::List &/*items*/ ) { return 0; } + virtual TDEIO::TransferJob *createUploadNewJob( const KURL &, const GroupwareUploadItem::List &/*items*/ ) { return nullptr; } // Interpreting the result of the jobs diff --git a/tderesources/lib/groupwaredownloadjob.cpp b/tderesources/lib/groupwaredownloadjob.cpp index 1381b9293..fd9449f83 100644 --- a/tderesources/lib/groupwaredownloadjob.cpp +++ b/tderesources/lib/groupwaredownloadjob.cpp @@ -36,8 +36,8 @@ using namespace KPIM; GroupwareDownloadJob::GroupwareDownloadJob( GroupwareDataAdaptor *adaptor ) - : GroupwareJob( adaptor ), mProgress(0), - mDownloadJob(0), mListEventsJob(0) + : GroupwareJob( adaptor ), mProgress(nullptr), + mDownloadJob(nullptr), mListEventsJob(nullptr) { } @@ -128,7 +128,7 @@ void GroupwareDownloadJob::slotListItemsResult( TDEIO::Job *job ) if ( job->error() ) { if ( mProgress ) { mProgress->setComplete(); - mProgress = 0; + mProgress = nullptr; } error( job->errorString() ); } else { @@ -136,7 +136,7 @@ void GroupwareDownloadJob::slotListItemsResult( TDEIO::Job *job ) } mListItemsData = TQString(); - mListEventsJob = 0; + mListEventsJob = nullptr; listItems(); } @@ -166,7 +166,7 @@ void GroupwareDownloadJob::downloadItem() mItemsDownloaded.clear(); mItemsDownloadError.clear(); - mProgress = 0; + mProgress = nullptr; success(); } else { if ( adaptor()->flags() & KPIM::GroupwareDataAdaptor::GWResBatchRequest ) { @@ -212,7 +212,7 @@ void GroupwareDownloadJob::slotDownloadItemResult( TDEIO::Job *job ) mProgress->updateProgress(); } mDownloadItemsData = TQString(); - mDownloadJob = 0; + mDownloadJob = nullptr; downloadItem(); } @@ -288,13 +288,13 @@ void GroupwareDownloadJob::kill() void GroupwareDownloadJob::cancelLoad() { if ( mDownloadJob ) mDownloadJob->kill(); - mDownloadJob = 0; + mDownloadJob = nullptr; if ( mListEventsJob ) mListEventsJob->kill(); - mListEventsJob = 0; + mListEventsJob = nullptr; if ( mProgress ) mProgress->setComplete(); - mProgress = 0; + mProgress = nullptr; } #include "groupwaredownloadjob.moc" diff --git a/tderesources/lib/groupwareuploadjob.cpp b/tderesources/lib/groupwareuploadjob.cpp index 4c0f1ba2b..7046749ea 100644 --- a/tderesources/lib/groupwareuploadjob.cpp +++ b/tderesources/lib/groupwareuploadjob.cpp @@ -40,8 +40,8 @@ using namespace KPIM; GroupwareUploadJob::GroupwareUploadJob( GroupwareDataAdaptor *adaptor ) - : GroupwareJob( adaptor ), mUploadJob(0), - mDeletionJob(0), mUploadProgress(0) + : GroupwareJob( adaptor ), mUploadJob(nullptr), + mDeletionJob(nullptr), mUploadProgress(nullptr) { } @@ -128,7 +128,7 @@ void GroupwareUploadJob::slotDeletionJobResult( TDEIO::Job *job ) if ( job && adaptor() ) { adaptor()->interpretRemoveJob( job, mDeletionJobData ); } - mDeletionJob = 0; + mDeletionJob = nullptr; TQTimer::singleShot( 0, this, TQ_SLOT( deleteItem() ) ); } @@ -184,7 +184,7 @@ void GroupwareUploadJob::slotUploadJobResult( TDEIO::Job *job ) if ( job && adaptor() ) { adaptor()->interpretUploadJob( job, mUploadJobData ); } - mUploadJob = 0; + mUploadJob = nullptr; TQTimer::singleShot( 0, this, TQ_SLOT( uploadItem() ) ); } @@ -245,7 +245,7 @@ void GroupwareUploadJob::slotUploadNewJobResult( TDEIO::Job *job ) if ( job && adaptor() ) { adaptor()->interpretUploadNewJob( job, mUploadNewJobData ); } - mUploadJob = 0; + mUploadJob = nullptr; TQTimer::singleShot( 0, this, TQ_SLOT( uploadNewItem() ) ); } @@ -449,9 +449,9 @@ kdDebug()<<"Found it in the list!"<kill(); - mUploadJob = 0; + mUploadJob = nullptr; if ( mUploadProgress ) mUploadProgress->setComplete(); - mUploadProgress = 0; + mUploadProgress = nullptr; } void GroupwareUploadJob::uploadCompleted() @@ -477,7 +477,7 @@ void GroupwareUploadJob::uploadCompleted() if ( mUploadProgress ) { mUploadProgress->setComplete(); - mUploadProgress = 0; + mUploadProgress = nullptr; } success(); diff --git a/tderesources/lib/kcal_cachesettingsdlg.h b/tderesources/lib/kcal_cachesettingsdlg.h index 13510782b..beb047bdf 100644 --- a/tderesources/lib/kcal_cachesettingsdlg.h +++ b/tderesources/lib/kcal_cachesettingsdlg.h @@ -44,7 +44,7 @@ class TDE_EXPORT CacheSettingsDialog : public KDialogBase TQ_OBJECT public: - CacheSettingsDialog( TQWidget *parent = 0, const char *name = 0 ); + CacheSettingsDialog( TQWidget *parent = nullptr, const char *name = nullptr ); public slots: virtual void loadSettings( KRES::Resource *resource ); diff --git a/tderesources/lib/kcal_resourcegroupwarebase.cpp b/tderesources/lib/kcal_resourcegroupwarebase.cpp index 1710a11ed..0464c0591 100644 --- a/tderesources/lib/kcal_resourcegroupwarebase.cpp +++ b/tderesources/lib/kcal_resourcegroupwarebase.cpp @@ -39,14 +39,14 @@ using namespace KCal; ResourceGroupwareBase::ResourceGroupwareBase() - : ResourceCached( 0 ), mPrefs(0), mFolderLister(0), - mLock( true ), mAdaptor(0), mDownloadJob(0), mUploadJob(0) + : ResourceCached( nullptr ), mPrefs(nullptr), mFolderLister(nullptr), + mLock( true ), mAdaptor(nullptr), mDownloadJob(nullptr), mUploadJob(nullptr) { } ResourceGroupwareBase::ResourceGroupwareBase( const TDEConfig *config ) - : ResourceCached( config ), mPrefs(0), mFolderLister(0), - mLock( true ), mAdaptor(0), mDownloadJob(0), mUploadJob(0) + : ResourceCached( config ), mPrefs(nullptr), mFolderLister(nullptr), + mLock( true ), mAdaptor(nullptr), mDownloadJob(nullptr), mUploadJob(nullptr) { if ( config ) readConfig( config ); } @@ -56,7 +56,7 @@ ResourceGroupwareBase::~ResourceGroupwareBase() disableChangeNotification(); delete mPrefs; - mPrefs = 0; + mPrefs = nullptr; } KPIM::GroupwarePrefsBase *ResourceGroupwareBase::createPrefs() @@ -149,7 +149,7 @@ void ResourceGroupwareBase::setAdaptor( CalendarAdaptor *adaptor ) void ResourceGroupwareBase::init() { - mDownloadJob = 0; + mDownloadJob = nullptr; mIsShowingError = false; enableChangeNotification(); @@ -216,7 +216,7 @@ void tqt_leave_modal( TQWidget *widget ); void ResourceGroupwareBase::enter_loop() { - TQWidget dummy(0,0,WType_Dialog | WShowModal); + TQWidget dummy(nullptr,nullptr,WType_Dialog | WShowModal); dummy.setFocusPolicy( TQWidget::NoFocus ); tqt_enter_modal(&dummy); tqApp->enter_loop(); @@ -301,7 +301,7 @@ void ResourceGroupwareBase::slotDownloadJobResult( KPIM::GroupwareJob *job ) emit resourceLoaded( this ); } - mDownloadJob = 0; + mDownloadJob = nullptr; } bool ResourceGroupwareBase::doSave() @@ -384,7 +384,7 @@ void ResourceGroupwareBase::slotUploadJobResult( KPIM::GroupwareJob *job ) } } - mDownloadJob = 0; + mDownloadJob = nullptr; } // FIXME: Put this into ResourceCached @@ -392,7 +392,7 @@ bool ResourceGroupwareBase::confirmSave() { if ( !hasChanges() ) return true; - ConfirmSaveDialog dlg( resourceName(), 0 ); + ConfirmSaveDialog dlg( resourceName(), nullptr ); dlg.addIncidences( addedIncidences(), i18n("Added") ); dlg.addIncidences( changedIncidences(), i18n("Changed") ); diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h index 23ffef60b..4aee5c00c 100644 --- a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h +++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h @@ -49,7 +49,7 @@ class TDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget TQ_OBJECT public: - ResourceGroupwareBaseConfig( TQWidget *parent = 0, const char *name = 0 ); + ResourceGroupwareBaseConfig( TQWidget *parent = nullptr, const char *name = nullptr ); public slots: virtual void loadSettings( KRES::Resource *resource ); diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.cpp b/tderesources/lib/tdeabc_resourcegroupwarebase.cpp index cf73e03ac..f1a8a37dc 100644 --- a/tderesources/lib/tdeabc_resourcegroupwarebase.cpp +++ b/tderesources/lib/tdeabc_resourcegroupwarebase.cpp @@ -36,7 +36,7 @@ using namespace TDEABC; ResourceGroupwareBase::ResourceGroupwareBase( const TDEConfig *config ) : ResourceCached( config ), - mPrefs(0), mFolderLister(0), mAdaptor(0), mDownloadJob(0), mUploadJob(0) + mPrefs(nullptr), mFolderLister(nullptr), mAdaptor(nullptr), mDownloadJob(nullptr), mUploadJob(nullptr) { if ( config ) readConfig( config ); } @@ -44,7 +44,7 @@ ResourceGroupwareBase::ResourceGroupwareBase( const TDEConfig *config ) ResourceGroupwareBase::~ResourceGroupwareBase() { delete mPrefs; - mPrefs = 0; + mPrefs = nullptr; } KPIM::GroupwareDownloadJob *ResourceGroupwareBase::createDownloadJob( @@ -102,7 +102,7 @@ void ResourceGroupwareBase::setAdaptor( AddressBookAdaptor *adaptor ) void ResourceGroupwareBase::init() { - mDownloadJob = 0; + mDownloadJob = nullptr; } KPIM::GroupwarePrefsBase *ResourceGroupwareBase::createPrefs() @@ -138,7 +138,7 @@ Ticket *ResourceGroupwareBase::requestSaveTicket() { if ( !addressBook() ) { kdDebug(5700) << "no addressbook" << endl; - return 0; + return nullptr; } return createTicket( this ); @@ -195,7 +195,7 @@ void ResourceGroupwareBase::slotDownloadJobResult( KPIM::GroupwareJob *job ) addressBook()->emitAddressBookChanged(); } - mDownloadJob = 0; + mDownloadJob = nullptr; } bool ResourceGroupwareBase::save( Ticket *ticket ) @@ -255,7 +255,7 @@ void ResourceGroupwareBase::slotUploadJobResult( KPIM::GroupwareJob *job ) // FIXME } - mUploadJob = 0; + mUploadJob = nullptr; } diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h index b7cb3a3ee..d84fe2a33 100644 --- a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h +++ b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h @@ -42,7 +42,7 @@ class TDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget public: - ResourceGroupwareBaseConfig( TQWidget* parent = 0, const char* name = 0 ); + ResourceGroupwareBaseConfig( TQWidget* parent = nullptr, const char* name = nullptr ); public slots: void loadSettings( KRES::Resource* ); diff --git a/tderesources/newexchange/exchangeaddressbookadaptor.cpp b/tderesources/newexchange/exchangeaddressbookadaptor.cpp index 7b061e868..c565989b2 100644 --- a/tderesources/newexchange/exchangeaddressbookadaptor.cpp +++ b/tderesources/newexchange/exchangeaddressbookadaptor.cpp @@ -47,7 +47,7 @@ TDEIO::TransferJob *ExchangeAddressBookUploadItem::createUploadJob( KPIM::Groupw { kdDebug()<<"ExchangeAddressBookUploadItem::createUploadJob"<adaptUploadUrl( upUrl ); kdDebug() << "Uploading to: " << upUrl.prettyURL() << endl; diff --git a/tderesources/newexchange/exchangecalendaradaptor.cpp b/tderesources/newexchange/exchangecalendaradaptor.cpp index 3b7aa36dc..8b81b9a5e 100644 --- a/tderesources/newexchange/exchangecalendaradaptor.cpp +++ b/tderesources/newexchange/exchangecalendaradaptor.cpp @@ -54,7 +54,7 @@ TDEIO::TransferJob *ExchangeCalendarUploadItem::createUploadJob( KPIM::Groupware { kdDebug()<<"ExchangeCalendarUploadItem::createUploadJob, adaptor="<") + i18n("Remote data access failure") + TQString("

") + i18n("Detailed information") \ + TQString(":
") + job->errorString() + TQString("

") + i18n("What would you like to do?"); - int rc = KMessageBox::warningContinueCancel(0, + int rc = KMessageBox::warningContinueCancel(nullptr, warningString, i18n("Remote Data Access Failure"), i18n("&Continue with cached resource")); if ( rc == KMessageBox::Continue ) { mCalendar.close(); @@ -248,10 +248,10 @@ void ResourceRemote::slotLoadJobResult( TDEIO::Job *job ) emit resourceChanged( this ); } - mDownloadJob = 0; + mDownloadJob = nullptr; if ( mProgress ) { mProgress->setComplete(); - mProgress = 0; + mProgress = nullptr; } mLock->unlock(); @@ -297,7 +297,7 @@ bool ResourceRemote::isSaving() void ResourceRemote::slotSaveJobResult( TDEIO::Job *job ) { if ( job->error() ) { - job->showErrorDialog( 0 ); + job->showErrorDialog( nullptr ); } else { kdDebug(5800) << "ResourceRemote::slotSaveJobResult() success" << endl; @@ -309,7 +309,7 @@ void ResourceRemote::slotSaveJobResult( TDEIO::Job *job ) mChangedIncidences.clear(); } - mUploadJob = 0; + mUploadJob = nullptr; emit resourceSaved( this ); } diff --git a/tderesources/remote/resourceremoteconfig.h b/tderesources/remote/resourceremoteconfig.h index 6359aa994..86d095f37 100644 --- a/tderesources/remote/resourceremoteconfig.h +++ b/tderesources/remote/resourceremoteconfig.h @@ -47,7 +47,7 @@ class TDE_EXPORT ResourceRemoteConfig : public KRES::ConfigWidget TQ_OBJECT public: - ResourceRemoteConfig( TQWidget *parent = 0, const char *name = 0 ); + ResourceRemoteConfig( TQWidget *parent = nullptr, const char *name = nullptr ); public slots: virtual void loadSettings( KRES::Resource *resource ); diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp index a716d28d7..ca8978cac 100644 --- a/tderesources/scalix/kcal/resourcescalix.cpp +++ b/tderesources/scalix/kcal/resourcescalix.cpp @@ -304,8 +304,8 @@ void ResourceScalix::resolveConflict( KCal::Incidence* inc, const TQString& subr return; } Incidence* local = mCalendar.incidence( inc->uid() ); - Incidence* localIncidence = 0; - Incidence* addedIncidence = 0; + Incidence* localIncidence = nullptr; + Incidence* addedIncidence = nullptr; if ( local ) { KIncidenceChooser* ch = new KIncidenceChooser(); ch->setIncidence( local ,inc ); @@ -322,7 +322,7 @@ void ResourceScalix::resolveConflict( KCal::Incidence* inc, const TQString& subr delete inc; } else if ( result == inc ) { addedIncidence = inc; - } else if ( result == 0 ) { // take both + } else if (!result) { // take both localIncidence = local->clone(); localIncidence->recreate(); localIncidence->setSummary( i18n("Copy of: %1").arg(localIncidence->summary()) ); @@ -357,7 +357,7 @@ bool ResourceScalix::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const TQ_UINT32 sernum ) { const TQString& type = incidencebase->type(); - const char* mimetype = 0; + const char* mimetype = nullptr; TQString data; if ( type == "Event" ) { mimetype = incidenceInlineMimeType; @@ -726,8 +726,8 @@ void ResourceScalix::fromKMailAddSubresource( const TQString& type, const TQString& label, bool writable ) { - ResourceMap* map = 0; - const char* mimetype = 0; + ResourceMap* map = nullptr; + const char* mimetype = nullptr; if ( type == kmailCalendarContentsType ) { map = &mEventSubResources; mimetype = eventAttachmentMimeType; @@ -858,7 +858,7 @@ bool ResourceScalix::subresourceActive( const TQString& subresource ) const void ResourceScalix::setSubresourceActive( const TQString &subresource, bool v ) { - ResourceMap *map = 0; + ResourceMap *map = nullptr; if ( mEventSubResources.contains( subresource ) ) map = &mEventSubResources; @@ -897,7 +897,7 @@ Scalix::ResourceMap* ResourceScalix::subResourceMap( const TQString& contentsTyp return &mJournalSubResources; } // Not ours - return 0; + return nullptr; } #include "resourcescalix.moc" diff --git a/tderesources/scalix/kcal/resourcescalix_plugin.cpp b/tderesources/scalix/kcal/resourcescalix_plugin.cpp index 036c2f45e..3ec4b78a7 100644 --- a/tderesources/scalix/kcal/resourcescalix_plugin.cpp +++ b/tderesources/scalix/kcal/resourcescalix_plugin.cpp @@ -43,7 +43,7 @@ public: KRES::ConfigWidget *configWidget( TQWidget* ) { - return 0; + return nullptr; } }; diff --git a/tderesources/scalix/knotes/resourcescalix.cpp b/tderesources/scalix/knotes/resourcescalix.cpp index ccec87b50..a6e80b804 100644 --- a/tderesources/scalix/knotes/resourcescalix.cpp +++ b/tderesources/scalix/knotes/resourcescalix.cpp @@ -160,7 +160,7 @@ bool ResourceScalix::addNote( KCal::Journal* journal ) KCal::Journal* ResourceScalix::addNote( const TQString& data, const TQString& subresource, TQ_UINT32 sernum, const TQString& ) { - KCal::Journal* journal = 0; + KCal::Journal* journal = nullptr; // FIXME: This does not take into account the time zone! KCal::ICalFormat formatter; journal = static_cast( formatter.fromString( data ) ); @@ -171,7 +171,7 @@ KCal::Journal* ResourceScalix::addNote( const TQString& data, const TQString& su return journal; else delete journal; - return 0; + return nullptr; } bool ResourceScalix::addNote( KCal::Journal* journal, diff --git a/tderesources/scalix/knotes/resourcescalix_plugin.cpp b/tderesources/scalix/knotes/resourcescalix_plugin.cpp index 925c27b01..541b59ecd 100644 --- a/tderesources/scalix/knotes/resourcescalix_plugin.cpp +++ b/tderesources/scalix/knotes/resourcescalix_plugin.cpp @@ -43,7 +43,7 @@ public: KRES::ConfigWidget *configWidget( TQWidget* ) { - return 0; + return nullptr; } }; diff --git a/tderesources/scalix/scalixadmin/delegatedialog.h b/tderesources/scalix/scalixadmin/delegatedialog.h index 874bced53..e6f04fa9d 100644 --- a/tderesources/scalix/scalixadmin/delegatedialog.h +++ b/tderesources/scalix/scalixadmin/delegatedialog.h @@ -38,7 +38,7 @@ class DelegateDialog : public KDialogBase public: - DelegateDialog( TQWidget *parent = 0 ); + DelegateDialog( TQWidget *parent = nullptr ); void setDelegate( const Scalix::Delegate &delegate ); Scalix::Delegate delegate() const; diff --git a/tderesources/scalix/scalixadmin/delegatepage.cpp b/tderesources/scalix/scalixadmin/delegatepage.cpp index b43dac85a..00395c3ed 100644 --- a/tderesources/scalix/scalixadmin/delegatepage.cpp +++ b/tderesources/scalix/scalixadmin/delegatepage.cpp @@ -161,7 +161,7 @@ void DelegatePage::delegateRemoved( TDEIO::Job *job ) void DelegatePage::selectionChanged() { - bool state = ( mView->selectedItem() != 0 ); + bool state = ( mView->selectedItem() != nullptr ); mEditButton->setEnabled( state ); mRemoveButton->setEnabled( state ); diff --git a/tderesources/scalix/scalixadmin/delegatepage.h b/tderesources/scalix/scalixadmin/delegatepage.h index eabd988df..aaeeed805 100644 --- a/tderesources/scalix/scalixadmin/delegatepage.h +++ b/tderesources/scalix/scalixadmin/delegatepage.h @@ -34,7 +34,7 @@ class DelegatePage : public TQWidget public: - DelegatePage( TQWidget *parent = 0 ); + DelegatePage( TQWidget *parent = nullptr ); ~DelegatePage(); private slots: diff --git a/tderesources/scalix/scalixadmin/delegateview.h b/tderesources/scalix/scalixadmin/delegateview.h index 2b72d284b..f25dc6984 100644 --- a/tderesources/scalix/scalixadmin/delegateview.h +++ b/tderesources/scalix/scalixadmin/delegateview.h @@ -35,7 +35,7 @@ class DelegateView : public TDEListView public: - DelegateView( DelegateManager *manager, TQWidget *parent = 0 ); + DelegateView( DelegateManager *manager, TQWidget *parent = nullptr ); Scalix::Delegate selectedDelegate() const; diff --git a/tderesources/scalix/scalixadmin/ldapdialog.h b/tderesources/scalix/scalixadmin/ldapdialog.h index 9d822af19..a7a901db3 100644 --- a/tderesources/scalix/scalixadmin/ldapdialog.h +++ b/tderesources/scalix/scalixadmin/ldapdialog.h @@ -27,7 +27,7 @@ class LdapView; class LdapDialog : public KDialogBase { public: - LdapDialog( TQWidget *parent = 0 ); + LdapDialog( TQWidget *parent = nullptr ); TQString selectedUser() const; diff --git a/tderesources/scalix/scalixadmin/ldapview.h b/tderesources/scalix/scalixadmin/ldapview.h index f405045be..906162ef7 100644 --- a/tderesources/scalix/scalixadmin/ldapview.h +++ b/tderesources/scalix/scalixadmin/ldapview.h @@ -33,7 +33,7 @@ class LdapView : public TDEListView public: - LdapView( TQWidget *parent = 0 ); + LdapView( TQWidget *parent = nullptr ); ~LdapView(); TQString selectedUser() const; diff --git a/tderesources/scalix/scalixadmin/main.cpp b/tderesources/scalix/scalixadmin/main.cpp index 6f162df9d..30e711952 100644 --- a/tderesources/scalix/scalixadmin/main.cpp +++ b/tderesources/scalix/scalixadmin/main.cpp @@ -36,7 +36,7 @@ int main( int argc, char **argv ) { TDEAboutData aboutData( "scalixadmin", I18N_NOOP("ScalixAdmin"), "1.0", description, TDEAboutData::License_GPL, "(c) 2007, Tobias Koenig" ); - aboutData.addAuthor( "Tobias Koenig",0, "tokoe@kde.org" ); + aboutData.addAuthor( "Tobias Koenig",nullptr, "tokoe@kde.org" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/tderesources/scalix/scalixadmin/otheruserpage.cpp b/tderesources/scalix/scalixadmin/otheruserpage.cpp index f7594acf2..d1bce7ee3 100644 --- a/tderesources/scalix/scalixadmin/otheruserpage.cpp +++ b/tderesources/scalix/scalixadmin/otheruserpage.cpp @@ -134,7 +134,7 @@ void OtherUserPage::userRemoved( TDEIO::Job *job ) void OtherUserPage::selectionChanged() { - mDeleteButton->setEnabled( mView->selectedItem() != 0 ); + mDeleteButton->setEnabled( mView->selectedItem() != nullptr ); } void OtherUserPage::updateKmail() @@ -152,7 +152,7 @@ void OtherUserPage::updateKmail() findServiceFor( "DCOP/ResourceBackend/IMAP", TQString(), TQString(), &error, &dcopService ); if ( result != 0 ) { - KMessageBox::error( 0, i18n( "Unable to start KMail to trigger account update with Scalix server" ) ); + KMessageBox::error( nullptr, i18n( "Unable to start KMail to trigger account update with Scalix server" ) ); delete msg; return; } diff --git a/tderesources/scalix/scalixadmin/otheruserpage.h b/tderesources/scalix/scalixadmin/otheruserpage.h index 035271251..dfc87cb78 100644 --- a/tderesources/scalix/scalixadmin/otheruserpage.h +++ b/tderesources/scalix/scalixadmin/otheruserpage.h @@ -34,7 +34,7 @@ class OtherUserPage : public TQWidget public: - OtherUserPage( TQWidget *parent = 0 ); + OtherUserPage( TQWidget *parent = nullptr ); ~OtherUserPage(); private slots: diff --git a/tderesources/scalix/scalixadmin/otheruserview.h b/tderesources/scalix/scalixadmin/otheruserview.h index b52ce1d74..ffc65073b 100644 --- a/tderesources/scalix/scalixadmin/otheruserview.h +++ b/tderesources/scalix/scalixadmin/otheruserview.h @@ -31,7 +31,7 @@ class OtherUserView : public TDEListView public: - OtherUserView( OtherUserManager *manager, TQWidget *parent = 0 ); + OtherUserView( OtherUserManager *manager, TQWidget *parent = nullptr ); TQString selectedUser() const; diff --git a/tderesources/scalix/scalixadmin/outofofficepage.h b/tderesources/scalix/scalixadmin/outofofficepage.h index b96de3527..384e8719e 100644 --- a/tderesources/scalix/scalixadmin/outofofficepage.h +++ b/tderesources/scalix/scalixadmin/outofofficepage.h @@ -34,7 +34,7 @@ class OutOfOfficePage : public TQWidget public: - OutOfOfficePage( TQWidget *parent = 0 ); + OutOfOfficePage( TQWidget *parent = nullptr ); ~OutOfOfficePage(); private slots: diff --git a/tderesources/scalix/scalixadmin/passwordpage.cpp b/tderesources/scalix/scalixadmin/passwordpage.cpp index f67e42511..801b5e5dc 100644 --- a/tderesources/scalix/scalixadmin/passwordpage.cpp +++ b/tderesources/scalix/scalixadmin/passwordpage.cpp @@ -36,7 +36,7 @@ #include "passwordpage.h" PasswordPage::PasswordPage( TQWidget *parent ) - : TQWidget( parent ), mJob( 0 ) + : TQWidget( parent ), mJob( nullptr ) { TQGridLayout *layout = new TQGridLayout( this, 2, 3, 11, 6 ); @@ -82,7 +82,7 @@ void PasswordPage::buttonClicked() updateState( true ); } else { mJob->kill(); - mJob = 0; + mJob = nullptr; updateState( false ); } @@ -109,7 +109,7 @@ void PasswordPage::textChanged() void PasswordPage::finished( TDEIO::Job* job ) { - mJob = 0; + mJob = nullptr; updateState( false ); diff --git a/tderesources/scalix/scalixadmin/passwordpage.h b/tderesources/scalix/scalixadmin/passwordpage.h index d7d6f455b..7784f793b 100644 --- a/tderesources/scalix/scalixadmin/passwordpage.h +++ b/tderesources/scalix/scalixadmin/passwordpage.h @@ -36,7 +36,7 @@ class PasswordPage : public TQWidget public: - PasswordPage( TQWidget *parent = 0 ); + PasswordPage( TQWidget *parent = nullptr ); private slots: void buttonClicked(); diff --git a/tderesources/scalix/scalixadmin/settings.cpp b/tderesources/scalix/scalixadmin/settings.cpp index 277a0631d..89def48fc 100644 --- a/tderesources/scalix/scalixadmin/settings.cpp +++ b/tderesources/scalix/scalixadmin/settings.cpp @@ -24,7 +24,7 @@ #include "settings.h" -Settings* Settings::mSelf = 0; +Settings* Settings::mSelf = nullptr; Settings::Settings() { diff --git a/tderesources/scalix/shared/kmailconnection.cpp b/tderesources/scalix/shared/kmailconnection.cpp index 6555d90f1..c3b6593bf 100644 --- a/tderesources/scalix/shared/kmailconnection.cpp +++ b/tderesources/scalix/shared/kmailconnection.cpp @@ -47,7 +47,7 @@ using namespace Scalix; KMailConnection::KMailConnection( ResourceScalixBase* resource, const TQCString& objId ) - : DCOPObject( objId ), mResource( resource ), mKMailIcalIfaceStub( 0 ) + : DCOPObject( objId ), mResource( resource ), mKMailIcalIfaceStub( nullptr ) { // Make the connection to KMail ready mDCOPClient = new DCOPClient(); @@ -63,9 +63,9 @@ KMailConnection::~KMailConnection() { tdeApp->dcopClient()->setNotifications( false ); delete mKMailIcalIfaceStub; - mKMailIcalIfaceStub = 0; + mKMailIcalIfaceStub = nullptr; delete mDCOPClient; - mDCOPClient = 0; + mDCOPClient = nullptr; } static const TQCString dcopObjectId = "KMailICalIface"; @@ -108,7 +108,7 @@ bool KMailConnection::connectToKMail() kdError(5650) << "DCOP connection to asyncLoadResult failed" << endl; } - return ( mKMailIcalIfaceStub != 0 ); + return mKMailIcalIfaceStub != nullptr; } bool KMailConnection::fromKMailAddIncidence( const TQString& type, @@ -274,7 +274,7 @@ void KMailConnection::unregisteredFromDCOP( const TQCString& appId ) // Delete the stub so that the next time we need to talk to kmail, // we'll know that we need to start a new one. delete mKMailIcalIfaceStub; - mKMailIcalIfaceStub = 0; + mKMailIcalIfaceStub = nullptr; } } diff --git a/tderesources/scalix/shared/resourcescalixbase.cpp b/tderesources/scalix/shared/resourcescalixbase.cpp index f9b104236..f47bf9093 100644 --- a/tderesources/scalix/shared/resourcescalixbase.cpp +++ b/tderesources/scalix/shared/resourcescalixbase.cpp @@ -154,7 +154,7 @@ TQString ResourceScalixBase::findWritableResource( const ResourceMap& resources if ( possible.isEmpty() ) { // None found!! kdWarning(5650) << "No writable resource found!" << endl; - KMessageBox::error( 0, i18n( "No writable resource was found, saving will not be possible. Reconfigure KMail first." ) ); + KMessageBox::error( nullptr, i18n( "No writable resource was found, saving will not be possible. Reconfigure KMail first." ) ); return TQString(); } if ( possible.count() == 1 ) diff --git a/tderesources/scalix/tdeabc/contact.cpp b/tderesources/scalix/tdeabc/contact.cpp index 6d4cc2bf5..5b0aeb6cf 100644 --- a/tderesources/scalix/tdeabc/contact.cpp +++ b/tderesources/scalix/tdeabc/contact.cpp @@ -27,7 +27,7 @@ using namespace Scalix; -static TQMap *s_distListMap = 0; +static TQMap *s_distListMap = nullptr; static KStaticDeleter< TQMap > sd; static TQString custom( const TQString &name, const TDEABC::Addressee &addr, const TQString &defaultValue = TQString() ) diff --git a/tderesources/scalix/tdeabc/resourcescalix.cpp b/tderesources/scalix/tdeabc/resourcescalix.cpp index 8a9fd5316..e6f35cf1e 100644 --- a/tderesources/scalix/tdeabc/resourcescalix.cpp +++ b/tderesources/scalix/tdeabc/resourcescalix.cpp @@ -66,7 +66,7 @@ class ScalixFactory : public KRES::PluginFactoryBase KRES::ConfigWidget *configWidget( TQWidget* ) { - return 0; + return nullptr; } }; @@ -139,7 +139,7 @@ TDEABC::Ticket * TDEABC::ResourceScalix::requestSaveTicket() { if ( !addressBook() ) { kdError() << "no addressbook" << endl; - return 0; + return nullptr; } mLocked = true; diff --git a/tderesources/scalix/tdeabc/resourcescalix_plugin.cpp b/tderesources/scalix/tdeabc/resourcescalix_plugin.cpp index ee84b7be3..1bcf5ef0f 100644 --- a/tderesources/scalix/tdeabc/resourcescalix_plugin.cpp +++ b/tderesources/scalix/tdeabc/resourcescalix_plugin.cpp @@ -45,7 +45,7 @@ class ScalixFactory : public KRES::PluginFactoryBase KRES::ConfigWidget *configWidget( TQWidget* ) { - return 0; + return nullptr; } }; diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp index 9945ebd0e..57b547b9d 100644 --- a/tderesources/scalix/tdeioslave/scalix.cpp +++ b/tderesources/scalix/tdeioslave/scalix.cpp @@ -39,9 +39,9 @@ extern "C" { static const TDECmdLineOptions options[] = { - { "+protocol", I18N_NOOP( "Protocol name" ), 0 }, - { "+pool", I18N_NOOP( "Socket name" ), 0 }, - { "+app", I18N_NOOP( "Socket name" ), 0 }, + { "+protocol", I18N_NOOP( "Protocol name" ), nullptr }, + { "+pool", I18N_NOOP( "Socket name" ), nullptr }, + { "+app", I18N_NOOP( "Socket name" ), nullptr }, TDECmdLineLastOption }; @@ -50,7 +50,7 @@ int kdemain( int argc, char **argv ) putenv( strdup( "SESSION_MANAGER=" ) ); TDEApplication::disableAutoDcopRegistration(); - TDECmdLineArgs::init( argc, argv, "tdeio_scalix", 0, 0, 0, 0 ); + TDECmdLineArgs::init( argc, argv, "tdeio_scalix", nullptr, nullptr, nullptr, 0 ); TDECmdLineArgs::addCmdLineOptions( options ); TDEApplication app( false, false ); diff --git a/tderesources/slox/kcalresourceslox.cpp b/tderesources/slox/kcalresourceslox.cpp index 19462bc4f..75759faca 100644 --- a/tderesources/slox/kcalresourceslox.cpp +++ b/tderesources/slox/kcalresourceslox.cpp @@ -76,7 +76,7 @@ KCalResourceSlox::KCalResourceSlox( const TDEConfig *config ) } KCalResourceSlox::KCalResourceSlox( const KURL &url ) - : ResourceCached( 0 ), SloxBase( this ) + : ResourceCached( nullptr ), SloxBase( this ) { init(); @@ -107,15 +107,15 @@ void KCalResourceSlox::init() mPrefs = new SloxPrefs; mWebdavHandler.setResource( this ); - mLoadEventsJob = 0; - mLoadTodosJob = 0; + mLoadEventsJob = nullptr; + mLoadTodosJob = nullptr; - mUploadJob = 0; + mUploadJob = nullptr; - mLoadEventsProgress = 0; - mLoadTodosProgress = 0; + mLoadEventsProgress = nullptr; + mLoadTodosProgress = nullptr; - mAccounts = 0; + mAccounts = nullptr; mLock = new TDEABC::LockNull( true ); @@ -305,7 +305,7 @@ void KCalResourceSlox::uploadIncidences() mUploadedIncidence = deleted.first(); mUploadIsDelete = true; } else { - mUploadedIncidence = 0; + mUploadedIncidence = nullptr; kdDebug() << "uploadIncidences(): FINISHED" << endl; emit resourceSaved( this ); return; @@ -942,7 +942,7 @@ void KCalResourceSlox::slotLoadTodosResult( TDEIO::Job *job ) changed = true; } } else if ( item.status == SloxItem::Create ) { - Todo *newTodo = 0; + Todo *newTodo = nullptr; Todo *todo = mCalendar.todo( uid ); if ( !todo ) { newTodo = new Todo; @@ -980,10 +980,10 @@ void KCalResourceSlox::slotLoadTodosResult( TDEIO::Job *job ) emit resourceLoaded( this ); } - mLoadTodosJob = 0; + mLoadTodosJob = nullptr; if ( mLoadTodosProgress ) mLoadTodosProgress->setComplete(); - mLoadTodosProgress = 0; + mLoadTodosProgress = nullptr; } void KCalResourceSlox::slotLoadEventsResult( TDEIO::Job *job ) @@ -1016,7 +1016,7 @@ void KCalResourceSlox::slotLoadEventsResult( TDEIO::Job *job ) changed = true; } } else if ( item.status == SloxItem::Create ) { - Event *newEvent = 0; + Event *newEvent = nullptr; Event *event = mCalendar.event( uid ); if ( !event ) { newEvent = new Event; @@ -1070,10 +1070,10 @@ void KCalResourceSlox::slotLoadEventsResult( TDEIO::Job *job ) emit resourceLoaded( this ); } - mLoadEventsJob = 0; + mLoadEventsJob = nullptr; if ( mLoadEventsProgress ) mLoadEventsProgress->setComplete(); - mLoadEventsProgress = 0; + mLoadEventsProgress = nullptr; } void KCalResourceSlox::slotUploadResult( TDEIO::Job *job ) @@ -1175,10 +1175,10 @@ void KCalResourceSlox::slotUploadResult( TDEIO::Job *job ) } } - mUploadJob = 0; + mUploadJob = nullptr; mUploadProgress->setComplete(); - mUploadProgress = 0; + mUploadProgress = nullptr; clearChange( mUploadedIncidence ); @@ -1223,7 +1223,7 @@ bool KCalResourceSlox::confirmSave() { if ( !hasChanges() ) return true; - ConfirmSaveDialog dlg( resourceName(), 0 ); + ConfirmSaveDialog dlg( resourceName(), nullptr ); dlg.addIncidences( addedIncidences(), i18n("Added") ); dlg.addIncidences( changedIncidences(), i18n("Changed") ); @@ -1295,23 +1295,23 @@ void KCalResourceSlox::dump() const void KCalResourceSlox::cancelLoadEvents() { if ( mLoadEventsJob ) mLoadEventsJob->kill(); - mLoadEventsJob = 0; + mLoadEventsJob = nullptr; if ( mLoadEventsProgress ) mLoadEventsProgress->setComplete(); - mLoadEventsProgress = 0; + mLoadEventsProgress = nullptr; } void KCalResourceSlox::cancelLoadTodos() { if ( mLoadTodosJob ) mLoadTodosJob->kill(); - mLoadTodosJob = 0; + mLoadTodosJob = nullptr; if ( mLoadTodosProgress ) mLoadTodosProgress->setComplete(); - mLoadTodosProgress = 0; + mLoadTodosProgress = nullptr; } void KCalResourceSlox::cancelUpload() { if ( mUploadJob ) mUploadJob->kill(); - mUploadJob = 0; + mUploadJob = nullptr; if ( mUploadProgress ) mUploadProgress->setComplete(); } diff --git a/tderesources/slox/kcalresourcesloxconfig.cpp b/tderesources/slox/kcalresourcesloxconfig.cpp index 402d853c8..592880436 100644 --- a/tderesources/slox/kcalresourcesloxconfig.cpp +++ b/tderesources/slox/kcalresourcesloxconfig.cpp @@ -41,7 +41,7 @@ #include "kcalresourcesloxconfig.h" KCalResourceSloxConfig::KCalResourceSloxConfig( TQWidget* parent, const char* name ) : - KRES::ConfigWidget( parent, name ), mRes( 0 ) + KRES::ConfigWidget( parent, name ), mRes( nullptr ) { resize( 245, 115 ); TQGridLayout *mainLayout = new TQGridLayout( this, 6, 2, KDialog::spacingHint(), KDialog::spacingHint() ); diff --git a/tderesources/slox/kcalresourcesloxconfig.h b/tderesources/slox/kcalresourcesloxconfig.h index 46da81bdc..705c8f31d 100644 --- a/tderesources/slox/kcalresourcesloxconfig.h +++ b/tderesources/slox/kcalresourcesloxconfig.h @@ -47,7 +47,7 @@ class TDE_EXPORT KCalResourceSloxConfig : public KRES::ConfigWidget TQ_OBJECT public: - KCalResourceSloxConfig( TQWidget *parent = 0, const char *name = 0 ); + KCalResourceSloxConfig( TQWidget *parent = nullptr, const char *name = nullptr ); public slots: virtual void loadSettings( KRES::Resource *resource ); diff --git a/tderesources/slox/sloxaccounts.cpp b/tderesources/slox/sloxaccounts.cpp index fdfd1eca8..83124a9a6 100644 --- a/tderesources/slox/sloxaccounts.cpp +++ b/tderesources/slox/sloxaccounts.cpp @@ -42,7 +42,7 @@ SloxAccounts::SloxAccounts( SloxBase *res, const KURL &baseUrl ) { kdDebug() << "SloxAccounts(): " << baseUrl << endl; - mDownloadJob = 0; + mDownloadJob = nullptr; TQString server = mBaseUrl.host(); @@ -148,7 +148,7 @@ void SloxAccounts::slotResult( TDEIO::Job *job ) kdDebug() << "SloxAccounts::slotResult()" << endl; if ( job->error() ) { - job->showErrorDialog( 0 ); + job->showErrorDialog( nullptr ); } else { if ( mRes->resType() == "ox" ) { TQFile f( cacheFile() ); @@ -163,7 +163,7 @@ void SloxAccounts::slotResult( TDEIO::Job *job ) readAccounts(); } - mDownloadJob = 0; + mDownloadJob = nullptr; } TQString SloxAccounts::cacheFile() const diff --git a/tderesources/slox/sloxfolder.cpp b/tderesources/slox/sloxfolder.cpp index cf75868cb..1d7476c0a 100644 --- a/tderesources/slox/sloxfolder.cpp +++ b/tderesources/slox/sloxfolder.cpp @@ -22,7 +22,7 @@ #include "sloxfolder.h" SloxFolder::SloxFolder( const TQString &id, const TQString &parentId, const TQString &type, const TQString &name, bool def ) : - item( 0 ), + item( nullptr ), mId( id ), mParentId( parentId ), mName( name ), diff --git a/tderesources/slox/sloxfolderdialog.cpp b/tderesources/slox/sloxfolderdialog.cpp index c1f1086ef..58475a423 100644 --- a/tderesources/slox/sloxfolderdialog.cpp +++ b/tderesources/slox/sloxfolderdialog.cpp @@ -45,7 +45,7 @@ SloxFolderDialog::~SloxFolderDialog() TQMap folders = mManager->folders(); TQMap::Iterator it; for ( it = folders.begin(); it != folders.end(); ++it ) - (*it)->item = 0; + (*it)->item = nullptr; } void SloxFolderDialog::updateFolderView() diff --git a/tderesources/slox/sloxfolderdialog.h b/tderesources/slox/sloxfolderdialog.h index 0b8785ea6..f9b237597 100644 --- a/tderesources/slox/sloxfolderdialog.h +++ b/tderesources/slox/sloxfolderdialog.h @@ -33,7 +33,7 @@ class SloxFolderDialog : public KDialogBase TQ_OBJECT public: - SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget* parent = 0, const char *name = 0 ); + SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget* parent = nullptr, const char *name = nullptr ); ~SloxFolderDialog(); TQString selectedFolder() const; diff --git a/tderesources/slox/sloxfoldermanager.cpp b/tderesources/slox/sloxfoldermanager.cpp index 4e89d8de9..69c7ce655 100644 --- a/tderesources/slox/sloxfoldermanager.cpp +++ b/tderesources/slox/sloxfoldermanager.cpp @@ -34,7 +34,7 @@ SloxFolderManager::SloxFolderManager( SloxBase *res, const KURL & baseUrl ) : - mDownloadJob( 0 ), + mDownloadJob( nullptr ), mBaseUrl( baseUrl ), mRes( res ) { @@ -88,7 +88,7 @@ void SloxFolderManager::slotResult( TDEIO::Job *job ) kdDebug() << k_funcinfo << endl; if ( job->error() ) { - job->showErrorDialog( 0 ); + job->showErrorDialog( nullptr ); } else { kdDebug() << k_funcinfo << " success, writing to " << cacheFile() << endl; TQFile f( cacheFile() ); @@ -102,7 +102,7 @@ void SloxFolderManager::slotResult( TDEIO::Job *job ) readFolders(); } - mDownloadJob = 0; + mDownloadJob = nullptr; emit foldersUpdated(); } diff --git a/tderesources/slox/tdeabcresourceslox.cpp b/tderesources/slox/tdeabcresourceslox.cpp index 2d44d0f39..fee071164 100644 --- a/tderesources/slox/tdeabcresourceslox.cpp +++ b/tderesources/slox/tdeabcresourceslox.cpp @@ -56,7 +56,7 @@ ResourceSlox::ResourceSlox( const TDEConfig *config ) ResourceSlox::ResourceSlox( const KURL &url, const TQString &user, const TQString &password ) - : ResourceCached( 0 ), SloxBase( this ) + : ResourceCached( nullptr ), SloxBase( this ) { init(); @@ -72,10 +72,10 @@ void ResourceSlox::init() mPrefs = new SloxPrefs; mWebdavHandler.setResource( this ); - mDownloadJob = 0; - mUploadJob = 0; - mDownloadProgress = 0; - mUploadProgress = 0; + mDownloadJob = nullptr; + mUploadJob = nullptr; + mDownloadProgress = nullptr; + mUploadProgress = nullptr; // phone number mapping for SLOX mPhoneNumberSloxMap[PhoneNumber::Work] << "phone" << "phone2"; @@ -134,7 +134,7 @@ Ticket *ResourceSlox::requestSaveTicket() { if ( !addressBook() ) { kdDebug(5700) << "no addressbook" << endl; - return 0; + return nullptr; } return createTicket( this ); @@ -228,7 +228,7 @@ void ResourceSlox::slotResult( TDEIO::Job *job ) kdDebug() << "ResourceSlox::slotResult()" << endl; if ( job->error() ) { - job->showErrorDialog( 0 ); + job->showErrorDialog( nullptr ); } else { kdDebug() << "ResourceSlox::slotResult() success" << endl; @@ -281,9 +281,9 @@ void ResourceSlox::slotResult( TDEIO::Job *job ) saveCache(); } - mDownloadJob = 0; + mDownloadJob = nullptr; mDownloadProgress->setComplete(); - mDownloadProgress = 0; + mDownloadProgress = nullptr; emit loadingFinished( this ); } @@ -293,7 +293,7 @@ void ResourceSlox::slotUploadResult( TDEIO::Job *job ) kdDebug() << "ResourceSlox::slotUploadResult()" << endl; if ( job->error() ) { - job->showErrorDialog( 0 ); + job->showErrorDialog( nullptr ); } else { kdDebug() << "ResourceSlox::slotUploadResult() success" << endl; @@ -329,9 +329,9 @@ void ResourceSlox::slotUploadResult( TDEIO::Job *job ) clearChange( mUploadAddressee ); - mUploadJob = 0; + mUploadJob = nullptr; mUploadProgress->setComplete(); - mUploadProgress = 0; + mUploadProgress = nullptr; uploadContacts(); } @@ -643,17 +643,17 @@ void ResourceSlox::slotProgress( TDEIO::Job *job, unsigned long percent ) void ResourceSlox::cancelDownload() { if ( mDownloadJob ) mDownloadJob->kill(); - mDownloadJob = 0; + mDownloadJob = nullptr; if ( mDownloadProgress ) mDownloadProgress->setComplete(); - mDownloadProgress = 0; + mDownloadProgress = nullptr; } void ResourceSlox::cancelUpload() { if ( mUploadJob ) mUploadJob->kill(); - mUploadJob = 0; + mUploadJob = nullptr; if ( mUploadProgress ) mUploadProgress->setComplete(); - mUploadProgress = 0; + mUploadProgress = nullptr; } void ResourceSlox::setReadOnly( bool b ) diff --git a/tderesources/slox/tdeabcresourcesloxconfig.cpp b/tderesources/slox/tdeabcresourcesloxconfig.cpp index 36f762387..275d77358 100644 --- a/tderesources/slox/tdeabcresourcesloxconfig.cpp +++ b/tderesources/slox/tdeabcresourcesloxconfig.cpp @@ -40,7 +40,7 @@ using namespace TDEABC; ResourceSloxConfig::ResourceSloxConfig( TQWidget* parent, const char* name ) - : KRES::ConfigWidget( parent, name ), mRes( 0 ) + : KRES::ConfigWidget( parent, name ), mRes( nullptr ) { TQGridLayout *mainLayout = new TQGridLayout( this, 5, 2, 0, KDialog::spacingHint() ); diff --git a/tderesources/slox/tdeabcresourcesloxconfig.h b/tderesources/slox/tdeabcresourcesloxconfig.h index 76dd7e540..45da161bf 100644 --- a/tderesources/slox/tdeabcresourcesloxconfig.h +++ b/tderesources/slox/tdeabcresourcesloxconfig.h @@ -38,7 +38,7 @@ class TDE_EXPORT ResourceSloxConfig : public KRES::ConfigWidget public: - ResourceSloxConfig( TQWidget* parent = 0, const char* name = 0 ); + ResourceSloxConfig( TQWidget* parent = nullptr, const char* name = nullptr ); public slots: void loadSettings( KRES::Resource* ); diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.cpp b/tderesources/tvanytime/kcal_resourcetvanytime.cpp index d2fccbb86..5db31cd26 100644 --- a/tderesources/tvanytime/kcal_resourcetvanytime.cpp +++ b/tderesources/tvanytime/kcal_resourcetvanytime.cpp @@ -74,14 +74,14 @@ ResourceTVAnytime::~ResourceTVAnytime() disableChangeNotification(); delete mPrefs; - mPrefs = 0; + mPrefs = nullptr; } void ResourceTVAnytime::init() { - mDownloadJob = 0; - mProgress = 0; - mDestination = 0; + mDownloadJob = nullptr; + mProgress = nullptr; + mDestination = nullptr; mIsShowingError = false; @@ -201,7 +201,7 @@ void ResourceTVAnytime::slotJobResult( TDEIO::Job *job ) loadError( job->errorString() ); mIsShowingError = false; delete mDestination; - mDestination = 0; + mDestination = nullptr; } else { disableChangeNotification(); @@ -221,11 +221,11 @@ void ResourceTVAnytime::slotJobResult( TDEIO::Job *job ) emit resourceLoaded( this ); } - mDownloadJob = 0; + mDownloadJob = nullptr; if ( mProgress ) mProgress->setComplete(); - mProgress = 0; + mProgress = nullptr; delete mDestination; - mDestination = 0; + mDestination = nullptr; } TQDomDocument ResourceTVAnytime::archiveFileXml( const TQString & name ) @@ -475,9 +475,9 @@ TDEABC::Lock *ResourceTVAnytime::lock() void ResourceTVAnytime::cancelLoad() { if ( mDownloadJob ) mDownloadJob->kill(); - mDownloadJob = 0; + mDownloadJob = nullptr; if ( mProgress ) mProgress->setComplete(); - mProgress = 0; + mProgress = nullptr; } void ResourceTVAnytime::slotEmitResourceChanged() -- cgit v1.2.3