postmerge fix

Author: JorisGoosen

CommonData/column.cpp

@@ -591,7 +591,7 @@ columnType Column::setValues(size_t rows, const std::function<std::string(size_t
 
 
 	dbUpdateValues();
-	
+
 	//Now determine what the most logical columntype would be given the current values AND empty values!
 	if(onlyInts && ints.size() <= thresholdScale && ints.size() > 0)
 	{
@@ -1019,7 +1019,12 @@ int Column::nonFilteredNumericsCount() const
 	return _nonFilteredNumericsCount;
 }
 
-stringvec Column::nonFilteredLevels()
+const stringvec & Column::nonFilteredLevels() const
+{
+	return _nonFilteredLevels;
+}
+ 
+const stringvec & Column::nonFilteredLevels() 
 {
 	if (_nonFilteredLevels.empty())
 	{
@@ -1854,7 +1859,7 @@ void Column::valuesReverse()
 		}
 	}
 
-	upgradeExtractDoublesIntsFromLabels(); //Make sure _dbls reflect _ints
+	
 	dbUpdateValues();
 
 	labelsHandleAutoSort(false);

CommonData/column.h

@@ -156,7 +156,8 @@ class Column : public DataSetBaseNode
 
 			int						nonFilteredNumericsCount();
 			int						nonFilteredNumericsCount()	const;
-            stringvec				nonFilteredLevels();
+            const stringvec		&	nonFilteredLevels();
+			const stringvec		&	nonFilteredLevels() const;
 			void					nonFilteredCountersReset(bool updateLabelIndexes = true);
 
 			std::set<qsizetype>		labelsMoveRows(std::vector<qsizetype> rows, bool up);

CommonData/dataset.cpp

@@ -244,7 +244,7 @@ Column *DataSet::column(const QString &name)
 	return column(fq(name));
 }
 
-Column *DataSet::column(size_t index)
+Column *DataSet::column(int index)
 {
 	if(index < 0 || index >= _columns.size())
 		return nullptr;

CommonData/dataset.h

@@ -40,8 +40,9 @@ class DataSet : public DataSetBaseNode
 			EmptyValues *	emptyValues()					{ return	_emptyValues; }
 
 			Column		*	column(		const std::string & name);
+			Column		*	column(		const char * name) { return column(std::string(name));}
 			Column		*	column(		const QString & name);
-			Column		*	column(		size_t				columnIndex);
+			Column		*	column(		int					columnIndex);
 
 			Column		*	operator[](	size_t				columnIndex)	{ return column(columnIndex); }
 			Column		*	operator[](	const std::string &	columnName)		{ return column(columnName); }

Desktop/modules/dynamicmodule.cpp

@@ -36,7 +36,7 @@
 #include "description/description.h"
 #include "utilities/extractarchive.h"
 #include "utilities/qmlutils.h"
-#include "utilities/qutils.h"
+#include "qutils.h"
 #include "mainwindow.h"
 
 #ifdef __APPLE__

QMLComponents/controls/jaspcontrol.cpp

@@ -3,7 +3,7 @@
 #include "log.h"
 #include "analysisform.h"
 #include "jasptheme.h"
-#include "utilities/qutils.h"
+#include "qutils.h"
 #include "preferencesmodelbase.h"
 #include <QQmlProperty>
 #include <QQmlContext>

Tests/testdebugdata.cpp

@@ -1,8 +1,8 @@
+#include "qutils.h"
 #include "testinfo.h"
 #include "tempfiles.h"
 #include "processinfo.h"
 #include "testdebugdata.h"
-#include "utilities/qutils.h"
 #include "databaseinterface.h"
 #include "data/datasetpackage.h"
 #include "data/importers/csvimporter.h"

Tests/testengine.cpp

@@ -1,10 +1,10 @@
 #include "dirs.h"
+#include "qutils.h"
 #include "testengine.h"
 #include <QSignalSpy>
 #include "testinfo.h"
 #include "tempfiles.h"
 #include "processinfo.h"
-#include "utilities/qutils.h"
 #include "engine/enginesync.h"
 #include "utilities/appdirs.h"
 #include "data/datasetpackage.h"
@@ -159,8 +159,8 @@ void TestEngine::testFilters()
 
 	QVERIFY2(spy.isValid(),	"Spy is broken!");
 
-	_data->filter()->setRFilter("V1%%2==0");
-	_engines->sendFilter("", tq(_data->filter()->rFilter()));
+	_data->defaultFilter()->setRFilter("V1%%2==0");
+	_engines->sendFilter("", tq(_data->defaultFilter()->rFilter()));
 
 	spy.wait();
 
@@ -173,9 +173,9 @@ void TestEngine::testFilters()
 
 	_data->checkForUpdates();
 
-	QVERIFY2(_data->filter()->filteredRowCount() == _data->rowCount() / 2,	"Did not get right filtered rowCount!");
-	QVERIFY2(!_data->filter()->filtered()[0],								"Expected first filtered to be FALSE");
-	QVERIFY2(_data->filter()->filtered()[1],								"Expected second filtered to be TRUE");
+	QVERIFY2(_data->defaultFilter()->filteredRowCount() == _data->rowCount() / 2,	"Did not get right filtered rowCount!");
+	QVERIFY2(!_data->defaultFilter()->filtered()[0],								"Expected first filtered to be FALSE");
+	QVERIFY2(_data->defaultFilter()->filtered()[1],									"Expected second filtered to be TRUE");
 
 }