pull/1/head
Timothy Pearson 13 years ago
parent f065ef42a5
commit d03f8569b3

@ -94,7 +94,7 @@ int ButtonFlowLayout::heightForWidth( int w ) const
return cached_hfw;
}
void ButtonFlowLayout::addItem( QLayoutItem *item)
void ButtonFlowLayout::addItem( TQLayoutItem *item)
{
list.append( TQT_TQLAYOUTITEM(item) );
}

@ -38,7 +38,7 @@ public:
~ButtonFlowLayout();
void addItem( QLayoutItem *item);
void addItem( TQLayoutItem *item);
bool hasHeightForWidth() const;
int heightForWidth( int ) const;
TQSize tqsizeHint() const;

@ -588,7 +588,6 @@ void Recording::stopEncoder(SoundStreamID id)
//logDebug("stopEncoder thread = " + TQString::number((long long)thread, 16));
//logDebug("stopEncoder thread error = " + TQString::number(thread->error(), 16));
#if (TDE_VERSION_MAJOR >= 3) && (TDE_VERSION_MINOR >= 1)
// FIXME: set a timer and do waiting "in background"
if (!thread->wait(5000)) {
//m_context.setError();
@ -596,10 +595,6 @@ void Recording::stopEncoder(SoundStreamID id)
thread->terminate();
thread->wait();
} else {
#else
logError(i18n("Waiting for encoding thread to terminate."));
thread->wait();
#endif
if (thread->error()) {
//m_context.setError();
logError(thread->errorString());

Loading…
Cancel
Save