Rename KStyle to TDEStyle to avoid conflicts with KDE4

27 files changed, 229 insertions, 229 deletions

diff --git a/kstyles/asteroid/asteroid.cpp b/kstyles/asteroid/asteroid.cpp
index 4451f952c..7119af5a8 100644
--- a/kstyles/asteroid/asteroid.cpp
+++ b/kstyles/asteroid/asteroid.cpp
@@ -91,7 +91,7 @@ TQ_EXPORT_PLUGIN(AsteroidStylePlugin);
 
 /* Ok, now we get to the good stuff. */
 
-AsteroidStyle::AsteroidStyle() : KStyle(AllowMenuTransparency)
+AsteroidStyle::AsteroidStyle() : TDEStyle(AllowMenuTransparency)
 {
 	if (tqApp->inherits("TDEApplication")) {
 		connect(tqApp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
@@ -139,13 +139,13 @@ void AsteroidStyle::polish(const TQStyleControlElementData &ceData, ControlEleme
 		installObjectEventHandler(ceData, elementFlags, ptr, this);
 	}
 	else {
-		KStyle::polish(ceData, elementFlags, ptr);
+		TDEStyle::polish(ceData, elementFlags, ptr);
 	}
 }
 
 void AsteroidStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
-	KStyle::unPolish(ceData, elementFlags, ptr);
+	TDEStyle::unPolish(ceData, elementFlags, ptr);
 }
 
 /*!
@@ -179,7 +179,7 @@ void AsteroidStyle::renderMenuBlendPixmap(KPixmap &pix,
 	p.fillRect(0, 0, pix.width(), pix.height(), cg.background());
 }
 
-void AsteroidStyle::drawKStylePrimitive(KStylePrimitive ksp,
+void AsteroidStyle::drawTDEStylePrimitive(TDEStylePrimitive ksp,
                                         TQPainter *p,
                                         const TQStyleControlElementData &ceData,
                                         ControlElementFlags elementFlags,
@@ -289,7 +289,7 @@ void AsteroidStyle::drawKStylePrimitive(KStylePrimitive ksp,
         	}
 
 		default: {
-			KStyle::drawKStylePrimitive(ksp, p, ceData, elementFlags, r, cg, sf, o, w);
+			TDEStyle::drawTDEStylePrimitive(ksp, p, ceData, elementFlags, r, cg, sf, o, w);
 		}
 	}
 }
@@ -320,7 +320,7 @@ int AsteroidStyle::styleHint( TQ_StyleHint stylehint,
 		}
 		
 		default:
-			return KStyle::styleHint(stylehint, ceData, elementFlags, option, returnData, widget);
+			return TDEStyle::styleHint(stylehint, ceData, elementFlags, option, returnData, widget);
 	}
 }
 
@@ -975,7 +975,7 @@ void AsteroidStyle::drawPrimitive(TQ_PrimitiveElement pe,
 		}
 
 		default: {
-			KStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, sf, o);
+			TDEStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, sf, o);
 		}
 	}
 }
@@ -1716,7 +1716,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
 		}
 
 		default: {
-			KStyle::drawControl(ce, p, ceData, elementFlags, r, cg, sf, o, w);
+			TDEStyle::drawControl(ce, p, ceData, elementFlags, r, cg, sf, o, w);
 		}
 	}
 }
@@ -1763,7 +1763,7 @@ void AsteroidStyle::drawControlMask(TQ_ControlElement ce,
 		CE_HeaderLabel
 	 */
 			default: {
-			KStyle::drawControlMask(ce, p, ceData, elementFlags, r, o, w);
+			TDEStyle::drawControlMask(ce, p, ceData, elementFlags, r, o, w);
 		}
 	}
 }
@@ -2091,7 +2091,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
 
 			// Draw slider groove
 			if ((sc & SC_SliderGroove) && groove.isValid()) {
-				drawKStylePrimitive( KPE_SliderGroove, &p2, ceData, elementFlags, groove, cg, sf, o, w );
+				drawTDEStylePrimitive( KPE_SliderGroove, &p2, ceData, elementFlags, groove, cg, sf, o, w );
 
 				// Draw the focus rect around the groove
 				if (elementFlags & CEF_HasFocus)
@@ -2109,7 +2109,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
 			if ((sc & SC_SliderHandle) && handle.isValid()) {
 				if (sa == SC_SliderHandle)
 					sf |= Style_Active;
-				drawKStylePrimitive( KPE_SliderHandle, &p2, ceData, elementFlags, handle, cg, sf, o, w );
+				drawTDEStylePrimitive( KPE_SliderHandle, &p2, ceData, elementFlags, handle, cg, sf, o, w );
 			}
 
 			p2.end();
@@ -2179,7 +2179,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
 
 
 		default: {
-			KStyle::drawComplexControl(cc, p, ceData, elementFlags, r, cg, sf, sc, sa, o, w);
+			TDEStyle::drawComplexControl(cc, p, ceData, elementFlags, r, cg, sf, sc, sa, o, w);
 		}
 	}
 }
@@ -2204,7 +2204,7 @@ void AsteroidStyle::drawComplexControlMask(TQ_ComplexControl cc,
 		CC_ListView
 	 */
 			default: {
-			KStyle::drawComplexControlMask(cc, p, ceData, elementFlags, r, o, w);
+			TDEStyle::drawComplexControlMask(cc, p, ceData, elementFlags, r, o, w);
 		}
 	}
 }
@@ -2303,7 +2303,7 @@ int AsteroidStyle::pixelMetric(PixelMetric pm, const TQStyleControlElementData &
 			if (ceData.widgetObjectTypes.contains(TQPOPUPMENU_OBJECT_NAME_STRING)) {
 				return 3;
 			} else {
-				return KStyle::pixelMetric(pm, ceData, elementFlags, w);
+				return TDEStyle::pixelMetric(pm, ceData, elementFlags, w);
 			}
 		}
 
@@ -2335,7 +2335,7 @@ int AsteroidStyle::pixelMetric(PixelMetric pm, const TQStyleControlElementData &
 			return 0;
 
 		default: {
-			return KStyle::pixelMetric(pm, ceData, elementFlags, w);
+			return TDEStyle::pixelMetric(pm, ceData, elementFlags, w);
 		}
 	}
 }
@@ -2379,7 +2379,7 @@ TQRect AsteroidStyle::subRect(SubRect sr, const TQStyleControlElementData &ceDat
 		SR_DialogButtonCustom
 	 */
 		default: {
-			return KStyle::subRect(sr, ceData, elementFlags, w);
+			return TDEStyle::subRect(sr, ceData, elementFlags, w);
 		}
 	}
 }
@@ -2441,7 +2441,7 @@ TQRect AsteroidStyle::querySubControlMetrics(TQ_ComplexControl cc,
 					return TQRect(r.x()+2, r.y()+2, r.width()-20, r.height()-4);
 				}
 				default: {
-					return KStyle::querySubControlMetrics(cc, ceData, elementFlags, sc, o, w);
+					return TDEStyle::querySubControlMetrics(cc, ceData, elementFlags, sc, o, w);
 				}
 			}
 
@@ -2474,7 +2474,7 @@ TQRect AsteroidStyle::querySubControlMetrics(TQ_ComplexControl cc,
 				case SC_SpinWidgetFrame:
 					return ceData.rect;
 				default:
-					return KStyle::querySubControlMetrics(cc, ceData, elementFlags, sc, o, w);
+					return TDEStyle::querySubControlMetrics(cc, ceData, elementFlags, sc, o, w);
 					break;
 			}
 
@@ -2482,7 +2482,7 @@ TQRect AsteroidStyle::querySubControlMetrics(TQ_ComplexControl cc,
 		}
 
 		default: {
-			return KStyle::querySubControlMetrics(cc, ceData, elementFlags, sc, o, w);
+			return TDEStyle::querySubControlMetrics(cc, ceData, elementFlags, sc, o, w);
 		}
 	}
 }
@@ -2516,7 +2516,7 @@ TQSize AsteroidStyle::sizeFromContents(ContentsType ct,
 
 		case CT_PushButton: {
 			const TQPushButton *pb = dynamic_cast<const TQPushButton *>(w);
-			const TQSize ret = KStyle::sizeFromContents(ct, ceData, elementFlags, s, o, w);
+			const TQSize ret = TDEStyle::sizeFromContents(ct, ceData, elementFlags, s, o, w);
 			int rw = ret.width(), rh = ret.height();
 			int mw;
 			int mh;
@@ -2615,7 +2615,7 @@ TQSize AsteroidStyle::sizeFromContents(ContentsType ct,
 		}
 
 		default: {
-			return KStyle::sizeFromContents(ct, ceData, elementFlags, s, o, w);
+			return TDEStyle::sizeFromContents(ct, ceData, elementFlags, s, o, w);
 		}
 	}
 }
diff --git a/kstyles/asteroid/asteroid.h b/kstyles/asteroid/asteroid.h
index 7bd652a12..52d18291b 100644
--- a/kstyles/asteroid/asteroid.h
+++ b/kstyles/asteroid/asteroid.h
@@ -9,7 +9,7 @@
 
 #include <kstyle.h>
 
-class AsteroidStyle : public KStyle
+class AsteroidStyle : public TDEStyle
 {
 	Q_OBJECT
 	
@@ -34,7 +34,7 @@ public:
 	                           const TQColorGroup &,
 	                           const TQPopupMenu *) const;
 	
-	void drawKStylePrimitive(KStylePrimitive,
+	void drawTDEStylePrimitive(TDEStylePrimitive,
 	                         TQPainter *,
 	                         const TQStyleControlElementData &ceData,
 	                         ControlElementFlags elementFlags,
@@ -98,7 +98,7 @@ public:
 
 	int pixelMetric(PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * = 0) const;
 
-	int kPixelMetric( KStylePixelMetric kpm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget* /* widget */) const;
+	int kPixelMetric( TDEStylePixelMetric kpm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget* /* widget */) const;
 
 	TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const;
 
diff --git a/kstyles/highcolor/highcolor.cpp b/kstyles/highcolor/highcolor.cpp
index 0dc02e7ec..4fccff059 100644
--- a/kstyles/highcolor/highcolor.cpp
+++ b/kstyles/highcolor/highcolor.cpp
@@ -174,7 +174,7 @@ KPixmap* GradientSet::gradient(GradientType type)
 // ---------------------------------------------------------------------------
 
 HighColorStyle::HighColorStyle( StyleType styleType ) 
-	: KStyle( AllowMenuTransparency | FilledFrameWorkaround, ThreeButtonScrollBar )
+	: TDEStyle( AllowMenuTransparency | FilledFrameWorkaround, ThreeButtonScrollBar )
 {
 	type = styleType;
 	highcolor = (type == HighColor && TQPixmap::defaultDepth() > 8);
@@ -209,7 +209,7 @@ void HighColorStyle::polish(const TQStyleControlElementData &ceData, ControlElem
 		}
 	}
 
-	KStyle::polish( ceData, elementFlags, ptr );
+	TDEStyle::polish( ceData, elementFlags, ptr );
 }
 
 
@@ -230,7 +230,7 @@ void HighColorStyle::unPolish(const TQStyleControlElementData &ceData, ControlEl
 		}
 	}
 
