7 files changed, 34 insertions, 35 deletions

diff --git a/libopie2/examples/opieui/osplitter_example/osplitter_example.cpp b/libopie2/examples/opieui/osplitter_example/osplitter_example.cpp
index 4a1468d..07c7e51 100644
--- a/libopie2/examples/opieui/osplitter_example/osplitter_example.cpp
+++ b/libopie2/examples/opieui/osplitter_example/osplitter_example.cpp
@@ -11,8 +11,9 @@
 #include <qdir.h>
 #include <qlayout.h>
 
 using namespace Opie::Ui;
+using namespace Opie::Core;
 
 OPIE_EXPORT_APP( OApplicationFactory<OSplitterExample> )
 
 OSplitterExample::OSplitterExample( QWidget *w,const char* n,WFlags f )
diff --git a/libopie2/examples/opieui/owidgetstack_example/owidgetstack_example.cpp b/libopie2/examples/opieui/owidgetstack_example/owidgetstack_example.cpp
index 50cc11b..272e42b 100644
--- a/libopie2/examples/opieui/owidgetstack_example/owidgetstack_example.cpp
+++ b/libopie2/examples/opieui/owidgetstack_example/owidgetstack_example.cpp
@@ -18,8 +18,9 @@
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qsignalmapper.h>
 
+using namespace Opie::Core;
 using namespace Opie::Ui;
 
 OPIE_EXPORT_APP( OApplicationFactory<StackExample> )
 
diff --git a/libopie2/opiecore/oprocess.h b/libopie2/opiecore/oprocess.h
index eb56b03..e23f98c 100644
--- a/libopie2/opiecore/oprocess.h
+++ b/libopie2/opiecore/oprocess.h
@@ -100,10 +100,10 @@ class OProcessPrivate;
  *OProcess *proc = new OProcess;
  *
  **proc << "my_executable";
  **proc << "These" << "are" << "the" << "command" << "line" << "args";
- *QApplication::connect(proc, SIGNAL(processExited(OProcess *)),
- *                      pointer_to_my_object, SLOT(my_objects_slot(OProcess *)));
+ *QApplication::connect(proc, SIGNAL(processExited(Opie::Core::OProcess *)),
+ *                      pointer_to_my_object, SLOT(my_objects_slot(Opie::Core::OProcess *)));
  *proc->start();
  *</pre>
  *
  *This will start "my_executable" with the commandline arguments "These"...
@@ -479,9 +479,9 @@ signals:
      * Emitted after the process has terminated when
      * the process was run in the @p NotifyOnExit  (==default option to
      * @ref start()) or the @ref Block mode.
      **/
-    void processExited( OProcess *proc );
+    void processExited( Opie::Core::OProcess *proc );
 
 
     /**
      * Emitted, when output from the child process has
@@ -496,9 +496,9 @@ signals:
      *
      * You should copy the information contained in @p buffer to your private
      * data structures before returning from this slot.
      **/
-    void receivedStdout( OProcess *proc, char *buffer, int buflen );
+    void receivedStdout( Opie::Core::OProcess *proc, char *buffer, int buflen );
 
     /**
      * Emitted when output from the child process has
      * been received on stdout.
@@ -529,16 +529,16 @@ signals:
      *
      * You should copy the information contained in @p buffer to your private
      * data structures before returning from this slot.
     */
-    void receivedStderr( OProcess *proc, char *buffer, int buflen );
+    void receivedStderr( Opie::Core::OProcess *proc, char *buffer, int buflen );
 
     /**
      * Emitted after all the data that has been
      * specified by a prior call to @ref writeStdin() has actually been
      * written to the child process.
      **/
-    void wroteStdin( OProcess *proc );
+    void wroteStdin( Opie::Core::OProcess *proc );
 
 protected slots:
 
     /**
diff --git a/libopie2/opienet/opcap.h b/libopie2/opienet/opcap.h
index dc609a3..72a78de 100644
--- a/libopie2/opienet/opcap.h
+++ b/libopie2/opienet/opcap.h
@@ -697,9 +697,9 @@ class OPacketCapturer : public QObject
   signals:
     /**
      * This signal is emitted, when a packet has been received.
      */
-    void receivedPacket( OPacket* );
+    void receivedPacket( Opie::Net::OPacket* );
 
   protected slots:
     void readyToReceive();
 
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
@@ -233,9 +233,9 @@ signals:
      * @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);
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
@@ -124,9 +124,6 @@ private:
 
 /* 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
@@ -146,9 +146,9 @@ class OVersatileView : public QWidgetStack
     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
@@ -235,10 +235,10 @@ public:
   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
     //
@@ -296,10 +296,10 @@ public:
     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
   //==============================================================================================//
@@ -339,17 +339,17 @@ public:
     // 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
@@ -372,25 +372,25 @@ public:
 
   */
 
   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
 
 };
 
 }