pidgin/quail/quail-redux

Kill some warnings

2013-09-28, Phil Hannent
caf6aeb13eea
Parents 7dfce9307091
Children e1ecfdd3c20a
Kill some warnings
5 files changed, 30 insertions(+), 29 deletions(-)
  • +1 -0
    .hgignore
  • +6 -10
    src/QuailAccountEditor.cpp
  • +15 -8
    src/QuailBlistItem.cpp
  • +8 -0
    src/QuailConvWindow.cpp
  • +0 -11
    src/QuailTabWidget.cpp
    • --- a/.hgignore Fri Sep 27 14:41:12 2013 +0100
    +++ b/.hgignore Sat Sep 28 17:52:39 2013 +0100
    @@ -30,3 +30,4 @@
    *.wixpdb
    *.wixobj
    *.autosave
    +*.diff
    \ No newline at end of file
    --- a/src/QuailAccountEditor.cpp Fri Sep 27 14:41:12 2013 +0100
    +++ b/src/QuailAccountEditor.cpp Sat Sep 28 17:52:39 2013 +0100
    @@ -92,8 +92,7 @@
    else
    setWindowTitle(tr("Edit Account"));
    - QVBoxLayout *layout = new QVBoxLayout(this);
    -
    + QVBoxLayout *layout = new QVBoxLayout(this);
    tabs = new QQuailTabWidget(this);
    layout->addWidget(tabs);
    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok
    @@ -152,12 +151,12 @@
    int row = 0;
    accountWidget = new QWidget(this);
    /* Create the main vbox. */
    - accountBox = vbox = new QVBoxLayout(this);
    + accountBox = vbox = new QVBoxLayout(accountWidget);
    accountWidget->setLayout(accountBox);
    vbox->setSpacing(5);
    frame = new QFrame(accountWidget);
    - grid = new QGridLayout(this);
    + grid = new QGridLayout();
    grid->addWidget(frame);
    grid->setSpacing(5);
    vbox->addLayout(grid);
    @@ -175,7 +174,7 @@
    buildUserOpts(grid, frame, row);
    /* Add the hbox */
    - hbox = new QHBoxLayout(this);
    + hbox = new QHBoxLayout();
    hbox->addLayout(vbox);
    hbox->setSpacing(5);
    @@ -222,7 +221,7 @@
    protocolWidget = new QWidget(this);
    /* Create the main vbox */
    - protocolBox = vbox = new QVBoxLayout(this);
    + protocolBox = vbox = new QVBoxLayout();
    protocolWidget->setLayout(protocolBox);
    vbox->setSpacing(5);
    @@ -339,12 +338,9 @@
    int row = 0;
    proxyWidget = new QWidget(this);
    /* Create the main vbox */
    - proxyBox = vbox = new QVBoxLayout(this);
    - qDebug() << "QQuailAccountEditor::buildProxyTab.1a";
    + proxyBox = vbox = new QVBoxLayout();
    proxyWidget->setLayout(proxyBox);
    - qDebug() << "QQuailAccountEditor::buildProxyTab.1b";
    vbox->setSpacing(5);
    - qDebug() << "QQuailAccountEditor::buildProxyTab.1c";
    frame = new QFrame(this);
    vbox->addWidget(frame);
    grid = new QGridLayout(frame);
    --- a/src/QuailBlistItem.cpp Fri Sep 27 14:41:12 2013 +0100
    +++ b/src/QuailBlistItem.cpp Sat Sep 28 17:52:39 2013 +0100
    @@ -104,17 +104,24 @@
    qDebug() << "QQuailBListItem::updateInfo.Contact.3";
    setIcon(1, QQuailBListItem::getBuddyStatusIcon((PurpleBlistNode *)buddy));
    setToolTip(1, text);
    + qDebug() << "QQuailBListItem::updateInfo.Contact.3.1";
    PurpleBuddyIcon *purpleIcon = purple_buddy_get_icon(buddy);
    - //TODO: Verify this is working
    - data = (guchar *)purple_buddy_icon_get_data(purpleIcon, &len);
    - QImage buddyIcon = QImage::fromData(data, len);
    - purple_buddy_icon_unref(purpleIcon);
    - if (buddyIcon.size().width() > 0) {
    - qDebug() << "QQuailBListItem::updateInfo.Contact.3a" << buddyIcon.size().width();
    + qDebug() << "QQuailBListItem::updateInfo.Contact.3.2";
    + if (purpleIcon != NULL)
    + {
    + data = (guchar *)purple_buddy_icon_get_data(purpleIcon, &len);
    + qDebug() << "QQuailBListItem::updateInfo.Contact.3.3";
    + QImage buddyIcon = QImage::fromData(data, len);
    + purple_buddy_icon_unref(purpleIcon);
    + if (buddyIcon.size().width() > 0) {
    + qDebug() << "QQuailBListItem::updateInfo.Contact.3a" << buddyIcon.size().width();
    + } else {
    + qDebug() << "QQuailBListItem::updateInfo.Contact.3b";
    + }
    + setIcon(2, QPixmap::fromImage(buddyIcon));
    } else {
    - qDebug() << "QQuailBListItem::updateInfo.Contact.3b";
    + qDebug() << "QQuailBListItem::updateInfo.Contact.4== No buddy icon";
    }
    - setIcon(2, QPixmap::fromImage(buddyIcon));
    }
    //qDebug() << "QQuailBListItem::updateInfo.Contact.1:" << buddy->server_alias;
    setText(1, getAlias(buddy));
    --- a/src/QuailConvWindow.cpp Fri Sep 27 14:41:12 2013 +0100
    +++ b/src/QuailConvWindow.cpp Sat Sep 28 17:52:39 2013 +0100
    @@ -1063,6 +1063,14 @@
    setupToolbar();
    tabs = new QQuailTabWidget(this);
    + connect(tabs, SIGNAL(currentChanged(int)),
    + this, SLOT(tabChanged(int)));
    + connect(this, SIGNAL(signalSendMessage()),
    + tabs, SLOT(slotSendMessage()));
    + connect(tabs, SIGNAL(signalSendEnabled(bool)),
    + this, SLOT(slotSendEnabled(bool)));
    + connect(this, SIGNAL(signalToggleUserList()),
    + tabs, SLOT(slotToggleUserList()));
    setCentralWidget(tabs);
    }
    --- a/src/QuailTabWidget.cpp Fri Sep 27 14:41:12 2013 +0100
    +++ b/src/QuailTabWidget.cpp Sat Sep 28 17:52:39 2013 +0100
    @@ -32,17 +32,6 @@
    : QTabWidget(parent)
    {
    setTabBar(new QQuailTabBar(this));
    - connect(this, SIGNAL(currentChanged(int)),
    - parent, SLOT(tabChanged(int)));
    -
    - connect(parent, SIGNAL(signalSendMessage()),
    - this, SLOT(slotSendMessage()));
    -
    - connect(this, SIGNAL(signalSendEnabled(bool)),
    - parent, SLOT(slotSendEnabled(bool)));
    -
    - connect(parent, SIGNAL(signalToggleUserList()),
    - this, SLOT(slotToggleUserList()));
    }
    void