more work on a higher level listview interface

2 files changed, 117 insertions, 11 deletions

diff --git a/libopie2/opieui/olistview.cpp b/libopie2/opieui/olistview.cpp
index 8f97cc6..8f290d3 100644
--- a/libopie2/opieui/olistview.cpp
+++ b/libopie2/opieui/olistview.cpp
@@ -468,2 +468,64 @@ void ONamedListView::addColumns( const QStringList& columns )
 
+int ONamedListView::findColumn( const QString& text ) const
+{
+    //FIXME: If used excessively, this will slow down performance of updates
+    //FIXME: because of the linear search over all column texts.
+    //FIXME: I will optimize later by using a hash map.
+    for ( int i = 0; i < columns(); ++i )
+        if ( columnText( i ) == text )
+            return i;
+    return -1;
+}
+
+
+ONamedListViewItem* ONamedListView::find( int column, const QString& text, int recurse ) const
+{
+    return find( (ONamedListViewItem*) firstChild(), column, text, recurse );
+}
+
+
+ONamedListViewItem* ONamedListView::find( ONamedListViewItem* item, int column, const QString& text, int recurse ) const
+{
+    ONamedListViewItem* result;
+    while ( item && item->text( column ) != text )
+    {
+        qDebug( "checked %s", (const char*) item->text( column ) );
+
+        if ( recurse < 0 || recurse > 0 )
+        {
+            qDebug( "recursion is %d - recursing into...", recurse );
+            result = find( (ONamedListViewItem*) item->firstChild(), column, text, recurse-1 );
+            if ( result ) return result;
+        }
+
+
+        item = (ONamedListViewItem*) item->itemBelow();
+    }
+    if ( item && item->text( column ) == text )
+        return item;
+    else
+        return 0;
+}
+
+
+ONamedListViewItem* ONamedListView::find( const QString& column, const QString& text, int recurse ) const
+{
+    int col = findColumn( column );
+    if ( col != -1 )
+        return find( (ONamedListViewItem*) firstChild(), col, text, recurse );
+    else
+        return 0;
+}
+
+
+ONamedListViewItem* ONamedListView::find( ONamedListViewItem* item, const QString& column, const QString& text, int recurse ) const
+{
+    int col = findColumn( column );
+    if ( col != -1 )
+        return find( item, col, text, recurse );
+    else
+        return 0;
+}
+
+
 /*======================================================================================
@@ -522,11 +584,24 @@ void ONamedListViewItem::setText( const QString& column, const QString& text )
     //FIXME: I will optimize later by using a hash map.
-    for ( int i = 0; i < listView()->columns(); ++i )
-    {
-        if ( listView()->columnText( i ) == column )
-        {
-            OListViewItem::setText( i, text );
-            return;
-        }
-    }
-    qWarning( "ONamedListViewItem::setText(): Warning! Columntext '%s' not found.", (const char*) column );
+    int col = ( (ONamedListView*) listView() )->findColumn( column );
+    if ( col != -1 )
+        OListViewItem::setText( col, text );
+    else
+        qWarning( "ONamedListViewItem::setText(): Warning! Columntext '%s' not found.", (const char*) column );
+}
+
+
+ONamedListViewItem* ONamedListViewItem::find( int column, const QString& text, int recurse ) const
+{
+    return ( (ONamedListView*) listView() )->find( (ONamedListViewItem*) firstChild(), column, text, recurse );
 }
+
+
+ONamedListViewItem* ONamedListViewItem::find( const QString& column, const QString& text, int recurse ) const
+{
+    int col = ( (ONamedListView*) listView() )->findColumn( column );
+    if ( col != -1 )
+        return ( (ONamedListView*) listView() )->find( (ONamedListViewItem*) firstChild(), col, text, recurse );
+    else
+        return 0;
+}
+
diff --git a/libopie2/opieui/olistview.h b/libopie2/opieui/olistview.h
index 99770bf..1bbdd5b 100644
--- a/libopie2/opieui/olistview.h
+++ b/libopie2/opieui/olistview.h
@@ -243,2 +243,4 @@ QDataStream& operator>>( QDataStream& stream, OListViewItem& item );
 
+class ONamedListViewItem;
+
 /**
@@ -246,3 +248,3 @@ QDataStream& operator>>( QDataStream& stream, OListViewItem& item );
  *
- * This class provides a higher-level interface to the columns in an OListView.
+ * This class provides a higher-level interface to an OListView.
  *
@@ -268,2 +270,20 @@ class ONamedListView: public OListView
     virtual void addColumns( const QStringList& columns );
+    /**
+     * @returns the column index matching to @a text or -1 if not found.
+     */
+    virtual int findColumn( const QString& text ) const;
+    /**
+     * @returns the first item which has a @a text in column @a column.
+     * Set @a recurse to indicate how much subchild levels to search, e.g.<ul>
+     * <li>set it to 0 to search only among direct childs,
+     * <li>set it to 1 to search direct childs and all 1st order subchilds
+     * <li>set it to -1 for maximum recursion.
+     * </ul>
+     * @sa ONamedListViewItem::find()
+     */
+    virtual ONamedListViewItem* find( ONamedListViewItem* start, int column, const QString& text, int recurse = -1 ) const;
+    virtual ONamedListViewItem* find( int column, const QString& text, int recurse = -1 ) const;
+
+    virtual ONamedListViewItem* find( ONamedListViewItem* start, const QString& column, const QString& text, int recurse = -1 ) const;
+    virtual ONamedListViewItem* find( const QString& column, const QString& text, int recurse = -1 ) const;
 };
@@ -277,3 +297,3 @@ class ONamedListView: public OListView
  *
- * This class provides a higher-level interface to the columns in an OListViewItem.
+ * This class provides a higher-level interface to an OListViewItem.
  *
@@ -306,2 +326,13 @@ class ONamedListViewItem: public OListViewItem
     virtual void setText( const QStringList& texts );
+    /**
+     * @returns the first child which has a @a text in column @a column.
+     * Set @a recurse to indicate how much subchild levels to search, e.g.<ul>
+     * <li>set it to 0 to search only among direct childs,
+     * <li>set it to 1 to search direct childs and all 1st order subchilds
+     * <li>set it to -1 for maximum recursion.
+     * </ul>
+     * @sa ONamedListView::find()
+     */
+    virtual ONamedListViewItem* find( int column, const QString& text, int recurse = -1 ) const;
+    virtual ONamedListViewItem* find( const QString& column, const QString& text, int recurse = -1 ) const;
 };