diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:46:43 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:46:43 +0000 |
commit | ffe8a83e053396df448e9413828527613ca3bd46 (patch) | |
tree | a73d4169e02df4a50f9a12cb165fcd0ab5bac7c6 /kmdi/kmdi | |
parent | 682bf3bfdcbcbb1fca85e8a36ed03e062e0555d5 (diff) | |
download | tdelibs-ffe8a83e053396df448e9413828527613ca3bd46.tar.gz tdelibs-ffe8a83e053396df448e9413828527613ca3bd46.zip |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1157647 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmdi/kmdi')
-rw-r--r-- | kmdi/kmdi/dockcontainer.cpp | 114 | ||||
-rw-r--r-- | kmdi/kmdi/dockcontainer.h | 44 | ||||
-rw-r--r-- | kmdi/kmdi/guiclient.cpp | 50 | ||||
-rw-r--r-- | kmdi/kmdi/guiclient.h | 18 | ||||
-rw-r--r-- | kmdi/kmdi/mainwindow.cpp | 94 | ||||
-rw-r--r-- | kmdi/kmdi/mainwindow.h | 20 | ||||
-rw-r--r-- | kmdi/kmdi/tabwidget.cpp | 68 | ||||
-rw-r--r-- | kmdi/kmdi/tabwidget.h | 24 | ||||
-rw-r--r-- | kmdi/kmdi/toolviewaccessor.cpp | 42 | ||||
-rw-r--r-- | kmdi/kmdi/toolviewaccessor.h | 24 | ||||
-rw-r--r-- | kmdi/kmdi/toolviewaccessor_p.h | 8 |
11 files changed, 253 insertions, 253 deletions
diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp index f1012d3dd..3455fe1e8 100644 --- a/kmdi/kmdi/dockcontainer.cpp +++ b/kmdi/kmdi/dockcontainer.cpp @@ -24,10 +24,10 @@ #include "kdockwidget_private.h" -#include <qwidgetstack.h> -#include <qlayout.h> -#include <qtimer.h> -#include <qtooltip.h> +#include <tqwidgetstack.h> +#include <tqlayout.h> +#include <tqtimer.h> +#include <tqtooltip.h> #include <kmultitabbar.h> #include <kglobalsettings.h> @@ -52,8 +52,8 @@ namespace KMDI { -DockContainer::DockContainer(QWidget *parent, QWidget *win, int position, int flags) -: QWidget(parent),KDockContainer() +DockContainer::DockContainer(TQWidget *parent, TQWidget *win, int position, int flags) +: TQWidget(parent),KDockContainer() { m_tabSwitching = false; m_block=false; @@ -68,13 +68,13 @@ DockContainer::DockContainer(QWidget *parent, QWidget *win, int position, int fl m_startEvent=0; kdDebug(760)<<"DockContainer created"<<endl; - QBoxLayout *l; + TQBoxLayout *l; m_vertical=!((position==KDockWidget::DockTop) || (position==KDockWidget::DockBottom)); if (!m_vertical) - l=new QVBoxLayout(this); + l=new TQVBoxLayout(this); else - l=new QHBoxLayout(this); + l=new TQHBoxLayout(this); l->setAutoAdd(false); @@ -88,9 +88,9 @@ DockContainer::DockContainer(QWidget *parent, QWidget *win, int position, int fl (position==KDockWidget::DockBottom)?KMultiTabBar::Bottom: (position==KDockWidget::DockTop)?KMultiTabBar::Top:KMultiTabBar::Right); - m_ws=new QWidgetStack(this); + m_ws=new TQWidgetStack(this); - m_ws->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding)); + m_ws->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding)); if ( (position==KDockWidget::DockLeft) || (position==KDockWidget::DockTop)) { @@ -114,7 +114,7 @@ void DockContainer::setStyle(int style) { DockContainer::~DockContainer() { - QMap<KDockWidget*,int>::iterator it; + TQMap<KDockWidget*,int>::iterator it; while (m_map.count()) { it = m_map.begin(); KDockWidget *w=it.key(); @@ -160,7 +160,7 @@ KDockWidget *DockContainer::parentDockWidget() return ((KDockWidget*)parent()); } -void DockContainer::insertWidget (KDockWidget *dwdg, QPixmap pixmap, const QString &text, int &) +void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQString &text, int &) { KDockWidget* w = (KDockWidget*) dwdg; int tab; @@ -193,7 +193,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, QPixmap pixmap, const QStri KDockButton_Private *btn = new KDockButton_Private( hdr, "OverlapButton" ); - QToolTip::add( btn, i18n("Switch between overlap and side by side mode", "Overlap") ); + TQToolTip::add( btn, i18n("Switch between overlap and side by side mode", "Overlap") ); btn->setToggleButton( true ); btn->setPixmap( const_cast< const char** >(kmdi_not_close_xpm) ); @@ -201,7 +201,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, QPixmap pixmap, const QStri m_overlapButtons.insert(w,btn); btn->setOn(!isOverlapMode()); - connect(btn,SIGNAL(clicked()),this,SLOT(changeOverlapMode())); + connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeOverlapMode())); } m_tb->appendTab(pixmap.isNull()?SmallIcon("misc"):pixmap,tab,w->tabPageLabel()); @@ -210,7 +210,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, QPixmap pixmap, const QStri //FB m_tb->setTab(tab,true); - connect(m_tb->tab(tab),SIGNAL(clicked(int)),this,SLOT(tabClicked(int))); + connect(m_tb->tab(tab),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(tabClicked(int))); kdDebug(760)<<"DockContainer::insertWidget()"<<endl; @@ -232,11 +232,11 @@ void DockContainer::insertWidget (KDockWidget *dwdg, QPixmap pixmap, const QStri } -bool DockContainer::eventFilter( QObject *obj, QEvent *event ) +bool DockContainer::eventFilter( TQObject *obj, TQEvent *event ) { if (obj==m_tb) { - if ( (event->type()==QEvent::Resize) && (m_ws->isHidden()) ) { - QSize size=((QResizeEvent*)event)->size(); + if ( (event->type()==TQEvent::Resize) && (m_ws->isHidden()) ) { + TQSize size=((TQResizeEvent*)event)->size(); if (m_vertical) parentDockWidget()->setForcedFixedWidth(size.width()); else @@ -245,7 +245,7 @@ bool DockContainer::eventFilter( QObject *obj, QEvent *event ) } else switch ( event->type() ){ - case QEvent::MouseButtonPress: + case TQEvent::MouseButtonPress: { KDockWidget * w=m_revMap[dynamic_cast<KMultiTabBarTab*>(obj)->id()]; if (!w) { @@ -266,20 +266,20 @@ bool DockContainer::eventFilter( QObject *obj, QEvent *event ) m_dragPanel=hdr->dragPanel(); if (m_dragPanel) m_movingState=WaitingForMoveStart; delete m_startEvent; - m_startEvent=new QMouseEvent(* ((QMouseEvent*)event)); + m_startEvent=new TQMouseEvent(* ((TQMouseEvent*)event)); } break; - case QEvent::MouseButtonRelease: + case TQEvent::MouseButtonRelease: if (m_movingState==Moving) { m_movingState=NotMoving; - QApplication::postEvent(m_dragPanel,new QMouseEvent(* ( (QMouseEvent*)event))); + TQApplication::postEvent(m_dragPanel,new TQMouseEvent(* ( (TQMouseEvent*)event))); delete m_startEvent; m_startEvent=0; } break; - case QEvent::MouseMove: + case TQEvent::MouseMove: if (m_movingState==WaitingForMoveStart) { - QPoint p( ((QMouseEvent*)event)->pos() - m_startEvent->pos() ); + 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,event); @@ -329,7 +329,7 @@ void DockContainer::changeOverlapMode() deactivateOverlapMode(); } - for (QMap<KDockWidget*,KDockButton_Private*>::iterator it=m_overlapButtons.begin(); + for (TQMap<KDockWidget*,KDockButton_Private*>::iterator it=m_overlapButtons.begin(); it!=m_overlapButtons.end();++it) it.data()->setOn(!isOverlapMode()); } @@ -449,12 +449,12 @@ void DockContainer::tabClicked(int t) m_tabSwitching=false; } -void DockContainer::setToolTip (KDockWidget *, QString &s) +void DockContainer::setToolTip (KDockWidget *, TQString &s) { kdDebug(760)<<"***********************************Setting tooltip for a widget: "<<s<<endl; } -void DockContainer::setPixmap(KDockWidget* widget ,const QPixmap& pixmap) +void DockContainer::setPixmap(KDockWidget* widget ,const TQPixmap& pixmap) { int id=m_ws->id(widget); if (id==-1) return; @@ -462,12 +462,12 @@ void DockContainer::setPixmap(KDockWidget* widget ,const QPixmap& pixmap) tab->setIcon(pixmap.isNull()?SmallIcon("misc"):pixmap); } -void DockContainer::save(KConfig* cfg,const QString& group_or_prefix) +void DockContainer::save(KConfig* cfg,const TQString& group_or_prefix) { // group name - QString grp=cfg->group(); - cfg->deleteGroup(group_or_prefix+QString("::%1").arg(parent()->name())); - cfg->setGroup(group_or_prefix+QString("::%1").arg(parent()->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())); // save overlap mode cfg->writeEntry("overlapMode",isOverlapMode()); @@ -481,21 +481,21 @@ void DockContainer::save(KConfig* cfg,const QString& group_or_prefix) cfg->writeEntry( "separatorPosition", m_separatorPos ); } - QPtrList<KMultiTabBarTab>* tl=m_tb->tabs(); - QPtrListIterator<KMultiTabBarTab> it(*tl); - QStringList::Iterator it2=itemNames.begin(); + TQPtrList<KMultiTabBarTab>* tl=m_tb->tabs(); + TQPtrListIterator<KMultiTabBarTab> it(*tl); + TQStringList::Iterator it2=itemNames.begin(); int i=0; for (;it.current()!=0;++it,++it2) { -// cfg->writeEntry(QString("widget%1").arg(i),m_ws->widget(it.current()->id())->name()); - cfg->writeEntry(QString("widget%1").arg(i),(*it2)); - QString s=tabCaptions[*it2]; +// cfg->writeEntry(TQString("widget%1").arg(i),m_ws->widget(it.current()->id())->name()); + cfg->writeEntry(TQString("widget%1").arg(i),(*it2)); + TQString s=tabCaptions[*it2]; if (!s.isEmpty()) { - cfg->writeEntry(QString("widget%1-tabCaption").arg(i),s); + cfg->writeEntry(TQString("widget%1-tabCaption").arg(i),s); } s=tabTooltips[*it2]; if (!s.isEmpty()) { - cfg->writeEntry(QString("widget%1-tabTooltip").arg(i),s); + cfg->writeEntry(TQString("widget%1-tabTooltip").arg(i),s); } // kdDebug(760)<<"****************************************Saving: "<<m_ws->widget(it.current()->id())->name()<<endl; if (m_tb->isTabRaised(it.current()->id())) @@ -506,10 +506,10 @@ void DockContainer::save(KConfig* cfg,const QString& group_or_prefix) cfg->setGroup(grp); } -void DockContainer::load(KConfig* cfg,const QString& group_or_prefix) +void DockContainer::load(KConfig* cfg,const TQString& group_or_prefix) { - QString grp=cfg->group(); - cfg->setGroup(group_or_prefix+QString("::%1").arg(parent()->name())); + TQString grp=cfg->group(); + cfg->setGroup(group_or_prefix+TQString("::%1").arg(parent()->name())); if (cfg->readBoolEntry("overlapMode")) activateOverlapMode( m_vertical?m_tb->width():m_tb->height() ); @@ -519,20 +519,20 @@ void DockContainer::load(KConfig* cfg,const QString& group_or_prefix) m_separatorPos = cfg->readNumEntry( "separatorPosition", 18000 ); // = 18% int i=0; - QString raise; + TQString raise; while (true) { - QString dwn=cfg->readEntry(QString("widget%1").arg(i)); + TQString dwn=cfg->readEntry(TQString("widget%1").arg(i)); if (dwn.isEmpty()) break; kdDebug(760)<<"*************************************************************Configuring dockwidget :"<<dwn<<endl; KDockWidget *dw=((KDockWidget*)parent())->dockManager()->getDockWidgetFromName(dwn); if (dw) { - QString s=cfg->readEntry(QString("widget%1-tabCaption").arg(i)); + TQString s=cfg->readEntry(TQString("widget%1-tabCaption").arg(i)); if (!s.isEmpty()) { dw->setTabPageLabel(s); } - s=cfg->readEntry(QString("widget%1-tabTooltip").arg(i)); + s=cfg->readEntry(TQString("widget%1-tabTooltip").arg(i)); if (!s.isEmpty()) { dw->setToolTipString(s); } @@ -543,8 +543,8 @@ void DockContainer::load(KConfig* cfg,const QString& group_or_prefix) } - QPtrList<KMultiTabBarTab>* tl=m_tb->tabs(); - QPtrListIterator<KMultiTabBarTab> it1(*tl); + TQPtrList<KMultiTabBarTab>* tl=m_tb->tabs(); + TQPtrListIterator<KMultiTabBarTab> it1(*tl); m_ws->hide(); if (m_vertical) parentDockWidget()->setForcedFixedWidth(m_tb->width()); @@ -557,13 +557,13 @@ void DockContainer::load(KConfig* cfg,const QString& group_or_prefix) kapp->syncX(); m_delayedRaise=-1; - for (QMap<KDockWidget*,KDockButton_Private*>::iterator it=m_overlapButtons.begin(); + for (TQMap<KDockWidget*,KDockButton_Private*>::iterator it=m_overlapButtons.begin(); it!=m_overlapButtons.end();++it) it.data()->setOn(!isOverlapMode()); if (!raise.isEmpty()) { - for (QMap<KDockWidget*,int>::iterator it=m_map.begin();it!=m_map.end();++it) + for (TQMap<KDockWidget*,int>::iterator it=m_map.begin();it!=m_map.end();++it) { if (it.key()->name()==raise) { @@ -575,14 +575,14 @@ void DockContainer::load(KConfig* cfg,const QString& group_or_prefix) kapp->syncX();*/ m_delayedRaise=it.data(); - QTimer::singleShot(0,this,SLOT(delayedRaise())); + TQTimer::singleShot(0,this,TQT_SLOT(delayedRaise())); kdDebug(760)<<"************** raising *******: "<<it.key()->name()<<endl; break; } } } - if (m_delayedRaise==-1) QTimer::singleShot(0,this,SLOT(init())); + if (m_delayedRaise==-1) TQTimer::singleShot(0,this,TQT_SLOT(init())); cfg->setGroup(grp); } @@ -597,8 +597,8 @@ void DockContainer::collapseOverlapped() { if (m_tabSwitching) return; if (isOverlapMode()){ - QPtrList<KMultiTabBarTab>* tl=m_tb->tabs(); - QPtrListIterator<KMultiTabBarTab> it(*tl); + TQPtrList<KMultiTabBarTab>* tl=m_tb->tabs(); + TQPtrListIterator<KMultiTabBarTab> it(*tl); for(;it.current();++it) { if (it.current()->isOn()) { kdDebug(760)<<"Lowering TAB"<<endl; @@ -630,7 +630,7 @@ void DockContainer::toggle() { } void DockContainer::prevToolView() { - QPtrList<KMultiTabBarTab>* tabs=m_tb->tabs(); + TQPtrList<KMultiTabBarTab>* tabs=m_tb->tabs(); int pos=tabs->findRef(m_tb->tab(oldtab)); if (pos==-1) return; pos--; @@ -642,7 +642,7 @@ void DockContainer::prevToolView() { } void DockContainer::nextToolView() { - QPtrList<KMultiTabBarTab>* tabs=m_tb->tabs(); + TQPtrList<KMultiTabBarTab>* tabs=m_tb->tabs(); int pos=tabs->findRef(m_tb->tab(oldtab)); if (pos==-1) return; pos++; diff --git a/kmdi/kmdi/dockcontainer.h b/kmdi/kmdi/dockcontainer.h index d301d3c53..74b93968b 100644 --- a/kmdi/kmdi/dockcontainer.h +++ b/kmdi/kmdi/dockcontainer.h @@ -20,14 +20,14 @@ #ifndef _KMDI_DOCK_CONTAINER_ #define _KMDI_DOCK_CONTAINER_ -#include <qwidget.h> -#include <qstringlist.h> +#include <tqwidget.h> +#include <tqstringlist.h> #include <kdockwidget.h> -#include <qmap.h> +#include <tqmap.h> # include <kdockwidget_p.h> -#include <qpushbutton.h> +#include <tqpushbutton.h> class QWidgetStack; class KMultiTabBar; @@ -36,12 +36,12 @@ class KDockButton_Private; namespace KMDI { -class DockContainer: public QWidget, public KDockContainer +class DockContainer: public TQWidget, public KDockContainer { Q_OBJECT public: - DockContainer(QWidget *parent, QWidget *win, int position, int flags); + DockContainer(TQWidget *parent, TQWidget *win, int position, int flags); virtual ~DockContainer(); /** Get the KDockWidget that is our parent */ @@ -52,7 +52,7 @@ class DockContainer: public QWidget, public KDockContainer * \param w the KDockWidget object to add * \todo Remove the extra parameters that we don't use? */ - virtual void insertWidget (KDockWidget *w, QPixmap, const QString &, int &); + virtual void insertWidget (KDockWidget *w, TQPixmap, const TQString &, int &); /** * Show a KDockWidget in our DockContainer @@ -66,14 +66,14 @@ class DockContainer: public QWidget, public KDockContainer * \todo Actually implement it? Right now, it looks just it * does exactly nothing */ - virtual void setToolTip (KDockWidget *, QString &); + virtual void setToolTip (KDockWidget *, TQString &); /** * Set a pixmap for one of our dock widgets * \param widget the KDockWidget to set the pixmap for * \param pixmap the pixmap you want to give the widget */ - virtual void setPixmap(KDockWidget* widget, const QPixmap& pixmap); + virtual void setPixmap(KDockWidget* widget, const TQPixmap& pixmap); /** * Undock a widget from the container. This function is called @@ -91,12 +91,12 @@ class DockContainer: public QWidget, public KDockContainer void hideIfNeeded(); - virtual void save(KConfig *,const QString& group_or_prefix); - virtual void load(KConfig *,const QString& group_or_prefix); + virtual void save(KConfig *,const TQString& group_or_prefix); + virtual void load(KConfig *,const TQString& group_or_prefix); void setStyle(int); protected: - bool eventFilter(QObject*,QEvent*); + bool eventFilter(TQObject*,TQEvent*); public slots: void init(); @@ -109,28 +109,28 @@ class DockContainer: public QWidget, public KDockContainer void delayedRaise(); void changeOverlapMode(); private: - QWidget *m_mainWin; - QWidgetStack *m_ws; + TQWidget *m_mainWin; + TQWidgetStack *m_ws; KMultiTabBar *m_tb; int mTabCnt; int oldtab; int m_previousTab; int m_position; int m_separatorPos; - QMap<KDockWidget*,int> m_map; - QMap<int,KDockWidget*> m_revMap; - QMap<KDockWidget*,KDockButton_Private*> m_overlapButtons; - QStringList itemNames; - QMap<QString,QString> tabCaptions; - QMap<QString,QString> tabTooltips; + TQMap<KDockWidget*,int> m_map; + TQMap<int,KDockWidget*> m_revMap; + TQMap<KDockWidget*,KDockButton_Private*> m_overlapButtons; + TQStringList itemNames; + TQMap<TQString,TQString> tabCaptions; + TQMap<TQString,TQString> tabTooltips; int m_inserted; int m_delayedRaise; bool m_vertical; bool m_block; bool m_tabSwitching; - QObject *m_dragPanel; + TQObject *m_dragPanel; KDockManager *m_dockManager; - QMouseEvent *m_startEvent; + TQMouseEvent *m_startEvent; enum MovingState {NotMoving=0,WaitingForMoveStart,MovingInternal,Moving} m_movingState; signals: void activated(DockContainer*); diff --git a/kmdi/kmdi/guiclient.cpp b/kmdi/kmdi/guiclient.cpp index 7e146b836..882916f30 100644 --- a/kmdi/kmdi/guiclient.cpp +++ b/kmdi/kmdi/guiclient.cpp @@ -21,13 +21,13 @@ #include "guiclient.h" #include "guiclient.moc" -#include <qpopupmenu.h> +#include <tqpopupmenu.h> #include <kapplication.h> #include <kconfig.h> #include <ktoolbar.h> #include <klocale.h> #include <kaction.h> -#include <qstring.h> +#include <tqstring.h> #include <kdebug.h> #include <kdockwidget.h> @@ -52,13 +52,13 @@ namespace KMDIPrivate { GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name) - : QObject ( mdiMainFrm,name ) + : TQObject ( mdiMainFrm,name ) , KXMLGUIClient ( mdiMainFrm ) { m_mdiMainFrm=mdiMainFrm; - connect( mdiMainFrm->guiFactory(), SIGNAL( clientAdded( KXMLGUIClient * ) ), - this, SLOT( clientAdded( KXMLGUIClient * ) ) ); + connect( mdiMainFrm->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ), + this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) ); /* re-use an existing resource file if it exists. can happen if the user launches the * toolbar editor */ @@ -68,7 +68,7 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name) if ( domDocument().documentElement().isNull() ) { - QString completeDescription = QString::fromLatin1( guiDescription ).arg( actionListName ); + TQString completeDescription = TQString::fromLatin1( guiDescription ).arg( actionListName ); setXML( completeDescription, false /*merge*/ ); } @@ -79,18 +79,18 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name) m_toolMenu=new KActionMenu(i18n("Tool &Views"),actionCollection(),"kmdi_toolview_menu"); m_gotoToolDockMenu=new KActionMenu(i18n("Tool &Docks"),actionCollection(),"kmdi_tooldock_menu"); - m_gotoToolDockMenu->insert(new KAction(i18n("Switch Top Dock"),ALT+CTRL+SHIFT+Key_T,this,SIGNAL(toggleTop()), + m_gotoToolDockMenu->insert(new KAction(i18n("Switch Top Dock"),ALT+CTRL+SHIFT+Key_T,this,TQT_SIGNAL(toggleTop()), actionCollection(),"kmdi_activate_top")); - m_gotoToolDockMenu->insert(new KAction(i18n("Switch Left Dock"),ALT+CTRL+SHIFT+Key_L,this,SIGNAL(toggleLeft()), + m_gotoToolDockMenu->insert(new KAction(i18n("Switch Left Dock"),ALT+CTRL+SHIFT+Key_L,this,TQT_SIGNAL(toggleLeft()), actionCollection(),"kmdi_activate_left")); - m_gotoToolDockMenu->insert(new KAction(i18n("Switch Right Dock"),ALT+CTRL+SHIFT+Key_R,this,SIGNAL(toggleRight()), + m_gotoToolDockMenu->insert(new KAction(i18n("Switch Right Dock"),ALT+CTRL+SHIFT+Key_R,this,TQT_SIGNAL(toggleRight()), actionCollection(),"kmdi_activate_right")); - m_gotoToolDockMenu->insert(new KAction(i18n("Switch Bottom Dock"),ALT+CTRL+SHIFT+Key_B,this,SIGNAL(toggleBottom()), + 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,SLOT(prevToolViewInDock()), + m_gotoToolDockMenu->insert(new KAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,m_mdiMainFrm,TQT_SLOT(prevToolViewInDock()), actionCollection(),"kmdi_prev_toolview")); - m_gotoToolDockMenu->insert(new KAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,m_mdiMainFrm,SLOT(nextToolViewInDock()), + m_gotoToolDockMenu->insert(new KAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,m_mdiMainFrm,TQT_SLOT(nextToolViewInDock()), actionCollection(),"kmdi_next_toolview")); actionCollection()->readShortcutSettings( "Shortcuts", kapp->config() ); @@ -115,7 +115,7 @@ void GUIClient::setupActions() unplugActionList( actionListName ); - QPtrList<KAction> addList; + TQPtrList<KAction> addList; if (m_toolViewActions.count()<3) { for (uint i=0;i<m_toolViewActions.count();i++) @@ -135,23 +135,23 @@ void GUIClient::addToolView(KMDI::ToolViewAccessor* mtva) { kdDebug(760)<<"*****void GUIClient::addToolView(KMDI::ToolViewAccessor* mtva)*****"<<endl; - QString aname = QString("kmdi_toolview_") + mtva->wrappedWidget()->name(); + TQString aname = TQString("kmdi_toolview_") + mtva->wrappedWidget()->name(); // try to read the action shortcut KShortcut sc; KConfig *cfg = kapp->config(); - QString _grp = cfg->group(); + TQString _grp = cfg->group(); cfg->setGroup("Shortcuts"); sc = KShortcut( cfg->readEntry( aname, "" ) ); cfg->setGroup( _grp ); KAction *a=new ToggleToolViewAction(i18n("Show %1").arg(mtva->wrappedWidget()->caption()), - /*QString::null*/sc,dynamic_cast<KDockWidget*>(mtva->wrapperWidget()), + /*TQString::null*/sc,dynamic_cast<KDockWidget*>(mtva->wrapperWidget()), m_mdiMainFrm,actionCollection(), aname.latin1() ); ((ToggleToolViewAction*)a)->setCheckedState(i18n("Hide %1").arg(mtva->wrappedWidget()->caption())); - connect(a,SIGNAL(destroyed(QObject*)),this,SLOT(actionDeleted(QObject*))); + connect(a,TQT_SIGNAL(destroyed(TQObject*)),this,TQT_SLOT(actionDeleted(TQObject*))); m_toolViewActions.append(a); m_toolMenu->insert(a); @@ -160,7 +160,7 @@ void GUIClient::addToolView(KMDI::ToolViewAccessor* mtva) setupActions(); } -void GUIClient::actionDeleted(QObject* a) +void GUIClient::actionDeleted(TQObject* a) { m_toolViewActions.remove(static_cast<KAction*>(a)); setupActions(); @@ -173,17 +173,17 @@ void GUIClient::clientAdded( KXMLGUIClient *client ) setupActions(); } -ToggleToolViewAction::ToggleToolViewAction ( const QString& text, const KShortcut& cut,KDockWidget *dw, KMDI::MainWindow *mdiMainFrm, - QObject* parent, const char* name ) +ToggleToolViewAction::ToggleToolViewAction ( const TQString& text, const KShortcut& cut,KDockWidget *dw, KMDI::MainWindow *mdiMainFrm, + TQObject* parent, const char* name ) : KToggleAction(text,cut,parent,name) , m_dw(dw) , m_mdiMainFrm(mdiMainFrm) { if (m_dw) { - connect(this,SIGNAL(toggled(bool)),this,SLOT(slotToggled(bool))); - connect(m_dw->dockManager(),SIGNAL(change()),this,SLOT(anDWChanged())); - connect(m_dw,SIGNAL(destroyed()),this,SLOT(slotWidgetDestroyed())); + 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())); setChecked(m_dw->mayBeHide()); } @@ -218,8 +218,8 @@ void ToggleToolViewAction::slotToggled(bool t) void ToggleToolViewAction::slotWidgetDestroyed() { - disconnect(m_dw->dockManager(),SIGNAL(change()),this,SLOT(anDWChanged())); - disconnect(this,SIGNAL(toggled(bool)),0,0); + disconnect(m_dw->dockManager(),TQT_SIGNAL(change()),this,TQT_SLOT(anDWChanged())); + disconnect(this,TQT_SIGNAL(toggled(bool)),0,0); unplugAll(); deleteLater(); diff --git a/kmdi/kmdi/guiclient.h b/kmdi/kmdi/guiclient.h index 04dd2fbd2..c3784fe6e 100644 --- a/kmdi/kmdi/guiclient.h +++ b/kmdi/kmdi/guiclient.h @@ -21,8 +21,8 @@ #ifndef _KMDI_GUICLIENT_H_ #define _KMDI_GUICLIENT_H_ -#include <qobject.h> -#include <qguardedptr.h> +#include <tqobject.h> +#include <tqguardedptr.h> #include <kxmlguiclient.h> #include <kaction.h> @@ -42,7 +42,7 @@ namespace KMDIPrivate { class GUIClientPrivate; -class GUIClient : public QObject, public KXMLGUIClient +class GUIClient : public TQObject, public KXMLGUIClient { Q_OBJECT @@ -55,7 +55,7 @@ class GUIClient : public QObject, public KXMLGUIClient private slots: void clientAdded( KXMLGUIClient *client ); void setupActions(); - void actionDeleted(QObject*); + void actionDeleted(TQObject*); signals: void toggleTop(); @@ -66,9 +66,9 @@ class GUIClient : public QObject, public KXMLGUIClient private: GUIClientPrivate *d; - QGuardedPtr<KMDI::MainWindow> m_mdiMainFrm; - QPtrList<KAction> m_toolViewActions; - QPtrList<KAction> m_documentViewActions; + TQGuardedPtr<KMDI::MainWindow> m_mdiMainFrm; + TQPtrList<KAction> m_toolViewActions; + TQPtrList<KAction> m_documentViewActions; KActionMenu *m_docMenu; KActionMenu *m_toolMenu; @@ -81,8 +81,8 @@ class ToggleToolViewAction:public KToggleAction Q_OBJECT public: - ToggleToolViewAction ( const QString& text, const KShortcut& cut = KShortcut(), - KDockWidget *dw=0,KMDI::MainWindow *mdiMainFrm=0, QObject* parent = 0, const char* name = 0 ); + ToggleToolViewAction ( const TQString& text, const KShortcut& cut = KShortcut(), + KDockWidget *dw=0,KMDI::MainWindow *mdiMainFrm=0, TQObject* parent = 0, const char* name = 0 ); virtual ~ToggleToolViewAction(); diff --git a/kmdi/kmdi/mainwindow.cpp b/kmdi/kmdi/mainwindow.cpp index 048086178..d6e332780 100644 --- a/kmdi/kmdi/mainwindow.cpp +++ b/kmdi/kmdi/mainwindow.cpp @@ -45,17 +45,17 @@ #include <assert.h> -#include <qcursor.h> -#include <qclipboard.h> -#include <qobjectlist.h> -#include <qpopupmenu.h> -#include <qmenubar.h> +#include <tqcursor.h> +#include <tqclipboard.h> +#include <tqobjectlist.h> +#include <tqpopupmenu.h> +#include <tqmenubar.h> #include <kmenubar.h> #include <kapplication.h> #include <kdebug.h> #include <kdeversion.h> -#include <qtabwidget.h> +#include <tqtabwidget.h> #include <klocale.h> #include <kiconloader.h> @@ -63,11 +63,11 @@ #include "mainwindow.moc" -#include <qtoolbutton.h> -#include <qlayout.h> -#include <qstring.h> -#include <qmap.h> -#include <qvaluelist.h> +#include <tqtoolbutton.h> +#include <tqlayout.h> +#include <tqstring.h> +#include <tqmap.h> +#include <tqvaluelist.h> #include "mainwindow.h" #include "dockcontainer.h" @@ -97,9 +97,9 @@ namespace KMDI { //============ constructor ============// -MainWindow::MainWindow(QWidget* parentWidget, const char* name) +MainWindow::MainWindow(TQWidget* parentWidget, const char* name) : KParts::DockMainWindow( parentWidget, name) - , m_toolViews (new QMap<QWidget*,KMDI::ToolViewAccessor*>) + , m_toolViews (new TQMap<TQWidget*,KMDI::ToolViewAccessor*>) , d(new KMDIPrivate::MainWindowPrivate()) { // setup main dock stuff @@ -125,7 +125,7 @@ MainWindow::~MainWindow() void MainWindow::setupMainDock () { // cover KMdi's childarea by a dockwidget - KDockWidget *dw = createDockWidget( "mdiAreaCover", QPixmap(), 0L, "mdi_area_cover"); + KDockWidget *dw = createDockWidget( "mdiAreaCover", TQPixmap(), 0L, "mdi_area_cover"); dw->setDockWindowTransient(this,true); dw->setEnableDocking(KDockWidget::DockNone); dw->setDockSite(KDockWidget::DockCorner); @@ -139,7 +139,7 @@ void MainWindow::setupMainDock () setMainDockWidget(dw); // connect signals to collapse sidebars - connect(m_tabWidget,SIGNAL(focusInEvent()),this,SIGNAL(collapseOverlapContainers())); + connect(m_tabWidget,TQT_SIGNAL(focusInEvent()),this,TQT_SIGNAL(collapseOverlapContainers())); } void MainWindow::setupToolViews () @@ -156,10 +156,10 @@ void MainWindow::setupToolViews () w=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent()); } - QPtrList<KDockWidget> leftReparentWidgets; - QPtrList<KDockWidget> rightReparentWidgets; - QPtrList<KDockWidget> bottomReparentWidgets; - QPtrList<KDockWidget> topReparentWidgets; + TQPtrList<KDockWidget> leftReparentWidgets; + TQPtrList<KDockWidget> rightReparentWidgets; + TQPtrList<KDockWidget> bottomReparentWidgets; + TQPtrList<KDockWidget> topReparentWidgets; if (mainDock->parentDockTabGroup()) { mainDock=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent()); @@ -180,40 +180,40 @@ void MainWindow::setupToolViews () m_leftContainer->manualDock(mainDock, KDockWidget::DockLeft,20); tmpDC->init(); - connect (this,SIGNAL(toggleLeft()),tmpDC,SLOT(toggle())); - connect(this,SIGNAL(collapseOverlapContainers()),tmpDC,SLOT(collapseOverlapped())); - connect(tmpDC,SIGNAL(activated(DockContainer*)),this,SLOT(setActiveToolDock(DockContainer*))); - connect(tmpDC,SIGNAL(deactivated(DockContainer*)),this,SLOT(removeFromActiveDockList(DockContainer*))); + 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*))); 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,SIGNAL(toggleRight()),tmpDC,SLOT(toggle())); - connect(this,SIGNAL(collapseOverlapContainers()),tmpDC,SLOT(collapseOverlapped())); - connect(tmpDC,SIGNAL(activated(DockContainer*)),this,SLOT(setActiveToolDock(DockContainer*))); - connect(tmpDC,SIGNAL(deactivated(DockContainer*)),this,SLOT(removeFromActiveDockList(DockContainer*))); + 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*))); 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,SIGNAL(toggleTop()),tmpDC,SLOT(toggle())); - connect(this,SIGNAL(collapseOverlapContainers()),tmpDC,SLOT(collapseOverlapped())); - connect(tmpDC,SIGNAL(activated(DockContainer*)),this,SLOT(setActiveToolDock(DockContainer*))); - connect(tmpDC,SIGNAL(deactivated(DockContainer*)),this,SLOT(removeFromActiveDockList(DockContainer*))); + 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*))); 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,SIGNAL(toggleBottom()),tmpDC,SLOT(toggle())); - connect(this,SIGNAL(collapseOverlapContainers()),tmpDC,SLOT(collapseOverlapped())); - connect(tmpDC,SIGNAL(activated(DockContainer*)),this,SLOT(setActiveToolDock(DockContainer*))); - connect(tmpDC,SIGNAL(deactivated(DockContainer*)),this,SLOT(removeFromActiveDockList(DockContainer*))); + 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*))); 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,SIGNAL(toggleTop()),this,SIGNAL(toggleTop())); - connect(m_guiClient,SIGNAL(toggleLeft()),this,SIGNAL(toggleLeft())); - connect(m_guiClient,SIGNAL(toggleRight()),this,SIGNAL(toggleRight())); - connect(m_guiClient,SIGNAL(toggleBottom()),this,SIGNAL(toggleBottom())); + 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())); } TabWidget *MainWindow::tabWidget () @@ -256,9 +256,9 @@ ToolViewAccessor *MainWindow::createToolWindow() return new KMDI::ToolViewAccessor(this); } -KMDI::ToolViewAccessor *MainWindow::addToolWindow( QWidget* pWnd, KDockWidget::DockPosition pos, QWidget* pTargetWnd, int percent, const QString& tabToolTip, const QString& tabCaption) +KMDI::ToolViewAccessor *MainWindow::addToolWindow( TQWidget* pWnd, KDockWidget::DockPosition pos, TQWidget* pTargetWnd, int percent, const TQString& tabToolTip, const TQString& tabCaption) { - QWidget *tvta=pWnd; + TQWidget *tvta=pWnd; KDockWidget* pDW = dockManager->getDockWidgetFromName(pWnd->name()); if (pDW) { // probably readDockConfig already created the widgetContainer, use that @@ -273,7 +273,7 @@ KMDI::ToolViewAccessor *MainWindow::addToolWindow( QWidget* pWnd, KDockWidget::D pWnd=pDW; } - QRect r=pWnd->geometry(); + TQRect r=pWnd->geometry(); KMDI::ToolViewAccessor *mtva=new KMDI::ToolViewAccessor(this,pWnd,tabToolTip,(tabCaption==0)?pWnd->caption():tabCaption); m_toolViews->insert(tvta,mtva); @@ -282,7 +282,7 @@ KMDI::ToolViewAccessor *MainWindow::addToolWindow( QWidget* pWnd, KDockWidget::D mtva->d->widgetContainer->setEnableDocking(KDockWidget::DockNone); mtva->d->widgetContainer->reparent(this, Qt::WType_TopLevel | Qt::WType_Dialog, r.topLeft(), isVisible()); } else { // add (and dock) the toolview as DockWidget view - //const QPixmap& wndIcon = pWnd->icon() ? *(pWnd->icon()) : QPixmap(); + //const TQPixmap& wndIcon = pWnd->icon() ? *(pWnd->icon()) : TQPixmap(); //KDockWidget *pCover=mtva->d->widgetContainer; @@ -297,7 +297,7 @@ void MainWindow::deleteToolWindow( KMDI::ToolViewAccessor *accessor) delete accessor; } -void MainWindow::deleteToolWindow( QWidget* pWnd) +void MainWindow::deleteToolWindow( TQWidget* pWnd) { if (!pWnd) return; @@ -325,7 +325,7 @@ void MainWindow::setToolViewStyle(int flag) d->m_toolviewStyle = flag; bool toolviewExists = false; - QMap<QWidget*,KMDI::ToolViewAccessor*>::Iterator it; + TQMap<TQWidget*,KMDI::ToolViewAccessor*>::Iterator it; for (it = m_toolViews->begin(); it != m_toolViews->end(); ++it) { KDockWidget *dockWidget = dynamic_cast<KDockWidget*>(it.data()->wrapperWidget()); if (dockWidget) { @@ -362,7 +362,7 @@ void MainWindow::setToolViewStyle(int flag) } } -void MainWindow::dockToolViewsIntoContainers(QPtrList<KDockWidget>& widgetsToReparent,KDockWidget *container) { +void MainWindow::dockToolViewsIntoContainers(TQPtrList<KDockWidget>& widgetsToReparent,KDockWidget *container) { for ( KDockWidget *dw = widgetsToReparent.first(); dw; dw=widgetsToReparent.next()){ dw->manualDock(container,KDockWidget::DockCenter,20); @@ -370,7 +370,7 @@ void MainWindow::dockToolViewsIntoContainers(QPtrList<KDockWidget>& widgetsToRep } } -void MainWindow::findToolViewsDockedToMain(QPtrList<KDockWidget>* list,KDockWidget::DockPosition dprtmw) { +void MainWindow::findToolViewsDockedToMain(TQPtrList<KDockWidget>* list,KDockWidget::DockPosition dprtmw) { KDockWidget *mainDock=getMainDockWidget(); if (mainDock->parentDockTabGroup()) { mainDock=dynamic_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent()); diff --git a/kmdi/kmdi/mainwindow.h b/kmdi/kmdi/mainwindow.h index 391ce8df9..a64cca43d 100644 --- a/kmdi/kmdi/mainwindow.h +++ b/kmdi/kmdi/mainwindow.h @@ -46,10 +46,10 @@ #include <kmenubar.h> #include <kpopupmenu.h> -#include <qptrlist.h> -#include <qrect.h> -#include <qapplication.h> -#include <qguardedptr.h> +#include <tqptrlist.h> +#include <tqrect.h> +#include <tqapplication.h> +#include <tqguardedptr.h> #include <kmdi/global.h> @@ -79,7 +79,7 @@ class KMDI_EXPORT MainWindow : public KParts::DockMainWindow /** * Constructor. */ - MainWindow ( QWidget* parentWidget, const char* name = ""); + MainWindow ( TQWidget* parentWidget, const char* name = ""); /** * Destructor. @@ -113,7 +113,7 @@ class KMDI_EXPORT MainWindow : public KParts::DockMainWindow * @param tabCaption * @return created toolview */ - KMDI::ToolViewAccessor *addToolWindow( QWidget* pWnd, KDockWidget::DockPosition pos = KDockWidget::DockNone, QWidget* pTargetWnd = 0L, int percent = 50, const QString& tabToolTip = 0, const QString& tabCaption = 0); + KMDI::ToolViewAccessor *addToolWindow( TQWidget* pWnd, KDockWidget::DockPosition pos = KDockWidget::DockNone, TQWidget* pTargetWnd = 0L, int percent = 50, const TQString& tabToolTip = 0, const TQString& tabCaption = 0); /** * delete the toolview belonging to the given accessor @@ -125,7 +125,7 @@ class KMDI_EXPORT MainWindow : public KParts::DockMainWindow * delete the toolview belonging to the given pWnd * @param pWnd toolview to be deleted */ - void deleteToolWindow( QWidget* pWnd); + void deleteToolWindow( TQWidget* pWnd); /** * Sets the appearance of the toolview tabs. @@ -141,8 +141,8 @@ class KMDI_EXPORT MainWindow : public KParts::DockMainWindow void collapseOverlapContainers(); protected: - void findToolViewsDockedToMain(QPtrList<KDockWidget>* list,KDockWidget::DockPosition dprtmw); - void dockToolViewsIntoContainers(QPtrList<KDockWidget>& widgetsToReparent,KDockWidget *container); + void findToolViewsDockedToMain(TQPtrList<KDockWidget>* list,KDockWidget::DockPosition dprtmw); + void dockToolViewsIntoContainers(TQPtrList<KDockWidget>& widgetsToReparent,KDockWidget *container); private: /** @@ -176,7 +176,7 @@ class KMDI_EXPORT MainWindow : public KParts::DockMainWindow protected: KMDIPrivate::GUIClient *m_guiClient; - QMap <QWidget*, KMDI::ToolViewAccessor*> *m_toolViews; + TQMap <TQWidget*, KMDI::ToolViewAccessor*> *m_toolViews; KDockWidget *m_leftContainer; KDockWidget *m_rightContainer; diff --git a/kmdi/kmdi/tabwidget.cpp b/kmdi/kmdi/tabwidget.cpp index 5d18e3769..0d21bd2ea 100644 --- a/kmdi/kmdi/tabwidget.cpp +++ b/kmdi/kmdi/tabwidget.cpp @@ -43,7 +43,7 @@ #include <kpopupmenu.h> #include <kdebug.h> -#include <qobjectlist.h> +#include <tqobjectlist.h> #include "tabwidget.h" #include "tabwidget.moc" @@ -59,7 +59,7 @@ namespace KMDIPrivate namespace KMDI { -TabWidget::TabWidget(QWidget* parent, const char* name) +TabWidget::TabWidget(TQWidget* parent, const char* name) : KTabWidget(parent,name) , m_visibility (KMDI::ShowWhenMoreThanOneTab) , d (new KMDIPrivate::TabWidgetPrivate()) @@ -70,7 +70,7 @@ TabWidget::TabWidget(QWidget* parent, const char* name) setHoverCloseButton(true); - connect(this, SIGNAL(closeRequest(QWidget*)), this, SLOT(closeTab(QWidget*))); + connect(this, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(closeTab(TQWidget*))); } TabWidget::~TabWidget() @@ -79,50 +79,50 @@ TabWidget::~TabWidget() d = 0; } -bool TabWidget::eventFilter(QObject *obj, QEvent *e ) +bool TabWidget::eventFilter(TQObject *obj, TQEvent *e ) { - if(e->type() == QEvent::FocusIn) + if(e->type() == TQEvent::FocusIn) { emit focusInEvent (); } - else if (e->type() == QEvent::ChildRemoved) + else if (e->type() == TQEvent::ChildRemoved) { // if we lost a child we uninstall ourself as event filter for the lost // child and its children - QObject* pLostChild = ((QChildEvent*)e)->child(); + TQObject* pLostChild = ((TQChildEvent*)e)->child(); if ((pLostChild != 0L) && (pLostChild->isWidgetType())) { - QObjectList *list = pLostChild->queryList( "QWidget" ); + TQObjectList *list = pLostChild->queryList( "TQWidget" ); list->insert(0, pLostChild); // add the lost child to the list too, just to save code - QObjectListIt it( *list ); // iterate over all lost child widgets - QObject * o; + TQObjectListIt it( *list ); // iterate over all lost child widgets + TQObject * o; while ( (o=it.current()) != 0 ) { // for each found object... - QWidget* widg = (QWidget*)o; + TQWidget* widg = (TQWidget*)o; ++it; widg->removeEventFilter(this); } delete list; // delete the list, not the objects } } - else if (e->type() == QEvent::ChildInserted) + else if (e->type() == TQEvent::ChildInserted) { // if we got a new child and we are attached to the MDI system we // install ourself as event filter for the new child and its children // (as we did when we were added to the MDI system). - QObject* pNewChild = ((QChildEvent*)e)->child(); + TQObject* pNewChild = ((TQChildEvent*)e)->child(); if ((pNewChild != 0L) && (pNewChild->isWidgetType())) { - QWidget* pNewWidget = (QWidget*)pNewChild; + TQWidget* pNewWidget = (TQWidget*)pNewChild; if (pNewWidget->testWFlags(Qt::WType_Dialog | Qt::WShowModal)) return false; - QObjectList *list = pNewWidget->queryList( "QWidget" ); + TQObjectList *list = pNewWidget->queryList( "TQWidget" ); list->insert(0, pNewChild); // add the new child to the list too, just to save code - QObjectListIt it( *list ); // iterate over all new child widgets - QObject * o; + TQObjectListIt it( *list ); // iterate over all new child widgets + TQObject * o; while ( (o=it.current()) != 0 ) { // for each found object... - QWidget* widg = (QWidget*)o; + TQWidget* widg = (TQWidget*)o; ++it; widg->installEventFilter(this); - connect(widg, SIGNAL(destroyed()), this, SLOT(childDestroyed())); + connect(widg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(childDestroyed())); } delete list; // delete the list, not the objects } @@ -135,15 +135,15 @@ void TabWidget::childDestroyed() { // if we lost a child we uninstall ourself as event filter for the lost // child and its children - const QObject* pLostChild = QObject::sender(); + const TQObject* pLostChild = TQObject::sender(); if ((pLostChild != 0L) && (pLostChild->isWidgetType())) { - QObjectList *list = ((QObject*)(pLostChild))->queryList("QWidget"); + TQObjectList *list = ((TQObject*)(pLostChild))->queryList("TQWidget"); list->insert(0, pLostChild); // add the lost child to the list too, just to save code - QObjectListIt it( *list ); // iterate over all lost child widgets - QObject * obj; + TQObjectListIt it( *list ); // iterate over all lost child widgets + TQObject * obj; while ( (obj=it.current()) != 0 ) { // for each found object... - QWidget* widg = (QWidget*)obj; + TQWidget* widg = (TQWidget*)obj; ++it; widg->removeEventFilter(this); } @@ -151,33 +151,33 @@ void TabWidget::childDestroyed() } } -void TabWidget::closeTab(QWidget* w) +void TabWidget::closeTab(TQWidget* w) { w->close(); } -void TabWidget::addTab ( QWidget * child, const QString & label ) +void TabWidget::addTab ( TQWidget * child, const TQString & label ) { KTabWidget::addTab(child,label); showPage(child); maybeShow(); } -void TabWidget::addTab ( QWidget * child, const QIconSet & iconset, const QString & label ) +void TabWidget::addTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label ) { KTabWidget::addTab(child,iconset,label); showPage(child); maybeShow(); } -void TabWidget::addTab ( QWidget * child, QTab * tab ) +void TabWidget::addTab ( TQWidget * child, TQTab * tab ) { KTabWidget::addTab(child,tab); showPage(child); maybeShow(); } -void TabWidget::insertTab ( QWidget * child, const QString & label, int index) +void TabWidget::insertTab ( TQWidget * child, const TQString & label, int index) { KTabWidget::insertTab(child,label,index); showPage(child); @@ -185,7 +185,7 @@ void TabWidget::insertTab ( QWidget * child, const QString & label, int index) tabBar()->repaint(); } -void TabWidget::insertTab ( QWidget * child, const QIconSet & iconset, const QString & label, int index ) +void TabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index ) { KTabWidget::insertTab(child,iconset,label,index); showPage(child); @@ -193,7 +193,7 @@ void TabWidget::insertTab ( QWidget * child, const QIconSet & iconset, const QSt tabBar()->repaint(); } -void TabWidget::insertTab ( QWidget * child, QTab * tab, int index) +void TabWidget::insertTab ( TQWidget * child, TQTab * tab, int index) { KTabWidget::insertTab(child,tab,index); showPage(child); @@ -201,18 +201,18 @@ void TabWidget::insertTab ( QWidget * child, QTab * tab, int index) tabBar()->repaint(); } -void TabWidget::removePage ( QWidget * w ) +void TabWidget::removePage ( TQWidget * w ) { KTabWidget::removePage(w); maybeShow(); } -void TabWidget::updateIconInView( QWidget *w, QPixmap icon ) +void TabWidget::updateIconInView( TQWidget *w, TQPixmap icon ) { changeTab(w,icon,tabLabel(w)); } -void TabWidget::updateCaptionInView( QWidget *w, const QString &caption ) +void TabWidget::updateCaptionInView( TQWidget *w, const TQString &caption ) { changeTab(w, caption); } diff --git a/kmdi/kmdi/tabwidget.h b/kmdi/kmdi/tabwidget.h index 9aa67d2aa..04e8f3c20 100644 --- a/kmdi/kmdi/tabwidget.h +++ b/kmdi/kmdi/tabwidget.h @@ -58,35 +58,35 @@ class KMDI_EXPORT TabWidget : public KTabWidget Q_OBJECT public: - TabWidget(QWidget* parent, const char* name=0); + TabWidget(TQWidget* parent, const char* name=0); virtual ~TabWidget(); - virtual void addTab ( QWidget * child, const QString & label ); + virtual void addTab ( TQWidget * child, const TQString & label ); - virtual void addTab ( QWidget * child, const QIconSet & iconset, const QString & label ); + virtual void addTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label ); - virtual void addTab ( QWidget * child, QTab * tab ); + virtual void addTab ( TQWidget * child, TQTab * tab ); - virtual void insertTab ( QWidget * child, const QString & label, int index = -1 ); + virtual void insertTab ( TQWidget * child, const TQString & label, int index = -1 ); - virtual void insertTab ( QWidget * child, const QIconSet & iconset, const QString & label, int index = -1 ); + virtual void insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index = -1 ); - virtual void insertTab ( QWidget * child, QTab * tab, int index = -1 ); + virtual void insertTab ( TQWidget * child, TQTab * tab, int index = -1 ); - virtual void removePage ( QWidget * w ); + virtual void removePage ( TQWidget * w ); KMDI::TabWidgetVisibility tabWidgetVisibility() const; void setTabWidgetVisibility( KMDI::TabWidgetVisibility ); - bool eventFilter(QObject *obj, QEvent *e ); + bool eventFilter(TQObject *obj, TQEvent *e ); private slots: - void closeTab(QWidget* w); + void closeTab(TQWidget* w); public slots: - void updateIconInView(QWidget*,QPixmap); - void updateCaptionInView(QWidget*,const QString&); + void updateIconInView(TQWidget*,TQPixmap); + void updateCaptionInView(TQWidget*,const TQString&); signals: void focusInEvent (); diff --git a/kmdi/kmdi/toolviewaccessor.cpp b/kmdi/kmdi/toolviewaccessor.cpp index 11e1ce4f3..21f621ec5 100644 --- a/kmdi/kmdi/toolviewaccessor.cpp +++ b/kmdi/kmdi/toolviewaccessor.cpp @@ -31,8 +31,8 @@ namespace KMDI { -ToolViewAccessor::ToolViewAccessor( KMDI::MainWindow *parent, QWidget *widgetToWrap, const QString& tabToolTip, const QString& tabCaption) -: QObject(parent) +ToolViewAccessor::ToolViewAccessor( KMDI::MainWindow *parent, TQWidget *widgetToWrap, const TQString& tabToolTip, const TQString& tabCaption) +: TQObject(parent) { mdiMainFrm=parent; d=new KMDIPrivate::ToolViewAccessorPrivate(); @@ -41,7 +41,7 @@ ToolViewAccessor::ToolViewAccessor( KMDI::MainWindow *parent, QWidget *widgetToW d->widget=d->widgetContainer->getWidget(); } else { d->widget=widgetToWrap; - QString finalTabCaption; + TQString finalTabCaption; if (tabCaption == 0) { finalTabCaption = widgetToWrap->caption(); if (finalTabCaption.isEmpty() && !widgetToWrap->icon()) { @@ -52,7 +52,7 @@ ToolViewAccessor::ToolViewAccessor( KMDI::MainWindow *parent, QWidget *widgetToW finalTabCaption = tabCaption; } d->widgetContainer= parent->createDockWidget( widgetToWrap->name(), - (widgetToWrap->icon()?(*(widgetToWrap->icon())):QPixmap()), + (widgetToWrap->icon()?(*(widgetToWrap->icon())):TQPixmap()), 0L, // parent widgetToWrap->caption(), finalTabCaption); @@ -67,7 +67,7 @@ ToolViewAccessor::ToolViewAccessor( KMDI::MainWindow *parent, QWidget *widgetToW d->widget->installEventFilter(this); } -ToolViewAccessor::ToolViewAccessor( KMDI::MainWindow *parent) : QObject(parent) { +ToolViewAccessor::ToolViewAccessor( KMDI::MainWindow *parent) : TQObject(parent) { mdiMainFrm=parent; d=new KMDIPrivate::ToolViewAccessorPrivate(); } @@ -79,29 +79,29 @@ ToolViewAccessor::~ToolViewAccessor() { } -QWidget *ToolViewAccessor::wrapperWidget() { +TQWidget *ToolViewAccessor::wrapperWidget() { if (!d->widgetContainer) { - d->widgetContainer=mdiMainFrm->createDockWidget( "ToolViewAccessor::null",QPixmap()); - connect(d->widgetContainer,SIGNAL(widgetSet(QWidget*)),this,SLOT(setWidgetToWrap(QWidget*))); + d->widgetContainer=mdiMainFrm->createDockWidget( "ToolViewAccessor::null",TQPixmap()); + connect(d->widgetContainer,TQT_SIGNAL(widgetSet(TQWidget*)),this,TQT_SLOT(setWidgetToWrap(TQWidget*))); } return d->widgetContainer; } -QWidget *ToolViewAccessor::wrappedWidget() { +TQWidget *ToolViewAccessor::wrappedWidget() { return d->widget; } -void ToolViewAccessor::setWidgetToWrap(QWidget *widgetToWrap, const QString& tabToolTip, const QString& tabCaption) +void ToolViewAccessor::setWidgetToWrap(TQWidget *widgetToWrap, const TQString& tabToolTip, const TQString& tabCaption) { Q_ASSERT(!(d->widget)); Q_ASSERT(!widgetToWrap->inherits("KDockWidget")); - disconnect(d->widgetContainer,SIGNAL(widgetSet(QWidget*)),this,SLOT(setWidgetToWrap(QWidget*))); + disconnect(d->widgetContainer,TQT_SIGNAL(widgetSet(TQWidget*)),this,TQT_SLOT(setWidgetToWrap(TQWidget*))); delete d->widget; d->widget=widgetToWrap; KDockWidget *tmp=d->widgetContainer; - QString finalTabCaption; + TQString finalTabCaption; if (tabCaption == 0) { finalTabCaption = widgetToWrap->caption(); if (finalTabCaption.isEmpty() && !widgetToWrap->icon()) { @@ -114,7 +114,7 @@ void ToolViewAccessor::setWidgetToWrap(QWidget *widgetToWrap, const QString& tab if (!tmp) { tmp = mdiMainFrm->createDockWidget( widgetToWrap->name(), - widgetToWrap->icon()?(*(widgetToWrap->icon())):QPixmap(), + widgetToWrap->icon()?(*(widgetToWrap->icon())):TQPixmap(), 0L, // parent widgetToWrap->caption(), finalTabCaption ); @@ -126,7 +126,7 @@ void ToolViewAccessor::setWidgetToWrap(QWidget *widgetToWrap, const QString& tab else { tmp->setCaption(widgetToWrap->caption()); tmp->setTabPageLabel(finalTabCaption); - tmp->setPixmap(widgetToWrap->icon()?(*(widgetToWrap->icon())):QPixmap()); + tmp->setPixmap(widgetToWrap->icon()?(*(widgetToWrap->icon())):TQPixmap()); tmp->setName(widgetToWrap->name()); if (tabToolTip!=0) { d->widgetContainer->setToolTipString(tabToolTip); @@ -140,25 +140,25 @@ void ToolViewAccessor::setWidgetToWrap(QWidget *widgetToWrap, const QString& tab } -bool ToolViewAccessor::eventFilter(QObject *o, QEvent *e) { - if (e->type()==QEvent::IconChange) { - d->widgetContainer->setPixmap(d->widget->icon()?(*d->widget->icon()):QPixmap()); +bool ToolViewAccessor::eventFilter(TQObject *o, TQEvent *e) { + if (e->type()==TQEvent::IconChange) { + d->widgetContainer->setPixmap(d->widget->icon()?(*d->widget->icon()):TQPixmap()); } return false; } -void ToolViewAccessor::placeAndShow(KDockWidget::DockPosition pos, QWidget* pTargetWnd ,int percent) +void ToolViewAccessor::placeAndShow(KDockWidget::DockPosition pos, TQWidget* pTargetWnd ,int percent) { place(pos,pTargetWnd,percent); show(); } -void ToolViewAccessor::place(KDockWidget::DockPosition pos, QWidget* pTargetWnd ,int percent) +void ToolViewAccessor::place(KDockWidget::DockPosition pos, TQWidget* pTargetWnd ,int percent) { Q_ASSERT(d->widgetContainer); if (!d->widgetContainer) return; if (pos == KDockWidget::DockNone) { d->widgetContainer->setEnableDocking(KDockWidget::DockNone); - d->widgetContainer->reparent(mdiMainFrm, Qt::WType_TopLevel | Qt::WType_Dialog, QPoint(0,0), mdiMainFrm->isVisible()); + d->widgetContainer->reparent(mdiMainFrm, Qt::WType_TopLevel | Qt::WType_Dialog, TQPoint(0,0), mdiMainFrm->isVisible()); } else { // add (and dock) the toolview as DockWidget view @@ -181,7 +181,7 @@ void ToolViewAccessor::place(KDockWidget::DockPosition pos, QWidget* pTargetWnd pTargetDock = mdiMainFrm->getMainDockWidget(); } } - // this is not inheriting QWidget*, its plain impossible that this condition is true + // this is not inheriting TQWidget*, its plain impossible that this condition is true //if (pTargetWnd == this) DockToOurself = true; if (!DockToOurself) if(pTargetWnd != 0L) { pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd); diff --git a/kmdi/kmdi/toolviewaccessor.h b/kmdi/kmdi/toolviewaccessor.h index 2a1bd4de2..180ba56a3 100644 --- a/kmdi/kmdi/toolviewaccessor.h +++ b/kmdi/kmdi/toolviewaccessor.h @@ -20,11 +20,11 @@ #ifndef _KMDI_TOOLVIEWACCESSOR_H_ #define _KMDI_TOOLVIEWACCESSOR_H_ -#include <qwidget.h> -#include <qpixmap.h> -#include <qrect.h> -#include <qapplication.h> -#include <qdatetime.h> +#include <tqwidget.h> +#include <tqpixmap.h> +#include <tqrect.h> +#include <tqapplication.h> +#include <tqdatetime.h> #include <kdockwidget.h> @@ -61,24 +61,24 @@ private: bool m_bFocusInEventIsPending; private: - ToolViewAccessor( KMDI::MainWindow *parent , QWidget *widgetToWrap, const QString& tabToolTip = 0, const QString& tabCaption = 0); + ToolViewAccessor( KMDI::MainWindow *parent , TQWidget *widgetToWrap, const TQString& tabToolTip = 0, const TQString& tabCaption = 0); ToolViewAccessor( KMDI::MainWindow *parent); public: ~ToolViewAccessor(); - QWidget *wrapperWidget(); - QWidget *wrappedWidget(); - void place(KDockWidget::DockPosition pos = KDockWidget::DockNone, QWidget* pTargetWnd = 0L,int percent = 50); - void placeAndShow(KDockWidget::DockPosition pos = KDockWidget::DockNone, QWidget* pTargetWnd = 0L,int percent = 50); + TQWidget *wrapperWidget(); + TQWidget *wrappedWidget(); + void place(KDockWidget::DockPosition pos = KDockWidget::DockNone, TQWidget* pTargetWnd = 0L,int percent = 50); + void placeAndShow(KDockWidget::DockPosition pos = KDockWidget::DockNone, TQWidget* pTargetWnd = 0L,int percent = 50); void show(); public slots: - void setWidgetToWrap(QWidget* widgetToWrap, const QString& tabToolTip = 0, const QString& tabCaption = 0); + void setWidgetToWrap(TQWidget* widgetToWrap, const TQString& tabToolTip = 0, const TQString& tabCaption = 0); void hide(); private: KMDIPrivate::ToolViewAccessorPrivate *d; KMDI::MainWindow *mdiMainFrm; protected: - bool eventFilter(QObject *o, QEvent *e); + bool eventFilter(TQObject *o, TQEvent *e); }; } diff --git a/kmdi/kmdi/toolviewaccessor_p.h b/kmdi/kmdi/toolviewaccessor_p.h index 3d7b6161a..71ffb286a 100644 --- a/kmdi/kmdi/toolviewaccessor_p.h +++ b/kmdi/kmdi/toolviewaccessor_p.h @@ -21,7 +21,7 @@ #define KMDI_TOOLVIEW_ACCESSOR_PRIVATE_H_ #include <kdockwidget.h> -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kaction.h> namespace KMDIPrivate @@ -46,9 +46,9 @@ class ToolViewAccessorPrivate delete (KDockWidget*)widgetContainer; } - QGuardedPtr<KDockWidget> widgetContainer; - QWidget *widget; - QGuardedPtr<KAction> action; + TQGuardedPtr<KDockWidget> widgetContainer; + TQWidget *widget; + TQGuardedPtr<KAction> action; }; } |