TDE
/
tdevelop
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdevelop
0
0
Fork 0
Code Issues Releases Wiki Activity

[kdevelop] compatibility with QT_NO_ASCII_CAST and automoc

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1216512 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
samelian 14 years ago
parent 5e2135048c
commit f9c30e41d2
18 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File

2
kdevdesigner/shared/domtool.cpp
Unescape View File

@ -184,7 +184,7 @@ TQVariant DomTool::elementToVariant( const TQDomElement& e, const TQVariant& def
if ( n.tagName() == "comment" ) if ( n.tagName() == "comment" )
comment = n.firstChild().toText().data(); comment = n.firstChild().toText().data();
} else if ( e.tagName() == "cstring" ) { } 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" ) { } else if ( e.tagName() == "number" ) {
bool ok = TRUE; bool ok = TRUE;
v = TQVariant( e.firstChild().toText().data().toInt( &ok ) ); v = TQVariant( e.firstChild().toText().data().toInt( &ok ) );

6
kdevdesigner/shared/widgetdatabase.cpp
Unescape View File

@ -832,8 +832,8 @@ void WidgetDatabase::append( WidgetDatabaseRecord *r )
TQString WidgetDatabase::widgetGroup( const TQString &g ) TQString WidgetDatabase::widgetGroup( const TQString &g )
{ {
if ( wGroups->find( g ) == -1 ) if ( wGroups->find( g.ascii() ) == -1 )
wGroups->append( g ); wGroups->append( g.ascii() );
return g; return g;
} }
@ -866,7 +866,7 @@ int WidgetDatabase::numWidgetGroups()
bool WidgetDatabase::isGroupVisible( const TQString &g ) bool WidgetDatabase::isGroupVisible( const TQString &g )
{ {
setupDataBase( -1 ); setupDataBase( -1 );
return invisibleGroups->find( g ) == -1; return invisibleGroups->find( g.ascii() ) == -1;
} }
int WidgetDatabase::addCustomWidget( WidgetDatabaseRecord *r ) int WidgetDatabase::addCustomWidget( WidgetDatabaseRecord *r )

4
kdevdesigner/uilib/database.cpp
Unescape View File

