[mythtv-commits] mythtv branch master updated by danielk. v0.27-pre2-738-g1a23e8b

Git Repo Owner noreply at mythtv.org
Fri Mar 1 22:18:14 UTC 2013


The branch, master has been updated on the
mythtv repository by gitolite user danielk.
       via  1a23e8b872973f116c73b2c189de1bab4daba7a1 (commit)
       via  a216dbefe882e081f84ad800b61c954dcd4f911b (commit)
       via  24f7f0b892bb04aeecb16a3333c02c0009797545 (commit)
       via  85f5e1a0cc962da9d300e6d0840022e441b320b0 (commit)
       via  2e9b97ebb4f8f36a4d872193f525b3c4f4a59332 (commit)
       via  b2737631bc399af24f31ac3ad0b44b1ab0f3be80 (commit)
       via  2b8584a82f1aeb634a74efb2f2f2cc53ce381550 (commit)
       via  ad8605c6d3847604668139a16ad42d86a392378a (commit)
       via  ddd9820eb94ea829f90a0bd2ee6ef9150e2a85ca (commit)
       via  d1c03534ecdf212a917b152c5a576b2c52d2be4a (commit)
       via  93ab2375a1f060c8d9d5b2e3dcf59864e900e40a (commit)
       via  f8f59f50955f21f2da37612b7dfa07deaade3d50 (commit)
       via  56d5b18b0398e05567352f8870ffe4a8857d86f8 (commit)
       via  4a498aafe714977b6b560711b126e4f328edefa3 (commit)
       via  ee6c47209d89c913da35cfe65d723a3c2d8e7a6a (commit)
       via  e5b3ed0dde5c0283a9ea779049d898c6496586cc (commit)
       via  d0bfbba5e6f74858e21ecd73e6fdbd1dce55ca20 (commit)
       via  d4f1890fa01605698e2aad1c896292994fffc085 (commit)
       via  36395e96d2cf1f16e46177a2c3a0fda13bac1ab2 (commit)
       via  3a716314a133b8eaa2b8bcc5d6ef09ee8066e517 (commit)
       via  0d63e0654033022d49b5db3f0fbbac4c44b85f46 (commit)
       via  7bbc3ccdc8fc5721b6bc80bf0060d5c2a814b9c0 (commit)
       via  c619ecce03ee2e453fd30aca9603946aadf07fd7 (commit)
       via  f42b774c1cd2c73a784e728e7501e75ce4538a75 (commit)
       via  164ec9c9a21b85d4056daebcf8881820355b2158 (commit)
       via  609bdfa1edabe925664daecc336437585ad84104 (commit)
       via  b2d243a3e0ac8938e6a8cabe54d5f2f44a4ed1dc (commit)
       via  f894ecb5b9e1934e84463cf7a1029c6d2b1a2cf5 (commit)
       via  8680f2bd09d84d533dc4a9250edf686880cce7ee (commit)
       via  48f36871f27655fd66d02619116fb9343482faa5 (commit)
       via  92c6b2268f2eccf257f4a718563ca669f37d1871 (commit)
       via  4679e35b0ad470127c2431cd262828e4cdc0b61e (commit)
       via  e7de92fdfb3fc6cbdb27eb821162b864728b679f (commit)
       via  2fa1e0d19c16784dbc0661376585b5b3b11fef60 (commit)
       via  dae83168cd21b2486ea5eae0fd2959a1460e8639 (commit)
       via  e24819ec0cd0529df94954e98bddb401542e798d (commit)
       via  57810c79ba5db0b248eeaed4cbfa31470c6103ee (commit)
      from  0413b5683b8839fd07ddf022efd9d39d6c9b4876 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1a23e8b872973f116c73b2c189de1bab4daba7a1
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:24:07 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 23:09:57 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=1a23e8b872973f116c73b2c189de1bab4daba7a1

Add widgets to QT components for mythnews on Qt5.



commit a216dbefe882e081f84ad800b61c954dcd4f911b
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:18:29 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 23:09:56 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=a216dbefe882e081f84ad800b61c954dcd4f911b

Remove false QApplication dependencies.



commit 24f7f0b892bb04aeecb16a3333c02c0009797545
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:15:17 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:53 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=24f7f0b892bb04aeecb16a3333c02c0009797545

Port mythweather to Qt5



commit 85f5e1a0cc962da9d300e6d0840022e441b320b0
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 21:24:46 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:53 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=85f5e1a0cc962da9d300e6d0840022e441b320b0

