Commented out some more #define QT_CLEAN_NAMESPACE statements
svn path=/trunk/kdebase/kscreensaver/; revision=59186
This commit is contained in:
parent
6d0db49d84
commit
13aebff097
5 changed files with 7 additions and 7 deletions
|
@ -3,7 +3,7 @@ kwin - the KDE window manager
|
|||
|
||||
Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
|
||||
******************************************************************/
|
||||
#define QT_CLEAN_NAMESPACE
|
||||
//#define QT_CLEAN_NAMESPACE
|
||||
#include <klocale.h>
|
||||
#include <kapp.h>
|
||||
#include <kdebug.h>
|
||||
|
|
|
@ -4,9 +4,9 @@ kwin - the KDE window manager
|
|||
Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
|
||||
******************************************************************/
|
||||
|
||||
#ifndef QT_CLEAN_NAMESPACE
|
||||
#define QT_CLEAN_NAMESPACE
|
||||
#endif
|
||||
//#ifndef QT_CLEAN_NAMESPACE
|
||||
//#define QT_CLEAN_NAMESPACE
|
||||
//#endif
|
||||
#include "killwindow.h"
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/keysym.h>
|
||||
|
|
2
main.cpp
2
main.cpp
|
@ -7,7 +7,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
|
|||
// X11/Qt conflict
|
||||
#undef Bool
|
||||
|
||||
#define QT_CLEAN_NAMESPACE
|
||||
//#define QT_CLEAN_NAMESPACE
|
||||
#include <kconfig.h>
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
|
|
|
@ -3,7 +3,7 @@ kwin - the KDE window manager
|
|||
|
||||
Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
|
||||
******************************************************************/
|
||||
#define QT_CLEAN_NAMESPACE
|
||||
//#define QT_CLEAN_NAMESPACE
|
||||
#include "tabbox.h"
|
||||
#include "workspace.h"
|
||||
#include "client.h"
|
||||
|
|
|
@ -3,7 +3,7 @@ kwin - the KDE window manager
|
|||
|
||||
Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
|
||||
******************************************************************/
|
||||
#define QT_CLEAN_NAMESPACE
|
||||
//#define QT_CLEAN_NAMESPACE
|
||||
#include <kconfig.h>
|
||||
#include <kglobal.h>
|
||||
#include <kglobalsettings.h>
|
||||
|
|
Loading…
Reference in a new issue