diff options
Diffstat (limited to 'kdgantt')
-rw-r--r-- | kdgantt/KDGanttMinimizeSplitter.cpp | 18 | ||||
-rw-r--r-- | kdgantt/KDGanttSemiSizingControl.cpp | 28 | ||||
-rw-r--r-- | kdgantt/KDGanttSemiSizingControl.h | 2 | ||||
-rw-r--r-- | kdgantt/KDGanttView.cpp | 2 | ||||
-rw-r--r-- | kdgantt/KDGanttViewSubwidgets.cpp | 8 | ||||
-rw-r--r-- | kdgantt/KDGanttViewSubwidgets.h | 2 |
6 files changed, 30 insertions, 30 deletions
diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp index fb9eda893..76d6e9885 100644 --- a/kdgantt/KDGanttMinimizeSplitter.cpp +++ b/kdgantt/KDGanttMinimizeSplitter.cpp @@ -241,7 +241,7 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * ) p.setBrush( colorGroup().background() ); p.setPen( colorGroup().foreground() ); p.drawRect( rect() ); - parentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(), + parentWidget()->style().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(), parentWidget()->colorGroup()); int sw = 8; // Hardcoded, given I didn't use styles anymore, I didn't like to use their size @@ -256,8 +256,8 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * ) for ( TQValueList<TQPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) { if ( index == _activeButton ) { p.save(); - p.translate( parentWidget()->tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal ), - parentWidget()->tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical ) ); + p.translate( parentWidget()->style().pixelMetric( TQStyle::PM_ButtonShiftHorizontal ), + parentWidget()->style().pixelMetric( TQStyle::PM_ButtonShiftVertical ) ); p.drawPolygon( *it, true ); p.restore(); } @@ -561,7 +561,7 @@ void KDGanttMinimizeSplitter::setRubberband( int p ) paint.setRasterOp( XorROP ); TQRect r = contentsRect(); const int rBord = 3; //Themable???? - int sw = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this); + int sw = style().pixelMetric(TQStyle::PM_SplitterWidth, this); if ( orient == Qt::Horizontal ) { if ( opaqueOldPos >= 0 ) paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(), @@ -601,7 +601,7 @@ bool KDGanttMinimizeSplitter::event( TQEvent *e ) void KDGanttMinimizeSplitter::drawSplitter( TQPainter *p, TQCOORD x, TQCOORD y, TQCOORD w, TQCOORD h ) { - tqstyle().tqdrawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), colorGroup(), + style().tqdrawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), colorGroup(), (orientation() == Qt::Horizontal ? TQStyle::Style_Horizontal : 0)); } @@ -632,7 +632,7 @@ int KDGanttMinimizeSplitter::idAfter( TQWidget* w ) const close as possible to position \a p, which is the distance from the left (or top) edge of the widget. - For Arabic and Hebrew the tqlayout is reversed, and using this + For Arabic and Hebrew the layout is reversed, and using this function to set the position of the splitter might lead to unexpected results, since in Arabic and Hebrew the position of splitter one is to the left of the position of splitter zero. @@ -837,7 +837,7 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max ) } TQRect r = contentsRect(); if ( orient == Qt::Horizontal && TQApplication::reverseLayout() ) { - int splitterWidth = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this); + int splitterWidth = style().pixelMetric(TQStyle::PM_SplitterWidth, this); if ( min ) *min = pick(r.topRight()) - TQMIN( maxB, pick(r.size())-minA ) - splitterWidth; if ( max ) @@ -1229,7 +1229,7 @@ bool KDGanttMinimizeSplitter::isHidden( TQWidget *w ) const splitter. Giving the values to another splitter's setSizes() function will - produce a splitter with the same tqlayout as this one. + produce a splitter with the same layout as this one. Note that if you want to iterate over the list, you should iterate over a copy, e.g. @@ -1309,7 +1309,7 @@ void KDGanttMinimizeSplitter::processChildEvents() void KDGanttMinimizeSplitter::styleChange( TQStyle& old ) { - int sw = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this); + int sw = style().pixelMetric(TQStyle::PM_SplitterWidth, this); TQSplitterLayoutStruct *s = data->list.first(); while ( s ) { if ( s->isSplitter ) diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp index 199fb2c72..dcc2f40d2 100644 --- a/kdgantt/KDGanttSemiSizingControl.cpp +++ b/kdgantt/KDGanttSemiSizingControl.cpp @@ -249,7 +249,7 @@ void KDGanttSemiSizingControl::init() _but = new TQPushButton( this ); _but->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); connect( _but, TQT_SIGNAL( clicked() ), this, TQT_SLOT(changeState()) ); - _tqlayout = 0; + _layout = 0; TQWhatsThis::add( _but, "Click on this button to show the \nlegend at the bottom of the widget"); TQToolTip::add( _but, "Show / hide legend"); @@ -258,19 +258,19 @@ void KDGanttSemiSizingControl::init() void KDGanttSemiSizingControl::setup() { - //-------------------------------------------------- Setup tqlayout - delete _tqlayout; - TQBoxLayout* butLayout; // _tqlayout will delete me + //-------------------------------------------------- Setup layout + delete _layout; + TQBoxLayout* butLayout; // _layout will delete me if ( _orient == Qt::Horizontal || isMinimized() ) - _tqlayout = new TQHBoxLayout( this ); + _layout = new TQHBoxLayout( this ); else - _tqlayout = new TQVBoxLayout( this ); + _layout = new TQVBoxLayout( this ); if ( _orient == Qt::Vertical && !isMinimized() ) - butLayout = new TQHBoxLayout( _tqlayout ); + butLayout = new TQHBoxLayout( _layout ); else - butLayout = new TQVBoxLayout( _tqlayout ); + butLayout = new TQVBoxLayout( _layout ); @@ -306,9 +306,9 @@ void KDGanttSemiSizingControl::setup() widget = _maximizedWidget; if( widget ) { if ( _arrowPos == Before || _orient == Qt::Vertical && !isMinimized() ) - _tqlayout->addWidget( widget, 1 ); + _layout->addWidget( widget, 1 ); else - _tqlayout->insertWidget( 0, widget, 1 ); + _layout->insertWidget( 0, widget, 1 ); } ************************************************** */ // hack for the usage in KDGantt as pop-up legend widget @@ -319,16 +319,16 @@ void KDGanttSemiSizingControl::setup() widget = _minimizedWidget; if( widget ) { if ( _arrowPos == Before || _orient == Qt::Vertical && !isMinimized() ) - _tqlayout->addWidget( widget, 1 ); + _layout->addWidget( widget, 1 ); else - _tqlayout->insertWidget( 0, widget, 1 ); + _layout->insertWidget( 0, widget, 1 ); } } else { if ( _arrowPos == Before || _orient == Qt::Vertical && !isMinimized() ) - _tqlayout->addStretch( 1 ); + _layout->addStretch( 1 ); else - _tqlayout->insertStretch( 0, 1 ); + _layout->insertStretch( 0, 1 ); widget = _maximizedWidget; // the following is only the special case // arrowPos == Before and _orient == Qt::Vertical diff --git a/kdgantt/KDGanttSemiSizingControl.h b/kdgantt/KDGanttSemiSizingControl.h index c1cc0b597..34b11a234 100644 --- a/kdgantt/KDGanttSemiSizingControl.h +++ b/kdgantt/KDGanttSemiSizingControl.h @@ -83,7 +83,7 @@ private: ArrowPosition _arrowPos; TQWidget* _minimizedWidget; TQWidget* _maximizedWidget; - TQBoxLayout* _tqlayout; + TQBoxLayout* _layout; TQPushButton* _but; }; diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp index 9598f8673..bb797cc7d 100644 --- a/kdgantt/KDGanttView.cpp +++ b/kdgantt/KDGanttView.cpp @@ -4239,7 +4239,7 @@ TQColor KDGanttView::legendHeaderBackgroundColor () const may add as many widgets as you want. They are ordered horizontally from left to right. To remove a widget from the spacer widget, call widget->reparent(newParent,...) or delete the widget. Since the spacer - is a TQHBox, the tqlayout of the added widgets is managed by this + is a TQHBox, the layout of the added widgets is managed by this TQHBox. \param w A pointer to the widget to be added. diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index 77bc4db73..859a4b59e 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -1487,7 +1487,7 @@ void KDTimeHeaderWidget::computeIntervals( int height ) { IntervalColorList::const_iterator it; for ( it = icList.begin(); it != icList.end(); ++it ) { - (*it)->tqlayout( this, height ); + (*it)->layout( this, height ); } } @@ -2652,7 +2652,7 @@ void KDLegendWidget::clearLegend ( ) myLegend->setFont( font() ); scroll->addChild( myLegend ); scroll->setResizePolicy( TQScrollView::AutoOneFit ); - myLegend->tqlayout()->setMargin( 11 ); + myLegend->layout()->setMargin( 11 ); myLegend->setFrameStyle( TQFrame::NoFrame ); if ( dock ) scroll->setMaximumHeight( 32000 ); @@ -2884,7 +2884,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch) c = fc; // draw to last interesting column - const TQColorGroup &cg = ( tqpalette().inactive() ); + const TQColorGroup &cg = ( palette().inactive() ); while ( c < lc && !drawables.isEmpty() ) { int i = header()->mapToLogical( c ); @@ -4018,7 +4018,7 @@ void KDIntervalColorRectangle::setColor( const TQColor& color ) /*! \internal */ -void KDIntervalColorRectangle::tqlayout( KDTimeHeaderWidget* timeHeader, int height ) +void KDIntervalColorRectangle::layout( KDTimeHeaderWidget* timeHeader, int height ) { int left = timeHeader->getCoordX(mStart); int right = timeHeader->getCoordX(mEnd); diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h index a21808504..30ed39d4d 100644 --- a/kdgantt/KDGanttViewSubwidgets.h +++ b/kdgantt/KDGanttViewSubwidgets.h @@ -471,7 +471,7 @@ public: enum HitTest { Start, Middle, End }; HitTest hitTest( KDTimeHeaderWidget* timeHeader, const TQPoint& pos ) const; - void tqlayout( KDTimeHeaderWidget* timeHeader, int height ); + void layout( KDTimeHeaderWidget* timeHeader, int height ); static const int RTTI = 0x0c58; /*reimp*/ int rtti() const { return RTTI; } |