SVN commit 514646 by pino: less qt3_support M +1 -1 kdeui/kanimwidget.cpp M +1 -1 kdeui/kedittoolbar.cpp M +4 -2 kdeui/kpassworddialog.cpp M +1 -1 kio/kio/defaultprogress.cpp M +1 -1 kio/kio/renamedlg.cpp --- trunk/KDE/kdelibs/kdeui/kanimwidget.cpp #514645:514646 @@ -212,7 +212,7 @@ d->transparent = img.hasAlphaBuffer(); if (d->pixmap.width() != d->size) { - img = img.smoothScale(d->size, d->size*d->frames); + img = img.scaled(d->size, d->size*d->frames, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); } d->pixmap = img; --- trunk/KDE/kdelibs/kdeui/kedittoolbar.cpp #514645:514646 @@ -789,7 +789,7 @@ connect(m_downAction, SIGNAL(clicked()), SLOT(slotDownButton())); d->m_helpArea = new QLabel(this); - d->m_helpArea->setAlignment( Qt::TextWordWrap ); + d->m_helpArea->setWordWrap( true ); // now start with our layouts QVBoxLayout *top_layout = new QVBoxLayout(this, 0, KDialog::spacingHint()); --- trunk/KDE/kdelibs/kdeui/kpassworddialog.cpp #514645:514646 @@ -421,7 +421,8 @@ m_pGrid->setRowStretch(12, 12); d->m_MatchLabel = new QLabel(m_pMain); - d->m_MatchLabel->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextWordWrap); + d->m_MatchLabel->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); + d->m_MatchLabel->setWordWrap(true); m_pGrid->addMultiCellWidget(d->m_MatchLabel, 13, 13, 0, 2); d->m_MatchLabel->setText(i18n("Passwords do not match")); @@ -471,7 +472,8 @@ m_pGrid->addWidget(lbl, m_Row+2, 0, Qt::AlignLeft); lbl = new QLabel(value, m_pMain); - lbl->setAlignment(Qt::AlignTop|Qt::TextWordWrap); + lbl->setAlignment(Qt::AlignTop); + lbl->setWordWrap(true); lbl->setFixedSize(275, lbl->heightForWidth(275)); m_pGrid->addWidget(lbl, m_Row+2, 2, Qt::AlignLeft); ++m_Row; --- trunk/KDE/kdelibs/kio/kio/defaultprogress.cpp #514645:514646 @@ -97,7 +97,7 @@ topLayout->setSpacing(KDialog::spacingHint() ); topLayout->addStrut( 360 ); // makes dlg at least that wide - QGridLayout *grid = new QGridLayout( 0 ); + QGridLayout *grid = new QGridLayout(); topLayout->addLayout(grid); grid->addItem(new QSpacerItem(KDialog::spacingHint(),0),0,1); //addColSpacing(1, KDialog::spacingHint()); // filenames or action name --- trunk/KDE/kdelibs/kio/kio/renamedlg.cpp #514645:514646 @@ -210,7 +210,7 @@ if( !d->plugin ){ // No plugin found, build default dialog - QGridLayout * gridLayout = new QGridLayout( 0 ); + QGridLayout * gridLayout = new QGridLayout(); gridLayout->setMargin( KDialog::marginHint() ); gridLayout->setSpacing( KDialog::spacingHint() ); pLayout->addLayout(gridLayout);