-	KStyle::unPolish( ceData, elementFlags, ptr );
+	TDEStyle::unPolish( ceData, elementFlags, ptr );
 }
 
 
@@ -796,7 +796,7 @@ void HighColorStyle::drawPrimitive( TQ_PrimitiveElement pe,
 				p->drawLine(x+1, y+1, x+1, y2-1);
 				p->setPen(oldPen);
 			} else
-				KStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt);
+				TDEStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt);
 
 			break;
 		}
@@ -959,13 +959,13 @@ void HighColorStyle::drawPrimitive( TQ_PrimitiveElement pe,
 				p->restore();
 			
 			} else
-				KStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt );
+				TDEStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt );
 		}
 	}
 }
 
 
-void HighColorStyle::drawKStylePrimitive( KStylePrimitive kpe,
+void HighColorStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
 										  TQPainter* p,
 										  const TQStyleControlElementData &ceData,
 										  ControlElementFlags elementFlags,
@@ -1139,7 +1139,7 @@ void HighColorStyle::drawKStylePrimitive( KStylePrimitive kpe,
 		}
 
 		default:
-			KStyle::drawKStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget);
+			TDEStyle::drawTDEStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget);
 	}
 }
 
@@ -1515,7 +1515,7 @@ void HighColorStyle::drawControl( TQ_ControlElement element,
 		}
 
 		default:
-			KStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget);
+			TDEStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget);
 	}
 }
 
@@ -1543,7 +1543,7 @@ void HighColorStyle::drawControlMask( TQ_ControlElement element,
 		}
 
 		default:
-			KStyle::drawControlMask(element, p, ceData, elementFlags, r, opt, widget);
+			TDEStyle::drawControlMask(element, p, ceData, elementFlags, r, opt, widget);
 	}
 }
 
@@ -1728,7 +1728,7 @@ void HighColorStyle::drawComplexControl( TQ_ComplexControl control,
 
 
 		default:
-			KStyle::drawComplexControl(control, p, ceData, elementFlags,
+			TDEStyle::drawComplexControl(control, p, ceData, elementFlags,
 						r, cg, flags, controls, active, opt, widget);
 			break;
 	}
@@ -1759,7 +1759,7 @@ void HighColorStyle::drawComplexControlMask( TQ_ComplexControl control,
 		}
 
 		default:
-			KStyle::drawComplexControlMask(control, p, ceData, elementFlags, r, opt, widget);
+			TDEStyle::drawComplexControlMask(control, p, ceData, elementFlags, r, opt, widget);
 	}
 }
 
@@ -1786,7 +1786,7 @@ void HighColorStyle::drawItem( TQPainter *p,
 	} else
 		col = penColor;
 
-	KStyle::drawItem( p, r, flags, cg, enabled, pixmap,
+	TDEStyle::drawItem( p, r, flags, cg, enabled, pixmap,
 			text, len, col );
 }
 
@@ -1813,7 +1813,7 @@ TQRect HighColorStyle::subRect(SubRect r, const TQStyleControlElementData &ceDat
 					 wrect.width()  - dfw2 - dbw2 - 1,
 					 wrect.height() - dfw2 - dbw2 - 1);
 	} else
-		return KStyle::subRect(r, ceData, elementFlags, widget);
+		return TDEStyle::subRect(r, ceData, elementFlags, widget);
 }
 
 
@@ -1856,7 +1856,7 @@ int HighColorStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &
 			return 0;
 
 		default:
-			return KStyle::pixelMetric(m, ceData, elementFlags, widget);
+			return TDEStyle::pixelMetric(m, ceData, elementFlags, widget);
 	}
 }
 
@@ -1878,7 +1878,7 @@ int HighColorStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceD
 			}
 			break;
 		default:
-			ret = KStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w);
+			ret = TDEStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w);
 			break;
 	}
 
@@ -1984,7 +1984,7 @@ TQSize HighColorStyle::sizeFromContents( ContentsType contents,
 
 
 		default:
-			return KStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget );
+			return TDEStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget );
 	}
 }
 
@@ -2005,13 +2005,13 @@ TQPixmap HighColorStyle::stylePixmap(StylePixmap stylepixmap,
 			break;
 	}
 
-	return KStyle::stylePixmap(stylepixmap, ceData, elementFlags, opt, widget);
+	return TDEStyle::stylePixmap(stylepixmap, ceData, elementFlags, opt, widget);
 }
 
 
 bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
 {
-	if (KStyle::objectEventHandler( ceData, elementFlags, source, event ))
+	if (TDEStyle::objectEventHandler( ceData, elementFlags, source, event ))
 		return true;
 
 	TQToolBar* toolbar;
diff --git a/kstyles/highcolor/highcolor.h b/kstyles/highcolor/highcolor.h
index 5f58b3f9c..33ded2d17 100644
--- a/kstyles/highcolor/highcolor.h
+++ b/kstyles/highcolor/highcolor.h
@@ -55,7 +55,7 @@ class GradientSet
 
 class TQPopupMenu;
 
-class HighColorStyle : public KStyle
+class HighColorStyle : public TDEStyle
 {
 	Q_OBJECT
 
@@ -71,7 +71,7 @@ class HighColorStyle : public KStyle
 		void renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg,
 								 	const TQPopupMenu* popup ) const;
 
-		void drawKStylePrimitive( KStylePrimitive kpe,
+		void drawTDEStylePrimitive( TDEStylePrimitive kpe,
 					TQPainter* p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
diff --git a/kstyles/highcontrast/highcontrast.cpp b/kstyles/highcontrast/highcontrast.cpp
index d212f7445..0b2e677b1 100644
--- a/kstyles/highcontrast/highcontrast.cpp
+++ b/kstyles/highcontrast/highcontrast.cpp
@@ -113,7 +113,7 @@ void addOffset (TQRect* r, int offset, int lineWidth = 0)
 // ---------------------------------------------------------------------------
 
 HighContrastStyle::HighContrastStyle()
-	: KStyle( 0, ThreeButtonScrollBar )
+	: TDEStyle( 0, ThreeButtonScrollBar )
 {
 	TQSettings settings;
 	settings.beginGroup("/highcontraststyle/Settings/");
@@ -175,7 +175,7 @@ void HighContrastStyle::polish (const TQStyleControlElementData &ceData, Control
 		}
 	}
 
-	KStyle::polish (ceData, elementFlags, ptr);
+	TDEStyle::polish (ceData, elementFlags, ptr);
 }
 
 
@@ -188,7 +188,7 @@ void HighContrastStyle::unPolish (const TQStyleControlElementData &ceData, Contr
 		}
 	}
 
-	KStyle::unPolish (ceData, elementFlags, ptr);
+	TDEStyle::unPolish (ceData, elementFlags, ptr);
 }
 
 void HighContrastStyle::setColorsNormal (TQPainter* p, const TQColorGroup& cg, int flags, int highlight) const
@@ -687,13 +687,13 @@ void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe,
 		}
 
 		default: {
-			KStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt );
+			TDEStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt );
 		}
 	}
 }
 
 
-void HighContrastStyle::drawKStylePrimitive (KStylePrimitive kpe,
+void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe,
 										TQPainter* p,
 										const TQStyleControlElementData &ceData,
 										ControlElementFlags elementFlags,
@@ -758,11 +758,11 @@ void HighContrastStyle::drawKStylePrimitive (KStylePrimitive kpe,
 
 		case KPE_ListViewExpander: {
 			// TODO There is no pixelMetric associated with the
-			// ListViewExpander in KStyle.
+			// ListViewExpander in TDEStyle.
 			// To have a properly large expander, the CC_ListView case of
 			// drawComplexControl should be handled.
 			// Probably it would be better to add a KPM_ListViewExpander metric
-			// to the KStyle KStylePixelMetric enum, and have the KStyle
+			// to the TDEStyle TDEStylePixelMetric enum, and have the TDEStyle
 			// drawComplexControl handle it.
 			TQ_PrimitiveElement direction;
 			if (flags & Style_On) { // Collapsed = On
@@ -779,7 +779,7 @@ void HighContrastStyle::drawKStylePrimitive (KStylePrimitive kpe,
 			// TODO Draw (thick) dotted line. Check kstyle.cpp
 			// Fall down for now
 		default:
-			KStyle::drawKStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget);
+			TDEStyle::drawTDEStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget);
 	}
 }
 
@@ -1158,7 +1158,7 @@ void HighContrastStyle::drawControl (TQ_ControlElement element,
 		}
 
 		default:
-			KStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget);
+			TDEStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget);
 	}
 }
 
@@ -1188,7 +1188,7 @@ void HighContrastStyle::drawControlMask (TQ_ControlElement element,
 		}
 
 		default: {
-			KStyle::drawControlMask (element, p, ceData, elementFlags, r, opt, w);
+			TDEStyle::drawControlMask (element, p, ceData, elementFlags, r, opt, w);
 		}
 	}
 }
@@ -1405,8 +1405,8 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
 							boxrect = TQRect( bx-h/2, linebot-h/2, h, h );
 							boxflags = child->isOpen() ? TQStyle::Style_Off : TQStyle::Style_On;
 
-							// KStyle extension: Draw the box and expand/collapse indicator
-							drawKStylePrimitive( KPE_ListViewExpander, p, ceData, elementFlags, boxrect, cg, boxflags, opt, NULL );
+							// TDEStyle extension: Draw the box and expand/collapse indicator
+							drawTDEStylePrimitive( KPE_ListViewExpander, p, ceData, elementFlags, boxrect, cg, boxflags, opt, NULL );
 
 							// dotlinery
 							p->setPen( cg.mid() );
@@ -1459,8 +1459,8 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
 						branchrect  = TQRect( point, other-(thickness/2), end-point, thickness );
 						branchflags = TQStyle::Style_Horizontal;
 
