diff --git a/src/barchart/bar.cpp b/src/barchart/bar.cpp
index f5a22f1..336c83c 100644
--- a/src/barchart/bar.cpp
+++ b/src/barchart/bar.cpp
@@ -7,7 +7,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
 Bar::Bar(QString category, QGraphicsItem *parent)
     : QGraphicsRectItem(parent),
-    mCategory(category)
+    m_Category(category)
 {
     setAcceptedMouseButtons(Qt::LeftButton | Qt::RightButton);
     setAcceptHoverEvents(true);
@@ -16,9 +16,9 @@ Bar::Bar(QString category, QGraphicsItem *parent)
 void Bar::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     if (event->button() == Qt::LeftButton) {
-        emit clicked(mCategory);
+        emit clicked(m_Category);
     } else if (event->button() == Qt::RightButton) {
-        emit rightClicked(mCategory);
+        emit rightClicked(m_Category);
     }
 }
 
diff --git a/src/barchart/bar_p.h b/src/barchart/bar_p.h
index c864b88..ab9ffe0 100644
--- a/src/barchart/bar_p.h
+++ b/src/barchart/bar_p.h
@@ -25,7 +25,7 @@ Q_SIGNALS:
     void hoverLeaved();
 
 private:
-    QString mCategory;
+    QString m_Category;
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/barchart/barchartitem.cpp b/src/barchart/barchartitem.cpp
index 5f00f54..24c9818 100644
--- a/src/barchart/barchartitem.cpp
+++ b/src/barchart/barchartitem.cpp
@@ -16,8 +16,8 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
 BarChartItem::BarChartItem(QBarSeries *series, ChartPresenter *presenter) :
     ChartItem(presenter),
