← Back to branch summary

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

« back to all changes in this revision

Viewing changes to scribus/scraction.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/scraction.cpp
187
187
                emit triggeredData(layerID);
188
188
        if (_actionType==ScrAction::ActionDLL)
189
189
                emit triggeredData(((ScribusMainWindow*)parent())->doc);
 
190
        if (_actionType==ScrAction::ActionDLLSE)
 
191
                emit triggeredData(dynamic_cast<QWidget*>(parent()), ((ScribusMainWindow*)parent())->doc);
190
192
}
191
193
 
192
194
void ScrAction::toggledToToggledData(bool ison)
229
231
        return text().remove('&').remove("...");
230
232
}
231
233
 
 
234
void ScrAction::setToolTipFromTextAndShortcut()
 
235
{
 
236
        QString sct(shortcut());
 
237
        if (sct.isEmpty())
 
238
                QAction::setToolTip("<qt>" + cleanMenuText() + "</qt>");
 
239
        else
 
240
                QAction::setToolTip("<qt>" + cleanMenuText() + " (" + sct + ")" + "</qt>");
 
241
}
 
242
 
232
243
int ScrAction::getMenuIndex() const
233
244
{
234
245
        return menuIndex;