Move subsurface-core to core and qt-mobile to mobile-widgets

Having subsurface-core as a directory name really messes with
autocomplete and is obviously redundant. Simmilarly, qt-mobile caused an
autocomplete conflict and also was inconsistent with the desktop-widget
name for the directory containing the "other" UI.

And while cleaning up the resulting change in the path name for include
files, I decided to clean up those even more to make them consistent
overall.

This could have been handled in more commits, but since this requires a
make clean before the build, it seemed more sensible to do it all in one.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 0 insertions, 65 deletions

diff --git a/subsurface-core/metrics.cpp b/subsurface-core/metrics.cpp
deleted file mode 100644
index 3c66528b8..000000000
--- a/subsurface-core/metrics.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * metrics.cpp
- *
- * methods to find/compute essential UI metrics
- * (font properties, icon sizes, etc)
- *
- */
-
-#include "metrics.h"
-
-static IconMetrics dfltIconMetrics;
-
-IconMetrics::IconMetrics() :
-	sz_small(-1),
-	sz_med(-1),
-	sz_big(-1),
-	sz_pic(-1),
-	spacing(-1),
-	dpr(1.0)
-{
-}
-
-QFont defaultModelFont()
-{
-	QFont font;
-//	font.setPointSizeF(font.pointSizeF() * 0.8);
-	return font;
-}
-
-QFontMetrics defaultModelFontMetrics()
-{
-	return QFontMetrics(defaultModelFont());
-}
-
-// return the default icon size, computed as the multiple of 16 closest to
-// the given height
-static int defaultIconSize(int height)
-{
-	int ret = (height + 8)/16;
-	ret *= 16;
-	if (ret < 16)
-		ret = 16;
-	return ret;
-}
-
-const IconMetrics & defaultIconMetrics()
-{
-	if (dfltIconMetrics.sz_small == -1) {
-		int small = defaultIconSize(defaultModelFontMetrics().height());
-		dfltIconMetrics.sz_small = small;
-		dfltIconMetrics.sz_med = small + small/2;
-		dfltIconMetrics.sz_big = 2*small;
-
-		dfltIconMetrics.sz_pic = 8*small;
-
-		dfltIconMetrics.spacing = small/8;
-	}
-
-	return dfltIconMetrics;
-}
-
-void updateDevicePixelRatio(double dpr)
-{
-	dfltIconMetrics.dpr = dpr;
-}