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

pull/1/head
Timothy Pearson 12 years ago
parent ac1e5178c2
commit 53eb297cad

@ -646,8 +646,8 @@
------ ------
1. Don't lighten border of disabled check/radio buttons. 1. Don't lighten border of disabled check/radio buttons.
2. Lighten trough of disabled slider. 2. Lighten trough of disabled slider.
3. Modify khtml check to also check to see if widget name == "__khtml" 3. Modify tdehtml check to also check to see if widget name == "__tdehtml"
4. Store khtml widgets in a map, to speed up checking. 4. Store tdehtml widgets in a map, to speed up checking.
5. Fix shadow on comboboxes. 5. Fix shadow on comboboxes.
6. Draw background of checked menuitem icons as per KDE4. 6. Draw background of checked menuitem icons as per KDE4.
@ -744,7 +744,7 @@
1. Fix slight drawing errors in corner of lineedits on toolbars. 1. Fix slight drawing errors in corner of lineedits on toolbars.
2. Fix scrollbar borders on certain apps - notably konsole. This was 2. Fix scrollbar borders on certain apps - notably konsole. This was
caused by an attempt to fix KHTML's scrollbars - that fix will caused by an attempt to fix KHTML's scrollbars - that fix will
now only be applied to konqueror and kontact (akregator uses khtml) now only be applied to konqueror and kontact (akregator uses tdehtml)
0.48.3 0.48.3
------ ------
@ -766,7 +766,7 @@
0.48.1 0.48.1
------ ------
1. Draw light border around all of progressbar. 1. Draw light border around all of progressbar.
2. Fix squared checkboxes in khtml. 2. Fix squared checkboxes in tdehtml.
3. Fix drawing of menubar border for inactive windows. 3. Fix drawing of menubar border for inactive windows.
4. Fix OpenOffice.org scrollbars. 4. Fix OpenOffice.org scrollbars.
@ -824,7 +824,7 @@
12. Removed save/load functionality from config dialog - only import/export 12. Removed save/load functionality from config dialog - only import/export
left. left.
13. Re-fix kaffeine's sliders. 13. Re-fix kaffeine's sliders.
14. Hacky fix for scrollbars within khtml. 14. Hacky fix for scrollbars within tdehtml.
15. Remove main frame that surounds kontact. 15. Remove main frame that surounds kontact.
16. Fix search field/results in systemsettings. 16. Fix search field/results in systemsettings.
@ -918,7 +918,7 @@
7. Option to use large dots. 7. Option to use large dots.
8. Option to set scrollbar button type: kde, windows, platinum, 8. Option to set scrollbar button type: kde, windows, platinum,
next, or none. next, or none.
9. Slightly better radios in khtml. 9. Slightly better radios in tdehtml.
10. Slightly smaller buttons. 10. Slightly smaller buttons.
11. Option to have coloured side-bar buttons - e.g. the buttons on the 11. Option to have coloured side-bar buttons - e.g. the buttons on the
edge of kate's windows. edge of kate's windows.
@ -1478,7 +1478,7 @@
5: KDE: Draw triangular tabs the same as rounded - prevous versions defaulted to 5: KDE: Draw triangular tabs the same as rounded - prevous versions defaulted to
KStyle. KStyle.
6: KDE: Add 10pix (2*10) border to non-default buttons. 6: KDE: Add 10pix (2*10) border to non-default buttons.
7: KDE: Implement masks for checks and radios - helps with khtml. 7: KDE: Implement masks for checks and radios - helps with tdehtml.
0.15 0.15
---- ----

@ -440,7 +440,7 @@ static bool kickerIsTrans()
static bool isKhtmlWidget(const TQWidget *w, int level=1) 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))); (level && isKhtmlWidget(w->parentWidget(), --level)));
} }
@ -1476,7 +1476,7 @@ void QtCurveStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
if(::isKhtmlFormWidget(widget)) if(::isKhtmlFormWidget(widget))
{ {
itsKhtmlWidgets[widget]=true; 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)) if(enableFilter && isSpecialHover(widget))
@ -4365,9 +4365,9 @@ void QtCurveStyle::drawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, const TQS
// HACK!! (From Plastik) // HACK!! (From Plastik)
// //
// In this place there is no reliable way to detect if we are in khtml; the // In this place there is no reliable way to detect if we are in tdehtml; the
// only thing we know is that khtml buffers its widgets into a pixmap. So // 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 khtml. // 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... // It's possible that this breaks other things, so let's see how it works...
if (p->device() && dynamic_cast<TQPixmap*>(p->device())) if (p->device() && dynamic_cast<TQPixmap*>(p->device()))
itsFormMode=true; itsFormMode=true;
@ -8751,7 +8751,7 @@ void QtCurveStyle::sliderThumbMoved(int)
slider->update(); slider->update();
} }
void QtCurveStyle::khtmlWidgetDestroyed(TQObject *o) void QtCurveStyle::tdehtmlWidgetDestroyed(TQObject *o)
{ {
itsKhtmlWidgets.remove(TQT_TQWIDGET_CONST(o)); itsKhtmlWidgets.remove(TQT_TQWIDGET_CONST(o));
} }

@ -250,7 +250,7 @@ class QtCurveStyle : public BASE_STYLE
void updateProgressPos(); void updateProgressPos();
void progressBarDestroyed(TQObject *bar); void progressBarDestroyed(TQObject *bar);
void sliderThumbMoved(int val); void sliderThumbMoved(int val);
void khtmlWidgetDestroyed(TQObject *o); void tdehtmlWidgetDestroyed(TQObject *o);
void hoverWidgetDestroyed(TQObject *o); void hoverWidgetDestroyed(TQObject *o);
private: private:

Loading…
Cancel
Save