kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev

Browse source
This commit is contained in:
John Preston 2016-09-03 10:19:15 -04:00
commit 3d3fc33253
6 changed files with 34 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/SourceFiles/boxes/addcontactbox.cpp
View file

@ -1355,7 +1355,7 @@ RevokePublicLinkBox::RevokePublicLinkBox(base::lambda_unique<void()> &&revokeCal
, _revokeWidth(st::normalFont->width(lang(lng_channels_too_much_public_revoke))) , _revokeWidth(st::normalFont->width(lang(lng_channels_too_much_public_revoke)))
, _aboutRevoke(this, lang(lng_channels_too_much_public_about), FlatLabel::InitType::Simple, st::aboutRevokePublicLabel) , _aboutRevoke(this, lang(lng_channels_too_much_public_about), FlatLabel::InitType::Simple, st::aboutRevokePublicLabel)
, _cancel(this, lang(lng_cancel), st::cancelBoxButton) , _cancel(this, lang(lng_cancel), st::cancelBoxButton)
, _revokeCallback(std::move(revokeCallback)) { , _revokeCallback(std_::move(revokeCallback)) {
setMouseTracking(true); setMouseTracking(true);
MTP::send(MTPchannels_GetAdminedPublicChannels(), rpcDone(&RevokePublicLinkBox::getPublicDone), rpcFail(&RevokePublicLinkBox::getPublicFail)); MTP::send(MTPchannels_GetAdminedPublicChannels(), rpcDone(&RevokePublicLinkBox::getPublicDone), rpcFail(&RevokePublicLinkBox::getPublicFail));

9
Telegram/SourceFiles/core/basic_types.h
View file

@ -339,6 +339,13 @@ inline constexpr typename remove_reference<T>::type &&move(T &&value) noexcept {
return static_cast<typename remove_reference<T>::type&&>(value); return static_cast<typename remove_reference<T>::type&&>(value);
} }
template <typename T>
void swap(T &a, T &b) {
T tmp = move(a);
a = move(b);
b = move(tmp);
}
template <typename T> template <typename T>
struct remove_const { struct remove_const {
using type = T; using type = T;
@ -510,7 +517,7 @@ struct is_base_of {
template <typename T> template <typename T>
T createAndSwap(T &value) { T createAndSwap(T &value) {
T result = T(); T result = T();
std::swap(result, value); std_::swap(result, value);
return std_::move(result); return std_::move(result);
} }

2
Telegram/SourceFiles/core/observer.h
View file

@ -417,7 +417,7 @@ private:
} }
static void destroyNode(Subscription::Node *node) { static void destroyNode(Subscription::Node *node) {
if (auto that = node->observable.lock()) { if (auto that = node->observable.toStrongRef()) {
static_cast<CommonObservableData*>(that.data())->remove(node); static_cast<CommonObservableData*>(that.data())->remove(node);
} }
} }

8
Telegram/SourceFiles/core/vector_of_moveable.h
View file

@ -39,9 +39,9 @@ public:
, _plaindata(createAndSwap(other._plaindata)) { , _plaindata(createAndSwap(other._plaindata)) {
} }
vector_of_moveable &operator=(vector_of_moveable &&other) { vector_of_moveable &operator=(vector_of_moveable &&other) {
std::swap(_size, other._size); std_::swap(_size, other._size);
std::swap(_capacity, other._capacity); std_::swap(_capacity, other._capacity);
std::swap(_plaindata, other._plaindata); std_::swap(_plaindata, other._plaindata);
return *this; return *this;
} }
@ -165,7 +165,7 @@ private:
new (newLocation) T(std_::move(*oldLocation)); new (newLocation) T(std_::move(*oldLocation));
oldLocation->~T(); oldLocation->~T();
} }
std::swap(_plaindata, newPlainData); std_::swap(_plaindata, newPlainData);
_capacity = newCapacity; _capacity = newCapacity;
operator delete[](newPlainData); operator delete[](newPlainData);
} }

28
Telegram/SourceFiles/pspecific_mac_p.h
View file

@ -24,30 +24,30 @@ public:
PsMacWindowPrivate(); PsMacWindowPrivate();
void setWindowBadge(const QString &str); void setWindowBadge(const QString &str);
void startBounce(); void startBounce();
void updateDelegate(); void updateDelegate();
void showNotify(uint64 peer, int32 msgId, const QPixmap &pix, const QString &title, const QString &subtitle, const QString &msg, bool withReply); void showNotify(uint64 peer, int32 msgId, const QPixmap &pix, const QString &title, const QString &subtitle, const QString &msg, bool withReply);
void clearNotifies(uint64 peer = 0); void clearNotifies(uint64 peer = 0);
void enableShadow(WId winId); void enableShadow(WId winId);
bool filterNativeEvent(void *event); bool filterNativeEvent(void *event);
virtual void activeSpaceChanged() { virtual void activeSpaceChanged() {
} }
virtual void darkModeChanged() { virtual void darkModeChanged() {
} }
virtual void notifyClicked(unsigned long long peer, int msgid) { virtual void notifyClicked(unsigned long long peer, int msgid) {
} }
virtual void notifyReplied(unsigned long long peer, int msgid, const char *str) { virtual void notifyReplied(unsigned long long peer, int msgid, const char *str) {
} }
~PsMacWindowPrivate(); ~PsMacWindowPrivate();
PsMacWindowData *data; PsMacWindowData *data;
}; };
@ -89,7 +89,6 @@ QByteArray objc_downloadPathBookmark(const QString &path);
QByteArray objc_pathBookmark(const QString &path); QByteArray objc_pathBookmark(const QString &path);
void objc_downloadPathEnableAccess(const QByteArray &bookmark); void objc_downloadPathEnableAccess(const QByteArray &bookmark);
class objc_FileBookmarkData;
class objc_FileBookmark { class objc_FileBookmark {
public: public:
objc_FileBookmark(const QByteArray &bookmark); objc_FileBookmark(const QByteArray &bookmark);
@ -103,6 +102,9 @@ public:
~objc_FileBookmark(); ~objc_FileBookmark();
private: private:
#ifdef OS_MAC_STORE
class objc_FileBookmarkData;
objc_FileBookmarkData *data = nullptr; objc_FileBookmarkData *data = nullptr;
#endif // OS_MAC_STORE
}; };

2
Telegram/SourceFiles/pspecific_mac_p.mm
View file

@ -1160,7 +1160,7 @@ namespace {
QMutex _bookmarksMutex; QMutex _bookmarksMutex;
} }
class objc_FileBookmarkData { class objc_FileBookmark::objc_FileBookmarkData {
public: public:
~objc_FileBookmarkData() { ~objc_FileBookmarkData() {
if (url) [url release]; if (url) [url release];