Rename KStyle to TDEStyle to avoid conflicts with KDE4.

kpresenter/scripts/mkstandalone.sh

@@ -22,7 +22,7 @@ else
   mkdir -p $out/share/apps
   cp -r $TDEDIR/share/apps/kpresenter $out/share/apps/
   cp -r $TDEDIR/share/apps/koffice $out/share/apps/
-  cp -r $TDEDIR/share/apps/kstyle $out/share/apps/
+  cp -r $TDEDIR/share/apps/tdestyle $out/share/apps/
   mkdir -p $out/share/config
   cp $TDEDIR/share/config/kdebug.areas $out/share/config/
   cp ~/.trinity/share/config/kdeglobals $out/share/config/

lib/koproperty/editoritem.cpp

@@ -61,10 +61,10 @@ static void paintListViewExpander(TQPainter* p, TQWidget* w, int height, const T
 //		if (dynamic_cast<EditorGroupItem*>(item))
 //				xmarg = xmarg * 10 / 14 -1;
 #if 0 
-//! @todo disabled: kstyles do not paint background yet... reenable in the future...
-	TDEStyle* kstyle = dynamic_cast<TDEStyle*>(widget->style());
-	if (kstyle) {
-		kstyle->drawTDEStylePrimitive(
+//! @todo disabled: tdestyles do not paint background yet... reenable in the future...
+	TDEStyle* tdestyle = dynamic_cast<TDEStyle*>(widget->style());
+	if (tdestyle) {
+		tdestyle->drawTDEStylePrimitive(
 			TDEStyle::KPE_ListViewExpander, p, w, TQRect( xmarg, marg, BRANCHBOX_SIZE, BRANCHBOX_SIZE ), 
 			cg, isOpen ? 0 : TQStyle::Style_On,
 				TQStyleOption::Default);