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

diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
index fc170780..00f1ba20 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
@@ -19,8 +19,8 @@
 */
 
 
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
 
 #include <kcombobox.h>
 #include <klineedit.h>
@@ -34,9 +34,9 @@
 
 using namespace KSpread;
 
-KWMailMergeKSpreadConfig::KWMailMergeKSpreadConfig( QWidget *parent, KWMailMergeKSpread *object )
+KWMailMergeKSpreadConfig::KWMailMergeKSpreadConfig( TQWidget *tqparent, KWMailMergeKSpread *object )
   : KDialogBase( Plain, i18n( "Mail Merge - Editor" ),
-                 Ok | Cancel, Ok, parent, "", true ),
+                 Ok | Cancel, Ok, tqparent, "", true ),
     _document( 0 ), _initialPage( 1 )
 {
   _object = object;
@@ -46,8 +46,8 @@ KWMailMergeKSpreadConfig::KWMailMergeKSpreadConfig( QWidget *parent, KWMailMerge
   _urlRequester->setURL( _object->url().url() );
   _initialPage = _object->spreadSheetNumber();
 
-  connect( _urlRequester, SIGNAL( urlSelected( const QString& ) ),
-           SLOT( loadDocument() ) );
+  connect( _urlRequester, TQT_SIGNAL( urlSelected( const TQString& ) ),
+           TQT_SLOT( loadDocument() ) );
 
   loadDocument();
   slotTextChanged( _urlRequester->lineEdit()->text() );
@@ -75,7 +75,7 @@ void KWMailMergeKSpreadConfig::loadDocument()
 
   if ( !_urlRequester->url().isEmpty() ) {
     _document = new Doc();
-    connect( _document, SIGNAL( completed() ), SLOT( documentLoaded() ) );
+    connect( _document, TQT_SIGNAL( completed() ), TQT_SLOT( documentLoaded() ) );
 
     _document->openURL( _urlRequester->url() );
   }
@@ -85,39 +85,39 @@ void KWMailMergeKSpreadConfig::documentLoaded()
 {
   _pageNumber->clear();
 
-  QPtrListIterator<Sheet> it( _document->map()->sheetList() );
+  TQPtrListIterator<Sheet> it( _document->map()->sheetList() );
   int counter = 1;
   for ( it.toFirst(); it.current(); ++it ) {
-    _pageNumber->insertItem( QString::number( counter ) );
+    _pageNumber->insertItem( TQString::number( counter ) );
     counter++;
   }
 
   _pageNumber->setEnabled( true );
-  _pageNumber->setCurrentText( QString::number( _initialPage ) );
+  _pageNumber->setCurrentText( TQString::number( _initialPage ) );
 }
 
 void KWMailMergeKSpreadConfig::initGUI()
 {
-  QFrame *page = plainPage();
+  TQFrame *page = plainPage();
 
-  QGridLayout *layout = new QGridLayout( page, 2, 2, marginHint(), spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2, marginHint(), spacingHint() );
 
-  QLabel *label = new QLabel( i18n( "URL:" ), page );
-  layout->addWidget( label, 0, 0 );
+  TQLabel *label = new TQLabel( i18n( "URL:" ), page );
+  tqlayout->addWidget( label, 0, 0 );
 
   _urlRequester = new KURLRequester( page );
-  layout->addWidget( _urlRequester, 0, 1 );
+  tqlayout->addWidget( _urlRequester, 0, 1 );
 
-  label = new QLabel( i18n( "Page number:" ), page );
-  layout->addWidget( label, 1, 0 );
+  label = new TQLabel( i18n( "Page number:" ), page );
+  tqlayout->addWidget( label, 1, 0 );
 
   _pageNumber = new KComboBox( page );
   _pageNumber->setEnabled( false );
-  layout->addWidget( _pageNumber, 1, 1 );
-  connect( _urlRequester->lineEdit() , SIGNAL( textChanged ( const QString & ) ), this, SLOT( slotTextChanged( const QString & ) ) );
+  tqlayout->addWidget( _pageNumber, 1, 1 );
+  connect( _urlRequester->lineEdit() , TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged( const TQString & ) ) );
 }
 
-void KWMailMergeKSpreadConfig::slotTextChanged( const QString & _text )
+void KWMailMergeKSpreadConfig::slotTextChanged( const TQString & _text )
 {
     enableButtonOK( !_text.isEmpty() );
 }