Index: i18n/i18n.pro
===================================================================
--- i18n/i18n.pro	(revision 20066)
+++ i18n/i18n.pro	(working copy)
@@ -17,3 +17,4 @@
 INSTALLS += trans
 
 SOURCES += dummy.c
+QT += xml network  sql opengl qt3support 
Index: themes/themes.pro
===================================================================
--- themes/themes.pro	(revision 20066)
+++ themes/themes.pro	(working copy)
@@ -20,3 +20,4 @@
 
 # Input
 SOURCES += dummy.c
+QT += xml network  sql opengl qt3support 
Index: libs/libmythtv/dtvconfparserhelpers.h
===================================================================
--- libs/libmythtv/dtvconfparserhelpers.h	(revision 20066)
+++ libs/libmythtv/dtvconfparserhelpers.h	(working copy)
@@ -32,7 +32,7 @@
 #ifndef _DTVCONFPARSERHELPERS_H_
 #define _DTVCONFPARSERHELPERS_H_
 
-#include <qstring.h>
+#include <QString>
 
 // The following are a set of helper classes to allow easy translation
 // between the different string representations of various tuning params.
Index: libs/libmythtv/linuxavcinfo.h
===================================================================
--- libs/libmythtv/linuxavcinfo.h	(revision 20066)
+++ libs/libmythtv/linuxavcinfo.h	(working copy)
@@ -11,7 +11,7 @@
 #include <libavc1394/rom1394.h>
 
 // Qt headers
-#include <qmap.h>
+#include <QMap>
 
 // MythTV headers
 #include "avcinfo.h"
Index: libs/libmythtv/customedit.cpp
===================================================================
--- libs/libmythtv/customedit.cpp	(revision 20066)
+++ libs/libmythtv/customedit.cpp	(working copy)
@@ -1,12 +1,14 @@
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qlabel.h>
-#include <qcursor.h>
-#include <qdatetime.h>
-#include <qapplication.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qsqldatabase.h>
+#include <QLayout>
+#include <QPushButton>
+#include <QLabel>
+#include <QCursor>
+#include <QDateTime>
+#include <QApplication>
+#include <QImage>
+#include <QPainter>
+#include <QSqlDatabase>
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
 
 #include <unistd.h>
 
@@ -47,12 +49,12 @@
     exSuffix = QString(" (%1)").arg(tr("stored example"));
     addString = tr("Add");
 
-    QVBoxLayout *vbox = new QVBoxLayout();
+    Q3VBoxLayout *vbox = new Q3VBoxLayout();
     vbox->setMargin((int)(20 * wmult));
     setLayout(vbox);
 
     // Edit selection
-    QHBoxLayout *edit_hbox = new QHBoxLayout();
+    Q3HBoxLayout *edit_hbox = new Q3HBoxLayout();
     edit_hbox->setMargin((int)(10 * wmult));
 
     QString message = tr("Edit Rule") + ": ";
@@ -100,7 +102,7 @@
     vbox->addWidget(edit_widget);
 
     // Title edit box
-    QHBoxLayout *title_hbox = new QHBoxLayout();
+    Q3HBoxLayout *title_hbox = new Q3HBoxLayout();
     title_hbox->setMargin((int)(10 * wmult));
 
     message = tr("Rule Name") + ": ";
@@ -371,7 +373,7 @@
     vbox->addWidget(m_addButton);
 
     // Subtitle edit box
-    QHBoxLayout *subtitle_hbox = new QHBoxLayout();
+    Q3HBoxLayout *subtitle_hbox = new Q3HBoxLayout();
     subtitle_hbox->setMargin((int)(10 * wmult));
 
     message = tr("Additional Tables") + ": ";
@@ -391,7 +393,7 @@
     vbox->addWidget(subtitle_widget);
 
     // Bottom row buttons
-    QHBoxLayout *buttons_hbox = new QHBoxLayout();
+    Q3HBoxLayout *buttons_hbox = new Q3HBoxLayout();
 
     //  Test Button
     buttons_hbox->setMargin((int)(10 * wmult));
Index: libs/libmythtv/channelscan/inputselectorsetting.cpp
===================================================================
--- libs/libmythtv/channelscan/inputselectorsetting.cpp	(revision 20066)
+++ libs/libmythtv/channelscan/inputselectorsetting.cpp	(working copy)
@@ -33,7 +33,7 @@
 InputSelector::InputSelector(
     uint _default_cardid, const QString &_default_inputname) :
     ComboBoxSetting(this), sourceid(0), default_cardid(_default_cardid),
-    default_inputname(Q3DeepCopy<QString>(_default_inputname))
+    default_inputname(_default_inputname)
 {
     setLabel(tr("Input"));
 }
Index: libs/libmythtv/channelscan/scanmonitor.h
===================================================================
--- libs/libmythtv/channelscan/scanmonitor.h	(revision 20066)
+++ libs/libmythtv/channelscan/scanmonitor.h	(working copy)
@@ -39,7 +39,6 @@
 
 class ChannelScanner;
 class SignalMonitorValue;
-class QString;
 
 class ScanMonitor :
     public QObject,
Index: libs/libmythtv/channelscan/scaninfo.h
===================================================================
--- libs/libmythtv/channelscan/scaninfo.h	(revision 20066)
+++ libs/libmythtv/channelscan/scaninfo.h	(working copy)
@@ -10,8 +10,8 @@
 using namespace std;
 
 // Qt headers
-#include <qstring.h>
-#include <qdatetime.h>
+#include <QString>
+#include <QDateTime>
 
 // MythTV headers
 #include "dtvmultiplex.h"
Index: libs/libmythtv/channelscan/channelscanner_cli.h
===================================================================
--- libs/libmythtv/channelscan/channelscanner_cli.h	(revision 20066)
+++ libs/libmythtv/channelscan/channelscanner_cli.h	(working copy)
@@ -34,7 +34,7 @@
 #include <pthread.h>
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 
 // MythTV headers
 #include "settings.h"
Index: libs/libmythtv/channelscan/channelscan_sm.h
===================================================================
--- libs/libmythtv/channelscan/channelscan_sm.h	(revision 20066)
+++ libs/libmythtv/channelscan/channelscan_sm.h	(working copy)
@@ -31,12 +31,12 @@
 #define SISCAN_H
 
 // Qt includes
-#include <qobject.h>
-#include <qstring.h>
-#include <qmap.h>
-#include <qmutex.h>
+#include <QObject>
+#include <QString>
+#include <QMap>
+#include <QMutex>
 #include <QList>
-#include <qdatetime.h>
+#include <QDateTime>
 
 // MythTV includes
 #include "frequencytables.h"
Index: libs/libmythtv/channelscan/channelimporter.cpp
===================================================================
--- libs/libmythtv/channelscan/channelimporter.cpp	(revision 20066)
+++ libs/libmythtv/channelscan/channelimporter.cpp	(working copy)
@@ -6,9 +6,6 @@
  *
  */
 
-// Qt headers
-#include <Q3DeepCopy>
-
 // MythTV headers
 #include "mythdialogs.h"
 #include "mythdbcon.h"
@@ -24,7 +21,7 @@
 {
     if (str.isEmpty())
         return "";
-    return Q3DeepCopy<QString>(str);
+    return str;
 }
 
 void ChannelImporter::Process(const ScanDTVTransportList &_transports)
Index: libs/libmythtv/channelscan/scanmonitor.cpp
===================================================================
--- libs/libmythtv/channelscan/scanmonitor.cpp	(revision 20066)
+++ libs/libmythtv/channelscan/scanmonitor.cpp	(working copy)
@@ -33,8 +33,7 @@
 #include "channelscanner.h"
 
 // Qt headers
-#include <qapplication.h>
-#include <Q3DeepCopy>
+#include <QApplication>
 
 /// Percentage to set to after the transports have been scanned
 #define TRANSPORT_PCT 6
@@ -51,7 +50,7 @@
 void post_event(QObject *dest, ScannerEvent::TYPE type, const QString &val)
 {
     ScannerEvent *e = new ScannerEvent(type);
-    e->strValue(Q3DeepCopy<QString>(val));
+    e->strValue(val);
     QApplication::postEvent(dest, e);
 }
 
Index: libs/libmythtv/channelscan/scaninfo.cpp
===================================================================
--- libs/libmythtv/channelscan/scaninfo.cpp	(revision 20066)
+++ libs/libmythtv/channelscan/scaninfo.cpp	(working copy)
@@ -2,7 +2,7 @@
 #include <stdint.h>
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 
 // MythTV headers
 #include "scaninfo.h"
Index: libs/libmythtv/channelscan/panedvbutilsimport.h
===================================================================
--- libs/libmythtv/channelscan/panedvbutilsimport.h	(revision 20066)
+++ libs/libmythtv/channelscan/panedvbutilsimport.h	(working copy)
@@ -31,8 +31,8 @@
 #define _PANE_DVB_UTILS_IMPORT_H_
 
 // Qt headers
-#include <qstring.h>
-#include <qobject.h>
+#include <QString>
+#include <QObject>
 
 // MythTV headers
 #include "channelscanmiscsettings.h"
Index: libs/libmythtv/channelscan/scanprogresspopup.h
===================================================================
--- libs/libmythtv/channelscan/scanprogresspopup.h	(revision 20066)
+++ libs/libmythtv/channelscan/scanprogresspopup.h	(working copy)
@@ -31,7 +31,7 @@
 #define _SCAN_PROGRESS_POPUP_H_
 
 // Qt headesr
-#include <qwaitcondition.h>
+#include <QWaitCondition>
 
 // MythTV headers
 #include "settings.h"
Index: libs/libmythtv/channelscan/frequencytablesetting.cpp
===================================================================
--- libs/libmythtv/channelscan/frequencytablesetting.cpp	(revision 20066)
+++ libs/libmythtv/channelscan/frequencytablesetting.cpp	(working copy)
@@ -30,7 +30,7 @@
 #include "frequencytablesetting.h"
 
 // Qt headers
-#include <qlocale.h>
+#include <QLocale>
 
 ScanFrequencyTable::ScanFrequencyTable() : ComboBoxSetting(this)
 {
Index: libs/libmythtv/channelscan/channelscan_sm.cpp
===================================================================
--- libs/libmythtv/channelscan/channelscan_sm.cpp	(revision 20066)
+++ libs/libmythtv/channelscan/channelscan_sm.cpp	(working copy)
@@ -32,7 +32,7 @@
 #include <unistd.h>
 
 // Qt includes
-#include <qmutex.h>
+#include <QMutex>
 
 // MythTV includes - General
 #include "channelscan_sm.h"
@@ -124,7 +124,7 @@
       sourceID(_sourceID),
       signalTimeout(signal_timeout),
       channelTimeout(channel_timeout),
-      inputname(Q3DeepCopy<QString>(_inputname)),
+      inputname(_inputname),
       // State
       scanning(false),
       threadExit(false),
@@ -1542,8 +1542,8 @@
             found = true;
             if (!channels[i].name.isEmpty())
             {
-                service_name = Q3DeepCopy<QString>(channels[i].name);
-                callsign     = Q3DeepCopy<QString>(channels[i].name);
+                service_name = channels[i].name;
+                callsign     = channels[i].name;
             }
         }
     }
Index: libs/libmythtv/channelscan/channelscanner_gui.h
===================================================================
--- libs/libmythtv/channelscan/channelscanner_gui.h	(revision 20066)
+++ libs/libmythtv/channelscan/channelscanner_gui.h	(working copy)
@@ -34,7 +34,7 @@
 #include <pthread.h>
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 
 // MythTV headers
 #include "settings.h"
Index: libs/libmythtv/dtvconfparser.cpp
===================================================================
--- libs/libmythtv/dtvconfparser.cpp	(revision 20066)
+++ libs/libmythtv/dtvconfparser.cpp	(working copy)
@@ -31,7 +31,7 @@
 
 // Qt headers
 #include <QTextStream>
-#include <qfile.h>
+#include <QFile>
 
 // MythTV headers
 #include "mythcontext.h"
Index: libs/libmythtv/sr_items.cpp
===================================================================
--- libs/libmythtv/sr_items.cpp	(revision 20066)
+++ libs/libmythtv/sr_items.cpp	(working copy)
@@ -1,10 +1,11 @@
 #include "scheduledrecording.h"
 #include "sr_items.h"
-#include <qlayout.h>
+
+#include <QLayout>
+
 #include "mythdialogs.h"
 
 
