From 75350e0e8770d1e873259634f3da3b4a11fcd42c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Nov 2011 02:52:10 -0600
Subject: [PATCH] Fix FTBFS (cherry picked from commit
 2dc7f12e969b3cef97b80fcbe7bc5a63b37b9a10)

---
 amarok/src/amarokcore/amarok.kcfg    | 2 +-
 amarok/src/socketserver.cpp          | 2 +-
 amarok/src/tagguesserconfigdialog.ui | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/amarok/src/amarokcore/amarok.kcfg b/amarok/src/amarokcore/amarok.kcfg
index bf618fcc..94d026e0 100644
--- a/amarok/src/amarokcore/amarok.kcfg
+++ b/amarok/src/amarokcore/amarok.kcfg
@@ -404,7 +404,7 @@
     <entry key="Osd Font" type="Font">
         <label>Font for On-Screen Display</label>
         <whatsthis>The font to use for the On-Screen Display.</whatsthis>
-        <default code="true">QFont("Arial",16)</default>
+        <default code="true">TQFont("Arial",16)</default>
     </entry>
     <entry key="Osd Draw Shadow" type="Bool">
         <label>Draw a shadow around the text.</label>
diff --git a/amarok/src/socketserver.cpp b/amarok/src/socketserver.cpp
index 8559bbeb..5d4e473c 100644
--- a/amarok/src/socketserver.cpp
+++ b/amarok/src/socketserver.cpp
@@ -101,7 +101,7 @@ Vis::SocketServer::newConnection( int sockfd )
 /// @class Vis::SocketNotifier
 
 Vis::SocketNotifier::SocketNotifier( int sockfd )
-        : TQSocketNotifier( sockfd, QSocketNotifier::Read, TQT_TQOBJECT(this) )
+        : TQSocketNotifier( sockfd, TQSocketNotifier::Read, TQT_TQOBJECT(this) )
 {
     connect( this, TQT_SIGNAL(activated( int )), TQT_SLOT(request( int )) );
 }
diff --git a/amarok/src/tagguesserconfigdialog.ui b/amarok/src/tagguesserconfigdialog.ui
index 2241f093..d99d254c 100644
--- a/amarok/src/tagguesserconfigdialog.ui
+++ b/amarok/src/tagguesserconfigdialog.ui
@@ -202,6 +202,9 @@ Note that the order in which the schemes appear in the list is relevant, since t
     <slot specifier="non virtual">slotModifyClicked()</slot>
     <slot specifier="non virtual">slotRemoveClicked()</slot>
 </Q_SLOTS>
+<forwards>
+    <forward>class TQListViewItem;</forward>
+</forwards>
 <functions>
     <function access="private" specifier="non virtual">init()</function>
 </functions>