diff --git a/krusader/DiskUsage/diskusage.cpp b/krusader/DiskUsage/diskusage.cpp --- a/krusader/DiskUsage/diskusage.cpp +++ b/krusader/DiskUsage/diskusage.cpp @@ -954,7 +954,7 @@ { QPixmap icon; - if (!QPixmapCache::find(mime, icon)) { + if (!QPixmapCache::find(mime, &icon)) { // get the icon. if (mime == "Broken Link !") // FIXME: this doesn't work anymore - the reported mimetype for a broken link is now "unknown" icon = FileListIcon("file-broken").pixmap(); diff --git a/krusader/GUI/krstyleproxy.cpp b/krusader/GUI/krstyleproxy.cpp --- a/krusader/GUI/krstyleproxy.cpp +++ b/krusader/GUI/krstyleproxy.cpp @@ -46,7 +46,7 @@ else newPen.setColor(Qt::white); } else { - newPen.setColor(option->palette.foreground().color()); + newPen.setColor(option->palette.windowText().color()); } newPen.setWidth(0); newPen.setStyle(Qt::DotLine); diff --git a/krusader/Panel/PanelView/krsort.cpp b/krusader/Panel/PanelView/krsort.cpp --- a/krusader/Panel/PanelView/krsort.cpp +++ b/krusader/Panel/PanelView/krsort.cpp @@ -310,15 +310,15 @@ void Sorter::sort() { - qStableSort(_items.begin(), _items.end(), + std::stable_sort(_items.begin(), _items.end(), descending() ? _greaterThanFunc : _lessThanFunc); } int Sorter::insertIndex(FileItem *fileitem, bool isDummy, QVariant customData) { SortProps props(fileitem, _viewProperties->sortColumn, _viewProperties, isDummy, !descending(), -1, std::move(customData)); const QVector::iterator it = - qLowerBound(_items.begin(), _items.end(), &props, + std::lower_bound(_items.begin(), _items.end(), &props, descending() ? _greaterThanFunc : _lessThanFunc); if(it != _items.end()) diff --git a/krusader/Panel/PanelView/krview.cpp b/krusader/Panel/PanelView/krview.cpp --- a/krusader/Panel/PanelView/krview.cpp +++ b/krusader/Panel/PanelView/krview.cpp @@ -344,7 +344,7 @@ //QPixmapCache::setCacheLimit( ag.readEntry("Icon Cache Size",_IconCacheSize) ); // first try the cache - if (!QPixmapCache::find(cacheName, icon)) { + if (!QPixmapCache::find(cacheName, &icon)) { icon = processIcon(Icon(iconName, Icon("unknown")).pixmap(size), dim, dimColor, dimFactor, fileitem->isSymLink()); // insert it into the cache diff --git a/krusader/Panel/listpanelactions.cpp b/krusader/Panel/listpanelactions.cpp --- a/krusader/Panel/listpanelactions.cpp +++ b/krusader/Panel/listpanelactions.cpp @@ -28,8 +28,6 @@ #include "../KViewer/krviewer.h" #include "../icon.h" -// QtCore -#include // QtWidgets #include @@ -41,17 +39,14 @@ ActionsBase(parent, mainWindow) { // set view type - auto *mapper = new QSignalMapper(this); - connect(mapper, QOverload::of(&QSignalMapper::mapped), this, &ListPanelActions::setView); auto *group = new QActionGroup(this); group->setExclusive(true); QList views = KrViewFactory::registeredViews(); for(int i = 0; i < views.count(); i++) { KrViewInstance *inst = views[i]; QAction *action = new QAction(Icon(inst->iconName()), inst->description(), group); action->setCheckable(true); - connect(action, &QAction::triggered, mapper, QOverload<>::of(&QSignalMapper::map)); - mapper->setMapping(action, inst->id()); + connect(action, &QAction::triggered, this, [=] {setView(inst->id());}); _mainWindow->actions()->addAction("view" + QString::number(i), action); _mainWindow->actions()->setDefaultShortcut(action, inst->shortcut()); setViewActions.insert(inst->id(), action); diff --git a/krusader/Synchronizer/synchronizergui.cpp b/krusader/Synchronizer/synchronizergui.cpp --- a/krusader/Synchronizer/synchronizergui.cpp +++ b/krusader/Synchronizer/synchronizergui.cpp @@ -117,7 +117,7 @@ mimeData->setImageData(FileListIcon(isLeft ? "arrow-left-double" : "arrow-right-double").pixmap()); mimeData->setUrls(urls); drag->setMimeData(mimeData); - drag->start(); + drag->exec(); } };