Commit e3b865cd authored by Luboš Luňák's avatar Luboš Luňák
Browse files

namespace KWinInternal -> KWin - shorter typing of names in gdb, yay


svn path=/branches/work/kwin_composite/; revision=650770
parent 4793790b
......@@ -100,7 +100,7 @@ if(HAVE_OPENGL)
)
endif(HAVE_OPENGL)
qt4_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.KWin.xml workspace.h KWinInternal::Workspace )
qt4_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.KWin.xml workspace.h KWin::Workspace )
kde4_automoc(kwin ${kwin_KDEINIT_SRCS})
......
......@@ -29,9 +29,10 @@ License. See the file "COPYING" for the exact licensing terms.
#include "atoms.h"
#include "group.h"
#include "rules.h"
#include "effects.h"
#include <QX11Info>
namespace KWinInternal
namespace KWin
{
/*
......@@ -221,8 +222,8 @@ void Workspace::setActiveClient( Client* c, allowed_t )
++set_active_client_recursion;
if( active_client != NULL )
{ // note that this may call setActiveClient( NULL ), therefore the recursion counter
active_client->setActive( false );
}
active_client->setActive( false );
}
active_client = c;
Q_ASSERT( c == NULL || c->isActive());
if( active_client != NULL )
......@@ -245,6 +246,8 @@ void Workspace::setActiveClient( Client* c, allowed_t )
rootInfo->setActiveWindow( active_client? active_client->window() : 0 );
updateColormap();
if( effects )
effects->windowActivated( active_client ? active_client->effectWindow() : NULL );
--set_active_client_recursion;
}
......@@ -263,7 +266,6 @@ void Workspace::activateClient( Client* c, bool force )
{
if( c == NULL )
{
focusToNull();
setActiveClient( NULL, Allowed );
return;
}
......@@ -698,7 +700,7 @@ void Client::demandAttentionKNotify()
}
// TODO I probably shouldn't be lazy here and do it without the macro, so that people can read it
KWIN_COMPARE_PREDICATE( SameApplicationActiveHackPredicate, const Client*,
KWIN_COMPARE_PREDICATE( SameApplicationActiveHackPredicate, Client, const Client*,
// ignore already existing splashes, toolbars, utilities, menus and topmenus,
// as the app may show those before the main window
!cl->isSplash() && !cl->isToolbar() && !cl->isTopMenu() && !cl->isUtility() && !cl->isMenu()
......
......@@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include "utils.h"
#include <assert.h>
namespace KWinInternal
namespace KWin
{
Atoms::Atoms()
......
......@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
#define KWIN_ATOMS_H
#include <X11/Xlib.h>
namespace KWinInternal
namespace KWin
{
class Atoms
......
......@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include "client.h"
#include "options.h"
namespace KWinInternal
namespace KWin
{
Bridge::Bridge( Client* cl )
......@@ -197,9 +197,9 @@ QRegion Bridge::unobscuredRegion( const QRegion& r ) const
void Bridge::grabXServer( bool grab )
{
if( grab )
KWinInternal::grabXServer();
KWin::grabXServer();
else
KWinInternal::ungrabXServer();
KWin::ungrabXServer();
}
} // namespace
......@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <kdecoration_p.h>
namespace KWinInternal
namespace KWin
{
class Client;
......
......@@ -38,7 +38,7 @@ License. See the file "COPYING" for the exact licensing terms.
// put all externs before the namespace statement to allow the linker
// to resolve them properly
namespace KWinInternal
namespace KWin
{
/*
......
......@@ -34,7 +34,7 @@ class QTimer;
class K3Process;
class KStartupInfoData;
namespace KWinInternal
namespace KWin
{
class Workspace;
......@@ -490,7 +490,7 @@ class GeometryUpdatesBlocker
class WinInfo : public NETWinInfo
{
private:
typedef KWinInternal::Client Client; // because of NET::Client
typedef KWin::Client Client; // because of NET::Client
public:
WinInfo( Client* c, Display * display, Window window,
Window rwin, const unsigned long pr[], int pr_size );
......
......@@ -43,7 +43,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <X11/extensions/shape.h>
namespace KWinInternal
namespace KWin
{
//****************************************
......
......@@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include "client.h"
#include "effects.h"
namespace KWinInternal
namespace KWin
{
Deleted::Deleted( Workspace* ws )
......
......@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include "toplevel.h"
namespace KWinInternal
namespace KWin
{
class Deleted
......
......@@ -45,7 +45,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include "effects/test_input.h"
#include "effects/test_thumbnail.h"
namespace KWinInternal
namespace KWin
{
//****************************************
......@@ -189,7 +189,7 @@ EffectsHandler::EffectsHandler()
{
if( !compositing())
return;
KWinInternal::effects = this;
KWin::effects = this;
#ifdef HAVE_CAPTURY
registerEffect("VideoRecord", new GenericEffectFactory<VideoRecordEffect>);
......
......@@ -17,7 +17,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <qpair.h>
namespace KWinInternal
namespace KWin
{
class Toplevel;
......
......@@ -21,7 +21,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <GL/gl.h>
#endif
namespace KWinInternal
namespace KWin
{
BoxSwitchEffect::BoxSwitchEffect()
......
......@@ -21,7 +21,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <QRegion>
#include <QSize>
namespace KWinInternal
namespace KWin
{
class BoxSwitchEffect
......
......@@ -18,7 +18,7 @@ License. See the file "COPYING" for the exact licensing terms.
// Note that currently effects need to be manually enabled in the EffectsHandler
// class constructor (in effects.cpp).
namespace KWinInternal
namespace KWin
{
TaskbarThumbnailEffect::TaskbarThumbnailEffect()
......
......@@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <effects.h>
namespace KWinInternal
namespace KWin
{
/**
......
......@@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <workspace.h>
namespace KWinInternal
namespace KWin
{
const int MAX_PROGRESS = 1000;
......
......@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <effects.h>
namespace KWinInternal
namespace KWin
{
class DesktopChangeSlideEffect
......
......@@ -16,7 +16,7 @@ License. See the file "COPYING" for the exact licensing terms.
// Note that currently effects need to be manually enabled in the EffectsHandler
// class constructor (in effects.cpp).
namespace KWinInternal
namespace KWin
{
void DialogParentEffect::prePaintWindow( EffectWindow* w, int* mask, QRegion* paint, QRegion* clip, int time )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment