TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


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

1 files changed, 32 insertions, 32 deletions

diff --git a/kivio/kiviopart/kivio_stackbar.cpp b/kivio/kiviopart/kivio_stackbar.cpp
index 71cae904..4c759a2d 100644
--- a/kivio/kiviopart/kivio_stackbar.cpp
+++ b/kivio/kiviopart/kivio_stackbar.cpp
@@ -19,23 +19,23 @@
 #include "kivio_stackbar.h"
 #include "stencilbarbutton.h"
 
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qapplication.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqapplication.h>
 
 #include <kdebug.h>
 
 
-KivioStackBar::KivioStackBar(KivioView* view, QWidget* parent, const char* name)
-  : QDockWindow(parent, name), m_view(view)
+KivioStackBar::KivioStackBar(KivioView* view, TQWidget* tqparent, const char* name)
+  : TQDockWindow(tqparent, name), m_view(view)
 {
-  QDockWindow::boxLayout()->setSpacing(0);
-  QDockWindow::boxLayout()->setMargin(0);
+  TQDockWindow::boxLayout()->setSpacing(0);
+  TQDockWindow::boxLayout()->setMargin(0);
   setResizeEnabled(true);
   setNewLine(true);
   m_visiblePage = 0;
   
-  connect(this, SIGNAL(placeChanged(QDockWindow::Place)), this, SLOT(newPlace(QDockWindow::Place)));
+  connect(this, TQT_SIGNAL(placeChanged(TQDockWindow::Place)), this, TQT_SLOT(newPlace(TQDockWindow::Place)));
 }
 
 KivioStackBar::~KivioStackBar()
@@ -43,25 +43,25 @@ KivioStackBar::~KivioStackBar()
   kdDebug(43000) << "KivioStackBar::~KivioStackBar()" << endl;
 }
 
