pidgin/quail/qpurple

Fix the linking problem with static function definitions

2013-06-18, Phil Hannent
1d15f5236c58
Parents ccb0603bc6f4
Children f4bfc1629ba4
Fix the linking problem with static function definitions
3 files changed, 37 insertions(+), 31 deletions(-)
  • +15 -15
    qpurple.cpp
  • +19 -15
    qpurple.h
  • +3 -1
    qpurpleionotifier.h
    • --- a/qpurple.cpp Tue Jun 18 12:57:47 2013 +0100
    +++ b/qpurple.cpp Tue Jun 18 14:13:39 2013 +0100
    @@ -12,7 +12,7 @@
    QMap< int , QPurpleTimer* > timerMap;
    // Event loop functions
    -static guint
    +guint
    QPurpleCore::qpurple_input_add(gint fd,
    PurpleInputCondition condition,
    PurpleInputFunction function,
    @@ -31,7 +31,7 @@
    return handle;
    }
    -static gboolean
    +gboolean
    QPurpleCore::qpurple_input_remove(guint handle)
    {
    int toReturn = 0;
    @@ -42,7 +42,7 @@
    return toReturn;
    }
    -static guint
    +guint
    QPurpleCore::qpurple_timer_add(guint interval,
    GSourceFunc function,
    gpointer data)
    @@ -52,7 +52,7 @@
    return handle;
    }
    -static guint
    +guint
    QPurpleCore::qpurple_timer_add_seconds(guint interval,
    GSourceFunc function,
    gpointer data)
    @@ -60,7 +60,7 @@
    return qpurple_timer_add(interval * 1000,function, data);
    }
    -static gboolean
    +gboolean
    QPurpleCore::qpurple_timer_remove(guint handle)
    {
    int toReturn = 0;
    @@ -74,12 +74,12 @@
    static PurpleEventLoopUiOps qpurple_eventloops =
    {
    - qpurple_timer_add,
    - qpurple_timer_remove,
    - qpurple_input_add,
    - qpurple_input_remove,
    + &QPurpleCore::qpurple_timer_add,
    + &QPurpleCore::qpurple_timer_remove,
    + &QPurpleCore::qpurple_input_add,
    + &QPurpleCore::qpurple_input_remove,
    NULL,
    - qpurple_timer_add_seconds,
    + &QPurpleCore::qpurple_timer_add_seconds,
    /* padding */
    NULL,
    @@ -87,7 +87,7 @@
    NULL
    };
    -static void
    +void
    QPurpleCore::qpurple_write_conv(PurpleConversation *conv,
    const char *who,
    const char *alias,
    @@ -108,7 +108,7 @@
    NULL, /* destroy_conversation */
    NULL, /* write_chat */
    NULL, /* write_im */
    - qpurple_write_conv, /* write_conv */
    + &QPurpleCore::qpurple_write_conv, /* write_conv */
    NULL, /* chat_add_users */
    NULL, /* chat_rename_user */
    NULL, /* chat_remove_users */
    @@ -125,7 +125,7 @@
    NULL
    };
    -static void
    +void
    QPurpleCore::qpurple_ui_init(void)
    {
    /**
    @@ -139,7 +139,7 @@
    {
    NULL,
    NULL,
    - qpurple_ui_init,
    + &QPurpleCore::qpurple_ui_init,
    NULL,
    /* padding */
    @@ -149,7 +149,7 @@
    NULL
    };
    -static void
    +void
    QPurpleCore::_init_libpurple(void)
    {
    /* Set a custom user directory (optional) */
    --- a/qpurple.h Tue Jun 18 12:57:47 2013 +0100
    +++ b/qpurple.h Tue Jun 18 14:13:39 2013 +0100
    @@ -23,25 +23,23 @@
    namespace QPurple {
    -class QPurpleCore : QObject
    +typedef struct _PurpleGLibIOClosure {
    + PurpleInputFunction function;
    + guint result;
    + gpointer data;
    +} PurpleGLibIOClosure;
    +
    +
    +class QPurpleCore : public QObject
    {
    Q_OBJECT
    - QPurpleCore();
    - ~QPurpleCore();
    +public:
    + QPurpleCore() { }
    + ~QPurpleCore() { }
    - typedef struct _PurpleGLibIOClosure {
    - PurpleInputFunction function;
    - guint result;
    - gpointer data;
    - } PurpleGLibIOClosure;
    + void qpurple_init(); /* call this in main to start libpurple */
    - void qpurple_init(); // call this in main to start libpurple
    -
    -signals:
    -
    -
    -private:
    static guint qpurple_input_add(gint fd,
    PurpleInputCondition condition,
    PurpleInputFunction function,
    @@ -60,8 +58,14 @@
    const char *message,
    PurpleMessageFlags flags,
    time_t mtime);
    + static void qpurple_ui_init(void);
    +
    +
    +signals:
    +
    +
    +private:
    static void _init_libpurple(void);
    - static void qpurple_ui_init(void);
    };
    --- a/qpurpleionotifier.h Tue Jun 18 12:57:47 2013 +0100
    +++ b/qpurpleionotifier.h Tue Jun 18 14:13:39 2013 +0100
    @@ -14,7 +14,9 @@
    PurpleInputCondition purpleInputCondition;
    public:
    QPurpleIONotifier();
    - QPurpleIONotifier(int fd, PurpleGLibIOClosure *c, PurpleInputCondition pic);
    + QPurpleIONotifier(int fd,
    + PurpleGLibIOClosure *c,
    + PurpleInputCondition pic);
    ~QPurpleIONotifier();
    int defaultConstructed;