diff options
Diffstat (limited to 'lib/compatibility/kmdi')
-rw-r--r-- | lib/compatibility/kmdi/qextmdi/kdemacros.h.in | 2 | ||||
-rw-r--r-- | lib/compatibility/kmdi/qextmdi/kdockwidget.cpp | 102 | ||||
-rw-r--r-- | lib/compatibility/kmdi/qextmdi/kdockwidget.h | 18 | ||||
-rw-r--r-- | lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp | 2 | ||||
-rw-r--r-- | lib/compatibility/kmdi/qextmdi/kmdichildarea.h | 12 | ||||
-rw-r--r-- | lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp | 36 | ||||
-rw-r--r-- | lib/compatibility/kmdi/qextmdi/kmdichildview.h | 2 | ||||
-rw-r--r-- | lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp | 6 | ||||
-rw-r--r-- | lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp | 4 | ||||
-rw-r--r-- | lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp | 4 | ||||
-rw-r--r-- | lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp | 4 | ||||
-rw-r--r-- | lib/compatibility/kmdi/qextmdi/ktabbar.cpp | 12 | ||||
-rw-r--r-- | lib/compatibility/kmdi/qextmdi/ktabwidget.cpp | 6 |
13 files changed, 105 insertions, 105 deletions
diff --git a/lib/compatibility/kmdi/qextmdi/kdemacros.h.in b/lib/compatibility/kmdi/qextmdi/kdemacros.h.in index 9308c18d..bfae0947 100644 --- a/lib/compatibility/kmdi/qextmdi/kdemacros.h.in +++ b/lib/compatibility/kmdi/qextmdi/kdemacros.h.in @@ -172,7 +172,7 @@ * * \note The added functions must be added to the header at the same location * as the macro; changing the order of virtual functions in a header is also - * binary incompatible as it breaks the tqlayout of the vtable. + * binary incompatible as it breaks the layout of the vtable. */ #define RESERVE_VIRTUAL_1 \ diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp index 323e7a06..78b1b6dd 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp @@ -203,7 +203,7 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* ) paint.begin( this ); - tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup()); + style().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup()); paint.end(); } @@ -221,14 +221,14 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) #endif d = new KDockWidgetHeaderPrivate( TQT_TQOBJECT(this) ); - tqlayout = new TQHBoxLayout( this ); - tqlayout->setResizeMode( TQLayout::Minimum ); + layout = new TQHBoxLayout( this ); + layout->setResizeMode( TQLayout::Minimum ); drag = new KDockWidgetHeaderDrag( this, parent ); closeButton = new KDockButton_Private( this, "DockCloseButton" ); TQToolTip::add( closeButton, i18n("Close") ); - closeButton->setPixmap( tqstyle().stylePixmap (TQStyle::SP_TitleBarCloseButton , this)); + closeButton->setPixmap( style().stylePixmap (TQStyle::SP_TitleBarCloseButton , this)); closeButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerCloseButtonClicked())); connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock())); @@ -258,13 +258,13 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) d->dummy->setFixedSize( 1,closeButton->pixmap()->height() ); - tqlayout->addWidget( drag ); - tqlayout->addWidget( dockbackButton ); - tqlayout->addWidget( d->toDesktopButton ); - tqlayout->addWidget( d->dummy); - tqlayout->addWidget( stayButton ); - tqlayout->addWidget( closeButton ); - tqlayout->activate(); + layout->addWidget( drag ); + layout->addWidget( dockbackButton ); + layout->addWidget( d->toDesktopButton ); + layout->addWidget( d->dummy); + layout->addWidget( stayButton ); + layout->addWidget( closeButton ); + layout->activate(); d->dummy->hide(); drag->setFixedHeight( tqlayout->minimumSize().height() ); } @@ -291,7 +291,7 @@ void KDockWidgetHeader::setTopLevel( bool isTopLevel ) if( d->showToDesktopButton ) d->toDesktopButton->show(); } - tqlayout->activate(); + layout->activate(); bool dontShowDummy=drag->isVisibleTo(this) || dockbackButton->isVisibleTo(this) || d->toDesktopButton->isVisibleTo(this) || stayButton->isVisibleTo(this) || @@ -318,9 +318,9 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd ) { if ( !nd ) return; - delete tqlayout; - tqlayout = new TQHBoxLayout( this ); - tqlayout->setResizeMode( TQLayout::Minimum ); + delete layout; + layout = new TQHBoxLayout( this ); + layout->setResizeMode( TQLayout::Minimum ); delete drag; drag = nd; @@ -329,21 +329,21 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd ) } - tqlayout->addWidget( drag ); - tqlayout->addWidget( dockbackButton ); - tqlayout->addWidget( d->dummy ); - tqlayout->addWidget( d->toDesktopButton ); - tqlayout->addWidget( stayButton ); + layout->addWidget( drag ); + layout->addWidget( dockbackButton ); + layout->addWidget( d->dummy ); + layout->addWidget( d->toDesktopButton ); + layout->addWidget( stayButton ); bool dontShowDummy=drag->isVisibleTo(this) || dockbackButton->isVisibleTo(this) || d->toDesktopButton->isVisibleTo(this) || stayButton->isVisibleTo(this) || closeButton->isVisibleTo(this); for (TQPtrListIterator<KDockButton_Private> it( d->btns );it.current();++it) { - tqlayout->addWidget(it.current()); + layout->addWidget(it.current()); dontShowDummy=dontShowDummy || (it.current()->isVisibleTo(this)); } if (dontShowDummy) d->dummy->hide(); else d->dummy->show(); - tqlayout->addWidget( closeButton ); - tqlayout->activate(); + layout->addWidget( closeButton ); + layout->activate(); kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<tqlayout->minimumSize().height()<<endl; #ifdef __GNUC__ #warning FIXME @@ -362,25 +362,25 @@ void KDockWidgetHeader::addButton(KDockButton_Private* btn) { btn->show(); - delete tqlayout; - tqlayout = new TQHBoxLayout( this ); - tqlayout->setResizeMode( TQLayout::Minimum ); + delete layout; + layout = new TQHBoxLayout( this ); + layout->setResizeMode( TQLayout::Minimum ); - tqlayout->addWidget( drag ); - tqlayout->addWidget( dockbackButton ); - tqlayout->addWidget( d->toDesktopButton ); - tqlayout->addWidget( d->dummy); - tqlayout->addWidget( stayButton ); + layout->addWidget( drag ); + layout->addWidget( dockbackButton ); + layout->addWidget( d->toDesktopButton ); + layout->addWidget( d->dummy); + layout->addWidget( stayButton ); bool dontShowDummy=drag->isVisibleTo(this) || dockbackButton->isVisibleTo(this) || d->toDesktopButton->isVisibleTo(this) || stayButton->isVisibleTo(this) || closeButton->isVisibleTo(this); for (TQPtrListIterator<KDockButton_Private> it( d->btns );it.current();++it) { - tqlayout->addWidget(it.current()); + layout->addWidget(it.current()); dontShowDummy=dontShowDummy || (it.current()->isVisibleTo(this)); } if (dontShowDummy) d->dummy->hide(); else d->dummy->show(); - tqlayout->addWidget( closeButton ); - tqlayout->activate(); + layout->addWidget( closeButton ); + layout->activate(); drag->setFixedHeight( tqlayout->minimumSize().height() ); } @@ -497,8 +497,8 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP d->_parent = parent; - tqlayout = new TQVBoxLayout( this ); - tqlayout->setResizeMode( TQLayout::Minimum ); + layout = new TQVBoxLayout( this ); + layout->setResizeMode( TQLayout::Minimum ); manager = dockManager; manager->childDock->append( TQT_TQOBJECT(this) ); @@ -577,7 +577,7 @@ void KDockWidget::paintEvent(TQPaintEvent* pe) TQWidget::paintEvent(pe); TQPainter paint; paint.begin( this ); - tqstyle().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup()); + style().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup()); paint.end(); } @@ -604,7 +604,7 @@ void KDockWidget::mousePressEvent(TQMouseEvent* mme) int styleheight; TQPoint mp; mp=mme->pos(); - styleheight=2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth,this); + styleheight=2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this); bbottom=mp.y()>=height()-styleheight; btop=mp.y()<=styleheight; bleft=mp.x()<=styleheight; @@ -692,7 +692,7 @@ void KDockWidget::mouseMoveEvent(TQMouseEvent* mme) int styleheight; TQPoint mp; mp=mme->pos(); - styleheight=2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth,this); + styleheight=2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this); bbottom=mp.y()>=height()-styleheight; btop=mp.y()<=styleheight; bleft=mp.x()<=styleheight; @@ -748,15 +748,15 @@ void KDockWidget::setHeader( KDockWidgetAbstractHeader* h ) if ( header ){ delete header; - delete tqlayout; + delete layout; header = h; - tqlayout = new TQVBoxLayout( this ); - tqlayout->setResizeMode( TQLayout::Minimum ); - tqlayout->addWidget( header ); + layout = new TQVBoxLayout( this ); + layout->setResizeMode( TQLayout::Minimum ); + layout->addWidget( header ); setWidget( widget ); } else { header = h; - tqlayout->addWidget( header ); + layout->addWidget( header ); } kdDebug(282)<<caption()<<": KDockWidget::setHeader"<<endl; setEnableDocking(eDocking); @@ -774,7 +774,7 @@ void KDockWidget::updateHeader() { if ( parent() ){ #ifdef BORDERLESS_WINDOWS - tqlayout->setMargin(0); + layout->setMargin(0); setMouseTracking(false); setCursor(TQCursor(ArrowCursor)); #endif @@ -792,7 +792,7 @@ void KDockWidget::updateHeader() header->setTopLevel( true ); header->show(); #ifdef BORDERLESS_WINDOWS - tqlayout->setMargin(2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth,this)); + layout->setMargin(2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this)); setMouseTracking(true); #endif } @@ -1438,10 +1438,10 @@ void KDockWidget::setWidget( TQWidget* mw ) if (!mw->ownCursor()) mw->setCursor(TQCursor(ArrowCursor)); #endif widget = mw; - delete tqlayout; + delete layout; - tqlayout = new TQVBoxLayout( this ); - tqlayout->setResizeMode( TQLayout::Minimum ); + layout = new TQVBoxLayout( this ); + layout->setResizeMode( TQLayout::Minimum ); KDockContainer* dc = dynamic_cast<KDockContainer*>(widget); if (dc) @@ -1456,8 +1456,8 @@ void KDockWidget::setWidget( TQWidget* mw ) { header->show(); - tqlayout->addWidget( header ); - tqlayout->addWidget( widget,1 ); + layout->addWidget( header ); + layout->addWidget( widget,1 ); } updateHeader(); emit widgetSet(mw); diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.h b/lib/compatibility/kmdi/qextmdi/kdockwidget.h index 3f522f39..c435dbfc 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.h +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.h @@ -328,9 +328,9 @@ protected slots: protected: /** - * A tqlayout manager for placing the embedded buttons (close and stay) + * A layout manager for placing the embedded buttons (close and stay) */ - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; /** * a little button for closing (undocking and hiding) the dockwidget @@ -856,9 +856,9 @@ private: TQWidget* widget; /** - * the tqlayout manager that takes care about proper resizing and moving the embedded widget and the header + * the layout manager that takes care about proper resizing and moving the embedded widget and the header */ - TQVBoxLayout* tqlayout; + TQVBoxLayout* layout; /** * the responsible dockmanager @@ -963,7 +963,7 @@ public: * (TQObject::name) in the childDock variable of * KDockManager. This list in turn contains all * KDockWidgets (according to the KDockWidget constructor). - * So in principle, in order to restore a window tqlayout, + * So in principle, in order to restore a window layout, * one must first construct all widgets, put each of them in a * KDockWidget and then call readConfig(). And for all that * to work, each widget must have a unique name. @@ -978,11 +978,11 @@ public: void setMainDockWidget2(KDockWidget *); /** - * Saves the current dock window tqlayout into a DOM tree below the given element. + * Saves the current dock window layout into a DOM tree below the given element. */ void writeConfig(TQDomElement &base); /** - * Reads the current dock window tqlayout from a DOM tree below the given element. + * Reads the current dock window layout from a DOM tree below the given element. */ void readConfig(TQDomElement &base); @@ -1371,11 +1371,11 @@ public: const TQString& strCaption = TQString(), const TQString& strTabPageLabel = TQString::fromLatin1( " " ) ); /** - * Saves the current dock window tqlayout into a DOM tree below the given element. + * Saves the current dock window layout into a DOM tree below the given element. */ void writeDockConfig(TQDomElement &base); /** - * Reads the current dock window tqlayout from a DOM tree below the given element. + * Reads the current dock window layout from a DOM tree below the given element. */ void readDockConfig(TQDomElement &base); diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp index 19bd28fb..3d87eace 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp @@ -611,7 +611,7 @@ void KMdiChildArea::tileAnodine() return ; int numCols = int( sqrt( ( double ) numVisible ) ); // set columns to square root of visible count - // create an array to form grid tqlayout + // create an array to form grid layout int *numRows = new int[ numCols ]; int numCurCol = 0; diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.h b/lib/compatibility/kmdi/qextmdi/kmdichildarea.h index 546843a5..d9d0184e 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.h +++ b/lib/compatibility/kmdi/qextmdi/kmdichildarea.h @@ -157,31 +157,31 @@ public: /** * Sets the MDI childframe window caption font - * A retqlayout does not occur when using this function + * A relayout does not occur when using this function */ void setMdiCaptionFont( const TQFont &fnt ); /** * Sets the foreground color of the active MDI childframe window caption - * A retqlayout does not occur when using this function + * A relayout does not occur when using this function */ void setMdiCaptionActiveForeColor( const TQColor &clr ); /** * Sets the background color of the active MDI childframe window captions - * A retqlayout does not occur when using this function + * A relayout does not occur when using this function */ void setMdiCaptionActiveBackColor( const TQColor &clr ); /** * Sets the foreground color of inactive MDI childframe window captions - * A retqlayout does not occur when using this function + * A relayout does not occur when using this function */ void setMdiCaptionInactiveForeColor( const TQColor &clr ); /** * Sets the background color of inactive MDI childframe window captions - * A retqlayout does not occur when using this function + * A relayout does not occur when using this function */ void setMdiCaptionInactiveBackColor( const TQColor &clr ); @@ -240,7 +240,7 @@ public slots: void tileVertically(); /** - * Position and tqlayout the minimized child frames + * Position and layout the minimized child frames */ void layoutMinimizedChildren(); diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp index 4a8fbdd6..21427186 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp @@ -521,7 +521,7 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) case Maximized: m_pClient->m_stateChanged = true; m_state = state; - // client min / max size / tqlayout behavior don't change + // client min / max size / layout behavior don't change // set frame max size indirectly by setting the clients max size to // it's current value (calls setMaxSize() of frame) m_pClient->setMaximumSize( m_pClient->maximumSize().width(), m_pClient->maximumSize().height() ); @@ -531,12 +531,12 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) case Minimized: m_pClient->m_stateChanged = true; m_state = state; - // restore client min / max size / tqlayout behavior + // restore client min / max size / layout behavior m_pClient->setMinimumSize( m_oldClientMinSize.width(), m_oldClientMinSize.height() ); m_pClient->setMaximumSize( m_oldClientMaxSize.width(), m_oldClientMaxSize.height() ); - if ( m_pClient->tqlayout() != 0L ) + if ( m_pClient->layout() != 0L ) { - m_pClient->tqlayout() ->setResizeMode( m_oldLayoutResizeMode ); + m_pClient->layout() ->setResizeMode( m_oldLayoutResizeMode ); } m_pMinimize->setPixmap( *m_pMinButtonPixmap ); m_pMaximize->setPixmap( *m_pMaxButtonPixmap ); @@ -555,12 +555,12 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) { m_pClient->m_stateChanged = true; m_state = state; - // restore client min / max size / tqlayout behavior + // restore client min / max size / layout behavior m_pClient->setMinimumSize( m_oldClientMinSize.width(), m_oldClientMinSize.height() ); m_pClient->setMaximumSize( m_oldClientMaxSize.width(), m_oldClientMaxSize.height() ); - if ( m_pClient->tqlayout() != 0L ) + if ( m_pClient->layout() != 0L ) { - m_pClient->tqlayout() ->setResizeMode( m_oldLayoutResizeMode ); + m_pClient->layout() ->setResizeMode( m_oldLayoutResizeMode ); } setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX ); // reset to maximize-captionbar @@ -581,7 +581,7 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) { m_pClient->m_stateChanged = true; m_state = state; - // client min / max size / tqlayout behavior don't change + // client min / max size / layout behavior don't change setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX ); m_pMaximize->setPixmap( *m_pRestoreButtonPixmap ); int nFrameWidth = KMDI_CHILDFRM_DOUBLE_BORDER; @@ -607,18 +607,18 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) case Maximized: m_pClient->m_stateChanged = true; m_state = state; - // save client min / max size / tqlayout behavior + // save client min / max size / layout behavior m_oldClientMinSize = m_pClient->minimumSize(); m_oldClientMaxSize = m_pClient->maximumSize(); - if ( m_pClient->tqlayout() != 0L ) + if ( m_pClient->layout() != 0L ) { - m_oldLayoutResizeMode = m_pClient->tqlayout() ->resizeMode(); + m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode(); } m_pClient->setMinimumSize( 0, 0 ); m_pClient->setMaximumSize( 0, 0 ); - if ( m_pClient->tqlayout() != 0L ) + if ( m_pClient->layout() != 0L ) { - m_pClient->tqlayout() ->setResizeMode( TQLayout::FreeResize ); + m_pClient->layout() ->setResizeMode( TQLayout::FreeResize ); } switchToMinimizeLayout(); m_pManager->childMinimized( this, true ); @@ -626,19 +626,19 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) case Normal: m_pClient->m_stateChanged = true; m_state = state; - // save client min / max size / tqlayout behavior + // save client min / max size / layout behavior m_oldClientMinSize = m_pClient->minimumSize(); m_oldClientMaxSize = m_pClient->maximumSize(); - if ( m_pClient->tqlayout() != 0L ) + if ( m_pClient->layout() != 0L ) { - m_oldLayoutResizeMode = m_pClient->tqlayout() ->resizeMode(); + m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode(); } m_restoredRect = geometry(); m_pClient->setMinimumSize( 0, 0 ); m_pClient->setMaximumSize( 0, 0 ); - if ( m_pClient->tqlayout() != 0L ) + if ( m_pClient->layout() != 0L ) { - m_pClient->tqlayout() ->setResizeMode( TQLayout::FreeResize ); + m_pClient->layout() ->setResizeMode( TQLayout::FreeResize ); } switchToMinimizeLayout(); m_pManager->childMinimized( this, false ); diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildview.h b/lib/compatibility/kmdi/qextmdi/kmdichildview.h index 9ce85fed..af0c8030 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildview.h +++ b/lib/compatibility/kmdi/qextmdi/kmdichildview.h @@ -71,7 +71,7 @@ class KMdiChildViewPrivate; * KMdiChildView* pMDICover = new KMdiChildView( pNewView->caption()); * pMDICover->setIcon(icon); * m_MDICoverList.append( pMDICover); - * TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "tqlayout"); + * TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "layout"); * pNewView->reparent( pMDICover, TQPoint(0,0)); * pLayout->addWidget( pNewView); * pMDICover->setName( pNewView->name()); diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp index d47b1cd4..1aa8b50c 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp @@ -70,9 +70,9 @@ KMdiDockContainer::KMdiDockContainer( TQWidget *parent, TQWidget *win, int posit if ( m_horizontal ) - l = new TQVBoxLayout( this ); //vertical tqlayout for top and bottom docks + l = new TQVBoxLayout( this ); //vertical layout for top and bottom docks else - l = new TQHBoxLayout( this ); //horizontal tqlayout for left and right docks + l = new TQHBoxLayout( this ); //horizontal layout for left and right docks l->setAutoAdd( false ); @@ -106,7 +106,7 @@ KMdiDockContainer::KMdiDockContainer( TQWidget *parent, TQWidget *win, int posit m_ws->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); - //tqlayout the tabbar + //layout the tabbar if ( position == KDockWidget::DockLeft || position == KDockWidget::DockTop ) { //add the tabbar then the widget stack diff --git a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp index 0c577360..3618ea3e 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp @@ -307,7 +307,7 @@ KMdiMainFrm::~KMdiMainFrm() TQValueListIterator<KMdiChildView*> childIt; for ( childIt = children.begin(); childIt != children.end(); ++childIt ) { - closeWindow( *childIt, false ); // without re-tqlayout taskbar! + closeWindow( *childIt, false ); // without re-layout taskbar! } emit lastChildViewClosed(); @@ -423,7 +423,7 @@ KMdiChildView* KMdiMainFrm::createWrapper( TQWidget *view, const TQString& name, KMdiChildView* pMDICover = new KMdiChildView( name /*caption*/, 0L /*parent*/, name.latin1() ); - TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "tqlayout" ); + TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "layout" ); view->reparent( pMDICover, TQPoint( 0, 0 ) ); pLayout->addWidget( view ); // pMDICover->setName(name); diff --git a/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp b/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp index 662924f3..81384f98 100644 --- a/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp @@ -337,8 +337,8 @@ void KMdiTaskBar::layoutTaskBar( int taskBarWidth ) // if there's enough space, use actual width int buttonCount = m_pButtonList->count(); int tbHandlePixel; - tbHandlePixel = tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); - int buttonAreaWidth = taskBarWidth - tbHandlePixel - tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5; + tbHandlePixel = style().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); + int buttonAreaWidth = taskBarWidth - tbHandlePixel - style().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5; if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < parentWidget() ->width() ) ) { for ( b = m_pButtonList->first();b;b = m_pButtonList->next() ) diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp b/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp index 72b244fe..c213f363 100644 --- a/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp @@ -473,7 +473,7 @@ TQSize KMultiTabBarButton::sizeHint() const } #endif if ( isMenuButton() ) - w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this); + w += style().pixelMetric(TQStyle::PM_MenuButtonIndicator, this); if ( pixmap() ) { TQPixmap *pm = (TQPixmap *)pixmap(); @@ -492,7 +492,7 @@ TQSize KMultiTabBarButton::sizeHint() const h = TQMAX(h, sz.height()); } - return (tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). + return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). expandedTo(TQApplication::globalStrut())); } diff --git a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp b/lib/compatibility/kmdi/qextmdi/ktabbar.cpp index 045b8a45..471ca4f0 100644 --- a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp +++ b/lib/compatibility/kmdi/qextmdi/ktabbar.cpp @@ -172,8 +172,8 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) int xoff = 0, yoff = 0; // The additional offsets were found by try and error, TODO: find the rational behind them if ( t == tab( currentTab() ) ) { - xoff = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3; - yoff = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4; + xoff = style().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3; + yoff = style().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4; } else { xoff = 7; @@ -340,8 +340,8 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br, r.setLeft( r.left() + pixw + 4 ); r.setRight( r.right() + 2 ); - int inactiveXShift = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ); - int inactiveYShift = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ); + int inactiveXShift = style().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ); + int inactiveYShift = style().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ); int right = t->text().isEmpty() ? br.right() - pixw : br.left() + 2; @@ -361,8 +361,8 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br, if ( mTabColors.contains( t->identifier() ) ) cg.setColor( TQColorGroup::Foreground, mTabColors[t->identifier()] ); - tqstyle().drawControl( TQStyle::CE_TabBarLabel, p, this, r, - t->isEnabled() ? cg : tqpalette().disabled(), + style().drawControl( TQStyle::CE_TabBarLabel, p, this, r, + t->isEnabled() ? cg : palette().disabled(), flags, TQStyleOption(t) ); } diff --git a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp index 8d74ebe3..216ca3f6 100644 --- a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp @@ -160,8 +160,8 @@ bool KTabWidget::tabCloseActivatePrevious() const unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength ) { int hframe, overlap; - hframe = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() ); - overlap = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() ); + hframe = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() ); + overlap = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() ); TQFontMetrics fm = tabBar()->fontMetrics(); int x = 0; @@ -174,7 +174,7 @@ unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength ) int iw = 0; if ( tab->iconSet() ) iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4; - x += ( tabBar()->tqstyle().tqsizeFromContents( TQStyle::CT_TabBarTab, this, + x += ( tabBar()->style().tqsizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width(); } |