← Back to branch summary

~ubuntu-branches/ubuntu/wily/psi/wily

« back to all changes in this revision

Viewing changes to src/psitoolbar.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jan Niehusmann
  • Date: 2010-02-19 09:37:12 UTC
  • mfrom: (6.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20100219093712-e225xvm1wjcf1cgi
Tags: 0.14-2
* comment out only function which uses va_list to work around build
  problems on armel
* Set Standards-Version to 3.8.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/psitoolbar.cpp
33
33
#include "options/opt_toolbars.h"
34
34
#include "common.h"
35
35
 
36
 
Qt::ToolBarArea dockPositionToToolBarArea(Qt::Dock dock)
 
36
Qt::ToolBarArea dockPositionToToolBarArea(Qt3Dock dock)
37
37
{
38
38
        switch (dock) {
39
 
        case Qt::DockTop:
 
39
        case Qt3Dock_Top:
40
40
                return Qt::TopToolBarArea;
41
 
        case Qt::DockBottom:
 
41
        case Qt3Dock_Bottom:
42
42
                return Qt::BottomToolBarArea;
43
 
        case Qt::DockRight:
 
43
        case Qt3Dock_Right:
44
44
                return Qt::RightToolBarArea;
45
 
        case Qt::DockLeft:
 
45
        case Qt3Dock_Left:
46
46
                return Qt::LeftToolBarArea;
47
47
 
48
 
        case Qt::DockUnmanaged:
49
 
        case Qt::DockTornOff:
50
 
        case Qt::DockMinimized:
 
48
        case Qt3Dock_Unmanaged:
 
49
        case Qt3Dock_TornOff:
 
50
        case Qt3Dock_Minimized:
51
51
                ;
52
52
        }
53
53
 
65
65
        setIconSize(QSize(16, 16));
66
66
 
67
67
        customizeAction_ = new QAction(tr("Configure& Toolbar..."), this);
68
 
        connect(customizeAction_, SIGNAL(activated()), this, SIGNAL(customize()));
 
68
        connect(customizeAction_, SIGNAL(triggered()), this, SIGNAL(customize()));
69
69
}
70
70
 
71
71
PsiToolBar::~PsiToolBar()
109
109
        }
110
110
 
111
111
        QMainWindow* mainWindow = dynamic_cast<QMainWindow*>(parentWidget());
112
 
        mainWindow->addToolBar(dockPositionToToolBarArea((Qt::Dock)o->getOption(base_ + ".dock.position").toInt()),
 
112
        mainWindow->addToolBar(dockPositionToToolBarArea((Qt3Dock)o->getOption(base_ + ".dock.position").toInt()),
113
113
                               this);
114
114
        if (mainWindow && o->getOption(base_ + ".dock.nl").toBool()) {
115
115
                mainWindow->insertToolBarBreak(this);