summaryrefslogtreecommitdiffstats
path: root/korganizer/actionmanager.h
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 /korganizer/actionmanager.h
parenta9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff)
downloadtdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz
tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'korganizer/actionmanager.h')
-rw-r--r--korganizer/actionmanager.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h
index 8c6a44026..1d7d99157 100644
--- a/korganizer/actionmanager.h
+++ b/korganizer/actionmanager.h
@@ -50,7 +50,7 @@ class KActionCollection;
class KRecentFilesAction;
class KSelectAction;
class KToggleAction;
-class KConfig;
+class TDEConfig;
class TDEProcess;
class KTempFile;
class KXMLGUIClient;
@@ -259,7 +259,7 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface
void keyBindings();
/**
- Using the KConfig associated with the kapp variable, read in the
+ Using the TDEConfig associated with the kapp variable, read in the
settings from the config file.
*/
void readSettings();
@@ -270,8 +270,8 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface
void writeSettings();
/* Session management */
- void saveProperties( KConfig * );
- void readProperties( KConfig * );
+ void saveProperties( TDEConfig * );
+ void readProperties( TDEConfig * );
void loadParts();