equal
deleted
inserted
replaced
23 ** |
23 ** |
24 ****************************************************************************/ |
24 ****************************************************************************/ |
25 #include "hbtheme.h" |
25 #include "hbtheme.h" |
26 #include "hbtheme_p.h" |
26 #include "hbtheme_p.h" |
27 #include "hbthemeclient_p.h" |
27 #include "hbthemeclient_p.h" |
28 #include <qglobal.h> |
|
29 #include <QSettings> |
|
30 #include "hbstandarddirs_p.h" |
28 #include "hbstandarddirs_p.h" |
31 #include "hbicontheme_p.h" |
29 #include "hbicontheme_p.h" |
32 #include "hbcolortheme_p.h" |
|
33 #include "hbthemeutils_p.h" |
30 #include "hbthemeutils_p.h" |
34 #include "hbiconloader_p.h" |
31 #include "hbiconloader_p.h" |
35 #include "hbcolortheme_p_p.h" |
32 #include "hbcolortheme_p_p.h" |
36 #include "hbcolortheme_p.h" |
33 #include "hbcolortheme_p.h" |
37 #include "hbeffecttheme_p.h" |
34 #include "hbeffecttheme_p.h" |
38 #include "hbeffectinternal_p.h" |
35 #include "hbeffectinternal_p.h" |
|
36 #include <QSettings> |
|
37 |
39 /*! |
38 /*! |
40 @stable |
39 @stable |
41 @hbcore |
40 @hbcore |
42 \class HbTheme |
41 \class HbTheme |
43 |
42 |
72 */ |
71 */ |
73 |
72 |
74 /*! |
73 /*! |
75 Returns static instance |
74 Returns static instance |
76 */ |
75 */ |
77 HbTheme* HbTheme::instance() |
76 HbTheme *HbTheme::instance() |
78 { |
77 { |
79 static HbTheme theInstance; |
78 static HbTheme theInstance; |
80 return &theInstance; |
79 return &theInstance; |
81 } |
80 } |
82 |
81 |
122 HbThemePrivate::HbThemePrivate() |
121 HbThemePrivate::HbThemePrivate() |
123 { |
122 { |
124 // Condition added to check if the client itself is server. |
123 // Condition added to check if the client itself is server. |
125 if(THEME_SERVER_NAME != HbMemoryUtils::getCleanAppName()) { |
124 if(THEME_SERVER_NAME != HbMemoryUtils::getCleanAppName()) { |
126 if(!HbThemeClient::global()->connectToServer()) { |
125 if(!HbThemeClient::global()->connectToServer()) { |
127 qWarning()<<"ThemeClient unable to connect to server in HbThemePrivate::HbThemePrivate."; |
126 qWarning() << "ThemeClient unable to connect to server in HbThemePrivate::HbThemePrivate."; |
128 } |
127 } |
129 } |
128 } |
130 } |
129 } |
131 |
130 |
132 /*! |
131 /*! |