summaryrefslogtreecommitdiffstats
path: root/twin/clients/keramik
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:02:02 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:02:02 -0600
commitde7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch)
treedbb3152c372f8620f9290137d461f3d9f9eba1cb /twin/clients/keramik
parent936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff)
downloadtdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz
tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'twin/clients/keramik')
-rw-r--r--twin/clients/keramik/config/CMakeLists.txt2
-rw-r--r--twin/clients/keramik/config/Makefile.am4
-rw-r--r--twin/clients/keramik/config/config.h4
-rw-r--r--twin/clients/keramik/config/keramitdeconfig.ui (renamed from twin/clients/keramik/config/keramikconfig.ui)0
-rw-r--r--twin/clients/keramik/keramik.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/twin/clients/keramik/config/CMakeLists.txt b/twin/clients/keramik/config/CMakeLists.txt
index 7b5bdb339..6fce6dfaf 100644
--- a/twin/clients/keramik/config/CMakeLists.txt
+++ b/twin/clients/keramik/config/CMakeLists.txt
@@ -23,7 +23,7 @@ link_directories(
##### twin_keramik_config (module) ##############
tde_add_kpart( twin_keramik_config AUTOMOC
- SOURCES config.cpp keramikconfig.ui
+ SOURCES config.cpp keramitdeconfig.ui
LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/twin/clients/keramik/config/Makefile.am b/twin/clients/keramik/config/Makefile.am
index 19ee4f27d..aa6014cf5 100644
--- a/twin/clients/keramik/config/Makefile.am
+++ b/twin/clients/keramik/config/Makefile.am
@@ -2,12 +2,12 @@ INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = twin_keramik_config.la
-twin_keramik_config_la_SOURCES = config.cpp keramikconfig.ui
+twin_keramik_config_la_SOURCES = config.cpp keramitdeconfig.ui
twin_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin_keramik_config_la_LIBADD = $(LIB_TDEUI)
METASOURCES = AUTO
-noinst_HEADERS = config.h keramikconfig.h
+noinst_HEADERS = config.h keramitdeconfig.h
lnkdir = $(kde_datadir)/twin
diff --git a/twin/clients/keramik/config/config.h b/twin/clients/keramik/config/config.h
index 4138fe958..7907f28e5 100644
--- a/twin/clients/keramik/config/config.h
+++ b/twin/clients/keramik/config/config.h
@@ -25,9 +25,9 @@
#ifndef __KWIN_KERAMIK_CONFIG_H
#define __KWIN_KERAMIK_CONFIG_H
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include "keramikconfig.h"
+#include "keramitdeconfig.h"
class KeramikConfig: public TQObject
{
diff --git a/twin/clients/keramik/config/keramikconfig.ui b/twin/clients/keramik/config/keramitdeconfig.ui
index dda8d5b5f..dda8d5b5f 100644
--- a/twin/clients/keramik/config/keramikconfig.ui
+++ b/twin/clients/keramik/config/keramitdeconfig.ui
diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp
index 3825a851a..d90291ad2 100644
--- a/twin/clients/keramik/keramik.cpp
+++ b/twin/clients/keramik/keramik.cpp
@@ -20,7 +20,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klocale.h>
#include <kiconeffect.h>