diff options
| -rw-r--r-- | tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp index 207a78402..1c35c6ea3 100644 --- a/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp +++ b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp @@ -628,7 +628,7 @@ TQString param( const TQString &type ) else if ( type == "Password" ) return "const TQString &"; else { kdError() <<"tdeconfig_compiler does not support type \""<< type <<"\""<<endl; - return TQSTRING_OBJECT_NAME_STRING; //For now, but an assert would be better + return "TQString"; //For now, but an assert would be better } } @@ -637,13 +637,13 @@ TQString param( const TQString &type ) */ TQString cppType( const TQString &type ) { - if ( type == "String" ) return TQSTRING_OBJECT_NAME_STRING; - else if ( type == "StringList" ) return TQSTRINGLIST_OBJECT_NAME_STRING; + if ( type == "String" ) return "TQString"; + else if ( type == "StringList" ) return "TQStringList"; else if ( type == "Font" ) return "TQFont"; else if ( type == "Rect" ) return "TQRect"; else if ( type == "Size" ) return "TQSize"; else if ( type == "Color" ) return "TQColor"; - else if ( type == "Point" ) return TQPOINT_OBJECT_NAME_STRING; + else if ( type == "Point" ) return "TQPoint"; else if ( type == "Int" ) return "int"; else if ( type == "UInt" ) return "uint"; else if ( type == "Bool" ) return "bool"; @@ -653,12 +653,12 @@ TQString cppType( const TQString &type ) else if ( type == "UInt64" ) return "TQ_UINT64"; else if ( type == "IntList" ) return "TQValueList<int>"; else if ( type == "Enum" ) return "int"; - else if ( type == "Path" ) return TQSTRING_OBJECT_NAME_STRING; - else if ( type == "PathList" ) return TQSTRINGLIST_OBJECT_NAME_STRING; - else if ( type == "Password" ) return TQSTRING_OBJECT_NAME_STRING; + else if ( type == "Path" ) return "TQString"; + else if ( type == "PathList" ) return "TQStringList"; + else if ( type == "Password" ) return "TQString"; else { kdError()<<"tdeconfig_compiler does not support type \""<< type <<"\""<<endl; - return TQSTRING_OBJECT_NAME_STRING; //For now, but an assert would be better + return "TQString"; //For now, but an assert would be better } } @@ -685,7 +685,7 @@ TQString defaultValue( const TQString &type ) else if ( type == "Password" ) return "\"\""; // Use empty string, not null string! else { kdWarning()<<"Error, tdeconfig_compiler doesn't support the \""<< type <<"\" type!"<<endl; - return TQSTRING_OBJECT_NAME_STRING; //For now, but an assert would be better + return "TQString"; //For now, but an assert would be better } } |