From f9c30e41d26594598abaa8315c4488b6c5ff38ea Mon Sep 17 00:00:00 2001 From: samelian Date: Sun, 23 Jan 2011 20:11:33 +0000 Subject: [kdevelop] compatibility with QT_NO_ASCII_CAST and automoc git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1216512 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdevdesigner/shared/domtool.cpp | 2 +- kdevdesigner/shared/widgetdatabase.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'kdevdesigner/shared') diff --git a/kdevdesigner/shared/domtool.cpp b/kdevdesigner/shared/domtool.cpp index 1696aa52..ef995e44 100644 --- a/kdevdesigner/shared/domtool.cpp +++ b/kdevdesigner/shared/domtool.cpp @@ -184,7 +184,7 @@ TQVariant DomTool::elementToVariant( const TQDomElement& e, const TQVariant& def if ( n.tagName() == "comment" ) comment = n.firstChild().toText().data(); } else if ( e.tagName() == "cstring" ) { - v = TQVariant( TQCString( e.firstChild().toText().data() ) ); + v = TQVariant( TQCString( e.firstChild().toText().data().ascii() ) ); } else if ( e.tagName() == "number" ) { bool ok = TRUE; v = TQVariant( e.firstChild().toText().data().toInt( &ok ) ); diff --git a/kdevdesigner/shared/widgetdatabase.cpp b/kdevdesigner/shared/widgetdatabase.cpp index 10cdc334..6419b9b6 100644 --- a/kdevdesigner/shared/widgetdatabase.cpp +++ b/kdevdesigner/shared/widgetdatabase.cpp @@ -832,8 +832,8 @@ void WidgetDatabase::append( WidgetDatabaseRecord *r ) TQString WidgetDatabase::widgetGroup( const TQString &g ) { - if ( wGroups->find( g ) == -1 ) - wGroups->append( g ); + if ( wGroups->find( g.ascii() ) == -1 ) + wGroups->append( g.ascii() ); return g; } @@ -866,7 +866,7 @@ int WidgetDatabase::numWidgetGroups() bool WidgetDatabase::isGroupVisible( const TQString &g ) { setupDataBase( -1 ); - return invisibleGroups->find( g ) == -1; + return invisibleGroups->find( g.ascii() ) == -1; } int WidgetDatabase::addCustomWidget( WidgetDatabaseRecord *r ) -- cgit v1.2.1