diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:02 -0600 |
| commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
| tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /kcontrol/style/keramik | |
| parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
| download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/style/keramik')
| -rw-r--r-- | kcontrol/style/keramik/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kcontrol/style/keramik/Makefile.am | 4 | ||||
| -rw-r--r-- | kcontrol/style/keramik/keramitdeconf.cpp (renamed from kcontrol/style/keramik/keramikconf.cpp) | 4 | ||||
| -rw-r--r-- | kcontrol/style/keramik/keramitdeconf.h (renamed from kcontrol/style/keramik/keramikconf.h) | 0 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/style/keramik/CMakeLists.txt b/kcontrol/style/keramik/CMakeLists.txt index b68be1c2e..e03b85ef3 100644 --- a/kcontrol/style/keramik/CMakeLists.txt +++ b/kcontrol/style/keramik/CMakeLists.txt @@ -23,7 +23,7 @@ link_directories( ##### kstyle_keramik_config (module) ############ tde_add_kpart( kstyle_keramik_config AUTOMOC - SOURCES keramikconf.cpp + SOURCES keramitdeconf.cpp LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/style/keramik/Makefile.am b/kcontrol/style/keramik/Makefile.am index 56fbefa6b..78077b923 100644 --- a/kcontrol/style/keramik/Makefile.am +++ b/kcontrol/style/keramik/Makefile.am @@ -1,10 +1,10 @@ INCLUDES = $(all_includes) -noinst_HEADERS = keramikconf.h +noinst_HEADERS = keramitdeconf.h kde_module_LTLIBRARIES = kstyle_keramik_config.la kstyle_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module kstyle_keramik_config_la_LIBADD = $(LIB_TDEUI) -kstyle_keramik_config_la_SOURCES = keramikconf.cpp +kstyle_keramik_config_la_SOURCES = keramitdeconf.cpp METASOURCES = AUTO diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramitdeconf.cpp index 3027106cd..742842876 100644 --- a/kcontrol/style/keramik/keramikconf.cpp +++ b/kcontrol/style/keramik/keramitdeconf.cpp @@ -28,7 +28,7 @@ DEALINGS IN THE SOFTWARE. #include <kglobal.h> #include <klocale.h> -#include "keramikconf.h" +#include "keramitdeconf.h" extern "C" { @@ -100,4 +100,4 @@ void KeramikStyleConfig::updateChanged() emit changed(true); } -#include "keramikconf.moc" +#include "keramitdeconf.moc" diff --git a/kcontrol/style/keramik/keramikconf.h b/kcontrol/style/keramik/keramitdeconf.h index 6de7edb10..6de7edb10 100644 --- a/kcontrol/style/keramik/keramikconf.h +++ b/kcontrol/style/keramik/keramitdeconf.h |