From 07b6965cbac26077a27faf4071487d9a25fb3aa0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 17 Jul 2011 19:19:26 -0500 Subject: Revert "Rename tqsize* to size*" This reverts commit e33879600503bacc0b4ef090f7f79ab80bb6b0da. --- experimental/tqtinterface/qt4/src/widgets/tqdockwindow.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'experimental/tqtinterface/qt4/src/widgets/tqdockwindow.cpp') diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.cpp b/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.cpp index 6809828d6..e6e6f558f 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqdockwindow.cpp @@ -80,7 +80,7 @@ public: void setOrientation( Orientation o ); Orientation orientation() const { return orient; } - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected: void paintEvent( TQPaintEvent * ); @@ -109,10 +109,10 @@ TQDockWindowResizeHandle::TQDockWindowResizeHandle( Orientation o, TQWidget *tqp setOrientation( o ); } -TQSize TQDockWindowResizeHandle::sizeHint() const +TQSize TQDockWindowResizeHandle::tqsizeHint() const { int sw = 2 * tqstyle().tqpixelMetric(TQStyle::PM_SplitterWidth, this) / 3; - return (tqstyle().sizeFromContents(TQStyle::CT_DockWindow, this, TQSize(sw, sw)). + return (tqstyle().tqsizeFromContents(TQStyle::CT_DockWindow, this, TQSize(sw, sw)). expandedTo(TQApplication::globalStrut())); } @@ -320,7 +320,7 @@ public: TQSize tqminimumSizeHint() const; TQSize tqminimumSize() const { return tqminimumSizeHint(); } - TQSize sizeHint() const { return tqminimumSize(); } + TQSize tqsizeHint() const { return tqminimumSize(); } TQSizePolicy sizePolicy() const; void setOpaqueMoving( bool b ) { opaque = b; } @@ -1148,7 +1148,7 @@ void TQDockWindow::swapRect( TQRect &r, Orientation o, const TQPoint &offset, TQ TQBoxLayout *bl = boxLayout()->createTmpCopy(); bl->setDirection( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ); bl->activate(); - r.setSize( bl->sizeHint() ); + r.setSize( bl->tqsizeHint() ); bl->data = 0; delete bl; bool reverse = TQApplication::reverseLayout(); @@ -1808,9 +1808,9 @@ TQBoxLayout *TQDockWindow::boxLayout() /*! \reimp */ -TQSize TQDockWindow::sizeHint() const +TQSize TQDockWindow::tqsizeHint() const { - TQSize sh( TQFrame::sizeHint() ); + TQSize sh( TQFrame::tqsizeHint() ); if ( place() == InDock ) sh = sh.expandedTo( fixedExtent() ); sh = sh.expandedTo( TQSize( 16, 16 ) ); -- cgit v1.2.1