Sync with Qt 3.0.5

1 files changed, 100 insertions, 203 deletions

diff --git a/noncore/apps/opie-write/qrichtext_p.cpp b/noncore/apps/opie-write/qrichtext_p.cpp
index fb20730..6783e0b 100644
--- a/noncore/apps/opie-write/qrichtext_p.cpp
+++ b/noncore/apps/opie-write/qrichtext_p.cpp
@@ -56,30 +56,29 @@ int QTextCustomItem::minimumWidth() const { return 0; }
 
 QString QTextCustomItem::richText() const { return QString::null; }
 
-bool QTextCustomItem::enter( QTextCursor *, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy, bool atEnd )
+bool QTextCustomItem::enter( QTextCursor *, QTextDocument*&, QTextParagraph *&, int &, int &, int &, bool )
 {
-    doc = doc; parag = parag; idx = idx; ox = ox; oy = oy; Q_UNUSED( atEnd ) return TRUE;
-                                                        
+    return TRUE;
 }
-bool QTextCustomItem::enterAt( QTextCursor *, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy, const QPoint & )
+bool QTextCustomItem::enterAt( QTextCursor *, QTextDocument *&, QTextParagraph *&, int &, int &, int &, const QPoint & )
 {
-    doc = doc; parag = parag; idx = idx; ox = ox; oy = oy; return TRUE;
+    return TRUE;
 }
-bool QTextCustomItem::next( QTextCursor *, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy )
+bool QTextCustomItem::next( QTextCursor *, QTextDocument *&, QTextParagraph *&, int &, int &, int & )
 {
-    doc = doc; parag = parag; idx = idx; ox = ox; oy = oy; return TRUE;
+    return TRUE;
 }
-bool QTextCustomItem::prev( QTextCursor *, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy )
+bool QTextCustomItem::prev( QTextCursor *, QTextDocument *&, QTextParagraph *&, int &, int &, int & )
 {
-    doc = doc; parag = parag; idx = idx; ox = ox; oy = oy; return TRUE;
+    return TRUE;
 }
-bool QTextCustomItem::down( QTextCursor *, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy )
+bool QTextCustomItem::down( QTextCursor *, QTextDocument *&, QTextParagraph *&, int &, int &, int & )
 {
-    doc = doc; parag = parag; idx = idx; ox = ox; oy = oy; return TRUE;
+    return TRUE;
 }
-bool QTextCustomItem::up( QTextCursor *, QTextDocument *&doc, QTextParag *&parag, int &idx, int &ox, int &oy )
+bool QTextCustomItem::up( QTextCursor *, QTextDocument *&, QTextParagraph *&, int &, int &, int & )
 {
-    doc = doc; parag = parag; idx = idx; ox = ox; oy = oy; return TRUE;
+    return TRUE;
 }
 
 void QTextFlow::setPageSize( int ps ) { pagesize = ps; }
@@ -89,8 +88,8 @@ void QTextTableCell::invalidate() { cached_width = -1; cached_sizehint = -1; }
 
 void QTextTable::invalidate() { cachewidth = -1; }
 
-QTextParagData::~QTextParagData() {}
-void QTextParagData::join( QTextParagData * ) {}
+QTextParagraphData::~QTextParagraphData() {}
+void QTextParagraphData::join( QTextParagraphData * ) {}
 
 QTextFormatter::~QTextFormatter() {}
 void QTextFormatter::setWrapEnabled( bool b ) { wrapEnabled = b; }
@@ -100,23 +99,51 @@ void QTextFormatter::setWrapAtColumn( int c ) { wrapColumn = c; }
 
 int QTextCursor::x() const
 {
-    QTextStringChar *c = string->at( idx );
+    QTextStringChar *c = para->at( idx );
     int curx = c->x;
     if ( !c->rightToLeft &&
          c->c.isSpace() &&
          idx > 0 &&
-         ( string->alignment() & Qt3::AlignJustify ) == Qt3::AlignJustify )
-        curx = string->at( idx - 1 )->x + string->string()->width( idx - 1 );
+         !c->lineStart &&
+         ( para->alignment() & Qt3::AlignJustify ) == Qt3::AlignJustify )
+        curx = para->at( idx - 1 )->x + para->string()->width( idx - 1 );
     if ( c->rightToLeft )
