equal
deleted
inserted
replaced
596 } |
596 } |
597 #endif |
597 #endif |
598 |
598 |
599 #if defined(Q_OS_SYMBIAN) && defined(QT_NO_FREETYPE) |
599 #if defined(Q_OS_SYMBIAN) && defined(QT_NO_FREETYPE) |
600 // class with virtual destructor, derived in qfontdatabase_s60.cpp |
600 // class with virtual destructor, derived in qfontdatabase_s60.cpp |
601 class QFontDatabaseS60Store |
601 class QSymbianFontDatabaseExtras |
602 { |
602 { |
603 public: |
603 public: |
604 virtual ~QFontDatabaseS60Store() {} |
604 virtual ~QSymbianFontDatabaseExtras() {} |
605 }; |
605 }; |
606 #endif |
606 #endif |
607 |
607 |
608 class QFontDatabasePrivate |
608 class QFontDatabasePrivate |
609 { |
609 { |
612 : count(0), families(0), reregisterAppFonts(false) |
612 : count(0), families(0), reregisterAppFonts(false) |
613 #if defined(Q_WS_QWS) |
613 #if defined(Q_WS_QWS) |
614 , stream(0) |
614 , stream(0) |
615 #endif |
615 #endif |
616 #if defined(Q_OS_SYMBIAN) && defined(QT_NO_FREETYPE) |
616 #if defined(Q_OS_SYMBIAN) && defined(QT_NO_FREETYPE) |
617 , s60Store(0) |
617 , symbianExtras(0) |
618 #endif |
618 #endif |
619 { } |
619 { } |
620 ~QFontDatabasePrivate() { |
620 ~QFontDatabasePrivate() { |
621 free(); |
621 free(); |
622 } |
622 } |
626 delete families[count]; |
626 delete families[count]; |
627 ::free(families); |
627 ::free(families); |
628 families = 0; |
628 families = 0; |
629 count = 0; |
629 count = 0; |
630 #if defined(Q_OS_SYMBIAN) && defined(QT_NO_FREETYPE) |
630 #if defined(Q_OS_SYMBIAN) && defined(QT_NO_FREETYPE) |
631 if (s60Store) { |
631 if (symbianExtras) { |
632 delete s60Store; |
632 delete symbianExtras; |
633 s60Store = 0; |
633 symbianExtras = 0; |
634 } |
634 } |
635 #endif |
635 #endif |
636 // don't clear the memory fonts! |
636 // don't clear the memory fonts! |
637 } |
637 } |
638 |
638 |
673 #endif |
673 #endif |
674 #if defined(Q_WS_QWS) |
674 #if defined(Q_WS_QWS) |
675 QDataStream *stream; |
675 QDataStream *stream; |
676 QStringList fallbackFamilies; |
676 QStringList fallbackFamilies; |
677 #elif defined(Q_OS_SYMBIAN) && defined(QT_NO_FREETYPE) |
677 #elif defined(Q_OS_SYMBIAN) && defined(QT_NO_FREETYPE) |
678 const QFontDatabaseS60Store *s60Store; |
678 const QSymbianFontDatabaseExtras *symbianExtras; |
679 #endif |
679 #endif |
680 }; |
680 }; |
681 |
681 |
682 void QFontDatabasePrivate::invalidate() |
682 void QFontDatabasePrivate::invalidate() |
683 { |
683 { |