summaryrefslogtreecommitdiff
authorsandman <sandman>2002-10-04 01:22:50 (UTC)
committer sandman <sandman>2002-10-04 01:22:50 (UTC)
commitb7ec6d0674f0f7835da7f114683dcfa74e6bc546 (patch) (unidiff)
treea2dff60b917d943543458f3e47d67f1584fbfb6c
parente2f23d8a5169ffef63dcbbac920f68ef0f113792 (diff)
downloadopie-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
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--library/qpeapplication.cpp2
-rw-r--r--library/styleinterface.h33
2 files changed, 17 insertions, 18 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index e92b4dd..f65f3ab 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1233,7 +1233,7 @@ void QPEApplication::internalSetStyle( const QString &style )
1233 StyleInterface *iface = 0; 1233 StyleInterface *iface = 0;
1234 1234
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
1238 if ( sty ) { 1238 if ( sty ) {
1239 setStyle ( sty ); 1239 setStyle ( sty );
diff --git a/library/styleinterface.h b/library/styleinterface.h
index 9fea636..b50f239 100644
--- a/library/styleinterface.h
+++ b/library/styleinterface.h
@@ -20,14 +20,14 @@
20 20
21#ifndef QT_NO_COMPONENT 21#ifndef QT_NO_COMPONENT
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
33#endif 33#endif
@@ -35,26 +35,25 @@
35class QWidget; 35class QWidget;
36class QStyle; 36class QStyle;
37 37
38
39class QStyle;
40
38struct StyleInterface : public QUnknownInterface 41struct StyleInterface : public QUnknownInterface
39{ 42{
40 //! Return a new style. 43 //! Return a new style.
41 virtual QStyle *create ( ) = 0; 44 virtual QStyle *style() = 0;
45 //! Return a short name for the style.
46 virtual QString name() const = 0;
47};
42 48
49struct StyleExtendedInterface : public StyleInterface
50{
43 //! Return a (longer) description for the style. 51 //! Return a (longer) description for the style.
44 virtual QString description ( ) = 0; 52 virtual QString description ( ) = 0;
45 53
46 //! Return a short name for the style. 54 //! Does this style support customization
47 virtual QString name ( ) = 0; 55 virtual bool hasSettings ( ) const = 0;
48
49 //! Return the library basename (libliquid.so => liquid)
50 virtual QCString key ( ) = 0;
51 56
52 //! QT_VERSION like 1.2.3 == 123
53 virtual unsigned int version ( ) = 0;
54};
55
56struct StyleSettingsInterface : public QUnknownInterface
57{
58 //! Return a new settings page. 57 //! Return a new settings page.
59 virtual QWidget *create ( QWidget *parent, const char *name = 0 ) = 0; 58 virtual QWidget *create ( QWidget *parent, const char *name = 0 ) = 0;
60 59