1 files changed, 44 insertions, 39 deletions

diff --git a/libopie2/opieui/oversatileview.h b/libopie2/opieui/oversatileview.h
index 8af21dc..61b61db 100644
--- a/libopie2/opieui/oversatileview.h
+++ b/libopie2/opieui/oversatileview.h
@@ -47,3 +47,2 @@ class QIconSet;
 class QIconViewItem;
-class OListView;
 class QListViewItem;
@@ -56,2 +55,6 @@ class QIconDragItem;
 
+namespace Opie {
+namespace Ui   {
+class OListView;
+
 class OVersatileView : public QWidgetStack
@@ -59,3 +62,3 @@ class OVersatileView : public QWidgetStack
   Q_OBJECT
-  
+
   friend class OVersatileViewItem;
@@ -71,19 +74,19 @@ class OVersatileView : public QWidgetStack
     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:
@@ -96,3 +99,3 @@ class OVersatileView : public QWidgetStack
     virtual void popupContextMenu( OVersatileViewItem* item, const QPoint& pos, int col = 0 );
-  
+
   private:
@@ -101,6 +104,6 @@ class OVersatileView : public QWidgetStack
     mutable int _warningpolicy;
-    
+
     OListView* _listview;
     QIconView* _iconview;
-    
+
     QPixmap _treeleaf;
@@ -112,10 +115,10 @@ class OVersatileView : public QWidgetStack
     QPixmap _iconclosed;
-    
+
     QPopupMenu* _contextmenu;
-    
+
     int _iconstyle;
     int _treestyle;
-  
+
   private slots:
-      
+
     void contextMenuRequested( QListViewItem*, const QPoint&, int );
@@ -124,3 +127,3 @@ class OVersatileView : public QWidgetStack
     // type converting signal forwarders
-    
+
     void selectionChanged( QListViewItem * );
@@ -132,3 +135,3 @@ class OVersatileView : public QWidgetStack
     void onItem( QListViewItem * );
-    
+
     void selectionChanged( QIconViewItem * );
@@ -140,3 +143,3 @@ class OVersatileView : public QWidgetStack
     void onItem( QIconViewItem * );
-    
+
     void expanded( QListViewItem * item ); // QListView
@@ -145,5 +148,5 @@ class OVersatileView : public QWidgetStack
   signals:
-    
+
     void contextMenuRequested( OVersatileViewItem * item, const QPoint& pos, int col );
-    
+
     /*#ifndef QT_NO_DRAGANDDROP
@@ -175,3 +178,3 @@ public:
     */
-    
+
     //
@@ -179,3 +182,3 @@ public:
     //
-    
+
     int treeStepSize() const;  // QListView
@@ -228,3 +231,3 @@ public:
     bool showSortIndicator() const;  // QListView
-    
+
     int index( const OVersatileViewItem *item ) const;  // QIconView
@@ -242,5 +245,5 @@ public:
 
-  public:    
+  public:
     uint count() const;  // QIconView
-    
+
     OVersatileViewItem *firstItem() const;  // QIconView
@@ -289,3 +292,3 @@ public:
     virtual void updateContents();  // QIconView
-  
+
   signals:
@@ -324,3 +327,3 @@ public:
     virtual void invertSelection();
-  
+
     void ensureItemVisible( const OVersatileViewItem * );
@@ -346,6 +349,6 @@ public:
     void returnPressed( OVersatileViewItem * );
-  
+
     void onItem( OVersatileViewItem * );
     void onViewport();
-  
+
   //==============================================================================================//
@@ -353,5 +356,5 @@ public:
   //==============================================================================================//
-  
+
   /*
-  
+
   public:
@@ -370,3 +373,3 @@ public:
   */
-  
+
   signals:
@@ -374,15 +377,15 @@ public:
     void clicked( OVersatileViewItem *, const QPoint & );  // QIconView
-    
+
     void pressed( OVersatileViewItem *, const QPoint &, int );  // QListView
     void pressed( OVersatileViewItem *, const QPoint & );  // QIconView
-    
+
     void rightButtonClicked( OVersatileViewItem* item, const QPoint& pos );  // QIconView
     void rightButtonClicked( OVersatileViewItem *, const QPoint&, int );  // QListView
-    
-    void rightButtonPressed( OVersatileViewItem* item, const QPoint& pos );  // QIconView   
+
+    void rightButtonPressed( OVersatileViewItem* item, const QPoint& pos );  // QIconView
     void rightButtonPressed( OVersatileViewItem *, const QPoint&, int );  // QListView
-    
+
     void mouseButtonPressed( int, OVersatileViewItem *, const QPoint& , int );  // QListView
     void mouseButtonPressed( int button, OVersatileViewItem* item, const QPoint& pos );  // QIconView
-    
+
     void mouseButtonClicked( int, OVersatileViewItem *,  const QPoint&, int );  // QListView
@@ -392,2 +395,4 @@ public:
 
+}
+}
 #endif