diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-24 11:57:45 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-19 19:43:00 +0200 |
| commit | 734f704ec053c56ee895a059d14315dcfe6572f0 (patch) | |
| tree | df2cf64d8ef9fae88390721be82791a32ee92d37 | |
| parent | 44b195a5922fe83a0769b971e8805cd2d3b5450e (diff) | |
| download | tdewebdev-734f704ec053c56ee895a059d14315dcfe6572f0.tar.gz tdewebdev-734f704ec053c56ee895a059d14315dcfe6572f0.zip | |
Rename a few stragglers
(cherry picked from commit 66c856af16022947d202b4d3ca7e25cf28ea0acc)
| -rw-r--r-- | lib/compatibility/kmdi/qextmdi/kdockwidget.cpp | 8 | ||||
| -rw-r--r-- | lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp index 3950d5bc..983bf1db 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp @@ -266,7 +266,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) layout->addWidget( closeButton ); layout->activate(); d->dummy->hide(); - drag->setFixedHeight( tqlayout->minimumSize().height() ); + drag->setFixedHeight( layout->minimumSize().height() ); } void KDockWidgetHeader::setTopLevel( bool isTopLevel ) @@ -344,11 +344,11 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd ) if (dontShowDummy) d->dummy->hide(); else d->dummy->show(); layout->addWidget( closeButton ); layout->activate(); - kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<tqlayout->minimumSize().height()<<endl; + kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<layout->minimumSize().height()<<endl; #ifdef __GNUC__ #warning FIXME #endif - drag->setFixedHeight( closeButton->height()); // /*tqlayout->minimumS*/sizeHint().height() ); + drag->setFixedHeight( closeButton->height()); // /*layout->minimumS*/sizeHint().height() ); } void KDockWidgetHeader::addButton(KDockButton_Private* btn) { @@ -381,7 +381,7 @@ void KDockWidgetHeader::addButton(KDockButton_Private* btn) { if (dontShowDummy) d->dummy->hide(); else d->dummy->show(); layout->addWidget( closeButton ); layout->activate(); - drag->setFixedHeight( tqlayout->minimumSize().height() ); + drag->setFixedHeight( layout->minimumSize().height() ); } void KDockWidgetHeader::removeButton(KDockButton_Private* btn) { diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp b/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp index c213f363..031c8c16 100644 --- a/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp @@ -651,8 +651,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) { if (isOn()) st|=TQStyle::Style_On; - tqstyle().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); - tqstyle().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); + style().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); + style().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); switch (m_position) { case KMultiTabBar::Left: @@ -668,7 +668,7 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) { paint->drawPixmap(0,0,pixmap); break; } -// tqstyle().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), +// style().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), // colorGroup(),TQStyle::Style_Enabled); |