[haiku-commits] r37695 - haiku/trunk/src/tests/servers/app/window_creation
- From: superstippi@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 22 Jul 2010 15:54:36 +0200 (CEST)
Author: stippi
Date: 2010-07-22 15:54:36 +0200 (Thu, 22 Jul 2010)
New Revision: 37695
Changeset: http://dev.haiku-os.org/changeset/37695
Modified:
haiku/trunk/src/tests/servers/app/window_creation/main.cpp
Log:
* Style cleanup.
* Include correct header for strcmp().
Modified: haiku/trunk/src/tests/servers/app/window_creation/main.cpp
===================================================================
--- haiku/trunk/src/tests/servers/app/window_creation/main.cpp 2010-07-22
13:35:18 UTC (rev 37694)
+++ haiku/trunk/src/tests/servers/app/window_creation/main.cpp 2010-07-22
13:54:36 UTC (rev 37695)
@@ -1,3 +1,8 @@
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
#include <Application.h>
#include <Box.h>
#include <OS.h>
@@ -2,10 +7,6 @@
#include <Screen.h>
-#include <String.h>
#include <Window.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-static BRect *sFrames = NULL;
+static BRect* sFrames = NULL;
static uint32 sNumFrames = 0;
@@ -15,21 +16,22 @@
class TestApp : public BApplication {
public:
- TestApp(uint32 numWindows, bool views);
- virtual ~TestApp();
+ TestApp(uint32
numWindows, bool views);
+ virtual ~TestApp();
- virtual void ReadyToRun();
+ virtual void ReadyToRun();
private:
- uint32 fFrameNum;
- BRect fScreenFrame;
- uint32 fNumWindows;
- uint32 fMaxWindows;
- bool fTestViews;
+ void _CreateFrames(uint32
numWindows);
+ int32 _WindowCreator();
+ static int32 _ThreadStarter(void* data);
- void _CreateFrames(uint32 numWindows);
- int32 _WindowCreator();
- static int32 _ThreadStarter(void *data);
+private:
+ uint32 fFrameNum;
+ BRect fScreenFrame;
+ uint32 fNumWindows;
+ uint32 fMaxWindows;
+ bool fTestViews;
};
@@ -37,13 +39,12 @@
public:
TestWindow(BRect frame, bool
createView);
virtual ~TestWindow();
-
-
};
TestApp::TestApp(uint32 numWindows, bool views)
- : BApplication("application/x.vnd-Haiku.window-creation"),
+ :
+ BApplication("application/x.vnd-Haiku.window-creation"),
fScreenFrame(),
fNumWindows(0),
fMaxWindows(numWindows),
@@ -64,7 +65,8 @@
void
TestApp::ReadyToRun()
{
- thread_id thread = spawn_thread(_ThreadStarter, "Window creator",
B_NORMAL_PRIORITY, this);
+ thread_id thread = spawn_thread(_ThreadStarter, "Window creator",
+ B_NORMAL_PRIORITY, this);
resume_thread(thread);
}
@@ -73,8 +75,10 @@
TestApp::_CreateFrames(uint32 numWindows)
{
BRect frame(0, 0, 50, 50);
- uint32 numHorizontal = (fScreenFrame.IntegerWidth() + 1) /
(frame.IntegerWidth() + 1);
- uint32 numVertical = (fScreenFrame.IntegerHeight() + 1) /
(frame.IntegerHeight() + 1);
+ uint32 numHorizontal = (fScreenFrame.IntegerWidth() + 1)
+ / (frame.IntegerWidth() + 1);
+ uint32 numVertical = (fScreenFrame.IntegerHeight() + 1)
+ / (frame.IntegerHeight() + 1);
sNumFrames = numHorizontal * numVertical;
sFrames = new BRect[sNumFrames];
for (uint32 i = 0; i < sNumFrames; i++) {
@@ -95,14 +99,15 @@
if (fFrameNum >= sNumFrames)
fFrameNum = 0;
- BWindow *window = new TestWindow(sFrames[fFrameNum++],
fTestViews);
+ BWindow* window = new TestWindow(sFrames[fFrameNum++],
fTestViews);
window->Show();
fNumWindows++;
}
bigtime_t endTime = system_time();
- printf("Test completed. %ld windows created in %lld usecs.\n",
fNumWindows, endTime - startTime);
+ printf("Test completed. %ld windows created in %lld usecs.\n",
fNumWindows,
+ endTime - startTime);
PostMessage(B_QUIT_REQUESTED);
return B_OK;
@@ -110,14 +115,15 @@
int32
-TestApp::_ThreadStarter(void *data)
+TestApp::_ThreadStarter(void* data)
{
- return static_cast<TestApp *>(data)->_WindowCreator();
+ return static_cast<TestApp*>(data)->_WindowCreator();
}
TestWindow::TestWindow(BRect frame, bool views)
- : BWindow(frame, "Test", B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS)
+ :
+ BWindow(frame, "Test", B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS)
{
if (views)
AddChild(new BBox(Bounds()));
@@ -129,16 +135,13 @@
}
-
-// main
int
main(int argc, char** argv)
{
uint32 numWindows = 10;
bool testViews = false;
- if (argc > 1) {
+ if (argc > 1)
numWindows = atoi(argv[1]);
- }
if (argc > 2) {
if (!strcmp(argv[2], "views"))
Other related posts:
- » [haiku-commits] r37695 - haiku/trunk/src/tests/servers/app/window_creation - superstippi
