Mercurial > ldforge / file diff

--- a/src/configDialog.h	Sun Apr 27 04:15:25 2014 +0300
+++ b/src/configDialog.h	Sun Apr 27 04:23:09 2014 +0300
@@ -67,12 +67,12 @@
 
 		void applySettings();
 		void addShortcut (KeySequenceConfig& cfg, QAction* act, int& i);
-		void setButtonBackground (QPushButton* button, QString value);
-		void pickColor (QString& conf, QPushButton* button);
+		void setButtonBackground (QPushButton* button, String value);
+		void pickColor (String& conf, QPushButton* button);
 		void updateQuickColorList (LDQuickColor* sel = null);
 		void setShortcutText (ShortcutListItem* item);
 		int getItemRow (QListWidgetItem* item, QList<QListWidgetItem*>& haystack);
-		QString quickColorString();
+		String quickColorString();
 		QListWidgetItem* getSelectedQuickColor();
 		QList<ShortcutListItem*> getShortcutSelection();
 		void initGrids();