Skip to content

Commit 7758802

Browse files
GreedyskyGreedysky
committed
Bump version 1.6.0.0 Final
1 parent 68c3bf9 commit 7758802

File tree

5 files changed

+97
-101
lines changed

5 files changed

+97
-101
lines changed

‎TTKApp/TTKApp.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
IDI_ICON1 ICON DISCARDABLE "../TTKResource/lb_app_icon.ico"
88

99
VS_VERSION_INFO VERSIONINFO
10-
FILEVERSION 1,5,0,0
11-
PRODUCTVERSION 1,5,0,0
10+
FILEVERSION 1,6,0,0
11+
PRODUCTVERSION 1,6,0,0
1212
FILEFLAGSMASK 0x3fL
1313

1414
#ifdef _DEBUG
@@ -27,12 +27,12 @@ BEGIN
2727
BEGIN
2828
VALUE "CompanyName", "Greedysky studio, Ltd."
2929
VALUE "FileDescription", "����Ԥ��"
30-
VALUE "FileVersion", "1.5.0.0"
30+
VALUE "FileVersion", "1.6.0.0"
3131
VALUE "InternalName", "����Ԥ��.exe"
3232
VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2022"
3333
VALUE "OriginalFilename", "����Ԥ��.exe"
3434
VALUE "ProductName", "����Ԥ��"
35-
VALUE "ProductVersion", "1.5.0.0"
35+
VALUE "ProductVersion", "1.6.0.0"
3636
END
3737
END
3838
BLOCK "VarFileInfo"

‎TTKModule/TTKCore.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
IDI_ICON1 ICON DISCARDABLE "../TTKResource/lb_app_icon.ico"
88

99
VS_VERSION_INFO VERSIONINFO
10-
FILEVERSION 1,5,0,0
11-
PRODUCTVERSION 1,5,0,0
10+
FILEVERSION 1,6,0,0
11+
PRODUCTVERSION 1,6,0,0
1212
FILEFLAGSMASK 0x3fL
1313

1414
#ifdef _DEBUG
@@ -27,10 +27,10 @@ BEGIN
2727
BEGIN
2828
VALUE "CompanyName", "Greedysky studio, Ltd."
2929
VALUE "FileDescription", "TTKCore"
30-
VALUE "FileVersion", "1.5.0.0"
30+
VALUE "FileVersion", "1.6.0.0"
3131
VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2022"
3232
VALUE "ProductName", "TTKCore"
33-
VALUE "ProductVersion", "1.5.0.0"
33+
VALUE "ProductVersion", "1.6.0.0"
3434
END
3535
END
3636
BLOCK "VarFileInfo"

‎TTKModule/weatherCore/weatherversion.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@
1919
* with this program; If not, see <http://www.gnu.org/licenses/>.
2020
***************************************************************************/
2121

22-
//update time 2021.10.27
22+
//update time 2022.01.29
2323
#define TTKWEATHER_STR "TTKWeather"
24-
#define TTKWEATHER_VERSION_STR "1.5.0.0"
24+
#define TTKWEATHER_VERSION_STR "1.6.0.0"
2525

2626
#define TTKWEATHER_MAJOR_VERSION 1
27-
#define TTKWEATHER_MIDLE_VERSION 5
27+
#define TTKWEATHER_MIDLE_VERSION 6
2828
#define TTKWEATHER_MINOR_VERSION 0
2929
#define TTKWEATHER_PATCH_VERSION 0
3030

31-
#define TTKWEATHER_VERSION 0x01500
31+
#define TTKWEATHER_VERSION 0x01600
3232

3333
#define TTKWEATHER_VERSION_CHECK(major, middle, minor, patch) ((major<<12)|(middle<<8)|(minor<<4)|(patch))
3434

‎TTKWeather.pri

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ unix:!mac{
5151
QMAKE_CXXFLAGS += -std=c++11 -Wunused-function -Wswitch
5252
}
5353

54-
TTKWeather = 1.5.0.0
54+
TTKWeather = 1.6.0.0
5555

5656
DEFINES += TTK_LIBRARY
5757

‎ttkglobal.h

+84-88
Original file line numberDiff line numberDiff line change
@@ -32,39 +32,39 @@
3232
#define TTK_QT_VERSION_CHECK(major, minor, patch) (QT_VERSION >= QT_VERSION_CHECK(major, minor, patch))
3333

3434
#ifndef qPrintable
35-
#define qPrintable(s) QString(s).toLocal8Bit().constData()
35+
# define qPrintable(s) QString(s).toLocal8Bit().constData()
3636
#endif
3737

3838
#ifndef qUtf8Printable
39-
#define qUtf8Printable(s) QString(s).toUtf8().constData()
39+
# define qUtf8Printable(s) QString(s).toUtf8().constData()
4040
#endif
4141

