--- a/emailservices/nmutilities/inc/emailmailboxinfo_p.h	Wed Sep 15 17:47:19 2010 +0300
+++ b/emailservices/nmutilities/inc/emailmailboxinfo_p.h	Thu Sep 30 11:43:07 2010 +0300
@@ -35,16 +35,16 @@
     EmailMailboxInfoPrivate();
     ~EmailMailboxInfoPrivate();
     
-    QString name(const QVariant &identifier);
-    QString icon(const QVariant &identifier);
+    QString name(const QString &identifier);
+    QString icon(const QString &identifier);
     
     void processCenRepRecords(const QString &brandingId);
-    quint8 getCurrentCountryL() const;
+    int getCurrentCountryL() const;
     bool verifyTimeZone() const;
     void verifyMailAccountName(QString &brandingName) const;
 
     static EmailMailboxInfoPrivate *mSelf;
-    static qint32 mReferenceCount;
+    static int mReferenceCount;
 
     XQSettingsManager *mSettingsManager;
     
@@ -54,11 +54,6 @@
     QString mWlbDomainName;
     
     /*!
-         temporary store for domain name to avoid additional cenrep scan
-     */
-    QString mTempDomain;
-    
-    /*!
          temporary store for icon and name branding variables to avoid additional cenrep scan
      */
     QString mTempIcon;
@@ -68,9 +63,8 @@
          Map of already imported branding keys
      */
     QMap<unsigned long int, QString> mBrandingDataMap;
-   
+
     friend class EmailMailboxInfo;
-    friend class TestEmailMailboxInfoPrivate;
 };
 
 #endif /* MAILBOXINFO_P_H_ */