From f008adb5a77e094eaf6abf3fc0f36958e66896a5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 25 Jun 2011 05:28:35 +0000 Subject: 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 --- kword/mailmerge/kspread/kwmailmerge_kspread.cpp | 40 +++++++++++----------- kword/mailmerge/kspread/kwmailmerge_kspread.h | 19 +++++----- .../kspread/kwmailmerge_kspread_config.cpp | 40 +++++++++++----------- .../mailmerge/kspread/kwmailmerge_kspread_config.h | 5 +-- 4 files changed, 53 insertions(+), 51 deletions(-) (limited to 'kword/mailmerge/kspread') diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp index 738cf6d7..518699a8 100644 --- a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp +++ b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp @@ -29,8 +29,8 @@ using namespace KSpread; -KWMailMergeKSpread::KWMailMergeKSpread( KInstance *instance, QObject *parent ) - : KWMailMergeDataSource( instance, parent ), _spreadSheetNumber( 1 ) +KWMailMergeKSpread::KWMailMergeKSpread( KInstance *instance, TQObject *tqparent ) + : KWMailMergeDataSource( instance, tqparent ), _spreadSheetNumber( 1 ) { } @@ -43,7 +43,7 @@ int KWMailMergeKSpread::getNumRecords() const return rows() - 2; } -QString KWMailMergeKSpread::getValue( const QString &name, int record ) const +TQString KWMailMergeKSpread::getValue( const TQString &name, int record ) const { if ( record < 0 ) return name; @@ -53,29 +53,29 @@ QString KWMailMergeKSpread::getValue( const QString &name, int record ) const if ( cell ) return cellText( cell ); else - return i18n( "Unkown mail merge variable: %1" ).arg( name ); + return i18n( "Unkown mail merge variable: %1" ).tqarg( name ); } -void KWMailMergeKSpread::load( QDomElement& parentElem ) +void KWMailMergeKSpread::load( TQDomElement& tqparentElem ) { - QDomNode contentNode = parentElem.namedItem( "CONTENT" ); + TQDomNode contentNode = tqparentElem.namedItem( "CONTENT" ); if ( contentNode.isNull() ) return; - QDomElement element = contentNode.toElement(); + TQDomElement element = contentNode.toElement(); if ( element.isNull() ) return; - _url = element.attribute( QString::fromLatin1( "URL" ) ); - _spreadSheetNumber = element.attribute( QString::fromLatin1( "SpreadSheetNumber" ) ).toInt(); + _url = element.attribute( TQString::tqfromLatin1( "URL" ) ); + _spreadSheetNumber = element.attribute( TQString::tqfromLatin1( "SpreadSheetNumber" ) ).toInt(); initDocument(); } -void KWMailMergeKSpread::save( QDomDocument& doc, QDomElement& parent ) +void KWMailMergeKSpread::save( TQDomDocument& doc, TQDomElement& tqparent ) { - QDomElement content = doc.createElement( QString::fromLatin1( "CONTENT" ) ); - parent.appendChild( content ); + TQDomElement content = doc.createElement( TQString::tqfromLatin1( "CONTENT" ) ); + tqparent.appendChild( content ); content.setAttribute( "URL", _url.url() ); content.setAttribute( "SpreadSheetNumber", _spreadSheetNumber ); @@ -85,9 +85,9 @@ void KWMailMergeKSpread::refresh( bool ) { } -bool KWMailMergeKSpread::showConfigDialog( QWidget *parent, int ) +bool KWMailMergeKSpread::showConfigDialog( TQWidget *tqparent, int ) { - KWMailMergeKSpreadConfig dlg( parent, this ); + KWMailMergeKSpreadConfig dlg( tqparent, this ); int retval = dlg.exec(); if ( retval ) @@ -100,7 +100,7 @@ void KWMailMergeKSpread::initDocument() { _document = new Doc(); - connect( _document, SIGNAL( completed() ), SLOT( initSpreadSheets() ) ); + connect( _document, TQT_SIGNAL( completed() ), TQT_SLOT( initSpreadSheets() ) ); _document->openURL( _url ); } @@ -111,7 +111,7 @@ void KWMailMergeKSpread::initSpreadSheets() _columnMap.clear(); sampleRecord.clear(); - QPtrListIterator it( _document->map()->sheetList() ); + TQPtrListIterator it( _document->map()->sheetList() ); int counter = 0; for ( it.toFirst(); it.current(), counter < _spreadSheetNumber; ++it ) { _sheet = it.current(); @@ -172,9 +172,9 @@ int KWMailMergeKSpread::columns() const return col; } -QString KWMailMergeKSpread::cellText( const Cell *cell ) const +TQString KWMailMergeKSpread::cellText( const Cell *cell ) const { - QString text = QString::null; + TQString text = TQString(); if ( !cell->isDefault() && !cell->isEmpty() ) { if ( cell->isFormula() ) @@ -202,9 +202,9 @@ QString KWMailMergeKSpread::cellText( const Cell *cell ) const extern "C" { - KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kspread( KInstance *instance, QObject *parent ) + KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kspread( KInstance *instance, TQObject *tqparent ) { - return new KWMailMergeKSpread( instance, parent ); + return new KWMailMergeKSpread( instance, tqparent ); } } diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.h b/kword/mailmerge/kspread/kwmailmerge_kspread.h index 2d639074..2b039c01 100644 --- a/kword/mailmerge/kspread/kwmailmerge_kspread.h +++ b/kword/mailmerge/kspread/kwmailmerge_kspread.h @@ -21,8 +21,8 @@ #ifndef _KWMAILMERGE_KSPREAD_H_ #define _KWMAILMERGE_KSPREAD_H_ -#include -#include +#include +#include #include #include @@ -32,20 +32,21 @@ class KWMailMergeKSpread: public KWMailMergeDataSource { Q_OBJECT + TQ_OBJECT public: - KWMailMergeKSpread( KInstance *inst, QObject *parent ); + KWMailMergeKSpread( KInstance *inst, TQObject *tqparent ); ~KWMailMergeKSpread(); /** Saves the mail merge list to the kword document. */ - virtual void save( QDomDocument&, QDomElement& ); + virtual void save( TQDomDocument&, TQDomElement& ); /** Loads the mail merge list stored in the kword document. */ - virtual void load( QDomElement& ); + virtual void load( TQDomElement& ); /** @param name The name of the value e.g. "Family name". @@ -54,7 +55,7 @@ class KWMailMergeKSpread: public KWMailMergeDataSource If @p record equals -1, @p name is returned. */ - virtual class QString getValue( const class QString &name, int record = -1 ) const; + virtual class TQString getValue( const class TQString &name, int record = -1 ) const; /** @return The number of available contacts in mail merge list. @@ -71,7 +72,7 @@ class KWMailMergeKSpread: public KWMailMergeDataSource /** Shows a KWMailMergeKSpreadConfig dialog for selecting entries from KAddressbook. */ - virtual bool showConfigDialog( QWidget*, int action); + virtual bool showConfigDialog( TQWidget*, int action); void setURL( const KURL &url ) { _url = url; } @@ -92,14 +93,14 @@ class KWMailMergeKSpread: public KWMailMergeDataSource int rows() const; int columns() const; - QString cellText( const KSpread::Cell* ) const; + TQString cellText( const KSpread::Cell* ) const; KSpread::Doc *_document; KSpread::Sheet* _sheet; KURL _url; int _spreadSheetNumber; - QMap _columnMap; + TQMap _columnMap; }; #endif 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 -#include +#include +#include #include #include @@ -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 it( _document->map()->sheetList() ); + TQPtrListIterator 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() ); } diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread_config.h b/kword/mailmerge/kspread/kwmailmerge_kspread_config.h index 6aacff63..31706e76 100644 --- a/kword/mailmerge/kspread/kwmailmerge_kspread_config.h +++ b/kword/mailmerge/kspread/kwmailmerge_kspread_config.h @@ -33,9 +33,10 @@ class KWMailMergeKSpread; class KWMailMergeKSpreadConfig: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KWMailMergeKSpreadConfig( QWidget *parent, KWMailMergeKSpread *object ); + KWMailMergeKSpreadConfig( TQWidget *tqparent, KWMailMergeKSpread *object ); virtual ~KWMailMergeKSpreadConfig(); @@ -44,7 +45,7 @@ class KWMailMergeKSpreadConfig: public KDialogBase void loadDocument(); void documentLoaded(); - void slotTextChanged( const QString & _text ); + void slotTextChanged( const TQString & _text ); private: void initGUI(); -- cgit v1.2.1