-						// KStyle extension: Draw the horizontal branch
-						drawKStylePrimitive( KPE_ListViewBranch, p, ceData, elementFlags, branchrect, cg, branchflags, opt, NULL );
+						// TDEStyle extension: Draw the horizontal branch
+						drawTDEStylePrimitive( KPE_ListViewBranch, p, ceData, elementFlags, branchrect, cg, branchflags, opt, NULL );
 
 					} else {
 						// Vertical branch
@@ -1475,8 +1475,8 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
 						else
 							branchflags = TQStyle::Style_Default;
 
-						// KStyle extension: Draw the vertical branch
-						drawKStylePrimitive( KPE_ListViewBranch, p, ceData, elementFlags, branchrect, cg, branchflags, opt, NULL );
+						// TDEStyle extension: Draw the vertical branch
+						drawTDEStylePrimitive( KPE_ListViewBranch, p, ceData, elementFlags, branchrect, cg, branchflags, opt, NULL );
 					}
 				}
 			}
@@ -1484,7 +1484,7 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
 		}
 
 		default:
-			KStyle::drawComplexControl(control, p, ceData, elementFlags,
+			TDEStyle::drawComplexControl(control, p, ceData, elementFlags,
 						r, cg, flags, controls, active, opt, widget);
 			break;
 	}
@@ -1506,7 +1506,7 @@ void HighContrastStyle::drawComplexControlMask(TQ_ComplexControl c,
 			break;
 		}
 		default: {
-			KStyle::drawComplexControlMask (c, p, ceData, elementFlags, r, o, w);
+			TDEStyle::drawComplexControlMask (c, p, ceData, elementFlags, r, o, w);
 		}
 	}
 }
@@ -1530,7 +1530,7 @@ void HighContrastStyle::drawItem( TQPainter *p,
 	
 	enabled = true; //do not ghost it in Qt
 
-	KStyle::drawItem (p, r, flags, cg, enabled, pixmap, text, len, penColor);
+	TDEStyle::drawItem (p, r, flags, cg, enabled, pixmap, text, len, penColor);
 	
 	p->restore();
 }
@@ -1585,7 +1585,7 @@ TQRect HighContrastStyle::querySubControlMetrics( TQ_ComplexControl control,
 		default: break;
 	}
 
-	return KStyle::querySubControlMetrics (control, ceData, elementFlags, subcontrol, opt, widget);
+	return TDEStyle::querySubControlMetrics (control, ceData, elementFlags, subcontrol, opt, widget);
 }
 
 
@@ -1679,19 +1679,19 @@ int HighContrastStyle::pixelMetric(PixelMetric m, const TQStyleControlElementDat
 			return 0;
 
 		default:
-			return KStyle::pixelMetric(m, ceData, elementFlags, widget);
+			return TDEStyle::pixelMetric(m, ceData, elementFlags, widget);
 	}
 }
 
-int HighContrastStyle::kPixelMetric( KStylePixelMetric kpm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
+int HighContrastStyle::kPixelMetric( TDEStylePixelMetric kpm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
 {
 	switch (kpm) {
 		case KPM_ListViewBranchThickness:
 			// XXX Proper support of thick branches requires reimplementation of
-			// the drawKStylePrimitive KPE_ListViewBranch case.
+			// the drawTDEStylePrimitive KPE_ListViewBranch case.
 			return basicLineWidth;
 		default:
-			return KStyle::kPixelMetric(kpm, ceData, elementFlags, widget);
+			return TDEStyle::kPixelMetric(kpm, ceData, elementFlags, widget);
 	}
 }
 
@@ -1817,7 +1817,7 @@ TQSize HighContrastStyle::sizeFromContents( ContentsType contents,
 
 
 		default:
-			return KStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget );
+			return TDEStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget );
 	}
 }
 
@@ -1829,13 +1829,13 @@ TQRect HighContrastStyle::subRect (SubRect subrect, const TQStyleControlElementD
 		case SR_ProgressBarLabel:
 			return ceData.rect;
 		default:
-			return KStyle::subRect (subrect, ceData, elementFlags, widget);
+			return TDEStyle::subRect (subrect, ceData, elementFlags, widget);
 	}
 }
 
 bool HighContrastStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
 {
-	return KStyle::objectEventHandler (ceData, elementFlags, source, event);
+	return TDEStyle::objectEventHandler (ceData, elementFlags, source, event);
 }
 
 /*! \reimp */
@@ -1856,7 +1856,7 @@ int HighContrastStyle::styleHint(StyleHint sh, const TQStyleControlElementData &
 			}
 			break;
 		default:
-			ret = KStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w);
+			ret = TDEStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w);
 			break;
 	}
 
diff --git a/kstyles/highcontrast/highcontrast.h b/kstyles/highcontrast/highcontrast.h
index 89a716dc1..1a721e8c6 100644
--- a/kstyles/highcontrast/highcontrast.h
+++ b/kstyles/highcontrast/highcontrast.h
@@ -14,7 +14,7 @@
  *               (C) 2000 Dirk Mueller          <mueller@kde.org>
  *               (C) 2001 Martijn Klingens      <klingens@kde.org>
  *
- * Includes portions from KStyle,
+ * Includes portions from TDEStyle,
  *     Copyright (C) 2001-2002 Karol Szwed <gallium@kde.org>
  *
  * Many thanks to Bradley T. Hughes for the 3 button scrollbar code.
@@ -46,7 +46,7 @@
 
 class TQPopupMenu;
 
-class HighContrastStyle : public KStyle
+class HighContrastStyle : public TDEStyle
 {
 	Q_OBJECT
 
@@ -59,7 +59,7 @@ class HighContrastStyle : public KStyle
 		void polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
 		void unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
 
-		void drawKStylePrimitive( KStylePrimitive kpe,
+		void drawTDEStylePrimitive( TDEStylePrimitive kpe,
 					TQPainter* p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
@@ -137,7 +137,7 @@ class HighContrastStyle : public KStyle
 		int pixelMetric( PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
 					const TQWidget *widget = 0 ) const;
 
-		int kPixelMetric( KStylePixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
+		int kPixelMetric( TDEStylePixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
 					const TQWidget *widget = 0 ) const;
 
 		TQSize sizeFromContents( ContentsType contents,
diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp
index 591a5aae3..d04c9abd8 100644
--- a/kstyles/keramik/keramik.cpp
+++ b/kstyles/keramik/keramik.cpp
@@ -12,7 +12,7 @@
              (C) 2000 Dirk Mueller          <mueller@kde.org>
              (C) 2001 Martijn Klingens      <klingens@kde.org>
 
-   Progressbar code based on KStyle, Copyright (C) 2001-2002 Karol Szwed <gallium@kde.org>,
+   Progressbar code based on TDEStyle, Copyright (C) 2001-2002 Karol Szwed <gallium@kde.org>,
    Improvements to progressbar animation from Plastik, Copyright (C) 2003 Sandro Giessl <sandro@giessl.com>
 
    This library is free software; you can redistribute it and/or
@@ -237,7 +237,7 @@ TQRect KeramikStyle::subRect(SubRect r, const TQStyleControlElementData &ceData,
 		}
 
 		default:
-			return KStyle::subRect( r, ceData, elementFlags, widget );
+			return TDEStyle::subRect( r, ceData, elementFlags, widget );
 	}
 }
 
@@ -269,14 +269,14 @@ TQPixmap KeramikStyle::stylePixmap(StylePixmap stylepixmap,
 			break;
 	}
 
-	return KStyle::stylePixmap(stylepixmap, ceData, elementFlags, opt, widget);
+	return TDEStyle::stylePixmap(stylepixmap, ceData, elementFlags, opt, widget);
 }
 
 
 
 
 KeramikStyle::KeramikStyle()
-	:KStyle( AllowMenuTransparency | FilledFrameWorkaround, ThreeButtonScrollBar ),
+	:TDEStyle( AllowMenuTransparency | FilledFrameWorkaround, ThreeButtonScrollBar ),
 		maskMode(false), formMode(false),
 		toolbarBlendWidget(0), titleBarMode(None), flatMode(false), customScrollMode(false), kickerMode(false)
 {
@@ -379,7 +379,7 @@ void KeramikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
 		}
 	}
 
-	KStyle::polish(ceData, elementFlags, ptr);
+	TDEStyle::polish(ceData, elementFlags, ptr);
 }
 
 void KeramikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
@@ -418,7 +418,7 @@ void KeramikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem
 		}
 	}
 
-	KStyle::unPolish(ceData, elementFlags, ptr);
+	TDEStyle::unPolish(ceData, elementFlags, ptr);
 }
 
 void KeramikStyle::progressBarDestroyed(TQObject* obj)
@@ -985,7 +985,7 @@ void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe,
 					return;
 				}
 			}
-			KStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt);
+			TDEStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt);
 			break;
 		}
 		case PE_WindowFrame:
@@ -1014,7 +1014,7 @@ void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe,
 				p->drawLine(x+1, y+1, x+1, y2-1);
 				p->setPen(oldPen);
 			} else
-				KStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt);
+				TDEStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt);
 
 			break;
 		}
@@ -1215,12 +1215,12 @@ void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe,
 
 			}
 			else
-				KStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt );
+				TDEStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt );
 		}
 	}
 }
 
-void KeramikStyle::drawKStylePrimitive( KStylePrimitive kpe,
+void KeramikStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
 										  TQPainter* p,
 										  const TQStyleControlElementData &ceData,
 										  ControlElementFlags elementFlags,
@@ -1350,7 +1350,7 @@ void KeramikStyle::drawKStylePrimitive( KStylePrimitive kpe,
 
 
 		default:
-			KStyle::drawKStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget);
+			TDEStyle::drawTDEStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget);
 	}
 }
 
@@ -1539,7 +1539,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
 				//	nr.setWidth(r.width()-2); //Account for shadow
 			}
 
-			KStyle::drawControl(element, p, ceData, elementFlags, nr, cg, flags, opt, widget);
+			TDEStyle::drawControl(element, p, ceData, elementFlags, nr, cg, flags, opt, widget);
 			break;
 		}
 
@@ -1602,7 +1602,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
 										 tb->orientation() == Qt::Horizontal);
 			}
 			else
-				KStyle::drawControl( (TQ_ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags,
+				TDEStyle::drawControl( (TQ_ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags,
 					r, cg, flags, opt, widget );
 			break;
 		}
@@ -1958,7 +1958,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
 
 
 		default:
-			KStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget);
+			TDEStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget);
 	}
 }
 
