Digikam/CodingSprint2014: Difference between revisions
*>Teemu |
m 395 revisions imported |
||
(23 intermediate revisions by 2 users not shown) | |||
Line 265: | Line 265: | ||
** KF5::I18n (translations). | ** KF5::I18n (translations). | ||
** KF5::Config (KConfigGroup used in widgets). | ** KF5::Config (KConfigGroup used in widgets). | ||
* Needs Marble code from [https://projects.kde.org/projects/kde/kdeedu/marble/repository/show?rev=master master git branch] compiled with cmake option '''-DQT5BUILD=ON'''. | |||
* Needs Marble code from [https://projects.kde.org/projects/kde/kdeedu/marble/repository/show?rev= | |||
* <span style="background:salmon">TODO</span> We need to detect the Marble version somehow, to avoid linking KF5 build against Qt4 version of Marble. We still use FindMarble cmake script from KDE4. Marble need to be ported as pure KF5 frameworks component. | * <span style="background:salmon">TODO</span> We need to detect the Marble version somehow, to avoid linking KF5 build against Qt4 version of Marble. We still use FindMarble cmake script from KDE4. Marble need to be ported as pure KF5 frameworks component. | ||
* <span style="background: | * <span style="background:lightgreen">DONE</span> KHTML based class HTMLWidget must be ported to Qt5::Webkit. | ||
|- | |- | ||
| '''libkgeomap/tests''' | | '''libkgeomap/tests''' | ||
Line 455: | Line 454: | ||
| '''digiKam/libs''' | | '''digiKam/libs''' | ||
| done | | done | ||
| | | done | ||
| | | done | ||
| yes | | yes | ||
| | | no | ||
| Gilles, Laurent, Teemu, Alin | | Gilles, Laurent, Teemu, Alin, Veaceslav | ||
| | | | ||
* <span style="background:salmon">TODO</span> ProxyLineEdit is based on KLineEdit and must be ported to QLineEdit, but it use KLineEdit::clearButtonUsedSize() which do not exist with QLineEdit. | * <span style="background:salmon">TODO</span> ProxyLineEdit is based on KLineEdit and must be ported to QLineEdit, but it use KLineEdit::clearButtonUsedSize() which do not exist with QLineEdit. | ||
* <span style="background: | * <span style="background:orange">UNCOMPLETE</span> SearchTextBar is based on KLineEdit and must be ported to QLineEdit, but it use completion model class ModelCompletion based on KCompletion Which must be ported to QCompleter. | ||
* <span style="background:lightgreen">DONE</span> ICCSettings : Q_WS__X11 have been removed with Qt5. X11 detection is performed by CMake and rules are set as definition into digikam_config.h | * <span style="background:lightgreen">DONE</span> ICCSettings : Q_WS__X11 have been removed with Qt5. X11 detection is performed by CMake and rules are set as definition into digikam_config.h | ||
* <span style="background:salmon">TODO</span> Port LoadingCache from KDirWatch to QFileSystemWatcher. | * <span style="background:salmon">TODO</span> Port LoadingCache from KDirWatch to QFileSystemWatcher. | ||
Line 469: | Line 468: | ||
| '''digiKam/app''' | | '''digiKam/app''' | ||
| done | | done | ||
| | | done | ||
| | | done | ||
| yes | | yes | ||
| no | |||
| Gilles, Laurent, Teemu, Alin | | Gilles, Laurent, Teemu, Alin | ||
| | | | ||
* <span style="background: | * <span style="background:orange">UNCOMPLETE</span> AddTagsLineEdit is based on KLineEdit and must be ported to QLineEdit, but it use completion model class ModelCompletion based on KCompletion Which must be ported to QCompleter. | ||
* <span style="background:lightgreen">DONE</span> WelcomePageView ported from KHTMLPart to QWebView. KParts and KHtml dependencies removed from digiKam. | * <span style="background:lightgreen">DONE</span> WelcomePageView ported from KHTMLPart to QWebView. KParts and KHtml dependencies removed from digiKam. | ||
* <span style="background: | * <span style="background:lightgreen">DONE</span> WelcomePageView HTML rendering is completly broken. Check if CSS and HTML code are conform. Note : this is not due to Qt5 port as KHTML done the same result. New layout introduced to host best users photo as background image. [https://www.flickr.com/photos/digikam/16628134940/ See example here for details]. | ||
* <span style="background:lightgreen">DONE</span> MediaPlayerView ported from Phonon to QMediaPlayer. Phonon dependency removed from digiKam. New CMake option add to enable/disable QMediaPlayer support. | * <span style="background:lightgreen">DONE</span> MediaPlayerView ported from Phonon to QMediaPlayer. Phonon dependency removed from digiKam. New CMake option add to enable/disable QMediaPlayer support. | ||
* <span style="background:salmon">TODO</span> Port AlbumWatch from KDirWatch to QFileSystemWatcher | * <span style="background:salmon">TODO</span> Port AlbumWatch from KDirWatch to QFileSystemWatcher | ||
Line 483: | Line 482: | ||
| '''digiKam/utilities''' | | '''digiKam/utilities''' | ||
| done | | done | ||
| | | done | ||
| | | done | ||
| yes | | yes | ||
| | | no | ||
| Gilles, Laurent, Teemu, Alin | | Gilles, Laurent, Teemu, Alin, Mohamed | ||
| | | | ||
* <span style="background:salmon">TODO</span> CameraController use KProcess and KMacroExpander and need to be ported to QProcess. | * <span style="background:salmon">TODO</span> CameraController use KProcess and KMacroExpander and need to be ported to QProcess. | ||
Line 493: | Line 492: | ||
| '''digiKam/imageplugins''' | | '''digiKam/imageplugins''' | ||
| done | | done | ||
| | | done | ||
| | | done | ||
| yes | | yes | ||
| no | |||
| Gilles, Laurent, Teemu | | Gilles, Laurent, Teemu | ||
| | | | ||
Line 503: | Line 502: | ||
| '''digiKam/kioslave''' | | '''digiKam/kioslave''' | ||
| done | | done | ||
| | | done | ||
| | | done | ||
| yes | | yes | ||
| no | |||
| Gilles, Laurent, Teemu | | Gilles, Laurent, Teemu | ||
| | | | ||
Line 513: | Line 512: | ||
| '''digiKam/showfoto''' | | '''digiKam/showfoto''' | ||
| done | | done | ||
| | | done | ||
| | | done | ||
| yes | | yes | ||
| no | |||
| Gilles, Laurent, Teemu | | Gilles, Laurent, Teemu | ||
| | | | ||
Line 522: | Line 521: | ||
| '''digiKam/databaseserver''' | | '''digiKam/databaseserver''' | ||
| done | | done | ||
| | | done | ||
| | | done | ||
| yes | | yes | ||
| no | |||
| Gilles, Laurent, Teemu | | Gilles, Laurent, Teemu | ||
| | | | ||
Line 531: | Line 530: | ||
| '''digiKam/tests''' | | '''digiKam/tests''' | ||
| done | | done | ||
| | | done | ||
| | | done | ||
| yes | |||
| no | | no | ||
| Gilles, Laurent, Teemu | | Gilles, Laurent, Teemu | ||
| | | | ||
* <span style="background:salmon">TODO</span> 2 test tools do not link yet and are disable from compilation rules | |||
|} | |} | ||
Line 1,137: | Line 1,137: | ||
** clean-includes.sh (try to remove not used includes, not safe to 100%) | ** clean-includes.sh (try to remove not used includes, not safe to 100%) | ||
** port_to_autogenerate_export_header.sh (convert to new signal/slot API, not safe to 100%) | ** port_to_autogenerate_export_header.sh (convert to new signal/slot API, not safe to 100%) | ||
Latest revision as of 17:45, 18 March 2016
KDE Framework Port
Branches Creation
All port code must be stored in dedicated "frameworks" git branch for each project. Branch must be created from master.
$>git checkout master
$>git pull --rebase
$>git checkout -b frameworks
$>git push origin frameworks:frameworks
$>git branch -a
* frameworks
master
remotes/origin/HEAD -> origin/master
remotes/origin/frameworks
remotes/origin/master
KF5 Repositories list is given below :
Kipi-plugins Refactoring
A lots of tools are not maintained since a while, other one have been never finalized. See the list of plugins which will be ported or not :
- Tools which can be ported as well :
- panorama
- expoblending
- gpssync
- sendimages
- timeadjust
- metadataedit
- videoslideshow
- advancedslideshow
- flashexport
- kmlexport
- acquireimages
- calendar
- dngconverter
- printimages
- imageviewer
- Tools in pending stage :
- dlnaexport <=== Needs HUpnp lib Qt5 port
- htmlexport <=== Nobody maintain this code since a while, but tool still used.
- photolayoutseditor <=== A complex but powerful tool. Will be complex to port.
- removeredeyes <=== We can share red eyes removal core implementation in libkface in way to share with other KDE applications and replace digiKam Image Editor tool by this code. A new digiKam BQM tool must be created. A GSoC 2015 project can be planned about this topic.
- Web export tools which must be factored (same settings widgets, common dialog, common high level interface to process import/export). Another GSoC 2015 project can be planned about this topic.
- picasawebexport
- rajceexport
- shwup
- debianscreenshots
- dropbox
- googledrive
- imageshackexport
- kioexportimport
- piwigoexport
- smug
- flickrexport
- yandexfotki
- mediawiki <=== need to port libmediawiki from extragear/libs/.
- vkontakte <=== require libkvkontakte from extragear/libs/.
- Tools never finalized (can be moved to attic for the moment) :
- imgurexport <=== require libqtkoauth from SF.net
- photivointegration
- jalbumexport
- wallpaper
- Tools obsolete (can be moved to attic for the moment) :
- batchprocessimages <=== replaced by digiKam BQM
- rawconverter <=== replaced by digiKam BQM
- jpeglossless <=== replaced by new digiKam core tool
- kopete <=== KF5 will use new API
- ipodexport <=== work only with very old Apple devices.
- galleryexport <=== Gallery web service is not maintained since a while. Gallery project is dead.
KF5/Qt5 Port Status
Libkexiv2
Component | Cmake port | pure Qt5 port | pure KF5 port | compile | warnings | Who | Remarks |
---|---|---|---|---|---|---|---|
libkexiv2/src | done | done | done | yes | no | Gilles, Laurent |
|
libkexiv2/tests | done | done | done | yes | no | Gilles, Laurent | Code do not depend of KF5 |
Libkdcraw
Component | Cmake port | pure Qt5 port | pure KF5 port | compile | warnings | Who | Remarks |
---|---|---|---|---|---|---|---|
libkdcraw/src | done | done | done | yes | no | Gilles, Laurent, Veaceslav |
|
libkdcraw/tests | done | done | done | yes | no | Gilles, Laurent, Veaceslav |
|
Libkipi
Component | Cmake port | pure Qt5 port | pure KF5 port | compile | warnings | Who | Remarks |
---|---|---|---|---|---|---|---|
libkipi/src | done | done | done | yes | no | Gilles, Laurent, Mohamed |
|
libkipi/test | done | done | done | yes | no | Gilles, Laurent, Mohamed |
|
Libkface
Component | Cmake port | pure Qt5 port | pure KF5 port | compile | warnings | Who | Remarks |
---|---|---|---|---|---|---|---|
libkface/src | done | done | done | yes | no | Gilles, Laurent, Teemu | Library only depend of KF5::I18n |
libkface/tests | done | done | done | yes | no | Gilles, Laurent, Teemu | Code do not depend of KF5 |
Libkgeomap
Component | Cmake port | pure Qt5 port | pure KF5 port | compile | warnings | Who | Remarks |
---|---|---|---|---|---|---|---|
libkgeomap/src | done | done | done | yes | no | Gilles, Laurent, Teemu, Mohamed |
|
libkgeomap/tests | done | done | done | yes | no | Gilles, Laurent, Teemu | |
libkgeomap/calibrator | done | done | done | yes | no | Gilles, Laurent, Teemu | |
libkgeomap/demo | done | done | done | yes | no | Gilles, Laurent, Teemu |
|
Kipi-plugins
Component | Cmake port | pure Qt5 port | pure KF5 port | compile | warnings | Who | Remarks |
---|---|---|---|---|---|---|---|
Kipi-plugins/common | done | uncomplete | uncomplete | yes | yes | Gilles, Laurent |
|
Kipi-plugins/tests | done | uncomplete | uncomplete | yes | no | Gilles, Laurent | |
Kipi-plugins Documentation | done | not applicable | not applicable | yes | no | Gilles | |
Kipi-plugins/timeadjust | done | uncomplete | uncomplete | yes | no | Gilles, Laurent | |
Kipi-plugins/sendimages | done | uncomplete | uncomplete | yes | no | Gilles, Laurent | |
Kipi-plugins/kmlexport | done | uncomplete | uncomplete | yes | no | Gilles, Laurent | |
Kipi-plugins/printimages | done | uncomplete | uncomplete | yes | no | Gilles, Laurent | Postscript support have been removed from QPrinter. Option is now removed from assistant. |
Kipi-plugins/flashexport | done | uncomplete | uncomplete | yes | no | Gilles, Laurent |
digiKam Software Compilation
Component | Cmake port | pure Qt5 port | pure KF5 port | compile | warnings | Who | Remarks |
---|---|---|---|---|---|---|---|
digiKam Software Compilation | done | not applicable | not applicable | not applicable | not applicable | Gilles |
|
digiKam Documentation | done | not applicable | not applicable | yes | no | Gilles |
digiKam Core
Component | Cmake port | pure Qt5 port | pure KF5 port | compile | warnings | Who | Remarks |
---|---|---|---|---|---|---|---|
digiKam/data | done | not applicable | not applicable | yes | no | Gilles, Laurent | |
digiKam/libs | done | done | done | yes | no | Gilles, Laurent, Teemu, Alin, Veaceslav |
|
digiKam/app | done | done | done | yes | no | Gilles, Laurent, Teemu, Alin |
|
digiKam/utilities | done | done | done | yes | no | Gilles, Laurent, Teemu, Alin, Mohamed |
|
digiKam/imageplugins | done | done | done | yes | no | Gilles, Laurent, Teemu |
|
digiKam/kioslave | done | done | done | yes | no | Gilles, Laurent, Teemu |
|
digiKam/showfoto | done | done | done | yes | no | Gilles, Laurent, Teemu | |
digiKam/databaseserver | done | done | done | yes | no | Gilles, Laurent, Teemu | |
digiKam/tests | done | done | done | yes | no | Gilles, Laurent, Teemu |
|
Recommendations
Porting to KF5 is divided in 4 stages:
1/ Change CMake files. Some Laurent scripts do this stuff. We use now ECM scripts collection from KDE core to manage dependencies and report on the console. Some macros disappear, and are replaced by new ones. For this job, it's recommended to look well all done in CMake files from libkexiv2 and libkdcraw already ported and polished.
2/ Port C++ code using KDE4Support. This include older classes from Qt4 and KDE4 to make transition faster. This will help to have quickly a code compilable, but this will generate a lots of deprecated warnings. First regression tests must be done at this stage to see if nothing is broken.
3/ Port C++ code to pure KF5. The goal of KF5 is to reduce KDELibs fingerprint everywhere, when it's possible. Qt API will be used in priority against KF5 API. But sometime, this will be not possible as well, without big changes. A lot of KDE API have migrated to Qt5 (as for ex : KUrl -> QUrl and kDebug ->qDebug). It's sound like KDELibs will become an incubator for new implementations which will move later to Qt. Also, to have the most of code using pure Qt5 will simplify future transitions more easy to do. Removing KDE4Support dependency will force to use non-deprecated KF5 API.
4/ Port C++ code to pure Qt5. Porting most of KF5 Api to use Qt5 instead is prefered, when it's possible. Another important change in Qt5 is the non-support of char pointer with QString.
In first stage we must use remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII) in CMake script to compile code. These definitions force to not use deprecated QString methods.
Another definition to add while Qt5 porting is add_definitions(-DQT_NO_URL_CAST_FROM_STRING) about cast between QString and QUrl.
In last stage we must use remove_definition(-DQT_DEPRECATED_SINCE(5,0)) in CMake script to compile code. These definitions force to disable deprecated methods in Qt API.
Common changes to port code
Original Code | Ported Code | Remarks |
---|---|---|
...section of code not yet ported... |
#pragma message("PORT QT5")
/*
...section of code not yet ported...
*/
|
Not yet ported code sections must be commented with compiler warnings printed on the console |
KDE4_BUILD_TESTS=ON | BUILD_TESTING=ON | CMake flag to build tests sub-dir. |
CMAKE_BUILD_TYPE=debugfull | CMAKE_BUILD_TYPE=debug | CMake flag to build code with debug symbols. |
kDebug() / kWarning() / kError() | qCDebug(FOO_LOG) / qCWarning(FOO_LOG) / qCCritical(FOO_LOG) |
|
#include "foo.moc"
|
#include "foo.h"
|
|
KUrl::directory()
|
QUrl::adjusted(QUrl::RemoveFilename).path()
|
|
KDiskFreeSpaceInfo
|
QStorageInfo
|
|
KUrl::setFileName(newFileName)
|
QUrl::setPath(QUrl::path() + newFileName)
|
|
KUrl url;
url.adjustPath(KUrl::AddTrailingSlash);
|
QUrl url;
url.setPath(url.path() + '/');
|
|
KDialog::spacingHint()
|
QApplication::style()->pixelMetric(QStyle::PM_DefaultLayoutSpacing)
|
|
KDialog::marginHint()
|
QApplication::style()->pixelMetric(QStyle::PM_DefaultChildMargin)
|
|
KComponentData::mainComponent().componentName()
|
QApplication::applicationName()
|
|
KComponentData::mainComponent().aboutData()->homepage()
|
KAboutData::applicationData().homepage()
|
|
KIconLoader::SmallIcon("icon_name", size)
or KIconLoader::global()->loadIcon("icon_name", size)
|
QIcon::fromTheme("icon_name").pixmap(size)
|
|
KStandardDirs::installPath("data") + QString("filename")
|
QStandardPaths::locate(QStandardPaths::GenericDataLocation,
QString("filename"))
|
File to open in read-only. File already exist. |
KStandardDirs::installPath("xdgdata-apps") + QString("filename")
|
QStandardPaths::locate(QStandardPaths::ApplicationsLocation,
QString("filename"))
|
File to open in read-only. File already exist. |
KStandardDirs::locateLocal("data", QString("filename"))
|
QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)
+ '/' + QString("filename")
|
File to open in read-only. File already exist. |
QString dir = KStandardDirs::locateLocal("data",
QString("dirname"), true)
|
QString dir =
QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)
+ '/' + QString("dirname");
QDir().mkpath(dir);
|
Dir to open in read-write. Create dir if it do not exist. |
KUrlLabel
|
KDcrawIface::RActiveLabel
|
|
KSeparator
|
KDcrawIface::RLineWidget
|
|
KXmlGuiWindow::restoreWindowSize(group);
KDialog::restoreDialogSize(group);
and KXmlGuiWindow::saveWindowSize(group);
KDialog::saveDialogSize(group);
|
KWindowConfig::restoreWindowSize(windowHandle(), group);
and KWindowConfig::saveWindowSize(windowHandle(), group);
|
|
KVBox* const vbox = new KVBox(this);
|
KDcrawIface::RVBox* const vbox = new KDcrawIface::RVBox(this);
|
|
KHBox* const hbox = new KHBox(this);
|
KDcrawIface::RHBox* const hbox = new KDcrawIface::RHBox(this);
|
|
KIO::NetAccess::del(url, QApplication::activeWindow());
KIO::NetAccess::mkdir(url, QApplication::activeWindow());
KIO::NetAccess::dircopy(srcUrl, dstUrl, QApplication::activeWindow())
|
auto deleteJob = KIO::file_delete(url);
KJobWidgets::setWindow(deleteJob, QApplication::activeWindow());
deleteJob->exec();
auto mkdirJob = KIO::mkdir(url);
KJobWidgets::setWindow(mkdirJob, QApplication::activeWindow());
mkdirJob->exec();
auto dircopyJob = KIO::copy(srcUrl, dstUrl);
KJobWidgets::setWindow(dircopyJob, QApplication::activeWindow());
dircopyJob->exec();
|
|
KD::rename(src, dst)
|
QFile::rename(src, dst)
|
|
KToolInvocation::invokeBrowser(url)
|
QDesktopServices::openUrl(url)
|
|
KGlobalSettings::singleClick()
|
qApp->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick)
|
|
KUrl::directory(KUrl::ObeyTrailingSlash)
|
QUrl url = adjusted(QUrl::RemoveFilename);
url.adjusted(QUrl::StripTrailingSlash).path()
|
|
KImageIO::typeForMime(str)
|
QMimeDatabase().mimeTypeForName(str)
|
|
KTemporaryFile temp;
temp.setPrefix(prefixStr);
temp.setSuffix(suffixStr);
|
QTemporaryFile temp;
temp.setFileTemplate(prefixStr + QLatin1String("XXXXXX") + suffixStr);
|
|
K_GLOBAL_STATIC
|
Q_GLOBAL_STATIC
|
|
KMenu::addTitle()
|
QMenu::addSection()
|
|
KStandardDirs::locate("data", "file")
|
QStandardPaths::locate(QStandardPaths::GenericDataLocation, "file")
|
|
KStandardDirs::locateLocal("data", "file")
|
QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)
+ QChar('/') + QString("file")
|
|
KStandardDirs::locateLocal("appdata", "file")
|
QStandardPaths::writableLocation(QStandardPaths::DataLocation)
+ QChar('/') + QString("file")
|
|
KStandardDirs::locateLocal("cache", "file")
|
QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation)
+ QChar('/') + QString("file")
|
|
KStandardDirs::locateLocal("tmp", "file")
|
QDir::tempPath() + QChar('/') + QString("file")
|
|
KStandardDirs::makeDir(path, permission);
|
if (!QDir(path).exists())
{
if (QDir().mkpath(path))
{
QFile f(path);
f.setPermissions(permission);
}
}
|
permission = QFile::ReadUser | QFile::WriteUser | QFile::ExeUser = 0700 |
KUrlRequester
|
KDcrawIface::RFileSelector
|
To select local only file or path, no need KUrlRequester. |
KActionMenu
|
QMenu
|
Use QMenu::menuAction() to get Action instance of menu to plug in action collection. |
KToggleAction
|
QAction
|
Use QAction::setCheckable(true) to switch Action as toggle state. |
QUrl url;
url.addQueryItem(key, value);
|
QUrl url;
QUrlQuery q(url);
q.addQueryItem(key, value);
url.setQuery(q);
|
|
QPixmap pix, alphaMask;
pix.setAlphaChannel(mask);
|
QPixmap pix, alphaMask;
QPainter p(&pix);
p.setOpacity(0.2);
p.drawPixmap(0, 0, alphaMask);
p.end();
|
Link to documentation to port code
Scripts to port code
Laurent Montel has written scripts to port CMake and C++ code to KF5/Qt5 and remove kdelibs4support dependency. There are available in this repository (see kf5 sub-dir).
Scripts must be applied in this order, with a test compilation between each one :
- Full safe scripts :
- convert-to-k4aboutdata.pl (first one to apply, this help to compile)
- adapt_cmakelists_file.pl (to convert CMake scripts, but code must don't be capititalized)
- remove-kde4support.pl
- convert-kicon.pl
- convert-kmenu.pl
- convert-kshortcut.pl
- convert-kcolordialog.pl
- convert-klistwidget.pl
- convert-kmd5.pl
- convert-kmenubar.pl
- convert-ksplashscreen.pl
- convert-kdebug.pl
- Less safe scripts :
- convert-kintnuminput.pl
- convert-kintspinbox.pl
- convert-ktextbrowser.pl
- convert-kfontcombobox.pl
- Scripts which need to check in-deep all changes :
- convert-kvbox.pl
- convert-kdialog.pl
- convert-kcmdlineargs.pl
- convert-kdebug-with-argument.sh (this one change kDebug(1556) en qCDebug with some info after to convert)
- convert-kmimetype.pl
- Last scripts to apply :
- clean-forward-declaration.sh (remove forward declaration, to do when all compile fine)
- clean-includes.sh (try to remove not used includes, not safe to 100%)
- port_to_autogenerate_export_header.sh (convert to new signal/slot API, not safe to 100%)