classview: adjust to d-pointer style rules

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>

1 files changed, 30 insertions, 28 deletions

diff --git a/src/plugins/classview/classviewnavigationwidget.cpp b/src/plugins/classview/classviewnavigationwidget.cpp
index 094f4de1954..a88fccdb64c 100644
--- a/src/plugins/classview/classviewnavigationwidget.cpp
+++ b/src/plugins/classview/classviewnavigationwidget.cpp
@@ -56,8 +56,9 @@ namespace Internal {
    \brief Internal data structures / methods for NavigationWidget
  */
 
-struct NavigationWidgetPrivate
+class NavigationWidgetPrivate
 {
+public:
     NavigationWidgetPrivate() : ui(0) {}
 
     //! Ui generated by Designer
@@ -75,18 +76,18 @@ struct NavigationWidgetPrivate
 
 NavigationWidget::NavigationWidget(QWidget *parent) :
     QWidget(parent),
-    d_ptr(new NavigationWidgetPrivate())
+    d(new NavigationWidgetPrivate())
 {
-    d_ptr->ui = new Ui::NavigationWidget;
-    d_ptr->ui->setupUi(this);
+    d->ui = new Ui::NavigationWidget;
+    d->ui->setupUi(this);
 
     // tree model
-    d_ptr->treeModel = new TreeItemModel(this);
-    d_ptr->ui->treeView->setModel(d_ptr->treeModel);
+    d->treeModel = new TreeItemModel(this);
+    d->ui->treeView->setModel(d->treeModel);
 
     // connect signal/slots
     // selected item
-    connect(d_ptr->ui->treeView, SIGNAL(activated(QModelIndex)), SLOT(onItemActivated(QModelIndex)));
+    connect(d->ui->treeView, SIGNAL(activated(QModelIndex)), SLOT(onItemActivated(QModelIndex)));
 
     // connections to the manager
     Manager *manager = Manager::instance();
@@ -109,8 +110,9 @@ NavigationWidget::NavigationWidget(QWidget *parent) :
 
 NavigationWidget::~NavigationWidget()
 {
-    delete d_ptr->fullProjectsModeButton;
-    delete d_ptr->ui;
+    delete d->fullProjectsModeButton;
+    delete d->ui;
+    delete d;
 }
 
 void NavigationWidget::hideEvent(QHideEvent *event)
@@ -134,41 +136,41 @@ QList<QToolButton *> NavigationWidget::createToolButtons()
     QList<QToolButton *> list;
 
     // full projects mode
-    if (!d_ptr->fullProjectsModeButton) {
+    if (!d->fullProjectsModeButton) {
         // create a button
-        d_ptr->fullProjectsModeButton = new QToolButton();
-        d_ptr->fullProjectsModeButton->setIcon(
+        d->fullProjectsModeButton = new QToolButton();
+        d->fullProjectsModeButton->setIcon(
                 QIcon(QLatin1String(":/classview/images/hierarchicalmode.png")));
-        d_ptr->fullProjectsModeButton->setCheckable(true);
-        d_ptr->fullProjectsModeButton->setToolTip(tr("Show Subprojects"));
+        d->fullProjectsModeButton->setCheckable(true);
+        d->fullProjectsModeButton->setToolTip(tr("Show Subprojects"));
 
         // by default - not a flat mode
         setFlatMode(false);
 
         // connections
-        connect(d_ptr->fullProjectsModeButton, SIGNAL(toggled(bool)),
+        connect(d->fullProjectsModeButton, SIGNAL(toggled(bool)),
                 this, SLOT(onFullProjectsModeToggled(bool)));
     }
 
-    list << d_ptr->fullProjectsModeButton;
+    list << d->fullProjectsModeButton;
 
     return list;
 }
 
 bool NavigationWidget::flatMode() const
 {
-    QTC_ASSERT(d_ptr->fullProjectsModeButton, return false);
+    QTC_ASSERT(d->fullProjectsModeButton, return false);
 
     // button is 'full projects mode' - so it has to be inverted
-    return !d_ptr->fullProjectsModeButton->isChecked();
+    return !d->fullProjectsModeButton->isChecked();
 }
 
 void NavigationWidget::setFlatMode(bool flatMode)
 {
-    QTC_ASSERT(d_ptr->fullProjectsModeButton, return);
+    QTC_ASSERT(d->fullProjectsModeButton, return);
 
     // button is 'full projects mode' - so it has to be inverted
-    d_ptr->fullProjectsModeButton->setChecked(!flatMode);
+    d->fullProjectsModeButton->setChecked(!flatMode);
 }
 
 void NavigationWidget::onFullProjectsModeToggled(bool state)
@@ -182,7 +184,7 @@ void NavigationWidget::onItemActivated(const QModelIndex &index)
     if (!index.isValid())
         return;
 
-    QList<QVariant> list = d_ptr->treeModel->data(index, Constants::SymbolLocationsRole).toList();
+    QList<QVariant> list = d->treeModel->data(index, Constants::SymbolLocationsRole).toList();
 
     emit requestGotoLocations(list);
 }
@@ -194,7 +196,7 @@ void NavigationWidget::onDataUpdate(QSharedPointer<QStandardItem> result)
 
     // if this is 1st call
     bool expandRootItems = false;
-    if (d_ptr->treeModel->invisibleRootItem()->rowCount() == 0)
+    if (d->treeModel->invisibleRootItem()->rowCount() == 0)
         expandRootItems = true;
 
     QTime timer;
@@ -204,15 +206,15 @@ void NavigationWidget::onDataUpdate(QSharedPointer<QStandardItem> result)
     // might be just a root - if a lazy data population is enabled.
     // so expanded items must be parsed and 'fetched'
 
-    fetchExpandedItems(result.data(), d_ptr->treeModel->invisibleRootItem());
+    fetchExpandedItems(result.data(), d->treeModel->invisibleRootItem());
 
-    d_ptr->treeModel->moveRootToTarget(result.data());
+    d->treeModel->moveRootToTarget(result.data());
 
     // expand top level projects
     QModelIndex sessionIndex;
 
-    for (int i = 0; i < d_ptr->treeModel->rowCount(sessionIndex); ++i)
-        d_ptr->ui->treeView->expand(d_ptr->treeModel->index(i, 0, sessionIndex));
+    for (int i = 0; i < d->treeModel->rowCount(sessionIndex); ++i)
+        d->ui->treeView->expand(d->treeModel->index(i, 0, sessionIndex));
 
     if (debug)
         qDebug() << "Class View:" << QDateTime::currentDateTime().toString()
@@ -224,8 +226,8 @@ void NavigationWidget::fetchExpandedItems(QStandardItem *item, const QStandardIt
     if (!item || !target)
         return;
 
-    const QModelIndex &parent = d_ptr->treeModel->indexFromItem(target);
-    if (d_ptr->ui->treeView->isExpanded(parent))
+    const QModelIndex &parent = d->treeModel->indexFromItem(target);
+    if (d->ui->treeView->isExpanded(parent))
         Manager::instance()->fetchMore(item, true);
 
     int itemIndex = 0;