1 files changed, 13 insertions, 11 deletions
diff --git a/src/systeminfo/linux/qsysteminfo_linux_common_p.h b/src/systeminfo/linux/qsysteminfo_linux_common_p.h
index 604e763066..49315ed3ca 100644
--- a/src/systeminfo/linux/qsysteminfo_linux_common_p.h
+++ b/src/systeminfo/linux/qsysteminfo_linux_common_p.h
@@ -96,12 +96,12 @@ class QSystemInfoLinuxCommonPrivate : public QObject
     Q_OBJECT
 
 public:
-
     QSystemInfoLinuxCommonPrivate(QObject *parent = 0);
     virtual ~QSystemInfoLinuxCommonPrivate();
-    QString currentLanguage() const;
 
-    QString version(QSystemInfo::Version,  const QString &/*parameter*/ = QString());
+    virtual QString currentLanguage() const;
+
+    QString version(QSystemInfo::Version, const QString &parameter = QString());
     QString currentCountryCode() const;
 
     bool fmTransmitterAvailable();
@@ -109,21 +109,24 @@ public:
     bool hasSysFeature(const QString &featureStr);
 
 Q_SIGNALS:
-    void currentLanguageChanged(const QString &);
+    void currentLanguageChanged(const QString &lang);
 
 private:
     QTimer *langTimer;
-    QString langCached;
 
 protected Q_SLOTS:
-    void startLanguagePolling();
+    void pollCurrentLanguage();
 
 protected:
+    QString currentLang;
+
+    void connectNotify(const char *signal);
+    void disconnectNotify(const char *signal);
+
 #if !defined(QT_NO_DBUS)
     bool hasHalDeviceFeature(const QString &param);
     bool hasHalUsbFeature(qint32 usbClass);
-    QHalInterface halIface;
-#endif
+#endif // QT_NO_DBUS
 };
 
 class QNetworkManagerInterface;
@@ -208,7 +211,6 @@ class QSystemDisplayInfoLinuxCommonPrivate : public QObject
     Q_OBJECT
 
 public:
-
     QSystemDisplayInfoLinuxCommonPrivate(QObject *parent = 0);
     virtual ~QSystemDisplayInfoLinuxCommonPrivate();
 
@@ -216,7 +218,7 @@ public:
     int colorDepth(int screen);
 
     QSystemDisplayInfo::DisplayOrientation orientation(int screen);
-    float contrast(int /*screen*/) {return 0.0;};
+    float contrast(int screen);
     int getDPIWidth(int screen);
     int getDPIHeight(int screen);
     int physicalHeight(int screen);
@@ -236,7 +238,7 @@ Q_SIGNALS:
 
 private:
     bool isScreenValid(int screen);
-    QDesktopWidget *wid;
+
     static QSystemDisplayInfoLinuxCommonPrivate *self;
 };