Drop USE_TQT4 code

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 8e878ece57)
r14.1.x
Michele Calgaro 1 year ago
parent 2d3320fc2f
commit d9559c5f69
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -83,22 +83,12 @@ TQSize SimpleFlow::sizeHint() const
TQSizePolicy::ExpandData SimpleFlow::expanding() const TQSizePolicy::ExpandData SimpleFlow::expanding() const
{ {
#ifdef USE_QT4
return (Qt::Orientation)TQSizePolicy::NoDirection;
#else // USE_QT4
return TQSizePolicy::NoDirection; return TQSizePolicy::NoDirection;
#endif // USE_QT4
} }
TQLayoutIterator SimpleFlow::iterator() 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 ) ); return TQLayoutIterator( new SimpleFlowIterator( &list ) );
#endif // USE_QT4
} }
void SimpleFlow::setGeometry( const TQRect &r ) void SimpleFlow::setGeometry( const TQRect &r )
@ -142,34 +132,3 @@ TQSize SimpleFlow::minimumSize() const
} }
return s; 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<TQPtrList<TQLayoutItem>&>(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

@ -42,10 +42,6 @@ public:
TQLayoutIterator iterator(); TQLayoutIterator iterator();
TQSizePolicy::ExpandData expanding() const; TQSizePolicy::ExpandData expanding() const;
#ifdef USE_QT4
QLAYOUT_REQUIRED_METHOD_DECLARATIONS
#endif // USE_QT4
protected: protected:
void setGeometry( const TQRect& ); void setGeometry( const TQRect& );

Loading…
Cancel
Save