diff -r b72c6db6890b -r 5dc02b23752f src/gui/styles/qgtkpainter.cpp --- a/src/gui/styles/qgtkpainter.cpp Wed Jun 23 19:07:03 2010 +0300 +++ b/src/gui/styles/qgtkpainter.cpp Tue Jul 06 15:10:48 2010 +0300 @@ -47,6 +47,7 @@ // This class is primarily a wrapper around the gtk painter functions // and takes care of converting all such calls into cached Qt pixmaps. +#include #include #include #include @@ -142,7 +143,7 @@ } QGtkPainter::QGtkPainter(QPainter *_painter) - : m_window(QGtkStylePrivate::gtkWidget(QLatin1String("GtkWindow"))) + : m_window(QGtkStylePrivate::gtkWidget("GtkWindow")) , m_painter(_painter) , m_alpha(true) , m_hflipped(false) @@ -155,8 +156,12 @@ const QSize &size, GtkWidget *widget = 0) { // Note the widget arg should ideally use the widget path, though would compromise performance - QString tmp = QString(QLS("%0-%1-%2-%3x%4-%5")).arg(key).arg(uint(state)).arg(shadow) - .arg(size.width()).arg(size.height()).arg(quintptr(widget)); + QString tmp = key + % HexString(state) + % HexString(shadow) + % HexString(size.width()) + % HexString(size.height()) + % HexString(quint64(widget)); return tmp; }