summaryrefslogtreecommitdiffstats
path: root/src/systeminfo/qsystemgeneralinfo.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/systeminfo/qsystemgeneralinfo.h')
-rw-r--r--src/systeminfo/qsystemgeneralinfo.h25
1 files changed, 10 insertions, 15 deletions
diff --git a/src/systeminfo/qsystemgeneralinfo.h b/src/systeminfo/qsystemgeneralinfo.h
index b896accb92..621a50782c 100644
--- a/src/systeminfo/qsystemgeneralinfo.h
+++ b/src/systeminfo/qsystemgeneralinfo.h
@@ -42,13 +42,9 @@
#define QSYSTEMGENERALINFO_H
#include "qmobilityglobal.h"
-
-#include <QObject>
-#include <QSize>
-#include <QPair>
#include <QString>
#include <QStringList>
-#include <QFileSystemWatcher>
+#include <QObject>
QT_BEGIN_HEADER
QTM_BEGIN_NAMESPACE
@@ -58,6 +54,7 @@ class QSystemInfoPrivate;
class Q_SYSINFO_EXPORT QSystemInfo : public QObject
{
Q_OBJECT
+
Q_PROPERTY(QString currentLanguage READ currentLanguage NOTIFY currentLanguageChanged)
Q_PROPERTY(QStringList availableLanguages READ availableLanguages)
Q_PROPERTY(QString currentCountryCode READ currentCountryCode)
@@ -65,13 +62,13 @@ class Q_SYSINFO_EXPORT QSystemInfo : public QObject
Q_ENUMS(Feature)
public:
-
QSystemInfo(QObject *parent = 0);
- virtual ~QSystemInfo();
+ virtual ~QSystemInfo();
QString currentLanguage(); // 2 letter ISO 639-1 //signal
QStringList availableLanguages(); // 2 letter ISO 639-1
QString currentCountryCode(); //2 letter ISO 3166-1
+
enum Version {
Os = 1,
QtCore,
@@ -82,7 +79,7 @@ public:
QString version(QSystemInfo::Version type, const QString &parameter = QString());
enum Feature {
- BluetoothFeature=0,
+ BluetoothFeature = 0,
CameraFeature,
FmradioFeature,
IrFeature,
@@ -96,24 +93,22 @@ public:
VideoOutFeature,
HapticsFeature,
FmTransmitterFeature
- };
+ };
Q_INVOKABLE bool hasFeatureSupported(QSystemInfo::Feature feature);
Q_SIGNALS:
- void currentLanguageChanged(const QString &);
+ void currentLanguageChanged(const QString &lang);
+
private:
QSystemInfoPrivate *d;
+
protected:
void connectNotify(const char *signal);
void disconnectNotify(const char *signal);
};
QTM_END_NAMESPACE
-
QT_END_HEADER
-#endif /*QSYSTEMSGENERALINFO_H*/
-
-// End of file
-
+#endif // QSYSTEMGENERALINFO_H