summaryrefslogtreecommitdiff
path: root/libopie2/opieui
authorzecke <zecke>2004-03-14 17:00:46 (UTC)
committer zecke <zecke>2004-03-14 17:00:46 (UTC)
commit52169e2469a1edcca986e9f0404c3ca815d5833b (patch) (side-by-side diff)
tree9c6651125f29fe63df33fe56b352d3288b2ea8df /libopie2/opieui
parent59106c8ffcf25181925281c519a2b49d6835ef9e (diff)
downloadopie-52169e2469a1edcca986e9f0404c3ca815d5833b.zip
opie-52169e2469a1edcca986e9f0404c3ca815d5833b.tar.gz
opie-52169e2469a1edcca986e9f0404c3ca815d5833b.tar.bz2
Change Signature of Signals to obey namespace
Make example compile
Diffstat (limited to 'libopie2/opieui') (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opieui/opopupmenu.h2
-rw-r--r--libopie2/opieui/otimepicker.h3
-rw-r--r--libopie2/opieui/oversatileview.h48
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
@@ -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
};