diff options
| author | Norwegian Rock Cat <qt-info@nokia.com> | 2009-06-18 14:44:40 (GMT) |
|---|---|---|
| committer | Norwegian Rock Cat <qt-info@nokia.com> | 2009-06-23 14:12:00 (GMT) |
| commit | 9205078f3b2d842735599fd74d6324a4d84bc275 (patch) | |
| tree | 463912fffbb3848fbb0abf3b08f69f3be53799e5 /src/gui/styles | |
| parent | 1b059b51b6d236ace4ec8c5203873caae250cf78 (diff) | |
| download | Qt-9205078f3b2d842735599fd74d6324a4d84bc275.zip Qt-9205078f3b2d842735599fd74d6324a4d84bc275.tar.gz Qt-9205078f3b2d842735599fd74d6324a4d84bc275.tar.bz2 | |
Clean up the font hash and palette hash stuff.
These are used enough (at least on the mac) to justify them being
accessible in a private header. As a bonus it "hides" the actual
container being used, so we could potentially sway it out with something
different.
Reviewed by: Jens Bache-Wiig
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qgtkstyle.cpp | 1 | ||||
| -rw-r--r-- | src/gui/styles/qmacstyle_mac.mm | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp index 8499811..852d3fd 100644 --- a/src/gui/styles/qgtkstyle.cpp +++ b/src/gui/styles/qgtkstyle.cpp @@ -150,7 +150,6 @@ bool QGtkStyleFilter::eventFilter(QObject *obj, QEvent *e) if (e->type() == QEvent::ApplicationPaletteChange) { // Only do this the first time since this will also // generate applicationPaletteChange events - extern QHash<QByteArray, QPalette> *qt_app_palettes_hash(); //qapplication.cpp if (!qt_app_palettes_hash() || qt_app_palettes_hash()->isEmpty()) { QGtk::applyCustomPaletteHash(); } diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index 262fbcb..d50cd42 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -50,6 +50,7 @@ #define QMAC_QAQUASTYLE_SIZE_CONSTRAIN //#define DEBUG_SIZE_CONSTRAINT +#include <private/qapplication_p.h> #include <private/qcombobox_p.h> #include <private/qmacstylepixmaps_mac_p.h> #include <private/qpaintengine_mac_p.h> @@ -103,7 +104,6 @@ QT_BEGIN_NAMESPACE extern QRegion qt_mac_convert_mac_region(RgnHandle); //qregion_mac.cpp -extern QHash<QByteArray, QFont> *qt_app_fonts_hash(); // qapplication.cpp // The following constants are used for adjusting the size // of push buttons so that they are drawn inside their bounds. |