summaryrefslogtreecommitdiffstats
path: root/kandy
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 /kandy
parenta9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff)
downloadtdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz
tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kandy')
-rw-r--r--kandy/src/kandy.cpp6
-rw-r--r--kandy/src/kandy.h6
-rw-r--r--kandy/src/kandyview.cpp4
-rw-r--r--kandy/src/mobilemain.cpp4
-rw-r--r--kandy/src/mobilemain.h6
5 files changed, 13 insertions, 13 deletions
diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp
index 6fb5fc2ac..f7c29d0c4 100644
--- a/kandy/src/kandy.cpp
+++ b/kandy/src/kandy.cpp
@@ -88,7 +88,7 @@ Kandy::Kandy(CommandScheduler *scheduler)
connect(mView,TQT_SIGNAL(modifiedChanged(bool)),TQT_SLOT(setTitle()));
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("General");
TQString currentProfile = config->readEntry("CurrentProfile",
locate("appdata","default.kandy"));
@@ -148,14 +148,14 @@ void Kandy::setupActions()
createGUI();
}
-void Kandy::saveProperties(KConfig */*config*/)
+void Kandy::saveProperties(TDEConfig */*config*/)
{
// the 'config' object points to the session managed
// config file. anything you write here will be available
// later when this app is restored
}
-void Kandy::readProperties(KConfig */*config*/)
+void Kandy::readProperties(TDEConfig */*config*/)
{
// the 'config' object points to the session managed
// config file. this function is automatically called whenever
diff --git a/kandy/src/kandy.h b/kandy/src/kandy.h
index 8a2cd0b32..05bd39b36 100644
--- a/kandy/src/kandy.h
+++ b/kandy/src/kandy.h
@@ -91,14 +91,14 @@ class Kandy : public KMainWindow
* This function is called when it is time for the app to save its
* properties for session management purposes.
*/
- void saveProperties(KConfig *);
+ void saveProperties(TDEConfig *);
/**
- * This function is called when this app is restored. The KConfig
+ * This function is called when this app is restored. The TDEConfig
* object points to the session management config file that was saved
* with @ref saveProperties
*/
- void readProperties(KConfig *);
+ void readProperties(TDEConfig *);
private slots:
diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp
index 662802f55..99336c921 100644
--- a/kandy/src/kandyview.cpp
+++ b/kandy/src/kandyview.cpp
@@ -283,7 +283,7 @@ bool KandyView::loadFile(const TQString& filename)
new CommandItem(mCommandList,cmds->at(i));
}
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("General");
config->writeEntry("CurrentProfile",filename);
@@ -296,7 +296,7 @@ bool KandyView::saveFile(const TQString& filename)
{
if (!mScheduler->saveProfile(filename)) return false;
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("General");
config->writeEntry("CurrentProfile",filename);
diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp
index 9a8003063..318b3eaa6 100644
--- a/kandy/src/mobilemain.cpp
+++ b/kandy/src/mobilemain.cpp
@@ -86,14 +86,14 @@ void MobileMain::setupActions()
createGUI("kandymobileui.rc");
}
-void MobileMain::saveProperties(KConfig */*config*/)
+void MobileMain::saveProperties(TDEConfig */*config*/)
{
// the 'config' object points to the session managed
// config file. anything you write here will be available
// later when this app is restored
}
-void MobileMain::readProperties(KConfig */*config*/)
+void MobileMain::readProperties(TDEConfig */*config*/)
{
// the 'config' object points to the session managed
// config file. this function is automatically called whenever
diff --git a/kandy/src/mobilemain.h b/kandy/src/mobilemain.h
index 7c7c48452..eeff40bba 100644
--- a/kandy/src/mobilemain.h
+++ b/kandy/src/mobilemain.h
@@ -78,14 +78,14 @@ class MobileMain : public KMainWindow
* This function is called when it is time for the app to save its
* properties for session management purposes.
*/
- void saveProperties(KConfig *);
+ void saveProperties(TDEConfig *);
/**
- * This function is called when this app is restored. The KConfig
+ * This function is called when this app is restored. The TDEConfig
* object points to the session management config file that was saved
* with @ref saveProperties
*/
- void readProperties(KConfig *);
+ void readProperties(TDEConfig *);
private slots: