← Back to branch summary

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

« back to all changes in this revision

Viewing changes to mscore/mscore/lyrics.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Toby Smithe, Matthias Klose
  • Date: 2011-02-16 20:04:20 UTC
  • mfrom: (3.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20110216200420-rlu5xdmcop6skghj
Tags: 1.0+dfsg-2
http://bugs.debian.org/597802
https://launchpad.net/bugs/642117
* Re-include Matthias Klose's armel qreal fixes (Closes: #597802)
  (I missed 0.9.6.3+dfsg-0ubuntu2...
   Apologies to Matthias and my sponsor, Tobias Quathamer!)

* debian/patches/12-debianise-about-box.dpatch:
  + Update "About" dialogue box to give copyright to 2011.

[ Matthias Klose ]
* More armel qreal fixes. LP: #642117.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mscore/mscore/lyrics.cpp
1
1
//=============================================================================
2
2
//  MusE Score
3
3
//  Linux Music Score Editor
4
 
//  $Id: lyrics.cpp 3247 2010-07-01 08:28:11Z lasconic $
 
4
//  $Id: lyrics.cpp 3683 2010-11-07 16:56:32Z lasconic $
5
5
//
6
6
//  Copyright (C) 2002-2007 Werner Schweer and others
7
7
//
573
573
      QClipboard::Mode mode = QClipboard::Selection;
574
574
#endif
575
575
      QString txt = QApplication::clipboard()->text(mode);
576
 
      QStringList sl = txt.split(" ", QString::SkipEmptyParts);
 
576
      QStringList sl = txt.split(QRegExp("\\s+"), QString::SkipEmptyParts);
577
577
      if (sl.isEmpty())
578
578
            return;
579
579
      cursor->insertText(sl[0]);
582
582
      score()->setLayoutAll(lo);
583
583
      score()->setUpdateAll();
584
584
      score()->end();
585
 
      txt = txt.mid(sl[0].size() + 1);
 
585
      sl.removeFirst();
 
586
      txt = sl.join(" ");   
586
587
      QApplication::clipboard()->setText(txt, mode);
587
 
 
588
 
//TODO-S      score()->lyricsTab(false, true);
589
588
      }
590
589