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

diff --git a/kpresenter/KPrPrinterDlg.cpp b/kpresenter/KPrPrinterDlg.cpp
index 68fc4d79..5e0b573d 100644
--- a/kpresenter/KPrPrinterDlg.cpp
+++ b/kpresenter/KPrPrinterDlg.cpp
@@ -20,23 +20,23 @@
 *
 */
 
-// Qt includes
-#include <qlayout.h>
+// TQt includes
+#include <tqlayout.h>
 
 // KDE includes
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klocale.h>
-#include <qtooltip.h>
+#include <tqtooltip.h>
 
 // local includes
 #include "KPrPrinterDlg.h"
 
- KPrPrinterDlg::KPrPrinterDlg( QWidget *parent, const char *name )
-  : KPrintDialogPage( parent, name )
+ KPrPrinterDlg::KPrPrinterDlg( TQWidget *tqparent, const char *name )
+  : KPrintDialogPage( tqparent, name )
 {
   setTitle( i18n( "KPresenter Options" ) );
-  QGridLayout *layout = new QGridLayout( this, 2, 1, 11, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, 11, 6 );
   txtRows = new KIntNumInput(this );
   txtRows->setMinValue(1);
   txtRows->setMaxValue(5);
@@ -45,36 +45,36 @@
   txtColumns->setMinValue(1);
   txtColumns->setMaxValue(5);
   txtColumns->setValue(1);
-  connect( txtRows, SIGNAL( valueChanged( int ) ), this, SLOT( txtRows_valueChanged( int ) ) );
-  connect( txtColumns, SIGNAL( valueChanged( int ) ), this, SLOT( txtColumns_valueChanged( int ) ) );
+  connect( txtRows, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( txtRows_valueChanged( int ) ) );
+  connect( txtColumns, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( txtColumns_valueChanged( int ) ) );
 
-  QLabel *caption = new QLabel(i18n("Slides in the pages:"), this );
-  QToolTip::add( caption, i18n("Choose how many rows and columns with slides you want to have on all pages") );
-  layout->addMultiCellWidget( caption, 0, 0, 0, 1 );
-  QVBoxLayout *l2 = new QVBoxLayout( 0, 0, 6 );
-  l2->addWidget( new QLabel(i18n("Rows: "), this) );
-  l2->addWidget( new QLabel(i18n("Columns: "), this) );
-  layout->addLayout( l2, 1, 0 );
+  TQLabel *caption = new TQLabel(i18n("Slides in the pages:"), this );
+  TQToolTip::add( caption, i18n("Choose how many rows and columns with slides you want to have on all pages") );
+  tqlayout->addMultiCellWidget( caption, 0, 0, 0, 1 );
+  TQVBoxLayout *l2 = new TQVBoxLayout( 0, 0, 6 );
+  l2->addWidget( new TQLabel(i18n("Rows: "), this) );
+  l2->addWidget( new TQLabel(i18n("Columns: "), this) );
+  tqlayout->addLayout( l2, 1, 0 );
 
-  QVBoxLayout *l3 = new QVBoxLayout( 0, 0, 6 );
+  TQVBoxLayout *l3 = new TQVBoxLayout( 0, 0, 6 );
   l3->addWidget( txtRows );
   l3->addWidget( txtColumns );
-  layout->addLayout( l3, 1, 1 );
+  tqlayout->addLayout( l3, 1, 1 );
 
-  drawBorder = new QCheckBox(i18n("Draw border around the slides"), this );
+  drawBorder = new TQCheckBox(i18n("Draw border around the slides"), this );
   drawBorder->setChecked( true );
   drawBorder->setEnabled( false );
-  layout->addMultiCellWidget( drawBorder, 2, 2, 0, 1 );
+  tqlayout->addMultiCellWidget( drawBorder, 2, 2, 0, 1 );
 }
 
-void KPrPrinterDlg::getOptions( QMap<QString, QString>& opts, bool )
+void KPrPrinterDlg::getOptions( TQMap<TQString, TQString>& opts, bool )
 {
-  opts["kde-kpresenter-printrows"] = QString::number(txtRows->value());
-  opts["kde-kpresenter-printcolumns"] = QString::number(txtColumns->value());
-  opts["kde-kpresenter-printslideborders"] = QString::number(drawBorder->isEnabled() && drawBorder->isChecked());
+  opts["kde-kpresenter-printrows"] = TQString::number(txtRows->value());
+  opts["kde-kpresenter-printcolumns"] = TQString::number(txtColumns->value());
+  opts["kde-kpresenter-printslideborders"] = TQString::number(drawBorder->isEnabled() && drawBorder->isChecked());
 }
 
-void KPrPrinterDlg::setOptions( const QMap<QString, QString>& opts )
+void KPrPrinterDlg::setOptions( const TQMap<TQString, TQString>& opts )
 {
   if ( opts["kde-kpresenter-printrows"].isEmpty() )
     txtRows->setValue(1);
@@ -91,7 +91,7 @@ void KPrPrinterDlg::setOptions( const QMap<QString, QString>& opts )
     drawBorder->setChecked((opts["kde-kpresenter-printslideborders"]).toInt());
 }
 
-bool KPrPrinterDlg::isValid( const QString& )
+bool KPrPrinterDlg::isValid( const TQString& )
 {
   return true;
 }