Mercurial > ldforge / file diff

--- a/src/messageLog.h	Mon Jun 02 14:34:23 2014 +0300
+++ b/src/messageLog.h	Tue Jun 03 20:28:10 2014 +0300
@@ -50,7 +50,7 @@
 		{
 			public:
 				//! Constructs a line with the given \c text
-				Line (String text);
+				Line (QString text);
 
 				//! Check this line's expiry and update alpha accordingly.
 				//! \c changed is updated to whether the line has somehow
@@ -59,7 +59,7 @@
 				//! \returns if it expired.
 				bool update (bool& changed);
 
-				String text;
+				QString text;
 				float alpha;
 				QDateTime expiry;
 		};
@@ -68,7 +68,7 @@
 		explicit MessageManager (QObject* parent = null);
 
 		//! Adds a line with the given \c text to the message manager.
-		void addLine (String line);
+		void addLine (QString line);
 
 		//! \returns all active lines in the message manager.
 		const QList<Line>& getLines() const;