OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

Merge pull request #413 from zrax/qt_tools

Browse Source 
Port GUI Tools to Qt5
This commit is contained in:
Adam Johnson
2014-05-19 23:23:39 -04:00
parent a332c9839d 14dbc7b10d
commit 69f1e2c511
51 changed files with 3968 additions and 3823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/CoreLib/hsThread_Unix.cpp
View File

@ -307,8 +307,8 @@ hsSemaphore::~hsSemaphore()
status = sem_close(fPSema);
} else {
status = sem_destroy(fPSema);
delete fPSema;
}
delete fPSema;
hsThrowIfOSErr(status);
#else
int status = ::pthread_cond_destroy(&fPCond);

2
Sources/Plasma/CoreLib/plFileSystem.cpp
View File

@ -394,7 +394,7 @@ std::vector<plFileName> plFileSystem::ListDir(const plFileName &path, const char
continue;
}
if (pattern && pattern[0] && fnmatch(pattern, de->d_name, 0))
if (pattern && pattern[0] && fnmatch(pattern, de->d_name, 0) == 0)
contents.push_back(dir_name);
else if (!pattern || !pattern[0])
contents.push_back(dir_name);

47
Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.cpp
View File

@ -691,11 +691,14 @@ bool pfLocalizationDataMgr::pf3PartMap<mapT>::exists(const plString & key)
return false;
// now check individually
if (fData.find(age) == fData.end()) // age doesn't exist
auto curAge = fData.find(age);
if (curAge == fData.end()) // age doesn't exist
return false;
if (fData[age].find(set) == fData[age].end()) // set doesn't exist
auto curSet = curAge->second.find(set);
if (curSet == curAge->second.end()) // set doesn't exist
return false;
if (fData[age][set].find(name) == fData[age][set].end()) // name doesn't exist
auto curElement = curSet->second.find(name);
if (curElement == curSet->second.end()) // name doesn't exist
return false;
// we passed all the tests, return true!
@ -713,9 +716,11 @@ bool pfLocalizationDataMgr::pf3PartMap<mapT>::setExists(const plString & key)
return false;
// now check individually
if (fData.find(age) == fData.end()) // age doesn't exist
auto curAge = fData.find(age);
if (curAge == fData.end()) // age doesn't exist
return false;
if (fData[age].find(set) == fData[age].end()) // set doesn't exist
auto curSet = curAge->second.find(set);
if (curSet == curAge->second.end()) // set doesn't exist
return false;
// we passed all the tests, return true!
@ -733,19 +738,22 @@ void pfLocalizationDataMgr::pf3PartMap<mapT>::erase(const plString & key)
return;
// now check individually
if (fData.find(age) == fData.end()) // age doesn't exist
auto curAge = fData.find(age);
if (curAge == fData.end()) // age doesn't exist
return;
if (fData[age].find(set) == fData[age].end()) // set doesn't exist
auto curSet = curAge->second.find(set);
if (curSet == curAge->second.end()) // set doesn't exist
return;
if (fData[age][set].find(name) == fData[age][set].end()) // name doesn't exist
auto curElement = curSet->second.find(name);
if (curElement == curSet->second.end()) // name doesn't exist
return;
// ok, so now we want to nuke it!
fData[age][set].erase(name);
if (fData[age][set].size() == 0) // is the set now empty?
fData[age].erase(set); // nuke it!
if (fData[age].size() == 0) // is the age now empty?
fData.erase(age); // nuke it!
curSet->second.erase(name);
if (curSet->second.size() == 0) // is the set now empty?
curAge->second.erase(curSet); // nuke it!
if (curAge->second.size() == 0) // is the age now empty?
fData.erase(curAge); // nuke it!
}
//// operator[]() ////////////////////////////////////////////////////
@ -780,10 +788,11 @@ std::vector<plString> pfLocalizationDataMgr::pf3PartMap<mapT>::getSetList(const
std::vector<plString> retVal;
typename std::map<plString, std::map<plString, mapT> >::iterator curSet;
if (fData.find(age) == fData.end())
auto curAge = fData.find(age);
if (curAge == fData.end())
return retVal; // return an empty list, the age doesn't exist
for (curSet = fData[age].begin(); curSet != fData[age].end(); curSet++)
for (curSet = curAge->second.begin(); curSet != curAge->second.end(); curSet++)
retVal.push_back(curSet->first);
return retVal;
@ -797,13 +806,15 @@ std::vector<plString> pfLocalizationDataMgr::pf3PartMap<mapT>::getNameList(const
std::vector<plString> retVal;
typename std::map<plString, mapT>::iterator curName;
if (fData.find(age) == fData.end())
auto curAge = fData.find(age);
if (curAge == fData.end())
return retVal; // return an empty list, the age doesn't exist
if (fData[age].find(set) == fData[age].end())
auto curSet = curAge->second.find(set);
if (curSet == curAge->second.end())
return retVal; // return an empty list, the set doesn't exist
for (curName = fData[age][set].begin(); curName != fData[age][set].end(); curName++)
for (curName = curSet->second.begin(); curName != curSet->second.end(); curName++)
retVal.push_back(curName->first);
return retVal;

3
Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizedString.cpp
View File

@ -157,7 +157,8 @@ void pfLocalizedString::IParameterize(const plString & inString)
void pfLocalizedString::IConvertFromPlainText(const plString & plainText)
{
IParameterize(plainText);
fPlainTextRep = plainText;
IParameterize(fPlainTextRep);
IUpdateXML();
}

6
Sources/Plasma/PubUtilLib/plGImage/plFont.cpp
View File

@ -1253,7 +1253,7 @@ bool plFont::LoadFromP2FFile( const plFileName &path )
// Load this font from the data found in the given Windows FNT file,
// using the format specified in the Windows 3 Developers Notes.
bool plFont::LoadFromFNT( const char *path )
bool plFont::LoadFromFNT( const plFileName &path )
{
hsUNIXStream stream; // Ahh, irony
if( !stream.Open( path, "rb" ) )
@ -2023,9 +2023,9 @@ bool plFont::LoadFromBDFStream( hsStream *stream, plBDFConvertCallback *callb
return false;
}
bool plFont::LoadFromBDF( const char *path, plBDFConvertCallback *callback )
bool plFont::LoadFromBDF( const plFileName &path, plBDFConvertCallback *callback )
{
FILE *fp = fopen( path, "rt" );
FILE *fp = fopen( path.AsString().c_str(), "rt" );
if( fp == nil )
return false;
try

4
Sources/Plasma/PubUtilLib/plGImage/plFont.h
View File

@ -293,10 +293,10 @@ class plFont : public hsKeyedObject
void CalcStringExtents( const plString &string, uint16_t &width, uint16_t &height, uint16_t &ascent, uint32_t &firstClippedChar, uint16_t &lastX, uint16_t &lastY );
void CalcStringExtents( const wchar_t *string, uint16_t &width, uint16_t &height, uint16_t &ascent, uint32_t &firstClippedChar, uint16_t &lastX, uint16_t &lastY );
bool LoadFromFNT( const char *path );
bool LoadFromFNT( const plFileName &path );
bool LoadFromFNTStream( hsStream *stream );
bool LoadFromBDF( const char *path, plBDFConvertCallback *callback );
bool LoadFromBDF( const plFileName &path, plBDFConvertCallback *callback );
bool LoadFromBDFStream( hsStream *stream, plBDFConvertCallback *callback );
bool LoadFromP2FFile( const plFileName &path );