procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed some warnings, added debug logs before thread wait calls

This commit is contained in:
John Preston 2016-03-01 05:36:23 +03:00
parent 616354b8e9
commit 32322c4450
9 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Telegram/SourceFiles/dialogswidget.h
View File

@ -219,15 +219,15 @@ public:
void searchReceived(DialogsSearchRequestType type, const MTPmessages_Messages &result, mtpRequestId req); void searchReceived(DialogsSearchRequestType type, const MTPmessages_Messages &result, mtpRequestId req);
void peopleReceived(const MTPcontacts_Found &result, mtpRequestId req); void peopleReceived(const MTPcontacts_Found &result, mtpRequestId req);
void dragEnterEvent(QDragEnterEvent *e); void dragEnterEvent(QDragEnterEvent *e) override;
void dragMoveEvent(QDragMoveEvent *e); void dragMoveEvent(QDragMoveEvent *e) override;
void dragLeaveEvent(QDragLeaveEvent *e); void dragLeaveEvent(QDragLeaveEvent *e) override;
void dropEvent(QDropEvent *e); void dropEvent(QDropEvent *e) override;
void updateDragInScroll(bool inScroll); void updateDragInScroll(bool inScroll);
void resizeEvent(QResizeEvent *e); void resizeEvent(QResizeEvent *e) override;
void keyPressEvent(QKeyEvent *e); void keyPressEvent(QKeyEvent *e) override;
void paintEvent(QPaintEvent *e); void paintEvent(QPaintEvent *e) override;
void searchInPeer(PeerData *peer); void searchInPeer(PeerData *peer);

1
Telegram/SourceFiles/gui/animation.cpp
View File

