3 files changed, 25 insertions, 28 deletions

diff --git a/libopie2/opieui/opopupmenu.h b/libopie2/opieui/opopupmenu.h
index 419a954..294edcc 100644
--- a/libopie2/opieui/opopupmenu.h
+++ b/libopie2/opieui/opopupmenu.h
@@ -45,220 +45,220 @@ namespace Ui   {
  */
 class OPopupTitle : public QWidget
 {
     Q_OBJECT
 
 public:
     /**
      * Constructs a title widget with the user specified gradient, pixmap,
      * and colors.
      */
     OPopupTitle(QWidget *parent=0, const char *name=0);
     /**
      * @deprecated
      * Constructs a title widget with the specified gradient and colors.
      */
     OPopupTitle(OPixmapEffect::GradientType gradient, const QColor &color,
                 const QColor &textColor, QWidget *parent=0,
                 const char *name=0);
     /**
      * @deprecated
      * Constructs a title widget with the specified pixmap and colors.
      */
     OPopupTitle(const OPixmap &background, const QColor &color,
                 const QColor &textColor, QWidget *parent=0,
                 const char *name=0);
     /**
      * Sets the title string and optional icon for the title widget.
      *
      * You will want to call this before inserting into a menu.
      */
     void setTitle(const QString &text, const QPixmap *icon=NULL);
     /**
      * Returns the current title.
      */
     QString title() const { return(titleStr); }
     /**
      * Returns the current icon.
      */
     QPixmap icon() const { return(miniicon); }
 
     QSize sizeHint() const;
 
 public slots:
     /// @since 3.1
     void setText( const QString &text );
     /// @since 3.1
     void setIcon( const QPixmap &pix );
 
 protected:
     void paintEvent(QPaintEvent *ev);
 
     QString titleStr;
     QPixmap miniicon;
     
     // Remove in KDE4
     OPixmapEffect::GradientType grType;
     QPixmap fill;
     QColor fgColor, bgColor, grHigh, grLow;
     bool useGradient;
 
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
     class OPopupTitlePrivate;
     OPopupTitlePrivate *d;
 };
 
 /**
  * OPopupMenu is a class for menus with standard title items and keyboard
  * accessibility for popups with many options and/or varying options. It acts
  * identically to QPopupMenu, with the addition of insertTitle(),
  * changeTitle(), setKeyboardShortcutsEnabled() and
  * setKeyboardShortcutsExecute() methods.
  *
  * The titles support a text string, an icon, plus user defined gradients,
  * colors, and background pixmaps.
  *
  * The keyboard search algorithm is incremental with additional underlining
  * for user feedback.
  *
  * @short A menu with title items.
  * @author Daniel M. Duley <mosfet@kde.org>
  * @author Hamish Rodda <meddie@yoyo.its.monash.edu.au>
  */
 class OPopupMenu : public QPopupMenu {
     Q_OBJECT
 public:
     /**
      * Constructs a OPopupMenu.
      */
     OPopupMenu(QWidget *parent=0, const char *name=0);
 
     /**
      * Destructs the object
      */
     ~OPopupMenu();
 
     /**
      * Inserts a title item with no icon.
      */
     int insertTitle(const QString &text, int id=-1, int index=-1);
     /**
      * Inserts a title item with the given icon and title.
      */
     int insertTitle(const QPixmap &icon, const QString &text, int id=-1,
                     int index=-1);
     /**
      * Changes the title of the item at the specified id. If a icon was
      * previously set it is cleared.
      */
     void changeTitle(int id, const QString &text);
     /**
      * Changes the title and icon of the title item at the specified id.
      */
     void changeTitle(int id, const QPixmap &icon, const QString &text);
     /**
      * Returns the title of the title item at the specified id. The default
      * id of -1 is for backwards compatibility only, you should always specify
      * the id.
      */
     QString title(int id=-1) const;
     /**
      * Returns the icon of the title item at the specified id.
      */
     QPixmap titlePixmap(int id) const;
 
     /**
      * Enables keyboard navigation by searching for the entered key sequence.
      * Also underlines the currently selected item, providing feedback on the search.
      *
      * Defaults to off.
      *
      * WARNING: calls to text() of currently keyboard-selected items will
      * contain additional ampersand characters.
      *
      * WARNING: though pre-existing keyboard shortcuts will not interfere with the
      * operation of this feature, they may be confusing to the user as the existing
      * shortcuts will not work.
      * @since 3.1
      */
     void setKeyboardShortcutsEnabled(bool enable);
 
     /**
      * Enables execution of the menu item once it is uniquely specified.
      * Defaults to off.
      * @since 3.1
      */
     void setKeyboardShortcutsExecute(bool enable);
 
     /**
      * Obsolete method provided for backwards compatibility only. Use the
      * normal constructor and insertTitle instead.
      */
     OPopupMenu(const QString &title, QWidget *parent=0, const char *name=0);
     /**
      * Obsolete method provided for backwards compatibility only. Use
      * insertTitle and changeTitle instead.
      */
     void setTitle(const QString &title);
 
     /**
      * Returns the context menu associated with this menu
      * @since 3.2
      */
     QPopupMenu* contextMenu();
 
     /**
      * Hides the context menu if shown
      * @since 3.2
      */
     void cancelContextMenuShow();
 
     /**
      * Returns the OPopupMenu associated with the current context menu
      * @since 3.2
      */
     static OPopupMenu* contextMenuFocus();
 
     /**
      * returns the ID of the menuitem associated with the current context menu
      * @since 3.2
      */
     static int contextMenuFocusItem();
 
 signals:
     /**
      * connect to this signal to be notified when a context menu is about to be shown
      * @param menu The menu that the context menu is about to be shown for
      * @param menuItem The menu item that the context menu is currently on
      * @param ctxMenu The context menu itself
      * @since 3.2
      */
-    void aboutToShowContextMenu(OPopupMenu* menu, int menuItem, QPopupMenu* ctxMenu);
+    void aboutToShowContextMenu(Opie::Ui::OPopupMenu* menu, int menuItem, QPopupMenu* ctxMenu);
 
 protected:
     virtual void closeEvent(QCloseEvent *);
     virtual void keyPressEvent(QKeyEvent* e);
     virtual bool eventFilter(QObject* obj, QEvent* event);
     virtual void hideEvent(QHideEvent*);
 
     virtual void virtual_hook( int id, void* data );
 
 protected slots:
     /// @since 3.1
     QString underlineText(const QString& text, uint length);
     /// @since 3.1 
     void resetKeyboardVars(bool noMatches = false);
     void itemHighlighted(int whichItem);
     void showCtxMenu(QPoint pos);
     void ctxMenuHiding();
 
 private:
     class OPopupMenuPrivate;
     OPopupMenuPrivate *d;
 };
 
 }
 }
 
 #endif
