From 791eb399d2a4c585352930b7b6757a4b29ddda9d Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Wed, 9 Jan 2013 17:49:08 -0200 Subject: Split QQNXLocaleData::readPPSLocale() Because this method creates a QSocketNotifier, it needs to be split into a part that is run on initialization, namely QQNXLocaleData::initialize(), and one that is run delayed through event loop invocation, namely QQNXLocaleData::installSocketNotifier(). Task-number: QTBUG-28701 Change-Id: Ib60000902692bbca4820d3d0bc7719212668dfa9 Reviewed-by: Laszlo Papp Reviewed-by: Kevin Krammer Reviewed-by: Sean Harmer --- src/corelib/tools/qlocale_p.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/corelib/tools/qlocale_p.h') diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h index 65201374a9..ca1b6f8b07 100644 --- a/src/corelib/tools/qlocale_p.h +++ b/src/corelib/tools/qlocale_p.h @@ -380,10 +380,13 @@ class QQNXLocaleData: public QObject public: QQNXLocaleData(); virtual ~QQNXLocaleData(); - void readPPSLocale(); public Q_SLOTS: void updateMeasurementSystem(); + void installSocketNotifier(); + +private: + void initialize(); public: uint ppsMeasurement; -- cgit v1.2.3