diff options
Diffstat (limited to 'kugar')
-rw-r--r-- | kugar/kudesigner_lib/band.cpp | 2 | ||||
-rw-r--r-- | kugar/kudesigner_lib/reportitem.cpp | 22 | ||||
-rw-r--r-- | kugar/kudesigner_lib/structurewidget.cpp | 6 | ||||
-rw-r--r-- | kugar/kudesigner_lib/view.cpp | 10 | ||||
-rw-r--r-- | kugar/lib/inputmask.cpp | 4 | ||||
-rw-r--r-- | kugar/lib/mfieldobject.cpp | 4 | ||||
-rw-r--r-- | kugar/lib/mreportengine.cpp | 30 | ||||
-rw-r--r-- | kugar/part/kugar_part.cpp | 2 |
8 files changed, 40 insertions, 40 deletions
diff --git a/kugar/kudesigner_lib/band.cpp b/kugar/kudesigner_lib/band.cpp index 09e62dbe..ffc56fe4 100644 --- a/kugar/kudesigner_lib/band.cpp +++ b/kugar/kudesigner_lib/band.cpp @@ -101,7 +101,7 @@ TQString Band::getXml() int Band::isInHolder( const TQPoint p ) { - if ( bottomMiddleResizableRect().tqcontains( p ) ) + if ( bottomMiddleResizableRect().contains( p ) ) return ( ResizeBottom ); return ResizeNothing; } diff --git a/kugar/kudesigner_lib/reportitem.cpp b/kugar/kudesigner_lib/reportitem.cpp index 78446a9e..4ca541df 100644 --- a/kugar/kudesigner_lib/reportitem.cpp +++ b/kugar/kudesigner_lib/reportitem.cpp @@ -121,21 +121,21 @@ TQString ReportItem::getXml() int ReportItem::isInHolder( const TQPoint p ) { - if ( topLeftResizableRect().tqcontains( p ) ) + if ( topLeftResizableRect().contains( p ) ) return ( ResizeTop | ResizeLeft ); - if ( bottomLeftResizableRect().tqcontains( p ) ) + if ( bottomLeftResizableRect().contains( p ) ) return ( ResizeBottom | ResizeLeft ); - if ( leftMiddleResizableRect().tqcontains( p ) ) + if ( leftMiddleResizableRect().contains( p ) ) return ( ResizeLeft ); - if ( bottomMiddleResizableRect().tqcontains( p ) ) + if ( bottomMiddleResizableRect().contains( p ) ) return ( ResizeBottom ); - if ( topMiddleResizableRect().tqcontains( p ) ) + if ( topMiddleResizableRect().contains( p ) ) return ( ResizeTop ); - if ( topRightResizableRect().tqcontains( p ) ) + if ( topRightResizableRect().contains( p ) ) return ( ResizeTop | ResizeRight ); - if ( bottomRightResizableRect().tqcontains( p ) ) + if ( bottomRightResizableRect().contains( p ) ) return ( ResizeBottom | ResizeRight ); - if ( rightMiddleResizableRect().tqcontains( p ) ) + if ( rightMiddleResizableRect().contains( p ) ) return ( ResizeRight ); return ResizeNothing; @@ -238,9 +238,9 @@ bool ReportItem::intersects( ReportItem *item ) TQString ReportItem::escape( TQString string ) { - string.tqreplace( TQRegExp( "&" ), "&" ); - string.tqreplace( TQRegExp( "<" ), "<" ); - string.tqreplace( TQRegExp( ">" ), ">" ); + string.replace( TQRegExp( "&" ), "&" ); + string.replace( TQRegExp( "<" ), "<" ); + string.replace( TQRegExp( ">" ), ">" ); return string; } diff --git a/kugar/kudesigner_lib/structurewidget.cpp b/kugar/kudesigner_lib/structurewidget.cpp index e629beca..945d3b71 100644 --- a/kugar/kudesigner_lib/structurewidget.cpp +++ b/kugar/kudesigner_lib/structurewidget.cpp @@ -174,7 +174,7 @@ void StructureWidget::refreshSectionContents( Kudesigner::Band *section, Structu name = tqtr( "Calculated Field: %1" ).tqarg( box->props[ "Field" ].value().toString() ); break; case Kudesigner::Rtti_Special: - idx = box->props[ "Type" ].listData()->keys.tqfindIndex( + 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() ); break; @@ -194,7 +194,7 @@ void StructureWidget::selectionMade() BoxList sel = m_doc->selected; for ( BoxList::iterator it = sel.begin(); it != sel.end(); ++it ) { - if ( m_items.tqcontains( *it ) ) + if ( m_items.contains( *it ) ) { StructureItem * item = static_cast<StructureItem*>( m_items[ *it ] ); item->setBold( true ); @@ -220,7 +220,7 @@ void StructureWidget::selectItem( TQListViewItem *item ) { if ( !item ) return ; - int idx = m_items.values().tqfindIndex( static_cast<StructureItem*>( item ) ); + int idx = m_items.values().findIndex( static_cast<StructureItem*>( item ) ); if ( idx == -1 ) return ; Kudesigner::Box *box = m_items.keys() [ idx ]; diff --git a/kugar/kudesigner_lib/view.cpp b/kugar/kudesigner_lib/view.cpp index 6c5c4404..70bf22ca 100644 --- a/kugar/kudesigner_lib/view.cpp +++ b/kugar/kudesigner_lib/view.cpp @@ -149,7 +149,7 @@ void View::selectItemFromList( TQCanvasItemList &l ) if ( ( *it ) ->rtti() >= 1800 ) //include bands and the template itself { Kudesigner::Box * b = static_cast<Kudesigner::Box*>( *it ); - if ( !m_canvas->selected.tqcontains( b ) ) + if ( !m_canvas->selected.contains( b ) ) { m_canvas->unselectAll(); m_canvas->selectItem( b, false ); @@ -158,7 +158,7 @@ void View::selectItemFromList( TQCanvasItemList &l ) // selected->drawHolders(); return ; } - if ( m_canvas->selected.tqcontains( b ) ) + if ( m_canvas->selected.contains( b ) ) { if ( m_canvas->selected.count() > 1 ) { @@ -465,7 +465,7 @@ void View::contentsMouseMoveEvent( TQMouseEvent* e ) if ((*it)->rtti() > 2000) { CanvasReportItem *item = (CanvasReportItem*)(*it); - if (item->bottomRightResizableRect().tqcontains(e->pos())) + if (item->bottomRightResizableRect().contains(e->pos())) setCursor(TQCursor(TQt::SizeFDiagCursor)); } }*/ @@ -598,7 +598,7 @@ void View::contentsMouseMoveEvent( TQMouseEvent* e ) r.setBottom( top < bottom ? bottom : top ); if ( ( ( *it ) ->rtti() > 2001 ) && - ( r.tqcontains( static_cast<Kudesigner::Box*>( *it ) ->rect() ) ) ) + ( r.contains( static_cast<Kudesigner::Box*>( *it ) ->rect() ) ) ) { m_canvas->selectItem( static_cast<Kudesigner::Box*>( *it ) ); m_canvas->update(); @@ -613,7 +613,7 @@ void View::contentsMouseMoveEvent( TQMouseEvent* e ) for (TQCanvasItemList::Iterator it=l.begin(); it!=l.end(); ++it) { if ( ((*it)->rtti() > 2001) && - (selectionRect->rect().tqcontains(((CanvasKudesigner::Box*)(*it))->rect())) ) + (selectionRect->rect().contains(((CanvasKudesigner::Box*)(*it))->rect())) ) { selectItem((CanvasKudesigner::Box*)(*it)); m_canvas->update(); diff --git a/kugar/lib/inputmask.cpp b/kugar/lib/inputmask.cpp index 8194a211..6fb49220 100644 --- a/kugar/lib/inputmask.cpp +++ b/kugar/lib/inputmask.cpp @@ -255,7 +255,7 @@ TQString InputMask::maskString( uint pos, const TQString &str, bool clear ) cons if ( str.length() != 1 || i == 0 || ( i > 0 && ( !m_maskData[ i - 1 ].separator || m_maskData[ i - 1 ].maskChar != str[ ( int ) strIndex ] ) ) ) { s += fill.mid( i, n - i + 1 ); - i = n + 1; // update i to tqfind + 1 + i = n + 1; // update i to find + 1 } } else @@ -276,7 +276,7 @@ TQString InputMask::maskString( uint pos, const TQString &str, bool clear ) cons default: s += str[ ( int ) strIndex ]; } - i = n + 1; // updates i to tqfind + 1 + i = n + 1; // updates i to find + 1 } } } diff --git a/kugar/lib/mfieldobject.cpp b/kugar/lib/mfieldobject.cpp index b0918c8c..7f7b994a 100644 --- a/kugar/lib/mfieldobject.cpp +++ b/kugar/lib/mfieldobject.cpp @@ -203,7 +203,7 @@ void MFieldObject::formatNegValue() /** Formats the string representation of a number with comma separators */ void MFieldObject::formatCommas() { - // text = text.tqreplace(".", ","); + // text = text.replace(".", ","); TQString tmp; int i, j; int offset; @@ -215,7 +215,7 @@ void MFieldObject::formatCommas() offset = 0; // Look for decimal point - int pos = text.tqfindRev( "." ); + int pos = text.findRev( "." ); // If a decimal was not found, start at end of string if ( pos == -1 ) diff --git a/kugar/lib/mreportengine.cpp b/kugar/lib/mreportengine.cpp index 654e1fff..4e1544d3 100644 --- a/kugar/lib/mreportengine.cpp +++ b/kugar/lib/mreportengine.cpp @@ -933,9 +933,9 @@ void MReportEngine::setLineAttributes( MLineObject* line, TQDomNamedNodeMap* att TQString tmp = attr->namedItem( "Color" ).nodeValue(); - line->setColor( tmp.left( tmp.tqfind( "," ) ).toInt(), - tmp.mid( tmp.tqfind( "," ) + 1, ( tmp.tqfindRev( "," ) - tmp.tqfind( "," ) ) - 1 ).toInt(), - tmp.right( tmp.length() - tmp.tqfindRev( "," ) - 1 ).toInt() ); + line->setColor( tmp.left( tmp.find( "," ) ).toInt(), + tmp.mid( tmp.find( "," ) + 1, ( tmp.findRev( "," ) - tmp.find( "," ) ) - 1 ).toInt(), + tmp.right( tmp.length() - tmp.findRev( "," ) - 1 ).toInt() ); line->setWidth( attr->namedItem( "Width" ).nodeValue().toInt() ); line->setStyle( attr->namedItem( "Style" ).nodeValue().toInt() ); @@ -953,19 +953,19 @@ void MReportEngine::setLabelAttributes( MLabelObject* label, TQDomNamedNodeMap* scaleDeltaHeight( attr->namedItem( "Height" ).nodeValue().toInt() ) ); tmp = attr->namedItem( "BackgroundColor" ).nodeValue(); - label->setBackgroundColor( tmp.left( tmp.tqfind( "," ) ).toInt(), - tmp.mid( tmp.tqfind( "," ) + 1, ( tmp.tqfindRev( "," ) - tmp.tqfind( "," ) ) - 1 ).toInt(), - tmp.right( tmp.length() - tmp.tqfindRev( "," ) - 1 ).toInt() ); + label->setBackgroundColor( tmp.left( tmp.find( "," ) ).toInt(), + tmp.mid( tmp.find( "," ) + 1, ( tmp.findRev( "," ) - tmp.find( "," ) ) - 1 ).toInt(), + tmp.right( tmp.length() - tmp.findRev( "," ) - 1 ).toInt() ); tmp = attr->namedItem( "ForegroundColor" ).nodeValue(); - label->setForegroundColor( tmp.left( tmp.tqfind( "," ) ).toInt(), - tmp.mid( tmp.tqfind( "," ) + 1, ( tmp.tqfindRev( "," ) - tmp.tqfind( "," ) ) - 1 ).toInt(), - tmp.right( tmp.length() - tmp.tqfindRev( "," ) - 1 ).toInt() ); + label->setForegroundColor( tmp.left( tmp.find( "," ) ).toInt(), + tmp.mid( tmp.find( "," ) + 1, ( tmp.findRev( "," ) - tmp.find( "," ) ) - 1 ).toInt(), + tmp.right( tmp.length() - tmp.findRev( "," ) - 1 ).toInt() ); tmp = attr->namedItem( "BorderColor" ).nodeValue(); - label->setBorderColor( tmp.left( tmp.tqfind( "," ) ).toInt(), - tmp.mid( tmp.tqfind( "," ) + 1, ( tmp.tqfindRev( "," ) - tmp.tqfind( "," ) ) - 1 ).toInt(), - tmp.right( tmp.length() - tmp.tqfindRev( "," ) - 1 ).toInt() ); + label->setBorderColor( tmp.left( tmp.find( "," ) ).toInt(), + tmp.mid( tmp.find( "," ) + 1, ( tmp.findRev( "," ) - tmp.find( "," ) ) - 1 ).toInt(), + tmp.right( tmp.length() - tmp.findRev( "," ) - 1 ).toInt() ); label->setBorderWidth( attr->namedItem( "BorderWidth" ).nodeValue().toInt() ); label->setBorderStyle( attr->namedItem( "BorderStyle" ).nodeValue().toInt() ); @@ -1008,9 +1008,9 @@ void MReportEngine::setFieldAttributes( MFieldObject* field, TQDomNamedNodeMap* TQString tmp = attr->namedItem( "NegValueColor" ).nodeValue(); - field->setNegValueColor( tmp.left( tmp.tqfind( "," ) ).toInt(), - tmp.mid( tmp.tqfind( "," ) + 1, ( tmp.tqfindRev( "," ) - tmp.tqfind( "," ) ) - 1 ).toInt(), - tmp.right( tmp.length() - tmp.tqfindRev( "," ) - 1 ).toInt() ); + field->setNegValueColor( tmp.left( tmp.find( "," ) ).toInt(), + tmp.mid( tmp.find( "," ) + 1, ( tmp.findRev( "," ) - tmp.find( "," ) ) - 1 ).toInt(), + tmp.right( tmp.length() - tmp.findRev( "," ) - 1 ).toInt() ); setLabelAttributes( ( MLabelObject * ) field, attr ); } diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp index 06395a75..c8249505 100644 --- a/kugar/part/kugar_part.cpp +++ b/kugar/part/kugar_part.cpp @@ -156,7 +156,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl ) if ( !url.isValid() ) { /* kdDebug() << "mailformed url" << endl;*/ - if ( tpl.tqfind( '/' ) >= 0 ) + if ( tpl.find( '/' ) >= 0 ) { if ( tpl.startsWith( "." ) ) { |