-        curx += string->string()->width( idx );
+        curx += para->string()->width( idx );
     return curx;
 }
 
 int QTextCursor::y() const
 {
     int dummy, line;
-    string->lineStartOfChar( idx, &dummy, &line );
-    return string->lineY( line );
+    para->lineStartOfChar( idx, &dummy, &line );
+    return para->lineY( line );
+}
+
+int QTextCursor::globalX() const { return totalOffsetX() + para->rect().x() + x(); }
+int QTextCursor::globalY() const { return totalOffsetY() + para->rect().y() + y(); }
+
+QTextDocument *QTextCursor::document() const
+{
+    return para ? para->document() : 0;
+}
+
+void QTextCursor::gotoPosition( QTextParagraph* p, int index )
+{
+    if ( para && p != para ) {
+        while ( para->document() != p->document() && !indices.isEmpty() )
+            pop();
+        Q_ASSERT( indices.isEmpty() || para->document() == p->document() );
+    }
+    para = p;
+    if ( index < 0 || index >= para->length() ) {
+#if defined(QT_CHECK_RANGE)
+        qWarning( "QTextCursor::gotoParagraph Index: %d out of range", index );
+#endif
+        index = index < 0 ? 0 : para->length() - 1;
+    }
+
+    tmpIndex = -1;
+    idx = index;
 }
 
 bool QTextDocument::hasSelection( int id, bool visible ) const
@@ -127,18 +154,18 @@ bool QTextDocument::hasSelection( int id, bool visible ) const
                ( (QTextDocument*)this )->selectionEndCursor( id ) ) );
 }
 
-void QTextDocument::setSelectionStart( int id, QTextCursor *cursor )
+void QTextDocument::setSelectionStart( int id, const QTextCursor &cursor )
 {
     QTextDocumentSelection sel;
-    sel.startCursor = *cursor;
-    sel.endCursor = *cursor;
+    sel.startCursor = cursor;
+    sel.endCursor = cursor;
     sel.swapped = FALSE;
     selections[ id ] = sel;
 }
 
-QTextParag *QTextDocument::paragAt( int i ) const
+QTextParagraph *QTextDocument::paragAt( int i ) const
 {
-    QTextParag* p = curParag;
+    QTextParagraph* p = curParag;
     if ( !p || p->paragId() > i )
         p = fParag;
     while ( p && p->paragId() != i )
@@ -153,8 +180,7 @@ QTextFormat::~QTextFormat()
 }
 
 QTextFormat::QTextFormat()
-    : fm( QFontMetrics( fn ) ), linkColor( TRUE ), logicalFontSize( 3 ), stdSize( qApp->font().pointSize() ),
-      different( NoFlags )
+    : fm( QFontMetrics( fn ) ), linkColor( TRUE ), logicalFontSize( 3 ), stdSize( qApp->font().pointSize() )
 {
     ref = 0;
 
@@ -163,15 +189,14 @@ QTextFormat::QTextFormat()
         stdSize = qApp->font().pixelSize();
         usePixelSizes = TRUE;
     }
-    
+
     missp = FALSE;
     ha = AlignNormal;
     collection = 0;
 }
 
 QTextFormat::QTextFormat( const QStyleSheetItem *style )
-    : fm( QFontMetrics( fn ) ), linkColor( TRUE ), logicalFontSize( 3 ), stdSize( qApp->font().pointSize() ),
-      different( NoFlags )
+    : fm( QFontMetrics( fn ) ), linkColor( TRUE ), logicalFontSize( 3 ), stdSize( qApp->font().pointSize() )
 {
     ref = 0;
 
@@ -181,7 +206,6 @@ QTextFormat::QTextFormat( const QStyleSheetItem *style )
         usePixelSizes = TRUE;
     }
 
-    this->style = style->name();
     missp = FALSE;
     ha = AlignNormal;
     collection = 0;
