fixed win version after os x build

This commit is contained in:
John Preston 2014-06-25 21:50:27 +04:00
parent 0c7baa86a4
commit e5d083ca13
14 changed files with 19 additions and 18 deletions

View File

@ -40,17 +40,17 @@ using std::exception;
class Exception : public exception {
public:
Exception(const QString &msg) : _msg(msg) {
Exception(const QString &msg) : _msg(msg.toUtf8()) {
}
virtual const char *what() const throw() {
return _msg.toUtf8().constData();
return _msg.constData();
}
virtual ~Exception() throw() {
}
private:
QString _msg;
QByteArray _msg;
};
bool genEmoji(QString emoji_in, const QString &emoji_out, const QString &emoji_png);

View File

@ -38,17 +38,17 @@ using std::exception;
class Exception : public exception {
public:
Exception(const QString &msg) : _msg(msg) {
Exception(const QString &msg) : _msg(msg.toUtf8()) {
}
virtual const char *what() const throw() {
return _msg.toUtf8().constData();
return _msg.constData();
}
virtual ~Exception() throw() {
}
private:
QString _msg;
QByteArray _msg;
};
bool genLang(const QString &lang_in, const QString &lang_out);

View File

@ -37,17 +37,17 @@ using std::exception;
class Exception : public exception {
public:
Exception(const QString &msg) : _msg(msg) {
Exception(const QString &msg) : _msg(msg.toUtf8()) {
}
virtual const char *what() const throw() {
return _msg.toUtf8().constData();
return _msg.constData();
}
virtual ~Exception() throw() {
}
private:
QString _msg;
QByteArray _msg;
};
bool genStyles(const QString &classes_in, const QString &classes_out, const QString &styles_in, const QString &styles_out, const QString &path_to_sprites);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

View File

@ -31,7 +31,7 @@ public:
return dynamic_cast<const TWidget*>(parentWidget());
}
virtual void leaveToChildEvent(QEvent */*e*/) { // e -- from enterEvent() of child TWidget
virtual void leaveToChildEvent(QEvent *e) { // e -- from enterEvent() of child TWidget
}
protected:

View File

@ -895,8 +895,9 @@ void PsMainWindow::psIdleTimeout() {
}
}
bool PsMainWindow::psIsActive() const {
return isActiveWindow() && isVisible() && !(windowState() & Qt::WindowMinimized) && !psIdle;
bool PsMainWindow::psIsActive(int state) const {
if (state < 0) state = this->windowState();
return isActiveWindow() && isVisible() && !(state & Qt::WindowMinimized) && !psIdle;
}
bool PsMainWindow::psIsOnline(int windowState) const {

View File

@ -102,7 +102,7 @@ public:
void psFlash();
void psNotifySettingGot();
bool psIsActive() const;
bool psIsActive(int state = -1) const;
bool psIsOnline(int windowState) const;
void psUpdateWorkmode();

View File

@ -49,7 +49,7 @@ using std::swap;
class Exception : public exception {
public:
Exception(const QString &msg, bool isFatal = true) : _fatal(isFatal), _msg(msg) {
Exception(const QString &msg, bool isFatal = true) : _fatal(isFatal), _msg(msg.toUtf8()) {
LOG(("Exception: %1").arg(msg));
}
bool fatal() const {
@ -57,14 +57,14 @@ public:
}
virtual const char *what() const throw() {
return _msg.toUtf8().constData();
return _msg.constData();
}
virtual ~Exception() throw() {
}
private:
bool _fatal;
QString _msg;
QByteArray _msg;
};
class MTPint;

View File

@ -793,11 +793,11 @@
</CustomBuild>
<CustomBuild Include="Resources\style_classes.txt">
<Outputs>.\GeneratedFiles\style_classes.h</Outputs>
<Command>"$(SolutionDir)$(Platform)\$(Configuration)Style\MetaStyle.exe" -classes_in ".\Resources\style_classes.txt" -classes_out ".\GeneratedFiles\style_classes.h" -styles_in ".\Resources\style.txt" -styles_out ".\GeneratedFiles\style_auto.h"</Command>
<Command>"$(SolutionDir)$(Platform)\$(Configuration)Style\MetaStyle.exe" -classes_in ".\Resources\style_classes.txt" -classes_out ".\GeneratedFiles\style_classes.h" -styles_in ".\Resources\style.txt" -styles_out ".\GeneratedFiles\style_auto.h" -path_to_sprites ".\SourceFiles\art"</Command>
</CustomBuild>
<CustomBuild Include="Resources\style.txt">
<Outputs>.\GeneratedFiles\style_auto.h</Outputs>
<Command>"$(SolutionDir)$(Platform)\$(Configuration)Style\MetaStyle.exe" -classes_in ".\Resources\style_classes.txt" -classes_out ".\GeneratedFiles\style_classes.h" -styles_in ".\Resources\style.txt" -styles_out ".\GeneratedFiles\style_auto.h"</Command>
<Command>"$(SolutionDir)$(Platform)\$(Configuration)Style\MetaStyle.exe" -classes_in ".\Resources\style_classes.txt" -classes_out ".\GeneratedFiles\style_classes.h" -styles_in ".\Resources\style.txt" -styles_out ".\GeneratedFiles\style_auto.h" -path_to_sprites ".\SourceFiles\art"</Command>
</CustomBuild>
<CustomBuild Include="Resources\lang.txt">
<Outputs>.\GeneratedFiles\lang.h</Outputs>