diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:13:55 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:13:55 -0600 |
commit | 5e6e2fd8352a86fb70f804472a6346868483623a (patch) | |
tree | dfc010a4f5fb5624b094cdb01295591c8879debf /src/document | |
parent | 59ff04ffaf48f18383b39ea6da17b8e18b6b50c3 (diff) | |
download | rosegarden-5e6e2fd8352a86fb70f804472a6346868483623a.tar.gz rosegarden-5e6e2fd8352a86fb70f804472a6346868483623a.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'src/document')
-rw-r--r-- | src/document/ConfigGroups.cpp | 2 | ||||
-rw-r--r-- | src/document/RosegardenGUIDoc.cpp | 6 | ||||
-rw-r--r-- | src/document/io/LilyPondExporter.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/document/ConfigGroups.cpp b/src/document/ConfigGroups.cpp index 8e164c3..6cd6c68 100644 --- a/src/document/ConfigGroups.cpp +++ b/src/document/ConfigGroups.cpp @@ -25,7 +25,7 @@ namespace Rosegarden { // - // KConfig group names + // TDEConfig group names // const char* const GeneralOptionsConfigGroup = "General Options"; const char* const LatencyOptionsConfigGroup = "Latency Options"; diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp index 3db3cfc..edc086c 100644 --- a/src/document/RosegardenGUIDoc.cpp +++ b/src/document/RosegardenGUIDoc.cpp @@ -169,7 +169,7 @@ RosegardenGUIDoc::~RosegardenGUIDoc() unsigned int RosegardenGUIDoc::getAutoSavePeriod() const { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup(GeneralOptionsConfigGroup); return config->readUnsignedNumEntry("autosaveinterval", 60); } @@ -1104,7 +1104,7 @@ void RosegardenGUIDoc::initialiseStudio() // Now commit all the remaining changes StudioControl::setStudioObjectProperties(ids, properties, values); - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup(SequencerOptionsConfigGroup); bool faderOuts = config->readBoolEntry("audiofaderouts", false); @@ -1963,7 +1963,7 @@ RosegardenGUIDoc::insertRecordedMidi(const MappedComposition &mC) if (haveNotes) { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup(GeneralOptionsConfigGroup); int tracking = config->readUnsignedNumEntry("recordtracking", 0); diff --git a/src/document/io/LilyPondExporter.cpp b/src/document/io/LilyPondExporter.cpp index d8de526..38b0fea 100644 --- a/src/document/io/LilyPondExporter.cpp +++ b/src/document/io/LilyPondExporter.cpp @@ -122,7 +122,7 @@ void LilyPondExporter::readConfigVariables(void) { // grab config info - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); cfg->setGroup(NotationViewConfigGroup); m_paperSize = cfg->readUnsignedNumEntry("lilypapersize", PAPER_A4); |