brian/promoe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Singletonify Skin class

Browse source
This commit is contained in:
Daniel Svensson 2006-02-27 18:00:00 +01:00
parent 4e46089c01
commit fa4fc01a31
16 changed files with 103 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

23
MainWindow.cpp
View file

@ -8,17 +8,6 @@ MainWindow::MainWindow (QWidget *parent) : QMainWindow (parent)
setWindowFlags(Qt::FramelessWindowHint);
setGeometry(100, 100, 275, 116);
/*
* Initialize the Handler that will
* update the display and the buttons
*/
m_handler = XMMSHandler::getInstance();
/*
* Initialize skin, but don't open one
*/
skin = new Skin ();
/*
* The MainDisplay is the mainwindow non-shaded mode
*/
@ -43,7 +32,8 @@ MainWindow::MainWindow (QWidget *parent) : QMainWindow (parent)
MainWindow::~MainWindow ()
{
delete skin;
delete Skin::getInstance ();
delete XMMSHandler::getInstance();
}
void
@ -65,11 +55,6 @@ MainWindow::switchDisplay ()
}
Skin *
MainWindow::getSkin(void)
{
return skin;
}
void
MainWindow::togglePL (void)
@ -91,7 +76,7 @@ main (int argc, char **argv)
MainWindow *mw = new MainWindow (NULL);
PlaylistWindow *playlistwin = new PlaylistWindow (NULL, mw->getSkin ());
PlaylistWindow *playlistwin = new PlaylistWindow (NULL);
/*
* Now that everything is initialized
@ -103,7 +88,7 @@ main (int argc, char **argv)
settings.setValue ("skin/path", "./CleanAMP/");
}
mw->getSkin ()->setSkin (settings.value("skin/path").toString ());
Skin::getInstance()->setSkin (settings.value("skin/path").toString ());
mw->show ();
mw->setPL (playlistwin);