← Back to branch summary

~ubuntu-branches/ubuntu/utopic/musescore/utopic

« back to all changes in this revision

Viewing changes to mscore/mscore/scpart.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Niall Creech
  • Date: 2010-09-21 19:23:50 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20100921192350-dhx7ynjk9r06o2it
Tags: 0.9.6.2+dfsg-1ubuntu1
https://launchpad.net/bugs/642117
* 20_armel-float-cast-fix.dpatch:
  - Define alternative rxpos and rypos calls for armel to handle
  its differenet QpointF rx() and ry() call return values. Ensure qMax
  and qMin calls have equivalent argument types(LP: #642117)

Show diffs side-by-side

added added

removed removed

Lines of Context:
mscore/mscore/scpart.cpp
69
69
      switch(_id) {
70
70
            case 0:     // "longName",
71
71
                  if (context->argumentCount() == 0)
72
 
                        return qScriptValueFromValue(context->engine(), part->longName()->getText());
 
72
                        return qScriptValueFromValue(context->engine(), part->longName()->getText().replace(QString(0xe10d), QString(0x266D)));
73
73
                  else if (context->argumentCount() == 1) {
74
74
                        QString s = qscriptvalue_cast<QString>(context->argument(0));
75
75
                        part->setLongName(s);
78
78
                  break;
79
79
            case 1:     // "shortName",
80
80
                  if (context->argumentCount() == 0)
81
 
                        return qScriptValueFromValue(context->engine(), part->shortName()->getText());
 
81
                        return qScriptValueFromValue(context->engine(), part->shortName()->getText().replace(QString(0xe10d), QString(0x266D)));
82
82
                  else if (context->argumentCount() == 1) {
83
83
                        QString s = qscriptvalue_cast<QString>(context->argument(0));
84
84
                        part->setShortName(s);