Hello community, here is the log from the commit of package kcachegrind for openSUSE:Factory checked in at 2014-07-16 16:17:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcachegrind (Old) and /work/SRC/openSUSE:Factory/.kcachegrind.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcachegrind" Changes: -------- --- /work/SRC/openSUSE:Factory/kcachegrind/kcachegrind.changes 2014-06-19 13:19:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kcachegrind.new/kcachegrind.changes 2014-07-16 16:17:11.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jul 10 22:16:39 UTC 2014 - [email protected] + +- Update to 4.13.80 + * KDE 4.14 Beta 1 release + * See http://www.kde.org/announcements/announce-4.14-beta1.php + +------------------------------------------------------------------- Old: ---- kcachegrind-4.13.2.tar.xz New: ---- kcachegrind-4.13.80.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcachegrind.spec ++++++ --- /var/tmp/diff_new_pack.sbt6rZ/_old 2014-07-16 16:17:11.000000000 +0200 +++ /var/tmp/diff_new_pack.sbt6rZ/_new 2014-07-16 16:17:11.000000000 +0200 @@ -22,7 +22,7 @@ License: GPL-2.0 and BSD-4-Clause and GFDL-1.2 Group: Development/Tools/Other Url: http://www.kde.org/ -Version: 4.13.2 +Version: 4.13.80 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kcachegrind-4.13.2.tar.xz -> kcachegrind-4.13.80.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-4.13.2/README new/kcachegrind-4.13.80/README --- old/kcachegrind-4.13.2/README 2014-05-29 09:06:53.000000000 +0200 +++ new/kcachegrind-4.13.80/README 2014-06-24 07:03:33.000000000 +0200 @@ -83,7 +83,7 @@ * KDE 4.3 or higher: kdelibs development packages (libs & headers) * CMake -Commands (from basee directory): +Commands (from base directory): cmake .; make; make install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-4.13.2/kcachegrind/toplevel.cpp new/kcachegrind-4.13.80/kcachegrind/toplevel.cpp --- old/kcachegrind-4.13.2/kcachegrind/toplevel.cpp 2014-05-29 09:06:53.000000000 +0200 +++ new/kcachegrind-4.13.80/kcachegrind/toplevel.cpp 2014-06-24 07:03:33.000000000 +0200 @@ -195,7 +195,7 @@ * sub widgets. * * No positions are saved. These is done automatically for - * KToolbar, and manually in queryExit() for QT docks. + * KToolbar, and manually in queryClose() for Qt docks. */ void TopLevel::saveCurrentState(const QString& postfix) { @@ -1881,11 +1881,6 @@ { saveTraceSettings(); - return true; -} - -bool TopLevel::queryExit() -{ // save current toplevel options as defaults... GlobalConfig::setShowPercentage(_showPercentage); GlobalConfig::setShowExpanded(_showExpanded); @@ -1893,7 +1888,7 @@ GlobalConfig::setHideTemplates(_hideTemplates); GlobalGUIConfig::config()->saveOptions(); - saveCurrentState(QString::null); //krazy:exclude=nullstrassign for old broken gcc + saveCurrentState(QString()); // toolbar and dock positions are automatically stored diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-4.13.2/kcachegrind/toplevel.h new/kcachegrind-4.13.80/kcachegrind/toplevel.h --- old/kcachegrind-4.13.2/kcachegrind/toplevel.h 2014-05-29 09:06:53.000000000 +0200 +++ new/kcachegrind-4.13.80/kcachegrind/toplevel.h 2014-06-24 07:03:33.000000000 +0200 @@ -130,7 +130,6 @@ void splitDirSlot(); void configureToolbars(); void configureKeys(); - bool queryExit(); bool queryClose(); void togglePartDock(); void toggleStackDock(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-4.13.2/libcore/costitem.cpp new/kcachegrind-4.13.80/libcore/costitem.cpp --- old/kcachegrind-4.13.2/libcore/costitem.cpp 2014-05-29 09:06:53.000000000 +0200 +++ new/kcachegrind-4.13.80/libcore/costitem.cpp 2014-06-24 07:03:33.000000000 +0200 @@ -603,7 +603,7 @@ return subCost(t).pretty(); } -QString ProfileCostArray::prettySubCostPerCall(EventType* t, int calls) +QString ProfileCostArray::prettySubCostPerCall(EventType* t, uint64 calls) { if (calls == 0) { /* For callgrind, a call count of zero means that diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-4.13.2/libcore/costitem.h new/kcachegrind-4.13.80/libcore/costitem.h --- old/kcachegrind-4.13.2/libcore/costitem.h 2014-05-29 09:06:53.000000000 +0200 +++ new/kcachegrind-4.13.80/libcore/costitem.h 2014-06-24 07:03:33.000000000 +0200 @@ -190,7 +190,7 @@ */ QString prettySubCost(EventType*); - QString prettySubCostPerCall(EventType* t, int calls); + QString prettySubCostPerCall(EventType* t, uint64 calls); protected: virtual void update(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-4.13.2/libcore/subcost.h new/kcachegrind-4.13.80/libcore/subcost.h --- old/kcachegrind-4.13.2/libcore/subcost.h 2014-05-29 09:06:53.000000000 +0200 +++ new/kcachegrind-4.13.80/libcore/subcost.h 2014-06-24 07:03:33.000000000 +0200 @@ -47,6 +47,7 @@ bool set(FixString& s) { return s.stripUInt64(v); } operator uint64&() { return v; } + operator uint64() const { return v; } bool operator==(unsigned i) const { return v == i; } bool operator==(int i) const { return v == (unsigned)i; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-4.13.2/libviews/callitem.cpp new/kcachegrind-4.13.80/libviews/callitem.cpp --- old/kcachegrind-4.13.2/libviews/callitem.cpp 2014-05-29 09:06:53.000000000 +0200 +++ new/kcachegrind-4.13.80/libviews/callitem.cpp 2014-06-24 07:03:33.000000000 +0200 @@ -141,7 +141,7 @@ setText(2, _call->prettySubCost(ct2)); } setIcon(2, costPixmap(ct2, _call, total, false)); - setText(3, _call->prettySubCostPerCall(ct, _cc)); + setText(3, _call->prettySubCostPerCall(ct2, _cc)); } } @@ -168,10 +168,26 @@ if (col==0) return ci1->_sum < ci2->_sum; - if (col==1) - return ci1->_sum2 < ci2->_sum2; + if (col==1) { + uint64 cc1 = ci1->_cc; + uint64 cc2 = ci2->_cc; + if (cc1 == 0) cc1 = 1; + if (cc2 == 0) cc2 = 1; + return (ci1->_sum / cc1) < (ci2->_sum / cc2); + } if (col==2) + return ci1->_sum2 < ci2->_sum2; + + if (col==3) { + uint64 cc1 = ci1->_cc; + uint64 cc2 = ci2->_cc; + if (cc1 == 0) cc1 = 1; + if (cc2 == 0) cc2 = 1; + return (ci1->_sum2 / cc1) < (ci2->_sum2 / cc2); + } + + if (col==4) return ci1->_cc < ci2->_cc; return QTreeWidgetItem::operator <(other); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-4.13.2/libviews/callview.cpp new/kcachegrind-4.13.80/libviews/callview.cpp --- old/kcachegrind-4.13.2/libviews/callview.cpp 2014-05-29 09:06:53.000000000 +0200 +++ new/kcachegrind-4.13.80/libviews/callview.cpp 2014-06-24 07:03:33.000000000 +0200 @@ -137,7 +137,8 @@ popup.addSeparator(); } - if ((col == 0) || (col == 1)) { + // add menu items to select event type if column displays cost for a type + if (col < 4) { addEventTypeMenu(&popup); popup.addSeparator(); } @@ -175,7 +176,7 @@ void CallView::headerClicked(int col) { // name columns should be sortable in both ways - if (col == 3) return; + if (col == 5) return; // all others only descending sortByColumn(col, Qt::DescendingOrder); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-4.13.2/libviews/eventtypeview.cpp new/kcachegrind-4.13.80/libviews/eventtypeview.cpp --- old/kcachegrind-4.13.2/libviews/eventtypeview.cpp 2014-05-29 09:06:53.000000000 +0200 +++ new/kcachegrind-4.13.80/libviews/eventtypeview.cpp 2014-06-24 07:03:33.000000000 +0200 @@ -244,6 +244,8 @@ for(int i = 0; i < topLevelItemCount(); i++) ((EventTypeItem*)topLevelItem(i))->update(); + resizeColumnToContents(1); + resizeColumnToContents(2); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-4.13.2/libviews/partlistitem.cpp new/kcachegrind-4.13.80/libviews/partlistitem.cpp --- old/kcachegrind-4.13.2/libviews/partlistitem.cpp 2014-05-29 09:06:53.000000000 +0200 +++ new/kcachegrind-4.13.80/libviews/partlistitem.cpp 2014-06-24 07:03:33.000000000 +0200 @@ -153,7 +153,7 @@ int col = treeWidget()->sortColumn(); if (col==0) - return (pi1->_part < pi2->_part); + return (*(pi1->_part) < *(pi2->_part)); if (col==1) return (pi1->_sum < pi2->_sum); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-4.13.2/libviews/sourceview.cpp new/kcachegrind-4.13.80/libviews/sourceview.cpp --- old/kcachegrind-4.13.2/libviews/sourceview.cpp 2014-05-29 09:06:53.000000000 +0200 +++ new/kcachegrind-4.13.80/libviews/sourceview.cpp 2014-06-24 07:03:33.000000000 +0200 @@ -248,13 +248,13 @@ sLine = (TraceLine*) _selectedItem; if (_selectedItem->type() == ProfileContext::Instr) sLine = ((TraceInstr*)_selectedItem)->line(); - if (!sLine) - return; + if ((_selectedItem->type() != ProfileContext::Function) && (sLine == 0)) + return; QList<QTreeWidgetItem*> items = selectedItems(); SourceItem* si = (items.count() > 0) ? (SourceItem*)items[0] : 0; if (si) { - if (si->line() == sLine) return; + if (sLine && (si->line() == sLine)) return; if (si->lineCall() && (si->lineCall()->call()->called() == _selectedItem)) return; } @@ -263,15 +263,15 @@ for (int i=0; i<topLevelItemCount(); i++) { item = topLevelItem(i); si = (SourceItem*)item; - if (si->line() == sLine) { + if (sLine && (si->line() == sLine)) { scrollToItem(item); _inSelectionUpdate = true; setCurrentItem(item); _inSelectionUpdate = false; break; } - item2 = 0; - for (int j=0; i<item->childCount(); j++) { + bool foundCall = false; + for (int j=0; j<item->childCount(); j++) { item2 = item->child(j); si = (SourceItem*)item2; if (!si->lineCall()) continue; @@ -280,10 +280,11 @@ _inSelectionUpdate = true; setCurrentItem(item2); _inSelectionUpdate = false; + foundCall = true; break; } } - if (item2) break; + if (foundCall) break; } return; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
