~ubuntu-branches/ubuntu/oneiric/smplayer/oneiric

« back to all changes in this revision

Viewing changes to src/global.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Breuil Cyril
  • Date: 2007-06-24 16:35:29 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20070624163529-hhckbmd24uicada7
Tags: 0.5.20-0ubuntu1
* New upstream release
* Change Maintainer Email

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
#include <qsettings.h>
23
23
#include "preferences.h"
24
24
#include "translator.h"
 
25
#include <qapplication.h>
25
26
 
26
27
QSettings * settings;
27
28
Preferences * pref;
28
29
Translator * translator;
29
30
 
30
 
void global_init() {
 
31
 
 
32
void global_init(const QString & ini_path) {
31
33
        qDebug("global_init");
32
34
 
33
35
        // Translator
34
36
        translator = new Translator;
35
37
 
36
38
        // settings
37
 
        #if QT_VERSION >= 0x040000
38
 
        settings = new QSettings(QSettings::IniFormat, QSettings::UserScope,
39
 
                             QString(COMPANY), QString(PROGRAM) );
40
 
        #else
 
39
#if QT_VERSION >= 0x040000
 
40
        if (!ini_path.isEmpty()) {
 
41
                settings = new QSettings( ini_path + "/smplayer.ini",
 
42
                                  QSettings::IniFormat );
 
43
        }
 
44
        else {
 
45
                settings = new QSettings(QSettings::IniFormat, QSettings::UserScope,
 
46
                                 QString(COMPANY), QString(PROGRAM) );
 
47
        }
 
48
#else
41
49
        settings = new QSettings(QSettings::Ini);
42
50
        settings->beginGroup( "/" + QString(PROGRAM) +"/" );
43
 
        #endif
 
51
#endif
44
52
 
45
53
        // Preferences
46
54
        pref = new Preferences;
51
59
 
52
60
        // delete
53
61
        delete pref;
 
62
        pref = 0;
54
63
 
55
64
        // settings
56
65
        #if QT_VERSION < 0x040000