summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:12:24 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:12:24 -0600
commitaf170e7e3fc1491de418039e06d5a8bd12ea352a (patch)
tree4376007af6b7395975ac0e66cb28f9732d53c9d2
parent94bde91405765adaea1365f488beb55a7f66833e (diff)
downloadksystemlog-af170e7e.tar.gz
ksystemlog-af170e7e.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
-rw-r--r--ksystemlog/src/ksystemlog.cpp4
-rw-r--r--ksystemlog/src/ksystemlog.h6
-rw-r--r--ksystemlog/src/view.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/ksystemlog/src/ksystemlog.cpp b/ksystemlog/src/ksystemlog.cpp
index 20e5bb5..83bbeb1 100644
--- a/ksystemlog/src/ksystemlog.cpp
+++ b/ksystemlog/src/ksystemlog.cpp
@@ -1297,7 +1297,7 @@ void KSystemLog::load(LogMode* logMode, LogManager* manager) {
* config file. anything you write here will be available
* later when this app is restored
*/
-void KSystemLog::saveProperties(KConfig* /*config*/) {
+void KSystemLog::saveProperties(TDEConfig* /*config*/) {
kdDebug() << "saveProperties method." << endl;
}
@@ -1307,7 +1307,7 @@ void KSystemLog::saveProperties(KConfig* /*config*/) {
* the app is being restored. read in here whatever you wrote
* in 'saveProperties'
*/
-void KSystemLog::readProperties(KConfig* /*config*/) {
+void KSystemLog::readProperties(TDEConfig* /*config*/) {
kdDebug() << "readProperties method." << endl;
}
diff --git a/ksystemlog/src/ksystemlog.h b/ksystemlog/src/ksystemlog.h
index b87618c..fda49de 100644
--- a/ksystemlog/src/ksystemlog.h
+++ b/ksystemlog/src/ksystemlog.h
@@ -132,14 +132,14 @@ class KSystemLog : 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 *);
void setupLogLevels();
diff --git a/ksystemlog/src/view.cpp b/ksystemlog/src/view.cpp
index ff50760..6b3b582 100644
--- a/ksystemlog/src/view.cpp
+++ b/ksystemlog/src/view.cpp
@@ -132,7 +132,7 @@ void View::saveConfig() {
kdDebug() << "Saving View Layout..." << endl;
KSystemLogConfig* configXT=KSystemLogConfig::self();
- KConfig* config=configXT->config();
+ TDEConfig* config=configXT->config();
TQString group="List";
group.append(logManager->getIndex());