From d10379268bacb97bc33b6d7aa05836afcb57ad01 Mon Sep 17 00:00:00 2001
From: Tiernan Hubble <thubble@thubble.ca>
Date: Mon, 10 Apr 2023 09:23:43 -0600
Subject: [PATCH] Remove a couple of extra lines and unnecessary changes, and
 make TODOs searchable.

---
 src/lib/adblock/adblockrule.cpp                    | 2 +-
 src/lib/plugins/qml/api/userscript/qmluserscript.h | 2 +-
 src/main/CMakeLists.txt                            | 3 +--
 src/plugins/CMakeLists.txt                         | 4 ++--
 src/plugins/StatusBarIcons/sbi_networkicon.cpp     | 2 ++
 src/plugins/StatusBarIcons/sbi_networkicon.h       | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/lib/adblock/adblockrule.cpp b/src/lib/adblock/adblockrule.cpp
index 2eaddb864..e36cedea7 100644
--- a/src/lib/adblock/adblockrule.cpp
+++ b/src/lib/adblock/adblockrule.cpp
@@ -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
 }
diff --git a/src/lib/plugins/qml/api/userscript/qmluserscript.h b/src/lib/plugins/qml/api/userscript/qmluserscript.h
index bd1a5c668..378440b16 100644
--- a/src/lib/plugins/qml/api/userscript/qmluserscript.h
+++ b/src/lib/plugins/qml/api/userscript/qmluserscript.h
@@ -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
     }
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 2ec3f7006..b5ad441f9 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -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})
 
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 48702bfd0..c85c3c1ed 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -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)
diff --git a/src/plugins/StatusBarIcons/sbi_networkicon.cpp b/src/plugins/StatusBarIcons/sbi_networkicon.cpp
index f8fbd0ce7..7d9156154 100644
--- a/src/plugins/StatusBarIcons/sbi_networkicon.cpp
+++ b/src/plugins/StatusBarIcons/sbi_networkicon.cpp
@@ -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
 
diff --git a/src/plugins/StatusBarIcons/sbi_networkicon.h b/src/plugins/StatusBarIcons/sbi_networkicon.h
index c59b1a2d9..5567a6d42 100644
--- a/src/plugins/StatusBarIcons/sbi_networkicon.h
+++ b/src/plugins/StatusBarIcons/sbi_networkicon.h
@@ -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
 };