summaryrefslogtreecommitdiffstats
path: root/tdemdi/tdemdi
diff options
context:
space:
mode:
Diffstat (limited to 'tdemdi/tdemdi')
-rw-r--r--tdemdi/tdemdi/dockcontainer.cpp38
-rw-r--r--tdemdi/tdemdi/dockcontainer.h2
-rw-r--r--tdemdi/tdemdi/guiclient.cpp32
-rw-r--r--tdemdi/tdemdi/guiclient.h4
-rw-r--r--tdemdi/tdemdi/mainwindow.cpp62
-rw-r--r--tdemdi/tdemdi/mainwindow.h2
-rw-r--r--tdemdi/tdemdi/tabwidget.cpp16
-rw-r--r--tdemdi/tdemdi/tabwidget.h2
-rw-r--r--tdemdi/tdemdi/toolviewaccessor.cpp6
-rw-r--r--tdemdi/tdemdi/toolviewaccessor.h2
10 files changed, 83 insertions, 83 deletions
diff --git a/tdemdi/tdemdi/dockcontainer.cpp b/tdemdi/tdemdi/dockcontainer.cpp
index efb10d734..cdc35d208 100644
--- a/tdemdi/tdemdi/dockcontainer.cpp
+++ b/tdemdi/tdemdi/dockcontainer.cpp
@@ -119,7 +119,7 @@ DockContainer::~DockContainer()
it = m_map.begin();
KDockWidget *w=it.key();
if (m_overlapButtons.contains(w)) {
- (::tqqt_cast<KDockWidgetHeader*>(w->getHeader()))->removeButton(m_overlapButtons[w]);
+ (::tqt_cast<KDockWidgetHeader*>(w->getHeader()))->removeButton(m_overlapButtons[w]);
m_overlapButtons.remove(w);
}
m_map.remove(w);
@@ -148,7 +148,7 @@ void DockContainer::init()
// try to restore splitter size
if ( parentDockWidget() && parentDockWidget()->parent() )
{
- KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()->
+ KDockSplitter *sp= ::tqt_cast<KDockSplitter*>(parentDockWidget()->
parent());
if ( sp )
sp->setSeparatorPosX( m_separatorPos );
@@ -184,11 +184,11 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt
if (((KDockWidget*)parentWidget())->mayBeShow())
((KDockWidget*)parentWidget())->dockBack();
- if (::tqqt_cast<KDockWidgetHeader*>(w->getHeader()))
+ if (::tqt_cast<KDockWidgetHeader*>(w->getHeader()))
{
kdDebug(760)<<"*** KDockWidgetHeader has been found"<<endl;
- KDockWidgetHeader *hdr=::tqqt_cast<KDockWidgetHeader*>(w->getHeader());
+ KDockWidgetHeader *hdr=::tqt_cast<KDockWidgetHeader*>(w->getHeader());
KDockButton_Private *btn = new KDockButton_Private( hdr, "OverlapButton" );
@@ -200,7 +200,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt
m_overlapButtons.insert(w,btn);
btn->setOn(!isOverlapMode());
- connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeOverlapMode()));
+ connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(changeOverlapMode()));
}
m_tb->appendTab(pixmap.isNull()?SmallIcon("misc"):pixmap,tab,w->tabPageLabel());
@@ -209,7 +209,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt
//FB m_tb->setTab(tab,true);
- connect(m_tb->tab(tab),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(tabClicked(int)));
+ connect(m_tb->tab(tab),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(tabClicked(int)));
kdDebug(760)<<"DockContainer::insertWidget()"<<endl;
@@ -233,7 +233,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt
bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
{
- if (TQT_BASE_OBJECT(obj)==TQT_BASE_OBJECT(m_tb)) {
+ if (obj==m_tb) {
if ( (event->type()==TQEvent::Resize) && (m_ws->isHidden()) ) {
TQSize size=((TQResizeEvent*)event)->size();
if (m_vertical)
@@ -246,7 +246,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
switch ( event->type() ){
case TQEvent::MouseButtonPress:
{
- KDockWidget * w=m_revMap[tqt_dynamic_cast<KMultiTabBarTab*>(obj)->id()];
+ KDockWidget * w=m_revMap[dynamic_cast<KMultiTabBarTab*>(obj)->id()];
if (!w) {
kdDebug()<<"NoWidget"<<endl;
break;
@@ -255,13 +255,13 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
kdDebug()<<"NO HEADER"<<endl;
break;
}
- KDockWidgetHeader *hdr=::tqqt_cast<KDockWidgetHeader*>(w->getHeader());
+ KDockWidgetHeader *hdr=::tqt_cast<KDockWidgetHeader*>(w->getHeader());
if (!hdr) {
kdDebug()<<"Wrong header type in DockContainer::eventFilter"<<endl;
break;
}
m_dockManager=w->dockManager();
- m_dragPanel=TQT_TQOBJECT(hdr->dragPanel());
+ m_dragPanel=hdr->dragPanel();
if (m_dragPanel) m_movingState=WaitingForMoveStart;
delete m_startEvent;
m_startEvent=new TQMouseEvent(* ((TQMouseEvent*)event));
@@ -279,7 +279,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
if (m_movingState==WaitingForMoveStart) {
TQPoint p( ((TQMouseEvent*)event)->pos() - m_startEvent->pos() );
if( p.manhattanLength() > TDEGlobalSettings::dndEventDelay()) {
- m_dockManager->eventFilter(m_dragPanel,TQT_TQEVENT(m_startEvent));
+ m_dockManager->eventFilter(m_dragPanel,static_cast<TQEvent*>(m_startEvent));
m_dockManager->eventFilter(m_dragPanel,event);
m_movingState=Moving;
}
@@ -307,7 +307,7 @@ void DockContainer::showWidget(KDockWidget *w) {
void DockContainer::changeOverlapMode()
{
- const KDockButton_Private *btn=tqt_dynamic_cast<const KDockButton_Private*>(sender());
+ const KDockButton_Private *btn=dynamic_cast<const KDockButton_Private*>(sender());
kdDebug(760)<<"DockContainer::changeOverlapMode: button=="<<btn<<endl;
@@ -355,7 +355,7 @@ void DockContainer::removeWidget(KDockWidget* dwdg)
m_map.remove(w);
m_revMap.remove(id);
if (m_overlapButtons.contains(w)) {
- (::tqqt_cast<KDockWidgetHeader*>(w->getHeader()))->removeButton(m_overlapButtons[w]);
+ (::tqt_cast<KDockWidgetHeader*>(w->getHeader()))->removeButton(m_overlapButtons[w]);
m_overlapButtons.remove(w);
}
KDockContainer::removeWidget(w);
@@ -403,7 +403,7 @@ void DockContainer::tabClicked(int t)
}
m_ws->raiseWidget(t);
if (m_ws->widget(t)) {
- KDockWidget *tmpDw=::tqqt_cast<KDockWidget*>(m_ws->widget(t));
+ KDockWidget *tmpDw=::tqt_cast<KDockWidget*>(m_ws->widget(t));
if (tmpDw) {
if (tmpDw->getWidget()) tmpDw->getWidget()->setFocus();
} else kdDebug(760)<<"Something really weird is going on"<<endl;
@@ -420,7 +420,7 @@ void DockContainer::tabClicked(int t)
// try save splitter position
if ( parentDockWidget() && parentDockWidget()->parent() )
{
- KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()->
+ KDockSplitter *sp= ::tqt_cast<KDockSplitter*>(parentDockWidget()->
parent());
if ( sp )
m_separatorPos = sp->separatorPos();
@@ -473,7 +473,7 @@ void DockContainer::save(TDEConfig* cfg,const TQString& group_or_prefix)
// try to save the splitter position
if ( parentDockWidget() && parentDockWidget()->parent() )
{
- KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()->
+ KDockSplitter *sp= ::tqt_cast<KDockSplitter*>(parentDockWidget()->
parent());
if ( sp )
cfg->writeEntry( "separatorPosition", m_separatorPos );
@@ -573,14 +573,14 @@ void DockContainer::load(TDEConfig* cfg,const TQString& group_or_prefix)
kapp->syncX();*/
m_delayedRaise=it.data();
- TQTimer::singleShot(0,this,TQT_SLOT(delayedRaise()));
+ TQTimer::singleShot(0,this,TQ_SLOT(delayedRaise()));
kdDebug(760)<<"************** raising *******: "<<it.key()->name()<<endl;
break;
}
}
}
- if (m_delayedRaise==-1) TQTimer::singleShot(0,this,TQT_SLOT(init()));
+ if (m_delayedRaise==-1) TQTimer::singleShot(0,this,TQ_SLOT(init()));
cfg->setGroup(grp);
}
@@ -612,7 +612,7 @@ void DockContainer::toggle() {
if (m_tb->isTabRaised(oldtab)) {
m_tb->setTab(oldtab,false);
tabClicked(oldtab);
- // KMDI::MainWindow *mainFrm = tqt_dynamic_cast<KMDI::MainWindow*>(m_mainWin);
+ // KMDI::MainWindow *mainFrm = dynamic_cast<KMDI::MainWindow*>(m_mainWin);
// if (mainFrm && mainFrm->activeWindow() ) // TODO
// mainFrm->activeWindow()->setFocus();
diff --git a/tdemdi/tdemdi/dockcontainer.h b/tdemdi/tdemdi/dockcontainer.h
index 57855bfa0..cbe71a944 100644
--- a/tdemdi/tdemdi/dockcontainer.h
+++ b/tdemdi/tdemdi/dockcontainer.h
@@ -38,7 +38,7 @@ namespace KMDI
class DockContainer: public TQWidget, public KDockContainer
{
- Q_OBJECT
+ TQ_OBJECT
public:
DockContainer(TQWidget *parent, TQWidget *win, int position, int flags);
diff --git a/tdemdi/tdemdi/guiclient.cpp b/tdemdi/tdemdi/guiclient.cpp
index 92a24acd5..32f0c2aea 100644
--- a/tdemdi/tdemdi/guiclient.cpp
+++ b/tdemdi/tdemdi/guiclient.cpp
@@ -57,8 +57,8 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name)
{
m_mdiMainFrm=mdiMainFrm;
- connect( mdiMainFrm->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ),
- this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) );
+ connect( mdiMainFrm->guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient * ) ),
+ this, TQ_SLOT( clientAdded( KXMLGUIClient * ) ) );
/* re-use an existing resource file if it exists. can happen if the user launches the
* toolbar editor */
@@ -79,18 +79,18 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name)
m_toolMenu=new TDEActionMenu(i18n("Tool &Views"),actionCollection(),"tdemdi_toolview_menu");
m_gotoToolDockMenu=new TDEActionMenu(i18n("Tool &Docks"),actionCollection(),"tdemdi_tooldock_menu");
- m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Top Dock"),ALT+CTRL+SHIFT+Key_T,this,TQT_SIGNAL(toggleTop()),
+ m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Top Dock"),ALT+CTRL+SHIFT+Key_T,this,TQ_SIGNAL(toggleTop()),
actionCollection(),"tdemdi_activate_top"));
- m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Left Dock"),ALT+CTRL+SHIFT+Key_L,this,TQT_SIGNAL(toggleLeft()),
+ m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Left Dock"),ALT+CTRL+SHIFT+Key_L,this,TQ_SIGNAL(toggleLeft()),
actionCollection(),"tdemdi_activate_left"));
- m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Right Dock"),ALT+CTRL+SHIFT+Key_R,this,TQT_SIGNAL(toggleRight()),
+ m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Right Dock"),ALT+CTRL+SHIFT+Key_R,this,TQ_SIGNAL(toggleRight()),
actionCollection(),"tdemdi_activate_right"));
- m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Bottom Dock"),ALT+CTRL+SHIFT+Key_B,this,TQT_SIGNAL(toggleBottom()),
+ m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Bottom Dock"),ALT+CTRL+SHIFT+Key_B,this,TQ_SIGNAL(toggleBottom()),
actionCollection(),"tdemdi_activate_bottom"));
m_gotoToolDockMenu->insert(new TDEActionSeparator(actionCollection(),"tdemdi_goto_menu_separator"));
- m_gotoToolDockMenu->insert(new TDEAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(prevToolViewInDock()),
+ m_gotoToolDockMenu->insert(new TDEAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,m_mdiMainFrm,TQ_SLOT(prevToolViewInDock()),
actionCollection(),"tdemdi_prev_toolview"));
- m_gotoToolDockMenu->insert(new TDEAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(nextToolViewInDock()),
+ m_gotoToolDockMenu->insert(new TDEAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,m_mdiMainFrm,TQ_SLOT(nextToolViewInDock()),
actionCollection(),"tdemdi_next_toolview"));
actionCollection()->readShortcutSettings( "Shortcuts", kapp->config() );
@@ -146,12 +146,12 @@ void GUIClient::addToolView(KMDI::ToolViewAccessor* mtva)
cfg->setGroup( _grp );
TDEAction *a=new ToggleToolViewAction(i18n("Show %1").arg(mtva->wrappedWidget()->caption()),
- /*TQString::null*/sc,tqt_dynamic_cast<KDockWidget*>(mtva->wrapperWidget()),
+ /*TQString::null*/sc,dynamic_cast<KDockWidget*>(mtva->wrapperWidget()),
m_mdiMainFrm,actionCollection(), aname.latin1() );
((ToggleToolViewAction*)a)->setCheckedState(TQString(i18n("Hide %1").arg(mtva->wrappedWidget()->caption())));
- connect(a,TQT_SIGNAL(destroyed(TQObject*)),this,TQT_SLOT(actionDeleted(TQObject*)));
+ connect(a,TQ_SIGNAL(destroyed(TQObject*)),this,TQ_SLOT(actionDeleted(TQObject*)));
m_toolViewActions.append(a);
m_toolMenu->insert(a);
@@ -181,9 +181,9 @@ ToggleToolViewAction::ToggleToolViewAction ( const TQString& text, const TDEShor
{
if (m_dw)
{
- connect(this,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool)));
- connect(m_dw->dockManager(),TQT_SIGNAL(change()),this,TQT_SLOT(anDWChanged()));
- connect(m_dw,TQT_SIGNAL(destroyed()),this,TQT_SLOT(slotWidgetDestroyed()));
+ connect(this,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotToggled(bool)));
+ connect(m_dw->dockManager(),TQ_SIGNAL(change()),this,TQ_SLOT(anDWChanged()));
+ connect(m_dw,TQ_SIGNAL(destroyed()),this,TQ_SLOT(slotWidgetDestroyed()));
setChecked(m_dw->mayBeHide());
}
@@ -201,7 +201,7 @@ void ToggleToolViewAction::anDWChanged()
else if ((!isChecked()) && m_dw->mayBeHide())
setChecked(true);
else if (isChecked() && (m_dw->parentDockTabGroup() &&
- ((::tqqt_cast<KDockWidget*>(m_dw->parentDockTabGroup()->
+ ((::tqt_cast<KDockWidget*>(m_dw->parentDockTabGroup()->
parent()))->mayBeShow())))
setChecked(false);
}
@@ -218,8 +218,8 @@ void ToggleToolViewAction::slotToggled(bool t)
void ToggleToolViewAction::slotWidgetDestroyed()
{
- disconnect(m_dw->dockManager(),TQT_SIGNAL(change()),this,TQT_SLOT(anDWChanged()));
- disconnect(this,TQT_SIGNAL(toggled(bool)),0,0);
+ disconnect(m_dw->dockManager(),TQ_SIGNAL(change()),this,TQ_SLOT(anDWChanged()));
+ disconnect(this,TQ_SIGNAL(toggled(bool)),0,0);
unplugAll();
deleteLater();
diff --git a/tdemdi/tdemdi/guiclient.h b/tdemdi/tdemdi/guiclient.h
index d4f752d64..14ccfa10a 100644
--- a/tdemdi/tdemdi/guiclient.h
+++ b/tdemdi/tdemdi/guiclient.h
@@ -44,7 +44,7 @@ class GUIClientPrivate;
class GUIClient : public TQObject, public KXMLGUIClient
{
- Q_OBJECT
+ TQ_OBJECT
public:
GUIClient( KMDI::MainWindow *mdiMainFrm, const char *name = 0 );
@@ -78,7 +78,7 @@ class GUIClient : public TQObject, public KXMLGUIClient
class ToggleToolViewAction:public TDEToggleAction
{
- Q_OBJECT
+ TQ_OBJECT
public:
ToggleToolViewAction ( const TQString& text, const TDEShortcut& cut = TDEShortcut(),
diff --git a/tdemdi/tdemdi/mainwindow.cpp b/tdemdi/tdemdi/mainwindow.cpp
index 4f23e3a9e..925f7619a 100644
--- a/tdemdi/tdemdi/mainwindow.cpp
+++ b/tdemdi/tdemdi/mainwindow.cpp
@@ -139,7 +139,7 @@ void MainWindow::setupMainDock ()
setMainDockWidget(dw);
// connect signals to collapse sidebars
- connect(m_tabWidget,TQT_SIGNAL(focusInEvent()),this,TQT_SIGNAL(collapseOverlapContainers()));
+ connect(m_tabWidget,TQ_SIGNAL(focusInEvent()),this,TQ_SIGNAL(collapseOverlapContainers()));
}
void MainWindow::setupToolViews ()
@@ -153,7 +153,7 @@ void MainWindow::setupToolViews ()
KDockWidget *w=mainDock;
if (mainDock->parentDockTabGroup()) {
- w=static_cast<KDockWidget*>(TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent()));
+ w=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent());
}
TQPtrList<KDockWidget> leftReparentWidgets;
@@ -162,7 +162,7 @@ void MainWindow::setupToolViews ()
TQPtrList<KDockWidget> topReparentWidgets;
if (mainDock->parentDockTabGroup()) {
- mainDock=static_cast<KDockWidget*>(TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent()));
+ mainDock=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent());
}
findToolViewsDockedToMain(&leftReparentWidgets,KDockWidget::DockLeft);
@@ -180,40 +180,40 @@ void MainWindow::setupToolViews ()
m_leftContainer->manualDock(mainDock, KDockWidget::DockLeft,20);
tmpDC->init();
- connect (this,TQT_SIGNAL(toggleLeft()),tmpDC,TQT_SLOT(toggle()));
- connect(this,TQT_SIGNAL(collapseOverlapContainers()),tmpDC,TQT_SLOT(collapseOverlapped()));
- connect(tmpDC,TQT_SIGNAL(activated(DockContainer*)),this,TQT_SLOT(setActiveToolDock(DockContainer*)));
- connect(tmpDC,TQT_SIGNAL(deactivated(DockContainer*)),this,TQT_SLOT(removeFromActiveDockList(DockContainer*)));
+ connect (this,TQ_SIGNAL(toggleLeft()),tmpDC,TQ_SLOT(toggle()));
+ connect(this,TQ_SIGNAL(collapseOverlapContainers()),tmpDC,TQ_SLOT(collapseOverlapped()));
+ connect(tmpDC,TQ_SIGNAL(activated(DockContainer*)),this,TQ_SLOT(setActiveToolDock(DockContainer*)));
+ connect(tmpDC,TQ_SIGNAL(deactivated(DockContainer*)),this,TQ_SLOT(removeFromActiveDockList(DockContainer*)));
m_rightContainer->setWidget(tmpDC=new DockContainer(m_rightContainer, this, KDockWidget::DockRight, d->m_styleIDEAlMode));
m_rightContainer->setEnableDocking(KDockWidget::DockRight);
m_rightContainer->manualDock(mainDock, KDockWidget::DockRight,80);
tmpDC->init();
- connect (this,TQT_SIGNAL(toggleRight()),tmpDC,TQT_SLOT(toggle()));
- connect(this,TQT_SIGNAL(collapseOverlapContainers()),tmpDC,TQT_SLOT(collapseOverlapped()));
- connect(tmpDC,TQT_SIGNAL(activated(DockContainer*)),this,TQT_SLOT(setActiveToolDock(DockContainer*)));
- connect(tmpDC,TQT_SIGNAL(deactivated(DockContainer*)),this,TQT_SLOT(removeFromActiveDockList(DockContainer*)));
+ connect (this,TQ_SIGNAL(toggleRight()),tmpDC,TQ_SLOT(toggle()));
+ connect(this,TQ_SIGNAL(collapseOverlapContainers()),tmpDC,TQ_SLOT(collapseOverlapped()));
+ connect(tmpDC,TQ_SIGNAL(activated(DockContainer*)),this,TQ_SLOT(setActiveToolDock(DockContainer*)));
+ connect(tmpDC,TQ_SIGNAL(deactivated(DockContainer*)),this,TQ_SLOT(removeFromActiveDockList(DockContainer*)));
m_topContainer->setWidget(tmpDC=new DockContainer(m_topContainer, this, KDockWidget::DockTop, d->m_styleIDEAlMode));
m_topContainer->setEnableDocking(KDockWidget::DockTop);
m_topContainer->manualDock(mainDock, KDockWidget::DockTop,20);
tmpDC->init();
- connect (this,TQT_SIGNAL(toggleTop()),tmpDC,TQT_SLOT(toggle()));
- connect(this,TQT_SIGNAL(collapseOverlapContainers()),tmpDC,TQT_SLOT(collapseOverlapped()));
- connect(tmpDC,TQT_SIGNAL(activated(DockContainer*)),this,TQT_SLOT(setActiveToolDock(DockContainer*)));
- connect(tmpDC,TQT_SIGNAL(deactivated(DockContainer*)),this,TQT_SLOT(removeFromActiveDockList(DockContainer*)));
+ connect (this,TQ_SIGNAL(toggleTop()),tmpDC,TQ_SLOT(toggle()));
+ connect(this,TQ_SIGNAL(collapseOverlapContainers()),tmpDC,TQ_SLOT(collapseOverlapped()));
+ connect(tmpDC,TQ_SIGNAL(activated(DockContainer*)),this,TQ_SLOT(setActiveToolDock(DockContainer*)));
+ connect(tmpDC,TQ_SIGNAL(deactivated(DockContainer*)),this,TQ_SLOT(removeFromActiveDockList(DockContainer*)));
m_bottomContainer->setWidget(tmpDC=new DockContainer(m_bottomContainer, this, KDockWidget::DockBottom, d->m_styleIDEAlMode));
m_bottomContainer->setEnableDocking(KDockWidget::DockBottom);
m_bottomContainer->manualDock(mainDock, KDockWidget::DockBottom,80);
tmpDC->init();
- connect (this,TQT_SIGNAL(toggleBottom()),tmpDC,TQT_SLOT(toggle()));
- connect(this,TQT_SIGNAL(collapseOverlapContainers()),tmpDC,TQT_SLOT(collapseOverlapped()));
- connect(tmpDC,TQT_SIGNAL(activated(DockContainer*)),this,TQT_SLOT(setActiveToolDock(DockContainer*)));
- connect(tmpDC,TQT_SIGNAL(deactivated(DockContainer*)),this,TQT_SLOT(removeFromActiveDockList(DockContainer*)));
+ connect (this,TQ_SIGNAL(toggleBottom()),tmpDC,TQ_SLOT(toggle()));
+ connect(this,TQ_SIGNAL(collapseOverlapContainers()),tmpDC,TQ_SLOT(collapseOverlapped()));
+ connect(tmpDC,TQ_SIGNAL(activated(DockContainer*)),this,TQ_SLOT(setActiveToolDock(DockContainer*)));
+ connect(tmpDC,TQ_SIGNAL(deactivated(DockContainer*)),this,TQ_SLOT(removeFromActiveDockList(DockContainer*)));
m_leftContainer->setDockSite( KDockWidget::DockCenter );
m_rightContainer->setDockSite( KDockWidget::DockCenter );
@@ -240,10 +240,10 @@ void MainWindow::setupGUIClient ()
{
m_guiClient = new KMDIPrivate::GUIClient (this);
- connect(m_guiClient,TQT_SIGNAL(toggleTop()),this,TQT_SIGNAL(toggleTop()));
- connect(m_guiClient,TQT_SIGNAL(toggleLeft()),this,TQT_SIGNAL(toggleLeft()));
- connect(m_guiClient,TQT_SIGNAL(toggleRight()),this,TQT_SIGNAL(toggleRight()));
- connect(m_guiClient,TQT_SIGNAL(toggleBottom()),this,TQT_SIGNAL(toggleBottom()));
+ connect(m_guiClient,TQ_SIGNAL(toggleTop()),this,TQ_SIGNAL(toggleTop()));
+ connect(m_guiClient,TQ_SIGNAL(toggleLeft()),this,TQ_SIGNAL(toggleLeft()));
+ connect(m_guiClient,TQ_SIGNAL(toggleRight()),this,TQ_SIGNAL(toggleRight()));
+ connect(m_guiClient,TQ_SIGNAL(toggleBottom()),this,TQ_SIGNAL(toggleBottom()));
}
TabWidget *MainWindow::tabWidget ()
@@ -311,23 +311,23 @@ void MainWindow::setToolViewStyle(int flag)
{
d->m_styleIDEAlMode = flag; // see KMultiTabBar for the first 3 bits
- DockContainer *tmpL=::tqqt_cast<KMDI::DockContainer*>(m_leftContainer->getWidget());
+ DockContainer *tmpL=::tqt_cast<KMDI::DockContainer*>(m_leftContainer->getWidget());
if (tmpL) tmpL->setStyle(flag);
- DockContainer *tmpR=::tqqt_cast<KMDI::DockContainer*>(m_rightContainer->getWidget());
+ DockContainer *tmpR=::tqt_cast<KMDI::DockContainer*>(m_rightContainer->getWidget());
if (tmpR) tmpR->setStyle(flag);
- DockContainer *tmpT=::tqqt_cast<KMDI::DockContainer*>(m_topContainer->getWidget());
+ DockContainer *tmpT=::tqt_cast<KMDI::DockContainer*>(m_topContainer->getWidget());
if (tmpT) tmpT->setStyle(flag);
- DockContainer *tmpB=::tqqt_cast<KMDI::DockContainer*>(m_bottomContainer->getWidget());
+ DockContainer *tmpB=::tqt_cast<KMDI::DockContainer*>(m_bottomContainer->getWidget());
if (tmpB) tmpB->setStyle(flag);
d->m_toolviewStyle = flag;
bool toolviewExists = false;
TQMap<TQWidget*,KMDI::ToolViewAccessor*>::Iterator it;
for (it = m_toolViews->begin(); it != m_toolViews->end(); ++it) {
- KDockWidget *dockWidget = tqt_dynamic_cast<KDockWidget*>(it.data()->wrapperWidget());
+ KDockWidget *dockWidget = dynamic_cast<KDockWidget*>(it.data()->wrapperWidget());
if (dockWidget) {
if (flag == KMDI::IconOnly)
{
@@ -373,18 +373,18 @@ void MainWindow::dockToolViewsIntoContainers(TQPtrList<KDockWidget>& widgetsToRe
void MainWindow::findToolViewsDockedToMain(TQPtrList<KDockWidget>* list,KDockWidget::DockPosition dprtmw) {
KDockWidget *mainDock=getMainDockWidget();
if (mainDock->parentDockTabGroup()) {
- mainDock=tqt_dynamic_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent());
+ mainDock=dynamic_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent());
// FIXME: will likely crash below due to unchecked cast
}
KDockWidget* widget=mainDock->findNearestDockWidget(dprtmw);
if (widget) {
if (widget->parentDockTabGroup()) {
- widget=static_cast<KDockWidget*>(TQT_TQWIDGET(widget->parentDockTabGroup()->parent()));
+ widget=static_cast<KDockWidget*>(widget->parentDockTabGroup()->parent());
}
if (widget) {
- KDockTabGroup *tg=tqt_dynamic_cast<KDockTabGroup*>(widget->
+ KDockTabGroup *tg=dynamic_cast<KDockTabGroup*>(widget->
getWidget());
if (tg) {
kdDebug(760)<<"KDockTabGroup found"<<endl;
diff --git a/tdemdi/tdemdi/mainwindow.h b/tdemdi/tdemdi/mainwindow.h
index 133abd4a9..835093e6e 100644
--- a/tdemdi/tdemdi/mainwindow.h
+++ b/tdemdi/tdemdi/mainwindow.h
@@ -71,7 +71,7 @@ class TabWidget;
class KMDI_EXPORT MainWindow : public KParts::DockMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
friend class KMDI::ToolViewAccessor;
diff --git a/tdemdi/tdemdi/tabwidget.cpp b/tdemdi/tdemdi/tabwidget.cpp
index 01eb6d889..5dff64920 100644
--- a/tdemdi/tdemdi/tabwidget.cpp
+++ b/tdemdi/tdemdi/tabwidget.cpp
@@ -70,7 +70,7 @@ TabWidget::TabWidget(TQWidget* parent, const char* name)
setHoverCloseButton(true);
- connect(this, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(closeTab(TQWidget*)));
+ connect(this, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(closeTab(TQWidget*)));
}
TabWidget::~TabWidget()
@@ -89,9 +89,9 @@ 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 = TQT_TQOBJECT(((TQChildEvent*)e)->child());
+ TQObject* pLostChild = ((TQChildEvent*)e)->child();
if ((pLostChild != 0L) && (pLostChild->isWidgetType())) {
- TQObjectList *list = pLostChild->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList *list = pLostChild->queryList( "TQWidget" );
list->insert(0, pLostChild); // add the lost child to the list too, just to save code
TQObjectListIt it( *list ); // iterate over all lost child widgets
TQObject * o;
@@ -108,13 +108,13 @@ 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 = TQT_TQOBJECT(((TQChildEvent*)e)->child());
+ TQObject* pNewChild = ((TQChildEvent*)e)->child();
if ((pNewChild != 0L) && (pNewChild->isWidgetType()))
{
TQWidget* pNewWidget = (TQWidget*)pNewChild;
if (pNewWidget->testWFlags((WFlags)(WType_Dialog | WShowModal)))
return false;
- TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectList *list = pNewWidget->queryList( "TQWidget" );
list->insert(0, pNewChild); // add the new child to the list too, just to save code
TQObjectListIt it( *list ); // iterate over all new child widgets
TQObject * o;
@@ -122,7 +122,7 @@ bool TabWidget::eventFilter(TQObject *obj, TQEvent *e )
TQWidget* widg = (TQWidget*)o;
++it;
widg->installEventFilter(this);
- connect(widg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(childDestroyed()));
+ connect(widg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(childDestroyed()));
}
delete list; // delete the list, not the objects
}
@@ -135,10 +135,10 @@ void TabWidget::childDestroyed()
{
// if we lost a child we uninstall ourself as event filter for the lost
// child and its children
- const TQObject* pLostChild = TQT_TQOBJECT_CONST(sender());
+ const TQObject* pLostChild = sender();
if ((pLostChild != 0L) && (pLostChild->isWidgetType()))
{
- TQObjectList *list = ((TQObject*)(pLostChild))->queryList(TQWIDGET_OBJECT_NAME_STRING);
+ TQObjectList *list = ((TQObject*)(pLostChild))->queryList("TQWidget");
list->insert(0, pLostChild); // add the lost child to the list too, just to save code
TQObjectListIt it( *list ); // iterate over all lost child widgets
TQObject * obj;
diff --git a/tdemdi/tdemdi/tabwidget.h b/tdemdi/tdemdi/tabwidget.h
index dd79f92a7..ecae1ec64 100644
--- a/tdemdi/tdemdi/tabwidget.h
+++ b/tdemdi/tdemdi/tabwidget.h
@@ -55,7 +55,7 @@ namespace KMDI
class KMDI_EXPORT TabWidget : public KTabWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
TabWidget(TQWidget* parent, const char* name=0);
diff --git a/tdemdi/tdemdi/toolviewaccessor.cpp b/tdemdi/tdemdi/toolviewaccessor.cpp
index 1b640b532..24242b0df 100644
--- a/tdemdi/tdemdi/toolviewaccessor.cpp
+++ b/tdemdi/tdemdi/toolviewaccessor.cpp
@@ -37,7 +37,7 @@ ToolViewAccessor::ToolViewAccessor( KMDI::MainWindow *parent, TQWidget *widgetTo
mdiMainFrm=parent;
d=new KMDIPrivate::ToolViewAccessorPrivate();
if (widgetToWrap->inherits("KDockWidget")) {
- d->widgetContainer=tqt_dynamic_cast<KDockWidget*>(widgetToWrap);
+ d->widgetContainer=dynamic_cast<KDockWidget*>(widgetToWrap);
d->widget=d->widgetContainer->getWidget();
} else {
d->widget=widgetToWrap;
@@ -82,7 +82,7 @@ ToolViewAccessor::~ToolViewAccessor() {
TQWidget *ToolViewAccessor::wrapperWidget() {
if (!d->widgetContainer) {
d->widgetContainer=mdiMainFrm->createDockWidget( "ToolViewAccessor::null",TQPixmap());
- connect(d->widgetContainer,TQT_SIGNAL(widgetSet(TQWidget*)),this,TQT_SLOT(setWidgetToWrap(TQWidget*)));
+ connect(d->widgetContainer,TQ_SIGNAL(widgetSet(TQWidget*)),this,TQ_SLOT(setWidgetToWrap(TQWidget*)));
}
return d->widgetContainer;
}
@@ -96,7 +96,7 @@ void ToolViewAccessor::setWidgetToWrap(TQWidget *widgetToWrap, const TQString& t
{
Q_ASSERT(!(d->widget));
Q_ASSERT(!widgetToWrap->inherits("KDockWidget"));
- disconnect(d->widgetContainer,TQT_SIGNAL(widgetSet(TQWidget*)),this,TQT_SLOT(setWidgetToWrap(TQWidget*)));
+ disconnect(d->widgetContainer,TQ_SIGNAL(widgetSet(TQWidget*)),this,TQ_SLOT(setWidgetToWrap(TQWidget*)));
delete d->widget;
d->widget=widgetToWrap;
KDockWidget *tmp=d->widgetContainer;
diff --git a/tdemdi/tdemdi/toolviewaccessor.h b/tdemdi/tdemdi/toolviewaccessor.h
index 2278a3931..d27a50c0f 100644
--- a/tdemdi/tdemdi/toolviewaccessor.h
+++ b/tdemdi/tdemdi/toolviewaccessor.h
@@ -39,7 +39,7 @@ class MainWindow;
class ToolViewAccessor : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
friend class KMDI::MainWindow;
friend class KMDIPrivate::GUIClient;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 07:19:33 +0000