Changeset 769 for trunk/src/qt3support


Ignore:
Timestamp:
Aug 2, 2010, 9:27:30 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

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

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/qt3support/dialogs/q3filedialog.cpp

    r651 r769  
    476476static bool detailViewMode = false;
    477477
    478 static Q3CleanupHandler<QPixmap> qfd_cleanup_pixmap;
    479478static Q3CleanupHandler<QString> qfd_cleanup_string;
     479
     480
     481
     482
     483
     484
     485
     486
     487
    480488
    481489static QString toRootIfNotExists( const QString &path )
     
    534542
    535543        openFolderIcon = new QPixmap((const char **)open_xpm);
    536         qfd_cleanup_pixmap.add(&openFolderIcon);
     544        qfd_openFolderIcon);
    537545        symLinkDirIcon = new QPixmap((const char **)link_dir_xpm);
    538         qfd_cleanup_pixmap.add(&symLinkDirIcon);
     546        qfd_symLinkDirIcon);
    539547        symLinkFileIcon = new QPixmap((const char **)link_file_xpm);
    540         qfd_cleanup_pixmap.add(&symLinkFileIcon);
     548        qfd_symLinkFileIcon);
    541549        fileIcon = new QPixmap((const char **)file_xpm);
    542         qfd_cleanup_pixmap.add(&fileIcon);
     550        qfd_fileIcon);
    543551        closedFolderIcon = new QPixmap((const char **)closed_xpm);
    544         qfd_cleanup_pixmap.add(&closedFolderIcon);
     552        qfd_closedFolderIcon);
    545553        detailViewIcon = new QPixmap((const char **)detailedview_xpm);
    546         qfd_cleanup_pixmap.add(&detailViewIcon);
     554        qfd_detailViewIcon);
    547555        multiColumnListViewIcon = new QPixmap((const char **)mclistview_xpm);
    548         qfd_cleanup_pixmap.add(&multiColumnListViewIcon);
     556        qfd_multiColumnListViewIcon);
    549557        cdToParentIcon = new QPixmap((const char **)cdtoparent_xpm);
    550         qfd_cleanup_pixmap.add(&cdToParentIcon);
     558        qfd_cdToParentIcon);
    551559        newFolderIcon = new QPixmap((const char **)newfolder_xpm);
    552         qfd_cleanup_pixmap.add(&newFolderIcon);
     560        qfd_newFolderIcon);
    553561        previewInfoViewIcon
    554562            = new QPixmap((const char **)previewinfoview_xpm);
    555         qfd_cleanup_pixmap.add(&previewInfoViewIcon);
     563        qfd_previewInfoViewIcon);
    556564        previewContentsViewIcon
    557565            = new QPixmap((const char **)previewcontentsview_xpm);
    558         qfd_cleanup_pixmap.add(&previewContentsViewIcon);
     566        qfd_previewContentsViewIcon);
    559567        startCopyIcon = new QPixmap((const char **)start_xpm);
    560         qfd_cleanup_pixmap.add(&startCopyIcon);
     568        qfd_startCopyIcon);
    561569        endCopyIcon = new QPixmap((const char **)end_xpm);
    562         qfd_cleanup_pixmap.add(&endCopyIcon);
     570        qfd_endCopyIcon);
    563571        goBackIcon = new QPixmap((const char **)back_xpm);
    564         qfd_cleanup_pixmap.add(&goBackIcon);
     572        qfd_goBackIcon);
    565573        fifteenTransparentPixels = new QPixmap(closedFolderIcon->width(), 1);
    566         qfd_cleanup_pixmap.add(&fifteenTransparentPixels);
     574        qfd_fifteenTransparentPixels);
    567575        QBitmap m(fifteenTransparentPixels->width(), 1);
    568576        m.fill(Qt::color0);
  • trunk/src/qt3support/itemviews/q3iconview.cpp

    r651 r769  
    133133static bool optimize_layout = false;
    134134
    135 static Q3CleanupHandler<QPixmap> qiv_cleanup_pixmap;
    136 
     135
     136static void qt_cleanup_iv_pixmaps();
     137typedef QList<QPixmap *> IVPixmaps;
     138Q_GLOBAL_STATIC_WITH_INITIALIZER(IVPixmaps, qiv_pixmaps, qAddPostRoutine(qt_cleanup_iv_pixmaps))
     139
     140static void qt_cleanup_iv_pixmaps()
     141{
     142    qDeleteAll(*qiv_pixmaps());
     143}
    137144
    138145static QPixmap *get_qiv_buffer_pixmap(const QSize &s)
     
    140147    if (!qiv_buffer_pixmap) {
    141148        qiv_buffer_pixmap = new QPixmap(s);
    142         qiv_cleanup_pixmap.add(&qiv_buffer_pixmap);
     149        qiv_qiv_buffer_pixmap);
    143150        return qiv_buffer_pixmap;
    144151    }
     
    25812588    if (!unknown_icon) {
    25822589        unknown_icon = new QPixmap((const char **)unknown_xpm);
    2583         qiv_cleanup_pixmap.add(&unknown_icon);
     2590        qiv_unknown_icon);
    25842591    }
    25852592
  • trunk/src/qt3support/itemviews/q3listview.cpp

    r651 r769  
    7070
    7171const int Unsorted = 16383;
    72 
    73 static Q3CleanupHandler<QBitmap> qlv_cleanup_bitmap;
    74 
    7572
    7673struct Q3ListViewPrivate
  • trunk/src/qt3support/widgets/q3spinwidget.cpp

    r651 r769  
    341341    QStyleOptionSpinBox opt = getStyleOption(this);
    342342
    343     if (d->theButton & 1)
     343    if (d->theButton & 1)
    344344        opt.activeSubControls = QStyle::SC_SpinBoxDown;
    345     else if (d->theButton & 2)
     345        opt.state |= QStyle::State_Sunken;
     346    } else if (d->theButton & 2) {
    346347        opt.activeSubControls = QStyle::SC_SpinBoxUp;
    347     else
     348        opt.state |= QStyle::State_Sunken;
     349    } else
    348350        opt.activeSubControls = QStyle::SC_None;
    349351    opt.rect = style()->subControlRect(QStyle::CC_SpinBox, &opt, QStyle::SC_SpinBoxFrame, this);
Note: See TracChangeset for help on using the changeset viewer.