--- a/controlpanelplugins/themeplugin/src/cpthemeclient_p.cpp	Thu May 27 12:52:25 2010 +0300
+++ b/controlpanelplugins/themeplugin/src/cpthemeclient_p.cpp	Fri Jun 11 13:39:17 2010 +0300
@@ -16,12 +16,7 @@
  */
 
 #include "cpthemeclient_p.h"
-
-#ifdef Q_OS_SYMBIAN
-#include "cpthemeclientsymbian_p.h"
-#else
-#include "cpthemeclientqt_p.h"
-#endif
+#include "cpthemeclient_p_p.h"
 
 static CpThemeClient *clientInst=0;
 
@@ -39,12 +34,14 @@
 bool CpThemeClient::connectToServer()
 {
     Q_D(CpThemeClient);
+    
     return d->connectToServer();
 }
 
 bool CpThemeClient::isConnected()
 {
-    Q_D(CpThemeClient);
+    Q_D(const CpThemeClient);
+    
     return d->isConnected();
 }
 
@@ -54,22 +51,20 @@
 bool CpThemeClient::changeTheme(const QString& newtheme)
 {
     Q_D(CpThemeClient);
+    
     return d->changeTheme(newtheme);
 }
 
-
-
 /**
  * CpThemeClient::~CpThemeClient()
  */
 CpThemeClient::~CpThemeClient()
 {
     Q_D(CpThemeClient);
+    
     delete d;
 }
 
-
-
 /**
  * CpThemeClient::global()
  */