Rename additional members for tqt3

pull/21/head
Timothy Pearson 12 years ago
parent 8c197c9946
commit 29d4a9cebb

@ -395,7 +395,7 @@ void PageViewer::slotPaletteOrFontChanged()
return; return;
TQUObject o[1]; TQUObject o[1];
obj->qt_invoke(id, o); obj->tqt_invoke(id, o);
// this hack is necessary since the part looks for []HTML Settings] in // this hack is necessary since the part looks for []HTML Settings] in
// KGlobal::config() by default, which is wrong when running in Kontact // KGlobal::config() by default, which is wrong when running in Kontact

@ -69,7 +69,7 @@ void TagAction::unplug(TQWidget* widget)
{ {
KToggleAction::unplug(widget); KToggleAction::unplug(widget);
TQPopupMenu* popup = ::qt_cast<TQPopupMenu *>(widget); TQPopupMenu* popup = ::tqt_cast<TQPopupMenu *>(widget);
if (popup) if (popup)
{ {
d->idToPopup.remove(d->popupToId[popup]); d->idToPopup.remove(d->popupToId[popup]);
@ -80,7 +80,7 @@ void TagAction::unplug(TQWidget* widget)
/* /*
int TagAction::plug(TQWidget* widget, int index) int TagAction::plug(TQWidget* widget, int index)
{ {
TQPopupMenu* popup = ::qt_cast<TQPopupMenu *>( widget ); TQPopupMenu* popup = ::tqt_cast<TQPopupMenu *>( widget );
if (!popup) if (!popup)
{ {
kdWarning() << "Can not plug KToggleAction in " << widget->className() << endl; kdWarning() << "Can not plug KToggleAction in " << widget->className() << endl;

@ -184,7 +184,7 @@ namespace KMail {
{ "Danny Kukawka", 0, 0, 0 }, // DCOP enhancements for better message importing { "Danny Kukawka", 0, 0, 0 }, // DCOP enhancements for better message importing
{ "Roger Larsson", 0, 0, 0 }, // add name of checked account to status bar message { "Roger Larsson", 0, 0, 0 }, // add name of checked account to status bar message
{ "Jeffrey McGee", 0, 0, 0 }, // fix for bug:64251 { "Jeffrey McGee", 0, 0, 0 }, // fix for bug:64251
{ "Dirk M\303\274ller", 0, 0, 0 }, // KURL() fixes and qt_cast optimizations { "Dirk M\303\274ller", 0, 0, 0 }, // KURL() fixes and tqt_cast optimizations
{ "OpenUsability", I18N_NOOP("Usability tests and improvements"), 0, "http://www.openusability.org" }, { "OpenUsability", I18N_NOOP("Usability tests and improvements"), 0, "http://www.openusability.org" },
{ "Mario Teijeiro Otero", 0, 0, 0 }, // various vendor annotations fixes { "Mario Teijeiro Otero", 0, 0, 0 }, // various vendor annotations fixes
{ "Simon Perreault", 0, 0, 0 }, // make the composer remember its "Use Fixed Font" setting (bug 49481) { "Simon Perreault", 0, 0, 0 }, // make the composer remember its "Use Fixed Font" setting (bug 49481)

@ -123,7 +123,7 @@ namespace KMail {
mRegExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); mRegExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
KRegExpEditorInterface *iface = KRegExpEditorInterface *iface =
static_cast<KRegExpEditorInterface *>( mRegExpEditDialog->qt_cast( "KRegExpEditorInterface" ) ); static_cast<KRegExpEditorInterface *>( mRegExpEditDialog->tqt_cast( "KRegExpEditorInterface" ) );
if( iface ) { if( iface ) {
iface->setRegExp( mLineEdit->text() ); iface->setRegExp( mLineEdit->text() );
if( mRegExpEditDialog->exec() == TQDialog::Accepted ) if( mRegExpEditDialog->exec() == TQDialog::Accepted )

@ -211,16 +211,16 @@ bool ResourceGroupwareBase::doOpen()
// Copyright (C) 1998 Matthias Ettrich (ettrich@kde.org) // Copyright (C) 1998 Matthias Ettrich (ettrich@kde.org)
// Copyright (C) 1999 David Faure (faure@kde.org) // Copyright (C) 1999 David Faure (faure@kde.org)
// If a troll sees this, he kills me // If a troll sees this, he kills me
void qt_enter_modal( TQWidget *widget ); void tqt_enter_modal( TQWidget *widget );
void qt_leave_modal( TQWidget *widget ); void tqt_leave_modal( TQWidget *widget );
void ResourceGroupwareBase::enter_loop() void ResourceGroupwareBase::enter_loop()
{ {
TQWidget dummy(0,0,WType_Dialog | WShowModal); TQWidget dummy(0,0,WType_Dialog | WShowModal);
dummy.setFocusPolicy( TQ_NoFocus ); dummy.setFocusPolicy( TQ_NoFocus );
qt_enter_modal(&dummy); tqt_enter_modal(&dummy);
tqApp->enter_loop(); tqApp->enter_loop();
qt_leave_modal(&dummy); tqt_leave_modal(&dummy);
} }
// END:COPIED // END:COPIED

@ -137,7 +137,7 @@ void SingleConditionWidget::showRegExpDialog()
{ {
TQDialog *editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor" ); TQDialog *editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor" );
if ( editorDialog ) { if ( editorDialog ) {
KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorDialog->qt_cast( "KRegExpEditorInterface" ) ); KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorDialog->tqt_cast( "KRegExpEditorInterface" ) );
Q_ASSERT( editor ); // This should not fail! Q_ASSERT( editor ); // This should not fail!
editor->setRegExp( expr->text() ); editor->setRegExp( expr->text() );
editorDialog->exec(); editorDialog->exec();

Loading…
Cancel
Save