@@ -190,6 +214,7 @@ QTextFormat::QTextFormat( const QStyleSheetItem *style )
                 style->fontWeight(),
                 style->fontItalic() );
     fn.setUnderline( style->fontUnderline() );
+    fn.setStrikeOut( style->fontStrikeOut() );
     col = style->color();
     fm = QFontMetrics( fn );
     leftBearing = fm.minLeftBearing();
@@ -202,12 +227,11 @@ QTextFormat::QTextFormat( const QStyleSheetItem *style )
     memset( widths, 0, 256 );
     generateKey();
     addRef();
-    updateStyleFlags();
 }
 
 QTextFormat::QTextFormat( const QFont &f, const QColor &c, QTextFormatCollection *parent )
     : fn( f ), col( c ), fm( QFontMetrics( f ) ), linkColor( TRUE ),
-      logicalFontSize( 3 ), stdSize( f.pointSize() ), different( NoFlags )
+      logicalFontSize( 3 ), stdSize( f.pointSize() )
 {
     ref = 0;
     usePixelSizes = FALSE;
@@ -226,7 +250,6 @@ QTextFormat::QTextFormat( const QFont &f, const QColor &c, QTextFormatCollection
     memset( widths, 0, 256 );
     generateKey();
     addRef();
-    updateStyleFlags();
 }
 
 QTextFormat::QTextFormat( const QTextFormat &f )
@@ -249,8 +272,6 @@ QTextFormat::QTextFormat( const QTextFormat &f )
     ha = f.ha;
     k = f.k;
     linkColor = f.linkColor;
-    style = f.style;
-    different = f.different;
     addRef();
 }
 
@@ -274,8 +295,6 @@ QTextFormat& QTextFormat::operator=( const QTextFormat &f )
     ha = f.ha;
     k = f.k;
     linkColor = f.linkColor;
-    style = f.style;
-    different = f.different;
     addRef();
     return *this;
 }
@@ -290,7 +309,6 @@ void QTextFormat::update()
     dsc = fm.descent();
     memset( widths, 0, 256 );
     generateKey();
-    updateStyleFlags();
 }
 
 
@@ -372,52 +390,6 @@ QString QTextFormat::getKey( const QFont &fn, const QColor &col, bool misspelled
     return k;
 }
 
-void QTextFormat::updateStyle()
-{
-    if ( !collection || !collection->styleSheet() )
-        return;
-    QStyleSheetItem *item = collection->styleSheet()->item( style );
-    if ( !item )
-        return;
-    if ( !( different & Color ) && item->color().isValid() )
-        col = item->color();
-    if ( !( different & Size ) && item->fontSize() != -1 )
-        fn.setPointSize( item->fontSize() );
-    if ( !( different & Family ) && !item->fontFamily().isEmpty() )
-        fn.setFamily( item->fontFamily() );
-    if ( !( different & Bold ) && item->fontWeight() != -1 )
-        fn.setWeight( item->fontWeight() );
-    if ( !( different & Italic ) && item->definesFontItalic() )
-        fn.setItalic( item->fontItalic() );
-    if ( !( different & Underline ) && item->definesFontUnderline() )
-        fn.setUnderline( item->fontUnderline() );
-    generateKey();
-    update();
-
-}
-
-void QTextFormat::updateStyleFlags()
-{
-    different = NoFlags;
-    if ( !collection || !collection->styleSheet() )
-        return;
-    QStyleSheetItem *item = collection->styleSheet()->item( style );
-    if ( !item )
-        return;
-    if ( item->color() != col )
-        different |= Color;
-    if ( item->fontSize() != fn.pointSize() )
-        different |= Size;
-    if ( item->fontFamily() != fn.family() )
-        different |= Family;
-    if ( item->fontItalic() != fn.italic() )
-        different |= Italic;
-    if ( item->fontUnderline() != fn.underline() )
-        different |= Underline;
-    if ( item->fontWeight() != fn.weight() )
-        different |= Bold;
-}
-
 QString QTextString::toString( const QMemArray<QTextStringChar> &data )
 {
     QString s;
@@ -443,22 +415,22 @@ QString QTextString::toString() const
     return toString( data );
 }
 
