← Back to branch summary

~ubuntu-branches/debian/sid/stellarium/sid

« back to all changes in this revision

Viewing changes to src/core/StelSkyCultureMgr.cpp

  • Committer: Package Import Robot
  • Author(s): Tomasz Buchert
  • Date: 2013-08-04 15:06:55 UTC
  • mfrom: (1.2.12)
  • Revision ID: package-import@ubuntu.com-20130804150655-iji0vb5navh3lk13
Tags: 0.12.2-1
* Imported Upstream version 0.12.2
* Added dependency to phonon (to enable video/sound)
* Fixed VCS links
* Removed unused lintian tag (embedded-library glee)
* Dropped obsolete patch
* Update copyright

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/StelSkyCultureMgr.cpp
30
30
#include <QDebug>
31
31
#include <QMap>
32
32
#include <QMapIterator>
 
33
#include <QDir>
33
34
 
34
35
StelSkyCultureMgr::StelSkyCultureMgr()
35
36
{
54
55
                }
55
56
                catch (std::runtime_error& e)
56
57
                {
57
 
                        qWarning() << "WARNING: unable to successfully read info.ini file from skyculture dir" << dir;
 
58
                        qWarning() << "WARNING: unable to successfully read info.ini file from skyculture dir" << QDir::toNativeSeparators(dir);
58
59
                }
59
60
        }       
60
61
}
78
79
        // make sure culture definition exists before attempting or will die
79
80
        if (directoryToSkyCultureEnglish(cultureDir) == "")
80
81
        {
81
 
                qWarning() << "Invalid sky culture directory: " << cultureDir;
 
82
                qWarning() << "Invalid sky culture directory: " << QDir::toNativeSeparators(cultureDir);
82
83
                return false;
83
84
        }
84
85
        currentSkyCultureDir = cultureDir;
149
150
        if (culture=="")
150
151
        {
151
152
                qWarning() << "WARNING: StelSkyCultureMgr::directoryToSkyCultureI18(\""
152
 
                           << directory << "\"): could not find directory";
 
153
                           << QDir::toNativeSeparators(directory) << "\"): could not find directory";
153
154
                return "";
154
155
        }
155
156
        return q_(culture);