Mercurial > ldforge / file diff

--- a/src/configDialog.h	Mon Jun 02 14:34:23 2014 +0300
+++ b/src/configDialog.h	Tue Jun 03 20:28:10 2014 +0300
@@ -64,12 +64,12 @@
 
 		void applySettings();
 		void addShortcut (KeySequenceConfigEntry& cfg, QAction* act, int& i);
-		void setButtonBackground (QPushButton* button, String value);
-		void pickColor (String& conf, QPushButton* button);
+		void setButtonBackground (QPushButton* button, QString value);
+		void pickColor (QString& conf, QPushButton* button);
 		void updateQuickColorList (LDQuickColor* sel = null);
 		void setShortcutText (ShortcutListItem* item);
 		int getItemRow (QListWidgetItem* item, QList<QListWidgetItem*>& haystack);
-		String quickColorString();
+		QString quickColorString();
 		QListWidgetItem* getSelectedQuickColor();
 		QList<ShortcutListItem*> getShortcutSelection();
 		void initExtProgs();