Changeset 769 for trunk/src/qt3support
- Timestamp:
- Aug 2, 2010, 9:27:30 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.6.3 (added) merged: 768 /branches/vendor/nokia/qt/current merged: 767 /branches/vendor/nokia/qt/4.6.2 removed
- Property svn:mergeinfo changed
-
trunk/src/qt3support/dialogs/q3filedialog.cpp
r651 r769 476 476 static bool detailViewMode = false; 477 477 478 static Q3CleanupHandler<QPixmap> qfd_cleanup_pixmap;479 478 static Q3CleanupHandler<QString> qfd_cleanup_string; 479 480 481 482 483 484 485 486 487 480 488 481 489 static QString toRootIfNotExists( const QString &path ) … … 534 542 535 543 openFolderIcon = new QPixmap((const char **)open_xpm); 536 qfd_ cleanup_pixmap.add(&openFolderIcon);544 qfd_openFolderIcon); 537 545 symLinkDirIcon = new QPixmap((const char **)link_dir_xpm); 538 qfd_ cleanup_pixmap.add(&symLinkDirIcon);546 qfd_symLinkDirIcon); 539 547 symLinkFileIcon = new QPixmap((const char **)link_file_xpm); 540 qfd_ cleanup_pixmap.add(&symLinkFileIcon);548 qfd_symLinkFileIcon); 541 549 fileIcon = new QPixmap((const char **)file_xpm); 542 qfd_ cleanup_pixmap.add(&fileIcon);550 qfd_fileIcon); 543 551 closedFolderIcon = new QPixmap((const char **)closed_xpm); 544 qfd_ cleanup_pixmap.add(&closedFolderIcon);552 qfd_closedFolderIcon); 545 553 detailViewIcon = new QPixmap((const char **)detailedview_xpm); 546 qfd_ cleanup_pixmap.add(&detailViewIcon);554 qfd_detailViewIcon); 547 555 multiColumnListViewIcon = new QPixmap((const char **)mclistview_xpm); 548 qfd_ cleanup_pixmap.add(&multiColumnListViewIcon);556 qfd_multiColumnListViewIcon); 549 557 cdToParentIcon = new QPixmap((const char **)cdtoparent_xpm); 550 qfd_ cleanup_pixmap.add(&cdToParentIcon);558 qfd_cdToParentIcon); 551 559 newFolderIcon = new QPixmap((const char **)newfolder_xpm); 552 qfd_ cleanup_pixmap.add(&newFolderIcon);560 qfd_newFolderIcon); 553 561 previewInfoViewIcon 554 562 = new QPixmap((const char **)previewinfoview_xpm); 555 qfd_ cleanup_pixmap.add(&previewInfoViewIcon);563 qfd_previewInfoViewIcon); 556 564 previewContentsViewIcon 557 565 = new QPixmap((const char **)previewcontentsview_xpm); 558 qfd_ cleanup_pixmap.add(&previewContentsViewIcon);566 qfd_previewContentsViewIcon); 559 567 startCopyIcon = new QPixmap((const char **)start_xpm); 560 qfd_ cleanup_pixmap.add(&startCopyIcon);568 qfd_startCopyIcon); 561 569 endCopyIcon = new QPixmap((const char **)end_xpm); 562 qfd_ cleanup_pixmap.add(&endCopyIcon);570 qfd_endCopyIcon); 563 571 goBackIcon = new QPixmap((const char **)back_xpm); 564 qfd_ cleanup_pixmap.add(&goBackIcon);572 qfd_goBackIcon); 565 573 fifteenTransparentPixels = new QPixmap(closedFolderIcon->width(), 1); 566 qfd_ cleanup_pixmap.add(&fifteenTransparentPixels);574 qfd_fifteenTransparentPixels); 567 575 QBitmap m(fifteenTransparentPixels->width(), 1); 568 576 m.fill(Qt::color0); -
trunk/src/qt3support/itemviews/q3iconview.cpp
r651 r769 133 133 static bool optimize_layout = false; 134 134 135 static Q3CleanupHandler<QPixmap> qiv_cleanup_pixmap; 136 135 136 static void qt_cleanup_iv_pixmaps(); 137 typedef QList<QPixmap *> IVPixmaps; 138 Q_GLOBAL_STATIC_WITH_INITIALIZER(IVPixmaps, qiv_pixmaps, qAddPostRoutine(qt_cleanup_iv_pixmaps)) 139 140 static void qt_cleanup_iv_pixmaps() 141 { 142 qDeleteAll(*qiv_pixmaps()); 143 } 137 144 138 145 static QPixmap *get_qiv_buffer_pixmap(const QSize &s) … … 140 147 if (!qiv_buffer_pixmap) { 141 148 qiv_buffer_pixmap = new QPixmap(s); 142 qiv_ cleanup_pixmap.add(&qiv_buffer_pixmap);149 qiv_qiv_buffer_pixmap); 143 150 return qiv_buffer_pixmap; 144 151 } … … 2581 2588 if (!unknown_icon) { 2582 2589 unknown_icon = new QPixmap((const char **)unknown_xpm); 2583 qiv_ cleanup_pixmap.add(&unknown_icon);2590 qiv_unknown_icon); 2584 2591 } 2585 2592 -
trunk/src/qt3support/itemviews/q3listview.cpp
r651 r769 70 70 71 71 const int Unsorted = 16383; 72 73 static Q3CleanupHandler<QBitmap> qlv_cleanup_bitmap;74 75 72 76 73 struct Q3ListViewPrivate -
trunk/src/qt3support/widgets/q3spinwidget.cpp
r651 r769 341 341 QStyleOptionSpinBox opt = getStyleOption(this); 342 342 343 if (d->theButton & 1) 343 if (d->theButton & 1) 344 344 opt.activeSubControls = QStyle::SC_SpinBoxDown; 345 else if (d->theButton & 2) 345 opt.state |= QStyle::State_Sunken; 346 } else if (d->theButton & 2) { 346 347 opt.activeSubControls = QStyle::SC_SpinBoxUp; 347 else 348 opt.state |= QStyle::State_Sunken; 349 } else 348 350 opt.activeSubControls = QStyle::SC_None; 349 351 opt.rect = style()->subControlRect(QStyle::CC_SpinBox, &opt, QStyle::SC_SpinBoxFrame, this);
Note:
See TracChangeset
for help on using the changeset viewer.