diff options
Diffstat (limited to 'kugar')
-rw-r--r-- | kugar/kudesigner_lib/canvas.cpp | 12 | ||||
-rw-r--r-- | kugar/kudesigner_lib/detail.cpp | 2 | ||||
-rw-r--r-- | kugar/kudesigner_lib/detailfooter.cpp | 2 | ||||
-rw-r--r-- | kugar/kudesigner_lib/detailheader.cpp | 2 | ||||
-rw-r--r-- | kugar/kudesigner_lib/propertyserializer.cpp | 4 | ||||
-rw-r--r-- | kugar/kudesigner_lib/structurewidget.cpp | 14 | ||||
-rw-r--r-- | kugar/lib/mlabelobject.cpp | 10 | ||||
-rw-r--r-- | kugar/lib/mlabelobject.h | 12 | ||||
-rw-r--r-- | kugar/lib/mlineobject.cpp | 4 | ||||
-rw-r--r-- | kugar/lib/mreportengine.cpp | 32 | ||||
-rw-r--r-- | kugar/lib/mreportobject.cpp | 4 | ||||
-rw-r--r-- | kugar/lib/mreportsection.cpp | 4 | ||||
-rw-r--r-- | kugar/lib/mreportviewer.cpp | 8 | ||||
-rw-r--r-- | kugar/lib/mutil.cpp | 24 | ||||
-rw-r--r-- | kugar/part/kugar_part.cpp | 22 | ||||
-rw-r--r-- | kugar/part/kugar_view.cpp | 4 |
16 files changed, 80 insertions, 80 deletions
diff --git a/kugar/kudesigner_lib/canvas.cpp b/kugar/kudesigner_lib/canvas.cpp index d486ae9d..3d4ba603 100644 --- a/kugar/kudesigner_lib/canvas.cpp +++ b/kugar/kudesigner_lib/canvas.cpp @@ -162,11 +162,11 @@ bool Canvas::loadXML( const TQDomNode &report ) templ->props[ "RightMargin" ].setValue( attributes.namedItem( "RightMargin" ).nodeValue().toInt() ); // Get all the child report elements - TQDomNodeList tqchildren = report.childNodes(); - int childCount = tqchildren.length(); + TQDomNodeList children = report.childNodes(); + int childCount = children.length(); for ( int j = 0; j < childCount; j++ ) { - TQDomNode child = tqchildren.item( j ); + TQDomNode child = children.item( j ); if ( child.nodeType() == TQDomNode::ElementNode ) { @@ -301,12 +301,12 @@ void Canvas::setDetailFooterAttributes( TQDomNode *node ) void Canvas::addReportItems( TQDomNode *node, Band *section ) { - TQDomNodeList tqchildren = node->childNodes(); - int childCount = tqchildren.length(); + TQDomNodeList children = node->childNodes(); + int childCount = children.length(); for ( int j = 0; j < childCount; j++ ) { - TQDomNode child = tqchildren.item( j ); + TQDomNode child = children.item( j ); if ( child.nodeType() == TQDomNode::ElementNode ) { if ( child.nodeName() == "Line" ) diff --git a/kugar/kudesigner_lib/detail.cpp b/kugar/kudesigner_lib/detail.cpp index db3765f8..a9f2faa5 100644 --- a/kugar/kudesigner_lib/detail.cpp +++ b/kugar/kudesigner_lib/detail.cpp @@ -39,7 +39,7 @@ Detail::Detail( int x, int y, int width, int height, int level, Canvas *canvas ) void Detail::draw( TQPainter &painter ) { - TQString str = TQString( "%1 %2" ).tqarg( i18n( "Detail" ) ).tqarg( props[ "Level" ].value().toInt() ); + TQString str = TQString( "%1 %2" ).arg( i18n( "Detail" ) ).arg( props[ "Level" ].value().toInt() ); painter.drawText( rect(), AlignVCenter | AlignLeft, str ); Band::draw( painter ); } diff --git a/kugar/kudesigner_lib/detailfooter.cpp b/kugar/kudesigner_lib/detailfooter.cpp index 14b5e13f..b1715920 100644 --- a/kugar/kudesigner_lib/detailfooter.cpp +++ b/kugar/kudesigner_lib/detailfooter.cpp @@ -36,7 +36,7 @@ DetailFooter::DetailFooter( int x, int y, int width, int height, int level, Canv void DetailFooter::draw( TQPainter &painter ) { - TQString str = TQString( "%1 %2" ).tqarg( i18n( "Detail Footer" ) ).tqarg( props[ "Level" ].value().toInt() ); + TQString str = TQString( "%1 %2" ).arg( i18n( "Detail Footer" ) ).arg( props[ "Level" ].value().toInt() ); painter.drawText( rect(), AlignVCenter | AlignLeft, str ); Band::draw( painter ); } diff --git a/kugar/kudesigner_lib/detailheader.cpp b/kugar/kudesigner_lib/detailheader.cpp index 071dea72..d43ce942 100644 --- a/kugar/kudesigner_lib/detailheader.cpp +++ b/kugar/kudesigner_lib/detailheader.cpp @@ -36,7 +36,7 @@ DetailHeader::DetailHeader( int x, int y, int width, int height, int level, Canv void DetailHeader::draw( TQPainter &painter ) { - TQString str = TQString( "%1 %2" ).tqarg( i18n( "Detail Header" ) ).tqarg( props[ "Level" ].value().toInt() ); + TQString str = TQString( "%1 %2" ).arg( i18n( "Detail Header" ) ).arg( props[ "Level" ].value().toInt() ); painter.drawText( rect(), AlignVCenter | AlignLeft, str ); Band::draw( painter ); } diff --git a/kugar/kudesigner_lib/propertyserializer.cpp b/kugar/kudesigner_lib/propertyserializer.cpp index 32ebe470..ae9f30d7 100644 --- a/kugar/kudesigner_lib/propertyserializer.cpp +++ b/kugar/kudesigner_lib/propertyserializer.cpp @@ -40,7 +40,7 @@ TQString PropertySerializer::toString( Property *prop ) switch ( prop->type() ) { case KoProperty::Color: - return TQString( "%1,%2,%3" ).tqarg( val.toColor().red() ).tqarg( val.toColor().green() ).tqarg( val.toColor().blue() ); + return TQString( "%1,%2,%3" ).arg( val.toColor().red() ).arg( val.toColor().green() ).arg( val.toColor().blue() ); case KoProperty::Boolean: return val.toBool() ? "true" : "false"; case KoProperty::Font: @@ -67,7 +67,7 @@ TQVariant PropertySerializer::fromString( Property *prop, const TQString &str ) case KoProperty::LineStyle: return TQVariant( str.toInt() ); case KoProperty::Symbol: - return TQVariant( str.tqat( 0 ).latin1() ); + return TQVariant( str.at( 0 ).latin1() ); default: return TQVariant( str ); } diff --git a/kugar/kudesigner_lib/structurewidget.cpp b/kugar/kudesigner_lib/structurewidget.cpp index 7ad4ac1b..01b4289e 100644 --- a/kugar/kudesigner_lib/structurewidget.cpp +++ b/kugar/kudesigner_lib/structurewidget.cpp @@ -142,7 +142,7 @@ void StructureWidget::refreshSection( Kudesigner::Band *section, StructureItem * break; } if ( level > 0 ) - name += tqtr( " (level %1)" ).tqarg( level ); + name += tqtr( " (level %1)" ).arg( level ); StructureItem *item = new StructureItem( root, name ); m_items[ section ] = item; @@ -165,18 +165,18 @@ void StructureWidget::refreshSectionContents( Kudesigner::Band *section, Structu switch ( box->rtti() ) { case Kudesigner::Rtti_Label: - name = tqtr( "Label: %1" ).tqarg( box->props[ "Text" ].value().toString() ); + name = tqtr( "Label: %1" ).arg( box->props[ "Text" ].value().toString() ); break; case Kudesigner::Rtti_Field: - name = tqtr( "Field: %1" ).tqarg( box->props[ "Field" ].value().toString() ); + name = tqtr( "Field: %1" ).arg( box->props[ "Field" ].value().toString() ); break; case Kudesigner::Rtti_Calculated: - name = tqtr( "Calculated Field: %1" ).tqarg( box->props[ "Field" ].value().toString() ); + name = tqtr( "Calculated Field: %1" ).arg( box->props[ "Field" ].value().toString() ); break; case Kudesigner::Rtti_Special: idx = box->props[ "Type" ].listData()->keys.findIndex( box->props[ "Type" ].value().toInt() ); - name = tqtr( "Special Field: %1" ).tqarg( box->props[ "Type" ].listData()->keys[ idx ].toString() ); + name = tqtr( "Special Field: %1" ).arg( box->props[ "Type" ].listData()->keys[ idx ].toString() ); break; case Kudesigner::Rtti_Line: name = tqtr( "Line" ); @@ -198,7 +198,7 @@ void StructureWidget::selectionMade() { StructureItem * item = static_cast<StructureItem*>( m_items[ *it ] ); item->setBold( true ); - item->tqrepaint(); + item->repaint(); m_selected.append( item ); } } @@ -211,7 +211,7 @@ void StructureWidget::selectionClear() if ( ( *it ) == 0 ) continue; ( *it ) ->setBold( false ); - ( *it ) ->tqrepaint(); + ( *it ) ->repaint(); } m_selected.clear(); } diff --git a/kugar/lib/mlabelobject.cpp b/kugar/lib/mlabelobject.cpp index 6a0db974..fecbd560 100644 --- a/kugar/lib/mlabelobject.cpp +++ b/kugar/lib/mlabelobject.cpp @@ -29,7 +29,7 @@ MLabelObject::MLabelObject() : MReportObject(), xMargin( 0 ), yMargin( 0 ) fontWeight = MLabelObject::Normal; fontItalic = false; - // Set the default tqalignment + // Set the default alignment hAlignment = MLabelObject::Left; vAlignment = MLabelObject::Top; wordWrap = false; @@ -76,13 +76,13 @@ void MLabelObject::setFont( const TQString family, int size, int weight, bool it fontItalic = italic; } -/** Sets the label's horizontal tqalignment */ +/** Sets the label's horizontal alignment */ void MLabelObject::setHorizontalAlignment( int a ) { hAlignment = a; } -/** Sets the label's vertical tqalignment */ +/** Sets the label's vertical alignment */ void MLabelObject::setVerticalAlignment( int a ) { vAlignment = a; @@ -113,7 +113,7 @@ void MLabelObject::draw( TQPainter* p, int xoffset, int yoffset ) p->setFont( font ); TQFontMetrics fm = p->fontMetrics(); - // Set the text tqalignment flags + // Set the text alignment flags //Qt::Horizontal switch ( hAlignment ) @@ -165,7 +165,7 @@ void MLabelObject::copy( const MLabelObject* mLabelObject ) fontWeight = mLabelObject->fontWeight; fontItalic = mLabelObject->fontItalic; - // Copy the label's tqalignment data + // Copy the label's alignment data vAlignment = mLabelObject->vAlignment; hAlignment = mLabelObject->hAlignment; wordWrap = mLabelObject->wordWrap; diff --git a/kugar/lib/mlabelobject.h b/kugar/lib/mlabelobject.h index 2b35f233..3526552e 100644 --- a/kugar/lib/mlabelobject.h +++ b/kugar/lib/mlabelobject.h @@ -27,9 +27,9 @@ class MLabelObject : public MReportObject public: /** Font weight constants */ enum FontWeight { Light = 25, Normal = 50, DemiBold = 63, Bold = 75, Black = 87 }; - /**Qt::Horizontal tqalignment constants */ + /**Qt::Horizontal alignment constants */ enum HAlignment { Left = 0, Center, Right }; - /** Vertial tqalignment constants */ + /** Vertial alignment constants */ enum VAlignment { Top = 0, Middle, Bottom }; /** Constructor */ @@ -52,9 +52,9 @@ protected: int fontWeight; /** Label text font italic flag */ bool fontItalic; - /** Lable text horizontal tqalignment */ + /** Lable text horizontal alignment */ int hAlignment; - /** Label text vertical tqalignment */ + /** Label text vertical alignment */ int vAlignment; /** Label text word wrap flag */ bool wordWrap; @@ -70,9 +70,9 @@ public: virtual void setText( const TQString txt ); /** Sets the label's text font - default is Times,10,Normal,false */ void setFont( const TQString family, int size, int weight, bool italic ); - /** Sets the label's horizontal tqalignment -default is Left */ + /** Sets the label's horizontal alignment -default is Left */ void setHorizontalAlignment( int a ); - /** Sets the label's vertical tqalignment - default is Top */ + /** Sets the label's vertical alignment - default is Top */ void setVerticalAlignment( int a ); /** Sets the label's word wrap flag - default is false */ void setWordWrap( bool state ); diff --git a/kugar/lib/mlineobject.cpp b/kugar/lib/mlineobject.cpp index 2a4a0bc9..abd7927c 100644 --- a/kugar/lib/mlineobject.cpp +++ b/kugar/lib/mlineobject.cpp @@ -14,7 +14,7 @@ namespace Kugar /** Constructor */ MLineObject::MLineObject() : TQObject() { - // Set the object's default tqgeometry + // Set the object's default geometry xpos1 = 0; ypos1 = 0; xpos2 = 0; @@ -104,7 +104,7 @@ void MLineObject::drawBase( TQPainter* p, int xoffset, int yoffset ) Used by the copy constructor and assignment operator */ void MLineObject::copy( const MLineObject* mLineObject ) { - // Copy the object's tqgeometry + // Copy the object's geometry xpos1 = mLineObject->xpos1; ypos1 = mLineObject->ypos1; xpos2 = mLineObject->xpos2; diff --git a/kugar/lib/mreportengine.cpp b/kugar/lib/mreportengine.cpp index 77f402ed..2263ba61 100644 --- a/kugar/lib/mreportengine.cpp +++ b/kugar/lib/mreportengine.cpp @@ -652,21 +652,21 @@ void MReportEngine::recalcDimensions() recalcAttribute( "LeftMargin", rattributes ); recalcAttribute( "RightMargin", rattributes ); - TQDomNodeList tqchildren = report.childNodes(); - int childCount = tqchildren.length(); + TQDomNodeList children = report.childNodes(); + int childCount = children.length(); for ( int j = 0; j < childCount; j++ ) { - child = tqchildren.item( j ); + child = children.item( j ); TQDomNamedNodeMap attributes = child.attributes(); - TQDomNodeList tqchildren2 = child.childNodes(); - int childCount2 = tqchildren2.length(); + TQDomNodeList children2 = child.childNodes(); + int childCount2 = children2.length(); recalcAttribute( "Height", attributes ); for ( int k = 0; k < childCount2; k++ ) { - TQDomNode child2 = tqchildren2.item( k ); + TQDomNode child2 = children2.item( k ); TQDomNamedNodeMap attributes = child2.attributes(); recalcAttribute( "X", attributes ); recalcAttribute( "Y", attributes ); @@ -685,7 +685,7 @@ void MReportEngine::recalcAttribute( const TQString& name, TQDomNamedNodeMap att { if ( !attributes.namedItem( name ).isNull() ) { - attributes.namedItem( name ).setNodeValue( TQString( "%1" ).tqarg( attributes.namedItem( name ).nodeValue().toInt() * 93 / 81 ) ); + attributes.namedItem( name ).setNodeValue( TQString( "%1" ).arg( attributes.namedItem( name ).nodeValue().toInt() * 93 / 81 ) ); } } @@ -712,12 +712,12 @@ void MReportEngine::initTemplate() setReportAttributes( &report ); // Get all the child report elements - TQDomNodeList tqchildren = report.childNodes(); - int childCount = tqchildren.length(); + TQDomNodeList children = report.childNodes(); + int childCount = children.length(); for ( int j = 0; j < childCount; j++ ) { - child = tqchildren.item( j ); + child = children.item( j ); if ( child.nodeType() == TQDomNode::ElementNode ) { @@ -803,14 +803,14 @@ void MReportEngine::setSectionAttributes( MReportSection* section, TQDomNode* re section->setPrintFrequency( attributes.namedItem( "PrintFrequency" ).nodeValue().toInt() ); // Process the sections labels - TQDomNodeList tqchildren = report->childNodes(); - int childCount = tqchildren.length(); + TQDomNodeList children = report->childNodes(); + int childCount = children.length(); // For each label, extract the attr list and add the new label // to the sections's label collection for ( int j = 0; j < childCount; j++ ) { - TQDomNode child = tqchildren.item( j ); + TQDomNode child = children.item( j ); if ( child.nodeType() == TQDomNode::ElementNode ) { if ( child.nodeName() == "Line" ) @@ -881,12 +881,12 @@ void MReportEngine::setDetailAttributes( TQDomNode* report ) detail->setRepeat( attributes.namedItem( "Repeat" ).nodeValue() == "true" ); // Process the report detail labels - TQDomNodeList tqchildren = report->childNodes(); - int childCount = tqchildren.length(); + TQDomNodeList children = report->childNodes(); + int childCount = children.length(); for ( int j = 0; j < childCount; j++ ) { - TQDomNode child = tqchildren.item( j ); + TQDomNode child = children.item( j ); if ( child.nodeType() == TQDomNode::ElementNode ) { if ( child.nodeName() == "Line" ) diff --git a/kugar/lib/mreportobject.cpp b/kugar/lib/mreportobject.cpp index 7fec9dd9..7a9366f6 100644 --- a/kugar/lib/mreportobject.cpp +++ b/kugar/lib/mreportobject.cpp @@ -16,7 +16,7 @@ namespace Kugar /** Constructor */ MReportObject::MReportObject() : TQObject() { - // Set the object's default tqgeometry + // Set the object's default geometry xpos = 0; ypos = 0; width = 40; @@ -166,7 +166,7 @@ void MReportObject::setBorderStyle( int style ) Used by the copy constructor and assignment operator */ void MReportObject::copy( const MReportObject* mReportObject ) { - // Copy the object's tqgeometry + // Copy the object's geometry xpos = mReportObject->xpos; ypos = mReportObject->ypos; width = mReportObject->width; diff --git a/kugar/lib/mreportsection.cpp b/kugar/lib/mreportsection.cpp index 5040d64c..b412d332 100644 --- a/kugar/lib/mreportsection.cpp +++ b/kugar/lib/mreportsection.cpp @@ -17,7 +17,7 @@ namespace Kugar /** Constructor */ MReportSection::MReportSection() { - // Set tqgeometry + // Set geometry height = 50; // Set print frequency @@ -293,7 +293,7 @@ void MReportSection::drawObjects( TQPainter* p, int xoffset, int yoffset ) Used by the copy constructor and assignment operator */ void MReportSection::copy( const MReportSection* mReportSection ) { - // Copy the section's tqgeometry + // Copy the section's geometry height = mReportSection->height; // Copy the print frequency diff --git a/kugar/lib/mreportviewer.cpp b/kugar/lib/mreportviewer.cpp index 9e7f02d1..5cbacf58 100644 --- a/kugar/lib/mreportviewer.cpp +++ b/kugar/lib/mreportviewer.cpp @@ -175,7 +175,7 @@ void MReportViewer::slotFirstPage() if ( ( page = report->getFirstPage() ) != 0 ) { display->setPage( page ); - display->tqrepaint(); + display->repaint(); } } @@ -192,7 +192,7 @@ void MReportViewer::slotNextPage() if ( ( page = report->getNextPage() ) != 0 ) { display->setPage( page ); - display->tqrepaint(); + display->repaint(); } else report->setCurrentPage( index ); @@ -211,7 +211,7 @@ void MReportViewer::slotPrevPage() if ( ( page = report->getPreviousPage() ) != 0 ) { display->setPage( page ); - display->tqrepaint(); + display->repaint(); } else report->setCurrentPage( index ); @@ -228,7 +228,7 @@ void MReportViewer::slotLastPage() if ( ( page = report->getLastPage() ) != 0 ) { display->setPage( page ); - display->tqrepaint(); + display->repaint(); } } diff --git a/kugar/lib/mutil.cpp b/kugar/lib/mutil.cpp index f70b67bf..e53c1ef2 100644 --- a/kugar/lib/mutil.cpp +++ b/kugar/lib/mutil.cpp @@ -40,40 +40,40 @@ TQString MUtil::formatDate( const TQDate& value, int format ) switch ( format ) { case MUtil::MDY_SLASH: - string = TQString( "%1/%2/%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( year ); + string = TQString( "%1/%2/%3" ).arg( value.month() ).arg( value.day() ).arg( year ); break; case MUtil::MDY_DASH: - string = TQString( "%1-%2-%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( year ); + string = TQString( "%1-%2-%3" ).arg( value.month() ).arg( value.day() ).arg( year ); break; case MUtil::MMDDY_SLASH: - string = TQString( "%1/%2/%3" ).tqarg( month ).tqarg( day ).tqarg( year ); + string = TQString( "%1/%2/%3" ).arg( month ).arg( day ).arg( year ); break; case MUtil::MMDDY_DASH: - string = TQString( "%1-%2-%3" ).tqarg( month ).tqarg( day ).tqarg( year ); + string = TQString( "%1-%2-%3" ).arg( month ).arg( day ).arg( year ); break; case MUtil::MDYYYY_SLASH: - string = TQString( "%1/%2/%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( value.year() ); + string = TQString( "%1/%2/%3" ).arg( value.month() ).arg( value.day() ).arg( value.year() ); break; case MUtil::MDYYYY_DASH: - string = TQString( "%1-%2-%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( value.year() ); + string = TQString( "%1-%2-%3" ).arg( value.month() ).arg( value.day() ).arg( value.year() ); break; case MUtil::MMDDYYYY_SLASH: - string = TQString( "%1/%2/%3" ).tqarg( month ).tqarg( day ).tqarg( value.year() ); + string = TQString( "%1/%2/%3" ).arg( month ).arg( day ).arg( value.year() ); break; case MUtil::MMDDYYYY_DASH: - string = TQString( "%1-%2-%3" ).tqarg( month ).tqarg( day ).tqarg( value.year() ); + string = TQString( "%1-%2-%3" ).arg( month ).arg( day ).arg( value.year() ); break; case MUtil::YYYYMD_SLASH: - string = TQString( "%1/%2/%3" ).tqarg( value.year() ).tqarg( value.month() ).tqarg( value.day() ); + string = TQString( "%1/%2/%3" ).arg( value.year() ).arg( value.month() ).arg( value.day() ); break; case MUtil::YYYYMD_DASH: - string = TQString( "%1-%2-%3" ).tqarg( value.year() ).tqarg( value.month() ).tqarg( value.day() ); + string = TQString( "%1-%2-%3" ).arg( value.year() ).arg( value.month() ).arg( value.day() ); break; case MUtil::DDMMYY_PERIOD: - string = TQString( "%1.%2.%3" ).tqarg( day ).tqarg( month ).tqarg( year ); + string = TQString( "%1.%2.%3" ).arg( day ).arg( month ).arg( year ); break; case MUtil::DDMMYYYY_PERIOD: - string = TQString( "%1.%2.%3" ).tqarg( day ).tqarg( month ).tqarg( value.year() ); + string = TQString( "%1.%2.%3" ).arg( day ).arg( month ).arg( value.year() ); break; default: string = value.toString(); diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp index 38ac5257..894dd1eb 100644 --- a/kugar/part/kugar_part.cpp +++ b/kugar/part/kugar_part.cpp @@ -89,19 +89,19 @@ bool KugarPart::loadXML( TQIODevice *file, const TQDomDocument & /*doc*/ ) } } if ( !ok ) - KMessageBox::sorry( 0, i18n( "Invalid data file %1" ).tqarg( m_file ) ); + KMessageBox::sorry( 0, i18n( "Invalid data file %1" ).arg( m_file ) ); } else { ok = false; - KMessageBox::sorry( 0, i18n( "The zero sized data file %1 can't be rendered" ).tqarg( m_file ) ); + KMessageBox::sorry( 0, i18n( "The zero sized data file %1 can't be rendered" ).arg( m_file ) ); } } else { ok = false; - KMessageBox::sorry( 0, i18n( "Unable to open data file: %1" ).tqarg( m_file ) ); + KMessageBox::sorry( 0, i18n( "Unable to open data file: %1" ).arg( m_file ) ); } return ok; @@ -166,7 +166,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl ) if ( KIO::NetAccess::download( tmpURL, localtpl ) ) isTemp = true; else - KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).tqarg( url.prettyURL() ) ); + KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).arg( url.prettyURL() ) ); } else localtpl = tpl; @@ -183,7 +183,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl ) if ( KIO::NetAccess::download( tmpURL, localtpl ) ) isTemp = true; else - KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).tqarg( url.prettyURL() ) ); + KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).arg( url.prettyURL() ) ); } } } @@ -192,7 +192,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl ) if ( KIO::NetAccess::download( url, localtpl ) ) isTemp = true; else - KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).tqarg( url.prettyURL() ) ); + KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).arg( url.prettyURL() ) ); } /* kdDebug() << "localtpl: " << localtpl.latin1() << endl;*/ @@ -215,7 +215,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl ) /* kdDebug() << "RawXML" << endl;*/ f.open( IO_ReadOnly ); if ( !m_reportEngine -> setReportTemplate( TQT_TQIODEVICE(&f) ) ) - KMessageBox::sorry( 0, i18n( "Invalid template file: %1" ).tqarg( localtpl ) ); + KMessageBox::sorry( 0, i18n( "Invalid template file: %1" ).arg( localtpl ) ); else { m_templateOk = true; @@ -229,13 +229,13 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl ) if ( tmpStore->open( "maindoc.xml" ) ) { if ( !m_reportEngine -> setReportTemplate( tmpStore->device() ) ) - KMessageBox::sorry( 0, i18n( "%1 is not a valid Kugar Designer template file." ).tqarg( localtpl ) ); + KMessageBox::sorry( 0, i18n( "%1 is not a valid Kugar Designer template file." ).arg( localtpl ) ); else m_templateOk = true; tmpStore->close(); } else - KMessageBox::sorry( 0, i18n( "%1 is not a valid Kugar Designer template file." ).tqarg( localtpl ) ); + KMessageBox::sorry( 0, i18n( "%1 is not a valid Kugar Designer template file." ).arg( localtpl ) ); delete tmpStore; } @@ -244,12 +244,12 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl ) else { f.close(); - KMessageBox::sorry( 0, i18n( "Couldn't read the beginning of the template file: %1" ).tqarg( localtpl ) ); + KMessageBox::sorry( 0, i18n( "Couldn't read the beginning of the template file: %1" ).arg( localtpl ) ); } } else - KMessageBox::sorry( 0, i18n( "Unable to open template file: %1" ).tqarg( localtpl ) ); + KMessageBox::sorry( 0, i18n( "Unable to open template file: %1" ).arg( localtpl ) ); if ( isTemp ) KIO::NetAccess::removeTempFile( localtpl ); diff --git a/kugar/part/kugar_view.cpp b/kugar/part/kugar_view.cpp index ddd8dfe1..2b5cc63b 100644 --- a/kugar/part/kugar_view.cpp +++ b/kugar/part/kugar_view.cpp @@ -90,12 +90,12 @@ bool KugarPart::openFile() ok = true; } else - KMessageBox::sorry( this, i18n( "Invalid data file: %1" ).tqarg( m_file ) ); + KMessageBox::sorry( this, i18n( "Invalid data file: %1" ).arg( m_file ) ); f.close(); } else - KMessageBox::sorry( this, i18n( "Unable to open data file: %1" ).tqarg( m_file ) ); + KMessageBox::sorry( this, i18n( "Unable to open data file: %1" ).arg( m_file ) ); return ok; } |