Review Request 120627: Remove kdelibs4support.
Kevin Kofler
kevin.kofler at chello.at
Sat Oct 18 05:40:06 BST 2014
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/120627/#review68642
-----------------------------------------------------------
> I wonder about the Qt 5.4 check though. This version of kompare using qt5 shouldn't be released until after we depend on Qt 5.4 imo,
> but I guess distros could use it with Qt 5.3 if they want.
Well, there are only 2 possibilities: Either you require 5.4 right now in CMakeLists.txt, or you use the #ifdefs until 5.4 becomes required. I'm for the latter (i.e. keep the #ifdefs for now), because Qt 5.4 isn't even released yet.
komparepart/kompare_part.cpp
<https://git.reviewboard.kde.org/r/120627/#comment47847>
tempFileName = tempFile.fileName(); missing somewhere between here and line 299 (and then you can use the variable in line 299). tempFileName is used further down in this function.
komparepart/kompare_part.cpp
<https://git.reviewboard.kde.org/r/120627/#comment47845>
So where does this temporary file get deleted? Apparently nowhere.
You have to handle this the same way as the QTemporaryDir, by allocating tempFile with new, setting autoRemove to true rather than false, storing tempFile in m_info, and deleting it in cleanUpTemporaryFiles.
(This is what the KIO::NetAccess::removeTempFile calls you removed from cleanUpTemporaryFiles were for, but those obviously wouldn't work anymore anyway if the files are not downloaded through KIO::NetAccess anymore.)
komparepart/kompare_part.cpp
<https://git.reviewboard.kde.org/r/120627/#comment47846>
Just to track the issue you found yourself:
> One issue with kio::copy_file exists still where it can't rename the QTemporaryFile in my /tmp folder since it's owned by root. I'll look into that in kio itself.
- Kevin Kofler
On Okt. 18, 2014, 3:40 vorm., Jeremy Whiting wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/120627/
> -----------------------------------------------------------
>
> (Updated Okt. 18, 2014, 3:40 vorm.)
>
>
> Review request for kdelibs and Kevin Kofler.
>
>
> Repository: kompare
>
>
> Description
> -------
>
> Change KUrl to QUrl.
> Use QLayout/QFrame instead of KVBox (seems broken though somehow)
> Use QFileDialog instead of KFileDialog.
>
>
> Diffs
> -----
>
> libdialogpages/viewpage.cpp 07bdba5e1edf55a6dcd02e5deef58d30c07660c2
> libdialogpages/viewsettings.h dbf6afe0d0c70e548e32dfc09391d67ef595cdba
> libdialogpages/viewsettings.cpp 5a69d0bd9a49f7a3881940c4ea8ad407be56adc1
> main.cpp 4132c8442f8546ee7d365051dda0e32196249217
> libdialogpages/pagebase.h 0cef46feaa2cc81deff12c2c5f739e6be6df1b49
> libdialogpages/pagebase.cpp ba1574aed7124ede49e1c5908a8fe693cf7bc5d3
> libdialogpages/viewpage.h b5b770d1441650564106e1cc7ef7e587f6ee142d
> libdialogpages/diffpage.h 37490b1ebb245e9648530429da63a9240010dddd
> libdialogpages/diffpage.cpp 7800b486e023cffe41e1fa3e9e60781250ea4199
> libdialogpages/filespage.h 42afafcd0fc8bc0a01e32b79d414742937d791fb
> libdialogpages/filespage.cpp 6a87fe36abd57bdaa09b516de38969db6c6f2298
> libdialogpages/filessettings.h dc3306e34fe1b4eb7cb6a9d2b598f91932bedda0
> libdialogpages/filessettings.cpp 0e19dc00f22a2f6e9588bf2d110dbde682888472
> komparepart/komparesaveoptionswidget.cpp 4c9acba6a7f9c6dda04130946faac37138422875
> komparepart/komparesplitter.cpp 8d496bf279caa7cb9a305c2d15131f591c48818d
> kompareurldialog.h dc50c588e70835ad9292da1baf5222f58f512f67
> kompareurldialog.cpp 7de050bc44770a79f8f7d789cabd95d6707a40f1
> libdialogpages/CMakeLists.txt 769a1154c56e8eb8aa42f1bc6d84e0f9a4154fd0
> libdialogpages/dialogpagesexport.h b2de57f6616739d353d4889ef4965ab07f1191aa
> komparepart/kompare_part.cpp 4d40be0dedcfb91b77ee239de11188b328f8bc13
> komparepart/komparelistview.cpp 35bbab849d8b7938cba518e97a00ed50cae35612
> komparepart/kompareprefdlg.cpp 118485663390e9563a77741b490a9cdf8bf6d464
> kompare_shell.cpp dcc45513f3f9f5f94869046989b6b4f5b1c0995e
> komparenavtreepart/CMakeLists.txt 53e8e670e70629afac9197fc108d844733ec5c07
> komparenavtreepart/komparenavtreepart.cpp 3faceff78fbbd2f083cd0a7837c74f50fe543474
> komparepart/CMakeLists.txt 09b61e6ca0cdce391fc759be49a672a050cc16cd
> komparepart/kompare_part.h 24475f1b0ccf7fbeda56860a9a69955cd0b82808
> CMakeLists.txt 38167c2099d0ea1600bd5a6893982e809902fa3a
> doc/index.docbook 578d12a41d9a6afed441ffd38c39bff16c096ab2
> interfaces/kompareinterface.h 53b19d944b2a4a65c14ea41b8f1c0997581933db
> kompare_shell.h 8549fcdc4d1536c58734f2bc3a78b9ebc42c6c5f
>
> Diff: https://git.reviewboard.kde.org/r/120627/diff/
>
>
> Testing
> -------
>
> It builds and runs. The compare dialog ui looks squished though and doesn't resize like it used to, must be something I did wrong when porting away from KVBox
>
>
> Thanks,
>
> Jeremy Whiting
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20141018/2f531912/attachment.htm>
More information about the kde-core-devel
mailing list