Review Request 124212: kwindowsystem: Change source file layout

Martin Gräßlin mgraesslin at kde.org
Wed Jul 1 12:37:12 UTC 2015



> On June 30, 2015, 4:59 p.m., Aleix Pol Gonzalez wrote:
> > In general, I like it.
> > 
> > Maybe now that we're putting the files in separate directories, we can drop the _mac postfixes?
> 
> Martin Gräßlin wrote:
>     I like the idea, but that won't be possible for all cases. E.g. with kkeyserver_foo it's still needed as they also get installed. Also with the private headers it might be tricky (I have another patch on top of that one to change to a plugin architecture and e.g. kwindowsystem_p_x11.h needs to include kwindowsystem_p.h). I'll have a look on it in my on top of this patch for the plugins what can be done.
> 
> Aleix Pol Gonzalez wrote:
>     Right. Still, it would be ideal to rename the files only once, so it's easier to read the file's history.
> 
> Martin Gräßlin wrote:
>     Ah that was a misunderstanding. Of course in the first commit. I just wanted to check in the commit on top of it how much it makes sense.
>     
>     I have it prepared now. At least the .cpp files could be renamed. For the .h files I don't see a solution, if you have ideas please let me know.
> 
> Aleix Pol Gonzalez wrote:
>     Maybe we can always include the plugin files using the platform? such as `#include "mac/fu.h`
> 
> Aleix Pol Gonzalez wrote:
>     Or even just call it `fu_p.h`, there should be just the one per platform and now they'll be namespaced by the directories.

but the problem is that e.g. fu_p.h needs to include the fu_p.h from the root directory. So I fear it doesn't work as we would either recursively includ our the wrong file gets included in other parts.


- Martin


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/124212/#review81902
-----------------------------------------------------------


On July 1, 2015, 8:20 a.m., Martin Gräßlin wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/124212/
> -----------------------------------------------------------
> 
> (Updated July 1, 2015, 8:20 a.m.)
> 
> 
> Review request for KDE Frameworks.
> 
> 
> Repository: kwindowsystem
> 
> 
> Description
> -------
> 
> In the src directory we introduce a platforms directory with a specific
> * osx
> * wayland
> * windows
> * xcb
> 
> sub directory. The platform specific source and header files are moved
> into those directories.
> 
> This is a preparation step to move the platform specific behavior into
> plugins which get loaded at runtime. Such a change is required to
> support more platforms in future for which kwindowsystem cannot provide
> support directly. An example is proper Wayland support on the Plasma
> platform. It needs to provide its own implementationn which has to
> differ from the generic Wayland implementation.
> 
> 
> Diffs
> -----
> 
>   autotests/CMakeLists.txt dda0af259b292ee5e526bb9166811fc1b376f388 
>   src/CMakeLists.txt ff2ce392ecd7969eb94543528c7a670ea0fcd870 
>   src/fixx11h.h  
>   src/kkeyserver_mac.h  
>   src/kkeyserver_mac.cpp  
>   src/kkeyserver_win.h  
>   src/kkeyserver_win.cpp  
>   src/kkeyserver_x11.h  
>   src/kkeyserver_x11.cpp  
>   src/kmanagerselection.h  
>   src/kselectionowner.h  
>   src/kselectionowner.cpp  
>   src/kselectionwatcher.h  
>   src/kselectionwatcher.cpp  
>   src/kwindoweffects_x11.cpp  
>   src/kwindowinfo_mac.cpp  
>   src/kwindowinfo_mac_p.h  
>   src/kwindowinfo_p_x11.h  
>   src/kwindowinfo_win.cpp  
>   src/kwindowinfo_x11.cpp  
>   src/kwindowsystem.cpp 789132e1b4883dd54218d29af9710dedfe6218e1 
>   src/kwindowsystem_mac.cpp  
>   src/kwindowsystem_p_wayland.h  
>   src/kwindowsystem_p_x11.h  
>   src/kwindowsystem_wayland.cpp  
>   src/kwindowsystem_win.cpp  
>   src/kwindowsystem_x11.cpp  
>   src/kxerrorhandler.cpp  
>   src/kxerrorhandler_p.h  
>   src/kxmessages.h  
>   src/kxmessages.cpp  
>   src/kxutils.cpp  
>   src/kxutils_p.h  
>   src/netwm.h  
>   src/netwm.cpp  
>   src/netwm_p.h  
>   src/platforms/CMakeLists.txt PRE-CREATION 
>   src/platforms/osx/CMakeLists.txt PRE-CREATION 
>   src/platforms/wayland/CMakeLists.txt PRE-CREATION 
>   src/platforms/windows/CMakeLists.txt PRE-CREATION 
>   src/platforms/xcb/CMakeLists.txt PRE-CREATION 
> 
> Diff: https://git.reviewboard.kde.org/r/124212/diff/
> 
> 
> Testing
> -------
> 
> compiles, installs and autotest pass on platform Linux/xcb
> 
> 
> Thanks,
> 
> Martin Gräßlin
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20150701/20370fde/attachment.html>


More information about the Kde-frameworks-devel mailing list