summaryrefslogtreecommitdiffstats
path: root/src/gui/editors/notation/NotationHLayout.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:13:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:13:55 -0600
commit5e6e2fd8352a86fb70f804472a6346868483623a (patch)
treedfc010a4f5fb5624b094cdb01295591c8879debf /src/gui/editors/notation/NotationHLayout.cpp
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/notation/NotationHLayout.cpp')
-rw-r--r--src/gui/editors/notation/NotationHLayout.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/editors/notation/NotationHLayout.cpp b/src/gui/editors/notation/NotationHLayout.cpp
index 4d891a6..32a47e2 100644
--- a/src/gui/editors/notation/NotationHLayout.cpp
+++ b/src/gui/editors/notation/NotationHLayout.cpp
@@ -75,7 +75,7 @@ NotationHLayout::NotationHLayout(Composition *c, NotePixmapFactory *npf,
{
// NOTATION_DEBUG << "NotationHLayout::NotationHLayout()" << endl;
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
config->setGroup("Notation Options");
m_keySigCancelMode = config->readNumEntry("keysigcancelmode", 1);
}
@@ -255,7 +255,7 @@ NotationHLayout::scanStaff(Staff &staff, timeT startTime, timeT endTime)
NOTATION_DEBUG << "ottava shift at start:" << ottavaShift << ", ottavaEnd " << ottavaEnd << endl;
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
config->setGroup("Notation Options");
int accOctaveMode = config->readNumEntry("accidentaloctavemode", 1);
@@ -1266,7 +1266,7 @@ NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
int startBar = getComposition()->getBarNumber(startTime);
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
config->setGroup("Notation Options");
bool showInvisibles = config->readBoolEntry("showinvisibles", true);