← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libs/libmythui/xmlparsebase.cpp

  • 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/xmlparsebase.cpp
 
1
 
 
2
// Own header
 
3
#include "xmlparsebase.h"
 
4
 
 
5
// C++/C headers
1
6
#include <typeinfo>
2
7
 
 
8
// QT headers
3
9
#include <QFile>
4
10
#include <QDomDocument>
5
11
 
6
 
#include "xmlparsebase.h"
 
12
// libmyth headers
 
13
#include "mythverbose.h"
 
14
 
 
15
// Mythui headers
7
16
#include "mythmainwindow.h"
8
17
#include "mythuihelper.h"
9
18
 
10
 
#include "mythverbose.h"
11
 
 
12
19
/* ui type includes */
13
20
#include "mythscreentype.h"
14
21
#include "mythuiimage.h"
118
125
{
119
126
    int alignment = 0;
120
127
 
121
 
    QStringList values = text.split(",");
 
128
    QStringList values = text.split(',');
122
129
 
123
130
    QStringList::Iterator it;
124
131
    for ( it = values.begin(); it != values.end(); ++it )
533
540
    for (i = searchpath.begin(); i != searchpath.end(); ++i)
534
541
    {
535
542
        QString themefile = *i + "base.xml";
536
 
        if (doLoad(QString::null, GetGlobalObjectStore(), themefile, false))
 
543
        if (doLoad(QString(), GetGlobalObjectStore(), themefile, false))
537
544
        {
538
545
            VERBOSE(VB_GENERAL, "Loading base theme from " + themefile);
539
546
        }