summaryrefslogtreecommitdiffstats
path: root/src/moc
diff options
context:
space:
mode:
Diffstat (limited to 'src/moc')
-rw-r--r--src/moc/moc.y18
-rw-r--r--src/moc/moc_yacc.cpp18
2 files changed, 18 insertions, 18 deletions
diff --git a/src/moc/moc.y b/src/moc/moc.y
index a393aa868..5f9ffa10a 100644
--- a/src/moc/moc.y
+++ b/src/moc/moc.y
@@ -97,7 +97,7 @@ void yyerror( const char *msg );
bool isEnumType( const char* type );
int enumIndex( const char* type );
bool isVariantType( const char* type );
-int qvariant_nameToType( const char* name );
+int tqvariant_nameToType( const char* name );
static void init(); // initialize
static void initClass(); // prepare for new class
static void generateClass(); // generate C++ code for class
@@ -212,7 +212,7 @@ TQCString uTypeExtra( TQCString ctype )
TQCString typeExtra = "0";
if ( !validUType( ctype ) ) {
if ( isVariantType( rawUType(ctype) ) )
- typeExtra.sprintf("\"\\x%02x\"", qvariant_nameToType( rawUType(ctype) ) );
+ typeExtra.sprintf("\"\\x%02x\"", tqvariant_nameToType( rawUType(ctype) ) );
else
typeExtra.sprintf( "\"%s\"", rawUType(ctype).data() );
return typeExtra;
@@ -227,7 +227,7 @@ TQCString uTypeExtra( TQCString ctype )
if ( raw == "char" )
;
else if ( isVariantType( raw ) )
- typeExtra.sprintf("\"\\x%02x\"", qvariant_nameToType( raw ) );
+ typeExtra.sprintf("\"\\x%02x\"", tqvariant_nameToType( raw ) );
else
typeExtra.sprintf( "\"%s\"", raw.stripWhiteSpace().data() );
@@ -249,7 +249,7 @@ TQCString uTypeExtra( TQCString ctype )
/*
Attention!
- This table is copied from qvariant.cpp. If you change
+ This table is copied from tqvariant.cpp. If you change
one, change both.
*/
static const int ntypes = 35;
@@ -292,7 +292,7 @@ static const char* const type_map[ntypes] =
"TQ_ULLONG"
};
-int qvariant_nameToType( const char* name )
+int tqvariant_nameToType( const char* name )
{
for ( int i = 0; i < ntypes; i++ ) {
if ( !qstrcmp( type_map[i], name ) )
@@ -306,7 +306,7 @@ int qvariant_nameToType( const char* name )
*/
bool isVariantType( const char* type )
{
- return qvariant_nameToType( type ) != 0;
+ return tqvariant_nameToType( type ) != 0;
}
/*
@@ -569,7 +569,7 @@ class parser_reg {
bool noInclude; // no #include <filename>
bool generatedCode; // no code generated
bool mocError; // moc parsing error occurred
- bool hasVariantIncluded; //whether or not ntqvariant.h was included yet
+ bool hasVariantIncluded; //whether or not tqvariant.h was included yet
TQCString className; // name of parsed class
TQCString superClassName; // name of first super class
TQStrList multipleSuperClasses; // other superclasses
@@ -2747,7 +2747,7 @@ int generateProps()
if ( !isEnumType( it.current()->type ) )
flags |= UnresolvedEnum;
} else {
- flags |= qvariant_nameToType( it.current()->type ) << 24;
+ flags |= tqvariant_nameToType( it.current()->type ) << 24;
}
if ( it.current()->getfunc )
flags |= Readable;
@@ -2923,7 +2923,7 @@ void generateClass() // generate C++ source code for a class
needToIncludeVariant = ( f->type != "void" && !validUType( f->type ) && isVariantType( f->type) );
if ( needToIncludeVariant ) {
- fprintf( out, "#include <%sntqvariant.h>\n", (const char*)g->qtPath );
+ fprintf( out, "#include <%stqvariant.h>\n", (const char*)g->qtPath );
g->hasVariantIncluded = TRUE;
}
}
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp
index ae23163da..d038c0b7e 100644
--- a/src/moc/moc_yacc.cpp
+++ b/src/moc/moc_yacc.cpp
@@ -110,7 +110,7 @@ void yyerror( const char *msg );
bool isEnumType( const char* type );
int enumIndex( const char* type );
bool isVariantType( const char* type );
-int qvariant_nameToType( const char* name );
+int tqvariant_nameToType( const char* name );
static void init(); // initialize
static void initClass(); // prepare for new class
static void generateClass(); // generate C++ code for class
@@ -225,7 +225,7 @@ TQCString uTypeExtra( TQCString ctype )
TQCString typeExtra = "0";
if ( !validUType( ctype ) ) {
if ( isVariantType( rawUType(ctype) ) )
- typeExtra.sprintf("\"\\x%02x\"", qvariant_nameToType( rawUType(ctype) ) );
+ typeExtra.sprintf("\"\\x%02x\"", tqvariant_nameToType( rawUType(ctype) ) );
else
typeExtra.sprintf( "\"%s\"", rawUType(ctype).data() );
return typeExtra;
@@ -240,7 +240,7 @@ TQCString uTypeExtra( TQCString ctype )
if ( raw == "char" )
;
else if ( isVariantType( raw ) )
- typeExtra.sprintf("\"\\x%02x\"", qvariant_nameToType( raw ) );
+ typeExtra.sprintf("\"\\x%02x\"", tqvariant_nameToType( raw ) );
else
typeExtra.sprintf( "\"%s\"", raw.stripWhiteSpace().data() );
@@ -262,7 +262,7 @@ TQCString uTypeExtra( TQCString ctype )
/*
Attention!
- This table is copied from qvariant.cpp. If you change
+ This table is copied from tqvariant.cpp. If you change
one, change both.
*/
static const int ntypes = 35;
@@ -305,7 +305,7 @@ static const char* const type_map[ntypes] =
"TQ_ULLONG"
};
-int qvariant_nameToType( const char* name )
+int tqvariant_nameToType( const char* name )
{
for ( int i = 0; i < ntypes; i++ ) {
if ( !qstrcmp( type_map[i], name ) )
@@ -319,7 +319,7 @@ int qvariant_nameToType( const char* name )
*/
bool isVariantType( const char* type )
{
- return qvariant_nameToType( type ) != 0;
+ return tqvariant_nameToType( type ) != 0;
}
/*
@@ -582,7 +582,7 @@ class parser_reg {
bool noInclude; // no #include <filename>
bool generatedCode; // no code generated
bool mocError; // moc parsing error occurred
- bool hasVariantIncluded; //whether or not ntqvariant.h was included yet
+ bool hasVariantIncluded; //whether or not tqvariant.h was included yet
TQCString className; // name of parsed class
TQCString superClassName; // name of first super class
TQStrList multipleSuperClasses; // other superclasses
@@ -5622,7 +5622,7 @@ int generateProps()
if ( !isEnumType( it.current()->type ) )
flags |= UnresolvedEnum;
} else {
- flags |= qvariant_nameToType( it.current()->type ) << 24;
+ flags |= tqvariant_nameToType( it.current()->type ) << 24;
}
if ( it.current()->getfunc )
flags |= Readable;
@@ -5798,7 +5798,7 @@ void generateClass() // generate C++ source code for a class
needToIncludeVariant = ( f->type != "void" && !validUType( f->type ) && isVariantType( f->type) );
if ( needToIncludeVariant ) {
- fprintf( out, "#include <%sntqvariant.h>\n", (const char*)g->qtPath );
+ fprintf( out, "#include <%stqvariant.h>\n", (const char*)g->qtPath );
g->hasVariantIncluded = TRUE;
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-31 08:02:37 +0000