4242
#if !TTK_QT_VERSION_CHECK(5,7,0)
43-
#define TTK_AS_CONST
43+
# define TTK_AS_CONST
4444
// this adds const to non-const objects (like std::as_const)
45-
#ifndef Q_CC_MSVC
45+
# ifndef Q_CC_MSVC
4646
template <typename T>
4747
Q_DECL_CONSTEXPR typename std::add_const<T>::type &qAsConst(T &t) noexcept { return t; }
4848
// prevent rvalue arguments:
4949
template <typename T>
5050
void qAsConst(const T &&) = delete;
51-
#else
51+
# else
5252
template <typename T>
5353
Q_DECL_CONSTEXPR typename std::add_const<T>::type &qAsConst(T &t) { return t; }
54-
#endif
54+
# endif
5555
#endif
5656

5757
//
5858
#ifdef QT_DEBUG
59-
# define TTK_DEBUG
59+
# define TTK_DEBUG
6060
#endif
6161

62-
///
63-
#ifdef __cplusplus
62+
//
63+
#if __cplusplus >= 201103L
6464
# define TTK_CAST
6565
#endif
6666

67-
///cast
67+
// cast
6868
#ifdef TTK_CAST
6969
# define TTKConst_cast(x,y) (const_cast< x >(y))
7070
#else
@@ -95,20 +95,19 @@ Q_DECL_CONSTEXPR typename std::add_const<T>::type &qAsConst(T &t) { return t; }
9595
# define TTKObject_cast(x,y) (qobject_cast< x >(y))
9696
#endif
9797

98-
///
99-
#define TTK_IN const &
100-
#define TTK_OT &
101-
#define TTK_RT const
102-
#define TTK_RD &
103-
#define TTK_RR const &
104-
#define TTK_CT const
105-
#define TTK_CR const &
98+
//
99+
#if !TTK_QT_VERSION_CHECK(5,0,0) && defined(Q_CC_GNU)
100+
# if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
101+
# define Q_COMPILER_DEFAULT_MEMBERS
102+
# define Q_COMPILER_DELETE_MEMBERS
103+
# define Q_COMPILER_NULLPTR
104+
# define Q_COMPILER_EXPLICIT_OVERRIDES
105+
# endif
106+
#endif
106107

107-
/*
108-
* C++11 keywords and expressions
109-
*/
108+
// C++11 keywords and expressions
110109
#ifdef Q_COMPILER_NULLPTR
111-
# define TTK_NULLPTR nullptr
110+
# define TTK_NULLPTR nullptr
112111
#else
113112
# define TTK_NULLPTR NULL
114113
#endif
@@ -137,76 +136,73 @@ Q_DECL_CONSTEXPR typename std::add_const<T>::type &qAsConst(T &t) { return t; }
137136
# endif
138137
#endif
139138

140-
///
141-
#define TTK_NAN_STR "NaN"
142-
#define TTK_STR_SPLITER "*|||*"
143-
144-
///
145-
#define TTK_DECLARE_PTR(Class) \
146-
public: \
147-
using Class##Ptr = Class *; \
148-
using Class##CPtr = const Class *;
139+
// disable copy
140+
#define TTK_DISABLE_COPY(Class) \
141+
private: \
142+
Class(const Class &) TTK_DELETE; \
143+
Class &operator=(const Class &) TTK_DELETE;
149144

