yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove all Q_WS_X11 ifdefs

Browse source 
Not sure why some KCMs used the define, but complete KWin is not compiled
for WIN32 and the define is useless in Qt 5 anyway.

REVIEW: 108319
This commit is contained in:
Martin Gräßlin 2013-01-10 09:26:29 +01:00
parent 3035d220c0
commit b5ed419ec6
2 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kcmkwin/kwindesktop/main.cpp
View file

@ -36,9 +36,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KServiceTypeTrader>
#include <KShortcutsEditor>
#ifdef Q_WS_X11
#include <QX11Info>
#endif
#include <netwm.h>
@ -104,7 +102,6 @@ void KWinDesktopConfig::init()
m_editor->addCollection(m_switchDesktopCollection, i18n("Desktop Switching"));
#ifdef Q_WS_X11
// get number of desktops
NETRootInfo info(QX11Info::display(), NET::NumberOfDesktops | NET::DesktopNames);
int n = info.numberOfDesktops();
@ -122,7 +119,6 @@ void KWinDesktopConfig::init()
m_ui->numberSpinBox->setValue(n);
m_editor->addCollection(m_actionCollection, i18n("Desktop Switching"));
#endif
// search the effect names
// TODO: way to recognize if a effect is not found
@ -167,11 +163,7 @@ void KWinDesktopConfig::init()
connect(m_ui->effectConfigButton, SIGNAL(clicked()), SLOT(slotConfigureEffectClicked()));
// Begin check for immutable - taken from old desktops kcm
#ifdef Q_WS_X11
int kwin_screen_number = DefaultScreen(QX11Info::display());
#else
int kwin_screen_number = 0;
#endif
m_config = KSharedConfig::openConfig("kwinrc");
@ -245,7 +237,6 @@ void KWinDesktopConfig::load()
// This method is called on reset(). So undo all changes.
undo();
#ifdef Q_WS_X11
// get number of desktops
unsigned long properties[] = {NET::NumberOfDesktops | NET::DesktopNames, NET::WM2DesktopLayout };
NETRootInfo info(QX11Info::display(), properties, 2);
@ -256,7 +247,6 @@ void KWinDesktopConfig::load()
m_ui->desktopNames->setName(i, name);
}
m_ui->rowsSpinBox->setValue(info.desktopLayoutColumnsRows().height());
#endif
// Popup info
KConfigGroup effectconfig(m_config, "Plugins");
@ -295,7 +285,6 @@ void KWinDesktopConfig::load()
void KWinDesktopConfig::save()
{
// TODO: plasma stuff
#ifdef Q_WS_X11
unsigned long properties[] = {NET::NumberOfDesktops | NET::DesktopNames, NET::WM2DesktopLayout };
NETRootInfo info(QX11Info::display(), properties, 2);
// set desktop names
@ -331,7 +320,6 @@ void KWinDesktopConfig::save()
groupname.sprintf("Desktops-screen-%d", screenNumber);
KConfigGroup group(m_config, groupname);
group.writeEntry("Rows", rows);
#endif
// Popup info
KConfigGroup effectconfig(m_config, "Plugins");

2
libkdecorations/kdecoration.cpp
View file

@ -30,11 +30,9 @@ DEALINGS IN THE SOFTWARE.
#include <QMenu>
#include <kglobal.h>
#include <assert.h>
#if defined Q_WS_X11 && ! defined K_WS_QTONLY
#include <X11/Xlib.h>
#include <fixx11h.h>
#include <QX11Info>
#endif
#include "kdecorationfactory.h"
#include "kdecorationbridge.h"