Fix some compiler warnings

Author: korli

artpaint/controls/ColorSlider.cpp

@@ -123,7 +123,7 @@ ColorSlider::SetColors(BList* colors)
 	uint32 numColors = colors->CountItems();
 	uint32 step = ceil((float)RES / (numColors - 1));
 
-	for (int i = 0; i < numColors - 1; ++i) {
+	for (uint32 i = 0; i < numColors - 1; ++i) {
 		start.word = *((uint32*)colors->ItemAt(i));
 		end.word = *((uint32*)colors->ItemAt(i + 1));
 
@@ -134,7 +134,7 @@ ColorSlider::SetColors(BList* colors)
 		float b_delta = (float)(end.bytes[0] - start.bytes[0]) / (float)step;
 		float a_delta = (float)(end.bytes[3] - start.bytes[3]) / (float)step;
 
-		for (int j = 0; j < step; ++j) {
+		for (uint32 j = 0; j < step; ++j) {
 			*bits++ = pixel.word;
 
 			pixel.bytes[0] = min_c(255, pixel.bytes[0] + ceil(b_delta));

artpaint/layers/Layer.cpp

@@ -250,8 +250,8 @@ Layer::calc_mini_image()
 		while ((x < miniature_width) && (fLayerPreviewThreads == 0)) {
 			color.word = *(big_image + ((int32)(y * dy)) * b_bpr + (int32)(x * dx));
 
-			*small_image++ = src_over_fixed(*small_image, color.word);
-
+			*small_image = src_over_fixed(*small_image, color.word);
+			small_image++;
 			x++;
 		}
 		y++;

artpaint/paintwindow/PaintWindow.cpp

@@ -1099,7 +1099,7 @@ PaintWindow::openMenuBar()
 		{ "SEPARATOR", 0, 0, 0, NULL, "SEPARATOR" } // separator
 	};
 
-	for (uint32 i = 0; i < (sizeof(fileMenu) / sizeof(menu_item)); ++i) {
+	for (uint32 i = 0; i < B_COUNT_OF(fileMenu); ++i) {
 		_AddMenuItems(menu, fileMenu[i].label, fileMenu[i].what, fileMenu[i].shortcut,
 			fileMenu[i].modifiers, fileMenu[i].target, fileMenu[i].help);
 	}
@@ -1121,7 +1121,7 @@ PaintWindow::openMenuBar()
 		{ "SEPARATOR", 0, 0, 0, NULL, "SEPARATOR" } // separator
 	};
 
-	for (uint32 i = 0; i < (sizeof(editMenu) / sizeof(menu_item)); ++i) {
+	for (uint32 i = 0; i < B_COUNT_OF(editMenu); ++i) {
 		_AddMenuItems(menu, editMenu[i].label, editMenu[i].what, editMenu[i].shortcut,
 			editMenu[i].modifiers, editMenu[i].target, editMenu[i].help);
 	}
@@ -1341,7 +1341,7 @@ PaintWindow::openMenuBar()
 
 	float zoomLevels[] = {0.25, 0.50, 1.0, 2.0, 4.0, 8.0, 16.0};
 
-	for (int i = 0; i < sizeof(zoomLevels) / sizeof(float); ++i) {
+	for (uint32 i = 0; i < B_COUNT_OF(zoomLevels); ++i) {
 		a_message = new BMessage(HS_SET_MAGNIFYING_SCALE);
 		a_message->AddFloat("magnifying_scale", zoomLevels[i]);
 
@@ -1654,7 +1654,7 @@ PaintWindow::_PreferredSize(Image* image) const
 	if (status == B_OK && tokens && tokenCount > 0) {
 		for (int32 i = 0; i < tokenCount; ++i) {
 			if (client_window_info* windowInfo = get_window_info(tokens[i])) {
-				if (!windowInfo->is_mini && !windowInfo->show_hide_level > 0) {
+				if (!windowInfo->is_mini && !(windowInfo->show_hide_level > 0)) {
 					tabHeight = windowInfo->tab_height;
 					borderSize = windowInfo->border_size;
 					free(windowInfo);
@@ -1779,7 +1779,7 @@ PaintWindow::_SaveImage(BMessage* message)
 		}
 		// here translate the data using a BitmapStream-object
 		BBitmap* bitmap = fImageView->ReturnImage()->ReturnRenderedImage();
-		printf("Bitmap at 0,0: 0x%8lx\n", *((uint32*)(bitmap->Bits())));
+		printf("Bitmap at 0,0: 0x%8" B_PRIx32 "\n", *((uint32*)(bitmap->Bits())));
 
 		// TODO: check if we leak here
 		BBitmapStream* bitmapStream = new BBitmapStream(bitmap);

artpaint/paintwindow/StatusView.cpp

@@ -150,9 +150,9 @@ StatusView::SetCoordinates(BPoint point, BPoint reference, bool use_reference)
 	if (use_reference) {
 		int32 dx = (int32)fabs(point.x - reference.x) + 1;
 		int32 dy = (int32)fabs(point.y - reference.y) + 1;
-		sprintf(coords, "X: %ld (%ld) Y: %ld (%ld)", x, dx, y, dy);
+		sprintf(coords, "X: %" B_PRId32 " (%" B_PRId32 ") Y: %" B_PRId32 " (%" B_PRId32 ")", x, dx, y, dy);
 	} else
-		sprintf(coords, "X: %ld   Y: %ld", x, y);
+		sprintf(coords, "X: %" B_PRId32 "   Y: %" B_PRId32, x, y);
 
 	coordinate_view->SetText(coords);
 }

artpaint/tools/Brush.cpp

@@ -475,7 +475,7 @@ Brush::print_brush(uint32** b)
 	printf("Brush:\n");
 	for (int32 y = 0; y < height_; y++) {
 		for (int32 x = 0; x < width_; x++)
-			printf("%ld ", b[y][x]);
+			printf("%" B_PRIu32 " ", b[y][x]);
 
 		printf("\n");
 	}

artpaint/tools/EllipseTool.cpp

@@ -478,11 +478,12 @@ EllipseToolConfigView::MessageReceived(BMessage* message)
 	switch (message->what) {
 		case OPTION_CHANGED:
 		{
-			if (message->FindInt32("option") == FILL_ENABLED_OPTION)
+			if (message->FindInt32("option") == FILL_ENABLED_OPTION) {
 				if (fFillEllipse->Value() == B_CONTROL_ON)
 					fLineWidth->SetEnabled(FALSE);
 				else
 					fLineWidth->SetEnabled(TRUE);
+			}
 		} break;
 	}
 }

artpaint/viewmanipulators/TextManipulator.cpp

@@ -510,14 +510,14 @@ TextManipulator::Restore(const BMessage& settings)
 	ssize_t dataSize;
 	status |= settings.FindData("font", B_RAW_TYPE, &data, &dataSize);
 	if (status == B_OK && dataSize == sizeof(BFont))
-		memcpy(&fSettings.font, data, sizeof(BFont));
+		fSettings.font = *(BFont*)data;
 
 	int32 i = 0;
 	fSettings.text_color_array = new rgb_color[fSettings.text_array_length];
 	while ((status |= settings.FindData("text_color_array", B_RGB_COLOR_TYPE, i,
 		&data, &dataSize)) == B_OK) {
 		if (dataSize == sizeof(rgb_color))
-			memcpy(&fSettings.text_color_array[i], data, sizeof(rgb_color));
+			fSettings.text_color_array[i] = *(rgb_color*)data;
 		i++;
 	}
 
@@ -982,7 +982,7 @@ TextManipulatorSettings::operator==(const TextManipulatorSettings& s)
 bool
 TextManipulatorSettings::operator!=(const TextManipulatorSettings& settings)
 {
-	return (*this != settings);
+	return !(*this == settings);
 }
 
 

artpaint/windows/GlobalSetupWindow.cpp

@@ -419,7 +419,7 @@ GlobalSetupWindow::TransparencyControlView::TransparencyControlView()
 	BRect frame(0, 0, size * 250, size * 100);
 
 	fBgContainer = new PreviewPane(frame);
-	BRect frameSwatch = (0, 0, size * 24, size * 24);
+	BRect frameSwatch(0, 0, size * 24, size * 24);
 
 	fColorSwatch1 = new ColorSwatch(frameSwatch, "color1");
 	fColorSwatch1->SetToolTip(B_TRANSLATE("Drop a color from the Colors window"));