From 5e6e2fd8352a86fb70f804472a6346868483623a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:13:55 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- src/gui/editors/parameters/SegmentParameterBox.cpp | 2 +- src/gui/editors/parameters/TrackParameterBox.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gui/editors/parameters') diff --git a/src/gui/editors/parameters/SegmentParameterBox.cpp b/src/gui/editors/parameters/SegmentParameterBox.cpp index 3f270dc..2eb39f8 100644 --- a/src/gui/editors/parameters/SegmentParameterBox.cpp +++ b/src/gui/editors/parameters/SegmentParameterBox.cpp @@ -1013,7 +1013,7 @@ SegmentParameterBox::updateHighLow() Pitch highest(m_highestPlayable, accidental); Pitch lowest(m_lowestPlayable, accidental); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(GeneralOptionsConfigGroup); int base = config->readNumEntry("midipitchoctave", -2); //!!! FIXME this code is broken, and needs to be fixed after the fashion of diff --git a/src/gui/editors/parameters/TrackParameterBox.cpp b/src/gui/editors/parameters/TrackParameterBox.cpp index 08ac430..d627b01 100644 --- a/src/gui/editors/parameters/TrackParameterBox.cpp +++ b/src/gui/editors/parameters/TrackParameterBox.cpp @@ -108,7 +108,7 @@ TrackParameterBox::TrackParameterBox( RosegardenGUIDoc *doc, title_font.setBold(true); // Set up default expansions for the collapsing elements - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); TQString groupTemp = config->group(); config->setGroup("CollapsingFrame"); bool expanded = config->readBoolEntry("trackparametersplayback", true); @@ -595,7 +595,7 @@ TrackParameterBox::updateHighLow() Pitch highest(m_highestPlayable, accidental); Pitch lowest(m_lowestPlayable, accidental); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(GeneralOptionsConfigGroup); int base = config->readNumEntry("midipitchoctave", -2); bool useSharps = true; -- cgit v1.2.1