diff --git a/kworldwatch/flow.cpp b/kworldwatch/flow.cpp index 519ed85..9232cda 100644 --- a/kworldwatch/flow.cpp +++ b/kworldwatch/flow.cpp @@ -83,22 +83,12 @@ TQSize SimpleFlow::sizeHint() const TQSizePolicy::ExpandData SimpleFlow::expanding() const { -#ifdef USE_QT4 - return (Qt::Orientation)TQSizePolicy::NoDirection; -#else // USE_QT4 return TQSizePolicy::NoDirection; -#endif // USE_QT4 } TQLayoutIterator SimpleFlow::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 SimpleFlowIterator( &list ) ); -#endif // USE_QT4 } void SimpleFlow::setGeometry( const TQRect &r ) @@ -142,34 +132,3 @@ TQSize SimpleFlow::minimumSize() const } return s; } - -#ifdef USE_QT4 -/*! - \reimp -*/ -int SimpleFlow::count() const { - return list.count(); -} - -/*! - \reimp -*/ -TQLayoutItem* SimpleFlow::itemAt(int index) const { - return index >= 0 && index < list.count() ? (const_cast&>(list).at(index)) : 0; -} - -/*! - \reimp -*/ -TQLayoutItem* SimpleFlow::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/kworldwatch/flow.h b/kworldwatch/flow.h index e027e64..6eed52e 100644 --- a/kworldwatch/flow.h +++ b/kworldwatch/flow.h @@ -42,10 +42,6 @@ public: TQLayoutIterator iterator(); TQSizePolicy::ExpandData expanding() const; -#ifdef USE_QT4 - QLAYOUT_REQUIRED_METHOD_DECLARATIONS -#endif // USE_QT4 - protected: void setGeometry( const TQRect& );