Rename KStyle to TDEStyle to avoid conflicts with KDE4.

CMakeLists.txt

@@ -1005,7 +1005,7 @@ add_subdirectory( tdeconf_update )
 add_subdirectory( kdewidgets )
 add_subdirectory( kimgio )
 add_subdirectory( tdeioslave )
-add_subdirectory( kstyles )
+add_subdirectory( tdestyles )
 add_subdirectory( libtdemid )
 add_subdirectory( libtdescreensaver )
 add_subdirectory( networkstatus )

KDE3PORTING.html

@@ -319,7 +319,7 @@ The old name will still work unless KDE_NO_COMPAT is defined.
 
 <H4>KThemeBase, KThemeStyle</H4>
 KThemeBase and KThemeStyle have been ported over to the new QStyle/TDEStyle API
-present in Qt3/KDE3. KThemeBase is no longer in tdeui, but in kstyles/kthemestyle
+present in Qt3/KDE3. KThemeBase is no longer in tdeui, but in tdestyles/kthemestyle
 as its use is basically limited to KThemeStyle.
 
 <H4>TDEAction, TDEToolBar, TDEToolBarButton and icons</H4>

README

@@ -98,7 +98,7 @@ Here is an alphabetical list:
 * tdeparts
     KDE component model.
 
-* kstyles
+* tdestyles
     The theme engine lies within. It handles nearly anything relating to
     customizing the appearance of widgets.
 

kstyles/highcontrast/config/Makefile.am

@@ -1,12 +0,0 @@
-INCLUDES = $(all_includes)
-
-noinst_HEADERS = highcontrastconfig.h
-kde_module_LTLIBRARIES = kstyle_highcontrast_config.la
-kstyle_highcontrast_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kstyle_highcontrast_config_la_LIBADD  = $(LIB_QT) $(LIB_TDECORE)
-kstyle_highcontrast_config_la_SOURCES = highcontrastconfig.cpp
-kstyle_highcontrast_config_la_METASOURCES = AUTO
-
-
-messages:
-	$(XGETTEXT) *.cpp *.h -o $(podir)/kstyle_highcontrast_config.pot

kstyles/plastik/config/Makefile.am

@@ -1,12 +0,0 @@
-INCLUDES = $(all_includes)
-
-noinst_HEADERS = plastikconf.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_METASOURCES = AUTO
-
-
-messages:
-	$(XGETTEXT) *.cpp *.h -o $(podir)/kstyle_plastik_config.pot

kstyles/themes/Makefile.am

@@ -1,12 +0,0 @@
-
-kstylethemesdata_DATA = qtplatinum.themerc qtcde.themerc qtmotif.themerc qtwindows.themerc \
-	qtsgi.themerc qtmotifplus.themerc\
-	highcolor.themerc \
-	default.themerc b3.themerc light-v2.themerc \
-	light-v3.themerc keramik.themerc
-kstylethemesdatadir = $(kde_datadir)/kstyle/themes
-
-EXTRA_DIST = $(kstylethemesdata_DATA)
-
-kde_conf_DATA = kthemestylerc
-

tdecore/tdeapplication.h

@@ -893,7 +893,7 @@ public:
   /**
    * @deprecated
    */
