diff --git a/src/flowlayout.cpp b/src/flowlayout.cpp index f24aef8..8ca8d5d 100644 --- a/src/flowlayout.cpp +++ b/src/flowlayout.cpp @@ -209,13 +209,7 @@ TQSizePolicy::ExpandData FlowLayout::expanding() const{ } TQLayoutIterator FlowLayout::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 FlowLayoutIterator(&mLayoutItems)); -#endif // USE_QT4 } Qt::Orientation FlowLayout::getOrientation() const{ @@ -316,33 +310,4 @@ int FlowLayout::doLayoutVertical( const TQRect& rect, bool testOnly ){ return y + height - rect.y(); // height } -#ifdef USE_QT4 -/*! - \reimp -*/ -int FlowLayout::count() const { - return mLayoutItems.count(); -} - -/*! - \reimp -*/ -TQLayoutItem* FlowLayout::itemAt(int index) const { - return index >= 0 && index < mLayoutItems.count() ? (const_cast&>(mLayoutItems).at(index)) : 0; -} - -/*! - \reimp -*/ -TQLayoutItem* FlowLayout::takeAt(int index) { - if (index < 0 || index >= mLayoutItems.count()) - return 0; - TQLayoutItem *item = mLayoutItems.at(index); - mLayoutItems.remove(mLayoutItems.at(index)); - delete item; - - invalidate(); - return item; -} -#endif // USE_QT4 #include "flowlayout.moc" diff --git a/src/flowlayout.h b/src/flowlayout.h index abe1c4f..df68e66 100644 --- a/src/flowlayout.h +++ b/src/flowlayout.h @@ -68,10 +68,6 @@ public: TQSizePolicy::ExpandData expanding() const; Qt::Orientation getOrientation() const; -#ifdef USE_QT4 - QLAYOUT_REQUIRED_METHOD_DECLARATIONS -#endif // USE_QT4 - public slots: void setOrientation(Qt::Orientation orientation);