Changeset 561 for trunk/demos/browser/history.cpp
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/demos/browser/history.cpp
r2 r561 2 2 ** 3 3 ** 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) 5 6 ** 6 7 ** This file is part of the demonstration applications of the Qt Toolkit. … … 21 22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ** 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. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** 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. 38 38 ** $QT_END_LICENSE$ 39 39 ** … … 78 78 connect(&m_expiredTimer, SIGNAL(timeout()), 79 79 this, SLOT(checkForExpired())); 80 connect(this, SIGNAL(entryAdded( const HistoryItem &)),80 connect(this, SIGNAL(entryAdded(HistoryItem)), 81 81 m_saveTimer, SLOT(changeOccurred())); 82 connect(this, SIGNAL(entryRemoved( const HistoryItem &)),82 connect(this, SIGNAL(entryRemoved(HistoryItem)), 83 83 m_saveTimer, SLOT(changeOccurred())); 84 84 load(); … … 370 370 connect(m_history, SIGNAL(historyReset()), 371 371 this, SLOT(historyReset())); 372 connect(m_history, SIGNAL(entryRemoved( const HistoryItem &)),372 connect(m_history, SIGNAL(entryRemoved(HistoryItem)), 373 373 this, SLOT(historyReset())); 374 374 375 connect(m_history, SIGNAL(entryAdded( const HistoryItem &)),375 connect(m_history, SIGNAL(entryAdded(HistoryItem)), 376 376 this, SLOT(entryAdded())); 377 377 connect(m_history, SIGNAL(entryUpdated(int)), … … 596 596 , m_history(0) 597 597 { 598 connect(this, SIGNAL(activated( const QModelIndex &)),599 this, SLOT(activated( const QModelIndex &)));598 connect(this, SIGNAL(activated(QModelIndex)), 599 this, SLOT(activated(QModelIndex))); 600 600 setHoverRole(HistoryModel::UrlStringRole); 601 601 } … … 640 640 { 641 641 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))); 644 644 dialog->show(); 645 645 } … … 688 688 tree->header()->resizeSection(0, header); 689 689 tree->header()->setStretchLastSection(true); 690 connect(tree, SIGNAL(activated( const QModelIndex&)),690 connect(tree, SIGNAL(activated(QModelIndex)), 691 691 this, SLOT(open())); 692 692 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))); 695 695 } 696 696 … … 752 752 if (sourceModel()) { 753 753 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))); 760 760 } 761 761 … … 765 765 m_loaded = false; 766 766 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))); 773 773 } 774 774 } … … 907 907 return false; 908 908 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))); 911 911 beginRemoveRows(parent, row, lastRow); 912 912 int oldCount = rowCount(); … … 915 915 sourceModel()->removeRows(start, end - start + 1); 916 916 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))); 919 919 m_loaded = false; 920 920 if (oldCount - count != rowCount()) … … 989 989 if (sourceModel()) { 990 990 disconnect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset())); 991 disconnect(sourceModel(), SIGNAL(rowsInserted( const QModelIndex &, int,int)),991 disconnect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)), 992 992 this, SLOT(sourceReset())); 993 disconnect(sourceModel(), SIGNAL(rowsRemoved( const QModelIndex &, int,int)),993 disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)), 994 994 this, SLOT(sourceReset())); 995 995 } … … 999 999 if (newSourceModel) { 1000 1000 connect(newSourceModel, SIGNAL(modelReset()), this, SLOT(sourceReset())); 1001 connect(sourceModel(), SIGNAL(rowsInserted( const QModelIndex &, int,int)),1001 connect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)), 1002 1002 this, SLOT(sourceReset())); 1003 connect(sourceModel(), SIGNAL(rowsRemoved( const QModelIndex &, int,int)),1003 connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)), 1004 1004 this, SLOT(sourceReset())); 1005 1005 } … … 1178 1178 disconnect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset())); 1179 1179 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))); 1184 1184 } 1185 1185 … … 1189 1189 connect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset())); 1190 1190 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))); 1195 1195 } 1196 1196
Note:
See TracChangeset
for help on using the changeset viewer.