diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
commit | f7e71d47719ab6094cf4a9fafffa5ea351973522 (patch) | |
tree | 30834aa632d442019e14f88685001d94657d060b /kmdi | |
parent | b31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff) | |
download | tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip |
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase. If it does then it needs to be fixed!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmdi')
-rw-r--r-- | kmdi/kmdi/dockcontainer.cpp | 28 | ||||
-rw-r--r-- | kmdi/kmdi/guiclient.cpp | 4 | ||||
-rw-r--r-- | kmdi/kmdi/mainwindow.cpp | 36 | ||||
-rw-r--r-- | kmdi/kmdi/mainwindow.h | 2 | ||||
-rw-r--r-- | kmdi/kmdi/tabwidget.cpp | 6 | ||||
-rw-r--r-- | kmdi/kmdi/toolviewaccessor.cpp | 4 | ||||
-rw-r--r-- | kmdi/kmdi/toolviewaccessor.h | 2 | ||||
-rw-r--r-- | kmdi/kmdichildarea.cpp | 6 | ||||
-rw-r--r-- | kmdi/kmdichildarea.h | 2 | ||||
-rw-r--r-- | kmdi/kmdichildfrm.cpp | 44 | ||||
-rw-r--r-- | kmdi/kmdichildfrm.h | 14 | ||||
-rw-r--r-- | kmdi/kmdichildfrmcaption.cpp | 6 | ||||
-rw-r--r-- | kmdi/kmdichildfrmcaption.h | 2 | ||||
-rw-r--r-- | kmdi/kmdichildview.cpp | 8 | ||||
-rw-r--r-- | kmdi/kmdichildview.h | 10 | ||||
-rw-r--r-- | kmdi/kmdidockcontainer.cpp | 26 | ||||
-rw-r--r-- | kmdi/kmdidocumentviewtabwidget.cpp | 8 | ||||
-rw-r--r-- | kmdi/kmdifocuslist.h | 2 | ||||
-rw-r--r-- | kmdi/kmdiguiclient.cpp | 4 | ||||
-rw-r--r-- | kmdi/kmdimainfrm.cpp | 90 | ||||
-rw-r--r-- | kmdi/kmdimainfrm.h | 8 | ||||
-rw-r--r-- | kmdi/kmditaskbar.cpp | 12 | ||||
-rw-r--r-- | kmdi/kmditaskbar.h | 2 | ||||
-rw-r--r-- | kmdi/kmditoolviewaccessor.cpp | 6 | ||||
-rw-r--r-- | kmdi/kmditoolviewaccessor.h | 2 | ||||
-rw-r--r-- | kmdi/test/hello.cpp | 6 | ||||
-rw-r--r-- | kmdi/test/hello.h | 2 |
27 files changed, 171 insertions, 171 deletions
diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp index 3455fe1e8..7e09ae100 100644 --- a/kmdi/kmdi/dockcontainer.cpp +++ b/kmdi/kmdi/dockcontainer.cpp @@ -90,7 +90,7 @@ DockContainer::DockContainer(TQWidget *parent, TQWidget *win, int position, int m_ws=new TQWidgetStack(this); - m_ws->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding)); + m_ws->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding)); if ( (position==KDockWidget::DockLeft) || (position==KDockWidget::DockTop)) { @@ -119,7 +119,7 @@ DockContainer::~DockContainer() it = m_map.begin(); KDockWidget *w=it.key(); if (m_overlapButtons.contains(w)) { - (static_cast<KDockWidgetHeader*>(w->getHeader()->qt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]); + (static_cast<KDockWidgetHeader*>(w->getHeader()->tqqt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]); m_overlapButtons.remove(w); } m_map.remove(w); @@ -149,7 +149,7 @@ void DockContainer::init() if ( parentDockWidget() && parentDockWidget()->parent() ) { KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()-> - parent()->qt_cast("KDockSplitter")); + parent()->tqqt_cast("KDockSplitter")); if ( sp ) sp->setSeparatorPosX( m_separatorPos ); } @@ -181,15 +181,15 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt m_revMap.insert(tab,w); - if (((KDockWidget*)parentWidget())->mayBeShow()) - ((KDockWidget*)parentWidget())->dockBack(); + if (((KDockWidget*)tqparentWidget())->mayBeShow()) + ((KDockWidget*)tqparentWidget())->dockBack(); - if (w->getHeader()->qt_cast("KDockWidgetHeader")) + if (w->getHeader()->tqqt_cast("KDockWidgetHeader")) { kdDebug(760)<<"*** KDockWidgetHeader has been found"<<endl; KDockWidgetHeader *hdr=static_cast<KDockWidgetHeader*>(w->getHeader()-> - qt_cast("KDockWidgetHeader")); + tqqt_cast("KDockWidgetHeader")); KDockButton_Private *btn = new KDockButton_Private( hdr, "OverlapButton" ); @@ -257,7 +257,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event ) break; } KDockWidgetHeader *hdr=static_cast<KDockWidgetHeader*>(w->getHeader()-> - qt_cast("KDockWidgetHeader")); + tqqt_cast("KDockWidgetHeader")); if (!hdr) { kdDebug()<<"Wrong header type in DockContainer::eventFilter"<<endl; break; @@ -337,7 +337,7 @@ void DockContainer::changeOverlapMode() void DockContainer::hideIfNeeded() { kdDebug(760)<<"************************* hideIfNeeded *************************"<<endl; if (!itemNames.count()) - ((KDockWidget*)parentWidget())->undock(); + ((KDockWidget*)tqparentWidget())->undock(); } void DockContainer::removeWidget(KDockWidget* dwdg) @@ -357,7 +357,7 @@ void DockContainer::removeWidget(KDockWidget* dwdg) m_map.remove(w); m_revMap.remove(id); if (m_overlapButtons.contains(w)) { - (static_cast<KDockWidgetHeader*>(w->getHeader()->qt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]); + (static_cast<KDockWidgetHeader*>(w->getHeader()->tqqt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]); m_overlapButtons.remove(w); } KDockContainer::removeWidget(w); @@ -365,7 +365,7 @@ void DockContainer::removeWidget(KDockWidget* dwdg) tabCaptions.remove(w->name()); tabTooltips.remove(w->name()); if (!itemNames.count()) - ((KDockWidget*)parentWidget())->undock(); + ((KDockWidget*)tqparentWidget())->undock(); } void DockContainer::undockWidget(KDockWidget *dwdg) @@ -405,7 +405,7 @@ void DockContainer::tabClicked(int t) } m_ws->raiseWidget(t); if (m_ws->widget(t)) { - KDockWidget *tmpDw=static_cast<KDockWidget*>(m_ws->widget(t)->qt_cast("KDockWidget")); + KDockWidget *tmpDw=static_cast<KDockWidget*>(m_ws->widget(t)->tqqt_cast("KDockWidget")); if (tmpDw) { if (tmpDw->getWidget()) tmpDw->getWidget()->setFocus(); } else kdDebug(760)<<"Something really weird is going on"<<endl; @@ -423,7 +423,7 @@ void DockContainer::tabClicked(int t) if ( parentDockWidget() && parentDockWidget()->parent() ) { KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()-> - parent()->qt_cast("KDockSplitter")); + parent()->tqqt_cast("KDockSplitter")); if ( sp ) m_separatorPos = sp->separatorPos(); } @@ -476,7 +476,7 @@ void DockContainer::save(KConfig* cfg,const TQString& group_or_prefix) if ( parentDockWidget() && parentDockWidget()->parent() ) { KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()-> - parent()->qt_cast("KDockSplitter")); + parent()->tqqt_cast("KDockSplitter")); if ( sp ) cfg->writeEntry( "separatorPosition", m_separatorPos ); } diff --git a/kmdi/kmdi/guiclient.cpp b/kmdi/kmdi/guiclient.cpp index 882916f30..0522d78a1 100644 --- a/kmdi/kmdi/guiclient.cpp +++ b/kmdi/kmdi/guiclient.cpp @@ -68,7 +68,7 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name) if ( domDocument().documentElement().isNull() ) { - TQString completeDescription = TQString::fromLatin1( guiDescription ).arg( actionListName ); + TQString completeDescription = TQString::tqfromLatin1( guiDescription ).arg( actionListName ); setXML( completeDescription, false /*merge*/ ); } @@ -202,7 +202,7 @@ void ToggleToolViewAction::anDWChanged() setChecked(true); else if (isChecked() && (m_dw->parentDockTabGroup() && ((static_cast<KDockWidget*>(m_dw->parentDockTabGroup()-> - parent()->qt_cast("KDockWidget")))->mayBeShow()))) + parent()->tqqt_cast("KDockWidget")))->mayBeShow()))) setChecked(false); } diff --git a/kmdi/kmdi/mainwindow.cpp b/kmdi/kmdi/mainwindow.cpp index d6e332780..912ad3a1d 100644 --- a/kmdi/kmdi/mainwindow.cpp +++ b/kmdi/kmdi/mainwindow.cpp @@ -97,8 +97,8 @@ namespace KMDI { //============ constructor ============// -MainWindow::MainWindow(TQWidget* parentWidget, const char* name) - : KParts::DockMainWindow( parentWidget, name) +MainWindow::MainWindow(TQWidget* tqparentWidget, const char* name) + : KParts::DockMainWindow( tqparentWidget, name) , m_toolViews (new TQMap<TQWidget*,KMDI::ToolViewAccessor*>) , d(new KMDIPrivate::MainWindowPrivate()) { @@ -156,19 +156,19 @@ void MainWindow::setupToolViews () w=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent()); } - TQPtrList<KDockWidget> leftReparentWidgets; - TQPtrList<KDockWidget> rightReparentWidgets; - TQPtrList<KDockWidget> bottomReparentWidgets; - TQPtrList<KDockWidget> topReparentWidgets; + TQPtrList<KDockWidget> leftRetqparentWidgets; + TQPtrList<KDockWidget> rightRetqparentWidgets; + TQPtrList<KDockWidget> bottomRetqparentWidgets; + TQPtrList<KDockWidget> topRetqparentWidgets; if (mainDock->parentDockTabGroup()) { mainDock=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent()); } - findToolViewsDockedToMain(&leftReparentWidgets,KDockWidget::DockLeft); - findToolViewsDockedToMain(&rightReparentWidgets,KDockWidget::DockRight); - findToolViewsDockedToMain(&bottomReparentWidgets,KDockWidget::DockBottom); - findToolViewsDockedToMain(&topReparentWidgets,KDockWidget::DockTop); + findToolViewsDockedToMain(&leftRetqparentWidgets,KDockWidget::DockLeft); + findToolViewsDockedToMain(&rightRetqparentWidgets,KDockWidget::DockRight); + findToolViewsDockedToMain(&bottomRetqparentWidgets,KDockWidget::DockBottom); + findToolViewsDockedToMain(&topRetqparentWidgets,KDockWidget::DockTop); mainDock->setEnableDocking(KDockWidget::DockNone); //::DockCorner); mainDock->setDockSite(KDockWidget::DockCorner); @@ -220,10 +220,10 @@ void MainWindow::setupToolViews () m_topContainer->setDockSite( KDockWidget::DockCenter ); m_bottomContainer->setDockSite( KDockWidget::DockCenter ); - dockToolViewsIntoContainers(leftReparentWidgets,m_leftContainer); - dockToolViewsIntoContainers(rightReparentWidgets,m_rightContainer); - dockToolViewsIntoContainers(bottomReparentWidgets,m_bottomContainer); - dockToolViewsIntoContainers(topReparentWidgets,m_topContainer); + dockToolViewsIntoContainers(leftRetqparentWidgets,m_leftContainer); + dockToolViewsIntoContainers(rightRetqparentWidgets,m_rightContainer); + dockToolViewsIntoContainers(bottomRetqparentWidgets,m_bottomContainer); + dockToolViewsIntoContainers(topRetqparentWidgets,m_topContainer); dockManager->setSpecialLeftDockContainer(m_leftContainer); dockManager->setSpecialRightDockContainer(m_rightContainer); @@ -311,16 +311,16 @@ void MainWindow::setToolViewStyle(int flag) { d->m_styleIDEAlMode = flag; // see KMultiTabBar for the first 3 bits - DockContainer *tmpL=(DockContainer*) (m_leftContainer->getWidget()->qt_cast("KMDI::DockContainer")); + DockContainer *tmpL=(DockContainer*) (m_leftContainer->getWidget()->tqqt_cast("KMDI::DockContainer")); if (tmpL) tmpL->setStyle(flag); - DockContainer *tmpR=(DockContainer*) (m_rightContainer->getWidget()->qt_cast("KMDI::DockContainer")); + DockContainer *tmpR=(DockContainer*) (m_rightContainer->getWidget()->tqqt_cast("KMDI::DockContainer")); if (tmpR) tmpR->setStyle(flag); - DockContainer *tmpT=(DockContainer*) (m_topContainer->getWidget()->qt_cast("KMDI::DockContainer")); + DockContainer *tmpT=(DockContainer*) (m_topContainer->getWidget()->tqqt_cast("KMDI::DockContainer")); if (tmpT) tmpT->setStyle(flag); - DockContainer *tmpB=(DockContainer*) (m_bottomContainer->getWidget()->qt_cast("KMDI::DockContainer")); + DockContainer *tmpB=(DockContainer*) (m_bottomContainer->getWidget()->tqqt_cast("KMDI::DockContainer")); if (tmpB) tmpB->setStyle(flag); d->m_toolviewStyle = flag; diff --git a/kmdi/kmdi/mainwindow.h b/kmdi/kmdi/mainwindow.h index d7351a330..597bc15f5 100644 --- a/kmdi/kmdi/mainwindow.h +++ b/kmdi/kmdi/mainwindow.h @@ -79,7 +79,7 @@ class KMDI_EXPORT MainWindow : public KParts::DockMainWindow /** * Constructor. */ - MainWindow ( TQWidget* parentWidget, const char* name = ""); + MainWindow ( TQWidget* tqparentWidget, const char* name = ""); /** * Destructor. diff --git a/kmdi/kmdi/tabwidget.cpp b/kmdi/kmdi/tabwidget.cpp index 0d21bd2ea..d4a369b47 100644 --- a/kmdi/kmdi/tabwidget.cpp +++ b/kmdi/kmdi/tabwidget.cpp @@ -182,7 +182,7 @@ void TabWidget::insertTab ( TQWidget * child, const TQString & label, int index) KTabWidget::insertTab(child,label,index); showPage(child); maybeShow(); - tabBar()->repaint(); + tabBar()->tqrepaint(); } void TabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index ) @@ -190,7 +190,7 @@ void TabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const T KTabWidget::insertTab(child,iconset,label,index); showPage(child); maybeShow(); - tabBar()->repaint(); + tabBar()->tqrepaint(); } void TabWidget::insertTab ( TQWidget * child, TQTab * tab, int index) @@ -198,7 +198,7 @@ void TabWidget::insertTab ( TQWidget * child, TQTab * tab, int index) KTabWidget::insertTab(child,tab,index); showPage(child); maybeShow(); - tabBar()->repaint(); + tabBar()->tqrepaint(); } void TabWidget::removePage ( TQWidget * w ) diff --git a/kmdi/kmdi/toolviewaccessor.cpp b/kmdi/kmdi/toolviewaccessor.cpp index 21f621ec5..e2707941b 100644 --- a/kmdi/kmdi/toolviewaccessor.cpp +++ b/kmdi/kmdi/toolviewaccessor.cpp @@ -186,8 +186,8 @@ void ToolViewAccessor::place(KDockWidget::DockPosition pos, TQWidget* pTargetWnd if (!DockToOurself) if(pTargetWnd != 0L) { pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd); if (!pTargetDock) { - if (pTargetWnd->parentWidget()) { - pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->parentWidget()); + if (pTargetWnd->tqparentWidget()) { + pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->tqparentWidget()); } } } diff --git a/kmdi/kmdi/toolviewaccessor.h b/kmdi/kmdi/toolviewaccessor.h index 180ba56a3..75d9a863e 100644 --- a/kmdi/kmdi/toolviewaccessor.h +++ b/kmdi/kmdi/toolviewaccessor.h @@ -37,7 +37,7 @@ namespace KMDI { class MainWindow; -class ToolViewAccessor : public QObject +class ToolViewAccessor : public TQObject { Q_OBJECT diff --git a/kmdi/kmdichildarea.cpp b/kmdi/kmdichildarea.cpp index 923b55372..c4a94597b 100644 --- a/kmdi/kmdichildarea.cpp +++ b/kmdi/kmdichildarea.cpp @@ -420,10 +420,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 ); diff --git a/kmdi/kmdichildarea.h b/kmdi/kmdichildarea.h index 37ce3336f..2e4faf6ec 100644 --- a/kmdi/kmdichildarea.h +++ b/kmdi/kmdichildarea.h @@ -49,7 +49,7 @@ class KMdiChildAreaPrivate; * and manages the frame widgets of attached MDI views. * All actions and stuff concerning only to childframes are handled here. */ -class KMDI_EXPORT KMdiChildArea : public QFrame +class KMDI_EXPORT KMdiChildArea : public TQFrame { friend class KMdiChildFrmCaption; friend class KMdiChildFrm; diff --git a/kmdi/kmdichildfrm.cpp b/kmdi/kmdichildfrm.cpp index f471cf6c3..162837b2b 100644 --- a/kmdi/kmdichildfrm.cpp +++ b/kmdi/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 ) @@ -286,7 +286,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e ) if ( !( e->state() & RightButton ) && !( e->state() & MidButton ) ) { // same as: if no button or left button pressed - TQPoint p = parentWidget()->mapFromGlobal( e->globalPos() ); + TQPoint p = tqparentWidget()->mapFromGlobal( e->globalPos() ); resizeWindow( m_iResizeCorner, p.x(), p.y() ); } else @@ -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; } @@ -524,7 +524,7 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) // client min / max size / layout behavior don't change // set frame max size indirectly by setting the clients max size to // it's current value (calls setMaxSize() of frame) - m_pClient->setMaximumSize( m_pClient->maximumSize().width(), m_pClient->maximumSize().height() ); + m_pClient->setMaximumSize( m_pClient->tqmaximumSize().width(), m_pClient->tqmaximumSize().height() ); m_pMaximize->setPixmap( *m_pMaxButtonPixmap ); setGeometry( m_restoredRect ); break; @@ -608,8 +608,8 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) 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(); + m_oldClientMinSize = m_pClient->tqminimumSize(); + m_oldClientMaxSize = m_pClient->tqmaximumSize(); if ( m_pClient->layout() != 0L ) { m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode(); @@ -627,8 +627,8 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) 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(); + m_oldClientMinSize = m_pClient->tqminimumSize(); + m_oldClientMaxSize = m_pClient->tqmaximumSize(); if ( m_pClient->layout() != 0L ) { m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode(); @@ -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( QWIDGETSIZE_MAX, QWIDGETSIZE_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() ); @@ -1105,7 +1105,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) { // in case we didn't click on the icon button TQFocusEvent focusEvent( TQFocusEvent::FocusIn ); - TQApplication::sendEvent( qApp->mainWidget(), &focusEvent ); + TQApplication::sendEvent( tqApp->mainWidget(), &focusEvent ); if ( m_pClient ) { m_pClient->updateTimeStamp(); @@ -1177,7 +1177,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) // child and its children (as we did when we got our client). // XXX see linkChildren() and focus policy stuff TQObject* pNewChild = ( ( TQChildEvent* ) e ) ->child(); - if ( ( pNewChild != 0L ) && ::qt_cast<TQWidget*>( pNewChild ) ) + if ( ( pNewChild != 0L ) && ::tqqt_cast<TQWidget*>( pNewChild ) ) { TQWidget * pNewWidget = static_cast<TQWidget*>( pNewChild ); TQObjectList *list = pNewWidget->queryList( "TQWidget" ); @@ -1188,7 +1188,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) { // for each found object... TQWidget * widg = ( TQWidget* ) obj; ++it; - if ( !::qt_cast<TQPopupMenu*>( widg ) ) + if ( !::tqqt_cast<TQPopupMenu*>( widg ) ) { widg->installEventFilter( this ); } @@ -1394,7 +1394,7 @@ void KMdiChildFrm::redecorateButtons() TQRect KMdiChildFrm::mdiAreaContentsRect() const { - TQFrame * p = ( TQFrame* ) parentWidget(); + TQFrame * p = ( TQFrame* ) tqparentWidget(); if ( p ) { return p->contentsRect(); diff --git a/kmdi/kmdichildfrm.h b/kmdi/kmdichildfrm.h index 23435479e..d9e3ed922 100644 --- a/kmdi/kmdichildfrm.h +++ b/kmdi/kmdichildfrm.h @@ -49,7 +49,7 @@ class TQToolButton; * @short Internal class, only used on Win32. * This class provides a label widget that can process mouse click events. */ -class KMDI_EXPORT KMdiWin32IconButton : public QLabel +class KMDI_EXPORT KMdiWin32IconButton : public TQLabel { Q_OBJECT public: @@ -68,7 +68,7 @@ signals: * @short a TQCustomEvent for move * This special event will be useful, to inform view about child frame event. */ -class KMDI_EXPORT KMdiChildFrmMoveEvent : public QCustomEvent +class KMDI_EXPORT KMdiChildFrmMoveEvent : public TQCustomEvent { public: KMdiChildFrmMoveEvent( TQMoveEvent *e ) : TQCustomEvent( TQEvent::Type( TQEvent::User + int( KMdi::EV_Move ) ), e ) {} @@ -80,7 +80,7 @@ public: * @short a TQCustomEvent for begin of dragging * This special event will be useful, to inform view about child frame event. */ -class KMDI_EXPORT KMdiChildFrmDragBeginEvent : public QCustomEvent +class KMDI_EXPORT KMdiChildFrmDragBeginEvent : public TQCustomEvent { public: KMdiChildFrmDragBeginEvent( TQMouseEvent *e ) : TQCustomEvent( TQEvent::Type( TQEvent::User + int( KMdi::EV_DragBegin ) ), e ) {} @@ -91,7 +91,7 @@ public: * @short a TQCustomEvent for end of dragging * This special event will be useful, to inform view about child frame event. */ -class KMDI_EXPORT KMdiChildFrmDragEndEvent : public QCustomEvent +class KMDI_EXPORT KMdiChildFrmDragEndEvent : public TQCustomEvent { public: KMdiChildFrmDragEndEvent( TQMouseEvent *e ) : TQCustomEvent( TQEvent::Type( TQEvent::User + int( KMdi::EV_DragEnd ) ), e ) {} @@ -102,7 +102,7 @@ public: * @short a TQCustomEvent for begin of resizing * This special event will be useful, to inform view about child frame event. */ -class KMDI_EXPORT KMdiChildFrmResizeBeginEvent : public QCustomEvent +class KMDI_EXPORT KMdiChildFrmResizeBeginEvent : public TQCustomEvent { public: KMdiChildFrmResizeBeginEvent( TQMouseEvent *e ) : TQCustomEvent( TQEvent::Type( TQEvent::User + int( KMdi::EV_ResizeBegin ) ), e ) {} @@ -113,7 +113,7 @@ public: * @short a TQCustomEvent for end of resizing * This special event will be useful, to inform view about child frame event. */ -class KMDI_EXPORT KMdiChildFrmResizeEndEvent : public QCustomEvent +class KMDI_EXPORT KMdiChildFrmResizeEndEvent : public TQCustomEvent { public: KMdiChildFrmResizeEndEvent( TQMouseEvent *e ) : TQCustomEvent( TQEvent::Type( TQEvent::User + int( KMdi::EV_ResizeEnd ) ), e ) {} @@ -127,7 +127,7 @@ class KMdiChildFrmPrivate; * It's an MDI child frame widget. It contains a view widget and a frame caption. Usually you derive from its view. */ //------------------------------------------------------------------------------ -class KMDI_EXPORT KMdiChildFrm : public QFrame +class KMDI_EXPORT KMdiChildFrm : public TQFrame { friend class KMdiChildArea; friend class KMdiChildFrmCaption; diff --git a/kmdi/kmdichildfrmcaption.cpp b/kmdi/kmdichildfrmcaption.cpp index 65d348f30..b92eda26e 100644 --- a/kmdi/kmdichildfrmcaption.cpp +++ b/kmdi/kmdichildfrmcaption.cpp @@ -163,7 +163,7 @@ void KMdiChildFrmCaption::mouseMoveEvent( TQMouseEvent *e ) TQPoint mousePosInChildArea = relMousePosInChildArea - m_offset; // set new child frame position - parentWidget() ->move( mousePosInChildArea ); + tqparentWidget() ->move( mousePosInChildArea ); } //=============== setActive ===============// @@ -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/kmdi/kmdichildfrmcaption.h b/kmdi/kmdichildfrmcaption.h index 1bc47ac1f..1c5ec0c86 100644 --- a/kmdi/kmdichildfrmcaption.h +++ b/kmdi/kmdichildfrmcaption.h @@ -41,7 +41,7 @@ class KMdiChildFrmCaptionPrivate; * * It's the caption bar of a child frame widget. */ -class KMDI_EXPORT KMdiChildFrmCaption : public QWidget +class KMDI_EXPORT KMdiChildFrmCaption : public TQWidget { Q_OBJECT public: diff --git a/kmdi/kmdichildview.cpp b/kmdi/kmdichildview.cpp index 37414fe0a..1aad3c36f 100644 --- a/kmdi/kmdichildview.cpp +++ b/kmdi/kmdichildview.cpp @@ -44,8 +44,8 @@ //============ KMdiChildView ============// -KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* parentWidget, const char* name, WFlags f ) - : TQWidget( parentWidget, name, f ) +KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* tqparentWidget, const char* name, WFlags f ) + : TQWidget( tqparentWidget, name, f ) , m_focusedChildWidget( 0L ) , m_firstFocusableChildWidget( 0L ) , m_lastFocusableChildWidget( 0L ) @@ -73,8 +73,8 @@ KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* parentWidget, c //============ KMdiChildView ============// -KMdiChildView::KMdiChildView( TQWidget* parentWidget, const char* name, WFlags f ) - : TQWidget( parentWidget, name, f ) +KMdiChildView::KMdiChildView( TQWidget* tqparentWidget, const char* name, WFlags f ) + : TQWidget( tqparentWidget, name, f ) , m_focusedChildWidget( 0L ) , m_firstFocusableChildWidget( 0L ) , m_lastFocusableChildWidget( 0L ) diff --git a/kmdi/kmdichildview.h b/kmdi/kmdichildview.h index 656c17fd7..75b05bb74 100644 --- a/kmdi/kmdichildview.h +++ b/kmdi/kmdichildview.h @@ -105,7 +105,7 @@ class KMdiChildViewPrivate; * */ -class KMDI_EXPORT KMdiChildView : public QWidget +class KMDI_EXPORT KMdiChildView : public TQWidget { friend class KMdiMainFrm; friend class KMdiChildFrm; @@ -182,13 +182,13 @@ public: /** * Constructor */ - KMdiChildView( const TQString& caption, TQWidget* parentWidget = 0L, const char* name = 0L, WFlags f = 0 ); + KMdiChildView( const TQString& caption, TQWidget* tqparentWidget = 0L, const char* name = 0L, WFlags f = 0 ); /** * Constructor * sets "Unnamed" as default caption */ - KMdiChildView( TQWidget* parentWidget = 0L, const char* name = 0L, WFlags f = 0 ); + KMdiChildView( TQWidget* tqparentWidget = 0L, const char* name = 0L, WFlags f = 0 ); /** * Destructor @@ -358,7 +358,7 @@ public: */ inline void updateTimeStamp() { - m_time.setDate( TQDate::currentDate() ); + m_time.setDate( TQDate::tqcurrentDate() ); m_time.setTime( TQTime::currentTime() ); } @@ -603,7 +603,7 @@ private: inline KMdiChildFrm *KMdiChildView::mdiParent() const { - TQWidget * pw = parentWidget(); + TQWidget * pw = tqparentWidget(); if ( pw != 0L ) if ( pw->inherits( "KMdiChildFrm" ) ) return ( KMdiChildFrm * ) pw; diff --git a/kmdi/kmdidockcontainer.cpp b/kmdi/kmdidockcontainer.cpp index df82a4e6c..8304aa168 100644 --- a/kmdi/kmdidockcontainer.cpp +++ b/kmdi/kmdidockcontainer.cpp @@ -104,7 +104,7 @@ 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 if ( position == KDockWidget::DockLeft || position == KDockWidget::DockTop ) @@ -140,7 +140,7 @@ KMdiDockContainer::~KMdiDockContainer() KDockWidget *w = it.key(); if ( m_overlapButtons.contains( w ) ) { - ( static_cast<KDockWidgetHeader*>( w->getHeader()->qt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[w] ); + ( static_cast<KDockWidgetHeader*>( w->getHeader()->tqqt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[w] ); m_overlapButtons.remove( w ); } m_map.remove( w ); @@ -172,7 +172,7 @@ void KMdiDockContainer::init() // try to restore splitter size if ( parentDockWidget() && parentDockWidget()->parent() ) { - KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->parent()->qt_cast( "KDockSplitter" ) ); + KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->parent()->tqqt_cast( "KDockSplitter" ) ); if ( sp ) sp->setSeparatorPosX( m_separatorPos ); } @@ -204,15 +204,15 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const m_map.insert( w, tab ); m_revMap.insert( tab, w ); - if ( ( ( KDockWidget* ) parentWidget() ) ->mayBeShow() ) - ( ( KDockWidget* ) parentWidget() ) ->dockBack(); + if ( ( ( KDockWidget* ) tqparentWidget() ) ->mayBeShow() ) + ( ( KDockWidget* ) tqparentWidget() ) ->dockBack(); - if ( w->getHeader()->qt_cast( "KDockWidgetHeader" ) ) + if ( w->getHeader()->tqqt_cast( "KDockWidgetHeader" ) ) { kdDebug( 760 ) << k_funcinfo << "The dockwidget we're adding has a header" << endl; kdDebug( 760 ) << k_funcinfo << "Adding our overlap mode button to it" << endl; - KDockWidgetHeader *hdr = static_cast<KDockWidgetHeader*>( w->getHeader()->qt_cast( "KDockWidgetHeader" ) ); + KDockWidgetHeader *hdr = static_cast<KDockWidgetHeader*>( w->getHeader()->tqqt_cast( "KDockWidgetHeader" ) ); KDockButton_Private *btn = new KDockButton_Private( hdr, "OverlapButton" ); TQToolTip::add( btn, i18n( "Switch between overlap and side by side mode", "Overlap" ) ); @@ -272,7 +272,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event ) break; } - KDockWidgetHeader *hdr = static_cast<KDockWidgetHeader*>( w->getHeader()->qt_cast( "KDockWidgetHeader" ) ); + KDockWidgetHeader *hdr = static_cast<KDockWidgetHeader*>( w->getHeader()->tqqt_cast( "KDockWidgetHeader" ) ); if ( !hdr ) { kdDebug(760) << "Wrong header type in KMdiDockContainer::eventFilter" << endl; @@ -362,7 +362,7 @@ void KMdiDockContainer::hideIfNeeded() if ( itemNames.count() == 0 ) { kdDebug( 760 ) << k_funcinfo << "Hiding the dock container" << endl; - ( ( KDockWidget* ) parentWidget() )->undock(); + ( ( KDockWidget* ) tqparentWidget() )->undock(); } } @@ -387,7 +387,7 @@ void KMdiDockContainer::removeWidget( KDockWidget* dwdg ) m_revMap.remove( id ); if ( m_overlapButtons.contains( w ) ) { - ( static_cast<KDockWidgetHeader*>( w->getHeader() ->qt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[ w ] ); + ( static_cast<KDockWidgetHeader*>( w->getHeader() ->tqqt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[ w ] ); m_overlapButtons.remove( w ); } KDockContainer::removeWidget( w ); @@ -442,7 +442,7 @@ void KMdiDockContainer::tabClicked( int t ) if ( m_ws->widget( t ) ) { m_ws->raiseWidget( t ); - KDockWidget * tmpDw = static_cast<KDockWidget*>( m_ws->widget( t )->qt_cast( "KDockWidget" ) ); + KDockWidget * tmpDw = static_cast<KDockWidget*>( m_ws->widget( t )->tqqt_cast( "KDockWidget" ) ); if ( tmpDw ) { if ( tmpDw->getWidget() ) @@ -467,7 +467,7 @@ void KMdiDockContainer::tabClicked( int t ) // try save splitter position if ( parentDockWidget() && parentDockWidget()->parent() ) { - KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->parent()->qt_cast( "KDockSplitter" ) ); + KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->parent()->tqqt_cast( "KDockSplitter" ) ); if ( sp ) m_separatorPos = sp->separatorPos(); } @@ -639,7 +639,7 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix ) if ( parentDockWidget() && parentDockWidget() ->parent() ) { KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget() -> - parent() ->qt_cast( "KDockSplitter" ) ); + parent() ->tqqt_cast( "KDockSplitter" ) ); if ( sp ) cfg->writeEntry( "separatorPosition", m_separatorPos ); } diff --git a/kmdi/kmdidocumentviewtabwidget.cpp b/kmdi/kmdidocumentviewtabwidget.cpp index 90b618e47..7656bb358 100644 --- a/kmdi/kmdidocumentviewtabwidget.cpp +++ b/kmdi/kmdidocumentviewtabwidget.cpp @@ -54,7 +54,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQString & l KTabWidget::insertTab( child, label, index ); showPage( child ); TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); - tabBar() ->repaint(); + tabBar() ->tqrepaint(); } void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index ) @@ -62,7 +62,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQIconSet & KTabWidget::insertTab( child, iconset, label, index ); showPage( child ); TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); - tabBar() ->repaint(); + tabBar() ->tqrepaint(); } void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index ) @@ -70,7 +70,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, TQTab * tab, int i KTabWidget::insertTab( child, tab, index ); showPage( child ); TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); - tabBar() ->repaint(); + tabBar() ->tqrepaint(); } void KMdiDocumentViewTabWidget::removePage ( TQWidget * w ) @@ -140,7 +140,7 @@ KMdi::TabWidgetVisibility KMdiDocumentViewTabWidget::tabWidgetVisibility( ) } -#ifndef NO_INCLUDE_MOCFILES +#ifndef NO_INCLUDE_TQMOCFILES #include "kmdidocumentviewtabwidget.moc" #endif diff --git a/kmdi/kmdifocuslist.h b/kmdi/kmdifocuslist.h index 71e2f05cb..37c98e8db 100644 --- a/kmdi/kmdifocuslist.h +++ b/kmdi/kmdifocuslist.h @@ -23,7 +23,7 @@ #include <tqwidget.h> #include <kdelibs_export.h> -class KMDI_EXPORT KMdiFocusList: public QObject +class KMDI_EXPORT KMdiFocusList: public TQObject { Q_OBJECT public: diff --git a/kmdi/kmdiguiclient.cpp b/kmdi/kmdiguiclient.cpp index 6279253bc..c94f2488f 100644 --- a/kmdi/kmdiguiclient.cpp +++ b/kmdi/kmdiguiclient.cpp @@ -84,7 +84,7 @@ void ToggleToolViewAction::anDWChanged() setChecked( true ); else if ( isChecked() && ( m_dw->parentDockTabGroup() && ( ( static_cast<KDockWidget*>( m_dw->parentDockTabGroup() -> - parent() ->qt_cast( "KDockWidget" ) ) ) ->mayBeShow() ) ) ) + parent() ->tqqt_cast( "KDockWidget" ) ) ) ->mayBeShow() ) ) ) setChecked( false ); } @@ -128,7 +128,7 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c if ( domDocument().documentElement().isNull() ) { - TQString completeDescription = TQString::fromLatin1( guiDescription ) + TQString completeDescription = TQString::tqfromLatin1( guiDescription ) .arg( actionListName ); setXML( completeDescription, false /*merge*/ ); diff --git a/kmdi/kmdimainfrm.cpp b/kmdi/kmdimainfrm.cpp index e62b61cb2..942919230 100644 --- a/kmdi/kmdimainfrm.cpp +++ b/kmdi/kmdimainfrm.cpp @@ -136,8 +136,8 @@ public: }; //============ constructor ============// -KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMode mdiMode, WFlags flags ) - : KParts::DockMainWindow( parentWidget, name, flags ) +KMdiMainFrm::KMdiMainFrm( TQWidget* tqparentWidget, const char* name, KMdi::MdiMode mdiMode, WFlags flags ) + : KParts::DockMainWindow( tqparentWidget, name, flags ) , m_mdiMode( KMdi::UndefinedMode ) , m_pMdi( 0L ) , m_pTaskBar( 0L ) @@ -294,7 +294,7 @@ void KMdiMainFrm::setStandardMDIMenuEnabled( bool showModeMenu ) //============ ~KMdiMainFrm ============// KMdiMainFrm::~KMdiMainFrm() { - //save the children first to a list, as removing invalidates our iterator + //save the children first to a list, as removing tqinvalidates our iterator TQValueList<KMdiChildView*> children; for ( KMdiChildView * w = m_pDocumentViews->first();w;w = m_pDocumentViews->next() ) children.append( w ); @@ -391,7 +391,7 @@ void KMdiMainFrm::slot_toggleTaskBar() void KMdiMainFrm::resizeEvent( TQResizeEvent *e ) { - if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() ) + if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() ) { if ( e->oldSize().height() != e->size().height() ) return ; @@ -406,7 +406,7 @@ void KMdiMainFrm::resizeEvent( TQResizeEvent *e ) void KMdiMainFrm::setMinimumSize( int minw, int minh ) { - if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() ) + if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() ) return ; DockMainWindow::setMinimumSize( minw, minh ); } @@ -627,7 +627,7 @@ void KMdiMainFrm::attachWindow( KMdiChildView *pWnd, bool bShow, bool bAutomatic lpC->setClient( pWnd, bAutomaticResize ); lpC->setFocus(); pWnd->youAreAttached( lpC ); - if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() ) + if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() ) { setMinimumHeight( m_oldMainFrmMinHeight ); setMaximumHeight( m_oldMainFrmMaxHeight ); @@ -701,7 +701,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow ) #ifdef Q_WS_X11 if ( mdiMode() == KMdi::ToplevelMode ) { - XSetTransientForHint( qt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() ); + XSetTransientForHint( qt_xdisplay(), pWnd->winId(), tqtopLevelWidget() ->winId() ); } #endif @@ -711,7 +711,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow ) #ifdef Q_WS_X11 if ( mdiMode() == KMdi::ToplevelMode ) { - XSetTransientForHint( qt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() ); + XSetTransientForHint( qt_xdisplay(), pWnd->winId(), tqtopLevelWidget() ->winId() ); } #endif @@ -772,12 +772,12 @@ void KMdiMainFrm::removeWindowFromMdi( KMdiChildView *pWnd ) m_pDockbaseOfTabPage = m_pDockbaseAreaOfDocumentViews; m_pClose->hide(); } - KDockWidget* pDockW = ( KDockWidget* ) pWnd->parentWidget(); + KDockWidget* pDockW = ( KDockWidget* ) pWnd->tqparentWidget(); pWnd->reparent( 0L, TQPoint( 0, 0 ) ); pDockW->setWidget( 0L ); if ( pDockW == m_pDockbaseOfTabPage ) { - TQTabWidget * pTab = ( TQTabWidget* ) pDockW->parentWidget() ->parentWidget(); + TQTabWidget * pTab = ( TQTabWidget* ) pDockW->tqparentWidget() ->tqparentWidget(); int cnt = pTab->count(); m_pDockbaseOfTabPage = ( KDockWidget* ) pTab->page( cnt - 2 ); if ( pDockW == m_pDockbaseOfTabPage ) @@ -874,12 +874,12 @@ void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool layoutTaskBar ) m_pClose->hide(); } #if 0 - KDockWidget* pDockW = ( KDockWidget* ) pWnd->parentWidget(); + KDockWidget* pDockW = ( KDockWidget* ) pWnd->tqparentWidget(); pWnd->reparent( 0L, TQPoint( 0, 0 ) ); pDockW->setWidget( 0L ); if ( pDockW == m_pDockbaseOfTabPage ) { - TQTabWidget * pTab = ( TQTabWidget* ) pDockW->parentWidget() ->parentWidget(); + TQTabWidget * pTab = ( TQTabWidget* ) pDockW->tqparentWidget() ->tqparentWidget(); int cnt = pTab->count(); m_pDockbaseOfTabPage = ( KDockWidget* ) pTab->page( cnt - 2 ); if ( pDockW == m_pDockbaseOfTabPage ) @@ -1234,7 +1234,7 @@ bool KMdiMainFrm::eventFilter( TQObject * /*obj*/, TQEvent *e ) */ void KMdiMainFrm::closeAllViews() { - //save the children first to a list, as removing invalidates our iterator + //save the children first to a list, as removing tqinvalidates our iterator TQValueList<KMdiChildView*> children; for ( KMdiChildView * w = m_pDocumentViews->first();w;w = m_pDocumentViews->next() ) { @@ -1296,13 +1296,13 @@ void KMdiMainFrm::findRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetLis // find the oldest ancestor of the current dockwidget that can be undocked while ( !pW->isTopLevel() ) { - if ( ::qt_cast<KDockWidget*>( pW ) || pW->inherits( "KDockWidget_Compat::KDockWidget" ) ) + if ( ::tqqt_cast<KDockWidget*>( pW ) || pW->inherits( "KDockWidget_Compat::KDockWidget" ) ) { undockCandidate = static_cast<KDockWidget*>( pW ); if ( undockCandidate->enableDocking() != KDockWidget::DockNone ) rootDockWindow = undockCandidate; } - pW = pW->parentWidget(); + pW = pW->tqparentWidget(); } if ( rootDockWindow ) @@ -1395,7 +1395,7 @@ void KMdiMainFrm::switchToToplevelMode() setMainDockWidget( m_pDockbaseAreaOfDocumentViews ); } // TQApplication::sendPostedEvents(); //why do we need to empty the event queue? - if ( !parentWidget() ) + if ( !tqparentWidget() ) { //if we don't have a parent widget ( which i expect we wouldn't ) //make sure we take into account the size of the docks provided by @@ -1556,7 +1556,7 @@ void KMdiMainFrm::switchToChildframeMode() if ( !pView->isToolView() ) pView->show(); } - if ( ( oldMdiMode == KMdi::ToplevelMode ) && !parentWidget() ) + if ( ( oldMdiMode == KMdi::ToplevelMode ) && !tqparentWidget() ) { setMinimumHeight( m_oldMainFrmMinHeight ); setMaximumHeight( m_oldMainFrmMaxHeight ); @@ -1659,10 +1659,10 @@ 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(); + TQWidget* pParent = pView->tqparentWidget(); TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset ); m_documentTabWidget->removePage( pView ); pView->reparent( 0, 0, p ); @@ -1688,7 +1688,7 @@ void KMdiMainFrm::finishTabPageMode() void KMdiMainFrm::setupTabbedDocumentViewSpace() { // resize to childframe mode size of the mainwindow if we were in toplevel mode - if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() ) + if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() ) { setMinimumHeight( m_oldMainFrmMinHeight ); setMaximumHeight( m_oldMainFrmMaxHeight ); @@ -1739,28 +1739,28 @@ void KMdiMainFrm::setIDEAlModeStyle( int flags ) d->m_styleIDEAlMode = flags; // see KMultiTabBar for the first 3 bits if ( m_leftContainer ) { - KMdiDockContainer * tmpL = ( KMdiDockContainer* ) ( m_leftContainer->getWidget()->qt_cast( "KMdiDockContainer" ) ); + KMdiDockContainer * tmpL = ( KMdiDockContainer* ) ( m_leftContainer->getWidget()->tqqt_cast( "KMdiDockContainer" ) ); if ( tmpL ) tmpL->setStyle( flags ); } if ( m_rightContainer ) { - KMdiDockContainer * tmpR = ( KMdiDockContainer* ) ( m_rightContainer->getWidget()->qt_cast( "KMdiDockContainer" ) ); + KMdiDockContainer * tmpR = ( KMdiDockContainer* ) ( m_rightContainer->getWidget()->tqqt_cast( "KMdiDockContainer" ) ); if ( tmpR ) tmpR->setStyle( flags ); } if ( m_topContainer ) { - KMdiDockContainer * tmpT = ( KMdiDockContainer* ) ( m_topContainer->getWidget()->qt_cast( "KMdiDockContainer" ) ); + KMdiDockContainer * tmpT = ( KMdiDockContainer* ) ( m_topContainer->getWidget()->tqqt_cast( "KMdiDockContainer" ) ); if ( tmpT ) tmpT->setStyle( flags ); } if ( m_bottomContainer ) { - KMdiDockContainer * tmpB = ( KMdiDockContainer* ) ( m_bottomContainer->getWidget()->qt_cast( "KMdiDockContainer" ) ); + KMdiDockContainer * tmpB = ( KMdiDockContainer* ) ( m_bottomContainer->getWidget()->tqqt_cast( "KMdiDockContainer" ) ); if ( tmpB ) tmpB->setStyle( flags ); } @@ -1933,18 +1933,18 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() if ( mainDock->parentDockTabGroup() ) w = static_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() ); - TQPtrList<KDockWidget> leftReparentWidgets; - TQPtrList<KDockWidget> rightReparentWidgets; - TQPtrList<KDockWidget> bottomReparentWidgets; - TQPtrList<KDockWidget> topReparentWidgets; + TQPtrList<KDockWidget> leftRetqparentWidgets; + TQPtrList<KDockWidget> rightRetqparentWidgets; + TQPtrList<KDockWidget> bottomRetqparentWidgets; + TQPtrList<KDockWidget> topRetqparentWidgets; if ( mainDock->parentDockTabGroup() ) mainDock = static_cast<KDockWidget*>( mainDock->parentDockTabGroup() ->parent() ); - findToolViewsDockedToMain( &leftReparentWidgets, KDockWidget::DockLeft ); - findToolViewsDockedToMain( &rightReparentWidgets, KDockWidget::DockRight ); - findToolViewsDockedToMain( &bottomReparentWidgets, KDockWidget::DockBottom ); - findToolViewsDockedToMain( &topReparentWidgets, KDockWidget::DockTop ); + findToolViewsDockedToMain( &leftRetqparentWidgets, KDockWidget::DockLeft ); + findToolViewsDockedToMain( &rightRetqparentWidgets, KDockWidget::DockRight ); + findToolViewsDockedToMain( &bottomRetqparentWidgets, KDockWidget::DockBottom ); + findToolViewsDockedToMain( &topRetqparentWidgets, KDockWidget::DockTop ); mainDock->setEnableDocking( KDockWidget::DockNone ); //::DockCorner); mainDock->setDockSite( KDockWidget::DockCorner ); @@ -1996,10 +1996,10 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() m_topContainer->setDockSite( KDockWidget::DockCenter ); m_bottomContainer->setDockSite( KDockWidget::DockCenter ); - dockToolViewsIntoContainers( leftReparentWidgets, m_leftContainer ); - dockToolViewsIntoContainers( rightReparentWidgets, m_rightContainer ); - dockToolViewsIntoContainers( bottomReparentWidgets, m_bottomContainer ); - dockToolViewsIntoContainers( topReparentWidgets, m_topContainer ); + dockToolViewsIntoContainers( leftRetqparentWidgets, m_leftContainer ); + dockToolViewsIntoContainers( rightRetqparentWidgets, m_rightContainer ); + dockToolViewsIntoContainers( bottomRetqparentWidgets, m_bottomContainer ); + dockToolViewsIntoContainers( topRetqparentWidgets, m_topContainer ); dockManager->setSpecialLeftDockContainer( m_leftContainer ); @@ -2075,10 +2075,10 @@ 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(); + TQWidget* pParent = pView->tqparentWidget(); TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset ); pView->reparent( 0, 0, p ); pView->reparent( 0, 0, p ); @@ -2101,7 +2101,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full ) } else { - pParent = pParent->parentWidget(); + pParent = pParent->tqparentWidget(); } } while ( pParent && !pDockW ); @@ -2262,10 +2262,10 @@ void KMdiMainFrm::setSysButtonsAtMenuPosition() { if ( m_pMainMenuBar == 0L ) return ; - if ( m_pMainMenuBar->parentWidget() == 0L ) + if ( m_pMainMenuBar->tqparentWidget() == 0L ) return ; - int menuW = m_pMainMenuBar->parentWidget() ->width(); + int menuW = m_pMainMenuBar->tqparentWidget() ->width(); int h; int y; if ( frameDecorOfAttachedViews() == KMdi::Win95Look ) @@ -2357,7 +2357,7 @@ void KMdiMainFrm::activateFirstWin() return ; TQDateTime current = activeWindow() ->getTimeStamp(); - TQMap<TQDateTime, KMdiChildView*>::iterator pos( m.find( current ) ); + TQMap<TQDateTime, KMdiChildView*>::iterator pos( m.tqfind( current ) ); TQMap<TQDateTime, KMdiChildView*>::iterator newPos = pos; if ( pos != m.end() ) { @@ -2390,7 +2390,7 @@ void KMdiMainFrm::activateLastWin() return ; TQDateTime current = activeWindow() ->getTimeStamp(); - TQMap<TQDateTime, KMdiChildView*>::iterator pos( m.find( current ) ); + TQMap<TQDateTime, KMdiChildView*>::iterator pos( m.tqfind( current ) ); if ( pos != m.begin() ) { --pos; diff --git a/kmdi/kmdimainfrm.h b/kmdi/kmdimainfrm.h index 47ca34b9f..772ecc779 100644 --- a/kmdi/kmdimainfrm.h +++ b/kmdi/kmdimainfrm.h @@ -69,7 +69,7 @@ class KMdiMainFrmPrivate; * * This special event is needed because the view has to inform the main frame that it`s being closed. */ -class KMDI_EXPORT KMdiViewCloseEvent : public QCustomEvent +class KMDI_EXPORT KMdiViewCloseEvent : public TQCustomEvent { public: KMdiViewCloseEvent( KMdiChildView* pWnd ) : TQCustomEvent( TQEvent::User, pWnd ) {} @@ -98,7 +98,7 @@ public: * * \code * MyMainWindow mainframe; - * qApp->setMainWidget(&mainframe); + * tqApp->setMainWidget(&mainframe); * mainframe->addWindow(view1); // put it under MDI control * mainframe->addWindow(view2); * \endcode @@ -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 @@ -296,7 +296,7 @@ private: // methods public: - KMdiMainFrm( TQWidget* parentWidget, const char* name = "", KMdi::MdiMode mdiMode = KMdi::ChildframeMode, WFlags flags = WType_TopLevel | WDestructiveClose ); + KMdiMainFrm( TQWidget* tqparentWidget, const char* name = "", KMdi::MdiMode mdiMode = KMdi::ChildframeMode, WFlags flags = WType_TopLevel | WDestructiveClose ); virtual ~KMdiMainFrm(); /** diff --git a/kmdi/kmditaskbar.cpp b/kmdi/kmditaskbar.cpp index 71c3de454..ae8ae0a09 100644 --- a/kmdi/kmditaskbar.cpp +++ b/kmdi/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 = style().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); - int buttonAreaWidth = taskBarWidth - tbHandlePixel - style().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5; - if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < parentWidget() ->width() ) ) + tbHandlePixel = style().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); + int buttonAreaWidth = taskBarWidth - tbHandlePixel - style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5; + if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < tqparentWidget() ->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/kmdi/kmditaskbar.h b/kmdi/kmditaskbar.h index 39c4efa2e..de6f0f51d 100644 --- a/kmdi/kmditaskbar.h +++ b/kmdi/kmditaskbar.h @@ -48,7 +48,7 @@ class KMdiTaskBarButtonPrivate; * It's a special kind of TQPushButton catching mouse clicks. * And you have the ability to abbreviate the text that it fits in the button. */ -class KMDI_EXPORT KMdiTaskBarButton : public QPushButton +class KMDI_EXPORT KMdiTaskBarButton : public TQPushButton { Q_OBJECT // methods diff --git a/kmdi/kmditoolviewaccessor.cpp b/kmdi/kmditoolviewaccessor.cpp index 1d2cce946..3de517d6c 100644 --- a/kmdi/kmditoolviewaccessor.cpp +++ b/kmdi/kmditoolviewaccessor.cpp @@ -222,9 +222,9 @@ void KMdiToolViewAccessor::place( KDockWidget::DockPosition pos, TQWidget* pTarg pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd ); if ( !pTargetDock ) { - if ( pTargetWnd->parentWidget() ) + if ( pTargetWnd->tqparentWidget() ) { - pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->parentWidget() ); + pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->tqparentWidget() ); } } } @@ -262,7 +262,7 @@ void KMdiToolViewAccessor::show() } -#ifndef NO_INCLUDE_MOCFILES +#ifndef NO_INCLUDE_TQMOCFILES #include "kmditoolviewaccessor.moc" #endif // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/kmdi/kmditoolviewaccessor.h b/kmdi/kmditoolviewaccessor.h index 28241ea3b..a58375ec8 100644 --- a/kmdi/kmditoolviewaccessor.h +++ b/kmdi/kmditoolviewaccessor.h @@ -35,7 +35,7 @@ class KMDIGUIClient; } -class KMDI_EXPORT KMdiToolViewAccessor : public QObject +class KMDI_EXPORT KMdiToolViewAccessor : public TQObject { Q_OBJECT diff --git a/kmdi/test/hello.cpp b/kmdi/test/hello.cpp index d92233ea6..a560a8902 100644 --- a/kmdi/test/hello.cpp +++ b/kmdi/test/hello.cpp @@ -18,8 +18,8 @@ Constructs a Hello widget. Starts a 40 ms animation timer. */ -Hello::Hello( const char *title, const char *text, TQWidget *parentWidget ) - : KMdiChildView(title, parentWidget), t(text), b(0) +Hello::Hello( const char *title, const char *text, TQWidget *tqparentWidget ) + : KMdiChildView(title, tqparentWidget), t(text), b(0) { TQTimer *timer = new TQTimer(this); TQObject::connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(animate()) ); @@ -36,7 +36,7 @@ Hello::Hello( const char *title, const char *text, TQWidget *parentWidget ) void Hello::animate() { b = (b + 1) & 15; - repaint( false ); + tqrepaint( false ); } diff --git a/kmdi/test/hello.h b/kmdi/test/hello.h index 808d25b90..762318d87 100644 --- a/kmdi/test/hello.h +++ b/kmdi/test/hello.h @@ -22,7 +22,7 @@ class Hello : public KMdiChildView { Q_OBJECT public: - Hello( const char *title, const char *text, TQWidget* parentWidget = 0 ); + Hello( const char *title, const char *text, TQWidget* tqparentWidget = 0 ); signals: void clicked(); protected: |