4 files changed, 148 insertions, 11 deletions

diff --git a/libopie2/examples/opieui/olistviewdemo/olistviewdemo.cpp b/libopie2/examples/opieui/olistviewdemo/olistviewdemo.cpp
index 31bda9d..5ba7b69 100644
--- a/libopie2/examples/opieui/olistviewdemo/olistviewdemo.cpp
+++ b/libopie2/examples/opieui/olistviewdemo/olistviewdemo.cpp
@@ -28,27 +28,53 @@
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "olistviewdemo.h"
 #include <opie2/olistview.h>
 
 #include <qstring.h>
 #include <qpixmap.h>
 #include <qlistview.h>
 
 OListViewDemo::OListViewDemo( QWidget* parent, const char* name, WFlags f )
                    :QVBox( parent, name, f )
 {
     lv = new ONamedListView( this );
+    lv->setRootIsDecorated( true );
     lv->addColumns( QStringList::split( ' ', "Column1 Column2 Column3 Column4" ) );
 
     ONamedListViewItem* item = new ONamedListViewItem( lv, QStringList::split( ' ', "Text1 Text2 Text3 Text4" ) );
     item->setText( "Column2", "ModifiedText" );
     item->setText( "Column5", "ThisColumnDoesNotExits" );
+
+    new ONamedListViewItem( lv, QStringList::split( ' ', "Text1 Text2 Text3 Text4" ) );
+    new ONamedListViewItem( lv, QStringList::split( ' ', "Text1 Text2 Text3 Text4" ) );
+    new ONamedListViewItem( lv, QStringList::split( ' ', "Text1 Text2 Text3 Minni" ) );
+    item = new ONamedListViewItem( lv, QStringList::split( ' ', "XXX YYY ZZZ ***" ) );
+    new ONamedListViewItem( lv, QStringList::split( ' ', "Text1 Text2 Text3 Text4" ) );
+    new ONamedListViewItem( lv, QStringList::split( ' ', "Text1 Text2 Text3 Text4" ) );
+
+    new ONamedListViewItem( item, QStringList::split( ' ', "SubText1 Text2 Text3 Text4" ) );
+    new ONamedListViewItem( item, QStringList::split( ' ', "SubText1 Text2 Text3 Text4" ) );
+    new ONamedListViewItem( item, QStringList::split( ' ', "SubText1 Text2 Text3 Text4" ) );
+    item = new ONamedListViewItem( item, QStringList::split( ' ', "Text1 Text2 Text3 HereItComes" ) );
+    item = new ONamedListViewItem( item, QStringList::split( ' ', "Text1 Text2 Text3 HereItComesSoon" ) );
+    item = new ONamedListViewItem( item, QStringList::split( ' ', "Text1 Text2 Text3 Mickey" ) );
+
+    if ( lv->find( 3, "Mickey", 3 ) )
+        qDebug( "found Mickey :-)" );
+    else
+        qDebug( "did not found Mickey :-(" );
+
+    if ( lv->find( 3, "Minni", 0 ) )
+        qDebug( "found Minni :-)" );
+    else
+        qDebug( "did not found Minni :-(" );
+
 }
 
 OListViewDemo::~OListViewDemo()
 {
 }
 
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index a29b29d..1b38d02 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -63,32 +63,33 @@
 #define _LINUX_IF_H
 #include <linux/wireless.h>
 
 class ONetworkInterface;
 class OWirelessNetworkInterface;
 class OChannelHopper;
 class OMonitoringInterface;
 
 /*======================================================================================
  * ONetwork
  *======================================================================================*/
 
 /**
  * @brief A container class for all network interfaces
  *
  * This class provides access to all available network interfaces of your computer.
+ *
  * @author Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
  */
 class ONetwork : public QObject
 {
   Q_OBJECT
 
  public:
     typedef QDict<ONetworkInterface> InterfaceMap;
     typedef QDictIterator<ONetworkInterface> InterfaceIterator;
 
   public:
     /**
      * @returns the number of available interfaces
      */
     int count() const;
     /**
@@ -124,32 +125,33 @@ class ONetwork : public QObject
     static ONetwork* _instance;
     InterfaceMap _interfaces;
 };
 
 
 /*======================================================================================
  * ONetworkInterface
  *======================================================================================*/
 
 /**
  * @brief A network interface wrapper.
  *
  * This class provides a wrapper for a network interface. All the cumbersume details of
  * Linux ioctls are hidden under a convenient high-level interface.
  * @warning Most of the setting methods contained in this class require the appropriate
  * process permissions to work.
+ *
  * @author Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
  */
 class ONetworkInterface : public QObject
 {
     friend class OMonitoringInterface;
     friend class OCiscoMonitoringInterface;
     friend class OWlanNGMonitoringInterface;
     friend class OHostAPMonitoringInterface;
     friend class OOrinocoMonitoringInterface;
 
   public:
     /**
      * Constructor. Normally you don't create @ref ONetworkInterface objects yourself,
      * but access them via @ref ONetwork::interface().
      */
     ONetworkInterface( QObject* parent, const char* name );
@@ -233,32 +235,33 @@ class ONetworkInterface : public QObject
     virtual void init();
     bool ioctl( int call ) const;
     bool ioctl( int call, struct ifreq& ) const;
 };
 
 /*======================================================================================
  * OChannelHopper
  *======================================================================================*/
 
 /**
  * @brief A radio frequency channel hopper.
  *
  * This class provides a channel hopper for radio frequencies. A channel hopper frequently
  * changes the radio frequency channel of its associated @ref OWirelessNetworkInterface.
  * This is necessary when in monitoring mode and scanning for other devices, because
  * the radio frequency hardware can only detect packets sent on the same frequency.
+ *
  * @author Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
  */
 class OChannelHopper : public QObject
 {
   Q_OBJECT
 
   public:
     /**
      * Constructor.
      */
     OChannelHopper( OWirelessNetworkInterface* );
     /**
      * Destructor.
      */
     virtual ~OChannelHopper();
     /**
@@ -292,32 +295,34 @@ class OChannelHopper : public QObject
     OWirelessNetworkInterface* _iface;
     int _interval;
     int _tid;
     QValueList<int> _channels;
     QValueList<int>::Iterator _channel;
 };
 
 
 /*======================================================================================
  * OWirelessNetworkInterface
  *======================================================================================*/
 
 /**
  * @brief A network interface wrapper for interfaces supporting the wireless extensions protocol.
  *
  * This class provides a high-level encapsulation of the Linux wireless extension API.
+ *
+ * @author Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
  */
 class OWirelessNetworkInterface : public ONetworkInterface
 {
     friend class OMonitoringInterface;
     friend class OCiscoMonitoringInterface;
     friend class OWlanNGMonitoringInterface;
     friend class OHostAPMonitoringInterface;
     friend class OOrinocoMonitoringInterface;
 
     friend class OPrivateIOCTL;
 
   public:
     /**
      * Constructor.
      */
     OWirelessNetworkInterface( QObject* parent, const char* name );
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
@@ -453,32 +453,94 @@ ONamedListView::ONamedListView( QWidget *parent, const char *name )
 
 ONamedListView::~ONamedListView()
 {
 }
 
 
 void ONamedListView::addColumns( const QStringList& columns )
 {
     for ( QStringList::ConstIterator it = columns.begin(); it != columns.end(); ++it )
     {
         qDebug( "adding column %s", (const char*) *it );
         addColumn( *it );
     }
 }
 
 
+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;
+}
+
+
 /*======================================================================================
  * ONamedListViewItem
  *======================================================================================*/
 
 ONamedListViewItem::ONamedListViewItem( QListView* parent, const QStringList& texts )
                    :OListViewItem( parent )
 {
     setText( texts );
 }
 
 
 ONamedListViewItem::ONamedListViewItem( QListViewItem* parent, const QStringList& texts )
                    :OListViewItem( parent )
 {
     setText( texts );
 }
@@ -507,26 +569,39 @@ void ONamedListViewItem::setText( const QStringList& texts )
 {
     int col = 0;
     for ( QStringList::ConstIterator it = texts.begin(); it != texts.end(); ++it )
     {
         qDebug( "setting column %d = text %s", col, (const char*) *it );
         OListViewItem::setText( col++, *it );
     }
 
 }
 
 
 void ONamedListViewItem::setText( const QString& column, const QString& text )
 {
     //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 < 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
@@ -228,83 +228,114 @@ class OListViewItem: public QListViewItem
   * @relates QListViewItem
   * Writes listview @a item and all subitems recursively to @a stream
   * and returns a reference to the stream.
   */
 QDataStream& operator<<( QDataStream& stream, const OListViewItem& item );
 /**
   * @relates QListViewItem
   * Reads listview @a item from @a stream and returns a reference to the stream.
   */
 QDataStream& operator>>( QDataStream& stream, OListViewItem& item );
 #endif // QT_NO_DATASTREAM
 
 /*======================================================================================
  * ONamedListView
  *======================================================================================*/
 
+class ONamedListViewItem;
+
 /**
  * @brief An OListView variant with named columns.
  *
- * This class provides a higher-level interface to the columns in an OListView.
+ * This class provides a higher-level interface to an OListView.
  *
  * @author Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
  */
 class ONamedListView: public OListView
 {
   public:
     /**
      * Constructor.
      *
      * The parameters @a parent and @a name are handled by
      * @ref OListView, as usual.
      */
     ONamedListView( QWidget* parent = 0, const char* name = 0 );
     /**
      * Destructor.
      */
     virtual ~ONamedListView();
     /**
      * Add a number of @a columns to the listview.
      */
     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;
 };
 
 /*======================================================================================
  * ONamedListViewItem
  *======================================================================================*/
 
 /**
  * @brief An OListView variant with named columns.
  *
- * This class provides a higher-level interface to the columns in an OListViewItem.
+ * This class provides a higher-level interface to an OListViewItem.
  *
  * @author Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
  */
 class ONamedListViewItem: public OListViewItem
 {
   public:
     /**
      * Constructor. Accepts the same parameters as a @ref OListViewItem,
      * plus a @ref QStringList which holds an arbitrary number of @a texts.
      */
     ONamedListViewItem( QListView* parent, const QStringList& texts );
     ONamedListViewItem( QListViewItem* parent, const QStringList& texts );
     ONamedListViewItem( QListView* parent, QListViewItem* after, const QStringList& texts );
     ONamedListViewItem( QListViewItem* parent, QListViewItem* after, const QStringList& texts );
     /**
      * Destructor.
      */
     virtual ~ONamedListViewItem();
     /**
      * Sets the text in column @a column to @a text.
      * This method differs from @ref QListViewItem::setText() in that it
      * accepts a string as column indicator instead of an int.
      */
     virtual void setText( const QString& column, const QString& text );
     /**
      * Sets a number of @a texts for this item.
      */
     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;
 };
 
 
 #endif // OLISTVIEW_H