Rename a number of libraries and executables to avoid conflicts with KDE4

1 files changed, 6 insertions, 6 deletions

diff --git a/style/qtcurve.cpp b/style/qtcurve.cpp
index 19e7e34..e636293 100644
--- a/style/qtcurve.cpp
+++ b/style/qtcurve.cpp
@@ -440,7 +440,7 @@ static bool kickerIsTrans()
 
 static bool isKhtmlWidget(const TQWidget *w, int level=1)
 {
-    return w && ((w->name() && 0==strcmp(w->name(), "__khtml")) ||
+    return w && ((w->name() && 0==strcmp(w->name(), "__tdehtml")) ||
                  (level && isKhtmlWidget(w->parentWidget(), --level)));
 }
 
@@ -1476,7 +1476,7 @@ void QtCurveStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
 	if(::isKhtmlFormWidget(widget))
 	{
 		itsKhtmlWidgets[widget]=true;
-		connect(widget, TQT_SIGNAL(destroyed(TQObject *)), this, TQT_SLOT(khtmlWidgetDestroyed(TQObject *)));
+		connect(widget, TQT_SIGNAL(destroyed(TQObject *)), this, TQT_SLOT(tdehtmlWidgetDestroyed(TQObject *)));
 	}
 	
 	if(enableFilter && isSpecialHover(widget))
@@ -4365,9 +4365,9 @@ void QtCurveStyle::drawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, const TQS
                 
             // HACK!!  (From Plastik)
             //
-            // In this place there is no reliable way to detect if we are in khtml; the
-            // only thing we know is that khtml buffers its widgets into a pixmap. So
-            // when the paint device is a TQPixmap, chances are high that we are in khtml.
+            // In this place there is no reliable way to detect if we are in tdehtml; the
+            // only thing we know is that tdehtml buffers its widgets into a pixmap. So
+            // when the paint device is a TQPixmap, chances are high that we are in tdehtml.
             // It's possible that this breaks other things, so let's see how it works...
             if (p->device() && dynamic_cast<TQPixmap*>(p->device()))
                 itsFormMode=true;
@@ -8751,7 +8751,7 @@ void QtCurveStyle::sliderThumbMoved(int)
         slider->update();
 }
 
-void QtCurveStyle::khtmlWidgetDestroyed(TQObject *o)
+void QtCurveStyle::tdehtmlWidgetDestroyed(TQObject *o)
 {
     itsKhtmlWidgets.remove(TQT_TQWIDGET_CONST(o));
 }