summaryrefslogtreecommitdiffstats
path: root/kalarm/preferences.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
commit86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch)
tree97d3ac2c2f60780d9a1de4f82caac7cb27534501 /kalarm/preferences.cpp
parenta9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff)
downloadtdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz
tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kalarm/preferences.cpp')
-rw-r--r--kalarm/preferences.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/kalarm/preferences.cpp b/kalarm/preferences.cpp
index c77c72f1c..24669fbe5 100644
--- a/kalarm/preferences.cpp
+++ b/kalarm/preferences.cpp
@@ -37,7 +37,7 @@
#include "preferences.moc"
-static TQString translateXTermPath(KConfig*, const TQString& cmdline, bool write);
+static TQString translateXTermPath(TDEConfig*, const TQString& cmdline, bool write);
Preferences* Preferences::mInstance = 0;
@@ -252,7 +252,7 @@ void Preferences::read()
{
initialise();
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->setGroup(GENERAL_SECTION);
TQStringList cols = config->readListEntry(MESSAGE_COLOURS);
if (!cols.count())
@@ -358,7 +358,7 @@ void Preferences::read()
*/
void Preferences::save(bool syncToDisc)
{
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->setGroup(GENERAL_SECTION);
config->writeEntry(VERSION_NUM, KALARM_VERSION);
TQStringList colours;
@@ -433,7 +433,7 @@ void Preferences::syncToDisc()
void Preferences::updateStartOfDayCheck()
{
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->setGroup(GENERAL_SECTION);
config->writeEntry(START_OF_DAY_CHECK, startOfDayCheck());
config->sync();
@@ -549,7 +549,7 @@ bool Preferences::notifying(const TQString& messageID)
*/
void Preferences::convertOldPrefs()
{
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->setGroup(GENERAL_SECTION);
int version = KAlarm::getVersionNumber(config->readEntry(VERSION_NUM));
if (version >= KAlarm::Version(1,4,22))
@@ -647,11 +647,11 @@ void Preferences::convertOldPrefs()
* Note that only a home directory specification at the start of the path is
* translated, so there's no need to worry about missing out some of the
* executable's path due to quotes etc.
-* N.B. Calling KConfig::read/writePathEntry() on the entire command line
+* N.B. Calling TDEConfig::read/writePathEntry() on the entire command line
* causes a crash on some systems, so it's necessary to extract the
* executable path first before processing.
*/
-TQString translateXTermPath(KConfig* config, const TQString& cmdline, bool write)
+TQString translateXTermPath(TDEConfig* config, const TQString& cmdline, bool write)
{
TQString params;
TQString cmd = cmdline;