Move define to allow Qt5 deprecated methods to ./configure.



commit 2e9b97ebb4f8f36a4d872193f525b3c4f4a59332
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 21:23:40 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:52 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=2e9b97ebb4f8f36a4d872193f525b3c4f4a59332

Fix a couple broken paths for targetdep.pro



commit b2737631bc399af24f31ac3ad0b44b1ab0f3be80
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 20:40:43 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:52 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=b2737631bc399af24f31ac3ad0b44b1ab0f3be80

Convert QImage::numBytes() to QImage::byteCount().
The numBytes() is not supported in Qt5 and byteCount() is supported by Qt4.6 and later.



commit 2b8584a82f1aeb634a74efb2f2f2cc53ce381550
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 19:53:56 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:52 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=2b8584a82f1aeb634a74efb2f2f2cc53ce381550

Update plugin ./configure to detect Qt5.



commit ad8605c6d3847604668139a16ad42d86a392378a
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Wed, 27 Feb 2013 22:46:15 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:51 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=ad8605c6d3847604668139a16ad42d86a392378a

Port of QTcpServer/QTcpSocket to Qt5.



commit ddd9820eb94ea829f90a0bd2ee6ef9150e2a85ca
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Tue, 26 Feb 2013 22:17:45 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:51 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=ddd9820eb94ea829f90a0bd2ee6ef9150e2a85ca

Tweak mythuiwebbrowser header to work with Qt4 & Qt5.



commit d1c03534ecdf212a917b152c5a576b2c52d2be4a
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Tue, 26 Feb 2013 21:29:04 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:50 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=d1c03534ecdf212a917b152c5a576b2c52d2be4a

Move qRegisterMetaType<> to after Q_DECLARE_METATYPE() in 'Service'.



commit 93ab2375a1f060c8d9d5b2e3dcf59864e900e40a
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Mon, 25 Feb 2013 22:27:57 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:50 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=93ab2375a1f060c8d9d5b2e3dcf59864e900e40a

Add a stub MythUIWebBrowser for Qt5.
It seems libqtwebkit is not quite working yet in the Ubuntu Qt5 packages for Ubuntu 12.04.

This just creates a stub so we can compile without webkit for now under Qt5.



commit f8f59f50955f21f2da37612b7dfa07deaade3d50
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Mon, 25 Feb 2013 22:25:14 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:49 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=f8f59f50955f21f2da37612b7dfa07deaade3d50

Remove false dependency on mythuiwebbrowser.h



commit 56d5b18b0398e05567352f8870ffe4a8857d86f8
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Mon, 25 Feb 2013 22:24:31 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:49 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=56d5b18b0398e05567352f8870ffe4a8857d86f8

Remove false dependency on QWindowsStyle



commit 4a498aafe714977b6b560711b126e4f328edefa3
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Mon, 25 Feb 2013 22:23:36 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:49 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=4a498aafe714977b6b560711b126e4f328edefa3

Refactor of UPnP Serializer so Q_DECLARE_METATYPE() comes before qRegisterMetaType<> (so we can compile under Qt5).



commit ee6c47209d89c913da35cfe65d723a3c2d8e7a6a
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Mon, 25 Feb 2013 22:22:09 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:48 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=ee6c47209d89c913da35cfe65d723a3c2d8e7a6a

Use QDesktopWidget::screenCount() in place of QDesktopWidget::numScreens() under Qt5 (method rename).



commit e5b3ed0dde5c0283a9ea779049d898c6496586cc
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Mon, 25 Feb 2013 22:21:02 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:48 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=e5b3ed0dde5c0283a9ea779049d898c6496586cc

Convert QApplication::type() to qobject_cast<QApplication*>()
QApplication::type() has been removed from Qt5 (as of beta 2).



commit d0bfbba5e6f74858e21ecd73e6fdbd1dce55ca20
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Mon, 25 Feb 2013 22:01:41 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:47 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=d0bfbba5e6f74858e21ecd73e6fdbd1dce55ca20

Conditionally compile netutils.h code only in Qt4 build.
netutils.h uses HTTP APIs that are gone in Qt5.



commit d4f1890fa01605698e2aad1c896292994fffc085
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Mon, 25 Feb 2013 21:57:34 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:47 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=d4f1890fa01605698e2aad1c896292994fffc085

Convert QDataTime::secsTo() to compile in both Qt4 and Qt5.