@@ -2353,7 +2353,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
 		case CC_TitleBar:
 			titleBarMode = Regular; //Handle buttons on titlebar different from toolbuttons
 		default:
-			KStyle::drawComplexControl( control, p, ceData, elementFlags,
+			TDEStyle::drawComplexControl( control, p, ceData, elementFlags,
 						r, cg, flags, controls, active, opt, widget );
 
 			titleBarMode = None;
@@ -2457,7 +2457,7 @@ int KeramikStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ce
 			return 2;
 
 		default:
-			return KStyle::pixelMetric(m, ceData, elementFlags, widget);
+			return TDEStyle::pixelMetric(m, ceData, elementFlags, widget);
 	}
 }
 
@@ -2500,7 +2500,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents,
 			}
 			else
 			{
-				return KStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget );
+				return TDEStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget );
 			}
 		}
 
@@ -2568,7 +2568,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents,
 		}
 		
 		default:
-			return KStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget );
+			return TDEStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget );
 	}
 }
 
@@ -2580,7 +2580,7 @@ TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control,
                                                   const TQStyleOption& opt,
                                                   const TQWidget* widget ) const
 {
-	SubControl result = KStyle::querySubControl( control, ceData, elementFlags, point, opt, widget );
+	SubControl result = TDEStyle::querySubControl( control, ceData, elementFlags, point, opt, widget );
 	if ( control == CC_ScrollBar && result == SC_ScrollBarAddLine )
 	{
 		TQRect addline = querySubControlMetrics( control, ceData, elementFlags, result, opt, widget );
@@ -2771,7 +2771,7 @@ TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control,
 		}
 		default: break;
 	}
-	return KStyle::querySubControlMetrics( control, ceData, elementFlags, subcontrol, opt, widget );
+	return TDEStyle::querySubControlMetrics( control, ceData, elementFlags, subcontrol, opt, widget );
 }
 
 
@@ -2791,7 +2791,7 @@ TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control,
 
 bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
 {
-	if (KStyle::objectEventHandler( ceData, elementFlags, source, event ))
+	if (TDEStyle::objectEventHandler( ceData, elementFlags, source, event ))
 		return true;
 
 	if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
@@ -2993,7 +2993,7 @@ int KeramikStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceDat
 			ret = 1;
 			break;
 		default:
-			ret = KStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w);
+			ret = TDEStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w);
 			break;
 	}
 
diff --git a/kstyles/keramik/keramik.h b/kstyles/keramik/keramik.h
index 5acaabf8d..02ec9499e 100644
--- a/kstyles/keramik/keramik.h
+++ b/kstyles/keramik/keramik.h
@@ -39,7 +39,7 @@
 
 class TQProgressBar;
 
