summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show 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 @@
12#include <qlayout.h> 12#include <qlayout.h>
13 13
14using namespace Opie::Ui; 14using namespace Opie::Ui;
15using namespace Opie::Core;
15 16
16OPIE_EXPORT_APP( OApplicationFactory<OSplitterExample> ) 17OPIE_EXPORT_APP( OApplicationFactory<OSplitterExample> )
17 18
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 @@
19#include <qpushbutton.h> 19#include <qpushbutton.h>
20#include <qsignalmapper.h> 20#include <qsignalmapper.h>
21 21
22using namespace Opie::Core;
22using namespace Opie::Ui; 23using namespace Opie::Ui;
23 24
24OPIE_EXPORT_APP( OApplicationFactory<StackExample> ) 25OPIE_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;
101 * 101 *
102 **proc << "my_executable"; 102 **proc << "my_executable";
103 **proc << "These" << "are" << "the" << "command" << "line" << "args"; 103 **proc << "These" << "are" << "the" << "command" << "line" << "args";
104 *QApplication::connect(proc, SIGNAL(processExited(OProcess *)), 104 *QApplication::connect(proc, SIGNAL(processExited(Opie::Core::OProcess *)),
105 * pointer_to_my_object, SLOT(my_objects_slot(OProcess *))); 105 * pointer_to_my_object, SLOT(my_objects_slot(Opie::Core::OProcess *)));
106 *proc->start(); 106 *proc->start();
107 *</pre> 107 *</pre>
108 * 108 *
@@ -480,7 +480,7 @@ signals:
480 * the process was run in the @p NotifyOnExit (==default option to 480 * the process was run in the @p NotifyOnExit (==default option to
481 * @ref start()) or the @ref Block mode. 481 * @ref start()) or the @ref Block mode.
482 **/ 482 **/
483 void processExited( OProcess *proc ); 483 void processExited( Opie::Core::OProcess *proc );
484 484
485 485
486 /** 486 /**
@@ -497,7 +497,7 @@ signals:
497 * You should copy the information contained in @p buffer to your private 497 * You should copy the information contained in @p buffer to your private
498 * data structures before returning from this slot. 498 * data structures before returning from this slot.
499 **/ 499 **/
500 void receivedStdout( OProcess *proc, char *buffer, int buflen ); 500 void receivedStdout( Opie::Core::OProcess *proc, char *buffer, int buflen );
501 501
502 /** 502 /**
503 * Emitted when output from the child process has 503 * Emitted when output from the child process has
@@ -530,14 +530,14 @@ signals:
530 * You should copy the information contained in @p buffer to your private 530 * You should copy the information contained in @p buffer to your private
531 * data structures before returning from this slot. 531 * data structures before returning from this slot.
532 */ 532 */
533 void receivedStderr( OProcess *proc, char *buffer, int buflen ); 533 void receivedStderr( Opie::Core::OProcess *proc, char *buffer, int buflen );
534 534
535 /** 535 /**
536 * Emitted after all the data that has been 536 * Emitted after all the data that has been
537 * specified by a prior call to @ref writeStdin() has actually been 537 * specified by a prior call to @ref writeStdin() has actually been
538 * written to the child process. 538 * written to the child process.
539 **/ 539 **/
540 void wroteStdin( OProcess *proc ); 540 void wroteStdin( Opie::Core::OProcess *proc );
541 541
542protected slots: 542protected slots:
543 543
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
698 /** 698 /**
699 * This signal is emitted, when a packet has been received. 699 * This signal is emitted, when a packet has been received.
700 */ 700 */
701 void receivedPacket( OPacket* ); 701 void receivedPacket( Opie::Net::OPacket* );
702 702
703 protected slots: 703 protected slots:
704 void readyToReceive(); 704 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:
234 * @param ctxMenu The context menu itself 234 * @param ctxMenu The context menu itself
235 * @since 3.2 235 * @since 3.2
236 */ 236 */
237 void aboutToShowContextMenu(OPopupMenu* menu, int menuItem, QPopupMenu* ctxMenu); 237 void aboutToShowContextMenu(Opie::Ui::OPopupMenu* menu, int menuItem, QPopupMenu* ctxMenu);
238 238
239protected: 239protected:
240 virtual void closeEvent(QCloseEvent *); 240 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:
125/* for Qt2 */ 125/* for Qt2 */
126#if ( QT_VERSION-0 >= 0x030000 ) 126#if ( QT_VERSION-0 >= 0x030000 )
127#error "Fix the UI File to use namespaces" 127#error "Fix the UI File to use namespaces"
128#else
129typedef Opie::Ui::OTimePicker OUIOTimePicker;
130#endif 128#endif
131#endif 129#endif
132
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
147 147
148 signals: 148 signals:
149 149
150 void contextMenuRequested( OVersatileViewItem * item, const QPoint& pos, int col ); 150 void contextMenuRequested( Opie::Ui::OVersatileViewItem * item, const QPoint& pos, int col );
151 151
152 /*#ifndef QT_NO_DRAGANDDROP 152 /*#ifndef QT_NO_DRAGANDDROP
153 void dropped( QDropEvent *e, const QValueList<QIconDragItem> &lst ); // QIconView 153 void dropped( QDropEvent *e, const QValueList<QIconDragItem> &lst ); // QIconView
@@ -236,8 +236,8 @@ public:
236 void triggerUpdate(); // QListView 236 void triggerUpdate(); // QListView
237 237
238 signals: 238 signals:
239 void expanded( OVersatileViewItem *item ); // QListView 239 void expanded( Opie::Ui::OVersatileViewItem *item ); // QListView
240 void collapsed( OVersatileViewItem *item ); // QListView 240 void collapsed( Opie::Ui::OVersatileViewItem *item ); // QListView
241 241
242 // 242 //
243 // only in QIconView 243 // only in QIconView
@@ -297,8 +297,8 @@ public:
297 #endif 297 #endif
298 */ 298 */
299 void moved(); // QIconView 299 void moved(); // QIconView
300 void itemRenamed( OVersatileViewItem *item, const QString & ); // QIconView 300 void itemRenamed( Opie::Ui::OVersatileViewItem *item, const QString & ); // QIconView
301 void itemRenamed( OVersatileViewItem *item ); // QIconView 301 void itemRenamed( Opie::Ui::OVersatileViewItem *item ); // QIconView
302 302
303 //==============================================================================================// 303 //==============================================================================================//
304 // "Derived" API - Case 2: Methods existing in QListView and QIconView with the same signatures 304 // "Derived" API - Case 2: Methods existing in QListView and QIconView with the same signatures
@@ -340,15 +340,15 @@ public:
340 340
341 signals: 341 signals:
342 void selectionChanged(); 342 void selectionChanged();
343 void selectionChanged( OVersatileViewItem * ); 343 void selectionChanged( Opie::Ui::OVersatileViewItem * );
344 void currentChanged( OVersatileViewItem * ); 344 void currentChanged( Opie::Ui::OVersatileViewItem * );
345 void clicked( OVersatileViewItem * ); 345 void clicked( Opie::Ui::OVersatileViewItem * );
346 void pressed( OVersatileViewItem * ); 346 void pressed( Opie::Ui::OVersatileViewItem * );
347 347
348 void doubleClicked( OVersatileViewItem * ); 348 void doubleClicked( Opie::Ui::OVersatileViewItem * );
349 void returnPressed( OVersatileViewItem * ); 349 void returnPressed( Opie::Ui::OVersatileViewItem * );
350 350
351 void onItem( OVersatileViewItem * ); 351 void onItem( Opie::Ui::OVersatileViewItem * );
352 void onViewport(); 352 void onViewport();
353 353
354 //==============================================================================================// 354 //==============================================================================================//
@@ -373,23 +373,23 @@ public:
373 */ 373 */
374 374
375 signals: 375 signals:
376 void clicked( OVersatileViewItem *, const QPoint &, int ); // QListView 376 void clicked( Opie::Ui::OVersatileViewItem *, const QPoint &, int ); // QListView
377 void clicked( OVersatileViewItem *, const QPoint & ); // QIconView 377 void clicked( Opie::Ui::OVersatileViewItem *, const QPoint & ); // QIconView
378 378
379 void pressed( OVersatileViewItem *, const QPoint &, int ); // QListView 379 void pressed( Opie::Ui::OVersatileViewItem *, const QPoint &, int ); // QListView
380 void pressed( OVersatileViewItem *, const QPoint & ); // QIconView 380 void pressed( Opie::Ui::OVersatileViewItem *, const QPoint & ); // QIconView
381 381
382 void rightButtonClicked( OVersatileViewItem* item, const QPoint& pos ); // QIconView 382 void rightButtonClicked( Opie::Ui::OVersatileViewItem* item, const QPoint& pos ); // QIconView
383 void rightButtonClicked( OVersatileViewItem *, const QPoint&, int ); // QListView 383 void rightButtonClicked( Opie::Ui::OVersatileViewItem *, const QPoint&, int ); // QListView
384 384
385 void rightButtonPressed( OVersatileViewItem* item, const QPoint& pos ); // QIconView 385 void rightButtonPressed( Opie::Ui::OVersatileViewItem* item, const QPoint& pos ); // QIconView
386 void rightButtonPressed( OVersatileViewItem *, const QPoint&, int ); // QListView 386 void rightButtonPressed( Opie::Ui::OVersatileViewItem *, const QPoint&, int ); // QListView
387 387
388 void mouseButtonPressed( int, OVersatileViewItem *, const QPoint& , int ); // QListView 388 void mouseButtonPressed( int, Opie::Ui::OVersatileViewItem *, const QPoint& , int ); // QListView
389 void mouseButtonPressed( int button, OVersatileViewItem* item, const QPoint& pos ); // QIconView 389 void mouseButtonPressed( int button, Opie::Ui::OVersatileViewItem* item, const QPoint& pos ); // QIconView
390 390
391 void mouseButtonClicked( int, OVersatileViewItem *, const QPoint&, int ); // QListView 391 void mouseButtonClicked( int, Opie::Ui::OVersatileViewItem *, const QPoint&, int ); // QListView
392 void mouseButtonClicked( int button, OVersatileViewItem* item, const QPoint& pos ); // QIconView 392 void mouseButtonClicked( int button, Opie::Ui::OVersatileViewItem* item, const QPoint& pos ); // QIconView
393 393
394}; 394};
395 395