-void QTextParag::setSelection( int id, int start, int end )
+void QTextParagraph::setSelection( int id, int start, int end )
 {
-    QMap<int, QTextParagSelection>::ConstIterator it = selections().find( id );
+    QMap<int, QTextParagraphSelection>::ConstIterator it = selections().find( id );
     if ( it != mSelections->end() ) {
         if ( start == ( *it ).start && end == ( *it ).end )
             return;
     }
 
-    QTextParagSelection sel;
+    QTextParagraphSelection sel;
     sel.start = start;
     sel.end = end;
     (*mSelections)[ id ] = sel;
     setChanged( TRUE, TRUE );
 }
 
-void QTextParag::removeSelection( int id )
+void QTextParagraph::removeSelection( int id )
 {
     if ( !hasSelection( id ) )
         return;
@@ -467,98 +439,93 @@ void QTextParag::removeSelection( int id )
     setChanged( TRUE, TRUE );
 }
 
-int QTextParag::selectionStart( int id ) const
+int QTextParagraph::selectionStart( int id ) const
 {
     if ( !mSelections )
         return -1;
-    QMap<int, QTextParagSelection>::ConstIterator it = mSelections->find( id );
+    QMap<int, QTextParagraphSelection>::ConstIterator it = mSelections->find( id );
     if ( it == mSelections->end() )
         return -1;
     return ( *it ).start;
 }
 
-int QTextParag::selectionEnd( int id ) const
+int QTextParagraph::selectionEnd( int id ) const
 {
     if ( !mSelections )
         return -1;
-    QMap<int, QTextParagSelection>::ConstIterator it = mSelections->find( id );
+    QMap<int, QTextParagraphSelection>::ConstIterator it = mSelections->find( id );
     if ( it == mSelections->end() )
         return -1;
     return ( *it ).end;
 }
 
-bool QTextParag::hasSelection( int id ) const
+bool QTextParagraph::hasSelection( int id ) const
 {
-    if ( !mSelections )
-        return FALSE;
-    QMap<int, QTextParagSelection>::ConstIterator it = mSelections->find( id );
-    if ( it == mSelections->end() )
-        return FALSE;
-    return ( *it ).start != ( *it ).end || length() == 1;
+    return mSelections ? mSelections->contains( id ) : FALSE;
 }
 
-bool QTextParag::fullSelected( int id ) const
+bool QTextParagraph::fullSelected( int id ) const
 {
     if ( !mSelections )
         return FALSE;
-    QMap<int, QTextParagSelection>::ConstIterator it = mSelections->find( id );
+    QMap<int, QTextParagraphSelection>::ConstIterator it = mSelections->find( id );
     if ( it == mSelections->end() )
         return FALSE;
     return ( *it ).start == 0 && ( *it ).end == str->length() - 1;
 }
 
-int QTextParag::lineY( int l ) const
+int QTextParagraph::lineY( int l ) const
 {
     if ( l > (int)lineStarts.count() - 1 ) {
-        qWarning( "QTextParag::lineY: line %d out of range!", l );
+        qWarning( "QTextParagraph::lineY: line %d out of range!", l );
         return 0;
     }
 
     if ( !isValid() )
-        ( (QTextParag*)this )->format();
+        ( (QTextParagraph*)this )->format();
 
-    QMap<int, QTextParagLineStart*>::ConstIterator it = lineStarts.begin();
+    QMap<int, QTextLineStart*>::ConstIterator it = lineStarts.begin();
     while ( l-- > 0 )
         ++it;
     return ( *it )->y;
 }
 
-int QTextParag::lineBaseLine( int l ) const
+int QTextParagraph::lineBaseLine( int l ) const
 {
     if ( l > (int)lineStarts.count() - 1 ) {
-        qWarning( "QTextParag::lineBaseLine: line %d out of range!", l );
+        qWarning( "QTextParagraph::lineBaseLine: line %d out of range!", l );
         return 10;
     }
 
     if ( !isValid() )
-        ( (QTextParag*)this )->format();
+        ( (QTextParagraph*)this )->format();
 
-    QMap<int, QTextParagLineStart*>::ConstIterator it = lineStarts.begin();
+    QMap<int, QTextLineStart*>::ConstIterator it = lineStarts.begin();
     while ( l-- > 0 )
         ++it;
     return ( *it )->baseLine;
 }
 
