Mercurial > ldforge / file diff

--- a/src/glRenderer.h	Sun Apr 27 04:15:25 2014 +0300
+++ b/src/glRenderer.h	Sun Apr 27 04:23:09 2014 +0300
@@ -49,7 +49,7 @@
 					oy;
 	double			lw,
 					lh;
-	QString			fname;
+	String			fname;
 	QImage*			img;
 	bool			invalid;
 };
@@ -178,7 +178,7 @@
 		void           setBackground();
 		void           setCamera (const EFixedCamera cam);
 		void           setDepthValue (double depth);
-		bool           setupOverlay (EFixedCamera cam, QString file, int x, int y, int w, int h);
+		bool           setupOverlay (EFixedCamera cam, String file, int x, int y, int w, int h);
 		void           updateOverlayObjects();
 		void           zoomNotch (bool inward);
 
@@ -309,7 +309,7 @@
 		}
 
 		template<typename... Args>
-		inline QString format (QString fmtstr, Args... args)
+		inline String format (String fmtstr, Args... args)
 		{
 			return ::format (fmtstr, args...);
 		}