# HG changeset patch # User Teemu Piippo # Date 1406424900 -10800 # Node ID cbd89b33f70dff592072a56b19993cf7b90c579b # Parent dbed6938238c882044f0fdc077c784106df68699 - down with all these unnecessary semicolons! diff -r dbed6938238c -r cbd89b33f70d src/actions.cc --- a/src/actions.cc Sun Jul 27 04:25:50 2014 +0300 +++ b/src/actions.cc Sun Jul 27 04:35:00 2014 +0300 @@ -39,16 +39,17 @@ #include "ui_newpart.h" #include "editmodes/abstractEditMode.h" -EXTERN_CFGENTRY (Bool, DrawWireframe); -EXTERN_CFGENTRY (Bool, BFCRedGreenView); -EXTERN_CFGENTRY (String, DefaultName); -EXTERN_CFGENTRY (String, DefaultUser); -EXTERN_CFGENTRY (Bool, UseCALicense); -EXTERN_CFGENTRY (Bool, DrawAngles); +EXTERN_CFGENTRY (Bool, DrawWireframe) +EXTERN_CFGENTRY (Bool, BFCRedGreenView) +EXTERN_CFGENTRY (String, DefaultName) +EXTERN_CFGENTRY (String, DefaultUser) +EXTERN_CFGENTRY (Bool, UseCALicense) +EXTERN_CFGENTRY (Bool, DrawAngles) EXTERN_CFGENTRY (Bool, RandomColors) EXTERN_CFGENTRY (Bool, DrawSurfaces) EXTERN_CFGENTRY (Bool, DrawEdgeLines) EXTERN_CFGENTRY (Bool, DrawConditionalLines) +EXTERN_CFGENTRY (Bool, DrawAxes) // ============================================================================= // @@ -495,7 +496,6 @@ // ============================================================================= // -EXTERN_CFGENTRY (Bool, DrawAxes); void MainWindow::slot_actionAxes() { cfg::DrawAxes = not cfg::DrawAxes; diff -r dbed6938238c -r cbd89b33f70d src/colorSelector.cc --- a/src/colorSelector.cc Sun Jul 27 04:25:50 2014 +0300 +++ b/src/colorSelector.cc Sun Jul 27 04:35:00 2014 +0300 @@ -35,8 +35,8 @@ static const int g_numColumns = 16; static const int g_squareSize = 32; -EXTERN_CFGENTRY (String, MainColor); -EXTERN_CFGENTRY (Float, MainColorAlpha); +EXTERN_CFGENTRY (String, MainColor) +EXTERN_CFGENTRY (Float, MainColorAlpha) // ============================================================================= // diff -r dbed6938238c -r cbd89b33f70d src/dialogs.cc --- a/src/dialogs.cc Sun Jul 27 04:25:50 2014 +0300 +++ b/src/dialogs.cc Sun Jul 27 04:35:00 2014 +0300 @@ -45,7 +45,7 @@ #include "ui_bombbox.h" extern const char* g_extProgPathFilter; -EXTERN_CFGENTRY (String, LDrawPath); +EXTERN_CFGENTRY (String, LDrawPath) // ============================================================================= // ============================================================================= diff -r dbed6938238c -r cbd89b33f70d src/extPrograms.cc --- a/src/extPrograms.cc Sun Jul 27 04:25:50 2014 +0300 +++ b/src/extPrograms.cc Sun Jul 27 04:35:00 2014 +0300 @@ -51,12 +51,12 @@ // ============================================================================= // -CFGENTRY (String, IsecalcPath, ""); -CFGENTRY (String, IntersectorPath, ""); -CFGENTRY (String, CovererPath, ""); -CFGENTRY (String, YtruderPath, ""); -CFGENTRY (String, RectifierPath, ""); -CFGENTRY (String, Edger2Path, ""); +CFGENTRY (String, IsecalcPath, "") +CFGENTRY (String, IntersectorPath, "") +CFGENTRY (String, CovererPath, "") +CFGENTRY (String, YtruderPath, "") +CFGENTRY (String, RectifierPath, "") +CFGENTRY (String, Edger2Path, "") QString* const g_extProgPaths[] = { @@ -69,12 +69,12 @@ }; #ifndef _WIN32 -CFGENTRY (Bool, IsecalcUsesWine, false); -CFGENTRY (Bool, IntersectorUsesWine, false); -CFGENTRY (Bool, CovererUsesWine, false); -CFGENTRY (Bool, YtruderUsesWine, false); -CFGENTRY (Bool, RectifierUsesWine, false); -CFGENTRY (Bool, Edger2UsesWine, false); +CFGENTRY (Bool, IsecalcUsesWine, false) +CFGENTRY (Bool, IntersectorUsesWine, false) +CFGENTRY (Bool, CovererUsesWine, false) +CFGENTRY (Bool, YtruderUsesWine, false) +CFGENTRY (Bool, RectifierUsesWine, false) +CFGENTRY (Bool, Edger2UsesWine, false) bool* const g_extProgWine[] = { diff -r dbed6938238c -r cbd89b33f70d src/glCompiler.cc --- a/src/glCompiler.cc Sun Jul 27 04:25:50 2014 +0300 +++ b/src/glCompiler.cc Sun Jul 27 04:35:00 2014 +0300 @@ -46,8 +46,8 @@ }; CFGENTRY (String, SelectColorBlend, "#0080FF") -EXTERN_CFGENTRY (Bool, BlackEdges); -EXTERN_CFGENTRY (String, BackgroundColor); +EXTERN_CFGENTRY (Bool, BlackEdges) +EXTERN_CFGENTRY (String, BackgroundColor) static QList g_warnedColors; static const QColor g_BFCFrontColor (64, 192, 80); diff -r dbed6938238c -r cbd89b33f70d src/ldObject.cc --- a/src/ldObject.cc Sun Jul 27 04:25:50 2014 +0300 +++ b/src/ldObject.cc Sun Jul 27 04:35:00 2014 +0300 @@ -27,9 +27,9 @@ #include "colors.h" #include "glCompiler.h" -CFGENTRY (String, DefaultName, ""); -CFGENTRY (String, DefaultUser, ""); -CFGENTRY (Bool, UseCALicense, true); +CFGENTRY (String, DefaultName, "") +CFGENTRY (String, DefaultUser, "") +CFGENTRY (Bool, UseCALicense, true) // List of all LDObjects QMap g_allObjects; diff -r dbed6938238c -r cbd89b33f70d src/main.cc --- a/src/main.cc Sun Jul 27 04:25:50 2014 +0300 +++ b/src/main.cc Sun Jul 27 04:35:00 2014 +0300 @@ -40,7 +40,7 @@ const Vertex g_origin (0.0f, 0.0f, 0.0f); const Matrix g_identity ({1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f}); -CFGENTRY (Bool, FirstStart, true); +CFGENTRY (Bool, FirstStart, true) // ============================================================================= // diff -r dbed6938238c -r cbd89b33f70d src/mainWindow.cc --- a/src/mainWindow.cc Sun Jul 27 04:25:50 2014 +0300 +++ b/src/mainWindow.cc Sun Jul 27 04:35:00 2014 +0300 @@ -55,17 +55,17 @@ static bool g_isSelectionLocked = false; static QMap g_defaultShortcuts; -CFGENTRY (Bool, ColorizeObjectsList, true); -CFGENTRY (String, QuickColorToolbar, "4:25:14:27:2:3:11:1:22:|:0:72:71:15"); -CFGENTRY (Bool, ListImplicitFiles, false); -EXTERN_CFGENTRY (List, RecentFiles); -EXTERN_CFGENTRY (Bool, DrawAxes); -EXTERN_CFGENTRY (String, MainColor); -EXTERN_CFGENTRY (Float, MainColorAlpha); -EXTERN_CFGENTRY (Bool, DrawWireframe); -EXTERN_CFGENTRY (Bool, BFCRedGreenView); -EXTERN_CFGENTRY (Bool, DrawAngles); -EXTERN_CFGENTRY (Bool, RandomColors); +CFGENTRY (Bool, ColorizeObjectsList, true) +CFGENTRY (String, QuickColorToolbar, "4:25:14:27:2:3:11:1:22:|:0:72:71:15") +CFGENTRY (Bool, ListImplicitFiles, false) +EXTERN_CFGENTRY (List, RecentFiles) +EXTERN_CFGENTRY (Bool, DrawAxes) +EXTERN_CFGENTRY (String, MainColor) +EXTERN_CFGENTRY (Float, MainColorAlpha) +EXTERN_CFGENTRY (Bool, DrawWireframe) +EXTERN_CFGENTRY (Bool, BFCRedGreenView) +EXTERN_CFGENTRY (Bool, DrawAngles) +EXTERN_CFGENTRY (Bool, RandomColors) EXTERN_CFGENTRY (Bool, DrawSurfaces) EXTERN_CFGENTRY (Bool, DrawEdgeLines) EXTERN_CFGENTRY (Bool, DrawConditionalLines) diff -r dbed6938238c -r cbd89b33f70d src/miscallenous.cc --- a/src/miscallenous.cc Sun Jul 27 04:25:50 2014 +0300 +++ b/src/miscallenous.cc Sun Jul 27 04:35:00 2014 +0300 @@ -99,15 +99,15 @@ // // Grid stuff // -CFGENTRY (Int, Grid, Grid::Medium); -CFGENTRY (Float, GridCoarseCoordinateSnap, 5.0f); -CFGENTRY (Float, GridCoarseAngleSnap, 45.0f); -CFGENTRY (Float, GridMediumCoordinateSnap, 1.0f); -CFGENTRY (Float, GridMediumAngleSnap, 22.5f); -CFGENTRY (Float, GridFineCoordinateSnap, 0.1f); -CFGENTRY (Float, GridFineAngleSnap, 7.5f); -CFGENTRY (Int, RotationPointType, 0); -CFGENTRY (Vertex, CustomRotationPoint, g_origin); +CFGENTRY (Int, Grid, Grid::Medium) +CFGENTRY (Float, GridCoarseCoordinateSnap, 5.0f) +CFGENTRY (Float, GridCoarseAngleSnap, 45.0f) +CFGENTRY (Float, GridMediumCoordinateSnap, 1.0f) +CFGENTRY (Float, GridMediumAngleSnap, 22.5f) +CFGENTRY (Float, GridFineCoordinateSnap, 0.1f) +CFGENTRY (Float, GridFineAngleSnap, 7.5f) +CFGENTRY (Int, RotationPointType, 0) +CFGENTRY (Vertex, CustomRotationPoint, g_origin) const gridinfo g_gridInfo[3] = { diff -r dbed6938238c -r cbd89b33f70d src/miscallenous.h --- a/src/miscallenous.h Sun Jul 27 04:25:50 2014 +0300 +++ b/src/miscallenous.h Sun Jul 27 04:35:00 2014 +0300 @@ -54,7 +54,7 @@ AbstractConfigEntry::FloatType* anglesnap; }; -EXTERN_CFGENTRY (Int, Grid); +EXTERN_CFGENTRY (Int, Grid) static const int g_numGrids = 3; extern const gridinfo g_gridInfo[3]; diff -r dbed6938238c -r cbd89b33f70d src/partDownloader.cc --- a/src/partDownloader.cc Sun Jul 27 04:25:50 2014 +0300 +++ b/src/partDownloader.cc Sun Jul 27 04:35:00 2014 +0300 @@ -30,9 +30,9 @@ #include "glRenderer.h" #include "configDialog.h" -CFGENTRY (String, DownloadFilePath, ""); -CFGENTRY (Bool, GuessDownloadPaths, true); -CFGENTRY (Bool, AutoCloseDownloadDialog, true); +CFGENTRY (String, DownloadFilePath, "") +CFGENTRY (Bool, GuessDownloadPaths, true) +CFGENTRY (Bool, AutoCloseDownloadDialog, true) const QString g_unofficialLibraryURL ("http://ldraw.org/library/unofficial/"); diff -r dbed6938238c -r cbd89b33f70d src/primitives.cc --- a/src/primitives.cc Sun Jul 27 04:25:50 2014 +0300 +++ b/src/primitives.cc Sun Jul 27 04:35:00 2014 +0300 @@ -31,9 +31,9 @@ static PrimitiveScanner* g_activeScanner = null; PrimitiveCategory* g_unmatched = null; -EXTERN_CFGENTRY (String, DefaultName); -EXTERN_CFGENTRY (String, DefaultUser); -EXTERN_CFGENTRY (Int, DefaultLicense); +EXTERN_CFGENTRY (String, DefaultName) +EXTERN_CFGENTRY (String, DefaultUser) +EXTERN_CFGENTRY (Int, DefaultLicense) static const QStringList g_radialNameRoots = {