summaryrefslogtreecommitdiff
path: root/libopie2
Side-by-side diff
Diffstat (limited to 'libopie2') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/examples/opieui/osplitter_example/osplitter_example.cpp1
-rw-r--r--libopie2/examples/opieui/owidgetstack_example/owidgetstack_example.cpp1
-rw-r--r--libopie2/opiecore/oprocess.h12
-rw-r--r--libopie2/opienet/opcap.h2
-rw-r--r--libopie2/opieui/opopupmenu.h2
-rw-r--r--libopie2/opieui/otimepicker.h3
-rw-r--r--libopie2/opieui/oversatileview.h48
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
@@ -12,6 +12,7 @@
#include <qlayout.h>
using namespace Opie::Ui;
+using namespace Opie::Core;
OPIE_EXPORT_APP( OApplicationFactory<OSplitterExample> )
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
@@ -19,6 +19,7 @@
#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
@@ -101,8 +101,8 @@ class OProcessPrivate;
*
**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>
*
@@ -480,7 +480,7 @@ signals:
* 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 );
/**
@@ -497,7 +497,7 @@ 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
@@ -530,14 +530,14 @@ 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
@@ -698,7 +698,7 @@ class OPacketCapturer : public QObject
/**
* 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
@@ -234,7 +234,7 @@ signals:
* @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 *);
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
@@ -125,8 +125,5 @@ 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
@@ -147,7 +147,7 @@ class OVersatileView : public QWidgetStack
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
@@ -236,8 +236,8 @@ public:
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
@@ -297,8 +297,8 @@ public:
#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
@@ -340,15 +340,15 @@ public:
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();
//==============================================================================================//
@@ -373,23 +373,23 @@ 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
};