CVS commit by staikos: AIX/xlC build fixes. M +1 -1 common/msgfmt.h 1.10 M +6 -2 common/poinfo.cpp 1.11 M +1 -1 common/libgettext/pofiles.h 1.3 M +3 -1 filters/gettext/gettextexport.h 1.5 M +3 -1 filters/linguist/linguistexport.h 1.4 --- kdesdk/kbabel/common/msgfmt.h #1.9:1.10 @@ -31,5 +31,5 @@ namespace KBabel { -class Msgfmt : QObject +class Msgfmt : private QObject { Q_OBJECT --- kdesdk/kbabel/common/poinfo.cpp #1.10:1.11 @@ -362,5 +362,7 @@ ConversionStatus PoInfo::info(const QStr info.untranslated=0; - GettextFlexLexer* lexer = new GettextFlexLexer( stream ); + // AIX needs a dynamic_cast to get the right base class. I think + // a failure is properly handled here so no test for null is needed. + GettextFlexLexer* lexer = new GettextFlexLexer( dynamic_cast(stream) ); lexer->yylex(); @@ -488,5 +490,7 @@ bool PoInfo::findInFile( const QString u KIO::NetAccess::removeTempFile(target); - GettextFlexLexer* lexer = new GettextFlexLexer( stream ); + // AIX needs a dynamic_cast to get the right base class. I think + // a failure is properly handled here so no test for null is needed. + GettextFlexLexer* lexer = new GettextFlexLexer( dynamic_cast(stream) ); lexer->yylex(); --- kdesdk/kbabel/common/libgettext/pofiles.h #1.2:1.3 @@ -10,5 +10,5 @@ public: int lastToken; - GettextFlexLexer(std::istream*stream) : GettextBaseFlexLexer(stream) {} + GettextFlexLexer(istream* stream) : GettextBaseFlexLexer(stream) {} int yylex() --- kdesdk/kbabel/filters/gettext/gettextexport.h #1.4:1.5 @@ -27,5 +27,7 @@ #include -class KBabel::Catalog; +namespace KBabel { +class Catalog; +} class KURL; class QFile; --- kdesdk/kbabel/filters/linguist/linguistexport.h #1.3:1.4 @@ -34,5 +34,7 @@ class QString; class QStringList; -class KBabel::Catalog; +namespace KBabel { +class Catalog; +} class LinguistExportPlugin : public KBabel::CatalogExportPlugin