diff --git a/kdeui/dialogs/kmessagebox.cpp b/kdeui/dialogs/kmessagebox.cpp index 3467a653..2fca2349 100644 --- a/kdeui/dialogs/kmessagebox.cpp +++ b/kdeui/dialogs/kmessagebox.cpp @@ -322,7 +322,7 @@ int KMessageBox::createKMessageBox(KDialog *dialog, const QIcon &icon, } if ((options & KMessageBox::Notify)) { - sendNotification(text, strlist, notifyType, dialog->topLevelWidget()->winId()); + sendNotification(text, strlist, notifyType, dialog->window()->winId()); } if (KMessageBox_queue) { diff --git a/kdeui/dialogs/kpassworddialog.cpp b/kdeui/dialogs/kpassworddialog.cpp index 63b8eef0..1929d6bb 100644 --- a/kdeui/dialogs/kpassworddialog.cpp +++ b/kdeui/dialogs/kpassworddialog.cpp @@ -127,7 +127,7 @@ void KPasswordDialog::KPasswordDialogPrivate::init() updateFields(); - QRect desktop = KGlobalSettings::desktopGeometry(q->topLevelWidget()); + QRect desktop = KGlobalSettings::desktopGeometry(q->window()); q->setMinimumWidth(qMin(1000, qMax(q->sizeHint().width(), desktop.width() / 4))); q->setPixmap(KIcon("dialog-password").pixmap(KIconLoader::SizeHuge)); } diff --git a/kdeui/notifications/knotificationmanager.cpp b/kdeui/notifications/knotificationmanager.cpp index 58fb27b9..65849843 100644 --- a/kdeui/notifications/knotificationmanager.cpp +++ b/kdeui/notifications/knotificationmanager.cpp @@ -108,7 +108,7 @@ bool KNotificationManager::notify( KNotification* n, const QPixmap &pix, const KNotification::ContextList & contexts, const QString &appname) { - WId winId=n->widget() ? n->widget()->topLevelWidget()->winId() : 0; + WId winId=n->widget() ? n->widget()->window()->winId() : 0; QByteArray pixmapData; QBuffer buffer(&pixmapData); diff --git a/kdeui/widgets/kdatepicker.cpp b/kdeui/widgets/kdatepicker.cpp index 67918285..35ff1e21 100644 --- a/kdeui/widgets/kdatepicker.cpp +++ b/kdeui/widgets/kdatepicker.cpp @@ -655,8 +655,7 @@ void KDatePicker::setCloseButton( bool enable ) d->navigationLayout->addWidget( d->closeButton ); d->closeButton->setToolTip( i18nc( "@action:button", "Close" ) ); d->closeButton->setIcon( SmallIcon( "window-close" ) ); - connect( d->closeButton, SIGNAL(clicked()), - topLevelWidget(), SLOT(close()) ); + connect( d->closeButton, SIGNAL(clicked()), window(), SLOT(close()) ); } else { delete d->closeButton; d->closeButton = 0L; diff --git a/kfile/kdiroperator.cpp b/kfile/kdiroperator.cpp index 6236a1ed..b5e8b938 100644 --- a/kfile/kdiroperator.cpp +++ b/kfile/kdiroperator.cpp @@ -1585,7 +1585,7 @@ void KDirOperator::setDirLister(KDirLister *lister) d->dirLister->setAutoUpdate(true); d->dirLister->setDelayedMimeTypes(true); - QWidget* mainWidget = topLevelWidget(); + QWidget* mainWidget = window(); d->dirLister->setMainWindow(mainWidget); kDebug(kfile_area) << "mainWidget=" << mainWidget; diff --git a/kio/kio/kmimetypechooser.cpp b/kio/kio/kmimetypechooser.cpp index 47eb111a..7ee52755 100644 --- a/kio/kio/kmimetypechooser.cpp +++ b/kio/kio/kmimetypechooser.cpp @@ -205,10 +205,10 @@ void KMimeTypeChooserPrivate::_k_editMimeType() q, SLOT(_k_slotSycocaDatabaseChanged(QStringList)) ); QString keditfiletype = QString::fromLatin1("keditfiletype"); KRun::runCommand( keditfiletype - + " --parent " + QString::number( (ulong)q->topLevelWidget()->winId()) + + " --parent " + QString::number( (ulong)q->window()->winId()) + " --caption " + KShell::quoteArg(KGlobal::caption()) + ' ' + KShell::quoteArg(mt), - keditfiletype, keditfiletype /*unused*/, q->topLevelWidget()); + keditfiletype, keditfiletype /*unused*/, q->window()); } void KMimeTypeChooserPrivate::_k_slotCurrentChanged(QTreeWidgetItem* item) diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp index 0927d142..5110e9c1 100644 --- a/kio/kio/krun.cpp +++ b/kio/kio/krun.cpp @@ -525,7 +525,7 @@ static bool runCommandInternal(KProcess* proc, const KService* service, const QS const QByteArray& asn) { if (window != NULL) { - window = window->topLevelWidget(); + window = window->window(); } if (service && !service->entryPath().isEmpty() && !KDesktopFile::isAuthorizedDesktopFile(service->entryPath())) diff --git a/kparts/part.cpp b/kparts/part.cpp index d3df9c08..b8c0e2cd 100644 --- a/kparts/part.cpp +++ b/kparts/part.cpp @@ -529,7 +529,7 @@ bool ReadOnlyPart::openUrl( const KUrl &url ) // Maybe we can use a "local path", to avoid a temp copy? KIO::JobFlags flags = d->m_showProgressInfo ? KIO::DefaultFlags : KIO::HideProgressInfo; d->m_statJob = KIO::mostLocalUrl(d->m_url, flags); - d->m_statJob->ui()->setWindow( widget() ? widget()->topLevelWidget() : 0 ); + d->m_statJob->ui()->setWindow( widget() ? widget()->window() : 0 ); connect(d->m_statJob, SIGNAL(result(KJob*)), this, SLOT(_k_slotStatJobFinished(KJob*))); return true; } else { @@ -592,7 +592,7 @@ void ReadOnlyPartPrivate::openRemoteFile() KIO::JobFlags flags = m_showProgressInfo ? KIO::DefaultFlags : KIO::HideProgressInfo; flags |= KIO::Overwrite; m_job = KIO::file_copy(m_url, destURL, 0600, flags); - m_job->ui()->setWindow(q->widget() ? q->widget()->topLevelWidget() : 0); + m_job->ui()->setWindow(q->widget() ? q->widget()->window() : 0); emit q->started(m_job); QObject::connect(m_job, SIGNAL(result(KJob*)), q, SLOT(_k_slotJobFinished(KJob*))); QObject::connect(m_job, SIGNAL(mimetype(KIO::Job*,QString)), @@ -949,7 +949,7 @@ bool ReadWritePart::saveToUrl() return false; } d->m_uploadJob = KIO::file_move( uploadUrl, d->m_url, -1, KIO::Overwrite ); - d->m_uploadJob->ui()->setWindow( widget() ? widget()->topLevelWidget() : 0 ); + d->m_uploadJob->ui()->setWindow( widget() ? widget()->window() : 0 ); connect( d->m_uploadJob, SIGNAL(result(KJob*)), this, SLOT(_k_slotUploadFinished(KJob*)) ); return true; } diff --git a/kparts/partmanager.cpp b/kparts/partmanager.cpp index 2be11740..1a241aa2 100644 --- a/kparts/partmanager.cpp +++ b/kparts/partmanager.cpp @@ -215,7 +215,7 @@ bool PartManager::eventFilter( QObject *obj, QEvent *ev ) { QPoint pos; - if ( !d->m_managedTopLevelWidgets.contains( w->topLevelWidget() ) ) + if ( !d->m_managedTopLevelWidgets.contains( w->window() ) ) return false; if ( d->m_bIgnoreScrollBars && ::qobject_cast(w) ) diff --git a/kparts/statusbarextension.cpp b/kparts/statusbarextension.cpp index 4b518b97..bac9e5f0 100644 --- a/kparts/statusbarextension.cpp +++ b/kparts/statusbarextension.cpp @@ -151,7 +151,7 @@ KStatusBar * StatusBarExtension::statusBar() const if ( !d->m_statusBar ) { KParts::ReadOnlyPart* part = qobject_cast(parent()); QWidget* w = part ? part->widget() : 0; - KMainWindow* mw = w ? qobject_cast( w->topLevelWidget() ) : 0; + KMainWindow* mw = w ? qobject_cast( w->window() ) : 0; if ( mw ) d->m_statusBar = mw->statusBar(); }