On 21/05/05, Christian Hack <[EMAIL PROTECTED]> wrote: > I've been away for a while - is QT3.3 required now for CVS? > > Scanwizard.cpp as of May 15 won't compile due to "qlocale.h" being not > available in QT3.2. It appeared in QT3.3. > The code auto tries to auto select which country you are in for a DVB-T full scan. The attached patch should alliviate the problem for you while keeping the functionality in. If you could test it and report back that would be good :)
-- John
Index: scanwizard.cpp =================================================================== RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/scanwizard.cpp,v retrieving revision 1.12 diff -u -r1.12 scanwizard.cpp --- scanwizard.cpp 15 May 2005 22:55:40 -0000 1.12 +++ scanwizard.cpp 21 May 2005 12:27:59 -0000 @@ -31,7 +31,9 @@ */ #include <qapplication.h> #include <qptrlist.h> +#if (QT_VERSION >= 0x030300) #include <qlocale.h> +#endif #include "mythcontext.h" #include "dvbchannel.h" #include "videosource.h" @@ -548,19 +550,36 @@ ScanCountry::ScanCountry() { QLocale locale = QLocale::system(); +#if (QT_VERSION >= 0x030300) QLocale::Country country = locale.country(); +#endif setLabel(tr("Country")); - addSelection(QObject::tr("Australia"),QString::number(AU), - country==QLocale::Australia); - addSelection(QObject::tr("Finland"),QString::number(FI), - country==QLocale::Finland); - addSelection(QObject::tr("Sweden"),QString::number(SE), - country==QLocale::Sweden); - addSelection(QObject::tr("United Kingdom"),QString::number(UK), - country==QLocale::UnitedKingdom); - addSelection(QObject::tr("Germany"),QString::number(DE), - country==QLocale::Germany); + addSelection(QObject::tr("Australia"),QString::number(AU) +#if (QT_VERSION >= 0x030300) + ,country==QLocale::Australia +#endif + ); + addSelection(QObject::tr("Finland"),QString::number(FI) +#if (QT_VERSION >= 0x030300) + ,country==QLocale::Finland +#endif + ); + addSelection(QObject::tr("Sweden"),QString::number(SE) +#if (QT_VERSION >= 0x030300) + ,country==QLocale::Sweden +#endif + ); + addSelection(QObject::tr("United Kingdom"),QString::number(UK) +#if (QT_VERSION >= 0x030300) + ,country==QLocale::UnitedKingdom +#endif + ); + addSelection(QObject::tr("Germany"),QString::number(DE) +#if (QT_VERSION >= 0x030300) + ,country==QLocale::Germany +#endif + ); } ScanOptionalConfig::ScanOptionalConfig(ScanWizard *wizard) :
_______________________________________________ mythtv-dev mailing list mythtv-dev@mythtv.org http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-dev