Finished remaining porting to new TQt API

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214736 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

5 files changed, 34 insertions, 34 deletions

diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp
index 7e09ae100..926728927 100644
--- a/kmdi/kmdi/dockcontainer.cpp
+++ b/kmdi/kmdi/dockcontainer.cpp
@@ -118,7 +118,7 @@ DockContainer::~DockContainer()
   while (m_map.count()) {
     it = m_map.begin();
     KDockWidget *w=it.key();
-      if (m_overlapButtons.contains(w)) {
+      if (m_overlapButtons.tqcontains(w)) {
         (static_cast<KDockWidgetHeader*>(w->getHeader()->tqqt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]);
         m_overlapButtons.remove(w);
       }
@@ -149,7 +149,7 @@ void DockContainer::init()
   if ( parentDockWidget() && parentDockWidget()->parent() )
   {
     KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()->
-                parent()->tqqt_cast("KDockSplitter"));
+                tqparent()->tqqt_cast("KDockSplitter"));
     if ( sp )
       sp->setSeparatorPosX( m_separatorPos );
   }
@@ -164,7 +164,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt
 {
   KDockWidget* w = (KDockWidget*) dwdg;
   int tab;
-  bool alreadyThere=m_map.contains(w);
+  bool alreadyThere=m_map.tqcontains(w);
 
   if (alreadyThere)
   {
@@ -234,7 +234,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt
 
 bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
 {
-    if (obj==m_tb) {
+    if (TQT_BASE_OBJECT(obj)==TQT_BASE_OBJECT(m_tb)) {
 	if ( (event->type()==TQEvent::Resize)  && (m_ws->isHidden()) ) {
 		TQSize size=((TQResizeEvent*)event)->size();
 		  if (m_vertical)
@@ -263,7 +263,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
 				break;
 			}
 			m_dockManager=w->dockManager();
-			m_dragPanel=hdr->dragPanel();
+			m_dragPanel=TQT_TQOBJECT(hdr->dragPanel());
 			if (m_dragPanel) m_movingState=WaitingForMoveStart;
 			delete m_startEvent;
 			m_startEvent=new TQMouseEvent(* ((TQMouseEvent*)event));
@@ -281,7 +281,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
 		if (m_movingState==WaitingForMoveStart) {
 			TQPoint p( ((TQMouseEvent*)event)->pos() - m_startEvent->pos() );
 		        if( p.manhattanLength() > KGlobalSettings::dndEventDelay()) {
-				m_dockManager->eventFilter(m_dragPanel,m_startEvent);
+				m_dockManager->eventFilter(m_dragPanel,TQT_TQEVENT(m_startEvent));
 				m_dockManager->eventFilter(m_dragPanel,event);
 				m_movingState=Moving;
 			}
@@ -298,7 +298,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
 }
 
 void DockContainer::showWidget(KDockWidget *w) {
-    if (!m_map.contains(w)) return;
+    if (!m_map.tqcontains(w)) return;
 
     kdDebug()<<"KMDI::DockContainer::<showWidget"<<endl;
     int id=m_map[w];
@@ -343,7 +343,7 @@ void DockContainer::hideIfNeeded() {
 void DockContainer::removeWidget(KDockWidget* dwdg)
 {
     KDockWidget* w = (KDockWidget*) dwdg;
-  if (!m_map.contains(w)) return;
+  if (!m_map.tqcontains(w)) return;
   int id=m_map[w];
   if (m_tb->isTabRaised(id)) {
     //why do we hide the tab if we're just going
@@ -356,7 +356,7 @@ void DockContainer::removeWidget(KDockWidget* dwdg)
   m_ws->removeWidget(w);
   m_map.remove(w);
   m_revMap.remove(id);
-  if (m_overlapButtons.contains(w)) {
+  if (m_overlapButtons.tqcontains(w)) {
     (static_cast<KDockWidgetHeader*>(w->getHeader()->tqqt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]);
     m_overlapButtons.remove(w);
   }
@@ -372,7 +372,7 @@ void DockContainer::undockWidget(KDockWidget *dwdg)
 {
   KDockWidget* w = (KDockWidget*) dwdg;
 
-  if (!m_map.contains(w))
+  if (!m_map.tqcontains(w))
     return;
 
   int id=m_map[w];
@@ -423,7 +423,7 @@ void DockContainer::tabClicked(int t)
       if ( parentDockWidget() && parentDockWidget()->parent() )
       {
         KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()->
-                    parent()->tqqt_cast("KDockSplitter"));
+                    tqparent()->tqqt_cast("KDockSplitter"));
         if ( sp )
           m_separatorPos = sp->separatorPos();
       }
@@ -466,8 +466,8 @@ void DockContainer::save(KConfig* cfg,const TQString& group_or_prefix)
 {
   // group name
   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").arg(tqparent()->name()));
+  cfg->setGroup(group_or_prefix+TQString("::%1").arg(tqparent()->name()));
 
   // save overlap mode
   cfg->writeEntry("overlapMode",isOverlapMode());
@@ -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()->tqqt_cast("KDockSplitter"));
+                tqparent()->tqqt_cast("KDockSplitter"));
     if ( sp )
       cfg->writeEntry( "separatorPosition", m_separatorPos );
   }
@@ -509,7 +509,7 @@ void DockContainer::save(KConfig* cfg,const TQString& group_or_prefix)
 void DockContainer::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").arg(tqparent()->name()));
 
   if (cfg->readBoolEntry("overlapMode"))
     activateOverlapMode( m_vertical?m_tb->width():m_tb->height() );
@@ -631,7 +631,7 @@ void DockContainer::toggle() {
 
 void DockContainer::prevToolView() {
     TQPtrList<KMultiTabBarTab>* tabs=m_tb->tabs();
-    int pos=tabs->findRef(m_tb->tab(oldtab));
+    int pos=tabs->tqfindRef(m_tb->tab(oldtab));
     if (pos==-1) return;
     pos--;
     if (pos<0) pos=tabs->count()-1;
@@ -643,7 +643,7 @@ void DockContainer::prevToolView() {
 
 void DockContainer::nextToolView() {
     TQPtrList<KMultiTabBarTab>* tabs=m_tb->tabs();
-    int pos=tabs->findRef(m_tb->tab(oldtab));
+    int pos=tabs->tqfindRef(m_tb->tab(oldtab));
     if (pos==-1) return;
     pos++;
     if (pos>=(int)tabs->count()) pos=0;
diff --git a/kmdi/kmdi/guiclient.cpp b/kmdi/kmdi/guiclient.cpp
index 0522d78a1..54e8fc26a 100644
--- a/kmdi/kmdi/guiclient.cpp
+++ b/kmdi/kmdi/guiclient.cpp
@@ -88,9 +88,9 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name)
   m_gotoToolDockMenu->insert(new KAction(i18n("Switch Bottom Dock"),ALT+CTRL+SHIFT+Key_B,this,TQT_SIGNAL(toggleBottom()),
   actionCollection(),"kmdi_activate_bottom"));
   m_gotoToolDockMenu->insert(new KActionSeparator(actionCollection(),"kmdi_goto_menu_separator"));
-  m_gotoToolDockMenu->insert(new KAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,m_mdiMainFrm,TQT_SLOT(prevToolViewInDock()),
+  m_gotoToolDockMenu->insert(new KAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(prevToolViewInDock()),
   actionCollection(),"kmdi_prev_toolview"));
-  m_gotoToolDockMenu->insert(new KAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,m_mdiMainFrm,TQT_SLOT(nextToolViewInDock()),
+  m_gotoToolDockMenu->insert(new KAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(nextToolViewInDock()),
   actionCollection(),"kmdi_next_toolview"));
 
   actionCollection()->readShortcutSettings( "Shortcuts", kapp->config() );
@@ -149,7 +149,7 @@ void GUIClient::addToolView(KMDI::ToolViewAccessor* mtva)
     /*TQString::null*/sc,dynamic_cast<KDockWidget*>(mtva->wrapperWidget()),
     m_mdiMainFrm,actionCollection(), aname.latin1() );
 
-  ((ToggleToolViewAction*)a)->setCheckedState(i18n("Hide %1").arg(mtva->wrappedWidget()->caption()));
+  ((ToggleToolViewAction*)a)->setCheckedState(TQString(i18n("Hide %1").arg(mtva->wrappedWidget()->caption())));
 
   connect(a,TQT_SIGNAL(destroyed(TQObject*)),this,TQT_SLOT(actionDeleted(TQObject*)));
 
@@ -202,7 +202,7 @@ void ToggleToolViewAction::anDWChanged()
     setChecked(true);
   else if (isChecked() && (m_dw->parentDockTabGroup() &&
           ((static_cast<KDockWidget*>(m_dw->parentDockTabGroup()->
-                  parent()->tqqt_cast("KDockWidget")))->mayBeShow())))
+                  tqparent()->tqqt_cast("KDockWidget")))->mayBeShow())))
     setChecked(false);
 }
 
diff --git a/kmdi/kmdi/mainwindow.cpp b/kmdi/kmdi/mainwindow.cpp
index 912ad3a1d..be38a3f48 100644
--- a/kmdi/kmdi/mainwindow.cpp
+++ b/kmdi/kmdi/mainwindow.cpp
@@ -280,7 +280,7 @@ KMDI::ToolViewAccessor *MainWindow::addToolWindow( TQWidget* pWnd, KDockWidget::
 
   if (pos == KDockWidget::DockNone) {
     mtva->d->widgetContainer->setEnableDocking(KDockWidget::DockNone);
-    mtva->d->widgetContainer->reparent(this, Qt::WType_TopLevel | Qt::WType_Dialog, r.topLeft(), isVisible());
+    mtva->d->widgetContainer->reparent(this, (WFlags)(WType_TopLevel | WType_Dialog), r.topLeft(), isVisible());
   } else {   // add (and dock) the toolview as DockWidget view
     //const TQPixmap& wndIcon = pWnd->icon() ? *(pWnd->icon()) : TQPixmap();
 
@@ -302,7 +302,7 @@ void MainWindow::deleteToolWindow( TQWidget* pWnd)
   if (!pWnd)
     return;
 
-  if (m_toolViews->contains(pWnd)) {
+  if (m_toolViews->tqcontains(pWnd)) {
     deleteToolWindow((*m_toolViews)[pWnd]);
   }
 }
diff --git a/kmdi/kmdi/tabwidget.cpp b/kmdi/kmdi/tabwidget.cpp
index d4a369b47..b1d88e6b8 100644
--- a/kmdi/kmdi/tabwidget.cpp
+++ b/kmdi/kmdi/tabwidget.cpp
@@ -89,7 +89,7 @@ bool TabWidget::eventFilter(TQObject *obj, TQEvent *e )
   {
     // if we lost a child we uninstall ourself as event filter for the lost
     // child and its children
-    TQObject* pLostChild = ((TQChildEvent*)e)->child();
+    TQObject* pLostChild = TQT_TQOBJECT(((TQChildEvent*)e)->child());
     if ((pLostChild != 0L) && (pLostChild->isWidgetType())) {
        TQObjectList *list = pLostChild->queryList( "TQWidget" );
        list->insert(0, pLostChild);        // add the lost child to the list too, just to save code
@@ -108,11 +108,11 @@ bool TabWidget::eventFilter(TQObject *obj, TQEvent *e )
     // 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
     // (as we did when we were added to the MDI system).
-    TQObject* pNewChild = ((TQChildEvent*)e)->child();
+    TQObject* pNewChild = TQT_TQOBJECT(((TQChildEvent*)e)->child());
     if ((pNewChild != 0L) && (pNewChild->isWidgetType()))
     {
        TQWidget* pNewWidget = (TQWidget*)pNewChild;
-       if (pNewWidget->testWFlags(Qt::WType_Dialog | Qt::WShowModal))
+       if (pNewWidget->testWFlags((WFlags)(WType_Dialog | WShowModal)))
            return false;
        TQObjectList *list = pNewWidget->queryList( "TQWidget" );
        list->insert(0, pNewChild);         // add the new child to the list too, just to save code
@@ -135,7 +135,7 @@ void TabWidget::childDestroyed()
 {
   // if we lost a child we uninstall ourself as event filter for the lost
   // child and its children
-  const TQObject* pLostChild = TQObject::sender();
+  const TQObject* pLostChild = TQT_TQOBJECT_CONST(sender());
   if ((pLostChild != 0L) && (pLostChild->isWidgetType()))
   {
      TQObjectList *list = ((TQObject*)(pLostChild))->queryList("TQWidget");
@@ -253,18 +253,18 @@ void TabWidget::maybeShow()
 void TabWidget::setCornerWidgetVisibility(bool visible) {
   // there are two corner widgets: on TopLeft and on TopTight!
 
-  if (cornerWidget(Qt::TopLeft) ) {
+  if (cornerWidget(TQt::TopLeft) ) {
     if (visible)
-      cornerWidget(Qt::TopLeft)->show();
+      cornerWidget(TQt::TopLeft)->show();
     else
-      cornerWidget(Qt::TopLeft)->hide();
+      cornerWidget(TQt::TopLeft)->hide();
   }
 
-  if (cornerWidget(Qt::TopRight) ) {
+  if (cornerWidget(TQt::TopRight) ) {
     if (visible)
-      cornerWidget(Qt::TopRight)->show();
+      cornerWidget(TQt::TopRight)->show();
     else
-      cornerWidget(Qt::TopRight)->hide();
+      cornerWidget(TQt::TopRight)->hide();
   }
 }
 
diff --git a/kmdi/kmdi/toolviewaccessor.cpp b/kmdi/kmdi/toolviewaccessor.cpp
index e2707941b..2ff4f972a 100644
--- a/kmdi/kmdi/toolviewaccessor.cpp
+++ b/kmdi/kmdi/toolviewaccessor.cpp
@@ -158,7 +158,7 @@ void ToolViewAccessor::place(KDockWidget::DockPosition pos, TQWidget* pTargetWnd
     if (!d->widgetContainer) return;
     if (pos == KDockWidget::DockNone) {
         d->widgetContainer->setEnableDocking(KDockWidget::DockNone);
-        d->widgetContainer->reparent(mdiMainFrm, Qt::WType_TopLevel | Qt::WType_Dialog, TQPoint(0,0), mdiMainFrm->isVisible());
+        d->widgetContainer->reparent(mdiMainFrm, (WFlags)(WType_TopLevel | WType_Dialog), TQPoint(0,0), mdiMainFrm->isVisible());
     }
     else {   // add (and dock) the toolview as DockWidget view