-int QTextParag::lineHeight( int l ) const
+int QTextParagraph::lineHeight( int l ) const
 {
     if ( l > (int)lineStarts.count() - 1 ) {
-        qWarning( "QTextParag::lineHeight: line %d out of range!", l );
+        qWarning( "QTextParagraph::lineHeight: line %d out of range!", l );
         return 15;
     }
 
     if ( !isValid() )
-        ( (QTextParag*)this )->format();
+        ( (QTextParagraph*)this )->format();
 
-    QMap<int, QTextParagLineStart*>::ConstIterator it = lineStarts.begin();
+    QMap<int, QTextLineStart*>::ConstIterator it = lineStarts.begin();
     while ( l-- > 0 )
         ++it;
     return ( *it )->h;
 }
 
-void QTextParag::lineInfo( int l, int &y, int &h, int &bl ) const
+void QTextParagraph::lineInfo( int l, int &y, int &h, int &bl ) const
 {
     if ( l > (int)lineStarts.count() - 1 ) {
-        qWarning( "QTextParag::lineInfo: line %d out of range!", l );
+        qWarning( "QTextParagraph::lineInfo: line %d out of range!", l );
         qDebug( "%d %d", (int)lineStarts.count() - 1, l );
         y = 0;
         h = 15;
@@ -567,9 +534,9 @@ void QTextParag::lineInfo( int l, int &y, int &h, int &bl ) const
     }
 
     if ( !isValid() )
-        ( (QTextParag*)this )->format();
+        ( (QTextParagraph*)this )->format();
 
-    QMap<int, QTextParagLineStart*>::ConstIterator it = lineStarts.begin();
+    QMap<int, QTextLineStart*>::ConstIterator it = lineStarts.begin();
     while ( l-- > 0 )
         ++it;
     y = ( *it )->y;
@@ -577,95 +544,31 @@ void QTextParag::lineInfo( int l, int &y, int &h, int &bl ) const
     bl = ( *it )->baseLine;
 }
 
-int QTextParag::alignment() const
-{
-    if ( align != -1 )
-        return align;
-    QStyleSheetItem *item = style();
-    if ( !item )
-        return Qt3::AlignAuto;
-    if ( mStyleSheetItemsVec ) {
-        for ( int i = 0; i < (int)mStyleSheetItemsVec->size(); ++i ) {
-            item = (*mStyleSheetItemsVec)[ i ];
-            if ( item->alignment() != QStyleSheetItem::Undefined )
-                return item->alignment();
-        }
-    }
-    return Qt3::AlignAuto;
-}
 
-QPtrVector<QStyleSheetItem> QTextParag::styleSheetItems() const
+void QTextParagraph::setAlignment( int a )
 {
-    QPtrVector<QStyleSheetItem> vec;
-    if ( mStyleSheetItemsVec ) {
-        vec.resize( mStyleSheetItemsVec->size() );
-        for ( int i = 0; i < (int)vec.size(); ++i )
-            vec.insert( i, (*mStyleSheetItemsVec)[ i ] );
-    }
-    return vec;
-}
-
-QStyleSheetItem *QTextParag::style() const
-{
-    if ( !mStyleSheetItemsVec || mStyleSheetItemsVec->size() == 0 )
-        return 0;
-    return (*mStyleSheetItemsVec)[ mStyleSheetItemsVec->size() - 1 ];
-}
-
-int QTextParag::numberOfSubParagraph() const
-{
-    if ( list_val != -1 )
-        return list_val;
-    if ( numSubParag != -1 )
-         return numSubParag;
-    int n = 0;
-    QTextParag *p = (QTextParag*)this;
-    while ( p && ( styleSheetItemsVec().size() >= p->styleSheetItemsVec().size() &&
-            styleSheetItemsVec()[ (int)p->styleSheetItemsVec().size() - 1 ] == p->style() ||
-                   p->styleSheetItemsVec().size() >= styleSheetItemsVec().size() &&
-                   p->styleSheetItemsVec()[ (int)styleSheetItemsVec().size() - 1 ] == style() ) ) {
-        if ( p->style() == style() && listStyle() != p->listStyle()
-             && p->styleSheetItemsVec().size() == styleSheetItemsVec().size() )
-            break;
-        if ( p->style()->displayMode() == QStyleSheetItem::DisplayListItem
-             && p->style() != style() || styleSheetItemsVec().size() == p->styleSheetItemsVec().size() )
-            ++n;
-        p = p->prev();
-    }
-    ( (QTextParag*)this )->numSubParag = n;
-    return n;
-}
-
-void QTextParag::setFormat( QTextFormat *fm )
-{
-    bool doUpdate = FALSE;
-    if (defFormat && (defFormat != formatCollection()->defaultFormat()))
-       doUpdate = TRUE;
-    defFormat = formatCollection()->format( fm );
-    if ( !doUpdate )
+    if ( a == (int)align )
         return;
-    for ( int i = 0; i < length(); ++i ) {
-        if ( at( i )->format()->styleName() == defFormat->styleName() )
-            at( i )->format()->updateStyle();
-    }
+    align = a;
+    invalidate( 0 );
 }
 
