From 3c87ec12c23bf62d3f60a7dd64020af8e0b997ce Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:36:28 -0600 Subject: Rename additional global TQt functions --- kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp | 2 +- kregexpeditor/altnwidget.cpp | 2 +- kregexpeditor/charselector.cpp | 2 +- kregexpeditor/concwidget.cpp | 2 +- kregexpeditor/drag.cpp | 2 +- kregexpeditor/kregexpeditorgui.cpp | 2 +- kregexpeditor/multicontainerwidget.cpp | 2 +- kregexpeditor/regexpconverter.cpp | 2 +- kregexpeditor/regexpwidget.cpp | 12 ++++++------ kregexpeditor/repeatwidget.cpp | 6 +++--- kregexpeditor/test-without-dl/main.cpp | 12 ++++++------ kregexpeditor/verifybuttons.cpp | 2 +- kregexpeditor/widgetfactory.cpp | 6 +++--- kregexpeditor/zerowidgets.cpp | 2 +- 14 files changed, 28 insertions(+), 28 deletions(-) (limited to 'kregexpeditor') diff --git a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp index 9015aaa..04ee2a6 100644 --- a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp +++ b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp @@ -68,7 +68,7 @@ void KWidgetStreamer::propertyToStream( const TQObject* from, TQDataStream& stre for ( PropertyListIt it = list.begin(); it != list.end(); ++it ) { TQVariant prop = from->property( (*it).latin1() ); if ( ! prop.isValid() ) - qWarning("Invalid property: %s:%s", tp.latin1(), (*it).latin1() ); + tqWarning("Invalid property: %s:%s", tp.latin1(), (*it).latin1() ); stream << prop ; } diff --git a/kregexpeditor/altnwidget.cpp b/kregexpeditor/altnwidget.cpp index 3a29135..f34c8c5 100644 --- a/kregexpeditor/altnwidget.cpp +++ b/kregexpeditor/altnwidget.cpp @@ -205,7 +205,7 @@ RegExp* AltnWidget::selection() const } } } - qFatal("Selection not found"); + tqFatal("Selection not found"); return 0; // compiler shut up. } diff --git a/kregexpeditor/charselector.cpp b/kregexpeditor/charselector.cpp index 04c6f5d..4eb9ada 100644 --- a/kregexpeditor/charselector.cpp +++ b/kregexpeditor/charselector.cpp @@ -141,7 +141,7 @@ void CharSelector::setText( TQString text ) else if ( text.at(1) == TQChar('v') ) slotNewItem(9); else { - qWarning("Warning %s:%d Unknown escape %s", __FILE__, __LINE__, text.latin1() ); + tqWarning("Warning %s:%d Unknown escape %s", __FILE__, __LINE__, text.latin1() ); } } else { diff --git a/kregexpeditor/concwidget.cpp b/kregexpeditor/concwidget.cpp index 8cbff9e..900b09f 100644 --- a/kregexpeditor/concwidget.cpp +++ b/kregexpeditor/concwidget.cpp @@ -385,7 +385,7 @@ void ConcWidget::addNewConcChild(DragAccepter *accepter, ConcWidget *other) return; } } - qFatal("accepter not found"); + tqFatal("accepter not found"); } bool ConcWidget::validateSelection() const diff --git a/kregexpeditor/drag.cpp b/kregexpeditor/drag.cpp index e17973c..cfc11bb 100644 --- a/kregexpeditor/drag.cpp +++ b/kregexpeditor/drag.cpp @@ -70,7 +70,7 @@ TQByteArray RegExpWidgetDrag::encodedData ( const char* format ) const stream << RegExpConverter::current()->toStr( _regexp, false ); } else { - qWarning("Unexpected drag and drop format: %s", format ); + tqWarning("Unexpected drag and drop format: %s", format ); } return data; } diff --git a/kregexpeditor/kregexpeditorgui.cpp b/kregexpeditor/kregexpeditorgui.cpp index f419c3b..0dae863 100644 --- a/kregexpeditor/kregexpeditorgui.cpp +++ b/kregexpeditor/kregexpeditorgui.cpp @@ -130,7 +130,7 @@ void KRegExpEditorGUI::doSomething( TQString method, void* arguments ) _editor->setAllowNonTQtSyntax( (bool) arguments ); } else { - qFatal( "%s", tqtr("Method '%1' is not valid!").arg(method).latin1() ); + tqFatal( "%s", tqtr("Method '%1' is not valid!").arg(method).latin1() ); } } diff --git a/kregexpeditor/multicontainerwidget.cpp b/kregexpeditor/multicontainerwidget.cpp index bd578d2..6c7102d 100644 --- a/kregexpeditor/multicontainerwidget.cpp +++ b/kregexpeditor/multicontainerwidget.cpp @@ -100,7 +100,7 @@ void MultiContainerWidget::addNewChild(DragAccepter *accepter, RegExpWidget *chi return; } } - qFatal("Accepter not found in list"); + tqFatal("Accepter not found in list"); } bool MultiContainerWidget::updateSelection(bool parentSelected) diff --git a/kregexpeditor/regexpconverter.cpp b/kregexpeditor/regexpconverter.cpp index 2678591..0010102 100644 --- a/kregexpeditor/regexpconverter.cpp +++ b/kregexpeditor/regexpconverter.cpp @@ -52,7 +52,7 @@ TQString RegExpConverter::toStr( RegExp* regexp, bool markSelection ) case RegExp::LOOKAHEAD: return toString( static_cast( regexp ), markSelection ); case RegExp::TEXTRANGE: return toString( static_cast( regexp ), markSelection ); } - qWarning("We shouldn't get here!"); + tqWarning("We shouldn't get here!"); return TQString::fromLatin1( "" ); } diff --git a/kregexpeditor/regexpwidget.cpp b/kregexpeditor/regexpwidget.cpp index 231848f..c139180 100644 --- a/kregexpeditor/regexpwidget.cpp +++ b/kregexpeditor/regexpwidget.cpp @@ -43,17 +43,17 @@ RegExpWidget::RegExpWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, void RegExpWidget::addNewChild(DragAccepter *, RegExpWidget *) { - qFatal("This widget should not expect any children"); + tqFatal("This widget should not expect any children"); } void RegExpWidget::addNewConcChild(DragAccepter *, ConcWidget *) { - qFatal("This widget should not expect any children"); + tqFatal("This widget should not expect any children"); } void RegExpWidget::setConcChild(ConcWidget *) { - qFatal("This widget should not expect any children"); + tqFatal("This widget should not expect any children"); } bool RegExpWidget::updateSelection(bool parentSelected) @@ -95,12 +95,12 @@ void RegExpWidget::clearSelection() void RegExpWidget::applyRegExpToSelection( RegExpType ) { - qFatal("This method should not be called for this widget"); + tqFatal("This method should not be called for this widget"); } void RegExpWidget::deleteSelection() { - qFatal("This method should be overridden if needed!"); + tqFatal("This method should be overridden if needed!"); } RegExp* RegExpWidget::selection() const @@ -110,7 +110,7 @@ RegExp* RegExpWidget::selection() const int RegExpWidget::edit() { - qFatal("This method should be overridden if needed!"); + tqFatal("This method should be overridden if needed!"); return 0; // Compiler shut up } diff --git a/kregexpeditor/repeatwidget.cpp b/kregexpeditor/repeatwidget.cpp index 9536679..e934122 100644 --- a/kregexpeditor/repeatwidget.cpp +++ b/kregexpeditor/repeatwidget.cpp @@ -273,7 +273,7 @@ TQString RepeatRangeWindow::text() case MINMAX: return i18n("Repeated From %1 to %2 Times") .arg( _rangeFrom->value() ).arg( _rangeTo->value() ); } - qFatal("Fall through!"); + tqFatal("Fall through!"); return TQString::fromLocal8Bit(""); } @@ -286,7 +286,7 @@ int RepeatRangeWindow::min() case EXACTLY: return _exactlyTimes->value(); case MINMAX: return _rangeFrom->value(); } - qFatal("Fall through!"); + tqFatal("Fall through!"); return -1; } @@ -299,7 +299,7 @@ int RepeatRangeWindow::max() case EXACTLY: return _exactlyTimes->value(); case MINMAX: return _rangeTo->value(); } - qFatal("Fall through!"); + tqFatal("Fall through!"); return -1; } diff --git a/kregexpeditor/test-without-dl/main.cpp b/kregexpeditor/test-without-dl/main.cpp index 0094b4a..ce7e084 100644 --- a/kregexpeditor/test-without-dl/main.cpp +++ b/kregexpeditor/test-without-dl/main.cpp @@ -28,14 +28,14 @@ public: dynamic_cast(event)->state() == TQt::ControlButton ) { // Ctrl + left mouse click. - qDebug("----------------------------------------------------"); - qDebug((TQString("Widget name : ") + TQString( recv->name() )).latin1() ); - qDebug((TQString("Widget class: ") + TQString( recv->className() )).latin1() ); - qDebug("\nObject info:"); + tqDebug("----------------------------------------------------"); + tqDebug((TQString("Widget name : ") + TQString( recv->name() )).latin1() ); + tqDebug((TQString("Widget class: ") + TQString( recv->className() )).latin1() ); + tqDebug("\nObject info:"); recv->dumpObjectInfo(); - qDebug("\nObject tree:"); + tqDebug("\nObject tree:"); recv->dumpObjectTree(); - qDebug("----------------------------------------------------"); + tqDebug("----------------------------------------------------"); return false; } return false; diff --git a/kregexpeditor/verifybuttons.cpp b/kregexpeditor/verifybuttons.cpp index 283b2fa..65e4735 100644 --- a/kregexpeditor/verifybuttons.cpp +++ b/kregexpeditor/verifybuttons.cpp @@ -199,7 +199,7 @@ RegExpConverter* VerifyButtons::setSyntax( const TQString& which) return (*it).first; } } - qWarning( "No such converter: '%s'", which.latin1() ); + tqWarning( "No such converter: '%s'", which.latin1() ); return 0; } diff --git a/kregexpeditor/widgetfactory.cpp b/kregexpeditor/widgetfactory.cpp index 1ab5d24..43a1008 100644 --- a/kregexpeditor/widgetfactory.cpp +++ b/kregexpeditor/widgetfactory.cpp @@ -76,7 +76,7 @@ RegExpWidget* WidgetFactory::createWidget( RegExpEditorWindow* win, TQWidget* pa case COMPOUND: widget = new CompoundWidget( win, parent ); break; default: - qFatal("It should not be possible to get here!"); + tqFatal("It should not be possible to get here!"); return 0; } @@ -91,7 +91,7 @@ RegExpWidget* WidgetFactory::createWidget( RegExp* regexp, RegExpEditorWindow* e TQWidget* parent ) { if ( regexp == 0 ) { - qFatal("%s:%d Regexp is 0", __FILE__, __LINE__ ); + tqFatal("%s:%d Regexp is 0", __FILE__, __LINE__ ); } else if ( TextRegExp* reg = dynamic_cast( regexp ) ) return new TextWidget( reg, editorWindow, parent ); @@ -126,7 +126,7 @@ RegExpWidget* WidgetFactory::createWidget( RegExp* regexp, RegExpEditorWindow* e else if ( CompoundRegExp* reg = dynamic_cast( regexp ) ) return new CompoundWidget( reg, editorWindow, parent ); else { - qFatal("%s:%d Internal Error: Unknown RegExp type", __FILE__, __LINE__); + tqFatal("%s:%d Internal Error: Unknown RegExp type", __FILE__, __LINE__); } return 0; } diff --git a/kregexpeditor/zerowidgets.cpp b/kregexpeditor/zerowidgets.cpp index 7c1f6c6..c403dce 100644 --- a/kregexpeditor/zerowidgets.cpp +++ b/kregexpeditor/zerowidgets.cpp @@ -39,7 +39,7 @@ ZeroWidget::ZeroWidget(TQString txt, RegExpEditorWindow* editorWindow, void ZeroWidget::addNewChild(DragAccepter *, RegExpWidget *) { - qFatal("No children should be added to this widget!"); + tqFatal("No children should be added to this widget!"); } TQSize ZeroWidget::sizeHint() const -- cgit v1.2.3