Fix a number of runtime object identification problems which led to an even larger array of minor glitches

NOTE: kdevelop and kdewebdev still need to be fully repaired


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1222475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent 57fb87513f
commit db22462503

@ -1390,7 +1390,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
TQRect r = viewR; TQRect r = viewR;
r.setLeft( xPos ); r.setLeft( xPos );
r.setBottom( yPos<maxY?yPos:maxY ); r.setBottom( yPos<maxY?yPos:maxY );
if ( inherits( "TQMultiLineEdit" ) ) if ( inherits( TQMULTILINEEDIT_OBJECT_NAME_STRING ) )
paint.fillRect( r.intersect( updateR ), g.base() ); paint.fillRect( r.intersect( updateR ), g.base() );
else else
paint.eraseRect( r.intersect( updateR ) ); paint.eraseRect( r.intersect( updateR ) );
@ -1398,7 +1398,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
if ( yPos <= maxY ) { if ( yPos <= maxY ) {
TQRect r = viewR; TQRect r = viewR;
r.setTop( yPos ); r.setTop( yPos );
if ( inherits( "TQMultiLineEdit" ) ) if ( inherits( TQMULTILINEEDIT_OBJECT_NAME_STRING ) )
paint.fillRect( r.intersect( updateR ), g.base() ); paint.fillRect( r.intersect( updateR ), g.base() );
else else
paint.eraseRect( r.intersect( updateR ) ); paint.eraseRect( r.intersect( updateR ) );

@ -409,7 +409,7 @@ bool KActionSelector::eventFilter( TQObject *o, TQEvent *e )
} }
return true; return true;
} }
else if ( o->inherits( "TQListBox" ) ) else if ( o->inherits( TQLISTBOX_OBJECT_NAME_STRING ) )
{ {
switch ( ((TQKeyEvent*)e)->key() ) switch ( ((TQKeyEvent*)e)->key() )
{ {

@ -580,7 +580,7 @@ TQString TabView::whatsThis() const
void TabView::installFocusFilters() void TabView::installFocusFilters()
{ {
TQObjectList *l = queryList("TQWidget"); TQObjectList *l = queryList(TQWIDGET_OBJECT_NAME_STRING);
TQObjectListIt it( *l ); TQObjectListIt it( *l );
TQObject *obj; TQObject *obj;

@ -185,7 +185,7 @@ void KUIViewerPart::slotStyle(int)
TQApplication::setOverrideCursor( WaitCursor ); TQApplication::setOverrideCursor( WaitCursor );
m_widget->setStyle( style); m_widget->setStyle( style);
TQObjectList *l = m_widget->queryList( "TQWidget" ); TQObjectList *l = m_widget->queryList( TQWIDGET_OBJECT_NAME_STRING );
for ( TQObject *o = l->first(); o; o = l->next() ) for ( TQObject *o = l->first(); o; o = l->next() )
( static_cast<TQWidget *>(o) )->setStyle( style ); ( static_cast<TQWidget *>(o) )->setStyle( style );
delete l; delete l;

@ -945,21 +945,21 @@ void StyleCheckStyle::polish(TQWidget* widget)
// //
// Put in order of highest occurance to maximise hit rate // Put in order of highest occurance to maximise hit rate
if (widget->inherits("TQPushButton")) { if (widget->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) {
widget->installEventFilter(this); widget->installEventFilter(this);
} }
if (widget->inherits("TQLabel")) if (widget->inherits(TQLABEL_OBJECT_NAME_STRING))
{ {
widget->installEventFilter(this); widget->installEventFilter(this);
} }
if (widget->inherits("TQGroupBox")) if (widget->inherits(TQGROUPBOX_OBJECT_NAME_STRING))
{ {
widget->installEventFilter(this); widget->installEventFilter(this);
} }
if (widget->inherits("TQMainWindow") || widget->inherits("TQDialog" ) ) if (widget->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) || widget->inherits(TQDIALOG_OBJECT_NAME_STRING) )
{ {
watcher->addWatched(widget); watcher->addWatched(widget);
} }
@ -970,16 +970,16 @@ void StyleCheckStyle::polish(TQWidget* widget)
void StyleCheckStyle::unPolish(TQWidget* widget) void StyleCheckStyle::unPolish(TQWidget* widget)
{ {
if (widget->inherits("TQPushButton")) { if (widget->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) {
widget->removeEventFilter(this); widget->removeEventFilter(this);
} }
if (widget->inherits("TQLabel")) if (widget->inherits(TQLABEL_OBJECT_NAME_STRING))
{ {
widget->removeEventFilter(this); widget->removeEventFilter(this);
} }
if (widget->inherits("TQGroupBox")) if (widget->inherits(TQGROUPBOX_OBJECT_NAME_STRING))
{ {
widget->removeEventFilter(this); widget->removeEventFilter(this);
} }
@ -2332,7 +2332,7 @@ void StyleCheckStyle::drawComplexControl( ComplexControl control,
} }
else if (widget->parent()) else if (widget->parent())
{ {
if (widget->parent()->inherits("TQToolBar")) if (widget->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING))
{ {
TQToolBar* parent = (TQToolBar*)widget->parent(); TQToolBar* parent = (TQToolBar*)widget->parent();
TQRect pr = parent->rect(); TQRect pr = parent->rect();
@ -2611,7 +2611,7 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event )
} }
} }
if ( event->type() == TQEvent::Paint && object->inherits("TQLabel") ) if ( event->type() == TQEvent::Paint && object->inherits(TQLABEL_OBJECT_NAME_STRING) )
{ {
TQLabel* lb = static_cast<TQLabel*>(object); TQLabel* lb = static_cast<TQLabel*>(object);
if (lb->pixmap() || lb->picture() || lb->movie() || (lb->textFormat() == Qt::RichText) || if (lb->pixmap() || lb->picture() || lb->movie() || (lb->textFormat() == Qt::RichText) ||
@ -2675,7 +2675,7 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event )
return true; return true;
} }
if ( event->type() == TQEvent::Paint && object->inherits("TQGroupBox") ) if ( event->type() == TQEvent::Paint && object->inherits(TQGROUPBOX_OBJECT_NAME_STRING) )
{ {
TQPaintEvent * pevent = static_cast<TQPaintEvent*>(event); TQPaintEvent * pevent = static_cast<TQPaintEvent*>(event);
TQGroupBox* gb = static_cast<TQGroupBox*>(object); TQGroupBox* gb = static_cast<TQGroupBox*>(object);
@ -2689,7 +2689,7 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event )
// I suggested that it could eat me. GCC won. // I suggested that it could eat me. GCC won.
while ( (parent = parent->parent()) ) while ( (parent = parent->parent()) )
{ {
if (parent->inherits("TQGroupBox")) if (parent->inherits(TQGROUPBOX_OBJECT_NAME_STRING))
{ {
nestedGroupBox = true; nestedGroupBox = true;
break; break;

@ -142,7 +142,7 @@ UMLListView::UMLListView(TQWidget *parent, const char *name)
UMLListView::~UMLListView() {} UMLListView::~UMLListView() {}
bool UMLListView::eventFilter(TQObject *o, TQEvent *e) { bool UMLListView::eventFilter(TQObject *o, TQEvent *e) {
if (e->type() != TQEvent::MouseButtonPress || !o->isA("TQHeader")) if (e->type() != TQEvent::MouseButtonPress || !o->isA(TQHEADER_OBJECT_NAME_STRING))
return TQListView::eventFilter(o, e); return TQListView::eventFilter(o, e);
TQMouseEvent *me = static_cast<TQMouseEvent*>(e); TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
if (me->button() == Qt::RightButton) { if (me->button() == Qt::RightButton) {

Loading…
Cancel
Save