← Back to branch summary

~ubuntu-branches/ubuntu/trusty/scribus/trusty

« back to all changes in this revision

Viewing changes to scribus/ui/modetoolbar.cpp

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2013-05-16 20:34:07 UTC
  • mfrom: (1.1.13) (32.1.2 saucy-proposed)
  • Revision ID: package-import@ubuntu.com-20130516203407-ztj7ebsivoo41dih
Tags: 1.4.2.dfsg+r18267-1ubuntu2
Avoid qreal/double type clashes on ARM.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scribus/ui/modetoolbar.cpp
40
40
{
41
41
        SubMode = 0;
42
42
        ValCount = 32;
43
 
        static double AutoShapes0[] = {0.0, 0.0, 0.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0,
 
43
        static qreal AutoShapes0[] = {0.0, 0.0, 0.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0,
44
44
                                                                        100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 0.0, 100.0, 0.0, 100.0,
45
45
                                                                        0.0, 100.0, 0.0, 100.0, 0.0, 0.0, 0.0, 0.0};
46
46
        ShapeVals = AutoShapes0;
91
91
{
92
92
        PolygonProps* dia = new PolygonProps(this, m_ScMW->doc->toolSettings.polyC, m_ScMW->doc->toolSettings.polyFd, m_ScMW->doc->toolSettings.polyF, m_ScMW->doc->toolSettings.polyS, m_ScMW->doc->toolSettings.polyR, m_ScMW->doc->toolSettings.polyCurvature);
93
93
        if (dia->exec())
 
94
        {
94
95
                dia->getValues(&m_ScMW->doc->toolSettings.polyC, &m_ScMW->doc->toolSettings.polyFd, &m_ScMW->doc->toolSettings.polyF, &m_ScMW->doc->toolSettings.polyS, &m_ScMW->doc->toolSettings.polyR, &m_ScMW->doc->toolSettings.polyCurvature);
 
96
                m_ScMW->scrActions["toolsInsertPolygon"]->trigger();
 
97
        }
95
98
        delete dia;
96
99
}
97
100
 
101
104
//      insertShapeButtonMenu->hide();
102
105
        SubMode = s;
103
106
        ValCount = c;
104
 
        ShapeVals = (double*)vals;
 
107
        ShapeVals = vals;
105
108
        m_ScMW->scrActions["toolsInsertShape"]->setChecked(false);
106
109
        m_ScMW->scrActions["toolsInsertShape"]->setChecked(true);
107
110
}