-class KeramikStyle : public KStyle
+class KeramikStyle : public TDEStyle
 {
 	Q_OBJECT
 
@@ -55,7 +55,7 @@ public:
 	void polish( TQPalette& );
 	void applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
 
-	void drawKStylePrimitive( KStylePrimitive kpe,
+	void drawTDEStylePrimitive( TDEStylePrimitive kpe,
 	                          TQPainter* p,
 	                          const TQStyleControlElementData &ceData,
 	                          ControlElementFlags elementFlags,
diff --git a/kstyles/keramik/keramikimage.h b/kstyles/keramik/keramikimage.h
index c8e684a00..05bc75900 100644
--- a/kstyles/keramik/keramikimage.h
+++ b/kstyles/keramik/keramikimage.h
@@ -12,7 +12,7 @@
              (C) 2000 Dirk Mueller          <mueller@kde.org>
              (C) 2001 Martijn Klingens      <klingens@kde.org>
 
-    Progressbar code based on KStyle, Copyright (C) 2001-2002 Karol Szwed <gallium@kde.org>
+    Progressbar code based on TDEStyle, Copyright (C) 2001-2002 Karol Szwed <gallium@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/kstyles/klegacy/klegacystyle.cpp b/kstyles/klegacy/klegacystyle.cpp
index d19dcec0a..5c083632e 100644
--- a/kstyles/klegacy/klegacystyle.cpp
+++ b/kstyles/klegacy/klegacystyle.cpp
@@ -1743,7 +1743,7 @@ bool KLegacyStylePrivate::parseStyle() {
 }
 
 
-KLegacyStyle::KLegacyStyle(void) : KStyle() {
+KLegacyStyle::KLegacyStyle(void) : TDEStyle() {
     setButtonDefaultIndicatorWidth(6);
     setScrollBarExtent(15, 15);
     setButtonMargin(3);
@@ -1873,7 +1873,7 @@ void KLegacyStyle::polish(TQApplication *app) {
 
     qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl) &KLegacyStyle::drawMenuBarItem);
 
-    KStyle::polish(app);
+    TDEStyle::polish(app);
 }
 
 
@@ -2066,12 +2066,12 @@ void KLegacyStyle::polish(TQWidget *widget) {
  	widget->setMouseTracking(mouseTrack);
     }
 
-    KStyle::polish(widget);
+    TDEStyle::polish(widget);
 }
 
 
 void KLegacyStyle::polishPopupMenu(TQPopupMenu *popup) {
-    KStyle::polishPopupMenu(popup);
+    TDEStyle::polishPopupMenu(popup);
 
     popup->setMouseTracking(true);
     popup->setCheckable(true);
@@ -2089,7 +2089,7 @@ void KLegacyStyle::unPolish(TQWidget *widget) {
     widget->removeEventFilter(this);
     widget->unsetPalette();
     widget->setAutoMask(false);
-    KStyle::unPolish(widget);
+    TDEStyle::unPolish(widget);
 }
 
 
@@ -2099,7 +2099,7 @@ void KLegacyStyle::unPolish(TQApplication *app) {
 
     qt_set_draw_menu_bar_impl(0);
 
-    KStyle::unPolish(app);
+    TDEStyle::unPolish(app);
 }
 
 
@@ -2150,7 +2150,7 @@ void KLegacyStyle::drawBevelButton(TQPainter *p, int x, int y, int w, int h,
     GtkObject *gobj = priv->gtkDict.find(TQButton::staticMetaObject());
 
     if (! gobj) {
-	KStyle::drawBevelButton(p, x, y, w, h, g, sunken, fill);
+	TDEStyle::drawBevelButton(p, x, y, w, h, g, sunken, fill);
 	return;
     }
 
@@ -2165,7 +2165,7 @@ void KLegacyStyle::drawBevelButton(TQPainter *p, int x, int y, int w, int h,
     if (pix && (! pix->isNull()))
 	p->drawPixmap(x, y, *pix);
     else
-	KStyle::drawBevelButton(p, x, y, w, h, g, sunken, fill);
+	TDEStyle::drawBevelButton(p, x, y, w, h, g, sunken, fill);
 }
 
 
@@ -2173,7 +2173,7 @@ void KLegacyStyle::drawPushButton(TQPushButton *btn, TQPainter *p) {
     GtkObject *gobj = priv->gtkDict.find(TQPushButton::staticMetaObject());
 
     if (! gobj) {
-	KStyle::drawPushButton(btn, p);
+	TDEStyle::drawPushButton(btn, p);
 	return;
     }
 
@@ -2199,7 +2199,7 @@ void KLegacyStyle::drawPushButton(TQPushButton *btn, TQPainter *p) {
 	if (pix)
 	    p->drawPixmap(x1, y1, *pix);
         else
-	    KStyle::drawBevelButton(p, x1, y1, x2 - x1 + 1, y2 - y1 + 1,
+	    TDEStyle::drawBevelButton(p, x1, y1, x2 - x1 + 1, y2 - y1 + 1,
 				    g, true, &fill);
     }
 
@@ -2227,7 +2227,7 @@ void KLegacyStyle::drawPushButton(TQPushButton *btn, TQPainter *p) {
     if (pix && ! pix->isNull())
 	p->drawPixmap(x1, y1, *pix);
     else {
-	KStyle::drawBevelButton(p, x1, y1, x2 - x1 + 1, y2 - y1 + 1,
+	TDEStyle::drawBevelButton(p, x1, y1, x2 - x1 + 1, y2 - y1 + 1,
 				g, btn->isOn() || btn->isDown(), &fill);
     }
 }
@@ -2240,7 +2240,7 @@ void KLegacyStyle::drawIndicator(TQPainter *p, int x, int y, int w, int h,
     GtkObject *gobj = priv->gtkDict.find(TQCheckBox::staticMetaObject());
 
     if (! gobj) {
-	KStyle::drawIndicator(p, x, y, w, h, g, state, down, enabled);
+	TDEStyle::drawIndicator(p, x, y, w, h, g, state, down, enabled);
 	return;
     }
 
@@ -2255,7 +2255,7 @@ void KLegacyStyle::drawIndicator(TQPainter *p, int x, int y, int w, int h,
     if (pix && (! pix->isNull()))
      	p->drawPixmap(x, y, *pix);
     else
-	KStyle::drawIndicator(p, x, y, w, h, g, state, down, enabled);
+	TDEStyle::drawIndicator(p, x, y, w, h, g, state, down, enabled);
 }
 
 
@@ -2263,7 +2263,7 @@ void KLegacyStyle::drawIndicatorMask(TQPainter *p, int x, int y, int w, int h, i
     GtkObject *gobj = priv->gtkDict.find(TQCheckBox::staticMetaObject());
 
     if (! gobj) {
-	KStyle::drawIndicatorMask(p, x, y, w, h, state);
+	TDEStyle::drawIndicatorMask(p, x, y, w, h, state);
 	return;
     }
 
@@ -2278,14 +2278,14 @@ void KLegacyStyle::drawIndicatorMask(TQPainter *p, int x, int y, int w, int h, i
     if (pix && pix->mask() && ! pix->mask()->isNull())
 	p->drawPixmap(x, y, *(pix->mask()));
     else
-	KStyle::drawIndicatorMask(p, x, y, w, h, state);
+	TDEStyle::drawIndicatorMask(p, x, y, w, h, state);
 }
 
 
 TQSize KLegacyStyle::indicatorSize(void) const {
     GtkObject *gobj = priv->gtkDict.find(TQCheckBox::staticMetaObject());
 
-    if (! gobj)	return KStyle::indicatorSize();
+    if (! gobj)	return TDEStyle::indicatorSize();
 
     KLegacyImageDataKey key;
     key.cachekey = 0;
@@ -2293,7 +2293,7 @@ TQSize KLegacyStyle::indicatorSize(void) const {
     key.data.shadow = KLegacy::Out;
     KLegacyImageData *id = gobj->getImageData(key, "checkbutton");
 
-    if (! id) return KStyle::indicatorSize();
+    if (! id) return TDEStyle::indicatorSize();
 
     TQString filename;
     if (! id->file.isNull())
@@ -2301,13 +2301,13 @@ TQSize KLegacyStyle::indicatorSize(void) const {
     else if (! id->overlayFile.isNull())
 	filename = id->overlayFile;
     else
-	return KStyle::indicatorSize();
+	return TDEStyle::indicatorSize();
 
     TQImage *image = imageCache->find(filename);
     if (! image) {
         image = new TQImage(filename);
 
-        if (! image) return KStyle::indicatorSize();
+        if (! image) return TDEStyle::indicatorSize();
 
         imageCache->insert(filename, image);
     }
@@ -2338,7 +2338,7 @@ void KLegacyStyle::drawExclusiveIndicator(TQPainter *p, int x, int y, int w, int
     if (pix && (! pix->isNull()))
 	p->drawPixmap(x, y, *pix);
     else
-	KStyle::drawExclusiveIndicator(p, x, y, w, h, g, down, enabled);
+	TDEStyle::drawExclusiveIndicator(p, x, y, w, h, g, down, enabled);
 }
 
 
@@ -2348,7 +2348,7 @@ void KLegacyStyle::drawExclusiveIndicatorMask(TQPainter *p, int x, int y, int w,
     GtkObject *gobj = priv->gtkDict.find(TQRadioButton::staticMetaObject());
 
     if (! gobj) {
-	KStyle::drawExclusiveIndicatorMask(p, x, y, w, h, on);
+	TDEStyle::drawExclusiveIndicatorMask(p, x, y, w, h, on);
 	return;
     }
 
@@ -2363,7 +2363,7 @@ void KLegacyStyle::drawExclusiveIndicatorMask(TQPainter *p, int x, int y, int w,
     if (pix && pix->mask() && ! pix->mask()->isNull())
 	p->drawPixmap(x, y, *(pix->mask()));
     else
-	KStyle::drawExclusiveIndicatorMask(p, x, y, w, h, on);
+	TDEStyle::drawExclusiveIndicatorMask(p, x, y, w, h, on);
 }
 
 
@@ -2371,7 +2371,7 @@ TQSize KLegacyStyle::exclusiveIndicatorSize(void) const {
     GtkObject *gobj = priv->gtkDict.find(TQRadioButton::staticMetaObject());
 
     if (! gobj) {
-	return KStyle::indicatorSize();
+	return TDEStyle::indicatorSize();
     }
 
     KLegacyImageDataKey key;
@@ -2380,7 +2380,7 @@ TQSize KLegacyStyle::exclusiveIndicatorSize(void) const {
     key.data.shadow = KLegacy::Out;
     KLegacyImageData *id = gobj->getImageData(key, "radiobutton");
 
-    if (! id) return KStyle::indicatorSize();
+    if (! id) return TDEStyle::indicatorSize();
 
     TQString filename;
     if (! id->file.isNull()) {
@@ -2388,7 +2388,7 @@ TQSize KLegacyStyle::exclusiveIndicatorSize(void) const {
     } else if (! id->overlayFile.isNull()) {
 	filename = id->overlayFile;
     } else {
-	return KStyle::indicatorSize();
+	return TDEStyle::indicatorSize();
     }
 
     TQImage *image = imageCache->find(filename);
@@ -2396,7 +2396,7 @@ TQSize KLegacyStyle::exclusiveIndicatorSize(void) const {
         image = new TQImage(filename);
 
         if (! image) {
-	    return KStyle::indicatorSize();
+	    return TDEStyle::indicatorSize();
 	}
 
         imageCache->insert(filename, image);
@@ -2534,7 +2534,7 @@ void KLegacyStyle::drawComboButton(TQPainter *p, int x, int y, int w, int h,
     GtkObject *gobj = priv->gtkDict.find(TQComboBox::staticMetaObject());
 
     if (! gobj) {
-	KStyle::drawComboButton(p, x, y, w, h, g, sunken, editable, enabled, b);
+	TDEStyle::drawComboButton(p, x, y, w, h, g, sunken, editable, enabled, b);
 	return;
     }
 
@@ -2552,7 +2552,7 @@ void KLegacyStyle::drawComboButton(TQPainter *p, int x, int y, int w, int h,
     if (pix && ! pix->isNull()) {
 	p->drawPixmap(x, y, *pix);
     } else {
-	KStyle::drawComboButton(p, x, y, w, h, g, sunken, editable, enabled, b);
+	TDEStyle::drawComboButton(p, x, y, w, h, g, sunken, editable, enabled, b);
 	return;
     }
 
@@ -2574,7 +2574,7 @@ TQRect KLegacyStyle::comboButtonRect(int x, int y, int w, int h) {
     GtkObject *gobj = priv->gtkDict.find(TQComboBox::staticMetaObject());
 
     if (! gobj) {
-	return KStyle::comboButtonRect(x, y, w, h);
+	return TDEStyle::comboButtonRect(x, y, w, h);
     }
 
     KLegacyImageDataKey key;
@@ -2583,7 +2583,7 @@ TQRect KLegacyStyle::comboButtonRect(int x, int y, int w, int h) {
     KLegacyImageData *id = gobj->getImageData(key, "optionmenu");
 
     if (! id) {
-	return KStyle::comboButtonRect(x, y, w, h);
+	return TDEStyle::comboButtonRect(x, y, w, h);
     }
 
     return TQRect(x + id->border.left() + 1, y + id->border.top() + 1,
@@ -2651,7 +2651,7 @@ void KLegacyStyle::drawScrollBarControls(TQPainter *p, const TQScrollBar *scroll
     GtkObject *gobj = priv->gtkDict.find(TQScrollBar::staticMetaObject());
 
     if (! gobj) {
-	KStyle::drawScrollBarControls(p, scrollbar, start, controls, active);
+	TDEStyle::drawScrollBarControls(p, scrollbar, start, controls, active);
 	return;
     }
 
@@ -2663,7 +2663,7 @@ void KLegacyStyle::drawScrollBarControls(TQPainter *p, const TQScrollBar *scroll
     KLegacyImageData *groove_id = gobj->getImageData(gkey, "trough");
 
     if (! groove_id) {
-	KStyle::drawScrollBarControls(p, scrollbar, start, controls, active);
+	TDEStyle::drawScrollBarControls(p, scrollbar, start, controls, active);
 	return;
     }
 
@@ -2704,7 +2704,7 @@ void KLegacyStyle::drawScrollBarControls(TQPainter *p, const TQScrollBar *scroll
     KLegacyImageData *slider_id = gobj->getImageData(skey, "slider");
 
     if (! slider_id) {
-	KStyle::drawScrollBarControls(p, scrollbar, start, controls, active);
+	TDEStyle::drawScrollBarControls(p, scrollbar, start, controls, active);
 	return;
     }
 
@@ -2765,7 +2765,7 @@ void KLegacyStyle::drawSlider(TQPainter *p, int x, int y, int w, int h, const TQ
     GtkObject *gobj = priv->gtkDict.find(TQSlider::staticMetaObject());
 
     if (! gobj) {
-	KStyle::drawSlider(p, x, y, w, h, g, orientation, tickAbove, tickBelow);
+	TDEStyle::drawSlider(p, x, y, w, h, g, orientation, tickAbove, tickBelow);
 	return;
     }
 
@@ -2781,7 +2781,7 @@ void KLegacyStyle::drawSlider(TQPainter *p, int x, int y, int w, int h, const TQ
     if (pix && ! pix->isNull())
 	p->drawPixmap(x, y, *pix);
     else
-	KStyle::drawSlider(p, x, y, w, h, g, orientation, tickAbove, tickBelow);
+	TDEStyle::drawSlider(p, x, y, w, h, g, orientation, tickAbove, tickBelow);
 }
 
 
@@ -2792,7 +2792,7 @@ void KLegacyStyle::drawSliderGroove(TQPainter *p, int x, int y, int w, int h,
     GtkObject *gobj = priv->gtkDict.find(TQSlider::staticMetaObject());
 
     if (! gobj) {
-	KStyle::drawSliderGroove(p, x, y, w, h, g, c, o);
+	TDEStyle::drawSliderGroove(p, x, y, w, h, g, c, o);
 	return;
     }
 
@@ -2808,7 +2808,7 @@ void KLegacyStyle::drawSliderGroove(TQPainter *p, int x, int y, int w, int h,
     if (pix && ! pix->isNull())
 	p->drawPixmap(x, y, *pix);
     else
-        KStyle::drawSliderGroove(p, x, y, w, h, g, c, o);
+        TDEStyle::drawSliderGroove(p, x, y, w, h, g, c, o);
 }
 
 
@@ -2819,7 +2819,7 @@ void KLegacyStyle::drawArrow(TQPainter *p, ArrowType type, bool down,
     GtkObject *gobj = priv->gtkDict.find(&arrow_ptr);
 
     if (! gobj) {
-	KStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b);
+	TDEStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b);
 	return;
     }
 
@@ -2840,7 +2840,7 @@ void KLegacyStyle::drawArrow(TQPainter *p, ArrowType type, bool down,
     if (pix && ! pix->isNull())
 	p->drawPixmap(x, y, *pix);
     else
-	KStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b);
+	TDEStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b);
 }
 
 
@@ -2851,7 +2851,7 @@ void KLegacyStyle::drawMenuArrow(TQPainter *p, ArrowType type, bool down,
     GtkObject *gobj = priv->gtkDict.find(&menuitem_ptr);
 
     if (! gobj) {
-	KStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b);
+	TDEStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b);
 	return;
     }
 
@@ -2868,14 +2868,14 @@ void KLegacyStyle::drawMenuArrow(TQPainter *p, ArrowType type, bool down,
     	p->drawPixmap(x + ((w - pix->width()) / 2),
 	              y + ((h - pix->height()) / 2), *pix);
     else
-	KStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b);
+	TDEStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b);
 }
 
 
 void KLegacyStyle::drawPanel(TQPainter *p, int x, int y, int w, int h,
 			  const TQColorGroup &g, bool sunken, int, const TQBrush *brush)
 {
-    KStyle::drawPanel(p, x, y, w, h, g, sunken, 1, brush);
+    TDEStyle::drawPanel(p, x, y, w, h, g, sunken, 1, brush);
 }
 
 
@@ -2894,7 +2894,7 @@ void KLegacyStyle::drawCheckMark(TQPainter *p, int x, int y, int w, int h,
     GtkObject *gobj = priv->gtkDict.find(&checkmenuitem_ptr);
 
     if (! gobj) {
-	KStyle::drawCheckMark(p, x, y, w, h, g, activated, disabled);
+	TDEStyle::drawCheckMark(p, x, y, w, h, g, activated, disabled);
 	return;
     }
 
@@ -2910,7 +2910,7 @@ void KLegacyStyle::drawCheckMark(TQPainter *p, int x, int y, int w, int h,
 	y += (h - pix->height()) / 2;
 	p->drawPixmap(x, y, *pix);
     } else {
-	KStyle::drawCheckMark(p, x, y, w, h, g, activated, disabled);
+	TDEStyle::drawCheckMark(p, x, y, w, h, g, activated, disabled);
     }
 }
 
@@ -2945,7 +2945,7 @@ void KLegacyStyle::drawTab(TQPainter *p, const TQTabBar *tabbar, TQTab *tab, boo
     GtkObject *gobj = priv->gtkDict.find(TQTabBar::staticMetaObject());
 
     if (! gobj) {
-	KStyle::drawTab(p, tabbar, tab, selected);
+	TDEStyle::drawTab(p, tabbar, tab, selected);
 	return;
     }
 
@@ -2974,7 +2974,7 @@ void KLegacyStyle::drawTab(TQPainter *p, const TQTabBar *tabbar, TQTab *tab, boo
     if (pix && ! pix->isNull())
 	p->drawPixmap(tab->r.left(), ry, *pix);
     else
-	KStyle::drawTab(p, tabbar, tab, selected);
+	TDEStyle::drawTab(p, tabbar, tab, selected);
 }
 
 
@@ -2984,7 +2984,7 @@ void KLegacyStyle::drawKBarHandle(TQPainter *p, int x, int y, int w, int h,
     GtkObject *gobj = priv->gtkDict.find(TQToolBar::staticMetaObject());
 
     if (! gobj) {
-	KStyle::drawKBarHandle(p, x, y, w, h, g, type, fill);
+	TDEStyle::drawKBarHandle(p, x, y, w, h, g, type, fill);
 	return;
     }
 
@@ -3362,5 +3362,5 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 	}
     }
 
-    return KStyle::eventFilter(obj, e);
+    return TDEStyle::eventFilter(obj, e);
 }
diff --git a/kstyles/klegacy/klegacystyle.h b/kstyles/klegacy/klegacystyle.h
index 5288fd4f8..ee3cecfe5 100644
--- a/kstyles/klegacy/klegacystyle.h
+++ b/kstyles/klegacy/klegacystyle.h
@@ -31,7 +31,7 @@
 class KLegacyStylePrivate;
 
 
-class Q_EXPORT KLegacyStyle : public KStyle {
+class Q_EXPORT KLegacyStyle : public TDEStyle {
     Q_OBJECT
 public:
     KLegacyStyle(void);
diff --git a/kstyles/klegacy/plugin.cpp b/kstyles/klegacy/plugin.cpp
index a146de2c3..5d3a58492 100644
--- a/kstyles/klegacy/plugin.cpp
+++ b/kstyles/klegacy/plugin.cpp
@@ -2,13 +2,13 @@
 #include <klocale.h>
 
 extern "C" {
-    KStyle* allocate();
+    TDEStyle* allocate();
     int minor_version();
     int major_version();
     const char *description();
 }
 
-KStyle* allocate()
+TDEStyle* allocate()
 {
     return(new KLegacyStyle());
 }
diff --git a/kstyles/kthemestyle/kstyledirs.cpp b/kstyles/kthemestyle/kstyledirs.cpp
index 0128dac28..8755fb294 100644
--- a/kstyles/kthemestyle/kstyledirs.cpp
+++ b/kstyles/kthemestyle/kstyledirs.cpp
@@ -25,19 +25,19 @@
 #include <kstandarddirs.h>
 #include "kstyledirs.h"
 
-KStyleDirs* KStyleDirs::instance = 0;
+TDEStyleDirs* TDEStyleDirs::instance = 0;
 
-KStyleDirs::KStyleDirs()
+TDEStyleDirs::TDEStyleDirs()
 {
     addResourceType( "themepixmap", TDEStandardDirs::kde_default( "data" ) + "kstyle/pixmaps/" );
     addResourceType( "themerc", TDEStandardDirs::kde_default( "data" ) + "kstyle/themes/" );
 }
 
-KStyleDirs::~KStyleDirs()
+TDEStyleDirs::~TDEStyleDirs()
 {
 }
 
-void KStyleDirs::addToSearch( const char* type, TQSettings& s ) const
+void TDEStyleDirs::addToSearch( const char* type, TQSettings& s ) const
 {
     const TQStringList & dirs = resourceDirs(type);
     for ( int c = dirs.size()-1; c >= 0 ; c-- )
diff --git a/kstyles/kthemestyle/kstyledirs.h b/kstyles/kthemestyle/kstyledirs.h
index 79887cce1..410fad2ef 100644
--- a/kstyles/kthemestyle/kstyledirs.h
+++ b/kstyles/kthemestyle/kstyledirs.h
@@ -39,13 +39,13 @@
 * It add share/apps/kstyle/themes as "themerc",
 *    share/apps/kstyle/pixmaps "themepixmap"
 */
-class KStyleDirs: public TDEStandardDirs
+class TDEStyleDirs: public TDEStandardDirs
 {
 public:
-    static KStyleDirs* dirs()
+    static TDEStyleDirs* dirs()
     {
         if ( !instance)
-            instance = new KStyleDirs;
+            instance = new TDEStyleDirs;
         return instance;
     }
 
@@ -60,7 +60,7 @@ public:
 
     For example, when one does the following:
     TQSettings settings;
-    KStyleDirs dirs;
+    TDEStyleDirs dirs;
     dirs.addToSearch("config",settings);
 
     The one can do settings.readEntry("kstyle/KDE/WidgetStyle") to access a settings in kstylerc.
@@ -68,15 +68,15 @@ public:
     void addToSearch( const char* type, TQSettings& q) const; //Better name?
 
 protected:
-    static KStyleDirs* instance;
+    static TDEStyleDirs* instance;
     /**
     Creates an instance of the class, and calculates the path information.
     */
-    KStyleDirs();
-    KStyleDirs(const KStyleDirs&);
-    KStyleDirs& operator= (const KStyleDirs&);
+    TDEStyleDirs();
+    TDEStyleDirs(const TDEStyleDirs&);
+    TDEStyleDirs& operator= (const TDEStyleDirs&);
 
-    virtual ~KStyleDirs();
+    virtual ~TDEStyleDirs();
 };
 
 #endif
diff --git a/kstyles/kthemestyle/kthemebase.cpp b/kstyles/kthemestyle/kthemebase.cpp
index 7ca3ffb06..adbf49084 100644
--- a/kstyles/kthemestyle/kthemebase.cpp
+++ b/kstyles/kthemestyle/kthemebase.cpp
@@ -423,7 +423,7 @@ void KThemeBase::readConfig( TQt::GUIStyle /*style*/ )
     TQSettings config;
     if (configDirName.isEmpty() || configDirName == ".")
     {
-    	KStyleDirs::dirs()->addToSearch( "themerc", config );
+    	TDEStyleDirs::dirs()->addToSearch( "themerc", config );
     }
     else config.insertSearchPath( TQSettings::Unix, configDirName );
 
@@ -525,7 +525,7 @@ void KThemeBase::readConfig( TQt::GUIStyle /*style*/ )
 }
 
 KThemeBase::KThemeBase( const TQString& dir, const TQString & configFile )
-        : KStyle( FilledFrameWorkaround ), configFileName( configFile )
+        : TDEStyle( FilledFrameWorkaround ), configFileName( configFile )
 {
     d = new KThemeBasePrivate;
     if ( configFileName.isEmpty() )
@@ -648,7 +648,7 @@ KThemeBase::~KThemeBase()
         if ( grHighColors[ i ] )
             delete( grHighColors[ i ] );
     }
-    KStyleDirs::release();
+    TDEStyleDirs::release();
     delete cache;
     delete d;
 }
@@ -656,7 +656,7 @@ KThemeBase::~KThemeBase()
 TQImage* KThemeBase::loadImage( const TQString &name )
 {
     TQImage * image = new TQImage;
-    TQString path = KStyleDirs::dirs()->findResource( "themepixmap",name );
+    TQString path = TDEStyleDirs::dirs()->findResource( "themepixmap",name );
     image->load( path );
     if ( !image->isNull() )
         return ( image );
@@ -668,7 +668,7 @@ TQImage* KThemeBase::loadImage( const TQString &name )
 KThemePixmap* KThemeBase::loadPixmap( const TQString &name )
 {
     KThemePixmap * pixmap = new KThemePixmap( false );
-    TQString path = KStyleDirs::dirs()->findResource( "themepixmap", name );
+    TQString path = TDEStyleDirs::dirs()->findResource( "themepixmap", name );
     pixmap->load( path );
     if ( !pixmap->isNull() )
         return pixmap;
diff --git a/kstyles/kthemestyle/kthemebase.h b/kstyles/kthemestyle/kthemebase.h
index e9ea55d5b..faef98dfd 100644
--- a/kstyles/kthemestyle/kthemebase.h
+++ b/kstyles/kthemestyle/kthemebase.h
@@ -211,7 +211,7 @@ class KThemeBasePrivate;
  *
  * @author Daniel M. Duley <mosfet@kde.org>
  */
-class KThemeBase: public KStyle
+class KThemeBase: public TDEStyle
 {
     Q_OBJECT
 public:
@@ -510,14 +510,14 @@ protected:
     */
     virtual int pixelMetric ( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * widget = 0 ) const
     {
-        return KStyle::pixelMetric( metric, ceData, elementFlags, widget );
+        return TDEStyle::pixelMetric( metric, ceData, elementFlags, widget );
     }
 
     virtual void drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect & r, const TQColorGroup & cg,
                                  SFlags flags = Style_Default,
                                  const TQStyleOption& option = TQStyleOption::Default ) const
     {
-        KStyle::tqdrawPrimitive ( pe, p, ceData, elementFlags, r, cg,
+        TDEStyle::tqdrawPrimitive ( pe, p, ceData, elementFlags, r, cg,
                                 flags, option );
     }
 
@@ -532,7 +532,7 @@ protected:
                               const TQStyleOption& opt = TQStyleOption::Default,
                               const TQWidget *widget = 0 ) const
     {
-        KStyle::drawControl( element, p, ceData, elementFlags,
+        TDEStyle::drawControl( element, p, ceData, elementFlags,
                              r, cg, how, opt, widget );
     }
 
@@ -544,7 +544,7 @@ protected:
                                   const TQStyleOption& opt = TQStyleOption::Default,
                                   const TQWidget *widget = 0 ) const
     {
-        KStyle::drawControlMask( element, p, ceData, elementFlags, r, opt, widget );
+        TDEStyle::drawControlMask( element, p, ceData, elementFlags, r, opt, widget );
     }
 
 
@@ -560,11 +560,11 @@ protected:
                                      const TQStyleOption& opt = TQStyleOption::Default,
                                      const TQWidget* widget = 0 ) const
     {
-        KStyle::drawComplexControl( control, p, ceData, elementFlags, r, cg, flags, controls, active, opt, widget );
+        TDEStyle::drawComplexControl( control, p, ceData, elementFlags, r, cg, flags, controls, active, opt, widget );
     }
 
 
-    virtual void drawKStylePrimitive( KStylePrimitive kpe,
+    virtual void drawTDEStylePrimitive( TDEStylePrimitive kpe,
                                       TQPainter* p,
                                       const TQStyleControlElementData &ceData,
                                       ControlElementFlags elementFlags,
@@ -574,7 +574,7 @@ protected:
                                       const TQStyleOption& opt = TQStyleOption::Default,
                                       const TQWidget* widget = 0 ) const
     {
-        KStyle::drawKStylePrimitive( kpe,
+        TDEStyle::drawTDEStylePrimitive( kpe,
                                      p, ceData, elementFlags, r,
                                      cg, flags, opt, widget );
     }
@@ -585,7 +585,7 @@ protected:
                            TQStyleHintReturn* returnData = 0,
                            const TQWidget *widget = 0 ) const
     {
-        return KStyle::styleHint( sh,
+        return TDEStyle::styleHint( sh,
                                   ceData,
                                   elementFlags,
                                   opt,
@@ -600,7 +600,7 @@ protected:
                                     const TQStyleOption& opt = TQStyleOption::Default,
                                     const TQWidget *widget = 0 ) const
     {
-        return KStyle::sizeFromContents( contents,
+        return TDEStyle::sizeFromContents( contents,
                                          ceData, elementFlags, contentsSize, opt, widget );
     }
 
diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp
index 7d2c72c2a..4cc374e5d 100644
--- a/kstyles/kthemestyle/kthemestyle.cpp
+++ b/kstyles/kthemestyle/kthemestyle.cpp
@@ -130,7 +130,7 @@ public:
     TQStringList keys() const
     {
         TQSettings cfg;
-        KStyleDirs::dirs()->addToSearch( "config", cfg );
+        TDEStyleDirs::dirs()->addToSearch( "config", cfg );
 
         TQStringList keys;
         bool ok;
@@ -145,7 +145,7 @@ public:
     TQStyle* create( const TQString& key )
     {
         TQSettings cfg;
-        KStyleDirs::dirs()->addToSearch( "config", cfg );
+        TDEStyleDirs::dirs()->addToSearch( "config", cfg );
 
         TQString file = cfg.readEntry( "/kthemestyle/" + key + "/file" );
         if ( !key.isEmpty() )
@@ -330,7 +330,7 @@ TQRect KThemeStyle::subRect(SubRect sr, const TQStyleControlElementData &ceData,
             return checkbox;
         }
     }
-    return KStyle::subRect(sr, ceData, elementFlags, widget);
+    return TDEStyle::subRect(sr, ceData, elementFlags, widget);
 }
 
 int KThemeStyle::pixelMetric ( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * widget ) const
@@ -515,7 +515,7 @@ bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, C
         }
     }
 
-    return KStyle::objectEventHandler(ceData, elementFlags, source, event);
+    return TDEStyle::objectEventHandler(ceData, elementFlags, source, event);
 }
 
 void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
@@ -626,7 +626,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen
         }
     }
 
-    KStyle::polish( ceData, elementFlags, ptr );
+    TDEStyle::polish( ceData, elementFlags, ptr );
 }
 
 void KThemeStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
@@ -662,7 +662,7 @@ void KThemeStyle::unPolish( const TQStyleControlElementData &ceData, ControlElem
          w->unsetPalette();
     }
 
-    KStyle::unPolish( ceData, elementFlags, ptr );
+    TDEStyle::unPolish( ceData, elementFlags, ptr );
 }
 
 
@@ -1831,7 +1831,7 @@ void KThemeStyle::drawControlMask( ControlElement element,
 }
 
 
-void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe,
+void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
                                        TQPainter* p,
                                        const TQStyleControlElementData &ceData,
                                        ControlElementFlags elementFlags,
@@ -2004,7 +2004,7 @@ void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe,
 
     if ( !handled )
     {
-        KThemeBase::drawKStylePrimitive( kpe, p, ceData, elementFlags,
+        KThemeBase::drawTDEStylePrimitive( kpe, p, ceData, elementFlags,
                                          r, cg, flags, opt, widget );
     }
 
diff --git a/kstyles/kthemestyle/kthemestyle.h b/kstyles/kthemestyle/kthemestyle.h
index c978601a8..24f24e1a8 100644
--- a/kstyles/kthemestyle/kthemestyle.h
+++ b/kstyles/kthemestyle/kthemestyle.h
@@ -116,7 +116,7 @@ public:
                                      const TQStyleOption& = TQStyleOption::Default,
                                      const TQWidget* widget = 0 ) const;
 
-    virtual void drawKStylePrimitive( KStylePrimitive kpe,
+    virtual void drawTDEStylePrimitive( TDEStylePrimitive kpe,
                                       TQPainter* p,
                                       const TQStyleControlElementData &ceData,
                                       ControlElementFlags elementFlags,
diff --git a/kstyles/light/lightstyle-v2.cpp b/kstyles/light/lightstyle-v2.cpp
index ef71e3c7f..0d343f778 100644
--- a/kstyles/light/lightstyle-v2.cpp
+++ b/kstyles/light/lightstyle-v2.cpp
@@ -67,7 +67,7 @@ static LightStyleV2Private *singleton = 0;
 
 
 LightStyleV2::LightStyleV2()
-    : KStyle(AllowMenuTransparency)
+    : TDEStyle(AllowMenuTransparency)
 {
     if (! singleton)
 	singleton = new LightStyleV2Private;
@@ -85,7 +85,7 @@ LightStyleV2::~LightStyleV2()
 
 void LightStyleV2::polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
-    KStyle::polishPopupMenu(ceData, elementFlags, ptr);
+    TDEStyle::polishPopupMenu(ceData, elementFlags, ptr);
 }
 
 static void drawLightBevel(TQPainter *p, const TQRect &r, const TQColorGroup &cg,
diff --git a/kstyles/light/lightstyle-v2.h b/kstyles/light/lightstyle-v2.h
index 3141ad978..75d096a4b 100644
--- a/kstyles/light/lightstyle-v2.h
+++ b/kstyles/light/lightstyle-v2.h
@@ -34,7 +34,7 @@
 #endif // QT_PLUGIN
 
 
-class Q_EXPORT_STYLE_LIGHT_V2 LightStyleV2 : public KStyle
+class Q_EXPORT_STYLE_LIGHT_V2 LightStyleV2 : public TDEStyle
 {
     Q_OBJECT
 
diff --git a/kstyles/light/lightstyle-v3.cpp b/kstyles/light/lightstyle-v3.cpp
index bf0163029..735bd3169 100644
--- a/kstyles/light/lightstyle-v3.cpp
+++ b/kstyles/light/lightstyle-v3.cpp
@@ -45,7 +45,7 @@
 // The Light Style, 3rd revision
 
 LightStyleV3::LightStyleV3()
-    : KStyle(AllowMenuTransparency)
+    : TDEStyle(AllowMenuTransparency)
 {
     basestyle = TQStyleFactory::create( "Windows" );
     if ( ! basestyle )
@@ -61,7 +61,7 @@ LightStyleV3::~LightStyleV3()
 
 void LightStyleV3::polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
-    KStyle::polishPopupMenu(ceData, elementFlags, ptr);
+    TDEStyle::polishPopupMenu(ceData, elementFlags, ptr);
     // empty to satisy pure virtual requirements
 }
 
diff --git a/kstyles/light/lightstyle-v3.h b/kstyles/light/lightstyle-v3.h
index ccda6cada..7ce62c3a8 100644
--- a/kstyles/light/lightstyle-v3.h
+++ b/kstyles/light/lightstyle-v3.h
@@ -37,7 +37,7 @@
 #endif // QT_PLUGIN
 
 
-class Q_EXPORT_STYLE_LIGHT_V3 LightStyleV3 : public KStyle
+class Q_EXPORT_STYLE_LIGHT_V3 LightStyleV3 : public TDEStyle
 {
     Q_OBJECT
     TQStyle *basestyle;
diff --git a/kstyles/plastik/plastik.cpp b/kstyles/plastik/plastik.cpp
index 77f6b0e1b..e7b6acd7f 100644
--- a/kstyles/plastik/plastik.cpp
+++ b/kstyles/plastik/plastik.cpp
@@ -20,7 +20,7 @@
    Copyright (C) 2000 Daniel M. Duley       <mosfet@kde.org>
              (C) 2000 Dirk Mueller          <mueller@kde.org>
              (C) 2001 Martijn Klingens      <klingens@kde.org>
-   Progressbar code based on KStyle,
+   Progressbar code based on TDEStyle,
    Copyright (C) 2001-2002 Karol Szwed <gallium@kde.org>
 
    This library is free software; you can redistribute it and/or
@@ -151,7 +151,7 @@ class PlastikStylePlugin : public TQStylePlugin
 KDE_Q_EXPORT_PLUGIN( PlastikStylePlugin )
 // -- end --
 
-PlastikStyle::PlastikStyle() : KStyle( AllowMenuTransparency, ThreeButtonScrollBar),
+PlastikStyle::PlastikStyle() : TDEStyle( AllowMenuTransparency, ThreeButtonScrollBar),
     kickerMode(false),
     kornMode(false),
     flatMode(false)
@@ -275,7 +275,7 @@ void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
 	}
     }
 
-    KStyle::polish(ceData, elementFlags, ptr);
+    TDEStyle::polish(ceData, elementFlags, ptr);
 }
 
 void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
@@ -311,7 +311,7 @@ void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem
 	}
     }
 
-    KStyle::unPolish(ceData, elementFlags, ptr);
+    TDEStyle::unPolish(ceData, elementFlags, ptr);
 }
 
 void PlastikStyle::tdehtmlWidgetDestroyed(TQObject* obj)
@@ -1198,7 +1198,7 @@ void PlastikStyle::renderTab(TQPainter *p,
     }
 }
 
-void PlastikStyle::drawKStylePrimitive(KStylePrimitive kpe,
+void PlastikStyle::drawTDEStylePrimitive(TDEStylePrimitive kpe,
                                       TQPainter *p,
                                       const TQStyleControlElementData &ceData,
                                       ControlElementFlags elementFlags,
@@ -1373,7 +1373,7 @@ void PlastikStyle::drawKStylePrimitive(KStylePrimitive kpe,
             break;
         }
 
-    // copied and slightly modified from KStyle.
+    // copied and slightly modified from TDEStyle.
     case KPE_ListViewBranch: {
         // Typical Windows style listview branch element (dotted line).
 
@@ -1446,7 +1446,7 @@ void PlastikStyle::drawKStylePrimitive(KStylePrimitive kpe,
     }
 
         default:
-            KStyle::drawKStylePrimitive(kpe, p, ceData, elementFlags, r, cg, flags, opt, widget);
+            TDEStyle::drawTDEStylePrimitive(kpe, p, ceData, elementFlags, r, cg, flags, opt, widget);
     }
 }
 
@@ -2175,7 +2175,7 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe,
         }
 
         default: {
-            return KStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt);
+            return TDEStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt);
         }
     }
 }
@@ -2375,7 +2375,7 @@ void PlastikStyle::drawControl(TQ_ControlElement element,
                     renderTab(p, r, cg, mouseOver, selected, true, pos, false, cornerWidget);
                     break;
                     default:
-                            KStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget);
+                            TDEStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget);
             }
 
             break;
@@ -2734,7 +2734,7 @@ void PlastikStyle::drawControl(TQ_ControlElement element,
             break;
 
         default:
-          KStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget);
+          TDEStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget);
     }
 }
 
@@ -2755,7 +2755,7 @@ void PlastikStyle::drawControlMask(TQ_ControlElement element,
         }
 
         default: {
-            KStyle::drawControlMask (element, p, ceData, elementFlags, r, opt, w);
+            TDEStyle::drawControlMask (element, p, ceData, elementFlags, r, opt, w);
         }
     }
 }
@@ -2778,7 +2778,7 @@ void PlastikStyle::drawComplexControlMask(TQ_ComplexControl c,
             break;
         }
         default: {
-            KStyle::drawComplexControlMask (c, p, ceData, elementFlags, r, o, w);
+            TDEStyle::drawComplexControlMask (c, p, ceData, elementFlags, r, o, w);
         }
     }
 }
@@ -3168,7 +3168,7 @@ void PlastikStyle::drawComplexControl(TQ_ComplexControl control,
         }
 
         default:
-            KStyle::drawComplexControl(control, p, ceData, elementFlags,
+            TDEStyle::drawComplexControl(control, p, ceData, elementFlags,
                                         r, cg, flags, controls,
                                         active, opt, widget);
             break;
@@ -3183,7 +3183,7 @@ TQRect PlastikStyle::subRect(SubRect r, const TQStyleControlElementData &ceData,
             return querySubControlMetrics( CC_ComboBox, ceData, elementFlags, SC_ComboBoxEditField, TQStyleOption::Default, widget );
         }
 
-        // Don't use KStyles progressbar subrect
+        // Don't use TDEStyles progressbar subrect
         // TODO:
         case SR_ProgressBarGroove: {
             return TQRect(ceData.rect);
@@ -3195,7 +3195,7 @@ TQRect PlastikStyle::subRect(SubRect r, const TQStyleControlElementData &ceData,
         }
 
         default: {
-            return KStyle::subRect(r, ceData, elementFlags, widget);
+            return TDEStyle::subRect(r, ceData, elementFlags, widget);
         }
     }
 }
@@ -3216,7 +3216,7 @@ TQRect PlastikStyle::querySubControlMetrics(TQ_ComplexControl control,
                     return TQRect(r.left()+2, r.top()+2, r.width()-4-15-1, r.height()-4);
                 }
                 default: {
-                    return KStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget);
+                    return TDEStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget);
                 }
             }
             break;
@@ -3260,13 +3260,13 @@ TQRect PlastikStyle::querySubControlMetrics(TQ_ComplexControl control,
                     return TQRect(buttonsLeft, r.top()+1, bs.width(), r.height()-2);
                 }
                 default: {
-                    return KStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget);
+                    return TDEStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget);
                 }
             }
             break;
         }
         default: {
-            return KStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget);
+            return TDEStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget);
         }
     }
 }
