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

classview: adjust to d-pointer style rules

Browse Source 
Change-Id: Ie413a7336ef4bde5dcf1b43b6832167742608a83
Reviewed-on: http://codereview.qt.nokia.com/1296
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-07-06 17:40:54 +02:00
committed by hjk
parent 2bdc5c79c6
commit 51d83e4ce6
15 changed files with 250 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/plugins/classview/classviewnavigationwidgetfactory.cpp
View File

@@ -44,45 +44,23 @@
namespace ClassView {
namespace Internal {
///////////////////////////////// NavigationWidget //////////////////////////////////
/*!
\struct NavigationWidgetFactoryPrivate
\brief Private class data for \a NavigationWidgetFactory
\sa NavigationWidgetFactory
*/
struct NavigationWidgetFactoryPrivate
{
//! constructor
NavigationWidgetFactoryPrivate() : naviPaneEnabled(false) {}
//! NavigationWidgetFactory instance
static NavigationWidgetFactory *instance;
//! Navigation pane visibility
bool naviPaneEnabled;
};
// static variable initialization
NavigationWidgetFactory *NavigationWidgetFactoryPrivate::instance = 0;
static NavigationWidgetFactory *factoryInstance;
///////////////////////////////// NavigationWidgetFactory //////////////////////////////////
NavigationWidgetFactory::NavigationWidgetFactory()
: d_ptr(new NavigationWidgetFactoryPrivate())
{
factoryInstance = this;
}
NavigationWidgetFactory::~NavigationWidgetFactory()
{
NavigationWidgetFactoryPrivate::instance = 0;
factoryInstance = 0;
}
NavigationWidgetFactory *NavigationWidgetFactory::instance()
{
if (!NavigationWidgetFactoryPrivate::instance)
NavigationWidgetFactoryPrivate::instance = new NavigationWidgetFactory();
return NavigationWidgetFactoryPrivate::instance;
return factoryInstance;
}
QString NavigationWidgetFactory::displayName() const
@@ -92,12 +70,12 @@ QString NavigationWidgetFactory::displayName() const
int NavigationWidgetFactory::priority() const
{
return Constants::CLASSVIEWNAVIGATION_PRIORITY;
return 500;
}
QString NavigationWidgetFactory::id() const
{
return QLatin1String(Constants::CLASSVIEWNAVIGATION_ID);
return QLatin1String("Class View");
}
QKeySequence NavigationWidgetFactory::activationSequence() const
@@ -115,15 +93,19 @@ Core::NavigationView NavigationWidgetFactory::createWidget()
return navigationView;
}
QString NavigationWidgetFactory::settingsPrefix(int position) const
/*!
\brief Get a settings prefix for the specified position
\param position Position
\return Settings prefix
*/
static QString settingsPrefix(int position)
{
QChar sep('/');
QString group = QLatin1String(Constants::CLASSVIEW_SETTINGS_GROUP) + sep;
group += QLatin1String(Constants::CLASSVIEW_SETTINGS_TREEWIDGET_PREFIX)
+ QString::number(position) + sep;
return group;
return QString::fromLatin1("ClassView/Treewidget.%1/FlatMode").arg(position);
}
//! Flat mode settings
void NavigationWidgetFactory::saveSettings(int position, QWidget *widget)
{
NavigationWidget *pw = qobject_cast<NavigationWidget *>(widget);
@@ -136,7 +118,7 @@ void NavigationWidgetFactory::saveSettings(int position, QWidget *widget)
QString group = settingsPrefix(position);
// save settings
settings->setValue(group + Constants::CLASSVIEW_SETTINGS_FLATMODE, pw->flatMode());
settings->setValue(group, pw->flatMode());
}
void NavigationWidgetFactory::restoreSettings(int position, QWidget *widget)
@@ -151,7 +133,7 @@ void NavigationWidgetFactory::restoreSettings(int position, QWidget *widget)
QString group = settingsPrefix(position);
// load settings
pw->setFlatMode(settings->value(group + Constants::CLASSVIEW_SETTINGS_FLATMODE, false).toBool());
pw->setFlatMode(settings->value(group, false).toBool());
}
} // namespace Internal