diff options
Diffstat (limited to 'src/widgets/kernel/qapplication_p.h')
| -rw-r--r-- | src/widgets/kernel/qapplication_p.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index 7a880986bf..2d639172e2 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -157,10 +157,7 @@ QMacTabletHash *qt_mac_tablet_hash(); # endif #endif -struct FontHash : public QHash<QByteArray, QFont> -{ - FontHash(); -}; +typedef QHash<QByteArray, QFont> FontHash; FontHash *qt_app_fonts_hash(); typedef QHash<QByteArray, QPalette> PaletteHash; @@ -292,6 +289,7 @@ public: static void setSystemPalette(const QPalette &pal); static void setPalette_helper(const QPalette &palette, const char* className, bool clearWidgetPaletteHash); static void initializeWidgetPaletteHash(); + static void initializeWidgetFontHash(); static void setSystemFont(const QFont &font); #if defined(Q_WS_X11) @@ -313,7 +311,7 @@ public: QPointer<QWSManager> last_manager; QWSServerCleaner qwsServerCleaner; # ifndef QT_NO_DIRECTPAINTER - QMap<WId, QDirectPainter *> *directPainters; + QHash<WId, QDirectPainter *> *directPainters; # endif QRect maxWindowRect(const QScreen *screen) const { return maxWindowRects[screen]; } void setMaxWindowRect(const QScreen *screen, int screenNo, const QRect &rect); @@ -393,7 +391,7 @@ public: private: #ifdef Q_WS_QWS - QMap<const QScreen*, QRect> maxWindowRects; + QHash<const QScreen*, QRect> maxWindowRects; #endif static QApplicationPrivate *self; |