-void KivioStackBar::insertPage( QWidget* w, const QString& title )
+void KivioStackBar::insertPage( TQWidget* w, const TQString& title )
 {
-  if (w->parent() != this) {
-    w->reparent(this,QPoint(0,0));
+  if (TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(this)) {
+    w->reparent(this,TQPoint(0,0));
   }
 
   w->hide();
-  w->setFocusPolicy(NoFocus);
+  w->setFocusPolicy(TQ_NoFocus);
 
-  setMinimumWidth( QMAX(minimumSize().width(),w->minimumSize().width() ) );
-  setMaximumWidth( QMAX(maximumSize().width(),w->maximumSize().width() ) );
+  setMinimumWidth( TQMAX(tqminimumSize().width(),w->tqminimumSize().width() ) );
+  setMaximumWidth( TQMAX(tqmaximumSize().width(),w->tqmaximumSize().width() ) );
 
   DragBarButton* b = new DragBarButton( title, this );
   b->setOrientation(orientation());
-  connect( b, SIGNAL(clicked()), SLOT(showButtonPage()) );
-  connect( b, SIGNAL(beginDrag()), SLOT(buttonBeginDrag()) );
-  connect( b, SIGNAL(finishDrag()), SLOT(buttonFinishDrag()) );
-  connect( b, SIGNAL(closeRequired(DragBarButton*)), SLOT(slotDeleteButton(DragBarButton*)) );
-  connect(this, SIGNAL(orientationChanged(Orientation)), b, SLOT(setOrientation(Orientation)));
+  connect( b, TQT_SIGNAL(clicked()), TQT_SLOT(showButtonPage()) );
+  connect( b, TQT_SIGNAL(beginDrag()), TQT_SLOT(buttonBeginDrag()) );
+  connect( b, TQT_SIGNAL(finishDrag()), TQT_SLOT(buttonFinishDrag()) );
+  connect( b, TQT_SIGNAL(closeRequired(DragBarButton*)), TQT_SLOT(slotDeleteButton(DragBarButton*)) );
+  connect(this, TQT_SIGNAL(orientationChanged(Qt::Orientation)), b, TQT_SLOT(setOrientation(Qt::Orientation)));
 
   boxLayout()->addWidget(b);
   boxLayout()->addWidget(w, 1);
@@ -76,12 +76,12 @@ void KivioStackBar::insertPage( QWidget* w, const QString& title )
 
 void KivioStackBar::slotDeleteButton( DragBarButton *b )
 {
-  QWidget *pWidget = m_data[b];
+  TQWidget *pWidget = m_data[b];
   kdDebug(43000) << "Emitting deleteButton" << endl;
   emit deleteButton(b, pWidget, this);
 }
 
-void KivioStackBar::showPage( QWidget* w )
+void KivioStackBar::showPage( TQWidget* w )
 {
   emit aboutToShow( w );
 
@@ -105,7 +105,7 @@ void KivioStackBar::showButtonPage()
   showPage(findPage(b));
 }
 
-QWidget* KivioStackBar::findPage( DragBarButton* w )
+TQWidget* KivioStackBar::findPage( DragBarButton* w )
 {
   return m_data[w];
 }
@@ -113,15 +113,15 @@ QWidget* KivioStackBar::findPage( DragBarButton* w )
 /*
  * This does *NOT* delete the widget
 */
-void KivioStackBar::removePage( QWidget* widget )
+void KivioStackBar::removePage( TQWidget* widget )
 {
-  QPtrDictIterator<QWidget> it(m_data); // iterator for dict
+  TQPtrDictIterator<TQWidget> it(m_data); // iterator for dict
   DragBarButton* pBtn;
   while ( it.current() ) {
     if ( it.current() == widget ) {
       widget->hide();
       pBtn = (DragBarButton*)it.currentKey();
-      it.current()->reparent(0, QPoint(0,0));
+      it.current()->reparent(0, TQPoint(0,0));
       m_data.remove( it.currentKey() );
       delete pBtn;
       break;
@@ -138,7 +138,7 @@ void KivioStackBar::removePage( QWidget* widget )
 
 void KivioStackBar::deletePageAndButton( DragBarButton *pBtn )
 {
-  QWidget *pPage;
+  TQWidget *pPage;
 
   if( !pBtn ) {
     kdDebug(43000) << "KivioStackBar::deletePageAndButton() - pBtn is NULL!" << endl;
@@ -165,15 +165,15 @@ void KivioStackBar::deletePageAndButton( DragBarButton *pBtn )
 
 
   // Set the next current page, or set it to nothing
-  QPtrDictIterator<QWidget> it(m_data); // iterator for dict
+  TQPtrDictIterator<TQWidget> it(m_data); // iterator for dict
   if ( it.toFirst() ) {
     showPage( it.current() );
   }
 }
 
-QWidget* KivioStackBar::findPage( const QString& name )
+TQWidget* KivioStackBar::findPage( const TQString& name )
 {
-  QPtrDictIterator<QWidget> it(m_data); // iterator for dict
+  TQPtrDictIterator<TQWidget> it(m_data); // iterator for dict
   while ( it.current() ) {
     if ( it.current()->name() == name )
       return it.current();
@@ -192,9 +192,9 @@ void KivioStackBar::buttonFinishDrag()
   emit finishDragPage((DragBarButton*)sender());
 }
 
-void KivioStackBar::closeEvent(QCloseEvent* ev)
+void KivioStackBar::closeEvent(TQCloseEvent* ev)
 {
-  QPtrDictIterator<QWidget> it(m_data); // iterator for dict
+  TQPtrDictIterator<TQWidget> it(m_data); // iterator for dict
   while ( it.current() ) {
     slotDeleteButton((DragBarButton*)it.currentKey());
     if (it.current())
@@ -204,7 +204,7 @@ void KivioStackBar::closeEvent(QCloseEvent* ev)
   ev->ignore();
 }
 
-void KivioStackBar::newPlace(QDockWindow::Place place)
+void KivioStackBar::newPlace(TQDockWindow::Place place)
 {
   if((place == OutsideDock) && (orientation() == Qt::Horizontal)) {
     setOrientation(Qt::Vertical);