Unbreak qfsm build with clang 6.0 by fixing two instances of:
error: cannot initialize return object of type 'Project *' with an rvalue of type 'bool' Pet portlint.
This commit is contained in:
parent
8b056a72f7
commit
85899a4a5c
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=471526
2 changed files with 21 additions and 1 deletions
|
@ -14,10 +14,10 @@ LICENSE= GPLv3+
|
|||
|
||||
OPTIONS_DEFINE= GRAPHVIZ DOCS EXAMPLES
|
||||
|
||||
USES= tar:bzip2 cmake desktop-file-utils
|
||||
USE_XORG= xi
|
||||
USE_QT4= corelib gui qt3support svg xml \
|
||||
moc_build qmake_build rcc_build uic_build
|
||||
USES= tar:bzip2 cmake desktop-file-utils
|
||||
INSTALLS_ICONS= yes
|
||||
|
||||
GRAPHVIZ_BUILD_DEPENDS= graphviz>=2.22:graphics/graphviz
|
||||
|
|
20
cad/qfsm/files/patch-src_FileIO.cpp
Normal file
20
cad/qfsm/files/patch-src_FileIO.cpp
Normal file
|
@ -0,0 +1,20 @@
|
|||
--- src/FileIO.cpp.orig 2015-01-02 18:01:46 UTC
|
||||
+++ src/FileIO.cpp
|
||||
@@ -1617,7 +1617,7 @@ Project* FileIO::importFile(Import* imp, ScrollView* s
|
||||
QString ext;
|
||||
|
||||
if (!imp)
|
||||
- return FALSE;
|
||||
+ return NULL;
|
||||
|
||||
Project* p=NULL;
|
||||
importdlg->setAcceptMode(QFileDialog::AcceptOpen);
|
||||
@@ -1641,7 +1641,7 @@ Project* FileIO::importFile(Import* imp, ScrollView* s
|
||||
ifstream fin(act_importfile);
|
||||
|
||||
if (!fin)
|
||||
- return FALSE;
|
||||
+ return NULL;
|
||||
|
||||
emit setWaitCursor();
|
||||
|
Loading…
Reference in a new issue