commit 36395e96d2cf1f16e46177a2c3a0fda13bac1ab2
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Mon, 25 Feb 2013 21:56:20 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:47 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=36395e96d2cf1f16e46177a2c3a0fda13bac1ab2

Conditionally compile QHttp code only in Qt4 build.
QHttp is gone in Qt5.



commit 3a716314a133b8eaa2b8bcc5d6ef09ee8066e517
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Mon, 25 Feb 2013 21:55:16 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:46 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=3a716314a133b8eaa2b8bcc5d6ef09ee8066e517

Conditionally compile httpcomms code only in Qt4 build.
httpcomms uses HTTP APIs that are gone in Qt5.



commit 0d63e0654033022d49b5db3f0fbbac4c44b85f46
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Mon, 25 Feb 2013 21:50:45 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:46 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=0d63e0654033022d49b5db3f0fbbac4c44b85f46

Convert various .pro files to work with Qt5.



commit 7bbc3ccdc8fc5721b6bc80bf0060d5c2a814b9c0
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Mon, 25 Feb 2013 21:48:46 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:45 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=7bbc3ccdc8fc5721b6bc80bf0060d5c2a814b9c0

Fix file inclusions in libmythtv.pro



commit c619ecce03ee2e453fd30aca9603946aadf07fd7
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Mon, 25 Feb 2013 21:46:24 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:45 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=c619ecce03ee2e453fd30aca9603946aadf07fd7

Allow Qt5 depreciated code to compile.



commit f42b774c1cd2c73a784e728e7501e75ce4538a75
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Mon, 25 Feb 2013 21:45:42 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:45 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=f42b774c1cd2c73a784e728e7501e75ce4538a75

Port libmyth.pro to work with Qt5 + Qt4.



commit 164ec9c9a21b85d4056daebcf8881820355b2158
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Mon, 25 Feb 2013 21:44:40 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:44 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=164ec9c9a21b85d4056daebcf8881820355b2158

mythevent.h is no longer in libmyth, remove from .pro



commit 609bdfa1edabe925664daecc336437585ad84104
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Mon, 25 Feb 2013 21:41:26 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:44 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=609bdfa1edabe925664daecc336437585ad84104

Rewrite ProgramInfo::GetSecondsInRecording() so it works in Qt5.
QDateTime::secsTo() returns a qint64 instead of an int in Qt5.
This tweaks things so the code compiles with both Qt4 and Qt5.



commit b2d243a3e0ac8938e6a8cabe54d5f2f44a4ed1dc
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Mon, 25 Feb 2013 21:37:12 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:43 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=b2d243a3e0ac8938e6a8cabe54d5f2f44a4ed1dc

Refactor of datacontracts so the compile with Qt5.
The qRegisterMetaType<> must come after Q_DECLARE_METATYPE().



commit f894ecb5b9e1934e84463cf7a1029c6d2b1a2cf5
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Sun, 24 Feb 2013 14:00:32 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:42 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=f894ecb5b9e1934e84463cf7a1029c6d2b1a2cf5

Convert {to,from}Ascii to {to,from}Latin1.
The ascii functions are depreciated in Qt5 and don't actually do what they are supposed to do in Qt4.



commit 8680f2bd09d84d533dc4a9250edf686880cce7ee
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Sun, 24 Feb 2013 13:56:16 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:41 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=8680f2bd09d84d533dc4a9250edf686880cce7ee

Convert QUrl encode/decode to Qt5 API under Qt5.



commit 48f36871f27655fd66d02619116fb9343482faa5
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Sun, 24 Feb 2013 13:32:42 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:41 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=48f36871f27655fd66d02619116fb9343482faa5

Add + use a check_ecxx() so we can check for Qt stuff using the required compiler flags to check this with qt5.



commit 92c6b2268f2eccf257f4a718563ca669f37d1871
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Sat, 23 Feb 2013 22:04:26 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:40 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=92c6b2268f2eccf257f4a718563ca669f37d1871

A QFileInfo metatype is declared by default in Qt5 so don't do it ourselves under Qt5.



commit 4679e35b0ad470127c2431cd262828e4cdc0b61e
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Sat, 23 Feb 2013 22:03:05 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:40 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=4679e35b0ad470127c2431cd262828e4cdc0b61e

Use httpcomms.h only where needed, & disable the httpcomms code compilation under Qt5.



