summaryrefslogtreecommitdiff
path: root/libopie2/opieui
Unidiff
Diffstat (limited to 'libopie2/opieui') (more/less context) (ignore 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
@@ -235,5 +235,5 @@ signals:
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:
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
@@ -126,7 +126,4 @@ private:
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
@@ -148,5 +148,5 @@ class OVersatileView : public QWidgetStack
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
@@ -237,6 +237,6 @@ public:
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 //
@@ -298,6 +298,6 @@ public:
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 //==============================================================================================//
@@ -341,13 +341,13 @@ public:
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
@@ -374,21 +374,21 @@ public:
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};