whitespace fixes

remove trailing spaces & expand tabs

Change-Id: If9909c94b52d9dacb7c8735470525d18a1c97d6b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

7 files changed, 205 insertions, 204 deletions

diff --git a/src/shared/deviceskin/deviceskin.cpp b/src/shared/deviceskin/deviceskin.cpp
index 7677d515f..5e4ae43ec 100644
--- a/src/shared/deviceskin/deviceskin.cpp
+++ b/src/shared/deviceskin/deviceskin.cpp
@@ -99,14 +99,14 @@ QDebug &operator<<(QDebug &str, const DeviceSkinButtonArea &a)
 QDebug operator<<(QDebug str, const DeviceSkinParameters &p)
 {
     str << "Images " << p.skinImageUpFileName << ','
-	<< p.skinImageDownFileName<< ',' << p.skinImageClosedFileName
-	<<  ',' <<  p.skinCursorFileName <<"\nScreen: " << p.screenRect
-	<< " back: " << p.backScreenRect << " closed: " << p.closedScreenRect
-	<< " cursor: " << p.cursorHot << " Prefix: " <<  p.prefix
-	<< " Joystick: " << p.joystick << " MouseHover" << p.hasMouseHover;
+        << p.skinImageDownFileName<< ',' << p.skinImageClosedFileName
+        <<  ',' <<  p.skinCursorFileName <<"\nScreen: " << p.screenRect
+        << " back: " << p.backScreenRect << " closed: " << p.closedScreenRect
+        << " cursor: " << p.cursorHot << " Prefix: " <<  p.prefix
+        << " Joystick: " << p.joystick << " MouseHover" << p.hasMouseHover;
     const int numAreas = p.buttonAreas.size();
     for (int i = 0; i < numAreas; i++)
-	str <<  p.buttonAreas[i];
+        str <<  p.buttonAreas[i];
     return str;
 }
 
@@ -151,7 +151,7 @@ bool DeviceSkinParameters::read(const QString &skinDirectory,  ReadMode rm,  QSt
     QTextStream ts(&f);
     const bool rc = read(ts, rm, errorMessage);
     if (!rc)
-	*errorMessage =  DeviceSkin::tr("The skin configuration file '%1' could not be read: %2").arg(fn).arg(*errorMessage);
+        *errorMessage =  DeviceSkin::tr("The skin configuration file '%1' could not be read: %2").arg(fn).arg(*errorMessage);
     return rc;
 }
 bool DeviceSkinParameters::read(QTextStream &ts, ReadMode rm, QString *errorMessage)
@@ -329,10 +329,10 @@ bool DeviceSkinParameters::read(QTextStream &ts, ReadMode rm, QString *errorMess
                     joystick = i;
                 area.activeWhenClosed = closedAreas.contains(area.name)
                     || area.keyCode == Qt::Key_Flip; // must be to work
-		area.toggleArea = toggleAreas.contains(area.name);
-		area.toggleActiveArea = toggleActiveAreas.contains(area.name);
-		if ( area.toggleArea )
-		    toggleAreaList += i;
+                area.toggleArea = toggleAreas.contains(area.name);
+                area.toggleActiveArea = toggleActiveAreas.contains(area.name);
+                if (area.toggleArea)
+                    toggleAreaList += i;
                 i++;
             }
         }
@@ -342,7 +342,7 @@ bool DeviceSkinParameters::read(QTextStream &ts, ReadMode rm, QString *errorMess
                       .arg(nareas).arg(i);
     }
     if (debugDeviceSkin)
-	qDebug() << *this;
+        qDebug() << *this;
     return true;
 }
 
@@ -401,10 +401,10 @@ DeviceSkin::DeviceSkin(const DeviceSkinParameters &parameters,  QWidget *p ) :
 void DeviceSkin::skinKeyRepeat()
 {
     if ( m_view ) {
-	const DeviceSkinButtonArea &area = m_parameters.buttonAreas[buttonIndex];
-	emit skinKeyReleaseEvent( area.keyCode,area.text, true );
-	emit skinKeyPressEvent( area.keyCode, area.text, true );
-	t_skinkey->start(key_repeat_period);
+        const DeviceSkinButtonArea &area = m_parameters.buttonAreas[buttonIndex];
+        emit skinKeyReleaseEvent(area.keyCode,area.text, true);
+        emit skinKeyPressEvent(area.keyCode, area.text, true);
+        t_skinkey->start(key_repeat_period);
     }
 }
 
