Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Big-Ugly Style Update (#278)

Browse Source 
* Bulk replaced tabs with spaces
* Bulk removed trailing whitespace from lines
* Replaced c-style comments with c++-style comments in file banners
* Replace nested namespace definitions with single concise definitions (C++17), this keeps the indentation more manageable
* Cleanup ordering and spacing of include directives
* Bulk renaming of header file extensions from '.h' to '.hpp'.
* Update CODING-STYLE.md
* Update target_compile_features from cxx_std_11 to cxx_std_20.
* Refresh .clang-format file.  Still needs a lot of tweaking.
This commit is contained in:
Jaye Evins
2026-01-07 19:43:34 -05:00
committed by GitHub
parent 3cd173a37f
commit 1c902230fe
454 changed files with 51827 additions and 52031 deletions
Download Patch File Download Diff File Expand all files Collapse all files
translations/CMakeLists.txt
+8 -8
View File
@@ -17,7 +17,7 @@ qt6_create_translation (glabels_C_qm_file
OPTIONS -no-obsolete -locations none
)
qt6_create_translation (templates_C_qm_file
${CMAKE_CURRENT_BINARY_DIR}/template-strings.h
${CMAKE_CURRENT_BINARY_DIR}/template-strings.hpp
templates_C.ts
OPTIONS -no-obsolete -locations none
)
@@ -41,12 +41,12 @@ add_dependencies (glabels-qt update_translations)
#=======================================
# XmlStrings utility
#=======================================
add_executable (XmlStrings WIN32
add_executable (XmlStrings
XmlStrings.cpp
)
target_compile_features (Model
PUBLIC cxx_std_11
target_compile_features (XmlStrings
PUBLIC cxx_std_20
)
target_link_libraries (XmlStrings
@@ -64,15 +64,15 @@ string (REGEX REPLACE "([^;]+)" "${CMAKE_SOURCE_DIR}/templates/\\1"
)
add_custom_command (
OUTPUT template-strings.h
COMMAND XmlStrings ${xml_files} > template-strings.h
OUTPUT template-strings.hpp
COMMAND XmlStrings ${xml_files} > template-strings.hpp
COMMENT "Extracting template strings."
DEPENDS XmlStrings ${xml_files}
)
set_source_files_properties (template-strings.h PROPERTIES GENERATED TRUE)
set_source_files_properties (template-strings.hpp PROPERTIES GENERATED TRUE)
add_custom_target (template-strings DEPENDS template-strings.h)
add_custom_target (template-strings DEPENDS template-strings.hpp)
#=======================================
translations/XmlStrings.cpp
+75 -74
View File
@@ -1,108 +1,109 @@
/* XmlStrings.cpp
*
* Copyright (C) 2013-2016 Jaye Evins <evins@snaught.com>
*
* This file is part of gLabels-qt.
*
* gLabels-qt is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* gLabels-qt is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
*/
// XmlStrings.cpp
//
// Copyright (C) 2013-2016 Jaye Evins <evins@snaught.com>
//
// This file is part of gLabels-qt.
//
// gLabels-qt is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// gLabels-qt is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
//
#include <QCoreApplication>
#include <QStringList>
#include <QFile>
#include <QDebug>
#include <QDomAttr>
#include <QDomDocument>
#include <QDomNode>
#include <QDomAttr>
#include <QFile>
#include <QStringList>
#include <QTextStream>
#include <QDebug>
namespace
{
QStringList stringList;
QStringList stringList;
}
void parseElement( const QDomElement& node )
{
// Examine each attribute for translatable strings
QDomNamedNodeMap attrNodes = node.attributes();
for ( int i = 0; i < attrNodes.count(); i++ )
{
QDomAttr attr = attrNodes.item(i).toAttr();
if ( attr.name().at(0) == '_' )
{
if ( !stringList.contains( attr.value() ) )
{
stringList.append( attr.value() );
}
}
}
// Examine each attribute for translatable strings
QDomNamedNodeMap attrNodes = node.attributes();
for ( int i = 0; i < attrNodes.count(); i++ )
{
QDomAttr attr = attrNodes.item(i).toAttr();
if ( attr.name().at(0) == '_' )
{
if ( !stringList.contains( attr.value() ) )
{
stringList.append( attr.value() );
}
}
}
// Recurse over children
for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
{
parseElement( child.toElement() );
}
// Recurse over children
for ( QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling() )
{
parseElement( child.toElement() );
}
}
void parseFile( const QString& filename )
{
QFile file( filename );
QFile file( filename );
if ( file.open( QFile::ReadOnly|QFile::Text ) )
{
QDomDocument doc;
if ( file.open( QFile::ReadOnly|QFile::Text ) )
{
QDomDocument doc;
if ( doc.setContent( &file, false ) )
{
QDomElement root = doc.documentElement();
if ( doc.setContent( &file, false ) )
{
QDomElement root = doc.documentElement();
parseElement( root );
}
}
parseElement( root );
}
}
}
int main( int argc, char *argv[] )
{
QCoreApplication app( argc, argv );
QCoreApplication app( argc, argv );
QStringList filenameList = app.arguments();
filenameList.removeFirst(); // Remove 0th argument, which is the command name
QStringList filenameList = app.arguments();
filenameList.removeFirst(); // Remove 0th argument, which is the command name
for ( QString filename : filenameList )
{
parseFile( filename );
}
for ( QString filename : filenameList )
{
parseFile( filename );
}
stringList.sort();
stringList.sort();
QTextStream out( stdout );
QTextStream out( stdout );
out << "// Automatically generated with " << app.arguments().at(0) << Qt::endl;
out << "//" << Qt::endl;
out << "// Sources:" << Qt::endl;
for ( QString filename : filenameList )
{
out << "// " << filename << Qt::endl;
}
out << "//" << Qt::endl;
for ( QString string : stringList )
{
out << "QT_TRANSLATE_NOOP( \"XmlStrings\", \"" << string << "\" );" << Qt::endl;
}
out << "// Automatically generated with " << app.arguments().at(0) << Qt::endl;
out << "//" << Qt::endl;
out << "// Sources:" << Qt::endl;
for ( QString filename : filenameList )
{
out << "// " << filename << Qt::endl;
}
out << "//" << Qt::endl;
for ( QString string : stringList )
{
out << "QT_TRANSLATE_NOOP( \"XmlStrings\", \"" << string << "\" );" << Qt::endl;
}
}