@ -60,9 +60,9 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t
con = TQSqlDatabase::database( connection ); con = TQSqlDatabase::database( connection );
else else
con = TQSqlDatabase::database(); con = TQSqlDatabase::database();
frm = new TQSqlForm( o, table ); frm = new TQSqlForm( o, table.ascii() );
for ( TQMap<TQString, TQString>::Iterator it = dbControls.begin(); it != dbControls.end(); ++it ) { for ( TQMap<TQString, TQString>::Iterator it = dbControls.begin(); it != dbControls.end(); ++it ) {
TQObject *chld = parent->child( it.key(), "TQWidget" ); TQObject *chld = parent->child( it.key().ascii(), "TQWidget" );
if ( !chld ) if ( !chld )
continue; continue;
frm->insert( (TQWidget*)chld, *it ); frm->insert( (TQWidget*)chld, *it );

42
kdevdesigner/uilib/qwidgetfactory.cpp
Unescape View File

@ -177,9 +177,9 @@ static TQImage loadImageData( const TQString& format, ulong len, TQByteArray dat
dataTmp[3] = ( len & 0x000000ff ); dataTmp[3] = ( len & 0x000000ff );
TQByteArray baunzip = qUncompress( dataTmp ); TQByteArray baunzip = qUncompress( dataTmp );
len = baunzip.size(); len = baunzip.size();
img.loadFromData( (const uchar*)baunzip.data(), len, format.left(format.find('.')) ); img.loadFromData( (const uchar*)baunzip.data(), len, format.left(format.find('.')).ascii() );
} else { } else {
img.loadFromData( (const uchar*)data.data(), data.size(), format ); img.loadFromData( (const uchar*)data.data(), data.size(), format.ascii() );
} }
return img; return img;
} }
@ -364,7 +364,7 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge
for ( TQMap<TQString, TQStringList>::Iterator it = widgetFactory->dbTables.begin(); for ( TQMap<TQString, TQStringList>::Iterator it = widgetFactory->dbTables.begin();
it != widgetFactory->dbTables.end(); ++it ) { it != widgetFactory->dbTables.end(); ++it ) {
TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key(), "TQDataTable" ); TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key().ascii(), "TQDataTable" );
if ( !table ) if ( !table )
continue; continue;
if ( widgetFactory->noDatabaseWidgets.find( table->name() ) != if ( widgetFactory->noDatabaseWidgets.find( table->name() ) !=
@ -391,8 +391,8 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge
for ( TQMap<TQString, TQString>::Iterator it = widgetFactory->buddies.begin(); for ( TQMap<TQString, TQString>::Iterator it = widgetFactory->buddies.begin();
it != widgetFactory->buddies.end(); ++it ) { it != widgetFactory->buddies.end(); ++it ) {
TQLabel *label = (TQLabel*)widgetFactory->toplevel->child( it.key(), "TQLabel" ); TQLabel *label = (TQLabel*)widgetFactory->toplevel->child( it.key().ascii(), "TQLabel" );
TQWidget *buddy = (TQWidget*)widgetFactory->toplevel->child( *it, "TQWidget" ); TQWidget *buddy = (TQWidget*)widgetFactory->toplevel->child( (*it).ascii(), "TQWidget" );
if ( label && buddy ) if ( label && buddy )
label->setBuddy( buddy ); label->setBuddy( buddy );
} }
@ -451,7 +451,7 @@ TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connec
TQDomElement widget; TQDomElement widget;
while ( !e.isNull() ) { while ( !e.isNull() ) {
if ( e.tagName() == "class" ) { if ( e.tagName() == "class" ) {
d->translationContext = e.firstChild().toText().data(); d->translationContext = e.firstChild().toText().data().ascii();
} else if ( e.tagName() == "widget" ) { } else if ( e.tagName() == "widget" ) {
widget = e; widget = e;
} else if ( e.tagName() == "pixmapinproject" ) { } else if ( e.tagName() == "pixmapinproject" ) {
@ -1808,13 +1808,13 @@ TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *layout ) cons
void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop, void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop,
TQVariant value ) TQVariant value )
{ {
int offset = obj->metaObject()->findProperty( prop, TRUE ); int offset = obj->metaObject()->findProperty( prop.ascii(), TRUE );
if ( offset != -1 ) { if ( offset != -1 ) {
if ( prop == "geometry" && obj == toplevel ) { if ( prop == "geometry" && obj == toplevel ) {
toplevel->resize( value.toRect().size() ); toplevel->resize( value.toRect().size() );
} else if ( prop == "accel" ) { } else if ( prop == "accel" ) {
obj->setProperty( prop, value.toKeySequence() ); obj->setProperty( prop.ascii(), value.toKeySequence() );
} else { } else {
if ( value.type() == TQVariant::String || if ( value.type() == TQVariant::String ||
value.type() == TQVariant::CString ) { value.type() == TQVariant::CString ) {
@ -1827,7 +1827,7 @@ void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop,
TQStringList::split( '|', value.asString() ); TQStringList::split( '|', value.asString() );
TQStringList::ConstIterator f = flagsStr.begin(); TQStringList::ConstIterator f = flagsStr.begin();
while ( f != flagsStr.end() ) { while ( f != flagsStr.end() ) {
flagsCStr.append( *f ); flagsCStr.append( (*f).ascii() );
++f; ++f;
} }
value = TQVariant( metaProp->keysToValue(flagsCStr) ); value = TQVariant( metaProp->keysToValue(flagsCStr) );
@ -1837,7 +1837,7 @@ void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop,
} }
} }
} }
obj->setProperty( prop, value ); obj->setProperty( prop.ascii(), value );
} }
} else { } else {
if ( obj->isWidgetType() ) { if ( obj->isWidgetType() ) {
@ -2068,12 +2068,12 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto
while ( !n2.isNull() ) { while ( !n2.isNull() ) {
if ( n2.tagName() == "sender" ) { if ( n2.tagName() == "sender" ) {
TQString name = n2.firstChild().toText().data(); TQString name = n2.firstChild().toText().data();
if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) { if ( name == "this" || qstrcmp( toplevel->name(), name.ascii() ) == 0 ) {
conn.sender = toplevel; conn.sender = toplevel;
} else { } else {
if ( name == "this" ) if ( name == "this" )
name = toplevel->name(); name = toplevel->name();
TQObjectList *l = toplevel->queryList( 0, name, FALSE ); TQObjectList *l = toplevel->queryList( 0, name.ascii(), FALSE );
if ( l ) { if ( l ) {
if ( l->first() ) if ( l->first() )
conn.sender = l->first(); conn.sender = l->first();
@ -2083,13 +2083,13 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto
if ( !conn.sender ) if ( !conn.sender )
conn.sender = findAction( name ); conn.sender = findAction( name );
} else if ( n2.tagName() == "signal" ) { } else if ( n2.tagName() == "signal" ) {
conn.signal = n2.firstChild().toText().data(); conn.signal = n2.firstChild().toText().data().ascii();
} else if ( n2.tagName() == "receiver" ) { } else if ( n2.tagName() == "receiver" ) {
TQString name = n2.firstChild().toText().data(); TQString name = n2.firstChild().toText().data();
if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) { if ( name == "this" || qstrcmp( toplevel->name(), name.ascii() ) == 0 ) {
conn.receiver = toplevel; conn.receiver = toplevel;
} else { } else {
TQObjectList *l = toplevel->queryList( 0, name, FALSE ); TQObjectList *l = toplevel->queryList( 0, name.ascii(), FALSE );
if ( l ) { if ( l ) {
if ( l->first() ) if ( l->first() )
conn.receiver = l->first(); conn.receiver = l->first();
@ -2097,7 +2097,7 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto
} }
} }
} else if ( n2.tagName() == "slot" ) { } else if ( n2.tagName() == "slot" ) {
conn.slot = n2.firstChild().toText().data(); conn.slot = n2.firstChild().toText().data().ascii();
} }
n2 = n2.nextSibling().toElement(); n2 = n2.nextSibling().toElement();
} }
@ -2159,7 +2159,7 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto
n = n.nextSibling().toElement(); n = n.nextSibling().toElement();
continue; continue;
} }
TQObject::connect( sender, s, receiver, s2 ); TQObject::connect( sender, s.ascii(), receiver, s2.ascii() );
} }
n = n.nextSibling().toElement(); n = n.nextSibling().toElement();
} }
@ -2172,7 +2172,7 @@ void TQWidgetFactory::loadTabOrder( const TQDomElement &e )
while ( !n.isNull() ) { while ( !n.isNull() ) {
if ( n.tagName() == "tabstop" ) { if ( n.tagName() == "tabstop" ) {
TQString name = n.firstChild().toText().data(); TQString name = n.firstChild().toText().data();
TQObjectList *l = toplevel->queryList( 0, name, FALSE ); TQObjectList *l = toplevel->queryList( 0, name.ascii(), FALSE );
if ( l ) { if ( l ) {
if ( l->first() ) { if ( l->first() ) {
TQWidget *w = (TQWidget*)l->first(); TQWidget *w = (TQWidget*)l->first();
@ -2466,7 +2466,7 @@ void TQWidgetFactory::loadToolBars( const TQDomElement &e )
Qt::Dock dock = (Qt::Dock)n.attribute( "dock" ).toInt(); Qt::Dock dock = (Qt::Dock)n.attribute( "dock" ).toInt();
tb = new TQToolBar( TQString::null, mw, dock ); tb = new TQToolBar( TQString::null, mw, dock );
tb->setLabel( n.attribute( "label" ) ); tb->setLabel( n.attribute( "label" ) );
tb->setName( n.attribute( "name" ) ); tb->setName( n.attribute( "name" ).ascii() );
TQDomElement n2 = n.firstChild().toElement(); TQDomElement n2 = n.firstChild().toElement();
while ( !n2.isNull() ) { while ( !n2.isNull() ) {
if ( n2.tagName() == "action" ) { if ( n2.tagName() == "action" ) {
@ -2496,7 +2496,7 @@ void TQWidgetFactory::loadMenuBar( const TQDomElement &e )
if ( n.tagName() == "item" ) { if ( n.tagName() == "item" ) {
TQPopupMenu *popup = new TQPopupMenu( mw ); TQPopupMenu *popup = new TQPopupMenu( mw );
loadPopupMenu( popup, n ); loadPopupMenu( popup, n );
popup->setName( n.attribute( "name" ) ); popup->setName( n.attribute( "name" ).ascii() );
mb->insertItem( translate( n.attribute( "text" ) ), popup ); mb->insertItem( translate( n.attribute( "text" ) ), popup );
} else if ( n.tagName() == "property" ) { } else if ( n.tagName() == "property" ) {
setProperty( mb, n.attribute( "name" ), n.firstChild().toElement() ); setProperty( mb, n.attribute( "name" ), n.firstChild().toElement() );
@ -2517,7 +2517,7 @@ void TQWidgetFactory::loadPopupMenu( TQPopupMenu *p, const TQDomElement &e )
TQDomElement n2 = n.nextSibling().toElement(); TQDomElement n2 = n.nextSibling().toElement();
if ( n2.tagName() == "item") { // load submenu if ( n2.tagName() == "item") { // load submenu
TQPopupMenu *popup = new TQPopupMenu( mw ); TQPopupMenu *popup = new TQPopupMenu( mw );
popup->setName( n2.attribute( "name" ) ); popup->setName( n2.attribute( "name" ).ascii() );
if ( a ) { if ( a ) {
p->setAccel( a->accel(), p->insertItem( a->iconSet(), p->setAccel( a->accel(), p->insertItem( a->iconSet(),
translate( n2.attribute( "text" ).utf8().data() ), translate( n2.attribute( "text" ).utf8().data() ),

2
languages/cpp/debugger/debuggertracingdialog.cpp
Unescape View File

@ -102,3 +102,5 @@ namespace GDBDebugger
} }
} }
#include "debuggertracingdialog.moc"

1
languages/lib/interfaces/kdevpcsimporter.cpp
Unescape View File

@ -33,4 +33,3 @@ TQWidget * KDevPCSImporter::createSettingsPage( TQWidget * /*parent*/, const cha
{ {
return 0; return 0;
} }

2
lib/interfaces/extras/kdevcompileroptions.cpp
Unescape View File

@ -4,3 +4,5 @@ KDevCompilerOptions::KDevCompilerOptions( TQObject * parent, const char * name )
:TQObject(parent, name) :TQObject(parent, name)
{ {
} }
#include "kdevcompileroptions.moc"

1
lib/widgets/kdevhtmlpart.h
Unescape View File

@ -14,7 +14,6 @@ Customized KHTML part for KDevelop.
class KAction; class KAction;
class KToolBarPopupAction; class KToolBarPopupAction;
class KParts::ReadOnlyPart;
struct DocumentationHistoryEntry { struct DocumentationHistoryEntry {
KURL url; KURL url;

2
lib/widgets/propeditor/propertyeditor.cpp
Unescape View File

@ -90,7 +90,7 @@ public:
valueToDraw = m_property->value(); valueToDraw = m_property->value();
TQColorGroup icg(cg); TQColorGroup icg(cg);
#ifndef PURE_QT #ifndef PURE_QT
icg.setColor(TQColorGroup::Background, backgroundColor()); icg.setColor(TQColorGroup::Background, backgroundColor(column));
#else #else
icg.setColor(TQColorGroup::Background, white); icg.setColor(TQColorGroup::Background, white);
#endif #endif

2
lib/widgets/propeditor/qeditlistbox.cpp
Unescape View File

@ -399,3 +399,5 @@ QEditListBox::CustomEditor::CustomEditor( TQComboBox *combo )
m_lineEdit = dynamic_cast<KLineEdit*>( combo->lineEdit() ); m_lineEdit = dynamic_cast<KLineEdit*>( combo->lineEdit() );
assert( m_lineEdit ); assert( m_lineEdit );
} }
#include "qeditlistbox.moc"

2
parts/ctags2/ctags2_createtagfile.cpp
Unescape View File

@ -50,4 +50,6 @@ TQString CreateTagFile::directory( )
return dirToTag->url(); return dirToTag->url();
} }
#include "ctags2_createtagfile.moc"
// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; // kate: space-indent off; indent-width 4; tab-width 4; show-tabs off;

1
parts/ctags2/ctags2_selecttagfile.cpp
Unescape View File

@ -43,5 +43,6 @@ TQString SelectTagFile::tagsfilePath( )
return tagFile->url(); return tagFile->url();
} }
#include "ctags2_selecttagfile.moc"
// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; // kate: space-indent off; indent-width 4; tab-width 4; show-tabs off;

2
parts/filecreate/filecreate_listitem.cpp
Unescape View File

@ -64,7 +64,7 @@ namespace FileCreate {
void ListItem::paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align ) void ListItem::paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align )
{ {
TQBrush brush( isSelected() ? cg.highlight() : backgroundColor() ); TQBrush brush( isSelected() ? cg.highlight() : backgroundColor(column) );
if( column == 1 ){ if( column == 1 ){
// m_filetypeRenderer->setWidth(width); // m_filetypeRenderer->setWidth(width);

3
parts/fileview/filegroupswidget.cpp
Unescape View File

@ -224,7 +224,8 @@ void FileGroupsWidget::slotItemExecuted(TQListViewItem *item)
void FileGroupsWidget::slotContextMenu(KListView *, TQListViewItem *item, const TQPoint &p) void FileGroupsWidget::slotContextMenu(KListView *, TQListViewItem *item, const TQPoint &p)
{ {
KPopupMenu popup(i18n("File Groups"), this); KPopupMenu popup(this);
popup.insertTitle(i18n("File Groups"));
/// @todo Add, remove groups /// @todo Add, remove groups
int customizeId = popup.insertItem(i18n("Customize...")); int customizeId = popup.insertItem(i18n("Customize..."));
popup.setWhatsThis(customizeId, i18n("<b>Customize</b><p>Opens <b>Customize File Groups</b> dialog where the groups can be managed.")); popup.setWhatsThis(customizeId, i18n("<b>Customize</b><p>Opens <b>Customize File Groups</b> dialog where the groups can be managed."));

3
parts/fileview/filetreewidget.cpp
Unescape View File

@ -203,7 +203,8 @@ void FileTreeWidget::slotContextMenu( KListView *, TQListViewItem* item, const T
{ {
kdDebug(9017) << "FileTreeWidget::slotContextMenu(...)" << endl; kdDebug(9017) << "FileTreeWidget::slotContextMenu(...)" << endl;
KPopupMenu popup( i18n("File Tree"), this ); KPopupMenu popup( this );
popup.insertTitle( i18n("File Tree") );
// If an item is selected, fill the file context with selected files' list // If an item is selected, fill the file context with selected files' list
if (item) if (item)

1
vcs/clearcase/clearcasefileinfoprovider.cpp
Unescape View File

@ -64,3 +64,4 @@ TQStringList ClearcaseFileinfoProvider::registeredEntryList() const
return l; return l;
} }
#include "clearcasefileinfoprovider.moc"

1
vcs/cvsservice/cvspart.h
Unescape View File

@ -24,7 +24,6 @@ class TQPopupMenu;
class TQDir; class TQDir;
class KDialogBase; class KDialogBase;
class KURL; class KURL;
class KURL::List;
class KAction; class KAction;
class CvsProcessWidget; class CvsProcessWidget;

1
vcs/cvsservice/cvspartimpl.h
Unescape View File

@ -22,7 +22,6 @@
class CvsServicePart; class CvsServicePart;
class KDialogBase; class KDialogBase;
class KURL; class KURL;
class KURL::List;
class CvsProcessWidget; class CvsProcessWidget;
class KDevMainWindow; class KDevMainWindow;
class KDevCore; class KDevCore;

Write Preview
Loading…
Cancel
Save