summaryrefslogtreecommitdiffstats
path: root/src/dialogs
diff options
context:
space:
mode:
Diffstat (limited to 'src/dialogs')
-rw-r--r--src/dialogs/ntqmessagebox.h6
-rw-r--r--src/dialogs/qcolordialog.cpp8
-rw-r--r--src/dialogs/qdialog.cpp2
-rw-r--r--src/dialogs/qerrormessage.cpp4
-rw-r--r--src/dialogs/qfiledialog.cpp56
-rw-r--r--src/dialogs/qfontdialog.cpp4
-rw-r--r--src/dialogs/qinputdialog.cpp2
-rw-r--r--src/dialogs/qmessagebox.cpp28
-rw-r--r--src/dialogs/qprintdialog.cpp8
-rw-r--r--src/dialogs/qprogressdialog.cpp2
-rw-r--r--src/dialogs/qwizard.cpp4
11 files changed, 62 insertions, 62 deletions
diff --git a/src/dialogs/ntqmessagebox.h b/src/dialogs/ntqmessagebox.h
index 11b79fc3f..50522e813 100644
--- a/src/dialogs/ntqmessagebox.h
+++ b/src/dialogs/ntqmessagebox.h
@@ -209,13 +209,13 @@ private: // Disabled copy constructor and operator=
* }
*/
#define QT_REQUIRE_VERSION( argc, argv, str ) { TQString s=TQString::fromLatin1(str);\
-TQString sq=TQString::fromLatin1(qVersion()); if ( (sq.section('.',0,0).toInt()<<16)+\
+TQString sq=TQString::fromLatin1(tqVersion()); 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 ( !tqApp){ int c=0; new \
TQApplication(argc,argv);} TQString s = TQApplication::tr("Executable '%1' requires TQt "\
"%2, found TQt %3.").arg(TQString::fromLatin1(tqAppName())).arg(TQString::fromLatin1(\
-str)).arg(TQString::fromLatin1(qVersion()) ); TQMessageBox::critical( 0, TQApplication::tr(\
-"Incompatible TQt Library Error" ), s, TQMessageBox::Abort,0 ); qFatal(s.ascii()); }}
+str)).arg(TQString::fromLatin1(tqVersion()) ); TQMessageBox::critical( 0, TQApplication::tr(\
+"Incompatible TQt Library Error" ), s, TQMessageBox::Abort,0 ); tqFatal(s.ascii()); }}
#endif // QT_NO_MESSAGEBOX
diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/qcolordialog.cpp
index d365e96f7..fada75546 100644
--- a/src/dialogs/qcolordialog.cpp
+++ b/src/dialogs/qcolordialog.cpp
@@ -366,7 +366,7 @@ void TQWellArray::setCellBrush( int row, int col, const TQBrush &b )
d->brush[row*numCols()+col] = b;
#ifdef QT_CHECK_RANGE
else
- qWarning( "TQWellArray::setCellBrush( %d, %d ) out of range", row, col );
+ tqWarning( "TQWellArray::setCellBrush( %d, %d ) out of range", row, col );
#endif
}
@@ -471,7 +471,7 @@ TQRgb TQColorDialog::customColor( int i )
initRGB();
if ( i < 0 || i >= customCount() ) {
#ifdef QT_CHECK_RANGE
- qWarning( "TQColorDialog::customColor() index %d out of range", i );
+ tqWarning( "TQColorDialog::customColor() index %d out of range", i );
#endif
i = 0;
}
@@ -486,7 +486,7 @@ void TQColorDialog::setCustomColor( int i, TQRgb c )
initRGB();
if ( i < 0 || i >= customCount() ) {
#ifdef QT_CHECK_RANGE
- qWarning( "TQColorDialog::setCustomColor() index %d out of range", i );
+ tqWarning( "TQColorDialog::setCustomColor() index %d out of range", i );
#endif
return;
}
@@ -503,7 +503,7 @@ void TQColorDialog::setStandardColor( int i, TQRgb c )
initRGB();
if ( i < 0 || i >= 6*8 ) {
#ifdef QT_CHECK_RANGE
- qWarning( "TQColorDialog::setStandardColor() index %d out of range", i );
+ tqWarning( "TQColorDialog::setStandardColor() index %d out of range", i );
#endif
return;
}
diff --git a/src/dialogs/qdialog.cpp b/src/dialogs/qdialog.cpp
index a25ad609f..90974de05 100644
--- a/src/dialogs/qdialog.cpp
+++ b/src/dialogs/qdialog.cpp
@@ -418,7 +418,7 @@ void TQDialog::hideSpecial()
int TQDialog::exec()
{
if ( in_loop ) {
- qWarning( "TQDialog::exec: Recursive call detected" );
+ tqWarning( "TQDialog::exec: Recursive call detected" );
return -1;
}
diff --git a/src/dialogs/qerrormessage.cpp b/src/dialogs/qerrormessage.cpp
index 70e670689..e883fdc64 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 TQErrorMessage
-that displays qDebug(), qWarning() and qFatal() messages.
+that displays tqDebug(), tqWarning() and tqFatal() messages.
\endlist
In both cases TQErrorMessage will queue pending messages, and display
@@ -224,7 +224,7 @@ TQErrorMessage * TQErrorMessage::qtHandler()
{
if ( !qtMessageHandler ) {
qtMessageHandler = new TQErrorMessage( 0, "automatic message handler" );
- qAddPostRoutine( deleteStaticcTQErrorMessage ); // clean up
+ tqAddPostRoutine( deleteStaticcTQErrorMessage ); // clean up
#ifndef QT_NO_WIDGET_TOPEXTRA
if ( tqApp->mainWidget() )
qtMessageHandler->setCaption( tqApp->mainWidget()->caption() );
diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp
index 019d3d56c..53b030153 100644
--- a/src/dialogs/qfiledialog.cpp
+++ b/src/dialogs/qfiledialog.cpp
@@ -529,8 +529,8 @@ static void resolveLibs()
if ( !triedResolve ) {
#ifdef QT_THREAD_SUPPORT
// protect initialization
- TQMutexLocker locker( qt_global_mutexpool ?
- qt_global_mutexpool->get( &triedResolve ) : 0 );
+ TQMutexLocker locker( tqt_global_mutexpool ?
+ tqt_global_mutexpool->get( &triedResolve ) : 0 );
// check triedResolve again, since another thread may have already
// done the initialization
if ( triedResolve ) {
@@ -3404,8 +3404,8 @@ void TQFileDialog::rereadDir()
\sa selectedFilter()
*/
-extern bool qt_resolve_symlinks; // defined in qapplication.cpp
-bool Q_EXPORT qt_use_native_dialogs = TRUE;
+extern bool tqt_resolve_symlinks; // defined in qapplication.cpp
+bool Q_EXPORT tqt_use_native_dialogs = TRUE;
/*!
This is a convenience static function that returns an existing file
@@ -3457,8 +3457,8 @@ TQString TQFileDialog::getOpenFileName( const TQString & startWith,
TQString *selectedFilter,
bool resolveSymlinks )
{
- bool save_qt_resolve_symlinks = qt_resolve_symlinks;
- qt_resolve_symlinks = resolveSymlinks;
+ bool save_qt_resolve_symlinks = tqt_resolve_symlinks;
+ tqt_resolve_symlinks = resolveSymlinks;
TQStringList filters;
if ( !filter.isEmpty() )
@@ -3494,15 +3494,15 @@ TQString TQFileDialog::getOpenFileName( const TQString & startWith,
*workingDirectory = ::toRootIfNotExists( TQDir::currentDirPath() );
#if defined(Q_WS_X11)
- if ( qt_use_native_dialogs && TQKDEIntegration::enabled())
+ if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())
return TQKDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name,
caption, selectedFilter, false ).first();
#elif defined(Q_WS_WIN)
- if ( qt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle )
+ if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle )
return winGetOpenFileName( initialSelection, filter, workingDirectory,
parent, name, caption, selectedFilter );
#elif defined(Q_WS_MAC)
- if (qt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE)
+ if (tqt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE)
|| tqApp->style().inherits("TQMacStyle")))
return qt_mac_precomposeFileName(macGetOpenFileNames(filter,
startWith.isEmpty() ? 0 : workingDirectory,
@@ -3534,7 +3534,7 @@ TQString TQFileDialog::getOpenFileName( const TQString & startWith,
}
delete dlg;
- qt_resolve_symlinks = save_qt_resolve_symlinks;
+ tqt_resolve_symlinks = save_qt_resolve_symlinks;
return result;
}
@@ -3588,8 +3588,8 @@ TQString TQFileDialog::getSaveFileName( const TQString & startWith,
TQString *selectedFilter,
bool resolveSymlinks)
{
- bool save_qt_resolve_symlinks = qt_resolve_symlinks;
- qt_resolve_symlinks = resolveSymlinks;
+ bool save_qt_resolve_symlinks = tqt_resolve_symlinks;
+ tqt_resolve_symlinks = resolveSymlinks;
TQStringList filters;
if ( !filter.isEmpty() )
@@ -3619,15 +3619,15 @@ TQString TQFileDialog::getSaveFileName( const TQString & startWith,
*workingDirectory = ::toRootIfNotExists( TQDir::currentDirPath() );
#if defined(Q_WS_X11)
- if ( qt_use_native_dialogs && TQKDEIntegration::enabled())
+ if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())
return TQKDEIntegration::getSaveFileName( initialSelection, filter, workingDirectory,
parent, name, caption, selectedFilter );
#elif defined(Q_WS_WIN)
- if ( qt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle )
+ if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle )
return winGetSaveFileName( initialSelection, filter, workingDirectory,
parent, name, caption, selectedFilter );
#elif defined(Q_WS_MAC)
- if (qt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE)
+ if (tqt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE)
|| tqApp->style().inherits("TQMacStyle")))
return qt_mac_precomposeFileName(macGetSaveFileName(initialSelection, filter,
startWith.isEmpty() ? 0 : workingDirectory, parent, name,
@@ -3659,7 +3659,7 @@ TQString TQFileDialog::getSaveFileName( const TQString & startWith,
}
delete dlg;
- qt_resolve_symlinks = save_qt_resolve_symlinks;
+ tqt_resolve_symlinks = save_qt_resolve_symlinks;
return result;
}
@@ -4504,8 +4504,8 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir,
bool dirOnly,
bool resolveSymlinks)
{
- bool save_qt_resolve_symlinks = qt_resolve_symlinks;
- qt_resolve_symlinks = resolveSymlinks;
+ bool save_qt_resolve_symlinks = tqt_resolve_symlinks;
+ tqt_resolve_symlinks = resolveSymlinks;
makeVariables();
TQString wd;
@@ -4520,7 +4520,7 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir,
initialDir = dir;
} else
initialDir = TQString::null;
- if ( qt_use_native_dialogs && TQKDEIntegration::enabled())
+ if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())
return TQKDEIntegration::getExistingDirectory( initialDir, parent, name, caption );
#elif defined(Q_WS_WIN)
TQString initialDir;
@@ -4530,7 +4530,7 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir,
initialDir = dir;
} else
initialDir = TQString::null;
- if ( qt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle && dirOnly )
+ if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle && dirOnly )
return winGetExistingDirectory( initialDir, parent, name, caption );
#endif
#if defined(Q_WS_MAC)
@@ -4540,7 +4540,7 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir,
if (TQFileInfo(u.path()).isDir())
initialDir = (TQString *)&dir;
}
- if( qt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE)
+ if( tqt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE)
|| tqApp->style().inherits("TQMacStyle")))
return qt_mac_precomposeFileName(macGetOpenFileNames("", initialDir, parent, name,
caption, 0, FALSE, TRUE).first());
@@ -4610,7 +4610,7 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir,
if ( !result.isEmpty() && result.right( 1 ) != "/" )
result += "/";
- qt_resolve_symlinks = save_qt_resolve_symlinks;
+ tqt_resolve_symlinks = save_qt_resolve_symlinks;
return result;
}
@@ -5664,8 +5664,8 @@ TQStringList TQFileDialog::getOpenFileNames( const TQString & filter,
TQString *selectedFilter,
bool resolveSymlinks )
{
- bool save_qt_resolve_symlinks = qt_resolve_symlinks;
- qt_resolve_symlinks = resolveSymlinks;
+ bool save_qt_resolve_symlinks = tqt_resolve_symlinks;
+ tqt_resolve_symlinks = resolveSymlinks;
TQStringList filters;
if ( !filter.isEmpty() )
@@ -5687,13 +5687,13 @@ TQStringList TQFileDialog::getOpenFileNames( const TQString & filter,
}
#if defined(Q_WS_X11)
- if ( qt_use_native_dialogs && TQKDEIntegration::enabled())
+ if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())
return TQKDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter, true );
#elif defined(Q_WS_WIN)
- if ( qt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle )
+ if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle )
return winGetOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter );
#elif defined(Q_WS_MAC)
- if (qt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE)
+ if (tqt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE)
|| tqApp->style().inherits("TQMacStyle"))) {
TQStringList sl = macGetOpenFileNames(filter, dir.isEmpty() ? 0 : workingDirectory, parent,
name, caption, selectedFilter);
@@ -5730,7 +5730,7 @@ TQStringList TQFileDialog::getOpenFileNames( const TQString & filter,
}
delete dlg;
- qt_resolve_symlinks = save_qt_resolve_symlinks;
+ tqt_resolve_symlinks = save_qt_resolve_symlinks;
return lst;
}
diff --git a/src/dialogs/qfontdialog.cpp b/src/dialogs/qfontdialog.cpp
index 48ecb3d61..2dcf7b530 100644
--- a/src/dialogs/qfontdialog.cpp
+++ b/src/dialogs/qfontdialog.cpp
@@ -391,13 +391,13 @@ TQFont TQFontDialog::getFont( bool *ok, TQWidget *parent,const char* name)
return getFont( ok, 0, parent, name );
}
-extern bool qt_use_native_dialogs;
+extern bool tqt_use_native_dialogs;
TQFont TQFontDialog::getFont( bool *ok, const TQFont *def,
TQWidget *parent, const char* name)
{
#if defined(Q_WS_X11)
- if ( qt_use_native_dialogs && TQKDEIntegration::enabled())
+ if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())
return TQKDEIntegration::getFont( ok, def, parent, name );
#endif
TQFont result;
diff --git a/src/dialogs/qinputdialog.cpp b/src/dialogs/qinputdialog.cpp
index 7b285da97..905a6da00 100644
--- a/src/dialogs/qinputdialog.cpp
+++ b/src/dialogs/qinputdialog.cpp
@@ -231,7 +231,7 @@ void TQInputDialog::setType( Type t )
break;
default:
#if defined(QT_CHECK_STATE)
- qWarning( "TQInputDialog::setType: Invalid type" );
+ tqWarning( "TQInputDialog::setType: Invalid type" );
#endif
break;
}
diff --git a/src/dialogs/qmessagebox.cpp b/src/dialogs/qmessagebox.cpp
index 96aabc066..b27ce1a82 100644
--- a/src/dialogs/qmessagebox.cpp
+++ b/src/dialogs/qmessagebox.cpp
@@ -61,7 +61,7 @@
#include "private/qtkdeintegration_x11_p.h"
#endif
-extern bool qt_use_native_dialogs;
+extern bool tqt_use_native_dialogs;
// Internal class - don't touch
@@ -614,7 +614,7 @@ void TQMessageBox::init( int button0, int button1, int button2 )
if ( (button2 && !button1) || (button1 && !button0) ) {
#if defined(QT_CHECK_RANGE)
- qWarning( "TQMessageBox: Inconsistent button parameters" );
+ tqWarning( "TQMessageBox: Inconsistent button parameters" );
#endif
button0 = button1 = button2 = 0;
}
@@ -634,7 +634,7 @@ void TQMessageBox::init( int button0, int button1, int button2 )
if ( (b & Default) ) {
if ( mbd->defButton >= 0 ) {
#if defined(QT_CHECK_RANGE)
- qWarning( "TQMessageBox: There can be at most one "
+ tqWarning( "TQMessageBox: There can be at most one "
"default button" );
#endif
} else {
@@ -644,7 +644,7 @@ void TQMessageBox::init( int button0, int button1, int button2 )
if ( (b & Escape) ) {
if ( mbd->escButton >= 0 ) {
#if defined(QT_CHECK_RANGE)
- qWarning( "TQMessageBox: There can be at most one "
+ tqWarning( "TQMessageBox: There can be at most one "
"escape button" );
#endif
} else {
@@ -657,13 +657,13 @@ void TQMessageBox::init( int button0, int button1, int button2 )
b = Ok;
} else if ( b < 0 || b > LastButton ) {
#if defined(QT_CHECK_RANGE)
- qWarning( "TQMessageBox: Invalid button specifier" );
+ tqWarning( "TQMessageBox: Invalid button specifier" );
#endif
b = Ok;
} else {
if ( i > 0 && mbd->button[i-1] == 0 ) {
#if defined(QT_CHECK_RANGE)
- qWarning( "TQMessageBox: Inconsistent button parameters; "
+ tqWarning( "TQMessageBox: Inconsistent button parameters; "
"button %d defined but not button %d",
i+1, i );
#endif
@@ -1121,7 +1121,7 @@ int TQMessageBox::information( TQWidget *parent,
int button0, int button1, int button2 )
{
#if defined(Q_WS_X11)
- if ( qt_use_native_dialogs && TQKDEIntegration::enabled())
+ if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())
return TQKDEIntegration::information( parent, caption, text, button0, button1, button2 );
#endif
TQMessageBox *mb = new TQMessageBox( caption, text, Information,
@@ -1172,7 +1172,7 @@ int TQMessageBox::question( TQWidget *parent,
int button0, int button1, int button2 )
{
#if defined(Q_WS_X11)
- if ( qt_use_native_dialogs && TQKDEIntegration::enabled())
+ if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())
return TQKDEIntegration::question( parent, caption, text, button0, button1, button2 );
#endif
TQMessageBox *mb = new TQMessageBox( caption, text, Question,
@@ -1224,7 +1224,7 @@ int TQMessageBox::warning( TQWidget *parent,
int button0, int button1, int button2 )
{
#if defined(Q_WS_X11)
- if ( qt_use_native_dialogs && TQKDEIntegration::enabled())
+ if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())
return TQKDEIntegration::warning( parent, caption, text, button0, button1, button2 );
#endif
TQMessageBox *mb = new TQMessageBox( caption, text, Warning,
@@ -1276,7 +1276,7 @@ int TQMessageBox::critical( TQWidget *parent,
int button0, int button1, int button2 )
{
#if defined(Q_WS_X11)
- if ( qt_use_native_dialogs && TQKDEIntegration::enabled())
+ if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())
return TQKDEIntegration::critical( parent, caption, text, button0, button1, button2 );
#endif
TQMessageBox *mb = new TQMessageBox( caption, text, Critical,
@@ -1427,7 +1427,7 @@ int TQMessageBox::information( TQWidget *parent, const TQString &caption,
int escapeButtonNumber )
{
#if defined(Q_WS_X11)
- if ( qt_use_native_dialogs && TQKDEIntegration::enabled())
+ if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())
return TQKDEIntegration::information( parent, caption, text,
button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber );
#endif
@@ -1474,7 +1474,7 @@ int TQMessageBox::question( TQWidget *parent, const TQString &caption,
int escapeButtonNumber )
{
#if defined(Q_WS_X11)
- if ( qt_use_native_dialogs && TQKDEIntegration::enabled())
+ if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())
return TQKDEIntegration::question( parent, caption, text,
button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber );
#endif
@@ -1523,7 +1523,7 @@ int TQMessageBox::warning( TQWidget *parent, const TQString &caption,
int escapeButtonNumber )
{
#if defined(Q_WS_X11)
- if ( qt_use_native_dialogs && TQKDEIntegration::enabled())
+ if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())
return TQKDEIntegration::warning( parent, caption, text,
button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber );
#endif
@@ -1568,7 +1568,7 @@ int TQMessageBox::critical( TQWidget *parent, const TQString &caption,
int escapeButtonNumber )
{
#if defined(Q_WS_X11)
- if ( qt_use_native_dialogs && TQKDEIntegration::enabled())
+ if ( tqt_use_native_dialogs && TQKDEIntegration::enabled())
return TQKDEIntegration::critical( parent, caption, text,
button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber );
#endif
diff --git a/src/dialogs/qprintdialog.cpp b/src/dialogs/qprintdialog.cpp
index f46d1a5e6..57eb2d0fe 100644
--- a/src/dialogs/qprintdialog.cpp
+++ b/src/dialogs/qprintdialog.cpp
@@ -404,7 +404,7 @@ static char * parsePrintersConf( TQListView * printers, bool *found = 0 )
j++;
// that's our default printer
defaultPrinter =
- qstrdup( printerDesc.mid( i, j-i ).ascii() );
+ tqstrdup( printerDesc.mid( i, j-i ).ascii() );
printerName = "";
printerDesc = "";
} else if ( printerName == TQString::fromLatin1("_all") ) {
@@ -807,7 +807,7 @@ static char * parseCupsOutput( TQListView * printers )
perhapsAddPrinter( printers, d[n].name,
TQPrintDialog::tr("Unknown Location"), 0 );
if ( d[n].is_default && !defaultPrinter )
- defaultPrinter = qstrdup( d[n].instance );
+ defaultPrinter = tqstrdup( d[n].instance );
n++;
}
}
@@ -977,7 +977,7 @@ void TQPrintDialog::setGlobalPrintDialog( TQPrintDialog *pd )
if ( oldPd )
delete oldPd;
else
- qAddPostRoutine( qpd_cleanup_globaldialog );
+ tqAddPostRoutine( qpd_cleanup_globaldialog );
globalPrintDialog->adjustSize();
}
@@ -1375,7 +1375,7 @@ bool TQPrintDialog::getPrinterSetup( TQPrinter * p, TQWidget* w )
#ifndef QT_NO_WIDGET_TOPEXTRA
globalPrintDialog->setCaption( TQPrintDialog::tr( "Setup Printer" ) );
#endif
- qAddPostRoutine( qpd_cleanup_globaldialog );
+ tqAddPostRoutine( qpd_cleanup_globaldialog );
globalPrintDialog->setPrinter( p, TRUE );
globalPrintDialog->adjustSize();
} else {
diff --git a/src/dialogs/qprogressdialog.cpp b/src/dialogs/qprogressdialog.cpp
index fe5168a03..87560add1 100644
--- a/src/dialogs/qprogressdialog.cpp
+++ b/src/dialogs/qprogressdialog.cpp
@@ -456,7 +456,7 @@ void TQProgressDialog::setBar( TQProgressBar *bar )
{
if ( progress() > 0 ) {
#if defined(QT_CHECK_STATE)
- qWarning( "TQProgrssDialog::setBar: Cannot set a new progress bar "
+ tqWarning( "TQProgrssDialog::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 8ab1d13c2..30720e831 100644
--- a/src/dialogs/qwizard.cpp
+++ b/src/dialogs/qwizard.cpp
@@ -264,7 +264,7 @@ void TQWizard::addPage( TQWidget * page, const TQString & title )
return;
if ( d->page( page ) ) {
#if defined(QT_CHECK_STATE)
- qWarning( "TQWizard::addPage(): already added %s/%s to %s/%s",
+ tqWarning( "TQWizard::addPage(): already added %s/%s to %s/%s",
page->className(), page->name(),
className(), name() );
#endif
@@ -293,7 +293,7 @@ void TQWizard::insertPage( TQWidget * page, const TQString & title, int index )
return;
if ( d->page( page ) ) {
#if defined(QT_CHECK_STATE)
- qWarning( "TQWizard::insertPage(): already added %s/%s to %s/%s",
+ tqWarning( "TQWizard::insertPage(): already added %s/%s to %s/%s",
page->className(), page->name(),
className(), name() );
#endif