summaryrefslogtreecommitdiffstats
path: root/tdefx/tdestyle.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tdefx/tdestyle.cpp')
-rw-r--r--tdefx/tdestyle.cpp92
1 files changed, 33 insertions, 59 deletions
diff --git a/tdefx/tdestyle.cpp b/tdefx/tdestyle.cpp
index ded6a2372..6571c2a48 100644
--- a/tdefx/tdestyle.cpp
+++ b/tdefx/tdestyle.cpp
@@ -53,7 +53,7 @@
#include <kpixmapeffect.h>
#include <kimageeffect.h>
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
# include <X11/Xlib.h>
# ifdef HAVE_XRENDER
# include <X11/extensions/Xrender.h> // schroder
@@ -263,11 +263,11 @@ TQString TDEStyle::defaultStyle()
void TDEStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{
- if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+ if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget* widget = reinterpret_cast<TQWidget*>(ptr);
if ( d->useFilledFrameWorkaround )
{
- if ( TQFrame *frame = ::tqqt_cast< TQFrame* >( widget ) ) {
+ if ( TQFrame *frame = ::tqt_cast< TQFrame* >( widget ) ) {
TQFrame::Shape shape = frame->frameShape();
if (shape == TQFrame::ToolBarPanel || shape == TQFrame::MenuBarPanel)
widget->installEventFilter(this);
@@ -287,11 +287,11 @@ void TDEStyle::polish( const TQStyleControlElementData &ceData, ControlElementFl
void TDEStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{
- if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+ if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget* widget = reinterpret_cast<TQWidget*>(ptr);
if ( d->useFilledFrameWorkaround )
{
- if ( TQFrame *frame = ::tqqt_cast< TQFrame* >( widget ) ) {
+ if ( TQFrame *frame = ::tqt_cast< TQFrame* >( widget ) ) {
TQFrame::Shape shape = frame->frameShape();
if (shape == TQFrame::ToolBarPanel || shape == TQFrame::MenuBarPanel)
widget->removeEventFilter(this);
@@ -310,7 +310,7 @@ void TDEStyle::polishPopupMenu( const TQStyleControlElementData &ceData, Control
widgetActionRequest(ceData, elementFlags, ptr, WAR_SetCheckable);
}
- if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+ if (ceData.widgetObjectTypes.contains("TQWidget")) {
TQWidget* widget = reinterpret_cast<TQWidget*>(ptr);
TQPopupMenu *p = dynamic_cast<TQPopupMenu*>(widget);
if (p) {
@@ -537,7 +537,7 @@ void TDEStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
break;
default:
- p->fillRect(r, Qt::yellow); // Something really bad happened - highlight.
+ p->fillRect(r, TQt::yellow); // Something really bad happened - highlight.
break;
}
}
@@ -569,29 +569,7 @@ int TDEStyle::kPixelMetric( TDEStylePixelMetric kpm, const TQStyleControlElement
// -----------------------------------------------------------------------------
-// #ifdef USE_QT4 // tdebindings / smoke needs this function declaration available at all times. Furthermore I don't think it would hurt to have the declaration available at all times...so leave these commented out for now
-
-//void TDEStyle::drawPrimitive( TQ_ControlElement pe,
-// TQPainter* p,
-// const TQStyleControlElementData &ceData,
-// ControlElementFlags elementFlags,
-// const TQRect &r,
-// const TQColorGroup &cg,
-// SFlags flags,
-// const TQStyleOption& opt ) const
-//{
-// // FIXME:
-// // What should "widget" be in actuality? How should I get it? From where?
-// // Almost certainly it should not be null!
-// TQWidget *widget = 0;
-// drawControl(pe, p, ceData, elementFlags, r, cg, flags, opt, widget);
-//}
-
-// #endif // USE_QT4
-
-// -----------------------------------------------------------------------------
-
-void TDEStyle::drawPrimitive( TQ_PrimitiveElement pe,
+void TDEStyle::drawPrimitive( PrimitiveElement pe,
TQPainter* p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -615,13 +593,13 @@ void TDEStyle::drawPrimitive( TQ_PrimitiveElement pe,
// Check if we are a normal toolbar or a hidden dockwidget.
if ( parent &&
- (parent->inherits(TQTOOLBAR_OBJECT_NAME_STRING) || // Normal toolbar
- (parent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) )) // Collapsed dock
+ (parent->inherits("TQToolBar") || // Normal toolbar
+ (parent->inherits("TQMainWindow")) )) // Collapsed dock
// Draw a toolbar handle
drawTDEStylePrimitive( KPE_ToolBarHandle, p, ceData, elementFlags, r, cg, flags, opt, widget );
- else if (ceData.widgetObjectTypes.contains(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING))
+ else if (ceData.widgetObjectTypes.contains("TQDockWindowHandle"))
// Draw a dock window handle
drawTDEStylePrimitive( KPE_DockWindowHandle, p, ceData, elementFlags, r, cg, flags, opt, widget );
@@ -686,7 +664,7 @@ void TDEStyle::drawPrimitive( TQ_PrimitiveElement pe,
-void TDEStyle::drawControl( TQ_ControlElement element,
+void TDEStyle::drawControl( ControlElement element,
TQPainter* p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -875,7 +853,7 @@ void TDEStyle::drawControl( TQ_ControlElement element,
// ------------------------------------------------------------------------
case CE_ProgressBarGroove: {
TQRect fr = subRect(SR_ProgressBarGroove, ceData, elementFlags, widget);
- drawPrimitive(PE_Panel, p, ceData, elementFlags, fr, cg, Style_Sunken, TQStyleOption::SO_Default);
+ drawPrimitive(PE_Panel, p, ceData, elementFlags, fr, cg, Style_Sunken, TQStyleOption::Default);
break;
}
@@ -1025,9 +1003,9 @@ int TDEStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData
// Check that we are not a normal toolbar or a hidden dockwidget,
// in which case we need to adjust the height for font size
if (widget
- && !(ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING))
- && !(ceData.parentWidgetData.widgetObjectTypes.contains(TQMAINWINDOW_OBJECT_NAME_STRING))
- && (ceData.widgetObjectTypes.contains(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING)) )
+ && !(ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar"))
+ && !(ceData.parentWidgetData.widgetObjectTypes.contains("TQMainWindow"))
+ && (ceData.widgetObjectTypes.contains("TQDockWindowHandle")) )
return widget->fontMetrics().lineSpacing();
else
return TQCommonStyle::pixelMetric(m, ceData, elementFlags, widget);
@@ -1086,7 +1064,7 @@ int TDEStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData
// SPLITTER
// ------------------------------------------------------------------------
case PM_SplitterWidth:
- if (ceData.widgetObjectTypes.contains(TQDOCKWINDOWRESIZEHANDLE_OBJECT_NAME_STRING))
+ if (ceData.widgetObjectTypes.contains("TQDockWindowResizeHandle"))
return 8; // ### why do we need 2pix extra?
else
return 6;
@@ -1131,7 +1109,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
return sibling;
}
-void TDEStyle::drawComplexControl( TQ_ComplexControl control,
+void TDEStyle::drawComplexControl( ComplexControl control,
TQPainter* p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1437,7 +1415,7 @@ void TDEStyle::drawComplexControl( TQ_ComplexControl control,
}
-TQStyle::SubControl TDEStyle::querySubControl( TQ_ComplexControl control,
+TQStyle::SubControl TDEStyle::querySubControl( ComplexControl control,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQPoint &pos,
@@ -1455,7 +1433,7 @@ TQStyle::SubControl TDEStyle::querySubControl( TQ_ComplexControl control,
}
-TQRect TDEStyle::querySubControlMetrics( TQ_ComplexControl control,
+TQRect TDEStyle::querySubControlMetrics( ComplexControl control,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl sc,
@@ -1875,7 +1853,7 @@ TQPixmap TDEStyle::stylePixmap( StylePixmap stylepixmap,
}
-int TDEStyle::styleHint( TQ_StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
+int TDEStyle::styleHint( StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
const TQStyleOption &opt, TQStyleHintReturn* shr, const TQWidget* w) const
{
switch (sh)
@@ -1936,7 +1914,7 @@ int TDEStyle::styleHint( TQ_StyleHint sh, const TQStyleControlElementData &ceDat
bool TDEStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
{
- if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
+ if (ceData.widgetObjectTypes.contains("TQObject")) {
TQObject* object = reinterpret_cast<TQObject*>(source);
if ( d->useFilledFrameWorkaround )
{
@@ -1949,17 +1927,17 @@ bool TDEStyle::objectEventHandler( const TQStyleControlElementData &ceData, Cont
// -- Karol.
TQFrame *frame = 0;
if ( event->type() == TQEvent::Paint
- && (frame = ::tqqt_cast<TQFrame*>(object)) )
+ && (frame = ::tqt_cast<TQFrame*>(object)) )
{
if (frame->frameShape() != TQFrame::ToolBarPanel && frame->frameShape() != TQFrame::MenuBarPanel)
return false;
bool horizontal = true;
TQPaintEvent* pe = (TQPaintEvent*)event;
- TQToolBar *toolbar = ::tqqt_cast< TQToolBar *>( frame );
+ TQToolBar *toolbar = ::tqt_cast< TQToolBar *>( frame );
TQRect r = pe->rect();
- if (toolbar && toolbar->orientation() == Qt::Vertical)
+ if (toolbar && toolbar->orientation() == TQt::Vertical)
horizontal = false;
if (horizontal) {
@@ -2163,7 +2141,7 @@ TQImage TransparencyHandler::handleRealAlpha(TQImage img) {
// Create a shadow of thickness 4.
void TransparencyHandler::createShadowWindows(const TQWidget* p)
{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
int x2 = p->x()+p->width();
int y2 = p->y()+p->height();
TQRect shadow1(x2, p->y() + 4, 4, p->height());
@@ -2222,7 +2200,7 @@ void TransparencyHandler::createShadowWindows(const TQWidget* p)
void TransparencyHandler::removeShadowWindows(const TQWidget* p)
{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
ShadowMap::iterator it = shadowMap().find(p);
if (it != shadowMap().end())
{
@@ -2241,7 +2219,7 @@ void TransparencyHandler::removeShadowWindows(const TQWidget* p)
bool TransparencyHandler::eventFilter( TQObject* object, TQEvent* event )
{
-#if !defined Q_WS_MAC && !defined Q_WS_WIN
+#if !defined TQ_WS_MAC && !defined TQ_WS_WIN
// Transparency idea was borrowed from KDE2's "MegaGradient" Style,
// Copyright (C) 2000 Daniel M. Duley <mosfet@kde.org>
@@ -2339,8 +2317,8 @@ void TransparencyHandler::blendToPixmap(const TQColorGroup &cg, const TQWidget*
return;
// Allow styles to define the blend pixmap - allows for some interesting effects.
- if (::tqqt_cast<TQPopupMenu*>(p))
- tdestyle->renderMenuBlendPixmap( blendPix, cg, ::tqqt_cast<TQPopupMenu*>(p) );
+ if (::tqt_cast<TQPopupMenu*>(p))
+ tdestyle->renderMenuBlendPixmap( blendPix, cg, ::tqt_cast<TQPopupMenu*>(p) );
else
blendPix.fill(cg.button()); // Just tint as the default behavior
@@ -2361,9 +2339,9 @@ void TransparencyHandler::XRenderBlendToPixmap(const TQWidget* p)
renderPix.resize( pix.width(), pix.height() );
// Allow styles to define the blend pixmap - allows for some interesting effects.
- if (::tqqt_cast<TQPopupMenu*>(p))
+ if (::tqt_cast<TQPopupMenu*>(p))
tdestyle->renderMenuBlendPixmap( renderPix, p->colorGroup(),
- ::tqqt_cast<TQPopupMenu*>(p) );
+ ::tqt_cast<TQPopupMenu*>(p) );
else
renderPix.fill(p->colorGroup().button()); // Just tint as the default behavior
@@ -2405,13 +2383,9 @@ void TDEStyle::virtual_hook( int, void* )
// HACK for gtk-qt-engine
-extern "C" KDE_EXPORT
+extern "C" TDE_EXPORT
void kde_tdestyle_set_scrollbar_type_windows( void* style )
{
((TDEStyle*)style)->setScrollBarType( TDEStyle::WindowsStyleScrollBar );
}
-
-// vim: set noet ts=4 sw=4:
-// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
-
#include "tdestyle.moc"