@@ -3373,7 +3373,7 @@ int PlastikStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ce
             return 2;
 
         default:
-            return KStyle::pixelMetric(m, ceData, elementFlags, widget);
+            return TDEStyle::pixelMetric(m, ceData, elementFlags, widget);
     }
 }
 
@@ -3456,14 +3456,14 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t,
             if(widget->parent() && ::tqqt_cast<TQToolBar*>(widget->parent()) )
                 return TQSize( s.width()+2*4, s.height()+2*4 );
             else
-                return KStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget);
+                return TDEStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget);
         }
 
         default:
-            return KStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget);
+            return TDEStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget);
     }
 
-    return KStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget);
+    return TDEStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget);
 }
 
 int PlastikStyle::styleHint( TQ_StyleHint stylehint,
@@ -3489,13 +3489,13 @@ int PlastikStyle::styleHint( TQ_StyleHint stylehint,
 	}
 
         default:
-            return KStyle::styleHint(stylehint, ceData, elementFlags, option, returnData, widget);
+            return TDEStyle::styleHint(stylehint, ceData, elementFlags, option, returnData, widget);
     }
 }
 
 bool PlastikStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *ev )
 {
-    if (KStyle::objectEventHandler(ceData, elementFlags, source, ev) )
+    if (TDEStyle::objectEventHandler(ceData, elementFlags, source, ev) )
         return true;
 
     if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
diff --git a/kstyles/plastik/plastik.h b/kstyles/plastik/plastik.h
index a1870b701..7c3e0484b 100644
--- a/kstyles/plastik/plastik.h
+++ b/kstyles/plastik/plastik.h
@@ -18,7 +18,7 @@
    Copyright (C) 2000 Daniel M. Duley       <mosfet@kde.org>
              (C) 2000 Dirk Mueller          <mueller@kde.org>
              (C) 2001 Martijn Klingens      <klingens@kde.org>
-   Progressbar code based on KStyle,
+   Progressbar code based on TDEStyle,
    Copyright (C) 2001-2002 Karol Szwed <gallium@kde.org>
 
    This library is free software; you can redistribute it and/or
@@ -54,7 +54,7 @@ class TQSettings;
 class TQTab;
 class TQTimer;
 
-class PlastikStyle : public KStyle
+class PlastikStyle : public TDEStyle
 {
     Q_OBJECT
 
@@ -66,7 +66,7 @@ public:
     void polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
     void unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
 
-    void drawKStylePrimitive(KStylePrimitive kpe,
+    void drawTDEStylePrimitive(TDEStylePrimitive kpe,
                              TQPainter* p,
                              const TQStyleControlElementData &ceData,
                              ControlElementFlags elementFlags,
diff --git a/kstyles/web/plugin.cpp b/kstyles/web/plugin.cpp
index c22bb08fa..6ab10ebd8 100644
--- a/kstyles/web/plugin.cpp
+++ b/kstyles/web/plugin.cpp
@@ -3,7 +3,7 @@
 
 extern "C"
 {
-  KStyle *      allocate()      { return new WebStyle; }
+  TDEStyle *      allocate()      { return new WebStyle; }
   int           minor_version() { return 0; }
   int           major_version() { return 1; }
   const char *  description()   { return(i18n("Web style plugin").utf8()); }
diff --git a/kstyles/web/webstyle.cpp b/kstyles/web/webstyle.cpp
index 3e850394f..aca43fb74 100644
--- a/kstyles/web/webstyle.cpp
+++ b/kstyles/web/webstyle.cpp
@@ -218,7 +218,7 @@ drawFunkyRect
 }
 
 WebStyle::WebStyle()
-  : KStyle()
+  : TDEStyle()
 {
   setButtonDefaultIndicatorWidth(6);
   setScrollBarExtent(_scrollBarExtent, _scrollBarExtent);
@@ -423,7 +423,7 @@ WebStyle::drawPushButtonLabel(TQPushButton * b, TQPainter * p)
 {
   // This is complicated stuff and we don't really want to mess with it.
 
-  KStyle::drawPushButtonLabel(b, p);
+  TDEStyle::drawPushButtonLabel(b, p);
 }
 
   void
@@ -474,7 +474,7 @@ WebStyle::drawScrollBarControls
     Qt::ArrowType t =
       sb->orientation() == Horizontal ? Qt::RightArrow : Qt::DownArrow;
 
-    // Is it me or is KStyle::drawArrow broken ?
+    // Is it me or is TDEStyle::drawArrow broken ?
 
     drawArrow
       (
@@ -930,7 +930,7 @@ WebStyle::drawArrow
  const TQBrush * fill
 )
 {
-  KStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, fill);
+  TDEStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, fill);
 }
 
   void
@@ -1308,7 +1308,7 @@ WebStyle::drawPopupMenuItem
 )
 {
   // TODO
-  KStyle::drawPopupMenuItem(p, checkable, maxpmw, tab, mi, pal, act, enabled, x, y, w, h);
+  TDEStyle::drawPopupMenuItem(p, checkable, maxpmw, tab, mi, pal, act, enabled, x, y, w, h);
 }
 
   void
diff --git a/kstyles/web/webstyle.h b/kstyles/web/webstyle.h
index 611cf8485..68f83c99b 100644
--- a/kstyles/web/webstyle.h
+++ b/kstyles/web/webstyle.h
@@ -28,7 +28,7 @@ class TQScrollBar;
 class TQPushButton;
 class TQWidget;
 
-class WebStyle : public KStyle
+class WebStyle : public TDEStyle
 {
   public: