diff options
Diffstat (limited to 'kword')
33 files changed, 164 insertions, 164 deletions
diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index fdd6eb6b..00fe2a85 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -1751,7 +1751,7 @@ bool KWCanvas::eventFilter( TQObject *o, TQEvent *e ) break; case TQt::Key_M: // 'M' -> mark debug output { - const TQDateTime dtMark ( TQDateTime::tqcurrentDateTime() ); + const TQDateTime dtMark ( TQDateTime::currentDateTime() ); kdDebug(32002) << "Developer mark: " << dtMark.toString("yyyy-MM-dd hh:mm:ss,zzz") << endl; keyev->accept(); break; diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp index 977ff322..d0a45a01 100644 --- a/kword/KWConfig.cpp +++ b/kword/KWConfig.cpp @@ -75,7 +75,7 @@ using namespace KSpell2; // (Note: KDialogBase should have version of the methods that take a TQString for the icon name) static inline TQPixmap loadIcon( const char * name ) { return KGlobal::instance()->iconLoader() - ->loadIcon( TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); + ->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); } KWConfig::KWConfig( KWView* parent ) diff --git a/kword/KWConfigFootNoteDia.cpp b/kword/KWConfigFootNoteDia.cpp index 8cfa8975..d15c78c0 100644 --- a/kword/KWConfigFootNoteDia.cpp +++ b/kword/KWConfigFootNoteDia.cpp @@ -82,7 +82,7 @@ void KWConfigFootNoteDia::setupTab3() TQWhatsThis::add(positionGroupBox, comment); positionGroupBox->setColumnLayout(0, Qt::Vertical ); TQVBoxLayout *positionLayout = new TQVBoxLayout( positionGroupBox->tqlayout() ); - positionLayout->tqsetAlignment( TQt::AlignTop ); + positionLayout->setAlignment( TQt::AlignTop ); // i18n context information necessary for gender considerations (e.g. in Polish) rbPosLeft = new TQRadioButton( i18n("Position", "Left"), positionGroupBox, "rbPosLeft" ); diff --git a/kword/KWDeleteDia.cpp b/kword/KWDeleteDia.cpp index 12f7b3b5..f710e12d 100644 --- a/kword/KWDeleteDia.cpp +++ b/kword/KWDeleteDia.cpp @@ -74,8 +74,8 @@ void KWDeleteDia::setupTab1() { } TQLabel *rc = new TQLabel( message , tab1 ); - rc->resize( rc->tqsizeHint() ); - rc->tqsetAlignment( AlignLeft | AlignBottom ); + rc->resize( rc->sizeHint() ); + rc->setAlignment( AlignLeft | AlignBottom ); grid1->addWidget( rc, 1, 0 ); } diff --git a/kword/KWDocStruct.h b/kword/KWDocStruct.h index 2eb4eb9d..87ac0f6f 100644 --- a/kword/KWDocStruct.h +++ b/kword/KWDocStruct.h @@ -290,7 +290,7 @@ public: void setup(); void refreshTree(int _type); - TQSize tqminimumSizeHint() const { + TQSize minimumSizeHint() const { return TQSize( 0, 0 ); } void selectItem(); diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp index 9420f048..5a60f326 100644 --- a/kword/KWDocument.cpp +++ b/kword/KWDocument.cpp @@ -2804,7 +2804,7 @@ bool KWDocument::saveOasisHelper( KoStore* store, KoXmlWriter* manifestWriter, S if ( saveFlag == SaveAll ) pictureList = savePictureList(); - m_varColl->variableSetting()->setModificationDate(TQDateTime::tqcurrentDateTime()); + m_varColl->variableSetting()->setModificationDate(TQDateTime::currentDateTime()); recalcVariables( VT_DATE ); recalcVariables( VT_TIME ); // for "current time" recalcVariables( VT_STATISTIC ); @@ -3235,7 +3235,7 @@ void KWDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyle buffer.close(); if ( m_pageColumns.columns > 1 ) { - buffer.tqsetBufferFromCopy(TQByteArray()); // clear data + buffer.setBuffer(TQByteArray()); // clear data buffer.open( IO_WriteOnly ); KoXmlWriter columnsTmpWriter( TQT_TQIODEVICE(&buffer) ); // TODO pass indentation level columnsTmpWriter.startElement( "style:columns" ); @@ -3405,7 +3405,7 @@ void KWDocument::saveOasisBody( KoXmlWriter& writer, KoSavingContext& context ) TQDomDocument KWDocument::saveXML() { - m_varColl->variableSetting()->setModificationDate(TQDateTime::tqcurrentDateTime()); + m_varColl->variableSetting()->setModificationDate(TQDateTime::currentDateTime()); recalcVariables( VT_DATE ); recalcVariables( VT_TIME ); // for "current time" recalcVariables( VT_STATISTIC ); @@ -5395,7 +5395,7 @@ void KWDocument::setEmpty() { KoDocument::setEmpty(); // Whether loaded from template or from empty doc: this is a new one -> set creation date - m_varColl->variableSetting()->setCreationDate(TQDateTime::tqcurrentDateTime()); + m_varColl->variableSetting()->setCreationDate(TQDateTime::currentDateTime()); recalcVariables( VT_DATE ); // , VST_CREATION_DATE ... // If we then load a document, it will override that date. } diff --git a/kword/KWEditPersonnalExpression.cpp b/kword/KWEditPersonnalExpression.cpp index 3638301d..281bf033 100644 --- a/kword/KWEditPersonnalExpression.cpp +++ b/kword/KWEditPersonnalExpression.cpp @@ -51,16 +51,16 @@ KWEditPersonnalExpression::KWEditPersonnalExpression( TQWidget *parent, const ch form1Layout->addLayout( hortqlayout1, 0, 1 ); TQGroupBox *expressionGroupBox = new TQGroupBox( page, "expressionGroupBox" ); - expressionGroupBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, expressionGroupBox->sizePolicy().hasHeightForWidth() ) ); + expressionGroupBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, expressionGroupBox->sizePolicy().hasHeightForWidth() ) ); expressionGroupBox->setTitle( i18n( "Expressions" ) ); expressionGroupBox->setColumnLayout(0, Qt::Vertical ); expressionGroupBox->tqlayout()->setSpacing( KDialog::spacingHint() ); expressionGroupBox->tqlayout()->setMargin( KDialog::marginHint() ); TQVBoxLayout *expressionGroupBoxLayout = new TQVBoxLayout( expressionGroupBox->tqlayout() ); - expressionGroupBoxLayout->tqsetAlignment( TQt::AlignTop ); + expressionGroupBoxLayout->setAlignment( TQt::AlignTop ); m_ExpressionsList = new TQListBox( expressionGroupBox, "listOfExpressions" ); - m_ExpressionsList->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 1, 0, m_ExpressionsList->sizePolicy().hasHeightForWidth() ) ); + m_ExpressionsList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 1, 0, m_ExpressionsList->sizePolicy().hasHeightForWidth() ) ); expressionGroupBoxLayout->addWidget( m_ExpressionsList ); m_expressionLineEdit = new TQLineEdit( expressionGroupBox, "expressionLineEdit" ); diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp index 2d9cb423..ab0bea65 100644 --- a/kword/KWFrameDia.cpp +++ b/kword/KWFrameDia.cpp @@ -67,7 +67,7 @@ void KWBrushStylePreview::drawContents( TQPainter* painter ) { painter->save(); painter->translate( contentsRect().x(), contentsRect().y() ); - painter->fillRect( contentsRect(), tqcolorGroup().base() ); // in case of a transparent brush + painter->fillRect( contentsRect(), colorGroup().base() ); // in case of a transparent brush painter->fillRect( contentsRect(), brush ); painter->restore(); } @@ -519,13 +519,13 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options m_sideGrid = new TQGridLayout( m_sideHeads, 4, 2, KDialog::marginHint(), KDialog::spacingHint() ); sideTitle1 = new TQLabel ( i18n("Size (%1):").tqarg(m_doc->unitName()),m_sideHeads); - sideTitle1->resize(sideTitle1->tqsizeHint()); + sideTitle1->resize(sideTitle1->sizeHint()); m_sideGrid->addWidget(sideTitle1,1,0); m_sideWidth= new TQLineEdit(m_sideHeads,""); m_sideWidth->setMaxLength(6); m_sideGrid->addWidget(m_sideWidth,1,1); sideTitle2 = new TQLabel( i18n("Gap size (%1):").tqarg(m_doc->unitName()),m_sideHeads); - sideTitle2->resize(sideTitle2->tqsizeHint()); + sideTitle2->resize(sideTitle2->sizeHint()); m_sideGrid->addWidget(sideTitle2,2,0); m_sideGap = new TQLineEdit(m_sideHeads,""); m_sideGap->setMaxLength(6); @@ -536,7 +536,7 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options m_sideAlign->insertItem ( i18n("Right")); m_sideAlign->insertItem ( i18n("Closest to Binding")); m_sideAlign->insertItem ( i18n("Closest to Page Edge")); - m_sideAlign->resize(m_sideAlign->tqsizeHint()); + m_sideAlign->resize(m_sideAlign->sizeHint()); m_sideGrid->addMultiCellWidget(m_sideAlign,3,3,0,1); m_sideGrid->addRowSpacing( 0, KDialog::marginHint() + 5 ); @@ -616,7 +616,7 @@ void KWFrameDia::setupTab2() { // TAB Text Runaround m_runGroup->setColumnLayout( 0, Qt::Vertical ); m_runGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); TQGridLayout *groupBox1Layout = new TQGridLayout( m_runGroup->tqlayout() ); - groupBox1Layout->tqsetAlignment( TQt::AlignTop ); + groupBox1Layout->setAlignment( TQt::AlignTop ); m_rRunNo = new TQRadioButton( i18n( "Text will run &through this frame" ), m_runGroup ); groupBox1Layout->addWidget( m_rRunNo, 0, 1 ); @@ -653,7 +653,7 @@ void KWFrameDia::setupTab2() { // TAB Text Runaround m_runSideGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); m_runSideGroup->tqlayout()->setMargin( KDialog::marginHint() ); TQGridLayout *runSideLayout = new TQGridLayout( m_runSideGroup->tqlayout() ); - runSideLayout->tqsetAlignment( TQt::AlignTop ); + runSideLayout->setAlignment( TQt::AlignTop ); m_rRunLeft = new TQRadioButton( i18n( "Run Around", "&Left" ), m_runSideGroup ); runSideLayout->addWidget( m_rRunLeft, 0, 0 /*1*/ ); @@ -961,43 +961,43 @@ void KWFrameDia::setupTab4() { // TAB Geometry TQGridLayout* pGrid = new TQGridLayout( m_grp1, 3, 4, KDialog::marginHint(), KDialog::spacingHint() ); m_lx = new TQLabel( i18n( "Left:" ), m_grp1 ); - m_lx->resize( m_lx->tqsizeHint() ); + m_lx->resize( m_lx->sizeHint() ); pGrid->addWidget( m_lx, 1, 0 ); m_sx = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() ); - m_sx->resize( m_sx->tqsizeHint() ); + m_sx->resize( m_sx->sizeHint() ); pGrid->addWidget( m_sx, 1, 1 ); m_ly = new TQLabel( i18n( "Top:" ), m_grp1 ); - m_ly->resize( m_ly->tqsizeHint() ); + m_ly->resize( m_ly->sizeHint() ); pGrid->addWidget( m_ly, 1, 2 ); m_sy = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() ); - m_sy->resize( m_sy->tqsizeHint() ); + m_sy->resize( m_sy->sizeHint() ); pGrid->addWidget( m_sy, 1, 3 ); m_lw = new TQLabel( i18n( "Width:" ), m_grp1 ); - m_lw->resize( m_lw->tqsizeHint() ); + m_lw->resize( m_lw->sizeHint() ); pGrid->addWidget( m_lw, 2, 0 ); m_sw = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() ); - m_sw->resize( m_sw->tqsizeHint() ); + m_sw->resize( m_sw->sizeHint() ); connect( m_sw, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotUpdateHeightForWidth(double)) ); pGrid->addWidget( m_sw, 2, 1 ); m_lh = new TQLabel( i18n( "Height:" ), m_grp1 ); - m_lh->resize( m_lh->tqsizeHint() ); + m_lh->resize( m_lh->sizeHint() ); pGrid->addWidget( m_lh, 2, 2 ); m_sh = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() ); connect( m_sh, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotUpdateWidthForHeight(double)) ); - m_sh->resize( m_sh->tqsizeHint() ); + m_sh->resize( m_sh->sizeHint() ); pGrid->addWidget( m_sh, 2, 3 ); @@ -2397,7 +2397,7 @@ KWFourSideConfigWidget::KWFourSideConfigWidget( KWDocument* doc, const TQString& mGrid->addMultiCellWidget( m_synchronize, 1, 1, 0, 1 ); TQLabel* lml = new TQLabel( i18n( "Left:" ), grp2 ); - //lml->resize( lml->tqsizeHint() ); + //lml->resize( lml->sizeHint() ); mGrid->addWidget( lml, 2, 0 ); m_inputLeft = new KoUnitDoubleSpinBox( grp2, 0, 9999, 1, 0.0, m_doc->unit() ); @@ -2405,31 +2405,31 @@ KWFourSideConfigWidget::KWFourSideConfigWidget( KWDocument* doc, const TQString& mGrid->addWidget( m_inputLeft, 2, 1 ); TQLabel* lmt = new TQLabel( i18n( "Top:" ), grp2 ); - //lmt->resize( lmt->tqsizeHint() ); + //lmt->resize( lmt->sizeHint() ); mGrid->addWidget( lmt, 2, 2 ); m_inputTop = new KoUnitDoubleSpinBox( grp2, 0, 9999, 1, 0.0, m_doc->unit() ); - //m_inputTop->resize( m_inputTop->tqsizeHint() ); + //m_inputTop->resize( m_inputTop->sizeHint() ); mGrid->addWidget( m_inputTop, 2, 3 ); TQLabel* lmr = new TQLabel( i18n( "Right:" ), grp2 ); - //lmr->resize( lmr->tqsizeHint() ); + //lmr->resize( lmr->sizeHint() ); mGrid->addWidget( lmr, 3, 0 ); m_inputRight = new KoUnitDoubleSpinBox( grp2, 0, 9999, 1, 0.0, m_doc->unit() ); - //m_inputRight->resize( m_inputRight->tqsizeHint() ); + //m_inputRight->resize( m_inputRight->sizeHint() ); mGrid->addWidget( m_inputRight, 3, 1 ); TQLabel* lmb = new TQLabel( i18n( "Bottom:" ), grp2 ); - //lmb->resize( lmb->tqsizeHint() ); + //lmb->resize( lmb->sizeHint() ); mGrid->addWidget( lmb, 3, 2 ); m_inputBottom = new KoUnitDoubleSpinBox( grp2, 0, 9999, 1, 0.0, m_doc->unit() ); - //m_inputBottom->resize( m_inputBottom->tqsizeHint() ); + //m_inputBottom->resize( m_inputBottom->sizeHint() ); mGrid->addWidget( m_inputBottom, 3, 3 ); mGrid->setRowSpacing( 0, KDialog::spacingHint() + 5 ); diff --git a/kword/KWFrameStyle.cpp b/kword/KWFrameStyle.cpp index 816afa9b..65ae6fbb 100644 --- a/kword/KWFrameStyle.cpp +++ b/kword/KWFrameStyle.cpp @@ -32,7 +32,7 @@ #include <tqdom.h> KWFrameStyleCollection::KWFrameStyleCollection() - : KoUserStyleCollection( TQString::tqfromLatin1( "frame" ) ) + : KoUserStyleCollection( TQString::fromLatin1( "frame" ) ) { } diff --git a/kword/KWFrameStyle.h b/kword/KWFrameStyle.h index 3336daa2..23dede0e 100644 --- a/kword/KWFrameStyle.h +++ b/kword/KWFrameStyle.h @@ -98,7 +98,7 @@ class KWFrameStyleCollection : public KoUserStyleCollection public: KWFrameStyleCollection(); - static TQString defaultStyleName() { return TQString::tqfromLatin1( "Plain" ); } + static TQString defaultStyleName() { return TQString::fromLatin1( "Plain" ); } /** * Find style based on the untranslated name @p name. diff --git a/kword/KWFrameStyleManager.cpp b/kword/KWFrameStyleManager.cpp index 781e9e8f..70930860 100644 --- a/kword/KWFrameStyleManager.cpp +++ b/kword/KWFrameStyleManager.cpp @@ -240,22 +240,22 @@ void KWFrameStyleManager::addGeneralTab() TQGridLayout *previewLayout = new TQGridLayout( previewBox->tqlayout() ); preview = new KWFrameStylePreview( previewBox ); - preview->resize(preview->tqsizeHint()); + preview->resize(preview->sizeHint()); previewLayout->addWidget( preview, 0, 0 ); tabLayout->addMultiCellWidget( previewBox, 1, 1, 0, 1 ); m_nameString = new TQLineEdit( tab ); - m_nameString->resize(m_nameString->tqsizeHint() ); + m_nameString->resize(m_nameString->sizeHint() ); connect( m_nameString, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( renameStyle(const TQString &) ) ); tabLayout->addWidget( m_nameString, 0, 1 ); TQLabel *nameLabel = new TQLabel( tab ); nameLabel->setText( i18n( "Name:" ) ); - nameLabel->resize(nameLabel->tqsizeHint()); - nameLabel->tqsetAlignment( AlignRight | AlignVCenter ); + nameLabel->resize(nameLabel->sizeHint()); + nameLabel->setAlignment( AlignRight | AlignVCenter ); tabLayout->addWidget( nameLabel, 0, 0 ); diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp index e477f502..ee4b919f 100644 --- a/kword/KWMailMergeDataBase.cpp +++ b/kword/KWMailMergeDataBase.cpp @@ -60,7 +60,7 @@ KWMailMergeDataBase::KWMailMergeDataBase( KWDocument *doc_ ) TQStringList KWMailMergeDataBase::availablePlugins() { TQStringList tmp; - KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::tqfromLatin1("KWord/MailMergePlugin"),TQString()); + KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),TQString()); for (KTrader::OfferList::Iterator it=pluginOffers.begin();*it;++it) { tmp.append((*it)->property("X-KDE-InternalName").toString()); @@ -79,7 +79,7 @@ bool KWMailMergeDataBase::loadPlugin(const TQString &name,const TQString &comman if (rejectdcopcall)return false; TQString constrain=TQString("[X-KDE-InternalName] =='"+name+"'"); kdDebug()<<constrain<<endl; - KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::tqfromLatin1("KWord/MailMergePlugin"),constrain); + KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),constrain); KService::Ptr it=pluginOffers.first(); TQVariant verProp=it->property("X-KDE-PluginVersion"); @@ -118,7 +118,7 @@ KWMailMergeDataSource *KWMailMergeDataBase::openPluginFor(int type,int &version) KWMailMergeDataSource *ret=0; TQString constrain=TQString("'%1' in [X-KDE-Capabilities]").tqarg(((type==KWSLCreate)?KWSLCreate_text:KWSLOpen_text)); kdDebug()<<constrain<<endl; - KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::tqfromLatin1("KWord/MailMergePlugin"),constrain); + KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),constrain); //Only for debugging for (KTrader::OfferList::Iterator it=pluginOffers.begin();*it;++it) @@ -280,7 +280,7 @@ TQDomElement KWMailMergeDataBase::save(TQDomDocument &doc) const if (plugin) { kdDebug()<<"KWMailMergeDataBase::save() There is really something to save"<<endl; - TQDomElement el=doc.createElement(TQString::tqfromLatin1("PLUGIN")); + TQDomElement el=doc.createElement(TQString::fromLatin1("PLUGIN")); TQDataStream ds(plugin->info,IO_ReadOnly); TQString libname; @@ -288,7 +288,7 @@ TQDomElement KWMailMergeDataBase::save(TQDomDocument &doc) const el.setAttribute("library",libname); parentElem.appendChild(el); kdDebug()<<"KWMailMergeDataBase::save() Calling datasource save()"<<endl; - TQDomElement el2=doc.createElement(TQString::tqfromLatin1("DATASOURCE")); + TQDomElement el2=doc.createElement(TQString::fromLatin1("DATASOURCE")); plugin->save(doc,el2); parentElem.appendChild(el2); @@ -336,18 +336,18 @@ KWMailMergeChoosePluginDialog::KWMailMergeChoosePluginDialog( KTrader::OfferList label->setBuddy( chooser ); descriptionLabel = new TQLabel( back ); descriptionLabel->hide(); - descriptionLabel->tqsetAlignment( WordBreak ); + descriptionLabel->setAlignment( WordBreak ); descriptionLabel->setFrameShape( TQFrame::Box ); descriptionLabel->setFrameShadow( TQFrame::Sunken ); - TQSize old_tqsizeHint; + TQSize old_sizeHint; for ( KTrader::OfferList::Iterator it = pluginOffers.begin(); *it; ++it ) { chooser->insertItem( (*it)->name() ); - old_tqsizeHint = descriptionLabel->tqsizeHint(); + old_sizeHint = descriptionLabel->sizeHint(); descriptionLabel->setText( (*it)->comment() ); - if (descriptionLabel->tqsizeHint().width()*descriptionLabel->tqsizeHint().height() > old_tqsizeHint.width()*old_tqsizeHint.height()) - descriptionLabel->setMinimumSize(descriptionLabel->tqsizeHint() ); + if (descriptionLabel->sizeHint().width()*descriptionLabel->sizeHint().height() > old_sizeHint.width()*old_sizeHint.height()) + descriptionLabel->setMinimumSize(descriptionLabel->sizeHint() ); } descriptionLabel->show(); @@ -395,7 +395,7 @@ KWMailMergeConfigDialog::KWMailMergeConfigDialog(TQWidget *parent,KWMailMergeDat // row1->setSpacing( KDialog::spacingHint() ); TQLabel *l = new TQLabel( i18n( "Datasource:" ),back ); -// l->setMaximumHeight( l->tqsizeHint().height() ); +// l->setMaximumHeight( l->sizeHint().height() ); tqlayout->addWidget(l); TQHBox *row1=new TQHBox(back); @@ -410,7 +410,7 @@ KWMailMergeConfigDialog::KWMailMergeConfigDialog(TQWidget *parent,KWMailMergeDat l = new TQLabel( i18n( "Merging:" ),back ); tqlayout->addWidget(l); -// l->setMaximumHeight( l->tqsizeHint().height() ); +// l->setMaximumHeight( l->sizeHint().height() ); TQHBox *row2=new TQHBox(back); tqlayout->addWidget(row2); row2->setSpacing( KDialog::spacingHint() ); @@ -482,7 +482,7 @@ void KWMailMergeConfigDialog::slotOpenClicked() void KWMailMergeConfigDialog::slotPreviewClicked() { db_->action=KWSLMergePreview; - KMainWindow *mw=dynamic_cast<KMainWindow*>(((TQWidget *)parent())->tqtopLevelWidget()); + KMainWindow *mw=dynamic_cast<KMainWindow*>(((TQWidget *)parent())->topLevelWidget()); if (mw) { KAction *ac=mw->actionCollection()->action(KStdAction::stdName(KStdAction::PrintPreview)); @@ -520,7 +520,7 @@ KWMailMergeVariableInsertDia::KWMailMergeVariableInsertDia( TQWidget *parent, KW tqlayout->setAutoAdd( true ); TQLabel *l = new TQLabel( i18n( "Name:" ), page ); - l->setMaximumHeight( l->tqsizeHint().height() ); + l->setMaximumHeight( l->sizeHint().height() ); names = new TQListBox( page ); TQMap< TQString, TQString >::ConstIterator it = db->getRecordEntries().begin(); diff --git a/kword/KWMailMergeLabelAction.cpp b/kword/KWMailMergeLabelAction.cpp index f3d70cb6..facb6e9d 100644 --- a/kword/KWMailMergeLabelAction.cpp +++ b/kword/KWMailMergeLabelAction.cpp @@ -63,7 +63,7 @@ protected: { validDrag = false; } - TQSize tqsizeHint() const + TQSize sizeHint() const { int w = fontMetrics().width( text() ); int h = fontMetrics().height(); @@ -72,10 +72,10 @@ protected: void drawButton( TQPainter * p ) { // Draw the background - tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, p, this, rect(), tqcolorGroup(), + tqstyle().drawComplexControl( TQStyle::CC_ToolButton, p, this, rect(), colorGroup(), TQStyle::Style_Enabled, TQStyle::SC_ToolButton ); // Draw the label - tqstyle().tqdrawControl( TQStyle::CE_ToolButtonLabel, p, this, rect(), tqcolorGroup(), + tqstyle().drawControl( TQStyle::CE_ToolButtonLabel, p, this, rect(), colorGroup(), TQStyle::Style_Enabled ); } void enterEvent( TQEvent* ) {}; diff --git a/kword/KWPictureFrameSet.cpp b/kword/KWPictureFrameSet.cpp index 3d04fda0..2cc8443b 100644 --- a/kword/KWPictureFrameSet.cpp +++ b/kword/KWPictureFrameSet.cpp @@ -184,7 +184,7 @@ void KWPictureFrameSet::loadOasis( const TQDomElement& frame, const TQDomElement { TQCString data = binaryData.toElement().text().latin1(); m_picture.loadFromBase64( data ); - key = KoPictureKey("nofile", TQDateTime::tqcurrentDateTime(Qt::UTC)); + key = KoPictureKey("nofile", TQDateTime::currentDateTime(Qt::UTC)); m_picture.setKey(key); } else @@ -199,7 +199,7 @@ void KWPictureFrameSet::loadOasis( const TQDomElement& frame, const TQDomElement strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } TQString filename(href/*.mid(1)*/); - key = KoPictureKey(filename, TQDateTime::tqcurrentDateTime(Qt::UTC)); + key = KoPictureKey(filename, TQDateTime::currentDateTime(Qt::UTC)); m_picture.setKey(key); KoStore* store = context.store(); diff --git a/kword/KWResizeTableDia.cpp b/kword/KWResizeTableDia.cpp index 3502701b..08c2ada2 100644 --- a/kword/KWResizeTableDia.cpp +++ b/kword/KWResizeTableDia.cpp @@ -43,10 +43,10 @@ KWResizeTableDia::KWResizeTableDia( TQWidget *parent, KWTableFrameSet *table, KW void KWResizeTableDia::setupTab1(int resizeColumn) { TQVBox *page = makeVBoxMainWidget(); TQLabel *rc = new TQLabel( i18n( "Column:" ), page ); - rc->resize( rc->tqsizeHint() ); - rc->tqsetAlignment( AlignLeft | AlignBottom ); + rc->resize( rc->sizeHint() ); + rc->setAlignment( AlignLeft | AlignBottom ); m_value = new TQSpinBox( 1, m_table->getColumns(), 1, page ); - m_value->resize( m_value->tqsizeHint() ); + m_value->resize( m_value->sizeHint() ); m_value->setValue( resizeColumn ); rc = new TQLabel( i18n( "Width:" ), page ); diff --git a/kword/KWSelectBookmarkDiaBase.ui b/kword/KWSelectBookmarkDiaBase.ui index 474498f4..55da7d96 100644 --- a/kword/KWSelectBookmarkDiaBase.ui +++ b/kword/KWSelectBookmarkDiaBase.ui @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kword/KWStartupWidgetBase.ui b/kword/KWStartupWidgetBase.ui index 57d7ce2f..cac182d2 100644 --- a/kword/KWStartupWidgetBase.ui +++ b/kword/KWStartupWidgetBase.ui @@ -65,7 +65,7 @@ For letters and notes with one main text, possibly on several pages, you should <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -90,7 +90,7 @@ For letters and notes with one main text, possibly on several pages, you should <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kword/KWTableStyle.cpp b/kword/KWTableStyle.cpp index 47f9029b..20016d49 100644 --- a/kword/KWTableStyle.cpp +++ b/kword/KWTableStyle.cpp @@ -31,7 +31,7 @@ #include <tqdom.h> KWTableStyleCollection::KWTableStyleCollection() - : KoUserStyleCollection( TQString::tqfromLatin1( "table" ) ) + : KoUserStyleCollection( TQString::fromLatin1( "table" ) ) { } diff --git a/kword/KWTableStyle.h b/kword/KWTableStyle.h index 0452312e..55cfe27a 100644 --- a/kword/KWTableStyle.h +++ b/kword/KWTableStyle.h @@ -89,7 +89,7 @@ class KWTableStyleCollection : public KoUserStyleCollection public: KWTableStyleCollection(); - static TQString defaultStyleName() { return TQString::tqfromLatin1( "Plain" ); } + static TQString defaultStyleName() { return TQString::fromLatin1( "Plain" ); } /** * Find style based on the untranslated name @p name. diff --git a/kword/KWTableStyleManager.cpp b/kword/KWTableStyleManager.cpp index c7cd547a..0a939087 100644 --- a/kword/KWTableStyleManager.cpp +++ b/kword/KWTableStyleManager.cpp @@ -275,20 +275,20 @@ void KWTableStyleManager::setupMain() mainLayout->setSpacing( KDialog::spacingHint() ); preview = new KWTableStylePreview( i18n("Preview"), i18n("Tablestyles preview"), main ); - preview->resize(preview->tqsizeHint()); + preview->resize(preview->sizeHint()); mainLayout->addMultiCellWidget( preview, 1, 1, 0, 1 ); m_nameString = new TQLineEdit( main ); - m_nameString->resize(m_nameString->tqsizeHint() ); + m_nameString->resize(m_nameString->sizeHint() ); connect( m_nameString, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( renameStyle(const TQString &) ) ); mainLayout->addWidget( m_nameString, 0, 1 ); TQLabel *nameLabel = new TQLabel( main ); nameLabel->setText( i18n( "Name:" ) ); - nameLabel->resize(nameLabel->tqsizeHint()); - nameLabel->tqsetAlignment( AlignRight | AlignVCenter ); + nameLabel->resize(nameLabel->sizeHint()); + nameLabel->setAlignment( AlignRight | AlignVCenter ); mainLayout->addWidget( nameLabel, 0, 0 ); @@ -299,11 +299,11 @@ void KWTableStyleManager::setupMain() TQLabel *frameStyleLabel = new TQLabel( adjustBox ); frameStyleLabel->setText( i18n( "Framestyle:" ) ); - frameStyleLabel->tqsetAlignment( AlignRight | AlignVCenter ); + frameStyleLabel->setAlignment( AlignRight | AlignVCenter ); TQLabel *styleLabel = new TQLabel( adjustBox ); styleLabel->setText( i18n( "Textstyle:" ) ); - styleLabel->tqsetAlignment( AlignRight | AlignVCenter ); + styleLabel->setAlignment( AlignRight | AlignVCenter ); m_frameStyle = new TQComboBox( adjustBox ); m_style = new TQComboBox( adjustBox ); diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp index 43a1de5a..7f7a78a3 100644 --- a/kword/KWTextFrameSet.cpp +++ b/kword/KWTextFrameSet.cpp @@ -3161,7 +3161,7 @@ void KWTextFrameSetEdit::pasteData( TQMimeSource* data, int provides, bool drop } else if ( provides & KWView::ProvidesPlainText ) { - // Note: TQClipboard::text() seems to do a better job than tqencodedData( "text/plain" ) + // Note: TQClipboard::text() seems to do a better job than encodedData( "text/plain" ) // In particular it handles charsets (in the mimetype). const TQString text = TQApplication::tqclipboard()->text(); const bool removeSelected = !drop; @@ -3188,7 +3188,7 @@ KCommand* KWTextFrameSetEdit::pasteOasisCommand( TQMimeSource* data ) TQCString returnedTypeMime = KoTextObject::providesOasis( data ); if ( !returnedTypeMime.isEmpty() ) { - TQByteArray arr = data->tqencodedData( returnedTypeMime ); + TQByteArray arr = data->encodedData( returnedTypeMime ); Q_ASSERT( !arr.isEmpty() ); if ( arr.size() ) return textFrameSet()->pasteOasis( cursor(), arr, true ); diff --git a/kword/KWView.cpp b/kword/KWView.cpp index 4ec739eb..d8d36c66 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -288,27 +288,27 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW if ( KStatusBar* sb = statusBar() ) // No statusbar in e.g. konqueror { m_sbPageLabel = new KStatusBarLabel( TQString(), 0, sb ); - m_sbPageLabel->tqsetAlignment( AlignLeft | AlignVCenter ); + m_sbPageLabel->setAlignment( AlignLeft | AlignVCenter ); addStatusBarItem( m_sbPageLabel, 0 ); m_sbModifiedLabel = new KStatusBarLabel( " ", 0, sb ); - m_sbModifiedLabel->tqsetAlignment( AlignLeft | AlignVCenter ); + m_sbModifiedLabel->setAlignment( AlignLeft | AlignVCenter ); addStatusBarItem( m_sbModifiedLabel, 0 ); m_sbFramesLabel = new KStatusBarLabel( TQString(), 0, sb ); - m_sbFramesLabel->tqsetAlignment( AlignLeft | AlignVCenter ); + m_sbFramesLabel->setAlignment( AlignLeft | AlignVCenter ); addStatusBarItem( m_sbFramesLabel, 1 ); m_sbOverwriteLabel = new KStatusBarLabel( ' ' + i18n( "INSRT" ) + ' ', 0, sb ); - m_sbOverwriteLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); + m_sbOverwriteLabel->setAlignment( AlignHCenter | AlignVCenter ); addStatusBarItem( m_sbOverwriteLabel, 0 ); m_sbZoomLabel = new KStatusBarLabel( ' ' + TQString::number( m_doc->zoom() ) + "% ", 0, sb ); - m_sbZoomLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); + m_sbZoomLabel->setAlignment( AlignHCenter | AlignVCenter ); addStatusBarItem( m_sbZoomLabel, 0 ); m_sbUnitLabel = new KStatusBarLabel( ' ' + KoUnit::unitDescription( m_doc->unit() ) + ' ', 0, sb ); - m_sbUnitLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); + m_sbUnitLabel->setAlignment( AlignHCenter | AlignVCenter ); addStatusBarItem( m_sbUnitLabel, 0 ); } @@ -1938,7 +1938,7 @@ void KWView::print( KPrinter &prt ) m_doc->variableCollection()->recalcVariables(VT_MAILMERGE); painter.end(); // this is what triggers the printing - m_doc->variableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::tqcurrentDateTime()); + m_doc->variableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::currentDateTime()); m_doc->recalcVariables( VT_DATE ); } @@ -2433,7 +2433,7 @@ void KWView::pasteData( TQMimeSource* data, bool drop ) TQCString returnedTypeMime = KoTextObject::providesOasis( data ); if ( !returnedTypeMime.isEmpty() ) { - const TQByteArray arr = data->tqencodedData( returnedTypeMime ); + const TQByteArray arr = data->encodedData( returnedTypeMime ); if( !arr.isEmpty() ) { TQBuffer buffer( arr ); @@ -2836,7 +2836,7 @@ void KWView::createLinkedFrame() if (selectedFrames.count() != 1) return; // action is disabled in such a case KWFrame* frame = selectedFrames[0]->frame(); - KWFrame* newFrame = new KWFrame(0L, frame->x() + m_gui->getVertRuler()->tqminimumSizeHint().width(), frame->y() + m_gui->getHorzRuler()->tqminimumSizeHint().height(), frame->width(), frame->height() ); + KWFrame* newFrame = new KWFrame(0L, frame->x() + m_gui->getVertRuler()->minimumSizeHint().width(), frame->y() + m_gui->getHorzRuler()->minimumSizeHint().height(), frame->width(), frame->height() ); newFrame->setZOrder( m_doc->maxZOrder( newFrame->pageNumber(m_doc) ) + 1 ); // make sure it's on top newFrame->setCopy(true); newFrame->setNewFrameBehavior( KWFrame::Copy ); @@ -4112,7 +4112,7 @@ void KWView::insertFormula( TQMimeSource* source ) KWFormulaFrameSet *frameset = new KWFormulaFrameSet( m_doc, TQString() ); m_doc->addFrameSet( frameset, false ); // done first since the frame number is stored in the undo/redo if ( source ) { - TQByteArray data = source->tqencodedData( KFormula::MimeSource::selectionMimeType() ); + TQByteArray data = source->encodedData( KFormula::MimeSource::selectionMimeType() ); TQDomDocument formula; formula.setContent( data ); TQDomElement formulaElem = formula.namedItem("math").toElement(); @@ -5021,7 +5021,7 @@ void KWView::textSpacingDouble() void KWView::slotCounterStyleSelected() { - TQString actionName = TQString::tqfromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); + TQString actionName = TQString::fromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); TQString styleStr = actionName.mid(13); //kdDebug() << "KWView::slotCounterStyleSelected styleStr=" << styleStr << endl; KoParagCounter::Style style = (KoParagCounter::Style)(styleStr.toInt()); @@ -7680,8 +7680,8 @@ void KWGUI::resizeEvent( TQResizeEvent *e ) void KWGUI::reorganize() { - int hSpace = m_vertRuler->tqminimumSizeHint().width(); - int vSpace = m_horRuler->tqminimumSizeHint().height(); + int hSpace = m_vertRuler->minimumSizeHint().width(); + int vSpace = m_horRuler->minimumSizeHint().height(); if(m_view->kWordDocument()->showRuler()) { m_vertRuler->show(); diff --git a/kword/KWordViewIface.cpp b/kword/KWordViewIface.cpp index 246b92e6..a259d9e7 100644 --- a/kword/KWordViewIface.cpp +++ b/kword/KWordViewIface.cpp @@ -394,7 +394,7 @@ bool KWordViewIface::pictureKeepRatio() const return view->getGUI()->canvasWidget()->pictureKeepRatio(); } -void KWordViewIface::changeAutoSpellChecktqStatus(bool b) +void KWordViewIface::changeAutoSpellCheckStatus(bool b) { view->autoSpellCheck(b); } diff --git a/kword/KWordViewIface.h b/kword/KWordViewIface.h index ea422ad9..5181359d 100644 --- a/kword/KWordViewIface.h +++ b/kword/KWordViewIface.h @@ -126,7 +126,7 @@ k_dcop: void setPictureKeepRatio( bool _keep); bool pictureKeepRatio() const; - void changeAutoSpellChecktqStatus(bool b); + void changeAutoSpellCheckStatus(bool b); void deselectAllFrames(); int currentPage(); void convertTableToText(); diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp index 1e6c20fe..1af6b0ad 100644 --- a/kword/mailmerge/KWClassicSerialDataSource.cpp +++ b/kword/mailmerge/KWClassicSerialDataSource.cpp @@ -115,25 +115,25 @@ void KWClassicSerialDataSource::removeRecord( int i ) void KWClassicSerialDataSource::save( TQDomDocument &doc, TQDomElement &parent) { - TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION")); + TQDomElement def=doc.createElement(TQString::fromLatin1("DEFINITION")); parent.appendChild(def); for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it) { - TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("FIELD")); - defEnt.setAttribute(TQString::tqfromLatin1("name"),it.key()); + TQDomElement defEnt=doc.createElement(TQString::fromLatin1("FIELD")); + defEnt.setAttribute(TQString::fromLatin1("name"),it.key()); def.appendChild(defEnt); } - TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT")); + TQDomElement cont=doc.createElement(TQString::fromLatin1("CONTENT")); parent.appendChild(cont); for (Db::Iterator dbI=db.begin();dbI!=db.end();++dbI) { - TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD")); + TQDomElement rec=doc.createElement(TQString::fromLatin1("RECORD")); cont.appendChild(rec); for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it) { - TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM")); - recEnt.setAttribute(TQString::tqfromLatin1("name"),it.key()); - recEnt.setAttribute(TQString::tqfromLatin1("data"),(*dbI)[it.key()]); + TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM")); + recEnt.setAttribute(TQString::fromLatin1("name"),it.key()); + recEnt.setAttribute(TQString::fromLatin1("data"),(*dbI)[it.key()]); rec.appendChild(recEnt); } } @@ -148,7 +148,7 @@ void KWClassicSerialDataSource::load( TQDomElement& parentElem ) TQDomElement def=defNd.toElement(); for (TQDomElement defEnt=def.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement()) { - sampleRecord[defEnt.attribute(TQString::tqfromLatin1("name"))]=i18n( "No Value" ); + sampleRecord[defEnt.attribute(TQString::fromLatin1("name"))]=i18n( "No Value" ); } TQDomNode contNd=parentElem.namedItem("CONTENT"); if (contNd.isNull()) return; @@ -157,8 +157,8 @@ void KWClassicSerialDataSource::load( TQDomElement& parentElem ) appendRecord(); for (TQDomElement recEnt=rec.firstChild().toElement();!recEnt.isNull();recEnt=recEnt.nextSibling().toElement()) { - setValue(recEnt.attribute(TQString::tqfromLatin1("name")), - recEnt.attribute(TQString::tqfromLatin1("data")),db.count()-1); + setValue(recEnt.attribute(TQString::fromLatin1("name")), + recEnt.attribute(TQString::fromLatin1("data")),db.count()-1); } } } @@ -219,9 +219,9 @@ TQString KWClassicMailMergeEditorListItem::text( int i ) const void KWClassicMailMergeEditorListItem::setup() { setHeight( TQMAX( listView()->fontMetrics().height(), - editWidget->tqsizeHint().height() ) ); - if ( listView()->columnWidth( 1 ) < editWidget->tqsizeHint().width() ) - listView()->setColumnWidth( 1, editWidget->tqsizeHint().width() ); + editWidget->sizeHint().height() ) ); + if ( listView()->columnWidth( 1 ) < editWidget->sizeHint().width() ) + listView()->setColumnWidth( 1, editWidget->sizeHint().width() ); } void KWClassicMailMergeEditorListItem::update() @@ -342,27 +342,27 @@ KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *parent, KWClassicS first = new TQToolButton( toolbar ); first->setIconSet( SmallIconSet( "start" ) ); - first->setFixedSize( first->tqsizeHint() ); + first->setFixedSize( first->sizeHint() ); connect(first, TQT_SIGNAL(clicked()), this, TQT_SLOT(firstRecord())); back_ = new TQToolButton( toolbar ); back_->setIconSet( SmallIconSet( "back" ) ); - back_->setFixedSize( back_->tqsizeHint() ); + back_->setFixedSize( back_->sizeHint() ); connect(back_, TQT_SIGNAL(clicked()), this, TQT_SLOT(prevRecord())); records = new TQSpinBox( 1, db->getNumRecords(), 1, toolbar ); - records->setMaximumHeight( records->tqsizeHint().height() ); + records->setMaximumHeight( records->sizeHint().height() ); connect( records, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changeRecord( int ) ) ); forward = new TQToolButton( toolbar ); forward->setIconSet( SmallIconSet( "forward" ) ); - forward->setFixedSize( forward->tqsizeHint() ); + forward->setFixedSize( forward->sizeHint() ); connect(forward, TQT_SIGNAL(clicked()), this, TQT_SLOT(nextRecord())); finish = new TQToolButton( toolbar ); finish->setIconSet( SmallIconSet( "finish" ) ); - finish->setFixedSize( finish->tqsizeHint() ); + finish->setFixedSize( finish->sizeHint() ); connect(finish, TQT_SIGNAL(clicked()), this, TQT_SLOT(lastRecord())); TQWidget *sep = new TQWidget( toolbar ); @@ -370,28 +370,28 @@ KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *parent, KWClassicS newRecord = new TQToolButton( toolbar ); newRecord->setIconSet( SmallIconSet( "sl_addrecord" ) ); - newRecord->setFixedSize( newRecord->tqsizeHint() ); + newRecord->setFixedSize( newRecord->sizeHint() ); connect( newRecord, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addRecord() ) ); TQToolTip::add( newRecord, i18n( "Add record" ) ); newEntry = new TQToolButton( toolbar ); newEntry->setIconSet( SmallIconSet( "sl_addentry" ) ); - newEntry->setFixedSize( newEntry->tqsizeHint() ); + newEntry->setFixedSize( newEntry->sizeHint() ); connect( newEntry, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addEntry() ) ); TQToolTip::add( newEntry, i18n( "Add entry" ) ); deleteRecord = new TQToolButton( toolbar ); deleteRecord->setIconSet( SmallIconSet( "sl_delrecord" ) ); - deleteRecord->setFixedSize( deleteRecord->tqsizeHint() ); + deleteRecord->setFixedSize( deleteRecord->sizeHint() ); connect( deleteRecord, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeRecord() ) ); TQToolTip::add( deleteRecord, i18n( "Remove record" ) ); deleteEntry = new TQToolButton( toolbar ); deleteEntry->setIconSet( SmallIconSet( "sl_delentry" ) ); - deleteEntry->setFixedSize( deleteEntry->tqsizeHint() ); + deleteEntry->setFixedSize( deleteEntry->sizeHint() ); connect( deleteEntry, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeEntry() ) ); TQToolTip::add( deleteEntry, i18n( "Remove entry" ) ); diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp index 411ee5e5..7b8feb70 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp +++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp @@ -409,7 +409,7 @@ void KWMailMergeKABC::load( TQDomElement& parentElem ) for( TQDomElement recEnt=rec.firstChild().toElement(); !recEnt.isNull(); recEnt=recEnt.nextSibling().toElement() ) { - addEntry( recEnt.attribute( TQString::tqfromLatin1("uid") ) ); + addEntry( recEnt.attribute( TQString::fromLatin1("uid") ) ); } } else if( rec.nodeName() == "LIST" ) @@ -417,7 +417,7 @@ void KWMailMergeKABC::load( TQDomElement& parentElem ) for( TQDomElement recEnt=rec.firstChild().toElement(); !recEnt.isNull(); recEnt=recEnt.nextSibling().toElement() ) { - addList( recEnt.attribute( TQString::tqfromLatin1("listid") ) ); + addList( recEnt.attribute( TQString::fromLatin1("listid") ) ); } } else @@ -482,26 +482,26 @@ void KWMailMergeKABC::refresh( bool ) void KWMailMergeKABC::save( TQDomDocument& doc, TQDomElement& parent) { - TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT")); + TQDomElement cont=doc.createElement(TQString::fromLatin1("CONTENT")); parent.appendChild(cont); TQValueList<TQString>::ConstIterator it = _individualUIDs.begin(); for( ; it != _individualUIDs.end(); ++it ) { - TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD")); + TQDomElement rec=doc.createElement(TQString::fromLatin1("RECORD")); cont.appendChild(rec); - TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM")); - recEnt.setAttribute(TQString::tqfromLatin1("uid"),*it); + TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM")); + recEnt.setAttribute(TQString::fromLatin1("uid"),*it); rec.appendChild(recEnt); } it = _lists.begin(); for( ; !(it == _lists.end()); ++it ) { - TQDomElement rec=doc.createElement(TQString::tqfromLatin1("LIST")); + TQDomElement rec=doc.createElement(TQString::fromLatin1("LIST")); cont.appendChild(rec); - TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM")); - recEnt.setAttribute(TQString::tqfromLatin1("listid"),*it); + TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM")); + recEnt.setAttribute(TQString::fromLatin1("listid"),*it); rec.appendChild(recEnt); } } diff --git a/kword/mailmerge/kabc/addresspicker.ui b/kword/mailmerge/kabc/addresspicker.ui index c7276c9b..e9d389ad 100644 --- a/kword/mailmerge/kabc/addresspicker.ui +++ b/kword/mailmerge/kabc/addresspicker.ui @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -76,7 +76,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp index 6801a64a..1a477737 100644 --- a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp +++ b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp @@ -66,15 +66,15 @@ void KWMailMergeKSpread::load( TQDomElement& parentElem ) if ( element.isNull() ) return; - _url = element.attribute( TQString::tqfromLatin1( "URL" ) ); - _spreadSheetNumber = element.attribute( TQString::tqfromLatin1( "SpreadSheetNumber" ) ).toInt(); + _url = element.attribute( TQString::fromLatin1( "URL" ) ); + _spreadSheetNumber = element.attribute( TQString::fromLatin1( "SpreadSheetNumber" ) ).toInt(); initDocument(); } void KWMailMergeKSpread::save( TQDomDocument& doc, TQDomElement& parent ) { - TQDomElement content = doc.createElement( TQString::tqfromLatin1( "CONTENT" ) ); + TQDomElement content = doc.createElement( TQString::fromLatin1( "CONTENT" ) ); parent.appendChild( content ); content.setAttribute( "URL", _url.url() ); diff --git a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp index 3db1d9d6..c45d7527 100644 --- a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp +++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp @@ -33,7 +33,7 @@ KWQtSqlEasyFilter::KWQtSqlEasyFilter( TQWidget *parent) int h=m_table->rowHeight(0); for (int i=0;i<6;i++) h+=m_table->rowHeight(i); - h+=m_table->horizontalHeader()->tqsizeHint().height(); + h+=m_table->horizontalHeader()->sizeHint().height(); m_table->setMinimumHeight(h); int w=0; diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp index 544f7990..d5e9b4ac 100644 --- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp @@ -85,27 +85,27 @@ TQString KWQtSqlPowerSerialDataSource::getValue( const TQString &name, int recor void KWQtSqlPowerSerialDataSource::save( TQDomDocument &doc, TQDomElement &parent) { - TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION")); + TQDomElement def=doc.createElement(TQString::fromLatin1("DEFINITION")); parent.appendChild(def); { - TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("DATABASE")); - defEnt.setAttribute(TQString::tqfromLatin1("hostname"),hostname); - defEnt.setAttribute(TQString::tqfromLatin1("port"),port); - defEnt.setAttribute(TQString::tqfromLatin1("driver"),driver); - defEnt.setAttribute(TQString::tqfromLatin1("databasename"),databasename); - defEnt.setAttribute(TQString::tqfromLatin1("username"),username); + TQDomElement defEnt=doc.createElement(TQString::fromLatin1("DATABASE")); + defEnt.setAttribute(TQString::fromLatin1("hostname"),hostname); + defEnt.setAttribute(TQString::fromLatin1("port"),port); + defEnt.setAttribute(TQString::fromLatin1("driver"),driver); + defEnt.setAttribute(TQString::fromLatin1("databasename"),databasename); + defEnt.setAttribute(TQString::fromLatin1("username"),username); def.appendChild(defEnt); - defEnt=doc.createElement(TQString::tqfromLatin1("QUERY")); - defEnt.setAttribute(TQString::tqfromLatin1("value"),query); + defEnt=doc.createElement(TQString::fromLatin1("QUERY")); + defEnt.setAttribute(TQString::fromLatin1("value"),query); def.appendChild(defEnt); - TQDomElement sampleEnt=doc.createElement(TQString::tqfromLatin1("SAMPLERECORD")); + TQDomElement sampleEnt=doc.createElement(TQString::fromLatin1("SAMPLERECORD")); parent.appendChild(sampleEnt); for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it) { - TQDomElement fieldEnt=doc.createElement(TQString::tqfromLatin1("FIELD")); - fieldEnt.setAttribute(TQString::tqfromLatin1("name"),it.key()); + TQDomElement fieldEnt=doc.createElement(TQString::fromLatin1("FIELD")); + fieldEnt.setAttribute(TQString::fromLatin1("name"),it.key()); sampleEnt.appendChild(fieldEnt); } } @@ -122,19 +122,19 @@ void KWQtSqlPowerSerialDataSource::load( TQDomElement& parentElem ) if (!dbNd.isNull()) { TQDomElement dbEnt=dbNd.toElement(); - if (dbEnt.tagName()==TQString::tqfromLatin1("DATABASE")) + if (dbEnt.tagName()==TQString::fromLatin1("DATABASE")) { - hostname=dbEnt.attribute(TQString::tqfromLatin1("hostname")); - port=dbEnt.attribute(TQString::tqfromLatin1("port")); - driver=dbEnt.attribute(TQString::tqfromLatin1("driver")); - databasename=dbEnt.attribute(TQString::tqfromLatin1("databasename")); - username=dbEnt.attribute(TQString::tqfromLatin1("username")); + hostname=dbEnt.attribute(TQString::fromLatin1("hostname")); + port=dbEnt.attribute(TQString::fromLatin1("port")); + driver=dbEnt.attribute(TQString::fromLatin1("driver")); + databasename=dbEnt.attribute(TQString::fromLatin1("databasename")); + username=dbEnt.attribute(TQString::fromLatin1("username")); } } TQDomNode queryNd=def.namedItem("QUERY"); if (!queryNd.isNull()) { - query=queryNd.toElement().attribute(TQString::tqfromLatin1("value")); + query=queryNd.toElement().attribute(TQString::fromLatin1("value")); } } @@ -144,7 +144,7 @@ void KWQtSqlPowerSerialDataSource::load( TQDomElement& parentElem ) TQDomElement def1=defNd.toElement(); for (TQDomElement defEnt=defNd.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement()) { - addSampleRecordEntry(defEnt.attribute(TQString::tqfromLatin1("name"))); + addSampleRecordEntry(defEnt.attribute(TQString::fromLatin1("name"))); } } } diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp index ec31df35..2181c172 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp @@ -66,25 +66,25 @@ TQString KWQtSqlSerialDataSource::getValue( const TQString &name, int record ) c void KWQtSqlSerialDataSource::save( TQDomDocument & /*doc*/, TQDomElement & /*parent*/) { /* - TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION")); + TQDomElement def=doc.createElement(TQString::fromLatin1("DEFINITION")); parent.appendChild(def); for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it) { - TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("FIELD")); - defEnt.setAttribute(TQString::tqfromLatin1("name"),it.key()); + TQDomElement defEnt=doc.createElement(TQString::fromLatin1("FIELD")); + defEnt.setAttribute(TQString::fromLatin1("name"),it.key()); def.appendChild(defEnt); } - TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT")); + TQDomElement cont=doc.createElement(TQString::fromLatin1("CONTENT")); parent.appendChild(cont); for (Db::Iterator dbI=db.begin();dbI!=db.end();++dbI) { - TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD")); + TQDomElement rec=doc.createElement(TQString::fromLatin1("RECORD")); cont.appendChild(rec); for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it) { - TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM")); - recEnt.setAttribute(TQString::tqfromLatin1("name"),it.key()); - recEnt.setAttribute(TQString::tqfromLatin1("data"),(*dbI)[it.key()]); + TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM")); + recEnt.setAttribute(TQString::fromLatin1("name"),it.key()); + recEnt.setAttribute(TQString::fromLatin1("data"),(*dbI)[it.key()]); rec.appendChild(recEnt); } } @@ -101,7 +101,7 @@ void KWQtSqlSerialDataSource::load( TQDomElement& /*parentElem*/ ) TQDomElement def=defNd.toElement(); for (TQDomElement defEnt=def.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement()) { - sampleRecord[defEnt.attribute(TQString::tqfromLatin1("name"))]=defEnt.attribute(TQString::tqfromLatin1("name"));//i18n( "No Value" ); + sampleRecord[defEnt.attribute(TQString::fromLatin1("name"))]=defEnt.attribute(TQString::fromLatin1("name"));//i18n( "No Value" ); } TQDomNode contNd=parentElem.namedItem("CONTENT"); if (contNd.isNull()) return; @@ -110,8 +110,8 @@ void KWQtSqlSerialDataSource::load( TQDomElement& /*parentElem*/ ) appendRecord(); for (TQDomElement recEnt=rec.firstChild().toElement();!recEnt.isNull();recEnt=recEnt.nextSibling().toElement()) { - setValue(recEnt.attribute(TQString::tqfromLatin1("name")), - recEnt.attribute(TQString::tqfromLatin1("data")),db.count()-1); + setValue(recEnt.attribute(TQString::fromLatin1("name")), + recEnt.attribute(TQString::fromLatin1("data")),db.count()-1); } } */ diff --git a/kword/mailmerge/sql/kwqtsqlpower.ui b/kword/mailmerge/sql/kwqtsqlpower.ui index a68b62db..afff8c7f 100644 --- a/kword/mailmerge/sql/kwqtsqlpower.ui +++ b/kword/mailmerge/sql/kwqtsqlpower.ui @@ -54,7 +54,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>120</height> @@ -73,7 +73,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>120</height> @@ -168,7 +168,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>0</height> @@ -196,7 +196,7 @@ <property name="name"> <cstring>Line2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> diff --git a/kword/mailmerge/sql/qtsqlopenwidget.ui b/kword/mailmerge/sql/qtsqlopenwidget.ui index fc32bded..c0d2423a 100644 --- a/kword/mailmerge/sql/qtsqlopenwidget.ui +++ b/kword/mailmerge/sql/qtsqlopenwidget.ui @@ -283,7 +283,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> |