Less krazy warnings: use prefix ++ instead of postfix.
SVN_SILENT svn path=/trunk/KDE/kdebase/workspace/; revision=1063341
This commit is contained in:
parent
9715014b4d
commit
21821f48a4
6 changed files with 17 additions and 17 deletions
|
@ -1813,7 +1813,7 @@ void Client::getWindowProtocols()
|
||||||
|
|
||||||
if( XGetWMProtocols( display(), window(), &p, &n ))
|
if( XGetWMProtocols( display(), window(), &p, &n ))
|
||||||
{
|
{
|
||||||
for( i = 0; i < n; i++ )
|
for( i = 0; i < n; ++i )
|
||||||
{
|
{
|
||||||
if( p[i] == atoms->wm_delete_window )
|
if( p[i] == atoms->wm_delete_window )
|
||||||
Pdeletewindow = 1;
|
Pdeletewindow = 1;
|
||||||
|
|
|
@ -221,7 +221,7 @@ void ClientGroup::setVisible( Client* c )
|
||||||
|
|
||||||
visible_ = indexOfClient( c );
|
visible_ = indexOfClient( c );
|
||||||
c->setClientShown( true );
|
c->setClientShown( true );
|
||||||
for( ClientList::const_iterator i = clients_.constBegin(); i != clients_.constEnd(); i++ )
|
for( ClientList::const_iterator i = clients_.constBegin(); i != clients_.constEnd(); ++i )
|
||||||
if( (*i) != c )
|
if( (*i) != c )
|
||||||
(*i)->setClientShown( false );
|
(*i)->setClientShown( false );
|
||||||
}
|
}
|
||||||
|
@ -262,7 +262,7 @@ void ClientGroup::updateStates( Client* main, Client* only )
|
||||||
void ClientGroup::updateItems()
|
void ClientGroup::updateItems()
|
||||||
{
|
{
|
||||||
items_.clear();
|
items_.clear();
|
||||||
for( ClientList::const_iterator i = clients_.constBegin(); i != clients_.constEnd(); i++ )
|
for( ClientList::const_iterator i = clients_.constBegin(); i != clients_.constEnd(); ++i )
|
||||||
{
|
{
|
||||||
QIcon icon( (*i)->icon() );
|
QIcon icon( (*i)->icon() );
|
||||||
icon.addPixmap( (*i)->miniIcon() );
|
icon.addPixmap( (*i)->miniIcon() );
|
||||||
|
@ -275,7 +275,7 @@ void ClientGroup::updateMinMaxSize()
|
||||||
// Determine entire group's minimum and maximum sizes
|
// Determine entire group's minimum and maximum sizes
|
||||||
minSize_ = QSize( 0, 0 );
|
minSize_ = QSize( 0, 0 );
|
||||||
maxSize_ = QSize( INT_MAX, INT_MAX );
|
maxSize_ = QSize( INT_MAX, INT_MAX );
|
||||||
for( ClientList::const_iterator i = clients_.constBegin(); i != clients_.constEnd(); i++ )
|
for( ClientList::const_iterator i = clients_.constBegin(); i != clients_.constEnd(); ++i )
|
||||||
{
|
{
|
||||||
if( (*i)->minSize().width() > minSize_.width() )
|
if( (*i)->minSize().width() > minSize_.width() )
|
||||||
minSize_.setWidth( (*i)->minSize().width() );
|
minSize_.setWidth( (*i)->minSize().width() );
|
||||||
|
@ -299,7 +299,7 @@ void ClientGroup::updateMinMaxSize()
|
||||||
qBound( minSize_.width(), size.width(), maxSize_.width() ),
|
qBound( minSize_.width(), size.width(), maxSize_.width() ),
|
||||||
qBound( minSize_.height(), size.height(), maxSize_.height() ));
|
qBound( minSize_.height(), size.height(), maxSize_.height() ));
|
||||||
if( newSize != size )
|
if( newSize != size )
|
||||||
for( ClientList::const_iterator i = clients_.constBegin(); i != clients_.constEnd(); i++ )
|
for( ClientList::const_iterator i = clients_.constBegin(); i != clients_.constEnd(); ++i )
|
||||||
// TODO: Doesn't affect shaded windows?
|
// TODO: Doesn't affect shaded windows?
|
||||||
// There seems to be a race condition when using plainResize() which causes the window
|
// There seems to be a race condition when using plainResize() which causes the window
|
||||||
// to sometimes be located at new window's location instead of the visible window's location
|
// to sometimes be located at new window's location instead of the visible window's location
|
||||||
|
|
|
@ -261,7 +261,7 @@ static void create_pixmaps()
|
||||||
QBitmap pinupMask = QBitmap::fromData(QSize(16, 16), pinup_mask_bits);
|
QBitmap pinupMask = QBitmap::fromData(QSize(16, 16), pinup_mask_bits);
|
||||||
QBitmap pindownMask = QBitmap::fromData(QSize(16, 16), pindown_mask_bits);
|
QBitmap pindownMask = QBitmap::fromData(QSize(16, 16), pindown_mask_bits);
|
||||||
QBitmap menuMask = QBitmap::fromData(QSize(16, 16), menu_mask_bits);
|
QBitmap menuMask = QBitmap::fromData(QSize(16, 16), menu_mask_bits);
|
||||||
for (i = 0; i < NumStates; i++) {
|
for (i = 0; i < NumStates; ++i) {
|
||||||
bool isDown = (i == Down) || (i == IDown);
|
bool isDown = (i == Down) || (i == IDown);
|
||||||
pixmap[P_MENU + i]->setMask(menuMask);
|
pixmap[P_MENU + i]->setMask(menuMask);
|
||||||
pixmap[P_PINUP + i]->setMask(isDown ? pindownMask: pinupMask);
|
pixmap[P_PINUP + i]->setMask(isDown ? pindownMask: pinupMask);
|
||||||
|
@ -280,7 +280,7 @@ static void create_pixmaps()
|
||||||
mask.fillRect(0, 0, 10, 10, one);
|
mask.fillRect(0, 0, 10, 10, one);
|
||||||
mask.end();
|
mask.end();
|
||||||
|
|
||||||
for (i = 0; i < NumStates; i++)
|
for (i = 0; i < NumStates; ++i)
|
||||||
pixmap[P_NORMALIZE + i]->setMask(normalizeMask);
|
pixmap[P_NORMALIZE + i]->setMask(normalizeMask);
|
||||||
|
|
||||||
QBitmap shadeMask(bsize, bsize);
|
QBitmap shadeMask(bsize, bsize);
|
||||||
|
@ -288,7 +288,7 @@ static void create_pixmaps()
|
||||||
mask.begin(&shadeMask);
|
mask.begin(&shadeMask);
|
||||||
mask.fillRect(0, 0, bsize, 6, one);
|
mask.fillRect(0, 0, bsize, 6, one);
|
||||||
mask.end();
|
mask.end();
|
||||||
for (i = 0; i < NumStates; i++)
|
for (i = 0; i < NumStates; ++i)
|
||||||
pixmap[P_SHADE + i]->setMask(shadeMask);
|
pixmap[P_SHADE + i]->setMask(shadeMask);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -303,7 +303,7 @@ namespace Oxygen
|
||||||
{
|
{
|
||||||
|
|
||||||
qreal ratio( ClientGroupItemDataList::progress() );
|
qreal ratio( ClientGroupItemDataList::progress() );
|
||||||
for( iterator iter = begin(); iter != end(); iter++ )
|
for( iterator iter = begin(); iter != end(); ++iter )
|
||||||
{
|
{
|
||||||
|
|
||||||
// left
|
// left
|
||||||
|
|
|
@ -123,7 +123,7 @@ void GearsEffect::gear( float inner_radius, float outer_radius, float width, int
|
||||||
/* draw front face */
|
/* draw front face */
|
||||||
glBegin( GL_QUAD_STRIP );
|
glBegin( GL_QUAD_STRIP );
|
||||||
|
|
||||||
for( i = 0; i <= teeth; i++ )
|
for( i = 0; i <= teeth; ++i )
|
||||||
{
|
{
|
||||||
angle = i * 2.0 * M_PI / teeth;
|
angle = i * 2.0 * M_PI / teeth;
|
||||||
glVertex3f( r0 * cos( angle ), r0 * sin( angle ), width * 0.5 );
|
glVertex3f( r0 * cos( angle ), r0 * sin( angle ), width * 0.5 );
|
||||||
|
@ -141,7 +141,7 @@ void GearsEffect::gear( float inner_radius, float outer_radius, float width, int
|
||||||
/* draw front sides of teeth */
|
/* draw front sides of teeth */
|
||||||
glBegin( GL_QUADS );
|
glBegin( GL_QUADS );
|
||||||
|
|
||||||
for( i = 0; i < teeth; i++ )
|
for( i = 0; i < teeth; ++i )
|
||||||
{
|
{
|
||||||
angle = i * 2.0 * M_PI / teeth;
|
angle = i * 2.0 * M_PI / teeth;
|
||||||
|
|
||||||
|
@ -161,7 +161,7 @@ void GearsEffect::gear( float inner_radius, float outer_radius, float width, int
|
||||||
/* draw back face */
|
/* draw back face */
|
||||||
glBegin( GL_QUAD_STRIP );
|
glBegin( GL_QUAD_STRIP );
|
||||||
|
|
||||||
for( i = 0; i <= teeth; i++ )
|
for( i = 0; i <= teeth; ++i )
|
||||||
{
|
{
|
||||||
angle = i * 2.0 * M_PI / teeth;
|
angle = i * 2.0 * M_PI / teeth;
|
||||||
glVertex3f( r1 * cos( angle ), r1 * sin( angle ), -width * 0.5 );
|
glVertex3f( r1 * cos( angle ), r1 * sin( angle ), -width * 0.5 );
|
||||||
|
@ -180,7 +180,7 @@ void GearsEffect::gear( float inner_radius, float outer_radius, float width, int
|
||||||
glBegin( GL_QUADS );
|
glBegin( GL_QUADS );
|
||||||
da = 2.0 * M_PI / teeth / 4.0;
|
da = 2.0 * M_PI / teeth / 4.0;
|
||||||
|
|
||||||
for( i = 0; i < teeth; i++ )
|
for( i = 0; i < teeth; ++i )
|
||||||
{
|
{
|
||||||
angle = i * 2.0 * M_PI / teeth;
|
angle = i * 2.0 * M_PI / teeth;
|
||||||
|
|
||||||
|
@ -198,7 +198,7 @@ void GearsEffect::gear( float inner_radius, float outer_radius, float width, int
|
||||||
/* draw outward faces of teeth */
|
/* draw outward faces of teeth */
|
||||||
glBegin( GL_QUAD_STRIP );
|
glBegin( GL_QUAD_STRIP );
|
||||||
|
|
||||||
for( i = 0; i < teeth; i++ )
|
for( i = 0; i < teeth; ++i )
|
||||||
{
|
{
|
||||||
angle = i * 2.0 * M_PI / teeth;
|
angle = i * 2.0 * M_PI / teeth;
|
||||||
|
|
||||||
|
@ -236,7 +236,7 @@ void GearsEffect::gear( float inner_radius, float outer_radius, float width, int
|
||||||
/* draw inside radius cylinder */
|
/* draw inside radius cylinder */
|
||||||
glBegin( GL_QUAD_STRIP );
|
glBegin( GL_QUAD_STRIP );
|
||||||
|
|
||||||
for( i = 0; i <= teeth; i++ )
|
for( i = 0; i <= teeth; ++i )
|
||||||
{
|
{
|
||||||
angle = i * 2.0 * M_PI / teeth;
|
angle = i * 2.0 * M_PI / teeth;
|
||||||
glNormal3f( -cos( angle ), -sin( angle ), 0.0 );
|
glNormal3f( -cos( angle ), -sin( angle ), 0.0 );
|
||||||
|
|
|
@ -992,7 +992,7 @@ void DesktopGridEffect::setActive( bool active )
|
||||||
if( isUsingPresentWindows() )
|
if( isUsingPresentWindows() )
|
||||||
{
|
{
|
||||||
QList<WindowMotionManager>::iterator it;
|
QList<WindowMotionManager>::iterator it;
|
||||||
for( it = m_managers.begin(); it != m_managers.end(); it++ )
|
for( it = m_managers.begin(); it != m_managers.end(); ++it )
|
||||||
{
|
{
|
||||||
foreach( EffectWindow* w, (*it).managedWindows() )
|
foreach( EffectWindow* w, (*it).managedWindows() )
|
||||||
{
|
{
|
||||||
|
@ -1152,7 +1152,7 @@ bool DesktopGridEffect::isMotionManagerMovingWindows()
|
||||||
if( isUsingPresentWindows() )
|
if( isUsingPresentWindows() )
|
||||||
{
|
{
|
||||||
QList<WindowMotionManager>::iterator it;
|
QList<WindowMotionManager>::iterator it;
|
||||||
for( it = m_managers.begin(); it != m_managers.end(); it++ )
|
for( it = m_managers.begin(); it != m_managers.end(); ++it )
|
||||||
{
|
{
|
||||||
if( (*it).areWindowsMoving() )
|
if( (*it).areWindowsMoving() )
|
||||||
return true;
|
return true;
|
||||||
|
|
Loading…
Reference in a new issue