[Konsole-devel] Review Request: Adjust header including as preparation for Qt5
Kurt Hindenburg
kurt.hindenburg at gmail.com
Tue Aug 14 02:35:54 UTC 2012
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/105819/#review17351
-----------------------------------------------------------
Ship it!
fine /w me
- Kurt Hindenburg
On Aug. 11, 2012, 1:44 p.m., Jekyll Wu wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/105819/
> -----------------------------------------------------------
>
> (Updated Aug. 11, 2012, 1:44 p.m.)
>
>
> Review request for Konsole.
>
>
> Description
> -------
>
> Now konsole code uses the form of "#include <Module/Class>" quite consistently for Qt headers. However, some Qt classes are moved into different module in Qt5[1], so some including change is needed to make konsole code work with *both* Qt4 and Qt5.
>
> The patch simply use the form of "#include <Class>" for those problematic including.
>
> * pros: it is the easy fix
> * cons: it introduces inconsistency
>
> Another solution is combining #ifdef and the QT_VERSION macro to use different including for Qt4 and Qt5.
>
> * pros: it keeps consistency
> * cons: it means more work and looks ugly
>
> Or just switch to using "#include <Class>" for all Qt headers, but I feel that is overkill.
>
> I'm inclined to the easy solution.
>
> [1] http://qt-project.org/wiki/Transition_from_Qt_4.x_to_Qt5
>
>
> Diffs
> -----
>
> src/ColorSchemeEditor.h e8cc714
> src/CopyInputDialog.cpp 42f8bd4
> src/EditProfileDialog.h 7d6438b
> src/EditProfileDialog.cpp 749173f
> src/Filter.cpp 475085f
> src/HistorySizeWidget.h 279e8a4
> src/HistorySizeWidget.cpp 717a0a1
> src/IncrementalSearchBar.h 8aed739
> src/IncrementalSearchBar.cpp 1ce77a8
> src/KeyBindingEditor.h 3b88ba7
> src/MainWindow.cpp 5f5c370
> src/ManageProfilesDialog.h 150fe3b
> src/ManageProfilesDialog.cpp 12bd3dc
> src/ProfileList.cpp 80ce32d
> src/RenameTabWidget.h 59c3cf9
> src/Session.h 12c40b8
> src/Session.cpp 66474a3
> src/SessionController.cpp 5db3f6b
> src/TabTitleFormatButton.h ba88cdb
> src/TabTitleFormatButton.cpp 5097ac4
> src/TerminalDisplay.h bb19229
> src/TerminalDisplay.cpp 5b04487
> src/TerminalDisplayAccessible.h 3d018f0
> src/ViewContainer.cpp 34b37a9
> src/ViewContainerTabBar.cpp 29805f3
> src/ViewManager.cpp 753204b
> src/ViewSplitter.h 129635f
> src/tests/PartTest.cpp 1e18b33
>
> Diff: http://git.reviewboard.kde.org/r/105819/diff/
>
>
> Testing
> -------
>
>
> Thanks,
>
> Jekyll Wu
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/konsole-devel/attachments/20120814/c7fa1c62/attachment.html>
More information about the konsole-devel
mailing list