From ec6db5f3d8b7f0b725fec0b4d8d71b330aa034c6 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 20 Jan 2012 23:05:30 +0300
Subject: Fix code style.

---
 src/opengl1graphics.cpp   |  5 +++--
 src/test/testlauncher.cpp |  2 +-
 src/test/testmain.cpp     | 12 ++++++------
 3 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/opengl1graphics.cpp b/src/opengl1graphics.cpp
index b6ecd068b..6f712f698 100644
--- a/src/opengl1graphics.cpp
+++ b/src/opengl1graphics.cpp
@@ -389,8 +389,9 @@ void OpenGL1Graphics::drawRescaledImagePattern(Image *image, int x, int y,
             int width = (px + iw >= w) ? w - px : iw;
             int dstX = x + px;
 
-            drawRescaledQuad(image, srcX, srcY, dstX, dstY, width / scaleFactorW,
-                height / scaleFactorH, scaledWidth, scaledHeight);
+            drawRescaledQuad(image, srcX, srcY, dstX, dstY,
+                width / scaleFactorW, height / scaleFactorH,
+                scaledWidth, scaledHeight);
         }
     }
 
diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp
index 6f2f7a612..2f6860d43 100644
--- a/src/test/testlauncher.cpp
+++ b/src/test/testlauncher.cpp
@@ -117,7 +117,7 @@ int TestLauncher::testFps()
     timeval end;
 
     Wallpaper::loadWallpapers();
-    const std::string wallpaperName = Wallpaper::getWallpaper(800, 600);
+    Wallpaper::getWallpaper(800, 600);
     Image *img[4];
 
     img[0] = Theme::getImageFromTheme("graphics/sprites/arrow_up.gif");
diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp
index 287eeb706..70fcfc346 100644
--- a/src/test/testmain.cpp
+++ b/src/test/testmain.cpp
@@ -264,24 +264,24 @@ int TestMain::invokeFastOpenGLRenderTest(std::string test)
 {
 #if defined USE_OPENGL
     config.setValue("opengl", 1);
-#else
-    return -1;
-#endif
     config.write();
     int ret = execFile(fileName, fileName, "-t", test, 30);
     log->log("%s: %d", test.c_str(), ret);
     return ret;
+#else
+    return -1;
+#endif
 }
 
 int TestMain::invokeSafeOpenGLRenderTest(std::string test)
 {
 #if defined USE_OPENGL
     config.setValue("opengl", 2);
-#else
-    return -1;
-#endif
     config.write();
     int ret = execFile(fileName, fileName, "-t", test, 30);
     log->log("%s: %d", test.c_str(), ret);
     return ret;
+#else
+    return -1;
+#endif
 }
-- 
cgit v1.2.3-60-g2f50