some krazy fixes

svn path=/trunk/KDE/kdebase/workspace/; revision=664331
This commit is contained in:
Thorsten Roeder 2007-05-13 17:47:20 +00:00
parent cdf8ccaa73
commit 0666147473
17 changed files with 22 additions and 26 deletions

View file

@ -9,8 +9,6 @@ You can Freely distribute this program under the GNU General Public
License. See the file "COPYING" for the exact licensing terms. License. See the file "COPYING" for the exact licensing terms.
******************************************************************/ ******************************************************************/
#include <QApplication>
#include "atoms.h" #include "atoms.h"
#include "utils.h" #include "utils.h"
#include <assert.h> #include <assert.h>

View file

@ -11,6 +11,8 @@ License. See the file "COPYING" for the exact licensing terms.
#ifndef KWIN_ATOMS_H #ifndef KWIN_ATOMS_H
#define KWIN_ATOMS_H #define KWIN_ATOMS_H
#include <QApplication>
#include <X11/Xlib.h> #include <X11/Xlib.h>
namespace KWin namespace KWin

View file

@ -37,8 +37,6 @@
#include <QBitmap> #include <QBitmap>
#include <QLabel> #include <QLabel>
#include <QPixmap>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <QX11Info> #include <QX11Info>
#include <KDebug> #include <KDebug>

View file

@ -157,6 +157,7 @@ private:
class B2ClientFactory : public QObject, public KDecorationFactory class B2ClientFactory : public QObject, public KDecorationFactory
{ {
Q_OBJECT
public: public:
B2ClientFactory(); B2ClientFactory();
virtual ~B2ClientFactory(); virtual ~B2ClientFactory();

View file

@ -1,5 +1,6 @@
#include <kconfig.h>
#include "kwmthemeclient.h" #include "kwmthemeclient.h"
#include <kconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include <QLayout> #include <QLayout>
#include <qdrawutil.h> #include <qdrawutil.h>

View file

@ -13,7 +13,6 @@
#include <QPixmap> #include <QPixmap>
#include <QPaintEvent> #include <QPaintEvent>
#include <kpixmapeffect.h> #include <kpixmapeffect.h>
#include <QPixmap>
#include <kdrawutil.h> #include <kdrawutil.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>

View file

@ -31,7 +31,7 @@
#include <klocale.h> #include <klocale.h>
#include <kglobal.h> #include <kglobal.h>
#include "config.h" #include <config.h>
PlastikConfig::PlastikConfig(KConfig* config, QWidget* parent) PlastikConfig::PlastikConfig(KConfig* config, QWidget* parent)
: QObject(parent), m_config(0), m_dialog(0) : QObject(parent), m_config(0), m_dialog(0)

View file

@ -20,6 +20,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#include "plastikbutton.h"
// #include <kwin/options.h> // #include <kwin/options.h>
#include <QAbstractButton> #include <QAbstractButton>
@ -28,10 +30,8 @@
#include <QPainter> #include <QPainter>
#include <QPixmap> #include <QPixmap>
#include <kpixmapeffect.h> #include <kpixmapeffect.h>
#include <QPixmap>
#include <QTimer> #include <QTimer>
#include "plastikbutton.h"
#include "plastikbutton.moc" #include "plastikbutton.moc"
#include "plastikclient.h" #include "plastikclient.h"
#include "misc.h" #include "misc.h"

View file

@ -24,11 +24,9 @@
#include <QImage> #include <QImage>
#include <QPixmap> #include <QPixmap>
#include <QApplication> #include <QApplication>
#include <QPaintEvent>
#include "quartz.h" #include "quartz.h"
//Added by qt3to4:
#include <QPixmap>
#include <QPaintEvent>
namespace Quartz { namespace Quartz {

View file

@ -8,10 +8,10 @@ You can Freely distribute this program under the GNU General Public
License. See the file "COPYING" for the exact licensing terms. License. See the file "COPYING" for the exact licensing terms.
******************************************************************/ ******************************************************************/
#include <config-X11.h>
#include "mousemark.h" #include "mousemark.h"
#include <config-X11.h>
#include <kaction.h> #include <kaction.h>
#include <kactioncollection.h> #include <kactioncollection.h>
#include <kglobal.h> #include <kglobal.h>

View file

@ -8,10 +8,10 @@ You can Freely distribute this program under the GNU General Public
License. See the file "COPYING" for the exact licensing terms. License. See the file "COPYING" for the exact licensing terms.
******************************************************************/ ******************************************************************/
#include <config-X11.h>
#include "showfps.h" #include "showfps.h"
#include <config-X11.h>
#include <kconfig.h> #include <kconfig.h>
#include <ksharedconfig.h> #include <ksharedconfig.h>

View file

@ -8,10 +8,10 @@ You can Freely distribute this program under the GNU General Public
License. See the file "COPYING" for the exact licensing terms. License. See the file "COPYING" for the exact licensing terms.
******************************************************************/ ******************************************************************/
#include <config-X11.h>
#include "trackmouse.h" #include "trackmouse.h"
#include <config-X11.h>
#include <kglobal.h> #include <kglobal.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>

View file

@ -32,7 +32,6 @@ DEALINGS IN THE SOFTWARE.
#include <klibloader.h> #include <klibloader.h>
#include <kconfiggroup.h> #include <kconfiggroup.h>
#include <assert.h> #include <assert.h>
#include <kconfig.h>
#include <QDir> #include <QDir>
#include <QFile> #include <QFile>

View file

@ -9,11 +9,11 @@ You can Freely distribute this program under the GNU General Public
License. See the file "COPYING" for the exact licensing terms. License. See the file "COPYING" for the exact licensing terms.
******************************************************************/ ******************************************************************/
#include "main.h"
//#define QT_CLEAN_NAMESPACE //#define QT_CLEAN_NAMESPACE
#include <ksharedconfig.h> #include <ksharedconfig.h>
#include "main.h"
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include <stdlib.h> #include <stdlib.h>

View file

@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms.
#ifndef KWIN_SCENE_XRENDER_H #ifndef KWIN_SCENE_XRENDER_H
#define KWIN_SCENE_XRENDER_H #define KWIN_SCENE_XRENDER_H
#include "config.h" #include <config.h>
#include "scene.h" #include "scene.h"

View file

@ -1138,7 +1138,7 @@ void Workspace::configureWM()
/*! /*!
avoids managing a window with title \a title avoids managing a window with title \a title
*/ */
void Workspace::doNotManage( QString title ) void Workspace::doNotManage( const QString &title )
{ {
doNotManageList.append( title ); doNotManageList.append( title );
} }
@ -1636,7 +1636,7 @@ void Workspace::checkActiveScreen( const Client* c )
} }
// called e.g. when a user clicks on a window, set active screen to be the screen // called e.g. when a user clicks on a window, set active screen to be the screen
// where the click occured // where the click occurred
void Workspace::setActiveScreenMouse( QPoint mousepos ) void Workspace::setActiveScreenMouse( QPoint mousepos )
{ {
if( !options->xineramaEnabled ) if( !options->xineramaEnabled )

View file

@ -251,7 +251,7 @@ class Workspace : public QObject, public KDecorationDefines
// dcop interface // dcop interface
void cascadeDesktop(); void cascadeDesktop();
void unclutterDesktop(); void unclutterDesktop();
void doNotManage(QString); void doNotManage( const QString & );
bool setCurrentDesktop( int new_desktop ); bool setCurrentDesktop( int new_desktop );
void nextDesktop(); void nextDesktop();
void previousDesktop(); void previousDesktop();