generic: adjust to Katie changes

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

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) {

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));
 }

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);

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()),
+        connect( d->closeButton, SIGNAL(clicked()), window(), SLOT(close()) );
-                 topLevelWidget(), SLOT(close()) );
     } else {
         delete d->closeButton;
         d->closeButton = 0L;

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;
 

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)

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()))

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;
     }

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<QScrollBar *>(w) )

kparts/statusbarextension.cpp

@@ -151,7 +151,7 @@ KStatusBar * StatusBarExtension::statusBar() const
   if ( !d->m_statusBar )  {
     KParts::ReadOnlyPart* part = qobject_cast<KParts::ReadOnlyPart*>(parent());
     QWidget* w = part ? part->widget() : 0;
-    KMainWindow* mw = w ? qobject_cast<KMainWindow *>( w->topLevelWidget() ) : 0;
+    KMainWindow* mw = w ? qobject_cast<KMainWindow *>( w->window() ) : 0;
     if ( mw )
       d->m_statusBar = mw->statusBar();
   }