Fix KDE compile
This commit is contained in:
committed by
craig.p.drummond
parent
a80cfd45ad
commit
c874af4bff
@@ -333,6 +333,20 @@ static inline void addEventFilter(QObject *object, QObject *filter)
|
||||
object->installEventFilter(filter);
|
||||
}
|
||||
|
||||
void GtkProxyStyle::destroySliderThumb()
|
||||
{
|
||||
if (sbarThumb) {
|
||||
sbarThumb->setVisible(false);
|
||||
sbarThumb->deleteLater();
|
||||
sbarThumb=0;
|
||||
}
|
||||
if (sbarEdgeTimer) {
|
||||
sbarEdgeTimer->stop();
|
||||
sbarEdgeTimer->deleteLater();
|
||||
sbarEdgeTimer=0;
|
||||
}
|
||||
}
|
||||
|
||||
void GtkProxyStyle::polish(QWidget *widget)
|
||||
{
|
||||
if (useOverlayScrollbars && sbarThumb && widget && qobject_cast<QAbstractScrollArea *>(widget) && qstrcmp(widget->metaObject()->className(), "QComboBoxListView")) {
|
||||
@@ -344,6 +358,16 @@ void GtkProxyStyle::polish(QWidget *widget)
|
||||
baseStyle()->polish(widget);
|
||||
}
|
||||
|
||||
void GtkProxyStyle::polish(QPalette &pal)
|
||||
{
|
||||
baseStyle()->polish(pal);
|
||||
}
|
||||
|
||||
void GtkProxyStyle::polish(QApplication *app)
|
||||
{
|
||||
baseStyle()->polish(app);
|
||||
}
|
||||
|
||||
void GtkProxyStyle::unpolish(QWidget *widget)
|
||||
{
|
||||
if (useOverlayScrollbars && sbarThumb && widget) {
|
||||
@@ -357,18 +381,9 @@ void GtkProxyStyle::unpolish(QWidget *widget)
|
||||
baseStyle()->unpolish(widget);
|
||||
}
|
||||
|
||||
void GtkProxyStyle::destroySliderThumb()
|
||||
void GtkProxyStyle::unpolish(QApplication *app)
|
||||
{
|
||||
if (sbarThumb) {
|
||||
sbarThumb->setVisible(false);
|
||||
sbarThumb->deleteLater();
|
||||
sbarThumb=0;
|
||||
}
|
||||
if (sbarEdgeTimer) {
|
||||
sbarEdgeTimer->stop();
|
||||
sbarEdgeTimer->deleteLater();
|
||||
sbarEdgeTimer=0;
|
||||
}
|
||||
baseStyle()->unpolish(app);
|
||||
}
|
||||
|
||||
bool GtkProxyStyle::eventFilter(QObject *object, QEvent *event)
|
||||
|
||||
@@ -45,11 +45,15 @@ public:
|
||||
int pixelMetric(PixelMetric metric, const QStyleOption *option, const QWidget *widget) const;
|
||||
QRect subControlRect(ComplexControl control, const QStyleOptionComplex *option, SubControl subControl, const QWidget *widget) const;
|
||||
void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option, QPainter *painter, const QWidget *widget) const;
|
||||
void polish(QWidget *widget);
|
||||
void unpolish(QWidget *widget);
|
||||
bool eventFilter(QObject *object, QEvent *event);
|
||||
void destroySliderThumb();
|
||||
|
||||
void polish(QWidget *widget);
|
||||
void polish(QPalette &pal);
|
||||
void polish(QApplication *app);
|
||||
void unpolish(QWidget *widget);
|
||||
void unpolish(QApplication *app);
|
||||
|
||||
private Q_SLOTS:
|
||||
void objectDestroyed(QObject *);
|
||||
void sbarThumbMoved(const QPoint &point);
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
#include "messagebox.h"
|
||||
#include "icon.h"
|
||||
#include "dialog.h"
|
||||
#include "localize.h"
|
||||
#include <QGridLayout>
|
||||
#include <QLabel>
|
||||
#include <QListWidget>
|
||||
|
||||
@@ -27,8 +27,8 @@
|
||||
#include "dialog.h"
|
||||
#ifdef ENABLE_KDE_SUPPORT
|
||||
#include <KDE/KMessageBox>
|
||||
class MessageBox: public KMessageBox {
|
||||
static errorListEx(QWidget *parent, const QString &message, const QStringList &strlist, const QString &title=QString());
|
||||
struct MessageBox: public KMessageBox {
|
||||
static void errorListEx(QWidget *parent, const QString &message, const QStringList &strlist, const QString &title=QString());
|
||||
};
|
||||
#else
|
||||
#include <QMessageBox>
|
||||
|
||||
Reference in New Issue
Block a user