@@ -412,16 +412,16 @@ void DeviceSkin::calcRegions()
 {
     const int numAreas = m_parameters.buttonAreas.size();
     for (int i=0; i<numAreas; i++) {
-	QPolygon xa(m_parameters.buttonAreas[i].area.count());
-	int n = m_parameters.buttonAreas[i].area.count();
-	for (int p=0; p<n; p++) {
-	    xa.setPoint(p,transform.map(m_parameters.buttonAreas[i].area[p]));
-	}
-	if ( n == 2 ) {
-	    buttonRegions[i] = QRegion(xa.boundingRect());
-	} else {
-	    buttonRegions[i] = QRegion(xa);
-	}
+        QPolygon xa(m_parameters.buttonAreas[i].area.count());
+        int n = m_parameters.buttonAreas[i].area.count();
+        for (int p = 0; p < n; p++) {
+            xa.setPoint(p,transform.map(m_parameters.buttonAreas[i].area[p]));
+        }
+        if (n == 2) {
+            buttonRegions[i] = QRegion(xa.boundingRect());
+        } else {
+            buttonRegions[i] = QRegion(xa);
+        }
     }
 }
 
@@ -434,33 +434,33 @@ void DeviceSkin::loadImages()
     const bool hasClosedImage = !m_parameters.skinImageClosed.isNull();
 
     if (hasClosedImage)
-	iclosed =  m_parameters.skinImageClosed;
+        iclosed =  m_parameters.skinImageClosed;
     QImage icurs;
     const bool hasCursorImage = !m_parameters.skinCursor.isNull();
     if (hasCursorImage)
-	icurs =  m_parameters.skinCursor;
+        icurs =  m_parameters.skinCursor;
 
     if (!transform.isIdentity()) {
-	iup = iup.transformed(transform, Qt::SmoothTransformation);
-	idown = idown.transformed(transform, Qt::SmoothTransformation);
-	if (hasClosedImage)
-	    iclosed = iclosed.transformed(transform, Qt::SmoothTransformation);
-	if (hasCursorImage)
-	    icurs = icurs.transformed(transform, Qt::SmoothTransformation);
+        iup = iup.transformed(transform, Qt::SmoothTransformation);
+        idown = idown.transformed(transform, Qt::SmoothTransformation);
+        if (hasClosedImage)
+            iclosed = iclosed.transformed(transform, Qt::SmoothTransformation);
+        if (hasCursorImage)
+            icurs = icurs.transformed(transform, Qt::SmoothTransformation);
     }
     const Qt::ImageConversionFlags conv = Qt::ThresholdAlphaDither|Qt::AvoidDither;
     skinImageUp = QPixmap::fromImage(iup);
     skinImageDown = QPixmap::fromImage(idown, conv);
     if (hasClosedImage)
-	skinImageClosed = QPixmap::fromImage(iclosed, conv);
+        skinImageClosed = QPixmap::fromImage(iclosed, conv);
     if (hasCursorImage)
-	skinCursor = QPixmap::fromImage(icurs, conv);
+        skinCursor = QPixmap::fromImage(icurs, conv);
 
     setFixedSize( skinImageUp.size() );
     if (!skinImageUp.mask())
-	skinImageUp.setMask(skinImageUp.createHeuristicMask());
+        skinImageUp.setMask(skinImageUp.createHeuristicMask());
     if (!skinImageClosed.mask())
-	skinImageClosed.setMask(skinImageClosed.createHeuristicMask());
+        skinImageClosed.setMask(skinImageClosed.createHeuristicMask());
 
     QWidget* parent = parentWidget();
     parent->setMask( skinImageUp.mask() );
@@ -469,9 +469,9 @@ void DeviceSkin::loadImages()
     delete cursorw;
     cursorw = 0;
     if (hasCursorImage) {
-	cursorw = new qvfb_internal::CursorWindow(m_parameters.skinCursor, m_parameters.cursorHot, this);
-	if ( m_view )
-	    cursorw->setView(m_view);
+        cursorw = new qvfb_internal::CursorWindow(m_parameters.skinCursor, m_parameters.cursorHot, this);
+        if (m_view)
+            cursorw->setView(m_view);
     }
 }
 
