Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/demos/browser/history.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
     
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
     
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
     
    7878    connect(&m_expiredTimer, SIGNAL(timeout()),
    7979            this, SLOT(checkForExpired()));
    80     connect(this, SIGNAL(entryAdded(const HistoryItem &)),
     80    connect(this, SIGNAL(entryAdded(HistoryItem)),
    8181            m_saveTimer, SLOT(changeOccurred()));
    82     connect(this, SIGNAL(entryRemoved(const HistoryItem &)),
     82    connect(this, SIGNAL(entryRemoved(HistoryItem)),
    8383            m_saveTimer, SLOT(changeOccurred()));
    8484    load();
     
    370370    connect(m_history, SIGNAL(historyReset()),
    371371            this, SLOT(historyReset()));
    372     connect(m_history, SIGNAL(entryRemoved(const HistoryItem &)),
     372    connect(m_history, SIGNAL(entryRemoved(HistoryItem)),
    373373            this, SLOT(historyReset()));
    374374
    375     connect(m_history, SIGNAL(entryAdded(const HistoryItem &)),
     375    connect(m_history, SIGNAL(entryAdded(HistoryItem)),
    376376            this, SLOT(entryAdded()));
    377377    connect(m_history, SIGNAL(entryUpdated(int)),
     
    596596    , m_history(0)
    597597{
    598     connect(this, SIGNAL(activated(const QModelIndex &)),
    599             this, SLOT(activated(const QModelIndex &)));
     598    connect(this, SIGNAL(activated(QModelIndex)),
     599            this, SLOT(activated(QModelIndex)));
    600600    setHoverRole(HistoryModel::UrlStringRole);
    601601}
     
    640640{
    641641    HistoryDialog *dialog = new HistoryDialog(this);
    642     connect(dialog, SIGNAL(openUrl(const QUrl&)),
    643             this, SIGNAL(openUrl(const QUrl&)));
     642    connect(dialog, SIGNAL(openUrl(QUrl)),
     643            this, SIGNAL(openUrl(QUrl)));
    644644    dialog->show();
    645645}
     
    688688    tree->header()->resizeSection(0, header);
    689689    tree->header()->setStretchLastSection(true);
    690     connect(tree, SIGNAL(activated(const QModelIndex&)),
     690    connect(tree, SIGNAL(activated(QModelIndex)),
    691691            this, SLOT(open()));
    692692    tree->setContextMenuPolicy(Qt::CustomContextMenu);
    693     connect(tree, SIGNAL(customContextMenuRequested(const QPoint &)),
    694             this, SLOT(customContextMenuRequested(const QPoint &)));
     693    connect(tree, SIGNAL(customContextMenuRequested(QPoint)),
     694            this, SLOT(customContextMenuRequested(QPoint)));
    695695}
    696696
     
    752752    if (sourceModel()) {
    753753        disconnect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
    754         disconnect(sourceModel(), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
    755                    this, SLOT(dataChanged(const QModelIndex &, const QModelIndex &)));
    756         disconnect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
    757                 this, SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
    758         disconnect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
    759                 this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
     754        disconnect(sourceModel(), SIGNAL(dataChanged(QModelIndex,QModelIndex)),
     755                   this, SLOT(dataChanged(QModelIndex,QModelIndex)));
     756        disconnect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
     757                this, SLOT(sourceRowsInserted(QModelIndex,int,int)));
     758        disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
     759                this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
    760760    }
    761761
     
    765765        m_loaded = false;
    766766        connect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
    767         connect(sourceModel(), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
    768                    this, SLOT(sourceDataChanged(const QModelIndex &, const QModelIndex &)));
    769         connect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
    770                 this, SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
    771         connect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
    772                 this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
     767        connect(sourceModel(), SIGNAL(dataChanged(QModelIndex,QModelIndex)),
     768                   this, SLOT(sourceDataChanged(QModelIndex,QModelIndex)));
     769        connect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
     770                this, SLOT(sourceRowsInserted(QModelIndex,int,int)));
     771        connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
     772                this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
    773773    }
    774774}
     
    907907        return false;
    908908    int lastRow = row + count - 1;
    909     disconnect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
    910                 this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
     909    disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
     910                this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
    911911    beginRemoveRows(parent, row, lastRow);
    912912    int oldCount = rowCount();
     
    915915    sourceModel()->removeRows(start, end - start + 1);
    916916    endRemoveRows();
    917     connect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
    918                 this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
     917    connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
     918                this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
    919919    m_loaded = false;
    920920    if (oldCount - count != rowCount())
     
    989989    if (sourceModel()) {
    990990        disconnect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
    991         disconnect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
     991        disconnect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
    992992                this, SLOT(sourceReset()));
    993         disconnect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
     993        disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
    994994                this, SLOT(sourceReset()));
    995995    }
     
    999999    if (newSourceModel) {
    10001000        connect(newSourceModel, SIGNAL(modelReset()), this, SLOT(sourceReset()));
    1001         connect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
     1001        connect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
    10021002                this, SLOT(sourceReset()));
    1003         connect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
     1003        connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
    10041004                this, SLOT(sourceReset()));
    10051005    }
     
    11781178        disconnect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
    11791179        disconnect(sourceModel(), SIGNAL(layoutChanged()), this, SLOT(sourceReset()));
    1180         disconnect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
    1181                 this, SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
    1182         disconnect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
    1183                 this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
     1180        disconnect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
     1181                this, SLOT(sourceRowsInserted(QModelIndex,int,int)));
     1182        disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
     1183                this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
    11841184    }
    11851185
     
    11891189        connect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
    11901190        connect(sourceModel(), SIGNAL(layoutChanged()), this, SLOT(sourceReset()));
    1191         connect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
    1192                 this, SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
    1193         connect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
    1194                 this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
     1191        connect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
     1192                this, SLOT(sourceRowsInserted(QModelIndex,int,int)));
     1193        connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
     1194                this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
    11951195    }
    11961196
Note: See TracChangeset for help on using the changeset viewer.