From 26274e177ec3438ae89c2765d93df4eded7db7b1 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Nov 2011 20:22:09 -0600
Subject: [PATCH] Fix FTBFS (cherry picked from commit
 d03f8569b307b380b4d1e6070d5e76e5f6868850)

---
 kradio3/plugins/gui-quickbar/buttonflowlayout.cpp | 4 ++--
 kradio3/plugins/gui-quickbar/buttonflowlayout.h   | 2 +-
 kradio3/plugins/recording/recording.cpp           | 5 -----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp b/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp
index 499ec8d..4cd8dd0 100644
--- a/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp
+++ b/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp
@@ -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) );
 }
@@ -265,4 +265,4 @@ TQLayoutItem* ButtonFlowLayout::takeAt(int index) {
 	invalidate();
 	return item;
 }
-#endif // USE_QT4
\ No newline at end of file
+#endif // USE_QT4
diff --git a/kradio3/plugins/gui-quickbar/buttonflowlayout.h b/kradio3/plugins/gui-quickbar/buttonflowlayout.h
index 885f6f7..fe33efc 100644
--- a/kradio3/plugins/gui-quickbar/buttonflowlayout.h
+++ b/kradio3/plugins/gui-quickbar/buttonflowlayout.h
@@ -38,7 +38,7 @@ public:
 
     ~ButtonFlowLayout();
 
-    void addItem( QLayoutItem *item);
+    void addItem( TQLayoutItem *item);
     bool hasHeightForWidth() const;
     int heightForWidth( int ) const;
     TQSize tqsizeHint() const;
diff --git a/kradio3/plugins/recording/recording.cpp b/kradio3/plugins/recording/recording.cpp
index a430e02..f82629d 100644
--- a/kradio3/plugins/recording/recording.cpp
+++ b/kradio3/plugins/recording/recording.cpp
@@ -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 (KDE_VERSION_MAJOR >= 3) && (KDE_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());