From kde-commits Sun Jan 31 23:08:33 2010 From: Cyrille Berger Date: Sun, 31 Jan 2010 23:08:33 +0000 To: kde-commits Subject: koffice/krita/image Message-Id: <1264979313.184966.7083.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=126497932610341 SVN commit 1083278 by berger: and remove qobject stuff in the cpp file too M +3 -31 kis_memory_leak_tracker.cpp --- trunk/koffice/krita/image/kis_memory_leak_tracker.cpp #1083277:1083278 @@ -71,7 +71,6 @@ struct KisMemoryLeakTracker::Private { QHash whatWhoWhen; - QHash whatQObjWhoWhen; template void dumpReferencedObjectsAndDelete(QHash&, bool _delete); }; @@ -105,13 +104,12 @@ KisMemoryLeakTracker::~KisMemoryLeakTracker() { - if (d->whatQObjWhoWhen.isEmpty() && d->whatWhoWhen.isEmpty()) { + if (d->whatWhoWhen.isEmpty()) { dbgKrita << "No leak detected."; } else { errKrita << "****************************************"; - errKrita << (d->whatQObjWhoWhen.size() + d->whatWhoWhen.size()) << " leaks have been detected"; + errKrita << (d->whatWhoWhen.size()) << " leaks have been detected"; d->dumpReferencedObjectsAndDelete(d->whatWhoWhen, true); - d->dumpReferencedObjectsAndDelete(d->whatQObjWhoWhen, true); errKrita << "****************************************"; } delete d; @@ -140,29 +138,11 @@ } } -void KisMemoryLeakTracker::reference(const QObject* what, const void* bywho) -{ - MAKE_BACKTRACEINFO - d->whatQObjWhoWhen[what].infos[bywho] = info; - d->whatQObjWhoWhen[what].name = what->objectName(); -} - -void KisMemoryLeakTracker::dereference(const QObject* what, const void* bywho) -{ - QHash& whoWhen = d->whatQObjWhoWhen[what].infos; - delete whoWhen[bywho]; - whoWhen.remove(bywho); - if (whoWhen.isEmpty()) { - d->whatQObjWhoWhen.remove(what); - } -} - void KisMemoryLeakTracker::dumpReferences() { errKrita << "****************************************"; - errKrita << (d->whatQObjWhoWhen.size() + d->whatWhoWhen.size()) << " objects are currently referenced"; + errKrita << (d->whatWhoWhen.size()) << " objects are currently referenced"; d->dumpReferencedObjectsAndDelete(d->whatWhoWhen, false); - d->dumpReferencedObjectsAndDelete(d->whatQObjWhoWhen, false); errKrita << "****************************************"; } @@ -205,14 +185,6 @@ { } -void KisMemoryLeakTracker::reference(const QObject* what, const void* bywho) -{ -} - -void KisMemoryLeakTracker::dereference(const QObject* what, const void* bywho) -{ -} - void KisMemoryLeakTracker::dumpReferences() { }