Merge remote-tracking branch 'upstream/master' into fix/reduce-boost-dependencies
# Conflicts: # toonz/sources/include/tfarmtask.h
This commit is contained in:
commit
a85aeb719a
57 changed files with 110 additions and 62 deletions
|
@ -10,7 +10,7 @@
|
|||
#include "tatomicvar.h"
|
||||
|
||||
#include "tthread.h"
|
||||
#include "tthreadP.h"
|
||||
#include "tthreadp.h"
|
||||
|
||||
// STL includes
|
||||
#include <set>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
void parseIndexes(string indexes, vector<string> &items)
|
||||
{
|
||||
#ifndef MACOSX
|
||||
#ifdef WIN32
|
||||
char seps[] = " ,;";
|
||||
char *token;
|
||||
if (indexes == "all" || indexes == "All" || indexes == "ALL")
|
||||
|
@ -39,7 +39,7 @@ void parseIndexes(string indexes, vector<string> &items)
|
|||
|
||||
void insertIndexes(vector<string> items, PaletteFilterFxRenderData *t)
|
||||
{
|
||||
#ifndef MACOSX
|
||||
#ifdef WIN32
|
||||
for (int i = 0; i < (int)items.size(); i++) {
|
||||
char *starttoken, *endtoken;
|
||||
char subseps[] = "-";
|
||||
|
|
|
@ -11,12 +11,14 @@
|
|||
#ifndef __sgi
|
||||
#ifdef WIN32
|
||||
#include <GL/glut.h>
|
||||
#elif defined(LINUX)
|
||||
#include <GL/glut.h>
|
||||
#else
|
||||
#include <GLUT/glut.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef MACOSX
|
||||
#if defined(MACOSX) || defined(LINUX)
|
||||
#include <QGLContext>
|
||||
#endif
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ extern "C" {
|
|||
|
||||
#include <stdio.h>
|
||||
|
||||
#ifdef MACOSX
|
||||
#if defined(MACOSX) || defined(LINUX)
|
||||
#include <stddef.h>
|
||||
#endif
|
||||
|
||||
|
|
|
@ -18,6 +18,9 @@
|
|||
#elif MACOSX
|
||||
#include <sys/sysctl.h>
|
||||
#include <unistd.h>
|
||||
#elif LINUX
|
||||
#include <sys/time.h>
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#include "tipc.h"
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <fstream>
|
||||
#include <set>
|
||||
#include <vector>
|
||||
#include <qtime>
|
||||
#include <QTimer>
|
||||
|
||||
using std::endl;
|
||||
|
||||
|
|
|
@ -21,7 +21,9 @@
|
|||
#include <dirent.h>
|
||||
#include <sys/dir.h>
|
||||
#include <sys/param.h> // for getfsstat
|
||||
#ifdef MACOSX
|
||||
#include <sys/ucred.h>
|
||||
#endif
|
||||
#include <sys/mount.h>
|
||||
#include <pwd.h>
|
||||
#include <dlfcn.h>
|
||||
|
@ -63,7 +65,7 @@ typedef const TPluginInfo *TnzLibMainProcType();
|
|||
namespace
|
||||
{
|
||||
const char *TnzLibMainProcName = "TLibMain";
|
||||
#ifdef MACOSX
|
||||
#if !defined(WIN32)
|
||||
const char *TnzLibMainProcName2 = "_TLibMain";
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -10,26 +10,26 @@ using namespace std;
|
|||
|
||||
#ifndef TNZCORE_LIGHT
|
||||
|
||||
#include <qdatetime>
|
||||
#include <qstringlist>
|
||||
#include <qprocess>
|
||||
#include <qdir>
|
||||
#include <qfile>
|
||||
#include <qfileinfo>
|
||||
#include <qsettings>
|
||||
#include <qvariant>
|
||||
#include <qthread>
|
||||
#include <qurl>
|
||||
#include <qcoreapplication>
|
||||
#include <quuid.h>
|
||||
#include <QDateTime>
|
||||
#include <QStringList>
|
||||
#include <QProcess>
|
||||
#include <QDir>
|
||||
#include <QFile>
|
||||
#include <QFileInfo>
|
||||
#include <QSettings>
|
||||
#include <QVariant>
|
||||
#include <QThread>
|
||||
#include <QUrl>
|
||||
#include <QCoreApplication>
|
||||
#include <QUuid>
|
||||
|
||||
#ifdef WIN32
|
||||
#include <qdesktopservices>
|
||||
#include <qhostinfo>
|
||||
#include <shlobj.h>
|
||||
#else
|
||||
#include <qdesktopservices>
|
||||
#include <qhostinfo>
|
||||
#include <QDesktopServices>
|
||||
#include <QHostInfo>
|
||||
#endif
|
||||
|
||||
#include <QStringList>
|
||||
|
|
|
@ -186,6 +186,11 @@ bool TSystem::memoryShortage()
|
|||
// to be done...
|
||||
return false;
|
||||
|
||||
#elif defined(LINUX)
|
||||
|
||||
// to be done...
|
||||
return false;
|
||||
|
||||
#else
|
||||
|
||||
@ @ @ERROR : PLATFORM NOT SUPPORTED
|
||||
|
|
|
@ -15,6 +15,10 @@
|
|||
|
||||
#include <set>
|
||||
|
||||
#if defined(LINUX)
|
||||
#include <typeinfo>
|
||||
#endif
|
||||
|
||||
using namespace std;
|
||||
|
||||
namespace
|
||||
|
|
|
@ -97,7 +97,7 @@ extern "C" void CALLBACK myCombine(GLdouble coords[3], GLdouble *d[4],
|
|||
typedef GLvoid(CALLBACK *GluCallback)(void);
|
||||
#endif
|
||||
|
||||
#ifdef MACOSX
|
||||
#if defined(MACOSX) || defined(LINUX)
|
||||
|
||||
typedef GLvoid (*GluCallback)();
|
||||
|
||||
|
|
|
@ -97,6 +97,11 @@
|
|||
* Platform Dependent Definitions and Typedefs *
|
||||
****************************************************************************/
|
||||
|
||||
|
||||
#ifdef LINUX
|
||||
#include <wchar.h>
|
||||
#endif
|
||||
|
||||
/* Microsoft C/C++ Compiler */
|
||||
#if defined(WIN32) || defined(WIN64) || defined(_WINDOWS)
|
||||
#define TWH_CMP_MSC
|
||||
|
|
|
@ -13,6 +13,10 @@ extern "C" {
|
|||
#include <stddef.h>
|
||||
#endif
|
||||
|
||||
#ifdef LINUX
|
||||
#include <wchar.h>
|
||||
#endif
|
||||
|
||||
char *convertWCHAR2CHAR(const wchar_t *fname);
|
||||
|
||||
#if defined(MACOSX) || defined(LINUX)
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include "tconvert.h"
|
||||
#include "trasterimage.h"
|
||||
|
||||
#include "QByteArray.h"
|
||||
#include <QByteArray>
|
||||
|
||||
#if !defined(TNZ_LITTLE_ENDIAN)
|
||||
TNZ_LITTLE_ENDIAN undefined !!
|
||||
|
|
|
@ -13,6 +13,8 @@
|
|||
#include <GL/glu.h>
|
||||
#elif MACOSX
|
||||
#include <GLUT/glut.h>
|
||||
#elif LINUX
|
||||
#include <GL/glut.h>
|
||||
#endif
|
||||
|
||||
#ifndef TCG_GLU_CALLBACK
|
||||
|
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
#include "tcommon.h"
|
||||
#include "tfilepath.h"
|
||||
#include <qstring>
|
||||
#include <qdatetime>
|
||||
#include <QString>
|
||||
#include <QDateTime>
|
||||
#include <map>
|
||||
#include <set>
|
||||
|
||||
|
|
|
@ -73,7 +73,7 @@ DVAPI wstring toUpper(wstring a);
|
|||
DVAPI wstring toLower(wstring a);
|
||||
|
||||
#ifndef TNZCORE_LIGHT
|
||||
#include <qstring>
|
||||
#include <QString>
|
||||
|
||||
inline bool fromStr(int &v, QString s)
|
||||
{
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
#include <memory>
|
||||
|
||||
#include <qdatetime>
|
||||
#include <QDateTime>
|
||||
#include "tpersist.h"
|
||||
#include "tfarmplatforms.h"
|
||||
#include "tfilepath.h"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <qobject>
|
||||
#include <QObject>
|
||||
#include <set>
|
||||
|
||||
#include "tcommon.h"
|
||||
|
|
|
@ -18,7 +18,7 @@ typedef uint32_t TUINT32;
|
|||
typedef int64_t TINT64;
|
||||
typedef uint64_t TUINT64;
|
||||
|
||||
#elif defined(__LP64__)
|
||||
#elif defined(__LP64__) && (!defined(LINUX))
|
||||
|
||||
#define TINT32 \
|
||||
; \
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#include "toonz/scriptbinding.h"
|
||||
#include "tfilepath.h"
|
||||
|
||||
#include <qdatetime.h>
|
||||
#include <QDateTime>
|
||||
|
||||
namespace TScriptBinding
|
||||
{
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#define TTILESET_HEADER
|
||||
|
||||
#include "trastercm.h"
|
||||
#include <qstring>
|
||||
#include <QString>
|
||||
|
||||
#undef DVAPI
|
||||
#undef DVVAR
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#define SCHEMATICGROUPEDITOR_H
|
||||
|
||||
#include "tcommon.h"
|
||||
#include <QGraphicsItem.h>
|
||||
#include <QGraphicsItem>
|
||||
#include "tgeometry.h"
|
||||
|
||||
#undef DVAPI
|
||||
|
|
|
@ -154,6 +154,8 @@ public:
|
|||
Channel b, g, r, m;
|
||||
#elif TNZ_MACHINE_CHANNEL_ORDER_MRGB
|
||||
Channel m, r, g, b;
|
||||
#elif TNZ_MACHINE_CHANNEL_ORDER_RGBM
|
||||
Channel r, g, b, m;
|
||||
#else
|
||||
undefined machine order !!!!
|
||||
#endif
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
#include "trasterimage.h"
|
||||
#include <set>
|
||||
#include <qstring>
|
||||
#include <QString>
|
||||
#undef DVAPI
|
||||
#undef DVVAR
|
||||
#ifdef TNZBASE_EXPORTS
|
||||
|
|
|
@ -162,9 +162,9 @@ public:
|
|||
//----------------------------------------------------------------------------
|
||||
|
||||
//!Applies a trasformation (echo, reverb, ect) to the object and returns the transformed soundtrack
|
||||
#ifdef MACOSX
|
||||
#if defined(MACOSX) || defined(LINUX)
|
||||
TSoundTrackP apply(TSoundTransform *transform);
|
||||
#else
|
||||
#else // WIN32
|
||||
TSoundTrackP apply(TSoundTransform *transform)
|
||||
{
|
||||
assert(transform);
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
#ifndef TNZCORE_LIGHT
|
||||
|
||||
#include <qdatetime>
|
||||
#include <QDateTime>
|
||||
|
||||
DVAPI ostream &operator<<(ostream &out, const QDateTime &t);
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@ void DVAPI shutdown();
|
|||
class ExecutorId; //Private
|
||||
class Runnable;
|
||||
|
||||
#ifndef MACOSX
|
||||
#if !(defined(MACOSX) || defined(LINUX))
|
||||
template class TSmartPointerT<Runnable>;
|
||||
#endif
|
||||
typedef TSmartPointerT<Runnable> RunnableP;
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
#include <stdexcept> /* std::domain_error(-) */
|
||||
#include <limits> /* std::numeric_limits */
|
||||
#include <cmath> /* pow(-),abs(-) */
|
||||
#include <cstring> /* memmove */
|
||||
#include "igs_ifx_common.h" /* igs::image::rgba */
|
||||
#include "igs_motion_blur.h"
|
||||
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
#include <cerrno>
|
||||
#include <cstring> /* memset */
|
||||
#include <vector>
|
||||
#include <stdexcept> // std::domain_error(-)
|
||||
#include <locale>
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
|
||||
#include "tscannerutil.h"
|
||||
|
||||
#include <cstring>
|
||||
|
||||
#define BUFBYTE(X, Y, BUF, BYTEWRAP, BITOFFS) \
|
||||
(((UCHAR *)(BUF))[(((X) + (BITOFFS)) >> 3) + (Y) * (BYTEWRAP)])
|
||||
|
||||
|
|
|
@ -12,6 +12,8 @@
|
|||
|
||||
#include "ext/plasticdeformer.h"
|
||||
|
||||
#include <cstring>
|
||||
|
||||
/*! \file plasticdeformer.cpp
|
||||
|
||||
This file contains the implementation of a Mesh Deformer as specified in the
|
||||
|
|
|
@ -18,6 +18,8 @@ using namespace tcg::bgl;
|
|||
|
||||
#include "ext/plastichandle.h"
|
||||
|
||||
#include <cstring>
|
||||
|
||||
//***********************************************************************************************
|
||||
// Distance building
|
||||
//***********************************************************************************************
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
#include <stddef.h>
|
||||
#include <stdlib.h>
|
||||
#include <memory>
|
||||
#include <cstring>
|
||||
|
||||
//blasint may either be common 4 bytes or extended 8 (long)...
|
||||
//Replace this and REBUILD the CBLAS with extended int if needed.
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
// Qt includes
|
||||
#include <QApplication>
|
||||
#include <QString>
|
||||
#include <QToolbar>
|
||||
#include <QToolBar>
|
||||
#include <QPushButton>
|
||||
#include <QLabel>
|
||||
#include <QClipboard>
|
||||
|
|
|
@ -24,8 +24,8 @@
|
|||
|
||||
#include "toonzqt/gutil.h"
|
||||
|
||||
#include <qstring>
|
||||
#include <qprocess>
|
||||
#include <QString>
|
||||
#include <QProcess>
|
||||
#include <QHostInfo>
|
||||
|
||||
namespace
|
||||
|
|
|
@ -3,11 +3,11 @@
|
|||
#ifndef BATCHES_H
|
||||
#define BATCHES_H
|
||||
|
||||
#include <qobject>
|
||||
#include <QObject>
|
||||
#include <map>
|
||||
#include <set>
|
||||
#include <vector>
|
||||
#include <qstring>
|
||||
#include <QString>
|
||||
#include "tfarmtask.h"
|
||||
#include "tfilepath.h"
|
||||
#include "tthread.h"
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
#include "drawingdata.h"
|
||||
#include "toonzqt/strokesdata.h"
|
||||
#include "toonzqt/rasterimagedata.h"
|
||||
#include "timageCache.h"
|
||||
#include "timagecache.h"
|
||||
#include "tools/toolutils.h"
|
||||
#include "toonzqt/icongenerator.h"
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
#include "tsystem.h"
|
||||
|
||||
#include <set>
|
||||
#include <qdatetime>
|
||||
#include <QDateTime>
|
||||
|
||||
class History
|
||||
{ // singleton
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#define INSERTFXPOPUP_H
|
||||
|
||||
#include "toonzqt/dvdialog.h"
|
||||
#include "tfilePath.h"
|
||||
#include "tfilepath.h"
|
||||
#include "tstream.h"
|
||||
|
||||
// forward declaration
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
// TnzLib includes
|
||||
#include "toonz/txsheet.h"
|
||||
#include "toonz/toonzscene.h"
|
||||
#include "toonz/levelSet.h"
|
||||
#include "toonz/levelset.h"
|
||||
#include "toonz/txshsimplelevel.h"
|
||||
#include "toonz/txshlevelcolumn.h"
|
||||
#include "toonz/txshcell.h"
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#include "tpalette.h"
|
||||
#include "toonz/txsheet.h"
|
||||
#include "toonz/toonzscene.h"
|
||||
#include "toonz/levelSet.h"
|
||||
#include "toonz/levelset.h"
|
||||
#include "toonz/txshsimplelevel.h"
|
||||
#include "toonz/txshlevelcolumn.h"
|
||||
#include "toonz/txshcell.h"
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#include "tpalette.h"
|
||||
#include "toonz/txsheet.h"
|
||||
#include "toonz/toonzscene.h"
|
||||
#include "toonz/levelSet.h"
|
||||
#include "toonz/levelset.h"
|
||||
#include "toonz/txshsimplelevel.h"
|
||||
#include "toonz/txshlevelcolumn.h"
|
||||
#include "toonz/txshcell.h"
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#include <QComboBox>
|
||||
#include <QLabel>
|
||||
#include <QApplication>
|
||||
#include <QMainwindow>
|
||||
#include <QMainWindow>
|
||||
#include <QPainter>
|
||||
|
||||
using namespace DVGui;
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
#include "toonz/tframehandle.h"
|
||||
#include "toonz/tcolumnhandle.h"
|
||||
#include "toonz/tobjecthandle.h"
|
||||
#include "toonz/cleanupParameters.h"
|
||||
#include "toonz/cleanupparameters.h"
|
||||
#include "sceneviewer.h"
|
||||
#include "ruler.h"
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include <QSettings>
|
||||
|
||||
// MACOSX includes
|
||||
#ifdef MACOSX
|
||||
#if defined(MACOSX) || defined(LINUX)
|
||||
#include <netdb.h> // gethostbyname
|
||||
#include <arpa/inet.h> // inet_ntoa
|
||||
#endif
|
||||
|
|
|
@ -49,6 +49,10 @@ using namespace std;
|
|||
#include <sys/sysctl.h> //To retrieve MAC HW infos
|
||||
#endif
|
||||
|
||||
#ifdef LINUX
|
||||
#include <sys/sysctl.h>
|
||||
#endif
|
||||
|
||||
// forward declaration
|
||||
class FarmServer;
|
||||
|
||||
|
@ -693,6 +697,7 @@ void FarmServer::queryHwInfo(HwInfo &hwInfo)
|
|||
hwInfo.m_type = Irix;
|
||||
#else
|
||||
|
||||
#ifdef MACOSX
|
||||
int mib[2];
|
||||
TINT64 physMemSize;
|
||||
size_t len;
|
||||
|
@ -701,6 +706,11 @@ void FarmServer::queryHwInfo(HwInfo &hwInfo)
|
|||
mib[1] = HW_MEMSIZE;
|
||||
len = sizeof(physMemSize);
|
||||
sysctl(mib, 2, &physMemSize, &len, NULL, 0);
|
||||
#endif
|
||||
|
||||
#ifdef LINUX
|
||||
TINT64 physMemSize = (TINT64)sysconf(_SC_PHYS_PAGES) * (TINT64)sysconf(_SC_PAGE_SIZE);
|
||||
#endif
|
||||
|
||||
hwInfo.m_cpuCount = TSystem::getProcessorCount();
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@ fare resize e realloc size dello stack a 65000 unita'
|
|||
|
||||
*/
|
||||
|
||||
#ifdef MACOSX
|
||||
#if defined(MACOSX) || defined(LINUX)
|
||||
#define TRUE 1
|
||||
#define FALSE 0
|
||||
#endif
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <search.h>
|
||||
#include "YombInputParam.h"
|
||||
#include "YOMBInputParam.h"
|
||||
//#include "tmsg.h"
|
||||
#ifdef WIN32
|
||||
#pragma warning(disable : 4996)
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include <string.h>
|
||||
#include "YOMBParam.h"
|
||||
#include "InputParam.h"
|
||||
#include "YombInputParam.h"
|
||||
#include "YOMBInputParam.h"
|
||||
#include "STColSelPic.h"
|
||||
#include "BlurMatrix.h"
|
||||
#include "SDef.h"
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
#include "STColSelPic.h"
|
||||
#include "SDef.h"
|
||||
#include "InputParam.h"
|
||||
#include "YombInputParam.h"
|
||||
#include "YOMBInputParam.h"
|
||||
#include "BlurMatrix.h"
|
||||
//#pragma warning(disable: 4786)
|
||||
//#include "tmsg.h"
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include "toonz/sceneproperties.h"
|
||||
#include "toonz/toonzfolders.h"
|
||||
#include "toonz/txsheet.h"
|
||||
#include <QApplication.h>
|
||||
#include <QApplication>
|
||||
|
||||
#include "historytypes.h"
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
//#include "tfilepath.h"
|
||||
#include "tfilepath_io.h"
|
||||
|
||||
#include <qdatetime>
|
||||
#include <QDateTime>
|
||||
|
||||
#ifdef WIN32
|
||||
#pragma warning(disable : 4996)
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
#include "tmsg.h"
|
||||
#include "copP.h"*/
|
||||
|
||||
#ifdef MACOSX
|
||||
#if defined(MACOSX) || defined(LINUX)
|
||||
#define TRUE 1
|
||||
#define FALSE 0
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#include "toonz/txsheethandle.h"
|
||||
#include "toonz/tobjecthandle.h"
|
||||
#include "toonz/tfxhandle.h"
|
||||
#include "toonz/tcolumnHandle.h"
|
||||
#include "toonz/tcolumnhandle.h"
|
||||
#include "toonz/fxdag.h"
|
||||
#include "toonz/txshzeraryfxcolumn.h"
|
||||
#include "toonz/tcolumnfx.h"
|
||||
|
@ -42,7 +42,7 @@
|
|||
#include <QPushButton>
|
||||
#include <QStackedWidget>
|
||||
#include <QLabel>
|
||||
#include <QToolbar>
|
||||
#include <QToolBar>
|
||||
#include <QAction>
|
||||
|
||||
using namespace DVGui;
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
// Qt includes
|
||||
#include <QGraphicsSceneMouseEvent>
|
||||
#include <QMouseEvent>
|
||||
#include <QGraphicsItem.h>
|
||||
#include <QGraphicsItem>
|
||||
#include <QToolBar>
|
||||
#include <QToolButton>
|
||||
#include <QMenu>
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <QKeyEvent>
|
||||
#include <QWheelEvent>
|
||||
#include <QLabel>
|
||||
#include <QScrollbar>
|
||||
#include <QScrollBar>
|
||||
#include <QPainter>
|
||||
#include <QGridLayout>
|
||||
#include <QPaintEvent>
|
||||
|
|
Loading…
Reference in a new issue