diff --git a/libopie2/opieui/otimepicker.h b/libopie2/opieui/otimepicker.h
index 01bb557..fb20781 100644
--- a/libopie2/opieui/otimepicker.h
+++ b/libopie2/opieui/otimepicker.h
@@ -1,132 +1,129 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) Stefan Eilers <eilers.stefan@epost.de>
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #ifndef OTIMEPICKER_H
 #define OTIMEPICKER_H
 
 /* OPIE */
 #include <opie2/oclickablelabel.h>
 #include <opie2/otimepickerbase.h>
 
 /* QT */
 #include <qwidget.h>
 #include <qvaluelist.h>
 #include <qdatetime.h>
 #include <qdialog.h>
 
 
 namespace Opie {
 namespace Ui   {
 
 /**
  * A class to pick time. It uses clickable labels
  * internally to allow a quick selection of a time.
  * A time can be selected by two clicks of a user
  *
  * @short A widget to quickly pick a QTime
  * @version 1.0
  * @see QWidget
  * @see QTime
  * @author Hakan Ardo, Stefan Eilers
  */
 class OTimePicker : public QWidget
 {
     Q_OBJECT
 
 public:
     OTimePicker(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
 
 public slots:
     void setHour(int h);
     void setMinute(int m);
     void setTime( const QTime& );
     void setTime( int h,  int m );
 
 public:
     QTime time()const;
 
 private:
     QValueList<OClickableLabel *> hourLst;
     QValueList<OClickableLabel *> minuteLst;
     QTime tm;
     struct Private;
     Private *d;
 
 private slots:
     void slotHour(bool b);
     void slotMinute(bool b);
 
 signals:
     /**
      * gets emitted when the time got changed by the user
      */
     void timeChanged(const QTime &);
 };
 
 /**
  *
  * @short A small dialog to pick a time
  * @version 1.0
  * @author Stefan Eilers
  *
  **/
 
 class OTimePickerDialog: public OTimePickerDialogBase
 {
     Q_OBJECT
 
 public:
     OTimePickerDialog ( QWidget* parent = 0, const char* name = NULL, WFlags fl = 0 );
     ~OTimePickerDialog() { };
 
     QTime time()const;
 
 public slots:
     void setTime( const QTime& time );
     void setHour( const QString& hour );
     void setMinute( const QString& minute );
 
 private:
     OTimePicker *m_timePicker;
     QTime m_time;
     class Private;
     Private* d;
 };
 
 }
 }
 
 /* for Qt2  */
 #if ( QT_VERSION-0 >= 0x030000 )
 #error "Fix the UI File to use namespaces"
-#else
-typedef Opie::Ui::OTimePicker OUIOTimePicker;
 #endif
 #endif
-
diff --git a/libopie2/opieui/oversatileview.h b/libopie2/opieui/oversatileview.h
index 61b61db..8cba65c 100644
--- a/libopie2/opieui/oversatileview.h
+++ b/libopie2/opieui/oversatileview.h
@@ -1,399 +1,399 @@
 /*
                              This file is part of the Opie Project
 
               =.             (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef OVERSATILEVIEW_H
 #define OVERSATILEVIEW_H
 
 /* QT */
 
 #include <qwidgetstack.h>
 #include <qiconview.h>
 
 /* OPIE */
 
 #include <opie2/oapplication.h>
 
 /* FORWARDS */
 
 class QHeader;
 class QIconSet;
 class QIconViewItem;
 class QListViewItem;
 class QPopupMenu;
 class QString;
 
 #ifndef QT_NO_DRAGANDDROP
 class QIconDragItem;
 #endif
 
 namespace Opie {
 namespace Ui   {
 class OListView;
 
 class OVersatileView : public QWidgetStack
 {
   Q_OBJECT
 
   friend class OVersatileViewItem;
 
   //==============================================================================================//
   // OVersatileView High Level API
   //==============================================================================================//
 
   public:
     OVersatileView( QWidget* parent = 0, const char* name = 0, int mode = 0 );
     ~OVersatileView();
 
     QPopupMenu* contextMenu() const;
 
     void setSynchronization( bool sync );
     bool synchronization();
 
     enum ViewMode { Tree = 0, Icons };
     int viewMode();
 
     QIconView* iconView() const;
     OListView* listView() const;
 
     enum WarningPolicy { None = 0, Warn, WarnReturn };
 
     void setWarningPolicy( int ) const;  // warn, if calling a method which doesn't apply to the current viewmode
     bool warningPolicy() const;
 
     void setDefaultPixmaps( int mode, QPixmap& leaf, QPixmap& opened, QPixmap& closed );
 
   public slots:
     void setViewMode( int mode );
     void setIconViewMode();
     void setTreeViewMode();
 
   protected:
     virtual bool isValidViewMode( int mode ) const;
     virtual void popupContextMenu( OVersatileViewItem* item, const QPoint& pos, int col = 0 );
 
   private:
     int _viewmode;
     bool _synchronization;
     mutable int _warningpolicy;
 
     OListView* _listview;
     QIconView* _iconview;
 
     QPixmap _treeleaf;
     QPixmap _treeopened;
     QPixmap _treeclosed;
 
     QPixmap _iconleaf;
     QPixmap _iconopened;
     QPixmap _iconclosed;
 
     QPopupMenu* _contextmenu;
 
     int _iconstyle;
     int _treestyle;
 
   private slots:
 
     void contextMenuRequested( QListViewItem*, const QPoint&, int );
     void contextMenuRequested( QIconViewItem*, const QPoint& );
 
     // type converting signal forwarders
 
     void selectionChanged( QListViewItem * );
     void currentChanged( QListViewItem * );
     void clicked( QListViewItem * );
     void pressed( QListViewItem * );
     void doubleClicked( QListViewItem * );
     void returnPressed( QListViewItem * );
     void onItem( QListViewItem * );
 
     void selectionChanged( QIconViewItem * );
     void currentChanged( QIconViewItem * );
     void clicked( QIconViewItem * );
     void pressed( QIconViewItem * );
     void doubleClicked( QIconViewItem * );
     void returnPressed( QIconViewItem * );
     void onItem( QIconViewItem * );
 
     void expanded( QListViewItem * item ); // QListView
     void collapsed( QListViewItem * item ); // QListView
 
   signals:
 
-    void contextMenuRequested( OVersatileViewItem * item, const QPoint& pos, int col );
+    void contextMenuRequested( Opie::Ui::OVersatileViewItem * item, const QPoint& pos, int col );
 
     /*#ifndef QT_NO_DRAGANDDROP
     void dropped( QDropEvent *e, const QValueList<QIconDragItem> &lst );  // QIconView
     #endif
     void itemRenamed( OVersatileViewItem *item, const QString & );  // QIconView
     void itemRenamed( OVersatileViewItem *item );  // QIconView
     */
 
   //==============================================================================================//
   // "Derived" API - Case 1: Methods existing either only in QListView or only in QIconView
   //==============================================================================================//
 
 public:
 
     /*
     enum Arrangement {  // QIconView
     LeftToRight = 0,
     TopToBottom
     };
     enum ResizeMode {   // QIconView
     Fixed = 0,
     Adjust
     };
     enum ItemTextPos {  // QIconView
     Bottom = 0,
     Right
     };
     */
 
     //
     // only in QListView
     //
 
     int treeStepSize() const;  // QListView
     virtual void setTreeStepSize( int );  // QListView
 
     QHeader * header() const;  // QListView
 
     virtual int addColumn( const QString &label, int size = -1);  // QListView
     virtual int addColumn( const QIconSet& iconset, const QString &label, int size = -1);  // QListView
     void removeColumn( int index ); // #### make virtual in next major release!  // QListView
     virtual void setColumnText( int column, const QString &label );  // QListView
     virtual void setColumnText( int column, const QIconSet& iconset, const QString &label );  // QListView
     QString columnText( int column ) const;  // QListView
     virtual void setColumnWidth( int column, int width );  // QListView
     int columnWidth( int column ) const;  // QListView
     enum WidthMode { Manual, Maximum };  // QListView
     virtual void setColumnWidthMode( int column, WidthMode );  // QListView
     WidthMode columnWidthMode( int column ) const;  // QListView
     int columns() const;  // QListView
 
     virtual void setColumnAlignment( int, int );  // QListView
     int columnAlignment( int ) const;  // QListView
 
     OVersatileViewItem * itemAt( const QPoint & screenPos ) const;  // QListView
     QRect itemRect( const OVersatileViewItem * ) const;  // QListView
     int itemPos( const OVersatileViewItem * );  // QListView
 
     bool isSelected( const OVersatileViewItem * ) const;  // QListView  // also in QIconViewItem but not in QIconView *shrug*
 
     virtual void setMultiSelection( bool enable );  // QListView
     bool isMultiSelection() const;  // QListView
 
     OVersatileViewItem * selectedItem() const;  // QListView
     virtual void setOpen( OVersatileViewItem *, bool );  // QListView
     bool isOpen( const OVersatileViewItem * ) const;  // QListView
 
     OVersatileViewItem * firstChild() const;  // QListView
     int childCount() const;  // QListView
 
     virtual void setAllColumnsShowFocus( bool );  // QListView
     bool allColumnsShowFocus() const;  // QListView
 
     virtual void setItemMargin( int );  // QListView
     int itemMargin() const;  // QListView
 
     virtual void setRootIsDecorated( bool );  // QListView
     bool rootIsDecorated() const;  // QListView
 
     void setShowSortIndicator( bool show );  // QListView
     bool showSortIndicator() const;  // QListView
 
     int index( const OVersatileViewItem *item ) const;  // QIconView
 
   public slots:
     void triggerUpdate();  // QListView
 
   signals:
-    void expanded( OVersatileViewItem *item ); // QListView
-    void collapsed( OVersatileViewItem *item ); // QListView
+    void expanded( Opie::Ui::OVersatileViewItem *item ); // QListView
+    void collapsed( Opie::Ui::OVersatileViewItem *item ); // QListView
 
     //
     // only in QIconView
     //
 
   public:
     uint count() const;  // QIconView
 
     OVersatileViewItem *firstItem() const;  // QIconView
     OVersatileViewItem *lastItem() const;  // QIconView
 
     OVersatileViewItem *findItem( const QPoint &pos ) const; // QIconView
     OVersatileViewItem *findItem( const QString &text ) const; // QIconView
 
     OVersatileViewItem* findFirstVisibleItem( const QRect &r ) const;  // QIconView
     OVersatileViewItem* findLastVisibleItem( const QRect &r ) const;  // QIconView
 
     virtual void setGridX( int rx );  // QIconView
     virtual void setGridY( int ry );  // QIconView
     int gridX() const;  // QIconView
     int gridY() const;  // QIconView
     virtual void setSpacing( int sp );  // QIconView
     int spacing() const;  // QIconView
     virtual void setItemTextPos( QIconView::ItemTextPos pos );  // QIconView
     QIconView::ItemTextPos itemTextPos() const;  // QIconView
     virtual void setItemTextBackground( const QBrush &b );  // QIconView
     QBrush itemTextBackground() const;  // QIconView
     virtual void setArrangement( QIconView::Arrangement am );  // QIconView
     QIconView::Arrangement arrangement() const;  // QIconView
     virtual void setResizeMode( QIconView::ResizeMode am );  // QIconView
     QIconView::ResizeMode resizeMode() const;  // QIconView
     virtual void setMaxItemWidth( int w );  // QIconView
     int maxItemWidth() const;  // QIconView
     virtual void setMaxItemTextLength( int w );  // QIconView
     int maxItemTextLength() const;  // QIconView
     virtual void setAutoArrange( bool b );  // QIconView
     bool autoArrange() const;  // QIconView
     virtual void setShowToolTips( bool b );  // QIconView
     bool showToolTips() const;  // QIconView
 
     bool sorting() const;  // QIconView
     bool sortDirection() const;  // QIconView
 
     virtual void setItemsMovable( bool b );  // QIconView
     bool itemsMovable() const;  // QIconView
     virtual void setWordWrapIconText( bool b );  // QIconView
     bool wordWrapIconText() const;  // QIconView
 
   public slots:
     virtual void arrangeItemsInGrid( const QSize &grid, bool update = TRUE );  // QIconView
     virtual void arrangeItemsInGrid( bool update = TRUE );  // QIconView
     virtual void updateContents();  // QIconView
 
   signals:
     /*#ifndef QT_NO_DRAGANDDROP
     void dropped( QDropEvent *e, const QValueList<QIconDragItem> &lst );  // QIconView
     #endif
     */
     void moved();  // QIconView
-    void itemRenamed( OVersatileViewItem *item, const QString & );  // QIconView
-    void itemRenamed( OVersatileViewItem *item );  // QIconView
+    void itemRenamed( Opie::Ui::OVersatileViewItem *item, const QString & );  // QIconView
+    void itemRenamed( Opie::Ui::OVersatileViewItem *item );  // QIconView
 
   //==============================================================================================//
   // "Derived" API - Case 2: Methods existing in QListView and QIconView with the same signatures
   //==============================================================================================//
 
   public:
     enum SelectionMode {
     Single = 0,
     Multi,
     Extended,
     NoSelection
     };
 
     virtual void clear();
 
     virtual void setFont( const QFont & );
     virtual void setPalette( const QPalette & );
 
     virtual void takeItem( OVersatileViewItem * );
 
     void setSelectionMode( SelectionMode mode );
     SelectionMode selectionMode() const;
 
     virtual void selectAll( bool select );
     virtual void clearSelection();
     virtual void invertSelection();
 
     void ensureItemVisible( const OVersatileViewItem * );
     virtual void repaintItem( const OVersatileViewItem * ) const;
 
     virtual void setCurrentItem( OVersatileViewItem * );
     OVersatileViewItem * currentItem() const;
 
     // bool eventFilter( QObject * o, QEvent * );   // use QWidgetStack implementation
 
     // QSize minimumSizeHint() const;               // use QWidgetStack implementation
     // QSizePolicy sizePolicy() const;              // use QWidgetStack implementation
     // QSize sizeHint() const;                      // use QWidgetStack implementation
 
   signals:
     void selectionChanged();
-    void selectionChanged( OVersatileViewItem * );
-    void currentChanged( OVersatileViewItem * );
-    void clicked( OVersatileViewItem * );
-    void pressed( OVersatileViewItem * );
+    void selectionChanged( Opie::Ui::OVersatileViewItem * );
+    void currentChanged( Opie::Ui::OVersatileViewItem * );
+    void clicked( Opie::Ui::OVersatileViewItem * );
+    void pressed( Opie::Ui::OVersatileViewItem * );
 
-    void doubleClicked( OVersatileViewItem * );
-    void returnPressed( OVersatileViewItem * );
+    void doubleClicked( Opie::Ui::OVersatileViewItem * );
+    void returnPressed( Opie::Ui::OVersatileViewItem * );
 
-    void onItem( OVersatileViewItem * );
+    void onItem( Opie::Ui::OVersatileViewItem * );
     void onViewport();
 
   //==============================================================================================//
   // "Derived" API - Case 2: Methods existing in QListView and QIconView with differing signatures
   //==============================================================================================//
 
   /*
 
   public:
     virtual void insertItem( OVersatileViewItem * );  // QListView
     virtual void insertItem( OVersatileViewItem *item, OVersatileViewItem *after = 0L );  // QIconView
 
     virtual void setSelected( OVersatileViewItem *, bool );  // QListView
     virtual void setSelected( OVersatileViewItem *item, bool s, bool cb = FALSE );  // QIconView
 
     virtual void setSorting( int column, bool increasing = TRUE );  // QListView
     void setSorting( bool sort, bool ascending = TRUE );  // QIconView
 
     void sort(); // #### make virtual in next major release  // QListView
     virtual void sort( bool ascending = TRUE );  // QIconView
 
   */
 
   signals:
-    void clicked( OVersatileViewItem *, const QPoint &, int );  // QListView
-    void clicked( OVersatileViewItem *, const QPoint & );  // QIconView
+    void clicked( Opie::Ui::OVersatileViewItem *, const QPoint &, int );  // QListView
+    void clicked( Opie::Ui::OVersatileViewItem *, const QPoint & );  // QIconView
 
-    void pressed( OVersatileViewItem *, const QPoint &, int );  // QListView
-    void pressed( OVersatileViewItem *, const QPoint & );  // QIconView
+    void pressed( Opie::Ui::OVersatileViewItem *, const QPoint &, int );  // QListView
+    void pressed( Opie::Ui::OVersatileViewItem *, const QPoint & );  // QIconView
 
-    void rightButtonClicked( OVersatileViewItem* item, const QPoint& pos );  // QIconView
-    void rightButtonClicked( OVersatileViewItem *, const QPoint&, int );  // QListView
+    void rightButtonClicked( Opie::Ui::OVersatileViewItem* item, const QPoint& pos );  // QIconView
+    void rightButtonClicked( Opie::Ui::OVersatileViewItem *, const QPoint&, int );  // QListView
 
-    void rightButtonPressed( OVersatileViewItem* item, const QPoint& pos );  // QIconView
-    void rightButtonPressed( OVersatileViewItem *, const QPoint&, int );  // QListView
+    void rightButtonPressed( Opie::Ui::OVersatileViewItem* item, const QPoint& pos );  // QIconView
+    void rightButtonPressed( Opie::Ui::OVersatileViewItem *, const QPoint&, int );  // QListView
 
-    void mouseButtonPressed( int, OVersatileViewItem *, const QPoint& , int );  // QListView
-    void mouseButtonPressed( int button, OVersatileViewItem* item, const QPoint& pos );  // QIconView
+    void mouseButtonPressed( int, Opie::Ui::OVersatileViewItem *, const QPoint& , int );  // QListView
+    void mouseButtonPressed( int button, Opie::Ui::OVersatileViewItem* item, const QPoint& pos );  // QIconView
 
-    void mouseButtonClicked( int, OVersatileViewItem *,  const QPoint&, int );  // QListView
-    void mouseButtonClicked( int button, OVersatileViewItem* item, const QPoint& pos );  // QIconView
+    void mouseButtonClicked( int, Opie::Ui::OVersatileViewItem *,  const QPoint&, int );  // QListView
+    void mouseButtonClicked( int button, Opie::Ui::OVersatileViewItem* item, const QPoint& pos );  // QIconView
 
 };
 
 }
 }
 #endif