From 9a75b154bf0732aa3a501b6e31e566e06c5f8a31 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 2 Mar 2012 02:11:59 -0600 Subject: Undo prior accidental commit --- src/dialogs/qcolordialog.cpp | 8 ++++---- src/dialogs/qdialog.cpp | 2 +- src/dialogs/qerrormessage.cpp | 4 ++-- src/dialogs/qinputdialog.cpp | 2 +- src/dialogs/qmessagebox.cpp | 10 +++++----- src/dialogs/qmessagebox.h | 6 +++--- src/dialogs/qprintdialog.cpp | 8 ++++---- src/dialogs/qprogressdialog.cpp | 2 +- src/dialogs/qwizard.cpp | 4 ++-- 9 files changed, 23 insertions(+), 23 deletions(-) (limited to 'src/dialogs') diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/qcolordialog.cpp index d807f79..4ce83bb 100644 --- a/src/dialogs/qcolordialog.cpp +++ b/src/dialogs/qcolordialog.cpp @@ -366,7 +366,7 @@ void QWellArray::setCellBrush( int row, int col, const QBrush &b ) d->brush[row*numCols()+col] = b; #ifdef QT_CHECK_RANGE else - tqWarning( "QWellArray::setCellBrush( %d, %d ) out of range", row, col ); + qWarning( "QWellArray::setCellBrush( %d, %d ) out of range", row, col ); #endif } @@ -471,7 +471,7 @@ QRgb QColorDialog::customColor( int i ) initRGB(); if ( i < 0 || i >= customCount() ) { #ifdef QT_CHECK_RANGE - tqWarning( "QColorDialog::customColor() index %d out of range", i ); + qWarning( "QColorDialog::customColor() index %d out of range", i ); #endif i = 0; } @@ -486,7 +486,7 @@ void QColorDialog::setCustomColor( int i, QRgb c ) initRGB(); if ( i < 0 || i >= customCount() ) { #ifdef QT_CHECK_RANGE - tqWarning( "QColorDialog::setCustomColor() index %d out of range", i ); + qWarning( "QColorDialog::setCustomColor() index %d out of range", i ); #endif return; } @@ -503,7 +503,7 @@ void QColorDialog::setStandardColor( int i, QRgb c ) initRGB(); if ( i < 0 || i >= 6*8 ) { #ifdef QT_CHECK_RANGE - tqWarning( "QColorDialog::setStandardColor() index %d out of range", i ); + qWarning( "QColorDialog::setStandardColor() index %d out of range", i ); #endif return; } diff --git a/src/dialogs/qdialog.cpp b/src/dialogs/qdialog.cpp index 07f8cf1..a80f509 100644 --- a/src/dialogs/qdialog.cpp +++ b/src/dialogs/qdialog.cpp @@ -418,7 +418,7 @@ void QDialog::hideSpecial() int QDialog::exec() { if ( in_loop ) { - tqWarning( "QDialog::exec: Recursive call detected" ); + qWarning( "QDialog::exec: Recursive call detected" ); return -1; } diff --git a/src/dialogs/qerrormessage.cpp b/src/dialogs/qerrormessage.cpp index 20da497..4e4dc5a 100644 --- a/src/dialogs/qerrormessage.cpp +++ b/src/dialogs/qerrormessage.cpp @@ -95,7 +95,7 @@ message() slot, or connect signals to it. \i For developers. In this context the static qtHandler() installs a message handler using qInstallMsgHandler() and creates a QErrorMessage -that displays tqDebug(), tqWarning() and tqFatal() messages. +that displays qDebug(), qWarning() and qFatal() messages. \endlist In both cases QErrorMessage will queue pending messages, and display @@ -224,7 +224,7 @@ QErrorMessage * QErrorMessage::qtHandler() { if ( !qtMessageHandler ) { qtMessageHandler = new QErrorMessage( 0, "automatic message handler" ); - tqAddPostRoutine( deleteStaticcQErrorMessage ); // clean up + qAddPostRoutine( deleteStaticcQErrorMessage ); // clean up #ifndef QT_NO_WIDGET_TOPEXTRA if ( qApp->mainWidget() ) qtMessageHandler->setCaption( qApp->mainWidget()->caption() ); diff --git a/src/dialogs/qinputdialog.cpp b/src/dialogs/qinputdialog.cpp index a0f39dd..fd73e0a 100644 --- a/src/dialogs/qinputdialog.cpp +++ b/src/dialogs/qinputdialog.cpp @@ -231,7 +231,7 @@ void QInputDialog::setType( Type t ) break; default: #if defined(QT_CHECK_STATE) - tqWarning( "QInputDialog::setType: Invalid type" ); + qWarning( "QInputDialog::setType: Invalid type" ); #endif break; } diff --git a/src/dialogs/qmessagebox.cpp b/src/dialogs/qmessagebox.cpp index d287576..37407b0 100644 --- a/src/dialogs/qmessagebox.cpp +++ b/src/dialogs/qmessagebox.cpp @@ -614,7 +614,7 @@ void QMessageBox::init( int button0, int button1, int button2 ) if ( (button2 && !button1) || (button1 && !button0) ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QMessageBox: Inconsistent button parameters" ); + qWarning( "QMessageBox: Inconsistent button parameters" ); #endif button0 = button1 = button2 = 0; } @@ -634,7 +634,7 @@ void QMessageBox::init( int button0, int button1, int button2 ) if ( (b & Default) ) { if ( mbd->defButton >= 0 ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QMessageBox: There can be at most one " + qWarning( "QMessageBox: There can be at most one " "default button" ); #endif } else { @@ -644,7 +644,7 @@ void QMessageBox::init( int button0, int button1, int button2 ) if ( (b & Escape) ) { if ( mbd->escButton >= 0 ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QMessageBox: There can be at most one " + qWarning( "QMessageBox: There can be at most one " "escape button" ); #endif } else { @@ -657,13 +657,13 @@ void QMessageBox::init( int button0, int button1, int button2 ) b = Ok; } else if ( b < 0 || b > LastButton ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QMessageBox: Invalid button specifier" ); + qWarning( "QMessageBox: Invalid button specifier" ); #endif b = Ok; } else { if ( i > 0 && mbd->button[i-1] == 0 ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QMessageBox: Inconsistent button parameters; " + qWarning( "QMessageBox: Inconsistent button parameters; " "button %d defined but not button %d", i+1, i ); #endif diff --git a/src/dialogs/qmessagebox.h b/src/dialogs/qmessagebox.h index 781efd1..338525b 100644 --- a/src/dialogs/qmessagebox.h +++ b/src/dialogs/qmessagebox.h @@ -209,13 +209,13 @@ private: // Disabled copy constructor and operator= * } */ #define QT_REQUIRE_VERSION( argc, argv, str ) { QString s=QString::fromLatin1(str);\ -QString sq=QString::fromLatin1(tqVersion()); if ( (sq.section('.',0,0).toInt()<<16)+\ +QString sq=QString::fromLatin1(qVersion()); if ( (sq.section('.',0,0).toInt()<<16)+\ (sq.section('.',1,1).toInt()<<8)+sq.section('.',2,2).toInt()<(s.section('.',0,0).toInt()<<16)+\ (s.section('.',1,1).toInt()<<8)+s.section('.',2,2).toInt() ){if ( !qApp){ int c=0; new \ QApplication(argc,argv);} QString s = QApplication::tr("Executable '%1' requires Qt "\ "%2, found Qt %3.").arg(QString::fromLatin1(qAppName())).arg(QString::fromLatin1(\ -str)).arg(QString::fromLatin1(tqVersion()) ); QMessageBox::critical( 0, QApplication::tr(\ -"Incompatible Qt Library Error" ), s, QMessageBox::Abort,0 ); tqFatal(s.ascii()); }} +str)).arg(QString::fromLatin1(qVersion()) ); QMessageBox::critical( 0, QApplication::tr(\ +"Incompatible Qt Library Error" ), s, QMessageBox::Abort,0 ); qFatal(s.ascii()); }} #endif // QT_NO_MESSAGEBOX diff --git a/src/dialogs/qprintdialog.cpp b/src/dialogs/qprintdialog.cpp index 7c0e015..3f3e2a1 100644 --- a/src/dialogs/qprintdialog.cpp +++ b/src/dialogs/qprintdialog.cpp @@ -404,7 +404,7 @@ static char * parsePrintersConf( QListView * printers, bool *found = 0 ) j++; // that's our default printer defaultPrinter = - tqstrdup( printerDesc.mid( i, j-i ).ascii() ); + qstrdup( printerDesc.mid( i, j-i ).ascii() ); printerName = ""; printerDesc = ""; } else if ( printerName == QString::fromLatin1("_all") ) { @@ -807,7 +807,7 @@ static char * parseCupsOutput( QListView * printers ) perhapsAddPrinter( printers, d[n].name, QPrintDialog::tr("Unknown Location"), 0 ); if ( d[n].is_default && !defaultPrinter ) - defaultPrinter = tqstrdup( d[n].instance ); + defaultPrinter = qstrdup( d[n].instance ); n++; } } @@ -977,7 +977,7 @@ void QPrintDialog::setGlobalPrintDialog( QPrintDialog *pd ) if ( oldPd ) delete oldPd; else - tqAddPostRoutine( qpd_cleanup_globaldialog ); + qAddPostRoutine( qpd_cleanup_globaldialog ); globalPrintDialog->adjustSize(); } @@ -1375,7 +1375,7 @@ bool QPrintDialog::getPrinterSetup( QPrinter * p, QWidget* w ) #ifndef QT_NO_WIDGET_TOPEXTRA globalPrintDialog->setCaption( QPrintDialog::tr( "Setup Printer" ) ); #endif - tqAddPostRoutine( qpd_cleanup_globaldialog ); + qAddPostRoutine( qpd_cleanup_globaldialog ); globalPrintDialog->setPrinter( p, TRUE ); globalPrintDialog->adjustSize(); } else { diff --git a/src/dialogs/qprogressdialog.cpp b/src/dialogs/qprogressdialog.cpp index b7d83eb..bdae310 100644 --- a/src/dialogs/qprogressdialog.cpp +++ b/src/dialogs/qprogressdialog.cpp @@ -456,7 +456,7 @@ void QProgressDialog::setBar( QProgressBar *bar ) { if ( progress() > 0 ) { #if defined(QT_CHECK_STATE) - tqWarning( "QProgrssDialog::setBar: Cannot set a new progress bar " + qWarning( "QProgrssDialog::setBar: Cannot set a new progress bar " "while the old one is active" ); #endif } diff --git a/src/dialogs/qwizard.cpp b/src/dialogs/qwizard.cpp index 3197af7..32c386a 100644 --- a/src/dialogs/qwizard.cpp +++ b/src/dialogs/qwizard.cpp @@ -264,7 +264,7 @@ void QWizard::addPage( QWidget * page, const QString & title ) return; if ( d->page( page ) ) { #if defined(QT_CHECK_STATE) - tqWarning( "QWizard::addPage(): already added %s/%s to %s/%s", + qWarning( "QWizard::addPage(): already added %s/%s to %s/%s", page->className(), page->name(), className(), name() ); #endif @@ -293,7 +293,7 @@ void QWizard::insertPage( QWidget * page, const QString & title, int index ) return; if ( d->page( page ) ) { #if defined(QT_CHECK_STATE) - tqWarning( "QWizard::insertPage(): already added %s/%s to %s/%s", + qWarning( "QWizard::insertPage(): already added %s/%s to %s/%s", page->className(), page->name(), className(), name() ); #endif -- cgit v1.2.1