diff options
Diffstat (limited to 'src/gui/editors/notation')
| -rw-r--r-- | src/gui/editors/notation/FontViewFrame.cpp | 6 | ||||
| -rw-r--r-- | src/gui/editors/notation/NotationEraser.cpp | 2 | ||||
| -rw-r--r-- | src/gui/editors/notation/NotationHLayout.cpp | 6 | ||||
| -rw-r--r-- | src/gui/editors/notation/NotationStaff.cpp | 6 | ||||
| -rw-r--r-- | src/gui/editors/notation/NotationStrings.cpp | 2 | ||||
| -rw-r--r-- | src/gui/editors/notation/NotationView.cpp | 4 | ||||
| -rw-r--r-- | src/gui/editors/notation/NoteFontFactory.cpp | 2 | ||||
| -rw-r--r-- | src/gui/editors/notation/NoteInserter.cpp | 2 | ||||
| -rw-r--r-- | src/gui/editors/notation/NotePixmapFactory.cpp | 4 |
9 files changed, 17 insertions, 17 deletions
diff --git a/src/gui/editors/notation/FontViewFrame.cpp b/src/gui/editors/notation/FontViewFrame.cpp index febb5ce..7aa7a28 100644 --- a/src/gui/editors/notation/FontViewFrame.cpp +++ b/src/gui/editors/notation/FontViewFrame.cpp @@ -182,8 +182,8 @@ void FontViewFrame::paintEvent( TQPaintEvent* e ) if (i == 0) { if (j == 0) continue; - p.setFont(kapp->font()); - TQFontMetrics afm(kapp->font()); + p.setFont(tdeApp->font()); + TQFontMetrics afm(tdeApp->font()); TQString s = TQString("%1").arg(m_row * 256 + (j - 1) * 16); p.drawText(x - afm.width(s), y, s); p.setPen(TQColor(190, 190, 255)); @@ -191,7 +191,7 @@ void FontViewFrame::paintEvent( TQPaintEvent* e ) p.setPen(TQt::black); continue; } else if (j == 0) { - p.setFont(kapp->font()); + p.setFont(tdeApp->font()); TQString s = TQString("%1").arg(i - 1); p.drawText(x, y, s); p.setPen(TQColor(190, 190, 255)); diff --git a/src/gui/editors/notation/NotationEraser.cpp b/src/gui/editors/notation/NotationEraser.cpp index e5ba5a6..75adfaa 100644 --- a/src/gui/editors/notation/NotationEraser.cpp +++ b/src/gui/editors/notation/NotationEraser.cpp @@ -45,7 +45,7 @@ NotationEraser::NotationEraser(NotationView* view) : NotationTool("NotationEraser", view), m_collapseRest(false) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(NotationViewConfigGroup); m_collapseRest = config->readBoolEntry("collapse", false); diff --git a/src/gui/editors/notation/NotationHLayout.cpp b/src/gui/editors/notation/NotationHLayout.cpp index fec7422..eb1e490 100644 --- a/src/gui/editors/notation/NotationHLayout.cpp +++ b/src/gui/editors/notation/NotationHLayout.cpp @@ -73,7 +73,7 @@ NotationHLayout::NotationHLayout(Composition *c, NotePixmapFactory *npf, { // NOTATION_DEBUG << "NotationHLayout::NotationHLayout()" << endl; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Notation Options"); m_keySigCancelMode = config->readNumEntry("keysigcancelmode", 1); } @@ -253,7 +253,7 @@ NotationHLayout::scanStaff(Staff &staff, timeT startTime, timeT endTime) NOTATION_DEBUG << "ottava shift at start:" << ottavaShift << ", ottavaEnd " << ottavaEnd << endl; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Notation Options"); int accOctaveMode = config->readNumEntry("accidentaloctavemode", 1); @@ -1264,7 +1264,7 @@ NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime) int startBar = getComposition()->getBarNumber(startTime); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Notation Options"); bool showInvisibles = config->readBoolEntry("showinvisibles", true); diff --git a/src/gui/editors/notation/NotationStaff.cpp b/src/gui/editors/notation/NotationStaff.cpp index 638afd9..59d6803 100644 --- a/src/gui/editors/notation/NotationStaff.cpp +++ b/src/gui/editors/notation/NotationStaff.cpp @@ -96,7 +96,7 @@ NotationStaff::NotationStaff(TQCanvas *canvas, Segment *segment, m_ready(false), m_lastRenderedBar(0) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(NotationViewConfigGroup); m_colourQuantize = config->readBoolEntry("colourquantize", false); @@ -431,7 +431,7 @@ NotationStaff::getNoteNameAtCanvasCoords(double x, int y, ::Rosegarden::Key key; getClefAndKeyAtCanvasCoords(x, y, clef, key); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(GeneralOptionsConfigGroup); int baseOctave = config->readNumEntry("midipitchoctave", -2); @@ -915,7 +915,7 @@ NotationStaff::renderSingleElement(ViewElementList::iterator &vli, <Bool>(BaseProperties::INVISIBLE, invisible) && invisible) { if (m_printPainter) return ; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Notation Options"); bool showInvisibles = config->readBoolEntry("showinvisibles", true); if (!showInvisibles) diff --git a/src/gui/editors/notation/NotationStrings.cpp b/src/gui/editors/notation/NotationStrings.cpp index 513be1c..a29ac2c 100644 --- a/src/gui/editors/notation/NotationStrings.cpp +++ b/src/gui/editors/notation/NotationStrings.cpp @@ -258,7 +258,7 @@ NotationStrings::makeNoteMenuLabel(timeT duration, } } - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(GeneralOptionsConfigGroup); GeneralConfigurationPage::NoteNameStyle noteNameStyle = (GeneralConfigurationPage::NoteNameStyle) diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp index 7965718..d545f76 100644 --- a/src/gui/editors/notation/NotationView.cpp +++ b/src/gui/editors/notation/NotationView.cpp @@ -4805,7 +4805,7 @@ void NotationView::slotEditPaste() (clipboard->getSingleSegment()->getEndTime() - clipboard->getSingleSegment()->getStartTime()); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(NotationViewConfigGroup); PasteEventsCommand::PasteType defaultType = (PasteEventsCommand::PasteType) config->readUnsignedNumEntry("pastetype", @@ -4839,7 +4839,7 @@ void NotationView::slotEditGeneralPaste() LinedStaff *staff = getCurrentLinedStaff(); Segment &segment = staff->getSegment(); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(NotationViewConfigGroup); PasteEventsCommand::PasteType defaultType = (PasteEventsCommand::PasteType) config->readUnsignedNumEntry("pastetype", diff --git a/src/gui/editors/notation/NoteFontFactory.cpp b/src/gui/editors/notation/NoteFontFactory.cpp index 8994225..6390d54 100644 --- a/src/gui/editors/notation/NoteFontFactory.cpp +++ b/src/gui/editors/notation/NoteFontFactory.cpp @@ -55,7 +55,7 @@ NoteFontFactory::getFontNames(bool forceRescan) if (!m_fontNames.empty()) return m_fontNames; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(NotationViewConfigGroup); TQString fontNameList = ""; diff --git a/src/gui/editors/notation/NoteInserter.cpp b/src/gui/editors/notation/NoteInserter.cpp index 74d51d6..eaed244 100644 --- a/src/gui/editors/notation/NoteInserter.cpp +++ b/src/gui/editors/notation/NoteInserter.cpp @@ -69,7 +69,7 @@ NoteInserter::NoteInserter(NotationView* view) { TQIconSet icon; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(NotationViewConfigGroup); m_autoBeam = config->readBoolEntry("autobeam", true); m_matrixInsertType = (config->readNumEntry("inserttype", 0) > 0); diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp index 47ded9b..ffee779 100644 --- a/src/gui/editors/notation/NotePixmapFactory.cpp +++ b/src/gui/editors/notation/NotePixmapFactory.cpp @@ -224,7 +224,7 @@ NotePixmapFactory::init(std::string fontName, int size) // sizes only and we want pixels TQFont timeSigFont(defaultTimeSigFontFamily), textFont(defaultSerifFontFamily); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup(NotationViewConfigGroup); m_timeSigFont = config->readFontEntry("timesigfont", &timeSigFont); @@ -3217,7 +3217,7 @@ NotePixmapFactory::getTextFont(const Text &text) const tiny = true; } - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); TQFont textFont; |
