Rename KStyle to TDEStyle to avoid conflicts with KDE4

src/note.cpp

@@ -1281,8 +1281,8 @@ void drawGradient( TQPainter *p, const TQColor &colorTop, const TQColor & colorB
 
 void Note::drawExpander(TQPainter *painter, int x, int y, const TQColor &background, bool expand, Basket *basket)
 {
-	// If the current style is a KStyle, use it to draw the expander (plus or minus):
+	// If the current style is a TDEStyle, use it to draw the expander (plus or minus):
-	if (dynamic_cast<KStyle*>(&(kapp->style())) != NULL) {
+	if (dynamic_cast<TDEStyle*>(&(kapp->style())) != NULL) {
 		// Set the 4 rounded corners background to background color:
 		TQColorGroup cg(basket->colorGroup());
 		cg.setColor(TQColorGroup::Base, background);
@@ -1292,7 +1292,7 @@ void Note::drawExpander(TQPainter *painter, int x, int y, const TQColor &backgro
 		painter->fillRect(x, y, 9, 9, brush);
 
 		// Draw it:
-		((KStyle&)(kapp->style())).drawKStylePrimitive( KStyle::KPE_ListViewExpander,
+		((TDEStyle&)(kapp->style())).drawTDEStylePrimitive( TDEStyle::KPE_ListViewExpander,
 		painter,
 		basket->viewport(),
 		TQRect(x, y, 9, 9),

src/tag.cpp

@@ -855,7 +855,7 @@ TQIconSet StateMenuItem::checkBoxIconSet(bool checked, TQColorGroup cg)
 	int height = kapp->style().pixelMetric(TQStyle::PM_IndicatorHeight, 0);
 	TQRect rect(0, 0, width, height);
 
-	TQColor menuBackgroundColor = (dynamic_cast<KStyle*>(&(kapp->style())) == NULL ? TQColor(cg.background()) : cg.background().light(103));
+	TQColor menuBackgroundColor = (dynamic_cast<TDEStyle*>(&(kapp->style())) == NULL ? TQColor(cg.background()) : cg.background().light(103));
 
 	// Enabled, Not hovering
 	TQPixmap  pixmap(width, height);