← Back to branch summary

~ubuntu-branches/ubuntu/saucy/kvirc/saucy

« back to all changes in this revision

Viewing changes to src/modules/options/OptionsWidget_message.cpp

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2013-05-18 19:36:33 UTC
  • mfrom: (22.1.4 sid)
  • Revision ID: package-import@ubuntu.com-20130518193633-kuhzryg7jstqvxpr
Tags: 4:4.2.0-2
Upload to unstable 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/options/OptionsWidget_message.cpp
39
39
#include <QPushButton>
40
40
#include <QCursor>
41
41
#include <QPainter>
 
42
#include <QWidgetAction>
42
43
 
43
44
#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
44
45
        #include <unistd.h> // symlink()
398
399
        m_pIconButton = new QToolButton(box);
399
400
        connect(m_pIconButton,SIGNAL(clicked()),this,SLOT(iconButtonClicked()));
400
401
 
401
 
        m_pIconPopup = new KviTalPopupMenu(this);
 
402
    m_pIconPopup = new QMenu(this);
402
403
        KviIconWidget * iw = new KviIconWidget(m_pIconPopup);
403
404
        connect(iw,SIGNAL(selected(KviIconManager::SmallIcon)),this,SLOT(newIconSelected(KviIconManager::SmallIcon)));
404
 
        m_pIconPopup->insertItem(iw);
 
405
    m_pIconPopup->addAction(new QWidgetAction(iw));
405
406
 
406
407
 
407
408
        m_pEnableLogging = new QCheckBox(__tr2qs_ctx("Log this","options"),box);
605
606
        //qDebug("ERRNO (%d)",errno);
606
607
        int dummy; // make gcc happy
607
608
        dummy = symlink(szGlobal.toLocal8Bit().data(),szLocal.toLocal8Bit().data());
 
609
        Q_UNUSED(dummy);
608
610
        // FIXME: Do it also on windows...
609
611
#endif
610
612