Changeset 846 for trunk/demos/interview

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• demos/interview/main.cpp (modified) (1 diff)
• demos/interview/model.cpp (modified) (3 diffs)
• demos/interview/model.h (modified) (3 diffs)

trunk/demos/interview/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/demos/interview/model.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -46 +46 @@
 Model::Model(int rows, int columns, QObject *parent)
     : QAbstractItemModel(parent),
+
       rc(rows), cc(columns),
       tree(new QVector<Node>(rows, Node(0)))
@@ -106 +107 @@
 QVariant Model::headerData(int section, Qt::Orientation orientation, int role) const
 {
-    static QIcon services(QPixmap(":/images/services.png"));
     if (role == Qt::DisplayRole)
         return QString::number(section);

trunk/demos/interview/model.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -45 +45 @@
 #include <QAbstractItemModel>
 #include <QFileIconProvider>
+
 #include <QVector>
 
@@ -81 +82 @@
     int row(Node *node) const;
 
+
     int rc, cc;
     QVector<Node> *tree;