commit e7de92fdfb3fc6cbdb27eb821162b864728b679f
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Sat, 23 Feb 2013 21:51:35 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:44:40 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=e7de92fdfb3fc6cbdb27eb821162b864728b679f

Disable some Qt5 incompatible stuff under Qt5.



commit 2fa1e0d19c16784dbc0661376585b5b3b11fef60
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Sat, 23 Feb 2013 21:35:18 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:30:06 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=2fa1e0d19c16784dbc0661376585b5b3b11fef60

Move and rename string formatting function.
The function was used in rssparse.cpp and programinfo.cpp, but defined in netutils.cpp.
This brought in a bunch of unnecessary headers into the places using the formating function
complicating the Qt 5 port and slowing down compilation to boot.



commit dae83168cd21b2486ea5eae0fd2959a1460e8639
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Sat, 23 Feb 2013 21:13:36 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:30:05 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=dae83168cd21b2486ea5eae0fd2959a1460e8639

Fix compilation of loggingserver.cpp in Qt 5.
Qt 5 flagged some non-threadsafe code. I've added TODO FIXME comments at the two locations where the bugs result in bad behavior and not just inaccurate debugging message.



commit e24819ec0cd0529df94954e98bddb401542e798d
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Sat, 23 Feb 2013 21:09:27 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:30:05 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=e24819ec0cd0529df94954e98bddb401542e798d

Disable HttpComms and MythHttpPool when compiling with Qt5.
These use APIs no longer present in Qt 5.



commit 57810c79ba5db0b248eeaed4cbfa31470c6103ee
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Mon, 25 Feb 2013 21:52:00 -0500
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Thu, 28 Feb 2013 22:30:05 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=57810c79ba5db0b248eeaed4cbfa31470c6103ee

Don't use TRUE/FALSE in cpp code.. (no longer defined in Qt5.)



-----------------------------------------------------------------------