-
 SRSchedOptionsGroup::SRSchedOptionsGroup(ScheduledRecording *_rec, ManagedList* _parentList, 
                                          ManagedListGroup* _group, QObject* _parent)
                    : ManagedListGroup( QObject::tr("Scheduling Options"), _group, _parentList,
Index: libs/libmythtv/videoout_d3d.cpp
===================================================================
--- libs/libmythtv/videoout_d3d.cpp	(revision 20066)
+++ libs/libmythtv/videoout_d3d.cpp	(working copy)
@@ -17,7 +17,7 @@
 #include "mmsystem.h"
 #include "tv.h"
 
-#include <qapplication.h>
+#include <QApplication>
 
 #undef UNICODE
 
Index: libs/libmythtv/dbchannelinfo.cpp
===================================================================
--- libs/libmythtv/dbchannelinfo.cpp	(revision 20066)
+++ libs/libmythtv/dbchannelinfo.cpp	(working copy)
@@ -2,6 +2,7 @@
 
 // Qt headers
 #include <QFile>
+#include <QPixmap>
 
 // MythTV headers
 #include "dbchannelinfo.h"
Index: libs/libmythtv/tv.h
===================================================================
--- libs/libmythtv/tv.h	(revision 20066)
+++ libs/libmythtv/tv.h	(working copy)
@@ -1,7 +1,8 @@
 #ifndef TV_H
 #define TV_H
 
-#include <qstring.h>
+#include <QString>
+
 #include "videoouttypes.h"
 
 /** \brief ChannelChangeDirection is an enumeration of possible channel
Index: libs/libmythtv/dtvmultiplex.h
===================================================================
--- libs/libmythtv/dtvmultiplex.h	(revision 20066)
+++ libs/libmythtv/dtvmultiplex.h	(working copy)
@@ -11,7 +11,7 @@
 #include <stdint.h>
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 
 // MythTV headers
 #include "dtvconfparserhelpers.h"
Index: libs/libmythtv/util-xv.cpp
===================================================================
--- libs/libmythtv/util-xv.cpp	(revision 20066)
+++ libs/libmythtv/util-xv.cpp	(working copy)
@@ -1,15 +1,15 @@
 // POSIX headers
 #include <signal.h>
 
+// MythTH headers
+#include "util-xv.h"
+#include "util-x11.h"
+
 // C++ headers
 #include <iostream>
 #include <cstdlib>
 using namespace std;
 
-// MythTH headers
-#include "util-x11.h"
-#include "util-xv.h"
-
 // X11 headers
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
Index: libs/libmythtv/eitcache.h
===================================================================
--- libs/libmythtv/eitcache.h	(revision 20066)
+++ libs/libmythtv/eitcache.h	(working copy)
@@ -9,9 +9,9 @@
 #include <stdint.h>
 
 // Qt headers
-#include <qmap.h>
-#include <qmutex.h>
-#include <qstring.h>
+#include <QMap>
+#include <QMutex>
+#include <QString>
 
 #include "mythexp.h"
 
Index: libs/libmythtv/cardutil.h
===================================================================
--- libs/libmythtv/cardutil.h	(revision 20066)
+++ libs/libmythtv/cardutil.h	(working copy)
@@ -10,8 +10,8 @@
 using namespace std;
 
 // Qt headers
-#include <qstringlist.h>
-#include <qmap.h>
+#include <QStringList>
+#include <QMap>
 
 class InputInfo;
 class CardInput;
Index: libs/libmythtv/playgroup.cpp
===================================================================
--- libs/libmythtv/playgroup.cpp	(revision 20066)
+++ libs/libmythtv/playgroup.cpp	(working copy)
@@ -1,9 +1,12 @@
 #include "mythcontext.h"
 #include "mythdb.h"
-#include <qsqldatabase.h>
-#include <qcursor.h>
-#include <qlayout.h>
+
+#include <QSqlDatabase>
+#include <QCursor>
+#include <QLayout>
+
 #include <iostream>
+
 #include "playgroup.h"
 #include "programinfo.h"
 
Index: libs/libmythtv/avcinfo.h
===================================================================
--- libs/libmythtv/avcinfo.h	(revision 20066)
+++ libs/libmythtv/avcinfo.h	(working copy)
@@ -8,7 +8,7 @@
 #include <stdint.h>
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 
 QString guid_to_string(uint64_t guid);
 uint64_t string_to_guid(const QString &guid);
Index: libs/libmythtv/dbchannelinfo.h
===================================================================
--- libs/libmythtv/dbchannelinfo.h	(revision 20066)
+++ libs/libmythtv/dbchannelinfo.h	(working copy)
@@ -9,8 +9,8 @@
 using namespace std;
 
 // Qt headers
-#include <qstring.h>
-#include <qpixmap.h>
+#include <QString>
+#include <QPixmap>
 
 // MythTV headers
 #include "mythexp.h" // for MPUBLIC
Index: libs/libmythtv/libmythtv.pro
===================================================================
--- libs/libmythtv/libmythtv.pro	(revision 20066)
+++ libs/libmythtv/libmythtv.pro	(working copy)
@@ -563,3 +563,4 @@
 include ( ../libs-targetfix.pro )
 
 LIBS += $$LATE_LIBS
+QT +=  opengl qt3support 
Index: libs/libmythtv/util-opengl.h
===================================================================
--- libs/libmythtv/util-opengl.h	(revision 20066)
+++ libs/libmythtv/util-opengl.h	(working copy)
@@ -25,7 +25,7 @@
 #endif
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 
 #ifndef GL_TEXTTURE0
 #define GL_TEXTURE0 0x84C0
Index: libs/libmythtv/dvbrecorder.h
===================================================================
--- libs/libmythtv/dvbrecorder.h	(revision 20066)
+++ libs/libmythtv/dvbrecorder.h	(working copy)
@@ -14,7 +14,7 @@
 using namespace std;
 
 // Qt includes
-#include <qmutex.h>
+#include <QMutex>
 
 #include "dtvrecorder.h"
 #include "tspacket.h"
Index: libs/libmythtv/guidegrid.h
===================================================================
--- libs/libmythtv/guidegrid.h	(revision 20066)
+++ libs/libmythtv/guidegrid.h	(working copy)
@@ -24,8 +24,6 @@
 class ProgramInfo;
 class TimeInfo;
 class TV;
-class QTimer;
-class QWidget;
 
 #define MAX_DISPLAY_CHANS 12
 #define MAX_DISPLAY_TIMES 30
Index: libs/libmythtv/dbox2epg.cpp
===================================================================
--- libs/libmythtv/dbox2epg.cpp	(revision 20066)
+++ libs/libmythtv/dbox2epg.cpp	(working copy)
@@ -4,7 +4,7 @@
  *  Distributed as part of MythTV under GPL v2 and later.
  */
 
-#include <qdatetime.h>
+#include <QDateTime>
 #include <QHttp>
 
 #include "dbox2channel.h"
Index: libs/libmythtv/osdtypes.h
===================================================================
--- libs/libmythtv/osdtypes.h	(revision 20066)
+++ libs/libmythtv/osdtypes.h	(working copy)
@@ -1,15 +1,16 @@
 #ifndef OSDDATATYPES_H_
 #define OSDDATATYPES_H_
 
-#include <qstring.h>
-#include <qrect.h>
-#include <qmap.h>
+#include <QString>
+#include <QRect>
+#include <QMap>
 #include <QKeyEvent>
+#include <QObject>
+#include <QRegExp>
+#include <QColor>
+
 #include <vector>
-#include <qobject.h>
-#include <qregexp.h>
 #include <cmath>
-#include <qcolor.h>
 #include "cc708window.h"
 #include "osdimagecache.h"
 
Index: libs/libmythtv/tv_play.h
===================================================================
--- libs/libmythtv/tv_play.h	(revision 20066)
+++ libs/libmythtv/tv_play.h	(working copy)
@@ -3,18 +3,21 @@
 #ifndef TVPLAY_H
 #define TVPLAY_H
 
-#include <qstring.h>
-#include <qmap.h>
-#include <qdatetime.h>
+#include <pthread.h>
+
+#include <QString>
+#include <QMap>
+#include <QDateTime>
 #include <QKeyEvent>
 #include <QEvent>
-#include <pthread.h>
-#include <qmutex.h>
-#include <qstringlist.h>
-#include <qregexp.h>
-#include <qwaitcondition.h>
+#include <QTimerEvent>
+#include <QMutex>
+#include <QStringList>
+#include <QRegExp>
+#include <QWaitCondition>
 #include <QThread>
 #include <QReadWriteLock>
+#include <QObject>
 
 #include "mythdeque.h"
 #include "tv.h"
@@ -26,12 +29,10 @@
 #include "volumebase.h"
 #include "inputinfo.h"
 
-#include <qobject.h>
+#include <vector>
 
-#include <vector>
 using namespace std;
 
-class QDateTime;
 class OSD;
 class RemoteEncoder;
 class NuppelVideoPlayer;
Index: libs/libmythtv/eit.h
===================================================================
--- libs/libmythtv/eit.h	(revision 20066)
+++ libs/libmythtv/eit.h	(working copy)
@@ -5,10 +5,10 @@
 #include <vector>
 using namespace std;
 
-#include <qmap.h>
-#include <qstring.h>
-#include <qdatetime.h>
-#include <qstringlist.h>
+#include <QMap>
+#include <QString>
+#include <QDateTime>
+#include <QStringList>
 
 class MSqlQuery;
 
Index: libs/libmythtv/scanwizardhelpers.h
===================================================================
--- libs/libmythtv/scanwizardhelpers.h	(revision 20066)
+++ libs/libmythtv/scanwizardhelpers.h	(working copy)
@@ -36,8 +36,8 @@
 #include "compat.h"
 #include "settings.h"
 
-#include <qwaitcondition.h>
-#include <qevent.h>
+#include <QWaitCondition>
+#include <QEvent>
 
 class TransFreqTableSelector;
 class TransLabelSetting;
Index: libs/libmythtv/dbox2recorder.h
===================================================================
--- libs/libmythtv/dbox2recorder.h	(revision 20066)
+++ libs/libmythtv/dbox2recorder.h	(working copy)
@@ -16,8 +16,6 @@
 #include "dtvrecorder.h"
 
 class DBox2Channel;
-class QHttp;
-class QString;
 
 typedef struct stream_meta_
 {
Index: libs/libmythtv/tvosdmenuentry.h
===================================================================
--- libs/libmythtv/tvosdmenuentry.h	(revision 20066)
+++ libs/libmythtv/tvosdmenuentry.h	(working copy)
@@ -1,10 +1,11 @@
 #ifndef TVOSDMENUENTRY_H_
 #define TVOSDMENUENTRY_H_
 
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qmutex.h>
+#include <QString>
+#include <QStringList>
+#include <QMutex>
 #include <QVariant>
+
 #include "tv.h"
 #include "mythexp.h"
 
Index: libs/libmythtv/progfind.h
===================================================================
--- libs/libmythtv/progfind.h	(revision 20066)
+++ libs/libmythtv/progfind.h	(working copy)
@@ -24,7 +24,6 @@
 #include "programlist.h"
 
 class ProgramInfo;
-class QWidget;
 class TV;
 
 MPUBLIC void RunProgramFind(bool thread = false, bool ggActive = false);
Index: libs/libmythtv/diseqc.h
===================================================================
--- libs/libmythtv/diseqc.h	(revision 20066)
+++ libs/libmythtv/diseqc.h	(working copy)
@@ -15,9 +15,9 @@
 using namespace std;
 
 // Qt headers
-#include <qmap.h>
-#include <qstring.h>
-#include <qmutex.h>
+#include <QMap>
+#include <QString>
+#include <QMutex>
 
 class DTVMultiplex;
 
Index: libs/libmythtv/dbox2epg.h
===================================================================
--- libs/libmythtv/dbox2epg.h	(revision 20066)
+++ libs/libmythtv/dbox2epg.h	(working copy)
@@ -12,9 +12,6 @@
 #include <QThread>
 #include <QMap>
 
-class QString;
-class QDateTime;
-class QHttp;
 class DBox2Channel;
 class DBox2DBOptions;
 
Index: libs/libmythtv/hdhrrecorder.h
===================================================================
--- libs/libmythtv/hdhrrecorder.h	(revision 20066)
+++ libs/libmythtv/hdhrrecorder.h	(working copy)
@@ -7,7 +7,8 @@
 #ifndef HDHOMERUNRECORDER_H_
 #define HDHOMERUNRECORDER_H_
 
-#include <qmutex.h>
+#include <QMutex>
+
 #include "dtvrecorder.h"
 #include "streamlisteners.h"
 #include "eitscanner.h"
Index: libs/libmythtv/dbcheck.cpp
===================================================================
--- libs/libmythtv/dbcheck.cpp	(revision 20066)
+++ libs/libmythtv/dbcheck.cpp	(working copy)
@@ -1,4 +1,5 @@
 #include <iostream>
+#include <QSqlError>
 using namespace std;
 
 #include <QString>
Index: libs/libmythtv/signalmonitor.h
===================================================================
--- libs/libmythtv/signalmonitor.h	(revision 20066)
+++ libs/libmythtv/signalmonitor.h	(working copy)
@@ -13,8 +13,8 @@
 using namespace std;
 
 // Qt headers
-#include <qobject.h>
-#include <qmutex.h>
+#include <QObject>
+#include <QMutex>
 
 // MythTV headers
 #include "signalmonitorvalue.h"
Index: libs/libmythtv/dvbtypes.cpp
===================================================================
--- libs/libmythtv/dvbtypes.cpp	(revision 20066)
+++ libs/libmythtv/dvbtypes.cpp	(working copy)
@@ -1,7 +1,7 @@
 // -*- Mode: c++ -*-
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 
 // MythTV headers
 #include "dvbtypes.h"
Index: libs/libmythtv/progdetails.cpp
===================================================================
--- libs/libmythtv/progdetails.cpp	(revision 20066)
+++ libs/libmythtv/progdetails.cpp	(working copy)
@@ -1,4 +1,5 @@
 #include <iostream>
+#include <QTextStream>
 using namespace std;
 
 // qt
Index: libs/libmythtv/openglvideo.h
===================================================================
--- libs/libmythtv/openglvideo.h	(revision 20066)
+++ libs/libmythtv/openglvideo.h	(working copy)
@@ -5,8 +5,8 @@
 #include <map>
 using namespace std;
 
-#include <qrect.h>
-#include <qmap.h>
+#include <QRect>
+#include <QMap>
 
 #include "videooutbase.h"
 #include "videoouttypes.h"
Index: libs/libmythtv/cc708window.h
===================================================================
--- libs/libmythtv/cc708window.h	(revision 20066)
+++ libs/libmythtv/cc708window.h	(working copy)
@@ -7,9 +7,9 @@
 #include <vector>
 using namespace std;
 
-#include <qstring.h>
-#include <qmutex.h>
-#include <qcolor.h>
+#include <QString>
+#include <QMutex>
+#include <QColor>
 
 class CC708CharacterAttribute
 {
Index: libs/libmythtv/signalmonitorvalue.h
===================================================================
--- libs/libmythtv/signalmonitorvalue.h	(revision 20066)
+++ libs/libmythtv/signalmonitorvalue.h	(working copy)
@@ -3,7 +3,9 @@
 #define SIGNALMONITORVALUES_H
 
 #include <vector>
-#include <qstringlist.h>
+
+#include <QStringList>
+
 #include <mythcontext.h>
 
 class SignalMonitorValue
Index: libs/libmythtv/dtvrecorder.h
===================================================================
--- libs/libmythtv/dtvrecorder.h	(revision 20066)
+++ libs/libmythtv/dtvrecorder.h	(working copy)
@@ -12,14 +12,13 @@
 #include <vector>
 using namespace std;
 
-#include <qdatetime.h>
+#include <QDateTime>
 
 #include "recorderbase.h"
 #include "H264Parser.h"
 
 class MPEGStreamData;
 class TSPacket;
-class QTime;
 
 class DTVRecorder: public RecorderBase
 {
Index: libs/libmythtv/openglcontext.h
===================================================================
--- libs/libmythtv/openglcontext.h	(revision 20066)
+++ libs/libmythtv/openglcontext.h	(working copy)
@@ -6,8 +6,8 @@
 using namespace std;
 
 // Qt headers
-#include <qstring.h>
-#include <qrect.h>
+#include <QString>
+#include <QRect>
 
 // MythTV headers
 #ifdef USING_X11
Index: libs/libmythtv/videoout_directfb.cpp
===================================================================
--- libs/libmythtv/videoout_directfb.cpp	(revision 20066)
+++ libs/libmythtv/videoout_directfb.cpp	(working copy)
@@ -10,6 +10,7 @@
 
 // Linux headers
 #include <linux/fb.h>
+#include <QEvent>
 extern "C" {
 #include <directfb.h>
 #include <directfb_version.h>
@@ -142,7 +143,7 @@
         if (DFB_OK != fberr)
         {
             VERBOSE(VB_IMPORTANT, LOC_ERR + "Failed to lock buffer" + ENOFB);
-            fberr = bufferSurface->Release(bufferSurface);
+            fberr = bufferSurface->ReleaseSource(bufferSurface);
             if (DFB_OK != fberr)
             {
                 VERBOSE(VB_IMPORTANT, LOC_ERR +
@@ -199,7 +200,7 @@
                             "Failed to unlock buffer" + ENOFB);
                 }
 
-                fberr = surf->Release(surf);
+                fberr = surf->ReleaseSource(surf);
                 if (DFB_OK != fberr)
                 {
                     VERBOSE(VB_IMPORTANT, LOC_ERR +
@@ -245,7 +246,7 @@
                         "Failed to unlock buffer" + ENOFB);
             }
 
-            fberr = surf->Release(surf);
+            fberr = surf->ReleaseSource(surf);
             if (DFB_OK != fberr)
             {
                 VERBOSE(VB_IMPORTANT, LOC_ERR +
@@ -1143,12 +1144,12 @@
     {
         VERBOSE(VB_IMPORTANT, LOC_WARN + "Failed to test config" + ENOFB);
 
-        fberr = vodata->videoLayer->Release(vodata->videoLayer);
-        if (DFB_OK != fberr)
-        {
-            VERBOSE(VB_IMPORTANT, LOC_ERR +
-                    "Failed to release display layer" + ENOFB);
-        }
+        //fberr = vodata->videoLayer->Release(vodata->videoLayer);
+        //if (DFB_OK != fberr)
+        //{
+        //    VERBOSE(VB_IMPORTANT, LOC_ERR +
+        //            "Failed to release display layer" + ENOFB);
+        //}
 
         return DFENUM_OK;
     }
Index: libs/libmythtv/viewschdiff.h
===================================================================
--- libs/libmythtv/viewschdiff.h	(revision 20066)
+++ libs/libmythtv/viewschdiff.h	(working copy)
@@ -5,6 +5,8 @@
 
 // C++ headers
 #include <vector>
+#include <QKeyEvent>
+#include <QPaintEvent>
 using namespace std;
 
 // Qt headers
@@ -27,9 +29,6 @@
     ProgramInfo *after;
 };
 
-class QKeyEvent;
-class QPaintEvent;
-
 class MPUBLIC ViewScheduleDiff : public MythDialog
 {
     Q_OBJECT
Index: libs/libmythtv/channelbase.h
===================================================================
--- libs/libmythtv/channelbase.h	(revision 20066)
+++ libs/libmythtv/channelbase.h	(working copy)
@@ -4,8 +4,8 @@
 #define CHANNELBASE_H
 
 // Qt headers
-#include <qmap.h>
-#include <qstringlist.h>
+#include <QMap>
+#include <QStringList>
 
 // MythTV headers
 #include "channelutil.h"
Index: libs/libmythtv/dbox2channel.h
===================================================================
--- libs/libmythtv/dbox2channel.h	(revision 20066)
+++ libs/libmythtv/dbox2channel.h	(working copy)
@@ -13,8 +13,9 @@
 #endif
 
 // Qt headers
-#include <qstring.h>
-#include <qmutex.h>
+#include <QString>
+#include <QMutex>
+#include <QHttp>
 
 // MythTV headers
 #include "channelbase.h"
@@ -23,7 +24,6 @@
 class DBox2Recorder;
 class DBox2Channel;
 class DBox2EPG;
-class Q3Http;
 
 class DBox2CRelay : public QObject
 {
@@ -83,8 +83,8 @@
     bool              m_recorderAlive;
     DBox2Recorder    *m_recorder;
 
-    Q3Http            *http;
-    Q3Http            *httpChanger;
+    QHttp            *http;
+    QHttp            *httpChanger;
     DBox2CRelay      *m_relay;
 
     int               m_dbox2channelcount;
Index: libs/libmythtv/siscan.cpp
===================================================================
--- libs/libmythtv/siscan.cpp	(revision 20066)
+++ libs/libmythtv/siscan.cpp	(working copy)
@@ -6,7 +6,7 @@
 #include <unistd.h>
 
 // Qt includes
-#include <qmutex.h>
+#include <QMutex>
 
 // MythTV includes - General
 #include "siscan.h"
Index: libs/libmythtv/ivtvdecoder.h
===================================================================
--- libs/libmythtv/ivtvdecoder.h	(revision 20066)
+++ libs/libmythtv/ivtvdecoder.h	(working copy)
@@ -1,8 +1,8 @@
 #ifndef IVTVDECODER_H_
 #define IVTVDECODER_H_
 
-#include <qstring.h>
-#include <qmap.h>
+#include <QString>
+#include <QMap>
 
 #include "programinfo.h"
 #include "format.h"
Index: libs/libmythtv/NuppelVideoRecorder.h
===================================================================
--- libs/libmythtv/NuppelVideoRecorder.h	(revision 20066)
+++ libs/libmythtv/NuppelVideoRecorder.h	(working copy)
@@ -26,8 +26,8 @@
 using namespace std;
 
 // Qt headers
-#include <qstring.h>
-#include <qmap.h>
+#include <QString>
+#include <QMap>
 
 // MythTV headers
 #include "recorderbase.h"
Index: libs/libmythtv/dtvconfparser.h
===================================================================
--- libs/libmythtv/dtvconfparser.h	(revision 20066)
+++ libs/libmythtv/dtvconfparser.h	(working copy)
@@ -41,13 +41,11 @@
 using namespace std;
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 
 // MythTV headers
 #include "dtvchannel.h"
 
-class QStringList;
-
 class DTVChannelInfo
 {
   public:
Index: libs/libmythtv/teletextdecoder.h
===================================================================
--- libs/libmythtv/teletextdecoder.h	(revision 20066)
+++ libs/libmythtv/teletextdecoder.h	(working copy)
@@ -3,9 +3,9 @@
 
 #include <stdint.h>
 
-#include <qwaitcondition.h>
-#include <qobject.h>
-#include <qmutex.h>
+#include <QWaitCondition>
+#include <QObject>
+#include <QMutex>
 
 class OSDType;
 
Index: libs/libmythtv/osdsurface.h
===================================================================
--- libs/libmythtv/osdsurface.h	(revision 20066)
+++ libs/libmythtv/osdsurface.h	(working copy)
@@ -1,8 +1,9 @@
 #ifndef OSDSURFACE_H_
 #define OSDSURFACE_H_
 
-#include <qregion.h>
-#include <qmutex.h>
+#include <QRegion>
+#include <QMutex>
+
 #include "blend.h"
 
 #define MAX_NEG_CROP 1024
Index: libs/libmythtv/eitcache.cpp
===================================================================
--- libs/libmythtv/eitcache.cpp	(revision 20066)
+++ libs/libmythtv/eitcache.cpp	(working copy)
@@ -6,7 +6,7 @@
  */
 
 
-#include <qdatetime.h>
+#include <QDateTime>
 
 #include "eitcache.h"
 #include "mythcontext.h"
Index: libs/libmythtv/videoout_ivtv.h
===================================================================
--- libs/libmythtv/videoout_ivtv.h	(revision 20066)
+++ libs/libmythtv/videoout_ivtv.h	(working copy)
@@ -1,8 +1,8 @@
 #ifndef VIDEOOUT_IVTV_H_
 #define VIDEOOUT_IVTV_H_
 
-#include <qstring.h>
-#include <qmutex.h>
+#include <QString>
+#include <QMutex>
 
 #include "videooutbase.h"
 
Index: libs/libmythtv/util-xv.h
===================================================================
--- libs/libmythtv/util-xv.h	(revision 20066)
+++ libs/libmythtv/util-xv.h	(working copy)
@@ -3,7 +3,7 @@
 #ifndef _UTIL_XV_H_
 #define _UTIL_XV_H_
 
-#include <qmap.h>
+#include <QMap>
 
 #include "videobuffers.h"
 #include "exitcodes.h"
Index: libs/libmythtv/cc708decoder.h
===================================================================
--- libs/libmythtv/cc708decoder.h	(revision 20066)
+++ libs/libmythtv/cc708decoder.h	(working copy)
@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 
-#include <qstringlist.h>
+#include <QStringList>
 
 #include "format.h"
 #include "compat.h"
Index: libs/libmythtv/ttfont.h
===================================================================
--- libs/libmythtv/ttfont.h	(revision 20066)
+++ libs/libmythtv/ttfont.h	(working copy)
@@ -5,9 +5,9 @@
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
 
-#include <qstring.h>
-#include <qmap.h>
-#include <qcolor.h>
+#include <QString>
+#include <QMap>
+#include <QColor>
 
 #include "mythconfig.h"
 
Index: libs/libmythtv/dummychannel.h
===================================================================
--- libs/libmythtv/dummychannel.h	(revision 20066)
+++ libs/libmythtv/dummychannel.h	(working copy)
@@ -6,7 +6,8 @@
 #ifndef DUMMYCHANNEL_H
 #define DUMMYCHANNEL_H
 
-#include <qstring.h>
+#include <QString>
+
 #include "tv_rec.h"
 #include "channelbase.h"
 
Index: libs/libmythtv/dvbstreamhandler.h
===================================================================
--- libs/libmythtv/dvbstreamhandler.h	(revision 20066)
+++ libs/libmythtv/dvbstreamhandler.h	(working copy)
@@ -6,14 +6,13 @@
 #include <vector>
 using namespace std;
 
-#include <qmap.h>
-#include <qmutex.h>
+#include <QMap>
+#include <QMutex>
 
 #include "util.h"
 #include "DeviceReadBuffer.h"
 #include "mpegstreamdata.h"
 
-class QString;
 class DVBStreamHandler;
 class DTVSignalMonitor;
 class DVBChannel;
Index: libs/libmythtv/playercontext.cpp
===================================================================
--- libs/libmythtv/playercontext.cpp	(revision 20066)
+++ libs/libmythtv/playercontext.cpp	(working copy)
@@ -1,7 +1,8 @@
 #include <math.h>
-#include <qtimer.h>
-#include <qpainter.h>
 
+#include <QTimer>
+#include <QPainter>
+
 #include "playercontext.h"
 #include "NuppelVideoPlayer.h"
 #include "remoteencoder.h"
Index: libs/libmythtv/sourceutil.h
===================================================================
--- libs/libmythtv/sourceutil.h	(revision 20066)
+++ libs/libmythtv/sourceutil.h	(working copy)
@@ -3,7 +3,7 @@
 #define _SOURCEUTIL_H_
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 
 #include "mythexp.h"
 
Index: libs/libmythtv/dvbchannel.h
===================================================================
--- libs/libmythtv/dvbchannel.h	(revision 20066)
+++ libs/libmythtv/dvbchannel.h	(working copy)
@@ -8,9 +8,9 @@
 #ifndef DVBCHANNEL_H
 #define DVBCHANNEL_H
 
-#include <qobject.h>
-#include <qstring.h>
-#include <qmap.h>
+#include <QObject>
+#include <QString>
+#include <QMap>
 
 #include "mythcontext.h"
 #include "mythdbcon.h"
Index: libs/libmythtv/NuppelVideoPlayer.h
===================================================================
--- libs/libmythtv/NuppelVideoPlayer.h	(revision 20066)
+++ libs/libmythtv/NuppelVideoPlayer.h	(working copy)
@@ -21,6 +21,7 @@
 #include "cc708window.h"
 
 #include "mythexp.h"
+#include <QKeyEvent>
 
 extern "C" {
 #include "filter.h"
Index: libs/libmythtv/eithelper.h
===================================================================
--- libs/libmythtv/eithelper.h	(revision 20066)
+++ libs/libmythtv/eithelper.h	(working copy)
@@ -6,9 +6,9 @@
 #include <stdint.h>
 
 // Qt includes
-#include <qmutex.h>
-#include <qobject.h>
-#include <qstring.h>
+#include <QMutex>
+#include <QObject>
+#include <QString>
 
 // MythTV includes
 #include "mythdeque.h"
Index: libs/libmythtv/DeviceReadBuffer.h
===================================================================
--- libs/libmythtv/DeviceReadBuffer.h	(revision 20066)
+++ libs/libmythtv/DeviceReadBuffer.h	(working copy)
@@ -7,9 +7,9 @@
 #include <unistd.h>
 #include <pthread.h>
 
-#include <qmutex.h>
-#include <qwaitcondition.h>
-#include <qstring.h>
+#include <QMutex>
+#include <QWaitCondition>
+#include <QString>
 
 #include "util.h"
 
Index: libs/libmythtv/dtvchannel.h
===================================================================
--- libs/libmythtv/dtvchannel.h	(revision 20066)
+++ libs/libmythtv/dtvchannel.h	(working copy)
@@ -15,8 +15,8 @@
 using namespace std;
 
 // Qt headers
-#include <qmutex.h>
-#include <qstring.h>
+#include <QMutex>
+#include <QString>
 
 // MythTV headers
 #include "channelbase.h"
Index: libs/libmythtv/darwinavcinfo.h
===================================================================
--- libs/libmythtv/darwinavcinfo.h	(revision 20066)
+++ libs/libmythtv/darwinavcinfo.h	(working copy)
@@ -16,7 +16,7 @@
 #include <IOKit/avc/IOFireWireAVCLib.h>
 
 // Qt headers
-#include <qmap.h>
+#include <QMap>
 
 // MythTV headers
 #include "avcinfo.h"
Index: libs/libmythtv/frequencytables.h
===================================================================
--- libs/libmythtv/frequencytables.h	(revision 20066)
+++ libs/libmythtv/frequencytables.h	(working copy)
@@ -8,9 +8,9 @@
 using namespace std;
 
 // Qt includes
-#include <qmap.h>
-#include <qstring.h>
-#include <qmutex.h>
+#include <QMap>
+#include <QString>
+#include <QMutex>
 #include <QList>
 
 // MythTV includes
Index: libs/libmythtv/dvbcam.h
===================================================================
--- libs/libmythtv/dvbcam.h	(revision 20066)
+++ libs/libmythtv/dvbcam.h	(working copy)
@@ -4,7 +4,7 @@
 #include <deque>
 using namespace std;
 
-#include <qmutex.h>
+#include <QMutex>
 
 #include "mpegtables.h"
 
Index: libs/libmythtv/scheduledrecording.h
===================================================================
--- libs/libmythtv/scheduledrecording.h	(revision 20066)
+++ libs/libmythtv/scheduledrecording.h	(working copy)
@@ -1,13 +1,13 @@
 #ifndef SCHEDULEDRECORDING_H
 #define SCHEDULEDRECORDING_H
 
-#include <qpointer.h>
+#include <QPointer>
 
 #include "settings.h"
 #include "recordingtypes.h"
+
 #include <list>
 
-
 using namespace std;
 
 class ProgramInfo;
Index: libs/libmythtv/datadirect.cpp
===================================================================
--- libs/libmythtv/datadirect.cpp	(revision 20066)
+++ libs/libmythtv/datadirect.cpp	(working copy)
@@ -7,6 +7,7 @@
 // Qt headers
 #include <QDir>
 #include <QFileInfo>
+#include <QTextStream>
 
 // MythTV headers
 #include "datadirect.h"
Index: libs/libmythtv/recorderbase.h
===================================================================
--- libs/libmythtv/recorderbase.h	(revision 20066)
+++ libs/libmythtv/recorderbase.h	(working copy)
@@ -2,11 +2,11 @@
 #ifndef RECORDERBASE_H_
 #define RECORDERBASE_H_
 
-#include <qmutex.h>
-#include <qstring.h>
-#include <qmap.h>
-#include <qsqldatabase.h>
-#include <qwaitcondition.h>
+#include <QMutex>
+#include <QString>
+#include <QMap>
+#include <QSqlDatabase>
+#include <QWaitCondition>
 
 #include <pthread.h>
 
Index: libs/libmythtv/channelutil.cpp
===================================================================
--- libs/libmythtv/channelutil.cpp	(revision 20066)
+++ libs/libmythtv/channelutil.cpp	(working copy)
@@ -4,11 +4,12 @@
 #include <set>
 using namespace std;
 
-#include <qregexp.h>
 #include <stdint.h>
-#include <qimage.h>
-#include <qfile.h>
 
+#include <QRegExp>
+#include <QImage>
+#include <QFile>
+
 #include "channelutil.h"
 #include "mythdb.h"
 #include "dvbtables.h"
Index: libs/libmythtv/mpeg/premieretables.h
===================================================================
--- libs/libmythtv/mpeg/premieretables.h	(revision 20066)
+++ libs/libmythtv/mpeg/premieretables.h	(working copy)
@@ -2,8 +2,10 @@
 #ifndef _PRIVATE_TABLES_H_
 #define _PRIVATE_TABLES_H_
 
-#include <qstring.h>
+#include <QString>
+
 #include <stdint.h>  // uint32_t
+
 #include "mpegtables.h"
 #include "dvbdescriptors.h"
 
Index: libs/libmythtv/mpeg/tsstats.h
===================================================================
--- libs/libmythtv/mpeg/tsstats.h	(revision 20066)
+++ libs/libmythtv/mpeg/tsstats.h	(working copy)
@@ -3,8 +3,8 @@
 #ifndef __TS_STATS__
 #define __TS_STATS__
 
-#include <qstring.h>
-#include <qmap.h>
+#include <QString>
+#include <QMap>
 
 /** \class TSStats
  *  \brief Collects statistics on the number of TSPacket's seen on each PID.
Index: libs/libmythtv/mpeg/premieredescriptors.h
===================================================================
--- libs/libmythtv/mpeg/premieredescriptors.h	(revision 20066)
+++ libs/libmythtv/mpeg/premieredescriptors.h	(working copy)
@@ -5,8 +5,8 @@
 #include <stdint.h>
 #include <inttypes.h>
 
-#include <qstring.h>
-#include <qdatetime.h>
+#include <QString>
+#include <QDateTime>
 
 #include "mpegdescriptors.h"
 
Index: libs/libmythtv/mpeg/iso639.h
===================================================================
--- libs/libmythtv/mpeg/iso639.h	(revision 20066)
+++ libs/libmythtv/mpeg/iso639.h	(working copy)
@@ -2,11 +2,14 @@
 #ifndef _ISO_639_2_H_
 #define _ISO_639_2_H_
 
-#include <qmap.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <QMap>
+#include <QString>
+#include <QStringList>
+
 #include <vector>
+
 #include "mythexp.h"
+
 using namespace std;
 
 extern MPUBLIC QMap<int, QString> _iso639_key_to_english_name;
Index: libs/libmythtv/mpeg/freesat_huffman.h
===================================================================
--- libs/libmythtv/mpeg/freesat_huffman.h	(revision 20066)
+++ libs/libmythtv/mpeg/freesat_huffman.h	(working copy)
@@ -5,7 +5,7 @@
 #include <unistd.h>
 
 // Qt header
-#include <qstring.h>
+#include <QString>
 
 QString freesat_huffman_to_string(const unsigned char *compressed, uint size);
 
Index: libs/libmythtv/mpeg/dvbdescriptors.h
===================================================================
--- libs/libmythtv/mpeg/dvbdescriptors.h	(revision 20066)
+++ libs/libmythtv/mpeg/dvbdescriptors.h	(working copy)
@@ -6,8 +6,10 @@
 #include <cassert>
 #include <vector>
 #include <map>
-#include <qmutex.h>
-#include <qstring.h>
+
+#include <QMutex>
+#include <QString>
+
 #include "mythcontext.h"
 #include "mpegdescriptors.h"
 #include "../programinfo.h" // for subtitle types and audio and video properties
Index: libs/libmythtv/mpeg/mpegstreamdata.h
===================================================================
--- libs/libmythtv/mpeg/mpegstreamdata.h	(revision 20066)
+++ libs/libmythtv/mpeg/mpegstreamdata.h	(working copy)
@@ -6,8 +6,10 @@
 #include <vector>
 using namespace std;
 
-#include <qmap.h>
+#include <QMap>
+
 #include <stdint.h>  // uint64_t
+
 #include "tspacket.h"
 #include "util.h"
 #include "streamlisteners.h"
Index: libs/libmythtv/mpeg/atsc_huffman.h
===================================================================
--- libs/libmythtv/mpeg/atsc_huffman.h	(revision 20066)
+++ libs/libmythtv/mpeg/atsc_huffman.h	(working copy)
@@ -5,7 +5,7 @@
 #include <unistd.h>
 
 // Qt header
-#include <qstring.h>
+#include <QString>
 
 QString atsc_huffman1_to_string(const unsigned char *compressed,
                                 uint size, uint table);
Index: libs/libmythtv/mpeg/dvbtables.h
===================================================================
--- libs/libmythtv/mpeg/dvbtables.h	(revision 20066)
+++ libs/libmythtv/mpeg/dvbtables.h	(working copy)
@@ -3,8 +3,10 @@
 #ifndef _DVB_TABLES_H_
 #define _DVB_TABLES_H_
 
-#include <qstring.h>
+#include <QString>
+
 #include <stdint.h>  // uint32_t
+
 #include "mpegtables.h"
 #include "dvbdescriptors.h"
 
Index: libs/libmythtv/mpeg/dishdescriptors.h
===================================================================
--- libs/libmythtv/mpeg/dishdescriptors.h	(revision 20066)
+++ libs/libmythtv/mpeg/dishdescriptors.h	(working copy)
@@ -6,8 +6,9 @@
 #include <cassert>
 
 using namespace std;
-#include <qstring.h>
 
+#include <QString>
+
 #include "mythcontext.h"
 #include "atscdescriptors.h"
 
Index: libs/libmythtv/mpeg/freesat_huffman.cpp
===================================================================
--- libs/libmythtv/mpeg/freesat_huffman.cpp	(revision 20066)
+++ libs/libmythtv/mpeg/freesat_huffman.cpp	(working copy)
@@ -1,6 +1,6 @@
 #include "freesat_huffman.h"
 
-#include <qstring.h>
+#include <QString>
 
 struct fsattab {
     unsigned int value;
Index: libs/libmythtv/inputinfo.h
===================================================================
--- libs/libmythtv/inputinfo.h	(revision 20066)
+++ libs/libmythtv/inputinfo.h	(working copy)
@@ -3,8 +3,8 @@
 #define _INPUTINFO_H_
 
 // Qt headers
-#include <qstringlist.h>
-#include <qmap.h>
+#include <QStringList>
+#include <QMap>
 
 // MythTV headers
 #include "channelutil.h" // for DBChanList
Index: libs/libmythtv/infostructs.cpp
===================================================================
--- libs/libmythtv/infostructs.cpp	(revision 20066)
+++ libs/libmythtv/infostructs.cpp	(working copy)
@@ -1,10 +1,10 @@
-#include <qdatetime.h>
-#include <qpixmap.h>
-#include <qimage.h>
-#include <qstring.h>
-#include <qfile.h>
-#include <qsqlquery.h>
-#include <qapplication.h>
+#include <QDateTime>
+#include <QPixmap>
+#include <QImage>
+#include <QString>
+#include <QFile>
+#include <QSqlQuery>
+#include <QApplication>
 
 #include "infostructs.h"
 #include "mythcontext.h"
Index: libs/libmythtv/jobqueue.h
===================================================================
--- libs/libmythtv/jobqueue.h	(revision 20066)
+++ libs/libmythtv/jobqueue.h	(working copy)
@@ -1,13 +1,14 @@
 #ifndef JOBQUEUE_H_
 #define JOBQUEUE_H_
 
-#include <qobject.h>
-#include <qmap.h>
-#include <qmutex.h>
-#include <qobject.h>
-#include <qsqldatabase.h>
+#include <QObject>
+#include <QMap>
+#include <QMutex>
+#include <QObject>
+#include <QSqlDatabase>
 #include <QEvent>
-#include <qwaitcondition.h>
+#include <QWaitCondition>
+
 #include <pthread.h>
 
 
Index: libs/libmythtv/firewiresignalmonitor.h
===================================================================
--- libs/libmythtv/firewiresignalmonitor.h	(revision 20066)
+++ libs/libmythtv/firewiresignalmonitor.h	(working copy)
@@ -3,9 +3,9 @@
 #ifndef _FIREWIRESIGNALMONITOR_H_
 #define _FIREWIRESIGNALMONITOR_H_
 
-#include <qmap.h>
-#include <qmutex.h>
-#include <qdatetime.h>
+#include <QMap>
+#include <QMutex>
+#include <QDateTime>
 
 #include "dtvsignalmonitor.h"
 #include "firewiredevice.h"
Index: libs/libmythtv/osd.h
===================================================================
--- libs/libmythtv/osd.h	(revision 20066)
+++ libs/libmythtv/osd.h	(working copy)
@@ -3,19 +3,19 @@
 
 #include <deque>
 #include <vector>
+#include <ctime>
 using namespace std;
 
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qrect.h>
-#include <qpoint.h>
+#include <QString>
+#include <QStringList>
+#include <QRect>
+#include <QPoint>
 #include <QKeyEvent>
-#include <ctime>
-#include <qmap.h>
-#include <qdom.h>
-#include <qmutex.h>
-#include <qobject.h>
-#include <qregexp.h>
+#include <QMap>
+#include <QMutex>
+#include <QDomElement>
+#include <QObject>
+#include <QRegExp>
 
 // Mythtv Headers
 #include "themeinfo.h"
@@ -50,7 +50,6 @@
 extern const char *kOSDDialogInfo;
 extern const char *kOSDDialogEditChannel;
 
-class QImage;
 class TTFFont;
 class OSDSet;
 class OSDTypeImage;
@@ -60,7 +59,6 @@
 class TV;
 class UDPNotifyOSDSet;
 class OSDListTreeType;
-class QKeyEvent;
 class OSDGenericTree;
 class ccText;
 class CC708Service;
Index: libs/libmythtv/dvbtypes.h
===================================================================
--- libs/libmythtv/dvbtypes.h	(revision 20066)
+++ libs/libmythtv/dvbtypes.h	(working copy)
@@ -45,7 +45,6 @@
   #define dvb_fe_params dvb_frontend_parameters
 #endif
 
-class QString;
 QString toString(fe_status);
 
 #endif // DVB_TYPES_H
Index: libs/libmythtv/tv_play.cpp
===================================================================
--- libs/libmythtv/tv_play.cpp	(revision 20066)
+++ libs/libmythtv/tv_play.cpp	(working copy)
@@ -6,6 +6,9 @@
 #include <pthread.h>
 
 #include <algorithm>
+#include <QTimerEvent>
+#include <QResizeEvent>
+
 using namespace std;
 
 #include <QApplication>
@@ -15,6 +18,7 @@
 #include <QDir>
 #include <QKeyEvent>
 #include <QEvent>
+#include <QUdpSocket>
 
 #include "mythdb.h"
 #include "tv_play.h"
Index: libs/libmythtv/videodisplayprofile.h
===================================================================
--- libs/libmythtv/videodisplayprofile.h	(revision 20066)
+++ libs/libmythtv/videodisplayprofile.h	(working copy)
@@ -6,10 +6,10 @@
 #include <vector>
 using namespace std;
 
-#include <qstringlist.h>
-#include <qmutex.h>
-#include <qsize.h>
-#include <qmap.h>
+#include <QStringList>
+#include <QMutex>
+#include <QSize>
+#include <QMap>
 
 #include "mythcontext.h"
 
Index: libs/libmythtv/remoteencoder.h
===================================================================
--- libs/libmythtv/remoteencoder.h	(revision 20066)
+++ libs/libmythtv/remoteencoder.h	(working copy)
@@ -1,9 +1,9 @@
 #ifndef REMOTEENCODER_H_
 #define REMOTEENCODER_H_
 
-#include <qstringlist.h>
-#include <qmutex.h>
-#include <qmap.h>
+#include <QStringList>
+#include <QMutex>
+#include <QMap>
 
 #include "mythexp.h"
 #include "videoouttypes.h"
Index: libs/libmythtv/videoout_directfb.h
===================================================================
--- libs/libmythtv/videoout_directfb.h	(revision 20066)
+++ libs/libmythtv/videoout_directfb.h	(working copy)
@@ -1,7 +1,7 @@
 #ifndef VIDEOOUT_DIRECTFB_H
 #define VIDEOOUT_DIRECTFB_H
 
-#include <qobject.h>
+#include <QObject>
 #include "videooutbase.h"
 
 class NuppelVideoPlayer;
Index: libs/libmythtv/videoout_xv.h
===================================================================
--- libs/libmythtv/videoout_xv.h	(revision 20066)
+++ libs/libmythtv/videoout_xv.h	(working copy)
@@ -2,7 +2,6 @@
 #define VIDEOOUT_XV_H_
 
 #include <set>
-#include <qwindowdefs.h>
 
 #include "DisplayRes.h"
 #include "videooutbase.h"
Index: libs/libmythtv/siscan.h
===================================================================
--- libs/libmythtv/siscan.h	(revision 20066)
+++ libs/libmythtv/siscan.h	(working copy)
@@ -6,11 +6,11 @@
 #include <pthread.h>
 
 // Qt includes
-#include <qobject.h>
-#include <qstring.h>
-#include <qmap.h>
-#include <qmutex.h>
-#include <qdatetime.h>
+#include <QObject>
+#include <QString>
+#include <QMap>
+#include <QMutex>
+#include <QDateTime>
 
 // MythTV includes
 #include "frequencytables.h"
Index: libs/libmythtv/xvmctextures.h
===================================================================
--- libs/libmythtv/xvmctextures.h	(revision 20066)
+++ libs/libmythtv/xvmctextures.h	(working copy)
@@ -3,7 +3,7 @@
 #ifndef _XVMC_TEXTURES_H_
 #define _XVMC_TEXTURES_H_
 
-#include <qsize.h>
+#include <QSize>
 
 class OSD;
 
Index: libs/libmythtv/dvbcam.cpp
===================================================================
--- libs/libmythtv/dvbcam.cpp	(revision 20066)
+++ libs/libmythtv/dvbcam.cpp	(working copy)
@@ -33,8 +33,8 @@
  *
  */
 
-#include <qdatetime.h>
-#include <qvariant.h>
+#include <QDateTime>
+#include <QVariant>
 
 #include <iostream>
 #include <vector>
Index: libs/libmythtv/profilegroup.cpp
===================================================================
--- libs/libmythtv/profilegroup.cpp	(revision 20066)
+++ libs/libmythtv/profilegroup.cpp	(working copy)
@@ -5,9 +5,12 @@
 #include "mythdb.h"
 #include "mythuihelper.h"
 #include "cardutil.h"
-#include <qsqldatabase.h>
-#include <qcursor.h>
-#include <qlayout.h>
+
+#include <QSqlDatabase>
+#include <QCursor>
+#include <QLayout>
+#include <Q3VBoxLayout>
+
 #include <iostream>
 
 QString ProfileGroupStorage::GetWhereClause(MSqlBindings &bindings) const
@@ -259,7 +262,7 @@
         float wmult = 0.0f, hmult  = 0.0f;
         GetMythUI()->GetScreenSettings(width, wmult, height, hmult);
 
-        QVBoxLayout *layout = new QVBoxLayout(dialog);
+        Q3VBoxLayout *layout = new Q3VBoxLayout(dialog);
         layout->setMargin((int)(20 * hmult));
         layout->addWidget(listbox->configWidget(NULL, dialog));
 
Index: libs/libmythtv/cc608decoder.h
===================================================================
--- libs/libmythtv/cc608decoder.h	(revision 20066)
+++ libs/libmythtv/cc608decoder.h	(working copy)
@@ -8,8 +8,8 @@
 #include <vector>
 using namespace std;
 
-#include <qmutex.h>
-#include <qstringlist.h>
+#include <QMutex>
+#include <QStringList>
 
 #include "format.h"
 
Index: libs/libmythtv/iptvchannel.h
===================================================================
--- libs/libmythtv/iptvchannel.h	(revision 20066)
+++ libs/libmythtv/iptvchannel.h	(working copy)
@@ -10,7 +10,7 @@
 #include "dtvchannel.h"
 #include "iptvchannelinfo.h"
 
-#include <qmutex.h>
+#include <QMutex>
 
 class IPTVFeederWrapper;
 
Index: libs/libmythtv/XvMCSurfaceTypes.h
===================================================================
--- libs/libmythtv/XvMCSurfaceTypes.h	(revision 20066)
+++ libs/libmythtv/XvMCSurfaceTypes.h	(working copy)
@@ -5,10 +5,11 @@
 #ifdef USING_XVMC
 
 #include <QString>
+#include <QEvent>
 
-#include <qwindowdefs.h>
+#include <X11/extensions/XvMC.h>
+
 #include "mythcontext.h"
-#include <X11/extensions/XvMC.h>
 #include "util-x11.h"
 #include "fourcc.h"
 
Index: libs/libmythtv/scanwizardscanner.h
===================================================================
--- libs/libmythtv/scanwizardscanner.h	(revision 20066)
+++ libs/libmythtv/scanwizardscanner.h	(working copy)
@@ -36,7 +36,7 @@
 #include <pthread.h>
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 #include <QEvent>
 
 // MythTV headers
Index: libs/libmythtv/dvbstreamhandler.cpp
===================================================================
--- libs/libmythtv/dvbstreamhandler.cpp	(revision 20066)
+++ libs/libmythtv/dvbstreamhandler.cpp	(working copy)
@@ -10,7 +10,7 @@
 #include <sys/ioctl.h>
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 
 // MythTV headers
 #include "dvbstreamhandler.h"
Index: libs/libmythtv/remoteutil.cpp
===================================================================
--- libs/libmythtv/remoteutil.cpp	(revision 20066)
+++ libs/libmythtv/remoteutil.cpp	(working copy)
@@ -1,5 +1,6 @@
-#include <qfile.h>
-#include <qstringlist.h>
+#include <QFile>
+#include <QStringList>
+
 #include <unistd.h>
 
 #include "remoteutil.h"
Index: libs/libmythtv/sr_items.h
===================================================================
--- libs/libmythtv/sr_items.h	(revision 20066)
+++ libs/libmythtv/sr_items.h	(working copy)
@@ -1,6 +1,8 @@
 #ifndef SR_ITEMS_H
 #define SR_ITEMS_H
-#include <qsqldatabase.h>
+
+#include <QSqlDatabase>
+
 #include "mythcontext.h"
 #include "mythdbcon.h"
 #include "managedlist.h"
Index: libs/libmythtv/RingBuffer.h
===================================================================
--- libs/libmythtv/RingBuffer.h	(revision 20066)
+++ libs/libmythtv/RingBuffer.h	(working copy)
@@ -3,9 +3,10 @@
 #ifndef RINGBUFFER
 #define RINGBUFFER
 
-#include <qstring.h>
-#include <qwaitcondition.h>
-#include <qmutex.h>
+#include <QString>
+#include <QWaitCondition>
+#include <QMutex>
+
 #include <pthread.h>
 
 extern "C" {
Index: libs/libmythtv/eitscanner.h
===================================================================
--- libs/libmythtv/eitscanner.h	(revision 20066)
+++ libs/libmythtv/eitscanner.h	(working copy)
@@ -3,12 +3,12 @@
 #define EITSCANNER_H
 
 // Qt includes
-#include <qmutex.h>
-#include <qobject.h>
-#include <qdatetime.h>
-#include <qstringlist.h>
-#include <qwaitcondition.h>
-#include <qthread.h>
+#include <QMutex>
+#include <QObject>
+#include <QDateTime>
+#include <QStringList>
+#include <QWaitCondition>
+#include <QThread>
 
 class TVRec;
 class ChannelBase;
Index: libs/libmythtv/iptv/iptvfeeder.h
===================================================================
--- libs/libmythtv/iptv/iptvfeeder.h	(revision 20066)
+++ libs/libmythtv/iptv/iptvfeeder.h	(working copy)
@@ -7,7 +7,8 @@
 #ifndef _IPTV_FEEDER_H_
 #define _IPTV_FEEDER_H_
 
-class QString;
+#include <QString>
+
 class TSDataListener;
 
 /** \class IPTVFeeder
Index: libs/libmythtv/iptv/iptvfeederwrapper.h
===================================================================
--- libs/libmythtv/iptv/iptvfeederwrapper.h	(revision 20066)
+++ libs/libmythtv/iptv/iptvfeederwrapper.h	(working copy)
@@ -10,8 +10,8 @@
 #include <vector>
 using namespace std;
 
-#include <qmutex.h>
-#include <qstring.h>
+#include <QMutex>
+#include <QString>
 
 class IPTVFeeder;
 class TSDataListener;
Index: libs/libmythtv/iptv/iptvmediasink.h
===================================================================
--- libs/libmythtv/iptv/iptvmediasink.h	(revision 20066)
+++ libs/libmythtv/iptv/iptvmediasink.h	(working copy)
@@ -10,7 +10,7 @@
 #include <vector>
 using namespace std;
 
-#include <qmutex.h>
+#include <QMutex>
 
 #include <MediaSink.hh>
 
Index: libs/libmythtv/iptv/iptvchannelfetcher.h
===================================================================
--- libs/libmythtv/iptv/iptvchannelfetcher.h	(revision 20066)
+++ libs/libmythtv/iptv/iptvchannelfetcher.h	(working copy)
@@ -2,9 +2,9 @@
 #define _IPTVCHANNELFETCHER_H_
 
 // Qt headers
-#include <qobject.h>
-#include <qmutex.h>
-#include <qthread.h>
+#include <QObject>
+#include <QMutex>
+#include <QThread>
 
 // MythTV headers
 #include "iptvchannelinfo.h"
Index: libs/libmythtv/iptv/iptvfeederlive.h
===================================================================
--- libs/libmythtv/iptv/iptvfeederlive.h	(revision 20066)
+++ libs/libmythtv/iptv/iptvfeederlive.h	(working copy)
@@ -12,13 +12,12 @@
 using namespace std;
 
 // Qt headers
-#include <qwaitcondition.h>
-#include <qmutex.h>
+#include <QWaitCondition>
+#include <QMutex>
 
 // Mythtv headers
 #include "iptvfeeder.h"
 
-class QString;
 class TSDataListener;
 class UsageEnvironment;
 
Index: libs/libmythtv/iptv/iptvchannelinfo.h
===================================================================
--- libs/libmythtv/iptv/iptvchannelinfo.h	(revision 20066)
+++ libs/libmythtv/iptv/iptvchannelinfo.h	(working copy)
@@ -6,8 +6,8 @@
 #ifndef _IPTV_CHANNELINFO_H_
 #define _IPTV_CHANNELINFO_H_
 
-#include <qmap.h>
-#include <qstring.h>
+#include <QMap>
+#include <QString>
 
 class IPTVChannelInfo
 {
Index: libs/libmythtv/programdata.h
===================================================================
--- libs/libmythtv/programdata.h	(revision 20066)
+++ libs/libmythtv/programdata.h	(working copy)
@@ -2,10 +2,10 @@
 #define _PROGRAMDATA_H_
 
 // Qt headers
-#include <qstring.h>
-#include <qdatetime.h>
+#include <QString>
+#include <QDateTime>
 #include <QList>
-#include <qmap.h>
+#include <QMap>
 
 // MythTV headers
 #include "mythexp.h"
Index: libs/libmythtv/transporteditor.h
===================================================================
--- libs/libmythtv/transporteditor.h	(revision 20066)
+++ libs/libmythtv/transporteditor.h	(working copy)
@@ -32,7 +32,8 @@
 #ifndef _TRANSPORT_EDITOR_H_
 #define _TRANSPORT_EDITOR_H_
 
-#include <qobject.h>
+#include <QObject>
+
 #include "settings.h"
 
 class VideoSourceSelector;
Index: libs/libmythtv/avformatdecoder.h
===================================================================
--- libs/libmythtv/avformatdecoder.h	(revision 20066)
+++ libs/libmythtv/avformatdecoder.h	(working copy)
@@ -1,8 +1,8 @@
 #ifndef AVFORMATDECODER_H_
 #define AVFORMATDECODER_H_
 
-#include <qstring.h>
-#include <qmap.h>
+#include <QString>
+#include <QMap>
 #include <QList>
 
 #include "programinfo.h"
Index: libs/libmythtv/tv_rec.cpp
===================================================================
--- libs/libmythtv/tv_rec.cpp	(revision 20066)
+++ libs/libmythtv/tv_rec.cpp	(working copy)
@@ -11,8 +11,8 @@
 using namespace std;
 
 // Qt headers
-#include <qapplication.h>
-#include <qsqldatabase.h>
+#include <QApplication>
+#include <QSqlDatabase>
 
 // MythTV headers
 #include "mythconfig.h"
Index: libs/libmythtv/xbox.h
===================================================================
--- libs/libmythtv/xbox.h	(revision 20066)
+++ libs/libmythtv/xbox.h	(working copy)
@@ -1,9 +1,9 @@
 #ifndef XBOX_H_
 #define XBOX_H_
 
-#include <qobject.h>
-#include <qtimer.h>
-#include <qstringlist.h>
+#include <QObject>
+#include <QTimer>
+#include <QStringList>
 
 #include "mythexp.h"
 
Index: libs/libmythtv/videoout_dvdv.h
===================================================================
--- libs/libmythtv/videoout_dvdv.h	(revision 20066)
+++ libs/libmythtv/videoout_dvdv.h	(working copy)
@@ -6,7 +6,6 @@
 
 #include "frame.h"
 
-class QSize;
 class AVCodecContext;
 struct DVDV_Private;
 struct AVCodecContext;
Index: libs/libmythtv/previewgenerator.h
===================================================================
--- libs/libmythtv/previewgenerator.h	(revision 20066)
+++ libs/libmythtv/previewgenerator.h	(working copy)
@@ -4,8 +4,8 @@
 
 #include <pthread.h>
 
-#include <qstring.h>
-#include <qmutex.h>
+#include <QString>
+#include <QMutex>
 
 #include "programinfo.h"
 #include "util.h"
Index: libs/libmythtv/videooutbase.h
===================================================================
--- libs/libmythtv/videooutbase.h	(revision 20066)
+++ libs/libmythtv/videooutbase.h	(working copy)
@@ -13,7 +13,6 @@
 #include <QString>
 #include <QPoint>
 #include <QMap>
-#include <qwindowdefs.h>
 
 #include "videobuffers.h"
 #include "mythcodecid.h"
Index: libs/libmythtv/videoout_dvdv.mm
===================================================================
--- libs/libmythtv/videoout_dvdv.mm	(revision 20066)
+++ libs/libmythtv/videoout_dvdv.mm	(working copy)
@@ -11,11 +11,11 @@
 #import <AGL/agl.h>
 #import <OpenGL/glext.h>
 
-#include <qmutex.h>
-#include <qstring.h>
-#include <q3ptrqueue.h>
-#include <qmap.h>
-#include <qsize.h>
+#include <QMutex>
+#include <QString>
+#include <Q3PtrQueue>
+#include <QMap>
+#include <QSize>
 
 #include "libmyth/mythconfig.h"
 #include "libmyth/mythverbose.h"
Index: libs/libmythtv/iptvrecorder.h
===================================================================
--- libs/libmythtv/iptvrecorder.h	(revision 20066)
+++ libs/libmythtv/iptvrecorder.h	(working copy)
@@ -8,7 +8,7 @@
 #ifndef _IPTV_RECORDER_H_
 #define _IPTV_RECORDER_H_
 
-#include <qwaitcondition.h>
+#include <QWaitCondition>
 
 #include "dtvrecorder.h"
 #include "streamlisteners.h"
Index: libs/libmythtv/textsubtitleparser.cpp
===================================================================
--- libs/libmythtv/textsubtitleparser.cpp	(revision 20066)
+++ libs/libmythtv/textsubtitleparser.cpp	(working copy)
@@ -8,8 +8,9 @@
 #include <cstring>
 #include <climits>
 #include <algorithm>
-#include <qtextcodec.h>
 
+#include <QTextCodec>
+
 #include "mythcontext.h"
 
 using std::lower_bound;
Index: libs/libmythtv/ThreadedFileWriter.h
===================================================================
--- libs/libmythtv/ThreadedFileWriter.h	(revision 20066)
+++ libs/libmythtv/ThreadedFileWriter.h	(working copy)
@@ -3,10 +3,11 @@
 #define TFW_H_
 
 #include <pthread.h>
-#include <qmutex.h>
-#include <qwaitcondition.h>
-#include <qstring.h>
 
+#include <QMutex>
+#include <QWaitCondition>
+#include <QString>
+
 class ThreadedFileWriter
 {
   public:
Index: libs/libmythtv/videobuffers.h
===================================================================
--- libs/libmythtv/videobuffers.h	(revision 20066)
+++ libs/libmythtv/videobuffers.h	(working copy)
@@ -6,17 +6,17 @@
 extern "C" {
 #include "frame.h"
 }
+
+#include <QMutex>
+#include <QString>
+#include <QWaitCondition>
+#include <qwindowdefs.h>
+
 #include <vector>
 #include <map>
-#include <qmutex.h>
-#include <qstring.h>
-#include <qwaitcondition.h>
+
 #include "mythdeque.h"
 
-#ifdef USING_XVMC
-#include <qwindowdefs.h>
-#endif // USING_XVMC
-
 #ifdef USING_VDPAU
 class VDPAUContext;
 #endif
Index: libs/libmythtv/channelsettings.h
===================================================================
--- libs/libmythtv/channelsettings.h	(revision 20066)
+++ libs/libmythtv/channelsettings.h	(working copy)
@@ -1,8 +1,8 @@
 #ifndef CHANNELSETTINGS_H
 #define CHANNELSETTINGS_H
 
-#include <qwidget.h>
-#include <qsqldatabase.h>
+#include <QWidget>
+#include <QSqlDatabase>
 
 #include <cstdlib>
 
Index: libs/libmythtv/firewiredevice.h
===================================================================
--- libs/libmythtv/firewiredevice.h	(revision 20066)
+++ libs/libmythtv/firewiredevice.h	(working copy)
@@ -12,8 +12,8 @@
 using namespace std;
 
 // Qt headers
-#include <qstring.h>
-#include <qmutex.h>
+#include <QString>
+#include <QMutex>
 
 // MythTV headers
 #include "streamlisteners.h"
Index: libs/libmythtv/eitfixup.h
===================================================================
--- libs/libmythtv/eitfixup.h	(revision 20066)
+++ libs/libmythtv/eitfixup.h	(working copy)
@@ -5,7 +5,7 @@
 #ifndef EITFIXUP_H
 #define EITFIXUP_H
 
-#include <qregexp.h>
+#include <QRegExp>
 
 #include "eit.h"
 
Index: libs/libmythtv/dbox2channel.cpp
===================================================================
--- libs/libmythtv/dbox2channel.cpp	(revision 20066)
+++ libs/libmythtv/dbox2channel.cpp	(working copy)
@@ -9,7 +9,7 @@
 using namespace std;
 
 // Qt headers
-#include <q3http.h>
+#include <QHttp>
 
 // MythTV headers
 #include "mythverbose.h"
@@ -50,7 +50,7 @@
       m_channelListReady(false),     m_lastChannel("1"),
       m_requestChannel(""),          m_epg(new DBox2EPG()),
       m_recorderAlive(false),        m_recorder(NULL),
-      http(new Q3Http()),             httpChanger(new Q3Http()),
+      http(new QHttp()),             httpChanger(new QHttp()),
       m_relay(new DBox2CRelay(this)),
       m_dbox2channelcount(0)
 {
@@ -230,7 +230,7 @@
     // Request Channel list via http.
     // Signal will be emmitted when list is ready.
 
-    Q3HttpRequestHeader header("GET", "/control/channellist");
+    QHttpRequestHeader header("GET", "/control/channellist");
     header.setValue("Host", m_dbox2options->host);
     http->setHost(m_dbox2options->host, m_dbox2options->httpport);
     http->request(header);
@@ -300,7 +300,7 @@
     // Request channel change via http.
     // Signal will be emmited when request is done.
 
-    Q3HttpRequestHeader header("GET", requestString);
+    QHttpRequestHeader header("GET", requestString);
     header.setValue("Host", m_dbox2options->host);
     httpChanger->setHost(m_dbox2options->host, m_dbox2options->httpport);
     httpChanger->request(header);
Index: libs/libmythtv/progfind.cpp
===================================================================
--- libs/libmythtv/progfind.cpp	(revision 20066)
+++ libs/libmythtv/progfind.cpp	(working copy)
@@ -7,15 +7,15 @@
         By John Danner
 */
 
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qdatetime.h>
-#include <qtimer.h>
-#include <qapplication.h>
-#include <qsqldatabase.h>
-#include <qstringlist.h>
-#include <qcursor.h>
-#include <qregexp.h>
+#include <QLabel>
+#include <QLayout>
+#include <QDateTime>
+#include <QTimer>
+#include <QApplication>
+#include <QSqlDatabase>
+#include <QStringList>
+#include <QCursor>
+#include <QRegExp>
 #include <QKeyEvent>
 #include <QEvent>
 #include <QPixmap>
Index: libs/libmythtv/linuxfirewiredevice.cpp
===================================================================
--- libs/libmythtv/linuxfirewiredevice.cpp	(revision 20066)
+++ libs/libmythtv/linuxfirewiredevice.cpp	(working copy)
@@ -28,7 +28,7 @@
 using namespace std;
 
 // Qt headers
-#include <qdatetime.h>
+#include <QDateTime>
 
 // MythTV headers
 #include "linuxfirewiredevice.h"
Index: libs/libmythtv/mhi.cpp
===================================================================
--- libs/libmythtv/mhi.cpp	(revision 20066)
+++ libs/libmythtv/mhi.cpp	(working copy)
@@ -1,8 +1,7 @@
 #include <unistd.h>
 
 #include <QRegion>
-#include <qbitarray.h>
-
+#include <QBitArray>
 #include <QVector>
 
 #include "mhi.h"
Index: libs/libmythtv/inputgroupmap.h
===================================================================
--- libs/libmythtv/inputgroupmap.h	(revision 20066)
+++ libs/libmythtv/inputgroupmap.h	(working copy)
@@ -7,7 +7,7 @@
 using namespace std;
 
 // Qt headers
-#include <qmap.h>
+#include <QMap>
 
 // MythTV headers
 #include "mythexp.h"
Index: libs/libmythtv/hdhrchannel.h
===================================================================
--- libs/libmythtv/hdhrchannel.h	(revision 20066)
+++ libs/libmythtv/hdhrchannel.h	(working copy)
@@ -8,7 +8,7 @@
 #define HDHOMERUNCHANNEL_H
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 
 // MythTV headers
 #include "dtvchannel.h"
Index: libs/libmythtv/udpnotify.h
===================================================================
--- libs/libmythtv/udpnotify.h	(revision 20066)
+++ libs/libmythtv/udpnotify.h	(working copy)
@@ -13,13 +13,12 @@
 #include <QObject>
 #include <QMutex>
 #include <QMap>
+#include <QUdpSocket>
+#include <QDomElement>
 
 class TV;
 class OSD;
 class UDPNotifyOSDTypeText;
-class QByteArray;
-class QUdpSocket;
-class QDomElement;
 
 class UDPNotifyOSDSet
 {
Index: libs/libmythtv/videoout_null.h
===================================================================
--- libs/libmythtv/videoout_null.h	(revision 20066)
+++ libs/libmythtv/videoout_null.h	(working copy)
@@ -1,7 +1,7 @@
 #ifndef VIDEOOUT_NULL_H_
 #define VIDEOOUT_NULL_H_
 
-#include <qmutex.h>
+#include <QMutex>
 
 #include "videooutbase.h"
 
Index: libs/libmythhdhomerun/hdhomerun_os.h
===================================================================
--- libs/libmythhdhomerun/hdhomerun_os.h	(revision 20066)
+++ libs/libmythhdhomerun/hdhomerun_os.h	(working copy)
@@ -86,8 +86,8 @@
 typedef unsigned __int16 uint16_t;
 typedef unsigned __int32 uint32_t;
 typedef unsigned __int64 uint64_t;
-typedef HANDLE pthread_t;
-typedef HANDLE pthread_mutex_t;
+typedef Qt::HANDLE pthread_t;
+typedef Qt::HANDLE pthread_mutex_t;
 
 #define socklen_t int
 #define close closesocket
Index: libs/libmythhdhomerun/libmythhdhomerun.pro
===================================================================
--- libs/libmythhdhomerun/libmythhdhomerun.pro	(revision 20066)
+++ libs/libmythhdhomerun/libmythhdhomerun.pro	(working copy)
@@ -22,3 +22,4 @@
 SOURCES += hdhomerun_video.c
 
 include ( ../libs-targetfix.pro )
+QT += network  sql qt3support 
Index: libs/libmythsoundtouch/libmythsoundtouch.pro
===================================================================
--- libs/libmythsoundtouch/libmythsoundtouch.pro	(revision 20066)
+++ libs/libmythsoundtouch/libmythsoundtouch.pro	(working copy)
@@ -39,3 +39,4 @@
 }
 
 include ( ../libs-targetfix.pro )
+QT +=  qt3support 
Index: libs/libmythsamplerate/libmythsamplerate.pro
===================================================================
--- libs/libmythsamplerate/libmythsamplerate.pro	(revision 20066)
+++ libs/libmythsamplerate/libmythsamplerate.pro	(working copy)
@@ -26,3 +26,4 @@
 INSTALLS += inc
 
 include ( ../libs-targetfix.pro )
+QT +=  qt3support 
Index: libs/libmythlivemedia/libmythlivemedia.pro
===================================================================
--- libs/libmythlivemedia/libmythlivemedia.pro	(revision 20066)
+++ libs/libmythlivemedia/libmythlivemedia.pro	(working copy)
@@ -305,7 +305,7 @@
     SOURCES += liveMedia/WAVAudioFileSource.cpp
 }
 
-#The following line was inserted by qt3to4
 QT -= core gui
 
 include ( ../libs-targetfix.pro )
+QT += network  sql qt3support 
Index: libs/libavutil/libavutil.pro
===================================================================
--- libs/libavutil/libavutil.pro	(revision 20066)
+++ libs/libavutil/libavutil.pro	(working copy)
@@ -56,3 +56,4 @@
 }
 
 include ( ../libs-targetfix.pro )
+QT +=  qt3support 
Index: libs/libavcodec/libavcodec.pro
===================================================================
--- libs/libavcodec/libavcodec.pro	(revision 20066)
+++ libs/libavcodec/libavcodec.pro	(working copy)
@@ -543,3 +543,4 @@
 }
 
 include ( ../libs-targetfix.pro )
+QT += xml network  sql opengl qt3support 
Index: libs/libmythmpeg2/libmythmpeg2.pro
===================================================================
--- libs/libmythmpeg2/libmythmpeg2.pro	(revision 20066)
+++ libs/libmythmpeg2/libmythmpeg2.pro	(working copy)
@@ -42,3 +42,4 @@
 }
 
 include ( ../libs-targetfix.pro )
+QT +=  qt3support 
Index: libs/libmythui/myththemedmenu.h
===================================================================
--- libs/libmythui/myththemedmenu.h	(revision 20066)
+++ libs/libmythui/myththemedmenu.h	(working copy)
@@ -5,12 +5,11 @@
 #include "mythuistatetype.h"
 #include "mythuibuttonlist.h"
 #include "xmlparsebase.h"
+#include <QKeyEvent>
 
 class MythMainWindow;
 class MythThemedMenuState;
 
-class QKeyEvent;
-
 struct ThemedButton
 {
     QString type;
Index: libs/libmythui/mythvirtualkeyboard.cpp
===================================================================
--- libs/libmythui/mythvirtualkeyboard.cpp	(revision 20066)
+++ libs/libmythui/mythvirtualkeyboard.cpp	(working copy)
@@ -5,6 +5,7 @@
 #include <QKeyEvent>
 #include <QDomDocument>
 #include <QFile>
+#include <QEvent>
 
 // myth
 #include "mythmainwindow.h"
@@ -437,7 +438,7 @@
 
                     if (m_parentEdit)
                     {
-                        QKeyEvent *event = new QKeyEvent(QEvent::KeyPress, 0, Qt::NoModifier, c);
+                        QKeyEvent *event = new QKeyEvent(QEvent::KeyPress, 0, (Qt::KeyboardModifiers)Qt::NoModifier, c);
                         m_parentEdit->keyPressEvent(event);
                     }
 
@@ -457,7 +458,7 @@
 
         if (m_parentEdit)
         {
-            QKeyEvent *event = new QKeyEvent(QEvent::KeyPress, 0, Qt::NoModifier, c);
+            QKeyEvent *event = new QKeyEvent(QEvent::KeyPress, 0, (Qt::KeyboardModifiers)Qt::NoModifier, c);
             m_parentEdit->keyPressEvent(event);
         }
 
Index: libs/libmythui/mythuibutton.cpp
===================================================================
--- libs/libmythui/mythuibutton.cpp	(revision 20066)
+++ libs/libmythui/mythuibutton.cpp	(working copy)
@@ -1,6 +1,7 @@
 // QT
 #include <QTimer>
 #include <QDomDocument>
+#include <QKeyEvent>
 
 // Myth headers
 #include "mythverbose.h"
Index: libs/libmythui/mythmainwindow.cpp
===================================================================
--- libs/libmythui/mythmainwindow.cpp	(revision 20066)
+++ libs/libmythui/mythmainwindow.cpp	(working copy)
@@ -18,7 +18,12 @@
 #include <QEvent>
 
 #ifdef QWS
-#include <qwindowsystem_qws.h>
+#include <QKeyEvent>
+#include <QPixmap>
+#include <QMouseEvent>
+#include <QPaintEvent>
+#include <QWheelEvent>
+#include <QCloseEvent>
 #endif
 #ifdef Q_WS_MACX
 #include <HIToolbox/Menus.h>   // For GetMBarHeight()
Index: libs/libmythui/mythmainwindow_internal.h
===================================================================
--- libs/libmythui/mythmainwindow_internal.h	(revision 20066)
+++ libs/libmythui/mythmainwindow_internal.h	(working copy)
@@ -2,6 +2,7 @@
 #define MYTHMAINWINDOW_INT
 
 #include <QWidget>
+#include <QPaintEvent>
 
 class MythMainWindow;
 class MythMainWindowPrivate;
Index: libs/libmythui/mythdialogbox.h
===================================================================
--- libs/libmythui/mythdialogbox.h	(revision 20066)
+++ libs/libmythui/mythdialogbox.h	(working copy)
@@ -3,14 +3,11 @@
 
 #include <QDir>
 #include <QEvent>
+#include <QKeyEvent>
 
 #include "mythscreentype.h"
 #include "mythuitextedit.h"
 
-class QString;
-class QStringList;
-class QTimer;
-
 class MythUIButtonListItem;
 class MythUIButtonList;
 class MythUIButton;
Index: libs/libmythui/AppleRemoteListener.cpp
===================================================================
--- libs/libmythui/AppleRemoteListener.cpp	(revision 20066)
+++ libs/libmythui/AppleRemoteListener.cpp	(working copy)
@@ -1,5 +1,6 @@
 #include <QApplication>
 #include <QKeySequence>
+#include <QEvent>
 #include "lircevent.h"
 
 #include "AppleRemoteListener.h"
Index: libs/libmythui/mythimage.cpp
===================================================================
--- libs/libmythui/mythimage.cpp	(revision 20066)
+++ libs/libmythui/mythimage.cpp	(working copy)
@@ -4,6 +4,7 @@
 // QT headers
 #include <QPainter>
 #include <QMatrix>
+#include <QPixmap>
 
 #include "mythimage.h"
 #include "mythmainwindow.h"
Index: libs/libmythui/mythgesture.h
===================================================================
--- libs/libmythui/mythgesture.h	(revision 20066)
+++ libs/libmythui/mythgesture.h	(working copy)
@@ -26,9 +26,9 @@
 
 #include <sys/types.h>
 
-#include <qpoint.h>
-#include <qlist.h>
-#include <qevent.h>
+#include <QPoint>
+#include <QList>
+#include <QEvent>
 
 const int MythGestureEventType = 24427;
 
Index: libs/libmythui/mythprogressdialog.h
===================================================================
--- libs/libmythui/mythprogressdialog.h	(revision 20066)
+++ libs/libmythui/mythprogressdialog.h	(working copy)
@@ -2,6 +2,7 @@
 #define MYTHPROGRESSBOX_H_
 
 #include <QEvent>
+#include <QKeyEvent>
 
 #include "mythscreentype.h"
 #include "mythmainwindow.h"
Index: libs/libmythui/mythuitextedit.h
===================================================================
--- libs/libmythui/mythuitextedit.h	(revision 20066)
+++ libs/libmythui/mythuitextedit.h	(working copy)
@@ -2,6 +2,7 @@
 #define MYTHUI_TEXTEDIT_H_
 
 #include <QString>
+#include <QKeyEvent>
 
 #include "mythuitype.h"
 #include "mythuitext.h"
Index: libs/libmythui/mythpainter.h
===================================================================
--- libs/libmythui/mythpainter.h	(revision 20066)
+++ libs/libmythui/mythpainter.h	(working copy)
@@ -4,8 +4,6 @@
 #include <QString>
 #include <QWidget>
 
-class QRect;
-
 //  #include "mythfontproperties.h"
 
 #include "compat.h"
Index: libs/libmythui/mythpainter_qt.h
===================================================================
--- libs/libmythui/mythpainter_qt.h	(revision 20066)
+++ libs/libmythui/mythpainter_qt.h	(working copy)
@@ -6,8 +6,6 @@
 
 #include "compat.h"
 
-class QPainter;
-
 class MythQtPainter : public MythPainter
 {
   public:
Index: libs/libmythui/mythmainwindow.h
===================================================================
--- libs/libmythui/mythmainwindow.h	(revision 20066)
+++ libs/libmythui/mythmainwindow.h	(working copy)
@@ -2,12 +2,13 @@
 #define MYTHMAINWINDOW_H_
 
 #include <QWidget>
+#include <QEvent>
+#include <QKeyEvent>
+#include <QCloseEvent>
 
 #include "mythuitype.h"
 #include "mythscreenstack.h"
 
-class QEvent;
-
 class MythMediaDevice;
 
 #define REG_KEY(a, b, c, d) GetMythMainWindow()->RegisterKey(a, b, c, d)
Index: libs/libmythui/util-x11.cpp
===================================================================
--- libs/libmythui/util-x11.cpp	(revision 20066)
+++ libs/libmythui/util-x11.cpp	(working copy)
@@ -4,6 +4,7 @@
 
 #include "config.h" // for CONFIG_DARWIN
 #include "mythverbose.h"
+#include "mythuihelper.h"
 
 QMutex x11_lock;
 
@@ -20,7 +21,6 @@
 #endif // USING_X11
 
 #include <QMutex>
-#include "mythuihelper.h"
 
 #ifdef USING_X11
 std::map<Display*, XErrorVectorType>   error_map;
Index: libs/libmythui/mythuitype.h
===================================================================
--- libs/libmythui/mythuitype.h	(revision 20066)
+++ libs/libmythui/mythuitype.h	(working copy)
@@ -6,6 +6,8 @@
 #include <QMap>
 #include <QList>
 #include <QFont>
+#include <QKeyEvent>
+#include <QEvent>
 
 #include "xmlparsebase.h"
 #include "mythrect.h"
@@ -16,9 +18,6 @@
 class FontMap;
 class MythFontProperties;
 
-class QEvent;
-class QKeyEvent;
-
 class MythUIText;
 class MythUIButton;
 class MythUIButtonList;
Index: libs/libmythui/mythscreentype.h
===================================================================
--- libs/libmythui/mythscreentype.h	(revision 20066)
+++ libs/libmythui/mythscreentype.h	(working copy)
@@ -4,6 +4,7 @@
 #include "mythuitype.h"
 #include "mythuitext.h"
 #include "mythuiutils.h"
+#include <QKeyEvent>
 
 class MythScreenStack;
 
Index: libs/libmythui/mythuibuttontree.h
===================================================================
--- libs/libmythui/mythuibuttontree.h	(revision 20066)
+++ libs/libmythui/mythuibuttontree.h	(working copy)
@@ -4,6 +4,7 @@
 #include "mythuitype.h"
 #include "mythgenerictree.h"
 #include "mythuibuttonlist.h"
+#include <QKeyEvent>
 
 class MythUIButtonListItem;
 
Index: libs/libmythui/mythuibuttonlist.h
===================================================================
--- libs/libmythui/mythuibuttonlist.h	(revision 20066)
+++ libs/libmythui/mythuibuttonlist.h	(working copy)
@@ -4,6 +4,7 @@
 #include <QList>
 #include <QString>
 #include <QVariant>
+#include <QKeyEvent>
 
 #include "mythuitype.h"
 #include "mythuiimage.h"
Index: libs/libmythui/mythscreentype.cpp
===================================================================
--- libs/libmythui/mythscreentype.cpp	(revision 20066)
+++ libs/libmythui/mythscreentype.cpp	(working copy)
@@ -1,6 +1,7 @@
 #include <cassert>
 
 #include <QDomDocument>
+#include <QKeyEvent>
 
 #include "mythverbose.h"
 
Index: libs/libmythui/themeinfo.h
===================================================================
--- libs/libmythui/themeinfo.h	(revision 20066)
+++ libs/libmythui/themeinfo.h	(working copy)
@@ -3,6 +3,7 @@
 
 #include <QString>
 #include <QSize>
+#include <QFileInfo>
 
 #include "mythexp.h"
 
@@ -13,8 +14,6 @@
     THEME_MENU  = 0x04
 } ThemeType;
 
-class QFileInfo;
-
 class MPUBLIC ThemeInfo
 {
 
Index: libs/libmythui/mythuihelper.h
===================================================================
--- libs/libmythui/mythuihelper.h	(revision 20066)
+++ libs/libmythui/mythuihelper.h	(working copy)
@@ -1,6 +1,7 @@
 #ifndef MYTHUIHELPERS_H_
 #define MYTHUIHELPERS_H_
 
+#include <QPixmap>
 #include <QString>
 #include <QFont>
 #include <QMutex>
@@ -9,10 +10,7 @@
 
 class MythUIHelperPrivate;
 class MythImage;
-class QImage;
-class QWidget;
 class Settings;
-class QPixmap;
 
 struct MPUBLIC MythUIMenuCallbacks
 {
Index: libs/libmythui/mythuicheckbox.cpp
===================================================================
--- libs/libmythui/mythuicheckbox.cpp	(revision 20066)
+++ libs/libmythui/mythuicheckbox.cpp	(working copy)
@@ -6,6 +6,7 @@
 #include "mythgesture.h"
 
 #include "mythuicheckbox.h"
+#include <QKeyEvent>
 
 MythUICheckBox::MythUICheckBox(MythUIType *parent, const QString &name)
             : MythUIType(parent, name)
Index: libs/libmythui/mythuiwebbrowser.h
===================================================================
--- libs/libmythui/mythuiwebbrowser.h	(revision 20066)
+++ libs/libmythui/mythuiwebbrowser.h	(working copy)
@@ -7,6 +7,7 @@
 #include <QTime>
 #include <QColor>
 #include <QIcon>
+#include <QKeyEvent>
 
 
 #ifdef USING_QTWEBKIT
Index: libs/libmythui/mythuibuttontree.cpp
===================================================================
--- libs/libmythui/mythuibuttontree.cpp	(revision 20066)
+++ libs/libmythui/mythuibuttontree.cpp	(working copy)
@@ -1,6 +1,7 @@
 // Qt headers
 #include <QDomDocument>
 #include <QDomDocument>
+#include <QKeyEvent>
 
 #include "mythverbose.h"
 
Index: libs/libmythui/mythuibuttonlist.cpp
===================================================================
--- libs/libmythui/mythuibuttonlist.cpp	(revision 20066)
+++ libs/libmythui/mythuibuttonlist.cpp	(working copy)
@@ -1,5 +1,6 @@
 // QT headers
 #include <QDomDocument>
+#include <QKeyEvent>
 
 // libmyth headers
 #include "mythverbose.h"
Index: libs/libmythui/mythdialogbox.cpp
===================================================================
--- libs/libmythui/mythdialogbox.cpp	(revision 20066)
+++ libs/libmythui/mythdialogbox.cpp	(working copy)
@@ -5,6 +5,7 @@
 #include <QString>
 #include <QStringList>
 #include <QTimer>
+#include <QKeyEvent>
 
 #include "mythverbose.h"
 
Index: libs/libmythui/mythvirtualkeyboard.h
===================================================================
--- libs/libmythui/mythvirtualkeyboard.h	(revision 20066)
+++ libs/libmythui/mythvirtualkeyboard.h	(working copy)
@@ -2,9 +2,8 @@
 #define MYTHUIVIRTUALKEYBOARD_H_
 
 #include "mythscreentype.h"
+#include <QKeyEvent>
 
-class QKeyEvent;
-
 /// Preferred position to place virtual keyboard popup.
 enum PopupPosition
 {
Index: libs/libmythui/mythuibutton.h
===================================================================
--- libs/libmythui/mythuibutton.h	(revision 20066)
+++ libs/libmythui/mythuibutton.h	(working copy)
@@ -2,6 +2,7 @@
 #define MYTHUI_BUTTON_H_
 
 #include <QString>
+#include <QKeyEvent>
 
 #include "mythuitype.h"
 #include "mythuistatetype.h"
@@ -66,7 +67,7 @@
 
     bool m_Pushed;
     bool m_Lockable;
-    class QTimer *m_clickTimer;
+    QTimer *m_clickTimer;
 };
 
 #endif
Index: libs/libmythui/mythgesture.cpp
===================================================================
--- libs/libmythui/mythgesture.cpp	(revision 20066)
+++ libs/libmythui/mythgesture.cpp	(working copy)
@@ -32,6 +32,7 @@
 
 #include <QMutex>
 #include <QMap>
+#include <QString>
 
 #include "mythgesture.h"
 
Index: libs/libmythui/mythuiwebbrowser.cpp
===================================================================
--- libs/libmythui/mythuiwebbrowser.cpp	(revision 20066)
+++ libs/libmythui/mythuiwebbrowser.cpp	(working copy)
@@ -21,6 +21,9 @@
 #include <QStyle>
 #include <QKeyEvent>
 #include <QDomDocument>
+#include <QPixmap>
+#include <QMouseEvent>
+#include <QEvent>
 
 // myth
 #include "mythpainter.h"
Index: libs/libmythui/libmythui.pro
===================================================================
--- libs/libmythui/libmythui.pro	(revision 20066)
+++ libs/libmythui/libmythui.pro	(working copy)
@@ -135,7 +135,6 @@
     }
 }
 
-#The following line was inserted by qt3to4
 QT += xml sql opengl network
 
 using_qtwebkit {
@@ -150,3 +149,4 @@
 include ( ../libs-targetfix.pro )
 
 LIBS += $$LATE_LIBS
+QT +=  qt3support 
Index: libs/libmythui/mythprogressdialog.cpp
===================================================================
--- libs/libmythui/mythprogressdialog.cpp	(revision 20066)
+++ libs/libmythui/mythprogressdialog.cpp	(working copy)
@@ -1,6 +1,8 @@
 // MythTV headers
 #include "mythprogressdialog.h"
 #include "mythverbose.h"
+#include <QEvent>
+#include <QKeyEvent>
 
 MythUIBusyDialog::MythUIBusyDialog(const QString &message,
                              MythScreenStack *parent, const char *name)
Index: libs/libmythui/mythuicheckbox.h
===================================================================
--- libs/libmythui/mythuicheckbox.h	(revision 20066)
+++ libs/libmythui/mythuicheckbox.h	(working copy)
@@ -4,6 +4,7 @@
 // MythUI headers
 #include "mythuitype.h"
 #include "mythuistatetype.h"
+#include <QKeyEvent>
 
 /** \class MythUICheckBox
  *
Index: libs/libmythui/xmlparsebase.h
===================================================================
--- libs/libmythui/xmlparsebase.h	(revision 20066)
+++ libs/libmythui/xmlparsebase.h	(working copy)
@@ -2,12 +2,12 @@
 #define XMLPARSEBASE_H_
 
 #include <QString>
+#include <QDomElement>
 
 #include "mythrect.h"
 
 class MythUIType;
 class MythScreenType;
-class QDomElement;
 
 class MPUBLIC XMLParseBase
 {
Index: libs/libavformat/libavformat.pro
===================================================================
--- libs/libavformat/libavformat.pro	(revision 20066)
+++ libs/libavformat/libavformat.pro	(working copy)
@@ -234,3 +234,4 @@
 mingw:SOURCES -= audio.c
 
 include ( ../libs-targetfix.pro )
+QT += xml network  sql opengl qt3support 
Index: libs/libmyth/settings.cpp
===================================================================
--- libs/libmyth/settings.cpp	(revision 20066)
+++ libs/libmyth/settings.cpp	(working copy)
@@ -1,5 +1,9 @@
 // C++ headers
 #include <algorithm>
+#include <Q3HBoxLayout>
+#include <QPixmap>
+#include <Q3VBoxLayout>
+#include <Q3BoxLayout>
 using namespace std;
 
 // POSIX headers
@@ -10,7 +14,7 @@
 #include <QLabel>
 #include <QSlider>
 #include <QLCDNumber>
-#include <QButtonGroup>
+#include <Q3ButtonGroup>
 #include <QRadioButton>
 #include <QProgressBar>
 
@@ -252,7 +256,7 @@
     QWidget *widget = new QWidget(parent);
     widget->setObjectName(widgetName);
 
-    QHBoxLayout *layout = new QHBoxLayout();
+    Q3HBoxLayout *layout = new Q3HBoxLayout();
 
     if (getLabel() != "")
     {
@@ -279,15 +283,15 @@
     QWidget *widget = new QWidget(parent);
     widget->setObjectName(widgetName);
 
-    QBoxLayout *layout = NULL;
+    Q3BoxLayout *layout = NULL;
     if (labelAboveWidget)
     {
-        layout = new QVBoxLayout();
+        layout = new Q3VBoxLayout();
         widget->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, 
                                           QSizePolicy::Maximum));
     }
     else
-        layout = new QHBoxLayout();
+        layout = new Q3HBoxLayout();
 
     if (getLabel() != "")
     {
@@ -379,15 +383,15 @@
     QWidget *widget = new QWidget(parent);
     widget->setObjectName(widgetName);
 
-    QBoxLayout *layout = NULL;
+    Q3BoxLayout *layout = NULL;
     if (labelAboveWidget)
     {
-        layout = new QVBoxLayout();
+        layout = new Q3VBoxLayout();
         widget->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, 
                                           QSizePolicy::Maximum));
     }
     else
-        layout = new QHBoxLayout();
+        layout = new Q3HBoxLayout();
 
     if (getLabel() != "")
     {
@@ -449,15 +453,15 @@
     QWidget *widget = new QWidget(parent);
     widget->setObjectName(widgetName);
 
-    QBoxLayout *layout = NULL;
+    Q3BoxLayout *layout = NULL;
     if (labelAboveWidget)
     {
-        layout = new QVBoxLayout();
+        layout = new Q3VBoxLayout();
         widget->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, 
                                           QSizePolicy::Maximum));
     }
     else
-        layout = new QHBoxLayout();
+        layout = new Q3HBoxLayout();
 
     if (getLabel() != "")
     {
@@ -561,15 +565,15 @@
     QWidget *widget = new QWidget(parent);
     widget->setObjectName(widgetName);
 
-    QBoxLayout *layout = NULL;
+    Q3BoxLayout *layout = NULL;
     if (labelAboveWidget)
     {
-        layout = new QVBoxLayout();
+        layout = new Q3VBoxLayout();
         widget->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, 
                                           QSizePolicy::Maximum));
     }
     else
-        layout = new QHBoxLayout();
+        layout = new Q3HBoxLayout();
 
     if (getLabel() != "")
     {
@@ -597,15 +601,15 @@
     QWidget *widget = new QWidget(parent);
     widget->setObjectName(widgetName);
 
-    QBoxLayout *layout = NULL;
+    Q3BoxLayout *layout = NULL;
     if (labelAboveWidget)
     {
-        layout = new QVBoxLayout();
+        layout = new Q3VBoxLayout();
         widget->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, 
                                           QSizePolicy::Maximum));
     }
     else
-        layout = new QHBoxLayout();
+        layout = new Q3HBoxLayout();
 
     if (getLabel() != "")
     {
@@ -837,7 +841,7 @@
 QWidget *RadioSetting::configWidget(ConfigurationGroup *cg, QWidget* parent,
                                     const char* widgetName)
 {
-    QGroupBox* widget = new QGroupBox(parent);
+    Q3GroupBox* widget = new Q3GroupBox(parent);
     widget->setObjectName(widgetName);
     widget->setTitle(getLabel());
 
@@ -990,7 +994,7 @@
     QWidget *widget = new QWidget(parent);
     widget->setObjectName(widgetName);
 
-    QVBoxLayout *layout = new QVBoxLayout();
+    Q3VBoxLayout *layout = new Q3VBoxLayout();
 
     if (getLabel() != "")
     {
@@ -1132,15 +1136,15 @@
     bxwidget = new QWidget(parent);
     bxwidget->setObjectName(widgetName);
 
-    QBoxLayout *layout = NULL;
+    Q3BoxLayout *layout = NULL;
     if (labelAboveWidget)
     {
-        layout = new QVBoxLayout();
+        layout = new Q3VBoxLayout();
         bxwidget->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, 
                                             QSizePolicy::Maximum));
     }
     else
-        layout = new QHBoxLayout();
+        layout = new Q3HBoxLayout();
 
     if (getLabel() != "")
     {
@@ -1292,7 +1296,7 @@
     (void)cg;
     QWidget *widget = new QWidget(parent);
     widget->setObjectName(widgetName);
-    QBoxLayout *layout = new QHBoxLayout();
+    Q3BoxLayout *layout = new Q3HBoxLayout();
 
     if (getLabel() != "")
     {
Index: libs/libmyth/mythwizard.cpp
===================================================================
--- libs/libmyth/mythwizard.cpp	(revision 20066)
+++ libs/libmyth/mythwizard.cpp	(working copy)
@@ -47,9 +47,13 @@
 
 #include <QStackedWidget>
 #include <QPushButton>
-#include <QBoxLayout>
-#include <QGroupBox>
+#include <Q3BoxLayout>
+#include <Q3GroupBox>
 #include <QLabel>
+#include <Q3HBoxLayout>
+#include <Q3Frame>
+#include <QEvent>
+#include <Q3VBoxLayout>
 
 #include "mythcontext.h"
 
@@ -70,7 +74,7 @@
         bool appropriate;
     };
 
-    QVBoxLayout * v;
+    Q3VBoxLayout * v;
     Page * current;
     QStackedWidget * ws;
     QList<Page*> pages;
@@ -80,10 +84,10 @@
     MythPushButton * finishButton;
     MythPushButton * cancelButton;
 
-    QGroupBox *helpgroup;
+    Q3GroupBox *helpgroup;
     QLabel *help;
 
-    QFrame * hbar1, * hbar2;
+    Q3Frame * hbar1, * hbar2;
 
     Page * page( const QWidget * w )
     {
@@ -422,7 +426,7 @@
     return d->cancelButton;
 }
 
-void MythWizard::layOutButtonRow( QHBoxLayout * layout )
+void MythWizard::layOutButtonRow( Q3HBoxLayout * layout )
 {
     bool hasEarlyFinish = FALSE;
 
@@ -433,8 +437,8 @@
         i--;
     }
 
-    QHBoxLayout *h = new QHBoxLayout();
-    h->setSpacing(QBoxLayout::LeftToRight);
+    Q3HBoxLayout *h = new Q3HBoxLayout();
+    h->setSpacing(Q3BoxLayout::LeftToRight);
     layout->addLayout( h );
 
     h->addWidget( d->cancelButton );
@@ -479,7 +483,7 @@
     }
 }
 
-void MythWizard::layOutTitleRow( QHBoxLayout * layout, const QString & title )
+void MythWizard::layOutTitleRow( Q3HBoxLayout * layout, const QString & title )
 {
     d->title->setText( title );
     layout->addWidget( d->title, 10 );
@@ -488,21 +492,21 @@
 void MythWizard::layOut()
 {
     delete d->v;
-    d->v = new QVBoxLayout( this);
+    d->v = new Q3VBoxLayout( this);
     d->v->setMargin(6);
     d->v->setSpacing(0);
     d->v->setObjectName("top-level layout");
 
-    QHBoxLayout * l;
-    l = new QHBoxLayout();
+    Q3HBoxLayout * l;
+    l = new Q3HBoxLayout();
     l->setMargin(6);
     d->v->addLayout( l, 0 );
     layOutTitleRow( l, d->current ? d->current->t : QString::null );
 
     if ( ! d->hbar1 ) {
-        d->hbar1 = new QFrame(this, 0);
+        d->hbar1 = new Q3Frame(this, 0);
         d->hbar1->setObjectName("MythWizard - hbar1");
-        d->hbar1->setFrameStyle(QFrame::Sunken | QFrame::HLine);
+        d->hbar1->setFrameStyle(Q3Frame::Sunken | Q3Frame::HLine);
         d->hbar1->setFixedHeight( 12 );
     }
 
@@ -512,7 +516,7 @@
 
     if (!d->helpgroup)
     {
-        d->helpgroup = new QGroupBox(this);
+        d->helpgroup = new Q3GroupBox(this);
         d->helpgroup->setObjectName("MythWizard -- help group box");
 
         d->help = new QLabel(d->helpgroup);
@@ -525,7 +529,7 @@
         d->help->setMaximumHeight((int)(80 * hmult));
         d->help->setMinimumHeight((int)(80 * hmult));
     
-        QVBoxLayout *helplayout = new QVBoxLayout(d->helpgroup);
+        Q3VBoxLayout *helplayout = new Q3VBoxLayout(d->helpgroup);
         helplayout->setMargin(10);
         helplayout->addWidget(d->help);
     }
@@ -537,14 +541,14 @@
     d->v->addWidget(d->helpgroup);
 
     if ( ! d->hbar2 ) {
-        d->hbar2 = new QFrame( this, 0 );
+        d->hbar2 = new Q3Frame( this, 0 );
         d->hbar2->setObjectName("MythWizard - hbar2"); 
-        d->hbar2->setFrameStyle(QFrame::Sunken | QFrame::HLine);
+        d->hbar2->setFrameStyle(Q3Frame::Sunken | Q3Frame::HLine);
         d->hbar2->setFixedHeight( 12 );
     }
     d->v->addWidget( d->hbar2 );
 
-    l = new QHBoxLayout();
+    l = new Q3HBoxLayout();
     l->setMargin(6);
     d->v->addLayout( l );
     layOutButtonRow( l );
Index: libs/libmyth/mythcommandlineparser.cpp
===================================================================
--- libs/libmyth/mythcommandlineparser.cpp	(revision 20066)
+++ libs/libmyth/mythcommandlineparser.cpp	(working copy)
@@ -1,4 +1,5 @@
 #include <QFile>
+#include <QTextStream>
 
 #include "mythcommandlineparser.h"
 #include "exitcodes.h"
Index: libs/libmyth/mythcdrom.cpp
===================================================================
--- libs/libmyth/mythcdrom.cpp	(revision 20066)
+++ libs/libmyth/mythcdrom.cpp	(working copy)
@@ -6,8 +6,8 @@
 #include "mythcdrom-freebsd.h"
 #endif
 
-#include <qdir.h>
-#include <qfileinfo.h>
+#include <QDir>
+#include <QFileInfo>
 
 #include "mythconfig.h"
 #include "mythverbose.h"
Index: libs/libmyth/uitypes.h
===================================================================
--- libs/libmyth/uitypes.h	(revision 20066)
+++ libs/libmyth/uitypes.h	(working copy)
@@ -25,8 +25,6 @@
 #undef LoadImage
 #endif
 
-class QFont;
-class QPainter;
 class UIType;
 class MythDialog;
 class MythThemedDialog;
Index: libs/libmyth/virtualkeyboard_qt.cpp
===================================================================
--- libs/libmyth/virtualkeyboard_qt.cpp	(revision 20066)
+++ libs/libmyth/virtualkeyboard_qt.cpp	(working copy)
@@ -1,7 +1,7 @@
 #include <QPixmap>
 #include <QImage>
 #include <QApplication>
-#include <QFrame>
+#include <Q3Frame>
 #include <QKeyEvent>
 
 #include "virtualkeyboard_qt.h"
@@ -23,7 +23,7 @@
                     bool setsize)
             : MythThemedDialog(parent, name, setsize)
 {
-    setFrameStyle(QFrame::Panel | QFrame::Raised);
+    setFrameStyle(Q3Frame::Panel | Q3Frame::Raised);
     setLineWidth(1);
     m_parentEdit = parentEdit;
 
Index: libs/libmyth/mythmedia.cpp
===================================================================
--- libs/libmyth/mythmedia.cpp	(revision 20066)
+++ libs/libmyth/mythmedia.cpp	(working copy)
@@ -9,6 +9,7 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QFileInfoList>
+#include <QTextStream>
 
 // MythTV headers
 #include "mythmedia.h"
Index: libs/libmyth/mythterminal.h
===================================================================
--- libs/libmyth/mythterminal.h	(revision 20066)
+++ libs/libmyth/mythterminal.h	(working copy)
@@ -8,6 +8,8 @@
 #include <QString>
 #include <QProcess>
 #include <QMutex>
+#include <QKeyEvent>
+#include <QEvent>
 
 // MythTV headers
 #include "mythexp.h"
Index: libs/libmyth/util.h
===================================================================
--- libs/libmyth/util.h	(revision 20066)
+++ libs/libmyth/util.h	(working copy)
@@ -4,10 +4,11 @@
 #include <algorithm>
 using namespace std;
 
-#include <qstringlist.h>
-#include <qdatetime.h>
-#include <qcolor.h>
+#include <QStringList>
+#include <QDateTime>
+#include <QColor>
 #include <QPixmap>
+#include <QFile>
 
 #include <stdint.h>
 #include <time.h>
@@ -16,12 +17,6 @@
 #include "mythtimer.h"
 #include "mythsystem.h"
 
-class QPixmap;
-class QImage;
-class QPainter;
-class QFont;
-class QFile;
-
 MPUBLIC QDateTime mythCurrentDateTime();
 MPUBLIC int calc_utc_offset(void);
 MPUBLIC QString getTimeZoneID(void);
Index: libs/libmyth/mythcontext.h
===================================================================
--- libs/libmyth/mythcontext.h	(revision 20066)
+++ libs/libmyth/mythcontext.h	(working copy)
@@ -1,17 +1,16 @@
 #ifndef MYTHCONTEXT_H_
 #define MYTHCONTEXT_H_
 
-#include <cerrno>
-#include <iostream>
-#include <sstream>
-#include <vector>
-
 #include <QObject>
 #include <QString>
 #include <QMutex>
 #include <QList>
+#include <QKeyEvent>
 
-#include <qevent.h>
+#include <cerrno>
+#include <iostream>
+#include <sstream>
+#include <vector>
 
 #include "mythexp.h"
 #include "mythobservable.h"
@@ -21,8 +20,6 @@
 
 using namespace std;
 
-class QFont;
-
 class Settings;
 class MythMainWindow;
 class MythPluginManager;
Index: libs/libmyth/mythmediamonitor.h
===================================================================
--- libs/libmyth/mythmediamonitor.h	(revision 20066)
+++ libs/libmyth/mythmediamonitor.h	(working copy)
@@ -2,9 +2,9 @@
 #define MYTH_MEDIA_MONITOR_H
 
 #include <QList>
-#include <qpointer.h>
-#include <qthread.h>
-#include <qstring.h>
+#include <QPointer>
+#include <QThread>
+#include <QString>
 #include <QStringList>
 #include <QMutex>
 #include <QEvent>
Index: libs/libmyth/langsettings.cpp
===================================================================
--- libs/libmyth/langsettings.cpp	(revision 20066)
+++ libs/libmyth/langsettings.cpp	(working copy)
@@ -1,5 +1,5 @@
-#include <qapplication.h>
-#include <qsqldatabase.h>
+#include <QApplication>
+#include <QSqlDatabase>
 #include <QTranslator>
 
 using namespace std;
Index: libs/libmyth/volumebase.cpp
===================================================================
--- libs/libmyth/volumebase.cpp	(revision 20066)
+++ libs/libmyth/volumebase.cpp	(working copy)
@@ -1,4 +1,5 @@
-#include <qstring.h>
+#include <QString>
+
 #include <cstdio>
 #include <cstdlib>
 
Index: libs/libmyth/settings.h
===================================================================
--- libs/libmyth/settings.h	(revision 20066)
+++ libs/libmyth/settings.h	(working copy)
@@ -9,6 +9,8 @@
 
 // Qt headers
 #include <QObject>
+#include <QLabel>
+#include <QDir>
 
 // MythTV headers
 #include "mythexp.h"
@@ -17,9 +19,7 @@
 #include "mythdbcon.h"
 #include "mythstorage.h"
 
-class QWidget;
 class ConfigurationGroup;
-class QDir;
 class Setting;
 
 class MPUBLIC Configurable : public QObject
@@ -524,7 +524,6 @@
     };
 };
 
-class QDate;
 class MPUBLIC DateSetting : public Setting
 {
     Q_OBJECT
@@ -540,7 +539,6 @@
     void setValue(const QDate& newValue);
 };
 
-class QTime;
 class MPUBLIC TimeSetting : public Setting
 {
     Q_OBJECT
Index: libs/libmyth/mythwizard.h
===================================================================
--- libs/libmyth/mythwizard.h	(revision 20066)
+++ libs/libmyth/mythwizard.h	(working copy)
@@ -43,9 +43,9 @@
 
 #include <QEvent>
 #include <QKeyEvent>
+#include <Q3HBoxLayout>
 
 class MythWizardPrivate;
-class QHBoxLayout;
 
 class MPUBLIC MythWizard : public MythDialog
 {
@@ -104,8 +104,8 @@
     void selected(const QString&);
 
 protected:
-    virtual void layOutButtonRow(QHBoxLayout *);
-    virtual void layOutTitleRow(QHBoxLayout *, const QString &);
+    virtual void layOutButtonRow(Q3HBoxLayout *);
+    virtual void layOutTitleRow(Q3HBoxLayout *, const QString &);
 
     void setBackEnabled(bool);
     void setNextEnabled(bool);
Index: libs/libmyth/visual.h
===================================================================
--- libs/libmyth/visual.h	(revision 20066)
+++ libs/libmyth/visual.h	(working copy)
@@ -7,7 +7,7 @@
 #ifndef __visual_h
 #define __visual_h
 
-#include <qmutex.h>
+#include <QMutex>
 
 class Decoder;
 class AudioOutput;
Index: libs/libmyth/mythconfigdialogs.cpp
===================================================================
--- libs/libmyth/mythconfigdialogs.cpp	(revision 20066)
+++ libs/libmyth/mythconfigdialogs.cpp	(working copy)
@@ -7,7 +7,10 @@
 #include "mythuihelper.h"
 
 #include <QWidget>
-#include <QHBoxLayout>
+#include <Q3HBoxLayout>
+#include <QLabel>
+#include <QKeyEvent>
+#include <Q3VBoxLayout>
 
 static void clear_widgets(vector<Configurable*> &children,
                           vector<QWidget*>      &childwidget)
@@ -59,7 +62,7 @@
         label->setSizePolicy(QSizePolicy(QSizePolicy::Minimum,
                                          QSizePolicy::Maximum));
 
-        QHBoxLayout *layout = new QHBoxLayout;
+        Q3HBoxLayout *layout = new Q3HBoxLayout;
         layout->addWidget(label);
 
         QWidget *box = new QWidget(dialog);
@@ -144,7 +147,7 @@
 
     GetMythUI()->GetScreenSettings(wmult, hmult);
 
-    QVBoxLayout *layout = new QVBoxLayout(dialog);
+    Q3VBoxLayout *layout = new Q3VBoxLayout(dialog);
     layout->setSpacing((int)(20 * hmult));
 
     ChildList::iterator it = cfgChildren.begin();
Index: libs/libmyth/mythterminal.cpp
===================================================================
--- libs/libmyth/mythterminal.cpp	(revision 20066)
+++ libs/libmyth/mythterminal.cpp	(working copy)
@@ -21,6 +21,8 @@
 // MythTV headers
 #include "mythterminal.h"
 #include "mythcontext.h"
+#include <QEvent>
+#include <QKeyEvent>
 
 MythTerminal::MythTerminal(QString _program, QStringList _arguments) :
     lock(QMutex::Recursive), running(false),
Index: libs/libmyth/util.cpp
===================================================================
--- libs/libmyth/util.cpp	(revision 20066)
+++ libs/libmyth/util.cpp	(working copy)
@@ -1,5 +1,6 @@
 // C++ headers
 #include <iostream>
+#include <QTextStream>
 
 using namespace std;
 
Index: libs/libmyth/mythdialogs.cpp
===================================================================
--- libs/libmyth/mythdialogs.cpp	(revision 20066)
+++ libs/libmyth/mythdialogs.cpp	(working copy)
@@ -1,6 +1,9 @@
 
 #include <iostream>
 #include <algorithm>
+#include <Q3HBoxLayout>
+#include <QEventLoop>
+#include <Q3VBoxLayout>
 using namespace std;
 
 #include <QCursor>
@@ -13,15 +16,11 @@
 #include <QLabel>
 #include <QPixmap>
 #include <QKeyEvent>
-#include <QFrame>
+#include <Q3Frame>
 #include <QPaintEvent>
 #include <QPainter>
 #include <QProgressBar>
 
-#ifdef QWS
-#include <qwindowsystem_qws.h>
-#endif
-
 #include "uitypes.h"
 #include "uilistbtntype.h"
 #include "xmlparse.h"
@@ -41,7 +40,7 @@
  */
 
 MythDialog::MythDialog(MythMainWindow *parent, const char *name, bool setsize)
-    : QFrame(parent), rescode(kDialogCodeAccepted)
+    : Q3Frame(parent), rescode(kDialogCodeAccepted)
 {
     setObjectName(name);
     if (!parent)
@@ -84,7 +83,7 @@
 {
     hide();
     TeardownAll();
-    QFrame::deleteLater();
+    Q3Frame::deleteLater();
 }
 
 void MythDialog::TeardownAll(void)
@@ -266,8 +265,8 @@
 
     setLineWidth(3);
     setMidLineWidth(3);
-    setFrameShape(QFrame::Panel);
-    setFrameShadow(QFrame::Raised);
+    setFrameShape(Q3Frame::Panel);
+    setFrameShadow(Q3Frame::Raised);
     setPalette(parent->palette());
     popupForegroundColor = palette().color(foregroundRole());
     setFont(parent->font());
@@ -275,7 +274,7 @@
     hpadding = gContext->GetNumSetting("PopupHeightPadding", 120);
     wpadding = gContext->GetNumSetting("PopupWidthPadding", 80);
 
-    vbox = new QVBoxLayout(this);
+    vbox = new Q3VBoxLayout(this);
     vbox->setMargin((int)(10 * hmult));
 
     setAutoFillBackground(true);
@@ -298,16 +297,16 @@
 
     setLineWidth(3);
     setMidLineWidth(3);
-    setFrameShape(QFrame::Panel);
-    setFrameShadow(QFrame::Raised);
-    setFrameStyle(QFrame::Box | QFrame::Plain);
+    setFrameShape(Q3Frame::Panel);
+    setFrameShadow(Q3Frame::Raised);
+    setFrameStyle(Q3Frame::Box | Q3Frame::Plain);
     setPalette(parent->palette());
     setFont(parent->font());
 
     hpadding = gContext->GetNumSetting("PopupHeightPadding", 120);
     wpadding = gContext->GetNumSetting("PopupWidthPadding", 80);
 
-    vbox = new QVBoxLayout(this);
+    vbox = new Q3VBoxLayout(this);
     vbox->setMargin((int)(10 * hmult));
 
     if (!graphicPopup)
@@ -860,13 +859,13 @@
     msglabel = new QLabel();
     msglabel->setText(message);
 
-    QVBoxLayout *vlayout = new QVBoxLayout();
+    Q3VBoxLayout *vlayout = new Q3VBoxLayout();
     vlayout->addWidget(msglabel);
 
     progress = new QProgressBar();
     progress->setRange(0, totalSteps);
 
-    QHBoxLayout *hlayout = new QHBoxLayout();
+    Q3HBoxLayout *hlayout = new Q3HBoxLayout();
     hlayout->addWidget(progress);
 
     if (cancelButton && slot && target)
@@ -898,15 +897,15 @@
     hbox->setLayout(hlayout);
     vlayout->addWidget(hbox);
 
-    QFrame *vbox = new QFrame(this);
+    Q3Frame *vbox = new Q3Frame(this);
     vbox->setObjectName(objectName() + "_vbox");
     vbox->setLineWidth(3);
     vbox->setMidLineWidth(3);
-    vbox->setFrameShape(QFrame::Panel);
-    vbox->setFrameShadow(QFrame::Raised);
+    vbox->setFrameShape(Q3Frame::Panel);
+    vbox->setFrameShadow(Q3Frame::Raised);
     vbox->setLayout(vlayout);
 
-    QVBoxLayout *lay = new QVBoxLayout();
+    Q3VBoxLayout *lay = new Q3VBoxLayout();
     lay->addWidget(vbox);
     setLayout(lay);
 
@@ -1733,10 +1732,10 @@
     this->setGeometry((screenwidth - 250 ) / 2,
                       (screenheight - 50 ) / 2,
                       totalWidth,50);
-    QFrame *outside_border = new QFrame(this);
+    Q3Frame *outside_border = new Q3Frame(this);
     outside_border->setObjectName(objectName() + "_outside_border");
     outside_border->setGeometry(0,0,totalWidth,50);
-    outside_border->setFrameStyle(QFrame::Panel | QFrame::Raised );
+    outside_border->setFrameStyle(Q3Frame::Panel | Q3Frame::Raised );
     outside_border->setLineWidth(4);
 
     QLabel *message_label = new QLabel(message, this);
Index: libs/libmyth/libmyth.pro
===================================================================
--- libs/libmyth/libmyth.pro	(revision 20066)
+++ libs/libmyth/libmyth.pro	(working copy)
@@ -210,3 +210,4 @@
 include ( ../libs-targetfix.pro )
 
 LIBS += $$LATE_LIBS
+QT +=  opengl qt3support 
Index: libs/libmyth/mythmediamonitor.cpp
===================================================================
--- libs/libmyth/mythmediamonitor.cpp	(revision 20066)
+++ libs/libmyth/mythmediamonitor.cpp	(working copy)
@@ -5,6 +5,7 @@
 // C++ headers
 #include <iostream>
 #include <typeinfo>
+#include <QEvent>
 using namespace std;
 
 // Qt headers
Index: libs/libmyth/xmlparse.h
===================================================================
--- libs/libmyth/xmlparse.h	(revision 20066)
+++ libs/libmyth/xmlparse.h	(working copy)
@@ -3,11 +3,12 @@
 
 #include "uitypes.h"
 #include "mythcontext.h"
-#include <qimage.h>
-#include <qrect.h>
-#include <qlabel.h>
-#include <qdom.h>
 
+#include <QImage>
+#include <QRect>
+#include <QLabel>
+#include <QDomNode>
+
 class MythUIHelper;
 
 class MPUBLIC XMLParse
Index: libs/libmyth/mythplugin.h
===================================================================
--- libs/libmyth/mythplugin.h	(revision 20066)
+++ libs/libmyth/mythplugin.h	(working copy)
@@ -4,15 +4,14 @@
 #include <QLibrary>
 #include <QMap>
 #include <QHash>
+#include <QPainter>
 
 #include <vector>
 using namespace std;
 
 #include "mythexp.h"
 
-class QSqlDatabase;
 class MythContext;
-class QPainter;
 
 typedef enum {
     kPluginType_Module = 0,
Index: libs/libmyth/output.h
===================================================================
--- libs/libmyth/output.h	(revision 20066)
+++ libs/libmyth/output.h	(working copy)
@@ -18,7 +18,6 @@
 
 #include "mythobservable.h"
 
-class QObject;
 class Buffer;
 
 namespace MythTV {
Index: libs/libmyth/volumebase.h
===================================================================
--- libs/libmyth/volumebase.h	(revision 20066)
+++ libs/libmyth/volumebase.h	(working copy)
@@ -4,7 +4,7 @@
 #include <iostream>
 using namespace std;
 
-#include <qstring.h>
+#include <QString>
 #include "mythcontext.h"
 
 typedef enum {
Index: libs/libmyth/dialogbox.cpp
===================================================================
--- libs/libmyth/dialogbox.cpp	(revision 20066)
+++ libs/libmyth/dialogbox.cpp	(working copy)
@@ -1,4 +1,6 @@
 #include <iostream>
+#include <Q3VBoxLayout>
+#include <QLabel>
 using namespace std;
 
 #include "dialogbox.h"
@@ -10,7 +12,7 @@
 #endif
 
 #include <QButtonGroup>
-#include <QBoxLayout>
+#include <Q3BoxLayout>
 
 DialogBox::DialogBox(MythMainWindow *parent, const QString &text, 
                      const char *checkboxtext,
@@ -21,7 +23,7 @@
     maintext->setAlignment(Qt::AlignLeft | Qt::AlignTop);
     maintext->setWordWrap(true);
 
-    box = new QVBoxLayout(this);
+    box = new Q3VBoxLayout(this);
     box->setContentsMargins((int)(60 * wmult),(int)(60 * wmult),
                            (int)(60 * wmult),(int)(60 * wmult));
     box->setSpacing(0);
Index: libs/libmyth/mythconfiggroups.h
===================================================================
--- libs/libmyth/mythconfiggroups.h	(revision 20066)
+++ libs/libmyth/mythconfiggroups.h	(working copy)
@@ -3,8 +3,9 @@
 #ifndef MYTH_CONFIG_GROUPS_H
 #define MYTH_CONFIG_GROUPS_H
 
-#include <QVBoxLayout>
-#include <QGroupBox>
+#include <Q3VBoxLayout>
+#include <Q3GroupBox>
+#include <QStackedWidget>
 
 // MythTV headers
 #include "mythexp.h"
@@ -14,8 +15,6 @@
 #include "settings.h"
 #undef MYTHCONFIG
 
-class QStackedWidget;
-
 class MPUBLIC ConfigurationGroup : public Setting, public Storage
 {
     Q_OBJECT
@@ -92,9 +91,9 @@
 
   private:
     vector<QWidget*>    childwidget;
-    QGroupBox          *widget;
+    Q3GroupBox          *widget;
     ConfigurationGroup *confgrp;
-    QVBoxLayout        *layout;
+    Q3VBoxLayout        *layout;
 };
 
 class MPUBLIC HorizontalConfigurationGroup : public ConfigurationGroup
Index: libs/libmyth/mythconfigdialogs.h
===================================================================
--- libs/libmyth/mythconfigdialogs.h	(revision 20066)
+++ libs/libmyth/mythconfigdialogs.h	(working copy)
@@ -6,6 +6,8 @@
 // Qt headers
 #include <QObject>
 #include <QString>
+#include <QLabel>
+#include <QKeyEvent>
 
 // MythTV headers
 #include "mythexp.h"
Index: libs/libmyth/mythhttphandler.h
===================================================================
--- libs/libmyth/mythhttphandler.h	(revision 20066)
+++ libs/libmyth/mythhttphandler.h	(working copy)
@@ -10,11 +10,10 @@
 // Qt headers
 #include <QMutex>
 #include <QUrl>
+#include <QHttpResponseHeader>
 
 typedef deque<QUrl> UrlQueue;
 
-class QHttp;
-class QHttpResponseHeader;
 class MythHttpPool;
 
 class MythHttpHandler : public QObject
Index: libs/libmyth/dbutil.h
===================================================================
--- libs/libmyth/dbutil.h	(revision 20066)
+++ libs/libmyth/dbutil.h	(working copy)
@@ -1,8 +1,8 @@
 #ifndef DBUTIL_H_
 #define DBUTIL_H_
 
-#include <qstringlist.h>
-#include <qmap.h>
+#include <QStringList>
+#include <QMap>
 
 #include "mythexp.h"
 #include "mythdbcon.h"
Index: libs/libmyth/mythdialogs.h
===================================================================
--- libs/libmyth/mythdialogs.h	(revision 20066)
+++ libs/libmyth/mythdialogs.h	(working copy)
@@ -6,9 +6,14 @@
 #include <QLabel>
 #include <QAbstractButton>
 #include <QObject>
-#include <QFrame>
+#include <Q3Frame>
 #include <QVector>
 #include <QList>
+#include <QKeyEvent>
+#include <QPixmap>
+#include <Q3VBoxLayout>
+#include <QPaintEvent>
+#include <QProgressBar>
 
 #include "mythexp.h"
 
@@ -40,8 +45,6 @@
 class MythListBox;
 struct fontProp;
 class MythMainWindow;
-class QVBoxLayout;
-class QProgressBar;
 
 #include "mythmainwindow.h"
 
@@ -71,7 +74,7 @@
 inline bool operator!=(const QDialog::DialogCode &a, const DialogCode &b)
 { return ((int)a) == ((int)b); }
 
-class MPUBLIC MythDialog : public QFrame
+class MPUBLIC MythDialog : public Q3Frame
 {
     Q_OBJECT
 
@@ -210,7 +213,7 @@
     void defaultButtonPressedHandler(void);
 
   private:
-    QVBoxLayout *vbox;
+    Q3VBoxLayout *vbox;
     QColor       popupForegroundColor;
     int          hpadding, wpadding;
     bool         arrowAccel;
Index: libs/libmyth/backendselect.h
===================================================================
--- libs/libmyth/backendselect.h	(revision 20066)
+++ libs/libmyth/backendselect.h	(working copy)
@@ -2,6 +2,7 @@
 #define __BACKENDSELECT_H__
 
 #include <QListWidget>
+#include <QEvent>
 
 #include "mythdialogs.h"
 #include "upnpdevice.h"
Index: libs/libmyth/uitypes.cpp
===================================================================
--- libs/libmyth/uitypes.cpp	(revision 20066)
+++ libs/libmyth/uitypes.cpp	(working copy)
@@ -3,6 +3,10 @@
 
 // C++ headers
 #include <algorithm>
+#include <QPixmap>
+#include <QKeyEvent>
+#include <QEvent>
+#include <QTextEdit>
 using namespace std;
 
 // Qt headers
Index: libs/libmyth/mythconfiggroups.cpp
===================================================================
--- libs/libmyth/mythconfiggroups.cpp	(revision 20066)
+++ libs/libmyth/mythconfiggroups.cpp	(working copy)
@@ -1,7 +1,11 @@
 #include <algorithm>
 
-#include <QGroupBox>
+#include <Q3GroupBox>
 #include <QStackedWidget>
+#include <Q3HBoxLayout>
+#include <QGridLayout>
+#include <Q3Frame>
+#include <Q3VBoxLayout>
 
 #include "mythconfiggroups.h"
 #include "mythcontext.h"
@@ -112,7 +116,7 @@
     QWidget            *parent,
     const char         *widgetName) 
 {
-    layout = new QVBoxLayout();
+    layout = new Q3VBoxLayout();
     layout->setMargin(margin);
     layout->setSpacing((space<0) ? margin : space);
 
@@ -137,15 +141,15 @@
     QWidget *widget = NULL;
     if (uselabel)
     {
-        QGroupBox *groupbox = new QGroupBox(parent);
+        Q3GroupBox *groupbox = new Q3GroupBox(parent);
         groupbox->setObjectName(QString("VCG(%1)_groupbox").arg(widgetName));
         groupbox->setTitle(getLabel());
         widget = groupbox;
     }
     else if (useframe)
     {
-        QFrame *frame = new QFrame(parent);
-        frame->setFrameStyle(QFrame::Box);
+        Q3Frame *frame = new Q3Frame(parent);
+        frame->setFrameStyle(Q3Frame::Box);
         frame->setObjectName(QString("VCG(%1)_frame").arg(widgetName));
         widget = frame;
     }
@@ -228,7 +232,7 @@
     QWidget            *parent, 
     const char         *widgetName) 
 {
-    QHBoxLayout *layout = new QHBoxLayout();
+    Q3HBoxLayout *layout = new Q3HBoxLayout();
     layout->setMargin(margin);
     layout->setSpacing((space<0) ? margin : space);
 
@@ -251,15 +255,15 @@
     QWidget *widget = NULL;
     if (uselabel)
     {
-        QGroupBox *groupbox = new QGroupBox(parent);
+        Q3GroupBox *groupbox = new Q3GroupBox(parent);
         groupbox->setObjectName(QString("HCG(%1)_groupbox").arg(widgetName));
         groupbox->setTitle(getLabel());
         widget = groupbox;
     }
     else if (useframe)
     {
-        QFrame *frame = new QFrame(parent);
-        frame->setFrameStyle(QFrame::Box);
+        Q3Frame *frame = new Q3Frame(parent);
+        frame->setFrameStyle(Q3Frame::Box);
         frame->setObjectName(QString("HCG(%1)_frame").arg(widgetName));
         widget = frame;
     }
@@ -301,15 +305,15 @@
     QWidget *widget = NULL;
     if (uselabel)
     {
-        QGroupBox *groupbox = new QGroupBox(parent);
+        Q3GroupBox *groupbox = new Q3GroupBox(parent);
         groupbox->setObjectName(QString("GCG(%1)_groupbox").arg(widgetName));
         groupbox->setTitle(getLabel());
         widget = groupbox;
     }
     else if (useframe)
     {
-        QFrame *frame = new QFrame(parent);
-        frame->setFrameStyle(QFrame::Box);
+        Q3Frame *frame = new Q3Frame(parent);
+        frame->setFrameStyle(Q3Frame::Box);
         frame->setObjectName(QString("GCG(%1)_frame").arg(widgetName));
         widget = frame;
     }
Index: libs/libmyth/dialogbox.h
===================================================================
--- libs/libmyth/dialogbox.h	(revision 20066)
+++ libs/libmyth/dialogbox.h	(working copy)
@@ -3,11 +3,11 @@
 
 #include <QObject>
 #include <QCheckBox>
+#include <Q3VBoxLayout>
+#include <QButtonGroup>
 
 #include "mythdialogs.h"
 #include "compat.h" // to undef DialogBox
-class QVBoxLayout;
-class QButtonGroup;
 
 class MPUBLIC DialogBox : public MythDialog
 {
@@ -28,7 +28,7 @@
     ~DialogBox() {} // use deleteLater() for thread safety
 
   private:
-    QVBoxLayout *box;
+    Q3VBoxLayout *box;
     QButtonGroup *buttongroup;
 
     QCheckBox *checkbox;
Index: libs/libmyth/virtualkeyboard_qt.h
===================================================================
--- libs/libmyth/virtualkeyboard_qt.h	(revision 20066)
+++ libs/libmyth/virtualkeyboard_qt.h	(working copy)
@@ -2,9 +2,8 @@
 #define VIRTUALKEYBOARDQT_H_
 
 #include "mythdialogs.h"
+#include <QKeyEvent>
 
-class QKeyEvent;
-
 /// Preferred position to place virtual keyboard popup.
 enum PopupPositionQt 
 {
Index: libs/libmyth/dbutil.cpp
===================================================================
--- libs/libmyth/dbutil.cpp	(revision 20066)
+++ libs/libmyth/dbutil.cpp	(working copy)
@@ -8,6 +8,7 @@
 #include <QFile>
 #include <QRegExp>
 #include <QDateTime>
+#include <QProcess>
 
 #include "dbutil.h"
 #include "mythcontext.h"
Index: libs/libmyth/mythcontext.cpp
===================================================================
--- libs/libmyth/mythcontext.cpp	(revision 20066)
+++ libs/libmyth/mythcontext.cpp	(working copy)
@@ -7,6 +7,8 @@
 #include <QDesktopWidget>
 #include <QPainter>
 #include <QDebug>
+#include <QTextStream>
+#include <QKeyEvent>
 
 #include <cmath>
 #include <queue>
Index: libs/libmyth/backendselect.cpp
===================================================================
--- libs/libmyth/backendselect.cpp	(revision 20066)
+++ libs/libmyth/backendselect.cpp	(working copy)
@@ -11,6 +11,10 @@
 #include "mythcontext.h"
 
 #include "mythxmlclient.h"
+#include <Q3GridLayout>
+#include <QLabel>
+#include <QKeyEvent>
+#include <QEvent>
 
 
 BackendSelect::BackendSelect(MythMainWindow *parent, DatabaseParams *params)
@@ -168,7 +172,7 @@
 {
     // Probably should all be members, and deleted by ~BackendSelect()
     QLabel         *label;
-    QGridLayout    *layout;
+    Q3GridLayout    *layout;
     MythPushButton *cancel;
     MythPushButton *manual;
     MythPushButton *OK;
@@ -188,7 +192,7 @@
 #endif
 
 
-    layout = new QGridLayout(this);
+    layout = new Q3GridLayout(this);
     layout->setContentsMargins(40,40,40,40);
     layout->addWidget(label, 0, 1, 1, 3);
     layout->addWidget(m_backends, 1, 0, 1, 5);
Index: libs/libmythfreemheg/Engine.cpp
===================================================================
--- libs/libmythfreemheg/Engine.cpp	(revision 20066)
+++ libs/libmythfreemheg/Engine.cpp	(working copy)
@@ -20,7 +20,7 @@
 */
 
 #include <QStringList>
-#include <qregexp.h>
+#include <QRegExp>
 
 #include "Engine.h"
 #include "ParseNode.h"
Index: libs/libmythfreemheg/Groups.h
===================================================================
--- libs/libmythfreemheg/Groups.h	(revision 20066)
+++ libs/libmythfreemheg/Groups.h	(working copy)
@@ -22,8 +22,8 @@
 
 #if !defined(GROUPCLASS_H)
 #define GROUPCLASS_H
-#include <qstring.h>
-#include <qdatetime.h> 
+#include <QString>
+#include <QDateTime> 
 #include <QList>
 
 #include "Root.h"
Index: libs/libmythfreemheg/libmythfreemheg.pro
===================================================================
--- libs/libmythfreemheg/libmythfreemheg.pro	(revision 20066)
+++ libs/libmythfreemheg/libmythfreemheg.pro	(working copy)
@@ -25,3 +25,4 @@
 LIBS += $$EXTRA_LIBS
 
 include ( ../libs-targetfix.pro )
+QT += network  sql qt3support 
Index: libs/libmythfreemheg/Logging.h
===================================================================
--- libs/libmythfreemheg/Logging.h	(revision 20066)
+++ libs/libmythfreemheg/Logging.h	(working copy)
@@ -22,8 +22,8 @@
 #if !defined(LOGGING_H)
 #define LOGGING_H
 
-#include <qglobal.h> // For Q_ASSERT
-#include <qstring.h> // For QString
+#include <QtGlobal> // For Q_ASSERT
+#include <QString>  // For QString
 
 #include "freemheg.h" // For MHLogError
 
Index: libs/libmythfreemheg/BaseClasses.h
===================================================================
--- libs/libmythfreemheg/BaseClasses.h	(revision 20066)
+++ libs/libmythfreemheg/BaseClasses.h	(working copy)
@@ -27,7 +27,7 @@
 #include <malloc.h>
 #endif
 
-#include <qstring.h>
+#include <QString>
 
 #include "Logging.h" // For MHASSERT
 
Index: libs/libmythfreemheg/Link.h
===================================================================
--- libs/libmythfreemheg/Link.h	(revision 20066)
+++ libs/libmythfreemheg/Link.h	(working copy)
@@ -28,7 +28,7 @@
 #include "Actions.h"
 #include "BaseActions.h"
 
-#include <qstring.h>
+#include <QString>
 
 class MHParseNode;
 
Index: libs/libmythfreemheg/TokenGroup.h
===================================================================
--- libs/libmythfreemheg/TokenGroup.h	(revision 20066)
+++ libs/libmythfreemheg/TokenGroup.h	(working copy)
@@ -31,7 +31,7 @@
 #include "BaseActions.h"
 #include "Actions.h"
 
-#include <qpoint.h>
+#include <QPoint>
 #include <QList>
 
 class MHEngine;
Index: libs/libmythfreemheg/Visible.h
===================================================================
--- libs/libmythfreemheg/Visible.h	(revision 20066)
+++ libs/libmythfreemheg/Visible.h	(working copy)
@@ -21,7 +21,7 @@
 
 #if !defined(VISIBLE_H)
 #define VISIBLE_H
-#include <qregion.h>
+#include <QRegion>
 
 #include "Presentable.h"
 // Dependencies
Index: libs/libmythfreemheg/Engine.h
===================================================================
--- libs/libmythfreemheg/Engine.h	(revision 20066)
+++ libs/libmythfreemheg/Engine.h	(working copy)
@@ -30,9 +30,10 @@
 #include "Visible.h"
 #include "Actions.h"
 #include "Link.h"
-#include <qstring.h>
-#include <qrect.h>
-#include <qregion.h>
+
+#include <QString>
+#include <QRect>
+#include <QRegion>
 #include <QList>
 #include <QStack>
 #include <QQueue>
Index: libs/libmythfreemheg/Ingredients.h
===================================================================
--- libs/libmythfreemheg/Ingredients.h	(revision 20066)
+++ libs/libmythfreemheg/Ingredients.h	(working copy)
@@ -26,8 +26,9 @@
 #include "BaseClasses.h"
 #include "Actions.h"
 #include "BaseActions.h"
-#include <qstring.h>
 
+#include <QString>
+
 class MHParseNode;
 
 // Abstract class for ingredients of a scene or application.
Index: libs/libmythfreemheg/freemheg.h
===================================================================
--- libs/libmythfreemheg/freemheg.h	(revision 20066)
+++ libs/libmythfreemheg/freemheg.h	(working copy)
@@ -22,7 +22,8 @@
 #if !defined(FREEMHEG_H)
 #define FREEMHEG_H
 
-#include <qregion.h>
+#include <QRegion>
+
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -68,7 +69,7 @@
 {
 public:
     MHRgba(int red, int green, int blue, int alpha):
-      m_red(red), m_green(green), m_blue(blue), m_alpha(alpha) {};
+      m_red(Qt::red), m_green(Qt::green), m_blue(Qt::blue), m_alpha(alpha) {};
     MHRgba(): m_red(0), m_green(0), m_blue(0), m_alpha(0) {};
     int red() const { return m_red; }
     int green() const { return m_green; }
Index: libs/libmythupnp/refcounted.h
===================================================================
--- libs/libmythupnp/refcounted.h	(revision 20066)
+++ libs/libmythupnp/refcounted.h	(working copy)
@@ -24,7 +24,7 @@
 #ifndef __REFCOUNTED_H__
 #define __REFCOUNTED_H__
 
-#include <qmutex.h>
+#include <QMutex>
 
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
Index: libs/libmythupnp/soapclient.h
===================================================================
--- libs/libmythupnp/soapclient.h	(revision 20066)
+++ libs/libmythupnp/soapclient.h	(working copy)
@@ -24,7 +24,8 @@
 #ifndef SOAPCLIENT_H_
 #define SOAPCLIENT_H_
 
-#include <qdom.h>
+#include <QDomNode>
+#include <QUrl>
 
 #include "httpcomms.h"
 #include "upnputil.h"
Index: libs/libmythupnp/threadpool.h
===================================================================
--- libs/libmythupnp/threadpool.h	(revision 20066)
+++ libs/libmythupnp/threadpool.h	(working copy)
@@ -25,6 +25,7 @@
 #define __THREADPOOL_H__
 
 #include <deque>
+#include <QEvent>
 using namespace std;
 
 #include <QString> 
Index: libs/libmythupnp/taskqueue.cpp
===================================================================
--- libs/libmythupnp/taskqueue.cpp	(revision 20066)
+++ libs/libmythupnp/taskqueue.cpp	(working copy)
@@ -23,8 +23,9 @@
 
 #include "taskqueue.h"
 #include <sys/time.h>
-#include <qdatetime.h>
 
+#include <QDateTime>
+
 #include <iostream>
 
 using std::cerr;
Index: libs/libmythupnp/configuration.cpp
===================================================================
--- libs/libmythupnp/configuration.cpp	(revision 20066)
+++ libs/libmythupnp/configuration.cpp	(working copy)
@@ -25,6 +25,7 @@
 
 #include <QDir>
 #include <QFile>
+#include <QTextStream>
 
 #include "configuration.h"
 #include "mythverbose.h"  // for VERBOSE and GetConfDir()
Index: libs/libmythupnp/upnpdevice.h
===================================================================
--- libs/libmythupnp/upnpdevice.h	(revision 20066)
+++ libs/libmythupnp/upnpdevice.h	(working copy)
@@ -28,6 +28,7 @@
 
 #include <QDomDocument>
 #include <QUrl>
+#include <QTextStream>
 
 #include "upnputil.h"
 #include "refcounted.h"
@@ -39,7 +40,6 @@
 class UPnpDevice;
 class UPnpService;
 class UPnpIcon;
-class QTextStream;
 
 /////////////////////////////////////////////////////////////////////////////
 // Typedefs
Index: libs/libmythupnp/ssdp.cpp
===================================================================
--- libs/libmythupnp/ssdp.cpp	(revision 20066)
+++ libs/libmythupnp/ssdp.cpp	(working copy)
@@ -29,11 +29,12 @@
 #include "multicast.h"
 #include "broadcast.h"
 
-#include <qregexp.h>
+#include <QRegExp>
+#include <QTextStream>
+#include <QStringList>
 
 #include <unistd.h>
 #include <stdlib.h>
-#include <qstringlist.h>
 #include <sys/time.h>
 
 /////////////////////////////////////////////////////////////////////////////
Index: libs/libmythupnp/upnputil.cpp
===================================================================
--- libs/libmythupnp/upnputil.cpp	(revision 20066)
+++ libs/libmythupnp/upnputil.cpp	(working copy)
@@ -27,7 +27,7 @@
 #include <cerrno>
 
 // Qt headers
-#include <quuid.h>
+#include <QUuid>
 
 // MythTV headers
 #include "upnputil.h"
Index: libs/libmythupnp/httprequest.cpp
===================================================================
--- libs/libmythupnp/httprequest.cpp	(revision 20066)
+++ libs/libmythupnp/httprequest.cpp	(working copy)
@@ -27,6 +27,7 @@
 #include <QFileInfo>
 #include <QTextCodec>
 #include <QStringList>
+#include <QUrl>
 
 #include "mythconfig.h"
 #if defined CONFIG_DARWIN || defined CONFIG_CYGWIN || defined(__FreeBSD__) || defined(USING_MINGW)
Index: libs/libmythupnp/libmythupnp.pro
===================================================================
--- libs/libmythupnp/libmythupnp.pro	(revision 20066)
+++ libs/libmythupnp/libmythupnp.pro	(working copy)
@@ -67,9 +67,9 @@
     QMAKE_LFLAGS_SHLIB += -flat_namespace
 }
 
-#The following line was inserted by qt3to4
 QT += network xml sql
 
 include ( ../libs-targetfix.pro )
 
 LIBS += $$LATE_LIBS
+QT +=  opengl qt3support 
Index: libs/libmythupnp/upnpmsrr.h
===================================================================
--- libs/libmythupnp/upnpmsrr.h	(revision 20066)
+++ libs/libmythupnp/upnpmsrr.h	(working copy)
@@ -1,8 +1,8 @@
 #ifndef UPnpMSRR_H_
 #define UPnpMSRR_H_
 
-#include <qdom.h>
-#include <qdatetime.h> 
+#include <QDomNode>
+#include <QDateTime> 
 
 #include "httpserver.h"
 #include "eventing.h"
Index: libs/libmythupnp/threadpool.cpp
===================================================================
--- libs/libmythupnp/threadpool.cpp	(revision 20066)
+++ libs/libmythupnp/threadpool.cpp	(working copy)
@@ -22,6 +22,7 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include <QCoreApplication>
+#include <QEvent>
 
 #include <algorithm>
 using namespace std;
Index: libs/libmythupnp/soapclient.cpp
===================================================================
--- libs/libmythupnp/soapclient.cpp	(revision 20066)
+++ libs/libmythupnp/soapclient.cpp	(working copy)
@@ -21,7 +21,9 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-#include <qbuffer.h>
+#include <QBuffer>
+#include <QTextStream>
+#include <QHttpRequestHeader>
 
 #include "soapclient.h"
 
Index: libs/libmythupnp/upnpdevice.cpp
===================================================================
--- libs/libmythupnp/upnpdevice.cpp	(revision 20066)
+++ libs/libmythupnp/upnpdevice.cpp	(working copy)
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <cerrno>
 
-#include <qfile.h>
+#include <QFile>
 #include <QTextStream>
 
 int DeviceLocation::g_nAllocated   = 0;       // Debugging only
Index: libs/libmythupnp/mythxmlclient.h
===================================================================
--- libs/libmythupnp/mythxmlclient.h	(revision 20066)
+++ libs/libmythupnp/mythxmlclient.h	(working copy)
@@ -24,8 +24,9 @@
 #ifndef MYTHXMLCLIENT_H_
 #define MYTHXMLCLIENT_H_
 
-#include <qdom.h>
-#include <qbuffer.h>
+#include <QDomNode>
+#include <QBuffer>
+#include <QUrl>
 
 #include "httpcomms.h"
 
Index: libs/libmythupnp/configuration.h
===================================================================
--- libs/libmythupnp/configuration.h	(revision 20066)
+++ libs/libmythupnp/configuration.h	(working copy)
@@ -24,8 +24,8 @@
 #ifndef __CONFIGURATION_H__
 #define __CONFIGURATION_H__
 
-#include <qdom.h>
-#include <qstringlist.h>
+#include <QDomNode>
+#include <QStringList>
 
 class Configuration 
 {
Index: libs/libmythupnp/eventing.h
===================================================================
--- libs/libmythupnp/eventing.h	(revision 20066)
+++ libs/libmythupnp/eventing.h	(working copy)
@@ -29,13 +29,12 @@
 #include <QUrl>
 #include <QUuid>
 #include <QMap>
+#include <QTextStream>
 
 #include "upnpimpl.h"
 #include "upnputil.h"
 #include "httpserver.h"
 
-class QTextStream;
-
 //////////////////////////////////////////////////////////////////////////////
 //
 //////////////////////////////////////////////////////////////////////////////
Index: libs/libmythupnp/upnpmsrr.cpp
===================================================================
--- libs/libmythupnp/upnpmsrr.cpp	(revision 20066)
+++ libs/libmythupnp/upnpmsrr.cpp	(working copy)
@@ -9,8 +9,9 @@
 #include "upnpmsrr.h"
 
 #include <math.h>
-#include <qregexp.h>
 
+#include <QRegExp>
+
 /////////////////////////////////////////////////////////////////////////////
 //
 /////////////////////////////////////////////////////////////////////////////
Index: libs/libmythupnp/upnpcdsobjects.h
===================================================================
--- libs/libmythupnp/upnpcdsobjects.h	(revision 20066)
+++ libs/libmythupnp/upnpcdsobjects.h	(working copy)
@@ -28,9 +28,9 @@
 #include <QString>
 #include <QList>
 #include <QMap>
+#include <QTextStream>
 
 class CDSObject;
-class QTextStream;
 
 //////////////////////////////////////////////////////////////////////////////
 //
Index: libs/libmythdvdnav/libmythdvdnav.pro
===================================================================
--- libs/libmythdvdnav/libmythdvdnav.pro	(revision 20066)
+++ libs/libmythdvdnav/libmythdvdnav.pro	(working copy)
@@ -55,3 +55,4 @@
 mingw:DEFINES += STDC_HEADERS
 
 include ( ../libs-targetfix.pro )
+QT +=  qt3support 
Index: libs/libmythfreesurround/freesurround.cpp
===================================================================
--- libs/libmythfreesurround/freesurround.cpp	(revision 20066)
+++ libs/libmythfreesurround/freesurround.cpp	(working copy)
@@ -29,8 +29,8 @@
 #include <map>
 #include <math.h>
 
-#include <qstring.h>
-#include <qdatetime.h>
+#include <QString>
+#include <QDateTime>
 
 using namespace std;
 
Index: libs/libmythfreesurround/libmythfreesurround.pro
===================================================================
--- libs/libmythfreesurround/libmythfreesurround.pro	(revision 20066)
+++ libs/libmythfreesurround/libmythfreesurround.pro	(working copy)
@@ -30,3 +30,4 @@
 }
 
 include ( ../libs-targetfix.pro )
+QT +=  qt3support 
Index: libs/libmythdb/oldsettings.cpp
===================================================================
--- libs/libmythdb/oldsettings.cpp	(revision 20066)
+++ libs/libmythdb/oldsettings.cpp	(working copy)
@@ -12,7 +12,9 @@
 #include "oldsettings.h"
 #include "mythverbose.h"
 
-#include <qstring.h>
+#include <QString>
+#include <QDir>
+
 #include <fstream>
 #include <cstdlib>
 #include <cstdio>
@@ -23,8 +25,6 @@
 
 using namespace std;
 
-#include <qdir.h>
-
 Settings::Settings(QString strSettingsFile)
 {
     if (strSettingsFile.length() == 0)
Index: libs/libmythdb/msocketdevice_win.cpp
===================================================================
--- libs/libmythdb/msocketdevice_win.cpp	(revision 20066)
+++ libs/libmythdb/msocketdevice_win.cpp	(working copy)
@@ -45,7 +45,7 @@
 #include "qwindowdefs.h"
 #include "qdatetime.h"
 
-#include <qcoreapplication.h>
+#include <QCoreApplication>
 
 #include <string.h>
 
Index: libs/libmythdb/decodeencode.h
===================================================================
--- libs/libmythdb/decodeencode.h	(revision 20066)
+++ libs/libmythdb/decodeencode.h	(working copy)
@@ -2,9 +2,10 @@
 #define DECODEENCODE_H_
 
 #include <algorithm>
+
 using namespace std;
 
-#include <qstringlist.h>
+#include <QStringList>
 
 // This is necessary for GCC 3.3, which has llabs(long long)
 // // but not abs(long long) or std::llabs(long long)
Index: libs/libmythdb/httpcomms.cpp
===================================================================
--- libs/libmythdb/httpcomms.cpp	(revision 20066)
+++ libs/libmythdb/httpcomms.cpp	(working copy)
@@ -1,8 +1,9 @@
 #include <iostream>
 
-#include <qfile.h>
-#include <qapplication.h>
-#include <qregexp.h>
+#include <QFile>
+#include <QApplication>
+#include <QRegExp>
+
 #include <unistd.h>
 
 #include "mythverbose.h"
Index: libs/libmythdb/mythobservable.cpp
===================================================================
--- libs/libmythdb/mythobservable.cpp	(revision 20066)
+++ libs/libmythdb/mythobservable.cpp	(working copy)
@@ -1,5 +1,5 @@
-#include <qobject.h>
-#include <qapplication.h>
+#include <QObject>
+#include <QApplication>
 
 #include "mythobservable.h"
 
Index: libs/libmythdb/mythdb.cpp
===================================================================
--- libs/libmythdb/mythdb.cpp	(revision 20066)
+++ libs/libmythdb/mythdb.cpp	(working copy)
@@ -1,4 +1,6 @@
 #include <QMutex>
+#include <QSqlQuery>
+#include <QSqlError>
 
 #include "mythdb.h"
 #include "mythdbcon.h"
Index: libs/libmythdb/mythdbcon.h
===================================================================
--- libs/libmythdb/mythdbcon.h	(revision 20066)
+++ libs/libmythdb/mythdbcon.h	(working copy)
@@ -3,13 +3,12 @@
 
 #include <iostream>
 
-#include <qsqldatabase.h>
-#include <qvariant.h>
-#include <qsql.h>
-#include <qsqlquery.h>
-#include <qsemaphore.h>
-#include <qsqlerror.h>
-#include <qsqlfield.h>
+#include <QSqlDatabase>
+#include <QVariant>
+#include <QSqlQuery>
+#include <QSemaphore>
+#include <QSqlError>
+#include <QSqlField>
 #include <QRegExp>
 #include <QDateTime>
 #include <QMutex>
Index: libs/libmythdb/mythsocket.h
===================================================================
--- libs/libmythdb/mythsocket.h	(revision 20066)
+++ libs/libmythdb/mythsocket.h	(working copy)
@@ -12,7 +12,6 @@
 #include "mythexp.h"
 #include "msocketdevice.h"
 
-class QHostAddress;
 class MythSocket;
 
 class MPUBLIC MythSocketCBs
@@ -49,7 +48,7 @@
     QList<MythSocket*> m_readyread_dellist;
     QList<MythSocket*> m_readyread_addlist;
 #ifdef USING_MINGW
-    HANDLE readyreadevent;
+    Qt::HANDLE readyreadevent;
 #else
     int m_readyread_pipe[2];
 #endif
Index: libs/libmythdb/remotefile.h
===================================================================
--- libs/libmythdb/remotefile.h	(revision 20066)
+++ libs/libmythdb/remotefile.h	(working copy)
@@ -1,8 +1,8 @@
 #ifndef REMOTEFILE_H_
 #define REMOTEFILE_H_
 
-#include <qstring.h>
-#include <qmutex.h>
+#include <QString>
+#include <QMutex>
 
 #include "mythexp.h"
 
Index: libs/libmythdb/oldsettings.h
===================================================================
--- libs/libmythdb/oldsettings.h	(revision 20066)
+++ libs/libmythdb/oldsettings.h	(working copy)
@@ -9,8 +9,10 @@
 
 #ifndef OLDSETTINGS_H
 #define OLDSETTINGS_H
-#include <qstring.h>
+
+#include <QString>
 #include <QPixmap>
+
 #include <map>
 
 #include "mythexp.h"
@@ -20,7 +22,6 @@
   *@author Sean Ward
   */
 
-class QPixmap;
 class MPUBLIC Settings {
 public:
         Settings(QString strSettingFile = "settings.txt");
Index: libs/libmythdb/httpcomms.h
===================================================================
--- libs/libmythdb/httpcomms.h	(revision 20066)
+++ libs/libmythdb/httpcomms.h	(working copy)
@@ -1,12 +1,13 @@
 #ifndef HTTPCOMMS_H_
 #define HTTPCOMMS_H_
 
-#include <qurl.h>
-#include <qobject.h>
+#include <QUrl>
+#include <QObject>
 #include <QByteArray>
 #include <QString>
 #include <QTimer>
 #include <QHttp>
+#include <QHttpRequestHeader>
 
 #include "mythexp.h"
 
Index: libs/libmythdb/qcodecs.h
===================================================================
--- libs/libmythdb/qcodecs.h	(revision 20066)
+++ libs/libmythdb/qcodecs.h	(working copy)
@@ -38,9 +38,6 @@
 
 #include <mythexp.h>
 
-class QByteArray;
-class QIODevice;
-
 /**
  * A wrapper class for the most commonly used encoding and
  * decoding algorithms.  Currently there is support for encoding
Index: libs/libmythdb/mythdbcon.cpp
===================================================================
--- libs/libmythdb/mythdbcon.cpp	(revision 20066)
+++ libs/libmythdb/mythdbcon.cpp	(working copy)
@@ -3,6 +3,7 @@
 
 #include <QVector>
 #include <QSqlDriver>
+#include <QSqlQuery>
 
 #include "compat.h"
 #include "mythdbcon.h"
Index: libs/libmythdb/mythsocket.cpp
===================================================================
--- libs/libmythdb/mythsocket.cpp	(revision 20066)
+++ libs/libmythdb/mythsocket.cpp	(working copy)
@@ -1,12 +1,12 @@
-#include <qapplication.h>
-#include <qstring.h>
-#include <unistd.h>
-#include <stdlib.h>
-
+#include <QApplication>
+#include <QString>
 #include <QByteArray>
 #include <QMutex>
 #include <QHostInfo>
 
+#include <unistd.h>
+#include <stdlib.h>
+
 #include "mythtimer.h"
 #include "mythsocket.h"
 #include "mythverbose.h"
@@ -811,8 +811,8 @@
 #ifdef USING_MINGW
 
         int n = m_readyread_list.count() + 1;
-        HANDLE *hEvents = new HANDLE[n];
-        memset(hEvents, 0, sizeof(HANDLE) * n);
+        Qt::HANDLE *hEvents = new Qt::HANDLE[n];
+        memset(hEvents, 0, sizeof(Qt::HANDLE) * n);
         unsigned *idx = new unsigned[n];
         n = 0;
 
@@ -822,7 +822,7 @@
             if (sock->state() == MythSocket::Connected
                 && !sock->m_notifyread && !isLocked(sock->m_lock))
             {
-                HANDLE hEvent = ::CreateEvent(NULL, false, false, NULL);
+                Qt::HANDLE hEvent = ::CreateEvent(NULL, false, false, NULL);
                 if (!hEvent)
                 {
                     VERBOSE(VB_IMPORTANT, "MythSocket: CreateEvent failed");
Index: libs/libmythdb/mythobservable.h
===================================================================
--- libs/libmythdb/mythobservable.h	(revision 20066)
+++ libs/libmythdb/mythobservable.h	(working copy)
@@ -5,8 +5,6 @@
 #include "mythevent.h"
 #include "mythexp.h"
 
-class QObject;
-
 /** \class MythObservable
     \brief Superclass for making an object have a set of listeners
 
Index: libs/libmythdb/libmythdb.pro
===================================================================
--- libs/libmythdb/libmythdb.pro	(revision 20066)
+++ libs/libmythdb/libmythdb.pro	(working copy)
@@ -56,3 +56,4 @@
 include ( ../libs-targetfix.pro )
 
 LIBS += $$LATE_LIBS
+QT +=  qt3support 
Index: libs/libmythdb/mythdb.h
===================================================================
--- libs/libmythdb/mythdb.h	(revision 20066)
+++ libs/libmythdb/mythdb.h	(working copy)
@@ -2,6 +2,8 @@
 #define MYTHDB_H_
 
 #include <QString>
+#include <QSqlQuery>
+#include <QSqlError>
 #include "mythexp.h"
 #include "mythdbcon.h"
 #include "mythdbparams.h"
Index: programs/mythfrontend/manualschedule.h
===================================================================
--- programs/mythfrontend/manualschedule.h	(revision 20066)
+++ programs/mythfrontend/manualschedule.h	(working copy)
@@ -6,7 +6,6 @@
 
 #include "mythscreentype.h"
 
-class QTimer;
 class ProgramInfo;
 
 class MythUIButton;
Index: programs/mythfrontend/playbackbox.cpp
===================================================================
--- programs/mythfrontend/playbackbox.cpp	(revision 20066)
+++ programs/mythfrontend/playbackbox.cpp	(working copy)
@@ -1,3 +1,5 @@
+#include <QKeyEvent>
+#include <QEvent>
 
 using namespace std;
 
Index: programs/mythfrontend/viewscheduled.h
===================================================================
--- programs/mythfrontend/viewscheduled.h	(revision 20066)
+++ programs/mythfrontend/viewscheduled.h	(working copy)
@@ -2,6 +2,8 @@
 #define VIEWSCHEDULED_H_
 
 #include <QDateTime>
+#include <QEvent>
+#include <QKeyEvent>
 
 #include "programlist.h"
 
Index: programs/mythfrontend/statusbox.h
===================================================================
--- programs/mythfrontend/statusbox.h	(revision 20066)
+++ programs/mythfrontend/statusbox.h	(working copy)
@@ -2,6 +2,8 @@
 #define STATUSBOX_H_
 
 #include <vector>
+#include <QKeyEvent>
+#include <QEvent>
 using namespace std;
 
 #include "mythscreentype.h"
Index: programs/mythfrontend/channelrecpriority.cpp
===================================================================
--- programs/mythfrontend/channelrecpriority.cpp	(revision 20066)
+++ programs/mythfrontend/channelrecpriority.cpp	(working copy)
@@ -2,6 +2,8 @@
 #include <iostream>
 #include <algorithm>
 #include <vector>
+#include <QKeyEvent>
+#include <QEvent>
 using namespace std;
 
 #include "channelrecpriority.h"
Index: programs/mythfrontend/mythappearance.h
===================================================================
--- programs/mythfrontend/mythappearance.h	(revision 20066)
+++ programs/mythfrontend/mythappearance.h	(working copy)
@@ -1,8 +1,10 @@
 #ifndef MYTHAPPEARANCE_H
 #define MYTHAPPEARANCE_H
 
-#include <qstringlist.h>
-#include <qstring.h>
+#include <QStringList>
+#include <QString>
+#include <QEvent>
+#include <QKeyEvent>
 
 #include "mythscreentype.h"
 #include "mythuitext.h"
Index: programs/mythfrontend/proglist.h
===================================================================
--- programs/mythfrontend/proglist.h	(revision 20066)
+++ programs/mythfrontend/proglist.h	(working copy)
@@ -4,6 +4,7 @@
 // Qt headers
 #include <QDateTime>
 #include <QKeyEvent>
+#include <QEvent>
 
 // MythTV headers
 #include "mythscreentype.h"
Index: programs/mythfrontend/programrecpriority.h
===================================================================
--- programs/mythfrontend/programrecpriority.h	(revision 20066)
+++ programs/mythfrontend/programrecpriority.h	(working copy)
@@ -4,9 +4,8 @@
 #include "programinfo.h"
 #include "scheduledrecording.h"
 #include "mythscreentype.h"
+#include <QKeyEvent>
 
-class QDateTime;
-
 class MythUIButtonList;
 class MythUIButtonListItem;
 class MythUIText;
Index: programs/mythfrontend/mythcontrols.h
===================================================================
--- programs/mythfrontend/mythcontrols.h	(revision 20066)
+++ programs/mythfrontend/mythcontrols.h	(working copy)
@@ -27,6 +27,8 @@
 // QT
 #include <QList>
 #include <QHash>
+#include <QEvent>
+#include <QKeyEvent>
 
 // MythUI
 #include <mythscreentype.h>
Index: programs/mythfrontend/custompriority.cpp
===================================================================
--- programs/mythfrontend/custompriority.cpp	(revision 20066)
+++ programs/mythfrontend/custompriority.cpp	(working copy)
@@ -1,5 +1,6 @@
 #include <unistd.h>
 #include <iostream>
+#include <QSqlError>
 using namespace std;
 
 #include "custompriority.h"
Index: programs/mythfrontend/globalsettings.cpp
===================================================================
--- programs/mythfrontend/globalsettings.cpp	(revision 20066)
+++ programs/mythfrontend/globalsettings.cpp	(working copy)
@@ -10,7 +10,7 @@
 // Qt headers
 #include <QApplication>
 #include <QEvent>
-#include <qnamespace.h>
+#include <Qt>
 #include <QStyleFactory>
 #include <QFile>
 #include <QDialog>
Index: programs/mythfrontend/mythfexml.h
===================================================================
--- programs/mythfrontend/mythfexml.h	(revision 20066)
+++ programs/mythfrontend/mythfexml.h	(working copy)
@@ -8,8 +8,8 @@
 #ifndef MYTHFEXML_H_
 #define MYTHFEXML_H_
 
-#include <qdom.h>
-#include <qdatetime.h> 
+#include <QDomNode>
+#include <QDateTime> 
 
 #include "upnp.h"
 #include "eventing.h"
Index: programs/mythfrontend/keygrabber.h
===================================================================
--- programs/mythfrontend/keygrabber.h	(revision 20066)
+++ programs/mythfrontend/keygrabber.h	(working copy)
@@ -6,6 +6,7 @@
 #include <mythscreentype.h>
 
 #include "mythscreentype.h"
+#include <QKeyEvent>
 
 class MythUIText;
 class MythUIButton;
Index: programs/mythfrontend/viewscheduled.cpp
===================================================================
--- programs/mythfrontend/viewscheduled.cpp	(revision 20066)
+++ programs/mythfrontend/viewscheduled.cpp	(working copy)
@@ -1,6 +1,8 @@
 #include <stdlib.h>
 
 #include <iostream>
+#include <QKeyEvent>
+#include <QEvent>
 using namespace std;
 
 #include <QDateTime>
Index: programs/mythfrontend/statusbox.cpp
===================================================================
--- programs/mythfrontend/statusbox.cpp	(revision 20066)
+++ programs/mythfrontend/statusbox.cpp	(working copy)
@@ -5,6 +5,8 @@
 #include <stdlib.h>
 
 #include <iostream>
+#include <QKeyEvent>
+#include <QEvent>
 using namespace std;
 
 #include <QRegExp>
Index: programs/mythfrontend/networkcontrol.h
===================================================================
--- programs/mythfrontend/networkcontrol.h	(revision 20066)
+++ programs/mythfrontend/networkcontrol.h	(working copy)
@@ -2,6 +2,8 @@
 #define NETWORKCONTROL_H_
 
 #include <deque>
+#include <QEvent>
+#include <QTextStream>
 using namespace std;
 
 #include <pthread.h>
@@ -12,7 +14,6 @@
 #include <QMutex>
 
 class MainServer;
-class QTextStream;
 
 // Locking order
 // clientLock -> ncLock
Index: programs/mythfrontend/mythfrontend.pro
===================================================================
--- programs/mythfrontend/mythfrontend.pro	(revision 20066)
+++ programs/mythfrontend/mythfrontend.pro	(working copy)
@@ -66,3 +66,4 @@
 using_jack:DEFINES += USING_JACK
 using_oss: DEFINES += USING_OSS
 macx:      DEFINES += USING_COREAUDIO
+QT +=  qt3support 
Index: programs/mythfrontend/mythappearance.cpp
===================================================================
--- programs/mythfrontend/mythappearance.cpp	(revision 20066)
+++ programs/mythfrontend/mythappearance.cpp	(working copy)
@@ -1,15 +1,16 @@
 #define MYTHAPPEARANCE_CPP
 
 /* QT includes */
-#include <qnamespace.h>
+#include <Qt>
 #include <QStringList>
 #include <QApplication>
 #include <QDomNode>
-#include <QButtonGroup>
+#include <Q3ButtonGroup>
 #include <QImage>
 #include <QEvent>
 #include <QDir>
 #include <QString>
+#include <QKeyEvent>
 
 /* MythTV includes */
 #include "mythcontext.h"
Index: programs/mythfrontend/proglist.cpp
===================================================================
--- programs/mythfrontend/proglist.cpp	(revision 20066)
+++ programs/mythfrontend/proglist.cpp	(working copy)
@@ -2,6 +2,8 @@
 #include <map>
 #include <vector>
 #include <algorithm>
+#include <QKeyEvent>
+#include <QEvent>
 using namespace std;
 
 // qt
Index: programs/mythfrontend/programrecpriority.cpp
===================================================================
--- programs/mythfrontend/programrecpriority.cpp	(revision 20066)
+++ programs/mythfrontend/programrecpriority.cpp	(working copy)
@@ -1,6 +1,7 @@
 
 #include <iostream>
 #include <vector>
+#include <QKeyEvent>
 using namespace std;
 
 #include <QDateTime>
Index: programs/mythfrontend/playbackbox.h
===================================================================
--- programs/mythfrontend/playbackbox.h	(revision 20066)
+++ programs/mythfrontend/playbackbox.h	(working copy)
@@ -6,6 +6,8 @@
 
 // C++ headers
 #include <vector>
+#include <QKeyEvent>
+#include <QEvent>
 using namespace std;
 
 #include <QDateTime>
@@ -21,7 +23,6 @@
 
 class NuppelVideoPlayer;
 class RingBuffer;
-class QTimer;
 class ProgramInfo;
 class PreviewGenerator;
 
Index: programs/mythfrontend/mythcontrols.cpp
===================================================================
--- programs/mythfrontend/mythcontrols.cpp	(revision 20066)
+++ programs/mythfrontend/mythcontrols.cpp	(working copy)
@@ -30,6 +30,7 @@
 #include <QStringList>
 #include <QApplication>
 #include <QKeyEvent>
+#include <QEvent>
 
 // MythTV headers
 #include <mythcontext.h>
Index: programs/mythfrontend/channelrecpriority.h
===================================================================
--- programs/mythfrontend/channelrecpriority.h	(revision 20066)
+++ programs/mythfrontend/channelrecpriority.h	(working copy)
@@ -4,6 +4,8 @@
 #include "mythscreentype.h"
 
 #include "programinfo.h"
+#include <QKeyEvent>
+#include <QEvent>
 
 class ChannelInfo;
 
Index: programs/mythfrontend/mediarenderer.h
===================================================================
--- programs/mythfrontend/mediarenderer.h	(revision 20066)
+++ programs/mythfrontend/mediarenderer.h	(working copy)
@@ -11,8 +11,8 @@
 #ifndef __MEDIARENDERER_H__
 #define __MEDIARENDERER_H__
 
-#include <qobject.h>
-#include <qmutex.h>
+#include <QObject>
+#include <QMutex>
 
 #include "upnp.h"
 #include "upnpcmgr.h"
Index: programs/mythfrontend/mythfexml.cpp
===================================================================
--- programs/mythfrontend/mythfexml.cpp	(revision 20066)
+++ programs/mythfrontend/mythfexml.cpp	(working copy)
@@ -13,11 +13,12 @@
 
 #include "mythmainwindow.h"
 
-#include <qtextstream.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qregexp.h>
-#include <qbuffer.h>
+#include <QTextStream>
+#include <QDir>
+#include <QFile>
+#include <QRegExp>
+#include <QBuffer>
+
 #include <math.h>
 
 #include "../../config.h"
Index: programs/mythfrontend/action.cpp
===================================================================
--- programs/mythfrontend/action.cpp	(revision 20066)
+++ programs/mythfrontend/action.cpp	(working copy)
@@ -23,7 +23,7 @@
  */
 
 // Qt headers
-#include <qkeysequence.h>
+#include <QKeySequence>
 
 // MythControls headers
 #include "action.h"
Index: programs/mythfrontend/keygrabber.cpp
===================================================================
--- programs/mythfrontend/keygrabber.cpp	(revision 20066)
+++ programs/mythfrontend/keygrabber.cpp	(working copy)
@@ -1,6 +1,7 @@
 // -*- Mode: c++ -*-
 // Qt headers
 #include <QString>
+#include <QKeyEvent>
 
 // MythTV headers
 #include <mythcontext.h>
Index: programs/mythfrontend/mythosdmenueditor.cpp
===================================================================
--- programs/mythfrontend/mythosdmenueditor.cpp	(revision 20066)
+++ programs/mythfrontend/mythosdmenueditor.cpp	(working copy)
@@ -1,15 +1,15 @@
 #define MYTHOSDMENUEDITOR_CPP
 
 /* QT includes */
-#include <qnamespace.h>
-#include <qstringlist.h>
-#include <qapplication.h>
-#include <qdom.h>
-#include <qbuttongroup.h>
-#include <qimage.h>
-#include <qevent.h>
-#include <qdir.h>
-#include <qstring.h>
+#include <Qt>
+#include <QStringList>
+#include <QApplication>
+#include <QDomNode>
+#include <Q3ButtonGroup>
+#include <QImage>
+#include <QEvent>
+#include <QDir>
+#include <QString>
 
 /* MythTV includes */
 #include "mythcontext.h"
Index: programs/mythjobqueue/mythjobqueue.pro
===================================================================
--- programs/mythjobqueue/mythjobqueue.pro	(revision 20066)
+++ programs/mythjobqueue/mythjobqueue.pro	(working copy)
@@ -14,3 +14,4 @@
 
 # Input
 SOURCES += main.cpp
+QT += xml network  opengl qt3support 
Index: programs/mythtranscode/replex/replex.pro
===================================================================
--- programs/mythtranscode/replex/replex.pro	(revision 20066)
+++ programs/mythtranscode/replex/replex.pro	(working copy)
@@ -34,3 +34,4 @@
 DEPENDPATH += ../../../libs/libavutil ../../../libs/libavformat ../../../libs/libsavcodec
 
 CONFIG  -= qt
+QT += xml network  sql opengl qt3support 
Index: programs/mythtranscode/mythtranscode.pro
===================================================================
--- programs/mythtranscode/mythtranscode.pro	(revision 20066)
+++ programs/mythtranscode/mythtranscode.pro	(working copy)
@@ -22,3 +22,4 @@
 INCLUDEPATH += replex
 INCLUDEPATH += ../../libs/libavcodec ../../libs/libavformat \
                ../../libs/libavutil  ../../libs/ ../../libs/libmythmpeg2
+QT +=  opengl 
Index: programs/mythtranscode/transcode.cpp
===================================================================
--- programs/mythtranscode/transcode.cpp	(revision 20066)
+++ programs/mythtranscode/transcode.cpp	(working copy)
@@ -8,13 +8,14 @@
 #include <ctime>
 #include <math.h>
 
-#include <qstringlist.h>
-#include <qsqldatabase.h>
-#include <qmap.h>
-#include <qstringlist.h>
-#include <qregexp.h>
+#include <QStringList>
+#include <QSqlDatabase>
+#include <QMap>
+#include <QStringList>
+#include <QRegExp>
 
 #include <iostream>
+
 using namespace std;
 
 #include "osdtypes.h"
Index: programs/mythtranscode/mpeg2fix.h
===================================================================
--- programs/mythtranscode/mpeg2fix.h	(revision 20066)
+++ programs/mythtranscode/mpeg2fix.h	(working copy)
@@ -23,9 +23,9 @@
 #include <QStringList>
 #include <QDateTime>
 
-#include <q3ptrlist.h>
-#include <q3ptrqueue.h>
-#include <q3valuelist.h>
+#include <Q3PtrList>
+#include <Q3PtrQueue>
+#include <Q3ValueList>
 
 #include "transcodedefs.h"
 
@@ -265,7 +265,8 @@
 };
 
 #ifdef NO_MYTH
-    #include <qdatetime.h>
+    #include <QDateTime>
+
     #include <iostream>
 
     using namespace std;
Index: programs/mythcommflag/mythcommflag.pro
===================================================================
--- programs/mythcommflag/mythcommflag.pro	(revision 20066)
+++ programs/mythcommflag/mythcommflag.pro	(working copy)
@@ -47,6 +47,5 @@
 
 SOURCES += main.cpp
 
-#The following line was inserted by qt3to4
 QT += xml sql
-
+QT += network  opengl qt3support 
Index: programs/mythcommflag/CommDetectorFactory.h
===================================================================
--- programs/mythcommflag/CommDetectorFactory.h	(revision 20066)
+++ programs/mythcommflag/CommDetectorFactory.h	(working copy)
@@ -1,12 +1,13 @@
 #ifndef _COMMDETECTOR_FACTORY_H_
 #define _COMMDETECTOR_FACTORY_H_
 
+#include <QDateTime>
+
 #include "channelutil.h"
 
 class CommDetectorBase;
 class NuppelVideoPlayer;
 class RemoteEncoder;
-class QDateTime;
 
 class CommDetectorFactory
 {
Index: programs/mythcommflag/FrameAnalyzer.h
===================================================================
--- programs/mythcommflag/FrameAnalyzer.h	(revision 20066)
+++ programs/mythcommflag/FrameAnalyzer.h	(working copy)
@@ -10,7 +10,7 @@
 /* Base class for commercial flagging video frame analyzers. */
 
 #include <limits.h>
-#include <qmap.h>
+#include <QMap>
 
 /*  
  * At least FreeBSD doesn't define LONG_LONG_MAX, but it does define  
Index: programs/scripts/scripts.pro
===================================================================
--- programs/scripts/scripts.pro	(revision 20066)
+++ programs/scripts/scripts.pro	(working copy)
@@ -12,3 +12,4 @@
 INSTALLS += installscripts
 
 SOURCES += dummy.c
+QT += xml network  sql opengl qt3support 
Index: programs/mythbackend/playbacksock.h
===================================================================
--- programs/mythbackend/playbacksock.h	(revision 20066)
+++ programs/mythbackend/playbacksock.h	(working copy)
@@ -1,8 +1,8 @@
 #ifndef PLAYBACKSOCK_H_
 #define PLAYBACKSOCK_H_
 
-#include <qstring.h>
-#include <qmutex.h>
+#include <QString>
+#include <QMutex>
 
 #include "programinfo.h"
 
Index: programs/mythbackend/mainserver.h
===================================================================
--- programs/mythbackend/mainserver.h	(revision 20066)
+++ programs/mythbackend/mainserver.h	(working copy)
@@ -1,13 +1,14 @@
 #ifndef MAINSERVER_H_
 #define MAINSERVER_H_
 
-#include <qmap.h>
-#include <qtimer.h>
-#include <qmutex.h>
-#include <qdom.h>
+#include <QMap>
+#include <QTimer>
+#include <QMutex>
+#include <QDomNode>
 #include <QEvent>
 
 #include <vector>
+
 using namespace std;
 
 #include "tv.h"
@@ -21,7 +22,6 @@
 #include "mythdeque.h"
 
 class ProcessRequestThread;
-class QUrl;
 class MythServer;
 
 class MainServer : public QObject, public MythSocketCBs
Index: programs/mythbackend/scheduler.h
===================================================================
--- programs/mythbackend/scheduler.h	(revision 20066)
+++ programs/mythbackend/scheduler.h	(working copy)
@@ -8,10 +8,10 @@
 using namespace std;
 
 // Qt headers
-#include <qmutex.h>
-#include <qwaitcondition.h>
-#include <qmap.h> 
-#include <qobject.h>
+#include <QMutex>
+#include <QWaitCondition>
+#include <QMap> 
+#include <QObject>
 
 // MythTV headers
 #include "scheduledrecording.h"
Index: programs/mythbackend/httpstatus.h
===================================================================
--- programs/mythbackend/httpstatus.h	(revision 20066)
+++ programs/mythbackend/httpstatus.h	(working copy)
@@ -11,8 +11,9 @@
 #ifndef HTTPSTATUS_H_
 #define HTTPSTATUS_H_
 
-#include <qdom.h>
-#include <qdatetime.h> 
+#include <QDomNode>
+#include <QDateTime> 
+#include <QTextStream>
 
 #include "httpserver.h"
 #include "mainserver.h"
Index: programs/mythbackend/autoexpire.h
===================================================================
--- programs/mythbackend/autoexpire.h	(revision 20066)
+++ programs/mythbackend/autoexpire.h	(working copy)
@@ -9,10 +9,10 @@
 #include <vector>
 #include <set>
 
-#include <qmap.h> 
-#include <qmutex.h>
-#include <qwaitcondition.h>
-#include <qobject.h>
+#include <QMap> 
+#include <QMutex>
+#include <QWaitCondition>
+#include <QObject>
 
 using namespace std;
 class ProgramInfo;
Index: programs/mythbackend/backendutil.h
===================================================================
--- programs/mythbackend/backendutil.h	(revision 20066)
+++ programs/mythbackend/backendutil.h	(working copy)
@@ -1,7 +1,7 @@
 #ifndef _BACKENDUTIL_H
 #define _BACKENDUTIL_H
 
-#include <qstringlist.h>
+#include <QStringList>
 
 #include "libmythtv/remoteutil.h"
 #include "encoderlink.h"
Index: programs/mythbackend/encoderlink.h
===================================================================
--- programs/mythbackend/encoderlink.h	(revision 20066)
+++ programs/mythbackend/encoderlink.h	(working copy)
@@ -1,7 +1,7 @@
 #ifndef ENCODERLINK_H_
 #define ENCODERLINK_H_
 
-#include <qstring.h>
+#include <QString>
 
 #include "tv.h"
 #include "programinfo.h"
Index: programs/mythbackend/playbacksock.cpp
===================================================================
--- programs/mythbackend/playbacksock.cpp	(revision 20066)
+++ programs/mythbackend/playbacksock.cpp	(working copy)
@@ -1,4 +1,4 @@
-#include <qstringlist.h>
+#include <QStringList>
 
 #include <iostream>
 
Index: programs/mythbackend/mythbackend.pro
===================================================================
--- programs/mythbackend/mythbackend.pro	(revision 20066)
+++ programs/mythbackend/mythbackend.pro	(working copy)
@@ -36,3 +36,4 @@
 
 using_valgrind:DEFINES += USING_VALGRIND
 
+QT +=  opengl qt3support 
Index: programs/mythbackend/mediaserver.h
===================================================================
--- programs/mythbackend/mediaserver.h	(revision 20066)
+++ programs/mythbackend/mediaserver.h	(working copy)
@@ -11,8 +11,8 @@
 #ifndef __MEDIASERVER_H__
 #define __MEDIASERVER_H__
 
-#include <qobject.h>
-#include <qmutex.h>
+#include <QObject>
+#include <QMutex>
 
 #include "libmythupnp/upnp.h"
 
Index: programs/mythbackend/upnpcdsmusic.cpp
===================================================================
--- programs/mythbackend/upnpcdsmusic.cpp	(revision 20066)
+++ programs/mythbackend/upnpcdsmusic.cpp	(working copy)
@@ -10,8 +10,11 @@
 
 #include "upnpcdsmusic.h"
 #include "httprequest.h"
-#include <qfileinfo.h>
+
+#include <QFileInfo>
+
 #include <limits.h>
+
 #include "mythcontext.h"
 
 /*
Index: programs/mythbackend/scheduler.cpp
===================================================================
--- programs/mythbackend/scheduler.cpp	(revision 20066)
+++ programs/mythbackend/scheduler.cpp	(working copy)
@@ -1,12 +1,14 @@
 #include <unistd.h>
-#include <qsqldatabase.h>
-#include <qsqlquery.h>
-#include <qregexp.h>
-#include <qstring.h>
-#include <qdatetime.h>
 
+#include <QSqlDatabase>
+#include <QSqlQuery>
+#include <QRegExp>
+#include <QString>
+#include <QDateTime>
+
 #include <iostream>
 #include <algorithm>
+
 using namespace std;
 
 #ifdef __linux__
Index: programs/mythbackend/housekeeper.cpp
===================================================================
--- programs/mythbackend/housekeeper.cpp	(revision 20066)
+++ programs/mythbackend/housekeeper.cpp	(working copy)
@@ -1,15 +1,17 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <qsqldatabase.h>
-#include <qsqlquery.h>
-#include <qstring.h>
-#include <qdatetime.h>
-#include <qstringlist.h>
-#include <qfileinfo.h>
 
+#include <QSqlDatabase>
+#include <QSqlQuery>
+#include <QString>
+#include <QDateTime>
+#include <QStringList>
+#include <QFileInfo>
+
 #include <iostream>
 #include <cstdlib>
+
 using namespace std;
 
 #include "housekeeper.h"
Index: programs/mythbackend/upnpmedia.cpp
===================================================================
--- programs/mythbackend/upnpmedia.cpp	(revision 20066)
+++ programs/mythbackend/upnpmedia.cpp	(working copy)
@@ -1,10 +1,13 @@
 #include "httprequest.h"
-#include <qfileinfo.h>
-#include <qregexp.h>
-#include <qurl.h>
-#include <qdir.h>
+
+#include <QFileInfo>
+#include <QRegExp>
+#include <QUrl>
+#include <QDir>
+
 #include <limits.h>
 #include <unistd.h>
+
 #include "util.h"
 
 #include <cstdlib>
Index: programs/mythbackend/autoexpire.cpp
===================================================================
--- programs/mythbackend/autoexpire.cpp	(revision 20066)
+++ programs/mythbackend/autoexpire.cpp	(working copy)
@@ -3,10 +3,10 @@
 #include <signal.h>
 
 
-#include <qregexp.h>
-#include <qstring.h>
-#include <qdatetime.h>
-#include <qfileinfo.h>
+#include <QRegExp>
+#include <QString>
+#include <QDateTime>
+#include <QFileInfo>
 
 #include <iostream>
 #include <algorithm>
Index: programs/mythbackend/backendutil.cpp
===================================================================
--- programs/mythbackend/backendutil.cpp	(revision 20066)
+++ programs/mythbackend/backendutil.cpp	(working copy)
@@ -8,9 +8,9 @@
 #include <sys/vfs.h>
 #endif
 
-#include <qdir.h>
-#include <qmutex.h>
-#include <qmap.h>
+#include <QDir>
+#include <QMutex>
+#include <QMap>
 
 #include "backendutil.h"
 #include "remoteutil.h"
Index: programs/mythbackend/filetransfer.h
===================================================================
--- programs/mythbackend/filetransfer.h	(revision 20066)
+++ programs/mythbackend/filetransfer.h	(working copy)
@@ -9,9 +9,9 @@
 using namespace std;
 
 // Qt headers
-#include <qstring.h>
-#include <qmutex.h>
-#include <qwaitcondition.h>
+#include <QString>
+#include <QMutex>
+#include <QWaitCondition>
 
 class ProgramInfo;
 class RingBuffer;
Index: programs/mythtv-setup/channeleditor.cpp
===================================================================
--- programs/mythtv-setup/channeleditor.cpp	(revision 20066)
+++ programs/mythtv-setup/channeleditor.cpp	(working copy)
@@ -1,11 +1,13 @@
-#include <qsqldatabase.h>
+#include <QSqlDatabase>
+#include <QKeyEvent>
+#include <QEvent>
+#include <QApplication>
+
 #include "settings.h"
 #include "mythcontext.h"
 #include "mythdb.h"
 #include "channeleditor.h"
 
-#include <QApplication>
-
 #include <mythdialogs.h>
 #include <mythwizard.h>
 
Index: programs/mythtv-setup/channeleditor.h
===================================================================
--- programs/mythtv-setup/channeleditor.h	(revision 20066)
+++ programs/mythtv-setup/channeleditor.h	(working copy)
@@ -4,6 +4,8 @@
 #include "mythscreentype.h"
 
 #include "settings.h"
+#include <QKeyEvent>
+#include <QEvent>
 
 class MythUIButton;
 class MythUIButtonList;
Index: programs/mythtv-setup/importicons.cpp
===================================================================
--- programs/mythtv-setup/importicons.cpp	(revision 20066)
+++ programs/mythtv-setup/importicons.cpp	(working copy)
@@ -3,6 +3,7 @@
 #include <QBuffer>
 #include <QDir>
 #include <QFileInfo>
+#include <QEvent>
 
 #include "mythcontext.h"
 #include "mythdb.h"
Index: programs/mythtv-setup/mythtv-setup.pro
===================================================================
--- programs/mythtv-setup/mythtv-setup.pro	(revision 20066)
+++ programs/mythtv-setup/mythtv-setup.pro	(working copy)
@@ -36,3 +36,4 @@
 
 using_x11:DEFINES += USING_X11
 
+QT +=  opengl qt3support 
Index: programs/mythtv-setup/importicons.h
===================================================================
--- programs/mythtv-setup/importicons.h	(revision 20066)
+++ programs/mythtv-setup/importicons.h	(working copy)
@@ -15,6 +15,7 @@
 
 #include <QUrl>
 #include <QDir>
+#include <QEvent>
 
 #include "mythscreentype.h"
 
Index: programs/mythlcdserver/lcdserver.h
===================================================================
--- programs/mythlcdserver/lcdserver.h	(revision 20066)
+++ programs/mythlcdserver/lcdserver.h	(working copy)
@@ -7,8 +7,8 @@
 
 */
 
-#include <qobject.h>
-#include <qstringlist.h>
+#include <QObject>
+#include <QStringList>
 
 #include "serversocket.h"
 #include "lcdprocclient.h"
Index: programs/mythlcdserver/main.cpp
===================================================================
--- programs/mythlcdserver/main.cpp	(revision 20066)
+++ programs/mythlcdserver/main.cpp	(working copy)
@@ -13,7 +13,7 @@
 
 #include <QApplication>
 #include <QFile>
-#include <q3textstream.h>
+#include <QTextStream>
 
 #include "exitcodes.h"
 #include "mythcontext.h"
Index: programs/mythlcdserver/serversocket.h
===================================================================
--- programs/mythlcdserver/serversocket.h	(revision 20066)
+++ programs/mythlcdserver/serversocket.h	(working copy)
@@ -10,11 +10,10 @@
 
 */
 
-#include <q3socket.h>
-#include <q3serversocket.h>
+#include <Q3Socket>
+#include <Q3ServerSocket>
 
 
-
 class LCDServerSocket : public Q3ServerSocket
 {
 
Index: programs/mythlcdserver/lcdprocclient.cpp
===================================================================
--- programs/mythlcdserver/lcdprocclient.cpp	(revision 20066)
+++ programs/mythlcdserver/lcdprocclient.cpp	(working copy)
@@ -11,8 +11,10 @@
 #include <stdlib.h>
 #include <cmath>
 
-#include <qapplication.h>
-#include <q3textstream.h>
+#include <QApplication>
+#include <QTextStream>
+#include <Q3PtrList>
+#include <QEvent>
 
 #include "lcdprocclient.h"
 #include "mythcontext.h"
@@ -158,7 +160,7 @@
 
     if (!connected)
     {
-        Q3TextStream os(socket);
+        QTextStream os(socket);
         socket->connectToHost(hostname, port);
 
         while (--timeout && socket->state() != Q3Socket::Idle)
@@ -197,8 +199,8 @@
         return;
     }
 
-    Q3TextStream os(socket);
-    os.setEncoding(Q3TextStream::Latin1);
+    QTextStream os(socket);
+    os.setEncoding(QTextStream::Latin1);
 
     last_command = someText;
 
Index: programs/mythlcdserver/lcdserver.cpp
===================================================================
--- programs/mythlcdserver/lcdserver.cpp	(revision 20066)
+++ programs/mythlcdserver/lcdserver.cpp	(working copy)
@@ -56,10 +56,11 @@
 */
 
 #include <stdlib.h>
-#include <qstringlist.h>
-#include <qregexp.h>
-#include <qdir.h>
-#include <qapplication.h>
+
+#include <QStringList>
+#include <QRegExp>
+#include <QDir>
+#include <QApplication>
 #include <Q3PtrList>
 
 #include "util.h"
Index: programs/mythlcdserver/mythlcdserver.pro
===================================================================
--- programs/mythlcdserver/mythlcdserver.pro	(revision 20066)
+++ programs/mythlcdserver/mythlcdserver.pro	(working copy)
@@ -13,5 +13,4 @@
 
 SOURCES += main.cpp lcdserver.cpp serversocket.cpp lcdprocclient.cpp 
 
-#The following line was inserted by qt3to4
 QT += network xml  sql opengl qt3support
Index: programs/mythlcdserver/lcdprocclient.h
===================================================================
--- programs/mythlcdserver/lcdprocclient.h	(revision 20066)
+++ programs/mythlcdserver/lcdprocclient.h	(working copy)
@@ -1,12 +1,12 @@
 #ifndef LCDPROCCLIENT_H_
 #define LCDPROCCLIENT_H_
 
-#include <qobject.h>
-#include <qstringlist.h>
-#include <q3valuevector.h>
-#include <q3socket.h>
-#include <qtimer.h>
-#include <qdatetime.h>
+#include <QObject>
+#include <QStringList>
+#include <Q3ValueVector>
+#include <Q3Socket>
+#include <QTimer>
+#include <QDateTime>
 #include <QEvent>
 #include <Q3PtrList>
 
Index: programs/mythtv/mythtv.pro
===================================================================
--- programs/mythtv/mythtv.pro	(revision 20066)
+++ programs/mythtv/mythtv.pro	(working copy)
@@ -23,3 +23,4 @@
 }
 
 using_x11:DEFINES += USING_X11
+QT +=  qt3support 
Index: programs/mythwelcome/welcomedialog.h
===================================================================
--- programs/mythwelcome/welcomedialog.h	(revision 20066)
+++ programs/mythwelcome/welcomedialog.h	(working copy)
@@ -3,6 +3,8 @@
 
 // qt
 #include <QDateTime>
+#include <QEvent>
+#include <QKeyEvent>
 
 // myth
 #include "remoteutil.h"
Index: programs/mythwelcome/mythwelcome.pro
===================================================================
--- programs/mythwelcome/mythwelcome.pro	(revision 20066)
+++ programs/mythwelcome/mythwelcome.pro	(working copy)
@@ -21,3 +21,4 @@
 # Input
 HEADERS += welcomedialog.h welcomesettings.h
 SOURCES += main.cpp welcomedialog.cpp welcomesettings.cpp
+QT += network  opengl qt3support 
Index: programs/mythwelcome/welcomedialog.cpp
===================================================================
--- programs/mythwelcome/welcomedialog.cpp	(revision 20066)
+++ programs/mythwelcome/welcomedialog.cpp	(working copy)
@@ -5,7 +5,7 @@
 #include <unistd.h>
 
 // qt
-#include <qapplication.h>
+#include <QApplication>
 #include <QKeyEvent>
 #include <QLabel>
 #include <QEvent>
Index: programs/mythtvosd/mythtvosd.pro
===================================================================
--- programs/mythtvosd/mythtvosd.pro	(revision 20066)
+++ programs/mythtvosd/mythtvosd.pro	(working copy)
@@ -18,3 +18,4 @@
 SOURCES += main.cpp
 
 mingw: LIBS += -lpthread -lwinmm -lws2_32
+QT += xml  sql opengl qt3support 
Index: programs/mythtvosd/main.cpp
===================================================================
--- programs/mythtvosd/main.cpp	(revision 20066)
+++ programs/mythtvosd/main.cpp	(working copy)
@@ -9,11 +9,11 @@
 using namespace std;
 
 // Qt headers
-#include <qapplication.h>
+#include <QApplication>
 #include <QUdpSocket>
-#include <qstring.h>
-#include <qfile.h>
-#include <qhostaddress.h>
+#include <QString>
+#include <QFile>
+#include <QHostAddress>
 
 // MythTV headers
 #include "exitcodes.h"
Index: programs/mythfilldatabase/filldata.cpp
===================================================================
--- programs/mythfilldatabase/filldata.cpp	(revision 20066)
+++ programs/mythfilldatabase/filldata.cpp	(working copy)
@@ -11,10 +11,10 @@
 using namespace std;
 
 // Qt headers
-#include <qmap.h>
-#include <qdatetime.h>
-#include <qdir.h>
-#include <qfile.h>
+#include <QMap>
+#include <QDateTime>
+#include <QDir>
+#include <QFile>
 #include <QProcess>
 #include <QList>
 
Index: programs/mythfilldatabase/icondata.cpp
===================================================================
--- programs/mythfilldatabase/icondata.cpp	(revision 20066)
+++ programs/mythfilldatabase/icondata.cpp	(working copy)
@@ -3,9 +3,10 @@
 #include <signal.h>
 
 // Qt headers
-#include <qdom.h>
-#include <qfile.h>
-#include <qfileinfo.h>
+#include <QDomNode>
+#include <QFile>
+#include <QFileInfo>
+#include <QTextStream>
 
 #include <iostream>
 #include <cstdlib>
Index: programs/mythfilldatabase/fillutil.cpp
===================================================================
--- programs/mythfilldatabase/fillutil.cpp	(revision 20066)
+++ programs/mythfilldatabase/fillutil.cpp	(working copy)
@@ -1,6 +1,6 @@
 // Qt headers
-#include <qfile.h>
-#include <qdir.h>
+#include <QFile>
+#include <QDir>
 
 // libmyth headers
 #include "mythcontext.h"
Index: programs/mythfilldatabase/filldata.h
===================================================================
--- programs/mythfilldatabase/filldata.h	(revision 20066)
+++ programs/mythfilldatabase/filldata.h	(working copy)
@@ -6,7 +6,7 @@
 using namespace std;
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 
 // libmythtv headers
 #include "datadirect.h"
Index: programs/mythfilldatabase/channeldata.h
===================================================================
--- programs/mythfilldatabase/channeldata.h	(revision 20066)
+++ programs/mythfilldatabase/channeldata.h	(working copy)
@@ -2,7 +2,7 @@
 #define _CHANNELDATA_H_
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 #include <QList>
 
 class ChanInfo
Index: programs/mythfilldatabase/icondata.h
===================================================================
--- programs/mythfilldatabase/icondata.h	(revision 20066)
+++ programs/mythfilldatabase/icondata.h	(working copy)
@@ -1,9 +1,6 @@
 #ifndef _ICONMAP_H_
 #define _ICONMAP_H_
 
-class QString;
-class QFile;
-
 class IconData
 {
   public:
Index: programs/mythfilldatabase/xmltvparser.cpp
===================================================================
--- programs/mythfilldatabase/xmltvparser.cpp	(revision 20066)
+++ programs/mythfilldatabase/xmltvparser.cpp	(working copy)
@@ -3,10 +3,9 @@
 #include <QStringList>
 #include <QDateTime>
 #include <QUrl>
+#include <Q3Url>
 #include <QDomDocument>
 
-#include <q3url.h>
-
 // C++ headers
 #include <iostream>
 #include <cstdlib>
Index: programs/mythfilldatabase/fillutil.h
===================================================================
--- programs/mythfilldatabase/fillutil.h	(revision 20066)
+++ programs/mythfilldatabase/fillutil.h	(working copy)
@@ -5,10 +5,8 @@
 #include <cstdio>
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 
-class QFile;
-
 bool dash_open(QFile &file, const QString &filename,
                int m, FILE *handle = NULL);
 
Index: programs/mythfilldatabase/mythfilldatabase.pro
===================================================================
--- programs/mythfilldatabase/mythfilldatabase.pro	(revision 20066)
+++ programs/mythfilldatabase/mythfilldatabase.pro	(working copy)
@@ -21,3 +21,4 @@
 SOURCES += icondata.cpp xmltvparser.cpp
 SOURCES += fillutil.cpp
 SOURCES += main.cpp
+QT +=  opengl 
Index: programs/mythfilldatabase/xmltvparser.h
===================================================================
--- programs/mythfilldatabase/xmltvparser.h	(revision 20066)
+++ programs/mythfilldatabase/xmltvparser.h	(working copy)
@@ -8,8 +8,6 @@
 
 class ProgInfo;
 class ChanInfo;
-class QUrl;
-class QDomElement;
 
 class XMLTVParser
 {
Index: programs/mythshutdown/mythshutdown.pro
===================================================================
--- programs/mythshutdown/mythshutdown.pro	(revision 20066)
+++ programs/mythshutdown/mythshutdown.pro	(working copy)
@@ -15,3 +15,4 @@
 # Input
 HEADERS += 
 SOURCES += main.cpp
+QT += xml network  opengl qt3support 
Index: bindings/python/python.pro
===================================================================
--- bindings/python/python.pro	(revision 20066)
+++ bindings/python/python.pro	(working copy)
@@ -20,3 +20,4 @@
 QMAKE_LINK=@-echo
 QMAKE_EXTRA_UNIX_TARGETS += python_build
 INSTALLS += python_install
+QT += xml network  sql opengl qt3support 
Index: bindings/perl/perl.pro
===================================================================
--- bindings/perl/perl.pro	(revision 20066)
+++ bindings/perl/perl.pro	(working copy)
@@ -26,3 +26,4 @@
 PRE_TARGETDEPS += perl_build
 QMAKE_EXTRA_UNIX_TARGETS += mythperlbindings mythperbindingsbuild phony perl_clean qmake_clean perl_install
 
+QT += xml network  sql opengl qt3support 
Index: settings.pro
===================================================================
--- settings.pro	(revision 20066)
+++ settings.pro	(working copy)
@@ -1,9 +1,6 @@
 CONFIG += $$CCONFIG
 
-#check QT major version
-contains(QT_MAJOR_VERSION, 3) {
-        error("Not building against Qt4")
-}
+QT += qt3support
 
 # Where binaries, includes and runtime assets are installed by 'make install'
 isEmpty( PREFIX ) {
Index: filters/linearblend/linearblend.pro
===================================================================
--- filters/linearblend/linearblend.pro	(revision 20066)
+++ filters/linearblend/linearblend.pro	(working copy)
@@ -5,3 +5,4 @@
 
 # Input
 SOURCES += filter_linearblend.c
+QT += xml network  sql opengl qt3support 
Index: filters/quickdnr/quickdnr.pro
===================================================================
--- filters/quickdnr/quickdnr.pro	(revision 20066)
+++ filters/quickdnr/quickdnr.pro	(working copy)
@@ -5,3 +5,4 @@
 
 # Input
 SOURCES += filter_quickdnr.c
+QT += xml network  sql opengl qt3support 
Index: filters/onefield/onefield.pro
===================================================================
--- filters/onefield/onefield.pro	(revision 20066)
+++ filters/onefield/onefield.pro	(working copy)
@@ -4,3 +4,4 @@
 
 # Input
 SOURCES += filter_onefield.c
+QT += xml network  sql opengl qt3support 
Index: filters/bobdeint/bobdeint.pro
===================================================================
--- filters/bobdeint/bobdeint.pro	(revision 20066)
+++ filters/bobdeint/bobdeint.pro	(working copy)
@@ -4,3 +4,4 @@
 
 # Input
 SOURCES += filter_bobdeint.c
+QT += xml network  sql opengl qt3support 
Index: filters/adjust/adjust.pro
===================================================================
--- filters/adjust/adjust.pro	(revision 20066)
+++ filters/adjust/adjust.pro	(working copy)
@@ -5,3 +5,4 @@
 
 # Input
 SOURCES += filter_adjust.c
+QT += xml network  sql opengl qt3support 
Index: filters/yadif/yadif.pro
===================================================================
--- filters/yadif/yadif.pro	(revision 20066)
+++ filters/yadif/yadif.pro	(working copy)
@@ -11,3 +11,4 @@
 }
 
 macx:debug:DEFINES -= MMX
+QT += xml network  sql opengl qt3support 
Index: filters/force/force.pro
===================================================================
--- filters/force/force.pro	(revision 20066)
+++ filters/force/force.pro	(working copy)
@@ -4,3 +4,4 @@
 
 # Input
 SOURCES += filter_force.c
+QT += xml network  sql opengl qt3support 
Index: filters/crop/crop.pro
===================================================================
--- filters/crop/crop.pro	(revision 20066)
+++ filters/crop/crop.pro	(working copy)
@@ -5,3 +5,4 @@
 
 # Input
 SOURCES += filter_crop.c
+QT += xml network  sql opengl qt3support 
Index: filters/kerneldeint/kerneldeint.pro
===================================================================
--- filters/kerneldeint/kerneldeint.pro	(revision 20066)
+++ filters/kerneldeint/kerneldeint.pro	(working copy)
@@ -10,3 +10,4 @@
 
 # Input
 SOURCES += filter_kerneldeint.c
+QT += xml network  sql opengl qt3support 
Index: filters/ivtc/ivtc.pro
===================================================================
--- filters/ivtc/ivtc.pro	(revision 20066)
+++ filters/ivtc/ivtc.pro	(working copy)
@@ -5,3 +5,4 @@
 
 # Input
 SOURCES += pullup.c filter_ivtc.c
+QT += xml network  sql opengl qt3support 
Index: filters/invert/invert.pro
===================================================================
--- filters/invert/invert.pro	(revision 20066)
+++ filters/invert/invert.pro	(working copy)
@@ -4,3 +4,4 @@
 
 # Input
 SOURCES += filter_invert.c
+QT += xml network  sql opengl qt3support 
Index: filters/greedyhdeint/greedyhdeint.pro
===================================================================
--- filters/greedyhdeint/greedyhdeint.pro	(revision 20066)
+++ filters/greedyhdeint/greedyhdeint.pro	(working copy)
@@ -7,3 +7,4 @@
 SOURCES += filter_greedyhdeint.c color.c
 
 macx : QMAKE_LFLAGS += -read_only_relocs warning
+QT += xml network  sql opengl qt3support 
Index: filters/denoise3d/denoise3d.pro
===================================================================
--- filters/denoise3d/denoise3d.pro	(revision 20066)
+++ filters/denoise3d/denoise3d.pro	(working copy)
@@ -5,3 +5,4 @@
 
 # Input
 SOURCES += filter_denoise3d.c
+QT += xml network  sql opengl qt3support 
