summaryrefslogtreecommitdiffstats
path: root/style
diff options
context:
space:
mode:
Diffstat (limited to 'style')
-rw-r--r--style/Makefile.am4
-rw-r--r--style/baghira.cpp74
-rw-r--r--style/baghira.h6
-rw-r--r--style/eventfilter.cpp12
-rw-r--r--style/optionHandler.cpp2
-rw-r--r--style/polish.cpp36
-rw-r--r--style/utils.cpp2
7 files changed, 68 insertions, 68 deletions
diff --git a/style/Makefile.am b/style/Makefile.am
index cc324e4..12efbcb 100644
--- a/style/Makefile.am
+++ b/style/Makefile.am
@@ -1,11 +1,11 @@
AM_CPPFLAGS = -DQT_PLUGIN
-INCLUDES = -I$(top_srcdir)/kdefx $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdefx $(all_includes)
noinst_HEADERS = baghira.h pixmaps.h bitmaps.h
METASOURCES = AUTO
kde_style_LTLIBRARIES = baghira.la
baghira_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-baghira_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx -lXtst
+baghira_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx -lXtst
baghira_la_SOURCES = baghira.cpp optionHandler.cpp polish.cpp utils.cpp
lnkdir = $(kde_datadir)/kstyle/themes
lnk_DATA = baghira.themerc
diff --git a/style/baghira.cpp b/style/baghira.cpp
index bb61570..09397ac 100644
--- a/style/baghira.cpp
+++ b/style/baghira.cpp
@@ -41,8 +41,8 @@
#include <tqtabbar.h>
#include <tqtabwidget.h>
#include <tqvariant.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
#include <kwordwrap.h>
#include "config.h"
@@ -132,13 +132,13 @@ TQPixmap LiquidStyle::popupBack;
//============
-class KAccessToolBarButton : public KToolBarButton
+class KAccessToolBarButton : public TDEToolBarButton
{
// to get me access to the toolbbar
friend class LiquidStyle;
public:
KAccessToolBarButton( TQWidget* parent=0, const char* name=0 )
- : KToolBarButton( parent, name ) {}
+ : TDEToolBarButton( parent, name ) {}
};
@@ -172,7 +172,7 @@ static const int arrowHMargin = 6;
static const int rightBorder = 12;
-LiquidStyle::LiquidStyle() : KStyle( AllowMenuTransparency | FilledFrameWorkaround, ThreeButtonScrollBar )
+LiquidStyle::LiquidStyle() : TDEStyle( AllowMenuTransparency | FilledFrameWorkaround, ThreeButtonScrollBar )
{
TQIntDict<ButtonFadeInfo>bfi(31);// assuming 31 btns will be enough - a pointer list would be more accurate, but we need to lookup this every 50ms...
TQIntDict<ButtonTile>btnShadowedDict(223);// we need around 10/color, 3 colors/button assuming 10 different colors (e.g. kcalc)
@@ -1357,12 +1357,12 @@ void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p,
p->setBrush( oldBrush );
}
else
- KStyle::drawPrimitive( pe, p, r, cg, flags, opt );
+ TDEStyle::drawPrimitive( pe, p, r, cg, flags, opt );
}
} // general switch
}
-void LiquidStyle::drawKStylePrimitive( KStylePrimitive kpe, TQPainter* p,
+void LiquidStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p,
const TQWidget* widget, const TQRect &r,
const TQColorGroup &cg, SFlags flags,
const TQStyleOption &opt ) const
@@ -1514,7 +1514,7 @@ void LiquidStyle::drawKStylePrimitive( KStylePrimitive kpe, TQPainter* p,
break;
}
default:
- KStyle::drawKStylePrimitive( kpe, p, widget, r, cg, flags, opt );
+ TDEStyle::drawTDEStylePrimitive( kpe, p, widget, r, cg, flags, opt );
}
}
@@ -2154,7 +2154,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p,
break;
}*/
default:
- KStyle::drawControl( element, p, widget, r, cg, flags, opt );
+ TDEStyle::drawControl( element, p, widget, r, cg, flags, opt );
}
}
@@ -2166,7 +2166,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p,
// break;
// }
// default:
-// KStyle::drawControlMask( element, p, widget, r, opt );
+// TDEStyle::drawControlMask( element, p, widget, r, opt );
// break;
// }
// }
@@ -2178,7 +2178,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p,
// // break;
// // }
// // default:
-// KStyle::drawComplexControlMask( control, p, widget, r, opt );
+// TDEStyle::drawComplexControlMask( control, p, widget, r, opt );
// // }
// }
@@ -2251,7 +2251,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
TQRect button, menuarea;
button = querySubControlMetrics( control, widget, SC_ToolButton, opt );
menuarea = querySubControlMetrics( control, widget, SC_ToolButtonMenu, opt );
- if (::tqt_cast<KToolBarButton*>(toolbutton))
+ if (::tqt_cast<TDEToolBarButton*>(toolbutton))
{
toolbutton2 = (const KAccessToolBarButton*)toolbutton;
#if GCC_VERSION < 40000
@@ -2304,11 +2304,11 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
else
{
myPosition pos = full;
- KToolBar *bar = NULL;
+ TDEToolBar *bar = NULL;
- if (toolbutton2 && toolbutton2->parentWidget() && ::tqt_cast<KToolBar*>(toolbutton2->parentWidget()) )
- { //position calculation - would be nice if ktoolbarbutton provided this as flag
- bar = (KToolBar*)toolbutton2->parentWidget();
+ if (toolbutton2 && toolbutton2->parentWidget() && ::tqt_cast<TDEToolBar*>(toolbutton2->parentWidget()) )
+ { //position calculation - would be nice if tdetoolbarbutton provided this as flag
+ bar = (TDEToolBar*)toolbutton2->parentWidget();
int buttonId = toolbutton2->id();
int buttonIndex = bar->itemIndex(buttonId);
@@ -2332,19 +2332,19 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
{
if (buttonIndex == 0)
{
- KToolBarButton *tmpButton = bar->getButton(bar->idAt(buttonIndex+1));
+ TDEToolBarButton *tmpButton = bar->getButton(bar->idAt(buttonIndex+1));
(tmpButton && tmpButton->x() == toolbutton2->x()+toolbutton2->width()) ? pos = left : pos = full;
}
else if (buttonIndex == bar->count() - 1)
{
- KToolBarButton *tmpButton = NULL;
+ TDEToolBarButton *tmpButton = NULL;
tmpButton = bar->getButton(bar->idAt(buttonIndex-1));
(tmpButton && tmpButton->x() + tmpButton->width() == toolbutton2->x()) ? pos = right : pos = full;
}
else
{
- KToolBarButton *tmpButton1 = bar->getButton(bar->idAt(buttonIndex-1));
- KToolBarButton *tmpButton2 = bar->getButton(bar->idAt(buttonIndex+1));
+ TDEToolBarButton *tmpButton1 = bar->getButton(bar->idAt(buttonIndex-1));
+ TDEToolBarButton *tmpButton2 = bar->getButton(bar->idAt(buttonIndex+1));
tmpButton1 && tmpButton1->x() + tmpButton1->width() == toolbutton2->x() ?
pos = center : pos = left;
if (!(tmpButton2 && tmpButton2->x() == toolbutton2->x()+toolbutton2->width()))
@@ -2355,21 +2355,21 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
{
if (buttonIndex == 0)
{
- KToolBarButton *tmpButton = bar->getButton(bar->idAt(buttonIndex+1));
+ TDEToolBarButton *tmpButton = bar->getButton(bar->idAt(buttonIndex+1));
(tmpButton && tmpButton->y() == toolbutton2->y()+toolbutton2->height()) ?
pos = left : pos = full;
}
else if (buttonIndex == bar->count() - 1)
{
- KToolBarButton *tmpButton = NULL;
+ TDEToolBarButton *tmpButton = NULL;
tmpButton = bar->getButton(bar->idAt(buttonIndex-1));
(tmpButton && tmpButton->y() + tmpButton->height() == toolbutton2->y()) ?
pos = right : pos = full;
}
else
{
- KToolBarButton *tmpButton1 = bar->getButton(bar->idAt(buttonIndex-1));
- KToolBarButton *tmpButton2 = bar->getButton(bar->idAt(buttonIndex+1));
+ TDEToolBarButton *tmpButton1 = bar->getButton(bar->idAt(buttonIndex-1));
+ TDEToolBarButton *tmpButton2 = bar->getButton(bar->idAt(buttonIndex+1));
tmpButton1 && tmpButton1->y() + tmpButton1->height() == toolbutton2->y() ?
pos = center : pos = left;
if (!(tmpButton2 && tmpButton2->y() == toolbutton2->y()+toolbutton2->height()))
@@ -2413,7 +2413,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
case CC_ScrollBar:
{
const_cast<LiquidStyle*>( this ) ->currentScrollBar = ( TQScrollBar * ) widget;
- KStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, opt );
+ TDEStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, opt );
break;
}
case CC_SpinWidget: {
@@ -2511,7 +2511,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
// Draw slider groove
if ((controls & SC_SliderGroove) && groove.isValid()) {
- drawKStylePrimitive( KPE_SliderGroove, &p2, widget, groove, cg, flags, opt );
+ drawTDEStylePrimitive( KPE_SliderGroove, &p2, widget, groove, cg, flags, opt );
// Draw the focus rect around the groove
/* if (slider->hasFocus())
@@ -2527,7 +2527,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
if ((controls & SC_SliderHandle) && handle.isValid()) {
if (active == SC_SliderHandle)
flags |= Style_Active;
- drawKStylePrimitive( KPE_SliderHandle, &p2, widget, handle, cg, flags, opt );
+ drawTDEStylePrimitive( KPE_SliderHandle, &p2, widget, handle, cg, flags, opt );
}
p2.end();
@@ -2842,7 +2842,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons
#endif //QT_NO_TITLEBAR
default:
- KStyle::drawComplexControl( control, p, widget,
+ TDEStyle::drawComplexControl( control, p, widget,
r, cg, flags, controls, active, opt );
break;
}
@@ -2860,9 +2860,9 @@ int LiquidStyle::styleHint(StyleHint sh, const TQWidget * w, const TQStyleOption
if (optionHandler->CenterTabs() && !TQApplication::reverseLayout())
return AlignHCenter;
else
- return KStyle::styleHint(sh, w, opt, shr);
+ return TDEStyle::styleHint(sh, w, opt, shr);
default:
- return KStyle::styleHint(sh, w, opt, shr);
+ return TDEStyle::styleHint(sh, w, opt, shr);
}
}
@@ -2870,7 +2870,7 @@ TQRect LiquidStyle::subRect( SubRect r, const TQWidget *widget ) const {
if (r == SR_ComboBoxFocusRect){
return querySubControlMetrics( CC_ComboBox, widget, SC_ComboBoxEditField );
}
- return ( KStyle::subRect( r, widget ) );
+ return ( TDEStyle::subRect( r, widget ) );
}
int LiquidStyle::pixelMetric( PixelMetric m, const TQWidget *widget ) const
@@ -2955,7 +2955,7 @@ int LiquidStyle::pixelMetric( PixelMetric m, const TQWidget *widget ) const
case PM_ButtonShiftVertical:
return 0;
default:
- return KStyle::pixelMetric( m, widget );
+ return TDEStyle::pixelMetric( m, widget );
}
}
@@ -3000,7 +3000,7 @@ TQSize LiquidStyle::sizeFromContents( ContentsType contents,
}
case CT_ComboBox: {
- // TQSize sz = KStyle::sizeFromContents( contents, widget, contentSize, opt );
+ // TQSize sz = TDEStyle::sizeFromContents( contents, widget, contentSize, opt );
// return ( TQSize( sz.width()+3, sz.height() > 25 ? sz.height() : 25 ) );
if ( ::tqt_cast<const TQComboBox *>(widget) && ((const TQComboBox *)widget)->editable())
return ( TQSize( contentSize.width()+27, contentSize.height() + 4 > 22 ? contentSize.height() + 4 : 26 ) );
@@ -3054,14 +3054,14 @@ TQSize LiquidStyle::sizeFromContents( ContentsType contents,
default:
break;
}
- return KStyle::sizeFromContents( contents, widget, contentSize, opt );
+ return TDEStyle::sizeFromContents( contents, widget, contentSize, opt );
}
TQPixmap LiquidStyle::stylePixmap( StylePixmap stylepixmap,
const TQWidget* widget,
const TQStyleOption& opt ) const {
- return KStyle::stylePixmap( stylepixmap, widget, opt );
+ return TDEStyle::stylePixmap( stylepixmap, widget, opt );
}
#include "eventfilter.cpp"
@@ -3091,11 +3091,11 @@ TQRect LiquidStyle::querySubControlMetrics( ComplexControl control, const TQWidg
case SC_TitleBarUnshadeButton:
return TQRect( widget->width() - 29, 1, 24, 16 );
default:
- return ( KStyle::querySubControlMetrics( control, widget, subcontrol, opt ) );
+ return ( TDEStyle::querySubControlMetrics( control, widget, subcontrol, opt ) );
}
}
else
- return ( KStyle::querySubControlMetrics( control, widget, subcontrol, opt ) );
+ return ( TDEStyle::querySubControlMetrics( control, widget, subcontrol, opt ) );
}
TQImage LiquidStyle::fetchImage( const char *name ){
diff --git a/style/baghira.h b/style/baghira.h
index adbe60d..340738a 100644
--- a/style/baghira.h
+++ b/style/baghira.h
@@ -9,7 +9,7 @@
#include <tqwmatrix.h>
#include <kpixmap.h>
#include <tqwidget.h>
-#include <kstyle.h>
+#include <tdestyle.h>
// #define BITMAP_ITEMS 75 // Don't worry, they're demand loaded ;-)
#define LIQUID_MENU_CHANGE 667
@@ -490,7 +490,7 @@ public:
bool fadeIn;
};
-class LiquidStyle : public KStyle
+class LiquidStyle : public TDEStyle
{
Q_OBJECT
public:
@@ -505,7 +505,7 @@ public:
virtual void polish( TQPalette &p );
virtual void unPolish( TQApplication *a );
int styleHint(StyleHint sh, const TQWidget * w, const TQStyleOption & opt, TQStyleHintReturn * shr) const;
- void drawKStylePrimitive( KStylePrimitive kpe, TQPainter* p, const TQWidget* widget, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const;
+ void drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, const TQWidget* widget, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const;
void drawPrimitive( PrimitiveElement pe, TQPainter* p, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const;
void drawControl( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const;
// void drawControlMask( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& = TQStyleOption::Default ) const;
diff --git a/style/eventfilter.cpp b/style/eventfilter.cpp
index ba09ff6..4f860b5 100644
--- a/style/eventfilter.cpp
+++ b/style/eventfilter.cpp
@@ -164,7 +164,7 @@ bool LiquidStyle::eventFilter( TQObject *obj, TQEvent *ev )
}
else if ( obj->inherits( "TQDockWindow" ) )
{
- if (KStyle::eventFilter( obj, ev ))
+ if (TDEStyle::eventFilter( obj, ev ))
return true;
TQWidget * w = ( TQWidget * ) obj;
if ( w->backgroundMode() != TQt::PaletteBackground )
@@ -261,7 +261,7 @@ bool LiquidStyle::eventFilter( TQObject *obj, TQEvent *ev )
}
return false;
}
- else if (::tqt_cast<KToolBar*>(obj))
+ else if (::tqt_cast<TDEToolBar*>(obj))
{
TQObjectList *handlerList = obj->queryList( "TQDockWindowHandle" );
for (uint i= 0; i < handlerList->count(); i++)
@@ -402,7 +402,7 @@ bool LiquidStyle::eventFilter( TQObject *obj, TQEvent *ev )
}
return false;
}
- else if (::tqt_cast<KToolBar*>(obj))
+ else if (::tqt_cast<TDEToolBar*>(obj))
{
TQObjectList *handlerList = obj->queryList( "TQDockWindowHandle" );
for (uint i= 0; i < handlerList->count(); i++)
@@ -668,7 +668,7 @@ bool LiquidStyle::eventFilter( TQObject *obj, TQEvent *ev )
progAnimWidgets[(TQWidget*)obj] = 0;
return false;
}
- if ( !qstrcmp(obj->name(), "kde toolbar widget") )
+ if ( !qstrcmp(obj->name(), "tde toolbar widget") )
{
TQWidget* lb = static_cast<TQWidget*>(obj);
if (lb->backgroundMode() == TQt::PaletteButton)
@@ -824,10 +824,10 @@ bool LiquidStyle::eventFilter( TQObject *obj, TQEvent *ev )
for (uint i= 0; i < kids->count(); i++)
{
TQWidget *kid = (TQWidget*)kids->at(i);
- if (kid && kid->paletteBackgroundPixmap() && !(kid->isTopLevel() || kid->inherits( "KonqIconViewWidget" ) || kid->inherits( "khtml") || kid->inherits( "KActiveLabel") || qstrcmp( kid->name(), "_B_ALI_HEADER" ) == 0 || (kid->parentWidget() && kid->parentWidget()->inherits("Thumbnail") || kid->parentWidget()->inherits("MarkListItem")) ))
+ if (kid && kid->paletteBackgroundPixmap() && !(kid->isTopLevel() || kid->inherits( "KonqIconViewWidget" ) || kid->inherits( "tdehtml") || kid->inherits( "KActiveLabel") || qstrcmp( kid->name(), "_B_ALI_HEADER" ) == 0 || (kid->parentWidget() && kid->parentWidget()->inherits("Thumbnail") || kid->parentWidget()->inherits("MarkListItem")) ))
{
//we can loose those kids anytime - especially if the user plays on konqueror...
- if (::tqt_cast<KToolBarButton*>(kid))
+ if (::tqt_cast<TDEToolBarButton*>(kid))
kid->setErasePixmap(tmpBrushPix);
else
{
diff --git a/style/optionHandler.cpp b/style/optionHandler.cpp
index 2ab110a..589786a 100644
--- a/style/optionHandler.cpp
+++ b/style/optionHandler.cpp
@@ -12,7 +12,7 @@
#include <tqsettings.h>
#include <tqsize.h>
#include <tqstring.h>
-// #include <kconfig.h>
+// #include <tdeconfig.h>
#include <kpixmapeffect.h>
#include <stdio.h>
#include <cmath>
diff --git a/style/polish.cpp b/style/polish.cpp
index 2f4bbeb..650afc9 100644
--- a/style/polish.cpp
+++ b/style/polish.cpp
@@ -17,8 +17,8 @@
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqlistbox.h>
-#include <klistview.h>
-#include <kmenubar.h>
+#include <tdelistview.h>
+#include <tdemenubar.h>
#include <tqpalette.h>
#include <tqpainter.h>
#include <tqpopupmenu.h>
@@ -30,10 +30,10 @@
#include <tqtabbar.h>
#include <tqtoolbar.h>
#include <tqtoolbutton.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kpixmapeffect.h>
-#include <kglobalsettings.h>
-#include <kwin.h>
+#include <tdeglobalsettings.h>
+#include <twin.h>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
@@ -376,7 +376,7 @@ void LiquidStyle::polish( TQWidget *w )
- if (qstrcmp( w->name(), "kde toolbar widget" ) == 0 )
+ if (qstrcmp( w->name(), "tde toolbar widget" ) == 0 )
w->installEventFilter( this );
if (::tqt_cast<TQButton*>(w))
@@ -416,7 +416,7 @@ void LiquidStyle::polish( TQWidget *w )
if ( ::tqt_cast<TQToolBar*>(w))
{
- if (optionHandler->useToolButtonFrame() && w->inherits("KToolBar"))
+ if (optionHandler->useToolButtonFrame() && w->inherits("TDEToolBar"))
((TQToolBar*)w)->boxLayout()->setSpacing( 0 );
((TQToolBar*)w)->setMargin( 4 );
w->setBackgroundMode(PaletteBackground);
@@ -434,7 +434,7 @@ void LiquidStyle::polish( TQWidget *w )
}
//if (testWidget) tqWarning("testwidget stage %d",testInt++);
- if (tmpBool = ::tqt_cast<TQToolButton*>(w) || w->inherits( "TQToolBarSeparator" ) || w->inherits( "KToolBarSeparator" ) )
+ if (tmpBool = ::tqt_cast<TQToolButton*>(w) || w->inherits( "TQToolBarSeparator" ) || w->inherits( "TDEToolBarSeparator" ) )
{
if (tmpBool && w->parentWidget() && ::tqt_cast<TQToolBar*>(w->parentWidget()) )
{
@@ -465,10 +465,10 @@ void LiquidStyle::polish( TQWidget *w )
goto kstpolish;
}
- if ( !isPlain () && (w->inherits( "KonqIconViewWidget" ) || w->inherits( "khtml")/* || w->inherits( "TQtVisionView")*/))
+ if ( !isPlain () && (w->inherits( "KonqIconViewWidget" ) || w->inherits( "tdehtml")/* || w->inherits( "TQtVisionView")*/))
{
// if you want custom backgrounds in konqueror, you have to reset pixmap, since Konq animation can't handle it
- // original liquid did this on khtml, too (at speed loss) so we'll see, if we get errors from this...
+ // original liquid did this on tdehtml, too (at speed loss) so we'll see, if we get errors from this...
TQPalette pal( w->palette() );
pal.setBrush( TQColorGroup::Background, pal.active().background() );
w->setPalette( pal );
@@ -483,9 +483,9 @@ void LiquidStyle::polish( TQWidget *w )
if ((::tqt_cast<TQScrollView*>(w) || w->inherits("KateView") || w->inherits("TEWidget") || w->inherits("CHexViewWidget")) && !(w->isA("KOAgenda")))
{
- if (::tqt_cast<KListView*>(w) && optionHandler->custCols[7] != -1 && ((KListView*)w)->alternateBackground() == KGlobalSettings::alternateBackgroundColor())
+ if (::tqt_cast<TDEListView*>(w) && optionHandler->custCols[7] != -1 && ((TDEListView*)w)->alternateBackground() == TDEGlobalSettings::alternateBackgroundColor())
{
- ((KListView*)w)->setAlternateBackground(TQColor(optionHandler->custCols[7]));
+ ((TDEListView*)w)->setAlternateBackground(TQColor(optionHandler->custCols[7]));
}
#if _FORCE_SCROLLBARS_
if (::tqt_cast<TQScrollView*>(w) && !w->inherits( "KActiveLabel" ))
@@ -613,7 +613,7 @@ void LiquidStyle::polish( TQWidget *w )
bool italic = w->font().italic();
bool underline = w->font().underline();
bool overline = w->font().overline();
- w->setFont(KGlobalSettings::menuFont());
+ w->setFont(TDEGlobalSettings::menuFont());
if (bold)
(const_cast<TQFont*>(&w->font()))->setBold(true);
if (italic)
@@ -671,7 +671,7 @@ void LiquidStyle::polish( TQWidget *w )
//if (testWidget) tqWarning("testwidget stage %d",testInt++);
- if ( w->parentWidget() && ( ( ::tqt_cast<TQListBox*>(w) && ::tqt_cast<TQPushButton*>(w->parentWidget())) || w->inherits( "KCompletionBox" ) ) ) {
+ if ( w->parentWidget() && ( ( ::tqt_cast<TQListBox*>(w) && ::tqt_cast<TQPushButton*>(w->parentWidget())) || w->inherits( "TDECompletionBox" ) ) ) {
TQListBox* listbox = (TQListBox*) w;
listbox->setBackgroundMode( NoBackground );
w->installEventFilter( this );
@@ -745,7 +745,7 @@ void LiquidStyle::polish( TQWidget *w )
w->setBackgroundMode( TQWidget::NoBackground );
}
//if (testWidget) tqWarning("testwidget stage %d",testInt++);
- kstpolish: KStyle::polish( w ); // nothing of all above? do default kde stuff
+ kstpolish: TDEStyle::polish( w ); // nothing of all above? do default kde stuff
}
@@ -763,7 +763,7 @@ void LiquidStyle::unPolish( TQWidget *w ) {
goto kstunpolish;
}
- if ( w->inherits("TQToolBar") || qstrcmp( w->name(), "kde toolbar widget" ) == 0 ) {
+ if ( w->inherits("TQToolBar") || qstrcmp( w->name(), "tde toolbar widget" ) == 0 ) {
w->setBackgroundOrigin( TQWidget::WidgetOrigin );
// w->unsetPalette();
goto kstunpolish;
@@ -780,7 +780,7 @@ void LiquidStyle::unPolish( TQWidget *w ) {
goto kstunpolish;
}
if ( !isPlain () && w->inherits( "KonqIconViewWidget" ) ||
- w->inherits( "KHTMLView" ) ) {
+ w->inherits( "TDEHTMLView" ) ) {
w->unsetPalette();
goto kstunpolish;
}
@@ -874,5 +874,5 @@ void LiquidStyle::unPolish( TQWidget *w ) {
goto kstunpolish;
}
}
-kstunpolish: KStyle::unPolish( w );
+kstunpolish: TDEStyle::unPolish( w );
}
diff --git a/style/utils.cpp b/style/utils.cpp
index 31ef75a..e39b5b0 100644
--- a/style/utils.cpp
+++ b/style/utils.cpp
@@ -1401,7 +1401,7 @@ bool LiquidStyle::isHTMLWidget( const TQWidget *widget ) const
if ( w )
{
w = w->parent();
- if ( w && w->inherits( "KHTMLView" ) )
+ if ( w && w->inherits( "TDEHTMLView" ) )
return ( true );
}
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-30 16:06:44 +0000