diff --git a/src/ActionClasses.cpp b/src/ActionClasses.cpp --- a/src/ActionClasses.cpp +++ b/src/ActionClasses.cpp @@ -239,16 +239,16 @@ m_function( b ); KToggleAction::setChecked( b ); - AmarokConfig::self()->writeConfig(); //So we don't lose the setting when crashing + AmarokConfig::self()->save(); //So we don't lose the setting when crashing if( announce ) emit toggled( b ); //KToggleAction doesn't do this for us. How gay! } void ToggleAction::setEnabled( bool b ) { const bool announce = b != isEnabled(); KToggleAction::setEnabled( b ); - AmarokConfig::self()->writeConfig(); //So we don't lose the setting when crashing + AmarokConfig::self()->save(); //So we don't lose the setting when crashing if( announce ) emit QAction::triggered( b ); } @@ -273,23 +273,23 @@ m_function( n ); KSelectAction::setCurrentItem( n ); - AmarokConfig::self()->writeConfig(); //So we don't lose the setting when crashing + AmarokConfig::self()->save(); //So we don't lose the setting when crashing if( announce ) emit triggered( n ); } void SelectAction::actionTriggered( QAction *a ) { m_function( currentItem() ); - AmarokConfig::self()->writeConfig(); + AmarokConfig::self()->save(); KSelectAction::actionTriggered( a ); } void SelectAction::setEnabled( bool b ) { const bool announce = b != isEnabled(); KSelectAction::setEnabled( b ); - AmarokConfig::self()->writeConfig(); //So we don't lose the setting when crashing + AmarokConfig::self()->save(); //So we don't lose the setting when crashing if( announce ) emit QAction::triggered( b ); } @@ -362,7 +362,7 @@ { KToolBar *bar = dynamic_cast(w); - if( bar && KAuthorized::authorizeKAction( objectName() ) ) + if( bar && KAuthorized::authorizeAction( objectName() ) ) { //const int id = QAction::getToolButtonID(); diff --git a/src/KNotificationBackend.cpp b/src/KNotificationBackend.cpp --- a/src/KNotificationBackend.cpp +++ b/src/KNotificationBackend.cpp @@ -80,7 +80,7 @@ KNotificationBackend::isFullscreenWindowActive() const { // Get information of the active window. - KWindowInfo activeWindowInfo = KWindowSystem::windowInfo( KWindowSystem::activeWindow(), NET::WMState ); + KWindowInfo activeWindowInfo( KWindowSystem::activeWindow(), NET::WMState ); // Check if it is running in fullscreen mode. return activeWindowInfo.hasState( NET::FullScreen ); diff --git a/src/SvgTinter.cpp b/src/SvgTinter.cpp --- a/src/SvgTinter.cpp +++ b/src/SvgTinter.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include SvgTinter * SvgTinter::s_instance = 0; @@ -54,7 +54,7 @@ if (!svg_source.startsWith("open(QIODevice::ReadOnly)) diff --git a/src/aboutdialog/AnimatedBarWidget.cpp b/src/aboutdialog/AnimatedBarWidget.cpp --- a/src/aboutdialog/AnimatedBarWidget.cpp +++ b/src/aboutdialog/AnimatedBarWidget.cpp @@ -144,18 +144,18 @@ const bool isHovered = isHoverHintEnabled(); if( isHovered ) { - QStyleOptionViewItemV4 option; + QStyleOptionViewItem option; option.initFrom(this); option.state = QStyle::State_Enabled | QStyle::State_Selected; - option.viewItemPosition = QStyleOptionViewItemV4::OnlyOne; + option.viewItemPosition = QStyleOptionViewItem::OnlyOne; style()->drawPrimitive( QStyle::PE_PanelItemViewItem, &option, painter, this ); } else { - QStyleOptionViewItemV4 option; + QStyleOptionViewItem option; option.initFrom(this); option.state = QStyle::State_Enabled | QStyle::State_MouseOver; - option.viewItemPosition = QStyleOptionViewItemV4::OnlyOne; + option.viewItemPosition = QStyleOptionViewItem::OnlyOne; style()->drawPrimitive( QStyle::PE_PanelItemViewItem, &option, painter, this ); } } diff --git a/src/aboutdialog/FramedLabel.cpp b/src/aboutdialog/FramedLabel.cpp --- a/src/aboutdialog/FramedLabel.cpp +++ b/src/aboutdialog/FramedLabel.cpp @@ -38,10 +38,10 @@ if( frameShape() == QFrame::StyledPanel ) { QPainter painter( this ); - QStyleOptionViewItemV4 option; + QStyleOptionViewItem option; option.initFrom( this ); option.state = QStyle::State_Enabled | QStyle::State_MouseOver; - option.viewItemPosition = QStyleOptionViewItemV4::OnlyOne; + option.viewItemPosition = QStyleOptionViewItem::OnlyOne; style()->drawPrimitive( QStyle::PE_PanelItemViewItem, &option, &painter, this ); } QRect cr = contentsRect(); diff --git a/src/aboutdialog/OcsPersonItem.cpp b/src/aboutdialog/OcsPersonItem.cpp --- a/src/aboutdialog/OcsPersonItem.cpp +++ b/src/aboutdialog/OcsPersonItem.cpp @@ -124,7 +124,7 @@ OcsPersonItem::launchUrl( QAction *action ) //SLOT { QUrl url = QUrl( action->data().toString() ); - KRun::runUrl( url, "text/html", 0, false ); + KRun::runUrl( url, "text/html", nullptr, KRun::RunExecutables, QString() ); } void diff --git a/src/browsers/playlistbrowser/QtGroupingProxy.h b/src/browsers/playlistbrowser/QtGroupingProxy.h --- a/src/browsers/playlistbrowser/QtGroupingProxy.h +++ b/src/browsers/playlistbrowser/QtGroupingProxy.h @@ -112,7 +112,7 @@ */ struct ParentCreate { - int parentCreateIndex; + quintptr parentCreateIndex; int row; }; mutable QList m_parentCreateList; diff --git a/src/browsers/playlistbrowser/QtGroupingProxy.cpp b/src/browsers/playlistbrowser/QtGroupingProxy.cpp --- a/src/browsers/playlistbrowser/QtGroupingProxy.cpp +++ b/src/browsers/playlistbrowser/QtGroupingProxy.cpp @@ -824,13 +824,11 @@ while( it.hasPrevious() ) { it.previous(); - int groupIndex = it.key(); //has to be a modifiable reference for remove and replace operations QList &groupList = it.value(); int rowIndex = groupList.indexOf( start ); if( rowIndex != -1 ) { - QModelIndex proxyParent = index( groupIndex, 0 ); groupList.removeAt( rowIndex ); } //Now decrement all source rows that are after the removed row diff --git a/src/scripting/scriptconsole/CompletionModel.h b/src/scripting/scriptconsole/CompletionModel.h --- a/src/scripting/scriptconsole/CompletionModel.h +++ b/src/scripting/scriptconsole/CompletionModel.h @@ -37,7 +37,7 @@ private: QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const; void completionInvoked( KTextEditor::View *view, const KTextEditor::Range &range, InvocationType invocationType ); - void executeCompletionItem( KTextEditor::Document *document, const KTextEditor::Range &range, int row ) const; + void executeCompletionItem( KTextEditor::View *view, const KTextEditor::Range &range, const QModelIndex &index ) const; KTextEditor::Range completionRange( KTextEditor::View *view, const KTextEditor::Cursor &position ); bool shouldAbortCompletion( KTextEditor::View *view, const KTextEditor::Range &range, const QString ¤tCompletion ); diff --git a/src/scripting/scriptconsole/CompletionModel.cpp b/src/scripting/scriptconsole/CompletionModel.cpp --- a/src/scripting/scriptconsole/CompletionModel.cpp +++ b/src/scripting/scriptconsole/CompletionModel.cpp @@ -108,9 +108,9 @@ } void -AmarokScriptCodeCompletionModel::executeCompletionItem( KTextEditor::Document *document, const KTextEditor::Range &range, int row ) const +AmarokScriptCodeCompletionModel::executeCompletionItem( KTextEditor::View *view, const KTextEditor::Range &range, const QModelIndex &index ) const { - document->replaceText( range, m_completionList.at( row ) ); + view->document()->replaceText( range, m_completionList.at( index.row() ) ); } AmarokScriptCodeCompletionModel::~AmarokScriptCodeCompletionModel() diff --git a/src/services/magnatune/MagnatuneXmlParser.cpp b/src/services/magnatune/MagnatuneXmlParser.cpp --- a/src/services/magnatune/MagnatuneXmlParser.cpp +++ b/src/services/magnatune/MagnatuneXmlParser.cpp @@ -21,7 +21,7 @@ #include "core/support/Components.h" #include "core/interfaces/Logger.h" -#include +#include #include #include @@ -103,28 +103,27 @@ return; } - QIODevice *file = KFilterDev::deviceForFile( filename, "application/x-bzip2", true ); - if ( !file || !file->open( QIODevice::ReadOnly ) ) { + QFile file( filename ); + auto device = new KCompressionDevice( &file, true, KCompressionDevice::BZip2 ); + if ( !device || !device->open( QIODevice::ReadOnly ) ) { debug() << "MagnatuneXmlParser::readConfigFile error reading file"; return ; } - if ( !doc.setContent( file ) ) + if ( !doc.setContent( device ) ) { debug() << "MagnatuneXmlParser::readConfigFile error parsing file"; - file->close(); + device->close(); return ; } - file->close(); - delete file; - + device->close(); + delete device; m_dbHandler->destroyDatabase(); m_dbHandler->createDatabase(); //run through all the elements QDomElement docElem = doc.documentElement(); - m_dbHandler->begin(); //start transaction (MAJOR speedup!!) parseElement( docElem ); m_dbHandler->commit(); //complete transaction diff --git a/src/statsyncing/models/CommonModel.cpp b/src/statsyncing/models/CommonModel.cpp --- a/src/statsyncing/models/CommonModel.cpp +++ b/src/statsyncing/models/CommonModel.cpp @@ -79,10 +79,10 @@ static QSize size; if( size.isValid() ) // optimization return size; - QStyleOptionViewItemV4 opt; - opt.features = QStyleOptionViewItemV2::HasDisplay - | QStyleOptionViewItemV2::HasCheckIndicator - | QStyleOptionViewItemV2::HasDecoration; + QStyleOptionViewItem opt; + opt.features = QStyleOptionViewItem::HasDisplay + | QStyleOptionViewItem::HasCheckIndicator + | QStyleOptionViewItem::HasDecoration; opt.state = QStyle::State_Enabled; opt.decorationSize = s_ratingSize; @@ -97,8 +97,8 @@ static QSize size; if( size.isValid() ) // optimization return size; - QStyleOptionViewItemV4 opt; - opt.features = QStyleOptionViewItemV2::HasDisplay; + QStyleOptionViewItem opt; + opt.features = QStyleOptionViewItem::HasDisplay; opt.state = QStyle::State_Enabled; opt.text = "88.88.8888 88:88"; @@ -111,8 +111,8 @@ static QSize size; if( size.isValid() ) // optimization return size; - QStyleOptionViewItemV4 opt; - opt.features = QStyleOptionViewItemV2::HasDisplay; + QStyleOptionViewItem opt; + opt.features = QStyleOptionViewItem::HasDisplay; opt.state = QStyle::State_Enabled; opt.text = "888 (88)"; opt.font.setBold( true ); diff --git a/src/statsyncing/models/MatchedTracksModel.cpp b/src/statsyncing/models/MatchedTracksModel.cpp --- a/src/statsyncing/models/MatchedTracksModel.cpp +++ b/src/statsyncing/models/MatchedTracksModel.cpp @@ -26,7 +26,7 @@ using namespace StatSyncing; -static const int tupleIndexIndernalId = -1; +static const quintptr tupleIndexIndernalId = 0; MatchedTracksModel::MatchedTracksModel( const QList &matchedTuples, const QList &columns, const Options &options, QObject *parent ) @@ -117,7 +117,7 @@ return QVariant(); return tupleData( tuple, field, role ); } - else if( index.internalId() < m_matchedTuples.count() ) + else if( index.internalId() < (quintptr)m_matchedTuples.count() ) { TrackTuple tuple = m_matchedTuples.value( index.internalId() ); ProviderPtr provider = tuple.provider( index.row() ); @@ -132,7 +132,7 @@ MatchedTracksModel::setData( const QModelIndex &idx, const QVariant &value, int role ) { if( !idx.isValid() || - idx.internalId() >= m_matchedTuples.count() || + idx.internalId() >= (quintptr)m_matchedTuples.count() || role != Qt::CheckStateRole ) { return false; diff --git a/src/statsyncing/ui/TrackDelegate.cpp b/src/statsyncing/ui/TrackDelegate.cpp --- a/src/statsyncing/ui/TrackDelegate.cpp +++ b/src/statsyncing/ui/TrackDelegate.cpp @@ -47,7 +47,7 @@ data.type() == QVariant::Int ) { // following is largely inspired by QStyledItemDelegate::paint() - QStyleOptionViewItemV4 opt = option; + QStyleOptionViewItem opt = option; initStyleOption( &opt, index ); QPixmap starsPixmap( CommonModel::s_ratingSize ); @@ -69,7 +69,7 @@ } opt.text.clear(); - opt.features |= QStyleOptionViewItemV2::HasDecoration; + opt.features |= QStyleOptionViewItem::HasDecoration; opt.decorationSize = CommonModel::s_ratingSize; opt.decorationAlignment = Qt::AlignRight | Qt::AlignVCenter; opt.decorationPosition = QStyleOptionViewItem::Right; diff --git a/src/widgets/BreadcrumbItemButton.cpp b/src/widgets/BreadcrumbItemButton.cpp --- a/src/widgets/BreadcrumbItemButton.cpp +++ b/src/widgets/BreadcrumbItemButton.cpp @@ -158,10 +158,10 @@ { // QColor backgroundColor = palette().color(QPalette::Highlight); // TODO: the backgroundColor should be applied to the style - QStyleOptionViewItemV4 option; + QStyleOptionViewItem option; option.initFrom(this); option.state = QStyle::State_Enabled | QStyle::State_MouseOver; - option.viewItemPosition = QStyleOptionViewItemV4::OnlyOne; + option.viewItemPosition = QStyleOptionViewItem::OnlyOne; style()->drawPrimitive( QStyle::PE_PanelItemViewItem, &option, painter, this ); } } diff --git a/tests/dynamic/TestDynamicModel.cpp b/tests/dynamic/TestDynamicModel.cpp --- a/tests/dynamic/TestDynamicModel.cpp +++ b/tests/dynamic/TestDynamicModel.cpp @@ -324,9 +324,8 @@ // -- copy a bias // TODO - QModelIndex biasIndex = model->index( 0, 0, playlistIndex ); - QModelIndex subBiasIndex = model->index( 0, 0, biasIndex ); - +// QModelIndex biasIndex = model->index( 0, 0, playlistIndex ); +// QModelIndex subBiasIndex = model->index( 0, 0, biasIndex ); } void