summaryrefslogtreecommitdiffstats
path: root/kmdi/kmdi
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
commit10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch)
tree4bc444c00a79e88105f2cfce5b6209994c413ca0 /kmdi/kmdi
parent307136d8eef0ba133b78ceee8e901138d4c996a1 (diff)
downloadtdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz
tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmdi/kmdi')
-rw-r--r--kmdi/kmdi/dockcontainer.cpp28
-rw-r--r--kmdi/kmdi/dockcontainer.h2
-rw-r--r--kmdi/kmdi/guiclient.cpp4
-rw-r--r--kmdi/kmdi/guiclient.h2
-rw-r--r--kmdi/kmdi/mainwindow.cpp38
-rw-r--r--kmdi/kmdi/mainwindow.h6
-rw-r--r--kmdi/kmdi/tabwidget.cpp8
-rw-r--r--kmdi/kmdi/tabwidget.h2
-rw-r--r--kmdi/kmdi/toolviewaccessor.cpp10
-rw-r--r--kmdi/kmdi/toolviewaccessor.h4
-rw-r--r--kmdi/kmdi/toolviewaccessor_p.h2
11 files changed, 53 insertions, 53 deletions
diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp
index 1761e86cd..3455fe1e8 100644
--- a/kmdi/kmdi/dockcontainer.cpp
+++ b/kmdi/kmdi/dockcontainer.cpp
@@ -90,7 +90,7 @@ DockContainer::DockContainer(TQWidget *parent, TQWidget *win, int position, int
m_ws=new TQWidgetStack(this);
- m_ws->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding));
+ m_ws->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding));
if ( (position==KDockWidget::DockLeft) || (position==KDockWidget::DockTop))
{
@@ -118,7 +118,7 @@ DockContainer::~DockContainer()
while (m_map.count()) {
it = m_map.begin();
KDockWidget *w=it.key();
- if (m_overlapButtons.tqcontains(w)) {
+ if (m_overlapButtons.contains(w)) {
(static_cast<KDockWidgetHeader*>(w->getHeader()->qt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]);
m_overlapButtons.remove(w);
}
@@ -164,7 +164,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt
{
KDockWidget* w = (KDockWidget*) dwdg;
int tab;
- bool alreadyThere=m_map.tqcontains(w);
+ bool alreadyThere=m_map.contains(w);
if (alreadyThere)
{
@@ -181,8 +181,8 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt
m_revMap.insert(tab,w);
- if (((KDockWidget*)tqparentWidget())->mayBeShow())
- ((KDockWidget*)tqparentWidget())->dockBack();
+ if (((KDockWidget*)parentWidget())->mayBeShow())
+ ((KDockWidget*)parentWidget())->dockBack();
if (w->getHeader()->qt_cast("KDockWidgetHeader"))
{
@@ -298,7 +298,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
}
void DockContainer::showWidget(KDockWidget *w) {
- if (!m_map.tqcontains(w)) return;
+ if (!m_map.contains(w)) return;
kdDebug()<<"KMDI::DockContainer::<showWidget"<<endl;
int id=m_map[w];
@@ -337,13 +337,13 @@ void DockContainer::changeOverlapMode()
void DockContainer::hideIfNeeded() {
kdDebug(760)<<"************************* hideIfNeeded *************************"<<endl;
if (!itemNames.count())
- ((KDockWidget*)tqparentWidget())->undock();
+ ((KDockWidget*)parentWidget())->undock();
}
void DockContainer::removeWidget(KDockWidget* dwdg)
{
KDockWidget* w = (KDockWidget*) dwdg;
- if (!m_map.tqcontains(w)) return;
+ if (!m_map.contains(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.tqcontains(w)) {
+ if (m_overlapButtons.contains(w)) {
(static_cast<KDockWidgetHeader*>(w->getHeader()->qt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]);
m_overlapButtons.remove(w);
}
@@ -365,14 +365,14 @@ void DockContainer::removeWidget(KDockWidget* dwdg)
tabCaptions.remove(w->name());
tabTooltips.remove(w->name());
if (!itemNames.count())
- ((KDockWidget*)tqparentWidget())->undock();
+ ((KDockWidget*)parentWidget())->undock();
}
void DockContainer::undockWidget(KDockWidget *dwdg)
{
KDockWidget* w = (KDockWidget*) dwdg;
- if (!m_map.tqcontains(w))
+ if (!m_map.contains(w))
return;
int id=m_map[w];
@@ -631,7 +631,7 @@ void DockContainer::toggle() {
void DockContainer::prevToolView() {
TQPtrList<KMultiTabBarTab>* tabs=m_tb->tabs();
- int pos=tabs->tqfindRef(m_tb->tab(oldtab));
+ int pos=tabs->findRef(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->tqfindRef(m_tb->tab(oldtab));
+ int pos=tabs->findRef(m_tb->tab(oldtab));
if (pos==-1) return;
pos++;
if (pos>=(int)tabs->count()) pos=0;
@@ -655,4 +655,4 @@ void DockContainer::nextToolView() {
}
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kmdi/kmdi/dockcontainer.h b/kmdi/kmdi/dockcontainer.h
index 7a1c8ae9d..ac27f8644 100644
--- a/kmdi/kmdi/dockcontainer.h
+++ b/kmdi/kmdi/dockcontainer.h
@@ -141,4 +141,4 @@ class DockContainer: public TQWidget, public KDockContainer
#endif
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kmdi/kmdi/guiclient.cpp b/kmdi/kmdi/guiclient.cpp
index d034db948..882916f30 100644
--- a/kmdi/kmdi/guiclient.cpp
+++ b/kmdi/kmdi/guiclient.cpp
@@ -68,7 +68,7 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name)
if ( domDocument().documentElement().isNull() )
{
- TQString completeDescription = TQString::tqfromLatin1( guiDescription ).arg( actionListName );
+ TQString completeDescription = TQString::fromLatin1( guiDescription ).arg( actionListName );
setXML( completeDescription, false /*merge*/ );
}
@@ -227,4 +227,4 @@ void ToggleToolViewAction::slotWidgetDestroyed()
}
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kmdi/kmdi/guiclient.h b/kmdi/kmdi/guiclient.h
index 196da3fd6..c3784fe6e 100644
--- a/kmdi/kmdi/guiclient.h
+++ b/kmdi/kmdi/guiclient.h
@@ -100,4 +100,4 @@ class ToggleToolViewAction:public KToggleAction
#endif
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kmdi/kmdi/mainwindow.cpp b/kmdi/kmdi/mainwindow.cpp
index 6976887de..d6e332780 100644
--- a/kmdi/kmdi/mainwindow.cpp
+++ b/kmdi/kmdi/mainwindow.cpp
@@ -97,8 +97,8 @@ namespace KMDI
{
//============ constructor ============//
-MainWindow::MainWindow(TQWidget* tqparentWidget, const char* name)
- : KParts::DockMainWindow( tqparentWidget, name)
+MainWindow::MainWindow(TQWidget* parentWidget, const char* name)
+ : KParts::DockMainWindow( parentWidget, name)
, m_toolViews (new TQMap<TQWidget*,KMDI::ToolViewAccessor*>)
, d(new KMDIPrivate::MainWindowPrivate())
{
@@ -156,19 +156,19 @@ void MainWindow::setupToolViews ()
w=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent());
}
- TQPtrList<KDockWidget> leftRetqparentWidgets;
- TQPtrList<KDockWidget> rightRetqparentWidgets;
- TQPtrList<KDockWidget> bottomRetqparentWidgets;
- TQPtrList<KDockWidget> topRetqparentWidgets;
+ TQPtrList<KDockWidget> leftReparentWidgets;
+ TQPtrList<KDockWidget> rightReparentWidgets;
+ TQPtrList<KDockWidget> bottomReparentWidgets;
+ TQPtrList<KDockWidget> topReparentWidgets;
if (mainDock->parentDockTabGroup()) {
mainDock=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent());
}
- tqfindToolViewsDockedToMain(&leftRetqparentWidgets,KDockWidget::DockLeft);
- tqfindToolViewsDockedToMain(&rightRetqparentWidgets,KDockWidget::DockRight);
- tqfindToolViewsDockedToMain(&bottomRetqparentWidgets,KDockWidget::DockBottom);
- tqfindToolViewsDockedToMain(&topRetqparentWidgets,KDockWidget::DockTop);
+ findToolViewsDockedToMain(&leftReparentWidgets,KDockWidget::DockLeft);
+ findToolViewsDockedToMain(&rightReparentWidgets,KDockWidget::DockRight);
+ findToolViewsDockedToMain(&bottomReparentWidgets,KDockWidget::DockBottom);
+ findToolViewsDockedToMain(&topReparentWidgets,KDockWidget::DockTop);
mainDock->setEnableDocking(KDockWidget::DockNone); //::DockCorner);
mainDock->setDockSite(KDockWidget::DockCorner);
@@ -220,10 +220,10 @@ void MainWindow::setupToolViews ()
m_topContainer->setDockSite( KDockWidget::DockCenter );
m_bottomContainer->setDockSite( KDockWidget::DockCenter );
- dockToolViewsIntoContainers(leftRetqparentWidgets,m_leftContainer);
- dockToolViewsIntoContainers(rightRetqparentWidgets,m_rightContainer);
- dockToolViewsIntoContainers(bottomRetqparentWidgets,m_bottomContainer);
- dockToolViewsIntoContainers(topRetqparentWidgets,m_topContainer);
+ dockToolViewsIntoContainers(leftReparentWidgets,m_leftContainer);
+ dockToolViewsIntoContainers(rightReparentWidgets,m_rightContainer);
+ dockToolViewsIntoContainers(bottomReparentWidgets,m_bottomContainer);
+ dockToolViewsIntoContainers(topReparentWidgets,m_topContainer);
dockManager->setSpecialLeftDockContainer(m_leftContainer);
dockManager->setSpecialRightDockContainer(m_rightContainer);
@@ -273,7 +273,7 @@ KMDI::ToolViewAccessor *MainWindow::addToolWindow( TQWidget* pWnd, KDockWidget::
pWnd=pDW;
}
- TQRect r=pWnd->tqgeometry();
+ TQRect r=pWnd->geometry();
KMDI::ToolViewAccessor *mtva=new KMDI::ToolViewAccessor(this,pWnd,tabToolTip,(tabCaption==0)?pWnd->caption():tabCaption);
m_toolViews->insert(tvta,mtva);
@@ -302,7 +302,7 @@ void MainWindow::deleteToolWindow( TQWidget* pWnd)
if (!pWnd)
return;
- if (m_toolViews->tqcontains(pWnd)) {
+ if (m_toolViews->contains(pWnd)) {
deleteToolWindow((*m_toolViews)[pWnd]);
}
}
@@ -370,14 +370,14 @@ void MainWindow::dockToolViewsIntoContainers(TQPtrList<KDockWidget>& widgetsToRe
}
}
-void MainWindow::tqfindToolViewsDockedToMain(TQPtrList<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());
// FIXME: will likely crash below due to unchecked cast
}
- KDockWidget* widget=mainDock->tqfindNearestDockWidget(dprtmw);
+ KDockWidget* widget=mainDock->findNearestDockWidget(dprtmw);
if (widget) {
if (widget->parentDockTabGroup()) {
widget=static_cast<KDockWidget*>(widget->parentDockTabGroup()->parent());
@@ -448,4 +448,4 @@ void MainWindow::nextToolViewInDock() {
}
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kmdi/kmdi/mainwindow.h b/kmdi/kmdi/mainwindow.h
index d0003e579..d7351a330 100644
--- a/kmdi/kmdi/mainwindow.h
+++ b/kmdi/kmdi/mainwindow.h
@@ -79,7 +79,7 @@ class KMDI_EXPORT MainWindow : public KParts::DockMainWindow
/**
* Constructor.
*/
- MainWindow ( TQWidget* tqparentWidget, const char* name = "");
+ MainWindow ( TQWidget* parentWidget, const char* name = "");
/**
* Destructor.
@@ -141,7 +141,7 @@ class KMDI_EXPORT MainWindow : public KParts::DockMainWindow
void collapseOverlapContainers();
protected:
- void tqfindToolViewsDockedToMain(TQPtrList<KDockWidget>* list,KDockWidget::DockPosition dprtmw);
+ void findToolViewsDockedToMain(TQPtrList<KDockWidget>* list,KDockWidget::DockPosition dprtmw);
void dockToolViewsIntoContainers(TQPtrList<KDockWidget>& widgetsToReparent,KDockWidget *container);
private:
@@ -196,4 +196,4 @@ class KMDI_EXPORT MainWindow : public KParts::DockMainWindow
#endif //_MainWindow_H_
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kmdi/kmdi/tabwidget.cpp b/kmdi/kmdi/tabwidget.cpp
index 98a756cd6..0d21bd2ea 100644
--- a/kmdi/kmdi/tabwidget.cpp
+++ b/kmdi/kmdi/tabwidget.cpp
@@ -182,7 +182,7 @@ void TabWidget::insertTab ( TQWidget * child, const TQString & label, int index)
KTabWidget::insertTab(child,label,index);
showPage(child);
maybeShow();
- tabBar()->tqrepaint();
+ tabBar()->repaint();
}
void TabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index )
@@ -190,7 +190,7 @@ void TabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const T
KTabWidget::insertTab(child,iconset,label,index);
showPage(child);
maybeShow();
- tabBar()->tqrepaint();
+ tabBar()->repaint();
}
void TabWidget::insertTab ( TQWidget * child, TQTab * tab, int index)
@@ -198,7 +198,7 @@ void TabWidget::insertTab ( TQWidget * child, TQTab * tab, int index)
KTabWidget::insertTab(child,tab,index);
showPage(child);
maybeShow();
- tabBar()->tqrepaint();
+ tabBar()->repaint();
}
void TabWidget::removePage ( TQWidget * w )
@@ -281,4 +281,4 @@ KMDI::TabWidgetVisibility TabWidget::tabWidgetVisibility( ) const
}
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kmdi/kmdi/tabwidget.h b/kmdi/kmdi/tabwidget.h
index d44d4bd4a..04e8f3c20 100644
--- a/kmdi/kmdi/tabwidget.h
+++ b/kmdi/kmdi/tabwidget.h
@@ -112,4 +112,4 @@ class KMDI_EXPORT TabWidget : public KTabWidget
#endif
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kmdi/kmdi/toolviewaccessor.cpp b/kmdi/kmdi/toolviewaccessor.cpp
index 01523a423..21f621ec5 100644
--- a/kmdi/kmdi/toolviewaccessor.cpp
+++ b/kmdi/kmdi/toolviewaccessor.cpp
@@ -184,16 +184,16 @@ void ToolViewAccessor::place(KDockWidget::DockPosition pos, TQWidget* pTargetWnd
// 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->tqfindWidgetParentDock( pTargetWnd);
+ pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd);
if (!pTargetDock) {
- if (pTargetWnd->tqparentWidget()) {
- pTargetDock = mdiMainFrm->dockManager->tqfindWidgetParentDock( pTargetWnd->tqparentWidget());
+ if (pTargetWnd->parentWidget()) {
+ pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->parentWidget());
}
}
}
/* if (!pTargetDock || pTargetWnd == mdiMainFrm->getMainDockWidget()) {
if (mdiMainFrm->m_managedDockPositionMode && (mdiMainFrm->m_pMdi || mdiMainFrm->m_documentTabWidget)) {
- KDockWidget *dw1=pTargetDock->tqfindNearestDockWidget(pos);
+ KDockWidget *dw1=pTargetDock->findNearestDockWidget(pos);
if (dw1)
pCover->manualDock(dw1,KDockWidget::DockCenter,percent);
else
@@ -220,4 +220,4 @@ void ToolViewAccessor::show() {
}
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kmdi/kmdi/toolviewaccessor.h b/kmdi/kmdi/toolviewaccessor.h
index d92da19a8..180ba56a3 100644
--- a/kmdi/kmdi/toolviewaccessor.h
+++ b/kmdi/kmdi/toolviewaccessor.h
@@ -37,7 +37,7 @@ namespace KMDI {
class MainWindow;
-class ToolViewAccessor : public TQObject
+class ToolViewAccessor : public QObject
{
Q_OBJECT
@@ -85,4 +85,4 @@ protected:
#endif //_KMDITOOLVIEWACCESSOR_H_
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kmdi/kmdi/toolviewaccessor_p.h b/kmdi/kmdi/toolviewaccessor_p.h
index ab349e3ab..71ffb286a 100644
--- a/kmdi/kmdi/toolviewaccessor_p.h
+++ b/kmdi/kmdi/toolviewaccessor_p.h
@@ -55,6 +55,6 @@ class ToolViewAccessorPrivate
#endif
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;