Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-24 10:52:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

qguiplatformplugin_kde: when build against Katie use its QGuiPlatformPlugin interface

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-05-19 18:31:35 +00:00
parent f220ab7a37
commit 17942687ac
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
View file

@ -27,6 +27,7 @@
#include <KIcon> #include <KIcon>
#include <KFileDialog> #include <KFileDialog>
#include <KColorDialog> #include <KColorDialog>
#include <KDebug>
#include <QtCore/QHash> #include <QtCore/QHash>
#include <QtCore/QTimer> #include <QtCore/QTimer>
#include <QtGui/QFileDialog> #include <QtGui/QFileDialog>
@ -35,9 +36,12 @@
#include <QtGui/QToolButton> #include <QtGui/QToolButton>
#include <QtGui/QToolBar> #include <QtGui/QToolBar>
#include <QtGui/QMainWindow> #include <QtGui/QMainWindow>
#include "qguiplatformplugin_p.h"
#include <kdebug.h> #ifndef QT_KATIE
#include "qguiplatformplugin_p.h"
#else
#include "qguiplatformplugin.h"
#endif
/* /*
* Map a Qt filter string into a KDE one. * Map a Qt filter string into a KDE one.
@ -173,7 +177,10 @@ public:
} }
virtual QIcon fileSystemIcon(const QFileInfo &file) virtual QIcon fileSystemIcon(const QFileInfo &file)
{ {
return KIcon(KMimeType::findByPath(file.filePath(), 0, true)->iconName()); KMimeType::Ptr mime = KMimeType::findByPath(file.filePath(), 0, true);
if (!mime)
return QIcon();
return KIcon(mime->iconName());
} }
virtual int platformHint(PlatformHint hint) virtual int platformHint(PlatformHint hint)
{ {

6
qguiplatformplugin_kde/qguiplatformplugin_p.h
View file

@ -57,13 +57,13 @@
#include <QtCore/qfactoryinterface.h> #include <QtCore/qfactoryinterface.h>
#include <QtGui/qdialog.h> #include <QtGui/qdialog.h>
#ifndef QT_KATIE
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef QT_KATIE
QT_MODULE(Gui) QT_MODULE(Gui)
#endif
#include <QPalette> #include <QPalette>
#include <QIcon> #include <QIcon>
@ -94,7 +94,6 @@ class Q_GUI_EXPORT QGuiPlatformPlugin : public QObject, public QGuiPlatformPlugi
enum PlatformHint { PH_ToolButtonStyle, PH_ToolBarIconSize, PH_ItemView_ActivateItemOnSingleClick }; enum PlatformHint { PH_ToolButtonStyle, PH_ToolBarIconSize, PH_ItemView_ActivateItemOnSingleClick };
virtual int platformHint(PlatformHint hint); virtual int platformHint(PlatformHint hint);
virtual void fileDialogDelete(QFileDialog *) {} virtual void fileDialogDelete(QFileDialog *) {}
virtual bool fileDialogSetVisible(QFileDialog *, bool) { return false; } virtual bool fileDialogSetVisible(QFileDialog *, bool) { return false; }
virtual QDialog::DialogCode fileDialogResultCode(QFileDialog *) { return QDialog::Rejected; } virtual QDialog::DialogCode fileDialogResultCode(QFileDialog *) { return QDialog::Rejected; }
@ -123,5 +122,6 @@ Q_DECLARE_INTERFACE(QGuiPlatformPluginInterface, QGuiPlatformPluginInterface_iid
QT_END_HEADER QT_END_HEADER
#endif // QT_KATIE
#endif // QGUIPLATFORMPLUGIN_H #endif // QGUIPLATFORMPLUGIN_H