author | sandman <sandman> | 2002-10-04 01:22:50 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-04 01:22:50 (UTC) |
commit | b7ec6d0674f0f7835da7f114683dcfa74e6bc546 (patch) (unidiff) | |
tree | a2dff60b917d943543458f3e47d67f1584fbfb6c | |
parent | e2f23d8a5169ffef63dcbbac920f68ef0f113792 (diff) | |
download | opie-b7ec6d0674f0f7835da7f114683dcfa74e6bc546.zip opie-b7ec6d0674f0f7835da7f114683dcfa74e6bc546.tar.gz opie-b7ec6d0674f0f7835da7f114683dcfa74e6bc546.tar.bz2 |
changes to make the style interface BC with Qtopia 1.6, while still
supporting our extended features
-rw-r--r-- | library/qpeapplication.cpp | 2 | ||||
-rw-r--r-- | library/styleinterface.h | 39 |
2 files changed, 20 insertions, 21 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index e92b4dd..f65f3ab 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -1235,3 +1235,3 @@ void QPEApplication::internalSetStyle( const QString &style ) | |||
1235 | if (( lib-> queryInterface ( IID_Style, ( QUnknownInterface ** ) &iface ) == QS_OK ) && iface ) | 1235 | if (( lib-> queryInterface ( IID_Style, ( QUnknownInterface ** ) &iface ) == QS_OK ) && iface ) |
1236 | sty = iface-> create ( ); | 1236 | sty = iface-> style ( ); |
1237 | 1237 | ||
diff --git a/library/styleinterface.h b/library/styleinterface.h index 9fea636..b50f239 100644 --- a/library/styleinterface.h +++ b/library/styleinterface.h | |||
@@ -22,11 +22,11 @@ | |||
22 | 22 | ||
23 | // {6C33B4F9-D529-453A-8FB3-DA42B21872BD} | 23 | // {17AF792C-E461-49A9-9B71-068B9A8DDAE4} |
24 | # ifndef IID_Style | 24 | #ifndef IID_Style |
25 | # define IID_Style QUuid( 0x6c33b4f9, 0xd529, 0x453a, 0x8f, 0xb3, 0xda, 0x42, 0xb2, 0x18, 0x72, 0xbd) | 25 | #define IID_Style QUuid( 0x17af792c, 0xe461, 0x49a9, 0x9b, 0x71, 0x06, 0x8b, 0x9a, 0x8d, 0xda, 0xe4) |
26 | #endif | 26 | #endif |
27 | 27 | ||
28 | // {9757A252-3FD4-438F-A756-80BE4A9FB8DC} | 28 | // {6C33B4F9-D529-453A-8FB3-DA42B21872BD} |
29 | # ifndef IID_StyleSettings | 29 | # ifndef IID_StyleExtended |
30 | # define IID_StyleSettings QUuid( 0x9757a252, 0x3fd4, 0x438f, 0xa7, 0x56, 0x80, 0xbe, 0x4a, 0x9f, 0xb8, 0xdc) | 30 | # define IID_StyleExtended QUuid( 0x6c33b4f9, 0xd529, 0x453a, 0x8f, 0xb3, 0xda, 0x42, 0xb2, 0x18, 0x72, 0xbd) |
31 | # endif | 31 | #endif |
32 | 32 | ||
@@ -37,2 +37,5 @@ class QStyle; | |||
37 | 37 | ||
38 | |||
39 | class QStyle; | ||
40 | |||
38 | struct StyleInterface : public QUnknownInterface | 41 | struct StyleInterface : public QUnknownInterface |
@@ -40,19 +43,15 @@ struct StyleInterface : public QUnknownInterface | |||
40 | //! Return a new style. | 43 | //! Return a new style. |
41 | virtual QStyle *create ( ) = 0; | 44 | virtual QStyle *style() = 0; |
42 | |||
43 | //! Return a (longer) description for the style. | ||
44 | virtual QString description ( ) = 0; | ||
45 | |||
46 | //! Return a short name for the style. | 45 | //! Return a short name for the style. |
47 | virtual QString name ( ) = 0; | 46 | virtual QString name() const = 0; |
48 | |||
49 | //! Return the library basename (libliquid.so => liquid) | ||
50 | virtual QCString key ( ) = 0; | ||
51 | |||
52 | //! QT_VERSION like 1.2.3 == 123 | ||
53 | virtual unsigned int version ( ) = 0; | ||
54 | }; | 47 | }; |
55 | 48 | ||
56 | struct StyleSettingsInterface : public QUnknownInterface | 49 | struct StyleExtendedInterface : public StyleInterface |
57 | { | 50 | { |
51 | //! Return a (longer) description for the style. | ||
52 | virtual QString description ( ) = 0; | ||
53 | |||
54 | //! Does this style support customization | ||
55 | virtual bool hasSettings ( ) const = 0; | ||
56 | |||
58 | //! Return a new settings page. | 57 | //! Return a new settings page. |