150-
#define TTK_DECLARE_GCN(Class) \
151-
public: \
152-
inline static QString getClassName() \
153-
{ \
154-
return #Class; \
145+
// make class name
146+
#define TTK_DECLARE_MODULE(Class) \
147+
public: \
148+
inline static QString className() \
149+
{ \
150+
return #Class; \
155151
}
156152

157-
#define TTK_DECLARE_MODULE(Class) \
158-
public: \
159-
TTK_DECLARE_PTR(Class) \
160-
TTK_DECLARE_GCN(Class)
161-
162-
///
153+
// marco str cat
163154
#ifndef _MSC_VER
164-
//gcc version less than 3.4.0
165-
#if __GNUC__ <= 3 && __GNUC_MINOR__ <= 4
166-
#define TTK_STRCAT(a, b) a##b
167-
#else
168-
#define TTK_STRCAT(a, b) a b
169-
#endif
155+
// gcc version less than 3.4.0
156+
# if __GNUC__ <= 3 && __GNUC_MINOR__ <= 4
157+
# define TTK_STRCAT(a, b) a##b
158+
# else
159+
# define TTK_STRCAT(a, b) a b
160+
# endif
170161
#else
171-
#define TTK_STRCAT(a, b) a b
172-
#endif
173-
174-
#define TTK_DECLARE_LISTS(Class) \
175-
typedef QList<Class> Class##s;
176-
177-
#define TTK_DECLARE_FLAGS(Flags, Enum) \
178-
typedef QFlags<Enum> Flags;
179-
180-
///
181-
typedef signed char TTKInt8; /* 8 bit signed */
182-
typedef unsigned char TTKUInt8; /* 8 bit unsigned */
183-
typedef short TTKInt16; /* 16 bit signed */
184-
typedef unsigned short TTKUInt16; /* 16 bit unsigned */
185-
typedef int TTKInt32; /* 32 bit signed */
186-
typedef unsigned int TTKUInt32; /* 32 bit unsigned */
187-
typedef long long TTKInt64; /* 64 bit signed */
188-
typedef unsigned long long TTKUInt64; /* 64 bit unsigned */
189-
190-
typedef double TTKDouble; /* double */
191-
typedef float TTKFloat; /* float */
192-
typedef bool TTKBool; /* bool */
193-
194-
typedef std::string TTKString; /* string */
195-
196-
///
197-
typedef QList<QVariant> TTKVariantList; /* variantlist */
198-
typedef QList<int> TTKIntList; /* intlist */
199-
typedef QSet<QVariant> TTKVariantSet; /* variantset */
200-
typedef QSet<int> TTKIntSet; /* intset */
201-
typedef QMap<QString, QVariant> TTKVariantMap; /* stringVariantMap */
202-
typedef QMap<QString, QString> TTKStringMap; /* stringsMap */
203-
typedef QMap<QString, QStringList> TTKStringListMap; /* stringStrlistsMap */
204-
typedef QMap<int, TTKIntList> TTKIntListMap; /* intIntlistMap */
205-
typedef QMap<qint64, QString> TTKIntStringMap; /* intStrMap */
206-
typedef QMapIterator<QString, QVariant> TTKVariantMapIterator; /* stringVariantMapIterator */
207-
typedef QMapIterator<QString, QString> TTKStringMapterator; /* stringsMapIterator */
208-
typedef QMapIterator<QString, QStringList> TTKStringListMapIterator; /* stringStrlistsMapIterator */
209-
typedef QMapIterator<int, TTKIntList> TTKIntListMapIterator; /* intIntlistMapIterator */
210-
typedef QMapIterator<qint64, QString> TTKIntStringMapIterator; /* intStrMapIterator */
162+
# define TTK_STRCAT(a, b) a b
163+
#endif
164+
165+
#define TTK_DECLARE_LIST(Class) typedef QList<Class> Class##s;
166+
#define TTK_DECLARE_FLAG(Flags, Enum) typedef QFlags<Enum> Flags;
167+
168+
#define TTK_DOT "."
169+
#define TTK_DOTDOT ".."
170+
#define TTK_SEPARATOR "/"
171+
#define TTK_PDIR TTK_STRCAT(TTK_DOTDOT, TTK_SEPARATOR)
172+
173+
#define TTK_SPLITER "*|||*"
174+
#define TTK_DEFAULT_STR "-"
175+
#define TTK_NAN_STR "NaN"
176+
#define TTK_NULL_STR "null"
177+
178+
// C style
179+
typedef signed char TTKInt8; /* 8 bit signed */
180+
typedef unsigned char TTKUInt8; /* 8 bit unsigned */
181+
typedef short TTKInt16; /* 16 bit signed */
182+
typedef unsigned short TTKUInt16; /* 16 bit unsigned */
183+
typedef int TTKInt32; /* 32 bit signed */
184+
typedef unsigned int TTKUInt32; /* 32 bit unsigned */
185+
typedef long long TTKInt64; /* 64 bit signed */
186+
typedef unsigned long long TTKUInt64; /* 64 bit unsigned */
187+
188+
typedef double TTKDouble; /* double */
189+
typedef float TTKFloat; /* float */
190+
typedef bool TTKBool; /* bool */
191+
192+
// C++ style
193+
typedef std::string TTKString; /* string */
194+
typedef std::wstring TTKWString; /* wstring */
195+
196+
// Qt style
197+
typedef QList<int> TTKIntList; /* intlist */
198+
typedef QList<QVariant> TTKVariantList; /* variantlist */
199+
typedef QSet<int> TTKIntSet; /* intset */
200+
typedef QMap<QString, QVariant> TTKVariantMap; /* stringVariantMap */
201+
typedef QMap<QString, QString> TTKStringMap; /* stringsMap */
202+
typedef QMap<QString, QStringList> TTKStringListMap; /* stringStrlistsMap */
203+
typedef QMap<int, TTKIntList> TTKIntListMap; /* intIntlistMap */
204+
typedef QMap<qint64, QString> TTKIntStringMap; /* intStrMap */
205+
typedef QMapIterator<QString, QString> TTKStringMapterator; /* stringsMapIterator */
206+
typedef QMapIterator<qint64, QString> TTKIntStringMapIterator; /* intStrMapIterator */
211207

212208
#endif // TTKGLOBAL_H

0 commit comments

Comments
 (0)