diff options
| author | Alex Richardson <[email protected]> | 2014-04-06 03:32:55 +0200 |
|---|---|---|
| committer | Alex Richardson <[email protected]> | 2014-05-05 23:05:13 +0200 |
| commit | 2f045c60109e0a5811f68bcce617236e3478e402 (patch) | |
| tree | 9c46f4506f5a693ddecd2564e0883e9fe2d0cf13 /src/panels/information | |
| parent | c2887688f102d0412ba93c74facd5ed007185e3a (diff) | |
Allow compiling Dolphin with KF5
This does not work properly yet, there are probably quite a few bad signal/
slot connections due to KUrl -> QUrl. However dolphin starts without
crashing.
Accessibility is not ported since that changed quite a lot from Qt4 -> Qt5
and I have no idea how it is supposed to be used.
This is the first commit for review 117395
Diffstat (limited to 'src/panels/information')
| -rw-r--r-- | src/panels/information/informationpanel.cpp | 4 | ||||
| -rw-r--r-- | src/panels/information/informationpanelcontent.cpp | 6 | ||||
| -rw-r--r-- | src/panels/information/phononwidget.cpp | 1 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp index eda74f3b5..3da076956 100644 --- a/src/panels/information/informationpanel.cpp +++ b/src/panels/information/informationpanel.cpp @@ -22,10 +22,12 @@ #include "informationpanelcontent.h" #include <KIO/Job> #include <KIO/JobUiDelegate> +#include <KJobWidgets> #include <KDirNotify> #include <QApplication> #include <QShowEvent> #include <QVBoxLayout> +#include <QTimer> InformationPanel::InformationPanel(QWidget* parent) : Panel(parent), @@ -184,7 +186,7 @@ void InformationPanel::showItemInfo() // an item for the currently shown directory. m_folderStatJob = KIO::stat(url(), KIO::HideProgressInfo); if (m_folderStatJob->ui()) { - m_folderStatJob->ui()->setWindow(this); + KJobWidgets::setWindow(m_folderStatJob, this); } connect(m_folderStatJob, SIGNAL(result(KJob*)), this, SLOT(slotFolderStatFinished(KJob*))); diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp index b2dd1582e..ee5e350af 100644 --- a/src/panels/information/informationpanelcontent.cpp +++ b/src/panels/information/informationpanelcontent.cpp @@ -24,8 +24,10 @@ #include <KGlobalSettings> #include <KIO/JobUiDelegate> #include <KIO/PreviewJob> +#include <KJobWidgets> #include <KIconEffect> #include <KIconLoader> +#include <KIcon> #include <KLocale> #include <KMenu> #include <kseparator.h> @@ -193,7 +195,7 @@ void InformationPanelContent::showItem(const KFileItem& item) m_previewJob->setScaleType(KIO::PreviewJob::Unscaled); m_previewJob->setIgnoreMaximumSize(item.isLocalFile()); if (m_previewJob->ui()) { - m_previewJob->ui()->setWindow(this); + KJobWidgets::setWindow(m_previewJob, this); } connect(m_previewJob, SIGNAL(gotPreview(KFileItem,QPixmap)), @@ -283,7 +285,7 @@ void InformationPanelContent::configureSettings(const QList<QAction*>& customCon KMenu popup(this); QAction* previewAction = popup.addAction(i18nc("@action:inmenu", "Preview")); - previewAction->setIcon(KIcon("view-preview")); + previewAction->setIcon(QIcon::fromTheme("view-preview")); previewAction->setCheckable(true); previewAction->setChecked(InformationPanelSettings::previewsShown()); diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp index a36ada180..092b5dd5b 100644 --- a/src/panels/information/phononwidget.cpp +++ b/src/panels/information/phononwidget.cpp @@ -33,6 +33,7 @@ #include <KDialog> #include <KIcon> +#include <KIconLoader> #include <KUrl> #include <KLocale> |