Rename KStyle to TDEStyle to avoid conflicts with KDE4.

lipstik.spec

@@ -30,11 +30,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(0644, root, root)
-/usr/lib/trinity/kstyle_lipstik_config.la
+/usr/lib/trinity/tdestyle_lipstik_config.la
-/usr/lib/trinity/kstyle_lipstik_config.so
+/usr/lib/trinity/tdestyle_lipstik_config.so
 /usr/lib/trinity/plugins/styles/lipstik.la
 /usr/lib/trinity/plugins/styles/lipstik.so
-/usr/share/apps/kstyle/themes/lipstik.themerc
+/usr/share/apps/tdestyle/themes/lipstik.themerc
 /usr/share/apps/tdedisplay/color-schemes/lipstikstandard.kcsrc
 /usr/share/apps/tdedisplay/color-schemes/lipstikwhite.kcsrc
 /usr/share/apps/tdedisplay/color-schemes/lipstiknoble.kcsrc

style/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 = lipstik.themerc
 
 colorshemedir = $(kde_datadir)/tdedisplay/color-schemes

style/config/Makefile.am

@@ -1,12 +1,12 @@
 INCLUDES = $(all_includes)
 
 noinst_HEADERS = lipstikconf.h
-kde_module_LTLIBRARIES = kstyle_lipstik_config.la
+kde_module_LTLIBRARIES = tdestyle_lipstik_config.la
-kstyle_lipstik_config_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(KDE_PLUGIN) -module
+tdestyle_lipstik_config_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(KDE_PLUGIN) -module
-kstyle_lipstik_config_la_LIBADD  = $(LIB_TDEUI)
+tdestyle_lipstik_config_la_LIBADD  = $(LIB_TDEUI)
-kstyle_lipstik_config_la_SOURCES = lipstikconf.cpp
+tdestyle_lipstik_config_la_SOURCES = lipstikconf.cpp
-kstyle_lipstik_config_la_METASOURCES = AUTO
+tdestyle_lipstik_config_la_METASOURCES = AUTO
 
 
 messages:
-	$(XGETTEXT) *.cpp *.h -o $(podir)/kstyle_lipstik_config.pot
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdestyle_lipstik_config.pot

style/config/lipstikconf.cpp

@@ -47,9 +47,9 @@ DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-	TQWidget* allocate_kstyle_config(TQWidget* parent)
+	TQWidget* allocate_tdestyle_config(TQWidget* parent)
 	{
-		TDEGlobal::locale()->insertCatalogue("kstyle_lipstik_config");
+		TDEGlobal::locale()->insertCatalogue("tdestyle_lipstik_config");
 		return new LipstikStyleConfig(parent);
 	}
 }
@@ -59,7 +59,7 @@ LipstikStyleConfig::LipstikStyleConfig(TQWidget* parent): TQWidget(parent)
 	TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
 	TQGridLayout* tabLayout = new TQGridLayout(this, 2, 1, 10);
 
-	TDEGlobal::locale()->insertCatalogue("kstyle_lipstik_config");
+	TDEGlobal::locale()->insertCatalogue("tdestyle_lipstik_config");
 
 	///Init tabs
 	TQTabWidget *tabWidget = new TQTabWidget(this);

style/lipstik.themerc

@@ -1,6 +1,6 @@
 [Misc]
 Name=Lipstik
-ConfigPage=kstyle_lipstik_config
+ConfigPage=tdestyle_lipstik_config
 Comment=A purified style
 Comment[fr]=Un style pure
 [KDE]