Fix FTBFS with clang

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 191490e345)
pull/9/head
Slávek Banko 9 years ago
parent b2c3073827
commit 1c95c92973

@ -26,7 +26,7 @@
#include "settingsclass.h" #include "settingsclass.h"
FractionBaseWidget::FractionBaseWidget(TQWidget * parent = 0, const char * name = 0) : FractionBaseWidget::FractionBaseWidget(TQWidget * parent, const char * name) :
TQWidget(parent, name) TQWidget(parent, name)
{ {
#ifdef DEBUG #ifdef DEBUG

@ -21,7 +21,7 @@
/* these includes are needed for TQt support */ /* these includes are needed for TQt support */
#include <tqpainter.h> #include <tqpainter.h>
RatioWidget::RatioWidget(TQWidget * parent = 0, const char * name = 0, RatioWidget::RatioWidget(TQWidget * parent, const char * name,
const ratio para_ratio = *new ratio()) : const ratio para_ratio = *new ratio()) :
FractionBaseWidget(parent, name), m_ratio(para_ratio) FractionBaseWidget(parent, name), m_ratio(para_ratio)
{ {

@ -23,7 +23,7 @@
#include "settingsclass.h" #include "settingsclass.h"
ResultWidget::ResultWidget(TQWidget * parent = 0, const char * name = 0, ResultWidget::ResultWidget(TQWidget * parent, const char * name,
const ratio para_result = *new ratio()) : const ratio para_result = *new ratio()) :
FractionBaseWidget(parent, name), m_result(para_result) FractionBaseWidget(parent, name), m_result(para_result)
{ {

@ -24,7 +24,7 @@
/* these includes are needed for TQt support */ /* these includes are needed for TQt support */
#include <tqpainter.h> #include <tqpainter.h>
TaskWidget::TaskWidget(TQWidget * parent = 0, const char * name = 0, TaskWidget::TaskWidget(TQWidget * parent, const char * name,
const task para_task = *new task()) : const task para_task = *new task()) :
FractionBaseWidget(parent, name), m_task(para_task) FractionBaseWidget(parent, name), m_task(para_task)
{ {

@ -84,9 +84,7 @@ extern char *getenv(const char *name);
/*====function to Load Dictionary and load/create index table=======*/ /*====function to Load Dictionary and load/create index table=======*/
int main(argc,argv) int main(int argc, char *argv[])
int argc;
unsigned char **argv;
{ {
FILE *fp,*fopen(); FILE *fp,*fopen();
uint32_t possav,schi,diclen,indlen; uint32_t possav,schi,diclen,indlen;

@ -334,9 +334,13 @@ float * FITSViewer::loadData(const char *filename, float *buffer)
case 32: case 32:
for (int i=0; i < totalCount ; i++) for (int i=0; i < totalCount ; i++)
{ {
FITS_GETBITPIX32(tempData, pixval_32);
//pixval_32 = ntohl(pixval_32); //pixval_32 = ntohl(pixval_32);
if (isnan(pixval_32)) pixval_32 = 0; if (fits_nan_32(tempData)) {
pixval_32 = 0;
}
else {
FITS_GETBITPIX32(tempData, pixval_32);
}
buffer[i] = pixval_32; buffer[i] = pixval_32;
tempData+=4; tempData+=4;
} }

@ -301,7 +301,7 @@ void writeToKvtml(TQTextStream &os, TQString month, TQString year)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
// use i18n-strings from kvoctrain // use i18n-strings from kvoctrain
TDEApplication app(argc,argv, "kvoctrain"); TDEApplication app(&argc, argv, "kvoctrain");
if (argc != 4) { if (argc != 4) {
cerr << i18n("usage: spotlight2kvtml spotfile month year\n\n").local8Bit().data(); cerr << i18n("usage: spotlight2kvtml spotfile month year\n\n").local8Bit().data();

Loading…
Cancel
Save