summaryrefslogtreecommitdiffstats
path: root/kstyles
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-14 01:31:16 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-14 01:31:16 +0000
commit7d7b2c04e147670ed65c5be42de7b7b131122856 (patch)
tree22b58114e71ac6a0e30730eccce10aa4d21e807a /kstyles
parenta46e33728580cacf68994d5b5d3780a5bcb58e8b (diff)
downloadtdelibs-7d7b2c04e147670ed65c5be42de7b7b131122856.tar.gz
tdelibs-7d7b2c04e147670ed65c5be42de7b7b131122856.zip
Fix kdelibs FTBFS under Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1246982 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kstyles')
-rw-r--r--kstyles/asteroid/asteroid.cpp2
-rw-r--r--kstyles/highcolor/highcolor.cpp2
-rw-r--r--kstyles/keramik/keramik.cpp12
3 files changed, 8 insertions, 8 deletions
diff --git a/kstyles/asteroid/asteroid.cpp b/kstyles/asteroid/asteroid.cpp
index 578d8f9e2..cef3b00f8 100644
--- a/kstyles/asteroid/asteroid.cpp
+++ b/kstyles/asteroid/asteroid.cpp
@@ -111,7 +111,7 @@ void AsteroidStyle::polish(TQWidget *w)
wp.setColor(TQColorGroup::Mid, wp.active().color(TQColorGroup::Button).dark(150)); // Which GUI element(s) does this correspond to?
bool isProtectedObject = false;
- TQObject *curparent = w;
+ TQObject *curparent = TQT_TQOBJECT(w);
while (curparent) {
if (curparent->inherits("KonqFileTip") || curparent->inherits("AppletItem")) {
isProtectedObject = true;
diff --git a/kstyles/highcolor/highcolor.cpp b/kstyles/highcolor/highcolor.cpp
index 602a138ca..c89862fa7 100644
--- a/kstyles/highcolor/highcolor.cpp
+++ b/kstyles/highcolor/highcolor.cpp
@@ -1979,7 +1979,7 @@ bool HighColorStyle::eventFilter( TQObject *object, TQEvent *event )
{
x_offset += parent->x();
y_offset += parent->y();
- parent = static_cast<TQWidget*>(parent->parent());
+ parent = TQT_TQWIDGET(parent->parent());
}
TQRect r = widget->rect();
diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp
index 49e024442..f7634de12 100644
--- a/kstyles/keramik/keramik.cpp
+++ b/kstyles/keramik/keramik.cpp
@@ -1232,9 +1232,9 @@ void KeramikStyle::drawKStylePrimitive( KStylePrimitive kpe,
TQToolBar* parent = 0;
if (widget && widget->parent() && widget->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING))
- parent = static_cast<TQToolBar*>(widget->parent());
+ parent = static_cast<TQToolBar*>(TQT_TQWIDGET(widget->parent()));
- renderToolbarEntryBackground(p, parent, r, cg, (flags & Style_Horizontal));
+ renderToolbarEntryBackground(p, parent, r, cg, (flags & Style_Horizontal));
if (flags & Style_Horizontal) {
p->setPen(cg.light());
p->drawLine(x+1, y+4, x+1, y2-4);
@@ -2238,7 +2238,7 @@ void KeramikStyle::tqdrawComplexControl( TQ_ComplexControl control,
bflags |= Style_MouseOver;
- if (onToolbar && static_cast<TQToolBar*>(widget->parent())->orientation() == Qt::Horizontal)
+ if (onToolbar && static_cast<TQToolBar*>(TQT_TQWIDGET(widget->parent()))->orientation() == Qt::Horizontal)
bflags |= Style_Horizontal;
if (controls & SC_ToolButton)
@@ -2270,8 +2270,8 @@ void KeramikStyle::tqdrawComplexControl( TQ_ComplexControl control,
{
// This assumes floating toolbars can't have extenders,
//(so if we're on an extender, we're not floating)
- TQWidget* parent = static_cast<TQWidget*> (widget->parent());
- TQToolBar* toolbar = static_cast<TQToolBar*>(parent->parent());
+ TQWidget* parent = static_cast<TQWidget*> (TQT_TQWIDGET(widget->parent()));
+ TQToolBar* toolbar = static_cast<TQToolBar*>(TQT_TQWIDGET(parent->parent()));
TQRect tr = toolbar->rect();
bool horiz = toolbar->orientation() == Qt::Horizontal;
@@ -2893,7 +2893,7 @@ bool KeramikStyle::eventFilter( TQObject* object, TQEvent* event )
{
// We need to override the paint event to draw a
// gradient on a QToolBarExtensionWidget.
- TQToolBar* toolbar = static_cast<TQToolBar*>(object->parent());
+ TQToolBar* toolbar = static_cast<TQToolBar*>(TQT_TQWIDGET(object->parent()));
TQWidget* widget = TQT_TQWIDGET(object);
TQRect wr = widget->rect (), tr = toolbar->rect();
TQPainter p( widget );