diff options
Diffstat (limited to 'src/kernel')
79 files changed, 754 insertions, 754 deletions
diff --git a/src/kernel/qabstractlayout.cpp b/src/kernel/qabstractlayout.cpp index 4607fd0..6921d49 100644 --- a/src/kernel/qabstractlayout.cpp +++ b/src/kernel/qabstractlayout.cpp @@ -606,7 +606,7 @@ QLayout::QLayout( QWidget *parent, int margin, int spacing, const char *name ) init(); if ( parent ) { if ( parent->layout() ) { - tqWarning( "QLayout \"%s\" added to %s \"%s\", which already has a" + qWarning( "QLayout \"%s\" added to %s \"%s\", which already has a" " layout", QObject::name(), parent->className(), parent->name() ); parent->removeChild( this ); @@ -1063,7 +1063,7 @@ void QLayout::addChildLayout( QLayout *l ) { if ( l->parent() ) { #if defined(QT_CHECK_NULL) - tqWarning( "QLayout::addChildLayout: layout already has a parent" ); + qWarning( "QLayout::addChildLayout: layout already has a parent" ); #endif return; } @@ -1189,7 +1189,7 @@ bool QLayout::activate() QWidget *mw = mainWidget(); if (!mw) { #if defined( QT_CHECK_NULL ) - tqWarning( "QLayout::activate: %s \"%s\" does not have a main widget", + qWarning( "QLayout::activate: %s \"%s\" does not have a main widget", QObject::className(), QObject::name() ); #endif return FALSE; diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp index 59beea2..53814dc 100644 --- a/src/kernel/qaccel.cpp +++ b/src/kernel/qaccel.cpp @@ -576,7 +576,7 @@ QAccel::QAccel( QWidget *parent, const char *name ) d->watch = parent; #if defined(QT_CHECK_NULL) if ( !d->watch ) - tqWarning( "QAccel: An accelerator must have a parent or a watch widget" ); + qWarning( "QAccel: An accelerator must have a parent or a watch widget" ); #endif } @@ -594,7 +594,7 @@ QAccel::QAccel( QWidget* watch, QObject *parent, const char *name ) d->watch = watch; #if defined(QT_CHECK_NULL) if ( !d->watch ) - tqWarning( "QAccel: An accelerator must have a parent or a watch widget" ); + qWarning( "QAccel: An accelerator must have a parent or a watch widget" ); #endif } diff --git a/src/kernel/qaccessible.cpp b/src/kernel/qaccessible.cpp index 539caae..d037124 100644 --- a/src/kernel/qaccessible.cpp +++ b/src/kernel/qaccessible.cpp @@ -385,7 +385,7 @@ QRESULT QAccessible::queryAccessibleInterface( QObject *object, QAccessibleInter if ( !qAccessibleManager ) { qAccessibleManager = new QPluginManager<QAccessibleFactoryInterface>( IID_QAccessibleFactory, QApplication::libraryPaths(), "/accessible" ); if ( !cleanupAdded ) { - tqAddPostRoutine( qAccessibleCleanup ); + qAddPostRoutine( qAccessibleCleanup ); cleanupAdded = TRUE; } } @@ -652,7 +652,7 @@ QAccessibleObject::QAccessibleObject( QObject *object ) if ( !qAccessibleInterface ) { qAccessibleInterface = new AccessibleCache; if ( !cleanupAdded ) { - tqAddPostRoutine( qAccessibleCleanup ); + qAddPostRoutine( qAccessibleCleanup ); cleanupAdded = TRUE; } } @@ -703,7 +703,7 @@ QObject *QAccessibleObject::object() const { #if defined(QT_CHECK_RANGE) if ( !isValid() ) - tqWarning( "QAccessibleInterface is invalid. Crash pending..." ); + qWarning( "QAccessibleInterface is invalid. Crash pending..." ); #endif return object_; } diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp index 66ab1dd..7296f4c 100644 --- a/src/kernel/qapplication.cpp +++ b/src/kernel/qapplication.cpp @@ -438,12 +438,12 @@ static QVFuncList *postRList = 0; // list of post routines void init_ptr() { global_ptr = new int[100]; // allocate data - tqAddPostRoutine( cleanup_ptr ); // delete later + qAddPostRoutine( cleanup_ptr ); // delete later } \endcode Note that for an application- or module-wide cleanup, - tqAddPostRoutine() is often not suitable. People have a tendency to + qAddPostRoutine() is often not suitable. People have a tendency to make such modules dynamically loaded, and then unload those modules long before the QApplication destructor is called, for example. @@ -477,7 +477,7 @@ static QVFuncList *postRList = 0; // list of post routines to clean up the module's data at the exact right moment. */ -Q_EXPORT void tqAddPostRoutine( QtCleanUpFunction p) +Q_EXPORT void qAddPostRoutine( QtCleanUpFunction p) { if ( !postRList ) { postRList = new QVFuncList; @@ -487,7 +487,7 @@ Q_EXPORT void tqAddPostRoutine( QtCleanUpFunction p) } -Q_EXPORT void tqRemovePostRoutine( QtCleanUpFunction p ) +Q_EXPORT void qRemovePostRoutine( QtCleanUpFunction p ) { if ( !postRList ) return; QVFuncList::Iterator it = postRList->begin(); @@ -862,7 +862,7 @@ QApplication::QApplication( Display* dpy, HANDLE visual, HANDLE colormap ) if ( ! dpy ) { #ifdef QT_CHECK_STATE - tqWarning( "QApplication: invalid Display* argument." ); + qWarning( "QApplication: invalid Display* argument." ); #endif // QT_CHECK_STATE qt_init( &aargc, aargv, GuiClient ); @@ -903,7 +903,7 @@ QApplication::QApplication(Display *dpy, int argc, char **argv, if ( ! dpy ) { #ifdef QT_CHECK_STATE - tqWarning( "QApplication: invalid Display* argument." ); + qWarning( "QApplication: invalid Display* argument." ); #endif // QT_CHECK_STATE qt_init( &argc, argv, GuiClient ); @@ -933,7 +933,7 @@ void QApplication::init_precmdline() #endif #if defined(QT_CHECK_STATE) if ( qApp ) - tqWarning( "QApplication: There should be max one application object" ); + qWarning( "QApplication: There should be max one application object" ); #endif qApp = (QApplication*)this; } @@ -1106,7 +1106,7 @@ QApplication::~QApplication() is_app_running = FALSE; if ( widgetCount ) { - tqDebug( "Widgets left: %i Max widgets: %i \n", QWidget::instanceCounter, QWidget::maxInstances ); + qDebug( "Widgets left: %i Max widgets: %i \n", QWidget::instanceCounter, QWidget::maxInstances ); } #ifndef QT_NO_SESSIONMANAGER delete session_manager; @@ -1214,7 +1214,7 @@ QStyle& QApplication::style() if ( app_style ) return *app_style; if ( !qt_is_gui_used ) - tqFatal( "No style available in non-gui applications!" ); + qFatal( "No style available in non-gui applications!" ); #if defined(Q_WS_X11) if(!qt_style_override) @@ -1262,7 +1262,7 @@ QStyle& QApplication::style() && !(app_style = QStyleFactory::create( QStyleFactory::keys()[0] ) ) #endif ) - tqFatal( "No %s style available!", style.latin1() ); + qFatal( "No %s style available!", style.latin1() ); } QPalette app_pal_copy ( *app_pal ); @@ -1500,7 +1500,7 @@ void QApplication::setColorSpec( int spec ) { #if defined(QT_CHECK_STATE) if ( qApp ) { - tqWarning( "QApplication::setColorSpec: This function must be " + qWarning( "QApplication::setColorSpec: This function must be " "called before the QApplication object is created" ); } #endif @@ -1723,7 +1723,7 @@ QStringList QApplication::libraryPaths() { if ( !app_libpaths ) { app_libpaths = new QStringList; - QString installPathPlugins = QString::fromLocal8Bit(tqInstallPathPlugins()); + QString installPathPlugins = QString::fromLocal8Bit(qInstallPathPlugins()); if ( QFile::exists(installPathPlugins) ) { #ifdef Q_WS_WIN installPathPlugins.replace('\\', '/'); @@ -1742,7 +1742,7 @@ QStringList QApplication::libraryPaths() #endif if (!app_location.isEmpty()) { app_location.truncate( app_location.findRev( '/' ) ); - if ( app_location != tqInstallPathPlugins() && QFile::exists( app_location ) ) + if ( app_location != qInstallPathPlugins() && QFile::exists( app_location ) ) app_libpaths->append( app_location ); } } @@ -1822,7 +1822,7 @@ QPalette QApplication::palette(const QWidget* w) { #if defined(QT_CHECK_STATE) if ( !qApp ) - tqWarning( "QApplication::palette: This function can only be " + qWarning( "QApplication::palette: This function can only be " "called after the QApplication object has been created" ); #endif if ( !app_pal ) { @@ -2319,7 +2319,7 @@ bool QApplication::notify( QObject *receiver, QEvent *e ) if ( receiver == 0 ) { // serious error #if defined(QT_CHECK_NULL) - tqWarning( "QApplication::notify: Unexpected null receiver" ); + qWarning( "QApplication::notify: Unexpected null receiver" ); #endif return FALSE; } @@ -3098,7 +3098,7 @@ void QApplication::postEvent( QObject *receiver, QEvent *event ) { if ( receiver == 0 ) { #if defined(QT_CHECK_NULL) - tqWarning( "QApplication::postEvent: Unexpected null receiver" ); + qWarning( "QApplication::postEvent: Unexpected null receiver" ); #endif delete event; return; @@ -3412,7 +3412,7 @@ void QApplication::removePostedEvent( QEvent * event ) if ( !globalPostedEvents ) { #if defined(QT_DEBUG) - tqDebug( "QApplication::removePostedEvent: %p %d is posted: impossible", + qDebug( "QApplication::removePostedEvent: %p %d is posted: impossible", (void*)event, event->type() ); return; #endif @@ -3493,7 +3493,7 @@ void QApplication::removePostedEvent( QEvent * event ) n = "<other>"; break; } - tqWarning("QEvent: Warning: %s event deleted while posted to %s %s", + qWarning("QEvent: Warning: %s event deleted while posted to %s %s", n, pe->receiver ? pe->receiver->className() : "null", pe->receiver ? pe->receiver->name() : "object" ); diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index 5f5e23c..45d83df 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -131,7 +131,7 @@ extern "C" Bool XftInitFtLibrary(void); extern "C" char *_Xsetlocale(int category, const char *locale); char *_Xsetlocale(int category, const char *locale) { - //tqDebug("_Xsetlocale(%d,%s),category,locale"); + //qDebug("_Xsetlocale(%d,%s),category,locale"); return setlocale(category,locale); } # endif // setlocale @@ -520,7 +520,7 @@ void qt_deferred_map_add( QWidget* w) { if ( !deferred_map_list ) { deferred_map_list = new QPtrList<QWidget>; - tqAddPostRoutine( qt_deferred_map_cleanup ); + qAddPostRoutine( qt_deferred_map_cleanup ); } deferred_map_list->append( w ); } @@ -788,7 +788,7 @@ static int qt_x_errhandler( Display *dpy, XErrorEvent *err ) char errstr[256]; XGetErrorText( dpy, err->error_code, errstr, 256 ); - tqWarning( "X Error: %s %d\n" + qWarning( "X Error: %s %d\n" " Major opcode: %d\n" " Minor opcode: %d\n" " Resource id: 0x%lx", @@ -806,7 +806,7 @@ static int qt_x_errhandler( Display *dpy, XErrorEvent *err ) static int qt_xio_errhandler( Display * ) { - tqWarning( "%s: Fatal IO error: client killed", appName ); + qWarning( "%s: Fatal IO error: client killed", appName ); qApp = 0; exit( 1 ); //### give the application a chance for a proper shutdown instead, @@ -866,7 +866,7 @@ static void qt_x11_process_intern_atoms() while( it.current() ) { res[i] = 0; resp[i] = it.current(); - names[i] = tqstrdup(it.currentKey()); + names[i] = qstrdup(it.currentKey()); i++; ++it; } @@ -1184,7 +1184,7 @@ static void qt_set_input_encoding() qt_input_mapper = QTextCodec::codecForLocale(); } else { - if ( !tqstricmp( data, "locale" ) ) + if ( !qstricmp( data, "locale" ) ) qt_input_mapper = QTextCodec::codecForLocale(); else qt_input_mapper = QTextCodec::codecForName( data ); @@ -1658,11 +1658,11 @@ void qt_init_internal( int *argcptr, char **argv, appDpy = display; // Set application name and class - appName = tqstrdup( "Qt-subapplication" ); + appName = qstrdup( "Qt-subapplication" ); char *app_class = 0; if (argv) { const char* p = strrchr( argv[0], '/' ); - app_class = tqstrdup(p ? p + 1 : argv[0]); + app_class = qstrdup(p ? p + 1 : argv[0]); if (app_class[0]) app_class[0] = toupper(app_class[0]); } @@ -1686,7 +1686,7 @@ void qt_init_internal( int *argcptr, char **argv, if (argv) { const char *p = strrchr( argv[0], '/' ); appName = p ? p + 1 : argv[0]; - app_class = tqstrdup(appName); + app_class = qstrdup(appName); if (app_class[0]) app_class[0] = toupper(app_class[0]); } @@ -1795,7 +1795,7 @@ void qt_init_internal( int *argcptr, char **argv, } if ( s == "gdb" ) { appNoGrab = TRUE; - tqDebug( "Qt: gdb: -nograb added to command-line options.\n" + qDebug( "Qt: gdb: -nograb added to command-line options.\n" "\t Use the -dograb option to enforce grabbing." ); } f.close(); @@ -1806,7 +1806,7 @@ void qt_init_internal( int *argcptr, char **argv, if( qt_is_gui_used ) { if ( ( appDpy = XOpenDisplay(appDpyName) ) == 0 ) { - tqWarning( "%s: cannot connect to X server %s", appName, + qWarning( "%s: cannot connect to X server %s", appName, XDisplayName(appDpyName) ); qApp = 0; exit( 1 ); @@ -2272,7 +2272,7 @@ void qt_init_internal( int *argcptr, char **argv, devices = XListInputDevices( appDpy, &ndev); if ( devices == NULL ) { - tqWarning( "Failed to get list of devices" ); + qWarning( "Failed to get list of devices" ); ndev = -1; } dev = NULL; @@ -2305,7 +2305,7 @@ void qt_init_internal( int *argcptr, char **argv, ev_class = event_list_eraser; } if ( dev == NULL ) { - tqWarning( "Failed to open device" ); + qWarning( "Failed to open device" ); } else { if ( dev->num_classes > 0 ) { for ( ip = dev->classes, j = 0; j < devs->num_classes; @@ -2689,7 +2689,7 @@ static GC create_gc( int scrn, bool monochrome ) GC qt_xget_readonly_gc( int scrn, bool monochrome ) // get read-only GC { if ( scrn < 0 || scrn >= appScreenCount ) { - tqDebug("invalid screen %d %d", scrn, appScreenCount ); + qDebug("invalid screen %d %d", scrn, appScreenCount ); QWidget* bla = 0; bla->setName("hello"); } @@ -2713,7 +2713,7 @@ GC qt_xget_readonly_gc( int scrn, bool monochrome ) // get read-only GC GC qt_xget_temp_gc( int scrn, bool monochrome ) // get temporary GC { if ( scrn < 0 || scrn >= appScreenCount ) { - tqDebug("invalid screen (tmp) %d %d", scrn, appScreenCount ); + qDebug("invalid screen (tmp) %d %d", scrn, appScreenCount ); QWidget* bla = 0; bla->setName("hello"); } @@ -2773,7 +2773,7 @@ void QApplication::setMainWidget( QWidget *mainWidget ) #if defined(QT_CHECK_STATE) if ( mainWidget && mainWidget->parentWidget() && ! mainWidget->parentWidget()->isDesktop() ) - tqWarning( "QApplication::setMainWidget(): New main widget (%s/%s) " + qWarning( "QApplication::setMainWidget(): New main widget (%s/%s) " "has a parent!", mainWidget->className(), mainWidget->name() ); #endif @@ -3567,7 +3567,7 @@ int QApplication::x11ProcessEvent( XEvent* event ) case XKeyRelease: { if ( keywidget && keywidget->isEnabled() ) { // should always exist - // tqDebug( "sending key event" ); + // qDebug( "sending key event" ); keywidget->translateKeyEvent( event, grabbed ); } break; @@ -4474,22 +4474,22 @@ bool QETWidget::translateXinputEvent( const XEvent *ev ) } button = (XDeviceButtonEvent*)ev; /* - tqDebug( "\n\nXInput Button Event" ); - tqDebug( "serial:\t%d", button->serial ); - tqDebug( "send_event:\t%d", button->send_event ); - tqDebug( "display:\t%p", button->display ); - tqDebug( "window:\t%d", button->window ); - tqDebug( "deviceID:\t%d", button->deviceid ); - tqDebug( "root:\t%d", button->root ); - tqDebug( "subwindot:\t%d", button->subwindow ); - tqDebug( "x:\t%d", button->x ); - tqDebug( "y:\t%d", button->y ); - tqDebug( "x_root:\t%d", button->x_root ); - tqDebug( "y_root:\t%d", button->y_root ); - tqDebug( "state:\t%d", button->state ); - tqDebug( "button:\t%d", button->button ); - tqDebug( "same_screen:\t%d", button->same_screen ); - tqDebug( "time:\t%d", button->time ); + qDebug( "\n\nXInput Button Event" ); + qDebug( "serial:\t%d", button->serial ); + qDebug( "send_event:\t%d", button->send_event ); + qDebug( "display:\t%p", button->display ); + qDebug( "window:\t%d", button->window ); + qDebug( "deviceID:\t%d", button->deviceid ); + qDebug( "root:\t%d", button->root ); + qDebug( "subwindot:\t%d", button->subwindow ); + qDebug( "x:\t%d", button->x ); + qDebug( "y:\t%d", button->y ); + qDebug( "x_root:\t%d", button->x_root ); + qDebug( "y_root:\t%d", button->y_root ); + qDebug( "state:\t%d", button->state ); + qDebug( "button:\t%d", button->button ); + qDebug( "same_screen:\t%d", button->same_screen ); + qDebug( "time:\t%d", button->time ); */ curr = QPoint( button->x, button->y ); } @@ -5181,7 +5181,7 @@ bool QETWidget::translateKeyEventInternal( const XEvent *event, int& count, keyDict->setAutoDelete( FALSE ); textDict = new QIntDict<void>( 13 ); textDict->setAutoDelete( FALSE ); - tqAddPostRoutine( deleteKeyDicts ); + qAddPostRoutine( deleteKeyDicts ); } QWidget* tlw = topLevelWidget(); @@ -6375,7 +6375,7 @@ static void sm_performSaveYourself( QSessionManagerData* smd ) // generate a restart and discard command that makes sense QStringList restart; restart << qApp->argv()[0] << "-session" << smd->sessionId + "_" + smd->sessionKey; - if (tqstricmp(qAppName(), qAppClass()) != 0) + if (qstricmp(qAppName(), qAppClass()) != 0) restart << "-name" << qAppName(); sm->setRestartCommand( restart ); QStringList discard; @@ -6524,7 +6524,7 @@ QSessionManager::QSessionManager( QApplication * app, QString &id, QString& key QString error = cerror; if (!smcConnection ) { - tqWarning("Session management error: %s", error.latin1() ); + qWarning("Session management error: %s", error.latin1() ); } else { sm_receiver = new QSmSocketReceiver( IceConnectionNumber( SmcGetIceConnection( smcConnection ) ) ); diff --git a/src/kernel/qasyncimageio.cpp b/src/kernel/qasyncimageio.cpp index adfc0da..8ecd1eb 100644 --- a/src/kernel/qasyncimageio.cpp +++ b/src/kernel/qasyncimageio.cpp @@ -304,7 +304,7 @@ public: gif_decoder_factory = new QGIFFormatType; #endif qt_init_image_handlers(); - tqAddPostRoutine( cleanup ); + qAddPostRoutine( cleanup ); } } @@ -438,7 +438,7 @@ QImageFormatType* QImageDecoder::format( const char* name ) f; f = QImageDecoderPrivate::factories->next()) { - if ( tqstricmp(name,f->formatName())==0 ) + if ( qstricmp(name,f->formatName())==0 ) return f; } return 0; diff --git a/src/kernel/qasyncio.cpp b/src/kernel/qasyncio.cpp index 6efea91..b29dfa6 100644 --- a/src/kernel/qasyncio.cpp +++ b/src/kernel/qasyncio.cpp @@ -187,7 +187,7 @@ bool QDataSource::rewindable() const is TRUE, then the data source must take measures to allow the rewind() function to subsequently operate as described. If rewindable() is FALSE, the function should call QDataSource::enableRewind(), which aborts with - a tqFatal() error. + a qFatal() error. For example, a network connection may choose to use a disk cache of input only if rewinding is enabled before the first buffer-full of @@ -196,7 +196,7 @@ bool QDataSource::rewindable() const */ void QDataSource::enableRewind( bool /* on */ ) { - tqFatal( "Attempted to make unrewindable QDataSource rewindable" ); + qFatal( "Attempted to make unrewindable QDataSource rewindable" ); } /*! @@ -205,7 +205,7 @@ void QDataSource::enableRewind( bool /* on */ ) */ void QDataSource::rewind() { - tqFatal("Attempted to rewind unrewindable QDataSource"); + qFatal("Attempted to rewind unrewindable QDataSource"); } /*! diff --git a/src/kernel/qclipboard.cpp b/src/kernel/qclipboard.cpp index e36448e..b02d1ec 100644 --- a/src/kernel/qclipboard.cpp +++ b/src/kernel/qclipboard.cpp @@ -72,7 +72,7 @@ // Copy text from the clipboard (paste) QString text = cb->text(QClipboard::Clipboard); if ( !text.isNull() ) - tqDebug( "The clipboard contains: " + text ); + qDebug( "The clipboard contains: " + text ); // Copy text into the clipboard cb->setText( "This text can be pasted by other programs", diff --git a/src/kernel/qclipboard_x11.cpp b/src/kernel/qclipboard_x11.cpp index b3aadaa..73cdad4 100644 --- a/src/kernel/qclipboard_x11.cpp +++ b/src/kernel/qclipboard_x11.cpp @@ -42,15 +42,15 @@ // #define QCLIPBOARD_DEBUG_VERBOSE #ifdef QCLIPBOARD_DEBUG -# define QDEBUG tqDebug +# define QDEBUG qDebug #else -# define QDEBUG if (FALSE) tqDebug +# define QDEBUG if (FALSE) qDebug #endif #ifdef QCLIPBOARD_DEBUG_VERBOSE -# define VQDEBUG tqDebug +# define VQDEBUG qDebug #else -# define VQDEBUG if (FALSE) tqDebug +# define VQDEBUG if (FALSE) qDebug #endif #include "qplatformdefs.h" @@ -140,7 +140,7 @@ void setupOwner() return; owner = new QWidget( 0, "internal clipboard owner" ); requestor = new QWidget(0, "internal clipboard requestor"); - tqAddPostRoutine( cleanup ); + qAddPostRoutine( cleanup ); } static @@ -239,7 +239,7 @@ static QClipboardData *clipboardData() if ( internalCbData == 0 ) { internalCbData = new QClipboardData; Q_CHECK_PTR( internalCbData ); - tqAddPostRoutine( cleanupClipboardData ); + qAddPostRoutine( cleanupClipboardData ); } return internalCbData; } @@ -261,7 +261,7 @@ static QClipboardData *selectionData() if (internalSelData == 0) { internalSelData = new QClipboardData; Q_CHECK_PTR(internalSelData); - tqAddPostRoutine(cleanupSelectionData); + qAddPostRoutine(cleanupSelectionData); } return internalSelData; } @@ -306,7 +306,7 @@ static int qt_xclb_transation_event_handler(XEvent *event) */ static void qt_xclb_incr_timeout(void) { - tqWarning("QClipboard: timed out while sending data"); + qWarning("QClipboard: timed out while sending data"); while (transactions) delete *transactions->begin(); @@ -482,7 +482,7 @@ bool qt_xclb_wait_for_event( Display *dpy, Window win, int type, XEvent *event, if (qApp->eventLoop()->inherits("QMotif")) { // yes yes, evil hack, we know if ( waiting_for_data ) - tqFatal( "QClipboard: internal error, qt_xclb_wait_for_event recursed" ); + qFatal( "QClipboard: internal error, qt_xclb_wait_for_event recursed" ); waiting_for_data = TRUE; has_captured_event = FALSE; @@ -1061,7 +1061,7 @@ bool QClipboard::event( QEvent *e ) } } else { #ifdef QT_CHECK_STATE - tqWarning("QClipboard: Unknown SelectionClear event received."); + qWarning("QClipboard: Unknown SelectionClear event received."); #endif return FALSE; } @@ -1110,7 +1110,7 @@ bool QClipboard::event( QEvent *e ) d = clipboardData(); } else { #ifdef QT_CHECK_RANGE - tqWarning("QClipboard: unknown selection '%lx'", req->selection); + qWarning("QClipboard: unknown selection '%lx'", req->selection); #endif // QT_CHECK_RANGE XSendEvent(dpy, req->requestor, False, NoEventMask, &event); @@ -1119,7 +1119,7 @@ bool QClipboard::event( QEvent *e ) if (! d->source()) { #ifdef QT_CHECK_STATE - tqWarning("QClipboard: cannot transfer data, no data available"); + qWarning("QClipboard: cannot transfer data, no data available"); #endif // QT_CHECK_STATE XSendEvent(dpy, req->requestor, False, NoEventMask, &event); @@ -1190,7 +1190,7 @@ bool QClipboard::event( QEvent *e ) } else { #ifdef QT_CHECK_STATE - tqWarning("QClipboard: invalid data timestamp"); + qWarning("QClipboard: invalid data timestamp"); #endif // QT_CHECK_STATE } } else if (target == xa_targets) { @@ -1262,7 +1262,7 @@ QClipboardWatcher::QClipboardWatcher( QClipboard::Mode mode ) #ifdef QT_CHECK_RANGE default: - tqWarning( "QClipboardWatcher: internal error, unknown clipboard mode" ); + qWarning( "QClipboardWatcher: internal error, unknown clipboard mode" ); break; #endif // QT_CHECK_RANGE } @@ -1285,7 +1285,7 @@ bool QClipboardWatcher::empty() const #ifdef QT_CHECK_STATE if( win == requestor->winId()) { - tqWarning( "QClipboardWatcher::empty: internal error, app owns the selection" ); + qWarning( "QClipboardWatcher::empty: internal error, app owns the selection" ); return TRUE; } #endif // QT_CHECK_STATE @@ -1371,10 +1371,10 @@ QByteArray QClipboardWatcher::encodedData( const char* fmt ) const Atom fmtatom = 0; - if ( 0==tqstricmp(fmt,"text/plain;charset=iso-8859-1") ) { + if ( 0==qstricmp(fmt,"text/plain;charset=iso-8859-1") ) { // ICCCM section 2.6.2 says STRING is latin1 text fmtatom = XA_STRING; - } else if ( 0==tqstricmp(fmt,"text/plain;charset=utf-8") ) { + } else if ( 0==qstricmp(fmt,"text/plain;charset=utf-8") ) { // proprosed UTF8_STRING conversion type fmtatom = *qt_xdnd_str_to_atom( "UTF8_STRING" ); } else if ( 0==qstrcmp(fmt,"text/plain") ) { @@ -1476,7 +1476,7 @@ QMimeSource* QClipboard::data( Mode mode ) const default: #ifdef QT_CHECK_RANGE - tqWarning( "QClipboard::data: invalid mode '%d'", mode ); + qWarning( "QClipboard::data: invalid mode '%d'", mode ); #endif // QT_CHECK_RANGE return 0; } @@ -1526,7 +1526,7 @@ void QClipboard::setData( QMimeSource* src, Mode mode ) default: #ifdef QT_CHECK_RANGE - tqWarning( "QClipboard::data: invalid mode '%d'", mode ); + qWarning( "QClipboard::data: invalid mode '%d'", mode ); #endif // QT_CHECK_RANGE return; } @@ -1557,7 +1557,7 @@ void QClipboard::setData( QMimeSource* src, Mode mode ) if (XGetSelectionOwner(dpy, atom) != newOwner) { #ifdef QT_CHECK_STATE - tqWarning("QClipboard::setData: Cannot set X11 selection owner for %s", + qWarning("QClipboard::setData: Cannot set X11 selection owner for %s", qt_xdnd_atom_to_str(atom)); #endif // QT_CHECK_STATE diff --git a/src/kernel/qcolor.cpp b/src/kernel/qcolor.cpp index e022d54..309915e 100644 --- a/src/kernel/qcolor.cpp +++ b/src/kernel/qcolor.cpp @@ -564,7 +564,7 @@ void QColor::setNamedColor( const QString &name ) d.d32.argb = Invalid; d.d32.pix = Dirt; #if defined(QT_CHECK_RANGE) - tqWarning( "QColor::setNamedColor: could not parse color '%s'", + qWarning( "QColor::setNamedColor: could not parse color '%s'", name.local8Bit().data() ); #endif } else { @@ -668,7 +668,7 @@ void QColor::setHsv( int h, int s, int v ) { if ( h < -1 || (uint)s > 255 || (uint)v > 255 ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QColor::setHsv: HSV parameters out of range" ); + qWarning( "QColor::setHsv: HSV parameters out of range" ); #endif return; } @@ -745,7 +745,7 @@ void QColor::setRgb( int r, int g, int b ) { if ( (uint)r > 255 || (uint)g > 255 || (uint)b > 255 ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QColor::setRgb: RGB parameter(s) out of range" ); + qWarning( "QColor::setRgb: RGB parameter(s) out of range" ); #endif return; } diff --git a/src/kernel/qcolor_p.cpp b/src/kernel/qcolor_p.cpp index b3fd1b3..266f553 100644 --- a/src/kernel/qcolor_p.cpp +++ b/src/kernel/qcolor_p.cpp @@ -728,7 +728,7 @@ static int __cdecl rgb_cmp( const void *d1, const void *d2 ) static int rgb_cmp( const void *d1, const void *d2 ) #endif { - return tqstricmp( ((RGBData *)d1)->name, ((RGBData *)d2)->name ); + return qstricmp( ((RGBData *)d1)->name, ((RGBData *)d2)->name ); } #if defined(Q_C_CALLBACKS) diff --git a/src/kernel/qcolor_x11.cpp b/src/kernel/qcolor_x11.cpp index 8dc7921..eeaee5e 100644 --- a/src/kernel/qcolor_x11.cpp +++ b/src/kernel/qcolor_x11.cpp @@ -640,7 +640,7 @@ void QColor::setSystemNamedColor( const QString& name ) } } else if ( !color_init ) { #if defined(QT_CHECK_STATE) - tqWarning( "QColor::setSystemNamedColor: Cannot perform this operation " + qWarning( "QColor::setSystemNamedColor: Cannot perform this operation " "because QApplication does not exist" ); #endif // set color to invalid @@ -737,7 +737,7 @@ int QColor::enterAllocContext() init_context_stack(); if ( context_ptr+1 == MAX_CONTEXTS ) { #if defined(QT_CHECK_STATE) - tqWarning( "QColor::enterAllocContext: Context stack overflow" ); + qWarning( "QColor::enterAllocContext: Context stack overflow" ); #endif return 0; } @@ -759,7 +759,7 @@ void QColor::leaveAllocContext() init_context_stack(); if ( context_ptr == 0 ) { #if defined(QT_CHECK_STATE) - tqWarning( "QColor::leaveAllocContext: Context stack underflow" ); + qWarning( "QColor::leaveAllocContext: Context stack underflow" ); #endif return; } diff --git a/src/kernel/qcursor.cpp b/src/kernel/qcursor.cpp index d49c57f..7956a94 100644 --- a/src/kernel/qcursor.cpp +++ b/src/kernel/qcursor.cpp @@ -165,7 +165,7 @@ QDataStream &operator<<( QDataStream &s, const QCursor &c ) s << *c.bitmap() << *c.mask(); s << c.hotSpot(); #else - tqWarning("No Image Cursor I/O"); + qWarning("No Image Cursor I/O"); #endif } return s; @@ -189,7 +189,7 @@ QDataStream &operator>>( QDataStream &s, QCursor &c ) s >> bm >> bmm >> hot; c = QCursor( bm, bmm, hot.x(), hot.y() ); #else - tqWarning("No Image Cursor I/O"); + qWarning("No Image Cursor I/O"); #endif } else { c.setShape( (int)shape ); // create cursor with shape diff --git a/src/kernel/qcursor_x11.cpp b/src/kernel/qcursor_x11.cpp index ec98020..7d359a3 100644 --- a/src/kernel/qcursor_x11.cpp +++ b/src/kernel/qcursor_x11.cpp @@ -166,7 +166,7 @@ void QCursor::initialize() for( shape = 0; shape <= LastCursor; shape++ ) cursorTable[shape].data = new QCursorData( shape ); initialized = TRUE; - tqAddPostRoutine( cleanup ); + qAddPostRoutine( cleanup ); } @@ -234,7 +234,7 @@ void QCursor::setBitmap( const QBitmap &bitmap, const QBitmap &mask, if ( bitmap.depth() != 1 || mask.depth() != 1 || bitmap.size() != mask.size() ) { #if defined(QT_CHECK_NULL) - tqWarning( "QCursor: Cannot create bitmap cursor; invalid bitmap(s)" ); + qWarning( "QCursor: Cannot create bitmap cursor; invalid bitmap(s)" ); #endif QCursor *c = &cursorTable[arrowCursorIdx]; c->data->ref(); @@ -825,7 +825,7 @@ void QCursor::update() const #endif /* QT_USE_APPROXIMATE_CURSORS */ default: #if defined(QT_CHECK_RANGE) - tqWarning( "QCursor::update: Invalid cursor shape %d", d->cshape ); + qWarning( "QCursor::update: Invalid cursor shape %d", d->cshape ); #endif return; } diff --git a/src/kernel/qdnd_x11.cpp b/src/kernel/qdnd_x11.cpp index 0764793..607a358 100644 --- a/src/kernel/qdnd_x11.cpp +++ b/src/kernel/qdnd_x11.cpp @@ -460,7 +460,7 @@ void qt_xdnd_setup() { qt_x11_intern_atom( "QT_SELECTION", &qt_selection_property ); qt_x11_intern_atom( "INCR", &qt_incr_atom ); - tqAddPostRoutine( qt_xdnd_cleanup ); + qAddPostRoutine( qt_xdnd_cleanup ); } @@ -616,7 +616,7 @@ void qt_handle_xdnd_position( QWidget *w, const XEvent * xe, bool passive ) } if ( l[0] != qt_xdnd_dragsource_xid ) { - //tqDebug( "xdnd drag position from unexpected source (%08lx not %08lx)", + //qDebug( "xdnd drag position from unexpected source (%08lx not %08lx)", // l[0], qt_xdnd_dragsource_xid ); return; } @@ -761,7 +761,7 @@ void qt_handle_xdnd_status( QWidget * w, const XEvent * xe, bool /*passive*/ ) void qt_handle_xdnd_leave( QWidget *w, const XEvent * xe, bool /*passive*/ ) { - //tqDebug( "xdnd leave" ); + //qDebug( "xdnd leave" ); if ( !qt_xdnd_current_widget || w->topLevelWidget() != qt_xdnd_current_widget->topLevelWidget() ) { return; // sanity @@ -780,7 +780,7 @@ void qt_handle_xdnd_leave( QWidget *w, const XEvent * xe, bool /*passive*/ ) if ( l[0] != qt_xdnd_dragsource_xid ) { // This often happens - leave other-process window quickly - //tqDebug( "xdnd drag leave from unexpected source (%08lx not %08lx", + //qDebug( "xdnd drag leave from unexpected source (%08lx not %08lx", //l[0], qt_xdnd_dragsource_xid ); qt_xdnd_current_widget = 0; return; @@ -839,10 +839,10 @@ void qt_handle_xdnd_drop( QWidget *, const XEvent * xe, bool passive ) } const unsigned long *l = (const unsigned long *)xe->xclient.data.l; - //tqDebug( "xdnd drop" ); + //qDebug( "xdnd drop" ); if ( l[0] != qt_xdnd_dragsource_xid ) { - //tqDebug( "xdnd drop from unexpected source (%08lx not %08lx", + //qDebug( "xdnd drop from unexpected source (%08lx not %08lx", // l[0], qt_xdnd_dragsource_xid ); return; } @@ -1509,7 +1509,7 @@ bool qt_xdnd_handle_badwindow() bool QDropEvent::provides( const char *mimeType ) const { - if ( qt_motifdnd_active && tqstrnicmp( mimeType, "text/", 5 ) == 0 ) + if ( qt_motifdnd_active && qstrnicmp( mimeType, "text/", 5 ) == 0 ) return TRUE; int n=0; @@ -1519,7 +1519,7 @@ bool QDropEvent::provides( const char *mimeType ) const if ( !f ) return FALSE; n++; - } while( tqstricmp( mimeType, f ) ); + } while( qstricmp( mimeType, f ) ); return TRUE; } @@ -1617,7 +1617,7 @@ static QByteArray qt_xdnd_obtain_data( const char *format ) qt_xdnd_selection, nbytes, FALSE ); } else if ( type != *a ) { - // (includes None) tqDebug( "Qt clipboard: unknown atom %ld", type); + // (includes None) qDebug( "Qt clipboard: unknown atom %ld", type); } #if 0 // this needs to be matched by a qt_xdnd_target_data->clear() diff --git a/src/kernel/qdragobject.cpp b/src/kernel/qdragobject.cpp index 71ee26f..44e340f 100644 --- a/src/kernel/qdragobject.cpp +++ b/src/kernel/qdragobject.cpp @@ -814,7 +814,7 @@ QTextCodec* findcodec(const QMimeSource* e) const char* f; int i; for ( i=0; (f=e->format(i)); i++ ) { - bool html = !tqstrnicmp(f, "text/html", 9); + bool html = !qstrnicmp(f, "text/html", 9); if (html) r = codecForHTML(QCString(e->encodedData(f))); if (!r) @@ -833,7 +833,7 @@ QTextCodec* findcodec(const QMimeSource* e) QByteArray QTextDrag::encodedData(const char* mime) const { QCString r; - if ( 0==tqstrnicmp(mime,"text/",5) ) { + if ( 0==qstrnicmp(mime,"text/",5) ) { QCString m(mime); m = m.lower(); QTextCodec *codec = qt_findcharset(m); @@ -872,7 +872,7 @@ bool QTextDrag::canDecode( const QMimeSource* e ) { const char* f; for (int i=0; (f=e->format(i)); i++) { - if ( 0==tqstrnicmp(f,"text/",5) ) { + if ( 0==qstrnicmp(f,"text/",5) ) { return findcodec(e) != 0; } } @@ -912,7 +912,7 @@ bool QTextDrag::decode( const QMimeSource* e, QString& str, QCString& subtype ) const char* mime; for (int i=0; (mime = e->format(i)); i++) { - if ( 0==tqstrnicmp(mime,"text/",5) ) { + if ( 0==qstrnicmp(mime,"text/",5) ) { QCString m(mime); m = m.lower(); int semi = m.find(';'); @@ -920,7 +920,7 @@ bool QTextDrag::decode( const QMimeSource* e, QString& str, QCString& subtype ) semi = m.length(); QCString foundst = m.mid(5,semi-5); if ( subtype.isNull() || foundst == subtype ) { - bool html = !tqstrnicmp(mime, "text/html", 9); + bool html = !qstrnicmp(mime, "text/html", 9); QTextCodec* codec = 0; if (html) { QByteArray bytes = e->encodedData(mime); @@ -1087,7 +1087,7 @@ const char * QImageDrag::format(int i) const */ QByteArray QImageDrag::encodedData(const char* fmt) const { - if ( tqstrnicmp( fmt, "image/", 6 )==0 ) { + if ( qstrnicmp( fmt, "image/", 6 )==0 ) { QCString f = fmt+6; QByteArray data; QBuffer w( data ); @@ -1233,7 +1233,7 @@ QStoredDrag::QStoredDrag( const char* mimeType, QWidget * dragSource, const char QDragObject(dragSource,name) { d = new QStoredDragData(); - d->fmt = tqstrdup(mimeType); + d->fmt = qstrdup(mimeType); } /*! @@ -1278,7 +1278,7 @@ void QStoredDrag::setEncodedData( const QByteArray & encodedData ) */ QByteArray QStoredDrag::encodedData(const char* m) const { - if ( !tqstricmp(m,d->fmt) ) + if ( !qstricmp(m,d->fmt) ) return d->enc; else return QByteArray(); @@ -1588,7 +1588,7 @@ QString QUriDrag::uriToLocalFile(const char* uri) if (!uri) return file; - if (0==tqstrnicmp(uri,"file:/",6)) // It is a local file uri + if (0==qstrnicmp(uri,"file:/",6)) // It is a local file uri uri += 6; else if (QString(uri).find(":/") != -1) // It is a different scheme uri return file; diff --git a/src/kernel/qdrawutil.cpp b/src/kernel/qdrawutil.cpp index 0db4ebd..bcac422 100644 --- a/src/kernel/qdrawutil.cpp +++ b/src/kernel/qdrawutil.cpp @@ -86,7 +86,7 @@ void qDrawShadeLine( QPainter *p, int x1, int y1, int x2, int y2, { if (!( p && lineWidth >= 0 && midLineWidth >= 0 ) ) { #if defined(QT_CHECK_RANGE) - tqWarning( "qDrawShadeLine invalid parameters." ); + qWarning( "qDrawShadeLine invalid parameters." ); #endif return; } @@ -209,7 +209,7 @@ void qDrawShadeRect( QPainter *p, int x, int y, int w, int h, return; if ( ! ( w > 0 && h > 0 && lineWidth >= 0 && midLineWidth >= 0 ) ) { #if defined(QT_CHECK_RANGE) - tqWarning( "qDrawShadeRect(): Invalid parameters" ); + qWarning( "qDrawShadeRect(): Invalid parameters" ); #endif return; } @@ -309,7 +309,7 @@ void qDrawShadePanel( QPainter *p, int x, int y, int w, int h, return; if ( !( w > 0 && h > 0 && lineWidth >= 0 ) ) { #if defined(QT_CHECK_RANGE) - tqWarning( "qDrawShadePanel() Invalid parameters." ); + qWarning( "qDrawShadePanel() Invalid parameters." ); #endif } QColor shade = g.dark(); @@ -538,7 +538,7 @@ void qDrawPlainRect( QPainter *p, int x, int y, int w, int h, const QColor &c, return; if ( !( w > 0 && h > 0 && lineWidth >= 0 ) ) { #if defined(QT_CHECK_RANGE) - tqWarning( "qDrawPlainRect() Invalid parameters." ); + qWarning( "qDrawPlainRect() Invalid parameters." ); #endif } QPen oldPen = p->pen(); @@ -948,7 +948,7 @@ void qDrawArrow( QPainter *p, Qt::ArrowType type, Qt::GUIStyle style, bool down, #endif default: #if defined(QT_CHECK_RANGE) - tqWarning( "qDrawArrow: Requested GUI style not supported" ); + qWarning( "qDrawArrow: Requested GUI style not supported" ); #else ; #endif diff --git a/src/kernel/qeventloop.cpp b/src/kernel/qeventloop.cpp index 2aef262..1f6a130 100644 --- a/src/kernel/qeventloop.cpp +++ b/src/kernel/qeventloop.cpp @@ -101,7 +101,7 @@ QEventLoop::QEventLoop( QObject *parent, const char *name ) { #if defined(QT_CHECK_STATE) if ( QApplication::eventloop ) - tqFatal( "QEventLoop: there must be only one event loop object. \nConstruct it before QApplication." ); + qFatal( "QEventLoop: there must be only one event loop object. \nConstruct it before QApplication." ); // for now ;) #endif // QT_CHECK_STATE diff --git a/src/kernel/qeventloop_unix.cpp b/src/kernel/qeventloop_unix.cpp index 63940ec..743eb1d 100644 --- a/src/kernel/qeventloop_unix.cpp +++ b/src/kernel/qeventloop_unix.cpp @@ -184,7 +184,7 @@ static void insertTimer( const TimerInfo *ti ) // insert timer info into list timerList->insert( index, ti ); // inserts sorted #if defined(QT_DEBUG) if ( dangerCount > 16 ) - tqDebug( "QObject: %d timers now exist for object %s::%s", + qDebug( "QObject: %d timers now exist for object %s::%s", dangerCount, ti->obj->className(), ti->obj->name() ); #endif } @@ -367,7 +367,7 @@ void QEventLoop::registerSocketNotifier( QSocketNotifier *notifier ) int type = notifier->type(); if ( sockfd < 0 || sockfd >= FD_SETSIZE || type < 0 || type > 2 || notifier == 0 ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QSocketNotifier: Internal error" ); + qWarning( "QSocketNotifier: Internal error" ); #endif return; } @@ -399,7 +399,7 @@ void QEventLoop::registerSocketNotifier( QSocketNotifier *notifier ) #if defined(QT_CHECK_STATE) if ( p && p->fd == sockfd ) { static const char *t[] = { "read", "write", "exception" }; - tqWarning( "QSocketNotifier: Multiple socket notifiers for " + qWarning( "QSocketNotifier: Multiple socket notifiers for " "same socket %d and type %s", sockfd, t[type] ); } #endif @@ -419,7 +419,7 @@ void QEventLoop::unregisterSocketNotifier( QSocketNotifier *notifier ) int type = notifier->type(); if ( sockfd < 0 || type < 0 || type > 2 || notifier == 0 ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QSocketNotifier: Internal error" ); + qWarning( "QSocketNotifier: Internal error" ); #endif return; } @@ -456,7 +456,7 @@ void QEventLoop::setSocketNotifierPending( QSocketNotifier *notifier ) int type = notifier->type(); if ( sockfd < 0 || type < 0 || type > 2 || notifier == 0 ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QSocketNotifier: Internal error" ); + qWarning( "QSocketNotifier: Internal error" ); #endif return; } diff --git a/src/kernel/qeventloop_x11.cpp b/src/kernel/qeventloop_x11.cpp index fddb906..e3b43a6 100644 --- a/src/kernel/qeventloop_x11.cpp +++ b/src/kernel/qeventloop_x11.cpp @@ -337,7 +337,7 @@ bool QEventLoop::processEvents( ProcessEventsFlags flags ) if (ret == -1 && errno == EBADF) { // disable the invalid socket notifier static const char *t[] = { "Read", "Write", "Exception" }; - tqWarning("QSocketNotifier: invalid socket %d and type '%s', disabling...", + qWarning("QSocketNotifier: invalid socket %d and type '%s', disabling...", sn->fd, t[type]); sn->obj->setEnabled(FALSE); } diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp index a4a998b..66ba453 100644 --- a/src/kernel/qfont.cpp +++ b/src/kernel/qfont.cpp @@ -63,9 +63,9 @@ // #define QFONTCACHE_DEBUG #ifdef QFONTCACHE_DEBUG -# define FC_DEBUG tqDebug +# define FC_DEBUG qDebug #else -# define FC_DEBUG if (FALSE) tqDebug +# define FC_DEBUG if (FALSE) qDebug #endif @@ -733,7 +733,7 @@ void QFont::setPointSize( int pointSize ) if ( pointSize <= 0 ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QFont::setPointSize: Point size <= 0 (%d)", pointSize ); + qWarning( "QFont::setPointSize: Point size <= 0 (%d)", pointSize ); #endif return; @@ -758,7 +758,7 @@ void QFont::setPointSizeFloat( float pointSize ) { if ( pointSize <= 0.0 ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QFont::setPointSize: Point size <= 0 (%f)", pointSize ); + qWarning( "QFont::setPointSize: Point size <= 0 (%f)", pointSize ); #endif return; } @@ -795,7 +795,7 @@ void QFont::setPixelSize( int pixelSize ) { if ( pixelSize <= 0 ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QFont::setPixelSize: Pixel size <= 0 (%d)", pixelSize ); + qWarning( "QFont::setPixelSize: Pixel size <= 0 (%d)", pixelSize ); #endif return; } @@ -892,7 +892,7 @@ void QFont::setWeight( int weight ) if ( weight < 0 || weight > 99 ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QFont::setWeight: Value out of range (%d)", weight ); + qWarning( "QFont::setWeight: Value out of range (%d)", weight ); #endif return; @@ -1203,7 +1203,7 @@ void QFont::setStretch( int factor ) { if ( factor < 1 || factor > 4000 ) { #ifdef QT_CHECK_RANGE - tqWarning( "QFont::setStretch(): parameter '%d' out of range", factor ); + qWarning( "QFont::setStretch(): parameter '%d' out of range", factor ); #endif // QT_CHECK_RANGE return; @@ -1658,7 +1658,7 @@ bool QFont::fromString(const QString &descrip) if ( !count || ( count > 2 && count < 9 ) || count > 11 ) { #ifdef QT_CHECK_STATE - tqWarning("QFont::fromString: invalid description '%s'", + qWarning("QFont::fromString: invalid description '%s'", descrip.isEmpty() ? "(empty)" : descrip.latin1()); #endif @@ -1917,7 +1917,7 @@ QFontMetrics::QFontMetrics( const QPainter *p ) { #if defined(CHECK_STATE) if ( !painter->isActive() ) - tqWarning( "QFontMetrics: Get font metrics between QPainter::begin() " + qWarning( "QFontMetrics: Get font metrics between QPainter::begin() " "and QPainter::end()" ); #endif @@ -2676,7 +2676,7 @@ QFontInfo::QFontInfo( const QPainter *p ) #if defined(CHECK_STATE) if ( !painter->isActive() ) - tqWarning( "QFontInfo: Get font info between QPainter::begin() " + qWarning( "QFontInfo: Get font info between QPainter::begin() " "and QPainter::end()" ); #endif diff --git a/src/kernel/qfont_x11.cpp b/src/kernel/qfont_x11.cpp index b14d953..fea0b58 100644 --- a/src/kernel/qfont_x11.cpp +++ b/src/kernel/qfont_x11.cpp @@ -350,7 +350,7 @@ void QFontPrivate::load( QFont::Script script ) #ifdef QT_CHECK_STATE // sanity checks if (!QFontCache::instance) - tqWarning("Must construct a QApplication before a QFont"); + qWarning("Must construct a QApplication before a QFont"); Q_ASSERT( script >= 0 && script < QFont::LastPrivateScript ); #endif // QT_CHECK_STATE @@ -521,7 +521,7 @@ void QFont::setRawName( const QString &name ) if ( ! qt_fillFontDef( qt_fixXLFD( name.latin1() ), &d->request, d->screen ) ) { #ifdef QT_CHECK_STATE - tqWarning("QFont::setRawName(): Invalid XLFD: \"%s\"", name.latin1()); + qWarning("QFont::setRawName(): Invalid XLFD: \"%s\"", name.latin1()); #endif // QT_CHECK_STATE setFamily( name ); @@ -650,7 +650,7 @@ QString QFont::lastResortFont() const } #if defined(CHECK_NULL) - tqFatal( "QFontPrivate::lastResortFont: Cannot find any reasonable font" ); + qFatal( "QFontPrivate::lastResortFont: Cannot find any reasonable font" ); #endif return last; diff --git a/src/kernel/qfontdatabase.cpp b/src/kernel/qfontdatabase.cpp index 8639190..e326657 100644 --- a/src/kernel/qfontdatabase.cpp +++ b/src/kernel/qfontdatabase.cpp @@ -57,16 +57,16 @@ //#define QFONTDATABASE_DEBUG #ifdef QFONTDATABASE_DEBUG -# define FD_DEBUG tqDebug +# define FD_DEBUG qDebug #else -# define FD_DEBUG if (FALSE) tqDebug +# define FD_DEBUG if (FALSE) qDebug #endif //#define FONT_MATCH_DEBUG #ifdef FONT_MATCH_DEBUG -# define FM_DEBUG tqDebug +# define FM_DEBUG qDebug #else -# define FM_DEBUG if (FALSE) tqDebug +# define FM_DEBUG if (FALSE) qDebug #endif #if defined(Q_CC_MSVC) && !defined(Q_CC_MSVC_NET) @@ -307,7 +307,7 @@ QtFontStyle *QtFontFoundry::style( const QtFontStyle::Key &key, bool create ) if ( !create ) return 0; -// tqDebug("adding key (weight=%d, italic=%d, oblique=%d stretch=%d) at %d", key.weight, key.italic, key.oblique, key.stretch, pos ); +// qDebug("adding key (weight=%d, italic=%d, oblique=%d stretch=%d) at %d", key.weight, key.italic, key.oblique, key.stretch, pos ); if ( !(count % 8) ) styles = (QtFontStyle **) realloc( styles, (((count+8) >> 3 ) << 3) * sizeof( QtFontStyle * ) ); @@ -439,7 +439,7 @@ QtFontFamily *QFontDatabasePrivate::family( const QString &f, bool create ) if ( res < 0 ) pos++; - // tqDebug("adding family %s at %d total=%d", f.latin1(), pos, count); + // qDebug("adding family %s at %d total=%d", f.latin1(), pos, count); if ( !(count % 8) ) families = (QtFontFamily **) realloc( families, @@ -1343,7 +1343,7 @@ int main( int argc, char **argv ) QStringList families = fdb.families(); for ( QStringList::Iterator f = families.begin(); f != families.end(); ++f ) { QString family = *f; - tqDebug( family ); + qDebug( family ); QStringList styles = fdb.styles( family ); for ( QStringList::Iterator s = styles.begin(); s != styles.end(); ++s ) { QString style = *s; @@ -1354,7 +1354,7 @@ int main( int argc, char **argv ) dstyle += QString::number( *points ) + " "; } dstyle = dstyle.left( dstyle.length() - 1 ) + ")"; - tqDebug( dstyle ); + qDebug( dstyle ); } } return 0; diff --git a/src/kernel/qfontdatabase_x11.cpp b/src/kernel/qfontdatabase_x11.cpp index 18074d4..05bdbb8 100644 --- a/src/kernel/qfontdatabase_x11.cpp +++ b/src/kernel/qfontdatabase_x11.cpp @@ -65,9 +65,9 @@ #endif #ifdef QFONTDATABASE_DEBUG -# define FD_DEBUG tqDebug +# define FD_DEBUG qDebug #else -# define FD_DEBUG if (FALSE) tqDebug +# define FD_DEBUG if (FALSE) qDebug #endif // QFONTDATABASE_DEBUG // from qfont_x11.cpp @@ -450,7 +450,7 @@ const int numEncodings = sizeof( xlfd_encoding ) / sizeof( XlfdEncoding ) - 1; int qt_xlfd_encoding_id( const char *encoding ) { - // tqDebug("looking for encoding id for '%s'", encoding ); + // qDebug("looking for encoding id for '%s'", encoding ); int len = strlen( encoding ); if ( len < 4 ) return -1; @@ -468,11 +468,11 @@ int qt_xlfd_encoding_id( const char *encoding ) const char *n = enc->name; const char *e = encoding; while ( 1 ) { - // tqDebug("bol: *e='%c', *n='%c'", *e, *n ); + // qDebug("bol: *e='%c', *n='%c'", *e, *n ); if ( *e == '\0' ) { if ( *n ) break; - // tqDebug( "found encoding id %d", enc->id ); + // qDebug( "found encoding id %d", enc->id ); return enc->id; } if ( *e == *n ) { @@ -483,12 +483,12 @@ int qt_xlfd_encoding_id( const char *encoding ) if ( *n != '*' ) break; ++n; - // tqDebug("skip: *e='%c', *n='%c'", *e, *n ); + // qDebug("skip: *e='%c', *n='%c'", *e, *n ); while ( *e && *e != *n ) ++e; } } - // tqDebug( "couldn't find encoding %s", encoding ); + // qDebug( "couldn't find encoding %s", encoding ); return -1; } @@ -734,7 +734,7 @@ static void loadXlfds( const char *reqFamily, int encoding_id ) char **fontList = XListFonts( QPaintDevice::x11AppDisplay(), xlfd_pattern.data(), 0xffff, &fontCount ); - // tqDebug("requesting xlfd='%s', got %d fonts", xlfd_pattern.data(), fontCount ); + // qDebug("requesting xlfd='%s', got %d fonts", xlfd_pattern.data(), fontCount ); char *tokens[NFontFields]; @@ -787,9 +787,9 @@ static void loadXlfds( const char *reqFamily, int encoding_id ) QtFontStyle *style = foundry->style( styleKey, TRUE ); delete [] style->weightName; - style->weightName = tqstrdup( tokens[Weight] ); + style->weightName = qstrdup( tokens[Weight] ); delete [] style->setwidthName; - style->setwidthName = tqstrdup( tokens[Width] ); + style->setwidthName = qstrdup( tokens[Width] ); if ( smooth_scalable ) { style->smoothScalable = TRUE; @@ -1095,7 +1095,7 @@ static Q_UINT16 getGlyphIndex( unsigned char *table, Q_UINT16 format, unsigned s if ( unicode < 256 ) return (int) *(table+6+unicode); } else if ( format == 2 ) { - tqWarning("format 2 encoding table for Unicode, not implemented!"); + qWarning("format 2 encoding table for Unicode, not implemented!"); } else if ( format == 4 ) { Q_UINT16 segCountX2 = getUShort( table + 6 ); unsigned char *ends = table + 14; @@ -1137,7 +1137,7 @@ static inline void checkXftCoverage( QtFontFamily *family ) QCString ext = family->fontFilename.mid( family->fontFilename.findRev( '.' ) ).lower(); if ( family->fontFileIndex == 0 && ( ext == ".ttf" || ext == ".otf" ) ) { void *map; - // tqDebug("using own ttf code coverage checking of '%s'!", family->name.latin1() ); + // qDebug("using own ttf code coverage checking of '%s'!", family->name.latin1() ); int fd = open( family->fontFilename.data(), O_RDONLY ); size_t pagesize = getpagesize(); off_t offset = 0; @@ -1152,7 +1152,7 @@ static inline void checkXftCoverage( QtFontFamily *family ) unsigned char *ttf = (unsigned char *)map; Q_UINT32 version = getUInt( ttf ); if ( version != 0x00010000 ) { - // tqDebug("file has wrong version %x", version ); + // qDebug("file has wrong version %x", version ); goto error1; } Q_UINT16 numTables = getUShort( ttf+4 ); @@ -1169,7 +1169,7 @@ static inline void checkXftCoverage( QtFontFamily *family ) } } if ( !cmap_offset ) { - // tqDebug("no cmap found" ); + // qDebug("no cmap found" ); goto error1; } @@ -1186,7 +1186,7 @@ static inline void checkXftCoverage( QtFontFamily *family ) version = getUShort( cmap ); if ( version != 0 ) { - // tqDebug("wrong cmap version" ); + // qDebug("wrong cmap version" ); goto error1; } numTables = getUShort( cmap + 2 ); @@ -1205,7 +1205,7 @@ static inline void checkXftCoverage( QtFontFamily *family ) } if ( !unicode_table ) { - // tqDebug("no unicode table found" ); + // qDebug("no unicode table found" ); goto error1; } @@ -1230,7 +1230,7 @@ static inline void checkXftCoverage( QtFontFamily *family ) } } if ( supported ){ - // tqDebug("font can render script %d", i ); + // qDebug("font can render script %d", i ); family->scripts[i] = QtFontFamily::Supported; } else { family->scripts[i] |= QtFontFamily::UnSupported_Xft; @@ -1451,7 +1451,7 @@ static void initializeDb() else if ( style->bitmapScalable ) FD_DEBUG("\t\t\t\tbitmap scalable" ); if ( style->pixelSizes ) { - tqDebug("\t\t\t\t%d pixel sizes", style->count ); + qDebug("\t\t\t\t%d pixel sizes", style->count ); for ( int z = 0; z < style->count; ++z ) { QtFontSize *size = style->pixelSizes + z; for ( int e = 0; e < size->count; ++e ) { @@ -1809,7 +1809,7 @@ static QFontEngine *loadFontConfigFont(const QFontPrivate *fp, const QFontDef &r double scale = addPatternProps(pattern, key, FALSE, TRUE, fp, request); #ifdef FONT_MATCH_DEBUG - tqDebug("original pattern contains:"); + qDebug("original pattern contains:"); FcPatternPrint(pattern); #endif @@ -1818,7 +1818,7 @@ static QFontEngine *loadFontConfigFont(const QFontPrivate *fp, const QFontDef &r FcConfigSubstitute(0, pattern, FcMatchPattern); XftDefaultSubstitute(QPaintDevice::x11AppDisplay(), QPaintDevice::x11AppScreen(), pattern); -// tqDebug("1: pattern contains:"); +// qDebug("1: pattern contains:"); // FcPatternPrint(pattern); { @@ -1951,7 +1951,7 @@ static QFontEngine *loadFontConfigFont(const QFontPrivate *fp, const QFontDef &r if ( !xftfs ) { // Xft couldn't find a font? - tqDebug("couldn't open fontconfigs chosen font with Xft!!!"); + qDebug("couldn't open fontconfigs chosen font with Xft!!!"); } else { fe = new QFontEngineXft( xftfs, result, 0 ); if (fp->paintdevice diff --git a/src/kernel/qfontengine_x11.cpp b/src/kernel/qfontengine_x11.cpp index c9f5f08..ae27f9a 100644 --- a/src/kernel/qfontengine_x11.cpp +++ b/src/kernel/qfontengine_x11.cpp @@ -139,7 +139,7 @@ static QBitmap transform(Display *dpy, const QBitmap &source, int xoff, int yof bm = QBitmap( w, h, dptr, QImage::systemBitOrder() != QImage::BigEndian ); } else { #if defined(QT_CHECK_RANGE) - tqWarning( "QFontEngineXft::tranform: xform failed"); + qWarning( "QFontEngineXft::tranform: xform failed"); #endif } @@ -266,7 +266,7 @@ void QFontEngineBox::draw( QPainter *p, int x, int y, const QTextEngine *engine, glyph_metrics_t ci = boundingBox( glyphs, offsets, numGlyphs ); p->drawRect( x + ci.x, y + ci.y, ci.width, ci.height ); p->drawRect( x + ci.x, y + 50 + ci.y, ci.width, ci.height ); - tqDebug("bounding rect=%d %d (%d/%d)", ci.x, ci.y, ci.width, ci.height ); + qDebug("bounding rect=%d %d (%d/%d)", ci.x, ci.y, ci.width, ci.height ); p->restore(); int xp = x; int yp = y; @@ -323,7 +323,7 @@ void QFontEngineBox::draw( QPainter *p, int x, int y, const QTextEngine *engine, x += offsets[i].x; y += offsets[i].y; p->drawRect( x + ci.x, y + 50 + ci.y, ci.width, ci.height ); - tqDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d offset=(%d/%d)", i, ci.x, ci.y, ci.width, ci.height, + qDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d offset=(%d/%d)", i, ci.x, ci.y, ci.width, ci.height, ci.xoff, ci.yoff, offsets[i].x, offsets[i].y ); x += ci.xoff; y += ci.yoff; @@ -558,7 +558,7 @@ void QFontEngineXLFD::draw( QPainter *p, int x, int y, const QTextEngine *engine if ( !si->num_glyphs ) return; -// tqDebug("QFontEngineXLFD::draw( %d, %d, numglyphs=%d", x, y, si->num_glyphs ); +// qDebug("QFontEngineXLFD::draw( %d, %d, numglyphs=%d", x, y, si->num_glyphs ); Display *dpy = QPaintDevice::x11AppDisplay(); Qt::HANDLE hd = p->device()->handle(); @@ -633,7 +633,7 @@ void QFontEngineXLFD::draw( QPainter *p, int x, int y, const QTextEngine *engine matrix += ' '; } matrix += ']'; - //tqDebug("m: %2.2f %2.2f %2.2f %2.2f, matrix=%s", p->m11(), p->m12(), p->m21(), p->m22(), matrix.data()); + //qDebug("m: %2.2f %2.2f %2.2f %2.2f, matrix=%s", p->m11(), p->m12(), p->m21(), p->m22(), matrix.data()); xlfd_transformed.replace( pos, endPos-pos, matrix ); x_font_load_error = FALSE; @@ -642,7 +642,7 @@ void QFontEngineXLFD::draw( QPainter *p, int x, int y, const QTextEngine *engine XSync( dpy, FALSE ); XSetErrorHandler( old_handler ); if ( x_font_load_error ) { - //tqDebug( "couldn't load transformed font" ); + //qDebug( "couldn't load transformed font" ); font_id = _fs->fid; xlfd_transformations = XlfdTrUnsupported; } else { @@ -678,7 +678,7 @@ void QFontEngineXLFD::draw( QPainter *p, int x, int y, const QTextEngine *engine glyph_metrics_t ci = boundingBox( glyphs, advances, offsets, si->num_glyphs ); p->drawRect( x + ci.x, y + ci.y, ci.width, ci.height ); p->drawRect( x + ci.x, y + 100 + ci.y, ci.width, ci.height ); - tqDebug("bounding rect=%d %d (%d/%d)", ci.x, ci.y, ci.width, ci.height ); + qDebug("bounding rect=%d %d (%d/%d)", ci.x, ci.y, ci.width, ci.height ); p->restore(); int xp = x; int yp = y; @@ -705,7 +705,7 @@ void QFontEngineXLFD::draw( QPainter *p, int x, int y, const QTextEngine *engine int i = si->num_glyphs; while( i-- ) { advance_t adv = advances[i]; - // tqDebug("advance = %d/%d", adv.x, adv.y ); + // qDebug("advance = %d/%d", adv.x, adv.y ); x += adv; glyph_metrics_t gi = boundingBox( glyphs[i] ); int xp = x-offsets[i].x-gi.xoff; @@ -726,7 +726,7 @@ void QFontEngineXLFD::draw( QPainter *p, int x, int y, const QTextEngine *engine if (!glyphAttributes[i].zeroWidth && xp < SHRT_MAX && xp > SHRT_MIN) XDrawString16(dpy, hd, gc, xp, yp, chars+i, 1 ); advance_t adv = advances[i]; - // tqDebug("advance = %d/%d", adv.x, adv.y ); + // qDebug("advance = %d/%d", adv.x, adv.y ); x += adv; i++; } @@ -760,7 +760,7 @@ void QFontEngineXLFD::draw( QPainter *p, int x, int y, const QTextEngine *engine for ( int i = 0; i < si->num_glyphs; i++ ) { glyph_metrics_t ci = boundingBox( glyphs[i] ); p->drawRect( x + ci.x + offsets[i].x, y + 100 + ci.y + offsets[i].y, ci.width, ci.height ); - tqDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d offs=(%d/%d) advance=(%d/%d)", i, ci.x, ci.y, ci.width, ci.height, + qDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d offs=(%d/%d) advance=(%d/%d)", i, ci.x, ci.y, ci.width, ci.height, ci.xoff, ci.yoff, offsets[i].x, offsets[i].y, advances[i].x, advances[i].y); x += advances[i].x; @@ -1505,10 +1505,10 @@ QFontEngineXft::QFontEngineXft( XftFont *font, XftPattern *pattern, int cmap ) // Xft maps Unicode and adobe roman for us. for (int i = 0; i < _face->num_charmaps; ++i) { FT_CharMap cm = _face->charmaps[i]; -// tqDebug("font has charmap %x", cm->encoding); +// qDebug("font has charmap %x", cm->encoding); if (cm->encoding == ft_encoding_adobe_custom || cm->encoding == ft_encoding_symbol) { -// tqDebug("font has adobe custom or ms symbol charmap"); +// qDebug("font has adobe custom or ms symbol charmap"); _cmap = i; break; } @@ -1855,13 +1855,13 @@ void QFontEngineXft::draw( QPainter *p, int x, int y, const QTextEngine *engine, col.color.alpha = 0xffff; col.pixel = pen.pixel(); #ifdef FONTENGINE_DEBUG - tqDebug("===== drawing %d glyphs reverse=%s ======", si->num_glyphs, si->analysis.bidiLevel % 2?"TRUE":"FALSE" ); + qDebug("===== drawing %d glyphs reverse=%s ======", si->num_glyphs, si->analysis.bidiLevel % 2?"TRUE":"FALSE" ); p->save(); p->setBrush( Qt::white ); glyph_metrics_t ci = boundingBox( glyphs, advances, offsets, si->num_glyphs ); p->drawRect( x + ci.x, y + ci.y, ci.width, ci.height ); p->drawRect( x + ci.x, y + 100 + ci.y, ci.width, ci.height ); - tqDebug("bounding rect=%d %d (%d/%d)", ci.x, ci.y, ci.width, ci.height ); + qDebug("bounding rect=%d %d (%d/%d)", ci.x, ci.y, ci.width, ci.height ); p->restore(); int yp = y; int xp = x; @@ -1895,7 +1895,7 @@ void QFontEngineXft::draw( QPainter *p, int x, int y, const QTextEngine *engine, p->drawRect( x+offsets[i].x+gi.x, y+offsets[i].y+100+gi.y, gi.width, gi.height ); p->drawLine( x+offsets[i].x, y + 150 + 5*i , x+offsets[i].x+advances[i], y + 150 + 5*i ); p->drawLine( x+offsets[i].x, y + 152 + 5*i , x+offsets[i].x+gi.xoff, y + 152 + 5*i ); - tqDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d offs=(%d/%d) advance=%d", i, gi.x, gi.y, gi.width, gi.height, + qDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d offs=(%d/%d) advance=%d", i, gi.x, gi.y, gi.width, gi.height, gi.xoff, gi.yoff, offsets[i].x, offsets[i].y, advances[i]); #endif x += advances[i]; @@ -1915,7 +1915,7 @@ void QFontEngineXft::draw( QPainter *p, int x, int y, const QTextEngine *engine, if (!glyphAttributes[i].zeroWidth && xp < SHRT_MAX && xp > SHRT_MIN) XftDrawString16( draw, &col, fnt, xp, yp, (XftChar16 *) (glyphs+i), 1 ); #endif // QT_XFT2 - // tqDebug("advance = %d/%d", adv.x, adv.y ); + // qDebug("advance = %d/%d", adv.x, adv.y ); x += advances[i]; i++; } @@ -1980,7 +1980,7 @@ void QFontEngineXft::draw( QPainter *p, int x, int y, const QTextEngine *engine, for ( int i = 0; i < si->num_glyphs; i++ ) { glyph_metrics_t ci = boundingBox( glyphs[i] ); p->drawRect( x + ci.x + offsets[i].x, y + 100 + ci.y + offsets[i].y, ci.width, ci.height ); - tqDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d offs=(%d/%d) advance=%d", i, ci.x, ci.y, ci.width, ci.height, + qDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d offs=(%d/%d) advance=%d", i, ci.x, ci.y, ci.width, ci.height, ci.xoff, ci.yoff, offsets[i].x, offsets[i].y, advances[i]); x += advances[i]; } @@ -2208,7 +2208,7 @@ bool QFontEngineXft::canRender( const QChar *string, int len ) QOpenType *QFontEngineXft::openType() const { -// tqDebug("openTypeIface requested!"); +// qDebug("openTypeIface requested!"); if ( _openType ) return _openType; @@ -2390,7 +2390,7 @@ QOpenType::QOpenType(QFontEngineXft *fe) FT_Error error; if ((error = TT_Load_GDEF_Table(face, &gdef))) { #ifdef OT_DEBUG - tqDebug("error loading gdef table: %d", error); + qDebug("error loading gdef table: %d", error); #endif gdef = 0; } @@ -2399,9 +2399,9 @@ QOpenType::QOpenType(QFontEngineXft *fe) gsub = 0; #ifdef OT_DEBUG if (error != FT_Err_Table_Missing) { - tqDebug("error loading gsub table: %d", error); + qDebug("error loading gsub table: %d", error); } else { - tqDebug("face doesn't have a gsub table"); + qDebug("face doesn't have a gsub table"); } #endif } @@ -2409,7 +2409,7 @@ QOpenType::QOpenType(QFontEngineXft *fe) if ((error = TT_Load_GPOS_Table(face, &gpos, gdef))) { gpos = 0; #ifdef OT_DEBUG - tqDebug("error loading gpos table: %d", error); + qDebug("error loading gpos table: %d", error); #endif } @@ -2448,7 +2448,7 @@ bool QOpenType::checkScript(unsigned int script) FT_Error error = TT_GSUB_Select_Script(gsub, tag, &script_index); if (error) { #ifdef OT_DEBUG - tqDebug("could not select script %d in GSub table: %d", (int)script, error); + qDebug("could not select script %d in GSub table: %d", (int)script, error); #endif return FALSE; } @@ -2462,7 +2462,7 @@ bool QOpenType::checkScript(unsigned int script) FT_Error error = TT_GPOS_Select_Script(gpos, script, &script_index); if (error) { #ifdef OT_DEBUG - tqDebug("could not select script in gpos table: %d", error); + qDebug("could not select script in gpos table: %d", error); #endif return FALSE; } @@ -2486,10 +2486,10 @@ void QOpenType::selectScript(unsigned int script, const Features *features) { TTO_FeatureList featurelist = gsub->FeatureList; int numfeatures = featurelist.FeatureCount; - tqDebug("gsub table has %d features", numfeatures); + qDebug("gsub table has %d features", numfeatures); for(int i = 0; i < numfeatures; i++) { TTO_FeatureRecord *r = featurelist.FeatureRecord + i; - tqDebug(" feature '%s'", tag_to_string(r->FeatureTag)); + qDebug(" feature '%s'", tag_to_string(r->FeatureTag)); } } #endif @@ -2498,14 +2498,14 @@ void QOpenType::selectScript(unsigned int script, const Features *features) FT_Error error = TT_GSUB_Select_Script(gsub, tag, &script_index); if (!error) { #ifdef OT_DEBUG - tqDebug("script %s has script index %d", tag_to_string(script), script_index); + qDebug("script %s has script index %d", tag_to_string(script), script_index); #endif while (features->tag) { FT_UShort feature_index; error = TT_GSUB_Select_Feature(gsub, features->tag, script_index, 0xffff, &feature_index); if (!error) { #ifdef OT_DEBUG - tqDebug(" adding feature %s", tag_to_string(features->tag)); + qDebug(" adding feature %s", tag_to_string(features->tag)); #endif TT_GSUB_Add_Feature(gsub, feature_index, features->property); } @@ -2523,12 +2523,12 @@ void QOpenType::selectScript(unsigned int script, const Features *features) { TTO_FeatureList featurelist = gpos->FeatureList; int numfeatures = featurelist.FeatureCount; - tqDebug("gpos table has %d features", numfeatures); + qDebug("gpos table has %d features", numfeatures); for(int i = 0; i < numfeatures; i++) { TTO_FeatureRecord *r = featurelist.FeatureRecord + i; FT_UShort feature_index; TT_GPOS_Select_Feature(gpos, r->FeatureTag, script_index, 0xffff, &feature_index); - tqDebug(" feature '%s'", tag_to_string(r->FeatureTag)); + qDebug(" feature '%s'", tag_to_string(r->FeatureTag)); } } #endif @@ -2553,7 +2553,7 @@ void QOpenType::selectScript(unsigned int script, const Features *features) static void dump_string(OTL_Buffer buffer) { for (uint i = 0; i < buffer->in_length; ++i) { - tqDebug(" %x: cluster=%d", buffer->in_string[i].gindex, buffer->in_string[i].cluster); + qDebug(" %x: cluster=%d", buffer->in_string[i].gindex, buffer->in_string[i].cluster); } } #endif @@ -2575,13 +2575,13 @@ bool QOpenType::shape(QShaperItem *item, const unsigned int *properties) } #ifdef OT_DEBUG - tqDebug("-----------------------------------------"); -// tqDebug("log clusters before shaping:"); + qDebug("-----------------------------------------"); +// qDebug("log clusters before shaping:"); // for (int j = 0; j < length; j++) -// tqDebug(" log[%d] = %d", j, item->log_clusters[j]); - tqDebug("original glyphs: %p", item->glyphs); +// qDebug(" log[%d] = %d", j, item->log_clusters[j]); + qDebug("original glyphs: %p", item->glyphs); for (int i = 0; i < length; ++i) - tqDebug(" glyph=%4x", otl_buffer->in_string[i].gindex); + qDebug(" glyph=%4x", otl_buffer->in_string[i].gindex); // dump_string(otl_buffer); #endif @@ -2594,13 +2594,13 @@ bool QOpenType::shape(QShaperItem *item, const unsigned int *properties) } #ifdef OT_DEBUG -// tqDebug("log clusters before shaping:"); +// qDebug("log clusters before shaping:"); // for (int j = 0; j < length; j++) -// tqDebug(" log[%d] = %d", j, item->log_clusters[j]); - tqDebug("shaped glyphs:"); +// qDebug(" log[%d] = %d", j, item->log_clusters[j]); + qDebug("shaped glyphs:"); for (int i = 0; i < length; ++i) - tqDebug(" glyph=%4x", otl_buffer->in_string[i].gindex); - tqDebug("-----------------------------------------"); + qDebug(" glyph=%4x", otl_buffer->in_string[i].gindex); + qDebug("-----------------------------------------"); // dump_string(otl_buffer); #endif @@ -2643,7 +2643,7 @@ bool QOpenType::positionAndAdd(QShaperItem *item, bool doLogClusters) int oldCi = 0; for (unsigned int i = 0; i < otl_buffer->in_length; ++i) { int ci = otl_buffer->in_string[i].cluster; - // tqDebug(" ci[%d] = %d mark=%d, cmb=%d, cs=%d", + // qDebug(" ci[%d] = %d mark=%d, cmb=%d, cs=%d", // i, ci, glyphAttributes[i].mark, glyphAttributes[i].combiningClass, glyphAttributes[i].clusterStart); if (!item->attributes[i].mark && item->attributes[i].clusterStart && ci != oldCi) { for (int j = oldCi; j < ci; j++) @@ -2657,7 +2657,7 @@ bool QOpenType::positionAndAdd(QShaperItem *item, bool doLogClusters) } // calulate the advances for the shaped glyphs -// tqDebug("unpositioned: "); +// qDebug("unpositioned: "); static_cast<QFontEngineXft *>(item->font)->recalcAdvances(item->num_glyphs, item->glyphs, item->advances); // positioning code: @@ -2665,9 +2665,9 @@ bool QOpenType::positionAndAdd(QShaperItem *item, bool doLogClusters) float scale = item->font->scale(); OTL_Position positions = otl_buffer->positions; -// tqDebug("positioned glyphs:"); +// qDebug("positioned glyphs:"); for (unsigned int i = 0; i < otl_buffer->in_length; i++) { -// tqDebug(" %d:\t orig advance: (%d/%d)\tadv=(%d/%d)\tpos=(%d/%d)\tback=%d\tnew_advance=%d", i, +// qDebug(" %d:\t orig advance: (%d/%d)\tadv=(%d/%d)\tpos=(%d/%d)\tback=%d\tnew_advance=%d", i, // glyphs[i].advance.x.toInt(), glyphs[i].advance.y.toInt(), // (int)(positions[i].x_advance >> 6), (int)(positions[i].y_advance >> 6), // (int)(positions[i].x_pos >> 6), (int)(positions[i].y_pos >> 6), @@ -2695,7 +2695,7 @@ bool QOpenType::positionAndAdd(QShaperItem *item, bool doLogClusters) --back; } } -// tqDebug(" ->\tadv=%d\tpos=(%d/%d)", +// qDebug(" ->\tadv=%d\tpos=(%d/%d)", // glyphs[i].advance.x.toInt(), glyphs[i].offset.x.toInt(), glyphs[i].offset.y.toInt()); } item->has_positioning = TRUE; @@ -2705,18 +2705,18 @@ bool QOpenType::positionAndAdd(QShaperItem *item, bool doLogClusters) #ifdef OT_DEBUG // if (doLogClusters) { -// tqDebug("log clusters after shaping:"); +// qDebug("log clusters after shaping:"); // for (int j = 0; j < length; j++) -// tqDebug(" log[%d] = %d", j, item->log_clusters[j]); +// qDebug(" log[%d] = %d", j, item->log_clusters[j]); // } - tqDebug("final glyphs:"); + qDebug("final glyphs:"); for (int i = 0; i < (int)otl_buffer->in_length; ++i) - tqDebug(" glyph=%4x char_index=%d mark: %d cmp: %d, clusterStart: %d advance=%d offset=%d/%d", + qDebug(" glyph=%4x char_index=%d mark: %d cmp: %d, clusterStart: %d advance=%d offset=%d/%d", item->glyphs[i], otl_buffer->in_string[i].cluster, item->attributes[i].mark, item->attributes[i].combiningClass, item->attributes[i].clusterStart, item->advances[i], item->offsets[i].x, item->offsets[i].y); - tqDebug("-----------------------------------------"); + qDebug("-----------------------------------------"); #endif return TRUE; } diff --git a/src/kernel/qguardedptr.cpp b/src/kernel/qguardedptr.cpp index a42f073..0d51e96 100644 --- a/src/kernel/qguardedptr.cpp +++ b/src/kernel/qguardedptr.cpp @@ -68,7 +68,7 @@ if ( label) label->show(); else - tqDebug("The label has been destroyed"); + qDebug("The label has been destroyed"); \endcode The program will output \c{The label has been destroyed} rather diff --git a/src/kernel/qimage.cpp b/src/kernel/qimage.cpp index 3984e67..b55a0e7 100644 --- a/src/kernel/qimage.cpp +++ b/src/kernel/qimage.cpp @@ -427,9 +427,9 @@ QImage::QImage( const char * const xpm[] ) #ifndef QT_NO_IMAGEIO_XPM read_xpm_image_or_array( 0, xpm, *this ); #else - // We use a tqFatal rather than disabling the whole function, as this + // We use a qFatal rather than disabling the whole function, as this // constructor may be ambiguous. - tqFatal("XPM not supported"); + qFatal("XPM not supported"); #endif } @@ -588,7 +588,7 @@ QImage QImage::fromMimeSource( const QString &abs_name ) const QMimeSource *m = QMimeSourceFactory::defaultFactory()->data( abs_name ); if ( !m ) { #if defined(QT_CHECK_STATE) - tqWarning("QImage::fromMimeSource: Cannot find image \"%s\" in the mime source factory", abs_name.latin1() ); + qWarning("QImage::fromMimeSource: Cannot find image \"%s\" in the mime source factory", abs_name.latin1() ); #endif return QImage(); } @@ -944,7 +944,7 @@ QImage QImage::copy(int x, int y, int w, int h, int conversion_flags) const void QImage::warningIndexRange( const char *func, int i ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QImage::%s: Index %d out of range", func, i ); + qWarning( "QImage::%s: Index %d out of range", func, i ); #else Q_UNUSED( func ) Q_UNUSED( i ) @@ -1091,7 +1091,7 @@ QImage::Endian QImage::systemByteOrder() if ( sbo == IgnoreEndian ) { // initialize int ws; bool be; - tqSysInfo( &ws, &be ); + qSysInfo( &ws, &be ); sbo = be ? BigEndian : LittleEndian; } return sbo; @@ -1242,7 +1242,7 @@ bool QImage::create( int width, int height, int depth, int numColors, return FALSE; // invalid parameter(s) if ( depth == 1 && bitOrder == IgnoreEndian ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QImage::create: Bit order is required for 1 bpp images" ); + qWarning( "QImage::create: Bit order is required for 1 bpp images" ); #endif return FALSE; } @@ -1251,7 +1251,7 @@ bool QImage::create( int width, int height, int depth, int numColors, #if defined(QT_CHECK_RANGE) if ( depth == 24 ) - tqWarning( "QImage::create: 24-bpp images no longer supported, " + qWarning( "QImage::create: 24-bpp images no longer supported, " "use 32-bpp instead" ); #endif switch ( depth ) { @@ -2162,9 +2162,9 @@ QImage QImage::convertDepth( int depth, int conversion_flags ) const else { #if defined(QT_CHECK_RANGE) if ( isNull() ) - tqWarning( "QImage::convertDepth: Image is a null image" ); + qWarning( "QImage::convertDepth: Image is a null image" ); else - tqWarning( "QImage::convertDepth: Depth %d not supported", depth ); + qWarning( "QImage::convertDepth: Depth %d not supported", depth ); #endif } return image; @@ -2206,7 +2206,7 @@ int QImage::pixelIndex( int x, int y ) const { #if defined(QT_CHECK_RANGE) if ( x < 0 || x >= width() ) { - tqWarning( "QImage::pixel: x=%d out of range", x ); + qWarning( "QImage::pixel: x=%d out of range", x ); return -12345; } #endif @@ -2225,7 +2225,7 @@ int QImage::pixelIndex( int x, int y ) const #endif case 32: #if defined(QT_CHECK_RANGE) - tqWarning( "QImage::pixelIndex: Not applicable for %d-bpp images " + qWarning( "QImage::pixelIndex: Not applicable for %d-bpp images " "(no palette)", depth() ); #endif return 0; @@ -2248,7 +2248,7 @@ QRgb QImage::pixel( int x, int y ) const { #if defined(QT_CHECK_RANGE) if ( x < 0 || x >= width() ) { - tqWarning( "QImage::pixel: x=%d out of range", x ); + qWarning( "QImage::pixel: x=%d out of range", x ); return 12345; } #endif @@ -2292,7 +2292,7 @@ void QImage::setPixel( int x, int y, uint index_or_rgb ) { if ( x < 0 || x >= width() ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QImage::setPixel: x=%d out of range", x ); + qWarning( "QImage::setPixel: x=%d out of range", x ); #endif return; } @@ -2300,7 +2300,7 @@ void QImage::setPixel( int x, int y, uint index_or_rgb ) uchar * s = scanLine( y ); if ( index_or_rgb > 1) { #if defined(QT_CHECK_RANGE) - tqWarning( "QImage::setPixel: index=%d out of range", + qWarning( "QImage::setPixel: index=%d out of range", index_or_rgb ); #endif } else if ( bitOrder() == QImage::LittleEndian ) { @@ -2317,7 +2317,7 @@ void QImage::setPixel( int x, int y, uint index_or_rgb ) } else if ( depth() == 8 ) { if (index_or_rgb > (uint)numColors()) { #if defined(QT_CHECK_RANGE) - tqWarning( "QImage::setPixel: index=%d out of range", + qWarning( "QImage::setPixel: index=%d out of range", index_or_rgb ); #endif return; @@ -2789,7 +2789,7 @@ QImage QImage::smoothScale( const QSize& s, ScaleMode mode ) const { if ( isNull() ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QImage::smoothScale: Image is a null image" ); + qWarning( "QImage::smoothScale: Image is a null image" ); #endif return copy(); } @@ -2854,7 +2854,7 @@ QImage QImage::scale( const QSize& s, ScaleMode mode ) const { if ( isNull() ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QImage::scale: Image is a null image" ); + qWarning( "QImage::scale: Image is a null image" ); #endif return copy(); } @@ -2892,7 +2892,7 @@ QImage QImage::scaleWidth( int w ) const { if ( isNull() ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QImage::scaleWidth: Image is a null image" ); + qWarning( "QImage::scaleWidth: Image is a null image" ); #endif return copy(); } @@ -2921,7 +2921,7 @@ QImage QImage::scaleHeight( int h ) const { if ( isNull() ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QImage::scaleHeight: Image is a null image" ); + qWarning( "QImage::scaleHeight: Image is a null image" ); #endif return copy(); } @@ -3336,7 +3336,7 @@ QImage QImage::swapRGB() const } #ifndef QT_NO_IMAGE_16_BIT } else if ( depth() == 16 ) { - tqWarning( "QImage::swapRGB not implemented for 16bpp" ); + qWarning( "QImage::swapRGB not implemented for 16bpp" ); #endif } else #endif //QT_NO_IMAGE_TRUECOLOR @@ -3562,7 +3562,7 @@ bool QImage::doImageIO( QImageIO* io, int quality ) const io->setImage( *this ); #if defined(QT_CHECK_RANGE) if ( quality > 100 || quality < -1 ) - tqWarning( "QPixmap::save: quality out of range [-1,100]" ); + qWarning( "QPixmap::save: quality out of range [-1,100]" ); #endif if ( quality >= 0 ) io->setQuality( QMIN(quality,100) ); @@ -3899,7 +3899,7 @@ void qt_init_image_handlers() // initialize image handlers imageHandlers = new QIHList; Q_CHECK_PTR( imageHandlers ); imageHandlers->setAutoDelete( TRUE ); - tqAddPostRoutine( cleanup ); + qAddPostRoutine( cleanup ); #ifndef QT_NO_IMAGEIO_BMP QImageIO::defineIOHandler( "BMP", "^BM", 0, read_bmp_image, write_bmp_image ); @@ -4199,7 +4199,7 @@ void QImageIO::setParameters( const char *parameters ) { if ( d && d->parameters ) delete [] (char*)d->parameters; - d->parameters = tqstrdup( parameters ); + d->parameters = qstrdup( parameters ); } /*! @@ -4502,7 +4502,7 @@ bool QImageIO::write() } if ( !h || !h->write_image ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QImageIO::write: No such image format handler: %s", + qWarning( "QImageIO::write: No such image format handler: %s", format() ); #endif return FALSE; @@ -4637,19 +4637,19 @@ bool read_dib( QDataStream& s, int offset, int startpos, QImage& image ) if ( d->atEnd() ) // end of stream/file return FALSE; #if 0 - tqDebug( "offset...........%d", offset ); - tqDebug( "startpos.........%d", startpos ); - tqDebug( "biSize...........%d", bi.biSize ); - tqDebug( "biWidth..........%d", bi.biWidth ); - tqDebug( "biHeight.........%d", bi.biHeight ); - tqDebug( "biPlanes.........%d", bi.biPlanes ); - tqDebug( "biBitCount.......%d", bi.biBitCount ); - tqDebug( "biCompression....%d", bi.biCompression ); - tqDebug( "biSizeImage......%d", bi.biSizeImage ); - tqDebug( "biXPelsPerMeter..%d", bi.biXPelsPerMeter ); - tqDebug( "biYPelsPerMeter..%d", bi.biYPelsPerMeter ); - tqDebug( "biClrUsed........%d", bi.biClrUsed ); - tqDebug( "biClrImportant...%d", bi.biClrImportant ); + qDebug( "offset...........%d", offset ); + qDebug( "startpos.........%d", startpos ); + qDebug( "biSize...........%d", bi.biSize ); + qDebug( "biWidth..........%d", bi.biWidth ); + qDebug( "biHeight.........%d", bi.biHeight ); + qDebug( "biPlanes.........%d", bi.biPlanes ); + qDebug( "biBitCount.......%d", bi.biBitCount ); + qDebug( "biCompression....%d", bi.biCompression ); + qDebug( "biSizeImage......%d", bi.biSizeImage ); + qDebug( "biXPelsPerMeter..%d", bi.biXPelsPerMeter ); + qDebug( "biYPelsPerMeter..%d", bi.biYPelsPerMeter ); + qDebug( "biClrUsed........%d", bi.biClrUsed ); + qDebug( "biClrImportant...%d", bi.biClrImportant ); #endif int w = bi.biWidth, h = bi.biHeight, nbits = bi.biBitCount; int t = bi.biSize, comp = bi.biCompression; @@ -5758,7 +5758,7 @@ static void read_xpm_image_or_array( QImageIO * iio, const char * const * source for( currentColor=0; currentColor < ncols; ++currentColor ) { if ( !read_xpm_string( buf, d, source, index ) ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QImage: XPM color specification missing"); + qWarning( "QImage: XPM color specification missing"); #endif return; } @@ -5769,7 +5769,7 @@ static void read_xpm_image_or_array( QImageIO * iio, const char * const * source i = nextColorSpec(buf); if ( i < 0 ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QImage: XPM color specification is missing: %s", buf.data()); + qWarning( "QImage: XPM color specification is missing: %s", buf.data()); #endif return; // no c/g/g4/m/s specification at all } @@ -5809,7 +5809,7 @@ static void read_xpm_image_or_array( QImageIO * iio, const char * const * source for( int y=0; y<h; y++ ) { if ( !read_xpm_string( buf, d, source, index ) ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QImage: XPM pixels missing on image line %d", y); + qWarning( "QImage: XPM pixels missing on image line %d", y); #endif return; } @@ -6478,7 +6478,7 @@ QGfx * QImage::graphicsContext() int h = qt_screen->mapToDevice( QSize(width(),height()) ).height(); ret=QGfx::createGfx(depth(),bits(),w,h,bytesPerLine()); } else { - tqDebug("Trying to create image for null depth"); + qDebug("Trying to create image for null depth"); return 0; } if(depth()<=8) { diff --git a/src/kernel/qinputcontext.cpp b/src/kernel/qinputcontext.cpp index 62c8570..5433ae4 100644 --- a/src/kernel/qinputcontext.cpp +++ b/src/kernel/qinputcontext.cpp @@ -526,15 +526,15 @@ void QInputContext::sendIMEventInternal( QEvent::Type type, return; if ( type == QEvent::IMStart ) { - tqDebug( "sending IMStart with %d chars to %p", + qDebug( "sending IMStart with %d chars to %p", text.length(), receiver ); event = new QIMEvent( type, text, cursorPosition ); } else if ( type == QEvent::IMEnd ) { - tqDebug( "sending IMEnd with %d chars to %p, text=%s", + qDebug( "sending IMEnd with %d chars to %p, text=%s", text.length(), receiver, (const char*)text.local8Bit() ); event = new QIMEvent( type, text, cursorPosition ); } else if ( type == QEvent::IMCompose ) { - tqDebug( "sending IMCompose to %p with %d chars, cpos=%d, sellen=%d, text=%s", + qDebug( "sending IMCompose to %p with %d chars, cpos=%d, sellen=%d, text=%s", receiver, text.length(), cursorPosition, selLength, (const char*)text.local8Bit() ); event = new QIMComposeEvent( type, text, cursorPosition, selLength ); diff --git a/src/kernel/qinternal.cpp b/src/kernel/qinternal.cpp index 1e0fd7c..cf1e037 100644 --- a/src/kernel/qinternal.cpp +++ b/src/kernel/qinternal.cpp @@ -183,7 +183,7 @@ bool QSharedDoubleBufferCleaner::event( QEvent *e ) } #ifdef QT_CHECK_STATE else { - tqWarning( "QSharedDoubleBufferCleaner::event: invalid timer event received." ); + qWarning( "QSharedDoubleBufferCleaner::event: invalid timer event received." ); return FALSE; } #endif // QT_CHECK_STATE @@ -335,7 +335,7 @@ bool QSharedDoubleBuffer::begin( QPainter* painter, int x, int y, int w, int h ) { if ( isActive() ) { #if defined(QT_CHECK_STATE) - tqWarning( "QSharedDoubleBuffer::begin: Buffer is already active." + qWarning( "QSharedDoubleBuffer::begin: Buffer is already active." "\n\tYou must end() the buffer before a second begin()" ); #endif // QT_CHECK_STATE return FALSE; @@ -390,7 +390,7 @@ bool QSharedDoubleBuffer::begin( QWidget* widget, int x, int y, int w, int h ) { if ( isActive() ) { #if defined(QT_CHECK_STATE) - tqWarning( "QSharedDoubleBuffer::begin: Buffer is already active." + qWarning( "QSharedDoubleBuffer::begin: Buffer is already active." "\n\tYou must end() the buffer before a second begin()" ); #endif // QT_CHECK_STATE return FALSE; @@ -447,7 +447,7 @@ bool QSharedDoubleBuffer::end() { if ( ! isActive() ) { #if defined(QT_CHECK_STATE) - tqWarning( "QSharedDoubleBuffer::end: Buffer is not active." + qWarning( "QSharedDoubleBuffer::end: Buffer is not active." "\n\tYou must call begin() before calling end()." ); #endif // QT_CHECK_STATE return FALSE; @@ -584,7 +584,7 @@ void QSharedDoubleBuffer::releasePixmap() // sanity check #ifdef QT_CHECK_STATE - tqWarning( "QSharedDoubleBuffer::releasePixmap: internal error." + qWarning( "QSharedDoubleBuffer::releasePixmap: internal error." "\n\t%p does not own shared pixmap, %p does.", (void*)this, (void*)qdb_owner ); #endif // QT_CHECK_STATE diff --git a/src/kernel/qjpegio.cpp b/src/kernel/qjpegio.cpp index 361d413..5d2a1b1 100644 --- a/src/kernel/qjpegio.cpp +++ b/src/kernel/qjpegio.cpp @@ -80,7 +80,7 @@ void my_error_exit (j_common_ptr cinfo) my_error_mgr* myerr = (my_error_mgr*) cinfo->err; char buffer[JMSG_LENGTH_MAX]; (*cinfo->err->format_message)(cinfo, buffer); - tqWarning(buffer); + qWarning(buffer); longjmp(myerr->setjmp_buffer, 1); } @@ -249,13 +249,13 @@ void read_jpeg_image(QImageIO* iio) } else if ( sModeQStr == "ScaleMax" ) { sMode = QImage::ScaleMax; } else { - tqDebug("read_jpeg_image: invalid scale mode \"%s\", see QImage::ScaleMode documentation", sModeStr); + qDebug("read_jpeg_image: invalid scale mode \"%s\", see QImage::ScaleMode documentation", sModeStr); sMode = QImage::ScaleFree; } -// tqDebug( "Parameters ask to scale the image to %i x %i ScaleMode: %s", sWidth, sHeight, sModeStr ); +// qDebug( "Parameters ask to scale the image to %i x %i ScaleMode: %s", sWidth, sHeight, sModeStr ); scaleSize( sWidth, sHeight, cinfo.output_width, cinfo.output_height, sMode ); -// tqDebug( "Scaling the jpeg to %i x %i", sWidth, sHeight, sModeStr ); +// qDebug( "Scaling the jpeg to %i x %i", sWidth, sHeight, sModeStr ); bool created = FALSE; if ( cinfo.output_components == 3 || cinfo.output_components == 4) { diff --git a/src/kernel/qkeysequence.cpp b/src/kernel/qkeysequence.cpp index a303d0a..7263d4a 100644 --- a/src/kernel/qkeysequence.cpp +++ b/src/kernel/qkeysequence.cpp @@ -300,7 +300,7 @@ void QKeySequence::setKey( int key, int index ) { #ifdef QT_CHECK_STATE if ( 0 > index && 4 < index ) { - tqWarning( "QKeySequence::setKey: index %u out of range", index ); + qWarning( "QKeySequence::setKey: index %u out of range", index ); return; } #endif // QT_CHECK_STATE @@ -620,7 +620,7 @@ int QKeySequence::operator[]( uint index ) const { #ifdef QT_CHECK_STATE if ( index > 4 ) { - tqWarning( "QKeySequence::operator[]: index %u out of range", index ); + qWarning( "QKeySequence::operator[]: index %u out of range", index ); return 0; } #endif // QT_CHECK_STATE @@ -707,7 +707,7 @@ QDataStream &operator>>( QDataStream &s, QKeySequence &keysequence ) #ifdef QT_CHECK_STATE if ( 1 != list.count() && 4 != list.count() ) { - tqWarning( "Invalid QKeySequence data in the datastream." ); + qWarning( "Invalid QKeySequence data in the datastream." ); return s; } #endif diff --git a/src/kernel/qlayout.cpp b/src/kernel/qlayout.cpp index e7ca24d..de9f5b9 100644 --- a/src/kernel/qlayout.cpp +++ b/src/kernel/qlayout.cpp @@ -468,9 +468,9 @@ void QGridLayoutData::add( QGridBox *box, int row1, int row2, int col1, { #ifdef QT_CHECK_RANGE if ( row2 >= 0 && row2 < row1 ) - tqWarning( "QGridLayout: Multi-cell fromRow greater than toRow" ); + qWarning( "QGridLayout: Multi-cell fromRow greater than toRow" ); if ( col2 >= 0 && col2 < col1 ) - tqWarning( "QGridLayout: Multi-cell fromCol greater than toCol" ); + qWarning( "QGridLayout: Multi-cell fromCol greater than toCol" ); #endif if ( row1 == row2 && col1 == col2 ) { add( box, row1, col1 ); @@ -1216,7 +1216,7 @@ static bool checkWidget( QLayout *l, QWidget *w ) { if ( !w ) { #if defined(QT_CHECK_STATE) - tqWarning( "QLayout: Cannot add null widget to %s/%s", l->className(), + qWarning( "QLayout: Cannot add null widget to %s/%s", l->className(), l->name() ); #endif return FALSE; @@ -1224,12 +1224,12 @@ static bool checkWidget( QLayout *l, QWidget *w ) if ( w->parentWidget() != l->mainWidget() && l->mainWidget() ) { #if defined(QT_CHECK_STATE) if ( w->parentWidget() ) - tqWarning( "QLayout: Adding %s/%s (child of %s/%s) to layout for " + qWarning( "QLayout: Adding %s/%s (child of %s/%s) to layout for " "%s/%s", w->className(), w->name(), w->parentWidget()->className(), w->parentWidget()->name(), l->mainWidget()->className(), l->mainWidget()->name() ); else - tqWarning( "QLayout: Adding %s/%s (top-level widget) to layout for" + qWarning( "QLayout: Adding %s/%s (top-level widget) to layout for" " %s/%s", w->className(), w->name(), l->mainWidget()->className(), l->mainWidget()->name() ); #endif @@ -1264,7 +1264,7 @@ void QGridLayout::addWidget( QWidget *w, int row, int col, int alignment ) return; if ( row < 0 || col < 0 ) { #if defined(QT_CHECK_STATE) - tqWarning( "QGridLayout: Cannot add %s/%s to %s/%s at row %d col %d", + qWarning( "QGridLayout: Cannot add %s/%s to %s/%s at row %d col %d", w->className(), w->name(), className(), name(), row, col ); #endif return; diff --git a/src/kernel/qlocalfs.cpp b/src/kernel/qlocalfs.cpp index e3b4334..e6017f6 100644 --- a/src/kernel/qlocalfs.cpp +++ b/src/kernel/qlocalfs.cpp @@ -73,7 +73,7 @@ \endcode This code will only work if the QLocalFs class is registered; to - register the class, you must call tqInitNetworkProtocols() before + register the class, you must call qInitNetworkProtocols() before using a QUrlOperator with QLocalFs. If you really need to use QLocalFs directly, don't forget @@ -122,7 +122,7 @@ static int convertPermissions(QFileInfo *fi) void QLocalFs::operationListChildren( QNetworkOperation *op ) { #ifdef QLOCALFS_DEBUG - tqDebug( "QLocalFs: operationListChildren" ); + qDebug( "QLocalFs: operationListChildren" ); #endif op->setState( StInProgress ); @@ -171,7 +171,7 @@ void QLocalFs::operationListChildren( QNetworkOperation *op ) void QLocalFs::operationMkDir( QNetworkOperation *op ) { #ifdef QLOCALFS_DEBUG - tqDebug( "QLocalFs: operationMkDir" ); + qDebug( "QLocalFs: operationMkDir" ); #endif op->setState( StInProgress ); QString dirname = op->arg( 0 ); @@ -202,7 +202,7 @@ void QLocalFs::operationMkDir( QNetworkOperation *op ) void QLocalFs::operationRemove( QNetworkOperation *op ) { #ifdef QLOCALFS_DEBUG - tqDebug( "QLocalFs: operationRemove" ); + qDebug( "QLocalFs: operationRemove" ); #endif op->setState( StInProgress ); QString name = QUrl( op->arg( 0 ) ).path(); @@ -236,7 +236,7 @@ void QLocalFs::operationRemove( QNetworkOperation *op ) void QLocalFs::operationRename( QNetworkOperation *op ) { #ifdef QLOCALFS_DEBUG - tqDebug( "QLocalFs: operationRename" ); + qDebug( "QLocalFs: operationRename" ); #endif op->setState( StInProgress ); QString oldname = op->arg( 0 ); @@ -263,7 +263,7 @@ void QLocalFs::operationRename( QNetworkOperation *op ) void QLocalFs::operationGet( QNetworkOperation *op ) { #ifdef QLOCALFS_DEBUG - tqDebug( "QLocalFs: operationGet" ); + qDebug( "QLocalFs: operationGet" ); #endif op->setState( StInProgress ); QString from = QUrl( op->arg( 0 ) ).path(); @@ -271,7 +271,7 @@ void QLocalFs::operationGet( QNetworkOperation *op ) QFile f( from ); if ( !f.open( IO_ReadOnly ) ) { #ifdef QLOCALFS_DEBUG - tqDebug( "QLocalFs: could not open %s", from.latin1() ); + qDebug( "QLocalFs: could not open %s", from.latin1() ); #endif QString msg = tr( "Could not open\n%1" ).arg( from ); op->setState( StFailed ); @@ -291,7 +291,7 @@ void QLocalFs::operationGet( QNetworkOperation *op ) emit data( s, op ); emit dataTransferProgress( f.size(), f.size(), op ); #ifdef QLOCALFS_DEBUG - tqDebug( "QLocalFs: got all %d bytes at once", f.size() ); + qDebug( "QLocalFs: got all %d bytes at once", f.size() ); #endif } else { s.resize( blockSize ); @@ -317,7 +317,7 @@ void QLocalFs::operationGet( QNetworkOperation *op ) if (!that) return; #ifdef QLOCALFS_DEBUG - tqDebug( "QLocalFs: got all %d bytes step by step", f.size() ); + qDebug( "QLocalFs: got all %d bytes step by step", f.size() ); #endif emit dataTransferProgress( f.size(), f.size(), op ); } @@ -334,7 +334,7 @@ void QLocalFs::operationGet( QNetworkOperation *op ) void QLocalFs::operationPut( QNetworkOperation *op ) { #ifdef QLOCALFS_DEBUG - tqDebug( "QLocalFs: operationPut" ); + qDebug( "QLocalFs: operationPut" ); #endif op->setState( StInProgress ); QString to = QUrl( op->arg( 0 ) ).path(); diff --git a/src/kernel/qlock.cpp b/src/kernel/qlock.cpp index 0a3f98c..56faa1d 100644 --- a/src/kernel/qlock.cpp +++ b/src/kernel/qlock.cpp @@ -138,9 +138,9 @@ QLock::QLock( const QString &filename, char id, bool create ) } #endif if ( data->id == -1 ) { - tqWarning( "Cannot %s semaphore %s \'%c\'", + qWarning( "Cannot %s semaphore %s \'%c\'", create ? "create" : "get", filename.latin1(), id ); - tqDebug("Error %d %s\n",errno,strerror(errno)); + qDebug("Error %d %s\n",errno,strerror(errno)); } #endif } @@ -211,7 +211,7 @@ void QLock::lock( Type t ) for( int rv=1; rv; ) { rv = flock(data->id, op); if (rv == -1 && errno != EINTR) - tqDebug("Semop lock failure %s",strerror(errno)); + qDebug("Semop lock failure %s",strerror(errno)); } #else sembuf sops; @@ -230,7 +230,7 @@ void QLock::lock( Type t ) do { rv = semop(data->id,&sops,1); if (rv == -1 && errno != EINTR) - tqDebug("Semop lock failure %s",strerror(errno)); + qDebug("Semop lock failure %s",strerror(errno)); } while ( rv == -1 && errno == EINTR ); #endif } @@ -256,7 +256,7 @@ void QLock::unlock() for( int rv=1; rv; ) { rv = flock(data->id, LOCK_UN); if (rv == -1 && errno != EINTR) - tqDebug("Semop lock failure %s",strerror(errno)); + qDebug("Semop lock failure %s",strerror(errno)); } #else sembuf sops; @@ -270,12 +270,12 @@ void QLock::unlock() do { rv = semop(data->id,&sops,1); if (rv == -1 && errno != EINTR) - tqDebug("Semop unlock failure %s",strerror(errno)); + qDebug("Semop unlock failure %s",strerror(errno)); } while ( rv == -1 && errno == EINTR ); #endif } } else { - tqDebug("Unlock without corresponding lock"); + qDebug("Unlock without corresponding lock"); } #endif } diff --git a/src/kernel/qmetaobject.cpp b/src/kernel/qmetaobject.cpp index 1c5640f..9a86686 100644 --- a/src/kernel/qmetaobject.cpp +++ b/src/kernel/qmetaobject.cpp @@ -423,7 +423,7 @@ int QMetaObject::findSignal( const char* n, bool super ) const if ( md ) { #if defined(QT_CHECK_RANGE) if ( offset != -1 ) { - tqWarning( "QMetaObject::findSignal:%s: Conflict with %s::%s", + qWarning( "QMetaObject::findSignal:%s: Conflict with %s::%s", className(), mo->className(), n ); return offset; } @@ -1245,7 +1245,7 @@ void QMetaObjectCleanUp::setMetaObject( QMetaObject *&mo ) { #if defined(QT_CHECK_RANGE) if ( metaObject ) - tqWarning( "QMetaObjectCleanUp::setMetaObject: Double use of QMetaObjectCleanUp!" ); + qWarning( "QMetaObjectCleanUp::setMetaObject: Double use of QMetaObjectCleanUp!" ); #endif metaObject = &mo; } diff --git a/src/kernel/qmime.cpp b/src/kernel/qmime.cpp index d6ab853..e50757d 100644 --- a/src/kernel/qmime.cpp +++ b/src/kernel/qmime.cpp @@ -139,7 +139,7 @@ bool QMimeSource::provides(const char* mimeType) const { const char* fmt; for (int i=0; (fmt = format(i)); i++) { - if ( !tqstricmp(mimeType,fmt) ) + if ( !qstricmp(mimeType,fmt) ) return TRUE; } return FALSE; diff --git a/src/kernel/qmngio.cpp b/src/kernel/qmngio.cpp index ac0513d..2644270 100644 --- a/src/kernel/qmngio.cpp +++ b/src/kernel/qmngio.cpp @@ -122,7 +122,7 @@ public: mng_int32 iExtra2, mng_pchar zErrortext ) { - tqWarning("MNG error %d: %s; chunk %c%c%c%c; subcode %d:%d", + qWarning("MNG error %d: %s; chunk %c%c%c%c; subcode %d:%d", iErrorcode, zErrortext ? zErrortext : "", (iChunkname>>24)&0xff, (iChunkname>>16)&0xff, @@ -456,7 +456,7 @@ void qInitMngIO() done = TRUE; #ifndef QT_NO_ASYNC_IMAGE_IO globalMngFormatTypeObject = new QMNGFormatType; - tqAddPostRoutine( qCleanupMngIO ); + qAddPostRoutine( qCleanupMngIO ); #endif } } diff --git a/src/kernel/qmotifdnd_x11.cpp b/src/kernel/qmotifdnd_x11.cpp index 201ac33..c9399f9 100644 --- a/src/kernel/qmotifdnd_x11.cpp +++ b/src/kernel/qmotifdnd_x11.cpp @@ -597,12 +597,12 @@ static DndTargetsTable TargetsTable(Display *display) &type, &format, &size, &bytes_after, (unsigned char **) &target_prop) != Success) || type == None) { - tqWarning("QMotifDND: cannot get property on motif window"); + qWarning("QMotifDND: cannot get property on motif window"); return 0; } if (target_prop->protocol_version != DND_PROTOCOL_VERSION) { - tqWarning("QMotifDND: protocol mismatch"); + qWarning("QMotifDND: protocol mismatch"); } if (target_prop->byte_order != DndByteOrder()) { @@ -726,7 +726,7 @@ QByteArray qt_motifdnd_obtain_data( const char *mimeType ) QByteArray result; // try to convert the selection to the requested property - // tqDebug( "trying to convert to '%s'", mimeType ); + // qDebug( "trying to convert to '%s'", mimeType ); int n=0; const char* f; @@ -735,18 +735,18 @@ QByteArray qt_motifdnd_obtain_data( const char *mimeType ) if ( !f ) return result; n++; - } while( tqstricmp( mimeType, f ) ); + } while( qstricmp( mimeType, f ) ); // found one Atom conversion_type; - if ( tqstrnicmp( f, "text/", 5 ) == 0 ) { + if ( qstrnicmp( f, "text/", 5 ) == 0 ) { // always convert text to XA_STRING for compatibility with // prior Qt versions conversion_type = XA_STRING; } else { conversion_type = *qt_xdnd_str_to_atom( f ); - // tqDebug( "found format '%s' 0x%lx '%s'", f, conversion_type, + // qDebug( "found format '%s' 0x%lx '%s'", f, conversion_type, // qt_xdnd_atom_to_str( conversion_type ) ); } diff --git a/src/kernel/qnetworkprotocol.cpp b/src/kernel/qnetworkprotocol.cpp index 97e039a..4173584 100644 --- a/src/kernel/qnetworkprotocol.cpp +++ b/src/kernel/qnetworkprotocol.cpp @@ -51,9 +51,9 @@ //#define QNETWORKPROTOCOL_DEBUG #define NETWORK_OP_DELAY 1000 -extern Q_EXPORT QNetworkProtocolDict *tqNetworkProtocolRegister; +extern Q_EXPORT QNetworkProtocolDict *qNetworkProtocolRegister; -QNetworkProtocolDict *tqNetworkProtocolRegister = 0; +QNetworkProtocolDict *qNetworkProtocolRegister = 0; class QNetworkProtocolPrivate { @@ -542,7 +542,7 @@ int QNetworkProtocol::supportedOperations() const void QNetworkProtocol::addOperation( QNetworkOperation *op ) { #ifdef QNETWORKPROTOCOL_DEBUG - tqDebug( "QNetworkOperation: addOperation: %p %d", op, op->operation() ); + qDebug( "QNetworkOperation: addOperation: %p %d", op, op->operation() ); #endif d->operationQueue.enqueue( op ); if ( !d->opInProgress ) @@ -566,12 +566,12 @@ void QNetworkProtocol::addOperation( QNetworkOperation *op ) void QNetworkProtocol::registerNetworkProtocol( const QString &protocol, QNetworkProtocolFactoryBase *protocolFactory ) { - if ( !tqNetworkProtocolRegister ) { - tqNetworkProtocolRegister = new QNetworkProtocolDict; + if ( !qNetworkProtocolRegister ) { + qNetworkProtocolRegister = new QNetworkProtocolDict; QNetworkProtocol::registerNetworkProtocol( "file", new QNetworkProtocolFactory< QLocalFs > ); } - tqNetworkProtocolRegister->insert( protocol, protocolFactory ); + qNetworkProtocolRegister->insert( protocol, protocolFactory ); } /*! @@ -596,15 +596,15 @@ void QNetworkProtocol::registerNetworkProtocol( const QString &protocol, QNetworkProtocol *QNetworkProtocol::getNetworkProtocol( const QString &protocol ) { - if ( !tqNetworkProtocolRegister ) { - tqNetworkProtocolRegister = new QNetworkProtocolDict; + if ( !qNetworkProtocolRegister ) { + qNetworkProtocolRegister = new QNetworkProtocolDict; QNetworkProtocol::registerNetworkProtocol( "file", new QNetworkProtocolFactory< QLocalFs > ); } if ( protocol.isNull() ) return 0; - QNetworkProtocolFactoryBase *factory = tqNetworkProtocolRegister->find( protocol ); + QNetworkProtocolFactoryBase *factory = qNetworkProtocolRegister->find( protocol ); if ( factory ) return factory->createObject(); @@ -619,10 +619,10 @@ QNetworkProtocol *QNetworkProtocol::getNetworkProtocol( const QString &protocol bool QNetworkProtocol::hasOnlyLocalFileSystem() { - if ( !tqNetworkProtocolRegister ) + if ( !qNetworkProtocolRegister ) return FALSE; - QDictIterator< QNetworkProtocolFactoryBase > it( *tqNetworkProtocolRegister ); + QDictIterator< QNetworkProtocolFactoryBase > it( *qNetworkProtocolRegister ); for ( ; it.current(); ++it ) if ( it.currentKey() != "file" ) return FALSE; @@ -637,7 +637,7 @@ bool QNetworkProtocol::hasOnlyLocalFileSystem() void QNetworkProtocol::startOps() { #ifdef QNETWORKPROTOCOL_DEBUG - tqDebug( "QNetworkOperation: start processing operations" ); + qDebug( "QNetworkOperation: start processing operations" ); #endif processNextOperation( 0 ); } @@ -826,7 +826,7 @@ void QNetworkProtocol::operationPutChunk( QNetworkOperation * ) void QNetworkProtocol::processNextOperation( QNetworkOperation *old ) { #ifdef QNETWORKPROTOCOL_DEBUG - tqDebug( "QNetworkOperation: process next operation, old: %p", old ); + qDebug( "QNetworkOperation: process next operation, old: %p", old ); #endif d->removeTimer->stop(); @@ -949,7 +949,7 @@ void QNetworkProtocol::removeMe() { if ( d->autoDelete ) { #ifdef QNETWORKPROTOCOL_DEBUG - tqDebug( "QNetworkOperation: autodelete of QNetworkProtocol %p", this ); + qDebug( "QNetworkOperation: autodelete of QNetworkProtocol %p", this ); #endif delete d->url; // destructor deletes the network protocol } diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp index 285fc51..7e01dec 100644 --- a/src/kernel/qobject.cpp +++ b/src/kernel/qobject.cpp @@ -335,7 +335,7 @@ static void cleanup_object_trees() static void ensure_object_trees() { object_trees = new QObjectList; - tqAddPostRoutine( cleanup_object_trees ); + qAddPostRoutine( cleanup_object_trees ); } static void insert_tree( QObject* obj ) @@ -418,7 +418,7 @@ QObject::QObject( QObject *parent, const char *name ) blockSig( FALSE ), // not blocking signals wasDeleted( FALSE ), // double-delete catcher isTree( FALSE ), // no tree yet - objname( name ? tqstrdup(name) : 0 ), // set object name + objname( name ? qstrdup(name) : 0 ), // set object name parentObj( 0 ), // no parent yet. It is set by insertChild() childObjects( 0 ), // no children yet connections( 0 ), // no connections yet @@ -463,7 +463,7 @@ QObject::~QObject() { if ( wasDeleted ) { #if defined(QT_DEBUG) - tqWarning( "Double QObject deletion detected." ); + qWarning( "Double QObject deletion detected." ); #endif return; } @@ -643,12 +643,12 @@ void *qt_inheritedBy( QMetaObject *superClass, const QObject *object ) future. If the object does not have a name, the name() function returns - "unnamed", so printf() (used in tqDebug()) will not be asked to + "unnamed", so printf() (used in qDebug()) will not be asked to output a null pointer. If you want a null pointer to be returned for unnamed objects, you can call name( 0 ). \code - tqDebug( "MyClass::setPrecision(): (%s) invalid precision %f", + qDebug( "MyClass::setPrecision(): (%s) invalid precision %f", name(), newPrecision ); \endcode @@ -668,7 +668,7 @@ void QObject::setName( const char *name ) { if ( objname ) delete [] (char*) objname; - objname = name ? tqstrdup(name) : 0; + objname = name ? qstrdup(name) : 0; } /*! @@ -756,7 +756,7 @@ bool QObject::event( QEvent *e ) { #if defined(QT_CHECK_NULL) if ( e == 0 ) - tqWarning( "QObject::event: Null events are not permitted" ); + qWarning( "QObject::event: Null events are not permitted" ); #endif if ( eventFilters ) { // try filters if ( activate_filters(e) ) // stopped by a filter @@ -883,7 +883,7 @@ void QObject::customEvent( QCustomEvent * ) if ( obj == textEdit ) { if ( e->type() == QEvent::KeyPress ) { QKeyEvent *k = (QKeyEvent*)ev; - tqDebug( "Ate key press %d", k->key() ); + qDebug( "Ate key press %d", k->key() ); return TRUE; } else { return FALSE; @@ -1005,7 +1005,7 @@ void QObject::blockSignals( bool block ) void MyObject::timerEvent( QTimerEvent *e ) { - tqDebug( "timer event, id %d", e->timerId() ); + qDebug( "timer event, id %d", e->timerId() ); } \endcode @@ -1282,7 +1282,7 @@ void QObject::insertChild( QObject *obj ) if ( obj->parentObj && obj->parentObj != this ) { #if defined(QT_CHECK_STATE) if ( obj->parentObj != this && obj->isWidgetType() ) - tqWarning( "QObject::insertChild: Cannot reparent a widget, " + qWarning( "QObject::insertChild: Cannot reparent a widget, " "use QWidget::reparent() instead" ); #endif obj->parentObj->removeChild( obj ); @@ -1293,7 +1293,7 @@ void QObject::insertChild( QObject *obj ) Q_CHECK_PTR( childObjects ); } else if ( obj->parentObj == this ) { #if defined(QT_CHECK_STATE) - tqWarning( "QObject::insertChild: Object %s::%s already in list", + qWarning( "QObject::insertChild: Object %s::%s already in list", obj->className(), obj->name( "unnamed" ) ); #endif return; @@ -1368,7 +1368,7 @@ void QObject::removeChild( QObject *obj ) if ( e->type() == QEvent::KeyPress ) { // special processing for key press QKeyEvent *k = (QKeyEvent *)e; - tqDebug( "Ate key press %d", k->key() ); + qDebug( "Ate key press %d", k->key() ); return TRUE; // eat event } else { // standard event processing @@ -1453,10 +1453,10 @@ static bool check_signal_macro( const QObject *sender, const char *signal, int sigcode = (int)(*signal) - '0'; if ( sigcode != QSIGNAL_CODE ) { if ( sigcode == QSLOT_CODE ) - tqWarning( "QObject::%s: Attempt to %s non-signal %s::%s", + qWarning( "QObject::%s: Attempt to %s non-signal %s::%s", func, op, sender->className(), signal+1 ); else - tqWarning( "QObject::%s: Use the SIGNAL macro to %s %s::%s", + qWarning( "QObject::%s: Use the SIGNAL macro to %s %s::%s", func, op, sender->className(), signal ); return FALSE; } @@ -1467,7 +1467,7 @@ static bool check_member_code( int code, const QObject *object, const char *member, const char *func ) { if ( code != QSLOT_CODE && code != QSIGNAL_CODE ) { - tqWarning( "QObject::%s: Use the SLOT or SIGNAL macro to " + qWarning( "QObject::%s: Use the SLOT or SIGNAL macro to " "%s %s::%s", func, func, object->className(), member ); return FALSE; } @@ -1483,10 +1483,10 @@ static void err_member_notfound( int code, const QObject *object, case QSIGNAL_CODE: type = "signal"; break; } if ( strchr(member,')') == 0 ) // common typing mistake - tqWarning( "QObject::%s: Parentheses expected, %s %s::%s", + qWarning( "QObject::%s: Parentheses expected, %s %s::%s", func, type, object->className(), member ); else - tqWarning( "QObject::%s: No such %s %s::%s", + qWarning( "QObject::%s: No such %s %s::%s", func, type, object->className(), member ); } @@ -1497,9 +1497,9 @@ static void err_info_about_objects( const char * func, { const char * a = sender->name(), * b = receiver->name(); if ( a ) - tqWarning( "QObject::%s: (sender name: '%s')", func, a ); + qWarning( "QObject::%s: (sender name: '%s')", func, a ); if ( b ) - tqWarning( "QObject::%s: (receiver name: '%s')", func, b ); + qWarning( "QObject::%s: (receiver name: '%s')", func, b ); } static void err_info_about_candidates( int code, @@ -1524,7 +1524,7 @@ static void err_info_about_candidates( int code, break; } if ( rm ) { - tqWarning("QObject::%s: Candidate: %s", func, newname.data()); + qWarning("QObject::%s: Candidate: %s", func, newname.data()); } } } @@ -1748,7 +1748,7 @@ bool QObject::connect( const QObject *sender, const char *signal, { #if defined(QT_CHECK_NULL) if ( sender == 0 || receiver == 0 || signal == 0 || member == 0 ) { - tqWarning( "QObject::connect: Cannot connect %s::%s to %s::%s", + qWarning( "QObject::connect: Cannot connect %s::%s to %s::%s", sender ? sender->className() : "(null)", signal ? signal+1 : "(null)", receiver ? receiver->className() : "(null)", @@ -1825,7 +1825,7 @@ bool QObject::connect( const QObject *sender, const char *signal, } #if defined(QT_CHECK_RANGE) if ( !s->checkConnectArgs(signal,receiver,member) ) { - tqWarning( "QObject::connect: Incompatible sender/receiver arguments" + qWarning( "QObject::connect: Incompatible sender/receiver arguments" "\n\t%s::%s --> %s::%s", s->className(), signal, r->className(), member ); @@ -1849,7 +1849,7 @@ bool QObject::connect( const QObject *sender, const char *signal, || ( QUType::isEqual( sm->method->parameters[si-1].type, &static_QUType_varptr ) && QUType::isEqual( rm->method->parameters[ri-1].type, &static_QUType_ptr ) ) ) continue; // varptr got introduced in 3.1 and is binary compatible with ptr - tqWarning( "QObject::connect: Incompatible sender/receiver marshalling" + qWarning( "QObject::connect: Incompatible sender/receiver marshalling" "\n\t%s::%s --> %s::%s", s->className(), signal, r->className(), member ); @@ -1989,7 +1989,7 @@ bool QObject::disconnect( const QObject *sender, const char *signal, { #if defined(QT_CHECK_NULL) if ( sender == 0 || (receiver == 0 && member != 0) ) { - tqWarning( "QObject::disconnect: Unexpected null parameter" ); + qWarning( "QObject::disconnect: Unexpected null parameter" ); return FALSE; } #endif @@ -2061,7 +2061,7 @@ bool QObject::disconnect( const QObject *sender, const char *signal, } if ( signal_index < 0 ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QObject::disconnect: No such signal %s::%s", + qWarning( "QObject::disconnect: No such signal %s::%s", s->className(), signal ); #endif return FALSE; @@ -2504,7 +2504,7 @@ static void dumpRecursive( int level, QObject *object ) flags += 'I'; } } - tqDebug( "%s%s::%s %s", (const char*)buf, object->className(), name, + qDebug( "%s%s::%s %s", (const char*)buf, object->className(), name, flags.latin1() ); if ( object->children() ) { QObjectListIt it(*object->children()); @@ -2546,41 +2546,41 @@ void QObject::dumpObjectTree() void QObject::dumpObjectInfo() { #if defined(QT_DEBUG) - tqDebug( "OBJECT %s::%s", className(), name( "unnamed" ) ); + qDebug( "OBJECT %s::%s", className(), name( "unnamed" ) ); int n = 0; - tqDebug( " SIGNALS OUT" ); + qDebug( " SIGNALS OUT" ); if ( connections ) { QConnectionList *clist; for ( uint i = 0; i < connections->size(); i++ ) { if ( ( clist = connections->at( i ) ) ) { - tqDebug( "\t%s", metaObject()->signal( i, TRUE )->name ); + qDebug( "\t%s", metaObject()->signal( i, TRUE )->name ); n++; register QConnection *c; QConnectionListIt cit(*clist); while ( (c=cit.current()) ) { ++cit; - tqDebug( "\t --> %s::%s %s", c->object()->className(), + qDebug( "\t --> %s::%s %s", c->object()->className(), c->object()->name( "unnamed" ), c->memberName() ); } } } } if ( n == 0 ) - tqDebug( "\t<None>" ); + qDebug( "\t<None>" ); - tqDebug( " SIGNALS IN" ); + qDebug( " SIGNALS IN" ); n = 0; if ( senderObjects ) { QObject *sender = senderObjects->first(); while ( sender ) { - tqDebug( "\t%s::%s", + qDebug( "\t%s::%s", sender->className(), sender->name( "unnamed" ) ); n++; sender = senderObjects->next(); } } if ( n == 0 ) - tqDebug( "\t<None>" ); + qDebug( "\t<None>" ); #endif } @@ -2610,7 +2610,7 @@ bool QObject::setProperty( const char *name, const QVariant& value ) int id = meta->findProperty( name, TRUE ); const QMetaProperty* p = meta->property( id, TRUE ); if ( !p || !p->isValid() || !p->writable() ) { - tqWarning( "%s::setProperty( \"%s\", value ) failed: property invalid, read-only or does not exist", + qWarning( "%s::setProperty( \"%s\", value ) failed: property invalid, read-only or does not exist", className(), name ); return FALSE; } @@ -2662,7 +2662,7 @@ QVariant QObject::property( const char *name ) const int id = meta->findProperty( name, TRUE ); const QMetaProperty* p = meta->property( id, TRUE ); if ( !p || !p->isValid() ) { - tqWarning( "%s::property( \"%s\" ) failed: property invalid or does not exist", + qWarning( "%s::property( \"%s\" ) failed: property invalid or does not exist", className(), name ); return v; } diff --git a/src/kernel/qpaintdevice_x11.cpp b/src/kernel/qpaintdevice_x11.cpp index b17c003..a755c01 100644 --- a/src/kernel/qpaintdevice_x11.cpp +++ b/src/kernel/qpaintdevice_x11.cpp @@ -133,7 +133,7 @@ QPaintDevice::QPaintDevice( uint devflags ) { if ( !qApp ) { // global constructor #if defined(QT_CHECK_STATE) - tqFatal( "QPaintDevice: Must construct a QApplication before a " + qFatal( "QPaintDevice: Must construct a QApplication before a " "QPaintDevice" ); #endif return; @@ -153,7 +153,7 @@ QPaintDevice::~QPaintDevice() { #if defined(QT_CHECK_STATE) if ( paintingActive() ) - tqWarning( "QPaintDevice: Cannot destroy paint device that is being " + qWarning( "QPaintDevice: Cannot destroy paint device that is being " "painted" ); #endif if ( x11Data && x11Data->deref() ) { @@ -699,7 +699,7 @@ int QPaintDevice::x11AppDpiY() bool QPaintDevice::cmd( int, QPainter *, QPDevCmdParam * ) { #if defined(QT_CHECK_STATE) - tqWarning( "QPaintDevice::cmd: Device has no command interface" ); + qWarning( "QPaintDevice::cmd: Device has no command interface" ); #endif return FALSE; } @@ -715,7 +715,7 @@ bool QPaintDevice::cmd( int, QPainter *, QPDevCmdParam * ) int QPaintDevice::metric( int ) const { #if defined(QT_CHECK_STATE) - tqWarning( "QPaintDevice::metrics: Device has no metric information" ); + qWarning( "QPaintDevice::metrics: Device has no metric information" ); #endif return 0; } @@ -778,7 +778,7 @@ static GC cache_mask_gc( Display *dpy, Drawable hd, int mask_no, Pixmap mask ) { if ( !init_mask_gc ) { // first time initialization init_mask_gc = TRUE; - tqAddPostRoutine( cleanup_mask_gc ); + qAddPostRoutine( cleanup_mask_gc ); for ( int i=0; i<max_mask_gcs; i++ ) gc_vec[i].gc = 0; } @@ -885,7 +885,7 @@ void bitBlt( QPaintDevice *dst, int dx, int dy, bitBlt( pm, 0, 0, src, sx, sy, sw, sh ); } else { #if defined(QT_CHECK_RANGE) - tqWarning( "bitBlt: Cannot bitBlt from device" ); + qWarning( "bitBlt: Cannot bitBlt from device" ); #endif return; } @@ -906,7 +906,7 @@ void bitBlt( QPaintDevice *dst, int dx, int dy, break; default: #if defined(QT_CHECK_RANGE) - tqWarning( "bitBlt: Cannot bitBlt from device type %x", ts ); + qWarning( "bitBlt: Cannot bitBlt from device type %x", ts ); #endif return; } @@ -917,7 +917,7 @@ void bitBlt( QPaintDevice *dst, int dx, int dy, break; default: #if defined(QT_CHECK_RANGE) - tqWarning( "bitBlt: Cannot bitBlt to device type %x", td ); + qWarning( "bitBlt: Cannot bitBlt to device type %x", td ); #endif return; } @@ -930,14 +930,14 @@ void bitBlt( QPaintDevice *dst, int dx, int dy, }; if ( rop > Qt::LastROP ) { #if defined(QT_CHECK_RANGE) - tqWarning( "bitBlt: Invalid ROP code" ); + qWarning( "bitBlt: Invalid ROP code" ); #endif return; } if ( dst->handle() == 0 ) { #if defined(QT_CHECK_NULL) - tqWarning( "bitBlt: Cannot bitBlt to device" ); + qWarning( "bitBlt: Cannot bitBlt to device" ); #endif return; } @@ -975,7 +975,7 @@ void bitBlt( QPaintDevice *dst, int dx, int dy, if ( mono_dst && !mono_src ) { // dest is 1-bit pixmap, source is not #if defined(QT_CHECK_RANGE) - tqWarning( "bitBlt: Incompatible destination pixmap" ); + qWarning( "bitBlt: Incompatible destination pixmap" ); #endif return; } diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp index 138ead6..e5e9026 100644 --- a/src/kernel/qpainter.cpp +++ b/src/kernel/qpainter.cpp @@ -601,7 +601,7 @@ bool QPainter::begin( const QPaintDevice *pd, const QWidget *copyAttributes, boo { if ( copyAttributes == 0 ) { #if defined(QT_CHECK_NULL) - tqWarning( "QPainter::begin: The widget to copy attributes from cannot " + qWarning( "QPainter::begin: The widget to copy attributes from cannot " "be null" ); #endif return FALSE; @@ -684,7 +684,7 @@ void QPainter::killPStack() { #if defined(QT_CHECK_STATE) if ( ps_stack && !((QPStateStack *)ps_stack)->isEmpty() ) - tqWarning( "QPainter::killPStack: non-empty save/restore stack when " + qWarning( "QPainter::killPStack: non-empty save/restore stack when " "end() was called" ); #endif delete (QPStateStack *)ps_stack; @@ -763,7 +763,7 @@ void QPainter::restore() QPStateStack *pss = (QPStateStack *)ps_stack; if ( pss == 0 || pss->isEmpty() ) { #if defined(QT_CHECK_STATE) - tqWarning( "QPainter::restore: Empty stack error" ); + qWarning( "QPainter::restore: Empty stack error" ); #endif return; } @@ -842,7 +842,7 @@ void QPainter::redirect( QPaintDevice *pdev, QPaintDevice *replacement ) } #if defined(QT_CHECK_NULL) if ( pdev == 0 ) - tqWarning( "QPainter::redirect: The pdev argument cannot be 0" ); + qWarning( "QPainter::redirect: The pdev argument cannot be 0" ); #endif if ( replacement ) { pdev_dict->insert( pdev, replacement ); @@ -920,7 +920,7 @@ void QPainter::setPen( const QPen &pen ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - tqWarning( "QPainter::setPen: Will be reset by begin()" ); + qWarning( "QPainter::setPen: Will be reset by begin()" ); #endif if ( cpen == pen ) return; @@ -941,7 +941,7 @@ void QPainter::setPen( PenStyle style ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - tqWarning( "QPainter::setPen: Will be reset by begin()" ); + qWarning( "QPainter::setPen: Will be reset by begin()" ); #endif QPen::QPenData *d = cpen.data; // low level access if ( d->style == style && d->linest == style && !d->width && d->color == Qt::black ) @@ -970,7 +970,7 @@ void QPainter::setPen( const QColor &color ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - tqWarning( "QPainter::setPen: Will be reset by begin()" ); + qWarning( "QPainter::setPen: Will be reset by begin()" ); #endif QPen::QPenData *d = cpen.data; // low level access if ( d->color == color && !d->width && d->style == SolidLine && d->linest == SolidLine ) @@ -1008,7 +1008,7 @@ void QPainter::setBrush( const QBrush &brush ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - tqWarning( "QPainter::setBrush: Will be reset by begin()" ); + qWarning( "QPainter::setBrush: Will be reset by begin()" ); #endif if ( cbrush == brush ) return; @@ -1027,7 +1027,7 @@ void QPainter::setBrush( BrushStyle style ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - tqWarning( "QPainter::setBrush: Will be reset by begin()" ); + qWarning( "QPainter::setBrush: Will be reset by begin()" ); #endif QBrush::QBrushData *d = cbrush.data; // low level access if ( d->style == style && d->color == Qt::black && !d->pixmap ) @@ -1058,7 +1058,7 @@ void QPainter::setBrush( const QColor &color ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - tqWarning( "QPainter::setBrush: Will be reset by begin()" ); + qWarning( "QPainter::setBrush: Will be reset by begin()" ); #endif QBrush::QBrushData *d = cbrush.data; // low level access if ( d->color == color && d->style == SolidPattern && !d->pixmap ) @@ -1136,7 +1136,7 @@ void QPainter::setTabStops( int ts ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - tqWarning( "QPainter::setTabStops: Will be reset by begin()" ); + qWarning( "QPainter::setTabStops: Will be reset by begin()" ); #endif tabstops = ts; if ( isActive() && testf(ExtDev) ) { // tell extended device @@ -1167,7 +1167,7 @@ void QPainter::setTabArray( int *ta ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - tqWarning( "QPainter::setTabArray: Will be reset by begin()" ); + qWarning( "QPainter::setTabArray: Will be reset by begin()" ); #endif if ( ta != tabarray ) { tabarraylen = 0; @@ -1218,7 +1218,7 @@ void QPainter::setViewXForm( bool enable ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - tqWarning( "QPainter::setViewXForm: Will be reset by begin()" ); + qWarning( "QPainter::setViewXForm: Will be reset by begin()" ); #endif if ( !isActive() || enable == testf(VxF) ) return; @@ -1272,7 +1272,7 @@ void QPainter::setWindow( int x, int y, int w, int h ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - tqWarning( "QPainter::setWindow: Will be reset by begin()" ); + qWarning( "QPainter::setWindow: Will be reset by begin()" ); #endif wx = x; wy = y; @@ -1322,7 +1322,7 @@ void QPainter::setViewport( int x, int y, int w, int h ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - tqWarning( "QPainter::setViewport: Will be reset by begin()" ); + qWarning( "QPainter::setViewport: Will be reset by begin()" ); #endif vx = x; vy = y; @@ -1354,7 +1354,7 @@ void QPainter::setWorldXForm( bool enable ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - tqWarning( "QPainter::setWorldXForm: Will be reset by begin()" ); + qWarning( "QPainter::setWorldXForm: Will be reset by begin()" ); #endif if ( !isActive() || enable == testf(WxF) ) return; @@ -1440,7 +1440,7 @@ void QPainter::setWorldMatrix( const QWMatrix &m, bool combine ) { if ( !isActive() ) { #if defined(QT_CHECK_STATE) - tqWarning( "QPainter::setWorldMatrix: Will be reset by begin()" ); + qWarning( "QPainter::setWorldMatrix: Will be reset by begin()" ); #endif return; } @@ -1493,7 +1493,7 @@ void QPainter::restoreWorldMatrix() QWMatrixStack *stack = (QWMatrixStack *)wm_stack; if ( stack == 0 || stack->isEmpty() ) { #if defined(QT_CHECK_STATE) - tqWarning( "QPainter::restoreWorldMatrix: Empty stack error" ); + qWarning( "QPainter::restoreWorldMatrix: Empty stack error" ); #endif return; } @@ -1774,7 +1774,7 @@ void QPainter::map( int x, int y, int w, int h, } break; default: #if defined(QT_CHECK_STATE) - tqWarning( "QPainter::map: Internal error" ); + qWarning( "QPainter::map: Internal error" ); #endif break; } @@ -1797,7 +1797,7 @@ void QPainter::map( int x, int y, int w, int h, break; default: #if defined(QT_CHECK_STATE) - tqWarning( "QPainter::map: Internal error" ); + qWarning( "QPainter::map: Internal error" ); #endif break; } @@ -1819,7 +1819,7 @@ void QPainter::mapInv( int x, int y, int *rx, int *ry ) const #ifndef QT_NO_TRANSFORMATIONS #if defined(QT_CHECK_STATE) if ( !txinv ) - tqWarning( "QPainter::mapInv: Internal error" ); + qWarning( "QPainter::mapInv: Internal error" ); #endif if ( qt_old_transformations ) { double tx = im11()*x + im21()*y+idx(); @@ -1848,7 +1848,7 @@ void QPainter::mapInv( int x, int y, int w, int h, #ifndef QT_NO_TRANSFORMATIONS #if defined(QT_CHECK_STATE) if ( !txinv || txop == TxRotShear ) - tqWarning( "QPainter::mapInv: Internal error" ); + qWarning( "QPainter::mapInv: Internal error" ); #endif if ( qt_old_transformations ) { double tx = im11()*x + idx(); @@ -2939,20 +2939,20 @@ void qt_format_text( const QFont& font, const QRect &_r, int desc = fm.descent(); height = -leading; - //tqDebug("\n\nbeginLayout: lw = %d, rectwidth=%d", lineWidth , r.width()); + //qDebug("\n\nbeginLayout: lw = %d, rectwidth=%d", lineWidth , r.width()); while ( !textLayout.atEnd() ) { height += leading; textLayout.beginLine( lineWidth == INT_MAX ? lineWidth : lineWidth ); - //tqDebug("-----beginLine( %d )-----", lineWidth ); + //qDebug("-----beginLine( %d )-----", lineWidth ); bool linesep = FALSE; while ( 1 ) { QTextItem ti = textLayout.currentItem(); - //tqDebug("item: from=%d, ch=%x", ti.from(), text.unicode()[ti.from()].unicode() ); + //qDebug("item: from=%d, ch=%x", ti.from(), text.unicode()[ti.from()].unicode() ); if ( expandtabs && ti.isTab() ) { int tw = 0; int x = textLayout.widthUsed(); if ( tabarraylen ) { -// tqDebug("tabarraylen=%d", tabarraylen ); +// qDebug("tabarraylen=%d", tabarraylen ); int tab = 0; while ( tab < tabarraylen ) { if ( tabarray[tab] > x ) { @@ -2964,7 +2964,7 @@ void qt_format_text( const QFont& font, const QRect &_r, } else { tw = tabstops - (x % tabstops); } - //tqDebug("tw = %d", tw ); + //qDebug("tw = %d", tw ); if ( tw ) ti.setWidth( tw ); } @@ -2979,7 +2979,7 @@ void qt_format_text( const QFont& font, const QRect &_r, textLayout.setLineWidth( r.width()-rb-lb ); textLayout.endLine( 0, height, tf, &ascent, &descent, &lineLeft, &lineRight ); - //tqDebug("finalizing line: lw=%d ascent = %d, descent=%d lineleft=%d lineright=%d", lineWidth, ascent, descent,lineLeft, lineRight ); + //qDebug("finalizing line: lw=%d ascent = %d, descent=%d lineleft=%d lineright=%d", lineWidth, ascent, descent,lineLeft, lineRight ); left = QMIN( left, lineLeft ); right = QMAX( right, lineRight ); height += ascent + descent + 1; @@ -2996,7 +2996,7 @@ void qt_format_text( const QFont& font, const QRect &_r, if ( brect ) { *brect = QRect( r.x() + left, r.y() + yoff, right-left + lb+rb, height ); - //tqDebug("br = %d %d %d/%d, left=%d, right=%d", brect->x(), brect->y(), brect->width(), brect->height(), left, right); + //qDebug("br = %d %d %d/%d, left=%d, right=%d", brect->x(), brect->y(), brect->width(), brect->height(), left, right); } if (!(tf & QPainter::DontPrint)) { @@ -3032,10 +3032,10 @@ void qt_format_text( const QFont& font, const QRect &_r, if (fnt.overline()) _tf |= Qt::Overline; if (fnt.strikeOut()) _tf |= Qt::StrikeOut; - //tqDebug("have %d items",textLayout.numItems()); + //qDebug("have %d items",textLayout.numItems()); for ( int i = 0; i < textLayout.numItems(); i++ ) { QTextItem ti = textLayout.itemAt( i ); - //tqDebug("Item %d: from=%d, length=%d, space=%d x=%d", i, ti.from(), ti.length(), ti.isSpace(), ti.x() ); + //qDebug("Item %d: from=%d, length=%d, space=%d x=%d", i, ti.from(), ti.length(), ti.isSpace(), ti.x() ); if ( ti.isTab() || ti.isObject() ) continue; int textFlags = _tf; @@ -3803,7 +3803,7 @@ void QBrush::setStyle( BrushStyle s ) // set brush style return; #if defined(QT_CHECK_RANGE) if ( s == CustomPattern ) - tqWarning( "QBrush::setStyle: CustomPattern is for internal use" ); + qWarning( "QBrush::setStyle: CustomPattern is for internal use" ); #endif detach(); data->style = s; @@ -3930,7 +3930,7 @@ QDataStream &operator<<( QDataStream &s, const QBrush &b ) #ifndef QT_NO_IMAGEIO s << *b.pixmap(); #else - tqWarning("No Image Brush I/O"); + qWarning("No Image Brush I/O"); #endif return s; } @@ -3956,7 +3956,7 @@ QDataStream &operator>>( QDataStream &s, QBrush &b ) s >> pm; b = QBrush( color, pm ); #else - tqWarning("No Image Brush I/O"); + qWarning("No Image Brush I/O"); #endif } else diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp index 59a598b..206bffc 100644 --- a/src/kernel/qpainter_x11.cpp +++ b/src/kernel/qpainter_x11.cpp @@ -347,7 +347,7 @@ static GC alloc_gc( Display *dpy, int scrn, Drawable hd, bool monochrome=FALSE, p++; } #if defined(QT_CHECK_NULL) - tqWarning( "QPainter: Internal error; no available GC" ); + qWarning( "QPainter: Internal error; no available GC" ); #endif GC gc = XCreateGC( dpy, hd, 0, 0 ); XSetGraphicsExposures( dpy, gc, False ); @@ -449,9 +449,9 @@ static void cleanup_gc_cache() if ( !gc_cache_init ) return; #if defined(GC_CACHE_STAT) - tqDebug( "Number of cache hits = %d", g_numhits ); - tqDebug( "Number of cache creates = %d", g_numcreates ); - tqDebug( "Number of cache faults = %d", g_numfaults ); + qDebug( "Number of cache hits = %d", g_numhits ); + qDebug( "Number of cache creates = %d", g_numcreates ); + qDebug( "Number of cache faults = %d", g_numfaults ); for ( int i=0; i<gc_cache_size; i++ ) { QCString str; QBuffer buf( str ); @@ -464,7 +464,7 @@ static void cleanup_gc_cache() << g->count << '\t'; } s << '\0'; - tqDebug( str ); + qDebug( str ); buf.close(); } #endif @@ -640,7 +640,7 @@ void QPainter::setFont( const QFont &font ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - tqWarning( "QPainter::setFont: Will be reset by begin()" ); + qWarning( "QPainter::setFont: Will be reset by begin()" ); #endif if ( cfont.d != font.d ) { cfont = font; @@ -1013,14 +1013,14 @@ bool QPainter::begin( const QPaintDevice *pd, bool unclipped ) { if ( isActive() ) { // already active painting #if defined(QT_CHECK_STATE) - tqWarning( "QPainter::begin: Painter is already active." + qWarning( "QPainter::begin: Painter is already active." "\n\tYou must end() the painter before a second begin()" ); #endif return FALSE; } if ( pd == 0 ) { #if defined(QT_CHECK_NULL) - tqWarning( "QPainter::begin: Paint device cannot be null" ); + qWarning( "QPainter::begin: Paint device cannot be null" ); #endif return FALSE; } @@ -1039,7 +1039,7 @@ bool QPainter::begin( const QPaintDevice *pd, bool unclipped ) if ( pdev->isExtDev() && pdev->paintingActive() ) { // somebody else is already painting #if defined(QT_CHECK_STATE) - tqWarning( "QPainter::begin: Another QPainter is already painting " + qWarning( "QPainter::begin: Another QPainter is already painting " "this device;\n\tAn extended paint device can only be " "painted by one QPainter at a time." ); #endif @@ -1129,7 +1129,7 @@ bool QPainter::begin( const QPaintDevice *pd, bool unclipped ) QPixmap *pm = (QPixmap*)pdev; if ( pm->isNull() ) { #if defined(QT_CHECK_NULL) - tqWarning( "QPainter::begin: Cannot paint null pixmap" ); + qWarning( "QPainter::begin: Cannot paint null pixmap" ); #endif end(); return FALSE; @@ -1189,7 +1189,7 @@ bool QPainter::end() // end painting { if ( !isActive() ) { #if defined(QT_CHECK_STATE) - tqWarning( "QPainter::end: Missing begin() or begin() failed" ); + qWarning( "QPainter::end: Missing begin() or begin() failed" ); #endif return FALSE; } @@ -1290,7 +1290,7 @@ void QPainter::setBackgroundColor( const QColor &c ) { if ( !isActive() ) { #if defined(QT_CHECK_STATE) - tqWarning( "QPainter::setBackgroundColor: Call begin() first" ); + qWarning( "QPainter::setBackgroundColor: Call begin() first" ); #endif return; } @@ -1325,13 +1325,13 @@ void QPainter::setBackgroundMode( BGMode m ) { if ( !isActive() ) { #if defined(QT_CHECK_STATE) - tqWarning( "QPainter::setBackgroundMode: Call begin() first" ); + qWarning( "QPainter::setBackgroundMode: Call begin() first" ); #endif return; } if ( m != TransparentMode && m != OpaqueMode ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QPainter::setBackgroundMode: Invalid mode" ); + qWarning( "QPainter::setBackgroundMode: Invalid mode" ); #endif return; } @@ -1379,13 +1379,13 @@ void QPainter::setRasterOp( RasterOp r ) { if ( !isActive() ) { #if defined(QT_CHECK_STATE) - tqWarning( "QPainter::setRasterOp: Call begin() first" ); + qWarning( "QPainter::setRasterOp: Call begin() first" ); #endif return; } if ( (uint)r > LastROP ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QPainter::setRasterOp: Invalid ROP code" ); + qWarning( "QPainter::setRasterOp: Invalid ROP code" ); #endif return; } @@ -1420,7 +1420,7 @@ void QPainter::setBrushOrigin( int x, int y ) { if ( !isActive() ) { #if defined(QT_CHECK_STATE) - tqWarning( "QPainter::setBrushOrigin: Call begin() first" ); + qWarning( "QPainter::setBrushOrigin: Call begin() first" ); #endif return; } @@ -1449,7 +1449,7 @@ void QPainter::setClipping( bool enable ) { if ( !isActive() ) { #if defined(QT_CHECK_STATE) - tqWarning( "QPainter::setClipping: Will be reset by begin()" ); + qWarning( "QPainter::setClipping: Will be reset by begin()" ); #endif return; } @@ -1514,7 +1514,7 @@ void QPainter::setClipRegion( const QRegion &rgn, CoordinateMode m ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - tqWarning( "QPainter::setClipRegion: Will be reset by begin()" ); + qWarning( "QPainter::setClipRegion: Will be reset by begin()" ); #endif if ( m == CoordDevice ) crgn = rgn; @@ -2501,7 +2501,7 @@ void QPainter::drawCubicBezier( const QPointArray &a, int index ) return; if ( a.size() - index < 4 ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QPainter::drawCubicBezier: Cubic Bezier needs 4 control " + qWarning( "QPainter::drawCubicBezier: Cubic Bezier needs 4 control " "points" ); #endif return; diff --git a/src/kernel/qpalette.cpp b/src/kernel/qpalette.cpp index 85ec2d9..a9e07f7 100644 --- a/src/kernel/qpalette.cpp +++ b/src/kernel/qpalette.cpp @@ -1100,13 +1100,13 @@ const QBrush &QPalette::directBrush( ColorGroup gr, QColorGroup::ColorRole r ) c { if ( (uint)gr > (uint)QPalette::NColorGroups ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QPalette::directBrush: colorGroup(%i) out of range", gr ); + qWarning( "QPalette::directBrush: colorGroup(%i) out of range", gr ); #endif return data->active.br[QColorGroup::Foreground]; } if ( (uint)r >= (uint)QColorGroup::NColorRoles ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QPalette::directBrush: colorRole(%i) out of range", r ); + qWarning( "QPalette::directBrush: colorRole(%i) out of range", r ); #endif return data->active.br[QColorGroup::Foreground]; } @@ -1124,7 +1124,7 @@ const QBrush &QPalette::directBrush( ColorGroup gr, QColorGroup::ColorRole r ) c break; } #if defined(QT_CHECK_RANGE) - tqWarning( "QPalette::directBrush: colorGroup(%i) internal error", gr ); + qWarning( "QPalette::directBrush: colorGroup(%i) internal error", gr ); #endif return data->active.br[QColorGroup::Foreground]; // Satisfy compiler } @@ -1133,13 +1133,13 @@ void QPalette::directSetBrush( ColorGroup gr, QColorGroup::ColorRole r, const QB { if ( (uint)gr > (uint)QPalette::NColorGroups ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QPalette::directBrush: colorGroup(%i) out of range", gr ); + qWarning( "QPalette::directBrush: colorGroup(%i) out of range", gr ); #endif return; } if ( (uint)r >= (uint)QColorGroup::NColorRoles ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QPalette::directBrush: colorRole(%i) out of range", r ); + qWarning( "QPalette::directBrush: colorRole(%i) out of range", r ); #endif return; } @@ -1155,7 +1155,7 @@ void QPalette::directSetBrush( ColorGroup gr, QColorGroup::ColorRole r, const QB break; default: #if defined(QT_CHECK_RANGE) - tqWarning( "QPalette::directBrush: colorGroup(%i) internal error", gr ); + qWarning( "QPalette::directBrush: colorGroup(%i) internal error", gr ); #endif break; } diff --git a/src/kernel/qpicture.cpp b/src/kernel/qpicture.cpp index c6364e0..d434516 100644 --- a/src/kernel/qpicture.cpp +++ b/src/kernel/qpicture.cpp @@ -138,7 +138,7 @@ QPicture::QPicture( int formatVersion ) #if defined(QT_CHECK_RANGE) if ( formatVersion == 0 ) - tqWarning( "QPicture: invalid format version 0" ); + qWarning( "QPicture: invalid format version 0" ); #endif // still accept the 0 default from before Qt 3.0. @@ -260,7 +260,7 @@ bool QPicture::load( QIODevice *dev, const char *format ) } #endif if ( format ) { - tqWarning( "QPicture::load: No such picture format: %s", format ); + qWarning( "QPicture::load: No such picture format: %s", format ); return FALSE; } @@ -291,7 +291,7 @@ bool QPicture::save( const QString &fileName, const char *format ) { if ( paintingActive() ) { #if defined(QT_CHECK_STATE) - tqWarning( "QPicture::save: still being painted on. " + qWarning( "QPicture::save: still being painted on. " "Call QPainter::end() first" ); #endif return FALSE; @@ -300,7 +300,7 @@ bool QPicture::save( const QString &fileName, const char *format ) #ifndef QT_NO_SVG // identical to QIODevice* code below but the file name // makes a difference when it comes to saving pixmaps - if ( tqstricmp( format, "svg" ) == 0 ) { + if ( qstricmp( format, "svg" ) == 0 ) { QSvgDevice svg; QPainter p( &svg ); if ( !play( &p ) ) @@ -326,14 +326,14 @@ bool QPicture::save( QIODevice *dev, const char *format ) { if ( paintingActive() ) { #if defined(QT_CHECK_STATE) - tqWarning( "QPicture::save: still being painted on. " + qWarning( "QPicture::save: still being painted on. " "Call QPainter::end() first" ); #endif return FALSE; } #ifndef QT_NO_SVG - if ( tqstricmp( format, "svg" ) == 0 ) { + if ( qstricmp( format, "svg" ) == 0 ) { QSvgDevice svg; QPainter p( &svg ); if ( !play( &p ) ) @@ -343,7 +343,7 @@ bool QPicture::save( QIODevice *dev, const char *format ) } #endif if ( format ) { - tqWarning( "QPicture::save: No such picture format: %s", format ); + qWarning( "QPicture::save: No such picture format: %s", format ); return FALSE; } @@ -409,7 +409,7 @@ bool QPicture::play( QPainter *painter ) s >> nrecords; if ( !exec( painter, s, nrecords ) ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QPicture::play: Format error" ); + qWarning( "QPicture::play: Format error" ); #endif d->pictb.close(); return FALSE; @@ -669,13 +669,13 @@ bool QPicture::exec( QPainter *painter, QDataStream &s, int nrecords ) break; default: #if defined(QT_CHECK_RANGE) - tqWarning( "QPicture::play: Invalid command %d", c ); + qWarning( "QPicture::play: Invalid command %d", c ); #endif if ( len ) // skip unknown command s.device()->at( s.device()->at()+len ); } #if defined(QT_DEBUG) - //tqDebug( "device->at(): %i, strm_pos: %i len: %i", s.device()->at(), strm_pos, len ); + //qDebug( "device->at(): %i, strm_pos: %i len: %i", s.device()->at(), strm_pos, len ); Q_ASSERT( Q_INT32(s.device()->at() - strm_pos) == len ); #endif } @@ -736,7 +736,7 @@ bool QPicture::QPicturePrivate::cmd( int c, QPainter *pt, QPDevCmdParam *p ) } s << (Q_UINT32)trecs; // write number of records pictb.at( cs_start ); - Q_UINT16 cs = (Q_UINT16)tqChecksum( buf.data()+data_start, pos-data_start ); + Q_UINT16 cs = (Q_UINT16)qChecksum( buf.data()+data_start, pos-data_start ); s << cs; // write checksum pictb.close(); return TRUE; @@ -899,7 +899,7 @@ bool QPicture::QPicturePrivate::cmd( int c, QPainter *pt, QPDevCmdParam *p ) break; #if defined(QT_CHECK_RANGE) default: - tqWarning( "QPicture::cmd: Command %d not recognized", c ); + qWarning( "QPicture::cmd: Command %d not recognized", c ); #endif } int newpos = (int)pictb.at(); // new position @@ -985,7 +985,7 @@ int QPicture::metric( int m ) const default: val = 0; #if defined(QT_CHECK_RANGE) - tqWarning( "QPicture::metric: Invalid metric command" ); + qWarning( "QPicture::metric: Invalid metric command" ); #endif } return val; @@ -1120,7 +1120,7 @@ bool QPicture::QPicturePrivate::checkFormat() s.readRawBytes( mf_id, 4 ); // read actual tag if ( memcmp(mf_id, mfhdr_tag, 4) != 0 ) { // wrong header id #if defined(QT_CHECK_RANGE) - tqWarning( "QPicture::checkFormat: Incorrect header" ); + qWarning( "QPicture::checkFormat: Incorrect header" ); #endif pictb.close(); return FALSE; @@ -1131,10 +1131,10 @@ bool QPicture::QPicturePrivate::checkFormat() Q_UINT16 cs,ccs; QByteArray buf = pictb.buffer(); // pointer to data s >> cs; // read checksum - ccs = tqChecksum( buf.data() + data_start, buf.size() - data_start ); + ccs = qChecksum( buf.data() + data_start, buf.size() - data_start ); if ( ccs != cs ) { #if defined(QT_CHECK_STATE) - tqWarning( "QPicture::checkFormat: Invalid checksum %x, %x expected", + qWarning( "QPicture::checkFormat: Invalid checksum %x, %x expected", ccs, cs ); #endif pictb.close(); @@ -1145,7 +1145,7 @@ bool QPicture::QPicturePrivate::checkFormat() s >> major >> minor; // read version number if ( major > mfhdr_maj ) { // new, incompatible version #if defined(QT_CHECK_RANGE) - tqWarning( "QPicture::checkFormat: Incompatible version %d.%d", + qWarning( "QPicture::checkFormat: Incompatible version %d.%d", major, minor); #endif pictb.close(); @@ -1163,7 +1163,7 @@ bool QPicture::QPicturePrivate::checkFormat() } } else { #if defined(QT_CHECK_RANGE) - tqWarning( "QPicture::checkFormat: Format error" ); + qWarning( "QPicture::checkFormat: Format error" ); #endif pictb.close(); return FALSE; diff --git a/src/kernel/qpixmap.cpp b/src/kernel/qpixmap.cpp index d388137..ecc9b46 100644 --- a/src/kernel/qpixmap.cpp +++ b/src/kernel/qpixmap.cpp @@ -405,7 +405,7 @@ QPixmap QPixmap::fromMimeSource( const QString &abs_name ) return QPixmap( abs_name ); #if defined(QT_CHECK_STATE) if ( !abs_name.isEmpty() ) - tqWarning( "QPixmap::fromMimeSource: Cannot find pixmap \"%s\" in the mime source factory", + qWarning( "QPixmap::fromMimeSource: Cannot find pixmap \"%s\" in the mime source factory", abs_name.latin1() ); #endif return QPixmap(); @@ -459,7 +459,7 @@ QPixmap &QPixmap::operator=( const QPixmap &pixmap ) { if ( paintingActive() ) { #if defined(QT_CHECK_STATE) - tqWarning("QPixmap::operator=: Cannot assign to pixmap during painting"); + qWarning("QPixmap::operator=: Cannot assign to pixmap during painting"); #endif return *this; } @@ -673,7 +673,7 @@ void QPixmap::resize( int w, int h ) } else #elif defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE) if (data->alphapm) - tqWarning("QPixmap::resize: TODO: resize alpha data"); + qWarning("QPixmap::resize: TODO: resize alpha data"); else #endif // Q_WS_X11 if ( data->mask ) { // resize mask as well @@ -746,7 +746,7 @@ void QPixmap::setMask( const QBitmap &newmask ) if ( newmask.width() != width() || newmask.height() != height() ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QPixmap::setMask: The pixmap and the mask must have " + qWarning( "QPixmap::setMask: The pixmap and the mask must have " "the same size" ); #endif return; @@ -1054,7 +1054,7 @@ bool QPixmap::doImageIO( QImageIO* io, int quality ) const io->setImage( convertToImage() ); #if defined(QT_CHECK_RANGE) if ( quality > 100 || quality < -1 ) - tqWarning( "QPixmap::save: quality out of range [-1,100]" ); + qWarning( "QPixmap::save: quality out of range [-1,100]" ); #endif if ( quality >= 0 ) io->setQuality( QMIN(quality,100) ); diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp index cec8ad8..d0a16c5 100644 --- a/src/kernel/qpixmap_x11.cpp +++ b/src/kernel/qpixmap_x11.cpp @@ -141,7 +141,7 @@ static bool qt_create_mitshm_buffer( const QPaintDevice* dev, int w, int h ) } else { if ( !XShmQueryVersion(dpy, &major, &minor, &pixmaps_ok) ) return FALSE; // MIT Shm not supported - tqAddPostRoutine( qt_cleanup_mitshm ); + qAddPostRoutine( qt_cleanup_mitshm ); xshminit = TRUE; } @@ -350,14 +350,14 @@ static void build_scale_table( uint **table, uint nBits ) { if ( nBits > 7 ) { #if defined(QT_CHECK_RANGE) - tqWarning( "build_scale_table: internal error, nBits = %i", nBits ); + qWarning( "build_scale_table: internal error, nBits = %i", nBits ); #endif return; } if (!*table) { static bool firstTable = TRUE; if ( firstTable ) { - tqAddPostRoutine( cleanup_scale_tables ); + qAddPostRoutine( cleanup_scale_tables ); firstTable = FALSE; } *table = new uint[256]; @@ -394,7 +394,7 @@ void QPixmap::init( int w, int h, int d, bool bitmap, Optimization optim ) { #if defined(QT_CHECK_STATE) if ( qApp->type() == QApplication::Tty ) { - tqWarning( "QPixmap: Cannot create a QPixmap when no GUI " + qWarning( "QPixmap: Cannot create a QPixmap when no GUI " "is being used" ); } #endif @@ -441,7 +441,7 @@ void QPixmap::init( int w, int h, int d, bool bitmap, Optimization optim ) rendhd = 0; #if defined(QT_CHECK_RANGE) if ( !make_null ) - tqWarning( "QPixmap: Invalid pixmap parameters" ); + qWarning( "QPixmap: Invalid pixmap parameters" ); #endif return; } @@ -690,7 +690,7 @@ int QPixmap::metric( int m ) const default: val = 0; #if defined(QT_CHECK_RANGE) - tqWarning( "QPixmap::metric: Invalid metric command" ); + qWarning( "QPixmap::metric: Invalid metric command" ); #endif } } @@ -889,7 +889,7 @@ QImage QPixmap::convertToImage() const y = h; pixel = 0; // eliminate compiler warning #if defined(QT_CHECK_RANGE) - tqWarning( "QPixmap::convertToImage: Invalid depth %d", + qWarning( "QPixmap::convertToImage: Invalid depth %d", bppc ); #endif } @@ -938,7 +938,7 @@ QImage QPixmap::convertToImage() const } else { /* Typically 2 or 4 bits display depth */ #if defined(QT_CHECK_RANGE) - tqWarning( "QPixmap::convertToImage: Display not supported (bpp=%d)", + qWarning( "QPixmap::convertToImage: Display not supported (bpp=%d)", xi->bits_per_pixel ); #endif image.reset(); @@ -1098,7 +1098,7 @@ bool QPixmap::convertFromImage( const QImage &img, int conversion_flags ) { if ( img.isNull() ) { #if defined(QT_CHECK_NULL) - tqWarning( "QPixmap::convertFromImage: Cannot convert a null image" ); + qWarning( "QPixmap::convertFromImage: Cannot convert a null image" ); #endif return FALSE; } @@ -1352,7 +1352,7 @@ bool QPixmap::convertFromImage( const QImage &img, int conversion_flags ) int wordsize; bool bigendian; - tqSysInfo( &wordsize, &bigendian ); + qSysInfo( &wordsize, &bigendian ); bool same_msb_lsb = ( xi->byte_order == MSBFirst ) == ( bigendian ); if( bppc == 8 ) // 8 bit @@ -1375,7 +1375,7 @@ bool QPixmap::convertFromImage( const QImage &img, int conversion_flags ) else mode = bppc == 33 ? BPP32_LSB : BPP32_MSB; } else - tqFatal("Logic error 3"); + qFatal("Logic error 3"); #define GET_PIXEL \ int pixel; \ @@ -1494,7 +1494,7 @@ bool QPixmap::convertFromImage( const QImage &img, int conversion_flags ) ) break; default: - tqFatal("Logic error"); + qFatal("Logic error"); } } else { switch ( mode ) { @@ -1591,7 +1591,7 @@ bool QPixmap::convertFromImage( const QImage &img, int conversion_flags ) ) break; default: - tqFatal("Logic error 2"); + qFatal("Logic error 2"); } } xi->data = (char *)newbits; @@ -1756,7 +1756,7 @@ bool QPixmap::convertFromImage( const QImage &img, int conversion_flags ) newbits = (uchar *)newerbits; } else if ( xi->bits_per_pixel != 8 ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QPixmap::convertFromImage: Display not supported " + qWarning( "QPixmap::convertFromImage: Display not supported " "(bpp=%d)", xi->bits_per_pixel ); #endif } @@ -2155,17 +2155,17 @@ QPixmap QPixmap::xForm( const QWMatrix &matrix ) const // #define QT_DEBUG_XIMAGE #if defined(QT_DEBUG_XIMAGE) - tqDebug( "----IMAGE--INFO--------------" ); - tqDebug( "width............. %d", xi->width ); - tqDebug( "height............ %d", xi->height ); - tqDebug( "xoffset........... %d", xi->xoffset ); - tqDebug( "format............ %d", xi->format ); - tqDebug( "byte order........ %d", xi->byte_order ); - tqDebug( "bitmap unit....... %d", xi->bitmap_unit ); - tqDebug( "bitmap bit order.. %d", xi->bitmap_bit_order ); - tqDebug( "depth............. %d", xi->depth ); - tqDebug( "bytes per line.... %d", xi->bytes_per_line ); - tqDebug( "bits per pixel.... %d", xi->bits_per_pixel ); + qDebug( "----IMAGE--INFO--------------" ); + qDebug( "width............. %d", xi->width ); + qDebug( "height............ %d", xi->height ); + qDebug( "xoffset........... %d", xi->xoffset ); + qDebug( "format............ %d", xi->format ); + qDebug( "byte order........ %d", xi->byte_order ); + qDebug( "bitmap unit....... %d", xi->bitmap_unit ); + qDebug( "bitmap bit order.. %d", xi->bitmap_bit_order ); + qDebug( "depth............. %d", xi->depth ); + qDebug( "bytes per line.... %d", xi->bytes_per_line ); + qDebug( "bits per pixel.... %d", xi->bits_per_pixel ); #endif int type; @@ -2188,7 +2188,7 @@ QPixmap QPixmap::xForm( const QWMatrix &matrix ) const if ( !qt_xForm_helper( mat, xi->xoffset, type, bpp, dptr, xbpl, p_inc, h, sptr, sbpl, ws, hs ) ){ #if defined(QT_CHECK_RANGE) - tqWarning( "QPixmap::xForm: display not supported (bpp=%d)",bpp); + qWarning( "QPixmap::xForm: display not supported (bpp=%d)",bpp); #endif QPixmap pm; return pm; @@ -2325,7 +2325,7 @@ void QPixmap::x11SetScreen( int screen ) return; } #if 0 - tqDebug("QPixmap::x11SetScreen for %p from %d to %d. Size is %d/%d", data, x11Screen(), screen, width(), height() ); + qDebug("QPixmap::x11SetScreen for %p from %d to %d. Size is %d/%d", data, x11Screen(), screen, width(), height() ); #endif QImage img = convertToImage(); diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp index 9cfcadb..ee70e19 100644 --- a/src/kernel/qpixmapcache.cpp +++ b/src/kernel/qpixmapcache.cpp @@ -307,7 +307,7 @@ void QPixmapCache::setCacheLimit( int n ) { #ifdef Q_WS_MAC9 if(n > 256) - tqWarning("QPixmapCache::setCacheLimit: Setting cache limits high is harmfull to mac9's health"); + qWarning("QPixmapCache::setCacheLimit: Setting cache limits high is harmfull to mac9's health"); #endif cache_limit = n; if ( pm_cache ) diff --git a/src/kernel/qpngio.cpp b/src/kernel/qpngio.cpp index 447a6d4..58e6e7e 100644 --- a/src/kernel/qpngio.cpp +++ b/src/kernel/qpngio.cpp @@ -309,7 +309,7 @@ extern "C" { #endif static void CALLBACK_CALL_TYPE qt_png_warning(png_structp /*png_ptr*/, png_const_charp message) { - tqWarning("libpng warning: %s", message); + qWarning("libpng warning: %s", message); } #if defined(Q_C_CALLBACKS) @@ -502,7 +502,7 @@ static void set_text(const QImage& image, png_structp png_ptr, png_infop info_pt text_ptr[i].compression = PNG_TEXT_COMPRESSION_zTXt; text_ptr[i].key = (png_charp)(*it).key.data(); text_ptr[i].text = (png_charp)t.latin1(); - //text_ptr[i].text = tqstrdup(t.latin1()); + //text_ptr[i].text = qstrdup(t.latin1()); i++; } } @@ -555,7 +555,7 @@ bool QPNGImageWriter::writeImage(const QImage& image, int quality_in, int off_x_ if (quality >= 0) { if (quality > 9) { #if defined(QT_CHECK_RANGE) - tqWarning( "PNG: Quality %d out of range", quality ); + qWarning( "PNG: Quality %d out of range", quality ); #endif quality = 9; } @@ -1268,7 +1268,7 @@ int QPNGFormat::user_chunk(png_structp png, png_bytep data, png_uint_32 length) { #if 0 // NOT SUPPORTED: experimental PNG animation. - // tqDebug("Got %ld-byte %s chunk", length, png->chunk_name); + // qDebug("Got %ld-byte %s chunk", length, png->chunk_name); if ( 0==qstrcmp((char*)png->chunk_name, "gIFg") && length == 4 ) { @@ -1351,7 +1351,7 @@ void qInitPngIO() #ifndef QT_NO_ASYNC_IMAGE_IO globalPngFormatTypeObject = new QPNGFormatType; #endif - tqAddPostRoutine( qCleanupPngIO ); + qAddPostRoutine( qCleanupPngIO ); } } diff --git a/src/kernel/qpoint.cpp b/src/kernel/qpoint.cpp index 7e08a70..5313307 100644 --- a/src/kernel/qpoint.cpp +++ b/src/kernel/qpoint.cpp @@ -376,7 +376,7 @@ void QPoint::warningDivByZero() { #if defined(QT_CHECK_MATH) - tqWarning( "QPoint: Division by zero error" ); + qWarning( "QPoint: Division by zero error" ); #endif } diff --git a/src/kernel/qpointarray.cpp b/src/kernel/qpointarray.cpp index bb8656c..d1c7569 100644 --- a/src/kernel/qpointarray.cpp +++ b/src/kernel/qpointarray.cpp @@ -915,7 +915,7 @@ QPointArray QPointArray::cubicBezier() const #ifdef USE_SIMPLE_QBEZIER_CODE if ( size() != 4 ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QPointArray::bezier: The array must have 4 control points" ); + qWarning( "QPointArray::bezier: The array must have 4 control points" ); #endif QPointArray p; return p; @@ -969,7 +969,7 @@ QPointArray QPointArray::cubicBezier() const if ( size() != 4 ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QPointArray::bezier: The array must have 4 control points" ); + qWarning( "QPointArray::bezier: The array must have 4 control points" ); #endif QPointArray pa; return pa; diff --git a/src/kernel/qprinter.cpp b/src/kernel/qprinter.cpp index 0ebe075..0db6dce 100644 --- a/src/kernel/qprinter.cpp +++ b/src/kernel/qprinter.cpp @@ -367,7 +367,7 @@ void QPrinter::setOutputToFile( bool enable ) { if ( state != 0 ) { #if defined(QT_CHECK_STATE) - tqWarning( "QPrinter::setOutputToFile: Cannot do this during printing" ); + qWarning( "QPrinter::setOutputToFile: Cannot do this during printing" ); #endif return; } @@ -400,7 +400,7 @@ void QPrinter::setOutputFileName( const QString &fileName ) { if ( state != 0 ) { #if defined(QT_CHECK_STATE) - tqWarning("QPrinter::setOutputFileName: Cannot do this during printing"); + qWarning("QPrinter::setOutputFileName: Cannot do this during printing"); #endif return; } @@ -457,7 +457,7 @@ void QPrinter::setDocName( const QString &name ) { if ( state != 0 ) { #if defined(QT_CHECK_STATE) - tqWarning( "QPrinter::setDocName: Cannot do this during printing" ); + qWarning( "QPrinter::setDocName: Cannot do this during printing" ); #endif return; } @@ -550,7 +550,7 @@ void QPrinter::setPageSize( PageSize newPageSize ) { if ( newPageSize > NPageSize ) { #if defined(QT_CHECK_STATE) - tqWarning("QPrinter::SetPageSize: illegal page size %d", newPageSize ); + qWarning("QPrinter::SetPageSize: illegal page size %d", newPageSize ); #endif return; } @@ -674,7 +674,7 @@ void QPrinter::setFromTo( int fromPage, int toPage ) { if ( state != 0 ) { #if defined(QT_CHECK_STATE) - tqWarning( "QPrinter::setFromTo: Cannot do this during printing" ); + qWarning( "QPrinter::setFromTo: Cannot do this during printing" ); #endif return; } diff --git a/src/kernel/qprinter_unix.cpp b/src/kernel/qprinter_unix.cpp index 44c30b2..5dcfa93 100644 --- a/src/kernel/qprinter_unix.cpp +++ b/src/kernel/qprinter_unix.cpp @@ -226,7 +226,7 @@ void QPrinter::setPrinterName( const QString &name ) { if ( state != 0 ) { #if defined(QT_CHECK_STATE) - tqWarning( "QPrinter::setPrinterName: Cannot do this during printing" ); + qWarning( "QPrinter::setPrinterName: Cannot do this during printing" ); #endif return; } @@ -258,7 +258,7 @@ bool QPrinter::setup( QWidget * parent ) if ( result ) { if ( !globalPrinterDefaults ) { globalPrinterDefaults = new PrinterDefaults; - tqAddPostRoutine( deleteGlobalPrinterDefaults ); + qAddPostRoutine( deleteGlobalPrinterDefaults ); } globalPrinterDefaults->printerName = printerName(); globalPrinterDefaults->outputToFile = outputToFile(); @@ -331,7 +331,7 @@ bool QPrinter::cmd( int c, QPainter *paint, QPDevCmdParam *p ) QApplication::flushX(); int fds[2]; if ( pipe( fds ) != 0 ) { - tqWarning( "QPSPrinter: could not open pipe to print" ); + qWarning( "QPSPrinter: could not open pipe to print" ); state = PST_ERROR; return FALSE; } @@ -587,7 +587,7 @@ int QPrinter::metric( int m ) const default: val = 0; #if defined(QT_CHECK_RANGE) - tqWarning( "QPixmap::metric: Invalid metric command" ); + qWarning( "QPixmap::metric: Invalid metric command" ); #endif } return val; diff --git a/src/kernel/qprocess.cpp b/src/kernel/qprocess.cpp index e0e060d..653327d 100644 --- a/src/kernel/qprocess.cpp +++ b/src/kernel/qprocess.cpp @@ -748,28 +748,28 @@ void QProcess::writeToStdin( const QString& buf ) void QProcess::connectNotify( const char * signal ) { #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcess::connectNotify(): signal %s has been connected", signal ); + qDebug( "QProcess::connectNotify(): signal %s has been connected", signal ); #endif if ( !ioRedirection ) if ( qstrcmp( signal, SIGNAL(readyReadStdout()) )==0 || qstrcmp( signal, SIGNAL(readyReadStderr()) )==0 ) { #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcess::connectNotify(): set ioRedirection to TRUE" ); + qDebug( "QProcess::connectNotify(): set ioRedirection to TRUE" ); #endif setIoRedirection( TRUE ); return; } if ( !notifyOnExit && qstrcmp( signal, SIGNAL(processExited()) )==0 ) { #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcess::connectNotify(): set notifyOnExit to TRUE" ); + qDebug( "QProcess::connectNotify(): set notifyOnExit to TRUE" ); #endif setNotifyOnExit( TRUE ); return; } if ( !wroteToStdinConnected && qstrcmp( signal, SIGNAL(wroteToStdin()) )==0 ) { #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcess::connectNotify(): set wroteToStdinConnected to TRUE" ); + qDebug( "QProcess::connectNotify(): set wroteToStdinConnected to TRUE" ); #endif setWroteStdinConnected( TRUE ); return; @@ -785,19 +785,19 @@ void QProcess::disconnectNotify( const char * ) receivers( SIGNAL(readyReadStderr()) ) ==0 ) { #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcess::disconnectNotify(): set ioRedirection to FALSE" ); + qDebug( "QProcess::disconnectNotify(): set ioRedirection to FALSE" ); #endif setIoRedirection( FALSE ); } if ( notifyOnExit && receivers( SIGNAL(processExited()) ) == 0 ) { #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcess::disconnectNotify(): set notifyOnExit to FALSE" ); + qDebug( "QProcess::disconnectNotify(): set notifyOnExit to FALSE" ); #endif setNotifyOnExit( FALSE ); } if ( wroteToStdinConnected && receivers( SIGNAL(wroteToStdin()) ) == 0 ) { #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcess::disconnectNotify(): set wroteToStdinConnected to FALSE" ); + qDebug( "QProcess::disconnectNotify(): set wroteToStdinConnected to FALSE" ); #endif setWroteStdinConnected( FALSE ); } diff --git a/src/kernel/qprocess_unix.cpp b/src/kernel/qprocess_unix.cpp index 21f3d98..40476d3 100644 --- a/src/kernel/qprocess_unix.cpp +++ b/src/kernel/qprocess_unix.cpp @@ -134,7 +134,7 @@ public: QProc( pid_t p, QProcess *proc=0 ) : pid(p), process(proc) { #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProc: Constructor for pid %d and QProcess %p", pid, process ); + qDebug( "QProc: Constructor for pid %d and QProcess %p", pid, process ); #endif socketStdin = 0; socketStdout = 0; @@ -143,7 +143,7 @@ public: ~QProc() { #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProc: Destructor for pid %d and QProcess %p", pid, process ); + qDebug( "QProc: Destructor for pid %d and QProcess %p", pid, process ); #endif if ( process ) { if ( process->d->notifierStdin ) @@ -273,7 +273,7 @@ QProcessManager::QProcessManager() : sn(0) sigchldFd[1] = 0; } else { #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcessManager: install socket notifier (%d)", sigchldFd[1] ); + qDebug( "QProcessManager: install socket notifier (%d)", sigchldFd[1] ); #endif sn = new QSocketNotifier( sigchldFd[1], QSocketNotifier::Read, this ); @@ -286,7 +286,7 @@ QProcessManager::QProcessManager() : sn(0) struct sigaction act; #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcessManager: install a SIGCHLD handler" ); + qDebug( "QProcessManager: install a SIGCHLD handler" ); #endif act.sa_handler = qt_C_sigchldHnd; sigemptyset( &(act.sa_mask) ); @@ -296,17 +296,17 @@ QProcessManager::QProcessManager() : sn(0) act.sa_flags |= SA_RESTART; #endif if ( sigaction( SIGCHLD, &act, &oldactChld ) != 0 ) - tqWarning( "Error installing SIGCHLD handler" ); + qWarning( "Error installing SIGCHLD handler" ); #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcessManager: install a SIGPIPE handler (SIG_IGN)" ); + qDebug( "QProcessManager: install a SIGPIPE handler (SIG_IGN)" ); #endif act.sa_handler = QT_SIGNAL_IGNORE; sigemptyset( &(act.sa_mask) ); sigaddset( &(act.sa_mask), SIGPIPE ); act.sa_flags = 0; if ( sigaction( SIGPIPE, &act, &oldactPipe ) != 0 ) - tqWarning( "Error installing SIGPIPE handler" ); + qWarning( "Error installing SIGPIPE handler" ); } QProcessManager::~QProcessManager() @@ -320,23 +320,23 @@ QProcessManager::~QProcessManager() // restore SIGCHLD handler #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcessManager: restore old sigchild handler" ); + qDebug( "QProcessManager: restore old sigchild handler" ); #endif if ( sigaction( SIGCHLD, &oldactChld, 0 ) != 0 ) - tqWarning( "Error restoring SIGCHLD handler" ); + qWarning( "Error restoring SIGCHLD handler" ); #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcessManager: restore old sigpipe handler" ); + qDebug( "QProcessManager: restore old sigpipe handler" ); #endif if ( sigaction( SIGPIPE, &oldactPipe, 0 ) != 0 ) - tqWarning( "Error restoring SIGPIPE handler" ); + qWarning( "Error restoring SIGPIPE handler" ); } void QProcessManager::append( QProc *p ) { procList->append( p ); #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcessManager: append process (procList.count(): %d)", procList->count() ); + qDebug( "QProcessManager: append process (procList.count(): %d)", procList->count() ); #endif } @@ -344,7 +344,7 @@ void QProcessManager::remove( QProc *p ) { procList->remove( p ); #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcessManager: remove process (procList.count(): %d)", procList->count() ); + qDebug( "QProcessManager: remove process (procList.count(): %d)", procList->count() ); #endif cleanup(); } @@ -359,7 +359,7 @@ void QProcessManager::cleanup() void QProcessManager::removeMe() { if ( procList->count() == 0 ) { - tqRemovePostRoutine(qprocess_cleanup); + qRemovePostRoutine(qprocess_cleanup); QProcessPrivate::procManager = 0; delete this; } @@ -381,7 +381,7 @@ void QProcessManager::sigchldHnd( int fd ) char tmp; ::read( fd, &tmp, sizeof(tmp) ); #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcessManager::sigchldHnd()" ); + qDebug( "QProcessManager::sigchldHnd()" ); #endif QProc *proc; QProcess *process; @@ -393,7 +393,7 @@ void QProcessManager::sigchldHnd( int fd ) if ( process != 0 ) { if ( !process->isRunning() ) { #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcessManager::sigchldHnd() (PID: %d): process exited (QProcess available)", proc->pid ); + qDebug( "QProcessManager::sigchldHnd() (PID: %d): process exited (QProcess available)", proc->pid ); #endif /* Apparently, there is not consistency among different @@ -415,14 +415,14 @@ void QProcessManager::sigchldHnd( int fd ) // read pending data if ( proc->socketStdout && ::ioctl(proc->socketStdout, FIONREAD, (char*)&nbytes)==0 && nbytes>0 ) { #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcessManager::sigchldHnd() (PID: %d): reading %d bytes of pending data on stdout", proc->pid, nbytes ); + qDebug( "QProcessManager::sigchldHnd() (PID: %d): reading %d bytes of pending data on stdout", proc->pid, nbytes ); #endif process->socketRead( proc->socketStdout ); } nbytes = 0; if ( proc->socketStderr && ::ioctl(proc->socketStderr, FIONREAD, (char*)&nbytes)==0 && nbytes>0 ) { #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcessManager::sigchldHnd() (PID: %d): reading %d bytes of pending data on stderr", proc->pid, nbytes ); + qDebug( "QProcessManager::sigchldHnd() (PID: %d): reading %d bytes of pending data on stderr", proc->pid, nbytes ); #endif process->socketRead( proc->socketStderr ); } @@ -450,7 +450,7 @@ void QProcessManager::sigchldHnd( int fd ) int status; if ( ::waitpid( proc->pid, &status, WNOHANG ) == proc->pid ) { #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcessManager::sigchldHnd() (PID: %d): process exited (QProcess not available)", proc->pid ); + qDebug( "QProcessManager::sigchldHnd() (PID: %d): process exited (QProcess not available)", proc->pid ); #endif removeProc = TRUE; } @@ -480,7 +480,7 @@ QProcessManager *QProcessPrivate::procManager = 0; QProcessPrivate::QProcessPrivate() { #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcessPrivate: Constructor" ); + qDebug( "QProcessPrivate: Constructor" ); #endif stdinBufRead = 0; @@ -497,7 +497,7 @@ QProcessPrivate::QProcessPrivate() QProcessPrivate::~QProcessPrivate() { #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcessPrivate: Destructor" ); + qDebug( "QProcessPrivate: Destructor" ); #endif if ( proc != 0 ) { @@ -543,7 +543,7 @@ void QProcessPrivate::newProc( pid_t pid, QProcess *process ) proc = new QProc( pid, process ); if ( procManager == 0 ) { procManager = new QProcessManager; - tqAddPostRoutine(qprocess_cleanup); + qAddPostRoutine(qprocess_cleanup); } // the QProcessManager takes care of deleting the QProc instances procManager->append( proc ); @@ -700,7 +700,7 @@ QProcess::~QProcess() bool QProcess::start( QStringList *env ) { #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcess::start()" ); + qDebug( "QProcess::start()" ); #endif reset(); @@ -760,7 +760,7 @@ bool QProcess::start( QStringList *env ) arglistQ[i] = (*it).local8Bit(); arglist[i] = arglistQ[i]; #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcess::start(): arg %d = %s", i, arglist[i] ); + qDebug( "QProcess::start(): arg %d = %s", i, arglist[i] ); #endif i++; } @@ -788,7 +788,7 @@ bool QProcess::start( QStringList *env ) // in case the process exits quickly. if ( d->procManager == 0 ) { d->procManager = new QProcessManager; - tqAddPostRoutine(qprocess_cleanup); + qAddPostRoutine(qprocess_cleanup); } // fork and exec @@ -969,7 +969,7 @@ bool QProcess::start( QStringList *env ) error: #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcess::start(): error starting process" ); + qDebug( "QProcess::start(): error starting process" ); #endif if ( d->procManager ) d->procManager->cleanup(); @@ -1050,7 +1050,7 @@ bool QProcess::isRunning() const { if ( d->exitValuesCalculated ) { #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcess::isRunning(): FALSE (already computed)" ); + qDebug( "QProcess::isRunning(): FALSE (already computed)" ); #endif return FALSE; } @@ -1080,12 +1080,12 @@ bool QProcess::isRunning() const } #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcess::isRunning() (PID: %d): FALSE", d->proc->pid ); + qDebug( "QProcess::isRunning() (PID: %d): FALSE", d->proc->pid ); #endif return FALSE; } #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcess::isRunning() (PID: %d): TRUE", d->proc->pid ); + qDebug( "QProcess::isRunning() (PID: %d): TRUE", d->proc->pid ); #endif return TRUE; } @@ -1142,7 +1142,7 @@ bool QProcess::canReadLineStderr() const void QProcess::writeToStdin( const QByteArray& buf ) { #if defined(QT_QPROCESS_DEBUG) -// tqDebug( "QProcess::writeToStdin(): write to stdin (%d)", d->socketStdin ); +// qDebug( "QProcess::writeToStdin(): write to stdin (%d)", d->socketStdin ); #endif d->stdinBuf.enqueue( new QByteArray(buf) ); if ( d->notifierStdin != 0 ) @@ -1169,10 +1169,10 @@ void QProcess::closeStdin() delete d->notifierStdin; d->notifierStdin = 0; if ( ::close( d->proc->socketStdin ) != 0 ) { - tqWarning( "Could not close stdin of child process" ); + qWarning( "Could not close stdin of child process" ); } #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcess::closeStdin(): stdin (%d) closed", d->proc->socketStdin ); + qDebug( "QProcess::closeStdin(): stdin (%d) closed", d->proc->socketStdin ); #endif d->proc->socketStdin = 0; } @@ -1193,7 +1193,7 @@ void QProcess::socketRead( int fd ) } #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcess::socketRead(): %d", fd ); + qDebug( "QProcess::socketRead(): %d", fd ); #endif if ( fd == 0 ) return; @@ -1229,7 +1229,7 @@ void QProcess::socketRead( int fd ) if ( n == 0 || n == -1 ) { if ( fd == d->proc->socketStdout ) { #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcess::socketRead(): stdout (%d) closed", fd ); + qDebug( "QProcess::socketRead(): stdout (%d) closed", fd ); #endif d->notifierStdout->setEnabled( FALSE ); delete d->notifierStdout; @@ -1239,7 +1239,7 @@ void QProcess::socketRead( int fd ) return; } else if ( fd == d->proc->socketStderr ) { #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcess::socketRead(): stderr (%d) closed", fd ); + qDebug( "QProcess::socketRead(): stderr (%d) closed", fd ); #endif d->notifierStderr->setEnabled( FALSE ); delete d->notifierStderr; @@ -1279,13 +1279,13 @@ void QProcess::socketRead( int fd ) d->socketReadCalled = TRUE; if ( fd == d->proc->socketStdout ) { #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcess::socketRead(): %d bytes read from stdout (%d)", + qDebug( "QProcess::socketRead(): %d bytes read from stdout (%d)", buffer->size()-oldSize, fd ); #endif emit readyReadStdout(); } else if ( fd == d->proc->socketStderr ) { #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcess::socketRead(): %d bytes read from stderr (%d)", + qDebug( "QProcess::socketRead(): %d bytes read from stderr (%d)", buffer->size()-oldSize, fd ); #endif emit readyReadStderr(); @@ -1309,7 +1309,7 @@ void QProcess::socketWrite( int fd ) d->stdinBuf.head()->data() + d->stdinBufRead, d->stdinBuf.head()->size() - d->stdinBufRead ); #if defined(QT_QPROCESS_DEBUG) - tqDebug( "QProcess::socketWrite(): wrote %d bytes to stdin (%d)", ret, fd ); + qDebug( "QProcess::socketWrite(): wrote %d bytes to stdin (%d)", ret, fd ); #endif if ( ret == -1 ) return; diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp index 6f00db3..039b587 100644 --- a/src/kernel/qpsprinter.cpp +++ b/src/kernel/qpsprinter.cpp @@ -1668,7 +1668,7 @@ unsigned short QPSPrinterFontPrivate::insertIntoSubset( unsigned short u ) pageSubsetCount++; } } else { - tqWarning("QPSPrinterFont::internal error"); + qWarning("QPSPrinterFont::internal error"); } return retval; } @@ -1677,7 +1677,7 @@ void QPSPrinterFontPrivate::restore() { page_subset.clear(); pageSubsetCount = 0; - //tqDebug("restore for font %s\n",psname.latin1()); + //qDebug("restore for font %s\n",psname.latin1()); } static inline const char *toHex( uchar u ) @@ -1814,7 +1814,7 @@ unsigned short QPSPrinterFontPrivate::mapUnicode( unsigned short unicode ) if ( !found ) { return insertIntoSubset( unicode ); } - //tqDebug("mapping unicode %x to %x", unicode, offset+*res); + //qDebug("mapping unicode %x to %x", unicode, offset+*res); return offset + *res; } @@ -2289,7 +2289,7 @@ QPSPrinterFontTTF::QPSPrinterFontTTF(const QFontEngine *f, QByteArray& d) else if (QString(environment_preference) == "3") target_type = 3; else - tqWarning("The value of QT_TTFTOPS must be 42 or 3"); + qWarning("The value of QT_TTFTOPS must be 42 or 3"); } #endif offset_table = (unsigned char*) data.data(); /* first 12 bytes */ @@ -2318,12 +2318,12 @@ QPSPrinterFontTTF::QPSPrinterFontTTF(const QFontEngine *f, QByteArray& d) ury = topost( getFWord( ptr + 42 ) ); indexToLocFormat = getSHORT( ptr + 50 ); /* size of 'loca' data */ if(indexToLocFormat != 0 && indexToLocFormat != 1) { - tqWarning("TrueType font is unusable because indexToLocFormat != 0"); + qWarning("TrueType font is unusable because indexToLocFormat != 0"); defective = TRUE; return; } if( getSHORT(ptr+52) != 0 ) { - tqWarning("TrueType font is unusable because glyphDataFormat != 0"); + qWarning("TrueType font is unusable because glyphDataFormat != 0"); defective = TRUE; return; } @@ -2340,7 +2340,7 @@ QPSPrinterFontTTF::QPSPrinterFontTTF(const QFontEngine *f, QByteArray& d) BYTE* table_ptr = getTable("name"); /* pointer to table */ if ( !table_ptr ) { defective = TRUE; - tqDebug("couldn't find name table" ); + qDebug("couldn't find name table" ); return; } int numrecords = getUSHORT( table_ptr + 2 ); /* number of names */ @@ -2392,8 +2392,8 @@ QPSPrinterFontTTF::QPSPrinterFontTTF(const QFontEngine *f, QByteArray& d) Fixed post_format = getFixed( post_table ); if( post_format.whole != 2 || post_format.fraction != 0 ) { - tqWarning("TrueType font does not have a format 2.0 'post' table"); - tqWarning("post format is %d.%d",post_format.whole,post_format.fraction); + qWarning("TrueType font does not have a format 2.0 'post' table"); + qWarning("post format is %d.%d",post_format.whole,post_format.fraction); // Sivan Feb 2001: no longer defective. // defective = TRUE; } @@ -2402,11 +2402,11 @@ QPSPrinterFontTTF::QPSPrinterFontTTF(const QFontEngine *f, QByteArray& d) BYTE *maxp = getTable("maxp"); if ( !maxp ) { defective = TRUE; - tqDebug("no maxp table in font"); + qDebug("no maxp table in font"); return; } numGlyphs = getUSHORT( maxp + 4 ); -// tqDebug("number of glyphs is %d", numGlyphs); +// qDebug("number of glyphs is %d", numGlyphs); replacementList = makePSFontNameList( f, psname ); uni2glyphSetup(); } @@ -2505,8 +2505,8 @@ void QPSPrinterFontTTF::download(QTextStream& s,bool global) return; } - //tqDebug("downloading ttf font %s", psname.latin1() ); - //tqDebug("target type=%d", target_type); + //qDebug("downloading ttf font %s", psname.latin1() ); + //qDebug("target type=%d", target_type); global_dict = global; QMap<unsigned short, unsigned short> *subsetDict = ⊂ if ( !global ) @@ -2716,7 +2716,7 @@ void QPSPrinterFontTTF::download(QTextStream& s,bool global) } else { /* type 3 */ if (!glyphset[x]) continue; - //tqDebug("emitting charproc for glyph %d, name=%s", x, glyphName(x).latin1() ); + //qDebug("emitting charproc for glyph %d, name=%s", x, glyphName(x).latin1() ); s << "/"; s << glyphName( x, glyphset ); s << "{"; @@ -2916,7 +2916,7 @@ void QPSPrinterFontTTF::uni2glyphSetup() } } if (map==nmaps) { - tqWarning("Font does not have unicode encoding\n"); + qWarning("Font does not have unicode encoding\n"); return; // no unicode encoding! } @@ -2928,7 +2928,7 @@ void QPSPrinterFontTTF::uni2glyphSetup() //fprintf(stderr,"Unicode cmap format %d\n",format); if (format != 4) { - //tqWarning("Unicode cmap format is not 4"); + //qWarning("Unicode cmap format is not 4"); return; } @@ -3145,7 +3145,7 @@ void QPSPrinterFontTTF::sfnts_glyf_table(ULONG oldoffset, ** two byte boundary. */ if( length % 2 ) { - tqWarning("TrueType font contains a 'glyf' table without 2 byte padding"); + qWarning("TrueType font contains a 'glyf' table without 2 byte padding"); defective = TRUE; return; } @@ -3168,7 +3168,7 @@ void QPSPrinterFontTTF::sfnts_glyf_table(ULONG oldoffset, /* Look for unexplainable descrepancies between sizes */ if( total != correct_total_length ) { - tqWarning("QPSPrinterFontTTF::sfnts_glyf_table: total != correct_total_length"); + qWarning("QPSPrinterFontTTF::sfnts_glyf_table: total != correct_total_length"); defective = TRUE; return; } @@ -3260,7 +3260,7 @@ void QPSPrinterFontTTF::download_sfnts(QTextStream& s) sfnts_pputUSHORT(81,s, string_len, line_len, in_string); /* rangeShift */ } else { - tqWarning("Fewer than 9 tables selected"); + qWarning("Fewer than 9 tables selected"); } /* Now, emmit the table directory. */ @@ -3297,7 +3297,7 @@ void QPSPrinterFontTTF::download_sfnts(QTextStream& s) string_len, line_len, in_string); } else { // other tables should not exceed 64K (not always true; Sivan) if( tables[x].length > 65535 ) { - tqWarning("TrueType font has a table which is too long"); + qWarning("TrueType font has a table which is too long"); defective = TRUE; return; } @@ -3699,7 +3699,7 @@ void QPSPrinterFontTTF::charprocLoad(BYTE *glyph, charproc_data* cd) ct = *(glyph++); if( (x + ct) > cd->num_pts ) { - tqWarning("Fatal Error in TT flags"); + qWarning("Fatal Error in TT flags"); return; } @@ -4053,7 +4053,7 @@ QPSPrinterFontPFA::QPSPrinterFontPFA(const QFontEngine *f, QByteArray& d) QString fontname; if (p[ pos ] != '%' || p[ pos+1 ] != '!') { // PFA marker - tqWarning("invalid pfa file"); + qWarning("invalid pfa file"); return; } @@ -4079,7 +4079,7 @@ void QPSPrinterFontPFA::download(QTextStream& s, bool global) return; } - //tqDebug("downloading pfa font %s", psname.latin1() ); + //qDebug("downloading pfa font %s", psname.latin1() ); char* p = data.data(); s << "% Font resource\n"; @@ -4111,7 +4111,7 @@ QPSPrinterFontPFB::QPSPrinterFontPFB(const QFontEngine *f, QByteArray& d) QString fontname; if (p[ pos ] != 0x80) { // PFB marker - tqWarning("pfb file does not start with 0x80"); + qWarning("pfb file does not start with 0x80"); return; } pos++; @@ -4146,7 +4146,7 @@ void QPSPrinterFontPFB::download(QTextStream& s, bool global) return; } - //tqDebug("downloading pfb font %s", psname.latin1() ); + //qDebug("downloading pfb font %s", psname.latin1() ); unsigned char* p = (unsigned char*) data.data(); int pos; int len; @@ -4173,7 +4173,7 @@ void QPSPrinterFontPFB::download(QTextStream& s, bool global) len |= (p[ pos ] << 16); pos++; len |= (p[ pos ] << 24); pos++; - //tqDebug("font block type %d len %d",typ,len); + //qDebug("font block type %d len %d",typ,len); int end = pos + len; if (typ==1) { @@ -4182,7 +4182,7 @@ void QPSPrinterFontPFB::download(QTextStream& s, bool global) s << "\n"; hexcol = 0; } - //tqWarning(QString::fromLatin1((char*)(p+pos),1)); + //qWarning(QString::fromLatin1((char*)(p+pos),1)); if (p[pos] == '\r' || p[pos] == '\n') { s << "\n"; while (pos < end && (p[pos] == '\r' || p[pos] == '\n')) @@ -4233,7 +4233,7 @@ QPSPrinterFontNotFound::QPSPrinterFontNotFound(const QFontEngine* f) void QPSPrinterFontNotFound::download(QTextStream& s, bool) { - //tqDebug("downloading not found font %s", psname.latin1() ); + //qDebug("downloading not found font %s", psname.latin1() ); emitPSFontNameList( s, psname, replacementList ); s << "% No embeddable font for "; s << psname; @@ -4350,7 +4350,7 @@ QString QPSPrinterFontAsian::defineFont( QTextStream &stream, const QString &ps, void QPSPrinterFontAsian::download(QTextStream& s, bool) { - //tqDebug("downloading asian font %s", psname.latin1() ); + //qDebug("downloading asian font %s", psname.latin1() ); s << "% Asian postscript font requested. Using " << psname << endl; emitPSFontNameList( s, psname, replacementList ); @@ -4871,7 +4871,7 @@ QPSPrinterFontSimplifiedChinese::QPSPrinterFontSimplifiedChinese(const QFontEngi psname = SongGBK2K[type].psname; appendReplacements( replacementList, SimplifiedReplacements, type ); } - //tqDebug("simplified chinese: fontname is %s, psname=%s", f.family().latin1(), psname.latin1() ); + //qDebug("simplified chinese: fontname is %s, psname=%s", f.family().latin1(), psname.latin1() ); } QString QPSPrinterFontSimplifiedChinese::extension() const @@ -4921,14 +4921,14 @@ QPSPrinterFont::QPSPrinterFont(const QFont &f, int script, QPSPrinterPrivate *pr #if defined( Q_WS_X11 ) bool xlfd = FALSE; - //tqDebug("engine = %p name=%s, script=%d", engine, engine ? engine->name() : "(null)", script); + //qDebug("engine = %p name=%s, script=%d", engine, engine ? engine->name() : "(null)", script); #ifndef QT_NO_XFTFREETYPE if ( qt_has_xft && engine && engine->type() == QFontEngine::Xft ) { XftPattern *pattern = static_cast<QFontEngineXft *>( engine )->pattern(); char *filename = 0; XftPatternGetString (pattern, XFT_FILE, 0, &filename); - //tqDebug("filename for font is '%s'", filename); + //qDebug("filename for font is '%s'", filename); if ( filename ) { fontfilename = QString::fromLocal8Bit( filename ); xfontname = fontfilename; @@ -4996,7 +4996,7 @@ QPSPrinterFont::QPSPrinterFont(const QFont &f, int script, QPSPrinterPrivate *pr xfontname += "/" + toString( script ); #endif - //tqDebug("looking for font %s in dict", xfontname.latin1() ); + //qDebug("looking for font %s in dict", xfontname.latin1() ); p = priv->fonts.find(xfontname); if ( p ) return; @@ -5014,15 +5014,15 @@ QPSPrinterFont::QPSPrinterFont(const QFont &f, int script, QPSPrinterPrivate *pr fontmapname = (*it) + "/fonts.scale"; else fontmapname = (*it) + "/fonts.dir"; - //tqWarning(fontmapname); + //qWarning(fontmapname); QFile fontmap(fontmapname); if (fontmap.open(IO_ReadOnly)) { while (!fontmap.atEnd()) { QString mapping; fontmap.readLine(mapping,512); // fold to lower (since X folds to lowercase) - //tqWarning(xfontname); - //tqWarning(mapping); + //qWarning(xfontname); + //qWarning(mapping); if (mapping.lower().contains(searchname.lower())) { int index = mapping.find(' ',0); QString ffn = mapping.mid(0,index); @@ -5031,7 +5031,7 @@ QPSPrinterFont::QPSPrinterFont(const QFont &f, int script, QPSPrinterPrivate *pr !ffn.contains( ".spd" ) && !ffn.contains( ".phont" ) ) { fontfilename = (*it) + QString("/") + ffn; if ( QFile::exists(fontfilename) ) { - //tqDebug("found font file %s", fontfilename.latin1()); + //qDebug("found font file %s", fontfilename.latin1()); break; } else // unset fontfilename fontfilename = QString(); @@ -5046,7 +5046,7 @@ QPSPrinterFont::QPSPrinterFont(const QFont &f, int script, QPSPrinterPrivate *pr } #endif - //tqDebug("font=%s, fontname=%s, file=%s, p=%p", f.family().latin1(), xfontname.latin1(), fontfilename.latin1(), p); + //qDebug("font=%s, fontname=%s, file=%s, p=%p", f.family().latin1(), xfontname.latin1(), fontfilename.latin1(), p); // memory mapping would be better here if (fontfilename.length() > 0) { // maybe there is no file name @@ -5074,7 +5074,7 @@ QPSPrinterFont::QPSPrinterFont(const QFont &f, int script, QPSPrinterPrivate *pr } else type = NONE; - //tqDebug("font is of type %d", type ); + //qDebug("font is of type %d", type ); switch (type) { case TTF : p = new QPSPrinterFontTTF(engine, data); @@ -5116,7 +5116,7 @@ QPSPrinterFont::QPSPrinterFont(const QFont &f, int script, QPSPrinterPrivate *pr } } else #endif - //tqDebug("didnt find font for %s", xfontname.latin1()); + //qDebug("didnt find font for %s", xfontname.latin1()); p = new QPSPrinterFontNotFound( engine ); break; } @@ -5128,14 +5128,14 @@ QPSPrinterFont::QPSPrinterFont(const QFont &f, int script, QPSPrinterPrivate *pr QDictIterator<QPSPrinterFontPrivate> it( priv->fonts ); for( it.toFirst(); it.current(); ++it ) { if ( *(*it) == *p ) { -// tqWarning("Post script driver: font already in dict"); +// qWarning("Post script driver: font already in dict"); delete p; p = *it; return; } } - //tqDebug("inserting font %s in dict psname=%s", xfontname.latin1(), p->postScriptFontName().latin1() ); + //qDebug("inserting font %s in dict psname=%s", xfontname.latin1(), p->postScriptFontName().latin1() ); priv->fonts.insert( xfontname, p ); } @@ -5235,7 +5235,7 @@ void QPSPrinterPrivate::setFont( const QFont & fnt, int script ) } if ( f.pointSize() == 0 ) { #if defined(CHECK_RANGE) - tqWarning( "QPrinter: Cannot set a font with zero point size." ); + qWarning( "QPrinter: Cannot set a font with zero point size." ); #endif f.setPointSize(QApplication::font().pointSize()); if ( f.pointSize() == 0 ) @@ -5529,7 +5529,7 @@ static QByteArray compress( const QImage & image, bool gray ) { #if 0 /* this should never happen: both the start and the end pointers ran off their tracks. */ - tqDebug( "oops! %06x %06x %06x %06x %5d %5d %5d %d", + qDebug( "oops! %06x %06x %06x %06x %5d %5d %5d %d", pixel[start], pixel[end], pixel[index], pixel[index+bestLength], start, end, index, bestLength ); @@ -5716,20 +5716,20 @@ static QByteArray compress( const QImage & image, bool gray ) { delete [] pixel; #ifdef DEBUG_COMPRESS - tqDebug( "------------- image compression statistics ----------------" ); - tqDebug(" compression time %d", t.elapsed() ); - tqDebug( "Size dist of uncompressed blocks:" ); - tqDebug( "\t%d\t%d\t%d\t%d\t%d\t%d\n", sizeUncompressed[0], sizeUncompressed[1], + qDebug( "------------- image compression statistics ----------------" ); + qDebug(" compression time %d", t.elapsed() ); + qDebug( "Size dist of uncompressed blocks:" ); + qDebug( "\t%d\t%d\t%d\t%d\t%d\t%d\n", sizeUncompressed[0], sizeUncompressed[1], sizeUncompressed[2], sizeUncompressed[3], sizeUncompressed[4], sizeUncompressed[5]); - tqDebug( "\t%d\t%d\t%d\t%d\t%d\n", sizeUncompressed[6], sizeUncompressed[7], + qDebug( "\t%d\t%d\t%d\t%d\t%d\n", sizeUncompressed[6], sizeUncompressed[7], sizeUncompressed[8], sizeUncompressed[9], sizeUncompressed[10] ); - tqDebug( "Size dist of compressed blocks:" ); - tqDebug( "\t%d\t%d\t%d\t%d\t%d\t%d\n", sizeCompressed[0], sizeCompressed[1], + qDebug( "Size dist of compressed blocks:" ); + qDebug( "\t%d\t%d\t%d\t%d\t%d\t%d\n", sizeCompressed[0], sizeCompressed[1], sizeCompressed[2], sizeCompressed[3], sizeCompressed[4], sizeCompressed[5]); - tqDebug( "\t%d\t%d\t%d\t%d\t%d\n", sizeCompressed[6], sizeCompressed[7], + qDebug( "\t%d\t%d\t%d\t%d\t%d\n", sizeCompressed[6], sizeCompressed[7], sizeCompressed[8], sizeCompressed[9], sizeCompressed[10] ); - tqDebug( "===> total compression ratio %d/%d = %f", outOffset, size, (float)outOffset/(float)size ); - tqDebug( "-----------------------------------------------------------" ); + qDebug( "===> total compression ratio %d/%d = %f", outOffset, size, (float)outOffset/(float)size ); + qDebug( "-----------------------------------------------------------" ); #endif return outarr; @@ -6061,7 +6061,7 @@ void QPSPrinterPrivate::resetDrawingTools( QPainter *paint ) if ( b != defaultBrush ) { if ( b == Qt::CustomPattern ) { #if defined(CHECK_RANGE) - tqWarning( "QPrinter: Pixmap brush not supported" ); + qWarning( "QPrinter: Pixmap brush not supported" ); #endif } else { cbrush = b; @@ -6171,7 +6171,7 @@ void QPSPrinterPrivate::flushPage( bool last ) (last || buffer->size() > 50000000) #endif ) { -// tqDebug("emiting header at page %d", pageCount ); +// qDebug("emiting header at page %d", pageCount ); emitHeader( last ); } outStream << "%%Page: " @@ -6180,7 +6180,7 @@ void QPSPrinterPrivate::flushPage( bool last ) << "QI\n"; if (!dirtyNewPage) { if ( pageFonts ) { - //tqDebug("page fonts for page %d", pageCount); + //qDebug("page fonts for page %d", pageCount); // we have already downloaded the header. Maybe we have page fonts here QDictIterator<QPSPrinterFontPrivate> it(fonts); while (it.current()) { @@ -6243,7 +6243,7 @@ static void ignoreSigPipe(bool b) return; // not ignoring sigpipe if (sigaction(SIGPIPE, users_sigpipe_handler, 0) == -1) - tqWarning("QPSPrinter: could not restore SIGPIPE handler"); + qWarning("QPSPrinter: could not restore SIGPIPE handler"); delete users_sigpipe_handler; users_sigpipe_handler = 0; @@ -6513,7 +6513,7 @@ bool QPSPrinter::cmd( int c , QPainter *paint, QPDevCmdParam *p ) case PdcSetROP: #if defined(CHECK_RANGE) if ( p[0].ival != Qt::CopyROP ) - tqWarning( "QPrinter: Raster operation setting not supported" ); + qWarning( "QPrinter: Raster operation setting not supported" ); #endif break; case PdcSetBrushOrigin: @@ -6534,7 +6534,7 @@ bool QPSPrinter::cmd( int c , QPainter *paint, QPDevCmdParam *p ) case PdcSetBrush: if ( p[0].brush->style() == Qt::CustomPattern ) { #if defined(CHECK_RANGE) - tqWarning( "QPrinter: Pixmap brush not supported" ); + qWarning( "QPrinter: Pixmap brush not supported" ); #endif return FALSE; } diff --git a/src/kernel/qregion.cpp b/src/kernel/qregion.cpp index 8a0f8de..603ab44 100644 --- a/src/kernel/qregion.cpp +++ b/src/kernel/qregion.cpp @@ -174,7 +174,7 @@ void QRegion::exec( const QByteArray &buffer, int ver ) } #if defined(QT_CHECK_STATE) if ( test_cnt > 0 && id != QRGN_TRANSLATE ) - tqWarning( "QRegion::exec: Internal error" ); + qWarning( "QRegion::exec: Internal error" ); test_cnt++; #endif if ( id == QRGN_SETRECT || id == QRGN_SETELLIPSE ) { diff --git a/src/kernel/qregion_x11.cpp b/src/kernel/qregion_x11.cpp index 40bb023..7b04a15 100644 --- a/src/kernel/qregion_x11.cpp +++ b/src/kernel/qregion_x11.cpp @@ -2433,7 +2433,7 @@ static void cleanup_empty_region() QRegion::QRegion() { if ( !empty_region ) { // avoid too many allocs - tqAddPostRoutine( cleanup_empty_region ); + qAddPostRoutine( cleanup_empty_region ); empty_region = new QRegion( TRUE ); Q_CHECK_PTR( empty_region ); } @@ -2469,7 +2469,7 @@ QRegion::QRegion( const QRect &r, RegionType t ) { if ( r.isEmpty() ) { if ( !empty_region ) { // avoid too many allocs - tqAddPostRoutine( cleanup_empty_region ); + qAddPostRoutine( cleanup_empty_region ); empty_region = new QRegion( TRUE ); Q_CHECK_PTR( empty_region ); } @@ -2516,7 +2516,7 @@ QRegion::QRegion( const QPointArray &a, bool winding ) winding ? WindingRule : EvenOddRule ); } else { if ( !empty_region ) { - tqAddPostRoutine( cleanup_empty_region ); + qAddPostRoutine( cleanup_empty_region ); empty_region = new QRegion( TRUE ); Q_CHECK_PTR( empty_region ); } @@ -2551,7 +2551,7 @@ QRegion::QRegion( const QBitmap & bm ) { if ( bm.isNull() ) { if ( !empty_region ) { // avoid too many allocs - tqAddPostRoutine( cleanup_empty_region ); + qAddPostRoutine( cleanup_empty_region ); empty_region = new QRegion( TRUE ); Q_CHECK_PTR( empty_region ); } diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp index 37d2493..eb43f3c 100644 --- a/src/kernel/qrichtext.cpp +++ b/src/kernel/qrichtext.cpp @@ -214,7 +214,7 @@ QTextCursor *QTextDeleteCommand::execute( QTextCursor *c ) { QTextParagraph *s = doc ? doc->paragAt( id ) : parag; if ( !s ) { - tqWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParagraph()->paragId() ); + qWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParagraph()->paragId() ); return 0; } @@ -242,7 +242,7 @@ QTextCursor *QTextDeleteCommand::unexecute( QTextCursor *c ) { QTextParagraph *s = doc ? doc->paragAt( id ) : parag; if ( !s ) { - tqWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParagraph()->paragId() ); + qWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParagraph()->paragId() ); return 0; } @@ -1733,10 +1733,10 @@ void QTextDocument::setRichTextInternal( const QString &text, QTextCursor* curso QString bg = attr["background"]; const QMimeSource* m = factory_->data( bg, contxt ); if ( !m ) { - tqWarning("QRichText: no mimesource for %s", bg.latin1() ); + qWarning("QRichText: no mimesource for %s", bg.latin1() ); } else { if ( !QImageDrag::decode( m, img ) ) { - tqWarning("QTextImage: cannot decode %s", bg.latin1() ); + qWarning("QTextImage: cannot decode %s", bg.latin1() ); } } if ( !img.isNull() ) { @@ -2370,7 +2370,7 @@ QString QTextDocument::richText() const QStyleSheetItem* item_ol = styleSheet()->item("ol"); QStyleSheetItem* item_li = styleSheet()->item("li"); if ( !item_p || !item_div || !item_ul || !item_ol || !item_li ) { - tqWarning( "QTextEdit: cannot export HTML due to insufficient stylesheet (lack of p, div, ul, ol, or li)" ); + qWarning( "QTextEdit: cannot export HTML due to insufficient stylesheet (lack of p, div, ul, ol, or li)" ); return QString::null; } int pastListDepth = 0; @@ -4415,7 +4415,7 @@ int QTextParagraph::lineHeightOfChar( int i, int *bl, int *y ) const --it; } - tqWarning( "QTextParagraph::lineHeightOfChar: couldn't find lh for %d", i ); + qWarning( "QTextParagraph::lineHeightOfChar: couldn't find lh for %d", i ); return 15; } @@ -4441,7 +4441,7 @@ QTextStringChar *QTextParagraph::lineStartOfChar( int i, int *index, int *line ) --l; } - tqWarning( "QTextParagraph::lineStartOfChar: couldn't find %d", i ); + qWarning( "QTextParagraph::lineStartOfChar: couldn't find %d", i ); return 0; } @@ -4468,7 +4468,7 @@ QTextStringChar *QTextParagraph::lineStartOfLine( int line, int *index ) const return &str->at( i ); } - tqWarning( "QTextParagraph::lineStartOfLine: couldn't find %d", line ); + qWarning( "QTextParagraph::lineStartOfLine: couldn't find %d", line ); return 0; } @@ -5407,12 +5407,12 @@ QTextLineStart *QTextFormatter::bidiReorderLine( QTextParagraph * /*parag*/, QTe visual = (int *)malloc( length*sizeof( int ) ); } - //tqDebug("bidiReorderLine: length=%d (%d-%d)", length, start, last ); + //qDebug("bidiReorderLine: length=%d (%d-%d)", length, start, last ); QTextStringChar *ch = startChar; unsigned char *l = levels; while ( ch <= lastChar ) { - //tqDebug( " level: %d", ch->bidiLevel ); + //qDebug( " level: %d", ch->bidiLevel ); *(l++) = (ch++)->bidiLevel; } @@ -5472,7 +5472,7 @@ QTextLineStart *QTextFormatter::bidiReorderLine( QTextParagraph * /*parag*/, QTe ch->x = x + toAdd; ch->rightToLeft = ch->bidiLevel % 2; - //tqDebug("visual: %d (%x) placed at %d rightToLeft=%d", visual[i], ch->c.unicode(), x +toAdd, ch->rightToLeft ); + //qDebug("visual: %d (%x) placed at %d rightToLeft=%d", visual[i], ch->c.unicode(), x +toAdd, ch->rightToLeft ); int ww = 0; if ( ch->c.unicode() >= 32 || ch->c == '\t' || ch->c == '\n' || ch->isCustom() ) { ww = text->width( start+visual[i] ); @@ -6178,7 +6178,7 @@ QTextFormat *QTextFormatCollection::format( const QFont &f, const QColor &c ) cachedFormat->collection = this; cKey.insert( cachedFormat->key(), cachedFormat ); if ( cachedFormat->key() != key ) - tqWarning("ASSERT: keys for format not identical: '%s '%s'", cachedFormat->key().latin1(), key.latin1() ); + qWarning("ASSERT: keys for format not identical: '%s '%s'", cachedFormat->key().latin1(), key.latin1() ); return cachedFormat; } @@ -6597,11 +6597,11 @@ QTextImage::QTextImage( QTextDocument *p, const QMap<QString, QString> &attr, co const QMimeSource* m = factory.data( imageName, context ); if ( !m ) { - tqWarning("QTextImage: no mimesource for %s", imageName.latin1() ); + qWarning("QTextImage: no mimesource for %s", imageName.latin1() ); } else { if ( !QImageDrag::decode( m, img ) ) { - tqWarning("QTextImage: cannot decode %s", imageName.latin1() ); + qWarning("QTextImage: cannot decode %s", imageName.latin1() ); } } @@ -7229,7 +7229,7 @@ static QMap<QString, QChar> *htmlMap() { if ( !html_map ) { html_map = new QMap<QString, QChar>; - tqAddPostRoutine( qt_cleanup_html_map ); + qAddPostRoutine( qt_cleanup_html_map ); const Entity *ent = entitylist; while( ent->code ) { diff --git a/src/kernel/qrichtext_p.cpp b/src/kernel/qrichtext_p.cpp index f71cc39..cf79a51 100644 --- a/src/kernel/qrichtext_p.cpp +++ b/src/kernel/qrichtext_p.cpp @@ -151,7 +151,7 @@ void QTextCursor::gotoPosition( QTextParagraph* p, int index ) para = p; if ( index < 0 || index >= para->length() ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QTextCursor::gotoParagraph Index: %d out of range", index ); + qWarning( "QTextCursor::gotoParagraph Index: %d out of range", index ); #endif if ( index < 0 || para->length() == 0 ) index = 0; @@ -506,7 +506,7 @@ bool QTextParagraph::fullSelected( int id ) const int QTextParagraph::lineY( int l ) const { if ( l > (int)lineStarts.count() - 1 ) { - tqWarning( "QTextParagraph::lineY: line %d out of range!", l ); + qWarning( "QTextParagraph::lineY: line %d out of range!", l ); return 0; } @@ -522,7 +522,7 @@ int QTextParagraph::lineY( int l ) const int QTextParagraph::lineBaseLine( int l ) const { if ( l > (int)lineStarts.count() - 1 ) { - tqWarning( "QTextParagraph::lineBaseLine: line %d out of range!", l ); + qWarning( "QTextParagraph::lineBaseLine: line %d out of range!", l ); return 10; } @@ -538,7 +538,7 @@ int QTextParagraph::lineBaseLine( int l ) const int QTextParagraph::lineHeight( int l ) const { if ( l > (int)lineStarts.count() - 1 ) { - tqWarning( "QTextParagraph::lineHeight: line %d out of range!", l ); + qWarning( "QTextParagraph::lineHeight: line %d out of range!", l ); return 15; } @@ -554,8 +554,8 @@ int QTextParagraph::lineHeight( int l ) const void QTextParagraph::lineInfo( int l, int &y, int &h, int &bl ) const { if ( l > (int)lineStarts.count() - 1 ) { - tqWarning( "QTextParagraph::lineInfo: line %d out of range!", l ); - tqDebug( "%d %d", (int)lineStarts.count() - 1, l ); + qWarning( "QTextParagraph::lineInfo: line %d out of range!", l ); + qDebug( "%d %d", (int)lineStarts.count() - 1, l ); y = 0; h = 15; bl = 10; diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h index c5bc09e..614841e 100644 --- a/src/kernel/qrichtext_p.h +++ b/src/kernel/qrichtext_p.h @@ -1981,7 +1981,7 @@ inline void QTextParagraph::setParagId( int i ) inline int QTextParagraph::paragId() const { if ( id == -1 ) - tqWarning( "invalid parag id!!!!!!!! (%p)", (void*)this ); + qWarning( "invalid parag id!!!!!!!! (%p)", (void*)this ); return id; } diff --git a/src/kernel/qscriptengine.cpp b/src/kernel/qscriptengine.cpp index 4bee84a..66aa07b 100644 --- a/src/kernel/qscriptengine.cpp +++ b/src/kernel/qscriptengine.cpp @@ -120,7 +120,7 @@ static inline void positionCluster(QShaperItem *item, int gfrom, int glast) { int nmarks = glast - gfrom; if (nmarks <= 0) { - tqWarning("positionCluster: no marks to position!"); + qWarning("positionCluster: no marks to position!"); return; } @@ -134,12 +134,12 @@ static inline void positionCluster(QShaperItem *item, int gfrom, int glast) QRect baseRect(baseInfo.x, baseInfo.y, baseInfo.width, baseInfo.height); -// tqDebug("---> positionCluster: cluster from %d to %d", gfrom, glast); -// tqDebug("baseInfo: %f/%f (%f/%f) off=%f/%f", baseInfo.x, baseInfo.y, baseInfo.width, baseInfo.height, baseInfo.xoff, baseInfo.yoff); +// qDebug("---> positionCluster: cluster from %d to %d", gfrom, glast); +// qDebug("baseInfo: %f/%f (%f/%f) off=%f/%f", baseInfo.x, baseInfo.y, baseInfo.width, baseInfo.height, baseInfo.xoff, baseInfo.yoff); int size = (f->ascent()/10); int offsetBase = (size - 4) / 4 + QMIN(size, 4) + 1; -// tqDebug("offset = %f", offsetBase); +// qDebug("offset = %f", offsetBase); bool rightToLeft = item->flags & QTextEngine::RightToLeft; @@ -152,7 +152,7 @@ static inline void positionCluster(QShaperItem *item, int gfrom, int glast) QPoint p; glyph_metrics_t markInfo = f->boundingBox(mark); QRect markRect(markInfo.x, markInfo.y, markInfo.width, markInfo.height); -// tqDebug("markInfo: %f/%f (%f/%f) off=%f/%f", markInfo.x, markInfo.y, markInfo.width, markInfo.height, markInfo.xoff, markInfo.yoff); +// qDebug("markInfo: %f/%f (%f/%f) off=%f/%f", markInfo.x, markInfo.y, markInfo.width, markInfo.height, markInfo.xoff, markInfo.yoff); int offset = offsetBase; unsigned char cmb = item->attributes[gfrom+i].combiningClass; @@ -192,7 +192,7 @@ static inline void positionCluster(QShaperItem *item, int gfrom, int glast) // combining marks of different class don't interact. Reset the rectangle. if (cmb != lastCmb) { - //tqDebug("resetting rect"); + //qDebug("resetting rect"); attachmentRect = baseRect; } @@ -246,7 +246,7 @@ static inline void positionCluster(QShaperItem *item, int gfrom, int glast) default: break; } -// tqDebug("char=%x combiningClass = %d offset=%d/%d", mark, cmb, p.x(), p.y()); +// qDebug("char=%x combiningClass = %d offset=%d/%d", mark, cmb, p.x(), p.y()); markRect.moveBy(p.x(), p.y()); attachmentRect |= markRect; lastCmb = cmb; @@ -287,7 +287,7 @@ static void heuristicSetGlyphAttributes(QShaperItem *item, const QChar *uc, int // justification is missing here!!!!! if ( item->num_glyphs != length ) - tqWarning("QScriptEngine::heuristicSetGlyphAttributes: char length and num glyphs disagree" ); + qWarning("QScriptEngine::heuristicSetGlyphAttributes: char length and num glyphs disagree" ); unsigned short *logClusters = item->log_clusters; @@ -899,7 +899,7 @@ struct QArabicProperties { static void getArabicProperties(const unsigned short *chars, int len, QArabicProperties *properties) { -// tqDebug("arabicSyriacOpenTypeShape: properties:"); +// qDebug("arabicSyriacOpenTypeShape: properties:"); int lastPos = 0; int lastGroup = ArabicNone; @@ -1005,7 +1005,7 @@ static void getArabicProperties(const unsigned short *chars, int len, QArabicPro // for (int i = 0; i < len; ++i) -// tqDebug("arabic properties(%d): uc=%x shape=%d, justification=%d", i, chars[i], properties[i].shape, properties[i].justification); +// qDebug("arabic properties(%d): uc=%x shape=%d, justification=%d", i, chars[i], properties[i].shape, properties[i].justification); } @@ -1326,7 +1326,7 @@ static inline int getShape(uchar cell, int shape) */ static inline const QChar prevChar(const QString *str, int pos) { - //tqDebug("leftChar: pos=%d", pos); + //qDebug("leftChar: pos=%d", pos); pos--; const QChar *ch = str->unicode() + pos; while(pos > -1) { @@ -1344,7 +1344,7 @@ static inline const QChar nextChar(const QString *str, int pos) int len = str->length(); const QChar *ch = str->unicode() + pos; while(pos < len) { - //tqDebug("rightChar: %d isLetter=%d, joining=%d", pos, ch.isLetter(), ch.joining()); + //qDebug("rightChar: %d isLetter=%d, joining=%d", pos, ch.isLetter(), ch.joining()); if(::category(*ch) != QChar::Mark_NonSpacing) return *ch; // assume it's a transparent char, this might not be 100% correct @@ -1402,7 +1402,7 @@ static void shapedString(const QString *uc, int from, int len, QChar *shapeBuffe uchar c = ch->cell(); int pos = i + from; int shape = properties[i].shape; -// tqDebug("mapping U+%x to shape %d glyph=0x%x", ch->unicode(), shape, getShape(c, shape)); +// qDebug("mapping U+%x to shape %d glyph=0x%x", ch->unicode(), shape, getShape(c, shape)); // take care of lam-alef ligatures (lam right of alef) ushort map; switch (c) { @@ -1414,7 +1414,7 @@ static void shapedString(const QString *uc, int from, int len, QChar *shapeBuffe case 0x23: case 0x25: case 0x27: -// tqDebug(" lam of lam-alef ligature"); +// qDebug(" lam of lam-alef ligature"); map = arabicUnicodeLamAlefMapping[pch.cell() - 0x22][shape]; goto next; default: @@ -1429,7 +1429,7 @@ static void shapedString(const QString *uc, int from, int len, QChar *shapeBuffe case 0x27: // alef if (prevChar(uc, pos).unicode() == 0x0644) { // have a lam alef ligature - //tqDebug(" alef of lam-alef ligature"); + //qDebug(" alef of lam-alef ligature"); goto skip; } default: @@ -1443,7 +1443,7 @@ static void shapedString(const QString *uc, int from, int len, QChar *shapeBuffe //attributes[gpos].zeroWidth = zeroWidth; if (::category(*ch) == QChar::Mark_NonSpacing) { attributes[gpos].mark = TRUE; -// tqDebug("glyph %d (char %d) is mark!", gpos, i); +// qDebug("glyph %d (char %d) is mark!", gpos, i); } else { attributes[gpos].mark = FALSE; clusterStart = data - shapeBuffer; @@ -1451,7 +1451,7 @@ static void shapedString(const QString *uc, int from, int len, QChar *shapeBuffe attributes[gpos].clusterStart = !attributes[gpos].mark; attributes[gpos].combiningClass = combiningClass(*ch); attributes[gpos].justification = properties[i].justification; -// tqDebug("data[%d] = %x (from %x)", gpos, (uint)data->unicode(), ch->unicode()); +// qDebug("data[%d] = %x (from %x)", gpos, (uint)data->unicode(), ch->unicode()); data++; skip: ch++; diff --git a/src/kernel/qscriptengine_x11.cpp b/src/kernel/qscriptengine_x11.cpp index 842c390..7d2b77d 100644 --- a/src/kernel/qscriptengine_x11.cpp +++ b/src/kernel/qscriptengine_x11.cpp @@ -1124,7 +1124,7 @@ static const unsigned short split_matras[] = { static inline void splitMatra(unsigned short *reordered, int matra, int &len, int &base) { unsigned short matra_uc = reordered[matra]; - //tqDebug("matra=%d, reordered[matra]=%x", matra, reordered[matra]); + //qDebug("matra=%d, reordered[matra]=%x", matra, reordered[matra]); const unsigned short *split = split_matras; while (split[0] < matra_uc) @@ -1189,9 +1189,9 @@ static const QOpenType::Features indic_features[] = { // #define INDIC_DEBUG #ifdef INDIC_DEBUG -#define IDEBUG tqDebug +#define IDEBUG qDebug #else -#define IDEBUG if(0) tqDebug +#define IDEBUG if(0) qDebug #endif #ifdef INDIC_DEBUG @@ -1665,7 +1665,7 @@ static bool indic_shape_syllable(QOpenType *openType, QShaperItem *item, bool in { IDEBUG("OT properties:"); for (int i = 0; i < len; ++i) - tqDebug(" i: %s", ::propertiesToString(properties[i]).toLatin1().data()); + qDebug(" i: %s", ::propertiesToString(properties[i]).toLatin1().data()); } #endif @@ -1678,14 +1678,14 @@ static bool indic_shape_syllable(QOpenType *openType, QShaperItem *item, bool in // move the left matra back to it's correct position in malayalam and tamil if ((script == QFont::Malayalam || script == QFont::Tamil) && (form(reordered[0]) == Matra)) { -// tqDebug("reordering matra, len=%d", newLen); +// qDebug("reordering matra, len=%d", newLen); // need to find the base in the shaped string and move the matra there int basePos = 0; while (basePos < newLen && (int)otl_glyphs[basePos].cluster <= base) basePos++; --basePos; if (basePos < newLen && basePos > 1) { -// tqDebug("moving prebase matra to position %d in syllable newlen=%d", basePos, newLen); +// qDebug("moving prebase matra to position %d in syllable newlen=%d", basePos, newLen); OTL_GlyphItemRec m = otl_glyphs[0]; --basePos; for (i = 0; i < basePos; ++i) @@ -2092,7 +2092,7 @@ static int tibetan_nextSyllableBoundary(const QString &s, int start, int end, bo int pos = 0; TibetanForm state = tibetan_form(*uc); -// tqDebug("state[%d]=%d (uc=%4x)", pos, state, uc[pos].unicode()); +// qDebug("state[%d]=%d (uc=%4x)", pos, state, uc[pos].unicode()); pos++; if (state != TibetanHeadConsonant) { @@ -2473,9 +2473,9 @@ static const signed char khmerStateTable[][CC_COUNT] = // #define KHMER_DEBUG #ifdef KHMER_DEBUG -#define KHDEBUG tqDebug +#define KHDEBUG qDebug #else -#define KHDEBUG if(0) tqDebug +#define KHDEBUG if(0) qDebug #endif // Given an input string of characters and a location in which to start looking @@ -2551,9 +2551,9 @@ static bool khmer_shape_syllable(QOpenType *openType, QShaperItem *item) memset(properties, 0, 16*sizeof(unsigned char)); #ifdef KHMER_DEBUG - tqDebug("original:"); + qDebug("original:"); for (int i = from; i < syllableEnd; i++) { - tqDebug(" %d: %4x", i, string[i].unicode()); + qDebug(" %d: %4x", i, string[i].unicode()); } #endif @@ -3001,9 +3001,9 @@ static const signed char mymrStateTable[][Mymr_CC_COUNT] = // #define MYANMAR_DEBUG #ifdef MYANMAR_DEBUG -#define MMDEBUG tqDebug +#define MMDEBUG qDebug #else -#define MMDEBUG if(0) tqDebug +#define MMDEBUG if(0) qDebug #endif // Given an input string of characters and a location in which to start looking @@ -3082,9 +3082,9 @@ static bool myanmar_shape_syllable(QOpenType *openType, QShaperItem *item, bool const QChar *uc = item->string->unicode() + item->from; #ifdef MYANMAR_DEBUG - tqDebug("original:"); + qDebug("original:"); for (int i = 0; i < item->length; i++) { - tqDebug(" %d: %4x", i, uc[i].unicode()); + qDebug(" %d: %4x", i, uc[i].unicode()); } #endif int vowel_e = -1; diff --git a/src/kernel/qsize.cpp b/src/kernel/qsize.cpp index 868c38a..8dc25e4 100644 --- a/src/kernel/qsize.cpp +++ b/src/kernel/qsize.cpp @@ -381,7 +381,7 @@ void QSize::scale( const QSize &s, ScaleMode mode ) void QSize::warningDivByZero() { #if defined(QT_CHECK_MATH) - tqWarning( "QSize: Division by zero error" ); + qWarning( "QSize: Division by zero error" ); #endif } diff --git a/src/kernel/qsocketnotifier.cpp b/src/kernel/qsocketnotifier.cpp index 2749b75..a5cdbbd 100644 --- a/src/kernel/qsocketnotifier.cpp +++ b/src/kernel/qsocketnotifier.cpp @@ -146,10 +146,10 @@ QSocketNotifier::QSocketNotifier( int socket, Type type, QObject *parent, { #if defined(QT_CHECK_RANGE) if ( socket < 0 ) - tqWarning( "QSocketNotifier: Invalid socket specified" ); + qWarning( "QSocketNotifier: Invalid socket specified" ); # if defined(Q_OS_UNIX) if ( socket >= FD_SETSIZE ) - tqWarning( "QSocketNotifier: Socket descriptor too large for select()" ); + qWarning( "QSocketNotifier: Socket descriptor too large for select()" ); # endif #endif sockfd = socket; diff --git a/src/kernel/qtextengine.cpp b/src/kernel/qtextengine.cpp index 421a709..5f00fb7 100644 --- a/src/kernel/qtextengine.cpp +++ b/src/kernel/qtextengine.cpp @@ -157,7 +157,7 @@ static void qAppendItems(QTextEngine *engine, int &start, int &stop, BidiControl if ( start > stop ) { // #### the algorithm is currently not really safe against this. Still needs fixing. -// tqWarning( "Bidi: appendItems() internal error" ); +// qWarning( "Bidi: appendItems() internal error" ); return; } @@ -177,7 +177,7 @@ static void qAppendItems(QTextEngine *engine, int &start, int &stop, BidiControl } #if (BIDI_DEBUG >= 1) - tqDebug("new run: dir=%s from %d, to %d level = %d\n", directions[dir], start, stop, level); + qDebug("new run: dir=%s from %d, to %d level = %d\n", directions[dir], start, stop, level); #endif QFont::Script script = QFont::NoScript; QScriptItem item; @@ -279,8 +279,8 @@ static void bidiItemize( QTextEngine *engine, bool rightToLeft, int mode ) status.last = status.lastStrong; status.dir = sdir; #if (BIDI_DEBUG >= 2) - tqDebug("---- bidiReorder --- '%s'", engine->string.utf8().data()); - tqDebug("rightToLeft = %d", rightToLeft); + qDebug("---- bidiReorder --- '%s'", engine->string.utf8().data()); + qDebug("rightToLeft = %d", rightToLeft); #endif @@ -861,7 +861,7 @@ static void calcLineBreaks(const QString &str, QCharAttributes *charAttributes) softBreak = (cls == QUnicodeTables::LineBreak_SP); else softBreak = (brk == Dbk); -// tqDebug("char = %c %04x, cls=%d, ncls=%d, brk=%d soft=%d", uc[i].cell(), uc[i].unicode(), cls, ncls, brk, charAttributes[i].softBreak); +// qDebug("char = %c %04x, cls=%d, ncls=%d, brk=%d soft=%d", uc[i].cell(), uc[i].unicode(), cls, ncls, brk, charAttributes[i].softBreak); charAttributes[i].softBreak = softBreak; charAttributes[i].whiteSpace = FALSE; charAttributes[i].charStop = TRUE; @@ -1044,7 +1044,7 @@ void QTextEngine::splitItem( int item, int pos ) oldItem.width = w; } -// tqDebug("split at position %d itempos=%d", pos, item ); +// qDebug("split at position %d itempos=%d", pos, item ); } @@ -1052,12 +1052,12 @@ int QTextEngine::width( int from, int len ) const { int w = 0; -// tqDebug("QTextEngine::width( from = %d, len = %d ), numItems=%d, strleng=%d", from, len, items.size(), string.length() ); +// qDebug("QTextEngine::width( from = %d, len = %d ), numItems=%d, strleng=%d", from, len, items.size(), string.length() ); for ( int i = 0; i < items.size(); i++ ) { QScriptItem *si = &items[i]; int pos = si->position; int ilen = length( i ); -// tqDebug("item %d: from %d len %d", i, pos, ilen ); +// qDebug("item %d: from %d len %d", i, pos, ilen ); if ( pos >= from + len ) break; if ( pos + ilen > from ) { @@ -1089,13 +1089,13 @@ int QTextEngine::width( int from, int len ) const charEnd++; glyphEnd = (charEnd == ilen) ? si->num_glyphs : logClusters[charEnd]; -// tqDebug("char: start=%d end=%d / glyph: start = %d, end = %d", charFrom, charEnd, glyphStart, glyphEnd ); +// qDebug("char: start=%d end=%d / glyph: start = %d, end = %d", charFrom, charEnd, glyphStart, glyphEnd ); for ( int i = glyphStart; i < glyphEnd; i++ ) w += advances[i]; } } } -// tqDebug(" --> w= %d ", w ); +// qDebug(" --> w= %d ", w ); return w; } diff --git a/src/kernel/qtextengine_unix.cpp b/src/kernel/qtextengine_unix.cpp index bfa7a7e..64d0a77 100644 --- a/src/kernel/qtextengine_unix.cpp +++ b/src/kernel/qtextengine_unix.cpp @@ -96,10 +96,10 @@ void QTextEngine::shape( int item ) const shaper_item.has_positioning = FALSE; while (1) { -// tqDebug(" . num_glyphs=%d, used=%d, item.num_glyphs=%d", num_glyphs, used, shaper_item.num_glyphs); +// qDebug(" . num_glyphs=%d, used=%d, item.num_glyphs=%d", num_glyphs, used, shaper_item.num_glyphs); ensureSpace(shaper_item.num_glyphs); shaper_item.num_glyphs = num_glyphs - used; -// tqDebug(" .. num_glyphs=%d, used=%d, item.num_glyphs=%d", num_glyphs, used, shaper_item.num_glyphs); +// qDebug(" .. num_glyphs=%d, used=%d, item.num_glyphs=%d", num_glyphs, used, shaper_item.num_glyphs); shaper_item.glyphs = glyphs(&si); shaper_item.advances = advances(&si); shaper_item.offsets = offsets(&si); @@ -118,7 +118,7 @@ void QTextEngine::shape( int item ) const advance_t *advances = this->advances( &si ); advance_t *end = advances + si.num_glyphs; while ( advances < end ) { -// tqDebug("advances[%d] = %d", advances - this->advances(&si), *advances); +// qDebug("advances[%d] = %d", advances - this->advances(&si), *advances); si.width += *(advances++); } diff --git a/src/kernel/qtextlayout.cpp b/src/kernel/qtextlayout.cpp index 3bda5d2..5f677a0 100644 --- a/src/kernel/qtextlayout.cpp +++ b/src/kernel/qtextlayout.cpp @@ -134,7 +134,7 @@ int QTextItem::cursorToX( int *cPos, Edge edge ) const for ( int i = 0; i < glyph_pos; i++ ) x += advances[i]; } -// tqDebug("cursorToX: pos=%d, gpos=%d x=%d", pos, glyph_pos, x ); +// qDebug("cursorToX: pos=%d, gpos=%d x=%d", pos, glyph_pos, x ); *cPos = pos; return x; } @@ -174,7 +174,7 @@ int QTextItem::xToCursor( int x, CursorPosition cpos ) const cp_after = i; for ( int j = lastCluster; j < newCluster; j++ ) x_after += advances[j]; - // tqDebug("cluster boundary: lastCluster=%d, newCluster=%d, x_before=%d, x_after=%d", + // qDebug("cluster boundary: lastCluster=%d, newCluster=%d, x_before=%d, x_after=%d", // lastCluster, newCluster, x_before, x_after ); if ( x_after > x ) break; @@ -184,7 +184,7 @@ int QTextItem::xToCursor( int x, CursorPosition cpos ) const bool before = ( cpos == OnCharacters || (x - x_before) < (x_after - x) ); -// tqDebug("got cursor position for %d: %d/%d, x_ba=%d/%d using %d", +// qDebug("got cursor position for %d: %d/%d, x_ba=%d/%d using %d", // x, cp_before,cp_after, x_before, x_after, before ? cp_before : cp_after ); return before ? cp_before : cp_after; @@ -355,7 +355,7 @@ QTextLayout::Result QTextLayout::addCurrentItem() QScriptItem ¤t = d->items[d->currentItem]; d->shape( d->currentItem ); d->widthUsed += current.width; -// tqDebug("trying to add item %d with width %d, remaining %d", d->currentItem, current.width, d->lineWidth-d->widthUsed ); +// qDebug("trying to add item %d with width %d, remaining %d", d->currentItem, current.width, d->lineWidth-d->widthUsed ); d->currentItem++; @@ -376,7 +376,7 @@ QTextLayout::Result QTextLayout::endLine( int x, int y, int alignment, int i; QTextLayout::Result result = LineEmpty; -// tqDebug("endLine x=%d, y=%d, first=%d, current=%d lw=%d wu=%d", x, y, d->firstItemInLine, d->currentItem, d->lineWidth, d->widthUsed ); +// qDebug("endLine x=%d, y=%d, first=%d, current=%d lw=%d wu=%d", x, y, d->firstItemInLine, d->currentItem, d->lineWidth, d->widthUsed ); int width_nobreak_found = d->widthUsed; if ( d->firstItemInLine == -1 ) goto end; @@ -428,21 +428,21 @@ QTextLayout::Result QTextLayout::endLine( int x, int y, int alignment, int lastGlyph = 0; int tmpItemWidth = 0; -// tqDebug("looking for break in item %d, isSpace=%d", i, si->isSpace ); +// qDebug("looking for break in item %d, isSpace=%d", i, si->isSpace ); if(si->isSpace && !(alignment & (Qt::SingleLine|Qt::IncludeTrailingSpaces))) { swidth += si->width; } else { tmpWidth += swidth; swidth = 0; for ( int pos = 0; pos < length; pos++ ) { -// tqDebug("advance=%d, w=%d, tmpWidth=%d, softbreak=%d, whitespace=%d", +// qDebug("advance=%d, w=%d, tmpWidth=%d, softbreak=%d, whitespace=%d", // *advances, w, tmpWidth, itemAttrs->softBreak, itemAttrs->whiteSpace ); int glyph = logClusters[pos]; if ( lastGlyph != glyph ) { while ( lastGlyph < glyph ) tmpItemWidth += advances[lastGlyph++]; if ( breakPosition != -1 && w + tmpWidth + tmpItemWidth > d->lineWidth ) { -// tqDebug("found break at w=%d, tmpWidth=%d, tmpItemWidth=%d", w, tmpWidth, tmpItemWidth); +// qDebug("found break at w=%d, tmpWidth=%d, tmpItemWidth=%d", w, tmpWidth, tmpItemWidth); d->widthUsed = w; goto found; } @@ -456,7 +456,7 @@ QTextLayout::Result QTextLayout::endLine( int x, int y, int alignment, breakany = FALSE; breakItem = i; breakPosition = pos; -// tqDebug("found possible break at item %d, position %d (absolute=%d), w=%d, tmpWidth=%d, tmpItemWidth=%d", breakItem, breakPosition, d->items[breakItem].position+breakPosition, w, tmpWidth, tmpItemWidth); +// qDebug("found possible break at item %d, position %d (absolute=%d), w=%d, tmpWidth=%d, tmpItemWidth=%d", breakItem, breakPosition, d->items[breakItem].position+breakPosition, w, tmpWidth, tmpItemWidth); w += tmpWidth + tmpItemWidth; itemWidth += tmpItemWidth; tmpWidth = 0; @@ -482,12 +482,12 @@ QTextLayout::Result QTextLayout::endLine( int x, int y, int alignment, goto nobreak; } -// tqDebug("linebreak at item %d, position %d, wu=%d", breakItem, breakPosition, d->widthUsed ); +// qDebug("linebreak at item %d, position %d, wu=%d", breakItem, breakPosition, d->widthUsed ); // split the line if ( breakPosition > 0 ) { // int length = d->length( breakItem ); -// tqDebug("splitting item, itemWidth=%d", itemWidth); +// qDebug("splitting item, itemWidth=%d", itemWidth); // not a full item, need to break d->splitItem( breakItem, breakPosition ); d->currentItem = breakItem+1; @@ -508,10 +508,10 @@ QTextLayout::Result QTextLayout::endLine( int x, int y, int alignment, visual = new int[numRuns]; } -// tqDebug("reordering %d runs, numSpaceItems=%d", numRuns, numSpaceItems ); +// qDebug("reordering %d runs, numSpaceItems=%d", numRuns, numSpaceItems ); for ( i = 0; i < numRuns; i++ ) { levels[i] = d->items[i+d->firstItemInLine].analysis.bidiLevel; -// tqDebug(" level = %d", d->items[i+d->firstItemInLine].analysis.bidiLevel ); +// qDebug(" level = %d", d->items[i+d->firstItemInLine].analysis.bidiLevel ); } d->bidiReorder( numRuns, levels, visual ); @@ -541,7 +541,7 @@ QTextLayout::Result QTextLayout::endLine( int x, int y, int alignment, int left = x; for ( i = 0; i < numRuns; i++ ) { QScriptItem &si = d->items[d->firstItemInLine+visual[i]]; -// tqDebug("positioning item %d with width %d (from=%d/length=%d) at %d", d->firstItemInLine+visual[i], si.width, si.position, +// qDebug("positioning item %d with width %d (from=%d/length=%d) at %d", d->firstItemInLine+visual[i], si.width, si.position, // d->length(d->firstItemInLine+visual[i]), x ); si.x = x; si.y = y + asc; @@ -593,7 +593,7 @@ void QTextLayout::endLayout() int QTextLayout::nextCursorPosition( int oldPos, CursorMode mode ) const { -// tqDebug("looking for next cursor pos for %d", oldPos ); +// qDebug("looking for next cursor pos for %d", oldPos ); const QCharAttributes *attributes = d->attributes(); int len = d->string.length(); if ( oldPos >= len ) @@ -606,13 +606,13 @@ int QTextLayout::nextCursorPosition( int oldPos, CursorMode mode ) const while ( oldPos < len && !attributes[oldPos].wordStop && !attributes[oldPos-1].whiteSpace ) oldPos++; } -// tqDebug(" -> %d", oldPos ); +// qDebug(" -> %d", oldPos ); return oldPos; } int QTextLayout::previousCursorPosition( int oldPos, CursorMode mode ) const { -// tqDebug("looking for previous cursor pos for %d", oldPos ); +// qDebug("looking for previous cursor pos for %d", oldPos ); const QCharAttributes *attributes = d->attributes(); if ( oldPos <= 0 ) return 0; @@ -624,7 +624,7 @@ int QTextLayout::previousCursorPosition( int oldPos, CursorMode mode ) const while ( oldPos && !attributes[oldPos].wordStop && !attributes[oldPos-1].whiteSpace ) oldPos--; } -// tqDebug(" -> %d", oldPos ); +// qDebug(" -> %d", oldPos ); return oldPos; } diff --git a/src/kernel/qthread.cpp b/src/kernel/qthread.cpp index 0cb8840..1653a51 100644 --- a/src/kernel/qthread.cpp +++ b/src/kernel/qthread.cpp @@ -80,7 +80,7 @@ { for( int count = 0; count < 20; count++ ) { sleep( 1 ); - tqDebug( "Ping!" ); + qDebug( "Ping!" ); } } @@ -166,7 +166,7 @@ QThread::~QThread() QMutexLocker locker( d->mutex() ); if ( d->running && !d->finished ) { #ifdef QT_CHECK_STATE - tqWarning("QThread object destroyed while thread is still running."); + qWarning("QThread object destroyed while thread is still running."); #endif d->orphan = TRUE; diff --git a/src/kernel/qthread_unix.cpp b/src/kernel/qthread_unix.cpp index b8c3f0d..e4d6625 100644 --- a/src/kernel/qthread_unix.cpp +++ b/src/kernel/qthread_unix.cpp @@ -131,7 +131,7 @@ void QThreadInstance::finish( void * ) if ( ! d ) { #ifdef QT_CHECK_STATE - tqWarning( "QThread: internal error: zero data for running thread." ); + qWarning( "QThread: internal error: zero data for running thread." ); #endif // QT_CHECK_STATE return; } @@ -328,7 +328,7 @@ void QThread::start(Priority priority) if (pthread_attr_getschedpolicy(&attr, &sched_policy) != 0) { // failed to get the scheduling policy, don't bother // setting the priority - tqWarning("QThread: cannot determine default scheduler policy"); + qWarning("QThread: cannot determine default scheduler policy"); break; } @@ -337,7 +337,7 @@ void QThread::start(Priority priority) if (prio_min == -1 || prio_max == -1) { // failed to get the scheduling parameters, don't // bother setting the priority - tqWarning("QThread: cannot determine scheduler priority range"); + qWarning("QThread: cannot determine scheduler priority range"); break; } @@ -378,7 +378,7 @@ void QThread::start(Priority priority) if ( ret ) { #ifdef QT_CHECK_STATE - tqWarning( "QThread::start: thread stack size error: %s", strerror( ret ) ) ; + qWarning( "QThread::start: thread stack size error: %s", strerror( ret ) ) ; #endif // QT_CHECK_STATE // we failed to set the stacksize, and as the documentation states, @@ -402,7 +402,7 @@ void QThread::start(Priority priority) if ( ret ) { #ifdef QT_CHECK_STATE - tqWarning( "QThread::start: thread creation error: %s", strerror( ret ) ); + qWarning( "QThread::start: thread creation error: %s", strerror( ret ) ); #endif // QT_CHECK_STATE d->running = FALSE; @@ -439,7 +439,7 @@ bool QThread::wait( unsigned long time ) if ( d->thread_id == pthread_self() ) { #ifdef QT_CHECK_STATE - tqWarning( "QThread::wait: thread tried to wait on itself" ); + qWarning( "QThread::wait: thread tried to wait on itself" ); #endif // QT_CHECK_STATE return FALSE; @@ -464,7 +464,7 @@ bool QThread::wait( unsigned long time ) #ifdef QT_CHECK_RANGE if (ret && ret != ETIMEDOUT) - tqWarning("Wait condition wait failure: %s",strerror(ret)); + qWarning("Wait condition wait failure: %s",strerror(ret)); #endif return (ret == 0); diff --git a/src/kernel/qtimer.cpp b/src/kernel/qtimer.cpp index ffa7e54..c748425 100644 --- a/src/kernel/qtimer.cpp +++ b/src/kernel/qtimer.cpp @@ -246,7 +246,7 @@ static void sst_init() if ( !sst_list ) { sst_list = new QObjectList; Q_CHECK_PTR( sst_list ); - tqAddPostRoutine( sst_cleanup ); + qAddPostRoutine( sst_cleanup ); } } diff --git a/src/kernel/qtranslator.cpp b/src/kernel/qtranslator.cpp index 55749e2..ca160f9 100644 --- a/src/kernel/qtranslator.cpp +++ b/src/kernel/qtranslator.cpp @@ -492,13 +492,13 @@ bool QTranslator::load( const QString & filename, const QString & directory, f = qt_open( QFile::encodeName(realname), O_RDONLY, 0666 ); if ( f < 0 ) { - // tqDebug( "can't open %s: %s", realname.ascii(), strerror( errno ) ); + // qDebug( "can't open %s: %s", realname.ascii(), strerror( errno ) ); return FALSE; } struct stat st; if ( fstat( f, &st ) ) { - // tqDebug( "can't stat %s: %s", realname.ascii(), strerror( errno ) ); + // qDebug( "can't stat %s: %s", realname.ascii(), strerror( errno ) ); return FALSE; } char * tmp; @@ -507,7 +507,7 @@ bool QTranslator::load( const QString & filename, const QString & directory, MAP_FILE | MAP_PRIVATE, // swap-backed map from file f, 0 ); // from offset 0 of f if ( !tmp || tmp == (char*)MAP_FAILED ) { - // tqDebug( "can't mmap %s: %s", filename.ascii(), strerror( errno ) ); + // qDebug( "can't mmap %s: %s", filename.ascii(), strerror( errno ) ); return FALSE; } @@ -845,7 +845,7 @@ void QTranslator::squeeze( SaveMode mode ) delete [] hTable; if ( upto > 131072 ) { - tqWarning( "QTranslator::squeeze: Too many contexts" ); + qWarning( "QTranslator::squeeze: Too many contexts" ); delete d->contextArray; d->contextArray = 0; } @@ -1029,7 +1029,7 @@ QTranslatorMessage QTranslator::findMessage( const char* context, return QTranslatorMessage(); if ( systemWordSize == 0 ) - tqSysInfo( &systemWordSize, &systemBigEndian ); + qSysInfo( &systemWordSize, &systemBigEndian ); for ( ;; ) { Q_UINT32 h = elfHash( QCString(sourceText) + comment ); diff --git a/src/kernel/qurl.cpp b/src/kernel/qurl.cpp index b717f2a..fd377ad 100644 --- a/src/kernel/qurl.cpp +++ b/src/kernel/qurl.cpp @@ -849,15 +849,15 @@ bool QUrl::parse( const QString& url ) d->cleanPathDirty = TRUE; #if 0 - tqDebug( "URL: %s", url.latin1() ); - tqDebug( "protocol: %s", d->protocol.latin1() ); - tqDebug( "user: %s", d->user.latin1() ); - tqDebug( "pass: %s", d->pass.latin1() ); - tqDebug( "host: %s", d->host.latin1() ); - tqDebug( "path: %s", path().latin1() ); - tqDebug( "ref: %s", d->refEncoded.latin1() ); - tqDebug( "query: %s", d->queryEncoded.latin1() ); - tqDebug( "port: %d\n\n----------------------------\n\n", d->port ); + qDebug( "URL: %s", url.latin1() ); + qDebug( "protocol: %s", d->protocol.latin1() ); + qDebug( "user: %s", d->user.latin1() ); + qDebug( "pass: %s", d->pass.latin1() ); + qDebug( "host: %s", d->host.latin1() ); + qDebug( "path: %s", path().latin1() ); + qDebug( "ref: %s", d->refEncoded.latin1() ); + qDebug( "query: %s", d->queryEncoded.latin1() ); + qDebug( "port: %d\n\n----------------------------\n\n", d->port ); #endif return TRUE; diff --git a/src/kernel/qurloperator.cpp b/src/kernel/qurloperator.cpp index 902f915..1e1b666 100644 --- a/src/kernel/qurloperator.cpp +++ b/src/kernel/qurloperator.cpp @@ -122,7 +122,7 @@ public: A QUrlOperator can be used like this, for example to download a file (and assuming that the FTP protocol is \link - tqInitNetworkProtocols() registered\endlink): + qInitNetworkProtocols() registered\endlink): \code QUrlOperator *op = new QUrlOperator(); op->copy( QString("ftp://ftp.trolltech.com/qt/source/qt-2.1.0.tar.gz"), @@ -148,7 +148,7 @@ public: handling deals with this problem. To register the available network protocols, use the - tqInitNetworkProtocols() function. The protocols currently + qInitNetworkProtocols() function. The protocols currently supported are: \list \i \link QFtp FTP\endlink, @@ -293,7 +293,7 @@ QUrlOperator::QUrlOperator() : QUrl() { #ifdef QURLOPERATOR_DEBUG - tqDebug( "QUrlOperator: cstr 1" ); + qDebug( "QUrlOperator: cstr 1" ); #endif d = new QUrlOperatorPrivate; } @@ -309,7 +309,7 @@ QUrlOperator::QUrlOperator( const QString &url ) : QUrl( url ) { #ifdef QURLOPERATOR_DEBUG - tqDebug( "QUrlOperator: cstr 2" ); + qDebug( "QUrlOperator: cstr 2" ); #endif d = new QUrlOperatorPrivate; getNetworkProtocol(); @@ -323,7 +323,7 @@ QUrlOperator::QUrlOperator( const QUrlOperator& url ) : QObject(), QUrl( url ) { #ifdef QURLOPERATOR_DEBUG - tqDebug( "QUrlOperator: cstr 3" ); + qDebug( "QUrlOperator: cstr 3" ); #endif d = new QUrlOperatorPrivate; *d = *url.d; @@ -345,7 +345,7 @@ QUrlOperator::QUrlOperator( const QUrlOperator& url, const QString& relUrl, bool : QUrl( url, relUrl, checkSlash ) { #ifdef QURLOPERATOR_DEBUG - tqDebug( "QUrlOperator: cstr 4" ); + qDebug( "QUrlOperator: cstr 4" ); #endif d = new QUrlOperatorPrivate; if ( relUrl == "." ) @@ -363,7 +363,7 @@ QUrlOperator::QUrlOperator( const QUrlOperator& url, const QString& relUrl, bool QUrlOperator::~QUrlOperator() { #ifdef QURLOPERATOR_DEBUG - tqDebug( "QUrlOperator: dstr" ); + qDebug( "QUrlOperator: dstr" ); #endif delete d; } @@ -570,7 +570,7 @@ const QNetworkOperation *QUrlOperator::rename( const QString &oldname, const QSt QPtrList<QNetworkOperation> QUrlOperator::copy( const QString &from, const QString &to, bool move, bool toPath ) { #ifdef QURLOPERATOR_DEBUG - tqDebug( "QUrlOperator: copy %s %s %d", from.latin1(), to.latin1(), move ); + qDebug( "QUrlOperator: copy %s %s %d", from.latin1(), to.latin1(), move ); #endif QPtrList<QNetworkOperation> ops; @@ -644,7 +644,7 @@ QPtrList<QNetworkOperation> QUrlOperator::copy( const QString &from, const QStri gProt->setAutoDelete( TRUE ); } #ifdef QURLOPERATOR_DEBUG - tqDebug( "QUrlOperator: copy operation should start now..." ); + qDebug( "QUrlOperator: copy operation should start now..." ); #endif return ops; } else { @@ -1063,7 +1063,7 @@ bool QUrlOperator::checkValid() void QUrlOperator::copyGotData( const QByteArray &data_, QNetworkOperation *op ) { #ifdef QURLOPERATOR_DEBUG - tqDebug( "QUrlOperator: copyGotData: %d new bytes", data_.size() ); + qDebug( "QUrlOperator: copyGotData: %d new bytes", data_.size() ); #endif QNetworkOperation *put = d->getOpPutOpMap[ (void*)op ]; if ( put ) { @@ -1089,7 +1089,7 @@ void QUrlOperator::continueCopy( QNetworkOperation *op ) #ifdef QURLOPERATOR_DEBUG if ( op->state() != QNetworkProtocol::StFailed ) { - tqDebug( "QUrlOperator: continue copy (get finished, put will start)" ); + qDebug( "QUrlOperator: continue copy (get finished, put will start)" ); } #endif @@ -1134,7 +1134,7 @@ void QUrlOperator::continueCopy( QNetworkOperation *op ) void QUrlOperator::finishedCopy() { #ifdef QURLOPERATOR_DEBUG - tqDebug( "QUrlOperator: finished copy (finished putting)" ); + qDebug( "QUrlOperator: finished copy (finished putting)" ); #endif if ( d->waitingCopies.isEmpty() ) diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp index 2125585..c9ea5b1 100644 --- a/src/kernel/qvariant.cpp +++ b/src/kernel/qvariant.cpp @@ -408,7 +408,7 @@ void QVariant::Private::clear() QDataStream in(...); // (opening the previously written stream) in >> v; // Reads an Int variant int z = v.toInt(); // z = 123 - tqDebug("Type is %s", // prints "Type is int" + qDebug("Type is %s", // prints "Type is int" v.typeName()); v.asInt() += 100; // The variant now hold the value 223. v = QVariant( QStringList() ); diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp index d0243bb..28328b8 100644 --- a/src/kernel/qwidget.cpp +++ b/src/kernel/qwidget.cpp @@ -882,7 +882,7 @@ QWidget::QWidget( QWidget *parent, const char *name, WFlags f, NFlags n ) { #if defined(QT_CHECK_STATE) && !defined(Q_WS_WIN) if ( qApp->type() == QApplication::Tty ) { - tqWarning( "QWidget: Cannot create a QWidget when no GUI " + qWarning( "QWidget: Cannot create a QWidget when no GUI " "is being used" ); } #endif @@ -954,7 +954,7 @@ QWidget::~QWidget() { #if defined (QT_CHECK_STATE) if ( paintingActive() ) - tqWarning( "%s (%s): deleted while being painted", className(), name() ); + qWarning( "%s (%s): deleted while being painted", className(), name() ); #endif // Remove myself and all children from the can-take-focus list @@ -2671,7 +2671,7 @@ void QWidget::setBackgroundMode( BackgroundMode m, BackgroundMode visual ) setBackgroundEmpty(); } else if ( m == FixedColor || m == FixedPixmap ) { #if defined(QT_DEBUG) - tqWarning( "QWidget::setBackgroundMode: FixedColor or FixedPixmap makes" + qWarning( "QWidget::setBackgroundMode: FixedColor or FixedPixmap makes" " no sense" ); #endif return; @@ -3181,7 +3181,7 @@ void QWidget::setFocusProxy( QWidget * w ) for ( QWidget* fp = w; fp; fp = fp->focusProxy() ) { if ( fp == this ) { #if defined (QT_CHECK_STATE) - tqWarning( "%s (%s): already in focus proxy chain", className(), name() ); + qWarning( "%s (%s): already in focus proxy chain", className(), name() ); #endif return; } diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp index 754ee9e..775829c 100644 --- a/src/kernel/qwidget_x11.cpp +++ b/src/kernel/qwidget_x11.cpp @@ -1250,7 +1250,7 @@ qstring_to_xtp( const QString& s ) tl, 1, XStdICCTextStyle, &tp ); #if defined(QT_DEBUG) if ( errCode < 0 ) - tqDebug( "qstring_to_xtp result code %d", errCode ); + qDebug( "qstring_to_xtp result code %d", errCode ); #endif } if ( !mapper || errCode < 0 ) { @@ -1422,7 +1422,7 @@ void QWidget::grabMouse() status == GrabFrozen ? "\"GrabFrozen\"" : status == GrabInvalidTime ? "\"GrabInvalidTime\"" : "<?>"; - tqWarning( "Grabbing the mouse failed with %s", s ); + qWarning( "Grabbing the mouse failed with %s", s ); } #endif mouseGrb = this; @@ -1464,7 +1464,7 @@ void QWidget::grabMouse( const QCursor &cursor ) status == GrabFrozen ? "\"GrabFrozen\"" : status == GrabInvalidTime ? "\"GrabInvalidTime\"" : "<?>"; - tqWarning( "Grabbing the mouse failed with %s", s ); + qWarning( "Grabbing the mouse failed with %s", s ); } #endif mouseGrb = this; @@ -2215,7 +2215,7 @@ void QWidget::setMinimumSize( int minw, int minh ) { #if defined(QT_CHECK_RANGE) if ( minw < 0 || minh < 0 ) - tqWarning("QWidget::setMinimumSize: The smallest allowed size is (0,0)"); + qWarning("QWidget::setMinimumSize: The smallest allowed size is (0,0)"); #endif createExtra(); if ( extra->minw == minw && extra->minh == minh ) @@ -2244,7 +2244,7 @@ void QWidget::setMaximumSize( int maxw, int maxh ) { #if defined(QT_CHECK_RANGE) if ( maxw > QWIDGETSIZE_MAX || maxh > QWIDGETSIZE_MAX ) { - tqWarning("QWidget::setMaximumSize: (%s/%s) " + qWarning("QWidget::setMaximumSize: (%s/%s) " "The largest allowed size is (%d,%d)", name( "unnamed" ), className(), QWIDGETSIZE_MAX, QWIDGETSIZE_MAX ); @@ -2252,7 +2252,7 @@ void QWidget::setMaximumSize( int maxw, int maxh ) maxh = QMIN( maxh, QWIDGETSIZE_MAX ); } if ( maxw < 0 || maxh < 0 ) { - tqWarning("QWidget::setMaximumSize: (%s/%s) Negative sizes (%d,%d) " + qWarning("QWidget::setMaximumSize: (%s/%s) Negative sizes (%d,%d) " "are not possible", name( "unnamed" ), className(), maxw, maxh ); maxw = QMAX( maxw, 0 ); @@ -2546,7 +2546,7 @@ int QWidget::metric( int m ) const default: val = 0; #if defined(QT_CHECK_RANGE) - tqWarning( "QWidget::metric: Invalid metric command" ); + qWarning( "QWidget::metric: Invalid metric command" ); #endif } } @@ -2800,7 +2800,7 @@ void QWidget::updateFrameStrut() const XFree(c); if (! p) { - tqWarning("QWidget::updateFrameStrut(): ERROR - no parent"); + qWarning("QWidget::updateFrameStrut(): ERROR - no parent"); return; } diff --git a/src/kernel/qwindowdefs.h b/src/kernel/qwindowdefs.h index f54e68a..05a3a33 100644 --- a/src/kernel/qwindowdefs.h +++ b/src/kernel/qwindowdefs.h @@ -185,8 +185,8 @@ Q_EXPORT const char *qAppName(); // get application name // Misc functions typedef void (*QtCleanUpFunction)(); -Q_EXPORT void tqAddPostRoutine( QtCleanUpFunction ); -Q_EXPORT void tqRemovePostRoutine( QtCleanUpFunction ); +Q_EXPORT void qAddPostRoutine( QtCleanUpFunction ); +Q_EXPORT void qRemovePostRoutine( QtCleanUpFunction ); #if !defined(QT_CLEAN_NAMESPACE) // source compatibility with Qt 2.x diff --git a/src/kernel/qwmatrix.cpp b/src/kernel/qwmatrix.cpp index c01c118..aaefddd 100644 --- a/src/kernel/qwmatrix.cpp +++ b/src/kernel/qwmatrix.cpp @@ -702,8 +702,8 @@ QPointArray QWMatrix::mapToPolygon( const QRect &rect ) const #if 0 int i; for( i = 0; i< 4; i++ ) - tqDebug("coords(%d) = (%f/%f) (%d/%d)", i, x[i], y[i], qRound(x[i]), qRound(y[i]) ); - tqDebug( "width=%f, height=%f", sqrt( (x[1]-x[0])*(x[1]-x[0]) + (y[1]-y[0])*(y[1]-y[0]) ), + qDebug("coords(%d) = (%f/%f) (%d/%d)", i, x[i], y[i], qRound(x[i]), qRound(y[i]) ); + qDebug( "width=%f, height=%f", sqrt( (x[1]-x[0])*(x[1]-x[0]) + (y[1]-y[0])*(y[1]-y[0]) ), sqrt( (x[0]-x[3])*(x[0]-x[3]) + (y[0]-y[3])*(y[0]-y[3]) ) ); #endif // all coordinates are correctly, tranform to a pointarray |