diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-10-17 19:46:30 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-10-17 19:46:30 +0900 |
commit | 69d87202cb139ffe9e4b3ce92e434523b7b09b64 (patch) | |
tree | 7b133311a4d5e5394f2612dced305f815c04847b /src/dialogs | |
parent | e07baa10b7b8e7105e02a621efadac67216c61ed (diff) | |
download | tqt3-69d87202cb139ffe9e4b3ce92e434523b7b09b64.tar.gz tqt3-69d87202cb139ffe9e4b3ce92e434523b7b09b64.zip |
QT_NO_* -> TQT_NO_* renaming.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src/dialogs')
-rw-r--r-- | src/dialogs/ntqcolordialog.h | 2 | ||||
-rw-r--r-- | src/dialogs/ntqdialog.h | 4 | ||||
-rw-r--r-- | src/dialogs/ntqerrormessage.h | 4 | ||||
-rw-r--r-- | src/dialogs/ntqfiledialog.h | 2 | ||||
-rw-r--r-- | src/dialogs/ntqfontdialog.h | 2 | ||||
-rw-r--r-- | src/dialogs/ntqinputdialog.h | 4 | ||||
-rw-r--r-- | src/dialogs/ntqmessagebox.h | 4 | ||||
-rw-r--r-- | src/dialogs/ntqprintdialog.h | 2 | ||||
-rw-r--r-- | src/dialogs/ntqprogressdialog.h | 4 | ||||
-rw-r--r-- | src/dialogs/ntqsemimodal.h | 2 | ||||
-rw-r--r-- | src/dialogs/ntqtabdialog.h | 4 | ||||
-rw-r--r-- | src/dialogs/ntqwizard.h | 4 | ||||
-rw-r--r-- | src/dialogs/qcolordialog.cpp | 26 | ||||
-rw-r--r-- | src/dialogs/qdialog.cpp | 34 | ||||
-rw-r--r-- | src/dialogs/qerrormessage.cpp | 8 | ||||
-rw-r--r-- | src/dialogs/qfiledialog.cpp | 66 | ||||
-rw-r--r-- | src/dialogs/qfontdialog.cpp | 4 | ||||
-rw-r--r-- | src/dialogs/qinputdialog.cpp | 12 | ||||
-rw-r--r-- | src/dialogs/qmessagebox.cpp | 16 | ||||
-rw-r--r-- | src/dialogs/qprintdialog.cpp | 26 | ||||
-rw-r--r-- | src/dialogs/qprogressdialog.cpp | 12 | ||||
-rw-r--r-- | src/dialogs/qtabdialog.cpp | 2 | ||||
-rw-r--r-- | src/dialogs/qwizard.cpp | 12 |
23 files changed, 128 insertions, 128 deletions
diff --git a/src/dialogs/ntqcolordialog.h b/src/dialogs/ntqcolordialog.h index 6c64f3ba6..07c695fe8 100644 --- a/src/dialogs/ntqcolordialog.h +++ b/src/dialogs/ntqcolordialog.h @@ -45,7 +45,7 @@ #include "ntqdialog.h" #endif // QT_H -#ifndef QT_NO_COLORDIALOG +#ifndef TQT_NO_COLORDIALOG class TQColorDialogPrivate; diff --git a/src/dialogs/ntqdialog.h b/src/dialogs/ntqdialog.h index 5c9e1499f..dc20b730d 100644 --- a/src/dialogs/ntqdialog.h +++ b/src/dialogs/ntqdialog.h @@ -44,7 +44,7 @@ #ifndef QT_H #include "ntqwidget.h" #endif // QT_H -#ifndef QT_NO_DIALOG +#ifndef TQT_NO_DIALOG #if 0 TQ_OBJECT #endif @@ -137,5 +137,5 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_DIALOG +#endif // TQT_NO_DIALOG #endif // TQDIALOG_H diff --git a/src/dialogs/ntqerrormessage.h b/src/dialogs/ntqerrormessage.h index ebc4a2330..f17db5ea2 100644 --- a/src/dialogs/ntqerrormessage.h +++ b/src/dialogs/ntqerrormessage.h @@ -45,7 +45,7 @@ #include "ntqdialog.h" #endif // QT_H -#ifndef QT_NO_ERRORMESSAGE +#ifndef TQT_NO_ERRORMESSAGE class TQPushButton; class TQCheckBox; class TQLabel; @@ -84,6 +84,6 @@ private: #endif }; -#endif //QT_NO_ERRORMESSAGE +#endif //TQT_NO_ERRORMESSAGE #endif diff --git a/src/dialogs/ntqfiledialog.h b/src/dialogs/ntqfiledialog.h index 577958bc5..a26cdd662 100644 --- a/src/dialogs/ntqfiledialog.h +++ b/src/dialogs/ntqfiledialog.h @@ -65,7 +65,7 @@ class TQFileDialogTQFileListView; #pragma GCC system_header #endif -#ifndef QT_NO_FILEDIALOG +#ifndef TQT_NO_FILEDIALOG class Q_EXPORT TQFileIconProvider : public TQObject { diff --git a/src/dialogs/ntqfontdialog.h b/src/dialogs/ntqfontdialog.h index 2aaa24242..88321cb42 100644 --- a/src/dialogs/ntqfontdialog.h +++ b/src/dialogs/ntqfontdialog.h @@ -43,7 +43,7 @@ #include "ntqwindowdefs.h" -#ifndef QT_NO_FONTDIALOG +#ifndef TQT_NO_FONTDIALOG // // W A R N I N G diff --git a/src/dialogs/ntqinputdialog.h b/src/dialogs/ntqinputdialog.h index e48b62303..afbdf0f1a 100644 --- a/src/dialogs/ntqinputdialog.h +++ b/src/dialogs/ntqinputdialog.h @@ -47,7 +47,7 @@ #include "ntqlineedit.h" #endif // QT_H -#ifndef QT_NO_INPUTDIALOG +#ifndef TQT_NO_INPUTDIALOG class TQSpinBox; class TQComboBox; @@ -101,7 +101,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_INPUTDIALOG +#endif // TQT_NO_INPUTDIALOG #endif // TQINPUTDIALOG_H diff --git a/src/dialogs/ntqmessagebox.h b/src/dialogs/ntqmessagebox.h index c4436dfc4..e41f20101 100644 --- a/src/dialogs/ntqmessagebox.h +++ b/src/dialogs/ntqmessagebox.h @@ -45,7 +45,7 @@ #include "ntqdialog.h" #endif // QT_H -#ifndef QT_NO_MESSAGEBOX +#ifndef TQT_NO_MESSAGEBOX class TQLabel; class TQPushButton; @@ -218,6 +218,6 @@ str)).arg(TQString::fromLatin1(tqVersion()) ); TQMessageBox::critical( 0, TQAppl "Incompatible TQt Library Error" ), s, TQMessageBox::Abort,0 ); tqFatal(s.ascii()); }} -#endif // QT_NO_MESSAGEBOX +#endif // TQT_NO_MESSAGEBOX #endif // TQMESSAGEBOX_H diff --git a/src/dialogs/ntqprintdialog.h b/src/dialogs/ntqprintdialog.h index 8f79bf0ba..696897602 100644 --- a/src/dialogs/ntqprintdialog.h +++ b/src/dialogs/ntqprintdialog.h @@ -45,7 +45,7 @@ #include "ntqdialog.h" #endif // QT_H -#ifndef QT_NO_PRINTDIALOG +#ifndef TQT_NO_PRINTDIALOG class TQGroupBox; class TQPrintDialogPrivate; diff --git a/src/dialogs/ntqprogressdialog.h b/src/dialogs/ntqprogressdialog.h index 404fa5e3d..d69b5dc0a 100644 --- a/src/dialogs/ntqprogressdialog.h +++ b/src/dialogs/ntqprogressdialog.h @@ -47,7 +47,7 @@ #include "ntqprogressbar.h" // ### remove or keep for users' convenience? #endif // QT_H -#ifndef QT_NO_PROGRESSDIALOG +#ifndef TQT_NO_PROGRESSDIALOG class TQPushButton; class TQTimer; @@ -136,6 +136,6 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_PROGRESSDIALOG +#endif // TQT_NO_PROGRESSDIALOG #endif // TQPROGRESSDIALOG_H diff --git a/src/dialogs/ntqsemimodal.h b/src/dialogs/ntqsemimodal.h index 107ed2c9a..cf0a46f6b 100644 --- a/src/dialogs/ntqsemimodal.h +++ b/src/dialogs/ntqsemimodal.h @@ -46,7 +46,7 @@ #endif // QT_H #ifndef TQT_NO_COMPAT -#ifndef QT_NO_SEMIMODAL +#ifndef TQT_NO_SEMIMODAL class Q_EXPORT TQSemiModal : public TQDialog { TQ_OBJECT diff --git a/src/dialogs/ntqtabdialog.h b/src/dialogs/ntqtabdialog.h index 826d3b6dc..dd91a4bcd 100644 --- a/src/dialogs/ntqtabdialog.h +++ b/src/dialogs/ntqtabdialog.h @@ -46,7 +46,7 @@ #include "ntqiconset.h" #endif // QT_H -#ifndef QT_NO_TABDIALOG +#ifndef TQT_NO_TABDIALOG class TQTabBar; class TQTab; @@ -141,6 +141,6 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_TABDIALOG +#endif // TQT_NO_TABDIALOG #endif // TQTABDIALOG_H diff --git a/src/dialogs/ntqwizard.h b/src/dialogs/ntqwizard.h index d9fb8d1cc..281ab3f7d 100644 --- a/src/dialogs/ntqwizard.h +++ b/src/dialogs/ntqwizard.h @@ -46,7 +46,7 @@ #include "ntqdialog.h" #endif // QT_H -#ifndef QT_NO_WIZARD +#ifndef TQT_NO_WIZARD class TQHBoxLayout; class TQWizardPrivate; @@ -137,6 +137,6 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_WIZARD +#endif // TQT_NO_WIZARD #endif // TQWIZARD_H diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/qcolordialog.cpp index ac27d6c34..281445c2e 100644 --- a/src/dialogs/qcolordialog.cpp +++ b/src/dialogs/qcolordialog.cpp @@ -40,7 +40,7 @@ #include "ntqcolordialog.h" -#ifndef QT_NO_COLORDIALOG +#ifndef TQT_NO_COLORDIALOG #include "ntqpainter.h" #include "ntqlayout.h" @@ -529,7 +529,7 @@ protected: void mousePressEvent( TQMouseEvent *e ); void mouseMoveEvent( TQMouseEvent *e ); void mouseReleaseEvent( TQMouseEvent *e ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void dragEnterEvent( TQDragEnterEvent *e ); void dragLeaveEvent( TQDragLeaveEvent *e ); void dragMoveEvent( TQDragMoveEvent *e ); @@ -561,7 +561,7 @@ void TQColorWell::mousePressEvent( TQMouseEvent *e ) void TQColorWell::mouseMoveEvent( TQMouseEvent *e ) { TQWellArray::mouseMoveEvent( e ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP if ( !mousePressed ) return; if ( ( pressPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() ) { @@ -581,7 +581,7 @@ void TQColorWell::mouseMoveEvent( TQMouseEvent *e ) #endif } -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void TQColorWell::dragEnterEvent( TQDragEnterEvent *e ) { setFocus(); @@ -620,7 +620,7 @@ void TQColorWell::dropEvent( TQDropEvent *e ) } } -#endif // QT_NO_DRAGANDDROP +#endif // TQT_NO_DRAGANDDROP void TQColorWell::mouseReleaseEvent( TQMouseEvent *e ) { @@ -987,7 +987,7 @@ protected: void mousePressEvent( TQMouseEvent *e ); void mouseMoveEvent( TQMouseEvent *e ); void mouseReleaseEvent( TQMouseEvent *e ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void dragEnterEvent( TQDragEnterEvent *e ); void dragLeaveEvent( TQDragLeaveEvent *e ); void dropEvent( TQDropEvent *e ); @@ -1024,7 +1024,7 @@ void TQColorShowLabel::mousePressEvent( TQMouseEvent *e ) void TQColorShowLabel::mouseMoveEvent( TQMouseEvent *e ) { -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP if ( !mousePressed ) return; if ( ( pressPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() ) { @@ -1041,7 +1041,7 @@ void TQColorShowLabel::mouseMoveEvent( TQMouseEvent *e ) #endif } -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void TQColorShowLabel::dragEnterEvent( TQDragEnterEvent *e ) { if ( TQColorDrag::canDecode( e ) ) @@ -1065,7 +1065,7 @@ void TQColorShowLabel::dropEvent( TQDropEvent *e ) e->ignore(); } } -#endif // QT_NO_DRAGANDDROP +#endif // TQT_NO_DRAGANDDROP void TQColorShowLabel::mouseReleaseEvent( TQMouseEvent * ) { @@ -1459,7 +1459,7 @@ TQColorDialog::TQColorDialog(TQWidget* parent, const char* name, bool modal) : setSizeGripEnabled( FALSE ); d = new TQColorDialogPrivate( this ); -#ifndef QT_NO_SETTINGS +#ifndef TQT_NO_SETTINGS if ( !customSet ) { TQSettings settings; settings.insertSearchPath( TQSettings::Windows, "/Trolltech" ); @@ -1494,7 +1494,7 @@ TQColor TQColorDialog::getColor( const TQColor& initial, TQWidget *parent, int allocContext = TQColor::enterAllocContext(); TQColorDialog *dlg = new TQColorDialog( parent, name, TRUE ); //modal -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA dlg->setCaption( TQColorDialog::tr( "Select color" ) ); #endif dlg->setColor( initial ); @@ -1540,7 +1540,7 @@ TQRgb TQColorDialog::getRgba( TQRgb initial, bool *ok, TQColorDialog *dlg = new TQColorDialog( parent, name, TRUE ); //modal TQ_CHECK_PTR( dlg ); -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA dlg->setCaption( TQColorDialog::tr( "Select color" ) ); #endif dlg->setColor( initial ); @@ -1584,7 +1584,7 @@ TQColor TQColorDialog::color() const TQColorDialog::~TQColorDialog() { -#ifndef QT_NO_SETTINGS +#ifndef TQT_NO_SETTINGS if ( !customSet ) { TQSettings settings; settings.insertSearchPath( TQSettings::Windows, "/Trolltech" ); diff --git a/src/dialogs/qdialog.cpp b/src/dialogs/qdialog.cpp index 095cbf2e7..3e3d77c3e 100644 --- a/src/dialogs/qdialog.cpp +++ b/src/dialogs/qdialog.cpp @@ -40,7 +40,7 @@ #include "ntqdialog.h" -#ifndef QT_NO_DIALOG +#ifndef TQT_NO_DIALOG #include "ntqpushbutton.h" #include "ntqfocusdata.h" @@ -215,7 +215,7 @@ public: TQDialogPrivate() : mainDef(0), orientation(Horizontal),extension(0), doShowExtension(FALSE) -#ifndef QT_NO_SIZEGRIP +#ifndef TQT_NO_SIZEGRIP ,resizer(0) #endif { @@ -226,7 +226,7 @@ public: TQWidget* extension; bool doShowExtension; TQSize size, min, max; -#ifndef QT_NO_SIZEGRIP +#ifndef TQT_NO_SIZEGRIP TQSizeGrip* resizer; #endif TQPoint lastRMBPress; @@ -283,7 +283,7 @@ TQDialog::~TQDialog() void TQDialog::setDefault( TQPushButton *pushButton ) { -#ifndef QT_NO_PUSHBUTTON +#ifndef TQT_NO_PUSHBUTTON TQObjectList *list = queryList( "TQPushButton" ); Q_ASSERT(list); TQObjectListIt it( *list ); @@ -313,7 +313,7 @@ void TQDialog::setDefault( TQPushButton *pushButton ) */ void TQDialog::setMainDefault( TQPushButton *pushButton ) { -#ifndef QT_NO_PUSHBUTTON +#ifndef TQT_NO_PUSHBUTTON d->mainDef = 0; setDefault(pushButton); #endif @@ -326,7 +326,7 @@ void TQDialog::setMainDefault( TQPushButton *pushButton ) */ void TQDialog::hideDefault() { -#ifndef QT_NO_PUSHBUTTON +#ifndef TQT_NO_PUSHBUTTON TQObjectList *list = queryList( "TQPushButton" ); TQObjectListIt it( *list ); TQPushButton *pb; @@ -529,7 +529,7 @@ bool TQDialog::eventFilter( TQObject *o, TQEvent *e ) /*! \reimp */ void TQDialog::contextMenuEvent( TQContextMenuEvent *e ) { -#if !defined(QT_NO_WHATSTHIS) && !defined(QT_NO_POPUPMENU) +#if !defined(TQT_NO_WHATSTHIS) && !defined(TQT_NO_POPUPMENU) TQWidget* w = childAt( e->pos(), TRUE ); if ( !w ) return; @@ -563,7 +563,7 @@ void TQDialog::keyPressEvent( TQKeyEvent *e ) switch ( e->key() ) { case Key_Enter: case Key_Return: { -#ifndef QT_NO_PUSHBUTTON +#ifndef TQT_NO_PUSHBUTTON TQObjectList *list = queryList( "TQPushButton" ); TQObjectListIt it( *list ); TQPushButton *pb; @@ -622,7 +622,7 @@ void TQDialog::keyPressEvent( TQKeyEvent *e ) /*! \reimp */ void TQDialog::closeEvent( TQCloseEvent *e ) { -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS if ( isModal() && TQWhatsThis::inWhatsThisMode() ) TQWhatsThis::leaveWhatsThisMode(); #endif @@ -725,7 +725,7 @@ void TQDialog::show() TQWidget::show(); showExtension( d->doShowExtension ); -#ifndef QT_NO_PUSHBUTTON +#ifndef TQT_NO_PUSHBUTTON TQWidget *fw = focusWidget(); TQFocusData *fd = focusData(); @@ -1043,7 +1043,7 @@ void TQDialog::showExtension( bool showIt ) d->size = size(); d->min = minimumSize(); d->max = maximumSize(); -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT if ( layout() ) layout()->setEnabled( FALSE ); #endif @@ -1066,7 +1066,7 @@ void TQDialog::showExtension( bool showIt ) setMinimumSize( d->min.expandedTo( TQSize( 1, 1 ) ) ); setMaximumSize( d->max ); resize( d->size ); -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT if ( layout() ) layout()->setEnabled( TRUE ); #endif @@ -1132,7 +1132,7 @@ bool TQDialog::isModal() const bool TQDialog::isSizeGripEnabled() const { -#ifndef QT_NO_SIZEGRIP +#ifndef TQT_NO_SIZEGRIP return !!d->resizer; #else return FALSE; @@ -1142,7 +1142,7 @@ bool TQDialog::isSizeGripEnabled() const void TQDialog::setSizeGripEnabled(bool enabled) { -#ifndef QT_NO_SIZEGRIP +#ifndef TQT_NO_SIZEGRIP if ( !enabled != !d->resizer ) { if ( enabled ) { d->resizer = new TQSizeGrip( this, "TQDialog::resizer" ); @@ -1159,7 +1159,7 @@ void TQDialog::setSizeGripEnabled(bool enabled) d->resizer = 0; } } -#endif //QT_NO_SIZEGRIP +#endif //TQT_NO_SIZEGRIP } @@ -1167,7 +1167,7 @@ void TQDialog::setSizeGripEnabled(bool enabled) /*! \reimp */ void TQDialog::resizeEvent( TQResizeEvent * ) { -#ifndef QT_NO_SIZEGRIP +#ifndef TQT_NO_SIZEGRIP if ( d->resizer ) { if ( TQApplication::reverseLayout() ) d->resizer->move( rect().bottomLeft() -d->resizer->rect().bottomLeft() ); @@ -1177,4 +1177,4 @@ void TQDialog::resizeEvent( TQResizeEvent * ) #endif } -#endif // QT_NO_DIALOG +#endif // TQT_NO_DIALOG diff --git a/src/dialogs/qerrormessage.cpp b/src/dialogs/qerrormessage.cpp index cbeeac685..13b55a1e1 100644 --- a/src/dialogs/qerrormessage.cpp +++ b/src/dialogs/qerrormessage.cpp @@ -40,7 +40,7 @@ #include "ntqerrormessage.h" -#ifndef QT_NO_ERRORMESSAGE +#ifndef TQT_NO_ERRORMESSAGE #include "ntqapplication.h" #include "ntqcheckbox.h" @@ -162,7 +162,7 @@ TQErrorMessage::TQErrorMessage( TQWidget * parent, const char * name ) { TQGridLayout * grid = new TQGridLayout( this, 3, 2, 11, 6 ); icon = new TQLabel( this, "qt_icon_lbl" ); -#ifndef QT_NO_MESSAGEBOX +#ifndef TQT_NO_MESSAGEBOX icon->setPixmap( TQMessageBox::standardIcon(TQMessageBox::Information) ); #endif grid->addWidget( icon, 0, 0, AlignTop ); @@ -225,7 +225,7 @@ TQErrorMessage * TQErrorMessage::qtHandler() if ( !qtMessageHandler ) { qtMessageHandler = new TQErrorMessage( 0, "automatic message handler" ); tqAddPostRoutine( deleteStaticcTQErrorMessage ); // clean up -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA if ( tqApp->mainWidget() ) qtMessageHandler->setCaption( tqApp->mainWidget()->caption() ); #endif @@ -267,4 +267,4 @@ void TQErrorMessage::message( const TQString & m ) show(); } -#endif // QT_NO_ERRORMESSAGE +#endif // TQT_NO_ERRORMESSAGE diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp index ae1b5ab34..471084f1e 100644 --- a/src/dialogs/qfiledialog.cpp +++ b/src/dialogs/qfiledialog.cpp @@ -52,7 +52,7 @@ #include "ntqfiledialog.h" -#ifndef QT_NO_FILEDIALOG +#ifndef TQT_NO_FILEDIALOG #include "private/qapplication_p.h" #include "ntqapplication.h" @@ -669,7 +669,7 @@ private: void viewportMouseReleaseEvent( TQMouseEvent *e ); void viewportMouseDoubleClickEvent( TQMouseEvent *e ); void viewportMouseMoveEvent( TQMouseEvent *e ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void viewportDragEnterEvent( TQDragEnterEvent *e ); void viewportDragMoveEvent( TQDragMoveEvent *e ); void viewportDragLeaveEvent( TQDragLeaveEvent *e ); @@ -726,7 +726,7 @@ private: void keyPressEvent( TQKeyEvent *e ); void viewportMouseReleaseEvent( TQMouseEvent *e ); void viewportMouseMoveEvent( TQMouseEvent *e ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void viewportDragEnterEvent( TQDragEnterEvent *e ); void viewportDragMoveEvent( TQDragMoveEvent *e ); void viewportDragLeaveEvent( TQDragLeaveEvent *e ); @@ -865,7 +865,7 @@ private: TQFDProgressDialog::TQFDProgressDialog( TQWidget *parent, const TQString &fn, int steps ) : TQDialog( parent, "", TRUE ) { -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA setCaption( TQFileDialog::tr( "Copy or Move a File" ) ); #endif TQVBoxLayout *layout = new TQVBoxLayout( this ); @@ -1305,7 +1305,7 @@ void TQFileListBox::viewportMouseMoveEvent( TQMouseEvent *e ) if ( !dragItem ) dragItem = itemAt( e->pos() ); renameTimer->stop(); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP if ( ( pressPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() && mousePressed ) { TQListBoxItem *item = dragItem; dragItem = 0; @@ -1339,13 +1339,13 @@ void TQFileListBox::viewportMouseMoveEvent( TQMouseEvent *e ) void TQFileListBox::dragObjDestroyed() { -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP //####### //filedialog->rereadDir(); #endif } -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void TQFileListBox::viewportDragEnterEvent( TQDragEnterEvent *e ) { startDragUrl = filedialog->d->url; @@ -1483,11 +1483,11 @@ void TQFileListBox::setCurrentDropItem( const TQPoint &pnt ) setCurrentItem( currDropItem ); changeDirTimer->start( 750 ); } -#endif // QT_NO_DRAGANDDROP +#endif // TQT_NO_DRAGANDDROP void TQFileListBox::changeDirDuringDrag() { -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP if ( !currDropItem ) return; changeDirTimer->stop(); @@ -1560,7 +1560,7 @@ void TQFileListBox::cancelRename() void TQFileListBox::contentsMoved( int, int ) { changeDirTimer->stop(); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP setCurrentDropItem( TQPoint( -1, -1 ) ); #endif } @@ -1735,7 +1735,7 @@ void TQFileDialogTQFileListView::viewportMouseMoveEvent( TQMouseEvent *e ) renameTimer->stop(); if ( !dragItem ) dragItem = itemAt( e->pos() ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP if ( ( pressPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() && mousePressed ) { TQListViewItem *item = dragItem; dragItem = 0; @@ -1763,13 +1763,13 @@ void TQFileDialogTQFileListView::viewportMouseMoveEvent( TQMouseEvent *e ) void TQFileDialogTQFileListView::dragObjDestroyed() { -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP //###### //filedialog->rereadDir(); #endif } -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void TQFileDialogTQFileListView::viewportDragEnterEvent( TQDragEnterEvent *e ) { startDragUrl = filedialog->d->url; @@ -1905,18 +1905,18 @@ void TQFileDialogTQFileListView::setCurrentDropItem( const TQPoint &pnt ) changeDirTimer->start( 750 ); } -#endif // QT_NO_DRAGANDDROP +#endif // TQT_NO_DRAGANDDROP void TQFileDialogTQFileListView::changeDirDuringDrag() { -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP if ( !currDropItem ) return; changeDirTimer->stop(); TQUrl u( filedialog->d->url, TQFileDialogPrivate::encodeFileName(currDropItem->text( 0 ) ) ); filedialog->setDir( u ); currDropItem = 0; -#endif // QT_NO_DRAGANDDROP +#endif // TQT_NO_DRAGANDDROP } @@ -1985,7 +1985,7 @@ void TQFileDialogTQFileListView::cancelRename() void TQFileDialogTQFileListView::contentsMoved( int, int ) { changeDirTimer->stop(); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP setCurrentDropItem( TQPoint( -1, -1 ) ); #endif } @@ -2609,14 +2609,14 @@ void TQFileDialog::init() d->goBack->setEnabled( FALSE ); d->goBack->setFocusPolicy( TabFocus ); connect( d->goBack, SIGNAL( clicked() ), this, SLOT( goBack() ) ); -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP TQToolTip::add( d->goBack, tr( "Back" ) ); #endif d->goBack->setIconSet( *goBackIcon ); d->cdToParent = new TQToolButton( this, "cd to parent" ); d->cdToParent->setFocusPolicy( TabFocus ); -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP TQToolTip::add( d->cdToParent, tr( "One directory up" ) ); #endif d->cdToParent->setIconSet( *cdToParentIcon ); @@ -2625,7 +2625,7 @@ void TQFileDialog::init() d->newFolder = new TQToolButton( this, "new folder" ); d->newFolder->setFocusPolicy( TabFocus ); -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP TQToolTip::add( d->newFolder, tr( "Create New Folder" ) ); #endif d->newFolder->setIconSet( *newFolderIcon ); @@ -2643,7 +2643,7 @@ void TQFileDialog::init() d->mcView = new TQToolButton( this, "mclistbox view" ); d->mcView->setFocusPolicy( TabFocus ); -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP TQToolTip::add( d->mcView, tr( "List View" ) ); #endif d->mcView->setIconSet( *multiColumnListViewIcon ); @@ -2651,7 +2651,7 @@ void TQFileDialog::init() d->stack->addWidget( d->moreFiles, d->modeButtons->insert( d->mcView ) ); d->detailView = new TQToolButton( this, "list view" ); d->detailView->setFocusPolicy( TabFocus ); -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP TQToolTip::add( d->detailView, tr( "Detail View" ) ); #endif d->detailView->setIconSet( *detailViewIcon ); @@ -2660,7 +2660,7 @@ void TQFileDialog::init() d->previewInfo = new TQToolButton( this, "preview info view" ); d->previewInfo->setFocusPolicy( TabFocus ); -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP TQToolTip::add( d->previewInfo, tr( "Preview File Info" ) ); #endif d->previewInfo->setIconSet( *previewInfoViewIcon ); @@ -2683,7 +2683,7 @@ void TQFileDialog::init() d->previewContents->setAutoRaise( TRUE ); } d->previewContents->setFocusPolicy( TabFocus ); -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP TQToolTip::add( d->previewContents, tr( "Preview File Contents" ) ); #endif d->previewContents->setIconSet( *previewContentsViewIcon ); @@ -2919,7 +2919,7 @@ TQFileDialog::~TQFileDialog() d->moreFiles->blockSignals( FALSE ); files->blockSignals( FALSE ); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR if ( d->cursorOverride ) TQApplication::restoreOverrideCursor(); #endif @@ -3343,7 +3343,7 @@ bool TQFileDialog::showHiddenFiles() const void TQFileDialog::rereadDir() { -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR if ( !d->cursorOverride ) { TQApplication::setOverrideCursor( TQCursor( TQt::WaitCursor ) ); d->cursorOverride = TRUE; @@ -3353,7 +3353,7 @@ void TQFileDialog::rereadDir() if ( d->mimeTypeTimer->isActive() ) d->mimeTypeTimer->stop(); d->currListChildren = d->url.listChildren(); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR if ( d->cursorOverride ) { TQApplication::restoreOverrideCursor(); d->cursorOverride = FALSE; @@ -3512,7 +3512,7 @@ TQString TQFileDialog::getOpenFileName( const TQString & startWith, TQFileDialog *dlg = new TQFileDialog( *workingDirectory, TQString::null, parent, name ? name : "qt_filedlg_gofn", TRUE ); TQ_CHECK_PTR( dlg ); -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA if ( !caption.isNull() ) dlg->setCaption( caption ); else @@ -3637,7 +3637,7 @@ TQString TQFileDialog::getSaveFileName( const TQString & startWith, TQFileDialog *dlg = new TQFileDialog( *workingDirectory, TQString::null, parent, name ? name : "qt_filedlg_gsfn", TRUE ); TQ_CHECK_PTR( dlg ); -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA if ( !caption.isNull() ) dlg->setCaption( caption ); else @@ -4549,7 +4549,7 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir, TQFileDialog *dlg = new TQFileDialog( parent, name ? name : "qt_filedlg_ged", TRUE ); TQ_CHECK_PTR( dlg ); -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA if ( !caption.isNull() ) dlg->setCaption( caption ); else @@ -5709,7 +5709,7 @@ TQStringList TQFileDialog::getOpenFileNames( const TQString & filter, TQFileDialog *dlg = new TQFileDialog( *workingDirectory, TQString::null, parent, name ? name : "qt_filedlg_gofns", TRUE ); TQ_CHECK_PTR( dlg ); -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA if ( !caption.isNull() ) dlg->setCaption( caption ); else @@ -5797,7 +5797,7 @@ void TQFileDialog::urlStart( TQNetworkOperation *op ) qt_ntfs_permission_lookup--; #endif if ( op->operation() == TQNetworkProtocol::OpListChildren ) { -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR if ( !d->cursorOverride ) { TQApplication::setOverrideCursor( TQCursor( TQt::WaitCursor ) ); d->cursorOverride = TRUE; @@ -5849,7 +5849,7 @@ void TQFileDialog::urlFinished( TQNetworkOperation *op ) if ( !op ) return; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR if ( op->operation() == TQNetworkProtocol::OpListChildren && d->cursorOverride ) { TQApplication::restoreOverrideCursor(); diff --git a/src/dialogs/qfontdialog.cpp b/src/dialogs/qfontdialog.cpp index 0eee95a8c..cddc66a9a 100644 --- a/src/dialogs/qfontdialog.cpp +++ b/src/dialogs/qfontdialog.cpp @@ -40,7 +40,7 @@ #include "ntqwindowdefs.h" -#ifndef QT_NO_FONTDIALOG +#ifndef TQT_NO_FONTDIALOG #include "ntqfontdialog.h" @@ -407,7 +407,7 @@ TQFont TQFontDialog::getFont( bool *ok, const TQFont *def, TQFontDialog *dlg = new TQFontDialog( parent, name, TRUE ); dlg->setFont( ( def ? *def : TQFont() ) ); -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA dlg->setCaption( tr("Select Font") ); #endif diff --git a/src/dialogs/qinputdialog.cpp b/src/dialogs/qinputdialog.cpp index 905a6da00..1569d7e73 100644 --- a/src/dialogs/qinputdialog.cpp +++ b/src/dialogs/qinputdialog.cpp @@ -40,7 +40,7 @@ #include "ntqinputdialog.h" -#ifndef QT_NO_INPUTDIALOG +#ifndef TQT_NO_INPUTDIALOG #include "ntqlayout.h" #include "ntqlabel.h" @@ -239,7 +239,7 @@ void TQInputDialog::setType( Type t ) d->stack->raiseWidget( input ); d->stack->setFixedHeight( input->sizeHint().height() ); input->setFocus(); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL d->label->setBuddy( input ); #endif } @@ -304,7 +304,7 @@ TQString TQInputDialog::getText( const TQString &caption, const TQString &label, name ? name : "qt_inputdlg_gettext", TRUE, LineEdit ); -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA dlg->setCaption( caption ); #endif dlg->lineEdit()->setText( text ); @@ -361,7 +361,7 @@ int TQInputDialog::getInteger( const TQString &caption, const TQString &label, TQInputDialog *dlg = new TQInputDialog( label, parent, name ? name : "qt_inputdlg_getint", TRUE, SpinBox ); -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA dlg->setCaption( caption ); #endif dlg->spinBox()->setRange( minValue, maxValue ); @@ -419,7 +419,7 @@ double TQInputDialog::getDouble( const TQString &caption, const TQString &label, { TQInputDialog dlg( label, parent, name ? name : "qt_inputdlg_getdbl", TRUE, LineEdit ); -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA dlg.setCaption( caption ); #endif dlg.lineEdit()->setValidator( new TQDoubleValidator( minValue, maxValue, decimals, dlg.lineEdit() ) ); @@ -472,7 +472,7 @@ TQString TQInputDialog::getItem( const TQString &caption, const TQString &label, bool *ok, TQWidget *parent, const char *name ) { TQInputDialog *dlg = new TQInputDialog( label, parent, name ? name : "qt_inputdlg_getitem", TRUE, editable ? EditableComboBox : ComboBox ); -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA dlg->setCaption( caption ); #endif if ( editable ) { diff --git a/src/dialogs/qmessagebox.cpp b/src/dialogs/qmessagebox.cpp index 23e1d5cde..97ba0e850 100644 --- a/src/dialogs/qmessagebox.cpp +++ b/src/dialogs/qmessagebox.cpp @@ -40,7 +40,7 @@ #include "ntqmessagebox.h" -#ifndef QT_NO_MESSAGEBOX +#ifndef TQT_NO_MESSAGEBOX #include "ntqaccel.h" #include "ntqlabel.h" @@ -566,7 +566,7 @@ TQMessageBox::TQMessageBox( const TQString& caption, : TQDialog( parent, name, modal, f | WStyle_Customize | WStyle_DialogBorder | WStyle_Title | WStyle_SysMenu ) { init( button0, button1, button2 ); -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA setCaption( caption ); #endif setText( text ); @@ -1022,7 +1022,7 @@ void TQMessageBox::keyPressEvent( TQKeyEvent *e ) return; } } -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL if ( !( e->state() & AltButton ) ) { TQObjectList *list = queryList( "TQPushButton" ); TQObjectListIt it( *list ); @@ -1315,7 +1315,7 @@ void TQMessageBox::about( TQWidget *parent, const TQString &caption, parent, "qt_msgbox_simple_about_box", TRUE, WDestructiveClose); TQ_CHECK_PTR( mb ); -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA const TQPixmap *pm = parent ? parent->icon() : 0; if ( pm && !pm->isNull() ) mb->setIconPixmap( *pm ); @@ -1381,7 +1381,7 @@ static int textBox( TQWidget *parent, TQMessageBox::Icon severity, if ( b[2] ) mb->setButtonText( 3, button2Text ); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR mb->setCursor( TQt::arrowCursor ); #endif return mb->exec() - 1; @@ -1597,14 +1597,14 @@ void TQMessageBox::aboutTQt( TQWidget *parent, const TQString &caption ) TQ_CHECK_PTR( mb ); mb->setWFlags( WDestructiveClose ); -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA TQString c = caption; if ( c.isNull() ) c = tr( "About TQt" ); mb->setCaption( c ); #endif mb->setText( *translatedTextAboutTQt ); -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO TQPixmap pm; TQImage logo( (const char **)qtlogo_xpm); if ( tqGray(mb->palette().active().text().rgb()) > @@ -1641,7 +1641,7 @@ void TQMessageBox::aboutTQt( TQWidget *parent, const TQString &caption ) void TQMessageBox::setIcon( const TQPixmap &pix ) { //reimplemented to avoid compiler warning. -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA TQDialog::setIcon( pix ); #endif } diff --git a/src/dialogs/qprintdialog.cpp b/src/dialogs/qprintdialog.cpp index 57eb2d0fe..48b180cdc 100644 --- a/src/dialogs/qprintdialog.cpp +++ b/src/dialogs/qprintdialog.cpp @@ -40,7 +40,7 @@ #include "ntqprintdialog.h" -#ifndef QT_NO_PRINTDIALOG +#ifndef TQT_NO_PRINTDIALOG #include "ntqfiledialog.h" #include "ntqfile.h" @@ -61,11 +61,11 @@ #include "ntqstyle.h" #include "ntqstring.h" #include "ntqregexp.h" -#if !defined(QT_NO_CUPS) || !defined(QT_NO_NIS) +#if !defined(TQT_NO_CUPS) || !defined(TQT_NO_NIS) #include "ntqlibrary.h" #endif -#ifndef QT_NO_NIS +#ifndef TQT_NO_NIS #ifndef BOOL_DEFINED #define BOOL_DEFINED @@ -79,7 +79,7 @@ # undef connect #endif -#endif // QT_NO_NIS +#endif // TQT_NO_NIS // UNIX Large File Support redefines open -> open64 #if defined(open) @@ -465,7 +465,7 @@ static char * parsePrintersConf( TQListView * printers, bool *found = 0 ) return defaultPrinter; } -#ifndef QT_NO_NIS +#ifndef TQT_NO_NIS #if defined(Q_C_CALLBACKS) extern "C" { @@ -510,7 +510,7 @@ static int retrieveNisPrinters( TQListView * printers ) return Unavail; } -#endif // QT_NO_NIS +#endif // TQT_NO_NIS static char *parseNsswitchPrintersEntry( TQListView * printers, char *line ) { @@ -578,7 +578,7 @@ static char *parseNsswitchPrintersEntry( TQListView * printers, char *line ) defaultPrinter = parsePrintersConf( printers, &found ); if ( found ) lastStatus = Success; -#ifndef QT_NO_NIS +#ifndef TQT_NO_NIS } else if ( source == "nis" ) { lastStatus = retrieveNisPrinters( printers ); #endif @@ -786,7 +786,7 @@ static void parseQconfig( TQListView * printers ) } -#ifndef QT_NO_CUPS +#ifndef TQT_NO_CUPS #include <cups/cups.h> static char * parseCupsOutput( TQListView * printers ) @@ -1037,7 +1037,7 @@ TQGroupBox * TQPrintDialog::setupDestination() #if defined(Q_OS_UNIX) char * etcLpDefault = 0; -#ifndef QT_NO_CUPS +#ifndef TQT_NO_CUPS etcLpDefault = parseCupsOutput( d->printers ); #endif if ( d->printers->childCount() == 0 ) { @@ -1162,7 +1162,7 @@ TQGroupBox * TQPrintDialog::setupDestination() horiz->addSpacing( 6 ); d->browse = new TQPushButton( tr("Browse..."), g, "browse files" ); d->browse->setAutoDefault( FALSE ); -#ifdef QT_NO_FILEDIALOG +#ifdef TQT_NO_FILEDIALOG d->browse->setEnabled( FALSE ); #endif connect( d->browse, SIGNAL(clicked()), @@ -1372,7 +1372,7 @@ bool TQPrintDialog::getPrinterSetup( TQPrinter * p, TQWidget* w ) { if ( !globalPrintDialog ) { globalPrintDialog = new TQPrintDialog( 0, 0, "global print dialog" ); -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA globalPrintDialog->setCaption( TQPrintDialog::tr( "Setup Printer" ) ); #endif tqAddPostRoutine( qpd_cleanup_globaldialog ); @@ -1382,7 +1382,7 @@ bool TQPrintDialog::getPrinterSetup( TQPrinter * p, TQWidget* w ) globalPrintDialog->setPrinter( p, TRUE ); } globalPrintDialog->adjustPosition( w ); - #ifndef QT_NO_WIDGET_TOPEXTRA + #ifndef TQT_NO_WIDGET_TOPEXTRA if ( w ) { const TQPixmap *pm = w->icon(); if ( pm && !pm->isNull() ) @@ -1471,7 +1471,7 @@ void TQPrintDialog::setNumCopies( int copies ) void TQPrintDialog::browseClicked() { -#ifndef QT_NO_FILEDIALOG +#ifndef TQT_NO_FILEDIALOG TQString fn = TQFileDialog::getSaveFileName( d->fileName->text(), tr( "PostScript Files (*.ps);;All Files (*)" ), this ); if ( !fn.isNull() ) d->fileName->setText( fn ); diff --git a/src/dialogs/qprogressdialog.cpp b/src/dialogs/qprogressdialog.cpp index d0320af69..f7d1e1c5a 100644 --- a/src/dialogs/qprogressdialog.cpp +++ b/src/dialogs/qprogressdialog.cpp @@ -40,7 +40,7 @@ #include "ntqprogressdialog.h" -#ifndef QT_NO_PROGRESSDIALOG +#ifndef TQT_NO_PROGRESSDIALOG #include "ntqaccel.h" #include "ntqpainter.h" @@ -89,7 +89,7 @@ public: bool shown_once; bool cancellation_flag; TQTime starttime; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQCursor parentCursor; #endif int showTime; @@ -298,7 +298,7 @@ TQProgressDialog::TQProgressDialog( const TQString &labelText, TQProgressDialog::~TQProgressDialog() { -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR if ( d->creator ) d->creator->setCursor( d->parentCursor ); #endif @@ -411,7 +411,7 @@ void TQProgressDialog::setCancelButton( TQPushButton *cancelButton ) cancelButton->reparent( this, 0, TQPoint(0,0), FALSE ); } connect( d->cancel, SIGNAL(clicked()), this, SIGNAL(canceled()) ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQAccel *accel = new TQAccel( this ); accel->connectItem( accel->insertItem(Key_Escape), d->cancel, SIGNAL(clicked()) ); @@ -519,7 +519,7 @@ void TQProgressDialog::setTotalSteps( int totalSteps ) void TQProgressDialog::reset() { -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR if ( progress() >= 0 ) { if ( d->creator ) d->creator->setCursor( d->parentCursor ); @@ -583,7 +583,7 @@ void TQProgressDialog::setProgress( int progress ) tqApp->processEvents(); } else { if ( progress == 0 ) { -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR if ( d->creator ) { d->parentCursor = d->creator->cursor(); d->creator->setCursor( waitCursor ); diff --git a/src/dialogs/qtabdialog.cpp b/src/dialogs/qtabdialog.cpp index c50b748e9..c577bdc63 100644 --- a/src/dialogs/qtabdialog.cpp +++ b/src/dialogs/qtabdialog.cpp @@ -40,7 +40,7 @@ #include "ntqtabdialog.h" -#ifndef QT_NO_TABDIALOG +#ifndef TQT_NO_TABDIALOG #include "ntqobjectlist.h" #include "ntqtabbar.h" diff --git a/src/dialogs/qwizard.cpp b/src/dialogs/qwizard.cpp index a11094a6f..a8bba3129 100644 --- a/src/dialogs/qwizard.cpp +++ b/src/dialogs/qwizard.cpp @@ -40,7 +40,7 @@ #include "ntqwizard.h" -#ifndef QT_NO_WIZARD +#ifndef TQT_NO_WIZARD #include "ntqlayout.h" #include "ntqpushbutton.h" @@ -138,7 +138,7 @@ public: TQFrame * hbar1, * hbar2; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQAccel * accel; int backAccel; int nextAccel; @@ -203,7 +203,7 @@ TQWizard::TQWizard( TQWidget *parent, const char *name, bool modal, connect( d->helpButton, SIGNAL(clicked()), this, SLOT(help()) ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL d->accel = new TQAccel( this, "arrow-key accel" ); d->backAccel = d->accel->insertItem( TQt::ALT + TQt::Key_Left ); d->accel->connectItem( d->backAccel, this, SLOT(back()) ); @@ -457,7 +457,7 @@ void TQWizard::help() void TQWizard::setBackEnabled( bool enable ) { d->backButton->setEnabled( enable ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL d->accel->setItemEnabled( d->backAccel, enable ); #endif } @@ -466,7 +466,7 @@ void TQWizard::setBackEnabled( bool enable ) void TQWizard::setNextEnabled( bool enable ) { d->nextButton->setEnabled( enable ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL d->accel->setItemEnabled( d->nextAccel, enable ); #endif } @@ -914,4 +914,4 @@ TQWidget* TQWizard::page( int index ) const return d->pages.at( index )->w; } -#endif // QT_NO_WIZARD +#endif // TQT_NO_WIZARD |