pidgin/quail/quail-redux

Fix merge conflict

2013-09-20, Phil Hannent
a355ffbd00cb
Parents 0ddfc69bdc67
Children a985a548a72f
Fix merge conflict
3 files changed, 39 insertions(+), 3 deletions(-)
  • +6 -0
    src/QuailEventLoop.cpp
  • +25 -0
    src/QuailEventLoop.h
  • +8 -3
    src/main.cpp
    • --- a/src/QuailEventLoop.cpp Fri Sep 20 10:05:48 2013 +0100
    +++ b/src/QuailEventLoop.cpp Fri Sep 20 13:37:45 2013 +0100
    @@ -41,6 +41,7 @@
    static guint nextSourceId = 0;
    static QMap<guint, QQuailSourceInfo*> m_sources;
    +//static QuailEventDispatcherMarkTwo *mainEvent = 0;
    //static QThread *quailThread = new QThread();
    QQuailTimer::QQuailTimer(guint sourceId, GSourceFunc func, gpointer data)
    @@ -226,3 +227,8 @@
    return &eventloop_ops;
    }
    +//QuailEventDispatcherMarkTwo::QuailEventDispatcherMarkTwo(QObject *parent)
    +// : QAbstractEventDispatcher(parent)
    +//{
    +// mainEvent = this;
    +//}
    --- a/src/QuailEventLoop.h Fri Sep 20 10:05:48 2013 +0100
    +++ b/src/QuailEventLoop.h Fri Sep 20 13:37:45 2013 +0100
    @@ -88,4 +88,29 @@
    */
    void qQuailEventLoopUninit(void);
    +//class QuailEventDispatcherMarkTwo : public QAbstractEventDispatcher
    +//{
    +// Q_OBJECT
    +
    +//public:
    +// QuailEventDispatcherMarkTwo(QObject *parent = 0);
    +
    +// virtual bool processEvents(QEventLoop::ProcessEventsFlags flags)
    +// {; }
    +// virtual bool hasPendingEvents() = 0;
    +
    +// virtual void registerSocketNotifier(QSocketNotifier *notifier) = 0;
    +// virtual void unregisterSocketNotifier(QSocketNotifier *notifier) = 0;
    +
    +// virtual void registerTimer(int timerId, int interval, QObject *object) = 0;
    +// virtual bool unregisterTimer(int timerId) = 0;
    +// virtual bool unregisterTimers(QObject *object) = 0;
    +// virtual QList<TimerInfo> registeredTimers(QObject *object) const = 0;
    +
    +// virtual void wakeUp() = 0;
    +// virtual void interrupt() = 0;
    +// virtual void flush() = 0;
    +
    +//};
    +
    #endif /* _QUAIL_EVENT_LOOP_H_ */
    --- a/src/main.cpp Fri Sep 20 10:05:48 2013 +0100
    +++ b/src/main.cpp Fri Sep 20 13:37:45 2013 +0100
    @@ -19,11 +19,13 @@
    * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
    * MA 02111-1307 USA
    */
    +#include <QApplication>
    +#include <QDebug>
    -#if defined(Q_OS_CYGWIN)
    +#if defined(Q_OS_WIN)
    #include "QuailWinGlibEventLoop.h"
    #endif
    -#include <QApplication>
    +#include "QuailEventLoop.h"
    #include "QuailMainWindow.h"
    int main(int argc, char *argv[])
    @@ -32,8 +34,11 @@
    qDebug() << "MAIN.1";
    QuailEventDispatcherWinGlib quailEventLoop;
    #endif
    - QApplication a(argc, argv);
    + //QuailEventDispatcherMarkTwo mainEvent;
    + QCoreApplication a(argc, argv);
    + qDebug() << "q";
    QQuailMainWindow w;
    + qDebug() << "q2";
    w.show();
    return a.exec();