diff options
Diffstat (limited to 'lib/compatibility/kmdi/qextmdi')
23 files changed, 381 insertions, 381 deletions
diff --git a/lib/compatibility/kmdi/qextmdi/kdemacros.h.in b/lib/compatibility/kmdi/qextmdi/kdemacros.h.in index bfae0947..9308c18d 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 layout of the vtable. + * binary incompatible as it breaks the tqlayout of the vtable. */ #define RESERVE_VIRTUAL_1 \ diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp index 8008c9e4..f4bd138b 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp @@ -22,7 +22,7 @@ #include "kdockwidget_p.h" #include <tqapplication.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpainter.h> #include <tqobjectlist.h> #include <tqstrlist.h> @@ -203,7 +203,7 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* ) paint.begin( this ); - tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup()); + tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), tqcolorGroup()); paint.end(); } @@ -221,8 +221,8 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) #endif d = new KDockWidgetHeaderPrivate( TQT_TQOBJECT(this) ); - layout = new TQHBoxLayout( this ); - layout->setResizeMode( TQLayout::Minimum ); + tqlayout = new TQHBoxLayout( this ); + tqlayout->setResizeMode( TQLayout::Minimum ); drag = new KDockWidgetHeaderDrag( this, parent ); @@ -234,7 +234,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock())); stayButton = new KDockButton_Private( this, "DockStayButton" ); - TQToolTip::add( stayButton, i18n("Freeze the window geometry", "Freeze") ); + TQToolTip::add( stayButton, i18n("Freeze the window tqgeometry", "Freeze") ); stayButton->setToggleButton( true ); stayButton->setPixmap( const_cast< const char** >(not_close_xpm) ); stayButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); @@ -258,15 +258,15 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) d->dummy->setFixedSize( 1,closeButton->pixmap()->height() ); - layout->addWidget( drag ); - layout->addWidget( dockbackButton ); - layout->addWidget( d->toDesktopButton ); - layout->addWidget( d->dummy); - layout->addWidget( stayButton ); - layout->addWidget( closeButton ); - layout->activate(); + tqlayout->addWidget( drag ); + tqlayout->addWidget( dockbackButton ); + tqlayout->addWidget( d->toDesktopButton ); + tqlayout->addWidget( d->dummy); + tqlayout->addWidget( stayButton ); + tqlayout->addWidget( closeButton ); + tqlayout->activate(); d->dummy->hide(); - drag->setFixedHeight( layout->minimumSize().height() ); + drag->setFixedHeight( tqlayout->tqminimumSize().height() ); } void KDockWidgetHeader::setTopLevel( bool isTopLevel ) @@ -291,7 +291,7 @@ void KDockWidgetHeader::setTopLevel( bool isTopLevel ) if( d->showToDesktopButton ) d->toDesktopButton->show(); } - layout->activate(); + tqlayout->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 layout; - layout = new TQHBoxLayout( this ); - layout->setResizeMode( TQLayout::Minimum ); + delete tqlayout; + tqlayout = new TQHBoxLayout( this ); + tqlayout->setResizeMode( TQLayout::Minimum ); delete drag; drag = nd; @@ -329,26 +329,26 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd ) } - layout->addWidget( drag ); - layout->addWidget( dockbackButton ); - layout->addWidget( d->dummy ); - layout->addWidget( d->toDesktopButton ); - layout->addWidget( stayButton ); + tqlayout->addWidget( drag ); + tqlayout->addWidget( dockbackButton ); + tqlayout->addWidget( d->dummy ); + tqlayout->addWidget( d->toDesktopButton ); + tqlayout->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) { - layout->addWidget(it.current()); + tqlayout->addWidget(it.current()); dontShowDummy=dontShowDummy || (it.current()->isVisibleTo(this)); } if (dontShowDummy) d->dummy->hide(); else d->dummy->show(); - layout->addWidget( closeButton ); - layout->activate(); - kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<layout->minimumSize().height()<<endl; + tqlayout->addWidget( closeButton ); + tqlayout->activate(); + kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<tqlayout->tqminimumSize().height()<<endl; #ifdef __GNUC__ #warning FIXME #endif - drag->setFixedHeight( closeButton->height()); // /*layout->minimumS*/sizeHint().height() ); + drag->setFixedHeight( closeButton->height()); // /*tqlayout->minimumS*/tqsizeHint().height() ); } void KDockWidgetHeader::addButton(KDockButton_Private* btn) { @@ -362,26 +362,26 @@ void KDockWidgetHeader::addButton(KDockButton_Private* btn) { btn->show(); - delete layout; - layout = new TQHBoxLayout( this ); - layout->setResizeMode( TQLayout::Minimum ); + delete tqlayout; + tqlayout = new TQHBoxLayout( this ); + tqlayout->setResizeMode( TQLayout::Minimum ); - layout->addWidget( drag ); - layout->addWidget( dockbackButton ); - layout->addWidget( d->toDesktopButton ); - layout->addWidget( d->dummy); - layout->addWidget( stayButton ); + tqlayout->addWidget( drag ); + tqlayout->addWidget( dockbackButton ); + tqlayout->addWidget( d->toDesktopButton ); + tqlayout->addWidget( d->dummy); + tqlayout->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) { - layout->addWidget(it.current()); + tqlayout->addWidget(it.current()); dontShowDummy=dontShowDummy || (it.current()->isVisibleTo(this)); } if (dontShowDummy) d->dummy->hide(); else d->dummy->show(); - layout->addWidget( closeButton ); - layout->activate(); - drag->setFixedHeight( layout->minimumSize().height() ); + tqlayout->addWidget( closeButton ); + tqlayout->activate(); + drag->setFixedHeight( tqlayout->tqminimumSize().height() ); } void KDockWidgetHeader::removeButton(KDockButton_Private* btn) { @@ -425,12 +425,12 @@ void KDockWidgetHeader::setDragEnabled(bool b) #ifndef NO_KDE2 void KDockWidgetHeader::saveConfig( KConfig* c ) { - c->writeEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), stayButton->isOn() ); + c->writeEntry( TQString("%1%2").tqarg(parent()->name()).tqarg(":stayButton"), stayButton->isOn() ); } void KDockWidgetHeader::loadConfig( KConfig* c ) { - setDragEnabled( !c->readBoolEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), false ) ); + setDragEnabled( !c->readBoolEntry( TQString("%1%2").tqarg(parent()->name()).tqarg(":stayButton"), false ) ); } #endif @@ -497,8 +497,8 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP d->_parent = parent; - layout = new TQVBoxLayout( this ); - layout->setResizeMode( TQLayout::Minimum ); + tqlayout = new TQVBoxLayout( this ); + tqlayout->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()); + tqstyle().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), tqcolorGroup()); 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*tqstyle().tqpixelMetric(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*tqstyle().tqpixelMetric(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 layout; + delete tqlayout; header = h; - layout = new TQVBoxLayout( this ); - layout->setResizeMode( TQLayout::Minimum ); - layout->addWidget( header ); + tqlayout = new TQVBoxLayout( this ); + tqlayout->setResizeMode( TQLayout::Minimum ); + tqlayout->addWidget( header ); setWidget( widget ); } else { header = h; - layout->addWidget( header ); + tqlayout->addWidget( header ); } kdDebug(282)<<caption()<<": KDockWidget::setHeader"<<endl; setEnableDocking(eDocking); @@ -774,7 +774,7 @@ void KDockWidget::updateHeader() { if ( parent() ){ #ifdef BORDERLESS_WINDOWS - layout->setMargin(0); + tqlayout->setMargin(0); setMouseTracking(false); setCursor(TQCursor(ArrowCursor)); #endif @@ -792,7 +792,7 @@ void KDockWidget::updateHeader() header->setTopLevel( true ); header->show(); #ifdef BORDERLESS_WINDOWS - layout->setMargin(2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth,this)); + tqlayout->setMargin(2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this)); setMouseTracking(true); #endif } @@ -811,7 +811,7 @@ void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p ) } if ( manager && s == manager->main ){ - setGeometry( TQRect(TQPoint(0,0), manager->main->geometry().size()) ); + setGeometry( TQRect(TQPoint(0,0), manager->main->tqgeometry().size()) ); } if ( !s ) @@ -1089,7 +1089,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, if ( !parentDock ){ // dock to a toplevel dockwidget means newDock is toplevel now newDock->move( target->frameGeometry().topLeft() ); - newDock->resize( target->geometry().size() ); + newDock->resize( target->tqgeometry().size() ); if ( target->isVisibleToTLW() ) newDock->show(); } @@ -1124,7 +1124,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, tab->insertTab( this, icon() ? *icon() : TQPixmap(), tabPageLabel(), tabIndex ); - TQRect geom=newDock->geometry(); + TQRect geom=newDock->tqgeometry(); TQWidget *wantTransient=tab->transientTo(); newDock->setDockWindowTransient(wantTransient,wantTransient); newDock->setGeometry(geom); @@ -1438,10 +1438,10 @@ void KDockWidget::setWidget( TQWidget* mw ) if (!mw->ownCursor()) mw->setCursor(TQCursor(ArrowCursor)); #endif widget = mw; - delete layout; + delete tqlayout; - layout = new TQVBoxLayout( this ); - layout->setResizeMode( TQLayout::Minimum ); + tqlayout = new TQVBoxLayout( this ); + tqlayout->setResizeMode( TQLayout::Minimum ); KDockContainer* dc = dynamic_cast<KDockContainer*>(widget); if (dc) @@ -1456,8 +1456,8 @@ void KDockWidget::setWidget( TQWidget* mw ) { header->show(); - layout->addWidget( header ); - layout->addWidget( widget,1 ); + tqlayout->addWidget( header ); + tqlayout->addWidget( widget,1 ); } updateHeader(); emit widgetSet(mw); @@ -1478,7 +1478,7 @@ void KDockWidget::setDockTabName( KDockTabGroup* tab ) tab->parentWidget()->setName( listOfName.utf8() ); tab->parentWidget()->setCaption( listOfCaption ); - tab->parentWidget()->repaint( false ); // KDockWidget->repaint + tab->parentWidget()->tqrepaint( false ); // KDockWidget->tqrepaint if ( tab->parentWidget()->parent() ) if ( tab->parentWidget()->parent()->inherits("KDockSplitter") ) ((KDockSplitter*)(tab->parentWidget()->parent()))->updateName(); @@ -1551,13 +1551,13 @@ void KDockWidget::loseFormerBrotherDockWidget() TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()), this, TQT_SLOT(loseFormerBrotherDockWidget()) ); formerBrotherDockWidget = 0L; - repaint(); + tqrepaint(); } void KDockWidget::dockBack() { if( formerBrotherDockWidget) { - // search all children if it tries to dock back to a child + // search all tqchildren if it tries to dock back to a child bool found = false; TQObjectList* cl = queryList("KDockWidget"); TQObjectListIt it( *cl ); @@ -1713,7 +1713,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) findChildDockWidget( curdw, childDockWidgetList ); //d->oldDragRect = TQRect(); should fix rectangle not erased problem - d->dragRect = TQRect(curdw->geometry()); + d->dragRect = TQRect(curdw->tqgeometry()); TQPoint p = curdw->mapToGlobal(TQPoint(0,0)); d->dragRect.moveTopLeft(p); drawDragRectangle(); @@ -1735,7 +1735,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) if (d->readyToDrag) { d->readyToDrag = false; //d->oldDragRect = TQRect(); should fix rectangle not erased problem - d->dragRect = TQRect(curdw->geometry()); + d->dragRect = TQRect(curdw->tqgeometry()); TQPoint p = curdw->mapToGlobal(TQPoint(0,0)); d->dragRect.moveTopLeft(p); drawDragRectangle(); @@ -1775,7 +1775,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) break; } else { if (dropCancel && curdw) { - d->dragRect = TQRect(curdw->geometry()); + d->dragRect = TQRect(curdw->tqgeometry()); TQPoint p = curdw->mapToGlobal(TQPoint(0,0)); d->dragRect.moveTopLeft(p); }else @@ -1831,7 +1831,7 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos ) return 0L; } #if defined(_OS_WIN32_) || defined(Q_OS_WIN32) - p = p->topLevelWidget(); + p = p->tqtopLevelWidget(); #endif TQWidget* w = 0L; findChildDockWidget( w, p, p->mapFromGlobal(pos) ); @@ -1892,7 +1892,7 @@ void KDockManager::findChildDockWidget( TQWidget*& ww, const TQWidget* p, const while ( it.current() ) { if ( it.current()->isWidgetType() ) { w = (TQWidget*)it.current(); - if ( w->isVisible() && w->geometry().contains(pos) ) { + if ( w->isVisible() && w->tqgeometry().contains(pos) ) { if ( w->inherits("KDockWidget") ) ww = w; findChildDockWidget( ww, w, w->mapFromParent(pos) ); return; @@ -2051,7 +2051,7 @@ static TQDomElement createStringEntry(TQDomDocument &doc, const TQString &tagNam static TQDomElement createBoolEntry(TQDomDocument &doc, const TQString &tagName, bool b) { - return createStringEntry(doc, tagName, TQString::fromLatin1(b? "true" : "false")); + return createStringEntry(doc, tagName, TQString::tqfromLatin1(b? "true" : "false")); } @@ -2090,7 +2090,7 @@ static TQDomElement createListEntry(TQDomDocument &doc, const TQString &tagName, TQStrListIterator it(list); for (; it.current(); ++it) { TQDomElement subel = doc.createElement(subTagName); - subel.appendChild(doc.createTextNode(TQString::fromLatin1(it.current()))); + subel.appendChild(doc.createTextNode(TQString::tqfromLatin1(it.current()))); el.appendChild(subel); } @@ -2160,7 +2160,7 @@ void KDockManager::writeConfig(TQDomElement &base) KDockWidget *obj1; while ( (obj1=(KDockWidget*)it.current()) ) { if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) ) - mainWidgetStr = TQString::fromLatin1(obj1->name()); + mainWidgetStr = TQString::tqfromLatin1(obj1->name()); nList.append(obj1->name()); ++it; } @@ -2178,7 +2178,7 @@ void KDockManager::writeConfig(TQDomElement &base) KDockWidget *obj = getDockWidgetFromName( *nListIt); if ((obj->isGroup && (!obj->d->isContainer)) && (nameList.find( obj->firstName.latin1() ) == -1 || nameList.find(obj->lastName.latin1()) == -1)) { - // Skip until children are saved (why?) + // Skip until tqchildren are saved (why?) ++nListIt; // nList.next(); //falk? if ( !nList.current() ) nList.first(); @@ -2225,7 +2225,7 @@ void KDockManager::writeConfig(TQDomElement &base) } } - groupEl.appendChild(createStringEntry(doc, "name", TQString::fromLatin1(obj->name()))); + groupEl.appendChild(createStringEntry(doc, "name", TQString::tqfromLatin1(obj->name()))); groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->parent())); if ( !obj->parent() ) { groupEl.appendChild(createRectEntry(doc, "geometry", TQRect(main->frameGeometry().topLeft(), main->size()))); @@ -2498,7 +2498,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) c->writeEntry( "Main:view", obj->name() ); } -// kdDebug(282)<<TQString("list size: %1").arg(nList.count())<<endl; +// kdDebug(282)<<TQString("list size: %1").tqarg(nList.count())<<endl; for (TQObjectListIt it(d->containerDocks);it.current();++it) { KDockContainer* dc = dynamic_cast<KDockContainer*>(((KDockWidget*)it.current())->widget); @@ -2506,7 +2506,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) dc->prepareSave(nList); } } -// kdDebug(282)<<TQString("new list size: %1").arg(nList.count())<<endl; +// kdDebug(282)<<TQString("new list size: %1").tqarg(nList.count())<<endl; TQStringList::Iterator nListIt=nList.begin(); while ( nListIt!=nList.end() ){ @@ -2529,7 +2529,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) c->writeEntry( cname+":type", "GROUP"); if ( !obj->parent() ){ c->writeEntry( cname+":parent", "___null___"); - c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); + c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); c->writeEntry( cname+":visible", obj->isVisible()); } else { c->writeEntry( cname+":parent", "yes"); @@ -2561,7 +2561,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) c->writeEntry( cname+":type", "TAB_GROUP"); if ( !obj->parent() ){ c->writeEntry( cname+":parent", "___null___"); - c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); + c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); c->writeEntry( cname+":visible", obj->isVisible()); c->writeEntry( cname+":dockBackTo", obj->formerBrotherDockWidget ? obj->formerBrotherDockWidget->name() : ""); c->writeEntry( cname+":dockBackToPos", obj->formerDockPos); @@ -2585,7 +2585,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) c->writeEntry( cname+":tabToolTip", obj->toolTipString()); if ( !obj->parent() ){ c->writeEntry( cname+":type", "NULL_DOCK"); - c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); + c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); c->writeEntry( cname+":visible", obj->isVisible()); c->writeEntry( cname+":dockBackTo", obj->formerBrotherDockWidget ? obj->formerBrotherDockWidget->name() : ""); c->writeEntry( cname+":dockBackToPos", obj->formerDockPos); @@ -2660,7 +2660,7 @@ void KDockManager::readConfig( KConfig* c, TQString group ) obj = 0L; if ( type == "NULL_DOCK" || c->readEntry( oname + ":parent") == "___null___" ){ - TQRect r = c->readRectEntry( oname + ":geometry" ); + TQRect r = c->readRectEntry( oname + ":tqgeometry" ); obj = getDockWidgetFromName( oname ); obj->applyToWidget( 0L ); obj->setGeometry(r); @@ -2877,13 +2877,13 @@ void KDockManager::slotMenuPopup() ++it; if ( obj->mayBeHide() ) { - menu->insertItem( obj->icon() ? *(obj->icon()) : TQPixmap(), i18n("Hide %1").arg(obj->caption()), numerator++ ); + menu->insertItem( obj->icon() ? *(obj->icon()) : TQPixmap(), i18n("Hide %1").tqarg(obj->caption()), numerator++ ); menuData->append( new MenuDockData( obj, true ) ); } if ( obj->mayBeShow() ) { - menu->insertItem( obj->icon() ? *(obj->icon()) : TQPixmap(), i18n("Show %1").arg(obj->caption()), numerator++ ); + menu->insertItem( obj->icon() ? *(obj->icon()) : TQPixmap(), i18n("Show %1").tqarg(obj->caption()), numerator++ ); menuData->append( new MenuDockData( obj, false ) ); } } @@ -2935,14 +2935,14 @@ void KDockManager::drawDragRectangle() KDockMainWindow* pMain = 0L; KDockWidget* pTLDockWdg = 0L; TQWidget* topWdg; - if (pDockWdgAtRect->topLevelWidget() == main) { + if (pDockWdgAtRect->tqtopLevelWidget() == main) { isOverMainWdg = true; topWdg = pMain = (KDockMainWindow*) main; unclipped = pMain->testWFlags( WPaintUnclipped ); pMain->setWFlags( WPaintUnclipped ); } else { - topWdg = pTLDockWdg = (KDockWidget*) pDockWdgAtRect->topLevelWidget(); + topWdg = pTLDockWdg = (KDockWidget*) pDockWdgAtRect->tqtopLevelWidget(); unclipped = pTLDockWdg->testWFlags( WPaintUnclipped ); pTLDockWdg->setWFlags( WPaintUnclipped ); } @@ -3059,11 +3059,11 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize) delete list; #if 0 KDockSplitter *split; -// for (unsigned int i=0;i<children()->count();i++) +// for (unsigned int i=0;i<tqchildren()->count();i++) { -// TQPtrList<TQObject> list(children()); -// TQObject *obj=((TQPtrList<TQObject*>)children())->at(i); - TQObject *obj=children()->getFirst(); +// TQPtrList<TQObject> list(tqchildren()); +// TQObject *obj=((TQPtrList<TQObject*>)tqchildren())->at(i); + TQObject *obj=tqchildren()->getFirst(); if (split = dynamic_cast<KDockSplitter*>(obj)) { split->setGeometry( TQRect(TQPoint(0,0), size() )); @@ -3096,12 +3096,12 @@ void KDockArea::setMainDockWidget( KDockWidget* mdw ) // KDOCKCONTAINER - AN ABSTRACTION OF THE KDOCKTABWIDGET -KDockContainer::KDockContainer(){m_overlapMode=false; m_childrenListBegin=0; m_childrenListEnd=0;} +KDockContainer::KDockContainer(){m_overlapMode=false; m_tqchildrenListBegin=0; m_tqchildrenListEnd=0;} KDockContainer::~KDockContainer(){ - if (m_childrenListBegin) + if (m_tqchildrenListBegin) { - struct ListItem *tmp=m_childrenListBegin; + struct ListItem *tmp=m_tqchildrenListBegin; while (tmp) { struct ListItem *tmp2=tmp->next; @@ -3109,8 +3109,8 @@ KDockContainer::~KDockContainer(){ delete tmp; tmp=tmp2; } - m_childrenListBegin=0; - m_childrenListEnd=0; + m_tqchildrenListBegin=0; + m_tqchildrenListEnd=0; } } @@ -3156,7 +3156,7 @@ KDockWidget *KDockContainer::parentDockWidget(){return 0;} TQStringList KDockContainer::containedWidgets() const { TQStringList tmp; - for (struct ListItem *it=m_childrenListBegin;it;it=it->next) { + for (struct ListItem *it=m_tqchildrenListBegin;it;it=it->next) { tmp<<TQString(it->data); } @@ -3172,36 +3172,36 @@ void KDockContainer::insertWidget (KDockWidget *dw, TQPixmap, const TQString &, it->data=strdup(dw->name()); it->next=0; - if (m_childrenListEnd) + if (m_tqchildrenListEnd) { - m_childrenListEnd->next=it; - it->prev=m_childrenListEnd; - m_childrenListEnd=it; + m_tqchildrenListEnd->next=it; + it->prev=m_tqchildrenListEnd; + m_tqchildrenListEnd=it; } else { it->prev=0; - m_childrenListEnd=it; - m_childrenListBegin=it; + m_tqchildrenListEnd=it; + m_tqchildrenListBegin=it; } } void KDockContainer::removeWidget (KDockWidget *dw){ - for (struct ListItem *tmp=m_childrenListBegin;tmp;tmp=tmp->next) + for (struct ListItem *tmp=m_tqchildrenListBegin;tmp;tmp=tmp->next) { if (!strcmp(tmp->data,dw->name())) { free(tmp->data); if (tmp->next) tmp->next->prev=tmp->prev; if (tmp->prev) tmp->prev->next=tmp->next; - if (tmp==m_childrenListBegin) m_childrenListBegin=tmp->next; - if (tmp==m_childrenListEnd) m_childrenListEnd=tmp->prev; + if (tmp==m_tqchildrenListBegin) m_tqchildrenListBegin=tmp->next; + if (tmp==m_tqchildrenListEnd) m_tqchildrenListEnd=tmp->prev; delete tmp; break; } } } -//m_children.remove(dw->name());} +//m_tqchildren.remove(dw->name());} void KDockContainer::undockWidget (KDockWidget *){;} void KDockContainer::setToolTip(KDockWidget *, TQString &){;} void KDockContainer::setPixmap(KDockWidget*,const TQPixmap&){;} @@ -3212,11 +3212,11 @@ void KDockContainer::save (TQDomElement&){;} void KDockContainer::prepareSave(TQStringList &names) { - for (struct ListItem *tmp=m_childrenListBegin;tmp; tmp=tmp->next) + for (struct ListItem *tmp=m_tqchildrenListBegin;tmp; tmp=tmp->next) names.remove(tmp->data); -// for (uint i=0;i<m_children.count();i++) +// for (uint i=0;i<m_tqchildren.count();i++) // { -// names.remove(m_children.at(i)); +// names.remove(m_tqchildren.at(i)); // } } diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.h b/lib/compatibility/kmdi/qextmdi/kdockwidget.h index c435dbfc..82872a4c 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.h +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.h @@ -328,9 +328,9 @@ protected slots: protected: /** - * A layout manager for placing the embedded buttons (close and stay) + * A tqlayout manager for placing the embedded buttons (close and stay) */ - TQHBoxLayout* layout; + TQHBoxLayout* tqlayout; /** * a little button for closing (undocking and hiding) the dockwidget @@ -454,7 +454,7 @@ public: */ KDockWidget( KDockManager* dockManager, const char* name, const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = TQString(), - const TQString& strTabPageLabel = TQString::fromLatin1( " " ), WFlags f = 0); + const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ), WFlags f = 0); /** * Destructs a dockwidget. @@ -856,9 +856,9 @@ private: TQWidget* widget; /** - * the layout manager that takes care about proper resizing and moving the embedded widget and the header + * the tqlayout manager that takes care about proper resizing and moving the embedded widget and the header */ - TQVBoxLayout* layout; + TQVBoxLayout* tqlayout; /** * the responsible dockmanager @@ -946,7 +946,7 @@ public: #ifndef NO_KDE2 /** * Saves the current state of the dockmanager and of all controlled widgets. - * State means here to save the geometry, visibility, parents, internal object names, orientation, + * State means here to save the tqgeometry, visibility, parents, internal object names, orientation, * separator positions, dockwidget-group information, tab widget states (if it is a tab group) and * last but not least some necessary things for recovering the dockmainwindow state. * @@ -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 layout, + * So in principle, in order to restore a window tqlayout, * 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 layout into a DOM tree below the given element. + * Saves the current dock window tqlayout into a DOM tree below the given element. */ void writeConfig(TQDomElement &base); /** - * Reads the current dock window layout from a DOM tree below the given element. + * Reads the current dock window tqlayout from a DOM tree below the given element. */ void readConfig(TQDomElement &base); @@ -1318,7 +1318,7 @@ public: /** * Constructs a dockmainwindow. It calls its base class constructor and does additional things concerning * to the dock stuff: - * @li information about the dock state of this' children gets initialized + * @li information about the dock state of this' tqchildren gets initialized * @li a dockmanager is created... * @li ...and gets initialized * @li the main dockwidget is set to 0 @@ -1368,14 +1368,14 @@ public: * @return a pointer to the new created dockwidget */ KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L, - const TQString& strCaption = TQString(), const TQString& strTabPageLabel = TQString::fromLatin1( " " ) ); + const TQString& strCaption = TQString(), const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) ); /** - * Saves the current dock window layout into a DOM tree below the given element. + * Saves the current dock window tqlayout into a DOM tree below the given element. */ void writeDockConfig(TQDomElement &base); /** - * Reads the current dock window layout from a DOM tree below the given element. + * Reads the current dock window tqlayout from a DOM tree below the given element. */ void readDockConfig(TQDomElement &base); @@ -1494,7 +1494,7 @@ public: KDockWidget* getMainDockWidget(){ return mainDockWidget; } KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L, - const TQString& strCaption = TQString(), const TQString& strTabPageLabel = TQString::fromLatin1( " " ) ); + const TQString& strCaption = TQString(), const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) ); void writeDockConfig(TQDomElement &base); void readDockConfig(TQDomElement &base); diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h b/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h index 9ee9e8e7..1ac686d9 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h @@ -77,8 +77,8 @@ private: - struct ListItem *m_childrenListBegin; - struct ListItem *m_childrenListEnd; + struct ListItem *m_tqchildrenListBegin; + struct ListItem *m_tqchildrenListEnd; class KDockContainerPrivate; KDockContainerPrivate *d; diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp index 49ddccdc..331b9082 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp @@ -180,20 +180,20 @@ void KDockSplitter::setupMinMaxSize() // Set the minimum and maximum sizes int minx, maxx, miny, maxy; if (m_orientation ==Qt::Horizontal) { - miny = child0->minimumSize().height() + child1->minimumSize().height()+4; - maxy = child0->maximumSize().height() + child1->maximumSize().height()+4; - minx = (child0->minimumSize().width() > child1->minimumSize().width()) ? child0->minimumSize().width() : child1->minimumSize().width(); - maxx = (child0->maximumSize().width() > child1->maximumSize().width()) ? child0->maximumSize().width() : child1->maximumSize().width(); + miny = child0->tqminimumSize().height() + child1->tqminimumSize().height()+4; + maxy = child0->tqmaximumSize().height() + child1->tqmaximumSize().height()+4; + minx = (child0->tqminimumSize().width() > child1->tqminimumSize().width()) ? child0->tqminimumSize().width() : child1->tqminimumSize().width(); + maxx = (child0->tqmaximumSize().width() > child1->tqmaximumSize().width()) ? child0->tqmaximumSize().width() : child1->tqmaximumSize().width(); miny = (miny > 4) ? miny : 4; maxy = (maxy < 32000) ? maxy : 32000; minx = (minx > 2) ? minx : 2; maxx = (maxx < 32000) ? maxx : 32000; } else { - minx = child0->minimumSize().width() + child1->minimumSize().width()+4; - maxx = child0->maximumSize().width() + child1->maximumSize().width()+4; - miny = (child0->minimumSize().height() > child1->minimumSize().height()) ? child0->minimumSize().height() : child1->minimumSize().height(); - maxy = (child0->maximumSize().height() > child1->maximumSize().height()) ? child0->maximumSize().height() : child1->maximumSize().height(); + minx = child0->tqminimumSize().width() + child1->tqminimumSize().width()+4; + maxx = child0->tqmaximumSize().width() + child1->tqmaximumSize().width()+4; + miny = (child0->tqminimumSize().height() > child1->tqminimumSize().height()) ? child0->tqminimumSize().height() : child1->tqminimumSize().height(); + maxy = (child0->tqmaximumSize().height() > child1->tqmaximumSize().height()) ? child0->tqmaximumSize().height() : child1->tqmaximumSize().height(); minx = (minx > 4) ? minx : 4; maxx = (maxx < 32000) ? maxx : 32000; @@ -351,20 +351,20 @@ int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidge if (initialised) { if (m_orientation ==Qt::Vertical) { if (child0==overlappingWidget) { - if (position<(child0->minimumSize().width())) - position=child0->minimumSize().width(); + if (position<(child0->tqminimumSize().width())) + position=child0->tqminimumSize().width(); if (position>width()) position=width()-4; - } else if (position>(width()-(child1->minimumSize().width())-4)){ - position=width()-(child1->minimumSize().width())-4; + } else if (position>(width()-(child1->tqminimumSize().width())-4)){ + position=width()-(child1->tqminimumSize().width())-4; if (position<0) position=0; } } else {// orientation ==Qt::Horizontal if (child0==overlappingWidget) { - if (position<(child0->minimumSize().height())) - position=child0->minimumSize().height(); + if (position<(child0->tqminimumSize().height())) + position=child0->tqminimumSize().height(); if (position>height()) position=height()-4; - } else if (position>(height()-(child1->minimumSize().height())-4)){ - position=height()-(child1->minimumSize().height())-4; + } else if (position>(height()-(child1->tqminimumSize().height())-4)){ + position=height()-(child1->tqminimumSize().height())-4; if (position<0) position=0; } @@ -378,15 +378,15 @@ int KDockSplitter::checkValue( int position ) const { if (initialised){ if (m_orientation ==Qt::Vertical){ - if (position < (child0->minimumSize().width())) - position = child0->minimumSize().width(); - if ((width()-4-position) < (child1->minimumSize().width())) - position = width() - (child1->minimumSize().width()) -4; + if (position < (child0->tqminimumSize().width())) + position = child0->tqminimumSize().width(); + if ((width()-4-position) < (child1->tqminimumSize().width())) + position = width() - (child1->tqminimumSize().width()) -4; } else { - if (position < (child0->minimumSize().height())) - position = (child0->minimumSize().height()); - if ((height()-4-position) < (child1->minimumSize().height())) - position = height() - (child1->minimumSize().height()) -4; + if (position < (child0->tqminimumSize().height())) + position = (child0->tqminimumSize().height()); + if ((height()-4-position) < (child1->tqminimumSize().height())) + position = height() - (child1->tqminimumSize().height()) -4; } } @@ -423,7 +423,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) } else { xpos = factor * checkValue( mapFromGlobal(mev->globalPos()).y() ) / height(); resizeEvent(0); - divider->repaint(true); + divider->tqrepaint(true); } } else { if ((fixedWidth0!=-1) || (fixedWidth1!=-1)) @@ -436,7 +436,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) } else { xpos = factor * checkValue( mapFromGlobal( mev->globalPos()).x() ) / width(); resizeEvent(0); - divider->repaint(true); + divider->tqrepaint(true); } } handled= true; @@ -452,7 +452,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) } xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).y() ) / height(); resizeEvent(0); - divider->repaint(true); + divider->tqrepaint(true); } else { if ((fixedWidth0!=-1) || (fixedWidth1!=-1)) { @@ -460,7 +460,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) } xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).x() ) / width(); resizeEvent(0); - divider->repaint(true); + divider->tqrepaint(true); } handled= true; break; @@ -473,7 +473,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) bool KDockSplitter::event( TQEvent* e ) { if ( e->type() == TQEvent::LayoutHint ){ - // change children min/max size + // change tqchildren min/max size setupMinMaxSize(); setSeparatorPos(xpos); } @@ -492,7 +492,7 @@ void KDockSplitter::updateName() TQString new_name = TQString( child0->name() ) + "," + child1->name(); parentWidget()->setName( new_name.latin1() ); parentWidget()->setCaption( child0->caption() + "," + child1->caption() ); - parentWidget()->repaint( false ); + parentWidget()->tqrepaint( false ); ((KDockWidget*)parentWidget())->firstName = child0->name(); ((KDockWidget*)parentWidget())->lastName = child1->name(); @@ -553,7 +553,7 @@ KDockButton_Private::~KDockButton_Private() void KDockButton_Private::drawButton( TQPainter* p ) { - p->fillRect( 0,0, width(), height(), TQBrush(colorGroup().brush(TQColorGroup::Background)) ); + p->fillRect( 0,0, width(), height(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)) ); p->drawPixmap( (width() - pixmap()->width()) / 2, (height() - pixmap()->height()) / 2, *pixmap() ); if ( moveMouse && !isDown() ){ p->setPen( white ); @@ -561,12 +561,12 @@ void KDockButton_Private::drawButton( TQPainter* p ) p->lineTo( 0, 0 ); p->lineTo( width() - 1, 0 ); - p->setPen( colorGroup().dark() ); + p->setPen( tqcolorGroup().dark() ); p->lineTo( width() - 1, height() - 1 ); p->lineTo( 0, height() - 1 ); } if ( isOn() || isDown() ){ - p->setPen( colorGroup().dark() ); + p->setPen( tqcolorGroup().dark() ); p->moveTo( 0, height() - 1 ); p->lineTo( 0, 0 ); p->lineTo( width() - 1, 0 ); @@ -580,13 +580,13 @@ void KDockButton_Private::drawButton( TQPainter* p ) void KDockButton_Private::enterEvent( TQEvent * ) { moveMouse = true; - repaint(); + tqrepaint(); } void KDockButton_Private::leaveEvent( TQEvent * ) { moveMouse = false; - repaint(); + tqrepaint(); } /*************************************************************************/ diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp index 3d87eace..bb258c6b 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp @@ -181,7 +181,7 @@ void KMdiChildArea::setTopChild( KMdiChildFrm* child, bool /* bSetFocus */ ) m_pZ->removeRef( child ); m_pZ->setAutoDelete( true ); - //disable the labels of all the other children + //disable the labels of all the other tqchildren TQPtrListIterator<KMdiChildFrm> it( *m_pZ ); for ( ; ( *it ); ++it ) ( *it )->m_pCaption->setActive( false ); @@ -230,7 +230,7 @@ void KMdiChildArea::setTopChild( KMdiChildFrm* child, bool /* bSetFocus */ ) void KMdiChildArea::resizeEvent( TQResizeEvent* e ) { - //If we have a maximized children at the top , adjust its size + //If we have a maximized tqchildren at the top , adjust its size KMdiChildFrm* child = topChild(); if ( child && child->state() == KMdiChildFrm::Maximized ) { @@ -368,7 +368,7 @@ void KMdiChildArea::focusTopChild() if ( !lastChild->m_pClient->hasFocus() ) { - //disable the labels of all the other children + //disable the labels of all the other tqchildren TQPtrListIterator<KMdiChildFrm> it ( *m_pZ ); for ( ; ( *it ); ++it ) { @@ -424,10 +424,10 @@ void KMdiChildArea::cascadeMaximized() childFrm->move( pnt ); TQSize curSize( width() - pnt.x(), height() - pnt.y() ); - if ( ( childFrm->minimumSize().width() > curSize.width() ) || - ( childFrm->minimumSize().height() > curSize.height() ) ) + if ( ( childFrm->tqminimumSize().width() > curSize.width() ) || + ( childFrm->tqminimumSize().height() > curSize.height() ) ) { - childFrm->resize( childFrm->minimumSize() ); + childFrm->resize( childFrm->tqminimumSize() ); } else childFrm->resize( curSize ); @@ -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 layout + // create an array to form grid tqlayout int *numRows = new int[ numCols ]; int numCurCol = 0; @@ -742,7 +742,7 @@ void KMdiChildArea::layoutMinimizedChildren() } child->move( posX, posY - child->height() ); - posX = child->geometry().right(); + posX = child->tqgeometry().right(); } } } diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.h b/lib/compatibility/kmdi/qextmdi/kmdichildarea.h index d9d0184e..e175373e 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.h +++ b/lib/compatibility/kmdi/qextmdi/kmdichildarea.h @@ -138,13 +138,13 @@ public: void setTopChild( KMdiChildFrm* child, bool setFocus = false ); /** - * Returns the topmost child (the active one) or 0 if there are no children. + * Returns the topmost child (the active one) or 0 if there are no tqchildren. * Note that the topmost child may be also hidded , if ALL the windows are minimized. */ inline KMdiChildFrm * topChild() const { return m_pZ->last(); } /** - * Returns the number of visible children + * Returns the number of visible tqchildren */ int getVisibleChildCount() const; @@ -157,31 +157,31 @@ public: /** * Sets the MDI childframe window caption font - * A relayout does not occur when using this function + * A retqlayout does not occur when using this function */ void setMdiCaptionFont( const TQFont &fnt ); /** * Sets the foreground color of the active MDI childframe window caption - * A relayout does not occur when using this function + * A retqlayout does not occur when using this function */ void setMdiCaptionActiveForeColor( const TQColor &clr ); /** * Sets the background color of the active MDI childframe window captions - * A relayout does not occur when using this function + * A retqlayout does not occur when using this function */ void setMdiCaptionActiveBackColor( const TQColor &clr ); /** * Sets the foreground color of inactive MDI childframe window captions - * A relayout does not occur when using this function + * A retqlayout does not occur when using this function */ void setMdiCaptionInactiveForeColor( const TQColor &clr ); /** * Sets the background color of inactive MDI childframe window captions - * A relayout does not occur when using this function + * A retqlayout does not occur when using this function */ void setMdiCaptionInactiveBackColor( const TQColor &clr ); @@ -240,7 +240,7 @@ public slots: void tileVertically(); /** - * Position and layout the minimized child frames + * Position and tqlayout the minimized child frames */ void layoutMinimizedChildren(); diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp index 21427186..8086e7f4 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp @@ -278,7 +278,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e ) if ( !m_pClient ) return; - if ( m_pClient->minimumSize() == m_pClient->maximumSize() ) + if ( m_pClient->tqminimumSize() == m_pClient->tqmaximumSize() ) return; if ( m_bResizing ) @@ -329,11 +329,11 @@ void KMdiChildFrm::resizeWindow( int resizeCorner, int xPos, int yPos ) // it could be the client forces the childframe to enlarge its minimum size if ( m_pClient ) { - minWidth = m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER; - minHeight = m_pClient->minimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER + + minWidth = m_pClient->tqminimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER; + minHeight = m_pClient->tqminimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER + m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR; - maxWidth = m_pClient->maximumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER; - maxHeight = m_pClient->maximumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER + + maxWidth = m_pClient->tqmaximumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER; + maxHeight = m_pClient->tqmaximumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER + m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR; } @@ -521,22 +521,22 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) case Maximized: m_pClient->m_stateChanged = true; m_state = state; - // client min / max size / layout behavior don't change + // client min / max size / tqlayout 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() ); + m_pClient->setMaximumSize( m_pClient->tqmaximumSize().width(), m_pClient->tqmaximumSize().height() ); m_pMaximize->setPixmap( *m_pMaxButtonPixmap ); setGeometry( m_restoredRect ); break; case Minimized: m_pClient->m_stateChanged = true; m_state = state; - // restore client min / max size / layout behavior + // restore client min / max size / tqlayout behavior m_pClient->setMinimumSize( m_oldClientMinSize.width(), m_oldClientMinSize.height() ); m_pClient->setMaximumSize( m_oldClientMaxSize.width(), m_oldClientMaxSize.height() ); - if ( m_pClient->layout() != 0L ) + if ( m_pClient->tqlayout() != 0L ) { - m_pClient->layout() ->setResizeMode( m_oldLayoutResizeMode ); + m_pClient->tqlayout() ->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 / layout behavior + // restore client min / max size / tqlayout behavior m_pClient->setMinimumSize( m_oldClientMinSize.width(), m_oldClientMinSize.height() ); m_pClient->setMaximumSize( m_oldClientMaxSize.width(), m_oldClientMaxSize.height() ); - if ( m_pClient->layout() != 0L ) + if ( m_pClient->tqlayout() != 0L ) { - m_pClient->layout() ->setResizeMode( m_oldLayoutResizeMode ); + m_pClient->tqlayout() ->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 / layout behavior don't change + // client min / max size / tqlayout behavior don't change setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX ); m_pMaximize->setPixmap( *m_pRestoreButtonPixmap ); int nFrameWidth = KMDI_CHILDFRM_DOUBLE_BORDER; @@ -590,7 +590,7 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) TQRect maximizedFrmRect( -m_pClient->x(), -m_pClient->y(), m_pManager->width() + nFrameWidth, m_pManager->height() + nFrameHeight ); - if ( geometry() != maximizedFrmRect ) + if ( tqgeometry() != maximizedFrmRect ) { setGeometry( maximizedFrmRect ); } @@ -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 / layout behavior - m_oldClientMinSize = m_pClient->minimumSize(); - m_oldClientMaxSize = m_pClient->maximumSize(); - if ( m_pClient->layout() != 0L ) + // save client min / max size / tqlayout behavior + m_oldClientMinSize = m_pClient->tqminimumSize(); + m_oldClientMaxSize = m_pClient->tqmaximumSize(); + if ( m_pClient->tqlayout() != 0L ) { - m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode(); + m_oldLayoutResizeMode = m_pClient->tqlayout() ->tqresizeMode(); } m_pClient->setMinimumSize( 0, 0 ); m_pClient->setMaximumSize( 0, 0 ); - if ( m_pClient->layout() != 0L ) + if ( m_pClient->tqlayout() != 0L ) { - m_pClient->layout() ->setResizeMode( TQLayout::FreeResize ); + m_pClient->tqlayout() ->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 / layout behavior - m_oldClientMinSize = m_pClient->minimumSize(); - m_oldClientMaxSize = m_pClient->maximumSize(); - if ( m_pClient->layout() != 0L ) + // save client min / max size / tqlayout behavior + m_oldClientMinSize = m_pClient->tqminimumSize(); + m_oldClientMaxSize = m_pClient->tqmaximumSize(); + if ( m_pClient->tqlayout() != 0L ) { - m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode(); + m_oldLayoutResizeMode = m_pClient->tqlayout() ->tqresizeMode(); } - m_restoredRect = geometry(); + m_restoredRect = tqgeometry(); m_pClient->setMinimumSize( 0, 0 ); m_pClient->setMaximumSize( 0, 0 ); - if ( m_pClient->layout() != 0L ) + if ( m_pClient->tqlayout() != 0L ) { - m_pClient->layout() ->setResizeMode( TQLayout::FreeResize ); + m_pClient->tqlayout() ->setResizeMode( TQLayout::FreeResize ); } switchToMinimizeLayout(); m_pManager->childMinimized( this, false ); @@ -694,7 +694,7 @@ void KMdiChildFrm::setCaption( const TQString& text ) void KMdiChildFrm::enableClose( bool bEnable ) { m_pClose->setEnabled( bEnable ); - m_pClose->repaint( false ); + m_pClose->tqrepaint( false ); } //============ setIcon ==================// @@ -779,8 +779,8 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize ) { //reparent to this widget , no flags , point , show it TQPoint pnt2( KMDI_CHILDFRM_BORDER, clientYPos ); - TQSize mincs = w->minimumSize(); - TQSize maxcs = w->maximumSize(); + TQSize mincs = w->tqminimumSize(); + TQSize maxcs = w->tqmaximumSize(); w->setMinimumSize( 0, 0 ); w->setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX ); @@ -798,11 +798,11 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize ) TQObject::connect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) ); if ( m_pClient->minimumWidth() > m_pManager->m_defaultChildFrmSize.width() ) - setMinimumWidth( m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER ); + setMinimumWidth( m_pClient->tqminimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER ); if ( m_pClient->minimumHeight() > m_pManager->m_defaultChildFrmSize.height() ) { - setMinimumHeight( m_pClient->minimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER + + setMinimumHeight( m_pClient->tqminimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER + m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR ); } } @@ -826,8 +826,8 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) if ( focusedChildWidget != 0 ) nameOfFocusedWidget = focusedChildWidget->name(); - TQSize mins = m_pClient->minimumSize(); - TQSize maxs = m_pClient->maximumSize(); + TQSize mins = m_pClient->tqminimumSize(); + TQSize maxs = m_pClient->tqmaximumSize(); m_pClient->reparent( 0, 0, mapToGlobal( pos() ) - pos() + positionOffset, isVisible() ); m_pClient->setMinimumSize( mins.width(), mins.height() ); m_pClient->setMaximumSize( maxs.width(), maxs.height() ); @@ -1005,7 +1005,7 @@ void KMdiChildFrm::doResize( bool captionOnly ) TQWidget* pIconWidget = m_pWinIcon; m_pCaption->setGeometry( KMDI_CHILDFRM_BORDER, KMDI_CHILDFRM_BORDER, captionWidth, captionHeight ); - //The buttons are caption children + //The buttons are caption tqchildren if ( KMdiMainFrm::frameDecorOfAttachedViews() == KMdi::Win95Look ) { rightOffset2 += 2; @@ -1153,7 +1153,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) case TQEvent::ChildRemoved: { // if we lost a child we uninstall ourself as event filter for the lost - // child and its children + // child and its tqchildren TQObject* pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e )->child()); if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits(TQWIDGET_OBJECT_NAME_STRING))*/ ) { @@ -1174,7 +1174,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) case TQEvent::ChildInserted: { // if we got a new child we install ourself as event filter for the new - // child and its children (as we did when we got our client). + // child and its tqchildren (as we did when we got our client). // XXX see linkChildren() and focus policy stuff TQObject* pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child()); if ( ( pNewChild != 0L ) && ::tqqt_cast<TQWidget*>( pNewChild ) ) @@ -1284,9 +1284,9 @@ void KMdiChildFrm::showSystemMenu() TQRect iconGeom; if ( KMdiMainFrm::frameDecorOfAttachedViews() == KMdi::Win95Look ) - iconGeom = m_pWinIcon->geometry(); + iconGeom = m_pWinIcon->tqgeometry(); else - iconGeom = m_pUnixIcon->geometry(); + iconGeom = m_pUnixIcon->tqgeometry(); popupmenuPosition = TQPoint( iconGeom.x(), iconGeom.y() + captionHeight() + KMDI_CHILDFRM_BORDER ); systemMenu() ->popup( mapToGlobal( popupmenuPosition ) ); diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h index 78f4492c..a63c4ed9 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h +++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h @@ -33,7 +33,7 @@ #include <tqpushbutton.h> #include <tqlabel.h> #include <tqdatetime.h> -#include <layout.h> +#include <tqlayout.h> #include <tqdict.h> @@ -247,12 +247,12 @@ public: TQRect mdiAreaContentsRect() const; /** - * Returns the geometry that will be restored by calling restore(). + * Returns the tqgeometry that will be restored by calling restore(). */ TQRect restoreGeometry() const; /** - * Sets the geometry that will be restored by calling restore(). + * Sets the tqgeometry that will be restored by calling restore(). */ void setRestoreGeometry( const TQRect& newRestGeo ); @@ -354,7 +354,7 @@ protected: virtual bool eventFilter( TQObject*, TQEvent* ); /** - * Calculates the new geometry from the new mouse position given as parameters + * Calculates the new tqgeometry from the new mouse position given as parameters * and calls KMdiChildFrm::setGeometry */ void resizeWindow( int resizeCorner, int x, int y ); diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp index ed4ba2d6..f243a2a7 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp @@ -182,7 +182,7 @@ void KMdiChildFrmCaption::setActive( bool bActive ) m_pParent->m_pManager->m_captionInactiveBackColor ); m_bActive = bActive; - repaint( false ); + tqrepaint( false ); } //=============== setCaption ===============// @@ -190,7 +190,7 @@ void KMdiChildFrmCaption::setActive( bool bActive ) void KMdiChildFrmCaption::setCaption( const TQString& text ) { m_szCaption = text; - repaint( false ); + tqrepaint( false ); } //============== heightHint ===============// diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp index 8afdf249..93dcbb56 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp @@ -107,14 +107,14 @@ void KMdiChildView::trackIconAndCaptionChanges( TQWidget *view ) } -//============== internal geometry ==============// +//============== internal tqgeometry ==============// TQRect KMdiChildView::internalGeometry() const { if ( mdiParent() ) { // is attached // get the client area coordinates inside the MDI child frame - TQRect posInFrame = geometry(); + TQRect posInFrame = tqgeometry(); // map these values to the parent of the MDI child frame // (this usually is the MDI child area) and return TQPoint ptTopLeft = mdiParent() ->mapToParent( posInFrame.topLeft() ); @@ -123,14 +123,14 @@ TQRect KMdiChildView::internalGeometry() const } else { - TQRect geo = geometry(); + TQRect geo = tqgeometry(); TQRect frameGeo = externalGeometry(); return TQRect( frameGeo.x(), frameGeo.y(), geo.width(), geo.height() ); - // return geometry(); + // return tqgeometry(); } } -//============== set internal geometry ==============// +//============== set internal tqgeometry ==============// void KMdiChildView::setInternalGeometry( const TQRect& newGeometry ) { @@ -142,7 +142,7 @@ void KMdiChildView::setInternalGeometry( const TQRect& newGeometry ) int nFrameSizeTop = geo.y() - frameGeo.y(); int nFrameSizeLeft = geo.x() - frameGeo.x(); - // create the new geometry that is accepted by the TQWidget::setGeometry() method + // create the new tqgeometry that is accepted by the TQWidget::setGeometry() method TQRect newGeoTQt; newGeoTQt.setX( newGeometry.x() - nFrameSizeLeft ); newGeoTQt.setY( newGeometry.y() - nFrameSizeTop ); @@ -152,7 +152,7 @@ void KMdiChildView::setInternalGeometry( const TQRect& newGeometry ) // newGeoTQt.setWidth(newGeometry.width()+KMDI_MDI_CHILDFRM_DOUBLE_BORDER); // newGeoTQt.setHeight(newGeometry.height()+mdiParent()->captionHeight()+KMDI_MDI_CHILDFRM_DOUBLE_BORDER); - // set the geometry + // set the tqgeometry mdiParent()->setGeometry( newGeoTQt ); } else @@ -163,7 +163,7 @@ void KMdiChildView::setInternalGeometry( const TQRect& newGeometry ) int nFrameSizeTop = geo.y() - frameGeo.y(); int nFrameSizeLeft = geo.x() - frameGeo.x(); - // create the new geometry that is accepted by the TQWidget::setGeometry() method + // create the new tqgeometry that is accepted by the TQWidget::setGeometry() method TQRect newGeoTQt; newGeoTQt.setX( newGeometry.x() - nFrameSizeLeft ); @@ -172,19 +172,19 @@ void KMdiChildView::setInternalGeometry( const TQRect& newGeometry ) newGeoTQt.setWidth( newGeometry.width() ); newGeoTQt.setHeight( newGeometry.height() ); - // set the geometry + // set the tqgeometry setGeometry( newGeoTQt ); } } -//============== external geometry ==============// +//============== external tqgeometry ==============// TQRect KMdiChildView::externalGeometry() const { return mdiParent() ? mdiParent()->frameGeometry() : frameGeometry(); } -//============== set external geometry ==============// +//============== set external tqgeometry ==============// void KMdiChildView::setExternalGeometry( const TQRect& newGeometry ) { @@ -202,7 +202,7 @@ void KMdiChildView::setExternalGeometry( const TQRect& newGeometry ) int nFrameSizeTop = geo.y() - frameGeo.y(); int nFrameSizeLeft = geo.x() - frameGeo.x(); - // create the new geometry that is accepted by the TQWidget::setGeometry() method + // create the new tqgeometry that is accepted by the TQWidget::setGeometry() method // not attached => the window system makes the frame TQRect newGeoTQt; newGeoTQt.setX( newGeometry.x() + nFrameSizeLeft ); @@ -210,7 +210,7 @@ void KMdiChildView::setExternalGeometry( const TQRect& newGeometry ) newGeoTQt.setWidth( newGeometry.width() - nTotalFrameWidth ); newGeoTQt.setHeight( newGeometry.height() - nTotalFrameHeight ); - // set the geometry + // set the tqgeometry setGeometry( newGeoTQt ); } } @@ -277,7 +277,7 @@ TQRect KMdiChildView::restoreGeometry() if ( mdiParent() ) return mdiParent() ->restoreGeometry(); else //FIXME not really supported, may be we must use Windows or X11 funtions - return geometry(); + return tqgeometry(); } //============== setRestoreGeometry ================// @@ -491,7 +491,7 @@ void KMdiChildView::slot_childDestroyed() // do what we do if a child is removed // if we lost a child we uninstall ourself as event filter for the lost - // child and its children + // child and its tqchildren const TQObject * pLostChild = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(TQT_BASE_OBJECT_NAME::sender())); if ( pLostChild && ( pLostChild->isWidgetType() ) ) { @@ -564,7 +564,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) else if ( e->type() == TQEvent::ChildRemoved ) { // if we lost a child we uninstall ourself as event filter for the lost - // child and its children + // child and its tqchildren TQObject * pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child()); if ( ( pLostChild != 0L ) && ( pLostChild->isWidgetType() ) ) { @@ -593,7 +593,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) else if ( e->type() == TQEvent::ChildInserted ) { // if we got a new child and we are attached to the MDI system we - // install ourself as event filter for the new child and its children + // install ourself as event filter for the new child and its tqchildren // (as we did when we were added to the MDI system). TQObject * pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child()); if ( ( pNewChild != 0L ) && ( pNewChild->isWidgetType() ) ) diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildview.h b/lib/compatibility/kmdi/qextmdi/kmdichildview.h index af0c8030..52cca9e0 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, "layout"); + * TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "tqlayout"); * pNewView->reparent( pMDICover, TQPoint(0,0)); * pLayout->addWidget( pNewView); * pMDICover->setName( pNewView->name()); @@ -271,12 +271,12 @@ public: bool isMaximized() const; /** - * Returns the geometry of this MDI child window as TQWidget::geometry() does. + * Returns the tqgeometry of this MDI child window as TQWidget::tqgeometry() does. */ TQRect internalGeometry() const; /** - * Sets the geometry of the client area of this MDI child window. The + * Sets the tqgeometry of the client area of this MDI child window. The * top left position of the argument is the position of the top left point * of the client area in its parent coordinates and the arguments width * and height is the width and height of the client area. Please note: This @@ -285,12 +285,12 @@ public: void setInternalGeometry( const TQRect& newGeomety ); /** - * Returns the frame geometry of this window or of the parent if there is any... + * Returns the frame tqgeometry of this window or of the parent if there is any... */ TQRect externalGeometry() const; /** - * Sets the geometry of the frame of this MDI child window. The top left + * Sets the tqgeometry of the frame of this MDI child window. The top left * position of the argument is the position of the top left point of the * frame in its parent coordinates and the arguments width and height is * the width and height of the widget frame. Please note: This differs @@ -316,12 +316,12 @@ public: virtual void maximize( bool bAnimate ); /** - * Returns the geometry that will be restored by calling restore(). + * Returns the tqgeometry that will be restored by calling restore(). */ TQRect restoreGeometry(); /** - * Sets the geometry that will be restored by calling restore(). + * Sets the tqgeometry that will be restored by calling restore(). */ void setRestoreGeometry( const TQRect& newRestGeo ); @@ -359,7 +359,7 @@ public: */ inline void updateTimeStamp() { - m_time.setDate( TQDate::currentDate() ); + m_time.setDate( TQDate::tqcurrentDate() ); m_time.setTime( TQTime::currentTime() ); } diff --git a/lib/compatibility/kmdi/qextmdi/kmdidefines.h b/lib/compatibility/kmdi/qextmdi/kmdidefines.h index ce41244a..f8dfdeb2 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidefines.h +++ b/lib/compatibility/kmdi/qextmdi/kmdidefines.h @@ -66,7 +66,7 @@ namespace KMdi /** * standard is: show normal, attached, visible, document view (not toolview). Maximize, Minimize, Hide adds * appropriately. Detach adds a view that appears toplevel, ToolWindow adds the view as tool view. - * That means it is stay-on-top and toplevel. UseKMdiSizeHint should use the restore geometry of the + * That means it is stay-on-top and toplevel. UseKMdiSizeHint should use the restore tqgeometry of the * latest current top childframe but is not supported yet. */ StandardAdd = 0, diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp index b80b497b..fa3394ad 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp @@ -24,7 +24,7 @@ #include "kdockwidget_private.h" #include <tqwidgetstack.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtimer.h> #include <tqtooltip.h> #include <kmultitabbar.h> @@ -70,9 +70,9 @@ KMdiDockContainer::KMdiDockContainer( TQWidget *parent, TQWidget *win, int posit if ( m_horizontal ) - l = new TQVBoxLayout( this ); //vertical layout for top and bottom docks + l = new TQVBoxLayout( this ); //vertical tqlayout for top and bottom docks else - l = new TQHBoxLayout( this ); //horizontal layout for left and right docks + l = new TQHBoxLayout( this ); //horizontal tqlayout for left and right docks l->setAutoAdd( false ); @@ -104,9 +104,9 @@ KMdiDockContainer::KMdiDockContainer( TQWidget *parent, TQWidget *win, int posit m_ws = new TQWidgetStack( this ); - m_ws->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + m_ws->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); - //layout the tabbar + //tqlayout the tabbar if ( position == KDockWidget::DockLeft || position == KDockWidget::DockTop ) { //add the tabbar then the widget stack @@ -514,7 +514,7 @@ void KMdiDockContainer::save( TQDomElement& dockEl ) TQDomDocument doc = dockEl.ownerDocument(); TQDomElement el; el = doc.createElement( "name" ); - el.appendChild( doc.createTextNode( TQString( "%1" ).arg( parent() ->name() ) ) ); + el.appendChild( doc.createTextNode( TQString( "%1" ).tqarg( parent() ->name() ) ) ); dockEl.appendChild( el ); el = doc.createElement( "overlapMode" ); el.appendChild( doc.createTextNode( isOverlapMode() ? "true" : "false" ) ); @@ -526,7 +526,7 @@ void KMdiDockContainer::save( TQDomElement& dockEl ) for ( ;it.current() != 0;++it, ++it2 ) { el = doc.createElement( "child" ); - el.setAttribute( "pos", TQString( "%1" ).arg( i ) ); + el.setAttribute( "pos", TQString( "%1" ).tqarg( i ) ); TQString s = tabCaptions[ *it2 ]; if ( !s.isEmpty() ) { @@ -624,8 +624,8 @@ void KMdiDockContainer::load( TQDomElement& dockEl ) void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix ) { TQString grp = cfg->group(); - cfg->deleteGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) ); - cfg->setGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) ); + cfg->deleteGroup( group_or_prefix + TQString( "::%1" ).tqarg( parent() ->name() ) ); + cfg->setGroup( group_or_prefix + TQString( "::%1" ).tqarg( parent() ->name() ) ); if ( isOverlapMode() ) cfg->writeEntry( "overlapMode", "true" ); @@ -647,17 +647,17 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix ) int i = 0; for ( ;it.current() != 0;++it, ++it2 ) { - // cfg->writeEntry(TQString("widget%1").arg(i),m_ws->widget(it.current()->id())->name()); - cfg->writeEntry( TQString( "widget%1" ).arg( i ), ( *it2 ) ); + // cfg->writeEntry(TQString("widget%1").tqarg(i),m_ws->widget(it.current()->id())->name()); + cfg->writeEntry( TQString( "widget%1" ).tqarg( i ), ( *it2 ) ); TQString s = tabCaptions[ *it2 ]; if ( !s.isEmpty() ) { - cfg->writeEntry( TQString( "widget%1-tabCaption" ).arg( i ), s ); + cfg->writeEntry( TQString( "widget%1-tabCaption" ).tqarg( i ), s ); } s = tabTooltips[ *it2 ]; if ( !s.isEmpty() ) { - cfg->writeEntry( TQString( "widget%1-tabTooltip" ).arg( i ), s ); + cfg->writeEntry( TQString( "widget%1-tabTooltip" ).tqarg( i ), s ); } // kdDebug(760)<<"****************************************Saving: "<<m_ws->widget(it.current()->id())->name()<<endl; if ( m_tb->isTabRaised( it.current() ->id() ) ) @@ -672,7 +672,7 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix ) void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix ) { TQString grp = cfg->group(); - cfg->setGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) ); + cfg->setGroup( group_or_prefix + TQString( "::%1" ).tqarg( parent() ->name() ) ); if ( cfg->readEntry( "overlapMode" ) != "false" ) activateOverlapMode( m_tb->width() ); @@ -685,19 +685,19 @@ void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix ) TQString raise; while ( true ) { - TQString dwn = cfg->readEntry( TQString( "widget%1" ).arg( i ) ); + TQString dwn = cfg->readEntry( TQString( "widget%1" ).tqarg( i ) ); if ( dwn.isEmpty() ) break; kdDebug( 760 ) << k_funcinfo << "configuring dockwidget :" << dwn << endl; KDockWidget *dw = ( ( KDockWidget* ) parent() ) ->dockManager() ->getDockWidgetFromName( dwn ); if ( dw ) { - TQString s = cfg->readEntry( TQString( "widget%1-tabCaption" ).arg( i ) ); + TQString s = cfg->readEntry( TQString( "widget%1-tabCaption" ).tqarg( i ) ); if ( !s.isEmpty() ) { dw->setTabPageLabel( s ); } - s = cfg->readEntry( TQString( "widget%1-tabTooltip" ).arg( i ) ); + s = cfg->readEntry( TQString( "widget%1-tabTooltip" ).tqarg( i ) ); if ( !s.isEmpty() ) { dw->setToolTipString( s ); diff --git a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp b/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp index f2c2d599..fb5ed357 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp @@ -56,7 +56,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQString & l KTabWidget::insertTab( child, label, index ); showPage( child ); maybeShow(); - tabBar() ->repaint(); + tabBar() ->tqrepaint(); } void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index ) @@ -64,7 +64,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQIconSet & KTabWidget::insertTab( child, iconset, label, index ); showPage( child ); maybeShow(); - tabBar() ->repaint(); + tabBar() ->tqrepaint(); } void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index ) @@ -72,7 +72,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, TQTab * tab, int i KTabWidget::insertTab( child, tab, index ); showPage( child ); maybeShow(); - tabBar() ->repaint(); + tabBar() ->tqrepaint(); } void KMdiDocumentViewTabWidget::removePage ( TQWidget * w ) diff --git a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp index f27391c8..0cf76c04 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp @@ -128,8 +128,8 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c if ( domDocument().documentElement().isNull() ) { - TQString completeDescription = TQString::fromLatin1( guiDescription ) - .arg( actionListName ); + TQString completeDescription = TQString::tqfromLatin1( guiDescription ) + .tqarg( actionListName ); setXML( completeDescription, false /*merge*/ ); } @@ -257,12 +257,12 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva ) // if ( cfg->hasKey( aname ) ) sc = KShortcut( cfg->readEntry( aname, "" ) ); cfg->setGroup( _grp ); - KAction *a = new ToggleToolViewAction( i18n( "Show %1" ).arg( mtva->wrappedWidget() ->caption() ), + KAction *a = new ToggleToolViewAction( i18n( "Show %1" ).tqarg( mtva->wrappedWidget() ->caption() ), /*TQString()*/sc, dynamic_cast<KDockWidget*>( mtva->wrapperWidget() ), m_mdiMainFrm, actionCollection(), aname.latin1() ); #if KDE_IS_VERSION(3,2,90) - ( ( ToggleToolViewAction* ) a ) ->setCheckedState( i18n( "Hide %1" ).arg( mtva->wrappedWidget() ->caption() ) ); + ( ( ToggleToolViewAction* ) a ) ->setCheckedState( i18n( "Hide %1" ).tqarg( mtva->wrappedWidget() ->caption() ) ); #endif connect( a, TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( actionDeleted( TQObject* ) ) ); diff --git a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp index 4449cb4f..aaa07ff8 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp @@ -38,7 +38,7 @@ #include <assert.h> #include <tqcursor.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqobjectlist.h> #include <tqpopupmenu.h> #include <tqmenubar.h> @@ -56,9 +56,9 @@ #include <tqtoolbutton.h> #include <tqdockarea.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtimer.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqstring.h> #include <tqmap.h> #include <tqvaluelist.h> @@ -298,16 +298,16 @@ void KMdiMainFrm::setStandardMDIMenuEnabled( bool showModeMenu ) //============ ~KMdiMainFrm ============// KMdiMainFrm::~KMdiMainFrm() { - //save the children first to a list, as removing invalidates our iterator - TQValueList<KMdiChildView*> children; + //save the tqchildren first to a list, as removing invalidates our iterator + TQValueList<KMdiChildView*> tqchildren; for ( KMdiChildView * w = m_pDocumentViews->first();w;w = m_pDocumentViews->next() ) - children.append( w ); + tqchildren.append( w ); // safely close the windows so properties are saved... TQValueListIterator<KMdiChildView*> childIt; - for ( childIt = children.begin(); childIt != children.end(); ++childIt ) + for ( childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt ) { - closeWindow( *childIt, false ); // without re-layout taskbar! + closeWindow( *childIt, false ); // without re-tqlayout 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, "layout" ); + TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "tqlayout" ); view->reparent( pMDICover, TQPoint( 0, 0 ) ); pLayout->addWidget( view ); // pMDICover->setName(name); @@ -586,7 +586,7 @@ KMdiToolViewAccessor *KMdiMainFrm::addToolWindow( TQWidget* pWnd, KDockWidget::D pWnd = pDW; } - TQRect r = pWnd->geometry(); + TQRect r = pWnd->tqgeometry(); KMdiToolViewAccessor *mtva = new KMdiToolViewAccessor( this, pWnd, tabToolTip, ( tabCaption == 0 ) ? pWnd->caption() : tabCaption ); m_pToolViews->insert( tvta, mtva ); @@ -614,7 +614,7 @@ void KMdiMainFrm::attachWindow( KMdiChildView *pWnd, bool bShow, bool bAutomatic TQRect frameGeo = pWnd->frameGeometry(); TQPoint topLeftScreen = pWnd->mapToGlobal( TQPoint( 0, 0 ) ); TQPoint topLeftMdiChildArea = m_pMdi->mapFromGlobal( topLeftScreen ); - TQRect childAreaGeo = m_pMdi->geometry(); + TQRect childAreaGeo = m_pMdi->tqgeometry(); if ( topLeftMdiChildArea.x() < 0 || topLeftMdiChildArea.y() < 0 || ( topLeftMdiChildArea.x() + frameGeo.width() > childAreaGeo.width() ) || ( topLeftMdiChildArea.y() + frameGeo.height() > childAreaGeo.height() ) ) @@ -643,7 +643,7 @@ void KMdiMainFrm::attachWindow( KMdiChildView *pWnd, bool bShow, bool bAutomatic m_pMdi->manageChild( lpC, false, bCascade ); if ( m_pMdi->topChild() && m_pMdi->topChild() ->isMaximized() ) { - TQRect r = lpC->geometry(); + TQRect r = lpC->tqgeometry(); lpC->setGeometry( -lpC->m_pClient->x(), -lpC->m_pClient->y(), m_pMdi->width() + KMDI_CHILDFRM_DOUBLE_BORDER, m_pMdi->height() + lpC->captionHeight() + KMDI_CHILDFRM_SEPARATOR + KMDI_CHILDFRM_DOUBLE_BORDER ); @@ -705,7 +705,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow ) #ifdef TQ_WS_X11 if ( mdiMode() == KMdi::ToplevelMode ) { - XSetTransientForHint( qt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() ); + XSetTransientForHint( qt_xdisplay(), pWnd->winId(), tqtopLevelWidget() ->winId() ); } #endif @@ -715,7 +715,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow ) #ifdef TQ_WS_X11 if ( mdiMode() == KMdi::ToplevelMode ) { - XSetTransientForHint( qt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() ); + XSetTransientForHint( qt_xdisplay(), pWnd->winId(), tqtopLevelWidget() ->winId() ); } #endif @@ -1238,14 +1238,14 @@ bool KMdiMainFrm::eventFilter( TQObject * /*obj*/, TQEvent *e ) */ void KMdiMainFrm::closeAllViews() { - //save the children first to a list, as removing invalidates our iterator - TQValueList<KMdiChildView*> children; + //save the tqchildren first to a list, as removing invalidates our iterator + TQValueList<KMdiChildView*> tqchildren; for ( KMdiChildView * w = m_pDocumentViews->first();w;w = m_pDocumentViews->next() ) { - children.append( w ); + tqchildren.append( w ); } TQValueListIterator<KMdiChildView *> childIt; - for ( childIt = children.begin(); childIt != children.end(); ++childIt ) + for ( childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt ) { ( *childIt )->close(); } @@ -1273,7 +1273,7 @@ void KMdiMainFrm::closeActiveView() m_pCurrentWindow->close(); } -/** find the root dockwidgets and store their geometry */ +/** find the root dockwidgets and store their tqgeometry */ void KMdiMainFrm::findRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetList, TQValueList<TQRect>* positionList ) { //nothing is valid @@ -1289,7 +1289,7 @@ void KMdiMainFrm::findRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetLis pObjList = queryList( "KDockWidget_Compat::KDockWidget" ); TQObjectListIt it( *pObjList ); - // for all dockwidgets (which are children of this mainwindow) + // for all dockwidgets (which are tqchildren of this mainwindow) while ( ( *it ) ) { KDockWidget* dockWindow = 0L; /* pDockW */ @@ -1357,7 +1357,7 @@ void KMdiMainFrm::switchToToplevelMode() const int frameBorderWidth = 7; // @todo: Can we / do we need to ask the window manager? setUndockPositioningOffset( TQPoint( 0, ( m_pTaskBar ? m_pTaskBar->height() : 0 ) + frameBorderWidth ) ); - // 1.) select the dockwidgets to be undocked and store their geometry + // 1.) select the dockwidgets to be undocked and store their tqgeometry TQPtrList<KDockWidget> rootDockWidgetList; TQValueList<TQRect> positionList; @@ -1470,7 +1470,7 @@ void KMdiMainFrm::switchToChildframeMode() if ( m_mdiMode == KMdi::TabPageMode ) { kdDebug(760) << k_funcinfo << "finishing tab page mode" << endl; - // select the dockwidgets to be undocked and store their geometry + // select the dockwidgets to be undocked and store their tqgeometry findRootDockWidgets( &rootDockWidgetList, &positionList ); kdDebug(760) << k_funcinfo << "Found " << rootDockWidgetList.count() << " widgets to undock" << endl; @@ -1490,7 +1490,7 @@ void KMdiMainFrm::switchToChildframeMode() kdDebug(760) << k_funcinfo << "finishing ideal mode" << endl; finishIDEAlMode( false ); - // select the dockwidgets to be undocked and store their geometry + // select the dockwidgets to be undocked and store their tqgeometry findRootDockWidgets( &rootDockWidgetList, &positionList ); kdDebug(760) << k_funcinfo << "Found " << rootDockWidgetList.count() << " widgets to undock" << endl; @@ -1663,8 +1663,8 @@ void KMdiMainFrm::finishTabPageMode() if ( pView->isToolView() ) continue; kdDebug(760) << "KMdiMainFrm::finishTabPageMode: in loop" << endl; - TQSize mins = pView->minimumSize(); - TQSize maxs = pView->maximumSize(); + TQSize mins = pView->tqminimumSize(); + TQSize maxs = pView->tqmaximumSize(); TQSize sz = pView->size(); TQWidget* pParent = pView->parentWidget(); TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset ); @@ -2079,8 +2079,8 @@ void KMdiMainFrm::finishIDEAlMode( bool full ) KMdiChildView* pView = it.current(); if ( pView->isToolView() ) continue; - TQSize mins = pView->minimumSize(); - TQSize maxs = pView->maximumSize(); + TQSize mins = pView->tqminimumSize(); + TQSize maxs = pView->tqmaximumSize(); TQSize sz = pView->size(); TQWidget* pParent = pView->parentWidget(); TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset ); diff --git a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h index ea19c899..18a47c3a 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h +++ b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h @@ -142,7 +142,7 @@ public: * use fakeSDIApplication() to fake it and isFakingSDIApplication() to query whether or not an SDI * interface is being faked. * - * You can dynamically change the shape of the attached MDI views using setFrameDecorOfAttachedViews(). + * You can dynamically change the tqshape of the attached MDI views using setFrameDecorOfAttachedViews(). * * Additionally, here's a hint how to restore the mainframe's settings from config file: * \code @@ -526,7 +526,7 @@ public slots: /** * Adds a KMdiChildView to the MDI system. The main frame takes control of it. - * \param rectNormal Sets the geometry for this child view + * \param rectNormal Sets the tqgeometry for this child view * \param flags the flags for the view such as: * \li whether the view should be attached or detached. * \li whether the view should be shown or hidden diff --git a/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp b/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp index 662924f3..7e775ccc 100644 --- a/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp @@ -102,7 +102,7 @@ void KMdiTaskBarButton::fitText( const TQString& origStr, int newWidth ) { TQButton::setText( m_actualText ); - int actualWidth = sizeHint().width(); + int actualWidth = tqsizeHint().width(); int realLetterCount = origStr.length(); int newLetterCount = ( newWidth * realLetterCount ) / actualWidth; int w = newWidth + 1; @@ -337,16 +337,16 @@ 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 = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); + int buttonAreaWidth = taskBarWidth - tbHandlePixel - tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5; if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < parentWidget() ->width() ) ) { for ( b = m_pButtonList->first();b;b = m_pButtonList->next() ) { b->setText( b->actualText() ); - if ( b->width() != b->sizeHint().width() ) + if ( b->width() != b->tqsizeHint().width() ) { - b->setFixedWidth( b->sizeHint().width() ); + b->setFixedWidth( b->tqsizeHint().width() ); b->show(); } } diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp b/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp index a5935ffd..3e69c674 100644 --- a/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp @@ -28,7 +28,7 @@ #include "kmultitabbar_p.moc" #include <tqbutton.h> #include <tqpopupmenu.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpainter.h> #include <tqtooltip.h> #include <tqfontmetrics.h> @@ -110,7 +110,7 @@ void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style) mainLayout->setAutoAdd(true); } - viewport()->repaint(); + viewport()->tqrepaint(); } void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy, int clipw, int cliph ) @@ -120,9 +120,9 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip if (m_position==KMultiTabBar::Right) { - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,0,0,viewport()->height()); - paint->setPen(colorGroup().background().dark(120)); + paint->setPen(tqcolorGroup().background().dark(120)); paint->drawLine(1,0,1,viewport()->height()); @@ -130,28 +130,28 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip else if (m_position==KMultiTabBar::Left) { - paint->setPen(colorGroup().light()); + paint->setPen(tqcolorGroup().light()); paint->drawLine(23,0,23,viewport()->height()); paint->drawLine(22,0,22,viewport()->height()); - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,0,0,viewport()->height()); } else if (m_position==KMultiTabBar::Bottom) { - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,0,viewport()->width(),0); - paint->setPen(colorGroup().background().dark(120)); + paint->setPen(tqcolorGroup().background().dark(120)); paint->drawLine(0,1,viewport()->width(),1); } else { - paint->setPen(colorGroup().light()); + paint->setPen(tqcolorGroup().light()); paint->drawLine(0,23,viewport()->width(),23); paint->drawLine(0,22,viewport()->width(),22); -/* paint->setPen(colorGroup().shadow()); +/* paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,0,0,viewport()->height());*/ } @@ -188,8 +188,8 @@ void KMultiTabBarInternal::mousePressEvent(TQMouseEvent *ev) void KMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) { /* kdDebug()<<"KMultiTabBarInternal::resizeEvent"<<endl; - kdDebug()<<"KMultiTabBarInternal::resizeEvent - box geometry"<<box->geometry()<<endl; - kdDebug()<<"KMultiTabBarInternal::resizeEvent - geometry"<<geometry()<<endl;*/ + kdDebug()<<"KMultiTabBarInternal::resizeEvent - box tqgeometry"<<box->tqgeometry()<<endl; + kdDebug()<<"KMultiTabBarInternal::resizeEvent - tqgeometry"<<tqgeometry()<<endl;*/ if (ev) TQScrollView::resizeEvent(ev); if ( (m_style==KMultiTabBar::KDEV3) || @@ -378,7 +378,7 @@ void KMultiTabBarInternal::setPosition(enum KMultiTabBar::KMultiTabBarPosition p m_position=pos; for (uint i=0;i<m_tabs.count();i++) m_tabs.at(i)->setTabsPosition(m_position); - viewport()->repaint(); + viewport()->tqrepaint(); } @@ -435,13 +435,13 @@ void KMultiTabBarButton::slotClicked() void KMultiTabBarButton::setPosition(KMultiTabBar::KMultiTabBarPosition pos) { m_position=pos; - repaint(); + tqrepaint(); } void KMultiTabBarButton::setStyle(KMultiTabBar::KMultiTabBarStyle style) { m_style=style; - repaint(); + tqrepaint(); } void KMultiTabBarButton::hideEvent( TQHideEvent* he) { @@ -457,7 +457,7 @@ void KMultiTabBarButton::showEvent( TQShowEvent* he) { } -TQSize KMultiTabBarButton::sizeHint() const +TQSize KMultiTabBarButton::tqsizeHint() const { constPolish(); @@ -473,7 +473,7 @@ TQSize KMultiTabBarButton::sizeHint() const } #endif if ( isMenuButton() ) - w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this); + w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this); if ( pixmap() ) { TQPixmap *pm = (TQPixmap *)pixmap(); @@ -483,7 +483,7 @@ TQSize KMultiTabBarButton::sizeHint() const TQString s( text() ); bool empty = s.isEmpty(); if ( empty ) - s = TQString::fromLatin1("XXXX"); + s = TQString::tqfromLatin1("XXXX"); TQFontMetrics fm = fontMetrics(); TQSize sz = fm.size( ShowPrefix, s ); if(!empty || !w) @@ -526,7 +526,7 @@ void KMultiTabBarTab::setTabsPosition(KMultiTabBar::KMultiTabBarPosition pos) } setPosition(pos); -// repaint(); +// tqrepaint(); } void KMultiTabBarTab::setIcon(const TQString& icon) @@ -578,12 +578,12 @@ void KMultiTabBarTab::updateState() if ((m_position==KMultiTabBar::Right || m_position==KMultiTabBar::Left)) { setFixedWidth(24); if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) { - setFixedHeight(KMultiTabBarButton::sizeHint().width()); + setFixedHeight(KMultiTabBarButton::tqsizeHint().width()); } else setFixedHeight(36); } else { setFixedHeight(24); if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) { - setFixedWidth(KMultiTabBarButton::sizeHint().width()); + setFixedWidth(KMultiTabBarButton::tqsizeHint().width()); } else setFixedWidth(36); } } else { @@ -634,7 +634,7 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) { const int height = 24; if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) { if ((m_position==KMultiTabBar::Left) || (m_position==KMultiTabBar::Right)) - sh=TQSize(this->height(),this->width());//KMultiTabBarButton::sizeHint(); + sh=TQSize(this->height(),this->width());//KMultiTabBarButton::tqsizeHint(); else sh=TQSize(this->width(),this->height()); } else @@ -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); + tqstyle().tqdrawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st); + tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st); switch (m_position) { case KMultiTabBar::Left: @@ -668,8 +668,8 @@ 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()), -// colorGroup(),TQStyle::Style_Enabled); +// tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), +// tqcolorGroup(),TQStyle::Style_Enabled); } @@ -679,58 +679,58 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) TQPixmap pixmap; if ( iconSet()) pixmap = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ); - paint->fillRect(0, 0, 24, 24, colorGroup().background()); + paint->fillRect(0, 0, 24, 24, tqcolorGroup().background()); if (!isOn()) { if (m_position==KMultiTabBar::Right) { - paint->fillRect(0,0,21,21,TQBrush(colorGroup().background())); + paint->fillRect(0,0,21,21,TQBrush(tqcolorGroup().background())); - paint->setPen(colorGroup().background().dark(150)); + paint->setPen(tqcolorGroup().background().dark(150)); paint->drawLine(0,22,23,22); paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap); - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,0,0,23); - paint->setPen(colorGroup().background().dark(120)); + paint->setPen(tqcolorGroup().background().dark(120)); paint->drawLine(1,0,1,23); } else if ((m_position==KMultiTabBar::Bottom) || (m_position==KMultiTabBar::Top)) { - paint->fillRect(0,1,23,22,TQBrush(colorGroup().background())); + paint->fillRect(0,1,23,22,TQBrush(tqcolorGroup().background())); paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap); - paint->setPen(colorGroup().background().dark(120)); + paint->setPen(tqcolorGroup().background().dark(120)); paint->drawLine(23,0,23,23); - paint->setPen(colorGroup().light()); + paint->setPen(tqcolorGroup().light()); paint->drawLine(0,22,23,22); paint->drawLine(0,23,23,23); - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,0,23,0); - paint->setPen(colorGroup().background().dark(120)); + paint->setPen(tqcolorGroup().background().dark(120)); paint->drawLine(0,1,23,1); } else { - paint->setPen(colorGroup().background().dark(120)); + paint->setPen(tqcolorGroup().background().dark(120)); paint->drawLine(0,23,23,23); - paint->fillRect(0,0,23,21,TQBrush(colorGroup().background())); + paint->fillRect(0,0,23,21,TQBrush(tqcolorGroup().background())); paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap); - paint->setPen(colorGroup().light()); + paint->setPen(tqcolorGroup().light()); paint->drawLine(23,0,23,23); paint->drawLine(22,0,22,23); - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,0,0,23); } @@ -741,12 +741,12 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) { if (m_position==KMultiTabBar::Right) { - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,height()-1,23,height()-1); paint->drawLine(0,height()-2,23,height()-2); paint->drawLine(23,0,23,height()-1); paint->drawLine(22,0,22,height()-1); - paint->fillRect(0,0,21,height()-3,TQBrush(colorGroup().light())); + paint->fillRect(0,0,21,height()-3,TQBrush(tqcolorGroup().light())); paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); if (m_showActiveTabText) @@ -756,9 +756,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) TQPixmap tpixmap(height()-25-3, width()-2); TQPainter painter(&tpixmap); - painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light())); + painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light())); - painter.setPen(colorGroup().text()); + painter.setPen(tqcolorGroup().text()); painter.drawText(0,+width()/2+TQFontMetrics(TQFont()).height()/2,m_text); paint->rotate(90); @@ -770,25 +770,25 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) else if (m_position==KMultiTabBar::Top) { - paint->fillRect(0,0,width()-1,23,TQBrush(colorGroup().light())); + paint->fillRect(0,0,width()-1,23,TQBrush(tqcolorGroup().light())); paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); if (m_showActiveTabText) { - paint->setPen(colorGroup().text()); + paint->setPen(tqcolorGroup().text()); paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text); } } else if (m_position==KMultiTabBar::Bottom) { - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,23,width()-1,23); paint->drawLine(0,22,width()-1,22); - paint->fillRect(0,0,width()-1,21,TQBrush(colorGroup().light())); + paint->fillRect(0,0,width()-1,21,TQBrush(tqcolorGroup().light())); paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); if (m_showActiveTabText) { - paint->setPen(colorGroup().text()); + paint->setPen(tqcolorGroup().text()); paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text); } @@ -797,10 +797,10 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) { - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,height()-1,23,height()-1); paint->drawLine(0,height()-2,23,height()-2); - paint->fillRect(0,0,23,height()-3,TQBrush(colorGroup().light())); + paint->fillRect(0,0,23,height()-3,TQBrush(tqcolorGroup().light())); paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); if (m_showActiveTabText) { @@ -810,9 +810,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) TQPixmap tpixmap(height()-25-3, width()-2); TQPainter painter(&tpixmap); - painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light())); + painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light())); - painter.setPen(colorGroup().text()); + painter.setPen(tqcolorGroup().text()); painter.drawText(tpixmap.width()-TQFontMetrics(TQFont()).width(m_text),+width()/2+TQFontMetrics(TQFont()).height()/2,m_text); paint->rotate(-90); @@ -839,13 +839,13 @@ KMultiTabBar::KMultiTabBar(KMultiTabBarMode bm, TQWidget *parent,const char *nam if (bm==Vertical) { m_l=new TQVBoxLayout(this); - setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true); + tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true); // setFixedWidth(24); } else { m_l=new TQHBoxLayout(this); - setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true); + tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true); // setFixedHeight(24); } m_l->setMargin(0); @@ -980,7 +980,7 @@ void KMultiTabBar::fontChange(const TQFont& /* oldFont */) { for (uint i=0;i<tabs()->count();i++) tabs()->at(i)->resize(); - repaint(); + tqrepaint(); } TQPtrList<KMultiTabBarTab>* KMultiTabBar::tabs() {return m_internal->tabs();} diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar.h b/lib/compatibility/kmdi/qextmdi/kmultitabbar.h index 904027a3..fc246b1f 100644 --- a/lib/compatibility/kmdi/qextmdi/kmultitabbar.h +++ b/lib/compatibility/kmdi/qextmdi/kmultitabbar.h @@ -28,7 +28,7 @@ #include <tqscrollview.h> #include <tqvbox.h> #include <tqhbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqstring.h> #include <tqptrlist.h> #include <tqpushbutton.h> @@ -181,7 +181,7 @@ public slots: */ void setText(const TQString &); - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected: KMultiTabBar::KMultiTabBarPosition m_position; diff --git a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp b/lib/compatibility/kmdi/qextmdi/ktabbar.cpp index c8393a8e..26a1c5e4 100644 --- a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp +++ b/lib/compatibility/kmdi/qextmdi/ktabbar.cpp @@ -80,7 +80,7 @@ void KTabBar::setTabEnabled( int id, bool enabled ) emit selected( t->identifier() ); } } - repaint( r ); + tqrepaint( r ); } } } @@ -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 = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3; + yoff = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4; } else { xoff = 7; @@ -252,7 +252,7 @@ void KTabBar::dragMoveEvent( TQDragMoveEvent *e ) TQTab *tab = selectTab( e->pos() ); if( tab ) { bool accept = false; - // The receivers of the testCanDecode() signal has to adjust + // The tqreceivers of the testCanDecode() signal has to adjust // 'accept' accordingly. emit testCanDecode( e, accept); if ( accept && tab != TQTabBar::tab( currentTab() ) ) { @@ -293,7 +293,7 @@ void KTabBar::setTabColor( int id, const TQColor& color ) TQTab *t = tab( id ); if ( t ) { mTabColors.insert( id, color ); - repaint( t->rect(), false ); + tqrepaint( t->rect(), false ); } } @@ -302,7 +302,7 @@ const TQColor &KTabBar::tabColor( int id ) const if ( mTabColors.contains( id ) ) return mTabColors[id]; - return colorGroup().foreground(); + return tqcolorGroup().foreground(); } int KTabBar::insertTab( TQTab *t, int index ) @@ -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 = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ); + int inactiveYShift = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ); int right = t->text().isEmpty() ? br.right() - pixw : br.left() + 2; @@ -357,12 +357,12 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br, if ( has_focus ) flags |= TQStyle::Style_HasFocus; - TQColorGroup cg( colorGroup() ); + TQColorGroup cg( tqcolorGroup() ); if ( mTabColors.contains( t->identifier() ) ) cg.setColor( TQColorGroup::Foreground, mTabColors[t->identifier()] ); - tqstyle().drawControl( TQStyle::CE_TabBarLabel, p, this, r, - t->isEnabled() ? cg : palette().disabled(), + tqstyle().tqdrawControl( TQStyle::CE_TabBarLabel, p, this, r, + t->isEnabled() ? cg : tqpalette().disabled(), flags, TQStyleOption(t) ); } diff --git a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp index 8d74ebe3..55fdcaf8 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()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() ); + overlap = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() ); TQFontMetrics fm = tabBar()->fontMetrics(); int x = 0; @@ -250,7 +250,7 @@ void KTabWidget::resizeTabs( int changeTabIndex ) newMaxLength=d->m_maxLength; uint lcw=0, rcw=0; - int tabBarHeight = tabBar()->sizeHint().height(); + int tabBarHeight = tabBar()->tqsizeHint().height(); if ( cornerWidget( TopLeft ) && cornerWidget( TopLeft )->isVisible() ) lcw = TQMAX( cornerWidget( TopLeft )->width(), tabBarHeight ); if ( cornerWidget( TopRight ) && cornerWidget( TopRight )->isVisible() ) @@ -294,7 +294,7 @@ void KTabWidget::dragMoveEvent( TQDragMoveEvent *e ) { if ( isEmptyTabbarSpace( e->pos() ) ) { bool accept = false; - // The receivers of the testCanDecode() signal has to adjust + // The tqreceivers of the testCanDecode() signal has to adjust // 'accept' accordingly. emit testCanDecode( e, accept); e->accept( accept ); @@ -445,7 +445,7 @@ void KTabWidget::removePage( TQWidget * w ) { bool KTabWidget::isEmptyTabbarSpace( const TQPoint &p ) const { TQPoint point( p ); - TQSize size( tabBar()->sizeHint() ); + TQSize size( tabBar()->tqsizeHint() ); if ( ( tabPosition()==Top && point.y()< size.height() ) || ( tabPosition()==Bottom && point.y()>(height()-size.height() ) ) ) { TQWidget *rightcorner = cornerWidget( TopRight ); if ( rightcorner ) { |