-  KDE_DEPRECATED TDEStyle* kstyle() const { return 0; }
+  KDE_DEPRECATED TDEStyle* tdestyle() const { return 0; }
 
   /**
    * Builds a caption that contains the application name along with the

tdecore/tdelibs_export.h

@@ -45,7 +45,7 @@
 #define TDESU_EXPORT KDE_EXPORT
 #define KVCARD_EXPORT KDE_EXPORT
 #define TDERESOURCES_EXPORT KDE_EXPORT
-#define KSTYLE_EXPORT KDE_EXPORT
+#define TDESTYLE_EXPORT KDE_EXPORT
 #define TDEHTML_EXPORT KDE_EXPORT
 #define KMDI_EXPORT KDE_EXPORT
 #define KUTILS_EXPORT KDE_EXPORT

tdefx/tdestyle.cpp

@@ -154,7 +154,7 @@ class TransparencyHandler : public TQObject
 		bool    dropShadow;
 		float   opacity;
 		TQPixmap pix;
-		TDEStyle* kstyle;
+		TDEStyle* tdestyle;
 		TransparencyEngine te;
 };
 } // namespace
@@ -1600,7 +1600,7 @@ TQRect TDEStyle::querySubControlMetrics( TQ_ComplexControl control,
 	return ret;
 }
 
-static const char * const kstyle_close_xpm[] = {
+static const char * const tdestyle_close_xpm[] = {
 "12 12 2 1",
 "# c #000000",
 ". c None",
@@ -1617,7 +1617,7 @@ static const char * const kstyle_close_xpm[] = {
 "............",
 "............"};
 
-static const char * const kstyle_maximize_xpm[]={
+static const char * const tdestyle_maximize_xpm[]={
 "12 12 2 1",
 "# c #000000",
 ". c None",
@@ -1635,7 +1635,7 @@ static const char * const kstyle_maximize_xpm[]={
 "............"};
 
 
-static const char * const kstyle_minimize_xpm[] = {
+static const char * const tdestyle_minimize_xpm[] = {
 "12 12 2 1",
 "# c #000000",
 ". c None",
@@ -1652,7 +1652,7 @@ static const char * const kstyle_minimize_xpm[] = {
 "............",
 "............"};
 
-static const char * const kstyle_normalizeup_xpm[] = {
+static const char * const tdestyle_normalizeup_xpm[] = {
 "12 12 2 1",
 "# c #000000",
 ". c None",
@@ -1670,7 +1670,7 @@ static const char * const kstyle_normalizeup_xpm[] = {
 "............"};
 
 
-static const char * const kstyle_shade_xpm[] = {
+static const char * const tdestyle_shade_xpm[] = {
 "12 12 2 1",
 "# c #000000",
 ". c None",
@@ -1687,7 +1687,7 @@ static const char * const kstyle_shade_xpm[] = {
 "............",
 "............"};
 
-static const char * const kstyle_unshade_xpm[] = {
+static const char * const tdestyle_unshade_xpm[] = {
 "12 12 2 1",
 "# c #000000",
 ". c None",
@@ -1850,17 +1850,17 @@ TQPixmap TDEStyle::stylePixmap( StylePixmap stylepixmap,
 {
 	switch (stylepixmap) {
 		case SP_TitleBarShadeButton:
-			return TQPixmap(const_cast<const char**>(kstyle_shade_xpm));
+			return TQPixmap(const_cast<const char**>(tdestyle_shade_xpm));
 		case SP_TitleBarUnshadeButton:
-			return TQPixmap(const_cast<const char**>(kstyle_unshade_xpm));
+			return TQPixmap(const_cast<const char**>(tdestyle_unshade_xpm));
 		case SP_TitleBarNormalButton:
-			return TQPixmap(const_cast<const char**>(kstyle_normalizeup_xpm));
+			return TQPixmap(const_cast<const char**>(tdestyle_normalizeup_xpm));
 		case SP_TitleBarMinButton:
-			return TQPixmap(const_cast<const char**>(kstyle_minimize_xpm));
+			return TQPixmap(const_cast<const char**>(tdestyle_minimize_xpm));
 		case SP_TitleBarMaxButton:
-			return TQPixmap(const_cast<const char**>(kstyle_maximize_xpm));
+			return TQPixmap(const_cast<const char**>(tdestyle_maximize_xpm));
 		case SP_TitleBarCloseButton:
-			return TQPixmap(const_cast<const char**>(kstyle_close_xpm));
+			return TQPixmap(const_cast<const char**>(tdestyle_close_xpm));
 		case SP_DockWindowCloseButton:
 			return TQPixmap(const_cast<const char**>(dock_window_close_xpm ));
 		case SP_MessageBoxInformation:
@@ -1998,7 +1998,7 @@ TransparencyHandler::TransparencyHandler( TDEStyle* style,
 	: TQObject()
 {
 	te = tEngine;
-	kstyle = style;
+	tdestyle = style;
 	opacity = menuOpacity;
 	dropShadow = useDropShadow;
 	pix.setOptimization(TQPixmap::BestOptim);
@@ -2341,7 +2341,7 @@ void TransparencyHandler::blendToPixmap(const TQColorGroup &cg, const TQWidget*
 
 	// Allow styles to define the blend pixmap - allows for some interesting effects.
 	if (::tqqt_cast<TQPopupMenu*>(p))
-		kstyle->renderMenuBlendPixmap( blendPix, cg, ::tqqt_cast<TQPopupMenu*>(p) );
+		tdestyle->renderMenuBlendPixmap( blendPix, cg, ::tqqt_cast<TQPopupMenu*>(p) );
 	else
 		blendPix.fill(cg.button());	// Just tint as the default behavior
 
@@ -2363,7 +2363,7 @@ void TransparencyHandler::XRenderBlendToPixmap(const TQWidget* p)
 
 	// Allow styles to define the blend pixmap - allows for some interesting effects.
 	if (::tqqt_cast<TQPopupMenu*>(p))
-	   kstyle->renderMenuBlendPixmap( renderPix, p->colorGroup(),
+	   tdestyle->renderMenuBlendPixmap( renderPix, p->colorGroup(),
 			   ::tqqt_cast<TQPopupMenu*>(p) );
 	else
 		renderPix.fill(p->colorGroup().button());	// Just tint as the default behavior
@@ -2407,7 +2407,7 @@ void TDEStyle::virtual_hook( int, void* )
 // HACK for gtk-qt-engine
 
 extern "C" KDE_EXPORT
-void kde_kstyle_set_scrollbar_type_windows( void* style )
+void kde_tdestyle_set_scrollbar_type_windows( void* style )
 {
     ((TDEStyle*)style)->setScrollBarType( TDEStyle::WindowsStyleScrollBar );
 }

tdefx/tdestyle.h

@@ -24,8 +24,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KSTYLE_H
+#ifndef __TDESTYLE_H
-#define __KSTYLE_H
+#define __TDESTYLE_H
 
 // W A R N I N G
 // -------------

tdestyles/Makefile.am

@@ -1,4 +1,4 @@
 SUBDIRS = asteroid plastik highcolor highcontrast themes light kthemestyle riscos utils keramik
 
-#kstyles should not be included in the apidocs
+#tdestyles should not be included in the apidocs
 #include $(top_srcdir)/admin/Doxyfile.am

tdestyles/asteroid/CMakeLists.txt

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

tdestyles/asteroid/Makefile.am

@@ -14,5 +14,5 @@ asteroid_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 asteroid_la_LIBADD = -ltdefx -ltdeutils
 asteroid_la_SOURCES = asteroid.cpp
 
-themercdir = $(kde_datadir)/kstyle/themes
+themercdir = $(kde_datadir)/tdestyle/themes
 themerc_DATA = asteroid.themerc

tdestyles/highcontrast/CMakeLists.txt

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

tdestyles/highcontrast/Makefile.am

@@ -25,7 +25,7 @@ KDE_CXXFLAGS = -DQT_PLUGIN
 
 INCLUDES = $(all_includes)
 
-stylercdir = $(kde_datadir)/kstyle/themes
+stylercdir = $(kde_datadir)/tdestyle/themes
 stylerc_DATA = highcontrast.themerc
 
 EXTRA_DIST = $(stylerc_DATA)

tdestyles/highcontrast/config/CMakeLists.txt

@@ -22,9 +22,9 @@ link_directories(
 )
 
 
-##### kstyle_highcontrast_config ################
+##### tdestyle_highcontrast_config ################
 
-set( target kstyle_highcontrast_config )
+set( target tdestyle_highcontrast_config )
 
 set( ${target}_SRCS
   highcontrastconfig.cpp

tdestyles/highcontrast/config/Makefile.am

@@ -0,0 +1,12 @@
+INCLUDES = $(all_includes)
+
+noinst_HEADERS = highcontrastconfig.h
+kde_module_LTLIBRARIES = tdestyle_highcontrast_config.la
+tdestyle_highcontrast_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+tdestyle_highcontrast_config_la_LIBADD  = $(LIB_QT) $(LIB_TDECORE)
+tdestyle_highcontrast_config_la_SOURCES = highcontrastconfig.cpp
+tdestyle_highcontrast_config_la_METASOURCES = AUTO
+
+
+messages:
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdestyle_highcontrast_config.pot

tdestyles/highcontrast/config/highcontrastconfig.cpp

@@ -34,7 +34,7 @@ DEALINGS IN THE SOFTWARE.
 #include "highcontrastconfig.h"
 
 extern "C" KDE_EXPORT TQWidget* 
-allocate_kstyle_config(TQWidget* parent)
+allocate_tdestyle_config(TQWidget* parent)
 {
     return new HighContrastStyleConfig(parent);
 }
@@ -44,7 +44,7 @@ HighContrastStyleConfig::HighContrastStyleConfig(
 {
     // Should have no margins here, the dialog provides them
     TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
-    TDEGlobal::locale()->insertCatalogue("kstyle_highcontrast_config");
+    TDEGlobal::locale()->insertCatalogue("tdestyle_highcontrast_config");
 
     wideLinesBox = new TQCheckBox(i18n("Use wider lines"), this);
 
@@ -62,7 +62,7 @@ HighContrastStyleConfig::HighContrastStyleConfig(
 
 HighContrastStyleConfig::~HighContrastStyleConfig()
 {
-    TDEGlobal::locale()->removeCatalogue("kstyle_keramik_config");
+    TDEGlobal::locale()->removeCatalogue("tdestyle_keramik_config");
 }
 
 

tdestyles/highcontrast/highcontrast.themerc

@@ -59,7 +59,7 @@ Name[uk]=Висока контрастність
 Name[vi]=Độ tương phản cao
 Name[zh_CN]=高对比度
 Name[zh_HK]=高反差
-ConfigPage=kstyle_highcontrast_config
+ConfigPage=tdestyle_highcontrast_config
 Comment=A style that works well with high contrast color schemes
 Comment[af]=´n Styl wat goed werk met hoë kontras kleur skemas
 Comment[be]=Стыль, які створаны для працы з высокакантрастнымі колернымі схемамі

tdestyles/kthemestyle/CMakeLists.txt

@@ -31,7 +31,7 @@ link_directories(
 set( target kthemestyle )
 
 set( ${target}_SRCS
-  kthemebase.cpp kthemestyle.cpp kstyledirs.cpp
+  kthemebase.cpp kthemestyle.cpp tdestyledirs.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC

tdestyles/kthemestyle/Makefile.am

@@ -21,9 +21,9 @@
 AM_CPPFLAGS = -DQT_PLUGIN 
 
 INCLUDES = -I$(top_srcdir)/tdefx $(all_includes)
-noinst_HEADERS = kthemestyle.h kthemebase.h kstyledirs.h
+noinst_HEADERS = kthemestyle.h kthemebase.h tdestyledirs.h
 kde_style_LTLIBRARIES = kthemestyle.la
 kthemestyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 kthemestyle_la_LIBADD = ../../tdefx/libtdefx.la  ../../tdecore/libtdecore.la -ldl $(LIB_QT)
-kthemestyle_la_SOURCES = kthemebase.cpp kthemestyle.cpp kstyledirs.cpp
+kthemestyle_la_SOURCES = kthemebase.cpp kthemestyle.cpp tdestyledirs.cpp
 kthemestyle_la_METASOURCES = AUTO

tdestyles/kthemestyle/kthemebase.cpp

@@ -529,7 +529,7 @@ KThemeBase::KThemeBase( const TQString& dir, const TQString & configFile )
 {
     d = new KThemeBasePrivate;
     if ( configFileName.isEmpty() )
-        configFileName = "kstylerc";
+        configFileName = "tdestylerc";
 
 
     configDirName = dir;

tdestyles/kthemestyle/kthemebase.h

@@ -37,7 +37,7 @@ Copyright (C) 1998, 1999, 2000 KDE Team
 #include <tdestyle.h>
 #include <tqsettings.h>
 #include <tqpalette.h> // for QColorGroup
-#include "kstyledirs.h"
+#include "tdestyledirs.h"
 #include <tqmap.h>
 
 class TQImage;

tdestyles/kthemestyle/kthemestyle.cpp

@@ -66,7 +66,7 @@ Port version 0.9.7
 #include <tqobjectlist.h>
 #include <tqradiobutton.h>
 #include <tqstatusbar.h>
-#include "kstyledirs.h"
+#include "tdestyledirs.h"
 
 #include <tqimage.h>
 

tdestyles/kthemestyle/tdestyledirs.cpp

@@ -23,14 +23,14 @@
 
 #include <tqfile.h>
 #include <kstandarddirs.h>
-#include "kstyledirs.h"
+#include "tdestyledirs.h"
 
 TDEStyleDirs* TDEStyleDirs::instance = 0;
 
 TDEStyleDirs::TDEStyleDirs()
 {
-    addResourceType( "themepixmap", TDEStandardDirs::kde_default( "data" ) + "kstyle/pixmaps/" );
+    addResourceType( "themepixmap", TDEStandardDirs::kde_default( "data" ) + "tdestyle/pixmaps/" );
-    addResourceType( "themerc", TDEStandardDirs::kde_default( "data" ) + "kstyle/themes/" );
+    addResourceType( "themerc", TDEStandardDirs::kde_default( "data" ) + "tdestyle/themes/" );
 }
 
 TDEStyleDirs::~TDEStyleDirs()

tdestyles/kthemestyle/tdestyledirs.h

@@ -19,8 +19,8 @@
  Boston, MA 02110-1301, USA.
 */
 
