[k3b] [Bug 366226] Conflicting declaration KSharedConfigPtr
Leslie Zhai via KDE Bugzilla
bugzilla_noreply at kde.org
Fri Jul 29 02:54:19 UTC 2016
https://bugs.kde.org/show_bug.cgi?id=366226
Leslie Zhai <xiangzhai83 at gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Resolution|--- |FIXED
Latest Commit| |http://commits.kde.org/k3b/
| |789fd6b5b7a9286c5a7279a7ca5
| |85f092f8add3e
Status|UNCONFIRMED |RESOLVED
--- Comment #1 from Leslie Zhai <xiangzhai83 at gmail.com> ---
Git commit 789fd6b5b7a9286c5a7279a7ca585f092f8add3e by Leslie Zhai.
Committed on 29/07/2016 at 02:52.
Pushed by lesliezhai into branch 'master'.
Revert "Merge branch 'kf5'"
This reverts commit 81d2d66aac78e6d59ecc907915a68a2b06ac5a54, reversing
changes made to 840121f0c0ecb5c1fc6324653b795fb7cba60deb.
Please carefully test it before git push! kde4lib and KF5 conflicting
declaration for KSharedConfigPtr!
CCMAIL: johannesobermayr at gmx.de
M +276 -205 CMakeLists.txt
M +3 -0 cmake/modules/ConfigureChecks.cmake
M +11 -15 cmake/modules/FindDvdRead.cmake
D +0 -148 cmake/modules/FindFFmpeg.cmake
D +0 -34 cmake/modules/FindFlac.cmake
M +7 -10 cmake/modules/FindIconv.cmake
A +35 -0 cmake/modules/FindKcddb.cmake
D +0 -32 cmake/modules/FindMusicBrainz.cmake
D +0 -76 cmake/modules/FindOggVorbis.cmake
M +12 -14 cmake/modules/FindSamplerate.cmake
D +0 -85 cmake/modules/FindTaglib.cmake
A +145 -0 cmake/modules/MacroLogFeature.cmake
M +1 -1 doc/CMakeLists.txt
M +1 -1 doc/index.docbook
M +1 -0 kioslaves/CMakeLists.txt
M +11 -10 kioslaves/videodvd/CMakeLists.txt
M +30 -36 kioslaves/videodvd/videodvd.cpp
M +9 -7 kioslaves/videodvd/videodvd.h
D +0 -7 kioslaves/videodvd/videodvd_i18n.h
M +245 -215 libk3b/CMakeLists.txt
M +1 -0 libk3b/core/CMakeLists.txt
A +40 -0 libk3b/core/k3b_export.h [License: LGPL (v2+)]
M +13 -11 libk3b/core/k3bcore.cpp
M +5 -4 libk3b/core/k3bcore.h
M +13 -13 libk3b/core/k3bdefaultexternalprograms.cpp
M +16 -20 libk3b/core/k3bexternalbinmanager.cpp
M +4 -5 libk3b/core/k3bexternalbinmanager.h
M +34 -53 libk3b/core/k3bglobals.cpp
M +10 -11 libk3b/core/k3bglobals.h
M +4 -4 libk3b/core/k3bglobalsettings.cpp
M +7 -5 libk3b/core/k3bjob.cpp
M +1 -1 libk3b/core/k3bjobhandler.h
M +1 -1 libk3b/core/k3bkjobbridge.cpp
M +1 -1 libk3b/core/k3bkjobbridge.h
M +4 -2 libk3b/core/k3bprogressinfoevent.h
M +1 -1 libk3b/core/k3bsimplejobhandler.cpp
M +1 -1 libk3b/core/k3bsimplejobhandler.h
M +5 -4 libk3b/core/k3bthread.cpp
M +1 -1 libk3b/core/k3bthread.h
M +10 -9 libk3b/core/k3bthreadjob.cpp
M +6 -5 libk3b/core/k3bthreadjobcommunicationevent.h
M +5 -4 libk3b/core/k3bversion.cpp
M +3 -3 libk3b/core/k3bversion.h
M +4 -4 libk3b/jobs/k3baudiocuefilewritingjob.cpp
M +1 -1 libk3b/jobs/k3baudiofileanalyzerjob.cpp
M +5 -5 libk3b/jobs/k3baudiosessionreadingjob.cpp
M +1 -1 libk3b/jobs/k3baudiosessionreadingjob.h
M +9 -8 libk3b/jobs/k3bbinimagewritingjob.cpp
M +7 -7 libk3b/jobs/k3bblankingjob.cpp
M +29 -27 libk3b/jobs/k3bcdcopyjob.cpp
M +9 -8 libk3b/jobs/k3bcdda2wavreader.cpp
M +1 -1 libk3b/jobs/k3bcdda2wavreader.h
M +6 -5 libk3b/jobs/k3bclonejob.cpp
M +1 -1 libk3b/jobs/k3bclonejob.h
M +21 -18 libk3b/jobs/k3bclonetocreader.cpp
M +13 -12 libk3b/jobs/k3bdatatrackreader.cpp
M +8 -7 libk3b/jobs/k3bdvdbooktypejob.cpp
M +1 -1 libk3b/jobs/k3bdvdbooktypejob.h
M +13 -12 libk3b/jobs/k3bdvdcopyjob.cpp
M +1 -1 libk3b/jobs/k3bdvdcopyjob.h
M +10 -9 libk3b/jobs/k3bdvdformattingjob.cpp
M +2 -1 libk3b/jobs/k3bdvdformattingjob.h
M +14 -12 libk3b/jobs/k3biso9660imagewritingjob.cpp
M +1 -1 libk3b/jobs/k3biso9660imagewritingjob.h
M +7 -6 libk3b/jobs/k3bmetawriter.cpp
M +15 -15 libk3b/jobs/k3breadcdreader.cpp
M +1 -1 libk3b/jobs/k3breadcdreader.h
M +6 -5 libk3b/jobs/k3bverificationjob.cpp
M +6 -6 libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp
M +1 -1 libk3b/jobs/k3bvideodvdtitledetectclippingjob.h
M +10 -9 libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
M +1 -1 libk3b/jobs/k3bvideodvdtitletranscodingjob.h
D +0 -7 libk3b/k3b_i18n.h
M +55 -89 libk3b/plugin/k3baudiodecoder.cpp
M +5 -4 libk3b/plugin/k3baudiodecoder.h
M +7 -7 libk3b/plugin/k3baudioencoder.cpp
M +1 -1 libk3b/plugin/k3baudioencoder.h
M +1 -1 libk3b/plugin/k3bplugin.cpp
M +8 -5 libk3b/plugin/k3bplugin.h
M +9 -7 libk3b/plugin/k3bpluginconfigwidget.cpp
M +7 -4 libk3b/plugin/k3bpluginconfigwidget.h
M +31 -42 libk3b/plugin/k3bpluginmanager.cpp
M +3 -4 libk3b/plugin/k3bpluginmanager.h
M +0 -1 libk3b/plugin/k3bprojectplugin.cpp
M +5 -5 libk3b/plugin/k3bprojectplugin.h
M +4 -4 libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp
M +3 -3 libk3b/projects/audiocd/k3baudiocdtrackreader.cpp
M +5 -5 libk3b/projects/audiocd/k3baudiocdtracksource.cpp
M +1 -1 libk3b/projects/audiocd/k3baudiodatasource.cpp
M +3 -3 libk3b/projects/audiocd/k3baudiodatasource.h
M +67 -65 libk3b/projects/audiocd/k3baudiodoc.cpp
M +9 -9 libk3b/projects/audiocd/k3baudiodoc.h
M +4 -4 libk3b/projects/audiocd/k3baudiodocreader.cpp
M +9 -7 libk3b/projects/audiocd/k3baudioimager.cpp
M +8 -7 libk3b/projects/audiocd/k3baudiojob.cpp
M +2 -2 libk3b/projects/audiocd/k3baudiojob.h
M +4 -3 libk3b/projects/audiocd/k3baudiojobtempdata.cpp
M +1 -1 libk3b/projects/audiocd/k3baudiojobtempdata.h
M +16 -13 libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp
M +8 -8 libk3b/projects/audiocd/k3baudionormalizejob.cpp
M +2 -2 libk3b/projects/audiocd/k3baudionormalizejob.h
M +21 -20 libk3b/projects/audiocd/k3baudiotrack.cpp
M +5 -5 libk3b/projects/audiocd/k3baudiotrack.h
M +4 -4 libk3b/projects/audiocd/k3baudiotrackreader.cpp
M +2 -1 libk3b/projects/audiocd/k3baudiozerodata.cpp
M +1 -1 libk3b/projects/audiocd/k3brawaudiodatareader.cpp
M +3 -2 libk3b/projects/audiocd/k3brawaudiodatasource.cpp
M +3 -2 libk3b/projects/datacd/k3bbootitem.cpp
M +42 -38 libk3b/projects/datacd/k3bdatadoc.cpp
M +4 -4 libk3b/projects/datacd/k3bdatadoc.h
M +5 -5 libk3b/projects/datacd/k3bdataitem.cpp
M +6 -6 libk3b/projects/datacd/k3bdataitem.h
M +45 -42 libk3b/projects/datacd/k3bdatajob.cpp
M +1 -1 libk3b/projects/datacd/k3bdatajob.h
M +6 -4 libk3b/projects/datacd/k3bdatamultisessionparameterjob.cpp
M +7 -6 libk3b/projects/datacd/k3bdatapreparationjob.cpp
M +5 -6 libk3b/projects/datacd/k3bdiritem.cpp
M +6 -5 libk3b/projects/datacd/k3bdiritem.h
M +8 -7 libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp
M +2 -1 libk3b/projects/datacd/k3bfilecompilationsizehandler.h
M +13 -13 libk3b/projects/datacd/k3bfileitem.cpp
M +5 -4 libk3b/projects/datacd/k3bfileitem.h
M +38 -49 libk3b/projects/datacd/k3bisoimager.cpp
M +6 -6 libk3b/projects/datacd/k3bisoimager.h
M +4 -4 libk3b/projects/datacd/k3bisooptions.cpp
M +2 -2 libk3b/projects/datacd/k3bisooptions.h
M +5 -5 libk3b/projects/datacd/k3bmkisofshandler.cpp
M +1 -1 libk3b/projects/datacd/k3bmkisofshandler.h
M +11 -11 libk3b/projects/datacd/k3bmsinfofetcher.cpp
M +1 -1 libk3b/projects/datacd/k3bsessionimportitem.cpp
M +1 -1 libk3b/projects/datacd/k3bspecialdataitem.h
M +5 -2 libk3b/projects/k3babstractwriter.cpp
M +8 -1 libk3b/projects/k3babstractwriter.h
M +53 -66 libk3b/projects/k3bcdrdaowriter.cpp
M +2 -2 libk3b/projects/k3bcdrdaowriter.h
M +36 -20 libk3b/projects/k3bcdrecordwriter.cpp
M +3 -2 libk3b/projects/k3bcdrecordwriter.h
M +24 -23 libk3b/projects/k3bcuefileparser.cpp
M +12 -10 libk3b/projects/k3bdoc.cpp
M +12 -11 libk3b/projects/k3bdoc.h
M +12 -10 libk3b/projects/k3bgrowisofshandler.cpp
M +1 -1 libk3b/projects/k3bgrowisofshandler.h
M +25 -13 libk3b/projects/k3bgrowisofswriter.cpp
M +4 -2 libk3b/projects/k3bgrowisofswriter.h
M +3 -2 libk3b/projects/k3bimagefilereader.cpp
M +1 -1 libk3b/projects/k3bimagefilereader.h
M +3 -3 libk3b/projects/k3binffilewriter.cpp
M +4 -4 libk3b/projects/k3btocfilewriter.cpp
M +3 -3 libk3b/projects/k3btocfilewriter.h
M +9 -8 libk3b/projects/mixedcd/k3bmixeddoc.cpp
M +2 -2 libk3b/projects/mixedcd/k3bmixeddoc.h
M +16 -15 libk3b/projects/mixedcd/k3bmixedjob.cpp
M +2 -2 libk3b/projects/mixedcd/k3bmixedjob.h
M +26 -25 libk3b/projects/movixcd/k3bmovixdoc.cpp
M +5 -5 libk3b/projects/movixcd/k3bmovixdoc.h
M +19 -18 libk3b/projects/movixcd/k3bmovixdocpreparer.cpp
M +4 -3 libk3b/projects/movixcd/k3bmovixjob.cpp
M +13 -13 libk3b/projects/movixcd/k3bmovixprogram.cpp
M +35 -34 libk3b/projects/videocd/k3bvcddoc.cpp
M +10 -10 libk3b/projects/videocd/k3bvcddoc.h
M +34 -31 libk3b/projects/videocd/k3bvcdjob.cpp
M +1 -1 libk3b/projects/videocd/k3bvcdjob.h
M +20 -15 libk3b/projects/videocd/k3bvcdoptions.cpp
M +4 -2 libk3b/projects/videocd/k3bvcdoptions.h
M +36 -34 libk3b/projects/videocd/k3bvcdtrack.cpp
M +9 -6 libk3b/projects/videocd/k3bvcdtrack.h
M +14 -16 libk3b/projects/videocd/k3bvcdxmlview.cpp
M +2 -2 libk3b/projects/videocd/k3bvcdxmlview.h
M +29 -26 libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp
M +1 -1 libk3b/projects/videocd/mpeginfo/k3bmpeginfo.h
M +1 -1 libk3b/projects/videodvd/k3bvideodvddoc.cpp
M +37 -21 libk3b/projects/videodvd/k3bvideodvdimager.cpp
M +1 -3 libk3b/projects/videodvd/k3bvideodvdimager.h
M +6 -4 libk3b/projects/videodvd/k3bvideodvdjob.cpp
M +3 -0 libk3b/tools/CMakeLists.txt
M +14 -13 libk3b/tools/k3bactivepipe.cpp
M +1 -0 libk3b/tools/k3bactivepipe.h
M +7 -4 libk3b/tools/k3bbusywidget.cpp
M +1 -1 libk3b/tools/k3bbusywidget.h
M +37 -27 libk3b/tools/k3bcddb.cpp
M +19 -5 libk3b/tools/k3bcddb.h
M +36 -35 libk3b/tools/k3bcdparanoialib.cpp
M +2 -2 libk3b/tools/k3bcdparanoialib.h
M +7 -8 libk3b/tools/k3bchecksumpipe.cpp
M +16 -12 libk3b/tools/k3bcutcombobox.cpp
M +3 -3 libk3b/tools/k3bcutcombobox.h
M +5 -3 libk3b/tools/k3bdevicecombobox.cpp
M +1 -1 libk3b/tools/k3bdevicecombobox.h
M +4 -4 libk3b/tools/k3bdevicehandler.cpp
M +9 -12 libk3b/tools/k3bdevicemodel.cpp
M +2 -2 libk3b/tools/k3bdevicemodel.h
M +19 -20 libk3b/tools/k3bdeviceselectiondialog.cpp
M +3 -3 libk3b/tools/k3bdeviceselectiondialog.h
M +11 -9 libk3b/tools/k3bdirsizejob.cpp
M +3 -3 libk3b/tools/k3bdirsizejob.h
M +8 -7 libk3b/tools/k3bfilesplitter.cpp
M +3 -3 libk3b/tools/k3bfilesplitter.h
M +6 -5 libk3b/tools/k3bfilesysteminfo.cpp
M +1 -1 libk3b/tools/k3bfilesysteminfo.h
M +3 -2 libk3b/tools/k3bintmapcombobox.cpp
M +2 -2 libk3b/tools/k3bintmapcombobox.h
M +7 -4 libk3b/tools/k3bintvalidator.cpp
M +1 -1 libk3b/tools/k3bintvalidator.h
M +27 -26 libk3b/tools/k3biso9660.cpp
M +7 -7 libk3b/tools/k3biso9660.h
M +3 -3 libk3b/tools/k3biso9660backend.cpp
M +2 -2 libk3b/tools/k3biso9660backend.h
M +22 -21 libk3b/tools/k3blibdvdcss.cpp
M +19 -19 libk3b/tools/k3bmd5job.cpp
M +4 -4 libk3b/tools/k3bmd5job.h
M +16 -12 libk3b/tools/k3bmediacache.cpp
M +5 -4 libk3b/tools/k3bmediacache.h
M +24 -23 libk3b/tools/k3bmedium.cpp
M +4 -3 libk3b/tools/k3bmedium.h
M +3 -3 libk3b/tools/k3bmedium_p.h
M +7 -7 libk3b/tools/k3bmsfedit.cpp
M +1 -1 libk3b/tools/k3bmsfedit.h
M +15 -14 libk3b/tools/k3bmultichoicedialog.cpp
M +3 -3 libk3b/tools/k3bmultichoicedialog.h
M +12 -10 libk3b/tools/k3bprocess.cpp
M +3 -2 libk3b/tools/k3bprocess.h
A +104 -0 libk3b/tools/k3bprogressdialog.cpp [License: GPL (v2+)]
A +64 -0 libk3b/tools/k3bprogressdialog.h [License: GPL (v2+)]
A +136 -0 libk3b/tools/k3bpushbutton.cpp [License: GPL (v2+)]
A +79 -0 libk3b/tools/k3bpushbutton.h [License: GPL (v2+)]
M +3 -2 libk3b/tools/k3bsignalwaiter.cpp
M +2 -2 libk3b/tools/k3bsignalwaiter.h
M +7 -6 libk3b/tools/k3bstdguiitems.cpp
M +2 -0 libk3b/tools/k3bstdguiitems.h
A +31 -0 libk3b/tools/k3bstringutils.cpp [License: GPL (v2+)]
A +43 -0 libk3b/tools/k3bstringutils.h [License: GPL (v2+)]
M +7 -5 libk3b/tools/k3bthreadwidget.cpp
M +6 -2 libk3b/tools/k3bthreadwidget.h
M +3 -3 libk3b/tools/k3bthroughputestimator.cpp
M +1 -1 libk3b/tools/k3bthroughputestimator.h
M +13 -10 libk3b/tools/k3btitlelabel.cpp
M +3 -3 libk3b/tools/k3btitlelabel.h
M +1 -1 libk3b/tools/k3bvalidators.h
M +7 -7 libk3b/tools/k3bwavefilewriter.cpp
M +3 -4 libk3b/tools/k3bwavefilewriter.h
M +9 -9 libk3b/tools/qprocess/k3bkprocess.cpp
M +4 -2 libk3b/tools/qprocess/k3bkprocess.h
M +4 -4 libk3b/tools/qprocess/k3bqprocess.cpp
M +1 -1 libk3b/tools/qprocess/k3bqprocess.h
M +1 -1 libk3b/tools/qprocess/k3bqprocess_p.h
M +8 -8 libk3b/tools/qprocess/k3bqprocess_unix.cpp
M +7 -7 libk3b/tools/qprocess/k3bqprocess_win.cpp
M +1 -1 libk3b/tools/qprocess/private/qabstractfileengine_p.h
M +1 -1 libk3b/tools/qprocess/private/qfsfileengine_iterator_p.h
M +1 -1 libk3b/tools/qprocess/private/qfsfileengine_iterator_win.cpp
M +1 -1 libk3b/tools/qprocess/private/qfsfileengine_p.h
M +3 -3 libk3b/tools/qprocess/private/qfsfileengine_win.cpp
M +1 -1 libk3b/tools/qprocess/private/qmutexpool_p.h
M +2 -2 libk3b/tools/qprocess/private/qobject_p.h
M +3 -3 libk3b/tools/qprocess/private/qthread_p.h
M +4 -4 libk3b/tools/qprocess/private/qwindowspipewriter_p.h
M +1 -1 libk3b/tools/qprocess/private/qwineventnotifier_p.h
M +2 -2 libk3b/tools/qprocess/qringbuffer_p.h
M +13 -11 libk3b/videodvd/k3bvideodvd.cpp
M +2 -2 libk3b/videodvd/k3bvideodvd.h
M +1 -1 libk3b/videodvd/k3bvideodvdaudiostream.h
M +1 -1 libk3b/videodvd/k3bvideodvdsubpicturestream.h
M +1 -1 libk3b/videodvd/k3bvideodvdtime.h
M +1 -1 libk3b/videodvd/k3bvideodvdtitle.h
M +43 -46 libk3bdevice/CMakeLists.txt
M +24 -23 libk3bdevice/k3bcdtext.cpp
M +3 -3 libk3bdevice/k3bcdtext.h
M +1 -1 libk3bdevice/k3bcrc.cpp
M +109 -108 libk3bdevice/k3bdevice.cpp
M +3 -3 libk3bdevice/k3bdevice.h
A +40 -0 libk3bdevice/k3bdevice_export.h [License: LGPL (v2+)]
D +0 -7 libk3bdevice/k3bdevice_i18n.h
M +31 -31 libk3bdevice/k3bdevice_mmc.cpp
M +8 -7 libk3bdevice/k3bdeviceglobals.cpp
M +1 -1 libk3bdevice/k3bdeviceglobals.h
M +22 -20 libk3bdevice/k3bdevicemanager.cpp
M +5 -4 libk3bdevice/k3bdevicemanager.h
M +7 -6 libk3bdevice/k3bdiskinfo.cpp
M +3 -3 libk3bdevice/k3bdiskinfo_p.h
M +14 -13 libk3bdevice/k3bhalconnection.cpp
M +3 -3 libk3bdevice/k3bhalconnection.h
M +2 -2 libk3bdevice/k3bmsf.cpp
M +3 -2 libk3bdevice/k3bmsf.h
M +2 -2 libk3bdevice/k3bscsicommand.cpp
M +3 -2 libk3bdevice/k3bscsicommand.h
M +9 -9 libk3bdevice/k3bscsicommand_bsd.cpp
M +1 -1 libk3bdevice/k3bscsicommand_linux.cpp
M +1 -1 libk3bdevice/k3bscsicommand_netbsd.cpp
M +3 -3 libk3bdevice/k3bscsicommand_win.cpp
M +2 -2 libk3bdevice/k3btoc.cpp
M +4 -3 libk3bdevice/k3btoc.h
M +0 -2 plugins/CMakeLists.txt
M +14 -14 plugins/decoder/CMakeLists.txt
M +19 -8 plugins/decoder/ffmpeg/CMakeLists.txt
M +2 -3 plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp
M +3 -1 plugins/decoder/ffmpeg/k3bffmpegdecoder.h
M +10 -9 plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
M +24 -13 plugins/decoder/flac/CMakeLists.txt
M +19 -19 plugins/decoder/flac/k3bflacdecoder.cpp
M +6 -1 plugins/decoder/flac/k3bflacdecoder.h
M +11 -5 plugins/decoder/libsndfile/CMakeLists.txt
M +19 -17 plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp
M +6 -1 plugins/decoder/libsndfile/k3blibsndfiledecoder.h
M +20 -6 plugins/decoder/mp3/CMakeLists.txt
M +12 -12 plugins/decoder/mp3/k3bmad.cpp
M +1 -1 plugins/decoder/mp3/k3bmad.h
M +17 -17 plugins/decoder/mp3/k3bmaddecoder.cpp
M +3 -1 plugins/decoder/mp3/k3bmaddecoder.h
M +13 -6 plugins/decoder/musepack/CMakeLists.txt
M +4 -3 plugins/decoder/musepack/k3bmpcdecoder.cpp
M +3 -1 plugins/decoder/musepack/k3bmpcdecoder.h
M +6 -6 plugins/decoder/musepack/k3bmpcwrapper.cpp
M +1 -1 plugins/decoder/musepack/k3bmpcwrapper.h
M +12 -4 plugins/decoder/ogg/CMakeLists.txt
M +17 -15 plugins/decoder/ogg/k3boggvorbisdecoder.cpp
M +6 -1 plugins/decoder/ogg/k3boggvorbisdecoder.h
M +1 -2 plugins/decoder/skeleton.cpp
M +3 -1 plugins/decoder/skeleton.h
M +11 -4 plugins/decoder/wave/CMakeLists.txt
M +47 -45 plugins/decoder/wave/k3bwavedecoder.cpp
M +9 -3 plugins/decoder/wave/k3bwavedecoder.h
M +8 -8 plugins/encoder/CMakeLists.txt
M +21 -26 plugins/encoder/external/CMakeLists.txt
R +32 -59 plugins/encoder/external/base_k3bexternalencodereditwidget.ui
[from: plugins/encoder/external/base_k3bexternalencodereditdialog.ui - 064%
similarity]
M +21 -21 plugins/encoder/external/k3bexternalencoder.cpp
M +9 -10 plugins/encoder/external/k3bexternalencodercommand.cpp
M +2 -2 plugins/encoder/external/k3bexternalencodercommand.h
M +44 -36 plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
M +7 -7 plugins/encoder/external/k3bexternalencoderconfigwidget.h
M +31 -24 plugins/encoder/lame/CMakeLists.txt
M +15 -89 plugins/encoder/lame/base_k3blameencodersettingswidget.ui
R +17 -49 plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui
[from: plugins/encoder/lame/base_k3bmanualbitratesettingsdialog.ui - 085%
similarity]
M +14 -15 plugins/encoder/lame/k3blameencoder.cpp
M +2 -0 plugins/encoder/lame/k3blameencoder.h
M +28 -24 plugins/encoder/lame/k3blameencoderconfigwidget.cpp
M +1 -1 plugins/encoder/lame/k3blameencoderconfigwidget.h
M +7 -4 plugins/encoder/lame/k3blamemanualsettingsdialog.cpp
M +3 -3 plugins/encoder/lame/k3blamemanualsettingsdialog.h
M +1 -1 plugins/encoder/lame/k3blametyes.h
M +20 -22 plugins/encoder/ogg/CMakeLists.txt
M +14 -3 plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui
M +12 -15 plugins/encoder/ogg/k3boggvorbisencoder.cpp
M +2 -0 plugins/encoder/ogg/k3boggvorbisencoder.h
M +14 -14 plugins/encoder/ogg/k3boggvorbisencoderconfigwidget.cpp
M +5 -7 plugins/encoder/skeleton.cpp
M +2 -0 plugins/encoder/skeleton.h
M +28 -14 plugins/encoder/sox/CMakeLists.txt
M +12 -15 plugins/encoder/sox/k3bsoxencoder.cpp
M +2 -0 plugins/encoder/sox/k3bsoxencoder.h
M +2 -5 plugins/encoder/sox/k3bsoxencoderconfigwidget.cpp
D +0 -7 plugins/k3bplugin_i18n.h
M +8 -2 plugins/project/CMakeLists.txt
M +14 -8 plugins/project/audiometainforenamer/CMakeLists.txt
M +39 -40
plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp
M +1 -1
plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h
M +23 -9 plugins/project/audioprojectcddb/CMakeLists.txt
M +29 -18 plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp
M +4 -7 plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.h
M +306 -226 src/CMakeLists.txt
M +4 -4 src/helper/CMakeLists.txt
M +9 -11 src/helper/k3bhelper.cpp
M +5 -4 src/helper/k3bhelper.h
M +0 -2 src/helper/k3bhelperprogramitem.cpp
M +1 -28 src/icons/actions/CMakeLists.txt
R +- -- src/icons/actions/hi128-actions-tools-rip-audio-cd.png [from:
src/icons/actions/128-actions-tools-rip-audio-cd.png - 100% similarity]
R +- -- src/icons/actions/hi128-actions-tools-rip-video-cd.png [from:
src/icons/actions/128-actions-tools-rip-video-cd.png - 100% similarity]
R +- -- src/icons/actions/hi128-actions-tools-rip-video-dvd.png [from:
src/icons/actions/128-actions-tools-rip-video-dvd.png - 100% similarity]
R +- -- src/icons/actions/hi16-action-musicbrainz.png [from:
src/icons/actions/16-actions-musicbrainz.png - 100% similarity]
R +- -- src/icons/actions/hi16-actions-tools-rip-audio-cd.png [from:
src/icons/actions/16-actions-tools-rip-audio-cd.png - 100% similarity]
R +- -- src/icons/actions/hi16-actions-tools-rip-video-cd.png [from:
src/icons/actions/16-actions-tools-rip-video-cd.png - 100% similarity]
R +- -- src/icons/actions/hi16-actions-tools-rip-video-dvd.png [from:
src/icons/actions/16-actions-tools-rip-video-dvd.png - 100% similarity]
R +- -- src/icons/actions/hi22-actions-tools-rip-audio-cd.png [from:
src/icons/actions/22-actions-tools-rip-audio-cd.png - 100% similarity]
R +- -- src/icons/actions/hi22-actions-tools-rip-video-cd.png [from:
src/icons/actions/22-actions-tools-rip-video-cd.png - 100% similarity]
R +- -- src/icons/actions/hi22-actions-tools-rip-video-dvd.png [from:
src/icons/actions/22-actions-tools-rip-video-dvd.png - 100% similarity]
R +- -- src/icons/actions/hi32-actions-tools-rip-audio-cd.png [from:
src/icons/actions/32-actions-tools-rip-audio-cd.png - 100% similarity]
R +- -- src/icons/actions/hi32-actions-tools-rip-video-cd.png [from:
src/icons/actions/32-actions-tools-rip-video-cd.png - 100% similarity]
R +- -- src/icons/actions/hi32-actions-tools-rip-video-dvd.png [from:
src/icons/actions/32-actions-tools-rip-video-dvd.png - 100% similarity]
R +- -- src/icons/actions/hi48-actions-tools-rip-audio-cd.png [from:
src/icons/actions/48-actions-tools-rip-audio-cd.png - 100% similarity]
R +- -- src/icons/actions/hi48-actions-tools-rip-video-cd.png [from:
src/icons/actions/48-actions-tools-rip-video-cd.png - 100% similarity]
R +- -- src/icons/actions/hi48-actions-tools-rip-video-dvd.png [from:
src/icons/actions/48-actions-tools-rip-video-dvd.png - 100% similarity]
R +- -- src/icons/actions/hi64-action-musicbrainz.png [from:
src/icons/actions/64-actions-musicbrainz.png - 100% similarity]
R +- -- src/icons/actions/hi64-actions-tools-rip-audio-cd.png [from:
src/icons/actions/64-actions-tools-rip-audio-cd.png - 100% similarity]
R +- -- src/icons/actions/hi64-actions-tools-rip-video-cd.png [from:
src/icons/actions/64-actions-tools-rip-video-cd.png - 100% similarity]
R +- -- src/icons/actions/hi64-actions-tools-rip-video-dvd.png [from:
src/icons/actions/64-actions-tools-rip-video-dvd.png - 100% similarity]
R +- -- src/icons/actions/hisc-actions-tools-rip-audio-cd.svgz [from:
src/icons/actions/sc-actions-tools-rip-audio-cd.svgz - 100% similarity]
R +- -- src/icons/actions/hisc-actions-tools-rip-video-cd.svgz [from:
src/icons/actions/sc-actions-tools-rip-video-cd.svgz - 100% similarity]
R +- -- src/icons/actions/hisc-actions-tools-rip-video-dvd.svgz [from:
src/icons/actions/sc-actions-tools-rip-video-dvd.svgz - 100% similarity]
M +1 -12 src/icons/apps/CMakeLists.txt
R +- -- src/icons/apps/hi128-apps-k3b.png [from:
src/icons/apps/128-apps-k3b.png - 100% similarity]
R +- -- src/icons/apps/hi16-apps-k3b.png [from:
src/icons/apps/16-apps-k3b.png - 100% similarity]
R +- -- src/icons/apps/hi22-apps-k3b.png [from:
src/icons/apps/22-apps-k3b.png - 100% similarity]
R +- -- src/icons/apps/hi32-apps-k3b.png [from:
src/icons/apps/32-apps-k3b.png - 100% similarity]
R +- -- src/icons/apps/hi48-apps-k3b.png [from:
src/icons/apps/48-apps-k3b.png - 100% similarity]
R +- -- src/icons/apps/hi64-apps-k3b.png [from:
src/icons/apps/64-apps-k3b.png - 100% similarity]
R +- -- src/icons/apps/hisc-apps-k3b.svgz [from:
src/icons/apps/sc-apps-k3b.svgz - 100% similarity]
M +1 -43 src/icons/devices/CMakeLists.txt
R +- -- src/icons/devices/hi128-devices-media-optical-audio.png [from:
src/icons/devices/128-devices-media-optical-audio.png - 100% similarity]
R +- -- src/icons/devices/hi128-devices-media-optical-cd-video.png
[from: src/icons/devices/128-devices-media-optical-cd-video.png - 100%
similarity]
R +- -- src/icons/devices/hi128-devices-media-optical-dvd-video.png
[from: src/icons/devices/128-devices-media-optical-dvd-video.png - 100%
similarity]
R +- -- src/icons/devices/hi128-devices-media-optical-mixed-cd.png
[from: src/icons/devices/128-devices-media-optical-mixed-cd.png - 100%
similarity]
R +- -- src/icons/devices/hi128-devices-media-optical-video.png [from:
src/icons/devices/128-devices-media-optical-video.png - 100% similarity]
R +- -- src/icons/devices/hi16-devices-media-optical-audio.png [from:
src/icons/devices/16-devices-media-optical-audio.png - 100% similarity]
R +- -- src/icons/devices/hi16-devices-media-optical-cd-video.png [from:
src/icons/devices/16-devices-media-optical-cd-video.png - 100% similarity]
R +- -- src/icons/devices/hi16-devices-media-optical-data.png [from:
src/icons/devices/16-devices-media-optical-data.png - 100% similarity]
R +- -- src/icons/devices/hi16-devices-media-optical-mixed-cd.png [from:
src/icons/devices/16-devices-media-optical-mixed-cd.png - 100% similarity]
R +- -- src/icons/devices/hi16-devices-media-optical-video.png [from:
src/icons/devices/16-devices-media-optical-video.png - 100% similarity]
R +- -- src/icons/devices/hi22-devices-media-optical-audio.png [from:
src/icons/devices/22-devices-media-optical-audio.png - 100% similarity]
R +- -- src/icons/devices/hi22-devices-media-optical-cd-video.png [from:
src/icons/devices/22-devices-media-optical-cd-video.png - 100% similarity]
R +- -- src/icons/devices/hi22-devices-media-optical-data.png [from:
src/icons/devices/22-devices-media-optical-data.png - 100% similarity]
R +- -- src/icons/devices/hi22-devices-media-optical-mixed-cd.png [from:
src/icons/devices/22-devices-media-optical-mixed-cd.png - 100% similarity]
R +- -- src/icons/devices/hi22-devices-media-optical-video.png [from:
src/icons/devices/22-devices-media-optical-video.png - 100% similarity]
R +- -- src/icons/devices/hi32-devices-media-optical-audio.png [from:
src/icons/devices/32-devices-media-optical-audio.png - 100% similarity]
R +- -- src/icons/devices/hi32-devices-media-optical-cd-video.png [from:
src/icons/devices/32-devices-media-optical-cd-video.png - 100% similarity]
R +- -- src/icons/devices/hi32-devices-media-optical-data.png [from:
src/icons/devices/32-devices-media-optical-data.png - 100% similarity]
R +- -- src/icons/devices/hi32-devices-media-optical-dvd-video.png
[from: src/icons/devices/32-devices-media-optical-dvd-video.png - 100%
similarity]
R +- -- src/icons/devices/hi32-devices-media-optical-mixed-cd.png [from:
src/icons/devices/32-devices-media-optical-mixed-cd.png - 100% similarity]
R +- -- src/icons/devices/hi32-devices-media-optical-video.png [from:
src/icons/devices/32-devices-media-optical-video.png - 100% similarity]
R +- -- src/icons/devices/hi48-devices-media-optical-audio.png [from:
src/icons/devices/48-devices-media-optical-audio.png - 100% similarity]
R +- -- src/icons/devices/hi48-devices-media-optical-cd-video.png [from:
src/icons/devices/48-devices-media-optical-cd-video.png - 100% similarity]
R +- -- src/icons/devices/hi48-devices-media-optical-data.png [from:
src/icons/devices/48-devices-media-optical-data.png - 100% similarity]
R +- -- src/icons/devices/hi48-devices-media-optical-dvd-video.png
[from: src/icons/devices/48-devices-media-optical-dvd-video.png - 100%
similarity]
R +- -- src/icons/devices/hi48-devices-media-optical-mixed-cd.png [from:
src/icons/devices/48-devices-media-optical-mixed-cd.png - 100% similarity]
R +- -- src/icons/devices/hi48-devices-media-optical-video.png [from:
src/icons/devices/48-devices-media-optical-video.png - 100% similarity]
R +- -- src/icons/devices/hi64-devices-media-optical-audio.png [from:
src/icons/devices/64-devices-media-optical-audio.png - 100% similarity]
R +- -- src/icons/devices/hi64-devices-media-optical-cd-video.png [from:
src/icons/devices/64-devices-media-optical-cd-video.png - 100% similarity]
R +- -- src/icons/devices/hi64-devices-media-optical-dvd-video.png
[from: src/icons/devices/64-devices-media-optical-dvd-video.png - 100%
similarity]
R +- -- src/icons/devices/hi64-devices-media-optical-mixed-cd.png [from:
src/icons/devices/64-devices-media-optical-mixed-cd.png - 100% similarity]
R +- -- src/icons/devices/hi64-devices-media-optical-video.png [from:
src/icons/devices/64-devices-media-optical-video.png - 100% similarity]
R +- -- src/icons/devices/hisc-devices-media-optical-audio.svgz [from:
src/icons/devices/sc-devices-media-optical-audio.svgz - 100% similarity]
R +- -- src/icons/devices/hisc-devices-media-optical-cd-video.svgz
[from: src/icons/devices/sc-devices-media-optical-cd-video.svgz - 100%
similarity]
R +- -- src/icons/devices/hisc-devices-media-optical-data.svgz [from:
src/icons/devices/sc-devices-media-optical-data.svgz - 100% similarity]
R +- -- src/icons/devices/hisc-devices-media-optical-dvd-video.svgz
[from: src/icons/devices/sc-devices-media-optical-dvd-video.svgz - 100%
similarity]
R +- -- src/icons/devices/hisc-devices-media-optical-mixed-cd.svgz
[from: src/icons/devices/sc-devices-media-optical-mixed-cd.svgz - 100%
similarity]
R +- -- src/icons/devices/hisc-devices-media-optical-video.svgz [from:
src/icons/devices/sc-devices-media-optical-video.svgz - 100% similarity]
M +1 -10 src/icons/mimetypes/CMakeLists.txt
R +- -- src/icons/mimetypes/hi128-mimetypes-application-x-k3b.png [from:
src/icons/mimetypes/128-mimetypes-application-x-k3b.png - 100% similarity]
R +- -- src/icons/mimetypes/hi32-mimetypes-application-x-k3b.png [from:
src/icons/mimetypes/32-mimetypes-application-x-k3b.png - 100% similarity]
R +- -- src/icons/mimetypes/hi48-mimetypes-application-x-k3b.png [from:
src/icons/mimetypes/48-mimetypes-application-x-k3b.png - 100% similarity]
R +- -- src/icons/mimetypes/hi64-mimetypes-application-x-k3b.png [from:
src/icons/mimetypes/64-mimetypes-application-x-k3b.png - 100% similarity]
R +- -- src/icons/mimetypes/hisc-mimetypes-application-x-k3b.svgz [from:
src/icons/mimetypes/sc-mimetypes-application-x-k3b.svgz - 100% similarity]
R +6 -3 src/k3b.appdata.xml [from: src/org.kde.k3b.appdata.xml - 098%
similarity]
M +115 -125 src/k3b.cpp
R +0 -1 src/k3b.desktop [from: src/org.kde.k3b.desktop - 099%
similarity]
M +7 -7 src/k3b.h
M +4 -4 src/k3baction.cpp
M +5 -7 src/k3baction.h
M +33 -31 src/k3bappdevicemanager.cpp
M +2 -4 src/k3bappdevicemanager.h
M +67 -53 src/k3bapplication.cpp
M +6 -8 src/k3bapplication.h
M +1 -1 src/k3baudioprojectinterface.cpp
M +6 -7 src/k3bburnprogressdialog.cpp
M +3 -3 src/k3bcontentsview.cpp
M +1 -1 src/k3bcontentsview.h
M +6 -4 src/k3bdatamodewidget.cpp
M +2 -2 src/k3bdatamodewidget.h
M +3 -5 src/k3bdataprojectinterface.cpp
M +1 -1 src/k3bdataprojectinterface.h
M +4 -3 src/k3bdebuggingoutputcache.cpp
M +2 -2 src/k3bdebuggingoutputcache.h
M +28 -40 src/k3bdebuggingoutputdialog.cpp
M +5 -5 src/k3bdebuggingoutputdialog.h
M +7 -17 src/k3bdebuggingoutputfile.cpp
M +2 -2 src/k3bdebuggingoutputfile.h
M +6 -6 src/k3bdevicedelegate.cpp
M +1 -1 src/k3bdevicedelegate.h
M +12 -12 src/k3bdevicemenu.cpp
M +2 -2 src/k3bdevicemenu.h
M +21 -19 src/k3bdiroperator.cpp
M +4 -5 src/k3bdiroperator.h
M +24 -21 src/k3bdirview.cpp
M +5 -5 src/k3bdirview.h
M +17 -17 src/k3bdiskinfoview.cpp
M +91 -89 src/k3bemptydiscwaiter.cpp
M +13 -5 src/k3bemptydiscwaiter.h
M +13 -14 src/k3bfiletreeview.cpp
M +5 -5 src/k3bfiletreeview.h
M +28 -29 src/k3bfileview.cpp
M +4 -4 src/k3bfileview.h
M +12 -18 src/k3bflatbutton.cpp
M +7 -7 src/k3bflatbutton.h
M +75 -74 src/k3binteractiondialog.cpp
M +10 -12 src/k3binteractiondialog.h
M +5 -7 src/k3binterface.cpp
M +3 -3 src/k3binterface.h
M +3 -3 src/k3bjobinterface.cpp
M +1 -1 src/k3bjobinterface.h
M +143 -142 src/k3bjobprogressdialog.cpp
M +15 -19 src/k3bjobprogressdialog.h
M +7 -6 src/k3blsofwrapper.cpp
M +2 -2 src/k3blsofwrapper.h
M +17 -25 src/k3blsofwrapperdialog.cpp
M +2 -2 src/k3blsofwrapperdialog.h
M +6 -6 src/k3bmediacontentsview.cpp
M +7 -7 src/k3bmediaselectioncombobox.cpp
M +3 -2 src/k3bmediaselectioncombobox.h
M +17 -20 src/k3bmediaselectiondialog.cpp
M +2 -5 src/k3bmediaselectiondialog.h
M +6 -6 src/k3bmediumdelegate.cpp
M +1 -1 src/k3bmediumdelegate.h
M +21 -40 src/k3bmetaitemmodel.cpp
M +5 -11 src/k3bmetaitemmodel.h
M +1 -1 src/k3bmixedprojectinterface.cpp
M +1 -1 src/k3bmodelutils.cpp
M +3 -2 src/k3bmodelutils.h
M +5 -5 src/k3bmusicbrainz.cpp
M +20 -20 src/k3bplacesmodel.cpp
M +3 -3 src/k3bplacesmodel.h
M +5 -7 src/k3bprojectinterface.cpp
M +4 -4 src/k3bprojectinterface.h
M +51 -63 src/k3bprojectmanager.cpp
M +6 -7 src/k3bprojectmanager.h
M +18 -19 src/k3bprojecttabwidget.cpp
M +3 -3 src/k3bprojecttabwidget.h
M +18 -22 src/k3bsplash.cpp
M +2 -2 src/k3bsplash.h
M +20 -22 src/k3bstatusbarmanager.cpp
M +52 -51 src/k3bsystemproblemdialog.cpp
M +4 -3 src/k3bsystemproblemdialog.h
M +19 -16 src/k3btempdirselectionwidget.cpp
M +5 -4 src/k3btempdirselectionwidget.h
M +8 -13 src/k3bthemedheader.cpp
M +2 -5 src/k3bthemedheader.h
M +9 -10 src/k3bthemedlabel.cpp
M +12 -17 src/k3bthemedlabel.h
M +29 -31 src/k3bthememanager.cpp
M +6 -7 src/k3bthememanager.h
M +5 -5 src/k3btimeoutwidget.cpp
M +1 -1 src/k3btimeoutwidget.h
M +4 -4 src/k3btrm.cpp
M +11 -10 src/k3burlnavigator.cpp
M +3 -4 src/k3burlnavigator.h
M +7 -6 src/k3bviewcolumnadjuster.cpp
M +1 -1 src/k3bviewcolumnadjuster.h
M +28 -37 src/k3bwelcomewidget.cpp
M +11 -12 src/k3bwelcomewidget.h
M +5 -4 src/k3bwidgetshoweffect.cpp
M +4 -4 src/k3bwidgetshoweffect.h
M +28 -27 src/k3bwriterselectionwidget.cpp
M +4 -4 src/k3bwriterselectionwidget.h
M +4 -4 src/k3bwritingmodewidget.cpp
M +1 -1 src/k3bwritingmodewidget.h
M +109 -94 src/main.cpp
M +61 -64 src/misc/k3bimagewritingdialog.cpp
M +2 -2 src/misc/k3bimagewritingdialog.h
M +29 -26 src/misc/k3bmediacopydialog.cpp
M +1 -1 src/misc/k3bmediacopydialog.h
M +11 -11 src/misc/k3bmediaformattingdialog.cpp
A +555 -0 src/option/base_k3bcddboptiontab.ui
M +21 -22 src/option/k3badvancedoptiontab.cpp
M +3 -3 src/option/k3badvancedoptiontab.h
M +11 -11 src/option/k3bcddboptiontab.cpp
M +1 -1 src/option/k3bcddboptiontab.h
M +7 -7 src/option/k3bdeviceoptiontab.cpp
M +1 -1 src/option/k3bdeviceoptiontab.h
M +43 -43 src/option/k3bdevicewidget.cpp
M +1 -1 src/option/k3bdevicewidget.h
M +8 -8 src/option/k3bexternalbinmodel.cpp
M +1 -1 src/option/k3bexternalbinmodel.h
M +6 -5 src/option/k3bexternalbinoptiontab.cpp
M +1 -1 src/option/k3bexternalbinoptiontab.h
M +6 -6 src/option/k3bexternalbinparamsmodel.cpp
M +1 -1 src/option/k3bexternalbinparamsmodel.h
M +10 -12 src/option/k3bexternalbinpermissionmodel.cpp
M +3 -3 src/option/k3bexternalbinpermissionmodel.h
M +51 -50 src/option/k3bexternalbinwidget.cpp
M +3 -3 src/option/k3bexternalbinwidget.h
M +18 -16 src/option/k3bmiscoptiontab.cpp
M +4 -4 src/option/k3bnotifyoptiontab.cpp
M +1 -1 src/option/k3bnotifyoptiontab.h
M +27 -29 src/option/k3boptiondialog.cpp
M +2 -2 src/option/k3boptiondialog.h
M +9 -9 src/option/k3bpluginoptiontab.cpp
M +6 -8 src/option/k3bthememodel.cpp
M +1 -1 src/option/k3bthememodel.h
M +25 -41 src/option/k3bthemeoptiontab.cpp
M +0 -3 src/option/k3bthemeoptiontab.h
M +82 -142 src/projects/base_k3badvanceddataimagesettings.ui
R +93 -130 src/projects/base_k3baudiocdtextallfieldswidget.ui [from:
src/projects/base_k3baudiocdtextallfieldsdialog.ui - 084% similarity]
R +7 -77 src/projects/base_k3bbootimageview.ui [from:
src/projects/base_k3bbootimagedialog.ui - 082% similarity]
R +173 -191 src/projects/base_k3bdatavolumedescwidget.ui [from:
src/projects/base_k3bdatavolumedescdialog.ui - 087% similarity]
M +32 -32 src/projects/k3baudioburndialog.cpp
M +4 -4 src/projects/k3baudioburndialog.h
M +26 -21 src/projects/k3baudiocdtextwidget.cpp
M +7 -6 src/projects/k3baudiodatasourceeditwidget.cpp
M +1 -2 src/projects/k3baudiodatasourceeditwidget.h
M +12 -12 src/projects/k3baudioeditorwidget.cpp
M +3 -4 src/projects/k3baudioeditorwidget.h
M +5 -5 src/projects/k3baudioprojectdelegate.cpp
M +1 -1 src/projects/k3baudioprojectdelegate.h
M +20 -25 src/projects/k3baudioprojectmodel.cpp
M +0 -1 src/projects/k3baudioprojectmodel.h
M +28 -28 src/projects/k3baudiotrackaddingdialog.cpp
M +11 -11 src/projects/k3baudiotrackaddingdialog.h
M +29 -22 src/projects/k3baudiotrackdialog.cpp
M +7 -3 src/projects/k3baudiotrackdialog.h
M +24 -24 src/projects/k3baudiotrackplayer.cpp
M +29 -30 src/projects/k3baudiotracksplitdialog.cpp
M +6 -6 src/projects/k3baudiotracksplitdialog.h
M +25 -25 src/projects/k3baudiotracktrmlookupdialog.cpp
M +5 -9 src/projects/k3baudiotracktrmlookupdialog.h
M +8 -8 src/projects/k3baudiotrackwidget.cpp
M +13 -13 src/projects/k3baudioview.cpp
M +2 -2 src/projects/k3baudioview.h
M +24 -35 src/projects/k3baudioviewimpl.cpp
M +18 -17 src/projects/k3baudioviewimpl.h
M +18 -199 src/projects/k3bbootimagedialog.cpp
M +23 -36 src/projects/k3bbootimagedialog.h
M +2 -2 src/projects/k3bbootimagemodel.cpp
M +1 -1 src/projects/k3bbootimagemodel.h
C +26 -27 src/projects/k3bbootimageview.cpp [from:
src/projects/k3bbootimagedialog.cpp - 084% similarity]
C +4 -4 src/projects/k3bbootimageview.h [from:
src/projects/k3bbootimagedialog.h - 086% similarity]
M +10 -9 src/projects/k3bdataadvancedimagesettingsdialog.cpp
M +3 -1 src/projects/k3bdataadvancedimagesettingsdialog.h
M +29 -25 src/projects/k3bdataburndialog.cpp
M +8 -9 src/projects/k3bdatadirtreeview.cpp
M +3 -3 src/projects/k3bdatadirtreeview.h
M +13 -11 src/projects/k3bdataimagesettingswidget.cpp
M +2 -2 src/projects/k3bdataimagesettingswidget.h
M +4 -4 src/projects/k3bdatamultisessioncombobox.cpp
M +1 -1 src/projects/k3bdatamultisessioncombobox.h
M +43 -32 src/projects/k3bdatamultisessionimportdialog.cpp
M +7 -2 src/projects/k3bdatamultisessionimportdialog.h
M +8 -7 src/projects/k3bdataprojectdelegate.cpp
M +1 -3 src/projects/k3bdataprojectdelegate.h
M +22 -23 src/projects/k3bdataprojectmodel.cpp
M +2 -2 src/projects/k3bdataprojectmodel.h
M +1 -1 src/projects/k3bdataprojectsortproxymodel.h
M +52 -55 src/projects/k3bdatapropertiesdialog.cpp
M +4 -4 src/projects/k3bdatapropertiesdialog.h
M +74 -64 src/projects/k3bdataurladdingdialog.cpp
M +12 -12 src/projects/k3bdataurladdingdialog.h
M +13 -12 src/projects/k3bdataview.cpp
M +1 -1 src/projects/k3bdataview.h
M +40 -44 src/projects/k3bdataviewimpl.cpp
M +17 -15 src/projects/k3bdataviewimpl.h
M +10 -11 src/projects/k3bdatavolumedescdialog.cpp
M +4 -2 src/projects/k3bdatavolumedescdialog.h
M +1 -1 src/projects/k3bdirproxymodel.h
M +2 -2 src/projects/k3bencodingconverter.cpp
M +1 -1 src/projects/k3bencodingconverter.h
M +68 -72 src/projects/k3bfillstatusdisplay.cpp
M +3 -3 src/projects/k3bfillstatusdisplay.h
M +19 -18 src/projects/k3bmixedburndialog.cpp
M +19 -15 src/projects/k3bmixedview.cpp
M +2 -3 src/projects/k3bmixedview.h
M +12 -11 src/projects/k3bmovixburndialog.cpp
M +18 -13 src/projects/k3bmovixoptionswidget.cpp
M +0 -2 src/projects/k3bmovixoptionswidget.h
M +15 -16 src/projects/k3bmovixprojectmodel.cpp
M +15 -15 src/projects/k3bmovixview.cpp
M +5 -5 src/projects/k3bmovixview.h
M +7 -8 src/projects/k3bmusicbrainzjob.cpp
M +2 -2 src/projects/k3bmusicbrainztrackloopupjob.cpp
M +27 -25 src/projects/k3bprojectburndialog.cpp
M +1 -1 src/projects/k3bprojectburndialog.h
M +2 -2 src/projects/k3bprojectplugindialog.cpp
M +28 -28 src/projects/k3bvcdburndialog.cpp
M +14 -19 src/projects/k3bvcdprojectmodel.cpp
M +1 -2 src/projects/k3bvcdprojectmodel.h
M +47 -43 src/projects/k3bvcdtrackdialog.cpp
M +4 -4 src/projects/k3bvcdtrackdialog.h
M +1 -3 src/projects/k3bvcdtrackkeysdelegate.cpp
M +2 -2 src/projects/k3bvcdtrackkeysdelegate.h
M +5 -6 src/projects/k3bvcdtrackkeysmodel.cpp
M +2 -2 src/projects/k3bvcdtrackkeysmodel.h
M +14 -12 src/projects/k3bvcdview.cpp
M +4 -5 src/projects/k3bvcdview.h
M +10 -10 src/projects/k3bvideodvdburndialog.cpp
M +5 -6 src/projects/k3bvideodvdview.cpp
M +19 -16 src/projects/k3bview.cpp
M +7 -7 src/projects/k3bview.h
M +5 -5 src/projects/k3bvolumenamewidget.cpp
M +1 -1 src/projects/k3bvolumenamewidget.h
M +47 -62 src/projects/kostore/KoStore.cpp
M +10 -10 src/projects/kostore/KoStore.h
M +2 -2 src/projects/kostore/KoStoreBase.h
M +27 -31 src/projects/kostore/KoZipStore.cpp
M +6 -5 src/projects/kostore/KoZipStore.h
M +1 -0 src/rip/base_k3baudiorippingoptionwidget.ui
M +1 -1 src/rip/categories.cpp
M +2 -2 src/rip/categories.h
M +70 -82 src/rip/k3baudiocdview.cpp
M +16 -16 src/rip/k3baudioconvertingoptionwidget.cpp
M +2 -4 src/rip/k3baudioconvertingoptionwidget.h
M +22 -21 src/rip/k3baudioprojectconvertingdialog.cpp
M +1 -1 src/rip/k3baudioprojectconvertingdialog.h
M +2 -2 src/rip/k3baudioprojectconvertingjob.cpp
M +2 -2 src/rip/k3baudioripjob.cpp
M +38 -36 src/rip/k3baudiorippingdialog.cpp
M +3 -3 src/rip/k3baudiorippingdialog.h
M +5 -7 src/rip/k3baudiotrackmodel.cpp
M +14 -13 src/rip/k3bcddbpatternwidget.cpp
M +0 -1 src/rip/k3bcddbpatternwidget.h
M +3 -3 src/rip/k3bcuefilewriter.cpp
M +1 -1 src/rip/k3bcuefilewriter.h
M +9 -7 src/rip/k3bmassaudioencodingjob.cpp
M +8 -8 src/rip/k3bpatternparser.cpp
M +1 -1 src/rip/k3bpatternparser.h
M +19 -18 src/rip/k3bvideocdinfo.cpp
M +4 -4 src/rip/k3bvideocdinfo.h
M +30 -27 src/rip/k3bvideocdrip.cpp
M +1 -1 src/rip/k3bvideocdrip.h
M +34 -30 src/rip/k3bvideocdrippingdialog.cpp
M +4 -0 src/rip/k3bvideocdrippingdialog.h
M +2 -2 src/rip/k3bvideocdrippingoptions.h
M +38 -31 src/rip/k3bvideocdview.cpp
M +10 -11 src/rip/videodvd/k3bvideodvdaudiomodel.cpp
M +3 -3 src/rip/videodvd/k3bvideodvdaudiomodel.h
M +24 -25 src/rip/videodvd/k3bvideodvdrippingdialog.cpp
M +3 -3 src/rip/videodvd/k3bvideodvdrippingjob.cpp
M +1 -1 src/rip/videodvd/k3bvideodvdrippingjob.h
M +19 -13 src/rip/videodvd/k3bvideodvdrippingpreview.cpp
M +3 -4 src/rip/videodvd/k3bvideodvdrippingpreview.h
M +28 -28 src/rip/videodvd/k3bvideodvdrippingview.cpp
M +28 -32 src/rip/videodvd/k3bvideodvdrippingwidget.cpp
M +1 -1 src/rip/videodvd/k3bvideodvdrippingwidget.h
M +10 -9 src/rip/videodvd/k3bvideodvdtitledelegate.cpp
M +1 -1 src/rip/videodvd/k3bvideodvdtitledelegate.h
M +13 -14 src/rip/videodvd/k3bvideodvdtitlemodel.cpp
M +1 -1 src/rip/videodvd/k3bvideodvdtitlemodel.h
M +28 -39 tests/CMakeLists.txt
M +4 -1 tests/k3bdataprojectmodeltest.cpp
M +3 -2 tests/k3bglobalstest.cpp
M +19 -17 tests/k3bmetaitemmodeltest.cpp
M +5 -3 tests/k3bmodelutilstest.cpp
M +0 -1 tests/k3btestutils.cpp
http://commits.kde.org/k3b/789fd6b5b7a9286c5a7279a7ca585f092f8add3e
--
You are receiving this mail because:
You are the assignee for the bug.
More information about the k3b
mailing list