HAVE_X11 usage in KIO/core

[Martin Gräßlin]

Hi,

I found some HAVE_X11 not defined warnings in KIO and had a look at them. One 
of them is in core/kprotocolmanager.cpp in the following snippet.

// This is not the OS, but the windowing system, e.g. X11 on Unix/Linux.
static QString platform()
{
#if HAVE_X11
    return QL1S("X11");
#elif defined(Q_OS_MAC)
    return QL1S("Macintosh");
#elif defined(Q_OS_WIN)
    return QL1S("Windows");
#else
    return QL1S("Unknown");
#endif
}

I'm wondering what to do about it. The best would be to use 
QGuiApplication::platformName, but it's a core app. Also finding X11 in 
CMakeLists to get the HAVE_X11 defined looks very wrong to me and not future 
safe (Wayland).

Given the dependencies I'd say the platform() needs to be removed. But I don't 
know what it's used for to really say something about it.

Cheers
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20140207/5d7bbeb4/attachment.sig>