diff --git a/plotter.cpp b/plotter.cpp index 360861f9c..9aad79453 100644 --- a/plotter.cpp +++ b/plotter.cpp @@ -488,11 +488,11 @@ void CPlotter::setPalette(QString palette) //setPalette() return; } - FILE* fp; + FILE* fp=NULL; if(palette=="Blue") fp=fopen("blue.dat","r"); if(palette=="AFMHot") fp=fopen("afmhot.dat","r"); if(palette=="Gray1") fp=fopen("gray1.dat","r"); - if(int(fp)==0) { + if(fp==NULL) { QMessageBox msgBox0; QString t="Error: Cannot find requested palette file."; msgBox0.setText(t); diff --git a/wsjtx.pro b/wsjtx.pro index a9aa52474..de91e1fec 100644 --- a/wsjtx.pro +++ b/wsjtx.pro @@ -11,11 +11,10 @@ CONFIG += thread TARGET = wsjtx DESTDIR = ../wsjtx_install -#DESTDIR = ../qt5_install VERSION = 1.1 TEMPLATE = app -DEFINES = QT4 -#DEFINES = QT5 +#DEFINES = QT4 +DEFINES = QT5 win32 { DEFINES += WIN32