diff -r bebe09014dd6 -r 6a1fa662bfc1 src/gui.h --- a/src/gui.h Wed Oct 16 16:40:42 2013 +0300 +++ b/src/gui.h Wed Oct 16 16:47:40 2013 +0300 @@ -110,7 +110,7 @@ LDObject::Type uniformSelectedType(); void scrollToSelection(); void spawnContextMenu (const QPoint pos); - void deleteObjVector (List< LDObject* > objs); + void deleteObjVector (QList< LDObject* > objs); int deleteSelection(); void deleteByColor (const short int colnum); void save (LDFile* f, bool saveAs); @@ -119,11 +119,11 @@ { return m_renderer; } - inline List& sel() + inline QList& sel() { return m_sel; } - inline void setQuickColors (List& colors) + inline void setQuickColors (QList& colors) { m_quickColors = colors; } @@ -152,10 +152,10 @@ GLRenderer* m_renderer; QProgressBar* m_primLoaderBar; QWidget* m_primLoaderWidget; - List m_sel; - List m_quickColors; - List m_colorButtons; - List m_recentFiles; + QList m_sel; + QList m_quickColors; + QList m_colorButtons; + QList m_recentFiles; MessageManager* m_msglog; Ui_LDForgeUI* ui; @@ -181,7 +181,7 @@ // ----------------------------------------------------------------------------- // Other GUI-related stuff not directly part of ForgeWindow: QPixmap getIcon (str iconName); // Get an icon from the resource dir -List quickColorsFromConfig(); // Make a list of quick colors based on config +QList quickColorsFromConfig(); // Make a list of quick colors based on config bool confirm (str title, str msg); // Generic confirm prompt bool confirm (str msg); // Generic confirm prompt void critical (str msg); // Generic error prompt @@ -194,7 +194,7 @@ // Takes in pairs of radio buttons and respective values and returns the value of // the first found radio button that was checked. // ============================================================================= -template T radioSwitch (const T& defval, List> haystack) +template T radioSwitch (const T& defval, QList> haystack) { for (pair i : haystack) if (i.first->isChecked()) return i.second; @@ -207,7 +207,7 @@ // Takes in pairs of radio buttons and respective values and checks the first // found radio button to have the given value. // ============================================================================= -template void radioDefault (const T& expr, List> haystack) +template void radioDefault (const T& expr, QList> haystack) { for (pair i : haystack) { if (i.second == expr) { i.first->setChecked (true);