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, 19 insertions, 19 deletions

diff --git a/kchart/kchartWizard.cc b/kchart/kchartWizard.cc
index 5f4f2393..634aa447 100644
--- a/kchart/kchartWizard.cc
+++ b/kchart/kchartWizard.cc
@@ -8,9 +8,9 @@
 #include "kchartWizardSetupAxesPage.h"
 #include "kchartWizardSelectDataFormatPage.h"
 
-#include <qlineedit.h>
-#include <qwidget.h>
-#include <qpushbutton.h>
+#include <tqlineedit.h>
+#include <tqwidget.h>
+#include <tqpushbutton.h>
 
 #include <kglobal.h>
 #include <kiconloader.h>
@@ -21,9 +21,9 @@
 namespace KChart
 {
 
-KChartWizard::KChartWizard ( KChartPart* _chart, QWidget *parent, const char* name,
+KChartWizard::KChartWizard ( KChartPart* _chart, TQWidget *tqparent, const char* name,
                              bool modal, WFlags f ) :
-    KWizard( parent, name, modal, f ),
+    KWizard( tqparent, name, modal, f ),
     m_chart( _chart )
 {
     // First page: select the data range
@@ -58,15 +58,15 @@ KChartWizard::KChartWizard ( KChartPart* _chart, QWidget *parent, const char* na
     setNextEnabled(m_axespage, false);
     setHelpEnabled(m_axespage, false);
 
-    // connect( this, SIGNAL( finished() ), _selectdatapage, SLOT( apply() ) );
-    connect(this, SIGNAL(finished()), m_dataFormatPage,   SLOT(apply()));
-    connect(this, SIGNAL(finished()), m_chartTypePage,    SLOT(apply()));
-    connect(this ,SIGNAL(finished()), m_chartSubtypePage, SLOT(apply()));
-    connect(this, SIGNAL(finished()), m_labelsLegendPage, SLOT(apply()));
-    connect(this, SIGNAL(finished()), m_axespage,         SLOT(apply()));
+    // connect( this, TQT_SIGNAL( finished() ), _selectdatapage, TQT_SLOT( apply() ) );
+    connect(this, TQT_SIGNAL(finished()), m_dataFormatPage,   TQT_SLOT(apply()));
+    connect(this, TQT_SIGNAL(finished()), m_chartTypePage,    TQT_SLOT(apply()));
+    connect(this ,TQT_SIGNAL(finished()), m_chartSubtypePage, TQT_SLOT(apply()));
+    connect(this, TQT_SIGNAL(finished()), m_labelsLegendPage, TQT_SLOT(apply()));
+    connect(this, TQT_SIGNAL(finished()), m_axespage,         TQT_SLOT(apply()));
 
-    connect( m_chartTypePage, SIGNAL( chartChange( int ) ),
-             this,            SLOT( subType( int ) ) );
+    connect( m_chartTypePage, TQT_SIGNAL( chartChange( int ) ),
+             this,            TQT_SLOT( subType( int ) ) );
     adjustSize();
 
     subType( m_chart->params()->chartType() );
@@ -115,7 +115,7 @@ void KChartWizard::subType(int _type)
 }
 
 
-bool KChartWizard::appropriate( QWidget * w ) const
+bool KChartWizard::appropriate( TQWidget * w ) const
 {
     // Show the sub-type page only if has anything to show
     if ( w == m_chartSubtypePage )
@@ -132,28 +132,28 @@ void KChartWizard::next()
     //if ( currentPage() == _charttypePage )
     //_chartSubtypePage->createChildren();
 
-    QWizard::next();
+    TQWizard::next();
 }
 
 void KChartWizard::accept()
 {
     emit finished();
-    QWizard::accept();
+    TQWizard::accept();
 }
 
 void KChartWizard::reject()
 {
     emit cancelled();
-    QWizard::reject();
+    TQWizard::reject();
 }
 
-void KChartWizard::setDataArea( const QString &dataArea )
+void KChartWizard::setDataArea( const TQString &dataArea )
 {
     m_dataFormatPage->setDataArea( dataArea );
 }
 
 
-QString KChartWizard::dataArea() const
+TQString KChartWizard::dataArea() const
 {
     return m_dataFormatPage->dataArea();
 }