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.
This commit is contained in:
Martin Gräßlin 2013-09-06 15:22:16 +02:00
parent 8d716124fa
commit 26c0e36400
3 changed files with 11 additions and 2 deletions

View file

@ -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

3
sm.cpp
View file

@ -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

7
sm.h
View file

@ -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