Clean up the includes in kwin/options.(h/cpp)

Used to include quite a bit no longer needed. In order to get rid of
the utils.h inclusion one enum is moved to options (where it actually
belongs to).
icc-effect-5.14.5
Martin Gräßlin 2013-09-06 09:42:56 +02:00
parent 4d089b28b4
commit 40588e05ea
3 changed files with 14 additions and 26 deletions

View File

@ -25,15 +25,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef KCMRULES
#include <QPalette>
#include <QPixmap>
#include <QProcess>
#include <kapplication.h>
#include <kconfig.h>
#include <kglobalsettings.h>
#include <klocale.h>
#include "client.h"
#include "compositingprefs.h"
#include "settings.h"
#include "xcbutils.h"

View File

@ -24,18 +24,27 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define KWIN_OPTIONS_H
#include <QObject>
#include <QFont>
#include <QPalette>
#include <kdecoration.h>
#include "placement.h"
#include "utils.h"
namespace KWin
{
class Client;
class CompositingPrefs;
// Whether to keep all windows mapped when compositing (i.e. whether to have
// actively updated window pixmaps).
enum HiddenPreviews {
// The normal mode with regard to mapped windows. Hidden (minimized, etc.)
// and windows on inactive virtual desktops are not mapped, their pixmaps
// are only their icons.
HiddenPreviewsNever,
// Like normal mode, but shown windows (i.e. on inactive virtual desktops)
// are kept mapped, only hidden windows are unmapped.
HiddenPreviewsShown,
// All windows are kept mapped regardless of their state.
HiddenPreviewsAlways
};
class Settings;
class Options : public QObject, public KDecorationOptions

14
utils.h
View File

@ -142,20 +142,6 @@ enum ShadeMode {
ShadeActivated // "shaded", but visible due to alt+tab to the window
};
// Whether to keep all windows mapped when compositing (i.e. whether to have
// actively updated window pixmaps).
enum HiddenPreviews {
// The normal mode with regard to mapped windows. Hidden (minimized, etc.)
// and windows on inactive virtual desktops are not mapped, their pixmaps
// are only their icons.
HiddenPreviewsNever,
// Like normal mode, but shown windows (i.e. on inactive virtual desktops)
// are kept mapped, only hidden windows are unmapped.
HiddenPreviewsShown,
// All windows are kept mapped regardless of their state.
HiddenPreviewsAlways
};
class Motif
{
public: