diff options
Diffstat (limited to 'khtml')
-rw-r--r-- | khtml/java/kjavaappletserver.cpp | 2 | ||||
-rw-r--r-- | khtml/khtml_factory.cpp | 4 | ||||
-rw-r--r-- | khtml/khtml_factory.h | 2 | ||||
-rw-r--r-- | khtml/khtml_part.cpp | 10 | ||||
-rw-r--r-- | khtml/khtml_part.h | 6 | ||||
-rw-r--r-- | khtml/khtmlimage.cpp | 8 | ||||
-rw-r--r-- | khtml/khtmlimage.h | 4 | ||||
-rw-r--r-- | khtml/khtmlview.cpp | 12 | ||||
-rw-r--r-- | khtml/kmultipart/kmultipart.cpp | 4 | ||||
-rw-r--r-- | khtml/kmultipart/kmultipart.h | 2 | ||||
-rw-r--r-- | khtml/rendering/bidi.cpp | 2 | ||||
-rw-r--r-- | khtml/rendering/render_canvas.h | 2 | ||||
-rw-r--r-- | khtml/rendering/render_object.cpp | 4 | ||||
-rw-r--r-- | khtml/rendering/render_object.h | 4 | ||||
-rw-r--r-- | khtml/rendering/render_replaced.cpp | 2 |
15 files changed, 34 insertions, 34 deletions
diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp index 0962a7916..e7c136f38 100644 --- a/khtml/java/kjavaappletserver.cpp +++ b/khtml/java/kjavaappletserver.cpp @@ -827,7 +827,7 @@ PermissionDialog::~PermissionDialog() void PermissionDialog::clicked() { m_button = TQT_TQOBJECT_CONST(sender())->name(); - static_cast<const TQWidget*>(sender())->tqparentWidget()->close(); + static_cast<const TQWidget*>(sender())->parentWidget()->close(); } #include "kjavaappletserver.moc" diff --git a/khtml/khtml_factory.cpp b/khtml/khtml_factory.cpp index 981f8e49e..bb80a1e83 100644 --- a/khtml/khtml_factory.cpp +++ b/khtml/khtml_factory.cpp @@ -103,13 +103,13 @@ KHTMLFactory::~KHTMLFactory() deref(); } -KParts::Part *KHTMLFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & ) +KParts::Part *KHTMLFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & ) { KHTMLPart::GUIProfile prof = KHTMLPart::DefaultGUI; if ( strcmp( className, "Browser/View" ) == 0 ) prof = KHTMLPart::BrowserViewGUI; - return new KHTMLPart( tqparentWidget, widgetName, parent, name, prof ); + return new KHTMLPart( parentWidget, widgetName, parent, name, prof ); } void KHTMLFactory::ref() diff --git a/khtml/khtml_factory.h b/khtml/khtml_factory.h index e5319bf83..e9d5c62a8 100644 --- a/khtml/khtml_factory.h +++ b/khtml/khtml_factory.h @@ -45,7 +45,7 @@ public: KHTMLFactory( bool clone = false ); virtual ~KHTMLFactory(); - virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ); + virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ); static void registerPart( KHTMLPart *part ); static void deregisterPart( KHTMLPart *part ); diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp index 64f0ea247..3363c02f6 100644 --- a/khtml/khtml_part.cpp +++ b/khtml/khtml_part.cpp @@ -203,7 +203,7 @@ KHTMLFrameList::Iterator KHTMLFrameList::find( const TQString &name ) return it; } -KHTMLPart::KHTMLPart( TQWidget *tqparentWidget, const char *widgetname, TQObject *parent, const char *name, GUIProfile prof ) +KHTMLPart::KHTMLPart( TQWidget *parentWidget, const char *widgetname, TQObject *parent, const char *name, GUIProfile prof ) : KParts::ReadOnlyPart( parent, name ) { d = 0; @@ -211,7 +211,7 @@ KHTMLPart::KHTMLPart( TQWidget *tqparentWidget, const char *widgetname, TQObject setInstance( KHTMLFactory::instance(), prof == BrowserViewGUI && !parentPart() ); // TODO KDE4 - don't load plugins yet //setInstance( KHTMLFactory::instance(), false ); - init( new KHTMLView( this, tqparentWidget, widgetname ), prof ); + init( new KHTMLView( this, parentWidget, widgetname ), prof ); } KHTMLPart::KHTMLPart( KHTMLView *view, TQObject *parent, const char *name, GUIProfile prof ) @@ -4643,7 +4643,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url } } -KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *tqparentWidget, const char *widgetName, +KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQString &mimetype, TQString &serviceName, TQStringList &serviceTypes, const TQStringList ¶ms ) @@ -4679,9 +4679,9 @@ KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *tqparentWidget, const cha className = "Browser/View"; if ( factory->inherits( "KParts::Factory" ) ) - res = static_cast<KParts::ReadOnlyPart *>(static_cast<KParts::Factory *>( factory )->createPart( tqparentWidget, widgetName, parent, name, className, params )); + res = static_cast<KParts::ReadOnlyPart *>(static_cast<KParts::Factory *>( factory )->createPart( parentWidget, widgetName, parent, name, className, params )); else - res = static_cast<KParts::ReadOnlyPart *>(factory->create( TQT_TQOBJECT(tqparentWidget), widgetName, className )); + res = static_cast<KParts::ReadOnlyPart *>(factory->create( TQT_TQOBJECT(parentWidget), widgetName, className )); if ( res ) { serviceTypes = service->serviceTypes(); diff --git a/khtml/khtml_part.h b/khtml/khtml_part.h index 95cd952b1..af8a1695d 100644 --- a/khtml/khtml_part.h +++ b/khtml/khtml_part.h @@ -243,10 +243,10 @@ public: * rendered in. You can specify two different parent objects for a * KHTMLPart, one parent for the KHTMLPart document and on parent * for the KHTMLView. If the second @p parent argument is 0L, then - * @p tqparentWidget is used as parent for both objects, the part and + * @p parentWidget is used as parent for both objects, the part and * the view. */ - KHTMLPart( TQWidget *tqparentWidget = 0, const char *widgetname = 0, + KHTMLPart( TQWidget *parentWidget = 0, const char *widgetname = 0, TQObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI ); KHTMLPart( KHTMLView *view, TQObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI ); @@ -1168,7 +1168,7 @@ protected: * to be a object of your derived type, in which case you should return a new instance for * the mimetype 'text/html' . */ - virtual KParts::ReadOnlyPart *createPart( TQWidget *tqparentWidget, const char *widgetName, + virtual KParts::ReadOnlyPart *createPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQString &mimetype, TQString &serviceName, TQStringList &serviceTypes, const TQStringList ¶ms); diff --git a/khtml/khtmlimage.cpp b/khtml/khtmlimage.cpp index 195602849..a8ee4d7ef 100644 --- a/khtml/khtmlimage.cpp +++ b/khtml/khtmlimage.cpp @@ -48,24 +48,24 @@ KHTMLImageFactory::~KHTMLImageFactory() delete s_instance; } -KParts::Part *KHTMLImageFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, +KParts::Part *KHTMLImageFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & ) { KHTMLPart::GUIProfile prof = KHTMLPart::DefaultGUI; if ( strcmp( className, "Browser/View" ) == 0 ) prof = KHTMLPart::BrowserViewGUI; - return new KHTMLImage( tqparentWidget, widgetName, parent, name, prof ); + return new KHTMLImage( parentWidget, widgetName, parent, name, prof ); } -KHTMLImage::KHTMLImage( TQWidget *tqparentWidget, const char *widgetName, +KHTMLImage::KHTMLImage( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, KHTMLPart::GUIProfile prof ) : KParts::ReadOnlyPart( parent, name ), m_image( 0 ) { KHTMLPart* parentPart = ::tqqt_cast<KHTMLPart *>( parent ); setInstance( KHTMLImageFactory::instance(), prof == KHTMLPart::BrowserViewGUI && !parentPart ); - TQVBox *box = new TQVBox( tqparentWidget, widgetName ); + TQVBox *box = new TQVBox( parentWidget, widgetName ); m_khtml = new KHTMLPart( box, widgetName, this, "htmlimagepart", prof ); m_khtml->setAutoloadImages( true ); diff --git a/khtml/khtmlimage.h b/khtml/khtmlimage.h index 735df4491..dda918177 100644 --- a/khtml/khtmlimage.h +++ b/khtml/khtmlimage.h @@ -44,7 +44,7 @@ public: KHTMLImageFactory(); virtual ~KHTMLImageFactory(); - virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName, + virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ); @@ -61,7 +61,7 @@ class KHTMLImage : public KParts::ReadOnlyPart, public khtml::CachedObjectClient { Q_OBJECT public: - KHTMLImage( TQWidget *tqparentWidget, const char *widgetName, + KHTMLImage( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, KHTMLPart::GUIProfile prof ); virtual ~KHTMLImage(); diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp index 6502ade52..2cbd99384 100644 --- a/khtml/khtmlview.cpp +++ b/khtml/khtmlview.cpp @@ -1179,7 +1179,7 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) if (d->clickCount > 0 && TQPoint(d->clickX-xm,d->clickY-ym).manhattanLength() > TQApplication::startDragDistance()) { - d->clickCount = 0; // moving the mouse outside the threshold tqinvalidates the click + d->clickCount = 0; // moving the mouse outside the threshold invalidates the click } // execute the scheduled script. This is to make sure the mouseover events come after the mouseout events @@ -1903,7 +1903,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) if (c->isWidgetType()) { TQWidget *w = TQT_TQWIDGET(c); // don't install the event filter on toplevels - if (w->tqparentWidget(true) == view) { + if (w->parentWidget(true) == view) { if (!strcmp(w->name(), "__khtml")) { w->installEventFilter(this); w->unsetCursor(); @@ -1931,7 +1931,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) TQWidget *c = v; while (v && v != view) { c = v; - v = v->tqparentWidget(true); + v = v->parentWidget(true); } if (v && !strcmp(c->name(), "__khtml")) { @@ -1948,7 +1948,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) while (v && v != view) { x += v->x(); y += v->y(); - v = v->tqparentWidget(); + v = v->parentWidget(); } viewportToContents( x, y, x, y ); TQPaintEvent *pe = TQT_TQPAINTEVENT(e); @@ -1969,7 +1969,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) case TQEvent::MouseButtonPress: case TQEvent::MouseButtonRelease: case TQEvent::MouseButtonDblClick: { - if ( (w->tqparentWidget() == view || ::tqqt_cast<TQScrollView*>(c)) && !::tqqt_cast<TQScrollBar *>(w)) { + if ( (w->parentWidget() == view || ::tqqt_cast<TQScrollView*>(c)) && !::tqqt_cast<TQScrollBar *>(w)) { TQMouseEvent *me = TQT_TQMOUSEEVENT(e); TQPoint pt = w->mapTo( view, me->pos()); TQMouseEvent me2(me->type(), pt, me->button(), me->state()); @@ -1988,7 +1988,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) } case TQEvent::KeyPress: case TQEvent::KeyRelease: - if (w->tqparentWidget() == view && !::tqqt_cast<TQScrollBar *>(w)) { + if (w->parentWidget() == view && !::tqqt_cast<TQScrollBar *>(w)) { TQKeyEvent *ke = TQT_TQKEYEVENT(e); if (e->type() == TQEvent::KeyPress) keyPressEvent(ke); diff --git a/khtml/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp index 187e051d1..8aeb2cdbd 100644 --- a/khtml/kmultipart/kmultipart.cpp +++ b/khtml/kmultipart/kmultipart.cpp @@ -93,7 +93,7 @@ Data for the second and last object. */ -KMultiPart::KMultiPart( TQWidget *tqparentWidget, const char *widgetName, +KMultiPart::KMultiPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& ) : KParts::ReadOnlyPart( parent, name ) { @@ -101,7 +101,7 @@ KMultiPart::KMultiPart( TQWidget *tqparentWidget, const char *widgetName, setInstance( KMultiPartFactory::instance() ); - TQVBox *box = new TQVBox( tqparentWidget, widgetName ); + TQVBox *box = new TQVBox( parentWidget, widgetName ); setWidget( box ); m_extension = new KParts::BrowserExtension( this ); diff --git a/khtml/kmultipart/kmultipart.h b/khtml/kmultipart/kmultipart.h index a17269d74..f3bf95219 100644 --- a/khtml/kmultipart/kmultipart.h +++ b/khtml/kmultipart/kmultipart.h @@ -40,7 +40,7 @@ class KMultiPart : public KParts::ReadOnlyPart { Q_OBJECT public: - KMultiPart( TQWidget *tqparentWidget, const char *widgetName, + KMultiPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& ); virtual ~KMultiPart(); diff --git a/khtml/rendering/bidi.cpp b/khtml/rendering/bidi.cpp index f2e64b5f8..30beadd7c 100644 --- a/khtml/rendering/bidi.cpp +++ b/khtml/rendering/bidi.cpp @@ -1329,7 +1329,7 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int breakBeforeLin m_overflowHeight = 0; - tqinvalidateVerticalPositions(); + invalidateVerticalPositions(); #ifdef DEBUG_LAYOUT TQTime qt; qt.start(); diff --git a/khtml/rendering/render_canvas.h b/khtml/rendering/render_canvas.h index f2822bc94..cd4ef30ca 100644 --- a/khtml/rendering/render_canvas.h +++ b/khtml/rendering/render_canvas.h @@ -137,7 +137,7 @@ protected: void updateDocumentSize(); // internal setters for cached values of document width/height - // Setting to -1/-1 tqinvalidates the cache. + // Setting to -1/-1 invalidates the cache. void setCachedDocWidth(int w ) { m_cachedDocWidth = w; } void setCachedDocHeight(int h) { m_cachedDocHeight = h; } diff --git a/khtml/rendering/render_object.cpp b/khtml/rendering/render_object.cpp index 89adbf548..8c4c8ab56 100644 --- a/khtml/rendering/render_object.cpp +++ b/khtml/rendering/render_object.cpp @@ -1923,12 +1923,12 @@ short RenderObject::baselinePosition( bool firstLine ) const return fm.ascent() + ( lineHeight( firstLine) - fm.height() ) / 2; } -void RenderObject::tqinvalidateVerticalPositions() +void RenderObject::invalidateVerticalPositions() { m_verticalPosition = PositionUndefined; RenderObject *child = firstChild(); while( child ) { - child->tqinvalidateVerticalPositions(); + child->invalidateVerticalPositions(); child = child->nextSibling(); } } diff --git a/khtml/rendering/render_object.h b/khtml/rendering/render_object.h index 49e9065e4..e403601d3 100644 --- a/khtml/rendering/render_object.h +++ b/khtml/rendering/render_object.h @@ -748,7 +748,7 @@ public: virtual int highestPosition(bool /*includeOverflowInterior*/=true, bool /*includeSelf*/=true) const { return 0; } // recursively tqinvalidate current layout - // unused: void tqinvalidateLayout(); + // unused: void invalidateLayout(); virtual void calcVerticalMargins() {} void removeFromObjectLists(); @@ -790,7 +790,7 @@ protected: virtual TQRect viewRect() const; void remove(); - void tqinvalidateVerticalPositions(); + void invalidateVerticalPositions(); bool attemptDirectLayerTranslation(); void updateWidgetMasks(); diff --git a/khtml/rendering/render_replaced.cpp b/khtml/rendering/render_replaced.cpp index 49c5097f6..80632cc81 100644 --- a/khtml/rendering/render_replaced.cpp +++ b/khtml/rendering/render_replaced.cpp @@ -667,7 +667,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) break; case TQEvent::Wheel: - if (widget()->tqparentWidget() == view()->viewport()) { + if (widget()->parentWidget() == view()->viewport()) { // don't allow the widget to react to wheel event unless its // currently focused. this avoids accidentally changing a select box // or something while wheeling a webpage. |