From 4cf3ec8663a0bdba536028172890da6d631b6b8f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 9 Mar 2020 22:01:39 -0500 Subject: [PATCH] [netinstall] Resolve TODO (changes translations) --- src/modules/netinstall/PackageModel.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/modules/netinstall/PackageModel.cpp b/src/modules/netinstall/PackageModel.cpp index 0805a8135..f0bd3a962 100644 --- a/src/modules/netinstall/PackageModel.cpp +++ b/src/modules/netinstall/PackageModel.cpp @@ -21,9 +21,6 @@ #include "utils/Yaml.h" -// TODO: see headerData(), remove after 3.2.19 -#include - PackageModel::PackageModel( const YAML::Node& data, QObject* parent ) : QAbstractItemModel( parent ) { @@ -171,12 +168,7 @@ PackageModel::headerData( int section, Qt::Orientation orientation, int role ) c { if ( orientation == Qt::Horizontal && role == Qt::DisplayRole ) { - // Unusual translation call uses the existing translation from the NetInstallPage - // class (now removed). - // - // TODO: after 3.2.19, change this to just tr() and push TX - return ( section == 0 ) ? QCoreApplication::translate( "NetInstallPage", "Name" ) - : QCoreApplication::translate( "NetInstallPage", "Description" ); + return ( section == 0 ) ? tr( "Name" ) : tr( "Description" ); } return QVariant(); }