From: Ivailo Monev <xakepa10@gmail.com>
Date: Fri, 3 Jun 2016 22:23:54 +0000 (+0000)
Subject: generic: use non-deprecated methods
X-Git-Tag: 4.22.0~1464
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b69b9ff2c0357358bdeda68c02a56e16c7e081b1;p=kde%2Fkde-workspace.git

generic: use non-deprecated methods

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---

diff --git a/kcontrol/input/xcursor/thememodel.cpp b/kcontrol/input/xcursor/thememodel.cpp
index ee2e341e..299629bb 100644
--- a/kcontrol/input/xcursor/thememodel.cpp
+++ b/kcontrol/input/xcursor/thememodel.cpp
@@ -262,7 +262,7 @@ bool CursorThemeModel::handleDefault(const QDir &themeDir)
     // If "default" is a symlink
     if (info.isSymLink())
     {
-        QFileInfo target(info.symLinkTarget());
+        QFileInfo target(info.readLink());
         if (target.exists() && (target.isDir() || target.isSymLink()))
             defaultName = target.fileName();
 
diff --git a/plasma/shells/plasma-desktop/controllerwindow.cpp b/plasma/shells/plasma-desktop/controllerwindow.cpp
index c92d0114..487460c5 100644
--- a/plasma/shells/plasma-desktop/controllerwindow.cpp
+++ b/plasma/shells/plasma-desktop/controllerwindow.cpp
@@ -242,7 +242,7 @@ void ControllerWindow::syncToGraphicsWidget()
                                  PlasmaApp::self()->corona()->screenGeometry(m_containment.data()->screen()) :
                                  PlasmaApp::self()->corona()->screenGeometry(PlasmaApp::self()->corona()->screenId(pos()));
 
-        QSize maxSize = KWindowSystem::workArea().intersect(screenRect).size();
+        QSize maxSize = KWindowSystem::workArea().intersected(screenRect).size();
 
         QSize windowSize;
         if (m_location == Plasma::LeftEdge || m_location == Plasma::RightEdge) {