whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <lpapp@kde.org>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
bb10
Rafael Roquetto 2013-01-09 17:49:08 -02:00 committed by The Qt Project
parent d525764430
commit 791eb399d2
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/tools/qlocale_p.h
View File

@ -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;

27
src/corelib/tools/qlocale_unix.cpp
View File

@ -66,7 +66,12 @@ QQNXLocaleData::QQNXLocaleData()
:ppsNotifier(0)
,ppsFd(-1)
{
readPPSLocale();
initialize();
// we cannot call this directly, because by the time this constructor is
// called, the event dispatcher has not yet been created, causing the
// subsequent call to QSocketNotifier constructor to fail.
QMetaObject::invokeMethod(this, "installSocketNotifier", Qt::QueuedConnection);
}
QQNXLocaleData::~QQNXLocaleData()
@ -106,7 +111,7 @@ void QQNXLocaleData::updateMeasurementSystem()
ppsMeasurement = QLocale::MetricSystem;
}
void QQNXLocaleData::readPPSLocale()
void QQNXLocaleData::initialize()
{
errno = 0;
ppsFd = qt_safe_open(ppsServicePath, O_RDONLY);
@ -116,10 +121,22 @@ void QQNXLocaleData::readPPSLocale()
}
updateMeasurementSystem();
if (QCoreApplication::instance()) {
ppsNotifier = new QSocketNotifier(ppsFd, QSocketNotifier::Read, this);
QObject::connect(ppsNotifier, SIGNAL(activated(int)), this, SLOT(updateMeasurementSystem()));
}
void QQNXLocaleData::installSocketNotifier()
{
if (!QCoreApplication::instance() || ppsFd == -1) {
qWarning("QQNXLocaleData: Failed to create socket notifier, locale updates may not work.");
return;
}
if (ppsNotifier) {
qWarning("QQNXLocaleData: socket notifier already created.");
return;
}
ppsNotifier = new QSocketNotifier(ppsFd, QSocketNotifier::Read, this);
QObject::connect(ppsNotifier, SIGNAL(activated(int)), this, SLOT(updateMeasurementSystem()));
}
#endif