yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change std::vector into QList and updated code accordingly.

Browse source 
Fixed compilation warnings.
This commit is contained in:
Hugo Pereira Da Costa 2012-11-04 20:54:22 +01:00
parent 21463a9a91
commit d5326ea461
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
clients/oxygen/config/oxygenexceptionlistwidget.cpp
View file

@ -78,7 +78,7 @@ namespace Oxygen
//__________________________________________________________
void ExceptionListWidget::setExceptions( const ExceptionList& exceptions )
{
model().set( ExceptionModel::List( exceptions.begin(), exceptions.end() ) );
model().set( exceptions );
resizeColumns();
}
@ -252,10 +252,10 @@ namespace Oxygen
) )
{
Exception last( newExceptions.back() );
newExceptions.pop_back();
newExceptions.push_back( *iter );
newExceptions.push_back( last );
} else newExceptions.push_back( *iter );
newExceptions.removeLast();
newExceptions.append( *iter );
newExceptions.append( last );
} else newExceptions.append( *iter );
}
@ -283,30 +283,34 @@ namespace Oxygen
QModelIndexList selectedIndices( ui.exceptionListView->selectionModel()->selectedIndexes() );
ExceptionModel::List selectedExceptions( model().get( selectedIndices ) );
ExceptionModel::List currentException( model().get() );
ExceptionModel::List currentExceptions( model().get() );
ExceptionModel::List newExceptions;
for( ExceptionModel::List::reverse_iterator iter = currentException.rbegin(); iter != currentException.rend(); ++iter )
ExceptionModel::ListIterator iter( currentExceptions );
iter.toBack();
while( iter.hasPrevious() )
{
const Exception& current( iter.previous() );
// check if new list is not empty, current index is selected and last index is not.
// if yes, move.
if(
!( newExceptions.empty() ||
selectedIndices.indexOf( model().index( *iter ) ) == -1 ||
selectedIndices.indexOf( model().index( newExceptions.back() ) ) != -1
selectedIndices.indexOf( model().index( current ) ) == -1 ||
selectedIndices.indexOf( model().index( newExceptions.front() ) ) != -1
) )
{
Exception last( newExceptions.back() );
newExceptions.pop_back();
newExceptions.push_back( *iter );
newExceptions.push_back( last );
Exception first( newExceptions.front() );
newExceptions.removeFirst();
newExceptions.prepend( current );
newExceptions.prepend( first );
} else newExceptions.push_back( *iter );
} else newExceptions.prepend( current );
}
model().set( ExceptionModel::List( newExceptions.rbegin(), newExceptions.rend() ) );
model().set( newExceptions );
// restore selection
ui.exceptionListView->selectionModel()->select( model().index( selectedExceptions.front() ), QItemSelectionModel::Clear|QItemSelectionModel::Select|QItemSelectionModel::Rows );