-    mLayoutSet(false),
-    mSeries(series)
+    m_LayoutSet(false),
+    m_Series(series)
 {
     connect(series, SIGNAL(showToolTip(QPoint,QString)), this, SLOT(showToolTip(QPoint,QString)));
     connect(series, SIGNAL(updatedBars()), this, SLOT(handleLayoutChanged()));
@@ -34,8 +34,8 @@ BarChartItem::~BarChartItem()
 
 void BarChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    if (!mLayoutSet) {
-        qDebug() << "BarChartItem::paint called without layout set. Aborting.";
+    if (!m_LayoutSet) {
+        qWarning() << "BarChartItem::paint called without layout set. Aborting.";
         return;
     }
 
@@ -55,33 +55,33 @@ void BarChartItem::dataChanged()
     foreach (QGraphicsItem *item, childItems())
         delete item;
 
-    mBars.clear();
-    mFloatingValues.clear();
-    mLayout.clear();
+    m_Bars.clear();
+    m_FloatingValues.clear();
+    m_Layout.clear();
 
     // Create new graphic items for bars
-    for (int c = 0; c < mSeries->categoryCount(); c++) {
-        QString category = mSeries->categoryName(c);
-        for (int s = 0; s < mSeries->barsetCount(); s++) {
-            QBarSet *set = mSeries->barsetAt(s);
+    for (int c = 0; c < m_Series->categoryCount(); c++) {
+        QString category = m_Series->categoryName(c);
+        for (int s = 0; s < m_Series->barsetCount(); s++) {
+            QBarSet *set = m_Series->barsetAt(s);
             Bar *bar = new Bar(category,this);
             childItems().append(bar);
-            mBars.append(bar);
+            m_Bars.append(bar);
             connect(bar, SIGNAL(clicked(QString)), set, SIGNAL(clicked(QString)));
             connect(bar, SIGNAL(rightClicked(QString)), set, SIGNAL(rightClicked(QString)));
             connect(bar, SIGNAL(hoverEntered(QPoint)), set, SLOT(barHoverEnterEvent(QPoint)));
             connect(bar, SIGNAL(hoverLeaved()), set, SLOT(barHoverLeaveEvent()));
-            mLayout.append(QRectF(0, 0, 0, 0));
+            m_Layout.append(QRectF(0, 0, 0, 0));
         }
     }
 
     // Create floating values
-    for (int category = 0; category < mSeries->categoryCount(); category++) {
-        for (int s = 0; s < mSeries->barsetCount(); s++) {
-            QBarSet *set = mSeries->barsetAt(s);
+    for (int category = 0; category < m_Series->categoryCount(); category++) {
+        for (int s = 0; s < m_Series->barsetCount(); s++) {
+            QBarSet *set = m_Series->barsetAt(s);
             BarValue *value = new BarValue(*set, this);
             childItems().append(value);
-            mFloatingValues.append(value);
+            m_FloatingValues.append(value);
             connect(set, SIGNAL(toggleFloatingValues()), value, SLOT(toggleVisible()));
         }
     }
@@ -91,17 +91,17 @@ QVector<QRectF> BarChartItem::calculateLayout()
     QVector<QRectF> layout;
 
     // Use temporary qreals for accurancy (we might get some compiler warnings... :)
-    qreal categoryCount = mSeries->categoryCount();
-    qreal setCount = mSeries->barsetCount();
+    qreal categoryCount = m_Series->categoryCount();
+    qreal setCount = m_Series->barsetCount();
 
     qreal width = geometry().width();
     qreal height = geometry().height();
 
-    qreal max = mSeries->max();
+    qreal max = m_Series->max();
 
     // Domain:
-    if (mDomainMaxY > max) {
-        max = mDomainMaxY;
+    if (m_DomainMaxY > max) {
+        max = m_DomainMaxY;
     }
 
     qreal scale = (height / max);
@@ -113,13 +113,13 @@ QVector<QRectF> BarChartItem::calculateLayout()
         qreal xPos = categoryWidth * category + barWidth / 2;
         qreal yPos = height;
         for (int set = 0; set < setCount; set++) {
-            qreal barHeight = mSeries->valueAt(set, category) * scale;
-            Bar* bar = mBars.at(itemIndex);
+            qreal barHeight = m_Series->valueAt(set, category) * scale;
+            Bar* bar = m_Bars.at(itemIndex);
 
             QRectF rect(xPos, yPos - barHeight, barWidth, barHeight);
             layout.append(rect);
-            bar->setPen(mSeries->barsetAt(set)->pen());
-            bar->setBrush(mSeries->barsetAt(set)->brush());
+            bar->setPen(m_Series->barsetAt(set)->pen());
+            bar->setBrush(m_Series->barsetAt(set)->brush());
             itemIndex++;
             xPos += barWidth;
         }
@@ -127,20 +127,20 @@ QVector<QRectF> BarChartItem::calculateLayout()
 
     // Position floating values
     itemIndex = 0;
-    for (int category = 0; category < mSeries->categoryCount(); category++) {
+    for (int category = 0; category < m_Series->categoryCount(); category++) {
         qreal xPos = categoryWidth * category  + barWidth;
         qreal yPos = height;
-        for (int set=0; set < mSeries->barsetCount(); set++) {
-            qreal barHeight = mSeries->valueAt(set, category) * scale;
-            BarValue* value = mFloatingValues.at(itemIndex);
+        for (int set=0; set < m_Series->barsetCount(); set++) {
+            qreal barHeight = m_Series->valueAt(set, category) * scale;
+            BarValue* value = m_FloatingValues.at(itemIndex);
 
-            QBarSet* barSet = mSeries->barsetAt(set);
+            QBarSet* barSet = m_Series->barsetAt(set);
             value->resize(100, 50);  // TODO: proper layout for this.
             value->setPos(xPos, yPos-barHeight / 2);
             value->setPen(barSet->floatingValuePen());
 
-            if (mSeries->valueAt(set,category) != 0) {
-                value->setValueString(QString::number(mSeries->valueAt(set, category)));
+            if (m_Series->valueAt(set,category) != 0) {
+                value->setValueString(QString::number(m_Series->valueAt(set, category)));
             } else {
                 value->setValueString(QString(""));
             }
@@ -156,17 +156,17 @@ QVector<QRectF> BarChartItem::calculateLayout()
 void BarChartItem::applyLayout(const QVector<QRectF> &layout)
 {
     if (animator())
-        animator()->updateLayout(this, mLayout, layout);
+        animator()->updateLayout(this, m_Layout, layout);
     else
         setLayout(layout);
 }
 
 void BarChartItem::setLayout(const QVector<QRectF> &layout)
 {
-    mLayout = layout;
+    m_Layout = layout;
 
-    for (int i=0; i < mBars.count(); i++)
-        mBars.at(i)->setRect(layout.at(i));
+    for (int i=0; i < m_Bars.count(); i++)
+        m_Bars.at(i)->setRect(layout.at(i));
 
     update();
 }
@@ -181,10 +181,10 @@ void BarChartItem::handleModelChanged(int index)
 
 void BarChartItem::handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY)
 {
-    mDomainMinX = minX;
-    mDomainMaxX = maxX;
-    mDomainMinY = minY;
-    mDomainMaxY = maxY;
+    m_DomainMinX = minX;
+    m_DomainMaxX = maxX;
+    m_DomainMinY = minY;
+    m_DomainMaxY = maxY;
     handleLayoutChanged();
 }
 
@@ -192,7 +192,7 @@ void BarChartItem::handleGeometryChanged(const QRectF &rect)
 {
     m_rect = rect;
     handleLayoutChanged();
-    mLayoutSet = true;
+    m_LayoutSet = true;
     setPos(rect.topLeft());
 }
 
diff --git a/src/barchart/barchartitem_p.h b/src/barchart/barchartitem_p.h
index 2e61092..3855548 100644
--- a/src/barchart/barchartitem_p.h
+++ b/src/barchart/barchartitem_p.h
@@ -55,19 +55,19 @@ public slots:
 protected:
 
     // TODO: consider these.
-    qreal mDomainMinX;
-    qreal mDomainMaxX;
-    qreal mDomainMinY;
-    qreal mDomainMaxY;
+    qreal m_DomainMinX;
+    qreal m_DomainMaxX;
+    qreal m_DomainMinY;
+    qreal m_DomainMaxY;
 
     QRectF m_rect;
-    bool mLayoutSet;    // True, if component has been laid out.
-    QVector<QRectF> mLayout;
+    bool m_LayoutSet;    // True, if component has been laid out.
+    QVector<QRectF> m_Layout;
 
     // Not owned.
-    QBarSeries *mSeries;
-    QList<Bar *> mBars;
-    QList<BarValue *> mFloatingValues;
+    QBarSeries *m_Series;
+    QList<Bar *> m_Bars;
+    QList<BarValue *> m_FloatingValues;
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/barchart/barchartmodel.cpp b/src/barchart/barchartmodel.cpp
index 81cbe8c..984fb37 100644
--- a/src/barchart/barchartmodel.cpp
+++ b/src/barchart/barchartmodel.cpp
@@ -6,75 +6,74 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-BarChartModel::BarChartModel(QStringList categories, QObject *parent) :
-    QObject(parent)
-    ,mCategory(categories)
+BarChartModel::BarChartModel(QStringList categories, QObject *parent) : QObject(parent),
+    m_Category(categories)
 {
 }
 
 QStringList BarChartModel::category()
 {
-    return mCategory;
+    return m_Category;
 }
 
 void BarChartModel::addBarSet(QBarSet *set)
 {
-    mDataModel.append(set);
+    m_DataModel.append(set);
 }
 
 void BarChartModel::removeBarSet(QBarSet *set)
 {
-    if (mDataModel.contains(set)) {
-        mDataModel.removeOne(set);
+    if (m_DataModel.contains(set)) {
+        m_DataModel.removeOne(set);
     }
 }
 
 void BarChartModel::insertBarSet(int i, QBarSet *set)
 {
-    mDataModel.insert(i, set);
+    m_DataModel.insert(i, set);
 }
 
 void BarChartModel::insertCategory(int i, QString category)
 {
-    mCategory.insert(i, category);
+    m_Category.insert(i, category);
 }
 
 void BarChartModel::removeCategory(int i)
 {
-    mCategory.removeAt(i);
+    m_Category.removeAt(i);
 }
 
 QBarSet* BarChartModel::setAt(int index)
 {
-    return mDataModel.at(index);
+    return m_DataModel.at(index);
 }
 
 QList<QBarSet*> BarChartModel::barSets()
 {
-    return mDataModel;
+    return m_DataModel;
 }
 
 int BarChartModel::barsetCount()
 {
-    return mDataModel.count();
+    return m_DataModel.count();
 }
 
 int BarChartModel::categoryCount()
 {
-    return mCategory.count();
+    return m_Category.count();
 }
 
 qreal BarChartModel::min()
 {
-    Q_ASSERT(mDataModel.count() > 0);
+    Q_ASSERT(m_DataModel.count() > 0);
     // TODO: make min and max members and update them when data changes.
     // This is slower since they are checked every time, even if data is same since previous call.
     qreal min = INT_MAX;
 
-    for (int i = 0; i < mDataModel.count(); i++) {
-        int itemCount = mDataModel.at(i)->count();
+    for (int i = 0; i < m_DataModel.count(); i++) {
+        int itemCount = m_DataModel.at(i)->count();
         for (int j = 0; j < itemCount; j++) {
-            qreal temp = mDataModel.at(i)->valueAt(j);
+            qreal temp = m_DataModel.at(i)->valueAt(j);
             if (temp < min)
                 min = temp;
         }
@@ -84,16 +83,16 @@ qreal BarChartModel::min()
 
 qreal BarChartModel::max()
 {
-    Q_ASSERT(mDataModel.count() > 0);
+    Q_ASSERT(m_DataModel.count() > 0);
 
     // TODO: make min and max members and update them when data changes.
     // This is slower since they are checked every time, even if data is same since previous call.
     qreal max = INT_MIN;
 
-    for (int i = 0; i < mDataModel.count(); i++) {
-        int itemCount = mDataModel.at(i)->count();
+    for (int i = 0; i < m_DataModel.count(); i++) {
+        int itemCount = m_DataModel.at(i)->count();
         for (int j = 0; j < itemCount; j++) {
-            qreal temp = mDataModel.at(i)->valueAt(j);
+            qreal temp = m_DataModel.at(i)->valueAt(j);
             if (temp > max)
                 max = temp;
         }
@@ -104,28 +103,28 @@ qreal BarChartModel::max()
 
 qreal BarChartModel::valueAt(int set, int category)
 {
-    if ((set < 0) || (set >= mDataModel.count())) {
+    if ((set < 0) || (set >= m_DataModel.count())) {
         // No set, no value.
         return 0;
-    } else if ((category < 0) || (category >= mDataModel.at(set)->count())) {
+    } else if ((category < 0) || (category >= m_DataModel.at(set)->count())) {
         // No category, no value.
         return 0;
     }
 
-    return mDataModel.at(set)->valueAt(category);
+    return m_DataModel.at(set)->valueAt(category);
 }
 
 qreal BarChartModel::percentageAt(int set, int category)
 {
-    if ((set < 0) || (set >= mDataModel.count())) {
+    if ((set < 0) || (set >= m_DataModel.count())) {
         // No set, no value.
         return 0;
-    } else if ((category < 0) || (category >= mDataModel.at(set)->count())) {
+    } else if ((category < 0) || (category >= m_DataModel.at(set)->count())) {
         // No category, no value.
         return 0;
     }
 
-    qreal value = mDataModel.at(set)->valueAt(category);
+    qreal value = m_DataModel.at(set)->valueAt(category);
     qreal total = categorySum(category);
     if (0 == total)
         return 100.0;
@@ -137,11 +136,11 @@ qreal BarChartModel::percentageAt(int set, int category)
 qreal BarChartModel::categorySum(int category)
 {
     qreal sum(0);
-    int count = mDataModel.count(); // Count sets
+    int count = m_DataModel.count(); // Count sets
 
     for (int set = 0; set < count; set++) {
-        if (category < mDataModel.at(set)->count())
-            sum += mDataModel.at(set)->valueAt(category);
+        if (category < m_DataModel.at(set)->count())
+            sum += m_DataModel.at(set)->valueAt(category);
     }
     return sum;
 }
@@ -161,7 +160,7 @@ qreal BarChartModel::maxCategorySum()
 
 QString BarChartModel::categoryName(int category)
 {
-    return mCategory.at(category);
+    return m_Category.at(category);
 }
 
 #include "moc_barchartmodel_p.cpp"
diff --git a/src/barchart/barchartmodel_p.h b/src/barchart/barchartmodel_p.h
index ee00b36..32cb5b3 100644
--- a/src/barchart/barchartmodel_p.h
+++ b/src/barchart/barchartmodel_p.h
@@ -48,9 +48,8 @@ public slots:
     
 private:
 
-    QList<QBarSet *> mDataModel;
-    QStringList mCategory;
-    int mCurrentSet;
+    QList<QBarSet *> m_DataModel;
+    QStringList m_Category;
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/barchart/barvalue.cpp b/src/barchart/barvalue.cpp
index 83a48d9..209b12d 100644
--- a/src/barchart/barvalue.cpp
+++ b/src/barchart/barvalue.cpp
@@ -6,45 +6,45 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
 BarValue::BarValue(QBarSet &set, QGraphicsItem *parent)
     : QGraphicsObject(parent),
-    mBarSet(set),
-    mXpos(0),
-    mYpos(0),
-    mWidth(0),
-    mHeight(0)
+    m_BarSet(set),
+    m_Xpos(0),
+    m_Ypos(0),
+    m_Width(0),
+    m_Height(0)
 {
     setVisible(false);
 }
 
 void BarValue::setValueString(QString str)
 {
-    mValueString = str;
+    m_ValueString = str;
 }
 
 QString BarValue::valueString()
 {
-    return mValueString;
+    return m_ValueString;
 }
 
 void BarValue::setPen(const QPen pen)
 {
-    mPen = pen;
+    m_Pen = pen;
 }
 
 QPen BarValue::pen() const
 {
-    return mPen;
+    return m_Pen;
 }
 
 void BarValue::resize(qreal w, qreal h)
 {
-    mWidth = w;
-    mHeight = h;
+    m_Width = w;
+    m_Height = h;
 }
 
 void BarValue::setPos(qreal x, qreal y)
 {
-    mXpos = x;
-    mYpos = y;
+    m_Xpos = x;
+    m_Ypos = y;
 }
 
 void BarValue::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
@@ -53,14 +53,14 @@ void BarValue::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, 
     Q_UNUSED(widget)
 
     if (isVisible()) {
-        painter->setPen(mPen);
-        painter->drawText(boundingRect(), mValueString);
+        painter->setPen(m_Pen);
+        painter->drawText(boundingRect(), m_ValueString);
     }
 }
 
 QRectF BarValue::boundingRect() const
 {
-    QRectF r(mXpos, mYpos, mWidth, mHeight);
+    QRectF r(m_Xpos, m_Ypos, m_Width, m_Height);
     return r;
 }
 
diff --git a/src/barchart/barvalue_p.h b/src/barchart/barvalue_p.h
index 05d2a8d..e3e7c1d 100644
--- a/src/barchart/barvalue_p.h
+++ b/src/barchart/barvalue_p.h
@@ -35,14 +35,14 @@ public Q_SLOTS:
 
 private:
 
-    QBarSet &mBarSet;
-    QPen mPen;
-    QString mValueString;
-
-    qreal mXpos;
-    qreal mYpos;
-    qreal mWidth;
-    qreal mHeight;
+    QBarSet &m_BarSet;
+    QPen m_Pen;
+    QString m_ValueString;
+
+    qreal m_Xpos;
+    qreal m_Ypos;
+    qreal m_Width;
+    qreal m_Height;
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/barchart/percentbarchartitem.cpp b/src/barchart/percentbarchartitem.cpp
index a0ed454..6678825 100644
--- a/src/barchart/percentbarchartitem.cpp
+++ b/src/barchart/percentbarchartitem.cpp
@@ -19,21 +19,21 @@ QVector<QRectF> PercentBarChartItem::calculateLayout()
     qreal width = geometry().width();
     qreal height = geometry().height();
 
-    qreal categoryCount = mSeries->categoryCount();
-    qreal barWidth = width / (mSeries->categoryCount() * 2);
+    qreal categoryCount = m_Series->categoryCount();
+    qreal barWidth = width / (m_Series->categoryCount() * 2);
     qreal xStep = width / categoryCount;
     qreal xPos =  xStep / 2 - barWidth / 2;
 
     int itemIndex(0);
     for (int category = 0; category < categoryCount; category++) {
-        qreal colSum = mSeries->categorySum(category);
+        qreal colSum = m_Series->categorySum(category);
         qreal scale = (height / colSum);
         qreal yPos = height;
-        for (int set=0; set < mSeries->barsetCount(); set++) {
-            qreal barHeight = mSeries->valueAt(set, category) * scale;
-            Bar* bar = mBars.at(itemIndex);
-            bar->setPen(mSeries->barsetAt(set)->pen());
-            bar->setBrush(mSeries->barsetAt(set)->brush());
+        for (int set=0; set < m_Series->barsetCount(); set++) {
+            qreal barHeight = m_Series->valueAt(set, category) * scale;
+            Bar* bar = m_Bars.at(itemIndex);
+            bar->setPen(m_Series->barsetAt(set)->pen());
+            bar->setBrush(m_Series->barsetAt(set)->brush());
             QRectF rect(xPos, yPos-barHeight, barWidth, barHeight);
             layout.append(rect);
             itemIndex++;
@@ -45,21 +45,21 @@ QVector<QRectF> PercentBarChartItem::calculateLayout()
     // Position floating values
     itemIndex = 0;
     xPos = (width/categoryCount);
-    for (int category=0; category < mSeries->categoryCount(); category++) {
+    for (int category=0; category < m_Series->categoryCount(); category++) {
         qreal yPos = height;
-        qreal colSum = mSeries->categorySum(category);
+        qreal colSum = m_Series->categorySum(category);
         qreal scale = (height / colSum);
-        for (int set=0; set < mSeries->barsetCount(); set++) {
-            qreal barHeight = mSeries->valueAt(set,category) * scale;
-            BarValue* value = mFloatingValues.at(itemIndex);
+        for (int set=0; set < m_Series->barsetCount(); set++) {
+            qreal barHeight = m_Series->valueAt(set,category) * scale;
+            BarValue* value = m_FloatingValues.at(itemIndex);
 
-            QBarSet* barSet = mSeries->barsetAt(set);
+            QBarSet* barSet = m_Series->barsetAt(set);
             value->resize(100, 50);  // TODO: proper layout for this.
             value->setPos(xPos, yPos-barHeight / 2);
             value->setPen(barSet->floatingValuePen());
 
-            if (mSeries->valueAt(set,category) != 0) {
-                int p = mSeries->percentageAt(set,category) * 100;
+            if (m_Series->valueAt(set,category) != 0) {
+                int p = m_Series->percentageAt(set,category) * 100;
                 QString vString(QString::number(p));
                 vString.truncate(3);
                 vString.append("%");
diff --git a/src/barchart/qbarseries.cpp b/src/barchart/qbarseries.cpp
index 2dee67f..25b83f0 100644
--- a/src/barchart/qbarseries.cpp
+++ b/src/barchart/qbarseries.cpp
@@ -33,9 +33,8 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
     Constructs empty QBarSeries. Parameter \a categories defines the categories for chart.
     QBarSeries is QObject which is a child of a \a parent.
 */
-QBarSeries::QBarSeries(QBarCategories categories, QObject *parent)
-    : QSeries(parent)
-    ,mModel(new BarChartModel(categories, this))
+QBarSeries::QBarSeries(QBarCategories categories, QObject *parent) : QSeries(parent),
+    m_Model(new BarChartModel(categories, this))
 {
     m_model = NULL;
     m_mapCategories = -1;
@@ -53,7 +52,7 @@ QBarSeries::QBarSeries(QBarCategories categories, QObject *parent)
 */
 void QBarSeries::addBarSet(QBarSet *set)
 {
-    mModel->addBarSet(set);
+    m_Model->addBarSet(set);
     connect(set, SIGNAL(clicked(QString)), this, SLOT(barsetClicked(QString)));
     connect(set, SIGNAL(rightClicked(QString)), this, SLOT(barsetRightClicked(QString)));
     connect(set, SIGNAL(valueChanged()), this, SLOT(barsetChanged()));
@@ -69,24 +68,24 @@ void QBarSeries::removeBarSet(QBarSet *set)
 {
     disconnect(set, SIGNAL(clicked(QString)), this, SLOT(barsetClicked(QString)));
     disconnect(set, SIGNAL(rightClicked(QString)), this, SLOT(barsetRightClicked(QString)));
-    mModel->removeBarSet(set);
+    m_Model->removeBarSet(set);
     emit updatedBars();
 }
 
 void QBarSeries::insertBarSet(int i, QBarSet *set)
 {
-    mModel->insertBarSet(i, set);
+    m_Model->insertBarSet(i, set);
     //    emit barsetChanged();
 }
 
 void QBarSeries::insertCategory(int i, QString category)
 {
-    mModel->insertCategory(i, category);
+    m_Model->insertCategory(i, category);
 }
 
 void QBarSeries::removeCategory(int i)
 {
-    mModel->removeCategory(i);
+    m_Model->removeCategory(i);
 }
 
 /*!
@@ -97,7 +96,7 @@ int QBarSeries::barsetCount()
     //    if(m_model)
     //        return m_mapBarTop - m_mapBarBottom;
     //    else
-    return mModel->barsetCount();
+    return m_Model->barsetCount();
 }
 
 /*!
@@ -105,7 +104,7 @@ int QBarSeries::barsetCount()
 */
 int QBarSeries::categoryCount()
 {
-    return mModel->categoryCount();
+    return m_Model->categoryCount();
 }
 
 /*!
@@ -113,7 +112,7 @@ int QBarSeries::categoryCount()
  */
 QList<QBarSet*> QBarSeries::barSets()
 {
-    return mModel->barSets();
+    return m_Model->barSets();
 }
 
 /*!
@@ -121,7 +120,7 @@ QList<QBarSet*> QBarSeries::barSets()
 */
 QBarSet* QBarSeries::barsetAt(int index)
 {
-    return mModel->setAt(index);
+    return m_Model->setAt(index);
 }
 
 /*!
@@ -129,7 +128,7 @@ QBarSet* QBarSeries::barsetAt(int index)
 */
 QString QBarSeries::categoryName(int category)
 {
-    return mModel->categoryName(category);
+    return m_Model->categoryName(category);
 }
 
 /*!
@@ -141,13 +140,13 @@ void QBarSeries::setToolTipEnabled(bool enabled)
 {
     // TODO: what if we add sets after call to this function? Those sets won't have tooltip enabled.
     if (enabled) {
-        for (int i=0; i<mModel->barsetCount(); i++) {
-            QBarSet *set = mModel->setAt(i);
+        for (int i=0; i<m_Model->barsetCount(); i++) {
+            QBarSet *set = m_Model->setAt(i);
             connect(set, SIGNAL(showToolTip(QPoint,QString)), this, SIGNAL(showToolTip(QPoint,QString)));
         }
     } else {
-        for (int i=0; i<mModel->barsetCount(); i++) {
-            QBarSet *set = mModel->setAt(i);
+        for (int i=0; i<m_Model->barsetCount(); i++) {
+            QBarSet *set = m_Model->setAt(i);
             disconnect(set, SIGNAL(showToolTip(QPoint,QString)), this, SIGNAL(showToolTip(QPoint,QString)));
         }
     }
@@ -176,7 +175,7 @@ void QBarSeries::barsetRightClicked(QString category)
 */
 qreal QBarSeries::min()
 {
-    return mModel->min();
+    return m_Model->min();
 }
 
 /*!
@@ -184,7 +183,7 @@ qreal QBarSeries::min()
 */
 qreal QBarSeries::max()
 {
-    return mModel->max();
+    return m_Model->max();
 }
 
 /*!
@@ -192,7 +191,7 @@ qreal QBarSeries::max()
 */
 qreal QBarSeries::valueAt(int set, int category)
 {
-    return mModel->valueAt(set, category);
+    return m_Model->valueAt(set, category);
 }
 
 /*!
@@ -200,7 +199,7 @@ qreal QBarSeries::valueAt(int set, int category)
 */
 qreal QBarSeries::percentageAt(int set, int category)
 {
-    return mModel->percentageAt(set, category);
+    return m_Model->percentageAt(set, category);
 }
 
 /*!
@@ -208,7 +207,7 @@ qreal QBarSeries::percentageAt(int set, int category)
 */
 qreal QBarSeries::categorySum(int category)
 {
-    return mModel->categorySum(category);
+    return m_Model->categorySum(category);
 }
 
 /*!
@@ -216,7 +215,7 @@ qreal QBarSeries::categorySum(int category)
 */
 qreal QBarSeries::maxCategorySum()
 {
-    return mModel->maxCategorySum();
+    return m_Model->maxCategorySum();
 }
 
 /*!
@@ -224,7 +223,7 @@ qreal QBarSeries::maxCategorySum()
 */
 BarChartModel& QBarSeries::model()
 {
-    return *mModel;
+    return *m_Model;
 }
 
 bool QBarSeries::setModel(QAbstractItemModel *model)
@@ -287,12 +286,12 @@ void QBarSeries::setModelMapping(int categories, int bottomBoundry, int topBound
 
 
     // create the initial bars
-    delete mModel;
+    delete m_Model;
     if (m_mapOrientation == Qt::Vertical) {
         QStringList categories;
         for (int k = m_mapFirst; k < m_mapFirst + m_mapCount; k++)
             categories << m_model->data(m_model->index(k, m_mapCategories), Qt::DisplayRole).toString();
-        mModel = new BarChartModel(categories, this);
+        m_Model = new BarChartModel(categories, this);
 
         for (int i = m_mapBarBottom; i <= m_mapBarTop; i++) {
             QBarSet* barSet = new QBarSet(QString("Column: %1").arg(i + 1));
@@ -304,7 +303,7 @@ void QBarSeries::setModelMapping(int categories, int bottomBoundry, int topBound
         QStringList categories;
         for (int k = m_mapFirst; k < m_mapFirst + m_mapCount; k++)
             categories << m_model->data(m_model->index(m_mapCategories, k), Qt::DisplayRole).toString();
-        mModel = new BarChartModel(categories, this);
+        m_Model = new BarChartModel(categories, this);
 
         for (int i = m_mapBarBottom; i <= m_mapBarTop; i++) {
             QBarSet* barSet = new QBarSet(QString("Row: %1").arg(i + 1));
@@ -376,9 +375,9 @@ void QBarSeries::barsetChanged()
 QBarCategories QBarSeries::categories() const
 {
     QBarCategories categories;
-    int count = mModel->categoryCount();
+    int count = m_Model->categoryCount();
     for (int i=1; i <= count; i++) {
-          categories.insert(i, mModel->categoryName(i - 1));
+          categories.insert(i, m_Model->categoryName(i - 1));
     }
     return categories;
 }
diff --git a/src/barchart/qbarseries.h b/src/barchart/qbarseries.h
index 945301b..38c2499 100644
--- a/src/barchart/qbarseries.h
+++ b/src/barchart/qbarseries.h
@@ -81,7 +81,7 @@ private Q_SLOTS:
     void barsetChanged();
 
 protected:
-    BarChartModel *mModel;
+    BarChartModel *m_Model;
 
 //    QAbstractItemModel* m_model;
     int m_mapCategories;
diff --git a/src/barchart/qbarset.cpp b/src/barchart/qbarset.cpp
index 40d8a7e..805434c 100644
--- a/src/barchart/qbarset.cpp
+++ b/src/barchart/qbarset.cpp
@@ -56,7 +56,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 */
 QBarSet::QBarSet(QString name, QObject *parent)
     : QObject(parent)
-    ,mName(name)
+    ,m_Name(name)
 {
 }
 
@@ -65,7 +65,7 @@ QBarSet::QBarSet(QString name, QObject *parent)
 */
 void QBarSet::setName(QString name)
 {
-    mName = name;
+    m_Name = name;
 }
 
 /*!
@@ -73,7 +73,7 @@ void QBarSet::setName(QString name)
 */
 QString QBarSet::name()
 {
-    return mName;
+    return m_Name;
 }
 
 /*!
@@ -81,19 +81,19 @@ QString QBarSet::name()
 */
 QBarSet& QBarSet::operator << (const qreal &value)
 {
-    mValues.append(value);
+    m_Values.append(value);
     emit structureChanged();
     return *this;
 }
 
 void QBarSet::insertValue(int i, qreal value)
 {
-    mValues.insert(i, value);
+    m_Values.insert(i, value);
 }
 
 void QBarSet::removeValue(int i)
 {
-    mValues.removeAt(i);
+    m_Values.removeAt(i);
 }
 
 /*!
@@ -101,7 +101,7 @@ void QBarSet::removeValue(int i)
 */
 int QBarSet::count()
 {
-    return mValues.count();
+    return m_Values.count();
 }
 
 /*!
@@ -109,7 +109,7 @@ int QBarSet::count()
 */
 qreal QBarSet::valueAt(int index)
 {
-    return mValues.at(index);
+    return m_Values.at(index);
 }
 
 /*!
@@ -117,7 +117,7 @@ qreal QBarSet::valueAt(int index)
 */
 void QBarSet::setValue(int index, qreal value)
 {
-    mValues.replace(index,value);
+    m_Values.replace(index,value);
     emit valueChanged();
 }
 
@@ -127,8 +127,8 @@ void QBarSet::setValue(int index, qreal value)
 qreal QBarSet::total()
 {
     qreal total(0);
-    for (int i=0; i < mValues.count(); i++) {
-        total += mValues.at(i);
+    for (int i=0; i < m_Values.count(); i++) {
+        total += m_Values.at(i);
     }
     return total;
 }
@@ -138,7 +138,7 @@ qreal QBarSet::total()
 */
 void QBarSet::setPen(const QPen pen)
 {
-    mPen = pen;
+    m_Pen = pen;
     emit valueChanged();
 }
 
@@ -147,7 +147,7 @@ void QBarSet::setPen(const QPen pen)
 */
 QPen QBarSet::pen() const
 {
-    return mPen;
+    return m_Pen;
 }
 
 /*!
@@ -155,7 +155,7 @@ QPen QBarSet::pen() const
 */
 void QBarSet::setBrush(const QBrush brush)
 {
-    mBrush = brush;
+    m_Brush = brush;
     emit valueChanged();
 }
 
@@ -164,7 +164,7 @@ void QBarSet::setBrush(const QBrush brush)
 */
 QBrush QBarSet::brush() const
 {
-    return mBrush;
+    return m_Brush;
 }
 
 /*!
@@ -172,7 +172,7 @@ QBrush QBarSet::brush() const
 */
 void QBarSet::setFloatingValuePen(const QPen pen)
 {
-    mFloatingValuePen = pen;
+    m_FloatingValuePen = pen;
 }
 
 /*!
@@ -180,7 +180,7 @@ void QBarSet::setFloatingValuePen(const QPen pen)
 */
 QPen QBarSet::floatingValuePen() const
 {
-    return mFloatingValuePen;
+    return m_FloatingValuePen;
 }
 
 /*!
@@ -188,7 +188,7 @@ QPen QBarSet::floatingValuePen() const
 */
 void QBarSet::barHoverEnterEvent(QPoint pos)
 {
-    emit showToolTip(pos, mName);
+    emit showToolTip(pos, m_Name);
     emit hoverEnter(pos);
 }
 
diff --git a/src/barchart/qbarset.h b/src/barchart/qbarset.h
index 9d3c2f0..7f39b98 100644
--- a/src/barchart/qbarset.h
+++ b/src/barchart/qbarset.h
@@ -61,12 +61,12 @@ public Q_SLOTS:
 
 private:
 
-    QString mName;
-    QList<qreal> mValues;   // TODO: replace with map (category, value)
-    QMap<QString, qreal> mMappedValues;
-    QPen mPen;
-    QBrush mBrush;
-    QPen mFloatingValuePen;
+    QString m_Name;
+    QList<qreal> m_Values;   // TODO: replace with map (category, value)
+    QMap<QString, qreal> m_MappedValues;
+    QPen m_Pen;
+    QBrush m_Brush;
+    QPen m_FloatingValuePen;
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/barchart/stackedbarchartitem.cpp b/src/barchart/stackedbarchartitem.cpp
index 952e03b..de6c5fa 100644
--- a/src/barchart/stackedbarchartitem.cpp
+++ b/src/barchart/stackedbarchartitem.cpp
@@ -20,16 +20,16 @@ QVector<QRectF> StackedBarChartItem::calculateLayout()
     QVector<QRectF> layout;
     // Use temporary qreals for accurancy (we might get some compiler warnings... :)
 
-    qreal maxSum = mSeries->maxCategorySum();
+    qreal maxSum = m_Series->maxCategorySum();
     // Domain:
-    if (mDomainMaxY > maxSum) {
-        maxSum = mDomainMaxY;
+    if (m_DomainMaxY > maxSum) {
+        maxSum = m_DomainMaxY;
     }
 
     qreal height = geometry().height();
     qreal width = geometry().width();
-    qreal scale = (height /  mSeries->maxCategorySum());
-    qreal categotyCount = mSeries->categoryCount();
+    qreal scale = (height /  m_Series->maxCategorySum());
+    qreal categotyCount = m_Series->categoryCount();
     qreal barWidth = width / (categotyCount * 2);
     qreal xStep = width / categotyCount;
     qreal xPos = xStep / 2 - barWidth / 2;
@@ -37,11 +37,11 @@ QVector<QRectF> StackedBarChartItem::calculateLayout()
     int itemIndex(0);
     for (int category = 0; category < categotyCount; category++) {
         qreal yPos = height;
-        for (int set=0; set < mSeries->barsetCount(); set++) {
-            qreal barHeight = mSeries->valueAt(set, category) * scale;
-            Bar* bar = mBars.at(itemIndex);
-            bar->setPen(mSeries->barsetAt(set)->pen());
-            bar->setBrush(mSeries->barsetAt(set)->brush());
+        for (int set=0; set < m_Series->barsetCount(); set++) {
+            qreal barHeight = m_Series->valueAt(set, category) * scale;
+            Bar* bar = m_Bars.at(itemIndex);
+            bar->setPen(m_Series->barsetAt(set)->pen());
+            bar->setBrush(m_Series->barsetAt(set)->brush());
             QRectF rect(xPos, yPos-barHeight, barWidth, barHeight);
             layout.append(rect);
             itemIndex++;
@@ -53,19 +53,19 @@ QVector<QRectF> StackedBarChartItem::calculateLayout()
     // Position floating values
     itemIndex = 0;
     xPos = (width/categotyCount);
-    for (int category=0; category < mSeries->categoryCount(); category++) {
+    for (int category=0; category < m_Series->categoryCount(); category++) {
         qreal yPos = height;
-        for (int set=0; set < mSeries->barsetCount(); set++) {
-            qreal barHeight = mSeries->valueAt(set, category) * scale;
-            BarValue* value = mFloatingValues.at(itemIndex);
+        for (int set=0; set < m_Series->barsetCount(); set++) {
+            qreal barHeight = m_Series->valueAt(set, category) * scale;
+            BarValue* value = m_FloatingValues.at(itemIndex);
 
-            QBarSet* barSet = mSeries->barsetAt(set);
+            QBarSet* barSet = m_Series->barsetAt(set);
             value->resize(100, 50);  // TODO: proper layout for this.
             value->setPos(xPos, yPos-barHeight / 2);
             value->setPen(barSet->floatingValuePen());
 
-            if (mSeries->valueAt(set, category) != 0) {
-                value->setValueString(QString::number(mSeries->valueAt(set,category)));
+            if (m_Series->valueAt(set, category) != 0) {
+                value->setValueString(QString::number(m_Series->valueAt(set,category)));
             } else {
                 value->setValueString(QString(""));
             }
diff --git a/src/qlegend.cpp b/src/qlegend.cpp
index df0094a..2dd74b1 100644
--- a/src/qlegend.cpp
+++ b/src/qlegend.cpp
@@ -66,31 +66,28 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 /*!
     Constructs the legend object and sets the parent to \a parent
 */
-QLegend::QLegend(QGraphicsItem *parent)
-    : QGraphicsObject(parent)
-    ,mPos(0,0)
-    ,mSize(0,0)
-    ,mMinimumSize(50,20)                // TODO: magic numbers
-    ,mMaximumSize(150,100)
-    ,m_brush(Qt::darkGray)       // TODO: from theme?
-    ,mPreferredLayout(QLegend::PreferredLayoutTop)
-    ,mFirstMarker(0)
-    ,mMargin(5)
-{
-//    setVisible(false);
-
-    mScrollButtonLeft = new LegendScrollButton(LegendScrollButton::ScrollButtonIdLeft, this);
-    mScrollButtonRight = new LegendScrollButton(LegendScrollButton::ScrollButtonIdRight, this);
-    mScrollButtonUp = new LegendScrollButton(LegendScrollButton::ScrollButtonIdUp, this);
-    mScrollButtonDown = new LegendScrollButton(LegendScrollButton::ScrollButtonIdDown, this);
-
-    connect(mScrollButtonLeft, SIGNAL(clicked(QGraphicsSceneMouseEvent*)),
+QLegend::QLegend(QGraphicsItem *parent) : QGraphicsObject(parent),
+    m_Pos(0,0),
+    m_Size(0,0),
+    m_MinimumSize(50,20),                // TODO: magic numbers
+    m_MaximumSize(150,100),
+    m_brush(Qt::darkGray),       // TODO: from theme?
+    m_PreferredLayout(QLegend::PreferredLayoutTop),
+    mFirstMarker(0),
+    m_Margin(5)
+{
+    m_ScrollButtonLeft = new LegendScrollButton(LegendScrollButton::ScrollButtonIdLeft, this);
+    m_ScrollButtonRight = new LegendScrollButton(LegendScrollButton::ScrollButtonIdRight, this);
+    m_ScrollButtonUp = new LegendScrollButton(LegendScrollButton::ScrollButtonIdUp, this);
+    m_ScrollButtonDown = new LegendScrollButton(LegendScrollButton::ScrollButtonIdDown, this);
+
+    connect(m_ScrollButtonLeft, SIGNAL(clicked(QGraphicsSceneMouseEvent*)),
             this, SLOT(handleScrollButtonClicked(QGraphicsSceneMouseEvent*)));
-    connect(mScrollButtonRight, SIGNAL(clicked(QGraphicsSceneMouseEvent*)),
+    connect(m_ScrollButtonRight, SIGNAL(clicked(QGraphicsSceneMouseEvent*)),
             this, SLOT(handleScrollButtonClicked(QGraphicsSceneMouseEvent*)));
-    connect(mScrollButtonUp, SIGNAL(clicked(QGraphicsSceneMouseEvent*)),
+    connect(m_ScrollButtonUp, SIGNAL(clicked(QGraphicsSceneMouseEvent*)),
             this, SLOT(handleScrollButtonClicked(QGraphicsSceneMouseEvent*)));
-    connect(mScrollButtonDown, SIGNAL(clicked(QGraphicsSceneMouseEvent*)),
+    connect(m_ScrollButtonDown, SIGNAL(clicked(QGraphicsSceneMouseEvent*)),
             this, SLOT(handleScrollButtonClicked(QGraphicsSceneMouseEvent*)));
 
     setZValue(ChartPresenter::LegendZValue);
@@ -115,7 +112,7 @@ void QLegend::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, Q
 */
 QRectF QLegend::boundingRect() const
 {
-    return QRectF(mPos,mSize);
+    return QRectF(m_Pos,m_Size);
 }
 
 /*!
@@ -163,7 +160,7 @@ QPen QLegend::pen() const
 */
 void QLegend::setPreferredLayout(QLegend::PreferredLayout preferred)
 {
-    mPreferredLayout = preferred;
+    m_PreferredLayout = preferred;
     updateLayout();
 }
 
@@ -172,7 +169,7 @@ void QLegend::setPreferredLayout(QLegend::PreferredLayout preferred)
 */
 QLegend::PreferredLayout QLegend::preferredLayout() const
 {
-    return mPreferredLayout;
+    return m_PreferredLayout;
 }
 
 /*!
@@ -180,7 +177,7 @@ QLegend::PreferredLayout QLegend::preferredLayout() const
 */
 QSizeF QLegend::maximumSize() const
 {
-    return mMaximumSize;
+    return m_MaximumSize;
 }
 
 /*!
@@ -189,7 +186,7 @@ QSizeF QLegend::maximumSize() const
 */
 void QLegend::setMaximumSize(const QSizeF size)
 {
-    mMaximumSize = size;
+    m_MaximumSize = size;
     updateLayout();
 }
 
@@ -198,7 +195,7 @@ void QLegend::setMaximumSize(const QSizeF size)
 */
 QSizeF QLegend::size() const
 {
-    return mSize;
+    return m_Size;
 }
 
 /*!
@@ -207,12 +204,12 @@ QSizeF QLegend::size() const
 */
 void QLegend::setSize(const QSizeF size)
 {
-    mSize = size;
-    if (mSize.width() > mMaximumSize.width()) {
-        mSize.setWidth(mMaximumSize.width());
+    m_Size = size;
+    if (m_Size.width() > m_MaximumSize.width()) {
+        m_Size.setWidth(m_MaximumSize.width());
     }
-    if (mSize.height() > mMaximumSize.height()) {
-        mSize.setHeight(mMaximumSize.height());
+    if (m_Size.height() > m_MaximumSize.height()) {
+        m_Size.setHeight(m_MaximumSize.height());
     }
 }
 
@@ -221,7 +218,7 @@ void QLegend::setSize(const QSizeF size)
 */
 void QLegend::setPos(const QPointF &pos)
 {
-    mPos = pos;
+    m_Pos = pos;
     updateLayout();
 }
 
@@ -272,7 +269,7 @@ void QLegend::handleAdded(QList<QPieSlice *> slices)
         connect(s, SIGNAL(changed()), marker, SLOT(changed()));
         connect(s, SIGNAL(destroyed()), marker, SLOT(deleteLater()));
         connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
-        mMarkers.append(marker);
+        m_Markers.append(marker);
         childItems().append(marker);
     }
     updateLayout();
@@ -285,8 +282,6 @@ void QLegend::handleAdded(QList<QPieSlice *> slices)
 void QLegend::handleRemoved(QList<QPieSlice *> slices)
 {
     Q_UNUSED(slices)
-    // Propably no need to listen for this, since removed slices are deleted and we listen destroyed signal
-//    qDebug() << "QLegend::handleRemoved(QList<QPieSlice*> slices) count:" << slices.count();
 }
 
 
@@ -297,7 +292,7 @@ void QLegend::handleMarkerDestroyed()
 {
     // TODO: what if more than one markers are destroyed and we update layout after first one?
     LegendMarker* m = static_cast<LegendMarker *> (sender());
-    mMarkers.removeOne(m);
+    m_Markers.removeOne(m);
     updateLayout();
 }
 
@@ -376,7 +371,7 @@ void QLegend::connectSeries(QSeries *series)
         break;
     }
     default: {
-        qDebug()<< "QLegend::connectSeries" << series->type() << "not implemented.";
+        qWarning() << "QLegend::connectSeries" << series->type() << "not implemented.";
         break;
     }
     }
@@ -425,7 +420,7 @@ void QLegend::disconnectSeries(QSeries *series)
         break;
     }
     default: {
-        qDebug()<< "QLegend::disconnectSeries" << series->type() << "not implemented.";
+        qWarning()<< "QLegend::disconnectSeries" << series->type() << "not implemented.";
         break;
     }
     }
@@ -489,7 +484,7 @@ void QLegend::createMarkers(QSeries *series)
         break;
     }
     default: {
-        qDebug()<< "QLegend::createMarkers" << series->type() << "not implemented.";
+        qWarning()<< "QLegend::createMarkers" << series->type() << "not implemented.";
         break;
     }
     }
@@ -506,7 +501,7 @@ void QLegend::appendMarkers(QXYSeries* series)
     marker->setBrush(series->brush());
     connect(marker, SIGNAL(clicked(QSeries *, Qt::MouseButton)), this, SIGNAL(clicked(QSeries *, Qt::MouseButton)));
     connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
-    mMarkers.append(marker);
+    m_Markers.append(marker);
     childItems().append(marker);
 }
 
@@ -524,7 +519,7 @@ void QLegend::appendMarkers(QBarSeries *series)
                 this, SIGNAL(clicked(QBarSet *, Qt::MouseButton)));
         connect(s, SIGNAL(valueChanged()), marker, SLOT(changed()));
         connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
-        mMarkers.append(marker);
+        m_Markers.append(marker);
         childItems().append(marker);
     }
 }
@@ -544,7 +539,7 @@ void QLegend::appendMarkers(QPieSeries *series)
         connect(s, SIGNAL(changed()), marker, SLOT(changed()));
         connect(s, SIGNAL(destroyed()), marker, SLOT(deleteLater()));
         connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
-        mMarkers.append(marker);
+        m_Markers.append(marker);
         childItems().append(marker);
     }
 }
@@ -555,9 +550,9 @@ void QLegend::appendMarkers(QPieSeries *series)
 void QLegend::deleteMarkers(QSeries *series)
 {
     // Search all markers that belong to given series and delete them.
-    foreach (LegendMarker *m, mMarkers) {
+    foreach (LegendMarker *m, m_Markers) {
         if (m->series() == series) {
-            mMarkers.removeOne(m);
+            m_Markers.removeOne(m);
             delete m;
         }
     }
@@ -571,7 +566,7 @@ void QLegend::deleteMarkers(QSeries *series)
 void QLegend::updateLayout()
 {
     // Calculate layout for markers and text
-    if (mMarkers.count() <= 0) {
+    if (m_Markers.count() <= 0) {
         // Nothing to do
         return;
     }
@@ -585,42 +580,42 @@ void QLegend::updateLayout()
 
     qreal totalWidth = 0;
     qreal totalHeight = 0;
-    switch (mPreferredLayout)
+    switch (m_PreferredLayout)
     {
     // Both cases organise items horizontally
     case QLegend::PreferredLayoutBottom:
     case QLegend::PreferredLayoutTop: {
 
         qreal xStep = markerMaxSize.width();
-        qreal x = mPos.x() + mMargin;
-        qreal y = mPos.y() + mMargin;
+        qreal x = m_Pos.x() + m_Margin;
+        qreal y = m_Pos.y() + m_Margin;
         int column = 0;
         int maxColumns = 1;
         qreal scrollButtonWidth = 0;
 
         // Set correct visibility for scroll scrollbuttons
         if (scrollButtonsVisible()) {
-            mScrollButtonLeft->setVisible(true);
-            mScrollButtonRight->setVisible(true);
+            m_ScrollButtonLeft->setVisible(true);
+            m_ScrollButtonRight->setVisible(true);
             // scrollbuttons visible, so add their width to total width
-            totalWidth += (mScrollButtonLeft->boundingRect().width() + mMargin) * 2;
-            scrollButtonWidth = mScrollButtonLeft->boundingRect().width() + mMargin;
+            totalWidth += (m_ScrollButtonLeft->boundingRect().width() + m_Margin) * 2;
+            scrollButtonWidth = m_ScrollButtonLeft->boundingRect().width() + m_Margin;
             // start position changes by scrollbutton width
             x += scrollButtonWidth;
         } else {
-            mScrollButtonLeft->setVisible(false);
-            mScrollButtonRight->setVisible(false);
+            m_ScrollButtonLeft->setVisible(false);
+            m_ScrollButtonRight->setVisible(false);
         }
-        mScrollButtonUp->setVisible(false);
-        mScrollButtonDown->setVisible(false);
+        m_ScrollButtonUp->setVisible(false);
+        m_ScrollButtonDown->setVisible(false);
 
-        for (int i=0; i < mMarkers.count(); i++) {
-            LegendMarker *m = mMarkers.at(i);
+        for (int i=0; i < m_Markers.count(); i++) {
+            LegendMarker *m = m_Markers.at(i);
             if (i < mFirstMarker) {
                 // Markers before first are not visible.
                 m->setVisible(false);
             } else {
-                if ((x + xStep + scrollButtonWidth + mMargin) > (mPos.x() + mMaximumSize.width())) {
+                if ((x + xStep + scrollButtonWidth + m_Margin) > (m_Pos.x() + m_MaximumSize.width())) {
                     // This marker would go outside legend rect.
                     m->setVisible(false);
                 } else {
@@ -634,11 +629,11 @@ void QLegend::updateLayout()
             maxColumns = column;
         }
 
-        mScrollButtonLeft->setPos(mPos.x() + mMargin, y);
-        mScrollButtonRight->setPos(x + mMargin, y);
+        m_ScrollButtonLeft->setPos(m_Pos.x() + m_Margin, y);
+        m_ScrollButtonRight->setPos(x + m_Margin, y);
 
-        totalWidth += maxColumns * markerMaxSize.width() + mMargin * 2;
-        totalHeight = markerMaxSize.height() + mMargin * 2;
+        totalWidth += maxColumns * markerMaxSize.width() + m_Margin * 2;
+        totalHeight = markerMaxSize.height() + m_Margin * 2;
 
         break;
     }
@@ -646,33 +641,33 @@ void QLegend::updateLayout()
     case QLegend::PreferredLayoutLeft:
     case QLegend::PreferredLayoutRight: {
         qreal yStep = markerMaxSize.height();
-        qreal x = mPos.x() + mMargin;
-        qreal y = mPos.y() + mMargin;
+        qreal x = m_Pos.x() + m_Margin;
+        qreal y = m_Pos.y() + m_Margin;
         int row = 1;
         int maxRows = 1;
         qreal scrollButtonHeight = 0;
 
         // Set correct visibility for scroll scrollbuttons
         if (scrollButtonsVisible()) {
-            mScrollButtonUp->setVisible(true);
-            mScrollButtonDown->setVisible(true);
-            totalHeight += (mScrollButtonUp->boundingRect().height() + mMargin) * 2;   // scrollbuttons visible, so add their height to total height
-            scrollButtonHeight = mScrollButtonUp->boundingRect().height();
-            y += scrollButtonHeight + mMargin;                                         // start position changes by scrollbutton height
+            m_ScrollButtonUp->setVisible(true);
+            m_ScrollButtonDown->setVisible(true);
+            totalHeight += (m_ScrollButtonUp->boundingRect().height() + m_Margin) * 2;   // scrollbuttons visible, so add their height to total height
+            scrollButtonHeight = m_ScrollButtonUp->boundingRect().height();
+            y += scrollButtonHeight + m_Margin;                                         // start position changes by scrollbutton height
         } else {
-            mScrollButtonUp->setVisible(false);
-            mScrollButtonDown->setVisible(false);
+            m_ScrollButtonUp->setVisible(false);
+            m_ScrollButtonDown->setVisible(false);
         }
-        mScrollButtonLeft->setVisible(false);
-        mScrollButtonRight->setVisible(false);
+        m_ScrollButtonLeft->setVisible(false);
+        m_ScrollButtonRight->setVisible(false);
 
-        for (int i=0; i < mMarkers.count(); i++) {
-            LegendMarker* m = mMarkers.at(i);
+        for (int i=0; i < m_Markers.count(); i++) {
+            LegendMarker* m = m_Markers.at(i);
             if (i < mFirstMarker) {
                 // Markers before first are not visible.
                 m->setVisible(false);
             } else {
-                if ((y + yStep + scrollButtonHeight) > (mPos.y() + mMaximumSize.height())) {
+                if ((y + yStep + scrollButtonHeight) > (m_Pos.y() + m_MaximumSize.height())) {
                     // This marker would go outside legend rect.
                     m->setVisible(false);
                 } else {
@@ -686,11 +681,11 @@ void QLegend::updateLayout()
             maxRows = row;
         }
 
-        mScrollButtonUp->setPos(mPos.x() + mMargin, mPos.y() + mMargin);
-        mScrollButtonDown->setPos(mPos.x() + mMargin, y + mMargin);
+        m_ScrollButtonUp->setPos(m_Pos.x() + m_Margin, m_Pos.y() + m_Margin);
+        m_ScrollButtonDown->setPos(m_Pos.x() + m_Margin, y + m_Margin);
 
-        totalWidth += markerMaxSize.width() + mMargin * 2;
-        totalHeight = maxRows * markerMaxSize.height() + mMargin * 4 + scrollButtonHeight; // TODO: check this
+        totalWidth += markerMaxSize.width() + m_Margin * 2;
+        totalHeight = maxRows * markerMaxSize.height() + m_Margin * 4 + scrollButtonHeight; // TODO: check this
         break;
     }
     default: {
@@ -698,8 +693,8 @@ void QLegend::updateLayout()
     }
     }
 
-    mSize.setWidth(totalWidth);
-    mSize.setHeight(totalHeight);
+    m_Size.setWidth(totalWidth);
+    m_Size.setHeight(totalHeight);
 
     update();
 }
@@ -718,10 +713,10 @@ void QLegend::rescaleScrollButtons(const QSize &size)
     QPolygonF down;
     down << QPointF(0, 0) << QPointF(size.width() / 2, size.height()) << QPointF(size.width(), 0);
 
-    mScrollButtonLeft->setPolygon(left);
-    mScrollButtonRight->setPolygon(right);
-    mScrollButtonUp->setPolygon(up);
-    mScrollButtonDown->setPolygon(down);
+    m_ScrollButtonLeft->setPolygon(left);
+    m_ScrollButtonRight->setPolygon(right);
+    m_ScrollButtonUp->setPolygon(up);
+    m_ScrollButtonDown->setPolygon(down);
 }
 
 /*!
@@ -730,7 +725,7 @@ void QLegend::rescaleScrollButtons(const QSize &size)
 QSizeF QLegend::maximumMarkerSize()
 {
     QSizeF max(0,0);
-    foreach (LegendMarker* m, mMarkers) {
+    foreach (LegendMarker* m, m_Markers) {
         if (m->boundingRect().width() > max.width())
             max.setWidth(m->boundingRect().width());
         if (m->boundingRect().height() > max.height())
@@ -745,28 +740,28 @@ QSizeF QLegend::maximumMarkerSize()
 */
 void QLegend::checkFirstMarkerBounds()
 {
-    if ((mPreferredLayout == QLegend::PreferredLayoutLeft) || (mPreferredLayout == QLegend::PreferredLayoutRight)) {
+    if ((m_PreferredLayout == QLegend::PreferredLayoutLeft) || (m_PreferredLayout == QLegend::PreferredLayoutRight)) {
         // Bounds limited by height.
         int max;
         if (scrollButtonsVisible()) {
-            max = (mMaximumSize.height() - mScrollButtonLeft->boundingRect().height() * 2 - mMargin * 4) / maximumMarkerSize().height();
+            max = (m_MaximumSize.height() - m_ScrollButtonLeft->boundingRect().height() * 2 - m_Margin * 4) / maximumMarkerSize().height();
         } else {
-            max = mMaximumSize.height() / maximumMarkerSize().height();
+            max = m_MaximumSize.height() / maximumMarkerSize().height();
         }
 
-        if (mFirstMarker > mMarkers.count() - max)
-            mFirstMarker = mMarkers.count() - max;
+        if (mFirstMarker > m_Markers.count() - max)
+            mFirstMarker = m_Markers.count() - max;
     } else {
         // Bounds limited by width
         int max;
         if (scrollButtonsVisible()) {
-            max = (mMaximumSize.width() - mScrollButtonLeft->boundingRect().width() * 2 - mMargin*4) / maximumMarkerSize().width();
+            max = (m_MaximumSize.width() - m_ScrollButtonLeft->boundingRect().width() * 2 - m_Margin*4) / maximumMarkerSize().width();
         } else {
-            max = mMaximumSize.width() / maximumMarkerSize().width();
+            max = m_MaximumSize.width() / maximumMarkerSize().width();
         }
 
-        if (mFirstMarker > mMarkers.count() - max)
-            mFirstMarker = mMarkers.count() - max;
+        if (mFirstMarker > m_Markers.count() - max)
+            mFirstMarker = m_Markers.count() - max;
     }
 
     if (mFirstMarker < 0)
@@ -779,13 +774,13 @@ void QLegend::checkFirstMarkerBounds()
 bool QLegend::scrollButtonsVisible()
 {
     // Just a helper to clarify, what the magic below means :)
-    if ((mPreferredLayout == QLegend::PreferredLayoutTop) || (mPreferredLayout == QLegend::PreferredLayoutBottom)) {
-        return (maximumMarkerSize().width() * mMarkers.count() + mMargin * 2 > mMaximumSize.width());
-    } else if ((mPreferredLayout == QLegend::PreferredLayoutLeft) || (mPreferredLayout == QLegend::PreferredLayoutRight)) {
-        return (maximumMarkerSize().height() * mMarkers.count() + mMargin * 2 > mMaximumSize.height());
+    if ((m_PreferredLayout == QLegend::PreferredLayoutTop) || (m_PreferredLayout == QLegend::PreferredLayoutBottom)) {
+        return (maximumMarkerSize().width() * m_Markers.count() + m_Margin * 2 > m_MaximumSize.width());
+    } else if ((m_PreferredLayout == QLegend::PreferredLayoutLeft) || (m_PreferredLayout == QLegend::PreferredLayoutRight)) {
+        return (maximumMarkerSize().height() * m_Markers.count() + m_Margin * 2 > m_MaximumSize.height());
     }
 
-    return (maximumMarkerSize().height() * mMarkers.count() + mMargin * 2 > mMaximumSize.height());
+    return (maximumMarkerSize().height() * m_Markers.count() + m_Margin * 2 > m_MaximumSize.height());
 }
 
 #include "moc_qlegend.cpp"
diff --git a/src/qlegend.h b/src/qlegend.h
index 7d39232..a675ff3 100644
--- a/src/qlegend.h
+++ b/src/qlegend.h
@@ -2,8 +2,9 @@
 #define QLEGEND_H
 
 #include <qchartglobal.h>
-#include <qseries.h>
 #include <QGraphicsObject>
+#include <QPen>
+#include <QBrush>
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
@@ -15,6 +16,7 @@ class QBarSet;
 class QBarSeries;
 class QPieSeries;
 class LegendScrollButton;
+class QSeries;
 
 class QTCOMMERCIALCHART_EXPORT QLegend : public QGraphicsObject
 {
@@ -80,25 +82,25 @@ private:
     void checkFirstMarkerBounds();
     bool scrollButtonsVisible();
 
-    QPointF mPos;
-    QSizeF mSize;
-    QSizeF mMinimumSize;
-    QSizeF mMaximumSize;
+    QPointF m_Pos;
+    QSizeF m_Size;
+    QSizeF m_MinimumSize;
+    QSizeF m_MaximumSize;
 
-    QList<LegendMarker *> mMarkers;
+    QList<LegendMarker *> m_Markers;
 
     QBrush m_brush;
     QPen m_pen;
-    QLegend::PreferredLayout mPreferredLayout;
+    QLegend::PreferredLayout m_PreferredLayout;
 
     int mFirstMarker;
 
-    LegendScrollButton *mScrollButtonLeft;
-    LegendScrollButton *mScrollButtonRight;
-    LegendScrollButton *mScrollButtonUp;
-    LegendScrollButton *mScrollButtonDown;
+    LegendScrollButton *m_ScrollButtonLeft;
+    LegendScrollButton *m_ScrollButtonRight;
+    LegendScrollButton *m_ScrollButtonUp;
+    LegendScrollButton *m_ScrollButtonDown;
 
-    qreal mMargin;
+    qreal m_Margin;
     // <--- PIMPL
 };