utils, qmljstools, vcsbase: s/\bm_d\b/d/g

Change-Id: I4678e9188b8f630aa3a3221be348984cdc7699dd
Reviewed-on: http://codereview.qt-project.org/4992
Reviewed-by: hjk <qthjk@ovi.com>

6 files changed, 47 insertions, 47 deletions

diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
index ba231ff2e4..178dc934c1 100644
--- a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
@@ -79,16 +79,16 @@ class Html5AppWizardPrivate
 
 Html5AppWizard::Html5AppWizard()
     : AbstractMobileAppWizard(parameters())
-    , m_d(new Html5AppWizardPrivate)
+    , d(new Html5AppWizardPrivate)
 {
-    m_d->app = new Html5App;
-    m_d->wizardDialog = 0;
+    d->app = new Html5App;
+    d->wizardDialog = 0;
 }
 
 Html5AppWizard::~Html5AppWizard()
 {
-    delete m_d->app;
-    delete m_d;
+    delete d->app;
+    delete d;
 }
 
 Core::BaseFileWizardParameters Html5AppWizard::parameters()
@@ -111,15 +111,15 @@ Core::BaseFileWizardParameters Html5AppWizard::parameters()
 
 AbstractMobileAppWizardDialog *Html5AppWizard::createWizardDialogInternal(QWidget *parent) const
 {
-    m_d->wizardDialog = new Html5AppWizardDialog(parent);
-    m_d->wizardDialog->m_htmlOptionsPage->setTouchOptimizationEndabled(
-                m_d->app->touchOptimizedNavigationEnabled());
-    return m_d->wizardDialog;
+    d->wizardDialog = new Html5AppWizardDialog(parent);
+    d->wizardDialog->m_htmlOptionsPage->setTouchOptimizationEndabled(
+                d->app->touchOptimizedNavigationEnabled());
+    return d->wizardDialog;
 }
 
 void Html5AppWizard::projectPathChanged(const QString &path) const
 {
-    m_d->wizardDialog->targetsPage()->setProFilePath(path);
+    d->wizardDialog->targetsPage()->setProFilePath(path);
 }
 
 void Html5AppWizard::prepareGenerateFiles(const QWizard *w,
@@ -127,27 +127,27 @@ void Html5AppWizard::prepareGenerateFiles(const QWizard *w,
 {
     Q_UNUSED(errorMessage)
     const Html5AppWizardDialog *wizard = qobject_cast<const Html5AppWizardDialog*>(w);
-    m_d->app->setMainHtml(wizard->m_htmlOptionsPage->mainHtmlMode(),
+    d->app->setMainHtml(wizard->m_htmlOptionsPage->mainHtmlMode(),
                           wizard->m_htmlOptionsPage->mainHtmlData());
-    m_d->app->setTouchOptimizedNavigationEnabled(
+    d->app->setTouchOptimizedNavigationEnabled(
                 wizard->m_htmlOptionsPage->touchOptimizationEndabled());
 }
 
 QString Html5AppWizard::fileToOpenPostGeneration() const
 {
-    return m_d->app->mainHtmlMode() == Html5App::ModeUrl ?
-                m_d->app->path(AbstractMobileApp::MainCpp)
-              : m_d->app->path(Html5App::MainHtml);
+    return d->app->mainHtmlMode() == Html5App::ModeUrl ?
+                d->app->path(AbstractMobileApp::MainCpp)
+              : d->app->path(Html5App::MainHtml);
 }
 
 AbstractMobileApp *Html5AppWizard::app() const
 {
-    return m_d->app;
+    return d->app;
 }
 
 AbstractMobileAppWizardDialog *Html5AppWizard::wizardDialog() const
 {
-    return m_d->wizardDialog;
+    return d->wizardDialog;
 }
 
 } // namespace Internal
diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizard.h b/src/plugins/qt4projectmanager/wizards/html5appwizard.h
index 97f9a7776c..d2665a9942 100644
--- a/src/plugins/qt4projectmanager/wizards/html5appwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/html5appwizard.h
@@ -59,7 +59,7 @@ private:
     virtual void prepareGenerateFiles(const QWizard *wizard,
         QString *errorMessage) const;
 
-    class Html5AppWizardPrivate *m_d;
+    class Html5AppWizardPrivate *d;
 };
 
 } // namespace Internal
diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp
index fb1f00801c..533ba09e38 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp
@@ -77,16 +77,16 @@ class MobileAppWizardPrivate
 
 MobileAppWizard::MobileAppWizard()
     : AbstractMobileAppWizard(parameters())
-    , m_d(new MobileAppWizardPrivate)
+    , d(new MobileAppWizardPrivate)
 {
-    m_d->mobileApp = new MobileApp;
-    m_d->wizardDialog = 0;
+    d->mobileApp = new MobileApp;
+    d->wizardDialog = 0;
 }
 
 MobileAppWizard::~MobileAppWizard()
 {
-    delete m_d->mobileApp;
-    delete m_d;
+    delete d->mobileApp;
+    delete d;
 }
 
 Core::BaseFileWizardParameters MobileAppWizard::parameters()
@@ -104,13 +104,13 @@ Core::BaseFileWizardParameters MobileAppWizard::parameters()
 
 AbstractMobileAppWizardDialog *MobileAppWizard::createWizardDialogInternal(QWidget *parent) const
 {
-    m_d->wizardDialog = new MobileAppWizardDialog(parent);
-    return m_d->wizardDialog;
+    d->wizardDialog = new MobileAppWizardDialog(parent);
+    return d->wizardDialog;
 }
 
 void MobileAppWizard::projectPathChanged(const QString &path) const
 {
-    m_d->wizardDialog->targetsPage()->setProFilePath(path);
+    d->wizardDialog->targetsPage()->setProFilePath(path);
 }
 
 void MobileAppWizard::prepareGenerateFiles(const QWizard *w,
@@ -127,12 +127,12 @@ QString MobileAppWizard::fileToOpenPostGeneration() const
 
 AbstractMobileApp *MobileAppWizard::app() const
 {
-    return m_d->mobileApp;
+    return d->mobileApp;
 }
 
 AbstractMobileAppWizardDialog *MobileAppWizard::wizardDialog() const
 {
-    return m_d->wizardDialog;
+    return d->wizardDialog;
 }
 
 } // namespace Internal
diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizard.h b/src/plugins/qt4projectmanager/wizards/mobileappwizard.h
index 0af9ca7a07..358d208eaf 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileappwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/mobileappwizard.h
@@ -59,7 +59,7 @@ private:
     virtual void prepareGenerateFiles(const QWizard *wizard,
         QString *errorMessage) const;
 
-    class MobileAppWizardPrivate *m_d;
+    class MobileAppWizardPrivate *d;
 };
 
 } // namespace Internal
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
index 047eb9699e..8a7cc42539 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
@@ -114,16 +114,16 @@ class QtQuickAppWizardPrivate
 
 QtQuickAppWizard::QtQuickAppWizard()
     : AbstractMobileAppWizard(parameters())
