add librdata to github workflow

Author: shun2wang

.github/workflows/ubuntu.yml

@@ -43,6 +43,7 @@ jobs:
             sudo apt install libglpk-dev libcurl4-openssl-dev libmpfr-dev libfontconfig1-dev libcairo2-dev #required by some r packages
             sudo apt install jags
             sudo apt install libminizip-dev # required by freexl
+            sudo apt install librdata-dev
             git clone https://github.com/jasp-stats/freexl.git
             cd freexl && ./configure && make && sudo make install
             

Desktop/CMakeLists.txt

@@ -107,16 +107,16 @@ target_include_directories(
     ${PROJECT_SOURCE_DIR}/QMLComponents
     # ReadStat
     $<$<PLATFORM_ID:Windows>:${RTOOLS_LIBREADSTAT_H}>
+    ${LIBREADSTAT_INCLUDE_DIRS}
     # librdata
     $<$<PLATFORM_ID:Windows>:${RTOOLS_LIBRDATA_H}>
-    ${LIBREADSTAT_INCLUDE_DIRS}
+    ${LIBRDATA_INCLUDE_DIRS}
     # JSONCPP
     $<$<PLATFORM_ID:Linux>:${_PKGCONFIG_LIB_JSONCPP_INCLUDEDIR}>
     $<$<BOOL:${FLATPAK_USED}>:/app/include/QtCore5Compat>
     $<$<BOOL:${FLATPAK_USED}>:/app/include/QtWebEngineQuick>
     $<$<BOOL:${FLATPAK_USED}>:/app/include/QtWebEngineCore>
     ${LIBFREEXL_INCLUDE_DIRS}
-    ${LIBRDATA_INCLUDE_DIRS}
 )
 
 target_link_libraries(
@@ -169,8 +169,6 @@ target_link_libraries(
          #$<$<PLATFORM_ID:Linux>:${_PKGCONFIG_LIB_JSONCPP_LINK_LIBRARIES}>
     # R-Framework --------------------------------
     $<$<PLATFORM_ID:Darwin>:${_R_Framework}>
-    # librdata
-    ${LIBRDATA_LIBRARIES}
 )
 
 target_compile_definitions(JASP PUBLIC JASP_USES_QT_HERE)

Desktop/data/importers/rdata/readrdata.h

@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2013-2024 University of Amsterdam
+// Copyright (C) 2013-2025 University of Amsterdam
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -36,8 +36,8 @@ class RDataReader
 private:
 	struct RDataCtx
 	{
-		long 		column_count = 0;
-		long 		row_count = 0;
+		size_t 		column_count = 0;
+		size_t 		row_count = 0;
 		const char *table_name = nullptr;
 		stringvec 	column_names;
 		stringvecvec column_data;

Desktop/data/importers/rdataimporter.cpp

@@ -53,7 +53,7 @@ ImportDataSet *RDataImporter::loadFile(const std::string &locator, std::function
 	if (colCount == 0)
 		throw std::runtime_error(fq(tr("0 valid columns were read from the file, please check your data file.")));
 
-	importColumns.reserve(ccolCount);
+	importColumns.reserve(colCount);
 
 	for (size_t colIndex = 0; colIndex < colCount; ++colIndex)
 	{