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

ide: Fixed some MSBT warnings

Browse source
This commit is contained in:
Mirek Fidler 2024-10-15 12:34:34 +02:00
parent 9298d61657
commit 4ab7087d6b
7 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/CtrlCore/Ctrl.cpp
View file

@ -440,7 +440,7 @@ String Ctrl::GetDesc() const
String Name(const Ctrl *ctrl)
{
return ctrl ? ctrl->Name() : "NULL";
return ctrl ? ctrl->Name() : String("NULL");
}
String Desc(const Ctrl *ctrl)

2
uppsrc/ide/Builders/AndroidBuilderUtils.cpp
View file

@ -18,7 +18,7 @@ String AndroidBuilderUtils::GetAssemblyDir(const String& packageDir, const Strin
if (pos >= 0 && pos < assemblyDir.GetCount())
assemblyDir.Trim(pos);
return assemblyDir != packageDir ? assemblyDir : "";
return assemblyDir != packageDir ? assemblyDir : String();
}
}

2
uppsrc/ide/Builders/CCJ.cpp
View file

@ -174,7 +174,7 @@ void MakeBuild::SaveCCJ(const String& fn, bool exporting)
String makefile;
Vector<String> uppdirs = GetUppDirs();
String uppout = exporting ? GetUppOut() : ".cache/upp.out";
String uppout = exporting ? GetUppOut() : String(".cache/upp.out");
Index<String> allconfig = PackageConfig(GetIdeWorkspace(), 0, bm, mainconfigparam, host, *b);
bool win32 = allconfig.Find("WIN32") >= 0;

4
uppsrc/ide/Builders/MakeFile.cpp
View file

@ -283,7 +283,7 @@ void MakeBuild::SaveMakeFile(const String& fn, bool exporting)
String makefile;
Vector<String> uppdirs = GetUppDirs();
String uppout = exporting ? GetUppOut() : ".cache/upp.out";
String uppout = exporting ? GetUppOut() : String(".cache/upp.out");
String inclist;
Index<String> allconfig = PackageConfig(GetIdeWorkspace(), 0, bm, mainconfigparam, host, *b);
@ -320,7 +320,7 @@ void MakeBuild::SaveMakeFile(const String& fn, bool exporting)
inclist << " -I$(UPPOUT)"; // build_info.h is created there
makefile << "\n"
"UPPOUT = " << (exporting ? "_out/" : GetMakePath(AdjustMakePath(AppendFileName(uppout, "")), win32)) << "\n"
"UPPOUT = " << (exporting ? "_out/" : GetMakePath(AdjustMakePath(AppendFileName(uppout, String())), win32)) << "\n"
"CINC = " << inclist << "\n"
"Macro = ";

2
uppsrc/ide/Core/Assembly.cpp
View file

@ -124,7 +124,7 @@ String Nest::PackagePath0(const String& name)
if(FileExists(p)) return p;
}
return d.GetCount() ? NormalizePath(AppendFileName(AppendFileName(d[0], uppfile),
GetFileName(uppfile)) + ".upp") : "";
GetFileName(uppfile)) + ".upp") : String();
}
String Nest::PackagePath(const String& name)

2
uppsrc/ide/Core/Ide.cpp
View file

@ -63,7 +63,7 @@ VectorMap<String, String> GetMethodVars(const String& method)
String GetMethodPath(const String& method)
{
return the_ide ? the_ide->GetMethodName(method) : "";
return the_ide ? the_ide->GetMethodName(method) : String();
}
bool IdeIsBuilding()

2
uppsrc/ide/Core/Package.cpp
View file

@ -448,7 +448,7 @@ String IdeCharsetName(byte charset) {
void PutSpellCheckComments(StringStream& out, int sc)
{
if(!IsNull(sc))
out << " spellcheck_comments " << AsCString(sc ? LNGAsText(sc) : "");
out << " spellcheck_comments " << AsCString(sc ? LNGAsText(sc) : String());
}
bool Package::Save(const char *path) const {