-    , m_d(new QtQuickAppWizardPrivate)
+    , d(new QtQuickAppWizardPrivate)
 {
-    m_d->app = new QtQuickApp;
-    m_d->wizardDialog = 0;
+    d->app = new QtQuickApp;
+    d->wizardDialog = 0;
 }
 
 QtQuickAppWizard::~QtQuickAppWizard()
 {
-    delete m_d->app;
-    delete m_d;
+    delete d->app;
+    delete d;
 }
 
 Core::BaseFileWizardParameters QtQuickAppWizard::parameters()
@@ -148,14 +148,14 @@ Core::BaseFileWizardParameters QtQuickAppWizard::parameters()
 
 AbstractMobileAppWizardDialog *QtQuickAppWizard::createWizardDialogInternal(QWidget *parent) const
 {
-    m_d->wizardDialog = new QtQuickAppWizardDialog(parent);
-    m_d->wizardDialog->m_componentOptionsPage->setComponentSet(m_d->app->componentSet());
-    return m_d->wizardDialog;
+    d->wizardDialog = new QtQuickAppWizardDialog(parent);
+    d->wizardDialog->m_componentOptionsPage->setComponentSet(d->app->componentSet());
+    return d->wizardDialog;
 }
 
 void QtQuickAppWizard::projectPathChanged(const QString &path) const
 {
-    m_d->wizardDialog->targetsPage()->setProFilePath(path);
+    d->wizardDialog->targetsPage()->setProFilePath(path);
 }
 
 void QtQuickAppWizard::prepareGenerateFiles(const QWizard *w,
@@ -164,29 +164,29 @@ void QtQuickAppWizard::prepareGenerateFiles(const QWizard *w,
     Q_UNUSED(errorMessage)
     const QtQuickAppWizardDialog *wizard = qobject_cast<const QtQuickAppWizardDialog*>(w);
     if (wizard->m_componentOptionsPage->mainQmlMode() == QtQuickApp::ModeGenerate) {
-        m_d->app->setMainQml(QtQuickApp::ModeGenerate);
+        d->app->setMainQml(QtQuickApp::ModeGenerate);
     } else {
         const QString mainQmlFile = wizard->m_componentOptionsPage->mainQmlFile();
-        m_d->app->setMainQml(QtQuickApp::ModeImport, mainQmlFile);
+        d->app->setMainQml(QtQuickApp::ModeImport, mainQmlFile);
     }
-    m_d->app->setComponentSet(wizard->m_componentOptionsPage->componentSet());
-    if (m_d->app->componentSet() == QtQuickApp::Symbian10Components)
-        m_d->app->setOrientation(AbstractMobileApp::ScreenOrientationImplicit);
+    d->app->setComponentSet(wizard->m_componentOptionsPage->componentSet());
+    if (d->app->componentSet() == QtQuickApp::Symbian10Components)
+        d->app->setOrientation(AbstractMobileApp::ScreenOrientationImplicit);
 }
 
 QString QtQuickAppWizard::fileToOpenPostGeneration() const
 {
-    return m_d->app->path(QtQuickApp::MainQml);
+    return d->app->path(QtQuickApp::MainQml);
 }
 
 AbstractMobileApp *QtQuickAppWizard::app() const
 {
-    return m_d->app;
+    return d->app;
 }
 
 AbstractMobileAppWizardDialog *QtQuickAppWizard::wizardDialog() const
 {
-    return m_d->wizardDialog;
+    return d->wizardDialog;
 }
 
 } // namespace Internal
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.h b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.h
index 8bd93e4c44..13f64767ce 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.h
@@ -59,7 +59,7 @@ private:
     virtual void prepareGenerateFiles(const QWizard *wizard,
         QString *errorMessage) const;
 
-    class QtQuickAppWizardPrivate *m_d;
+    class QtQuickAppWizardPrivate *d;
 };
 
 } // namespace Internal