yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disambiguating ints and unsigned and float and double

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=747016
This commit is contained in:
Adriaan de Groot 2007-12-10 20:43:13 +00:00
parent 539275e0df
commit 9ff9f6ce22
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client.cpp
View file

@ -1119,7 +1119,7 @@ void Client::killProcess( bool ask, Time timestamp )
connect( process_killer, SIGNAL( error( QProcess::ProcessError )), SLOT( processKillerExited())); connect( process_killer, SIGNAL( error( QProcess::ProcessError )), SLOT( processKillerExited()));
connect( process_killer, SIGNAL( finished( int, QProcess::ExitStatus )), SLOT( processKillerExited())); connect( process_killer, SIGNAL( finished( int, QProcess::ExitStatus )), SLOT( processKillerExited()));
process_killer->start( KStandardDirs::findExe( "kwin_killer_helper" ), process_killer->start( KStandardDirs::findExe( "kwin_killer_helper" ),
QStringList() << "--pid" << QByteArray().setNum( pid ) << "--hostname" << machine QStringList() << "--pid" << QByteArray().setNum( (unsigned)pid ) << "--hostname" << machine
<< "--windowname" << caption().toUtf8() << "--windowname" << caption().toUtf8()
<< "--applicationname" << resourceClass() << "--applicationname" << resourceClass()
<< "--wid" << QString::number( window() ) << "--wid" << QString::number( window() )

14
effects/presentwindows.cpp
View file

@ -487,12 +487,12 @@ void PresentWindowsEffect::calculateWindowTransformationsKompose(EffectWindowLis
// Use more columns than rows when parent's width > parent's height // Use more columns than rows when parent's width > parent's height
if ( parentRatio > 1 ) if ( parentRatio > 1 )
{ {
columns = (int)ceil( sqrt(windowlist.count()) ); columns = (int)ceil( sqrt((double)windowlist.count()) );
rows = (int)ceil( (double)windowlist.count() / (double)columns ); rows = (int)ceil( (double)windowlist.count() / (double)columns );
} }
else else
{ {
rows = (int)ceil( sqrt(windowlist.count()) ); rows = (int)ceil( sqrt((double)windowlist.count()) );
columns = (int)ceil( (double)windowlist.count() / (double)rows ); columns = (int)ceil( (double)windowlist.count() / (double)rows );
} }
kDebug() << "Using " << rows << " rows & " << columns << " columns for " << windowlist.count() << " clients"; kDebug() << "Using " << rows << " rows & " << columns << " columns for " << windowlist.count() << " clients";
@ -619,7 +619,7 @@ void PresentWindowsEffect::calculateWindowTransformationsKompose(EffectWindowLis
void PresentWindowsEffect::calculateWindowTransformationsClosest(EffectWindowList windowlist) void PresentWindowsEffect::calculateWindowTransformationsClosest(EffectWindowList windowlist)
{ {
QRect area = effects->clientArea( PlacementArea, effects->activeScreen(), effects->currentDesktop()); QRect area = effects->clientArea( PlacementArea, effects->activeScreen(), effects->currentDesktop());
int columns = int( ceil( sqrt( windowlist.count()))); int columns = int( ceil( sqrt( (double)windowlist.count())));
int rows = int( ceil( windowlist.count() / double( columns ))); int rows = int( ceil( windowlist.count() / double( columns )));
foreach( EffectWindow* w, windowlist ) foreach( EffectWindow* w, windowlist )
mWindowData[ w ].slot = -1; mWindowData[ w ].slot = -1;
@ -715,7 +715,7 @@ void PresentWindowsEffect::assignSlots( const QRect& area, int columns, int rows
continue; continue;
int xdiff = pos.x() - ( area.x() + slotwidth * x + slotwidth / 2 ); // slotwidth/2 for center int xdiff = pos.x() - ( area.x() + slotwidth * x + slotwidth / 2 ); // slotwidth/2 for center
int ydiff = pos.y() - ( area.y() + slotheight * y + slotheight / 2 ); int ydiff = pos.y() - ( area.y() + slotheight * y + slotheight / 2 );
int dist = int( sqrt( xdiff * xdiff + ydiff * ydiff )); int dist = int( sqrt( (double)(xdiff * xdiff + ydiff * ydiff) ));
if( dist < distance ) if( dist < distance )
{ {
distance = dist; distance = dist;
@ -750,9 +750,9 @@ void PresentWindowsEffect::getBestAssignments()
bool PresentWindowsEffect::canRearrangeClosest(EffectWindowList windowlist) bool PresentWindowsEffect::canRearrangeClosest(EffectWindowList windowlist)
{ {
QRect area = effects->clientArea( PlacementArea, effects->activeScreen(), effects->currentDesktop()); QRect area = effects->clientArea( PlacementArea, effects->activeScreen(), effects->currentDesktop());
int columns = int( ceil( sqrt( windowlist.count()))); int columns = int( ceil( sqrt( (double)windowlist.count())));
int rows = int( ceil( windowlist.count() / double( columns ))); int rows = int( ceil( windowlist.count() / double( columns )));
int old_columns = int( ceil( sqrt( mWindowData.count()))); int old_columns = int( ceil( sqrt( (double)mWindowData.count())));
int old_rows = int( ceil( mWindowData.count() / double( columns ))); int old_rows = int( ceil( mWindowData.count() / double( columns )));
return old_columns != columns || old_rows != rows; return old_columns != columns || old_rows != rows;
} }
@ -857,7 +857,7 @@ EffectWindow* PresentWindowsEffect::relativeWindow( EffectWindow* w, int xdiff,
return NULL; return NULL;
if( w == NULL ) if( w == NULL )
return findFirstWindow(); return findFirstWindow();
int columns = int( ceil( sqrt( mWindowData.count()))); int columns = int( ceil( sqrt( (double)mWindowData.count())));
int rows = int( ceil( mWindowData.count() / double( columns ))); int rows = int( ceil( mWindowData.count() / double( columns )));
QVector< QVector< EffectWindow* > > grid; QVector< QVector< EffectWindow* > > grid;
grid.resize( columns ); grid.resize( columns );