github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: 'init' code removed

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@10406 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-11-10 08:12:26 +00:00
parent 9c645da2be
commit db45682ec3
4 changed files with 1 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Core/Defs.h
View file

@ -229,7 +229,7 @@ template <class T> inline const T& max(const T& a, const T& b, const T& c)
template <class T> inline const T& max(const T& a, const T& b, const T& c, const T& d) template <class T> inline const T& max(const T& a, const T& b, const T& c, const T& d)
{ return max(max(a, b), max(c, d)); } { return max(max(a, b), max(c, d)); }
template <class T> template <class T> // deprecated name, use clamp
inline T minmax(T x, T _min, T _max) { return min(max(x, _min), _max); } inline T minmax(T x, T _min, T _max) { return min(max(x, _min), _max); }
template <class T> template <class T>

2
uppsrc/Core/src.tpp/AppEnv$en-us.tpp
View file

@ -197,8 +197,6 @@ lass]_[*@4 T]>_[@(0.0.255) const]_[*@4 T][@(0.0.255) `&]_[* max]([@(0.0.255) con
[s2;%% Returns the greatest of all arguments.&] [s2;%% Returns the greatest of all arguments.&]
[s3;%% &] [s3;%% &]
[s4; &] [s4; &]
[s5;:minmax`(T`,T`,T`): [@(0.0.255) template]_<[@(0.0.255) class]_[*@4 T]>_[*@4 T]_[* minmax]([*@4 T
]_[*@3 x], [*@4 T]_[*@3 `_min], [*@4 T]_[*@3 `_max])&]
[s5;:clamp`(T`,T`,T`): [@(0.0.255) template]_<[@(0.0.255) class]_[*@4 T]>_[*@4 T]_[* clamp]([*@4 T [s5;:clamp`(T`,T`,T`): [@(0.0.255) template]_<[@(0.0.255) class]_[*@4 T]>_[*@4 T]_[* clamp]([*@4 T
]_[*@3 x], [*@4 T]_[*@3 `_min], [*@4 T]_[*@3 `_max])&] ]_[*@3 x], [*@4 T]_[*@3 `_min], [*@4 T]_[*@3 `_max])&]
[s2;%% Returns [%-*@3 x] if it is between [%-*@3 `_min] and [%-*@3 `_max].&] [s2;%% Returns [%-*@3 x] if it is between [%-*@3 `_min] and [%-*@3 `_max].&]

1
uppsrc/ide/Export.cpp
View file

@ -27,7 +27,6 @@ void Ide::ExportProject(const String& ep, bool all, bool gui, bool deletedir)
used.FindAdd(SourcePath(pn, f.depends[q].text)); used.FindAdd(SourcePath(pn, f.depends[q].text));
} }
} }
used.FindAdd(SourcePath(pn, "init"));
} }
if(FileExists(ep)) { if(FileExists(ep)) {
if(gui && !PromptYesNo(DeQtf(ep) + " is existing file.&" if(gui && !PromptYesNo(DeQtf(ep) + " is existing file.&"

23
uppsrc/ide/UppWspc.cpp
View file

@ -161,29 +161,6 @@ void WorkspaceWork::SavePackage()
b.data = String::GetVoid(); b.data = String::GetVoid();
} }
actual.Save(pp); actual.Save(pp);
#if 0 // nobody is using 'init'. to be replaced by "add by include" method
String init;
String mnm = Filter('_' + actualpackage + "_icpp_init_stub", CharFilterMacro);
init << "#ifndef " << mnm << "\r\n";
init << "#define " << mnm << "\r\n";
Index<String> once;
for(int i = 0; i < actual.uses.GetCount(); i++) {
String u = actual.uses[i].text;
if(once.Find(u) < 0) {
once.Add(u);
init << "#include \"" << actual.uses[i].text << "/init\"\r\n";
}
}
for(int i = 0; i < actual.GetCount(); i++) {
String f = actual[i];
if(ToLower(GetFileExt(f)) == ".icpp")
init << "#define BLITZ_INDEX__ " << "F" << MD5String(f) << "\r\n"
<< "#include \"" << f << "\"\r\n"
<< "#undef BLITZ_INDEX__\r\n";
}
init << "#endif\r\n";
SaveChangedFile(SourcePath(actualpackage, "init"), init);
#endif
} }
void WorkspaceWork::RestoreBackup() void WorkspaceWork::RestoreBackup()