Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-19 18:26:34 +01:00
Code Releases Activity

Remove a couple of extra lines and unnecessary changes, and make TODOs searchable.

Browse Source
This commit is contained in:
Tiernan Hubble 2023-04-10 09:23:43 -06:00 committed by Juraj Oravec
parent 632cd4c4ba
commit d10379268b
Signed by: SGOrava
GPG Key ID: 13660A3F1D9F093B
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/adblock/adblockrule.cpp
View File

@ -79,7 +79,7 @@ static QString getTopLevelDomain(const QUrl &url)
}
//return qt_ACE_do(tld, ToAceOnly, AllowLeadingDot, {});
// TODO - QUrl::toAce() uses ForbidLeadingDot, while the old QUrl::topLevelDomain() used AllowLeadingDot. Does this matter?
// TODO QT6 - QUrl::toAce() uses ForbidLeadingDot, while the old QUrl::topLevelDomain() used AllowLeadingDot. Does this matter?
return QString(QUrl::toAce(tld));
#endif
}

2
src/lib/plugins/qml/api/userscript/qmluserscript.h
View File

@ -123,7 +123,7 @@ private:
void setNotNull()
{
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
// TODO: This is a really hacky way of keeping track of whether the script has been initialized - and is it even necessary?
// TODO QT6: This is a really hacky way of keeping track of whether the script has been initialized - and is it even necessary?
m_isNull = false;
#endif
}

3
src/main/CMakeLists.txt
View File

@ -35,8 +35,7 @@ if (UNIX AND NOT APPLE)
if (KF${KF_MAJOR_VERSION}I18n_FOUND)
ki18n_install(${CMAKE_SOURCE_DIR}/po)
endif()
# TODO Qt6 port ?
#ecm_install_po_files_as_qm(${CMAKE_SOURCE_DIR}/poqm)
ecm_install_po_files_as_qm(${CMAKE_SOURCE_DIR}/poqm)
install(PROGRAMS ../../linux/applications/org.kde.falkon.desktop DESTINATION ${KDE_INSTALL_APPDIR})

4
src/plugins/CMakeLists.txt
View File

@ -6,8 +6,8 @@ add_subdirectory(GreaseMonkey)
add_subdirectory(MouseGestures)
add_subdirectory(PIM)
add_subdirectory(StatusBarIcons)
## TODO ## add_subdirectory(TabManager)
## TODO ## add_subdirectory(VerticalTabs)
## TODO QT6 ## add_subdirectory(TabManager)
## TODO QT6 ## add_subdirectory(VerticalTabs)
if (GNOME_KEYRING_FOUND)
add_subdirectory(GnomeKeyringPasswords)

2
src/plugins/StatusBarIcons/sbi_networkicon.cpp
View File

@ -113,6 +113,8 @@ void SBI_NetworkIcon::updateToolTip()
tooltip = tooltip.arg(tr("Offline"));
}
#else
// TODO QT6 - in Qt6 we're always reporting as online, should we just remove this functionality instead?
// Or is there a way to detect network status in Qt6?
tooltip = tooltip.arg(tr("Connected"));
#endif

2
src/plugins/StatusBarIcons/sbi_networkicon.h
View File

@ -47,7 +47,7 @@ private:
#endif
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
// TODO - should we try to replace the online status detection using Qt 6?
// TODO QT6 - should we try to replace the online status detection using Qt 6?
QNetworkConfigurationManager* m_networkConfiguration;
#endif
};