@@ -487,7 +487,7 @@ void DeviceSkin::setTransform( const QMatrix& wm )
     loadImages();
     if ( m_view ) {
         QPoint p = transform.map(QPolygon(m_parameters.screenRect)).boundingRect().topLeft();
-	m_view->move(p);
+        m_view->move(p);
     }
     updateSecondaryScreen();
 }
@@ -524,7 +524,7 @@ void DeviceSkin::setView( QWidget *v )
     m_view->setFocus();
     m_view->move(transform.map(QPolygon(m_parameters.screenRect)).boundingRect().topLeft());
     if ( cursorw )
-	cursorw->setView(v);
+        cursorw->setView(v);
 }
 
 void DeviceSkin::setSecondaryView( QWidget *v )
@@ -537,9 +537,9 @@ void DeviceSkin::paintEvent( QPaintEvent *)
 {
     QPainter p( this );
     if ( flipped_open ) {
-	p.drawPixmap( 0, 0, skinImageUp );
+        p.drawPixmap(0, 0, skinImageUp);
     } else {
-	p.drawPixmap( 0, 0, skinImageClosed );
+        p.drawPixmap(0, 0, skinImageClosed);
     }
     QList<int> toDraw;
     if ( buttonPressed == true ) {
@@ -547,13 +547,13 @@ void DeviceSkin::paintEvent( QPaintEvent *)
     }
     foreach (int toggle, m_parameters.toggleAreaList) {
         const DeviceSkinButtonArea &ba = m_parameters.buttonAreas[toggle];
-	if ( flipped_open || ba.activeWhenClosed ) {
-	    if ( ba.toggleArea && ba.toggleActiveArea )
-		toDraw += toggle;
-	}
+        if (flipped_open || ba.activeWhenClosed) {
+            if (ba.toggleArea && ba.toggleActiveArea)
+                toDraw += toggle;
+        }
     }
     foreach (int button, toDraw ) {
-	const DeviceSkinButtonArea &ba = m_parameters.buttonAreas[button];
+        const DeviceSkinButtonArea &ba = m_parameters.buttonAreas[button];
         const QRect r = buttonRegions[button].boundingRect();
         if ( ba.area.count() > 2 )
             p.setClipRegion(buttonRegions[button]);
@@ -564,14 +564,14 @@ void DeviceSkin::paintEvent( QPaintEvent *)
 void DeviceSkin::mousePressEvent( QMouseEvent *e )
 {
     if (e->button() == Qt::RightButton) {
-	emit popupMenu();
+        emit popupMenu();
     } else {
-	buttonPressed = false;
+        buttonPressed = false;
 
-	onjoyrelease = -1;
-	const int numAreas = m_parameters.buttonAreas.size();
+        onjoyrelease = -1;
+        const int numAreas = m_parameters.buttonAreas.size();
         for (int i = 0; i < numAreas ; i++) {
-	    const DeviceSkinButtonArea &ba = m_parameters.buttonAreas[i];
+            const DeviceSkinButtonArea &ba = m_parameters.buttonAreas[i];
             if (  buttonRegions[i].contains( e->pos() ) ) {
                 if ( flipped_open || ba.activeWhenClosed ) {
                     if ( m_parameters.joystick == i ) {
@@ -582,30 +582,30 @@ void DeviceSkin::mousePressEvent( QMouseEvent *e )
                         else
                             startPress(i);
                         break;
-			if (debugDeviceSkin)// Debug message to be sure we are clicking the right areas
-			    qDebug()<< m_parameters.buttonAreas[i].name << " clicked";
+                        if (debugDeviceSkin)// Debug message to be sure we are clicking the right areas
+                            qDebug()<< m_parameters.buttonAreas[i].name << " clicked";
                     }
                 }
             }
         }
-	clickPos = e->pos();
-//	This is handy for finding the areas to define rectangles for new skins
-	if (debugDeviceSkin)
-	    qDebug()<< "Clicked in " <<  e->pos().x() << ',' <<  e->pos().y();
-	clickPos = e->pos();
+        clickPos = e->pos();
+//      This is handy for finding the areas to define rectangles for new skins
+        if (debugDeviceSkin)
+            qDebug()<< "Clicked in " <<  e->pos().x() << ',' <<  e->pos().y();
+        clickPos = e->pos();
     }
 }
 
 void DeviceSkin::flip(bool open)
 {
     if ( flipped_open == open )
-	return;
+        return;
     if ( open ) {
-	parent->setMask( skinImageUp.mask() );
-	emit skinKeyReleaseEvent( Qt::Key(Qt::Key_Flip), QString(), false);
+        parent->setMask(skinImageUp.mask());
+        emit skinKeyReleaseEvent(Qt::Key(Qt::Key_Flip), QString(), false);
     } else {
-	parent->setMask( skinImageClosed.mask() );
-	emit skinKeyPressEvent( Qt::Key(Qt::Key_Flip), QString(), false);
+        parent->setMask(skinImageClosed.mask());
+        emit skinKeyPressEvent(Qt::Key(Qt::Key_Flip), QString(), false);
     }
     flipped_open = open;
     updateSecondaryScreen();
@@ -617,21 +617,21 @@ void DeviceSkin::startPress(int i)
     buttonPressed = true;
     buttonIndex = i;
     if (m_view) {
-	const DeviceSkinButtonArea &ba = m_parameters.buttonAreas[buttonIndex];
-	if ( ba.keyCode == Qt::Key_Flip ) {
-	    flip(!flipped_open);
-	} else if ( ba.toggleArea ) {
-	    bool active = !ba.toggleActiveArea;
-	    const_cast<DeviceSkinButtonArea &>(ba).toggleActiveArea = active;
-	    if ( active )
-	        emit skinKeyPressEvent( ba.keyCode, ba.text, false);
-	    else
-	        emit skinKeyReleaseEvent( ba.keyCode, ba.text, false);
-	} else {
-	    emit skinKeyPressEvent( ba.keyCode, ba.text, false);
-	    t_skinkey->start(key_repeat_delay);
-	}
-	repaint( buttonRegions[buttonIndex].boundingRect() );
+        const DeviceSkinButtonArea &ba = m_parameters.buttonAreas[buttonIndex];
+        if (ba.keyCode == Qt::Key_Flip) {
+            flip(!flipped_open);
+        } else if (ba.toggleArea) {
+            bool active = !ba.toggleActiveArea;
+            const_cast<DeviceSkinButtonArea &>(ba).toggleActiveArea = active;
+            if (active)
+                emit skinKeyPressEvent(ba.keyCode, ba.text, false);
+            else
+                emit skinKeyReleaseEvent(ba.keyCode, ba.text, false);
+        } else {
+            emit skinKeyPressEvent(ba.keyCode, ba.text, false);
+            t_skinkey->start(key_repeat_delay);
+        }
+        repaint(buttonRegions[buttonIndex].boundingRect());
     }
 }
 
@@ -639,7 +639,7 @@ void DeviceSkin::endPress()
 {
     const DeviceSkinButtonArea &ba = m_parameters.buttonAreas[buttonIndex];
     if (m_view && ba.keyCode != Qt::Key_Flip && !ba.toggleArea )
-	emit skinKeyReleaseEvent(ba.keyCode, ba.text, false );
+        emit skinKeyReleaseEvent(ba.keyCode, ba.text, false);
     t_skinkey->stop();
     buttonPressed = false;
     repaint( buttonRegions[buttonIndex].boundingRect() );
@@ -648,40 +648,40 @@ void DeviceSkin::endPress()
 void DeviceSkin::mouseMoveEvent( QMouseEvent *e )
 {
     if ( e->buttons() & Qt::LeftButton ) {
-	const int joystick = m_parameters.joystick;
-	QPoint newpos =  e->globalPos() - clickPos;
-	if ( joydown ) {
-	    int k1=0, k2=0;
-	    if ( newpos.x() < -joydistance ) {
-		k1 = joystick+1;
-	    } else if ( newpos.x() > +joydistance ) {
-		k1 = joystick+3;
-	    }
-	    if ( newpos.y() < -joydistance ) {
-		k2 = joystick+2;
-	    } else if ( newpos.y() > +joydistance ) {
-		k2 = joystick+4;
-	    }
-	    if ( k1 || k2 ) {
-		if ( !buttonPressed ) {
-		    onjoyrelease = -1;
-		    if ( k1 && k2 ) {
-			startPress(k2);
-			endPress();
-		    }
-		    startPress(k1 ? k1 : k2);
-		}
-	    } else if ( buttonPressed ) {
-		endPress();
-	    }
-	} else if ( buttonPressed == false ) {
-	    parentpos = newpos;
-	    if ( !t_parentmove->isActive() )
-		t_parentmove->start(50);
-	}
+        const int joystick = m_parameters.joystick;
+        QPoint newpos =  e->globalPos() - clickPos;
+        if (joydown) {
+            int k1=0, k2=0;
+            if (newpos.x() < -joydistance) {
+                k1 = joystick+1;
+            } else if (newpos.x() > +joydistance) {
+                k1 = joystick+3;
+            }
+            if (newpos.y() < -joydistance) {
+                k2 = joystick+2;
+            } else if (newpos.y() > +joydistance) {
+                k2 = joystick+4;
+            }
+            if (k1 || k2) {
+                if (!buttonPressed) {
+                    onjoyrelease = -1;
+                    if (k1 && k2) {
+                        startPress(k2);
+                        endPress();
+                    }
+                    startPress(k1 ? k1 : k2);
+                }
+            } else if (buttonPressed) {
+                endPress();
+            }
+        } else if (buttonPressed == false) {
+            parentpos = newpos;
+            if (!t_parentmove->isActive())
+                t_parentmove->start(50);
+        }
     }
     if ( cursorw )
-	cursorw->setPos(e->globalPos());
+        cursorw->setPos(e->globalPos());
 }
 
 void DeviceSkin::moveParent()
@@ -692,13 +692,13 @@ void DeviceSkin::moveParent()
 void DeviceSkin::mouseReleaseEvent( QMouseEvent * )
 {
     if ( buttonPressed )
-	endPress();
+        endPress();
     if ( joydown ) {
-	joydown = false;
-	if ( onjoyrelease >= 0 ) {
-	    startPress(onjoyrelease);
-	    endPress();
-	}
+        joydown = false;
+        if (onjoyrelease >= 0) {
+            startPress(onjoyrelease);
+            endPress();
+        }
     }
 }
 
@@ -729,36 +729,36 @@ bool CursorWindow::handleMouseEvent(QEvent *ev)
     bool handledEvent = false;
     static int inhere=0;
     if ( !inhere ) {
-	inhere++;
-	if ( m_view ) {
-	    if ( ev->type() >= QEvent::MouseButtonPress && ev->type() <= QEvent::MouseMove ) {
-		QMouseEvent *e = (QMouseEvent*)ev;
-		QPoint gp = e->globalPos();
-		QPoint vp = m_view->mapFromGlobal(gp);
-		QPoint sp = skin->mapFromGlobal(gp);
-		if ( e->type() == QEvent::MouseButtonPress || e->type() == QEvent::MouseButtonDblClick ) {
-		    if ( m_view->rect().contains(vp) )
-			mouseRecipient = m_view;
-		    else if ( skin->parentWidget()->geometry().contains(gp) )
-			mouseRecipient = skin;
-		    else
-			mouseRecipient = 0;
-		}
-		if ( mouseRecipient ) {
-		    setPos(gp);
-		    QMouseEvent me(e->type(),mouseRecipient==skin ? sp : vp,gp,e->button(),e->buttons(),e->modifiers());
-		    QApplication::sendEvent(mouseRecipient, &me);
-		} else if ( !skin->parentWidget()->geometry().contains(gp) ) {
-		    hide();
-		} else {
-		    setPos(gp);
-		}
-		if ( e->type() == QEvent::MouseButtonRelease )
-		    mouseRecipient = 0;
-		handledEvent = true;
-	    }
-	}
-	inhere--;
+        inhere++;
+        if (m_view) {
+            if (ev->type() >= QEvent::MouseButtonPress && ev->type() <= QEvent::MouseMove) {
+                QMouseEvent *e = (QMouseEvent*)ev;
+                QPoint gp = e->globalPos();
+                QPoint vp = m_view->mapFromGlobal(gp);
+                QPoint sp = skin->mapFromGlobal(gp);
+                if (e->type() == QEvent::MouseButtonPress || e->type() == QEvent::MouseButtonDblClick) {
+                    if (m_view->rect().contains(vp))
+                        mouseRecipient = m_view;
+                    else if (skin->parentWidget()->geometry().contains(gp))
+                        mouseRecipient = skin;
+                    else
+                        mouseRecipient = 0;
+                }
+                if (mouseRecipient) {
+                    setPos(gp);
+                    QMouseEvent me(e->type(),mouseRecipient==skin ? sp : vp,gp,e->button(),e->buttons(),e->modifiers());
+                    QApplication::sendEvent(mouseRecipient, &me);
+                } else if (!skin->parentWidget()->geometry().contains(gp)) {
+                    hide();
+                } else {
+                    setPos(gp);
+                }
+                if (e->type() == QEvent::MouseButtonRelease)
+                    mouseRecipient = 0;
+                handledEvent = true;
+            }
+        }
+        inhere--;
     }
     return handledEvent;
 }
@@ -766,8 +766,8 @@ bool CursorWindow::handleMouseEvent(QEvent *ev)
 void CursorWindow::setView(QWidget* v)
 {
     if ( m_view ) {
-	m_view->removeEventFilter(this);
-	m_view->removeEventFilter(this);
+        m_view->removeEventFilter(this);
+        m_view->removeEventFilter(this);
     }
     m_view = v;
     m_view->installEventFilter(this);
@@ -776,9 +776,10 @@ void CursorWindow::setView(QWidget* v)
 }
 
 CursorWindow::CursorWindow(const QImage &img, QPoint hot, QWidget* sk)
-	:QWidget(0),
-	m_view(0), skin(sk),
-	hotspot(hot)
+    : QWidget(0),
+      m_view(0),
+      skin(sk),
+      hotspot(hot)
 {
     setWindowFlags( Qt::FramelessWindowHint );
     mouseRecipient = 0;
@@ -789,22 +790,22 @@ CursorWindow::CursorWindow(const QImage &img, QPoint hot, QWidget* sk)
     QPixmap p;
     p = QPixmap::fromImage(img);
     if (!p.mask()) {
-	if ( img.hasAlphaChannel() ) {
-	    QBitmap bm;
-	    bm = QPixmap::fromImage(img.createAlphaMask());
-	    p.setMask( bm );
-	} else {
-	    QBitmap bm;
-	    bm = QPixmap::fromImage(img.createHeuristicMask());
-	    p.setMask( bm );
-	}
+        if (img.hasAlphaChannel()) {
+            QBitmap bm;
+            bm = QPixmap::fromImage(img.createAlphaMask());
+            p.setMask(bm);
+        } else {
+            QBitmap bm;
+            bm = QPixmap::fromImage(img.createHeuristicMask());
+            p.setMask(bm);
+        }
     }
     QPalette palette;
     palette.setBrush(backgroundRole(), QBrush(p));
     setPalette(palette);
     setFixedSize( p.size() );
     if ( !p.mask().isNull() )
-	setMask( p.mask() );
+        setMask(p.mask());
 }
 
 void CursorWindow::setPos(QPoint p)
@@ -828,8 +829,8 @@ int main(int argc,char *argv[])
     DeviceSkinParameters params;
     QString errorMessage;
     if (!params.read(skinFile, DeviceSkinParameters::ReadAll, &errorMessage)) {
-	qWarning() << errorMessage;
-	return 1;
+        qWarning() << errorMessage;
+        return 1;
     }
     DeviceSkin ds(params, &mw);
     // View Dialog
diff --git a/src/shared/deviceskin/deviceskin.h b/src/shared/deviceskin/deviceskin.h
index 8fb237304..c32067d8a 100644
--- a/src/shared/deviceskin/deviceskin.h
+++ b/src/shared/deviceskin/deviceskin.h
@@ -60,7 +60,7 @@ class QTextStream;
 struct DeviceSkinButtonArea {
     DeviceSkinButtonArea();
     QString name;
-    int	keyCode;
+    int keyCode;
     QPolygon area;
     QString text;
     bool activeWhenClosed;
diff --git a/src/shared/deviceskin/skins/ClamshellPhone.skin/ClamshellPhone.skin b/src/shared/deviceskin/skins/ClamshellPhone.skin/ClamshellPhone.skin
index cb24a8e14..976d9e90a 100644
--- a/src/shared/deviceskin/skins/ClamshellPhone.skin/ClamshellPhone.skin
+++ b/src/shared/deviceskin/skins/ClamshellPhone.skin/ClamshellPhone.skin
@@ -19,12 +19,12 @@ HasMouseHover=false
 "*"        0x002a 39 515 110 552
 "0"        0x0030 122 515 195 553
 "#"        0x0023 207 516 280 553
-"Context1" 0x01100000 137 360 108 383 123 410 90 409 60 387 63 378 100 362 
+"Context1" 0x01100000 137 360 108 383 123 410 90 409 60 387 63 378 100 362
 "Back"     0x01000061 184 361 206 376 213 387 197 410 226 410 256 392 258 381 244 369
 "Backspace" 0x01000003 68 563 113 587
-"Select"   0x01010000 160 391 172 390 181 386 184 381 180 377 173 373 165 372 155 372 145 375 138 378 136 382 138 387 147 390 
-"Left"     0x1000012 141 390 136 385 136 381 143 375 132 371 120 380 121 393 129 401 
-"Down"     0x1000015 143 389 130 402 162 412 191 404 175 390 
-"Right"    0x1000014 186 370 176 375 184 382 182 387 175 390 190 404 201 396 202 375 
-"Up"       0x1000013 133 370 143 374 176 374 185 370 169 362 149 362 
+"Select"   0x01010000 160 391 172 390 181 386 184 381 180 377 173 373 165 372 155 372 145 375 138 378 136 382 138 387 147 390
+"Left"     0x1000012 141 390 136 385 136 381 143 375 132 371 120 380 121 393 129 401
+"Down"     0x1000015 143 389 130 402 162 412 191 404 175 390
+"Right"    0x1000014 186 370 176 375 184 382 182 387 175 390 190 404 201 396 202 375
+"Up"       0x1000013 133 370 143 374 176 374 185 370 169 362 149 362
 "Flip"     0x01100006 98 325 225 353
diff --git a/src/shared/deviceskin/skins/S60-QVGA-Candybar.skin/S60-QVGA-Candybar.skin b/src/shared/deviceskin/skins/S60-QVGA-Candybar.skin/S60-QVGA-Candybar.skin
index 4f8fe5dca..db16782b4 100644
--- a/src/shared/deviceskin/skins/S60-QVGA-Candybar.skin/S60-QVGA-Candybar.skin
+++ b/src/shared/deviceskin/skins/S60-QVGA-Candybar.skin/S60-QVGA-Candybar.skin
@@ -6,7 +6,7 @@ Areas=7
 HasMouseHover=false
 
 
-"Context1" 0x01100000 54 469 151 469 140 483 88 485 81 496 54 498 
+"Context1" 0x01100000 54 469 151 469 140 483 88 485 81 496 54 498
 "Back"     0x01000061 211 468 307 467 307 498 278 497 219 486
 "Select"   0x01010000 165 491 196 522
 "Left"     0x1000012 149 474 166 492 163 519 143 538 142 481
diff --git a/src/shared/deviceskin/skins/S60-nHD-Touchscreen.skin/S60-nHD-Touchscreen.skin b/src/shared/deviceskin/skins/S60-nHD-Touchscreen.skin/S60-nHD-Touchscreen.skin
index ed25d0eac..bf5824e30 100644
--- a/src/shared/deviceskin/skins/S60-nHD-Touchscreen.skin/S60-nHD-Touchscreen.skin
+++ b/src/shared/deviceskin/skins/S60-nHD-Touchscreen.skin/S60-nHD-Touchscreen.skin
@@ -5,6 +5,6 @@ Screen=53 183 360 640
 Areas=3
 HasMouseHover=false
 
-"Call"	     0x01100004 76 874 171 899
+"Call"       0x01100004 76 874 171 899
 "Hangup"     0x01100005 300 876 393 899
 "Home"       0x1000010   174 878 298 899
diff --git a/src/shared/deviceskin/skins/SmartPhone2.skin/SmartPhone2.skin b/src/shared/deviceskin/skins/SmartPhone2.skin/SmartPhone2.skin
index 16884bfb5..d644c6e9b 100644
--- a/src/shared/deviceskin/skins/SmartPhone2.skin/SmartPhone2.skin
+++ b/src/shared/deviceskin/skins/SmartPhone2.skin/SmartPhone2.skin
@@ -2,24 +2,24 @@ SmartPhone2.png SmartPhone2-pressed.png
 90 107
 176 220
 21
-"Menu"         0x01100000 70 400 115 427            
-"Backspace"    0x01000003 238 400 285 427            
-"1"	       0x0031 138 437 149 451 142 461 120 462 102 455 95 442 99 435 121 432
-"2"	       0x0032 153 445 202 470            
-"3"	       0x0033 258 435 260 448 243 461 215 462 207 452 218 438 248 431  
-"4"	       0x0034 138 470 149 484 142 494 120 495 102 488 95 475 99 468 121 465
-"5"	       0x0035 153 477 202 502            
-"6"	       0x0036 258 467 260 480 243 493 215 494 207 484 218 470 248 463  
-"7"	       0x0037 138 502 149 516 142 526 120 527 102 520 95 507 99 500 121 497
-"8"	       0x0038 153 509 202 534            
-"9"	       0x0039 258 499 260 512 243 525 215 526 207 516 218 502 248 495  
-"*"	       0x002a 138 534 149 548 142 558 120 559 102 552 95 539 99 532 121 529
-"0"	       0x0030 153 542 202 567            
-"#"	       0x0023 258 532 260 545 243 558 215 559 207 549 218 535 248 528  
-"Yes"	       0x01010001 91 343 141 393            
-"No"           0x01010002 219 343 269 393            
-"Select"       0x01010000 160 356 195 389            
-"Left"	       0x1000012 159 356 149 346 141 354 141 391 149 399 159 389 159 387  
-"Down"	       0x1000015 160 391 150 400 159 409 199 409 207 403 196 392 194 392  
-"Right"	       0x1000014 195 354 206 341 215 356 215 391 208 402 197 393    
-"Up"	       0x1000013 160 354 149 344 158 337 197 337 203 340 194 355    
+"Menu"         0x01100000 70 400 115 427
+"Backspace"    0x01000003 238 400 285 427
+"1"            0x0031 138 437 149 451 142 461 120 462 102 455 95 442 99 435 121 432
+"2"            0x0032 153 445 202 470
+"3"            0x0033 258 435 260 448 243 461 215 462 207 452 218 438 248 431
+"4"            0x0034 138 470 149 484 142 494 120 495 102 488 95 475 99 468 121 465
+"5"            0x0035 153 477 202 502
+"6"            0x0036 258 467 260 480 243 493 215 494 207 484 218 470 248 463
+"7"            0x0037 138 502 149 516 142 526 120 527 102 520 95 507 99 500 121 497
+"8"            0x0038 153 509 202 534
+"9"            0x0039 258 499 260 512 243 525 215 526 207 516 218 502 248 495
+"*"            0x002a 138 534 149 548 142 558 120 559 102 552 95 539 99 532 121 529
+"0"            0x0030 153 542 202 567
+"#"            0x0023 258 532 260 545 243 558 215 559 207 549 218 535 248 528
+"Yes"          0x01010001 91 343 141 393
+"No"           0x01010002 219 343 269 393
+"Select"       0x01010000 160 356 195 389
+"Left"         0x1000012 159 356 149 346 141 354 141 391 149 399 159 389 159 387
+"Down"         0x1000015 160 391 150 400 159 409 199 409 207 403 196 392 194 392
+"Right"        0x1000014 195 354 206 341 215 356 215 391 208 402 197 393
+"Up"           0x1000013 160 354 149 344 158 337 197 337 203 340 194 355
diff --git a/src/shared/deviceskin/skins/TouchscreenPhone.skin/TouchscreenPhone.skin b/src/shared/deviceskin/skins/TouchscreenPhone.skin/TouchscreenPhone.skin
index 24316a1b4..3525d0aa2 100644
--- a/src/shared/deviceskin/skins/TouchscreenPhone.skin/TouchscreenPhone.skin
+++ b/src/shared/deviceskin/skins/TouchscreenPhone.skin/TouchscreenPhone.skin
@@ -6,11 +6,11 @@ Areas=9
 HasMouseHover=false
 
 "Context1"   0x01100000  145 321 134 333 132 361 134 374 110 343 109 318
-"Call"	     0x01100004   88 395 130 439
+"Call"       0x01100004   88 395 130 439
 "Hangup"     0x01100005  227 395 269 439
-"Back"	     0x01000061  249 322 240 354 219 373 223 344 216 325 208 318
-"Left"	     0x1000012  159 338 149 328 141 336 141 373 149 381 159 371 159 369
-"Down"	     0x1000015  160 373 150 382 159 391 199 391 207 385 196 374 194 374
-"Right"	     0x1000014  195 336 206 323 215 338 215 373 208 384 197 375
-"Up"	     0x1000013  160 336 149 326 158 319 197 319 203 322 194 337
+"Back"       0x01000061  249 322 240 354 219 373 223 344 216 325 208 318
+"Left"       0x1000012  159 338 149 328 141 336 141 373 149 381 159 371 159 369
+"Down"       0x1000015  160 373 150 382 159 391 199 391 207 385 196 374 194 374
+"Right"      0x1000014  195 336 206 323 215 338 215 373 208 384 197 375
+"Up"         0x1000013  160 336 149 326 158 319 197 319 203 322 194 337
 "Select"     0x01010000  160 338 195 371