← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mythtv/lucid

« back to all changes in this revision

Viewing changes to libs/libmythui/mythuiwebbrowser.h

  • Committer: Bazaar Package Importer
  • Author(s): Mario Limonciello, Mario Limonciello, John Baab
  • Date: 2009-09-29 01:33:23 UTC
  • mfrom: (1.1.35 upstream)
  • Revision ID: james.westby@ubuntu.com-20090929013323-6pvn8encm757zbxw
Tags: 0.22.0~trunk22101-0ubuntu1
[ Mario Limonciello ]
* New upstream checkout (r22101)
* Try to guard and make sure that ~mythtv is read from /etc/passwd 
  rather than assuming it's /home/mythtv.

[ John Baab ]
* debian/mythtv-common.postinst:
  - Added symlink for /home/mythtv/.mythtv/config.xml

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/libmythui/mythuiwebbrowser.h
8
8
#include <QColor>
9
9
#include <QIcon>
10
10
 
11
 
 
12
 
#ifdef USING_QTWEBKIT
13
11
#include <QWebView>
14
12
#include <QWebPage>
15
13
#include <QNetworkReply>
16
 
#endif
17
14
 
18
15
#include "mythuitype.h"
19
16
 
20
17
 
21
18
class MythUIWebBrowser;
22
19
 
23
 
#ifdef USING_QTWEBKIT
24
20
class MythWebView : public QWebView
25
21
{
26
22
  Q_OBJECT
35
31
  private:
36
32
    MythUIWebBrowser *m_parentBrowser;
37
33
};
38
 
#endif
39
34
 
40
35
class MPUBLIC MythUIWebBrowser : public MythUIType
41
36
{
102
97
    virtual void CopyFrom(MythUIType *base);
103
98
    virtual void CreateCopy(MythUIType *parent);
104
99
 
105
 
#ifdef USING_QTWEBKIT
106
100
    MythWebView *m_browser;
107
 
#endif
108
101
 
109
102
    MythImage   *m_image;
110
103