This change ports the classes KUrl -> QUrl, kDebug -> qDebug, with their corresponding include files. The plugin now builds without KDElibs4Support.
Details
Details
- Reviewers
dfaure - Group Reviewers
Konqueror Plasma - Commits
- R226:0e858c8e39c4: Akregator feed detector plugin: Port away from KDELibs4Support
Built konqueror with these changes. Checked correct detection of feeds on a variety of websites, and the correct resolution of the feed URL passed to Akregator.
Diff Detail
Diff Detail
- Repository
- R226 Konqueror
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
Comment Actions
Just drop qDebug at all. It's better to categorized debug messages but here it's not needed.
Comment Actions
Some of the debugging is useful so I have left it in, but converted it to qCDebug and tidied up the messages.
| plugins/akregator/CMakeLists.txt | ||
|---|---|---|
| 7 | Without affecting the current state of things certainly, but it refers to a popupmenu plugin which, according to the message above, was removed at KF5 porting time with the hope of it being reimplemented later. So, unless it is absolutely impossible to implement post KDE4 and there are no plans to port it, maybe the commented out code should be retained as a reminder. | |
Comment Actions
Found stuff on the way, but the commit itself is fine.
| plugins/akregator/CMakeLists.txt | ||
|---|---|---|
| 15 | Installing a categories file as well (like e.g. kbookmarks/kbookmarks.categories, or many others) would make that logging category available in kdebugsettings. | |
| plugins/akregator/pluginbase.cpp | ||
| 33–34 | (pre-existing) this includes all of QtCore as well... better use more specific includes | |
| 80–81 | (pre-existing) prepend modifies the string, so "s2 = " is redundant | |
| 82–83 | (pre-existing) technically a fragment could remain too, here.... | |
| 94 | (pre-existing) the two .url() calls should be removed. This is especially important in case a password ends up in the URL (we don't want it printed out in the debug output). | |
| plugins/akregator/pluginbase.h | ||
| 46 | (pre-existing) could be static | |
| plugins/akregator/CMakeLists.txt | ||
|---|---|---|
| 15 | Will include in commit. | |
| plugins/akregator/pluginbase.cpp | ||
| 33–34 | Will include in commit. | |
| 80–81 | Will include in commit. | |
| 82–83 | Will include in commit: can use baseurl.adjusted(QUrl::RemovePath|QUrl::RemoveQuery|QUrl::RemoveFragment) | |
| 94 | Will include in commit. | |
| plugins/akregator/pluginbase.h | ||
| 46 | Will implement in a separate commit, along with renaming some classes and source files to more descriptive names and making PluginBase a namespace - it doesn't need to be a class and therefore no need for multiple inheritance. | |