From 26c0e36400b0ab8c5f32d694a275c1f52ba5bded Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Fri, 6 Sep 2013 15:22:16 +0200
Subject: [PATCH] Do not build KWin::SessionManager for the time being

KSessionManager is deprecated and there is no replacement yet. So
let's get rid of the warnings for now. Needs to be re-added once
there is a working QSessionManager again.
---
 main.cpp | 3 +++
 sm.cpp   | 3 ++-
 sm.h     | 7 ++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/main.cpp b/main.cpp
index 25a60c0e4e..5bdd115a94 100644
--- a/main.cpp
+++ b/main.cpp
@@ -496,7 +496,10 @@ KDE_EXPORT int kdemain(int argc, char * argv[])
     a.start();
 
     ksmserver.resumeStartup(QStringLiteral(KWIN_NAME));
+#warning SessionManager needs porting
+#if KWIN_QT5_PORTING
     KWin::SessionManager weAreIndeed;
+#endif
     KWin::SessionSaveDoneHelper helper;
 #warning insertCatalog needs porting
 #if KWIN_QT5_PORTING
diff --git a/sm.cpp b/sm.cpp
index 3a3b52e02f..e02d37d109 100644
--- a/sm.cpp
+++ b/sm.cpp
@@ -32,11 +32,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QDebug>
 #include <QSocketNotifier>
 #include <QSessionManager>
-#include <KDE/KApplication>
 
 namespace KWin
 {
 
+#if KWIN_QT5_PORTING
 bool SessionManager::saveState(QSessionManager& sm)
 {
     // If the session manager is ksmserver, save stacking
@@ -75,6 +75,7 @@ bool SessionManager::commitData(QSessionManager& sm)
         Workspace::self()->sessionSaveStarted();
     return true;
 }
+#endif
 
 // Workspace
 
diff --git a/sm.h b/sm.h
index 2aee595dca..7ab8bd5dff 100644
--- a/sm.h
+++ b/sm.h
@@ -23,7 +23,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KWIN_SM_H
 
 #include <QDataStream>
+#include <kwinglobals.h>
+#include <QStringList>
+#if KWIN_QT5_PORTING
 #include <ksessionmanager.h>
+#endif
 #include <netwm_def.h>
 #include <QRect>
 
@@ -97,7 +101,7 @@ private:
     SmcConn conn;
 };
 
-
+#if KWIN_QT5_PORTING
 class SessionManager
     : public KSessionManager
 {
@@ -105,6 +109,7 @@ public:
     virtual bool saveState(QSessionManager& sm);
     virtual bool commitData(QSessionManager& sm);
 };
+#endif
 
 } // namespace