Undo prior accidental commit

2 files changed, 16 insertions, 16 deletions

diff --git a/extensions/nsplugin/examples/grapher/grapher.cpp b/extensions/nsplugin/examples/grapher/grapher.cpp
index f0186df..84633e4 100644
--- a/extensions/nsplugin/examples/grapher/grapher.cpp
+++ b/extensions/nsplugin/examples/grapher/grapher.cpp
@@ -159,7 +159,7 @@ void Graph::timerEvent(QTimerEvent*)
 void Graph::setStyle(const char* stext)
 {
     for ( Style s = Pie; styleName[s]; s = Style(s+1) ) {
-	if ( tqstricmp(stext,styleName[s])==0 ) {
+	if ( qstricmp(stext,styleName[s])==0 ) {
 	    setStyle(s);
 	    return;
 	}
diff --git a/extensions/nsplugin/src/qnp.cpp b/extensions/nsplugin/src/qnp.cpp
index 3f135fe..5a5eb5c 100644
--- a/extensions/nsplugin/src/qnp.cpp
+++ b/extensions/nsplugin/src/qnp.cpp
@@ -800,7 +800,7 @@ QNPWidget::QNPWidget() :
      pi(next_pi)
 {
     if (!next_pi) {
-	tqFatal("QNPWidget must only be created within call to newWindow");
+	qFatal("QNPWidget must only be created within call to newWindow");
     }
     next_pi->widget = this;
     next_pi = 0;
@@ -942,7 +942,7 @@ QNPInstance::QNPInstance() :
     pi(next_pi)
 {
     if (!next_pi) {
-	tqFatal("QNPInstance must only be created within call to newInstance");
+	qFatal("QNPInstance must only be created within call to newInstance");
     }
     next_pi->instance = this;
     next_pi = 0;
@@ -1207,7 +1207,7 @@ const char* QNPInstance::arg(const char* name) const
 {
     for (int i=0; i<pi->argc; i++) {
 	// SGML: names are case insensitive
-	if ( tqstricmp( name, pi->argn[i] ) == 0 ) {
+	if ( qstricmp( name, pi->argn[i] ) == 0 ) {
 	    if (pi->argv[i].isEmpty())
 		return "";
 	    else
@@ -1558,7 +1558,7 @@ void* QNPlugin::getJavaClass()
 */
 void QNPlugin::unuseJavaClass()
 {
-    tqFatal("QNPlugin::unuseJavaClass() must be overridden along with getJavaClass()");
+    qFatal("QNPlugin::unuseJavaClass() must be overridden along with getJavaClass()");
 }
 
 /*!
@@ -1625,7 +1625,7 @@ bool QNPXt::redeliverEvent( XEvent *event )
 {
     // redeliver the event to Xt, NOT through Qt
     if ( static_d->dispatchers[ event->type ]( event ) ) {
-	// tqDebug( "Xt: redelivered event" );
+	// qDebug( "Xt: redelivered event" );
 	return TRUE;
     }
     return FALSE;
@@ -1709,11 +1709,11 @@ Boolean qnpxt_event_dispatcher( XEvent *event )
 	if ( w ) {
 	    if ( !grabbed && ( event->type        == XFocusIn &&
 			       event->xfocus.mode == NotifyGrab ) ) {
-		// tqDebug( "Xt: grab started" );
+		// qDebug( "Xt: grab started" );
 		grabbed = TRUE;
 	    } else if ( grabbed && ( event->type        == XFocusOut &&
 				     event->xfocus.mode == NotifyUngrab ) ) {
-		// tqDebug( "Xt: grab ended" );
+		// qDebug( "Xt: grab ended" );
 		grabbed = FALSE;
 	    }
 	}
@@ -1760,7 +1760,7 @@ Boolean qnpxt_event_dispatcher( XEvent *event )
     qnpxt_keep_alive();
 
     if ( delivered ) {
-	// tqDebug( "Qt: delivered event" );
+	// qDebug( "Qt: delivered event" );
 	return True;
     }
 
@@ -1775,7 +1775,7 @@ Boolean qnpxt_event_dispatcher( XEvent *event )
 	case EnterNotify:
 	case LeaveNotify:
 	case ClientMessage:
-	    // tqDebug( "Qt: active popup - discarding event" );
+	    // qDebug( "Qt: active popup - discarding event" );
 	    return True;
 
 	default:
@@ -1787,7 +1787,7 @@ Boolean qnpxt_event_dispatcher( XEvent *event )
 	if ( qnpxt ) {
 	    // send event through Qt modality handling...
 	    if ( !qt_try_modal( qnpxt, event ) ) {
-		// tqDebug( "Qt: active modal widget discarded event" );
+		// qDebug( "Qt: active modal widget discarded event" );
 		return True;
 	    }
 	} else if ( !grabbed ) {
@@ -1814,7 +1814,7 @@ Boolean qnpxt_event_dispatcher( XEvent *event )
 		case EnterNotify:
 		case LeaveNotify:
 		case ClientMessage:
-		    // tqDebug( "Qt: active modal widget discarded unknown event" );
+		    // qDebug( "Qt: active modal widget discarded unknown event" );
 		    return True;
 		default:
 		    break;
@@ -1824,7 +1824,7 @@ Boolean qnpxt_event_dispatcher( XEvent *event )
     }
 
     if ( static_d->dispatchers[ event->type ]( event ) ) {
-	// tqDebug( "Xt: delivered event" );
+	// qDebug( "Xt: delivered event" );
 	// Xt handled the event.
 	return True;
     }
@@ -1839,7 +1839,7 @@ QNPXt::QNPXt( const char *applicationClass, XtAppContext context,
 {
 #if defined(QT_CHECK_STATE)
     if ( static_d )
-	tqWarning( "QNPXt: should only have one QNPXt instance!" );
+	qWarning( "QNPXt: should only have one QNPXt instance!" );
 #endif
 
     d = static_d = new QNPXtPrivate;
@@ -1966,7 +1966,7 @@ void QNPXt::registerSocketNotifier( QSocketNotifier *notifier )
 	break;
 
     default:
-	tqWarning( "QNPXtEventLoop: socket notifier has invalid type" );
+	qWarning( "QNPXtEventLoop: socket notifier has invalid type" );
 	return;
     }
 
@@ -1985,7 +1985,7 @@ void QNPXt::unregisterSocketNotifier( QSocketNotifier *notifier )
 	++it;
     if ( ! it.current() ) {
 	// this shouldn't happen
-	tqWarning( "QNPXtEventLoop: failed to unregister socket notifier" );
+	qWarning( "QNPXtEventLoop: failed to unregister socket notifier" );
 	return;
     }