myQtHelper->getDataPath() removed

This commit is contained in:
doitux
2007-09-08 22:01:30 +00:00
parent d3be07bb17
commit 26390ac1a7
12 changed files with 66 additions and 35 deletions
@@ -19,16 +19,19 @@
***************************************************************************/
#include "startsplash.h"
StartSplash::StartSplash(mainWindowImpl *parent)
: QSplashScreen(parent), myW(parent)
#include "configfile.h"
#include "mainwindowimpl.h"
StartSplash::StartSplash(mainWindowImpl *parent, ConfigFile *c)
: QSplashScreen(parent), myW(parent), myConfig(c)
{
myQtHelper = new QtHelper;
myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str());
QFontDatabase::addApplicationFont (myQtHelper->getDataPath() +"fonts/c059013l.pfb");
QFontDatabase::addApplicationFont (myQtHelper->getDataPath() +"fonts/andybold.ttf");
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/c059013l.pfb");
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/andybold.ttf");
logo = myQtHelper->getDataPath()+"gfx/gui/misc/logoChip3D.png";
logo = myAppDataPath+"gfx/gui/misc/logoChip3D.png";
frameNo = 52;
@@ -12,17 +12,16 @@
#ifndef STARTSPLASH_H
#define STARTSPLASH_H
#include "mainwindowimpl.h"
#include "qthelper.h"
#include <QtGui>
#include <QtCore>
class mainWindowImpl;
class ConfigFile;
class StartSplash : public QSplashScreen
{
Q_OBJECT
public:
StartSplash(mainWindowImpl *);
StartSplash(mainWindowImpl *, ConfigFile*);
~StartSplash();
@@ -39,8 +38,9 @@ public slots:
private:
mainWindowImpl *myW;
QtHelper *myQtHelper;
QPixmap logo;
QString myAppDataPath;
QPixmap logo;
ConfigFile *myConfig;
};