summaryrefslogtreecommitdiffstats
path: root/kstyles
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:04:16 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:04:16 -0600
commit5159cd2beb2e87806a5b54e9991b7895285c9d3e (patch)
tree9b70e8be47a390f8f4d56ead812ab0c9dad88709 /kstyles
parentc17cb900dcf52b8bd6dc300d4f103392900ec2b4 (diff)
downloadtdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.tar.gz
tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kstyles')
-rw-r--r--kstyles/plastik/config/CMakeLists.txt2
-rw-r--r--kstyles/plastik/config/Makefile.am4
-rw-r--r--kstyles/plastik/config/plastitdeconf.cpp (renamed from kstyles/plastik/config/plastikconf.cpp)4
-rw-r--r--kstyles/plastik/config/plastitdeconf.h (renamed from kstyles/plastik/config/plastikconf.h)0
4 files changed, 5 insertions, 5 deletions
diff --git a/kstyles/plastik/config/CMakeLists.txt b/kstyles/plastik/config/CMakeLists.txt
index b8534cea7..8de92d14a 100644
--- a/kstyles/plastik/config/CMakeLists.txt
+++ b/kstyles/plastik/config/CMakeLists.txt
@@ -27,7 +27,7 @@ link_directories(
set( target kstyle_plastik_config )
set( ${target}_SRCS
- plastikconf.cpp
+ plastitdeconf.cpp
)
tde_add_kpart( ${target} AUTOMOC
diff --git a/kstyles/plastik/config/Makefile.am b/kstyles/plastik/config/Makefile.am
index 887c7ea89..d97df31bb 100644
--- a/kstyles/plastik/config/Makefile.am
+++ b/kstyles/plastik/config/Makefile.am
@@ -1,10 +1,10 @@
INCLUDES = $(all_includes)
-noinst_HEADERS = plastikconf.h
+noinst_HEADERS = plastitdeconf.h
kde_module_LTLIBRARIES = kstyle_plastik_config.la
kstyle_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kstyle_plastik_config_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
-kstyle_plastik_config_la_SOURCES = plastikconf.cpp
+kstyle_plastik_config_la_SOURCES = plastitdeconf.cpp
kstyle_plastik_config_la_METASOURCES = AUTO
diff --git a/kstyles/plastik/config/plastikconf.cpp b/kstyles/plastik/config/plastitdeconf.cpp
index 338cdcd1e..8d3e4acfd 100644
--- a/kstyles/plastik/config/plastikconf.cpp
+++ b/kstyles/plastik/config/plastitdeconf.cpp
@@ -35,7 +35,7 @@ DEALINGS IN THE SOFTWARE.
#include <kcolorbutton.h>
#include <kdemacros.h>
-#include "plastikconf.h"
+#include "plastitdeconf.h"
extern "C"
{
@@ -220,4 +220,4 @@ void PlastikStyleConfig::updateChanged()
emit changed(true);
}
-#include "plastikconf.moc"
+#include "plastitdeconf.moc"
diff --git a/kstyles/plastik/config/plastikconf.h b/kstyles/plastik/config/plastitdeconf.h
index 512ad6f2e..512ad6f2e 100644
--- a/kstyles/plastik/config/plastikconf.h
+++ b/kstyles/plastik/config/plastitdeconf.h