Rename KStyle to TDEStyle to avoid conflicts with KDE4.

styles/dotnet/CMakeLists.txt

@@ -25,7 +25,7 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES dotnet.themerc DESTINATION ${DATA_INSTALL_DIR}/kstyle/themes )
+install( FILES dotnet.themerc DESTINATION ${DATA_INSTALL_DIR}/tdestyle/themes )
 
 
 ##### dotnet #####################################

styles/dotnet/Makefile.am

@@ -28,5 +28,5 @@ dotnet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECO
 dotnet_la_LIBADD = -ltdefx
 dotnet_la_SOURCES = dotnet.cpp
 
-themercdir = $(kde_datadir)/kstyle/themes
+themercdir = $(kde_datadir)/tdestyle/themes
 themerc_DATA = dotnet.themerc

styles/dotnet/README

@@ -1,6 +1,6 @@
 To make this your default style without having to recompile tdelibs:
 
-Create a $TDEHOME/share/config/kstylerc with the following lines.
+Create a $TDEHOME/share/config/tdestylerc with the following lines.
 [KDE]
 WidgetStyle=dotNET
 

styles/phase/CMakeLists.txt

@@ -28,7 +28,7 @@ add_subdirectory( config )
 
 ##### other data ################################
 
-install( FILES phase.themerc DESTINATION ${DATA_INSTALL_DIR}/kstyle/themes )
+install( FILES phase.themerc DESTINATION ${DATA_INSTALL_DIR}/tdestyle/themes )
 
 ##### phasestyle #################################
 

styles/phase/Makefile.am

@@ -6,7 +6,7 @@ KDE_CXXFLAGS = -DQT_PLUGIN
 
 INCLUDES = $(all_includes)
 
-styledir = $(kde_datadir)/kstyle/themes
+styledir = $(kde_datadir)/tdestyle/themes
 style_DATA = phase.themerc
 
 EXTRA_DIST = $(style_DATA)

styles/phase/config/CMakeLists.txt

@@ -19,9 +19,9 @@ link_directories(
   ${TQT_LIBRARY_DIRS}
 )
 
-##### kstyle_phase_config ########################
+##### tdestyle_phase_config ########################
 
-set( target kstyle_phase_config )
+set( target tdestyle_phase_config )
 
 set( ${target}_SRCS
   phasestyleconfig.cpp

styles/phase/config/Makefile.am

@@ -2,11 +2,11 @@ INCLUDES = $(all_includes)
 
 noinst_HEADERS = phasestyleconfig.h
 
-kde_module_LTLIBRARIES = kstyle_phase_config.la
-kstyle_phase_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-kstyle_phase_config_la_LIBADD  = $(LIB_TDEUI)
-kstyle_phase_config_la_SOURCES = phasestyleconfig.cpp styledialog.ui
-kstyle_phase_config_la_METASOURCES = AUTO
+kde_module_LTLIBRARIES = tdestyle_phase_config.la
+tdestyle_phase_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+tdestyle_phase_config_la_LIBADD  = $(LIB_TDEUI)
+tdestyle_phase_config_la_SOURCES = phasestyleconfig.cpp styledialog.ui
+tdestyle_phase_config_la_METASOURCES = AUTO
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp *.h -o $(podir)/kstyle_phase_config.pot
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdestyle_phase_config.pot

styles/phase/config/phasestyleconfig.cpp

@@ -28,7 +28,7 @@
 
 PhaseStyleConfig::PhaseStyleConfig(TQWidget* parent) : StyleDialog(parent)
 {
-    TDEGlobal::locale()->insertCatalogue("kstyle_phase_config");
+    TDEGlobal::locale()->insertCatalogue("tdestyle_phase_config");
 
     TQSettings settings;
     oldgradients =
@@ -52,7 +52,7 @@ PhaseStyleConfig::PhaseStyleConfig(TQWidget* parent) : StyleDialog(parent)
 
 PhaseStyleConfig::~PhaseStyleConfig()
 {
-    TDEGlobal::locale()->removeCatalogue("kstyle_phase_config");
+    TDEGlobal::locale()->removeCatalogue("tdestyle_phase_config");
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -103,7 +103,7 @@ void PhaseStyleConfig::defaults()
 
 extern "C"
 {
-    KDE_EXPORT TQObject* allocate_kstyle_config(TQWidget* parent) {
+    KDE_EXPORT TQObject* allocate_tdestyle_config(TQWidget* parent) {
         return(TQT_TQOBJECT(new PhaseStyleConfig(parent)));
     }
 }

styles/phase/phase.themerc

@@ -35,7 +35,7 @@ Name[tr]=Faz
 Name[uk]=Фаза
 Name[vi]=Pha
 Name[zh_TW]=相
-ConfigPage=kstyle_phase_config
+ConfigPage=tdestyle_phase_config
 Comment=Clean classical look
 Comment[bg]=Семпъл и изчистен стил
 Comment[bs]=Jednostavan klasični stil