-rw-r--r-- | libopie2/opieui/opopupmenu.h | 2 | ||||
-rw-r--r-- | libopie2/opieui/otimepicker.h | 3 | ||||
-rw-r--r-- | libopie2/opieui/oversatileview.h | 48 |
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 | |||
@@ -225,25 +225,25 @@ public: | |||
225 | * @since 3.2 | 225 | * @since 3.2 |
226 | */ | 226 | */ |
227 | static int contextMenuFocusItem(); | 227 | static int contextMenuFocusItem(); |
228 | 228 | ||
229 | signals: | 229 | signals: |
230 | /** | 230 | /** |
231 | * connect to this signal to be notified when a context menu is about to be shown | 231 | * connect to this signal to be notified when a context menu is about to be shown |
232 | * @param menu The menu that the context menu is about to be shown for | 232 | * @param menu The menu that the context menu is about to be shown for |
233 | * @param menuItem The menu item that the context menu is currently on | 233 | * @param menuItem The menu item that the context menu is currently on |
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 | ||
239 | protected: | 239 | protected: |
240 | virtual void closeEvent(QCloseEvent *); | 240 | virtual void closeEvent(QCloseEvent *); |
241 | virtual void keyPressEvent(QKeyEvent* e); | 241 | virtual void keyPressEvent(QKeyEvent* e); |
242 | virtual bool eventFilter(QObject* obj, QEvent* event); | 242 | virtual bool eventFilter(QObject* obj, QEvent* event); |
243 | virtual void hideEvent(QHideEvent*); | 243 | virtual void hideEvent(QHideEvent*); |
244 | 244 | ||
245 | virtual void virtual_hook( int id, void* data ); | 245 | virtual void virtual_hook( int id, void* data ); |
246 | 246 | ||
247 | protected slots: | 247 | protected slots: |
248 | /// @since 3.1 | 248 | /// @since 3.1 |
249 | QString underlineText(const QString& text, uint length); | 249 | QString underlineText(const QString& text, uint length); |
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 | |||
@@ -116,17 +116,14 @@ private: | |||
116 | OTimePicker *m_timePicker; | 116 | OTimePicker *m_timePicker; |
117 | QTime m_time; | 117 | QTime m_time; |
118 | class Private; | 118 | class Private; |
119 | Private* d; | 119 | Private* d; |
120 | }; | 120 | }; |
121 | 121 | ||
122 | } | 122 | } |
123 | } | 123 | } |
124 | 124 | ||
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 | ||
129 | typedef 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 | |||
@@ -138,25 +138,25 @@ class OVersatileView : public QWidgetStack | |||
138 | void currentChanged( QIconViewItem * ); | 138 | void currentChanged( QIconViewItem * ); |
139 | void clicked( QIconViewItem * ); | 139 | void clicked( QIconViewItem * ); |
140 | void pressed( QIconViewItem * ); | 140 | void pressed( QIconViewItem * ); |
141 | void doubleClicked( QIconViewItem * ); | 141 | void doubleClicked( QIconViewItem * ); |
142 | void returnPressed( QIconViewItem * ); | 142 | void returnPressed( QIconViewItem * ); |
143 | void onItem( QIconViewItem * ); | 143 | void onItem( QIconViewItem * ); |
144 | 144 | ||
145 | void expanded( QListViewItem * item ); // QListView | 145 | void expanded( QListViewItem * item ); // QListView |
146 | void collapsed( QListViewItem * item ); // QListView | 146 | void collapsed( QListViewItem * item ); // QListView |
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 |
154 | #endif | 154 | #endif |
155 | void itemRenamed( OVersatileViewItem *item, const QString & ); // QIconView | 155 | void itemRenamed( OVersatileViewItem *item, const QString & ); // QIconView |
156 | void itemRenamed( OVersatileViewItem *item ); // QIconView | 156 | void itemRenamed( OVersatileViewItem *item ); // QIconView |
157 | */ | 157 | */ |
158 | 158 | ||
159 | //==============================================================================================// | 159 | //==============================================================================================// |
160 | // "Derived" API - Case 1: Methods existing either only in QListView or only in QIconView | 160 | // "Derived" API - Case 1: Methods existing either only in QListView or only in QIconView |
161 | //==============================================================================================// | 161 | //==============================================================================================// |
162 | 162 | ||
@@ -227,26 +227,26 @@ public: | |||
227 | virtual void setRootIsDecorated( bool ); // QListView | 227 | virtual void setRootIsDecorated( bool ); // QListView |
228 | bool rootIsDecorated() const; // QListView | 228 | bool rootIsDecorated() const; // QListView |
229 | 229 | ||
230 | void setShowSortIndicator( bool show ); // QListView | 230 | void setShowSortIndicator( bool show ); // QListView |
231 | bool showSortIndicator() const; // QListView | 231 | bool showSortIndicator() const; // QListView |
232 | 232 | ||
233 | int index( const OVersatileViewItem *item ) const; // QIconView | 233 | int index( const OVersatileViewItem *item ) const; // QIconView |
234 | 234 | ||
235 | public slots: | 235 | public slots: |
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 |
244 | // | 244 | // |
245 | 245 | ||
246 | public: | 246 | public: |
247 | uint count() const; // QIconView | 247 | uint count() const; // QIconView |
248 | 248 | ||
249 | OVersatileViewItem *firstItem() const; // QIconView | 249 | OVersatileViewItem *firstItem() const; // QIconView |
250 | OVersatileViewItem *lastItem() const; // QIconView | 250 | OVersatileViewItem *lastItem() const; // QIconView |
251 | 251 | ||
252 | OVersatileViewItem *findItem( const QPoint &pos ) const; // QIconView | 252 | OVersatileViewItem *findItem( const QPoint &pos ) const; // QIconView |
@@ -288,26 +288,26 @@ public: | |||
288 | 288 | ||
289 | public slots: | 289 | public slots: |
290 | virtual void arrangeItemsInGrid( const QSize &grid, bool update = TRUE ); // QIconView | 290 | virtual void arrangeItemsInGrid( const QSize &grid, bool update = TRUE ); // QIconView |
291 | virtual void arrangeItemsInGrid( bool update = TRUE ); // QIconView | 291 | virtual void arrangeItemsInGrid( bool update = TRUE ); // QIconView |
292 | virtual void updateContents(); // QIconView | 292 | virtual void updateContents(); // QIconView |
293 | 293 | ||
294 | signals: | 294 | signals: |
295 | /*#ifndef QT_NO_DRAGANDDROP | 295 | /*#ifndef QT_NO_DRAGANDDROP |
296 | void dropped( QDropEvent *e, const QValueList<QIconDragItem> &lst ); // QIconView | 296 | void dropped( QDropEvent *e, const QValueList<QIconDragItem> &lst ); // QIconView |
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 |
305 | //==============================================================================================// | 305 | //==============================================================================================// |
306 | 306 | ||
307 | public: | 307 | public: |
308 | enum SelectionMode { | 308 | enum SelectionMode { |
309 | Single = 0, | 309 | Single = 0, |
310 | Multi, | 310 | Multi, |
311 | Extended, | 311 | Extended, |
312 | NoSelection | 312 | NoSelection |
313 | }; | 313 | }; |
@@ -331,69 +331,69 @@ public: | |||
331 | 331 | ||
332 | virtual void setCurrentItem( OVersatileViewItem * ); | 332 | virtual void setCurrentItem( OVersatileViewItem * ); |
333 | OVersatileViewItem * currentItem() const; | 333 | OVersatileViewItem * currentItem() const; |
334 | 334 | ||
335 | // bool eventFilter( QObject * o, QEvent * ); // use QWidgetStack implementation | 335 | // bool eventFilter( QObject * o, QEvent * ); // use QWidgetStack implementation |
336 | 336 | ||
337 | // QSize minimumSizeHint() const; // use QWidgetStack implementation | 337 | // QSize minimumSizeHint() const; // use QWidgetStack implementation |
338 | // QSizePolicy sizePolicy() const; // use QWidgetStack implementation | 338 | // QSizePolicy sizePolicy() const; // use QWidgetStack implementation |
339 | // QSize sizeHint() const; // use QWidgetStack implementation | 339 | // QSize sizeHint() const; // use QWidgetStack implementation |
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 | //==============================================================================================// |
355 | // "Derived" API - Case 2: Methods existing in QListView and QIconView with differing signatures | 355 | // "Derived" API - Case 2: Methods existing in QListView and QIconView with differing signatures |
356 | //==============================================================================================// | 356 | //==============================================================================================// |
357 | 357 | ||
358 | /* | 358 | /* |
359 | 359 | ||
360 | public: | 360 | public: |
361 | virtual void insertItem( OVersatileViewItem * ); // QListView | 361 | virtual void insertItem( OVersatileViewItem * ); // QListView |
362 | virtual void insertItem( OVersatileViewItem *item, OVersatileViewItem *after = 0L ); // QIconView | 362 | virtual void insertItem( OVersatileViewItem *item, OVersatileViewItem *after = 0L ); // QIconView |
363 | 363 | ||
364 | virtual void setSelected( OVersatileViewItem *, bool ); // QListView | 364 | virtual void setSelected( OVersatileViewItem *, bool ); // QListView |
365 | virtual void setSelected( OVersatileViewItem *item, bool s, bool cb = FALSE ); // QIconView | 365 | virtual void setSelected( OVersatileViewItem *item, bool s, bool cb = FALSE ); // QIconView |
366 | 366 | ||
367 | virtual void setSorting( int column, bool increasing = TRUE ); // QListView | 367 | virtual void setSorting( int column, bool increasing = TRUE ); // QListView |
368 | void setSorting( bool sort, bool ascending = TRUE ); // QIconView | 368 | void setSorting( bool sort, bool ascending = TRUE ); // QIconView |
369 | 369 | ||
370 | void sort(); // #### make virtual in next major release // QListView | 370 | void sort(); // #### make virtual in next major release // QListView |
371 | virtual void sort( bool ascending = TRUE ); // QIconView | 371 | virtual void sort( bool ascending = TRUE ); // QIconView |
372 | 372 | ||
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 | ||
396 | } | 396 | } |
397 | } | 397 | } |
398 | #endif | 398 | #endif |
399 | 399 | ||