pidgin/quail/quail-redux

Look into improving the eventloop process

2013-08-27, Phil Hannent
abe02b214c11
Parents 1c082a1e9fca
Children 705e160c8659
Look into improving the eventloop process
2 files changed, 7 insertions(+), 6 deletions(-)
  • +1 -0
    .hgignore
  • +6 -6
    src/QuailEventLoop.cpp
    • --- a/.hgignore Fri Aug 23 16:26:42 2013 +0100
    +++ b/.hgignore Tue Aug 27 10:19:49 2013 +0100
    @@ -27,3 +27,4 @@
    *.msi
    *.wixpdb
    *.wixobj
    +*.autosave
    --- a/src/QuailEventLoop.cpp Fri Aug 23 16:26:42 2013 +0100
    +++ b/src/QuailEventLoop.cpp Tue Aug 27 10:19:49 2013 +0100
    @@ -38,7 +38,7 @@
    static gboolean qQuailSourceRemove(guint handle);
    static guint nextSourceId = 0;
    -static QMap<guint, QQuailSourceInfo*> sources;
    +static QMap<guint, QQuailSourceInfo*> m_sources;
    QQuailTimer::QQuailTimer(guint sourceId, GSourceFunc func, gpointer data)
    : QTimer(), sourceId(sourceId), func(func), userData(data)
    @@ -58,7 +58,7 @@
    PurpleInputCondition cond,
    PurpleInputFunction func,
    gpointer userData)
    - : QObject(), func(func), userData(userData), readNotifier(NULL),
    + : QAbstractEventDispatcher(), func(func), userData(userData), readNotifier(NULL),
    writeNotifier(NULL)
    {
    //qDebug() << "QQuailInputNotifier::QQuailInputNotifier";
    @@ -117,7 +117,7 @@
    info->timer = new QQuailTimer(info->handle, func, data);
    info->timer->start(interval);
    - sources.insert(info->handle, info);
    + m_sources.insert(info->handle, info);
    return info->handle;
    }
    @@ -144,7 +144,7 @@
    info->notifier = new QQuailInputNotifier(fd, cond, func, userData);
    - sources.insert(info->handle, info);
    + m_sources.insert(info->handle, info);
    return info->handle;
    }
    @@ -155,12 +155,12 @@
    //qDebug() << "QQuailInputNotifier::qQuailSourceRemove";
    QQuailSourceInfo *info;
    - info = sources.value(handle);
    + info = m_sources.value(handle);
    if (info == NULL)
    return false;
    - sources.remove(handle);
    + m_sources.remove(handle);
    if (info->timer != NULL)
    delete info->timer;