-#ifndef KSTYLE_DIRS_H
+#ifndef TDESTYLE_DIRS_H
-#define KSTYLE_DIRS_H
+#define TDESTYLE_DIRS_H
 
 
 #include <tqsettings.h>
@@ -36,8 +36,8 @@
 * This class provides a this wrapper for styles around TDEStandardDirs,
 * permitting integration with TQSettings and easy loading of pixmaps
 *
-* It add share/apps/kstyle/themes as "themerc",
+* It add share/apps/tdestyle/themes as "themerc",
-*    share/apps/kstyle/pixmaps "themepixmap"
+*    share/apps/tdestyle/pixmaps "themepixmap"
 */
 class TDEStyleDirs: public TDEStandardDirs
 {
@@ -63,7 +63,7 @@ public:
     TDEStyleDirs dirs;
     dirs.addToSearch("config",settings);
 
-    The one can do settings.readEntry("kstyle/KDE/WidgetStyle") to access a settings in kstylerc.
+    The one can do settings.readEntry("tdestyle/TDE/WidgetStyle") to access a settings in tdestylerc.
     */
     void addToSearch( const char* type, TQSettings& q) const; //Better name?
 

tdestyles/plastik/CMakeLists.txt

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

tdestyles/plastik/Makefile.am

@@ -6,7 +6,7 @@ KDE_CXXFLAGS = -DQT_PLUGIN
 
 INCLUDES = $(all_includes)
 
-stylercdir = $(kde_datadir)/kstyle/themes
+stylercdir = $(kde_datadir)/tdestyle/themes
 stylerc_DATA = plastik.themerc
 
 EXTRA_DIST = $(stylerc_DATA)

tdestyles/plastik/config/CMakeLists.txt

@@ -22,9 +22,9 @@ link_directories(
 )
 
 
-##### kstyle_plastik_config ######################
+##### tdestyle_plastik_config ######################
 
-set( target kstyle_plastik_config )
+set( target tdestyle_plastik_config )
 
 set( ${target}_SRCS
   plastikconf.cpp

tdestyles/plastik/config/Makefile.am

@@ -0,0 +1,12 @@
+INCLUDES = $(all_includes)
+
+noinst_HEADERS = plastikconf.h
+kde_module_LTLIBRARIES = tdestyle_plastik_config.la
+tdestyle_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+tdestyle_plastik_config_la_LIBADD  = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
+tdestyle_plastik_config_la_SOURCES = plastikconf.cpp
+tdestyle_plastik_config_la_METASOURCES = AUTO
+
+
+messages:
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdestyle_plastik_config.pot

tdestyles/plastik/config/plastikconf.cpp

@@ -39,9 +39,9 @@ DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-	KDE_EXPORT TQWidget* allocate_kstyle_config(TQWidget* parent)
+	KDE_EXPORT TQWidget* allocate_tdestyle_config(TQWidget* parent)
 	{
-		TDEGlobal::locale()->insertCatalogue("kstyle_plastik_config");
+		TDEGlobal::locale()->insertCatalogue("tdestyle_plastik_config");
 		return new PlastikStyleConfig(parent);
 	}
 }
@@ -50,7 +50,7 @@ PlastikStyleConfig::PlastikStyleConfig(TQWidget* parent): TQWidget(parent)
 {
 	//Should have no margins here, the dialog provides them
 	TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
-	TDEGlobal::locale()->insertCatalogue("kstyle_plastik_config");
+	TDEGlobal::locale()->insertCatalogue("tdestyle_plastik_config");
 
 // 	scrollBarLines = new TQCheckBox(i18n("Scrollbar handle lines"), this);
 	animateProgressBar = new TQCheckBox(i18n("Animate progress bars"), this);

tdestyles/plastik/plastik.themerc

@@ -26,7 +26,7 @@ Name[th]=พลาสติคK
 Name[uk]=Пластик
 Name[uz@cyrillic]=Пластик
 Name[zh_CN]=塑料
-ConfigPage=kstyle_plastik_config
+ConfigPage=tdestyle_plastik_config
 Comment=A simple and clean style
 Comment[af]=´n eenvoudige en skoon styl
 Comment[be]=Просты і прыгожы стыль

tdestyles/riscos/CMakeLists.txt

@@ -23,8 +23,8 @@ install( FILES
     sunk_border.png tab_up.png vscrollback.png
     vscrollbar.png vscrollbar_down.png vscrollborder.png
     vtab.png
-  DESTINATION ${DATA_INSTALL_DIR}/kstyle/pixmaps/riscos )
+  DESTINATION ${DATA_INSTALL_DIR}/tdestyle/pixmaps/riscos )
 
 install( FILES
     riscos.themerc
-  DESTINATION ${DATA_INSTALL_DIR}/kstyle/themes )
+  DESTINATION ${DATA_INSTALL_DIR}/tdestyle/themes )

