diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-13 17:43:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-13 17:43:39 -0600 |
| commit | 359640943bcf155faa9a067dde9e00a123276290 (patch) | |
| tree | fb3d55ea5e18949042fb0064123fb73d2b1eb932 /src/dialogs/ntqmessagebox.h | |
| parent | a829bcdc533e154000803d517200d32fe762e85c (diff) | |
| download | tqt3-359640943bcf155faa9a067dde9e00a123276290.tar.gz tqt3-359640943bcf155faa9a067dde9e00a123276290.zip | |
Automated update from Qt3
Diffstat (limited to 'src/dialogs/ntqmessagebox.h')
| -rw-r--r-- | src/dialogs/ntqmessagebox.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dialogs/ntqmessagebox.h b/src/dialogs/ntqmessagebox.h index 5ab38f78c..0296612ac 100644 --- a/src/dialogs/ntqmessagebox.h +++ b/src/dialogs/ntqmessagebox.h @@ -53,7 +53,7 @@ struct TQMessageBoxData; class Q_EXPORT TQMessageBox : public TQDialog { - Q_OBJECT + TQ_OBJECT Q_ENUMS( Icon ) Q_PROPERTY( TQString text READ text WRITE setText ) Q_PROPERTY( Icon icon READ icon WRITE setIcon ) @@ -191,7 +191,7 @@ private: void *reserved2; private: // Disabled copy constructor and operator= -#if defined(Q_DISABLE_COPY) +#if defined(TQ_DISABLE_COPY) TQMessageBox( const TQMessageBox & ); TQMessageBox &operator=( const TQMessageBox & ); #endif @@ -213,7 +213,7 @@ TQString sq=TQString::fromLatin1(qVersion()); if ( (sq.section('.',0,0).toInt()< (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 \ TQApplication(argc,argv);} TQString s = TQApplication::tr("Executable '%1' requires TQt "\ - "%2, found TQt %3.").arg(TQString::fromLatin1(qAppName())).arg(TQString::fromLatin1(\ + "%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()); }} |