Summary of changes:
 mythplugins/configure                              |   17 +++--
 mythplugins/libs-targetfix.pro                     |    2 +-
 .../mytharchive/mytharchive/recordingselector.cpp  |    9 +--
 mythplugins/mythgallery/mythgallery/iconview.cpp   |    1 -
 mythplugins/mythmusic/mythmusic/streamview.cpp     |    1 -
 mythplugins/mythnews/mythnews/mythnews.cpp         |    2 +-
 mythplugins/mythnews/mythnews/mythnews.pro         |    3 +
 mythplugins/mythnews/mythnews/mythnewsconfig.cpp   |    1 -
 mythplugins/mythweather/mythweather/main.cpp       |    4 -
 .../mythweather/mythweather/mythweather.pro        |    3 +
 mythplugins/programs-libs.pro                      |    2 +-
 mythtv/configure                                   |   15 +++-
 mythtv/external/qjson/src/qobjecthelper.cpp        |    2 +-
 mythtv/libs/libmyth/audio/audiooutputalsa.cpp      |    8 +-
 mythtv/libs/libmyth/audio/audiooutputjack.cpp      |    6 +-
 mythtv/libs/libmyth/audio/audiooutputoss.cpp       |    6 +-
 mythtv/libs/libmyth/audio/audiooutputpulse.cpp     |    2 +-
 mythtv/libs/libmyth/audio/spdifencoder.cpp         |    2 +-
 mythtv/libs/libmyth/libmyth.pro                    |   44 ++++++++---
 mythtv/libs/libmyth/mediamonitor-darwin.cpp        |    6 +-
 mythtv/libs/libmyth/mediamonitor-unix.cpp          |   16 ++--
 mythtv/libs/libmyth/mythdialogs.cpp                |    6 +-
 mythtv/libs/libmyth/mythmediamonitor.cpp           |    2 +-
 mythtv/libs/libmyth/mythwizard.cpp                 |   16 ++--
 mythtv/libs/libmyth/netutils.cpp                   |   15 ----
 mythtv/libs/libmyth/netutils.h                     |    1 -
 mythtv/libs/libmyth/programinfo.cpp                |   37 +++++++---
 mythtv/libs/libmyth/programinfo.h                  |    2 +
 mythtv/libs/libmyth/remoteutil.cpp                 |    2 +-
 mythtv/libs/libmyth/rssparse.cpp                   |   18 +++---
 mythtv/libs/libmyth/settings.cpp                   |    8 +-
 mythtv/libs/libmyth/storagegroupeditor.cpp         |    2 +-
 mythtv/libs/libmythbase/filesysteminfo.cpp         |    2 +-
 mythtv/libs/libmythbase/iso639.cpp                 |    2 +-
 mythtv/libs/libmythbase/iso639.h                   |    8 +-
 mythtv/libs/libmythbase/libmythbase.pro            |   27 +++++--
 mythtv/libs/libmythbase/loggingserver.cpp          |   11 ++-
 mythtv/libs/libmythbase/mythcdrom-linux.cpp        |    2 +-
 mythtv/libs/libmythbase/mythcommandlineparser.cpp  |    4 +-
 mythtv/libs/libmythbase/mythdownloadmanager.cpp    |    2 +-
 mythtv/libs/libmythbase/mythmiscutil.cpp           |    8 +-
 mythtv/libs/libmythbase/mythplugin.cpp             |    2 +-
 mythtv/libs/libmythbase/mythqtcompat.h             |   10 +++
 mythtv/libs/libmythbase/mythsocket.cpp             |    5 +-
 mythtv/libs/libmythbase/mythsocket.h               |    5 +-
 mythtv/libs/libmythbase/plist.cpp                  |    2 +-
 mythtv/libs/libmythbase/remotefile.cpp             |    5 ++
 mythtv/libs/libmythbase/serverpool.cpp             |   10 ++-
 mythtv/libs/libmythbase/serverpool.h               |    8 ++-
 mythtv/libs/libmythbase/storagegroup.cpp           |    8 +-
 .../test/test_mythtimer/test_mythtimer.pro         |   10 ++-
 mythtv/libs/libmythbase/unzip.cpp                  |    8 +-
 mythtv/libs/libmythfreemheg/BaseClasses.h          |    2 +-
 mythtv/libs/libmythfreemheg/Engine.cpp             |    2 +-
 mythtv/libs/libmythfreemheg/Groups.cpp             |    2 +-
 mythtv/libs/libmythmetadata/bluraymetadata.cpp     |    2 +-
 mythtv/libs/libmythmetadata/libmythmetadata.pro    |    7 ++-
 .../libs/libmythmetadata/metadataimagedownload.cpp |    1 -
 mythtv/libs/libmythmetadata/videometadata.cpp      |   18 +++---
 .../libs/libmythprotoserver/libmythprotoserver.pro |    3 +
 .../libs/libmythprotoserver/mythsocketmanager.cpp  |    9 ++-
 mythtv/libs/libmythprotoserver/mythsocketmanager.h |    7 +-
 .../datacontracts/artworkInfo.h                    |   15 +++--
 .../datacontracts/artworkInfoList.h                |   19 +++--
 .../datacontracts/blurayInfo.h                     |   15 +++--
 .../datacontracts/captureCard.h                    |   15 +++--
 .../datacontracts/captureCardList.h                |   19 +++--
 .../datacontracts/channelInfoList.h                |   19 +++--
 .../datacontracts/connectionInfo.h                 |   23 ++++---
 .../datacontracts/databaseInfo.h                   |   15 +++--
 .../datacontracts/encoder.h                        |   19 +++--
 .../datacontracts/encoderList.h                    |   19 +++--
 .../datacontracts/frontendActionList.h             |   15 +++--
 .../datacontracts/frontendStatus.h                 |   15 +++--
 .../datacontracts/labelValue.h                     |   15 +++--
 .../libmythservicecontracts/datacontracts/lineup.h |   31 +++++---
 .../datacontracts/liveStreamInfo.h                 |   15 +++--
 .../datacontracts/liveStreamInfoList.h             |   19 +++--
 .../datacontracts/logMessage.h                     |   15 +++--
 .../datacontracts/logMessageList.h                 |   21 ++++--
 .../datacontracts/programAndChannel.h              |   42 ++++++-----
 .../datacontracts/programGuide.h                   |   19 +++--
 .../datacontracts/programList.h                    |   19 +++--
 .../datacontracts/recRule.h                        |   15 +++--
 .../datacontracts/recRuleList.h                    |   19 +++--
 .../datacontracts/recording.h                      |   15 +++--
 .../datacontracts/settingList.h                    |   15 +++--
 .../datacontracts/storageGroupDir.h                |   15 +++--
 .../datacontracts/storageGroupDirList.h            |   19 +++--
 .../datacontracts/timeZoneInfo.h                   |   15 +++--
 .../datacontracts/versionInfo.h                    |   14 +++--
 .../datacontracts/videoLookupInfo.h                |   31 +++++---
 .../datacontracts/videoLookupInfoList.h            |   19 +++--
 .../datacontracts/videoMetadataInfo.h              |   21 ++++--
 .../datacontracts/videoMetadataInfoList.h          |   19 +++--
 .../datacontracts/videoMultiplex.h                 |   15 +++--
 .../datacontracts/videoMultiplexList.h             |   19 +++--
 .../datacontracts/videoSource.h                    |   15 +++--
 .../datacontracts/videoSourceList.h                |   19 +++--
 .../datacontracts/wolInfo.h                        |   14 +++--
 .../libmythservicecontracts.pro                    |    2 +
 mythtv/libs/libmythservicecontracts/service.cpp    |    4 +-
 mythtv/libs/libmythservicecontracts/service.h      |   15 +++--
 .../libs/libmythtv/AirPlay/mythairplayserver.cpp   |   18 +++---
 .../libs/libmythtv/AirPlay/mythraopconnection.cpp  |    6 +-
 mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp   |    2 +-
 mythtv/libs/libmythtv/Bluray/bdringbuffer.cpp      |    2 +-
 mythtv/libs/libmythtv/HLS/httplivestream.cpp       |   12 ++--
 mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp |    8 +-
 mythtv/libs/libmythtv/avformatdecoder.cpp          |    4 +-
 mythtv/libs/libmythtv/avformatwriter.cpp           |   10 ++--
 mythtv/libs/libmythtv/cardutil.cpp                 |   14 ++--
 mythtv/libs/libmythtv/cc608decoder.cpp             |    2 +-
 mythtv/libs/libmythtv/cc708window.cpp              |    8 +-
 .../libs/libmythtv/channelscan/channelimporter.cpp |   76 ++++++++++----------
 .../libmythtv/channelscan/channelscanner_cli.cpp   |   10 ++--
 .../libmythtv/channelscan/iptvchannelfetcher.cpp   |   12 +++-
 mythtv/libs/libmythtv/channelutil.cpp              |   16 ++--
 mythtv/libs/libmythtv/datadirect.cpp               |   14 ++--
 mythtv/libs/libmythtv/dtvconfparser.cpp            |    2 +-
 mythtv/libs/libmythtv/fifowriter.cpp               |    4 +-
 mythtv/libs/libmythtv/filtermanager.cpp            |    4 +-
 mythtv/libs/libmythtv/libmythtv.pro                |   14 +++--
 mythtv/libs/libmythtv/mhi.cpp                      |    8 +-
 mythtv/libs/libmythtv/mpeg/dvbdescriptors.h        |    6 +-
 mythtv/libs/libmythtv/netstream.cpp                |    2 +-
 mythtv/libs/libmythtv/previewgenerator.cpp         |    2 +-
 .../libmythtv/recorders/NuppelVideoRecorder.cpp    |    8 +-
 mythtv/libs/libmythtv/recorders/audioinput.cpp     |    2 +-
 mythtv/libs/libmythtv/recorders/audioinputalsa.cpp |    2 +-
 mythtv/libs/libmythtv/recorders/audioinputoss.cpp  |    2 +-
 mythtv/libs/libmythtv/recorders/cetonrtsp.cpp      |    2 +-
 .../libmythtv/recorders/cetonstreamhandler.cpp     |   10 +++-
 mythtv/libs/libmythtv/recorders/dvbcam.cpp         |    4 +-
 mythtv/libs/libmythtv/recorders/dvbchannel.cpp     |    2 +-
 .../libs/libmythtv/recorders/dvbstreamhandler.cpp  |    8 +-
 .../libs/libmythtv/recorders/iptvstreamhandler.cpp |    2 +-
 mythtv/libs/libmythtv/recorders/mpegrecorder.cpp   |   10 ++--
 mythtv/libs/libmythtv/recorders/v4lchannel.cpp     |    2 +-
 mythtv/libs/libmythtv/recorders/v4lrecorder.cpp    |    2 +-
 mythtv/libs/libmythtv/streamingringbuffer.cpp      |    2 +-
 mythtv/libs/libmythtv/util-xv.cpp                  |    2 +-
 mythtv/libs/libmythtv/videoout_xv.cpp              |    6 +-
 mythtv/libs/libmythtv/videooutwindow.cpp           |    7 ++-
 mythtv/libs/libmythtv/videosource.cpp              |    8 +-
 mythtv/libs/libmythui/libmythui.pro                |   16 ++++-
 mythtv/libs/libmythui/mythdisplay.h                |    3 +-
 mythtv/libs/libmythui/mythimage.h                  |    2 +-
 mythtv/libs/libmythui/mythmainwindow.cpp           |    2 +-
 mythtv/libs/libmythui/mythrender_opengl1.cpp       |    2 +-
 mythtv/libs/libmythui/mythrender_opengl2.cpp       |    2 +-
 mythtv/libs/libmythui/mythuifilebrowser.cpp        |    2 +-
 mythtv/libs/libmythui/mythuihelper.cpp             |    6 +-
 mythtv/libs/libmythui/mythuitype.cpp               |    3 +-
 mythtv/libs/libmythui/mythuiwebbrowser.h           |   27 ++++++-
 mythtv/libs/libmythui/mythxdisplay.cpp             |    2 +-
 mythtv/libs/libmythupnp/httpserver.cpp             |    4 +-
 mythtv/libs/libmythupnp/httpserver.h               |    8 ++-
 mythtv/libs/libmythupnp/mmulticastsocketdevice.cpp |    2 +-
 mythtv/libs/libmythupnp/mythxmlclient.h            |    2 -
 mythtv/libs/libmythupnp/serializers/serializer.h   |   11 ++-
 .../libs/libmythupnp/serializers/xmlSerializer.cpp |    2 +-
 mythtv/libs/libmythupnp/servicehost.cpp            |    2 +-
 mythtv/libs/libmythupnp/soapclient.cpp             |   13 +++-
 mythtv/libs/libmythupnp/soapclient.h               |    1 -
 mythtv/programs/mythavtest/mythavtest.pro          |    3 +
 mythtv/programs/mythbackend/internetContent.cpp    |    9 ++-
 mythtv/programs/mythbackend/main_helpers.cpp       |    2 +-
 mythtv/programs/mythbackend/mainserver.cpp         |    6 +-
 mythtv/programs/mythbackend/mythbackend.pro        |    3 +
 mythtv/programs/mythbackend/services/content.cpp   |    4 +-
 .../programs/mythccextractor/mythccextractor.pro   |    3 +
 .../programs/mythcommflag/ClassicCommDetector.cpp  |   15 +++--
 .../programs/mythcommflag/ClassicLogoDetector.cpp  |    2 +-
 .../programs/mythcommflag/PrePostRollFlagger.cpp   |    4 +-
 mythtv/programs/mythcommflag/TemplateFinder.cpp    |    4 +-
 mythtv/programs/mythcommflag/main.cpp              |    6 +-
 mythtv/programs/mythcommflag/mythcommflag.pro      |    4 +
 .../programs/mythfilldatabase/mythfilldatabase.pro |    3 +
 mythtv/programs/mythfrontend/mythcontrols.cpp      |    2 +-
 mythtv/programs/mythfrontend/mythfrontend.pro      |   11 +++-
 mythtv/programs/mythfrontend/playbackbox.cpp       |   17 ++---
 mythtv/programs/mythfrontend/videofilter.cpp       |    2 +-
 mythtv/programs/mythjobqueue/main.cpp              |    2 +-
 mythtv/programs/mythjobqueue/mythjobqueue.pro      |    4 +
 mythtv/programs/mythlcdserver/mythlcdserver.pro    |   10 ++-
 mythtv/programs/mythlogserver/mythlogserver.pro    |    3 +
 mythtv/programs/mythmediaserver/main.cpp           |    2 +-
 .../programs/mythmediaserver/mythmediaserver.pro   |    3 +
 mythtv/programs/mythpreviewgen/mythpreviewgen.pro  |    3 +
 .../programs/mythscreenwizard/mythscreenwizard.pro |    3 +
 mythtv/programs/mythtranscode/mythtranscode.pro    |    3 +
 mythtv/programs/mythtv-setup/importicons.cpp       |   17 ++++-
 mythtv/programs/mythtv-setup/main.cpp              |    8 +-
 mythtv/programs/mythtv-setup/mythtv-setup.pro      |    3 +
 mythtv/programs/mythutil/mythutil.pro              |    3 +
 mythtv/programs/mythwelcome/mythwelcome.pro        |    3 +
 197 files changed, 1110 insertions(+), 683 deletions(-)
 create mode 100644 mythtv/libs/libmythbase/mythqtcompat.h

-- 



More information about the mythtv-commits mailing list