summaryrefslogtreecommitdiffstats
path: root/src/gui/editors/parameters
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 00:13:55 -0600
committerTimothy Pearson <[email protected]>2013-01-25 00:13:55 -0600
commit5e6e2fd8352a86fb70f804472a6346868483623a (patch)
treedfc010a4f5fb5624b094cdb01295591c8879debf /src/gui/editors/parameters
parent59ff04ffaf48f18383b39ea6da17b8e18b6b50c3 (diff)
downloadrosegarden-5e6e2fd8352a86fb70f804472a6346868483623a.tar.gz
rosegarden-5e6e2fd8352a86fb70f804472a6346868483623a.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'src/gui/editors/parameters')
-rw-r--r--src/gui/editors/parameters/SegmentParameterBox.cpp2
-rw-r--r--src/gui/editors/parameters/TrackParameterBox.cpp4
2 files changed, 3 insertions, 3 deletions
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;