aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Schroeder <holger.schroeder.ext@basyskom.de>2010-09-08 14:32:33 +0200
committerMike FABIAN <mike.fabian@basyskom.de>2010-09-08 15:03:29 +0200
commit26ea10b15185e3d3b2a9fd5ddb61a5defec50336 (patch)
tree961a0c19fa7723ba81cfcf214921bcf190bc6285
parente29b6ae989520f065cd3ed3d4f3f3f89c5a29994 (diff)
Changes: get rid of lupdate warnings
RevBy: Mike FABIAN Details: for some reason lupdate recognizes "/*=" as a special marker. then it throws errors like this: .../qtmaemo6scrollbareventfilter.cpp:44: Discarding unconsumed meta data so this patch replaces the "/*=" by "/* =" and lupdate does not throw warnings any more.
-rw-r--r--plainqt/style/qtmaemo6scrollbareventfilter.cpp4
-rwxr-xr-xplainqt/style/qtmaemo6style.cpp20
-rw-r--r--plainqt/style/qtmaemo6window.cpp2
-rw-r--r--plainqt/style/qtmaemo6windowdecoration.cpp2
4 files changed, 14 insertions, 14 deletions
diff --git a/plainqt/style/qtmaemo6scrollbareventfilter.cpp b/plainqt/style/qtmaemo6scrollbareventfilter.cpp
index 2fe894ef..fba493f6 100644
--- a/plainqt/style/qtmaemo6scrollbareventfilter.cpp
+++ b/plainqt/style/qtmaemo6scrollbareventfilter.cpp
@@ -38,7 +38,7 @@
#include <mwidgetfadeanimationstyle.h>
#ifdef SHOW_SCROLLING_THUMBNAIL
-AbstractScrollAreaThumbView::AbstractScrollAreaThumbView(QWidget *parent /*= NULL*/)
+AbstractScrollAreaThumbView::AbstractScrollAreaThumbView(QWidget *parent /* = NULL*/)
: QLabel(parent)
{
setVisible(false);
@@ -206,7 +206,7 @@ void QtMaemo6ScrollBarEventFilter::setScrollBarVisibility(QScrollBar *scrollBar)
void QtMaemo6ScrollBarEventFilter::generateScrollAreaThumb(QAbstractScrollArea *scrollArea,
- bool forceUpdate /*= false*/)
+ bool forceUpdate /* = false*/)
{
#ifndef SHOW_SCROLLING_THUMBNAIL
//surpress unused warning while this is inactive
diff --git a/plainqt/style/qtmaemo6style.cpp b/plainqt/style/qtmaemo6style.cpp
index 1e71b6bf..09814a14 100755
--- a/plainqt/style/qtmaemo6style.cpp
+++ b/plainqt/style/qtmaemo6style.cpp
@@ -410,7 +410,7 @@ bool QtMaemo6Style::drawBackground(QPainter *p,
const QStyleOption *option,
const QRect &rect,
const MWidgetStyle *style,
- const QWidget* w /*= 0*/) const
+ const QWidget* w /* = 0*/) const
{
Q_D(const QtMaemo6Style);
bool ret = false;
@@ -603,7 +603,7 @@ void QtMaemo6StylePrivate::drawBasicButton(QPainter *p,
const QRect &rect,
const QStyleOption *option,
const QString &styleClass,
- const QString &styleObject /*= QString()*/) const
+ const QString &styleObject /* = QString()*/) const
{
const MButtonStyle *style =
static_cast<const MButtonStyle *>(QtMaemo6StylePrivate::mStyle(option->state,
@@ -619,7 +619,7 @@ void QtMaemo6StylePrivate::drawToggleButton(QPainter *p,
const QRect &rect,
const QStyleOption *option,
const QString &styleClass,
- const QString &styleObject /*= QString()*/) const
+ const QString &styleObject /* = QString()*/) const
{
const MButtonStyle *style =
static_cast<const MButtonStyle *>(QtMaemo6StylePrivate::mStyle(option->state,
@@ -754,7 +754,7 @@ void QtMaemo6StylePrivate::drawButtonIcon(const MButtonStyle *style,
QPainter *painter,
const QRect &contentsRect,
const QIcon &icon,
- const QSize &iconSize /*= QSize()*/) const
+ const QSize &iconSize /* = QSize()*/) const
{
if(style) {
Q_Q(const QtMaemo6Style);
@@ -779,9 +779,9 @@ void QtMaemo6StylePrivate::drawButtonIcon(const MButtonStyle *style,
QRect QtMaemo6StylePrivate::getTextAndIconRect(const MButtonStyle *style,
const QString &text,
- const QIcon &icon /*= QIcon()*/,
- const QFont &font /*= QFont()*/,
- const QSize &iconSize /*= QSize()*/) const
+ const QIcon &icon /* = QIcon()*/,
+ const QFont &font /* = QFont()*/,
+ const QSize &iconSize /* = QSize()*/) const
{
QRect textAndIconRect;
QRect textRect = textBoundingRect(text, font);
@@ -853,7 +853,7 @@ void QtMaemo6StylePrivate::paddingFromStyle(const MWidgetStyle *style,
}
QRect QtMaemo6StylePrivate::scrollBarSliderRect(const QStyleOptionComplex *option,
- const QWidget *widget /*= 0*/) const
+ const QWidget *widget /* = 0*/) const
{
Q_Q(const QtMaemo6Style);
if (const QStyleOptionSlider *scrollBar = qstyleoption_cast<const QStyleOptionSlider *>(option)) {
@@ -1781,7 +1781,7 @@ void QtMaemo6Style::drawControl(ControlElement element,
void QtMaemo6Style::drawComplexControl(ComplexControl control,
const QStyleOptionComplex *opt,
QPainter *p,
- const QWidget *widget /*= 0*/) const
+ const QWidget *widget /* = 0*/) const
{
if( !isStyled( widget ) ) {
QPlastiqueStyle::drawComplexControl(control, opt, p, widget);
@@ -2082,7 +2082,7 @@ void QtMaemo6Style::drawComplexControl(ComplexControl control,
QRect QtMaemo6Style::subControlRect(ComplexControl control,
const QStyleOptionComplex *option,
SubControl subControl,
- const QWidget *widget /*= 0*/) const
+ const QWidget *widget /* = 0*/) const
{
if( !isStyled( widget ) ) {
return QPlastiqueStyle::subControlRect(control, option, subControl, widget);
diff --git a/plainqt/style/qtmaemo6window.cpp b/plainqt/style/qtmaemo6window.cpp
index 7eb0b98f..c838b5be 100644
--- a/plainqt/style/qtmaemo6window.cpp
+++ b/plainqt/style/qtmaemo6window.cpp
@@ -33,7 +33,7 @@
#include "qtmaemo6dialogtitle.h"
#include "qtmaemo6style_p.h"
-QtMaemo6Window::QtMaemo6Window(QWidget *originalWidget, QWidget *parent /*= NULL*/)
+QtMaemo6Window::QtMaemo6Window(QWidget *originalWidget, QWidget *parent /* = NULL*/)
: QWidget(parent)
, m_window(originalWidget)
, m_centralWidget(0)
diff --git a/plainqt/style/qtmaemo6windowdecoration.cpp b/plainqt/style/qtmaemo6windowdecoration.cpp
index 47905527..65cdbda0 100644
--- a/plainqt/style/qtmaemo6windowdecoration.cpp
+++ b/plainqt/style/qtmaemo6windowdecoration.cpp
@@ -41,7 +41,7 @@
const int QtMaemo6WindowDecoration::layoutOffset = 2;
-QtMaemo6WindowDecoration::QtMaemo6WindowDecoration(QWidget *mw, QWidget *parent /*= NULL*/)
+QtMaemo6WindowDecoration::QtMaemo6WindowDecoration(QWidget *mw, QWidget *parent /* = NULL*/)
: QtMaemo6Window(mw, parent),
m_menuBar(0),
m_statusBar(0),