diff options
| -rw-r--r-- | plugins/gui-quickbar/buttonflowlayout.cpp | 36 | ||||
| -rw-r--r-- | plugins/gui-quickbar/buttonflowlayout.h | 4 |
2 files changed, 0 insertions, 40 deletions
diff --git a/plugins/gui-quickbar/buttonflowlayout.cpp b/plugins/gui-quickbar/buttonflowlayout.cpp index 023bc8f..950e519 100644 --- a/plugins/gui-quickbar/buttonflowlayout.cpp +++ b/plugins/gui-quickbar/buttonflowlayout.cpp @@ -116,13 +116,7 @@ TQSizePolicy::ExpandData ButtonFlowLayout::expanding() const TQLayoutIterator ButtonFlowLayout::iterator() { - // [FIXME] -#ifdef USE_QT4 - #warning [FIXME] ContainerAreaLayout iterators may not function correctly under Qt4 - return TQLayoutIterator( this ); // [FIXME] -#else // USE_QT4 return TQLayoutIterator( new ButtonFlowLayoutIterator( &list ) ); -#endif // USE_QT4 } void ButtonFlowLayout::setGeometry( const TQRect &r ) @@ -236,33 +230,3 @@ TQSize ButtonFlowLayout::minimumSize(const TQSize &r) const return s; } - -#ifdef USE_QT4 -/*! - \reimp -*/ -int ButtonFlowLayout::count() const { - return list.count(); -} - -/*! - \reimp -*/ -TQLayoutItem* ButtonFlowLayout::itemAt(int index) const { - return index >= 0 && index < list.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(list).at(index)) : 0; -} - -/*! - \reimp -*/ -TQLayoutItem* ButtonFlowLayout::takeAt(int index) { - if (index < 0 || index >= list.count()) - return 0; - TQLayoutItem *item = list.at(index); - list.remove(list.at(index)); - delete item; - - invalidate(); - return item; -} -#endif // USE_QT4 diff --git a/plugins/gui-quickbar/buttonflowlayout.h b/plugins/gui-quickbar/buttonflowlayout.h index f092a74..117197a 100644 --- a/plugins/gui-quickbar/buttonflowlayout.h +++ b/plugins/gui-quickbar/buttonflowlayout.h @@ -47,10 +47,6 @@ public: TQLayoutIterator iterator(); TQSizePolicy::ExpandData expanding() const; -#ifdef USE_QT4 - QLAYOUT_REQUIRED_METHOD_DECLARATIONS -#endif // USE_QT4 - protected: void setGeometry( const TQRect& ); |