[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [labplot] src/backend/datasources/filters: small fixes
From:       Stefan Gerlach <stefan.gerlach () uni-konstanz ! de>
Date:       2015-05-31 21:57:18
Message-ID: E1YzBEM-0005J1-Tu () scm ! kde ! org
[Download RAW message or body]

Git commit ce348403f0d5e5a221f708560d1958935786efe7 by Stefan Gerlach.
Committed on 31/05/2015 at 21:57.
Pushed by sgerlach into branch 'master'.

small fixes

M  +3    -6    src/backend/datasources/filters/HDFFilter.cpp
M  +1    -1    src/backend/datasources/filters/HDFFilterPrivate.h

http://commits.kde.org/labplot/ce348403f0d5e5a221f708560d1958935786efe7

diff --git a/src/backend/datasources/filters/HDFFilter.cpp \
b/src/backend/datasources/filters/HDFFilter.cpp index bfb2fdc..94d9238 100644
--- a/src/backend/datasources/filters/HDFFilter.cpp
+++ b/src/backend/datasources/filters/HDFFilter.cpp
@@ -153,9 +153,9 @@ HDFFilterPrivate::HDFFilterPrivate(HDFFilter* owner) :
 }
 
 #ifdef HAVE_HDF5
-void HDFFilterPrivate::handleError(int status, QString function, QString arg) {
-	if (status < 0) {
-		qDebug()<<"ERROR"<<status<<":"<<function<<"() - "<<arg;
+void HDFFilterPrivate::handleError(int err, QString function, QString arg) {
+	if (err < 0) {
+		qDebug()<<"ERROR"<<err<<":"<<function<<"() - "<<arg;
 	}
 }
 
@@ -930,8 +930,6 @@ void HDFFilterPrivate::scanHDFGroup(hid_t gid, char *groupName, \
                QTreeWidgetItem*
 */
 void HDFFilterPrivate::parse(const QString & fileName, QTreeWidgetItem* rootItem) {
 #ifdef HAVE_HDF5
-	int status;
-
 	QByteArray bafileName = fileName.toLatin1();
 	hid_t file = H5Fopen(bafileName.data(), H5F_ACC_RDONLY, H5P_DEFAULT);
 	handleError((int)file,"H5Fopen",fileName);
@@ -954,7 +952,6 @@ void HDFFilterPrivate::parse(const QString & fileName, \
                QTreeWidgetItem* rootItem
     reads the content of the date set in the file \c fileName to a string (for \
                preview) or to the data source.
 */
 QString HDFFilterPrivate::readCurrentDataSet(const QString & fileName, \
                AbstractDataSource* dataSource, AbstractFileFilter::ImportMode mode, \
                int lines){
-	int status;
 	QStringList dataString;
 
 	if(currentDataSet.isEmpty())
diff --git a/src/backend/datasources/filters/HDFFilterPrivate.h \
b/src/backend/datasources/filters/HDFFilterPrivate.h index d930ca8..6cea927 100644
--- a/src/backend/datasources/filters/HDFFilterPrivate.h
+++ b/src/backend/datasources/filters/HDFFilterPrivate.h
@@ -58,7 +58,7 @@ class HDFFilterPrivate {
 		QList<unsigned long> multiLinkList;	// used to find hard links
 #ifdef HAVE_HDF5
 		int status;
-		void handleError(int status, QString function, QString arg=QString());
+		void handleError(int err, QString function, QString arg=QString());
 		QString translateHDFOrder(H5T_order_t);
 		QString translateHDFType(hid_t);
 		QString translateHDFClass(H5T_class_t);


[prev in list] [next in list] [prev in thread] [next in thread]