summaryrefslogtreecommitdiff
path: root/noncore/settings/sysinfo/benchmarkinfo.cpp
Side-by-side diff
Diffstat (limited to 'noncore/settings/sysinfo/benchmarkinfo.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sysinfo/benchmarkinfo.cpp21
1 files changed, 12 insertions, 9 deletions
diff --git a/noncore/settings/sysinfo/benchmarkinfo.cpp b/noncore/settings/sysinfo/benchmarkinfo.cpp
index 3c2c15f..2a52b00 100644
--- a/noncore/settings/sysinfo/benchmarkinfo.cpp
+++ b/noncore/settings/sysinfo/benchmarkinfo.cpp
@@ -50,9 +50,12 @@
#if defined (__GNUC__) && (__GNUC__ < 3)
extern double round(double);
#endif
+using namespace Opie::Ui;
+using namespace Opie::Core;
extern "C"
+
{
void BenchFFT( void );
double dhry_main( int );
}
@@ -174,14 +177,14 @@ void BenchmarkInfo::machineActivated( int index )
return;
}
QStringList::Iterator it = results->begin();
test_alu->setText( 2, *(it++) );
- test_fpu->setText( 2, *(it++) );
+ test_fpu->setText( 2, *(it++) );
test_txt->setText( 2, *(it++) );
test_gfx->setText( 2, *(it++) );
test_ram->setText( 2, *(it++) );
test_sd->setText( 2, *(it++) );
- test_cf->setText( 2, *(it++) );
+ test_cf->setText( 2, *(it++) );
}
void BenchmarkInfo::run()
@@ -258,9 +261,9 @@ int BenchmarkInfo::textRendering( int seconds )
BenchmarkPaintWidget bpw;
int loops = 0;
-
+
while ( t.elapsed() < stop )
{
int k = rand() % 9;
int s = rand() % 100;
@@ -268,9 +271,9 @@ int BenchmarkInfo::textRendering( int seconds )
bpw.p.setFont( QFont( "Vera", s ) );
bpw.p.drawText( rand() % w, rand() % h, text, text.length() );
++loops;
}
-
+
return loops * text.length();
}
int BenchmarkInfo::gfxRendering( int seconds )
@@ -289,9 +292,9 @@ int BenchmarkInfo::gfxRendering( int seconds )
QTime t;
t.start();
int stop = t.elapsed() + seconds*1000;
int loops = 0;
-
+
while ( t.elapsed() < stop )
{
int k = rand() % 9;
bpw.p.setPen( QColor( rr[ k ], gg[ k ], bb[ k ] ) );
@@ -300,9 +303,9 @@ int BenchmarkInfo::gfxRendering( int seconds )
}
t.restart();
stop = t.elapsed() + seconds*1000;
-
+
while ( t.elapsed() < stop )
{
int k = rand() % 9;
bpw.p.setPen( QColor( rr[ k ], gg[ k ], bb[ k ] ) );
@@ -313,9 +316,9 @@ int BenchmarkInfo::gfxRendering( int seconds )
QBrush br1;
br1.setStyle( SolidPattern );
t.restart();
stop = t.elapsed() + seconds*1000;
-
+
while ( t.elapsed() < stop )
{
int k = rand() % 9;
br1.setColor( QColor( rr[ k ], gg[ k ], bb[ k ] ) );
@@ -325,17 +328,17 @@ int BenchmarkInfo::gfxRendering( int seconds )
QPixmap p = Resource::loadPixmap( "sysinfo/pattern" );
t.restart();
stop = t.elapsed() + seconds*1000;
-
+
while ( t.elapsed() < stop )
{
bpw.p.drawPixmap( rand()%w, rand()%h, p );
++loops;
}
return loops;
-
+
}
void BenchmarkInfo::performFileTest( const QString& fname, OCheckListItem* item )
{