-QTextFormatter *QTextParag::formatter() const
+QTextFormatter *QTextParagraph::formatter() const
 {
     if ( hasdoc )
         return document()->formatter();
     if ( pseudoDocument()->pFormatter )
         return pseudoDocument()->pFormatter;
-    return ( ( (QTextParag*)this )->pseudoDocument()->pFormatter = new QTextFormatterBreakWords );
+    return ( ( (QTextParagraph*)this )->pseudoDocument()->pFormatter = new QTextFormatterBreakWords );
 }
 
-void QTextParag::setTabArray( int *a )
+void QTextParagraph::setTabArray( int *a )
 {
     delete [] tArray;
     tArray = a;
 }
 
-void QTextParag::setTabStops( int tw )
+void QTextParagraph::setTabStops( int tw )
 {
     if ( hasdoc )
         document()->setTabStops( tw );
@@ -673,24 +576,18 @@ void QTextParag::setTabStops( int tw )
         tabStopWidth = tw;
 }
 
-QMap<int, QTextParagSelection> &QTextParag::selections() const
+QMap<int, QTextParagraphSelection> &QTextParagraph::selections() const
 {
     if ( !mSelections )
-        ((QTextParag *)this)->mSelections = new QMap<int, QTextParagSelection>;
+        ((QTextParagraph *)this)->mSelections = new QMap<int, QTextParagraphSelection>;
     return *mSelections;
 }
 
-QPtrVector<QStyleSheetItem> &QTextParag::styleSheetItemsVec() const
-{
-    if ( !mStyleSheetItemsVec )
-        ((QTextParag *)this)->mStyleSheetItemsVec = new QPtrVector<QStyleSheetItem>;
-    return *mStyleSheetItemsVec;
-}
 
-QPtrList<QTextCustomItem> &QTextParag::floatingItems() const
+QPtrList<QTextCustomItem> &QTextParagraph::floatingItems() const
 {
     if ( !mFloatingItems )
-        ((QTextParag *)this)->mFloatingItems = new QPtrList<QTextCustomItem>;
+        ((QTextParagraph *)this)->mFloatingItems = new QPtrList<QTextCustomItem>;
     return *mFloatingItems;
 }
 
@@ -702,5 +599,5 @@ QTextStringChar::~QTextStringChar()
         delete d.custom;
 }
 
-QTextParagPseudoDocument::QTextParagPseudoDocument():pFormatter(0),commandHistory(0), minw(0),wused(0){}
-QTextParagPseudoDocument::~QTextParagPseudoDocument(){ delete pFormatter; delete commandHistory; }
+QTextParagraphPseudoDocument::QTextParagraphPseudoDocument():pFormatter(0),commandHistory(0), minw(0),wused(0){}
+QTextParagraphPseudoDocument::~QTextParagraphPseudoDocument(){ delete pFormatter; delete commandHistory; }