diff options
Diffstat (limited to 'kugar')
-rw-r--r-- | kugar/kudesigner/kudesigner_doc.cpp | 4 | ||||
-rw-r--r-- | kugar/kudesigner/kudesigner_view.cpp | 2 | ||||
-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/inputmask.cpp | 4 | ||||
-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/mpagedisplay.cpp | 2 | ||||
-rw-r--r-- | kugar/lib/mpagedisplay.h | 2 | ||||
-rw-r--r-- | kugar/lib/mreportengine.cpp | 58 | ||||
-rw-r--r-- | kugar/lib/mreportengine.h | 20 | ||||
-rw-r--r-- | kugar/lib/mreportobject.cpp | 4 | ||||
-rw-r--r-- | kugar/lib/mreportsection.cpp | 6 | ||||
-rw-r--r-- | kugar/lib/mreportviewer.cpp | 14 | ||||
-rw-r--r-- | kugar/lib/mreportviewer.h | 2 | ||||
-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 | 6 |
23 files changed, 116 insertions, 116 deletions
diff --git a/kugar/kudesigner/kudesigner_doc.cpp b/kugar/kudesigner/kudesigner_doc.cpp index 58d27637..0e7355b2 100644 --- a/kugar/kudesigner/kudesigner_doc.cpp +++ b/kugar/kudesigner/kudesigner_doc.cpp @@ -33,8 +33,8 @@ #include <tqfileinfo.h> #include <tqdockwindow.h> #include <tqdom.h> -#include <textstream.h> -#include <textcodec.h> +#include <tqtextstream.h> +#include <tqtextcodec.h> #include <canvas.h> #include <kugartemplate.h> diff --git a/kugar/kudesigner/kudesigner_view.cpp b/kugar/kudesigner/kudesigner_view.cpp index 6a478a3f..991d8304 100644 --- a/kugar/kudesigner/kudesigner_view.cpp +++ b/kugar/kudesigner/kudesigner_view.cpp @@ -28,7 +28,7 @@ #include <tqevent.h> #include <tqmainwindow.h> #include <tqaction.h> -#include <layout.h> +#include <tqlayout.h> #include <tqdockwindow.h> #include <tqmenubar.h> #include <tqmessagebox.h> diff --git a/kugar/kudesigner_lib/canvas.cpp b/kugar/kudesigner_lib/canvas.cpp index 3d4ba603..d486ae9d 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 children = report.childNodes(); - int childCount = children.length(); + TQDomNodeList tqchildren = report.childNodes(); + int childCount = tqchildren.length(); for ( int j = 0; j < childCount; j++ ) { - TQDomNode child = children.item( j ); + TQDomNode child = tqchildren.item( j ); if ( child.nodeType() == TQDomNode::ElementNode ) { @@ -301,12 +301,12 @@ void Canvas::setDetailFooterAttributes( TQDomNode *node ) void Canvas::addReportItems( TQDomNode *node, Band *section ) { - TQDomNodeList children = node->childNodes(); - int childCount = children.length(); + TQDomNodeList tqchildren = node->childNodes(); + int childCount = tqchildren.length(); for ( int j = 0; j < childCount; j++ ) { - TQDomNode child = children.item( j ); + TQDomNode child = tqchildren.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 a9f2faa5..db3765f8 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" ).arg( i18n( "Detail" ) ).arg( props[ "Level" ].value().toInt() ); + TQString str = TQString( "%1 %2" ).tqarg( i18n( "Detail" ) ).tqarg( 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 b1715920..14b5e13f 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" ).arg( i18n( "Detail Footer" ) ).arg( props[ "Level" ].value().toInt() ); + TQString str = TQString( "%1 %2" ).tqarg( i18n( "Detail Footer" ) ).tqarg( 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 d43ce942..071dea72 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" ).arg( i18n( "Detail Header" ) ).arg( props[ "Level" ].value().toInt() ); + TQString str = TQString( "%1 %2" ).tqarg( i18n( "Detail Header" ) ).tqarg( 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 ae9f30d7..32ebe470 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" ).arg( val.toColor().red() ).arg( val.toColor().green() ).arg( val.toColor().blue() ); + return TQString( "%1,%2,%3" ).tqarg( val.toColor().red() ).tqarg( val.toColor().green() ).tqarg( 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.at( 0 ).latin1() ); + return TQVariant( str.tqat( 0 ).latin1() ); default: return TQVariant( str ); } diff --git a/kugar/kudesigner_lib/structurewidget.cpp b/kugar/kudesigner_lib/structurewidget.cpp index 01b4289e..7ad4ac1b 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)" ).arg( level ); + name += tqtr( " (level %1)" ).tqarg( 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" ).arg( box->props[ "Text" ].value().toString() ); + name = tqtr( "Label: %1" ).tqarg( box->props[ "Text" ].value().toString() ); break; case Kudesigner::Rtti_Field: - name = tqtr( "Field: %1" ).arg( box->props[ "Field" ].value().toString() ); + name = tqtr( "Field: %1" ).tqarg( box->props[ "Field" ].value().toString() ); break; case Kudesigner::Rtti_Calculated: - name = tqtr( "Calculated Field: %1" ).arg( box->props[ "Field" ].value().toString() ); + name = tqtr( "Calculated Field: %1" ).tqarg( 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" ).arg( box->props[ "Type" ].listData()->keys[ idx ].toString() ); + name = tqtr( "Special Field: %1" ).tqarg( 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->repaint(); + item->tqrepaint(); m_selected.append( item ); } } @@ -211,7 +211,7 @@ void StructureWidget::selectionClear() if ( ( *it ) == 0 ) continue; ( *it ) ->setBold( false ); - ( *it ) ->repaint(); + ( *it ) ->tqrepaint(); } m_selected.clear(); } diff --git a/kugar/lib/inputmask.cpp b/kugar/lib/inputmask.cpp index 850b7a73..923323cb 100644 --- a/kugar/lib/inputmask.cpp +++ b/kugar/lib/inputmask.cpp @@ -210,13 +210,13 @@ bool InputMask::isValidInput( TQChar key, TQChar mask ) const TQString InputMask::maskString( uint pos, const TQString &str, bool clear ) const { if ( pos >= ( uint ) m_maxLength ) - return TQString::fromLatin1( "" ); + return TQString::tqfromLatin1( "" ); TQString fill; fill = clear ? clearString( 0, m_maxLength ) : m_text; uint strIndex = 0; - TQString s = TQString::fromLatin1( "" ); + TQString s = TQString::tqfromLatin1( "" ); int i = pos; while ( i < m_maxLength ) { diff --git a/kugar/lib/mlabelobject.cpp b/kugar/lib/mlabelobject.cpp index fecbd560..6a0db974 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 alignment + // Set the default tqalignment 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 alignment */ +/** Sets the label's horizontal tqalignment */ void MLabelObject::setHorizontalAlignment( int a ) { hAlignment = a; } -/** Sets the label's vertical alignment */ +/** Sets the label's vertical tqalignment */ 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 alignment flags + // Set the text tqalignment 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 alignment data + // Copy the label's tqalignment data vAlignment = mLabelObject->vAlignment; hAlignment = mLabelObject->hAlignment; wordWrap = mLabelObject->wordWrap; diff --git a/kugar/lib/mlabelobject.h b/kugar/lib/mlabelobject.h index 3526552e..2b35f233 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 alignment constants */ + /**Qt::Horizontal tqalignment constants */ enum HAlignment { Left = 0, Center, Right }; - /** Vertial alignment constants */ + /** Vertial tqalignment 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 alignment */ + /** Lable text horizontal tqalignment */ int hAlignment; - /** Label text vertical alignment */ + /** Label text vertical tqalignment */ 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 alignment -default is Left */ + /** Sets the label's horizontal tqalignment -default is Left */ void setHorizontalAlignment( int a ); - /** Sets the label's vertical alignment - default is Top */ + /** Sets the label's vertical tqalignment - 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 abd7927c..2a4a0bc9 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 geometry + // Set the object's default tqgeometry 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 geometry + // Copy the object's tqgeometry xpos1 = mLineObject->xpos1; ypos1 = mLineObject->ypos1; xpos2 = mLineObject->xpos2; diff --git a/kugar/lib/mpagedisplay.cpp b/kugar/lib/mpagedisplay.cpp index 4f4b1869..12eac741 100644 --- a/kugar/lib/mpagedisplay.cpp +++ b/kugar/lib/mpagedisplay.cpp @@ -45,7 +45,7 @@ void MPageDisplay::setPageDimensions( TQSize size ) // Return the preferred size of the display. -TQSize MPageDisplay::sizeHint() const +TQSize MPageDisplay::tqsizeHint() const { return buffer.size(); } diff --git a/kugar/lib/mpagedisplay.h b/kugar/lib/mpagedisplay.h index 919d8a36..65a419d5 100644 --- a/kugar/lib/mpagedisplay.h +++ b/kugar/lib/mpagedisplay.h @@ -42,7 +42,7 @@ public: /** Sets the page display dimensions */ void setPageDimensions( TQSize size ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSizePolicy sizePolicy() const; protected: diff --git a/kugar/lib/mreportengine.cpp b/kugar/lib/mreportengine.cpp index ca747b3e..4e1544d3 100644 --- a/kugar/lib/mreportengine.cpp +++ b/kugar/lib/mreportengine.cpp @@ -289,7 +289,7 @@ MPageCollection* MReportEngine::renderReport() // Initialize the basic page data currHeight = pageHeight - ( topMargin + bottomMargin + pFooter.getHeight() ); currPage = 0; - currDate = TQDate::currentDate(); + currDate = TQDate::tqcurrentDate(); // Initialise global report variables unsigned int rowCount = records.length(); @@ -336,7 +336,7 @@ MPageCollection* MReportEngine::renderReport() { // Update status event if ( ( chkRow = ( j / 2 ) % 20 ) == 0 ) - emit signalRenderStatus( j / 2 ); + emit signalRendertqStatus( j / 2 ); // Check for cancel action if ( cancelRender ) @@ -481,7 +481,7 @@ MPageCollection* MReportEngine::renderReport() pages->setPageOrientation( pageOrientation ); // Send final status - emit signalRenderStatus( rowCount / 2 ); + emit signalRendertqStatus( rowCount / 2 ); m_needRegeneration = false; m_pageCollection = pages; return pages; @@ -652,21 +652,21 @@ void MReportEngine::recalcDimensions() recalcAttribute( "LeftMargin", rattributes ); recalcAttribute( "RightMargin", rattributes ); - TQDomNodeList children = report.childNodes(); - int childCount = children.length(); + TQDomNodeList tqchildren = report.childNodes(); + int childCount = tqchildren.length(); for ( int j = 0; j < childCount; j++ ) { - child = children.item( j ); + child = tqchildren.item( j ); TQDomNamedNodeMap attributes = child.attributes(); - TQDomNodeList children2 = child.childNodes(); - int childCount2 = children2.length(); + TQDomNodeList tqchildren2 = child.childNodes(); + int childCount2 = tqchildren2.length(); recalcAttribute( "Height", attributes ); for ( int k = 0; k < childCount2; k++ ) { - TQDomNode child2 = children2.item( k ); + TQDomNode child2 = tqchildren2.item( k ); TQDomNamedNodeMap attributes = child2.attributes(); recalcAttribute( "X", attributes ); recalcAttribute( "Y", attributes ); @@ -685,11 +685,11 @@ void MReportEngine::recalcAttribute( const TQString& name, TQDomNamedNodeMap att { if ( !attributes.namedItem( name ).isNull() ) { - attributes.namedItem( name ).setNodeValue( TQString( "%1" ).arg( attributes.namedItem( name ).nodeValue().toInt() * 93 / 81 ) ); + attributes.namedItem( name ).setNodeValue( TQString( "%1" ).tqarg( attributes.namedItem( name ).nodeValue().toInt() * 93 / 81 ) ); } } -/** Walks the document tree, setting the report layout */ +/** Walks the document tree, setting the report tqlayout */ void MReportEngine::initTemplate() { heightOfDetails = 0; @@ -712,12 +712,12 @@ void MReportEngine::initTemplate() setReportAttributes( &report ); // Get all the child report elements - TQDomNodeList children = report.childNodes(); - int childCount = children.length(); + TQDomNodeList tqchildren = report.childNodes(); + int childCount = tqchildren.length(); for ( int j = 0; j < childCount; j++ ) { - child = children.item( j ); + child = tqchildren.item( j ); if ( child.nodeType() == TQDomNode::ElementNode ) { @@ -748,7 +748,7 @@ void MReportEngine::initTemplate() } } -/** Sets the main layout attributes for the report */ +/** Sets the main tqlayout attributes for the report */ void MReportEngine::setReportAttributes( TQDomNode* report ) { // Get the attributes for the report @@ -792,7 +792,7 @@ int MReportEngine::scaleDeltaHeight( int height ) const return f > 1 ? int( f + 0.5 ) : ceil( f ); } -/** Sets the layout attributes for the given report section */ +/** Sets the tqlayout attributes for the given report section */ void MReportEngine::setSectionAttributes( MReportSection* section, TQDomNode* report ) { // Get the attributes for the section @@ -803,14 +803,14 @@ void MReportEngine::setSectionAttributes( MReportSection* section, TQDomNode* re section->setPrintFrequency( attributes.namedItem( "PrintFrequency" ).nodeValue().toInt() ); // Process the sections labels - TQDomNodeList children = report->childNodes(); - int childCount = children.length(); + TQDomNodeList tqchildren = report->childNodes(); + int childCount = tqchildren.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 = children.item( j ); + TQDomNode child = tqchildren.item( j ); if ( child.nodeType() == TQDomNode::ElementNode ) { if ( child.nodeName() == "Line" ) @@ -852,7 +852,7 @@ void MReportEngine::setSectionAttributes( MReportSection* section, TQDomNode* re } } -/** Sets the layout attributes for the detail headers and footers */ +/** Sets the tqlayout attributes for the detail headers and footers */ void MReportEngine::setDetMiscAttributes( MReportSection* section, TQDomNode* report ) { // Get the attributes for the section @@ -866,7 +866,7 @@ void MReportEngine::setDetMiscAttributes( MReportSection* section, TQDomNode* re } -/** Sets the layout attributes for the detail section */ +/** Sets the tqlayout attributes for the detail section */ void MReportEngine::setDetailAttributes( TQDomNode* report ) { // Get the attributes for the detail section @@ -881,12 +881,12 @@ void MReportEngine::setDetailAttributes( TQDomNode* report ) detail->setRepeat( attributes.namedItem( "Repeat" ).nodeValue() == "true" ); // Process the report detail labels - TQDomNodeList children = report->childNodes(); - int childCount = children.length(); + TQDomNodeList tqchildren = report->childNodes(); + int childCount = tqchildren.length(); for ( int j = 0; j < childCount; j++ ) { - TQDomNode child = children.item( j ); + TQDomNode child = tqchildren.item( j ); if ( child.nodeType() == TQDomNode::ElementNode ) { if ( child.nodeName() == "Line" ) @@ -923,7 +923,7 @@ void MReportEngine::setDetailAttributes( TQDomNode* report ) details.append( detail ); } -/** Sets a line's layout attributes */ +/** Sets a line's tqlayout attributes */ void MReportEngine::setLineAttributes( MLineObject* line, TQDomNamedNodeMap* attr ) { line->setLine( scaleDeltaWidth( attr->namedItem( "X1" ).nodeValue().toInt() ), @@ -941,7 +941,7 @@ void MReportEngine::setLineAttributes( MLineObject* line, TQDomNamedNodeMap* att line->setStyle( attr->namedItem( "Style" ).nodeValue().toInt() ); } -/** Sets a label's layout attributes */ +/** Sets a label's tqlayout attributes */ void MReportEngine::setLabelAttributes( MLabelObject* label, TQDomNamedNodeMap* attr ) { TQString tmp; @@ -986,7 +986,7 @@ void MReportEngine::setLabelAttributes( MLabelObject* label, TQDomNamedNodeMap* label->setWordWrap( attr->namedItem( "WordWrap" ).nodeValue().toInt() == 0 ? false : true ); } -/** Sets a special field's layout attributes */ +/** Sets a special field's tqlayout attributes */ void MReportEngine::setSpecialAttributes( MSpecialObject* field, TQDomNamedNodeMap* attr ) { field->setType( attr->namedItem( "Type" ).nodeValue().toInt() ); @@ -995,7 +995,7 @@ void MReportEngine::setSpecialAttributes( MSpecialObject* field, TQDomNamedNodeM setLabelAttributes( ( MLabelObject * ) field, attr ); } -/** Sets a field's layout attributes */ +/** Sets a field's tqlayout attributes */ void MReportEngine::setFieldAttributes( MFieldObject* field, TQDomNamedNodeMap* attr ) { field->setFieldName( attr->namedItem( "Field" ).nodeValue() ); @@ -1015,7 +1015,7 @@ void MReportEngine::setFieldAttributes( MFieldObject* field, TQDomNamedNodeMap* setLabelAttributes( ( MLabelObject * ) field, attr ); } -/** Sets a calculated field's layout attributes */ +/** Sets a calculated field's tqlayout attributes */ void MReportEngine::setCalculatedFieldAttributes( MCalcObject* field, TQDomNamedNodeMap* attr ) { field->setCalculationType( attr->namedItem( "CalculationType" ).nodeValue().toInt() ); diff --git a/kugar/lib/mreportengine.h b/kugar/lib/mreportengine.h index 846d0a3a..33b651cc 100644 --- a/kugar/lib/mreportengine.h +++ b/kugar/lib/mreportengine.h @@ -71,7 +71,7 @@ public slots: void slotCancelRendering(); signals: - void signalRenderStatus( int ); + void signalRendertqStatus( int ); void preferedTemplate( const TQString & ); protected: @@ -170,27 +170,27 @@ private: void initData(); void initTemplate(); - /** Sets the main layout attributes for the report */ + /** Sets the main tqlayout attributes for the report */ void setReportAttributes( TQDomNode* report ); int scaleDeltaWidth( int width ) const; int scaleDeltaHeight( int width ) const; - /** Sets the layout attributes for the given report section */ + /** Sets the tqlayout attributes for the given report section */ void setSectionAttributes( MReportSection* section, TQDomNode* report ); - /** Sets the layout attributes for the detail headers and footers */ + /** Sets the tqlayout attributes for the detail headers and footers */ void setDetMiscAttributes( MReportSection* section, TQDomNode* report ); - /** Sets the layout attributes for the detail section */ + /** Sets the tqlayout attributes for the detail section */ void setDetailAttributes( TQDomNode* report ); - /** Sets a line's layout attributes */ + /** Sets a line's tqlayout attributes */ void setLineAttributes( MLineObject* line, TQDomNamedNodeMap* attr ); - /** Sets a label's layout attributes */ + /** Sets a label's tqlayout attributes */ void setLabelAttributes( MLabelObject* label, TQDomNamedNodeMap* attr ); - /** Sets a special field's layout attributes */ + /** Sets a special field's tqlayout attributes */ void setSpecialAttributes( MSpecialObject* field, TQDomNamedNodeMap* attr ); - /** Sets a field's layout attributes */ + /** Sets a field's tqlayout attributes */ void setFieldAttributes( MFieldObject* field, TQDomNamedNodeMap* attr ); - /** Sets a calculated field's layout attributes */ + /** Sets a calculated field's tqlayout attributes */ void setCalculatedFieldAttributes( MCalcObject* field, TQDomNamedNodeMap* attr ); /** Copies member data from one object to another. diff --git a/kugar/lib/mreportobject.cpp b/kugar/lib/mreportobject.cpp index 7a9366f6..7fec9dd9 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 geometry + // Set the object's default tqgeometry 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 geometry + // Copy the object's tqgeometry xpos = mReportObject->xpos; ypos = mReportObject->ypos; width = mReportObject->width; diff --git a/kugar/lib/mreportsection.cpp b/kugar/lib/mreportsection.cpp index b412d332..1184d773 100644 --- a/kugar/lib/mreportsection.cpp +++ b/kugar/lib/mreportsection.cpp @@ -17,14 +17,14 @@ namespace Kugar /** Constructor */ MReportSection::MReportSection() { - // Set geometry + // Set tqgeometry height = 50; // Set print frequency frequency = MReportSection::EveryPage; // Set special field data - reportDate = TQDate::currentDate(); + reportDate = TQDate::tqcurrentDate(); pageNumber = 0; // Set the line list to AutoDelete @@ -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 geometry + // Copy the section's tqgeometry height = mReportSection->height; // Copy the print frequency diff --git a/kugar/lib/mreportviewer.cpp b/kugar/lib/mreportviewer.cpp index 5cbacf58..a3fd9ab5 100644 --- a/kugar/lib/mreportviewer.cpp +++ b/kugar/lib/mreportviewer.cpp @@ -38,7 +38,7 @@ void MReportViewer::init() scroller = new TQScrollView( this ); // Connect the rendering update signal and slot - connect( rptEngine, TQT_SIGNAL( signalRenderStatus( int ) ), + connect( rptEngine, TQT_SIGNAL( signalRendertqStatus( int ) ), TQT_SLOT( slotRenderProgress( int ) ) ); connect( rptEngine, TQT_SIGNAL( preferedTemplate( const TQString & ) ), @@ -175,7 +175,7 @@ void MReportViewer::slotFirstPage() if ( ( page = report->getFirstPage() ) != 0 ) { display->setPage( page ); - display->repaint(); + display->tqrepaint(); } } @@ -192,7 +192,7 @@ void MReportViewer::slotNextPage() if ( ( page = report->getNextPage() ) != 0 ) { display->setPage( page ); - display->repaint(); + display->tqrepaint(); } else report->setCurrentPage( index ); @@ -211,7 +211,7 @@ void MReportViewer::slotPrevPage() if ( ( page = report->getPreviousPage() ) != 0 ) { display->setPage( page ); - display->repaint(); + display->tqrepaint(); } else report->setCurrentPage( index ); @@ -228,7 +228,7 @@ void MReportViewer::slotLastPage() if ( ( page = report->getLastPage() ) != 0 ) { display->setPage( page ); - display->repaint(); + display->tqrepaint(); } } @@ -273,9 +273,9 @@ void MReportViewer::slotRenderProgress( int p ) // Return the preferred size. -TQSize MReportViewer::sizeHint() const +TQSize MReportViewer::tqsizeHint() const { - return scroller -> sizeHint(); + return scroller -> tqsizeHint(); } void MReportViewer::printReport( KPrinter &printer ) diff --git a/kugar/lib/mreportviewer.h b/kugar/lib/mreportviewer.h index ca47b12b..599e22db 100644 --- a/kugar/lib/mreportviewer.h +++ b/kugar/lib/mreportviewer.h @@ -59,7 +59,7 @@ public: void setupPrinter( KPrinter &printer ); void printReportSilent( int printFrom = -1, int printTo = -1, int printCopies = -1, TQString printerName = TQString() ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; public slots: void slotFirstPage(); diff --git a/kugar/lib/mutil.cpp b/kugar/lib/mutil.cpp index e53c1ef2..f70b67bf 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" ).arg( value.month() ).arg( value.day() ).arg( year ); + string = TQString( "%1/%2/%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( year ); break; case MUtil::MDY_DASH: - string = TQString( "%1-%2-%3" ).arg( value.month() ).arg( value.day() ).arg( year ); + string = TQString( "%1-%2-%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( year ); break; case MUtil::MMDDY_SLASH: - string = TQString( "%1/%2/%3" ).arg( month ).arg( day ).arg( year ); + string = TQString( "%1/%2/%3" ).tqarg( month ).tqarg( day ).tqarg( year ); break; case MUtil::MMDDY_DASH: - string = TQString( "%1-%2-%3" ).arg( month ).arg( day ).arg( year ); + string = TQString( "%1-%2-%3" ).tqarg( month ).tqarg( day ).tqarg( year ); break; case MUtil::MDYYYY_SLASH: - string = TQString( "%1/%2/%3" ).arg( value.month() ).arg( value.day() ).arg( value.year() ); + string = TQString( "%1/%2/%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( value.year() ); break; case MUtil::MDYYYY_DASH: - string = TQString( "%1-%2-%3" ).arg( value.month() ).arg( value.day() ).arg( value.year() ); + string = TQString( "%1-%2-%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( value.year() ); break; case MUtil::MMDDYYYY_SLASH: - string = TQString( "%1/%2/%3" ).arg( month ).arg( day ).arg( value.year() ); + string = TQString( "%1/%2/%3" ).tqarg( month ).tqarg( day ).tqarg( value.year() ); break; case MUtil::MMDDYYYY_DASH: - string = TQString( "%1-%2-%3" ).arg( month ).arg( day ).arg( value.year() ); + string = TQString( "%1-%2-%3" ).tqarg( month ).tqarg( day ).tqarg( value.year() ); break; case MUtil::YYYYMD_SLASH: - string = TQString( "%1/%2/%3" ).arg( value.year() ).arg( value.month() ).arg( value.day() ); + string = TQString( "%1/%2/%3" ).tqarg( value.year() ).tqarg( value.month() ).tqarg( value.day() ); break; case MUtil::YYYYMD_DASH: - string = TQString( "%1-%2-%3" ).arg( value.year() ).arg( value.month() ).arg( value.day() ); + string = TQString( "%1-%2-%3" ).tqarg( value.year() ).tqarg( value.month() ).tqarg( value.day() ); break; case MUtil::DDMMYY_PERIOD: - string = TQString( "%1.%2.%3" ).arg( day ).arg( month ).arg( year ); + string = TQString( "%1.%2.%3" ).tqarg( day ).tqarg( month ).tqarg( year ); break; case MUtil::DDMMYYYY_PERIOD: - string = TQString( "%1.%2.%3" ).arg( day ).arg( month ).arg( value.year() ); + string = TQString( "%1.%2.%3" ).tqarg( day ).tqarg( month ).tqarg( value.year() ); break; default: string = value.toString(); diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp index 894dd1eb..38ac5257 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" ).arg( m_file ) ); + KMessageBox::sorry( 0, i18n( "Invalid data file %1" ).tqarg( m_file ) ); } else { ok = false; - KMessageBox::sorry( 0, i18n( "The zero sized data file %1 can't be rendered" ).arg( m_file ) ); + KMessageBox::sorry( 0, i18n( "The zero sized data file %1 can't be rendered" ).tqarg( m_file ) ); } } else { ok = false; - KMessageBox::sorry( 0, i18n( "Unable to open data file: %1" ).arg( m_file ) ); + KMessageBox::sorry( 0, i18n( "Unable to open data file: %1" ).tqarg( 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" ).arg( url.prettyURL() ) ); + KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).tqarg( 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" ).arg( url.prettyURL() ) ); + KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).tqarg( 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" ).arg( url.prettyURL() ) ); + KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).tqarg( 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" ).arg( localtpl ) ); + KMessageBox::sorry( 0, i18n( "Invalid template file: %1" ).tqarg( 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." ).arg( localtpl ) ); + KMessageBox::sorry( 0, i18n( "%1 is not a valid Kugar Designer template file." ).tqarg( localtpl ) ); else m_templateOk = true; tmpStore->close(); } else - KMessageBox::sorry( 0, i18n( "%1 is not a valid Kugar Designer template file." ).arg( localtpl ) ); + KMessageBox::sorry( 0, i18n( "%1 is not a valid Kugar Designer template file." ).tqarg( 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" ).arg( localtpl ) ); + KMessageBox::sorry( 0, i18n( "Couldn't read the beginning of the template file: %1" ).tqarg( localtpl ) ); } } else - KMessageBox::sorry( 0, i18n( "Unable to open template file: %1" ).arg( localtpl ) ); + KMessageBox::sorry( 0, i18n( "Unable to open template file: %1" ).tqarg( localtpl ) ); if ( isTemp ) KIO::NetAccess::removeTempFile( localtpl ); diff --git a/kugar/part/kugar_view.cpp b/kugar/part/kugar_view.cpp index 631bbe1d..ddd8dfe1 100644 --- a/kugar/part/kugar_view.cpp +++ b/kugar/part/kugar_view.cpp @@ -15,7 +15,7 @@ #include <tqfile.h> #include <kglobal.h> #include <kiconloader.h> -#include <layout.h> +#include <tqlayout.h> #if defined(HAVE_CONFIG_H) #include "config.h" @@ -90,12 +90,12 @@ bool KugarPart::openFile() ok = true; } else - KMessageBox::sorry( this, i18n( "Invalid data file: %1" ).arg( m_file ) ); + KMessageBox::sorry( this, i18n( "Invalid data file: %1" ).tqarg( m_file ) ); f.close(); } else - KMessageBox::sorry( this, i18n( "Unable to open data file: %1" ).arg( m_file ) ); + KMessageBox::sorry( this, i18n( "Unable to open data file: %1" ).tqarg( m_file ) ); return ok; } |