Mac OS X: Cleanup, fixed build

skyjake · Mar 24, 2012 · 60e2a00 · 60e2a00
1 parent 53b4974
commit 60e2a00
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 28 deletions.
diff --git a/doomsday/engine/portable/src/displaymode.cpp b/doomsday/engine/portable/src/displaymode.cpp
@@ -22,10 +22,6 @@
 #include "displaymode.h"
 #include "displaymode_native.h"
 
-#ifdef MACOSX
-#  include "displaymode_macx.h"
-#endif
-
 #include <vector>
 #include <set>
 #include <algorithm>
@@ -34,29 +30,6 @@
 
 static bool inited = false;
 
-#if 0
-static bool tryDivide(int& ratioX, int& ratioY, int div)
-{
-    int dx = ratioX / div;
-    if(dx * div != ratioX) return false;
-    int dy = ratioY / div;
-    if(dy * div != ratioY) return false;
-    ratioX = dx;
-    ratioY = dy;
-    return true;
-}
-
-static bool reduce(int& ratioX, int& ratioY)
-{
-    for(int div = 2; div <= qMin(ratioX, ratioY); div++)
-    {
-        if(tryDivide(ratioX, ratioY, div))
-            return true;
-    }
-    return false;
-}
-#endif
-
 static float differenceToOriginalHz(float hz);
 
 struct Mode : public DisplayMode

diff --git a/doomsday/engine/portable/src/window.cpp b/doomsday/engine/portable/src/window.cpp
@@ -52,7 +52,7 @@
 #include <QDebug>
 
 #ifdef MACOSX
-static const int POST_MODE_CHANGE_WAIT_BEFORE_LAYOUT_UPDATE = 100; // ms
+static const int POST_MODE_CHANGE_WAIT_BEFORE_UPDATE = 100; // ms
 #else
 static const int POST_MODE_CHANGE_WAIT_BEFORE_UPDATE = 1; // ms
 #endif