soutade/KissCount
1
0
Fork 0
Code Issues Pull Requests Packages Releases 1 Wiki Activity

Updates for Qt6 + some fixes

Browse Source
This commit is contained in:
Grégory Soutadé
2023-03-06 20:32:17 +01:00
parent 259b163b11
commit 9677a077c6
30 changed files with 241 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/controller/KissCount.cpp
+2 -2
View File
@@ -51,7 +51,7 @@ KissCount::KissCount(int& argc, char** argv) : QApplication(argc, argv), _user(0
_wxUI->close();
throw s;
}
_wxUI->ChangeUser();
_wxUI->setDisabled(false);
}
@@ -691,7 +691,7 @@ QFont KissCount::ExtractFont(QString strFont)
QString KissCount::CompactFont(const QFont& font)
{
QString res ;
res = res.sprintf("%d;%d;%d;%d;", font.pointSize(), 0, 0, font.weight());
res = res.asprintf("%d;%d;%d;%d;", font.pointSize(), 0, 0, font.weight());
res += font.family();
return res;
src/controller/KissCount.hpp
+2 -15
View File
@@ -30,24 +30,11 @@
#include <view/wxUI.hpp>
#define APP_VERSION "0.8"
#define APP_VERSION "0.9"
#define ESCAPE_CHARS(s) s = s.replace("\"", " ");
// #define ESCAPE_CHARS(s) s = s.replace("\"", "\\\""); s = s.replace("\'", "\\\'");
/*{ \
if (s.Find(wxT("\\\"")) == wxNOT_FOUND) \
s.Replace(wxT("\""), wxT("\\\""), true); \
if (s.Find(wxT("\\\'")) == wxNOT_FOUND) \
s.Replace(wxT("\'"), wxT("\\\'"), true); \
}
*/
#define UNESCAPE_CHARS(s) s = s.replace("\\\"", " ");
// #define UNESCAPE_CHARS(s) s = s.replace("\\\"", "\""); s = s.replace("\\\'", "\'");
/*{ \
s.Replace(wxT("\\\""), wxT("\""), true); \
s.Replace(wxT("\\\'"), wxT("\'"), true); \
}
*/
class wxUI;
class Database;
class ImportEngine;