Hello community, here is the log from the commit of package kcachegrind for openSUSE:Factory checked in at 2014-08-25 11:01:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-16 16:17:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kcachegrind.new/kcachegrind.changes 2014-08-25 11:02:48.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Aug 15 09:07:53 UTC 2014 - [email protected] + +- Update to 4.14.0 + * KDE 4.14.0 SC Final Release + * See http://www.kde.org/announcements/4.13/ + +------------------------------------------------------------------- +Thu Jul 17 16:44:06 UTC 2014 - [email protected] + +- Update to 4.13.90 + * KDE 4.14 Beta 2 release + * See http://www.kde.org/announcements/announce-4.14-beta2.php + +------------------------------------------------------------------- Old: ---- kcachegrind-4.13.80.tar.xz New: ---- kcachegrind-4.14.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcachegrind.spec ++++++ --- /var/tmp/diff_new_pack.MMR62H/_old 2014-08-25 11:02:49.000000000 +0200 +++ /var/tmp/diff_new_pack.MMR62H/_new 2014-08-25 11:02:49.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.80 +Version: 4.14.0 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kcachegrind-4.13.80.tar.xz -> kcachegrind-4.14.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-4.13.80/libviews/instritem.cpp new/kcachegrind-4.14.0/libviews/instritem.cpp --- old/kcachegrind-4.13.80/libviews/instritem.cpp 2014-06-24 07:03:33.000000000 +0200 +++ new/kcachegrind-4.14.0/libviews/instritem.cpp 2014-07-23 23:36:47.000000000 +0200 @@ -306,6 +306,7 @@ // InstrItemDelegate::InstrItemDelegate(InstrView *parent) + : QItemDelegate(parent) { _parent = parent; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-4.13.80/libviews/instrview.cpp new/kcachegrind-4.14.0/libviews/instrview.cpp --- old/kcachegrind-4.13.80/libviews/instrview.cpp 2014-06-24 07:03:33.000000000 +0200 +++ new/kcachegrind-4.14.0/libviews/instrview.cpp 2014-07-23 23:36:47.000000000 +0200 @@ -338,28 +338,19 @@ CostItem* InstrView::canShow(CostItem* i) { ProfileContext::Type t = i ? i->type() : ProfileContext::InvalidType; - TraceFunction* f = 0; - switch(t) { - case ProfileContext::Function: - f = (TraceFunction*) i; - break; - - case ProfileContext::Instr: - f = ((TraceInstr*)i)->function(); - select(i); - break; - - case ProfileContext::Line: - f = ((TraceLine*)i)->functionSource()->function(); - select(i); - break; - - default: - break; - } + switch(t) { + case ProfileContext::Function: + case ProfileContext::Instr: + case ProfileContext::InstrJump: + case ProfileContext::Line: + return i; + + default: + break; + } - return f; + return 0; } @@ -382,12 +373,17 @@ (ii->instrCall()->call()->called() == _selectedItem)) return; } + TraceInstrJump* ij = 0; + if (_selectedItem->type() == ProfileContext::InstrJump) + ij = (TraceInstrJump*) _selectedItem; + QTreeWidgetItem *item, *item2; for (int i=0; i<topLevelItemCount(); i++) { item = topLevelItem(i); ii = (InstrItem*)item; if ((ii->instr() == _selectedItem) || - (ii->instr() && (ii->instr()->line() == _selectedItem))) { + (ii->instr() && (ii->instr()->line() == _selectedItem)) || + (ij && (ij->instrTo() == ii->instr())) ) { scrollToItem(item); _inSelectionUpdate = true; setCurrentItem(item); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-4.13.80/libviews/sourceitem.cpp new/kcachegrind-4.14.0/libviews/sourceitem.cpp --- old/kcachegrind-4.13.80/libviews/sourceitem.cpp 2014-06-24 07:03:33.000000000 +0200 +++ new/kcachegrind-4.14.0/libviews/sourceitem.cpp 2014-07-23 23:36:47.000000000 +0200 @@ -297,6 +297,7 @@ // SourceItemDelegate::SourceItemDelegate(SourceView *parent) + : QItemDelegate(parent) { _parent = parent; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-4.13.80/libviews/sourceview.cpp new/kcachegrind-4.14.0/libviews/sourceview.cpp --- old/kcachegrind-4.13.80/libviews/sourceview.cpp 2014-06-24 07:03:33.000000000 +0200 +++ new/kcachegrind-4.14.0/libviews/sourceview.cpp 2014-07-23 23:36:47.000000000 +0200 @@ -208,29 +208,19 @@ CostItem* SourceView::canShow(CostItem* i) { - ProfileContext::Type t = i ? i->type() : ProfileContext::InvalidType; - TraceFunction* f = 0; - - switch(t) { - case ProfileContext::Function: - f = (TraceFunction*) i; - break; - - case ProfileContext::Instr: - f = ((TraceInstr*)i)->function(); - select(i); - break; - - case ProfileContext::Line: - f = ((TraceLine*)i)->functionSource()->function(); - select(i); - break; + ProfileContext::Type t = i ? i->type() : ProfileContext::InvalidType; - default: - break; - } + switch(t) { + case ProfileContext::Function: + case ProfileContext::Instr: + case ProfileContext::Line: + return i; + + default: + break; + } - return f; + return 0; } void SourceView::doUpdate(int changeType, bool) @@ -333,7 +323,8 @@ if (t == ProfileContext::Function) f = (TraceFunction*) _activeItem; if (t == ProfileContext::Instr) { f = ((TraceInstr*)_activeItem)->function(); - if (!_selectedItem) _selectedItem = _activeItem; + if (!_selectedItem) + _selectedItem = ((TraceInstr*)_activeItem)->line(); } if (t == ProfileContext::Line) { f = ((TraceLine*)_activeItem)->functionSource()->function(); @@ -372,6 +363,7 @@ } // reset to the original position - this is useful when the view // is refreshed just because we change between relative/absolute + // FIXME: this overrides scrolling to selected item verticalScrollBar()->setValue(originalPosition); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-4.13.80/libviews/traceitemview.cpp new/kcachegrind-4.14.0/libviews/traceitemview.cpp --- old/kcachegrind-4.13.80/libviews/traceitemview.cpp 2014-06-24 07:03:33.000000000 +0200 +++ new/kcachegrind-4.14.0/libviews/traceitemview.cpp 2014-07-23 23:36:47.000000000 +0200 @@ -22,6 +22,7 @@ #include "traceitemview.h" +#include <QtGlobal> #include <QWidget> #include "toplevelbase.h" @@ -109,13 +110,14 @@ bool TraceItemView::activate(CostItem* i) { - i = canShow(i); - if (_activeItem == i) return (i != 0); - - _newActiveItem = i; - updateView(); + _newActiveItem = canShow(i); + if (_activeItem != _newActiveItem) { + // new item activated, start with empty selection + _newSelectedItem = 0; + updateView(); + } - return (i != 0); + return (_newActiveItem != 0); } TraceFunction* TraceItemView::activeFunction() @@ -146,8 +148,10 @@ _newPartList = l; _newSelectedItem = s; _newActiveItem = canShow(a); - if (!_newActiveItem) + if (_activeItem != _newActiveItem) { + // new item activated, start with empty selection _newSelectedItem = 0; + } updateView(); return (_newActiveItem != 0); @@ -273,35 +277,37 @@ if (!force && (_status == nothingChanged)) return; #if TRACE_UPDATES - qDebug() << (widget() ? widget()->name() : "TraceItemView") - << "::doUpdate ( " - << ((_status & dataChanged) ? "data ":"") - << ((_status & configChanged) ? "config ":"") - << ")"; + qDebug("%s::doUpate", + widget() ? qPrintable(widget()->objectName()) : "TraceItemView"); + + if (_status & dataChanged) + qDebug(" data changed"); + + if (_status & configChanged) + qDebug(" config changed"); if (_status & partsChanged) - qDebug() << " Part List " - << _partList.names(); + qDebug(" parts changed: %s", qPrintable(_partList[0]->name()) ); if (_status & eventTypeChanged) - qDebug() << " Cost type " - << (_eventType ? qPrintable( _eventType->name() ) : "?"); + qDebug(" event type 1 changed: %s", + _eventType ? qPrintable( _eventType->name() ) : "(None)"); if (_status & eventType2Changed) - qDebug() << " Cost type 2 " - << (_eventType2 ? qPrintable( _eventType2->name() ) : "?"); + qDebug(" event type 2 changed: %s", + _eventType2 ? qPrintable( _eventType2->name() ) : "(None)"); if (_status & groupTypeChanged) - qDebug() << " Group type " - << ProfileContext::typeName(_groupType); + qDebug(" group type changed: %s", + qPrintable(ProfileContext::typeName(_groupType))); if (_status & activeItemChanged) - qDebug() << " Active: " - << (_activeItem ? qPrintable( _activeItem->fullName() ) : "?"); + qDebug(" active item changed: %s", + _activeItem ? qPrintable( _activeItem->fullName() ) : "(none)"); if (_status & selectedItemChanged) - qDebug() << " Selected: " - << (_selectedItem ? qPrintable( _selectedItem->fullName() ) : "?"); + qDebug(" selected item changed: %s", + _selectedItem ? qPrintable( _selectedItem->fullName() ) : "(none)"); #endif int st = _status; @@ -312,12 +318,11 @@ void TraceItemView::selected(TraceItemView* /*sender*/, CostItem* i) { -#if TRACE_UPDATES - qDebug() << (widget() ? widget()->name() : "TraceItemView") - << "::selected " - << (i ? qPrintable( i->name() ): "(nil)") - << ", sender " - << sender->widget()->name() << endl; +#if 0 // TRACE_UPDATES + qDebug("%s::selected( item %s, sender %s )", + widget() ? qPrintable(widget()->objectName()) : "TraceItemView", + i ? qPrintable( i->name() ): "(none)", + qPrintable(sender->widget()->objectName()) ); #endif if (_parentView) _parentView->selected(this, i); @@ -325,7 +330,7 @@ void TraceItemView::partsSelected(TraceItemView* /*sender*/, const TracePartList& l) { -#if TRACE_UPDATES +#if 0 // TRACE_UPDATES qDebug() << (widget() ? widget()->name() : "TraceItemView") << "::selected " << l.names() @@ -341,12 +346,11 @@ void TraceItemView::activated(TraceItemView* /*sender*/, CostItem* i) { -#if TRACE_UPDATES - qDebug() << (widget() ? widget()->name() : "TraceItemView") - << "::activated " - << (i ? qPrintable( i->name() ) : "(nil)") - << ", sender " - << sender->widget()->name(); +#if 0 // TRACE_UPDATES + qDebug("%s::activated( item %s, sender %s )", + widget() ? qPrintable(widget()->objectName()) : "TraceItemView", + i ? qPrintable( i->name() ): "(none)", + qPrintable(sender->widget()->objectName()) ); #endif if (_parentView) @@ -394,6 +398,12 @@ void TraceItemView::selected(CostItem* i) { +#if TRACE_UPDATES + qDebug("%s::selected( item %s )", + widget() ? qPrintable(widget()->objectName()) : "TraceItemView", + i ? qPrintable( i->name() ): "(none)" ); +#endif + if (_parentView) _parentView->selected(this, i); @@ -410,9 +420,9 @@ void TraceItemView::activated(CostItem* i) { #if TRACE_UPDATES - qDebug() << (widget() ? widget()->name() : "TraceItemView") - << "::activated " - << (i ? qPrintable( i->name() ): "(nil)"); + qDebug("%s::activated( item %s )", + widget() ? qPrintable(widget()->objectName()) : "TraceItemView", + i ? qPrintable( i->name() ): "(none)" ); #endif if (_parentView) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-4.13.80/libviews/traceitemview.h new/kcachegrind-4.14.0/libviews/traceitemview.h --- old/kcachegrind-4.13.80/libviews/traceitemview.h 2014-06-24 07:03:33.000000000 +0200 +++ new/kcachegrind-4.14.0/libviews/traceitemview.h 2014-07-23 23:36:47.000000000 +0200 @@ -78,8 +78,8 @@ * - <dataChanged> is used if e.g. cycles are recalculated */ enum { nothingChanged = 0, - eventTypeChanged = 1, - eventType2Changed = 2, + eventTypeChanged = 1, + eventType2Changed = 2, groupTypeChanged = 4, partsChanged = 8, activeItemChanged = 16, @@ -171,11 +171,11 @@ virtual QWidget* widget() = 0; /** - * This function is called when a new item should become active. - * Reimplement this in subclasses. + * Called when a new item is about to become active. + * Itemviews should reimplement this to notify that a + * given item cannot be shown (return 0) or should be + * redirected to another item to be shown as active. * - * Returns the real item to become active. You can call select() here. - * Return 0 if nothing can be shown. * Use the methods like data() instead of _data here, as * _data possibly will give old/wrong information. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-4.13.80/qcachegrind/qcachegrind.desktop new/kcachegrind-4.14.0/qcachegrind/qcachegrind.desktop --- old/kcachegrind-4.13.80/qcachegrind/qcachegrind.desktop 2014-06-24 07:03:33.000000000 +0200 +++ new/kcachegrind-4.14.0/qcachegrind/qcachegrind.desktop 2014-07-23 23:36:47.000000000 +0200 @@ -13,6 +13,7 @@ Name[da]=QCachegrind Name[de]=QCachegrind Name[el]=QCachegrind +Name[en_GB]=QCachegrind Name[es]=QCachegrind Name[et]=QCachegrind Name[fi]=QCachegrind diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcachegrind-4.13.80/qcachegrind/qcgtoplevel.cpp new/kcachegrind-4.14.0/qcachegrind/qcgtoplevel.cpp --- old/kcachegrind-4.13.80/qcachegrind/qcgtoplevel.cpp 2014-06-24 07:03:33.000000000 +0200 +++ new/kcachegrind-4.14.0/qcachegrind/qcgtoplevel.cpp 2014-07-23 23:36:47.000000000 +0200 @@ -1201,14 +1201,11 @@ _multiView->activate(_traceItemDelayed); break; -#if 0 - // this conflicts with the selection policy of InstrView ?!? case ProfileContext::Instr: case ProfileContext::Line: // only for multiview _multiView->activate(_traceItemDelayed); break; -#endif default: break; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
