Return a reference to the object, changed from pointer.

Since we use addAutoReleasedObject we would rather unclean call the
class destructor.
This commit is contained in:
kh1
2010-02-23 16:22:25 +01:00
parent 399ad59faa
commit 69ebf668ba
7 changed files with 19 additions and 22 deletions

View File

@@ -65,7 +65,7 @@ MaemoManager::MaemoManager()
, m_settingsPage(new MaemoSettingsPage(this))
, m_qemuCommand(0)
{
m_instance = this;
icon.addFile(":/qt-maemo/images/qemu-run.png", iconSize);
icon.addFile(":/qt-maemo/images/qemu-stop.png", iconSize, QIcon::Normal,
QIcon::On);
@@ -83,14 +83,14 @@ MaemoManager::~MaemoManager()
ExtensionSystem::PluginManager::instance()->removeObject(m_settingsPage);
}
MaemoManager *MaemoManager::instance()
MaemoManager &MaemoManager::instance()
{
if (!m_instance) {
QMutexLocker _(&m_mutex);
if (!m_instance)
m_instance = new MaemoManager;
new MaemoManager;
}
return m_instance;
return *m_instance;
}
bool