comparison: src/ldObject.cpp
src/ldObject.cpp
- changeset 970
- c8aae45afd85
- parent 968
- 4b93b7963456
- child 971
- c00f9665a9f8
equal
deleted
inserted
replaced
| 969:b1742ee91d5b | 970:c8aae45afd85 |
|---|---|
| 25 #include "editHistory.h" | 25 #include "editHistory.h" |
| 26 #include "glRenderer.h" | 26 #include "glRenderer.h" |
| 27 #include "colors.h" | 27 #include "colors.h" |
| 28 #include "glCompiler.h" | 28 #include "glCompiler.h" |
| 29 | 29 |
| 30 CFGENTRY (String, DefaultName, "") | 30 ConfigOption (QString DefaultName = "") |
| 31 CFGENTRY (String, DefaultUser, "") | 31 ConfigOption (QString DefaultUser = "") |
| 32 CFGENTRY (Bool, UseCALicense, true) | 32 ConfigOption (bool UseCaLicense = true) |
| 33 | 33 |
| 34 // List of all LDObjects | 34 // List of all LDObjects |
| 35 QMap<int32, LDObject*> g_allObjects; | 35 QMap<int32, LDObject*> g_allObjects; |
| 36 static int32 g_idcursor = 1; // 0 shalt be null | 36 static int32 g_idcursor = 1; // 0 shalt be null |
| 37 | 37 |
| 857 | 857 |
| 858 // ============================================================================= | 858 // ============================================================================= |
| 859 // | 859 // |
| 860 QString PreferredLicenseText() | 860 QString PreferredLicenseText() |
| 861 { | 861 { |
| 862 return (cfg::UseCALicense ? CALicenseText : ""); | 862 return (g_win->configBag()->useCaLicense ? CALicenseText : ""); |
| 863 } | 863 } |
| 864 | 864 |
| 865 // ============================================================================= | 865 // ============================================================================= |
| 866 // | 866 // |
| 867 LDObject* LDObject::createCopy() const | 867 LDObject* LDObject::createCopy() const |
