Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2024-12-26 21:58:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disabled update checks on OSX because of bug #62. Fixes #112.

Browse source
This commit is contained in:
Leonardo Zide 2017-08-27 12:10:52 -07:00
parent 8486295a02
commit e905047179
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/lc_library.cpp
View file

@ -661,7 +661,7 @@ bool lcPiecesLibrary::OpenDirectory(const QDir& LibraryDir)
mHasUnofficial = true; mHasUnofficial = true;
bool SubFile = SubFileDirectories[DirectoryIdx]; bool SubFile = SubFileDirectories[DirectoryIdx];
mPrimitives[Name] = new lcLibraryPrimitive((strchr(PrimitiveDirectories[DirectoryIdx], '/') + 1) + FileString, LC_NUM_ZIPFILES, 0, !SubFile && (memcmp(Name, "STU", 3) == 0), SubFile); mPrimitives[Name] = new lcLibraryPrimitive(QByteArray(strchr(PrimitiveDirectories[DirectoryIdx], '/') + 1) + FileString, LC_NUM_ZIPFILES, 0, !SubFile && (memcmp(Name, "STU", 3) == 0), SubFile);
} }
} }
} }

4
common/lc_lxf.cpp
View file

@ -54,7 +54,7 @@ static bool lcLoadLDrawXML(std::map<int, int>& MaterialTable, std::map<int, std:
QString LDrawID = Element.attribute(QLatin1String("ldraw")); QString LDrawID = Element.attribute(QLatin1String("ldraw"));
int LegoID = Element.attribute(QLatin1String("lego")).toInt(); int LegoID = Element.attribute(QLatin1String("lego")).toInt();
BrickTable.insert(std::make_pair(LegoID, std::move(LDrawID.toStdString()))); BrickTable.insert(std::make_pair(LegoID, LDrawID.toStdString()));
} }
else if (ElementName == QLatin1String("Transformation")) else if (ElementName == QLatin1String("Transformation"))
{ {
@ -72,7 +72,7 @@ static bool lcLoadLDrawXML(std::map<int, int>& MaterialTable, std::map<int, std:
AxisAngle[2] = Element.attribute(QLatin1String("az")).toFloat(); AxisAngle[2] = Element.attribute(QLatin1String("az")).toFloat();
AxisAngle[3] = Element.attribute(QLatin1String("angle")).toFloat(); AxisAngle[3] = Element.attribute(QLatin1String("angle")).toFloat();
TransformTable.insert(std::make_pair(std::move(LDrawID.toStdString()), std::make_pair(Translation, AxisAngle))); TransformTable.insert(std::make_pair(LDrawID.toStdString(), std::make_pair(Translation, AxisAngle)));
} }
} }

1
leocad.pro
View file

@ -121,6 +121,7 @@ macx {
library.path = Contents/Resources library.path = Contents/Resources
QMAKE_BUNDLE_DATA += document_icon library QMAKE_BUNDLE_DATA += document_icon library
DEFINES += LC_DISABLE_UPDATE_CHECK=1
} }
SOURCES += common/view.cpp \ SOURCES += common/view.cpp \

2
qt/lc_setsdatabasedialog.h
View file

@ -28,7 +28,7 @@ public:
public slots: public slots:
void DownloadFinished(QNetworkReply* Reply); void DownloadFinished(QNetworkReply* Reply);
void on_SearchButton_clicked(); void on_SearchButton_clicked();
void accept(); void accept() override;
void Finished(int Result); void Finished(int Result);
private: private: