feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

helpmanager: cleanup

Browse Source 
Change-Id: I7bd885e9e64f8be99a040b14151cd8fba5249235
Reviewed-on: http://codereview.qt.nokia.com/4202
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-09-02 19:05:12 +02:00
committed by hjk
parent 9fd44abcf1
commit 61a887a755
4 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/plugins/coreplugin/helpmanager.cpp
View File

@@ -50,11 +50,11 @@
namespace Core {
struct HelpManagerPrivate {
struct HelpManagerPrivate
{
HelpManagerPrivate() :
m_needsSetup(true), m_helpEngine(0), m_collectionWatcher(0) {}
static HelpManager *m_instance;
m_needsSetup(true), m_helpEngine(0), m_collectionWatcher(0)
{}
bool m_needsSetup;
QHelpEngineCore *m_helpEngine;
@@ -65,7 +65,7 @@ struct HelpManagerPrivate {
QHash<QString, QVariant> m_customValues;
};
HelpManager *HelpManagerPrivate::m_instance = 0;
static HelpManager *m_instance = 0;
static const char linksForKeyQuery[] = "SELECT d.Title, f.Name, e.Name, "
"d.Name, a.Anchor FROM IndexTable a, FileNameTable d, FolderTable e, "
@@ -74,12 +74,10 @@ static const char linksForKeyQuery[] = "SELECT d.Title, f.Name, e.Name, "
// -- DbCleaner
struct DbCleaner {
DbCleaner(const QString &dbName)
: name(dbName) {}
~DbCleaner() {
QSqlDatabase::removeDatabase(name);
}
struct DbCleaner
{
DbCleaner(const QString &dbName) : name(dbName) {}
~DbCleaner() { QSqlDatabase::removeDatabase(name); }
QString name;
};
@@ -88,25 +86,23 @@ struct DbCleaner {
HelpManager::HelpManager(QObject *parent) :
QObject(parent), d(new HelpManagerPrivate)
{
Q_ASSERT(!HelpManagerPrivate::m_instance);
HelpManagerPrivate::m_instance = this;
connect(Core::ICore::instance(), SIGNAL(coreOpened()), this,
SLOT(setupHelpManager()));
Q_ASSERT(!m_instance);
m_instance = this;
connect(Core::ICore::instance(), SIGNAL(coreOpened()), SLOT(setupHelpManager()));
}
HelpManager::~HelpManager()
{
delete d->m_helpEngine;
d->m_helpEngine = 0;
HelpManagerPrivate::m_instance = 0;
m_instance = 0;
delete d;
}
HelpManager* HelpManager::instance()
HelpManager *HelpManager::instance()
{
Q_ASSERT(HelpManagerPrivate::m_instance);
return HelpManagerPrivate::m_instance;
Q_ASSERT(m_instance);
return m_instance;
}
QString HelpManager::collectionFilePath()