mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move intdup to qthelper

Browse source 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
This commit is contained in:
Miika Turkia 2017-05-07 09:41:27 +03:00
parent 0d36b6e4e8
commit ab1813a445
4 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/qthelper.cpp
View file

@ -1509,3 +1509,12 @@ QString getUUID()
uuidString.replace("{", "").replace("}", ""); uuidString.replace("{", "").replace("}", "");
return uuidString; return uuidString;
} }
char *intdup(int index)
{
char tmpbuf[21];
snprintf(tmpbuf, sizeof(tmpbuf) - 2, "%d", index);
tmpbuf[20] = 0;
return strdup(tmpbuf);
}

1
core/qthelper.h
View file

@ -46,5 +46,6 @@ extern "C" enum deco_mode decoMode();
extern "C" void subsurface_mkdir(const char *dir); extern "C" void subsurface_mkdir(const char *dir);
void init_proxy(); void init_proxy();
QString getUUID(); QString getUUID();
char *intdup(int index);
#endif // QTHELPER_H #endif // QTHELPER_H

10
desktop-widgets/divelogimportdialog.cpp
View file

@ -7,6 +7,7 @@
#include <QDrag> #include <QDrag>
#include <QMimeData> #include <QMimeData>
#include <QRegExp> #include <QRegExp>
#include "core/qthelper.h"
static QString subsurface_mimedata = "subsurface/csvcolumns"; static QString subsurface_mimedata = "subsurface/csvcolumns";
static QString subsurface_index = "subsurface/csvindex"; static QString subsurface_index = "subsurface/csvindex";
@ -742,15 +743,6 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
resultModel->setData(resultModel->index(0, i),headers.at(i),Qt::EditRole); resultModel->setData(resultModel->index(0, i),headers.at(i),Qt::EditRole);
} }
char *intdup(int index)
{
char tmpbuf[21];
snprintf(tmpbuf, sizeof(tmpbuf) - 2, "%d", index);
tmpbuf[20] = 0;
return strdup(tmpbuf);
}
int DiveLogImportDialog::setup_csv_params(QStringList r, char **params, int pnr) int DiveLogImportDialog::setup_csv_params(QStringList r, char **params, int pnr)
{ {
params[pnr++] = strdup("dateField"); params[pnr++] = strdup("dateField");

10
tests/testparse.cpp
View file

@ -4,6 +4,7 @@
#include "core/file.h" #include "core/file.h"
#include "core/divelist.h" #include "core/divelist.h"
#include <QTextStream> #include <QTextStream>
#include "core/qthelper.h"
/* We have to use a macro since QCOMPARE /* We have to use a macro since QCOMPARE
* can only be called from a test method * can only be called from a test method
@ -42,15 +43,6 @@ void TestParse::cleanup()
sqlite3_close(_sqlite3_handle); sqlite3_close(_sqlite3_handle);
} }
char *intdup(int index)
{
char tmpbuf[21];
snprintf(tmpbuf, sizeof(tmpbuf) - 2, "%d", index);
tmpbuf[20] = 0;
return strdup(tmpbuf);
}
int TestParse::parseCSV(int units, std::string file) int TestParse::parseCSV(int units, std::string file)
{ {
// some basic file parsing tests // some basic file parsing tests