Rename KStyle to TDEStyle to avoid conflicts with KDE4

2 files changed, 20 insertions, 20 deletions

diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp
index 3e3ff314..84b8b245 100644
--- a/styles/dotnet/dotnet.cpp
+++ b/styles/dotnet/dotnet.cpp
@@ -74,7 +74,7 @@ KDE_Q_EXPORT_PLUGIN( dotNETstylePlugin )
 
 // ---------------------------------------------------
 
-dotNETstyle::dotNETstyle() : KStyle( AllowMenuTransparency ), kickerMode(false)
+dotNETstyle::dotNETstyle() : TDEStyle( AllowMenuTransparency ), kickerMode(false)
 {
 	winstyle = 0L;
 	winstyle = TQStyleFactory::create("Windows");
@@ -89,9 +89,9 @@ dotNETstyle::dotNETstyle() : KStyle( AllowMenuTransparency ), kickerMode(false)
 	}
 
 	TQSettings settings;
-	pseudo3D = settings.readBoolEntry("/KStyle/Settings/Pseudo3D", true);
-	roundedCorners = settings.readBoolEntry("/KStyle/Settings/RoundedCorners", true);
-	useTextShadows = settings.readBoolEntry("/KStyle/Settings/UseTextShadows", false);
+	pseudo3D = settings.readBoolEntry("/TDEStyle/Settings/Pseudo3D", true);
+	roundedCorners = settings.readBoolEntry("/TDEStyle/Settings/RoundedCorners", true);
+	useTextShadows = settings.readBoolEntry("/TDEStyle/Settings/UseTextShadows", false);
 	reverseLayout = TQApplication::TQApplication::reverseLayout();
 }
 
@@ -376,7 +376,7 @@ void dotNETstyle::renderPanel(TQPainter *p,
 }
 
 
-void dotNETstyle::drawKStylePrimitive(KStylePrimitive kpe,
+void dotNETstyle::drawTDEStylePrimitive(TDEStylePrimitive kpe,
                                       TQPainter *p,
                                       const TQStyleControlElementData &ceData,
                                       ControlElementFlags elementFlags,
@@ -419,7 +419,7 @@ void dotNETstyle::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);
 	}
 }
 
@@ -791,7 +791,7 @@ void dotNETstyle::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);
 		}
 	}
 }
@@ -1428,7 +1428,7 @@ void dotNETstyle::drawControlMask(TQ_ControlElement element,
 		}
 
 		default: {
-			KStyle::drawControlMask (element, p, ceData, elementFlags, r, opt, w);
+			TDEStyle::drawControlMask (element, p, ceData, elementFlags, r, opt, w);
 		}
 	}
 }
@@ -1457,7 +1457,7 @@ void dotNETstyle::drawComplexControlMask(ComplexControl c,
 			break;
 		}
 		default: {
-			KStyle::drawComplexControlMask (c, p, ceData, elementFlags, r, o, w);
+			TDEStyle::drawComplexControlMask (c, p, ceData, elementFlags, r, o, w);
 		}
 	}
 }
@@ -1710,7 +1710,7 @@ void dotNETstyle::drawComplexControl(ComplexControl control,
 		}
 
 		default:
-			KStyle::drawComplexControl(control, p, ceData, elementFlags,
+			TDEStyle::drawComplexControl(control, p, ceData, elementFlags,
 			                           r, cg, flags, controls,
 			                           active, opt, widget);
 			break;
@@ -1720,7 +1720,7 @@ void dotNETstyle::drawComplexControl(ComplexControl control,
 
 TQRect dotNETstyle::subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const
 {
-// Don't use KStyles progressbar subrect
+// Don't use TDEStyles progressbar subrect
 	switch (r) {
 		case SR_ComboBoxFocusRect: {
 			return querySubControlMetrics( CC_ComboBox, ceData, elementFlags, SC_ComboBoxEditField, TQStyleOption::Default, widget );
@@ -1740,7 +1740,7 @@ TQRect dotNETstyle::subRect(SubRect r, const TQStyleControlElementData &ceData,
 			return winstyle->subRect(r, ceData, elementFlags, widget);
 		}
 		default: {
-			return KStyle::subRect(r, ceData, elementFlags, widget);
+			return TDEStyle::subRect(r, ceData, elementFlags, widget);
 		}
 	}
 }
@@ -1760,7 +1760,7 @@ TQRect dotNETstyle::querySubControlMetrics(ComplexControl control,
 					return TQRect(r.x() + 2, r.y() + 2, r.width() - 19, r.height() - 4);
 				}
 				default: {
-					return KStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget);
+					return TDEStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget);
 				}
 			}
 			break;
@@ -1801,7 +1801,7 @@ TQRect dotNETstyle::querySubControlMetrics(ComplexControl control,
 		default: {
 		}
 	}
-	return KStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget);
+	return TDEStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget);
 }
 
 int dotNETstyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
@@ -1901,7 +1901,7 @@ int dotNETstyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceD
 			return 2;
 
 		default:
-			return KStyle::pixelMetric(m, ceData, elementFlags, widget);
+			return TDEStyle::pixelMetric(m, ceData, elementFlags, widget);
 	}
 }
 
@@ -2008,10 +2008,10 @@ TQSize dotNETstyle::sizeFromContents(ContentsType t,
 		}
 
 		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);
 //	return winstyle->sizeFromContents(t, ceData, elementFlags, s, opt, widget);
 }
 
@@ -2113,7 +2113,7 @@ int dotNETstyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceData
 			}
 			break;
 		default:
-			ret = KStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w);
+			ret = TDEStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w);
 			break;
 	}
 
diff --git a/styles/dotnet/dotnet.h b/styles/dotnet/dotnet.h
index 416f20ae..72436526 100644
--- a/styles/dotnet/dotnet.h
+++ b/styles/dotnet/dotnet.h
@@ -32,7 +32,7 @@
 
 #define TQCOORDARRLEN(x) sizeof(x)/(sizeof(TQCOORD)*2)
 
-class dotNETstyle : public KStyle
+class dotNETstyle : public TDEStyle
 {
 	Q_OBJECT
   
@@ -47,7 +47,7 @@ public:
 
 	void renderMenuBlendPixmap( KPixmap&, const TQColorGroup&, const TQPopupMenu * ) const;
 
-	void drawKStylePrimitive( KStylePrimitive kpe,
+	void drawTDEStylePrimitive( TDEStylePrimitive kpe,
 		TQPainter* p,
 		const TQStyleControlElementData &ceData,
 		ControlElementFlags elementFlags,