summaryrefslogtreecommitdiffstats
path: root/ksim/library
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:05:57 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:05:57 -0600
commit0ea54195f4400f13a5cc109feee4b3779fbd2f0f (patch)
tree14f5fe9a43c0a4bc41119c9d518713a3f91bd4c1 /ksim/library
parent0ec14ccb8401eff2be20f861953a77431410955c (diff)
downloadtdeutils-0ea54195f4400f13a5cc109feee4b3779fbd2f0f.tar.gz
tdeutils-0ea54195f4400f13a5cc109feee4b3779fbd2f0f.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'ksim/library')
-rw-r--r--ksim/library/chart.cpp2
-rw-r--r--ksim/library/ksimconfig.cpp2
-rw-r--r--ksim/library/label.cpp2
-rw-r--r--ksim/library/pluginloader.h2
-rw-r--r--ksim/library/pluginmodule.cpp2
-rw-r--r--ksim/library/themeloader.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp
index 62a2328..547729c 100644
--- a/ksim/library/chart.cpp
+++ b/ksim/library/chart.cpp
@@ -31,7 +31,7 @@
#include <kdebug.h>
#include <klocale.h>
#include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <themeloader.h>
#include <led.h>
diff --git a/ksim/library/ksimconfig.cpp b/ksim/library/ksimconfig.cpp
index 3619f90..04f4559 100644
--- a/ksim/library/ksimconfig.cpp
+++ b/ksim/library/ksimconfig.cpp
@@ -18,7 +18,7 @@
*/
#include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kglobal.h>
#include "ksimconfig.h"
diff --git a/ksim/library/label.cpp b/ksim/library/label.cpp
index 91c23a6..954b03f 100644
--- a/ksim/library/label.cpp
+++ b/ksim/library/label.cpp
@@ -34,7 +34,7 @@
#include <kdebug.h>
#include <kglobal.h>
#include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
class KSim::Label::Private
{
diff --git a/ksim/library/pluginloader.h b/ksim/library/pluginloader.h
index 912297c..974a540 100644
--- a/ksim/library/pluginloader.h
+++ b/ksim/library/pluginloader.h
@@ -78,7 +78,7 @@ namespace KSim
/**
* loads a plugin, example:
* <pre>
- * KDesktopFile deskfile("/home/user/foo.desktop");
+ * KDesktopFile destdefile("/home/user/foo.desktop");
* KSim::PluginLoader::self().loadPlugin(deskFile);
* </pre>
* you can then use @ref pluginList() to access the plugin, view,
diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp
index 74128d9..d668e82 100644
--- a/ksim/library/pluginmodule.cpp
+++ b/ksim/library/pluginmodule.cpp
@@ -26,7 +26,7 @@
#include <kdebug.h>
#include <tqregexp.h>
#include <tqpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
class KSim::PluginObject::Private
diff --git a/ksim/library/themeloader.h b/ksim/library/themeloader.h
index 89ac67b..c70dc92 100644
--- a/ksim/library/themeloader.h
+++ b/ksim/library/themeloader.h
@@ -430,7 +430,7 @@ namespace KSim
*/
void reColourImage(TQImage &image);
/**
- * changes some of the entries in the config file so kconfig
+ * changes some of the entries in the config file so tdeconfig
* can handle the file better.
* @return the location of the config file
*/