Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove cotire, rewrite #include's and fix all compile errors which appeared after cotire removal #148

Merged
merged 22 commits into from
Jun 4, 2018

Conversation

leha-bot
Copy link
Member

@leha-bot leha-bot commented May 12, 2018

This PR drops cotire and broken PCH, and rearrange headers to avoid cycles which has been hidden by PCH.

Also this PR closes #133

CAUTION: Merge only if:

  • This build compiles on MacOS;
  • This build compiles on Windows;
  • This build compiles on Linux;
  • This build compiles on CI;
  • All style quirks which I accidently may add to codebase are reviewed and fixed;
  • The commits contain only relevant changes (it's not at the PR creation moment!);
~~~Split huge commits by @leha-bot and @crackedmind;~~~
~~~Merge parts with related @berkus commits;~~~
~~~Ensure that the commit history is clear to understand.~~~

UPD: We decide to squash them all (instead of completing subtasks).

@leha-bot leha-bot added category:Enhancement This is a proposed improvement category:Infrastructure Related to build tools, automation category:Refactoring Related to code refactoring pr:WIP DO NOT MERGE This PR is in progress, do not merge yet labels May 12, 2018
@leha-bot leha-bot added this to the Refactoring milestone May 12, 2018
@crackedmind
Copy link
Member

@crackedmind
Copy link
Member

@crackedmind
Copy link
Member

@crackedmind
Copy link
Member

berkus
berkus previously approved these changes May 14, 2018
Copy link
Member

@berkus berkus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is good to go, but i'd rearrange/squash several commits before merging.

Copy link
Member Author

@leha-bot leha-bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: cherry-pick one line related to core include paths from my commit and squash with this commit

@@ -18,13 +18,14 @@ to link the code of portions of this program with the OpenSSL library.
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
*/
#include <QMouseEvent>
#include "single_timer.h"
#include "core/single_timer.h"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This string must be squashed into a8e998a

Travis CI used old cache and did not find the compilation
errors (instead it that errors has been found by us).
Also get rid of some Qt private parts, more fwd decls and so on.
@leha-bot
Copy link
Member Author

leha-bot commented Jun 3, 2018

TODO: move out timer-related utils from utils to timer to avoid include bloating

@crackedmind
Copy link
Member

Build kepka 1.0.129-oqbhvnun completed (commit 08a7294d3a by @)

@leha-bot leha-bot removed the pr:WIP DO NOT MERGE This PR is in progress, do not merge yet label Jun 3, 2018
@leha-bot leha-bot merged commit 6966121 into dev Jun 4, 2018
@leha-bot leha-bot deleted the remove-cotire branch June 4, 2018 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:Enhancement This is a proposed improvement category:Infrastructure Related to build tools, automation category:Refactoring Related to code refactoring
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Get rid of additional include "Telegram\SourceFiles\core" in favour to use nested headers
4 participants