From 9e0c8ba8b4d66a6af117c2ec13ea07d6d8f9366c Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Fri, 14 Jan 2011 14:31:18 +0100
Subject: [PATCH] compile fix

---
 src/libs/utils/ipaddresslineedit.cpp             | 16 ++++++++--------
 .../qt-s60/s60devicerunconfiguration.cpp         |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/libs/utils/ipaddresslineedit.cpp b/src/libs/utils/ipaddresslineedit.cpp
index 3eaf683af28..9496159a247 100644
--- a/src/libs/utils/ipaddresslineedit.cpp
+++ b/src/libs/utils/ipaddresslineedit.cpp
@@ -84,20 +84,20 @@ bool IpAddressLineEdit::isValid() const
 
 void IpAddressLineEdit::validateAddress(const QString &string)
 {
-    QString copy(string);
-    int offset(0);
+    QString copy = string;
+    int offset = 0;
     bool isValid = m_d->m_ipAddressValidator->validate(copy, offset) == QValidator::Acceptable;
 
     if (isValid != m_d->m_addressIsValid) {
         if (isValid) {
-            QPalette palette(palette());
-            palette.setColor(QPalette::Text, m_d->m_validColor);
-            setPalette(palette);
+            QPalette pal(palette());
+            pal.setColor(QPalette::Text, m_d->m_validColor);
+            setPalette(pal);
             emit validAddressChanged(copy);
         } else {
-            QPalette palette(palette());
-            palette.setColor(QPalette::Text, Qt::red);
-            setPalette(palette);
+            QPalette pal(palette());
+            pal.setColor(QPalette::Text, Qt::red);
+            setPalette(pal);
             setToolTip(tr("The IP address is not valid."));
         }
         m_d->m_addressIsValid = isValid;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index b9694492911..b6489958418 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -775,7 +775,8 @@ void S60DeviceRunControl::initCommunication()
 
 void S60DeviceRunControl::handleContextRemoved(const TcfTrkEvent &event)
 {
-    QVector<QByteArray> &removedItems( static_cast<const TcfTrkRunControlContextRemovedEvent &>(event).ids());
+    const QVector<QByteArray> removedItems
+        = static_cast<const TcfTrkRunControlContextRemovedEvent &>(event).ids();
     if (!m_runningProcessId.isEmpty()
             && removedItems.contains(m_runningProcessId.toAscii())) {
         appendMessage(tr("Process has finished."), NormalMessageFormat);