@ -93,6 +93,7 @@ namespace anim {
if (!_clipThreads.isEmpty()) { if (!_clipThreads.isEmpty()) {
for (int32 i = 0, l = _clipThreads.size(); i < l; ++i) { for (int32 i = 0, l = _clipThreads.size(); i < l; ++i) {
_clipThreads.at(i)->quit(); _clipThreads.at(i)->quit();
DEBUG_LOG(("Waiting for clipThread to finish: %1").arg(i));
_clipThreads.at(i)->wait(); _clipThreads.at(i)->wait();
delete _clipManagers.at(i); delete _clipManagers.at(i);
delete _clipThreads.at(i); delete _clipThreads.at(i);

26
Telegram/SourceFiles/historywidget.h
View File

@ -423,18 +423,18 @@ public:
void windowShown(); void windowShown();
bool isActive() const; bool isActive() const;
void resizeEvent(QResizeEvent *e); void resizeEvent(QResizeEvent *e) override;
void keyPressEvent(QKeyEvent *e); void keyPressEvent(QKeyEvent *e) override;
void mousePressEvent(QMouseEvent *e); void mousePressEvent(QMouseEvent *e) override;
void paintEvent(QPaintEvent *e); void paintEvent(QPaintEvent *e) override;
void dragEnterEvent(QDragEnterEvent *e); void dragEnterEvent(QDragEnterEvent *e) override;
void dragLeaveEvent(QDragLeaveEvent *e); void dragLeaveEvent(QDragLeaveEvent *e) override;
void leaveEvent(QEvent *e); void leaveEvent(QEvent *e) override;
void dropEvent(QDropEvent *e); void dropEvent(QDropEvent *e) override;
void mouseReleaseEvent(QMouseEvent *e); void mouseReleaseEvent(QMouseEvent *e) override;
void mouseMoveEvent(QMouseEvent *e); void mouseMoveEvent(QMouseEvent *e) override;
void leaveToChildEvent(QEvent *e); void leaveToChildEvent(QEvent *e) override;
void contextMenuEvent(QContextMenuEvent *e); void contextMenuEvent(QContextMenuEvent *e) override;
void updateTopBarSelection(); void updateTopBarSelection();
@ -542,7 +542,7 @@ public:
void sendBotCommand(const QString &cmd, MsgId replyTo); void sendBotCommand(const QString &cmd, MsgId replyTo);
bool insertBotCommand(const QString &cmd, bool specialGif); bool insertBotCommand(const QString &cmd, bool specialGif);
bool eventFilter(QObject *obj, QEvent *e); bool eventFilter(QObject *obj, QEvent *e) override;
void updateBotKeyboard(History *h = 0); void updateBotKeyboard(History *h = 0);
DragState getDragState(const QMimeData *d); DragState getDragState(const QMimeData *d);

1
Telegram/SourceFiles/localimageloader.cpp
View File

@ -117,6 +117,7 @@ void TaskQueue::stop() {
if (_thread) { if (_thread) {
_thread->requestInterruption(); _thread->requestInterruption();
_thread->quit(); _thread->quit();
DEBUG_LOG(("Waiting for taskThread to finish"));
_thread->wait(); _thread->wait();
delete _worker; delete _worker;
delete _thread; delete _thread;

20
Telegram/SourceFiles/mainwidget.h
View File

@ -39,13 +39,13 @@ public:
TopBarWidget(MainWidget *w); TopBarWidget(MainWidget *w);
void enterEvent(QEvent *e); void enterEvent(QEvent *e) override;
void enterFromChildEvent(QEvent *e); void enterFromChildEvent(QEvent *e) override;
void leaveEvent(QEvent *e); void leaveEvent(QEvent *e) override;
void leaveToChildEvent(QEvent *e); void leaveToChildEvent(QEvent *e) override;
void paintEvent(QPaintEvent *e); void paintEvent(QPaintEvent *e) override;
void mousePressEvent(QMouseEvent *e); void mousePressEvent(QMouseEvent *e) override;
void resizeEvent(QResizeEvent *e); void resizeEvent(QResizeEvent *e) override;
void step_appearance(float64 ms, bool timer); void step_appearance(float64 ms, bool timer);
void enableShadow(bool enable = true); void enableShadow(bool enable = true);
@ -201,9 +201,9 @@ public:
MainWidget(Window *window); MainWidget(Window *window);
void paintEvent(QPaintEvent *e); void paintEvent(QPaintEvent *e) override;
void resizeEvent(QResizeEvent *e); void resizeEvent(QResizeEvent *e) override;
void keyPressEvent(QKeyEvent *e); void keyPressEvent(QKeyEvent *e) override;
void updateAdaptiveLayout(); void updateAdaptiveLayout();
bool needBackButton(); bool needBackButton();

1
Telegram/SourceFiles/mtproto/mtpConnection.cpp
View File

@ -323,6 +323,7 @@ void MTProtoConnection::kill() {
void MTProtoConnection::waitTillFinish() { void MTProtoConnection::waitTillFinish() {
t_assert(data == nullptr && thread != nullptr); t_assert(data == nullptr && thread != nullptr);
DEBUG_LOG(("Waiting for connectionThread to finish"));
thread->wait(); thread->wait();
delete thread; delete thread;
thread = nullptr; thread = nullptr;

1
Telegram/SourceFiles/mtproto/mtpFileLoader.cpp
View File

@ -741,6 +741,7 @@ void reinitWebLoadManager() {
void stopWebLoadManager() { void stopWebLoadManager() {
if (webLoadManager()) { if (webLoadManager()) {
_webLoadThread->quit(); _webLoadThread->quit();
DEBUG_LOG(("Waiting for webloadThread to finish"));
_webLoadThread->wait(); _webLoadThread->wait();
delete _webLoadManager; delete _webLoadManager;
delete _webLoadMainManager; delete _webLoadMainManager;

6
Telegram/SourceFiles/overviewwidget.h
View File

@ -245,9 +245,9 @@ public:
void clear(); void clear();
void resizeEvent(QResizeEvent *e); void resizeEvent(QResizeEvent *e) override;
void paintEvent(QPaintEvent *e); void paintEvent(QPaintEvent *e) override;
void contextMenuEvent(QContextMenuEvent *e); void contextMenuEvent(QContextMenuEvent *e) override;
void scrollBy(int32 add); void scrollBy(int32 add);
void scrollReset(); void scrollReset();

12
Telegram/SourceFiles/profilewidget.h
View File

@ -222,12 +222,12 @@ public:
ProfileWidget(QWidget *parent, PeerData *peer); ProfileWidget(QWidget *parent, PeerData *peer);
void resizeEvent(QResizeEvent *e); void resizeEvent(QResizeEvent *e) override;
void mousePressEvent(QMouseEvent *e); void mousePressEvent(QMouseEvent *e) override;
void paintEvent(QPaintEvent *e); void paintEvent(QPaintEvent *e) override;
void dragEnterEvent(QDragEnterEvent *e); void dragEnterEvent(QDragEnterEvent *e) override;
void dropEvent(QDropEvent *e); void dropEvent(QDropEvent *e) override;
void keyPressEvent(QKeyEvent *e); void keyPressEvent(QKeyEvent *e) override;
void paintTopBar(QPainter &p, float64 over, int32 decreaseWidth); void paintTopBar(QPainter &p, float64 over, int32 decreaseWidth);
void topBarClick(); void topBarClick();