summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-06-28 03:00:11 +0200
committerSlávek Banko <slavek.banko@axis.cz>2015-06-28 03:00:11 +0200
commit191490e34508041a8bfab9535f7e65ee2c71b695 (patch)
tree703896deb60e96370a787980a8bddb657e947be3
parentf17aa6a5367b70eec8fd3456fffe100bb87c551e (diff)
downloadtdeedu-191490e3.tar.gz
tdeedu-191490e3.zip
Fix FTBFS with clang
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--kbruch/src/fractionbasewidget.cpp2
-rw-r--r--kbruch/src/ratiowidget.cpp2
-rw-r--r--kbruch/src/resultwidget.cpp2
-rw-r--r--kbruch/src/taskwidget.cpp2
-rw-r--r--kiten/xjdxgen.c4
-rw-r--r--kstars/kstars/fitsviewer.cpp8
-rw-r--r--kvoctrain/kvoctrain/spotlight2kvtml.cpp2
7 files changed, 12 insertions, 10 deletions
diff --git a/kbruch/src/fractionbasewidget.cpp b/kbruch/src/fractionbasewidget.cpp
index 02fd1cfb..0cc52c8f 100644
--- a/kbruch/src/fractionbasewidget.cpp
+++ b/kbruch/src/fractionbasewidget.cpp
@@ -26,7 +26,7 @@
#include "settingsclass.h"
-FractionBaseWidget::FractionBaseWidget(TQWidget * parent = 0, const char * name = 0) :
+FractionBaseWidget::FractionBaseWidget(TQWidget * parent, const char * name) :
TQWidget(parent, name)
{
#ifdef DEBUG
diff --git a/kbruch/src/ratiowidget.cpp b/kbruch/src/ratiowidget.cpp
index dddf7d11..9323cb1d 100644
--- a/kbruch/src/ratiowidget.cpp
+++ b/kbruch/src/ratiowidget.cpp
@@ -21,7 +21,7 @@
/* these includes are needed for TQt support */
#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()) :
FractionBaseWidget(parent, name), m_ratio(para_ratio)
{
diff --git a/kbruch/src/resultwidget.cpp b/kbruch/src/resultwidget.cpp
index caecfdbe..9735b046 100644
--- a/kbruch/src/resultwidget.cpp
+++ b/kbruch/src/resultwidget.cpp
@@ -23,7 +23,7 @@
#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()) :
FractionBaseWidget(parent, name), m_result(para_result)
{
diff --git a/kbruch/src/taskwidget.cpp b/kbruch/src/taskwidget.cpp
index 3dbe954e..c43fcde6 100644
--- a/kbruch/src/taskwidget.cpp
+++ b/kbruch/src/taskwidget.cpp
@@ -24,7 +24,7 @@
/* these includes are needed for TQt support */
#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()) :
FractionBaseWidget(parent, name), m_task(para_task)
{
diff --git a/kiten/xjdxgen.c b/kiten/xjdxgen.c
index 8dcfdd64..bf4de028 100644
--- a/kiten/xjdxgen.c
+++ b/kiten/xjdxgen.c
@@ -84,9 +84,7 @@ extern char *getenv(const char *name);
/*====function to Load Dictionary and load/create index table=======*/
-int main(argc,argv)
-int argc;
-unsigned char **argv;
+int main(int argc, char *argv[])
{
FILE *fp,*fopen();
uint32_t possav,schi,diclen,indlen;
diff --git a/kstars/kstars/fitsviewer.cpp b/kstars/kstars/fitsviewer.cpp
index a5e6143c..135c5cad 100644
--- a/kstars/kstars/fitsviewer.cpp
+++ b/kstars/kstars/fitsviewer.cpp
@@ -334,9 +334,13 @@ float * FITSViewer::loadData(const char *filename, float *buffer)
case 32:
for (int i=0; i < totalCount ; i++)
{
- FITS_GETBITPIX32(tempData, 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;
tempData+=4;
}
diff --git a/kvoctrain/kvoctrain/spotlight2kvtml.cpp b/kvoctrain/kvoctrain/spotlight2kvtml.cpp
index d5be9e90..bfee17b9 100644
--- a/kvoctrain/kvoctrain/spotlight2kvtml.cpp
+++ b/kvoctrain/kvoctrain/spotlight2kvtml.cpp
@@ -301,7 +301,7 @@ void writeToKvtml(TQTextStream &os, TQString month, TQString year)
int main(int argc, char **argv)
{
// use i18n-strings from kvoctrain
- TDEApplication app(argc,argv, "kvoctrain");
+ TDEApplication app(&argc, argv, "kvoctrain");
if (argc != 4) {
cerr << i18n("usage: spotlight2kvtml spotfile month year\n\n").local8Bit().data();