Skip to content

Commit 7f4364e

Browse files
committed
Move utility classes and http pool into libmythbase. Full distclean required.
1 parent f32d76d commit 7f4364e

File tree

10 files changed

+12
-13
lines changed

10 files changed

+12
-13
lines changed

mythtv/libs/libmyth/libmyth.pro

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,18 @@ HEADERS += audio/audiosettings.h audio/audiooutputsettings.h audio/pink.h
1818
HEADERS += backendselect.h dbsettings.h dialogbox.h
1919
HEADERS += generictree.h langsettings.h
2020
HEADERS += managedlist.h mythconfigdialogs.h mythconfiggroups.h
21-
HEADERS += mythcontext.h mythdeque.h mythdialogs.h
21+
HEADERS += mythcontext.h mythdialogs.h
2222
HEADERS += mythevent.h mythexp.h mythmediamonitor.h
2323
HEADERS += mythplugin.h mythpluginapi.h
2424
HEADERS += mythwidgets.h mythwizard.h schemawizard.h
2525
HEADERS += output.h
2626
HEADERS += settings.h
2727
HEADERS += uilistbtntype.h uitypes.h mythuifilebrowser.h
2828
HEADERS += volumebase.h visual.h xmlparse.h
29-
HEADERS += storagegroupeditor.h dbutil.h
29+
HEADERS += storagegroupeditor.h
3030
HEADERS += mythcommandlineparser.h mythterminal.h
31-
HEADERS += mythhttppool.h mythhttphandler.h
3231
HEADERS += remoteutil.h
33-
HEADERS += rawsettingseditor.h autodeletedeque.h
32+
HEADERS += rawsettingseditor.h
3433
HEADERS += programinfo.h programinfoupdater.h
3534
HEADERS += programtypes.h recordingtypes.h
3635
HEADERS += mythrssmanager.h netgrabbermanager.h
@@ -56,9 +55,8 @@ SOURCES += mythwidgets.cpp mythwizard.cpp schemawizard.cpp
5655
SOURCES += output.cpp
5756
SOURCES += settings.cpp
5857
SOURCES += uilistbtntype.cpp uitypes.cpp util.cpp mythuifilebrowser.cpp
59-
SOURCES += storagegroupeditor.cpp dbutil.cpp
58+
SOURCES += storagegroupeditor.cpp
6059
SOURCES += mythcommandlineparser.cpp mythterminal.cpp
61-
SOURCES += mythhttppool.cpp mythhttphandler.cpp
6260
SOURCES += remoteutil.cpp
6361
SOURCES += rawsettingseditor.cpp
6462
SOURCES += programinfo.cpp programinfoupdater.cpp
@@ -105,15 +103,14 @@ inc.files += mythwidgets.h remotefile.h oldsettings.h volumecontrol.h
105103
inc.files += settings.h uitypes.h xmlparse.h mythplugin.h mythdialogs.h
106104
inc.files += audio/audiooutput.h audio/audiosettings.h
107105
inc.files += audio/audiooutputsettings.h
108-
inc.files += dbutil.h
109106
inc.files += inetcomms.h mythwizard.h schemawizard.h
110107
inc.files += uilistbtntype.h generictree.h managedlist.h mythmediamonitor.h
111108
inc.files += visual.h volumebase.h output.h langsettings.h
112109
inc.files += mythexp.h mythpluginapi.h storagegroupeditor.h
113110
inc.files += mythconfigdialogs.h mythconfiggroups.h
114-
inc.files += mythterminal.h mythdeque.h mythuifilebrowser.h
115-
inc.files += mythhttppool.h remoteutil.h
116-
inc.files += programinfo.h autodeletedeque.h
111+
inc.files += mythterminal.h mythuifilebrowser.h
112+
inc.files += remoteutil.h
113+
inc.files += programinfo.h
117114
inc.files += programtypes.h recordingtypes.h
118115
inc.files += mythrssmanager.h netgrabbermanager.h
119116
inc.files += rssparse.h netutils.h
File renamed without changes.
File renamed without changes.
File renamed without changes.

mythtv/libs/libmythbase/libmythbase.pro

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ HEADERS += lcddevice.h mythstorage.h remotefile.h decodeencode.h
1919
HEADERS += mythcorecontext.h mythsystem.h mythlocale.h storagegroup.h
2020
HEADERS += mythcoreutil.h mythdownloadmanager.h mythtranslation.h
2121
HEADERS += unzip.h unzip_p.h zipentry_p.h iso639.h iso3166.h mythmedia.h
22-
HEADERS += util.h mythhdd.h mythcdrom.h
22+
HEADERS += util.h mythhdd.h mythcdrom.h autodeletedeque.h dbutil.h
23+
HEADERS += mythhttppool.h mythhttphandler.h mythdeque.h
2324

2425
SOURCES += mythsocket.cpp mythsocketthread.cpp msocketdevice.cpp
2526
SOURCES += mythdbcon.cpp mythdb.cpp oldsettings.cpp mythverbose.cpp
@@ -29,7 +30,8 @@ SOURCES += lcddevice.cpp mythstorage.cpp remotefile.cpp decodeencode.cpp
2930
SOURCES += mythcorecontext.cpp mythsystem.cpp mythlocale.cpp storagegroup.cpp
3031
SOURCES += mythcoreutil.cpp mythdownloadmanager.cpp mythtranslation.cpp
3132
SOURCES += unzip.cpp iso639.cpp iso3166.cpp mythmedia.cpp util.cpp
32-
SOURCES += mythhdd.cpp mythcdrom.cpp
33+
SOURCES += mythhdd.cpp mythcdrom.cpp dbutil.cpp
34+
SOURCES += mythhttppool.cpp mythhttphandler.cpp
3335

3436
win32:SOURCES += msocketdevice_win.cpp
3537
unix {
@@ -53,7 +55,7 @@ inc.files += mythsocket.h mythsocket_cb.h msocketdevice.h
5355
inc.files += mythcorecontext.h mythsystem.h storagegroup.h
5456
inc.files += mythcoreutil.h mythlocale.h mythdownloadmanager.h
5557
inc.files += mythtranslation.h iso639.h iso3166.h mythmedia.h util.h
56-
inc.files += mythcdrom.h
58+
inc.files += mythcdrom.h autodeletedeque.h dbutil.h mythhttppool.h mythdeque.h
5759

5860
# Allow both #include <blah.h> and #include <libmyth/blah.h>
5961
inc2.path = $${PREFIX}/include/mythtv/libmyth
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)