tdestyles/riscos/Makefile.am

@@ -32,9 +32,9 @@ pixmap_DATA = \
   vscrollborder.png \
   vtab.png
 
-pixmapdir = $(kde_datadir)/kstyle/pixmaps/riscos
+pixmapdir = $(kde_datadir)/tdestyle/pixmaps/riscos
 
 themerc_DATA = riscos.themerc
-themercdir = $(kde_datadir)/kstyle/themes
+themercdir = $(kde_datadir)/tdestyle/themes
 
 EXTRA_DIST = $(pixmap_DATA) $(themerc_DATA)

tdestyles/themes/CMakeLists.txt

@@ -16,7 +16,7 @@ install( FILES
     qtwindows.themerc qtsgi.themerc qtmotifplus.themerc
     highcolor.themerc default.themerc b3.themerc
     light-v2.themerc light-v3.themerc keramik.themerc
-  DESTINATION ${DATA_INSTALL_DIR}/kstyle/themes )
+  DESTINATION ${DATA_INSTALL_DIR}/tdestyle/themes )
 
 install( FILES
     kthemestylerc

tdestyles/themes/Makefile.am

@@ -0,0 +1,12 @@
+
+tdestylethemesdata_DATA = qtplatinum.themerc qtcde.themerc qtmotif.themerc qtwindows.themerc \
+	qtsgi.themerc qtmotifplus.themerc\
+	highcolor.themerc \
+	default.themerc b3.themerc light-v2.themerc \
+	light-v3.themerc keramik.themerc
+tdestylethemesdatadir = $(kde_datadir)/tdestyle/themes
+
+EXTRA_DIST = $(tdestylethemesdata_DATA)
+
+kde_conf_DATA = kthemestylerc
+

tdestyles/themes/keramik.themerc

@@ -30,7 +30,7 @@ Name[tg]=Сафолӣ
 Name[th]=Kเครามิก
 Name[uz]=Keramika
 Name[uz@cyrillic]=Керамика
-ConfigPage=kstyle_keramik_config
+ConfigPage=tdestyle_keramik_config
 Comment=A style using alphablending
 Comment[af]='n standaard styl wat alfa vermenging gebruik
 Comment[bg]=Стил, използващ алфа сливане

tdestyles/utils/installtheme/main.cpp

@@ -40,7 +40,7 @@ int main(int argc, char **argv)
     TDECmdLineArgs::init(argc, argv, "kinstalltheme", I18N_NOOP("KInstalltheme"), desc, ver);
     TDEApplication qapp(false, false); //We don't  allow styles.. Kind of ironic, isn't it?
 
-    TDEGlobal::dirs()->addResourceType("themercs", TDEGlobal::dirs()->kde_default("data")+TQString("kstyle/themes"));
+    TDEGlobal::dirs()->addResourceType("themercs", TDEGlobal::dirs()->kde_default("data")+TQString("tdestyle/themes"));
     TQStringList themercs = TDEGlobal::dirs()->findAllResources("themercs","*.themerc");
 
     TQMap <TQString, TQString> themes; //Name->file mapping..

tdestyles/web/Makefile.am

@@ -5,6 +5,6 @@ webstyle_la_LIBADD    = $(LIB_TDEUI)
 webstyle_la_SOURCES   = webstyle.cpp plugin.cpp
 noinst_HEADERS        = webstyle.h 
 
-kstylewebdata_DATA = web.themerc
+tdestylewebdata_DATA = web.themerc
-kstylewebdatadir = $(kde_datadir)/kstyle/themes
+tdestylewebdatadir = $(kde_datadir)/tdestyle/themes
-EXTRA_DIST = $(kstylewebdata_DATA)
+EXTRA_DIST = $(tdestylewebdata_DATA)

tdeui/kdepackages.h

@@ -428,7 +428,7 @@ const char * const packages[] = {
 "tdelibs/knewstuff",
 "tdelibs/knotify",
 "tdelibs/tdespell",
-"tdelibs/kstyle",
+"tdelibs/tdestyle",
 "tdelibs/tdesycoca",
 "tdelibs/tdewallet",
 "tdelibs/qt",

win/common.pro

@@ -109,7 +109,7 @@ contains( TEMPLATE, lib ) {
 	!contains( CONFIG, trinitylib ) {
 	  DESTDIR = $$KDELIBDESTDIR
 	}
-	contains( CONFIG, kstyle ) {
+	contains( CONFIG, tdestyle ) {
 	  DESTDIR = $$KDEBINDESTDIR/lib/trinity/plugins/styles
 	  CONFIG += plugin
 	}

win/pro_files/tdestyles/common.pro

@@ -1,12 +1,12 @@
 TEMPLATE	= lib
 
-CONFIG += kstyle
+CONFIG += tdestyle
 
 include( $(KDELIBS)/win/common.pro )
 
 
 # needed to export library classes:
-DEFINES += MAKE_KSTYLE_LIB 
+DEFINES += MAKE_TDESTYLE_LIB 
 
 LIBS += $$KDELIBDESTDIR\tdefx$$KDELIB_SUFFIX
 

win/pro_files/tdestyles/kthemestyle/themestyle.pro

@@ -7,7 +7,7 @@ TARGET		= kthemestyle$$KDEBUG
 SOURCES = \
 kthemestyle.cpp \
 kthemebase.cpp \
-kstyledirs.cpp
+tdestyledirs.cpp
 
 system( moc kthemestyle.h -o moc/kthemestyle.moc )
 system( moc kthemebase.h -o moc/kthemebase.moc )

win/pro_files/tdestyles/thinkeramik/widget-engine/thinkeramik_rel.pro

@@ -11,7 +11,7 @@ unix {
 }
 
 
-CONFIG += kstyle
+CONFIG += tdestyle
 
 KW_CONFIG = release
 CONFIG -= debug
@@ -25,7 +25,7 @@ LIBS= #DONT BE DEPENDENT ON ANY OTHER LIBS
 CONFIG -= debug
 
 # needed to export library classes:
-DEFINES += MAKE_KSTYLE_LIB MAKE_TDEFX_LIB
+DEFINES += MAKE_TDESTYLE_LIB MAKE_TDEFX_LIB
 
 TARGET		= thinkeramik
 

win/tdelibs_export_win.h

@@ -115,10 +115,10 @@
 #endif
 
 // all TDEStyle libs
-#ifdef MAKE_KSTYLE_LIB
+#ifdef MAKE_TDESTYLE_LIB
-# define KSTYLE_EXPORT KDE_EXPORT
+# define TDESTYLE_EXPORT KDE_EXPORT
 #else
-# define KSTYLE_EXPORT KDE_IMPORT
+# define TDESTYLE_EXPORT KDE_IMPORT
 #endif
 
 #ifdef MAKE_KMDI_LIB

win/tools/build_tdelibs_dbg

@@ -27,8 +27,8 @@ echo
 cd win/9x && $make || exit 1
 cd "$pwd"
 
-if [ -d "kstyles/thinkeramik/widget-engine" ] ; then
+if [ -d "tdestyles/thinkeramik/widget-engine" ] ; then
-	additional="kstyles/thinkeramik/widget-engine/genembed kstyles/thinkeramik/widget-engine "
+	additional="tdestyles/thinkeramik/widget-engine/genembed tdestyles/thinkeramik/widget-engine "
 fi
 
 # all

win/tools/build_tdelibs_rel

@@ -45,7 +45,7 @@ dcop/iceauth \
 tdefx \
 tdecore \
 tdeui \
-kstyles/thinkeramik/widget-engine \
+tdestyles/thinkeramik/widget-engine \
 kio \
 tderesources \
 tdeabc/vcard \