Fixed coverity warnings

Some dead code removed
Some member not initialized missing

16 files changed, 26 insertions, 37 deletions

diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index 8299f6993..f548912ff 100644
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -2696,7 +2696,7 @@ void QFileDialogPrivate::_q_updateOkButton()
     if (lineEditText.startsWith(QLatin1String("//")) || lineEditText.startsWith(QLatin1Char('\\'))) {
         button->setEnabled(true);
         if (acceptMode == QFileDialog::AcceptSave)
-            button->setText(isOpenDirectory ? QFileDialog::tr("&Open") : acceptLabel);
+            button->setText(acceptLabel);
         return;
     }
 
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index 4f32ecc49..7b5148327 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -584,7 +584,7 @@ void QAbstractItemView::setModel(QAbstractItemModel *model)
                "QAbstractItemView::setModel",
                "The parent of a top level index should be invalid");
 
-    if (d->model && d->model != QAbstractItemModelPrivate::staticEmptyModel()) {
+    if (d->model != QAbstractItemModelPrivate::staticEmptyModel()) {
         connect(d->model, SIGNAL(destroyed()),
                 this, SLOT(_q_modelDestroyed()));
         connect(d->model, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp
index 2cbde51ec..1e36f7245 100644
--- a/src/gui/itemviews/qitemdelegate.cpp
+++ b/src/gui/itemviews/qitemdelegate.cpp
@@ -722,8 +722,6 @@ void QItemDelegate::drawDisplay(QPainter *painter, const QStyleOptionViewItem &o
             //let's add the last line (after the last QChar::LineSeparator)
             elided += option.fontMetrics.elidedText(text.mid(start),
                                                     option.textElideMode, textRect.width());
-            if (end != -1)
-                elided += QChar::LineSeparator;
         }
         d->textLayout.setText(elided);
         textLayoutSize = d->doTextLayout(textRect.width());
diff --git a/src/gui/itemviews/qitemselectionmodel_p.h b/src/gui/itemviews/qitemselectionmodel_p.h
index 6e1046cb7..e9e6bb1f3 100644
--- a/src/gui/itemviews/qitemselectionmodel_p.h
+++ b/src/gui/itemviews/qitemselectionmodel_p.h
@@ -65,7 +65,7 @@ public:
     QItemSelectionModelPrivate()
       : model(0),
         currentCommand(QItemSelectionModel::NoUpdate),
-        tableSelected(false) {}
+        tableSelected(false), tableColCount(0), tableRowCount(0) {}
 
     QItemSelection expandSelection(const QItemSelection &selection,
                                    QItemSelectionModel::SelectionFlags command) const;
diff --git a/src/gui/itemviews/qlistwidget_p.h b/src/gui/itemviews/qlistwidget_p.h
index 124222c5c..0851e2003 100644
--- a/src/gui/itemviews/qlistwidget_p.h
+++ b/src/gui/itemviews/qlistwidget_p.h
@@ -163,7 +163,6 @@ class QListWidgetItemPrivate
 public:
     QListWidgetItemPrivate(QListWidgetItem *item) : q(item), theid(-1) {}
     QListWidgetItem *q;
-    int id;
     QVector<QWidgetItemData> values;
     int theid;
 };
diff --git a/src/gui/itemviews/qstandarditemmodel_p.h b/src/gui/itemviews/qstandarditemmodel_p.h
index e21ac9c5f..5984a5945 100644
--- a/src/gui/itemviews/qstandarditemmodel_p.h
+++ b/src/gui/itemviews/qstandarditemmodel_p.h
@@ -75,6 +75,7 @@ public:
           parent(0),
           rows(0),
           columns(0),
+          q_ptr(0),
           lastIndexOf(2)
         { }
     virtual ~QStandardItemPrivate();
diff --git a/src/gui/itemviews/qtreewidget.cpp b/src/gui/itemviews/qtreewidget.cpp
index ee7cea356..025f83caa 100644
--- a/src/gui/itemviews/qtreewidget.cpp
+++ b/src/gui/itemviews/qtreewidget.cpp
@@ -2074,6 +2074,8 @@ QList<QTreeWidgetItem*> QTreeWidgetItem::takeChildren()
 void QTreeWidgetItemPrivate::sortChildren(int column, Qt::SortOrder order, bool climb)
 {
     QTreeModel *model = (q->view ? qobject_cast<QTreeModel*>(q->view->model()) : 0);
+    if (!model)
+        return;   
     model->sortItems(&q->children, column, order);
     if (climb) {
         QList<QTreeWidgetItem*>::iterator it = q->children.begin();
diff --git a/src/gui/itemviews/qtreewidgetitemiterator_p.h b/src/gui/itemviews/qtreewidgetitemiterator_p.h
index 3ffe82348..ee0808c86 100644
--- a/src/gui/itemviews/qtreewidgetitemiterator_p.h
+++ b/src/gui/itemviews/qtreewidgetitemiterator_p.h
@@ -73,7 +73,8 @@ public:
     }
 
     QTreeWidgetItemIteratorPrivate(const QTreeWidgetItemIteratorPrivate& other)
-        : m_currentIndex(other.m_currentIndex), m_model(other.m_model), m_parentIndex(other.m_parentIndex)
+        : m_currentIndex(other.m_currentIndex), m_model(other.m_model),
+          m_parentIndex(other.m_parentIndex), q_ptr(other.q_ptr)
     {
 
     }
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index cc41f7365..c00f953d9 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -2747,7 +2747,7 @@ void QWidget::showNormal()
 bool QWidget::isEnabledTo(QWidget* ancestor) const
 {
     const QWidget * w = this;
-    while (w && !w->testAttribute(Qt::WA_ForceDisabled)
+    while (!w->testAttribute(Qt::WA_ForceDisabled)
             && !w->isWindow()
             && w->parentWidget()
             && w->parentWidget() != ancestor)
@@ -7239,8 +7239,7 @@ bool QWidget::isVisibleTo(QWidget* ancestor) const
     if (!ancestor)
         return isVisible();
     const QWidget * w = this;
-    while (w
-            && !w->isHidden()
+    while (!w->isHidden()
             && !w->isWindow()
             && w->parentWidget()
             && w->parentWidget() != ancestor)
diff --git a/src/gui/kernel/qx11info_x11.cpp b/src/gui/kernel/qx11info_x11.cpp
index 786d48dfe..136f7f8b3 100644
--- a/src/gui/kernel/qx11info_x11.cpp
+++ b/src/gui/kernel/qx11info_x11.cpp
@@ -179,6 +179,7 @@ QX11InfoData* QX11Info::getX11Data(bool def) const
     QX11InfoData* res = 0;
     if (def) {
         res = new QX11InfoData;
+        res->ref = 0;
         res->screen = appScreen();
         res->depth = appDepth();
         res->cells = appCells();
@@ -189,8 +190,8 @@ QX11InfoData* QX11Info::getX11Data(bool def) const
     } else if (x11data) {
         res = new QX11InfoData;
         *res = *x11data;
+        res->ref = 0;
     }
-    res->ref = 0;
     return res;
 }
 
diff --git a/src/gui/styles/qstyleoption.cpp b/src/gui/styles/qstyleoption.cpp
index 38abd9595..98996e267 100644
--- a/src/gui/styles/qstyleoption.cpp
+++ b/src/gui/styles/qstyleoption.cpp
@@ -954,7 +954,7 @@ QStyleOptionViewItemV2 &QStyleOptionViewItemV2::operator=(const QStyleOptionView
     Constructs a QStyleOptionViewItemV3 object.
 */
 QStyleOptionViewItemV3::QStyleOptionViewItemV3()
-    : QStyleOptionViewItemV2(Version)
+    : QStyleOptionViewItemV2(Version), widget(0)
 {
 }
 
@@ -962,7 +962,7 @@ QStyleOptionViewItemV3::QStyleOptionViewItemV3()
     Constructs a copy of \a other.
 */
 QStyleOptionViewItemV3::QStyleOptionViewItemV3(const QStyleOptionViewItem &other)
-    : QStyleOptionViewItemV2(Version)
+    : QStyleOptionViewItemV2(Version), widget(0)
 {
     (void)QStyleOptionViewItemV3::operator=(other);
 }
@@ -991,7 +991,7 @@ QStyleOptionViewItemV3 &QStyleOptionViewItemV3::operator = (const QStyleOptionVi
     \internal
 */
 QStyleOptionViewItemV3::QStyleOptionViewItemV3(int version)
-    : QStyleOptionViewItemV2(version)
+    : QStyleOptionViewItemV2(version), widget(0)
 {
 }
 
diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h
index 2d21bc2f8..732164ccb 100644
--- a/src/gui/text/qcssparser_p.h
+++ b/src/gui/text/qcssparser_p.h
@@ -368,18 +368,18 @@ struct Q_GUI_EXPORT Value
 };
 
 struct ColorData {
-    ColorData() : type(Invalid) {}
-    ColorData(const QColor &col) : color(col) , type(Color) {}
-    ColorData(QPalette::ColorRole r) : role(r) , type(Role) {}
+    ColorData() : role(QPalette::NoRole), type(Invalid) {}
+    ColorData(const QColor &col) : role(QPalette::NoRole), color(col), type(Color) {}
+    ColorData(QPalette::ColorRole r) : role(r), type(Role) {}
     QColor color;
     QPalette::ColorRole role;
     enum { Invalid, Color, Role} type;
 };
 
 struct BrushData {
-    BrushData() : type(Invalid) {}
-    BrushData(const QBrush &br) : brush(br) , type(Brush) {}
-    BrushData(QPalette::ColorRole r) : role(r) , type(Role) {}
+    BrushData() : role(QPalette::NoRole), type(Invalid) {}
+    BrushData(const QBrush &br) : brush(br), role(QPalette::NoRole), type(Brush) {}
+    BrushData(QPalette::ColorRole r) : role(r), type(Role) {}
     QBrush brush;
     QPalette::ColorRole role;
     enum { Invalid, Brush, Role, DependsOnThePalette } type;
@@ -726,7 +726,7 @@ enum TokenType {
 
 struct Q_GUI_EXPORT Symbol
 {
-    inline Symbol() : start(0), len(-1) {}
+    inline Symbol() : token(NONE), start(0), len(-1) {}
     TokenType token;
     QString text;
     int start, len;
diff --git a/src/gui/text/qzip.cpp b/src/gui/text/qzip.cpp
index edef81615..9fd13cd61 100644
--- a/src/gui/text/qzip.cpp
+++ b/src/gui/text/qzip.cpp
@@ -771,7 +771,7 @@ QList<QZipReader::FileInfo> QZipReader::fileInfoList() const
 {
     d->scanFiles();
     QList<QZipReader::FileInfo> files;
-    for (int i = 0; d && i < d->fileHeaders.size(); ++i) {
+    for (int i = 0; i < d->fileHeaders.size(); ++i) {
         QZipReader::FileInfo fi;
         d->fillFileInfo(i, fi);
         files.append(fi);
diff --git a/src/gui/widgets/qcalendarwidget.cpp b/src/gui/widgets/qcalendarwidget.cpp
index 31da850d5..8d5d0c737 100644
--- a/src/gui/widgets/qcalendarwidget.cpp
+++ b/src/gui/widgets/qcalendarwidget.cpp
@@ -332,10 +332,9 @@ QString QCalendarMonthValidator::text(const QDate &date, int repeat) const
         return str + QString::number(date.month());
     } else if (repeat == 3) {
         return m_locale.standaloneMonthName(date.month(), QLocale::ShortFormat);
-    } else if (repeat >= 4) {
+    } else /*if (repeat >= 4)*/ {
         return m_locale.standaloneMonthName(date.month(), QLocale::LongFormat);
     }
-    return QString();
 }
 
 //////////////////////////////////
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index 43f9301ce..7e4bd7f75 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -693,7 +693,7 @@ static bool matchLineFeed(const QByteArray &pem, int *offset)
         ch = pem.at(++*offset);
 
     if (ch == '\n') {
-        *offset++;
+        *offset += 1;
         return true;
     }
     if (ch == '\r' && pem.size() > (*offset + 1) && pem.at(*offset + 1) == '\n') {
diff --git a/src/scripttools/debugging/qscriptstdmessagehandler.cpp b/src/scripttools/debugging/qscriptstdmessagehandler.cpp
index bed04ecad..5fb2db906 100644
--- a/src/scripttools/debugging/qscriptstdmessagehandler.cpp
+++ b/src/scripttools/debugging/qscriptstdmessagehandler.cpp
@@ -92,18 +92,7 @@ void QScriptStdMessageHandler::message(QtMsgType type, const QString &text,
     }
     msg.append(text);
 
-    FILE *fp = 0;
-    switch (type) {
-    case QtDebugMsg:
-        fp = stdout;
-        break;
-    case QtWarningMsg:
-    case QtCriticalMsg:
-    case QtFatalMsg:
-        fp = stderr;
-        break;
-    }
-
+    FILE *fp = (type == QtDebugMsg) ? stdout : stderr;
     fprintf(fp, "%s\n", msg.toLatin1().constData());
     fflush(fp);
 }