Skip to content

Commit eeb3341

Browse files
UPD: Merged project branch and replaced QT part with new core parts.
1 parent da6f8b9 commit eeb3341

File tree

5 files changed

+8
-10
lines changed

5 files changed

+8
-10
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,4 @@ CMakeLists.txt.user
7676
build*
7777
.vscode
7878
/.vscode
79+
*.bak

smcore/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ set(SMCORE_INCLUDE
3535
license.h
3636
options.h
3737
project.h
38-
smcore_global.h
3938
)
4039

4140
set(SMCORE_BODY

smcore/error.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222

2323
#pragma once
2424

25-
#include <QString>
26-
#include "smcore_global.h"
25+
#include "smstring.h"
2726

2827
// See error class in C++ with enum
2928
// https://stackoverflow.com/questions/21295935/can-a-c-enum-class-have-methods
@@ -34,7 +33,7 @@ namespace smos
3433
{
3534
namespace smcore
3635
{
37-
class SMCORE_EXPORT Error
36+
class Error
3837
{
3938
public:
4039
enum ErrorCode

smcore/project.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ namespace smos
3232
{
3333
}
3434
//******************************************************************************
35-
smos::smcore::Error::ErrorCode Project::loadProject(QString filename)
35+
smos::smcore::Error::ErrorCode Project::loadProject(smos::smcore::SMSring filename)
3636
{
37-
if (!std::filesystem::exists(filename.toStdString()))
37+
if (!std::filesystem::exists(filename))
3838
{
3939
return smos::smcore::Error::ERR_PROJECT_DOES_NOT_EXIST;
4040
}

smcore/project.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,14 @@
2222

2323
#pragma once
2424

25-
#include <QString>
26-
#include "smcore_global.h"
25+
#include "smstring.h"
2726
#include "error.h"
2827

2928
namespace smos
3029
{
3130
namespace smcore
3231
{
33-
class SMCORE_EXPORT Project
32+
class Project
3433
{
3534
public:
3635
/**
@@ -46,7 +45,7 @@ namespace smos
4645
*
4746
* @return smos::smcore::Error::ErrorCode
4847
*/
49-
smos::smcore::Error::ErrorCode loadProject(QString filename);
48+
smos::smcore::Error::ErrorCode loadProject(smos::smcore::SMSring filename);
5049
};
5150
}
5251
}

0 commit comments

Comments
 (0)