From 840aac8d62b0a05ac697eaef5c60460942f2f9ca Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 8 Nov 2011 00:16:02 -0600 Subject: Fix accidental conversion of dockwin --- kdgantt/KDGanttView.cpp | 2 +- kdgantt/KDGanttViewSubwidgets.cpp | 8 ++++---- kdgantt/KDGanttViewSubwidgets.h | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'kdgantt') diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp index 0af98043..5a1618a3 100644 --- a/kdgantt/KDGanttView.cpp +++ b/kdgantt/KDGanttView.cpp @@ -646,7 +646,7 @@ void KDGanttView::slotHeaderSizeChanged() */ TQDockWindow* KDGanttView::legendDoctwindow() const { - return myLegend->doctwindow(); + return myLegend->dockwindow(); } diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index 9f76bea6..bd83feb1 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -2553,11 +2553,11 @@ KDLegendWidget:: KDLegendWidget( TQWidget* parent, clearLegend(); showMe ( false ); } -void KDLegendWidget::setAsDoctwindow( bool doctwin ) +void KDLegendWidget::setAsDoctwindow( bool dockwin ) { - if ( (dock == 0 && !doctwin) || ( dock && doctwin ) ) + if ( (dock == 0 && !dockwin) || ( dock && dockwin ) ) return; - if ( doctwin ) + if ( dockwin ) { setMaximizedWidget( 0 ); showMe ( false ); @@ -2602,7 +2602,7 @@ bool KDLegendWidget::asDoctwindow( ) } -TQDockWindow* KDLegendWidget::doctwindow( ) +TQDockWindow* KDLegendWidget::dockwindow( ) { return dock; } diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h index cbccbb10..7b553222 100644 --- a/kdgantt/KDGanttViewSubwidgets.h +++ b/kdgantt/KDGanttViewSubwidgets.h @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include "KDGanttView.h" @@ -341,9 +341,9 @@ public: void clearLegend(); void setFont( TQFont ); void drawToPainter( TQPainter *p ); - void setAsDoctwindow( bool doctwin ); + void setAsDoctwindow( bool dockwin ); bool asDoctwindow(); - TQDockWindow* doctwindow(); + TQDockWindow* dockwindow(); TQSize legendSize(); TQSize legendSizeHint(); private: -- cgit v1.2.3