alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make the checks consistent with the rest of the methods: check the count of d->pages, not the tabwidget proxy; use value() instead of [] as it is protected against OOB indexes

Browse Source 
BUG:248976

svn path=/trunk/KDE/kdelibs/; revision=1168059
This commit is contained in:
Aaron J. Seigo 2010-08-26 01:22:45 +00:00
parent db7227e7f4
commit 6aa1aab52b
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
widgets/tabbar.cpp
View File

@ -101,8 +101,8 @@ public:
int currentIndex;
bool tabWidgetMode;
QWeakPointer<QGraphicsWidget>oldPage;
QWeakPointer<QGraphicsWidget>newPage;
QWeakPointer<QGraphicsWidget> oldPage;
QWeakPointer<QGraphicsWidget> newPage;
int oldPageAnimId;
int newPageAnimId;
Animation *oldPageAnim;
@ -360,20 +360,20 @@ void TabBar::resizeEvent(QGraphicsSceneResizeEvent * event)
void TabBar::setCurrentIndex(int index)
{
if (index >= d->tabProxy->native->count() ||
d->tabProxy->native->count() <= 1 ||
if (index >= d->pages.count() ||
d->pages.count() < 2 ||
d->currentIndex == index) {
return;
}
if (d->currentIndex >= 0) {
d->oldPage = d->pages[d->currentIndex];
d->oldPage = d->pages.value(d->currentIndex);
if (d->oldPage) {
d->tabWidgetLayout->removeItem(d->oldPage.data());
}
d->tabWidgetLayout->removeItem(d->oldPage.data());
if (index >= 0) {
d->newPage = d->pages[index];
d->newPage = d->pages.value(index);
}
setFlags(QGraphicsItem::ItemClipsChildrenToShape);
@ -434,7 +434,6 @@ void TabBar::setCurrentIndex(int index)
}
d->currentIndex = index;
d->tabProxy->native->setCurrentIndex(index);
}