diff options
Diffstat (limited to 'src/widgets')
122 files changed, 784 insertions, 784 deletions
diff --git a/src/widgets/ntqaction.h b/src/widgets/ntqaction.h index 1ca1032c..cb568071 100644 --- a/src/widgets/ntqaction.h +++ b/src/widgets/ntqaction.h @@ -48,7 +48,7 @@ #include "ntqkeysequence.h" #endif // QT_H -#ifndef QT_NO_ACTION +#ifndef TQT_NO_ACTION class TQActionPrivate; class TQActionGroupPrivate; @@ -68,14 +68,14 @@ class Q_EXPORT TQAction : public TQObject TQ_PROPERTY( TQString toolTip READ toolTip WRITE setToolTip ) TQ_PROPERTY( TQString statusTip READ statusTip WRITE setStatusTip ) TQ_PROPERTY( TQString whatsThis READ whatsThis WRITE setWhatsThis ) -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQ_PROPERTY( TQKeySequence accel READ accel WRITE setAccel ) #endif TQ_PROPERTY( bool visible READ isVisible WRITE setVisible ) public: TQAction( TQObject* parent, const char* name = 0 ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQAction( const TQString& menuText, TQKeySequence accel, TQObject* parent, const char* name = 0 ); TQAction( const TQIconSet& icon, const TQString& menuText, TQKeySequence accel, @@ -101,7 +101,7 @@ public: TQString statusTip() const; virtual void setWhatsThis( const TQString& ); TQString whatsThis() const; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL virtual void setAccel( const TQKeySequence& key ); TQKeySequence accel() const; #endif diff --git a/src/widgets/ntqbutton.h b/src/widgets/ntqbutton.h index 9c47e60e..ee6b341c 100644 --- a/src/widgets/ntqbutton.h +++ b/src/widgets/ntqbutton.h @@ -46,7 +46,7 @@ #include "ntqkeysequence.h" #endif // QT_H -#ifndef QT_NO_BUTTON +#ifndef TQT_NO_BUTTON class TQButtonGroup; @@ -78,7 +78,7 @@ public: const TQPixmap *pixmap() const; virtual void setPixmap( const TQPixmap & ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQKeySequence accel() const; virtual void setAccel( const TQKeySequence& ); #endif @@ -229,6 +229,6 @@ inline TQButton::ToggleType TQButton::toggleType() const } -#endif // QT_NO_BUTTON +#endif // TQT_NO_BUTTON #endif // TQBUTTON_H diff --git a/src/widgets/ntqbuttongroup.h b/src/widgets/ntqbuttongroup.h index 92e2860a..0903ae91 100644 --- a/src/widgets/ntqbuttongroup.h +++ b/src/widgets/ntqbuttongroup.h @@ -45,7 +45,7 @@ #include "ntqgroupbox.h" #endif // QT_H -#ifndef QT_NO_BUTTONGROUP +#ifndef TQT_NO_BUTTONGROUP class TQButton; @@ -116,6 +116,6 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_BUTTONGROUP +#endif // TQT_NO_BUTTONGROUP #endif // TQBUTTONGROUP_H diff --git a/src/widgets/ntqcheckbox.h b/src/widgets/ntqcheckbox.h index a62a0d1b..4c91197e 100644 --- a/src/widgets/ntqcheckbox.h +++ b/src/widgets/ntqcheckbox.h @@ -45,7 +45,7 @@ #include "ntqbutton.h" #endif // QT_H -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX class Q_EXPORT TQCheckBox : public TQButton { @@ -91,6 +91,6 @@ inline void TQCheckBox::setChecked( bool check ) { setOn( check ); } -#endif // QT_NO_CHECKBOX +#endif // TQT_NO_CHECKBOX #endif // TQCHECKBOX_H diff --git a/src/widgets/ntqcombobox.h b/src/widgets/ntqcombobox.h index c6b27ce9..faca22c2 100644 --- a/src/widgets/ntqcombobox.h +++ b/src/widgets/ntqcombobox.h @@ -45,7 +45,7 @@ #include "ntqwidget.h" #endif // QT_H -#ifndef QT_NO_COMBOBOX +#ifndef TQT_NO_COMBOBOX class TQStrList; @@ -176,7 +176,7 @@ protected: void keyPressEvent( TQKeyEvent *e ); void focusInEvent( TQFocusEvent *e ); void focusOutEvent( TQFocusEvent *e ); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void wheelEvent( TQWheelEvent *e ); #endif void styleChange( TQStyle& ); @@ -201,6 +201,6 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_COMBOBOX +#endif // TQT_NO_COMBOBOX #endif // TQCOMBOBOX_H diff --git a/src/widgets/ntqdatetimeedit.h b/src/widgets/ntqdatetimeedit.h index 8078d826..b96ff38d 100644 --- a/src/widgets/ntqdatetimeedit.h +++ b/src/widgets/ntqdatetimeedit.h @@ -47,7 +47,7 @@ #include "ntqdatetime.h" #endif // QT_H -#ifndef QT_NO_DATETIMEEDIT +#ifndef TQT_NO_DATETIMEEDIT class Q_EXPORT TQDateTimeEditBase : public TQWidget { diff --git a/src/widgets/ntqdial.h b/src/widgets/ntqdial.h index c28bedfa..bb1f1737 100644 --- a/src/widgets/ntqdial.h +++ b/src/widgets/ntqdial.h @@ -47,7 +47,7 @@ #include "ntqrangecontrol.h" #endif // QT_H -#ifndef QT_NO_DIAL +#ifndef TQT_NO_DIAL class TQDialPrivate; @@ -119,7 +119,7 @@ protected: void mousePressEvent( TQMouseEvent * ); void mouseReleaseEvent( TQMouseEvent * ); void mouseMoveEvent( TQMouseEvent * ); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void wheelEvent( TQWheelEvent * ); #endif void focusInEvent( TQFocusEvent * ); @@ -148,6 +148,6 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_DIAL +#endif // TQT_NO_DIAL #endif diff --git a/src/widgets/ntqdockarea.h b/src/widgets/ntqdockarea.h index 7a5a5910..39ad32a5 100644 --- a/src/widgets/ntqdockarea.h +++ b/src/widgets/ntqdockarea.h @@ -51,7 +51,7 @@ #include "ntqtextstream.h" #endif // QT_H -#ifndef QT_NO_MAINWINDOW +#ifndef TQT_NO_MAINWINDOW class TQSplitter; class TQBoxLayout; @@ -179,7 +179,7 @@ private: // Disabled copy constructor and operator= }; -#ifndef QT_NO_TEXTSTREAM +#ifndef TQT_NO_TEXTSTREAM Q_EXPORT TQTextStream &operator<<( TQTextStream &, const TQDockArea & ); Q_EXPORT TQTextStream &operator>>( TQTextStream &, TQDockArea & ); #endif @@ -188,4 +188,4 @@ Q_EXPORT TQTextStream &operator>>( TQTextStream &, TQDockArea & ); #include "ntqwinexport.h" #endif -#endif //QT_NO_MAINWINDOW +#endif //TQT_NO_MAINWINDOW diff --git a/src/widgets/ntqdockwindow.h b/src/widgets/ntqdockwindow.h index fa9d66bc..6f5d69fd 100644 --- a/src/widgets/ntqdockwindow.h +++ b/src/widgets/ntqdockwindow.h @@ -45,7 +45,7 @@ #include "ntqframe.h" #endif // QT_H -#ifndef QT_NO_MAINWINDOW +#ifndef TQT_NO_MAINWINDOW class TQDockWindowHandle; class TQDockWindowTitleBar; @@ -143,7 +143,7 @@ public: bool eventFilter( TQObject *o, TQEvent *e ); -#ifdef QT_NO_WIDGET_TOPEXTRA +#ifdef TQT_NO_WIDGET_TOPEXTRA TQString caption() const; #endif diff --git a/src/widgets/ntqframe.h b/src/widgets/ntqframe.h index 8c66f0b1..74710e0c 100644 --- a/src/widgets/ntqframe.h +++ b/src/widgets/ntqframe.h @@ -45,7 +45,7 @@ #include "ntqwidget.h" #endif // QT_H -#ifndef QT_NO_FRAME +#ifndef TQT_NO_FRAME class Q_EXPORT TQFrame : public TQWidget { @@ -166,6 +166,6 @@ inline int TQFrame::frameWidth() const { return fwidth; } -#endif // QT_NO_FRAME +#endif // TQT_NO_FRAME #endif // TQFRAME_H diff --git a/src/widgets/ntqgrid.h b/src/widgets/ntqgrid.h index ff5bab2b..7479b954 100644 --- a/src/widgets/ntqgrid.h +++ b/src/widgets/ntqgrid.h @@ -41,7 +41,7 @@ #include "ntqframe.h" #endif // QT_H -#ifndef QT_NO_GRID +#ifndef TQT_NO_GRID class TQGridLayout; @@ -72,6 +72,6 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_GRID +#endif // TQT_NO_GRID #endif // TQGRID_H diff --git a/src/widgets/ntqgridview.h b/src/widgets/ntqgridview.h index 72b0982f..e08adfa5 100644 --- a/src/widgets/ntqgridview.h +++ b/src/widgets/ntqgridview.h @@ -45,7 +45,7 @@ #include "ntqscrollview.h" #endif // QT_H -#ifndef QT_NO_GRIDVIEW +#ifndef TQT_NO_GRIDVIEW class TQGridViewPrivate; @@ -133,7 +133,7 @@ inline TQSize TQGridView::gridSize() const -#endif // QT_NO_GRIDVIEW +#endif // TQT_NO_GRIDVIEW #endif // TQTABLEVIEW_H diff --git a/src/widgets/ntqgroupbox.h b/src/widgets/ntqgroupbox.h index 49b7aa72..42c674b4 100644 --- a/src/widgets/ntqgroupbox.h +++ b/src/widgets/ntqgroupbox.h @@ -45,7 +45,7 @@ #include "ntqframe.h" #endif // QT_H -#ifndef QT_NO_GROUPBOX +#ifndef TQT_NO_GROUPBOX class TQAccel; @@ -62,7 +62,7 @@ class Q_EXPORT TQGroupBox : public TQFrame TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation DESIGNABLE false ) TQ_PROPERTY( int columns READ columns WRITE setColumns DESIGNABLE false ) TQ_PROPERTY( bool flat READ isFlat WRITE setFlat ) -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX TQ_PROPERTY( bool checkable READ isCheckable WRITE setCheckable ) TQ_PROPERTY( bool checked READ isChecked WRITE setChecked ) #endif @@ -101,13 +101,13 @@ public: bool isFlat() const; void setFlat( bool b ); bool isCheckable() const; -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX void setCheckable( bool b ); #endif bool isChecked() const; void setEnabled(bool on); -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX public slots: void setChecked( bool b ); @@ -132,13 +132,13 @@ private: void calculateFrame(); void insertWid( TQWidget* ); void setTextSpacer(); -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX void updateCheckBoxGeometry(); #endif TQString str; int align; int lenvisible; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQAccel * accel; #endif TQGroupBoxPrivate * d; @@ -160,6 +160,6 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_GROUPBOX +#endif // TQT_NO_GROUPBOX #endif // TQGROUPBOX_H diff --git a/src/widgets/ntqhbox.h b/src/widgets/ntqhbox.h index 57fd2ba9..b2fd7594 100644 --- a/src/widgets/ntqhbox.h +++ b/src/widgets/ntqhbox.h @@ -42,7 +42,7 @@ #include "ntqwidget.h" #endif // QT_H -#ifndef QT_NO_HBOX +#ifndef TQT_NO_HBOX #include "ntqframe.h" @@ -71,6 +71,6 @@ private: #endif }; -#endif // QT_NO_HBOX +#endif // TQT_NO_HBOX #endif // TQHBOX_H diff --git a/src/widgets/ntqhbuttongroup.h b/src/widgets/ntqhbuttongroup.h index c5f59ffd..acc4b0fc 100644 --- a/src/widgets/ntqhbuttongroup.h +++ b/src/widgets/ntqhbuttongroup.h @@ -45,7 +45,7 @@ #include "ntqbuttongroup.h" #endif // QT_H -#ifndef QT_NO_HBUTTONGROUP +#ifndef TQT_NO_HBUTTONGROUP class Q_EXPORT TQHButtonGroup : public TQButtonGroup { @@ -63,6 +63,6 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_HBUTTONGROUP +#endif // TQT_NO_HBUTTONGROUP #endif // TQHBUTTONGROUP_H diff --git a/src/widgets/ntqheader.h b/src/widgets/ntqheader.h index a6d9ce33..65df516a 100644 --- a/src/widgets/ntqheader.h +++ b/src/widgets/ntqheader.h @@ -47,7 +47,7 @@ #include "ntqiconset.h" // conversion TQPixmap->TQIconset #endif // QT_H -#ifndef QT_NO_HEADER +#ifndef TQT_NO_HEADER class TQShowEvent; class TQHeaderData; @@ -214,6 +214,6 @@ inline bool TQHeader::tracking() const { return trackingIsOn; } extern Q_EXPORT bool tqt_qheader_label_return_null_strings; // needed for professional edition -#endif // QT_NO_HEADER +#endif // TQT_NO_HEADER #endif // TQHEADER_H diff --git a/src/widgets/ntqhgroupbox.h b/src/widgets/ntqhgroupbox.h index 73d33e28..a6f81893 100644 --- a/src/widgets/ntqhgroupbox.h +++ b/src/widgets/ntqhgroupbox.h @@ -45,7 +45,7 @@ #include "ntqgroupbox.h" #endif // QT_H -#ifndef QT_NO_HGROUPBOX +#ifndef TQT_NO_HGROUPBOX class Q_EXPORT TQHGroupBox : public TQGroupBox { @@ -62,6 +62,6 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_HGROUPBOX +#endif // TQT_NO_HGROUPBOX #endif // TQHGROUPBOX_H diff --git a/src/widgets/ntqiconview.h b/src/widgets/ntqiconview.h index 0de83775..e9c5d949 100644 --- a/src/widgets/ntqiconview.h +++ b/src/widgets/ntqiconview.h @@ -53,7 +53,7 @@ #include "ntqpicture.h" #endif // QT_H -#ifndef QT_NO_ICONVIEW +#ifndef TQT_NO_ICONVIEW class TQIconView; class TQPainter; @@ -70,7 +70,7 @@ class TQIconViewItemLineEdit; class TQStringList; class TQIconDragPrivate; -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP class Q_EXPORT TQIconDragItem { @@ -129,7 +129,7 @@ public: TQIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text ); TQIconViewItem( TQIconView *parent, const TQString &text, const TQPixmap &icon ); TQIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text, const TQPixmap &icon ); -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE TQIconViewItem( TQIconView *parent, const TQString &text, const TQPicture &picture ); TQIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text, const TQPicture &picture ); #endif @@ -141,7 +141,7 @@ public: virtual TQString text() const; virtual TQPixmap *pixmap() const; -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE virtual TQPicture *picture() const; #endif virtual TQString key() const; @@ -187,7 +187,7 @@ public: virtual bool acceptDrop( const TQMimeSource *mime ) const; -#ifndef QT_NO_TEXTEDIT +#ifndef TQT_NO_TEXTEDIT void rename(); #endif @@ -195,7 +195,7 @@ public: virtual void setText( const TQString &text ); virtual void setPixmap( const TQPixmap &icon ); -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE virtual void setPicture( const TQPicture &icon ); #endif virtual void setText( const TQString &text, bool recalc, bool redraw = TRUE ); @@ -206,13 +206,13 @@ public: static int RTTI; protected: -#ifndef QT_NO_TEXTEDIT +#ifndef TQT_NO_TEXTEDIT virtual void removeRenameBox(); #endif virtual void calcRect( const TQString &text_ = TQString::null ); virtual void paintItem( TQPainter *p, const TQColorGroup &cg ); virtual void paintFocus( TQPainter *p, const TQColorGroup &cg ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP virtual void dropped( TQDropEvent *e, const TQValueList<TQIconDragItem> &lst ); #endif virtual void dragEntered(); @@ -225,11 +225,11 @@ protected: private: void init( TQIconViewItem *after = 0 -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE , TQPicture *pic = 0 #endif ); -#ifndef QT_NO_TEXTEDIT +#ifndef TQT_NO_TEXTEDIT void renameItem(); void cancelRenameItem(); #endif @@ -239,7 +239,7 @@ private: TQString itemText, itemKey; TQString tmpText; TQPixmap *itemIcon; -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE TQPicture *itemPic; #endif TQIconViewItem *prev, *next; @@ -252,7 +252,7 @@ private: uint dirty : 1; uint wordWrapDirty : 1; TQRect itemRect, itemTextRect, itemIconRect; -#ifndef QT_NO_TEXTEDIT +#ifndef TQT_NO_TEXTEDIT TQIconViewItemLineEdit *renameBox; #endif TQRect oldRect; @@ -414,7 +414,7 @@ signals: void mouseButtonClicked( int button, TQIconViewItem* item, const TQPoint& pos ); void contextMenuRequested( TQIconViewItem* item, const TQPoint &pos ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void dropped( TQDropEvent *e, const TQValueList<TQIconDragItem> &lst ); #endif void moved(); @@ -439,7 +439,7 @@ protected: void contentsMouseDoubleClickEvent( TQMouseEvent *e ); void contentsContextMenuEvent( TQContextMenuEvent *e ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void contentsDragEnterEvent( TQDragEnterEvent *e ); void contentsDragMoveEvent( TQDragMoveEvent *e ); void contentsDragLeaveEvent( TQDragLeaveEvent *e ); @@ -454,7 +454,7 @@ protected: void enterEvent( TQEvent *e ); virtual void drawRubber( TQPainter *p ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP virtual TQDragObject *dragObject(); virtual void startDrag(); #endif @@ -472,7 +472,7 @@ protected: private: void contentsMousePressEventEx( TQMouseEvent *e ); virtual void drawDragShapes( const TQPoint &pnt ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP virtual void initDragEnter( TQDropEvent *e ); #endif void drawContents( TQPainter* ); @@ -505,6 +505,6 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_ICONVIEW +#endif // TQT_NO_ICONVIEW #endif // TQICONVIEW_H diff --git a/src/widgets/ntqlabel.h b/src/widgets/ntqlabel.h index b1d439fc..e9c348e4 100644 --- a/src/widgets/ntqlabel.h +++ b/src/widgets/ntqlabel.h @@ -45,7 +45,7 @@ #include "ntqframe.h" #endif // QT_H -#ifndef QT_NO_LABEL +#ifndef TQT_NO_LABEL class TQSimpleRichText; class TQLabelPrivate; @@ -71,10 +71,10 @@ public: TQString text() const { return ltext; } TQPixmap *pixmap() const { return lpixmap; } -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE TQPicture *picture() const { return lpicture; } #endif -#ifndef QT_NO_MOVIE +#ifndef TQT_NO_MOVIE TQMovie *movie() const; #endif @@ -88,13 +88,13 @@ public: bool autoResize() const { return autoresize; } virtual void setAutoResize( bool ); -#ifndef QT_NO_IMAGE_SMOOTHSCALE +#ifndef TQT_NO_IMAGE_SMOOTHSCALE bool hasScaledContents() const; void setScaledContents( bool ); #endif TQSize sizeHint() const; TQSize minimumSizeHint() const; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL virtual void setBuddy( TQWidget * ); TQWidget *buddy() const; #endif @@ -105,10 +105,10 @@ public: public slots: virtual void setText( const TQString &); virtual void setPixmap( const TQPixmap & ); -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE virtual void setPicture( const TQPicture & ); #endif -#ifndef QT_NO_MOVIE +#ifndef TQT_NO_MOVIE virtual void setMovie( const TQMovie & ); #endif virtual void setNum( int ); @@ -121,11 +121,11 @@ protected: void resizeEvent( TQResizeEvent* ); private slots: -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL void acceleratorSlot(); void buddyDied(); #endif -#ifndef QT_NO_MOVIE +#ifndef TQT_NO_MOVIE void movieUpdated(const TQRect&); void movieResized(const TQSize&); #endif @@ -137,13 +137,13 @@ private: TQSize sizeForWidth( int w ) const; TQString ltext; TQPixmap *lpixmap; -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE TQPicture *lpicture; #endif -#ifndef QT_NO_MOVIE +#ifndef TQT_NO_MOVIE TQMovie * lmovie; #endif -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQWidget * lbuddy; #endif ushort align; @@ -151,10 +151,10 @@ private: uint autoresize:1; uint scaledcontents :1; TextFormat textformat; -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT TQSimpleRichText* doc; #endif -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQAccel * accel; #endif TQLabelPrivate* d; @@ -169,6 +169,6 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_LABEL +#endif // TQT_NO_LABEL #endif // TQLABEL_H diff --git a/src/widgets/ntqlcdnumber.h b/src/widgets/ntqlcdnumber.h index f76aa224..14013129 100644 --- a/src/widgets/ntqlcdnumber.h +++ b/src/widgets/ntqlcdnumber.h @@ -46,7 +46,7 @@ #include "ntqbitarray.h" #endif // QT_H -#ifndef QT_NO_LCDNUMBER +#ifndef TQT_NO_LCDNUMBER class TQLCDNumberPrivate; @@ -141,6 +141,6 @@ inline int TQLCDNumber::numDigits() const { return ndigits; } -#endif // QT_NO_LCDNUMBER +#endif // TQT_NO_LCDNUMBER #endif // TQLCDNUMBER_H diff --git a/src/widgets/ntqlineedit.h b/src/widgets/ntqlineedit.h index 28d00b18..18979f8f 100644 --- a/src/widgets/ntqlineedit.h +++ b/src/widgets/ntqlineedit.h @@ -51,7 +51,7 @@ class TQPopupMenu; #include "ntqstring.h" #endif // QT_H -#ifndef QT_NO_LINEEDIT +#ifndef TQT_NO_LINEEDIT class TQTextParagraph; class TQTextCursor; @@ -165,7 +165,7 @@ public slots: virtual void setSelection( int, int ); virtual void setCursorPosition( int ); virtual void setAlignment( int flag ); -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD virtual void cut(); virtual void copy() const; virtual void paste(); @@ -192,7 +192,7 @@ protected: void focusOutEvent( TQFocusEvent * ); void resizeEvent( TQResizeEvent * ); void drawContents( TQPainter * ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void dragEnterEvent( TQDragEnterEvent * ); void dragMoveEvent( TQDragMoveEvent *e ); void dragLeaveEvent( TQDragLeaveEvent *e ); @@ -227,6 +227,6 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_LINEEDIT +#endif // TQT_NO_LINEEDIT #endif // TQLINEEDIT_H diff --git a/src/widgets/ntqlistbox.h b/src/widgets/ntqlistbox.h index 7584e4f8..6a44866b 100644 --- a/src/widgets/ntqlistbox.h +++ b/src/widgets/ntqlistbox.h @@ -46,7 +46,7 @@ #include "ntqpixmap.h" #endif // QT_H -#ifndef QT_NO_LISTBOX +#ifndef TQT_NO_LISTBOX class TQListBoxPrivate; @@ -430,6 +430,6 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_LISTBOX +#endif // TQT_NO_LISTBOX #endif // TQLISTBOX_H diff --git a/src/widgets/ntqlistview.h b/src/widgets/ntqlistview.h index de41e07f..250389a5 100644 --- a/src/widgets/ntqlistview.h +++ b/src/widgets/ntqlistview.h @@ -45,7 +45,7 @@ #include "ntqscrollview.h" #endif // QT_H -#ifndef QT_NO_LISTVIEW +#ifndef TQT_NO_LISTVIEW class TQPixmap; @@ -187,7 +187,7 @@ protected: virtual void activate(); bool activatedPos( TQPoint & ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP virtual void dropped( TQDropEvent *e ); #endif virtual void dragEntered(); @@ -393,7 +393,7 @@ signals: void expanded( TQListViewItem *item ); void collapsed( TQListViewItem *item ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void dropped( TQDropEvent *e ); #endif void itemRenamed( TQListViewItem *item, int col, const TQString & ); @@ -405,7 +405,7 @@ protected: void contentsMouseMoveEvent( TQMouseEvent * e ); void contentsMouseDoubleClickEvent( TQMouseEvent * e ); void contentsContextMenuEvent( TQContextMenuEvent * e ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void contentsDragEnterEvent( TQDragEnterEvent *e ); void contentsDragMoveEvent( TQDragMoveEvent *e ); void contentsDragLeaveEvent( TQDragLeaveEvent *e ); @@ -601,6 +601,6 @@ private: bool isChecked( const TQListViewItem* ) const; }; -#endif // QT_NO_LISTVIEW +#endif // TQT_NO_LISTVIEW #endif // TQLISTVIEW_H diff --git a/src/widgets/ntqmainwindow.h b/src/widgets/ntqmainwindow.h index 03a9eee6..1104608a 100644 --- a/src/widgets/ntqmainwindow.h +++ b/src/widgets/ntqmainwindow.h @@ -48,7 +48,7 @@ #include "ntqtextstream.h" #endif // QT_H -#ifndef QT_NO_MAINWINDOW +#ifndef TQT_NO_MAINWINDOW class TQMenuBar; class TQStatusBar; @@ -70,11 +70,11 @@ public: TQMainWindow( TQWidget* parent=0, const char* name=0, WFlags f = WType_TopLevel ); ~TQMainWindow(); -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR TQMenuBar * menuBar() const; #endif TQStatusBar * statusBar() const; -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP TQToolTipGroup * toolTipGroup() const; #endif @@ -118,7 +118,7 @@ public: // compatibility stuff bool hasDockWindow( TQDockWindow *dw ); -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR void addToolBar( TQDockWindow *, Dock = DockTop, bool newLine = FALSE ); void addToolBar( TQDockWindow *, const TQString &label, Dock = DockTop, bool newLine = FALSE ); @@ -163,7 +163,7 @@ signals: void usesTextLabelChanged( bool ); void dockWindowPositionChanged( TQDockWindow * ); -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR // compatibility stuff void toolBarPositionChanged( TQToolBar * ); #endif @@ -188,11 +188,11 @@ private: void triggerLayout( bool deleteLayout = TRUE); bool dockMainWindow( TQObject *dock ); -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR virtual void setMenuBar( TQMenuBar * ); #endif virtual void setStatusBar( TQStatusBar * ); -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP virtual void setToolTipGroup( TQToolTipGroup * ); #endif @@ -208,7 +208,7 @@ private: // Disabled copy constructor and operator= #endif }; -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR inline void TQMainWindow::addToolBar( TQDockWindow *w, ToolBarDock dock, bool newLine ) { addDockWindow( w, dock, newLine ); @@ -251,11 +251,11 @@ inline void TQMainWindow::setToolBarsMovable( bool b ) } #endif -#ifndef QT_NO_TEXTSTREAM +#ifndef TQT_NO_TEXTSTREAM Q_EXPORT TQTextStream &operator<<( TQTextStream &, const TQMainWindow & ); Q_EXPORT TQTextStream &operator>>( TQTextStream &, TQMainWindow & ); #endif -#endif // QT_NO_MAINWINDOW +#endif // TQT_NO_MAINWINDOW #endif // TQMAINWINDOW_H diff --git a/src/widgets/ntqmenubar.h b/src/widgets/ntqmenubar.h index 87e316fe..03b7cc1d 100644 --- a/src/widgets/ntqmenubar.h +++ b/src/widgets/ntqmenubar.h @@ -47,7 +47,7 @@ #include "ntqmenudata.h" #endif // QT_H -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR class TQPopupMenu; @@ -116,7 +116,7 @@ protected: private slots: void subActivated( int itemId ); void subHighlighted( int itemId ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL void accelActivated( int itemId ); void accelDestroyed(); #endif @@ -142,7 +142,7 @@ private: int calculateRects( int max_width = -1 ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL void setupAccelerators(); TQAccel *autoaccel; #endif @@ -200,6 +200,6 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_MENUBAR +#endif // TQT_NO_MENUBAR #endif // TQMENUBAR_H diff --git a/src/widgets/ntqmenudata.h b/src/widgets/ntqmenudata.h index c7afc95e..620c0daf 100644 --- a/src/widgets/ntqmenudata.h +++ b/src/widgets/ntqmenudata.h @@ -50,7 +50,7 @@ #include "ntqfont.h" #endif // QT_H -#ifndef QT_NO_MENUDATA +#ifndef TQT_NO_MENUDATA class TQPopupMenu; class TQMenuDataData; @@ -74,7 +74,7 @@ public: TQPopupMenu *popup() const { return popup_menu; } TQWidget *widget() const { return widget_item; } TQCustomMenuItem *custom() const; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQKeySequence key() const { return accel_key; } #endif TQSignal *signal() const { return signal_data; } @@ -99,7 +99,7 @@ public: void setPixmap( TQPixmap* pixmap ) { pixmap_data = pixmap; } void setPopup( TQPopupMenu* popup ) { popup_menu = popup; } void setWidget( TQWidget* widget ) { widget_item = widget; } -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL void setKey( TQKeySequence key ) { accel_key = key; } #endif void setSignal( TQSignal* signal ) { signal_data = signal; } @@ -112,7 +112,7 @@ private: TQPixmap *pixmap_data; // item pixmap TQPopupMenu *popup_menu; // item popup menu TQWidget *widget_item; // widget menu item -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQKeySequence accel_key; // accelerator key (state|ascii) #endif TQSignal *signal_data; // connection @@ -209,7 +209,7 @@ public: void removeItemAt( int index ); void clear(); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQKeySequence accel( int id ) const; void setAccel( const TQKeySequence& key, int id ); #endif @@ -295,6 +295,6 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_MENUDATA +#endif // TQT_NO_MENUDATA #endif // TQMENUDATA_H diff --git a/src/widgets/ntqmultilineedit.h b/src/widgets/ntqmultilineedit.h index ad073e37..a40e8df9 100644 --- a/src/widgets/ntqmultilineedit.h +++ b/src/widgets/ntqmultilineedit.h @@ -45,7 +45,7 @@ #include "ntqtextedit.h" #endif // QT_H -#ifndef QT_NO_MULTILINEEDIT +#ifndef TQT_NO_MULTILINEEDIT class TQMultiLineEditCommand; class TQValidator; @@ -136,6 +136,6 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_MULTILINEEDIT +#endif // TQT_NO_MULTILINEEDIT #endif // TQMULTILINED_H diff --git a/src/widgets/ntqpopupmenu.h b/src/widgets/ntqpopupmenu.h index a028d82f..6fb1e1b4 100644 --- a/src/widgets/ntqpopupmenu.h +++ b/src/widgets/ntqpopupmenu.h @@ -46,7 +46,7 @@ #include "ntqmenudata.h" #endif // QT_H -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU class TQPopupMenuPrivate; class Q_EXPORT TQPopupMenu : public TQFrame, public TQMenuData @@ -121,7 +121,7 @@ protected: private slots: void subActivated( int itemId ); void subHighlighted( int itemId ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL void accelActivated( int itemId ); void accelDestroyed(); #endif @@ -156,12 +156,12 @@ private: TQSize updateSize(bool force_recalc=FALSE, bool do_resize=TRUE); void updateRow( int row ); TQRect screenRect(const TQPoint& pos); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL void updateAccel( TQWidget * ); void enableAccel( bool ); #endif TQPopupMenuPrivate *d; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQAccel *autoaccel; #endif @@ -199,6 +199,6 @@ public: }; -#endif // QT_NO_POPUPMENU +#endif // TQT_NO_POPUPMENU #endif // TQPOPUPMENU_H diff --git a/src/widgets/ntqprogressbar.h b/src/widgets/ntqprogressbar.h index 4ca7b9e8..4515b098 100644 --- a/src/widgets/ntqprogressbar.h +++ b/src/widgets/ntqprogressbar.h @@ -45,7 +45,7 @@ #include "ntqframe.h" #endif // QT_H -#ifndef QT_NO_PROGRESSBAR +#ifndef TQT_NO_PROGRESSBAR class TQProgressBarPrivate; @@ -154,6 +154,6 @@ inline bool TQProgressBar::percentageVisible() const return percentage_visible; } -#endif // QT_NO_PROGRESSBAR +#endif // TQT_NO_PROGRESSBAR #endif // TQPROGRESSBAR_H diff --git a/src/widgets/ntqpushbutton.h b/src/widgets/ntqpushbutton.h index a0945782..fc52aac3 100644 --- a/src/widgets/ntqpushbutton.h +++ b/src/widgets/ntqpushbutton.h @@ -46,7 +46,7 @@ #include "ntqiconset.h" #endif // QT_H -#ifndef QT_NO_PUSHBUTTON +#ifndef TQT_NO_PUSHBUTTON class TQPushButtonPrivate; class TQPopupMenu; @@ -66,7 +66,7 @@ class Q_EXPORT TQPushButton : public TQButton public: TQPushButton( TQWidget *parent, const char* name=0 ); TQPushButton( const TQString &text, TQWidget *parent, const char* name=0 ); -#ifndef QT_NO_ICONSET +#ifndef TQT_NO_ICONSET TQPushButton( const TQIconSet& icon, const TQString &text, TQWidget *parent, const char* name=0 ); #endif ~TQPushButton(); @@ -97,11 +97,11 @@ public: } bool isMenuButton() const { return hasMenuArrow; } -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU void setPopup( TQPopupMenu* popup ); TQPopupMenu* popup() const; #endif -#ifndef QT_NO_ICONSET +#ifndef TQT_NO_ICONSET void setIconSet( const TQIconSet& ); TQIconSet* iconSet() const; #endif @@ -119,7 +119,7 @@ protected: void resizeEvent( TQResizeEvent * ); void updateMask(); private slots: -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU void popupPressed(); #endif private: @@ -144,6 +144,6 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_PUSHBUTTON +#endif // TQT_NO_PUSHBUTTON #endif // TQPUSHBUTTON_H diff --git a/src/widgets/ntqradiobutton.h b/src/widgets/ntqradiobutton.h index 3ff6d61e..b660eadb 100644 --- a/src/widgets/ntqradiobutton.h +++ b/src/widgets/ntqradiobutton.h @@ -45,7 +45,7 @@ #include "ntqbutton.h" #endif // QT_H -#ifndef QT_NO_RADIOBUTTON +#ifndef TQT_NO_RADIOBUTTON class Q_EXPORT TQRadioButton : public TQButton { @@ -86,6 +86,6 @@ private: // Disabled copy constructor and operator= inline bool TQRadioButton::isChecked() const { return isOn(); } -#endif // QT_NO_RADIOBUTTON +#endif // TQT_NO_RADIOBUTTON #endif // TQRADIOBUTTON_H diff --git a/src/widgets/ntqrangecontrol.h b/src/widgets/ntqrangecontrol.h index 7cc2cc3b..63f10166 100644 --- a/src/widgets/ntqrangecontrol.h +++ b/src/widgets/ntqrangecontrol.h @@ -46,7 +46,7 @@ #include "ntqframe.h" #endif // QT_H -#ifndef QT_NO_RANGECONTROL +#ifndef TQT_NO_RANGECONTROL class TQRangeControlPrivate; @@ -122,9 +122,9 @@ inline int TQRangeControl::pageStep() const { return page; } -#endif // QT_NO_RANGECONTROL +#endif // TQT_NO_RANGECONTROL -#ifndef QT_NO_SPINWIDGET +#ifndef TQT_NO_SPINWIDGET class TQSpinWidgetPrivate; class Q_EXPORT TQSpinWidget : public TQWidget @@ -165,7 +165,7 @@ protected: void resizeEvent( TQResizeEvent* ev ); void mouseReleaseEvent( TQMouseEvent *e ); void mouseMoveEvent( TQMouseEvent *e ); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void wheelEvent( TQWheelEvent * ); #endif void styleChange( TQStyle& ); @@ -189,6 +189,6 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_SPINWIDGET +#endif // TQT_NO_SPINWIDGET #endif // TQRANGECONTROL_H diff --git a/src/widgets/ntqscrollbar.h b/src/widgets/ntqscrollbar.h index aff49247..dffd0993 100644 --- a/src/widgets/ntqscrollbar.h +++ b/src/widgets/ntqscrollbar.h @@ -48,7 +48,7 @@ class TQTimer; #include "ntqrangecontrol.h" #endif // QT_H -#ifndef QT_NO_SCROLLBAR +#ifndef TQT_NO_SCROLLBAR class Q_EXPORT TQScrollBar : public TQWidget, public TQRangeControl { @@ -107,7 +107,7 @@ signals: void prevPage(); protected: -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void wheelEvent( TQWheelEvent * ); #endif void keyPressEvent( TQKeyEvent * ); @@ -192,6 +192,6 @@ inline void TQScrollBar::setSizePolicy( TQSizePolicy::SizeType hor, TQSizePolicy } -#endif // QT_NO_SCROLLBAR +#endif // TQT_NO_SCROLLBAR #endif // TQSCROLLBAR_H diff --git a/src/widgets/ntqscrollview.h b/src/widgets/ntqscrollview.h index 24a1322b..abad327e 100644 --- a/src/widgets/ntqscrollview.h +++ b/src/widgets/ntqscrollview.h @@ -45,7 +45,7 @@ #include "ntqscrollbar.h" #endif // QT_H -#ifndef QT_NO_SCROLLVIEW +#ifndef TQT_NO_SCROLLVIEW class TQScrollViewData; @@ -62,7 +62,7 @@ class Q_EXPORT TQScrollView : public TQFrame TQ_PROPERTY( int contentsHeight READ contentsHeight ) TQ_PROPERTY( int contentsX READ contentsX ) TQ_PROPERTY( int contentsY READ contentsY ) -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP TQ_PROPERTY( bool dragAutoScroll READ dragAutoScroll WRITE setDragAutoScroll ) #endif @@ -142,7 +142,7 @@ public: bool isHorizontalSliderPressed(); bool isVerticalSliderPressed(); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP virtual void setDragAutoScroll( bool b ); bool dragAutoScroll() const; #endif @@ -176,13 +176,13 @@ protected: virtual void contentsMouseReleaseEvent( TQMouseEvent* ); virtual void contentsMouseDoubleClickEvent( TQMouseEvent* ); virtual void contentsMouseMoveEvent( TQMouseEvent* ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP virtual void contentsDragEnterEvent( TQDragEnterEvent * ); virtual void contentsDragMoveEvent( TQDragMoveEvent * ); virtual void contentsDragLeaveEvent( TQDragLeaveEvent * ); virtual void contentsDropEvent( TQDropEvent * ); #endif -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT virtual void contentsWheelEvent( TQWheelEvent * ); #endif virtual void contentsContextMenuEvent( TQContextMenuEvent * ); @@ -194,13 +194,13 @@ protected: virtual void viewportMouseReleaseEvent( TQMouseEvent* ); virtual void viewportMouseDoubleClickEvent( TQMouseEvent* ); virtual void viewportMouseMoveEvent( TQMouseEvent* ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP virtual void viewportDragEnterEvent( TQDragEnterEvent * ); virtual void viewportDragMoveEvent( TQDragMoveEvent * ); virtual void viewportDragLeaveEvent( TQDragLeaveEvent * ); virtual void viewportDropEvent( TQDropEvent * ); #endif -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT virtual void viewportWheelEvent( TQWheelEvent * ); #endif virtual void viewportContextMenuEvent( TQContextMenuEvent * ); @@ -223,7 +223,7 @@ protected: void mouseReleaseEvent( TQMouseEvent * ); void mouseDoubleClickEvent( TQMouseEvent * ); void mouseMoveEvent( TQMouseEvent * ); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void wheelEvent( TQWheelEvent * ); #endif void contextMenuEvent( TQContextMenuEvent * ); @@ -246,7 +246,7 @@ private slots: void hbarIsReleased(); void vbarIsPressed(); void vbarIsReleased(); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void doDragAutoScroll(); void startDragAutoScroll(); void stopDragAutoScroll(); @@ -264,6 +264,6 @@ public: }; -#endif // QT_NO_SCROLLVIEW +#endif // TQT_NO_SCROLLVIEW #endif // TQSCROLLVIEW_H diff --git a/src/widgets/ntqslider.h b/src/widgets/ntqslider.h index f5417949..c5e922f9 100644 --- a/src/widgets/ntqslider.h +++ b/src/widgets/ntqslider.h @@ -46,7 +46,7 @@ #include "ntqrangecontrol.h" #endif // QT_H -#ifndef QT_NO_SLIDER +#ifndef TQT_NO_SLIDER struct TQSliderPrivate; @@ -128,7 +128,7 @@ protected: void mousePressEvent( TQMouseEvent * ); void mouseReleaseEvent( TQMouseEvent * ); void mouseMoveEvent( TQMouseEvent * ); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void wheelEvent( TQWheelEvent * ); #endif void focusInEvent( TQFocusEvent *e ); @@ -194,6 +194,6 @@ inline void TQSlider::setSizePolicy( TQSizePolicy::SizeType hor, TQSizePolicy::S TQWidget::setSizePolicy( hor, ver, hfw ); } -#endif // QT_NO_SLIDER +#endif // TQT_NO_SLIDER #endif // TQSLIDER_H diff --git a/src/widgets/ntqspinbox.h b/src/widgets/ntqspinbox.h index 11271bbc..0657b3b5 100644 --- a/src/widgets/ntqspinbox.h +++ b/src/widgets/ntqspinbox.h @@ -46,7 +46,7 @@ #include "ntqrangecontrol.h" #endif // QT_H -#ifndef QT_NO_SPINBOX +#ifndef TQT_NO_SPINBOX class TQLineEdit; class TQValidator; @@ -135,7 +135,7 @@ protected: bool eventFilter( TQObject* obj, TQEvent* ev ); void resizeEvent( TQResizeEvent* ev ); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void wheelEvent( TQWheelEvent * ); #endif void leaveEvent( TQEvent* ); @@ -167,6 +167,6 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_SPINBOX +#endif // TQT_NO_SPINBOX #endif // TQSPINBOX_H diff --git a/src/widgets/ntqsplashscreen.h b/src/widgets/ntqsplashscreen.h index a369ffc5..131ab1aa 100644 --- a/src/widgets/ntqsplashscreen.h +++ b/src/widgets/ntqsplashscreen.h @@ -44,7 +44,7 @@ #include "ntqwidget.h" #endif // QT_H -#ifndef QT_NO_SPLASHSCREEN +#ifndef TQT_NO_SPLASHSCREEN class TQSplashScreenPrivate; class Q_EXPORT TQSplashScreen : public TQWidget @@ -76,5 +76,5 @@ private: TQSplashScreenPrivate *d; }; -#endif //QT_NO_SPLASHSCREEN +#endif //TQT_NO_SPLASHSCREEN #endif diff --git a/src/widgets/ntqsplitter.h b/src/widgets/ntqsplitter.h index 138cdbfd..cc8c431c 100644 --- a/src/widgets/ntqsplitter.h +++ b/src/widgets/ntqsplitter.h @@ -46,7 +46,7 @@ #include "ntqvaluelist.h" #endif // QT_H -#ifndef QT_NO_SPLITTER +#ifndef TQT_NO_SPLITTER #define QT_QSPLITTER_DEFAULT 2 @@ -185,7 +185,7 @@ private: #endif }; -#ifndef QT_NO_TEXTSTREAM +#ifndef TQT_NO_TEXTSTREAM Q_EXPORT TQTextStream& operator<<( TQTextStream&, const TQSplitter& ); Q_EXPORT TQTextStream& operator>>( TQTextStream&, TQSplitter& ); #endif @@ -220,6 +220,6 @@ public: // private: TQSplitter *s; }; -#endif // QT_NO_SPLITTER +#endif // TQT_NO_SPLITTER #endif // TQSPLITTER_H diff --git a/src/widgets/ntqstatusbar.h b/src/widgets/ntqstatusbar.h index 894d1347..91fe500b 100644 --- a/src/widgets/ntqstatusbar.h +++ b/src/widgets/ntqstatusbar.h @@ -45,7 +45,7 @@ #include "ntqwidget.h" #endif // QT_H -#ifndef QT_NO_STATUSBAR +#ifndef TQT_NO_STATUSBAR class TQStatusBarPrivate; @@ -91,6 +91,6 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_STATUSBAR +#endif // TQT_NO_STATUSBAR #endif // TQSTATUSBAR_H diff --git a/src/widgets/ntqtabbar.h b/src/widgets/ntqtabbar.h index 1fd1b742..8aa5bb02 100644 --- a/src/widgets/ntqtabbar.h +++ b/src/widgets/ntqtabbar.h @@ -44,7 +44,7 @@ #include "ntqptrlist.h" #endif // QT_H -#ifndef QT_NO_TABBAR +#ifndef TQT_NO_TABBAR class TQTabBar; class TQIconSet; @@ -191,6 +191,6 @@ public: }; -#endif // QT_NO_TABBAR +#endif // TQT_NO_TABBAR #endif // TQTABBAR_H diff --git a/src/widgets/ntqtabwidget.h b/src/widgets/ntqtabwidget.h index 0a58cf6a..f60739bd 100644 --- a/src/widgets/ntqtabwidget.h +++ b/src/widgets/ntqtabwidget.h @@ -46,7 +46,7 @@ #include "ntqiconset.h" #endif // QT_H -#ifndef QT_NO_TABWIDGET +#ifndef TQT_NO_TABWIDGET class TQTabBar; class TQTabWidgetData; @@ -157,6 +157,6 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_TABWIDGET +#endif // TQT_NO_TABWIDGET #endif // TQTABWIDGET_H diff --git a/src/widgets/ntqtextbrowser.h b/src/widgets/ntqtextbrowser.h index 834f7241..c852fa3a 100644 --- a/src/widgets/ntqtextbrowser.h +++ b/src/widgets/ntqtextbrowser.h @@ -48,7 +48,7 @@ #include "ntqtextedit.h" #endif // QT_H -#ifndef QT_NO_TEXTBROWSER +#ifndef TQT_NO_TEXTBROWSER class TQTextBrowserData; @@ -102,6 +102,6 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_TEXTBROWSER +#endif // TQT_NO_TEXTBROWSER #endif // TQTEXTBROWSER_H diff --git a/src/widgets/ntqtextedit.h b/src/widgets/ntqtextedit.h index a001dadc..6e9a3861 100644 --- a/src/widgets/ntqtextedit.h +++ b/src/widgets/ntqtextedit.h @@ -49,7 +49,7 @@ #include "ntqptrlist.h" #endif // QT_H -#ifndef QT_NO_TEXTEDIT +#ifndef TQT_NO_TEXTEDIT // uncomment below to enable optimization mode - also uncomment the // optimDoAutoScroll() private slot since moc ignores #ifdefs.. #define QT_TEXTEDIT_OPTIMIZATION @@ -247,7 +247,7 @@ public: int paragraphLength( int para ) const; TQStyleSheet* styleSheet() const; -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME TQMimeSourceFactory* mimeSourceFactory() const; #endif TQBrush paper() const; @@ -310,7 +310,7 @@ public: public slots: void setEnabled( bool ); -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME virtual void setMimeSourceFactory( TQMimeSourceFactory* factory ); #endif virtual void setStyleSheet( TQStyleSheet* styleSheet ); @@ -344,7 +344,7 @@ public slots: virtual void redo(); virtual void cut(); virtual void paste(); -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD virtual void pasteSubType( const TQCString &subtype ); #endif virtual void clear(); @@ -431,13 +431,13 @@ protected: void contentsMouseMoveEvent( TQMouseEvent *e ); void contentsMouseReleaseEvent( TQMouseEvent *e ); void contentsMouseDoubleClickEvent( TQMouseEvent *e ); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void contentsWheelEvent( TQWheelEvent *e ); #endif void imStartEvent( TQIMEvent * ); void imComposeEvent( TQIMEvent * ); void imEndEvent( TQIMEvent * ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void contentsDragEnterEvent( TQDragEnterEvent *e ); void contentsDragMoveEvent( TQDragMoveEvent *e ); void contentsDragLeaveEvent( TQDragLeaveEvent *e ); @@ -505,11 +505,11 @@ private: void makeParagVisible( TQTextParagraph *p ); void normalCopy(); void copyToClipboard(); -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME TQCString pickSpecial(TQMimeSource* ms, bool always_ask, const TQPoint&); TQTextDrag *dragObject( TQWidget *parent = 0 ) const; #endif -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD void pasteSpecial(const TQPoint&); #endif void setFontInternal( const TQFont &f ); @@ -557,7 +557,7 @@ private slots: #endif // QT_TEXTEDIT_OPTIMIZATION private: -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD void pasteSubType( const TQCString &subtype, TQMimeSource *m ); #endif @@ -612,5 +612,5 @@ inline void TQTextEdit::setCurrentFont( const TQFont &f ) TQTextEdit::setFontInternal( f ); } -#endif //QT_NO_TEXTEDIT +#endif //TQT_NO_TEXTEDIT #endif //TQTEXTVIEW_H diff --git a/src/widgets/ntqtextview.h b/src/widgets/ntqtextview.h index 342ed0db..4d243181 100644 --- a/src/widgets/ntqtextview.h +++ b/src/widgets/ntqtextview.h @@ -45,7 +45,7 @@ #include "ntqtextedit.h" #endif // QT_H -#ifndef QT_NO_TEXTVIEW +#ifndef TQT_NO_TEXTVIEW class Q_EXPORT TQTextView : public TQTextEdit { @@ -70,5 +70,5 @@ private: #endif }; -#endif //QT_NO_TEXTVIEW +#endif //TQT_NO_TEXTVIEW #endif //TQTEXTVIEW_H diff --git a/src/widgets/ntqtoolbar.h b/src/widgets/ntqtoolbar.h index 2036cc71..87163aef 100644 --- a/src/widgets/ntqtoolbar.h +++ b/src/widgets/ntqtoolbar.h @@ -45,7 +45,7 @@ #include "ntqdockwindow.h" #endif // QT_H -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR class TQMainWindow; class TQButton; @@ -112,6 +112,6 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_TOOLBAR +#endif // TQT_NO_TOOLBAR #endif // TQTOOLBAR_H diff --git a/src/widgets/ntqtoolbox.h b/src/widgets/ntqtoolbox.h index acd200cc..5b0030b2 100644 --- a/src/widgets/ntqtoolbox.h +++ b/src/widgets/ntqtoolbox.h @@ -46,7 +46,7 @@ #include <ntqiconset.h> #endif // QT_H -#ifndef QT_NO_TOOLBOX +#ifndef TQT_NO_TOOLBOX class TQToolBoxPrivate; class TQWidgetList; @@ -122,5 +122,5 @@ inline int TQToolBox::addItem( TQWidget *item, const TQIconSet &iconSet, inline int TQToolBox::insertItem( int index, TQWidget *item, const TQString &label ) { return insertItem( index, item, TQIconSet(), label ); } -#endif // QT_NO_TOOLBOX +#endif // TQT_NO_TOOLBOX #endif diff --git a/src/widgets/ntqtoolbutton.h b/src/widgets/ntqtoolbutton.h index 45733ea1..84909de5 100644 --- a/src/widgets/ntqtoolbutton.h +++ b/src/widgets/ntqtoolbutton.h @@ -48,7 +48,7 @@ #include "ntqiconset.h" #endif // QT_H -#ifndef QT_NO_TOOLBUTTON +#ifndef TQT_NO_TOOLBUTTON class TQToolButtonPrivate; class TQToolBar; @@ -82,7 +82,7 @@ public: Under = BelowIcon // obsolete }; TQToolButton( TQWidget * parent, const char* name=0 ); -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR TQToolButton( const TQIconSet& s, const TQString &textLabel, const TQString& grouptext, TQObject * receiver, const char* slot, @@ -109,7 +109,7 @@ public: bool usesTextLabel() const { return utl; } TQString textLabel() const { return tl; } -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU void setPopup( TQPopupMenu* popup ); TQPopupMenu* popup() const; @@ -155,7 +155,7 @@ protected: bool eventFilter( TQObject *o, TQEvent *e ); -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE void paletteChange( const TQPalette & ); #endif @@ -187,6 +187,6 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_TOOLBUTTON +#endif // TQT_NO_TOOLBUTTON #endif // TQTOOLBUTTON_H diff --git a/src/widgets/ntqtooltip.h b/src/widgets/ntqtooltip.h index 873634df..2bd4af52 100644 --- a/src/widgets/ntqtooltip.h +++ b/src/widgets/ntqtooltip.h @@ -43,7 +43,7 @@ #include "ntqwidget.h" #endif // QT_H -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP #if __GNUC__ - 0 > 3 #pragma GCC system_header @@ -145,6 +145,6 @@ private: }; -#endif // QT_NO_TOOLTIP +#endif // TQT_NO_TOOLTIP #endif // TQTOOLTIP_H diff --git a/src/widgets/ntqvalidator.h b/src/widgets/ntqvalidator.h index ade5fd7b..a66f99a6 100644 --- a/src/widgets/ntqvalidator.h +++ b/src/widgets/ntqvalidator.h @@ -47,7 +47,7 @@ #include "ntqregexp.h" // TQString->TQRegExp conversion #endif // QT_H -#ifndef QT_NO_VALIDATOR +#ifndef TQT_NO_VALIDATOR class Q_EXPORT TQValidator : public TQObject @@ -100,7 +100,7 @@ private: int b, t; }; -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP class Q_EXPORT TQDoubleValidator : public TQValidator { @@ -161,9 +161,9 @@ private: TQRegExp r; }; -#endif // QT_NO_REGEXP +#endif // TQT_NO_REGEXP -#endif // QT_NO_VALIDATOR +#endif // TQT_NO_VALIDATOR #endif // TQVALIDATOR_H diff --git a/src/widgets/ntqvbox.h b/src/widgets/ntqvbox.h index f5def613..8328ebd7 100644 --- a/src/widgets/ntqvbox.h +++ b/src/widgets/ntqvbox.h @@ -45,7 +45,7 @@ #include "ntqhbox.h" #endif // QT_H -#ifndef QT_NO_VBOX +#ifndef TQT_NO_VBOX class Q_EXPORT TQVBox : public TQHBox { @@ -60,6 +60,6 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_VBOX +#endif // TQT_NO_VBOX #endif // TQVBOX_H diff --git a/src/widgets/ntqvbuttongroup.h b/src/widgets/ntqvbuttongroup.h index 332e555f..cfccba70 100644 --- a/src/widgets/ntqvbuttongroup.h +++ b/src/widgets/ntqvbuttongroup.h @@ -45,7 +45,7 @@ #include "ntqbuttongroup.h" #endif // QT_H -#ifndef QT_NO_VBUTTONGROUP +#ifndef TQT_NO_VBUTTONGROUP class Q_EXPORT TQVButtonGroup : public TQButtonGroup { @@ -64,6 +64,6 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_VBUTTONGROUP +#endif // TQT_NO_VBUTTONGROUP #endif // TQVBUTTONGROUP_H diff --git a/src/widgets/ntqvgroupbox.h b/src/widgets/ntqvgroupbox.h index afa8ae09..27cb9216 100644 --- a/src/widgets/ntqvgroupbox.h +++ b/src/widgets/ntqvgroupbox.h @@ -45,7 +45,7 @@ #include "ntqgroupbox.h" #endif // QT_H -#ifndef QT_NO_VGROUPBOX +#ifndef TQT_NO_VGROUPBOX class Q_EXPORT TQVGroupBox : public TQGroupBox { @@ -63,6 +63,6 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_VGROUPBOX +#endif // TQT_NO_VGROUPBOX #endif // TQVGROUPBOX_H diff --git a/src/widgets/ntqwhatsthis.h b/src/widgets/ntqwhatsthis.h index e4cda6c1..22ecafa7 100644 --- a/src/widgets/ntqwhatsthis.h +++ b/src/widgets/ntqwhatsthis.h @@ -43,7 +43,7 @@ #include "ntqobject.h" #endif // QT_H -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS #include "ntqcursor.h" @@ -76,6 +76,6 @@ public: static void display( const TQString& text, const TQPoint& pos = TQCursor::pos(), TQWidget* w = 0 ); }; -#endif // QT_NO_WHATSTHIS +#endif // TQT_NO_WHATSTHIS #endif // TQWHATSTHIS_H diff --git a/src/widgets/ntqwidgetplugin.h b/src/widgets/ntqwidgetplugin.h index 6769ada7..51cf6cd1 100644 --- a/src/widgets/ntqwidgetplugin.h +++ b/src/widgets/ntqwidgetplugin.h @@ -46,7 +46,7 @@ #include "ntqstringlist.h" #include "ntqiconset.h" #endif // QT_H -#ifndef QT_NO_WIDGETPLUGIN +#ifndef TQT_NO_WIDGETPLUGIN #ifdef Q_WS_WIN #ifdef QT_PLUGIN @@ -116,5 +116,5 @@ public: }; #endif // QT_CONTAINER_CUSTOM_WIDGETS -#endif // QT_NO_WIDGETPLUGIN +#endif // TQT_NO_WIDGETPLUGIN #endif // TQWIDGETPLUGIN_H diff --git a/src/widgets/ntqwidgetstack.h b/src/widgets/ntqwidgetstack.h index 1362ca10..2844042d 100644 --- a/src/widgets/ntqwidgetstack.h +++ b/src/widgets/ntqwidgetstack.h @@ -47,7 +47,7 @@ #include "ntqptrdict.h" #endif // QT_H -#ifndef QT_NO_WIDGETSTACK +#ifndef TQT_NO_WIDGETSTACK class TQWidgetStackPrivate; @@ -107,6 +107,6 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_WIDGETSTACK +#endif // TQT_NO_WIDGETSTACK #endif // TQWIDGETSTACK_H diff --git a/src/widgets/qaction.cpp b/src/widgets/qaction.cpp index 242de2dd..62661018 100644 --- a/src/widgets/qaction.cpp +++ b/src/widgets/qaction.cpp @@ -38,7 +38,7 @@ #include "ntqaction.h" -#ifndef QT_NO_ACTION +#ifndef TQT_NO_ACTION #include "ntqtoolbar.h" #include "ntqptrlist.h" @@ -134,7 +134,7 @@ public: TQString tooltip; TQString statustip; TQString whatsthis; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQKeySequence key; TQAccel* accel; int accelid; @@ -145,7 +145,7 @@ public: uint on : 1; uint forceDisabled : 1; uint forceInvisible : 1; -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP TQToolTipGroup tipGroup; #endif TQActionGroupPrivate* d_group; @@ -178,19 +178,19 @@ public: TQActionPrivate::TQActionPrivate(TQAction *act) : iconset( 0 ), -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL key( 0 ), accel( 0 ), accelid( 0 ), #endif enabled( TRUE ), visible( TRUE ), toggleaction( FALSE ), on( FALSE ), forceDisabled( FALSE ), forceInvisible( FALSE ), -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP tipGroup( 0 ), #endif d_group( 0 ), action(act) { menuitems.setAutoDelete( TRUE ); comboitems.setAutoDelete( TRUE ); -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP tipGroup.setDelay( FALSE ); #endif } @@ -241,7 +241,7 @@ TQActionPrivate::~TQActionPrivate() delete siblings; } -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL delete accel; #endif delete iconset; @@ -275,7 +275,7 @@ void TQActionPrivate::update( uint upd ) for ( TQPtrListIterator<MenuItem> it( menuitems); it.current(); ++it ) { MenuItem* mi = it.current(); TQString t = menuText(); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL if ( key ) t += '\t' + TQAccel::keyToString( key ); #endif @@ -322,18 +322,18 @@ void TQActionPrivate::update( uint upd ) btn->setToggleButton( toggleaction ); if ( !text.isEmpty() ) btn->setTextLabel( text, FALSE ); -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP TQToolTip::remove( btn ); TQToolTip::add( btn, toolTip(), &tipGroup, statusTip() ); #endif -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS TQWhatsThis::remove( btn ); if ( !whatsthis.isEmpty() ) TQWhatsThis::add( btn, whatsthis ); #endif } } -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL if ( accel ) { accel->setEnabled( enabled && visible ); if ( !whatsthis.isEmpty() ) @@ -365,7 +365,7 @@ TQString TQActionPrivate::menuText() const TQString TQActionPrivate::toolTip() const { if ( tooltip.isNull() ) { -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL if ( accel ) return text + " (" + TQAccel::keyToString( accel->key( accelid )) + ")"; #endif @@ -431,7 +431,7 @@ TQAction::TQAction( TQObject* parent, const char* name, bool toggle ) } -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL /*! This constructor creates an action with the following properties: @@ -748,7 +748,7 @@ TQString TQAction::whatsThis() const } -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL /*! \property TQAction::accel \brief the action's accelerator key @@ -1008,7 +1008,7 @@ void TQAction::toolButtonToggled( bool on ) */ bool TQAction::addTo( TQWidget* w ) { -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR if ( ::tqt_cast<TQToolBar*>(w) ) { if ( !qstrcmp( name(), "qt_separator_action" ) ) { ((TQToolBar*)w)->addSeparator(); @@ -1024,7 +1024,7 @@ bool TQAction::addTo( TQWidget* w ) connect( btn, SIGNAL( clicked() ), this, SIGNAL( activated() ) ); connect( btn, SIGNAL( toggled(bool) ), this, SLOT( toolButtonToggled(bool) ) ); connect( btn, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) ); -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP connect( &(d->tipGroup), SIGNAL(showTip(const TQString&)), this, SLOT(showStatusText(const TQString&)) ); connect( &(d->tipGroup), SIGNAL(removeTip()), this, SLOT(clearStatusText()) ); #endif @@ -1104,7 +1104,7 @@ void TQAction::addedTo( int index, TQPopupMenu *menu ) */ void TQAction::showStatusText( const TQString& text ) { -#ifndef QT_NO_STATUSBAR +#ifndef TQT_NO_STATUSBAR // find out whether we are clearing the status bar by the popup that actually set the text static TQPopupMenu *lastmenu = 0; TQObject *s = (TQObject*)sender(); @@ -1188,7 +1188,7 @@ void TQAction::clearStatusText() */ bool TQAction::removeFrom( TQWidget* w ) { -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR if ( ::tqt_cast<TQToolBar*>(w) ) { TQPtrListIterator<TQToolButton> it( d->toolbuttons); TQToolButton* btn; @@ -1313,12 +1313,12 @@ void TQActionGroupPrivate::update( const TQActionGroup* that ) combobox->setEnabled( that->isEnabled() ); combobox->setShown( that->isVisible() ); -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP TQToolTip::remove( combobox ); if ( !!that->toolTip() ) TQToolTip::add( combobox, that->toolTip() ); #endif -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS TQWhatsThis::remove( combobox ); if ( !!that->whatsThis() ) TQWhatsThis::add( combobox, that->whatsThis() ); @@ -1335,12 +1335,12 @@ void TQActionGroupPrivate::update( const TQActionGroup* that ) if ( !that->iconSet().isNull() ) button->setIconSet( that->iconSet() ); -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP TQToolTip::remove( mb.current() ); if ( !!that->toolTip() ) TQToolTip::add( button, that->toolTip() ); #endif -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS TQWhatsThis::remove( button ); if ( !!that->whatsThis() ) TQWhatsThis::add( button, that->whatsThis() ); @@ -1370,7 +1370,7 @@ void TQActionGroupPrivate::update( const TQActionGroup* that ) else parent->changeItem( id, that->menuText() ); parent->setItemEnabled( id, that->isEnabled() ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL parent->setAccel( that->accel(), id ); #endif } @@ -1654,7 +1654,7 @@ void TQActionGroup::addSeparator() */ bool TQActionGroup::addTo( TQWidget* w ) { -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR if ( ::tqt_cast<TQToolBar*>(w) ) { if ( d->dropdown ) { if ( !d->exclusive ) { @@ -1677,13 +1677,13 @@ bool TQActionGroup::addTo( TQWidget* w ) btn->setTextLabel( text() ); else if ( !!defAction->text() ) btn->setTextLabel( defAction->text() ); -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP if ( !!toolTip() ) TQToolTip::add( btn, toolTip() ); else if ( !!defAction->toolTip() ) TQToolTip::add( btn, defAction->toolTip() ); #endif -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS if ( !!whatsThis() ) TQWhatsThis::add( btn, whatsThis() ); else if ( !!defAction->whatsThis() ) @@ -1709,11 +1709,11 @@ bool TQActionGroup::addTo( TQWidget* w ) addedTo( box, w ); connect( box, SIGNAL(destroyed()), SLOT(objectDestroyed()) ); d->comboboxes.append( box ); -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP if ( !!toolTip() ) TQToolTip::add( box, toolTip() ); #endif -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS if ( !!whatsThis() ) TQWhatsThis::add( box, whatsThis() ); #endif @@ -1791,7 +1791,7 @@ bool TQActionGroup::removeFrom( TQWidget* w ) it.current()->removeFrom( w ); } -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR if ( ::tqt_cast<TQToolBar*>(w) ) { TQPtrListIterator<TQComboBox> cb( d->comboboxes ); while( cb.current() ) { diff --git a/src/widgets/qbutton.cpp b/src/widgets/qbutton.cpp index eb2a196a..e5d172f3 100644 --- a/src/widgets/qbutton.cpp +++ b/src/widgets/qbutton.cpp @@ -40,7 +40,7 @@ #undef TQT_NO_COMPAT #include "ntqbutton.h" -#ifndef QT_NO_BUTTON +#ifndef TQT_NO_BUTTON #include "ntqbuttongroup.h" #include "ntqbitmap.h" #include "ntqpainter.h" @@ -64,18 +64,18 @@ class TQButtonData { public: TQButtonData() { -#ifndef QT_NO_BUTTONGROUP +#ifndef TQT_NO_BUTTONGROUP group = 0; #endif -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL a = 0; #endif } -#ifndef QT_NO_BUTTONGROUP +#ifndef TQT_NO_BUTTONGROUP TQButtonGroup *group; #endif TQTimer timer; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQAccel *a; #endif }; @@ -102,7 +102,7 @@ void TQButton::ensureData() TQButtonGroup *TQButton::group() const { -#ifndef QT_NO_BUTTONGROUP +#ifndef TQT_NO_BUTTONGROUP return d ? d->group : 0; #else return 0; @@ -112,7 +112,7 @@ TQButtonGroup *TQButton::group() const void TQButton::setGroup( TQButtonGroup* g ) { -#ifndef QT_NO_BUTTONGROUP +#ifndef TQT_NO_BUTTONGROUP ensureData(); d->group = g; #endif @@ -390,7 +390,7 @@ TQButton::TQButton( TQWidget *parent, const char *name, WFlags f ) animation = FALSE; // no pending animateClick repeat = FALSE; // not in autorepeat mode d = 0; -#ifndef QT_NO_BUTTONGROUP +#ifndef TQT_NO_BUTTONGROUP if ( ::tqt_cast<TQButtonGroup*>(parent) ) { setGroup((TQButtonGroup*)parent); group()->insert( this ); // insert into button group @@ -404,7 +404,7 @@ TQButton::TQButton( TQWidget *parent, const char *name, WFlags f ) */ TQButton::~TQButton() { -#ifndef QT_NO_BUTTONGROUP +#ifndef TQT_NO_BUTTONGROUP if ( group() ) group()->remove( this ); #endif @@ -477,7 +477,7 @@ void TQButton::setText( const TQString &text ) if ( btext == text ) return; btext = text; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL setAccel( TQAccel::shortcutKey( text ) ); #endif @@ -516,7 +516,7 @@ void TQButton::setPixmap( const TQPixmap &pixmap ) bpixmap->setMask( *((TQBitmap *)bpixmap) ); if ( !btext.isNull() ) { btext = TQString::null; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL setAccel( TQKeySequence() ); #endif } @@ -530,7 +530,7 @@ void TQButton::setPixmap( const TQPixmap &pixmap ) } -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQKeySequence TQButton::accel() const { if ( d && d->a ) @@ -704,7 +704,7 @@ void TQButton::keyPressEvent( TQKeyEvent *e ) case Key_Enter: case Key_Return: { -#ifndef QT_NO_PUSHBUTTON +#ifndef TQT_NO_PUSHBUTTON TQPushButton *pb = (TQPushButton*)tqt_cast( "TQPushButton" ); if ( pb && ( pb->autoDefault() || pb->isDefault() ) ) emit clicked(); @@ -716,7 +716,7 @@ void TQButton::keyPressEvent( TQKeyEvent *e ) case Key_Space: if ( !e->isAutoRepeat() ) { setDown( TRUE ); -#ifndef QT_NO_PUSHBUTTON +#ifndef TQT_NO_PUSHBUTTON if ( ::tqt_cast<TQPushButton*>(this) ) emit pressed(); else @@ -726,7 +726,7 @@ void TQButton::keyPressEvent( TQKeyEvent *e ) break; case Key_Up: case Key_Left: -#ifndef QT_NO_BUTTONGROUP +#ifndef TQT_NO_BUTTONGROUP if ( group() ) { group()->moveFocus( e->key() ); } else @@ -739,7 +739,7 @@ void TQButton::keyPressEvent( TQKeyEvent *e ) break; case Key_Right: case Key_Down: -#ifndef QT_NO_BUTTONGROUP +#ifndef TQT_NO_BUTTONGROUP if ( group() ) { group()->moveFocus( e->key() ); } else @@ -996,7 +996,7 @@ void TQButton::setToggleType( ToggleType type ) bool TQButton::isExclusiveToggle() const { -#ifndef QT_NO_BUTTONGROUP +#ifndef TQT_NO_BUTTONGROUP return group() && ( group()->isExclusive() || ( group()->isRadioButtonExclusive() && ::tqt_cast<TQRadioButton*>(this) ) ); diff --git a/src/widgets/qbuttongroup.cpp b/src/widgets/qbuttongroup.cpp index 595bd883..9ffb5f19 100644 --- a/src/widgets/qbuttongroup.cpp +++ b/src/widgets/qbuttongroup.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqbuttongroup.h" -#ifndef QT_NO_BUTTONGROUP +#ifndef TQT_NO_BUTTONGROUP #include "ntqbutton.h" #include "ntqptrlist.h" #include "ntqapplication.h" diff --git a/src/widgets/qcheckbox.cpp b/src/widgets/qcheckbox.cpp index 8a2ffd4e..0d6fdfa4 100644 --- a/src/widgets/qcheckbox.cpp +++ b/src/widgets/qcheckbox.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqcheckbox.h" -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX #include "ntqpainter.h" #include "ntqdrawutil.h" #include "ntqpixmap.h" @@ -193,7 +193,7 @@ void TQCheckBox::drawButton( TQPainter *paint ) TQRect irect = TQStyle::visualRect( style().subRect(TQStyle::SR_CheckBoxIndicator, this), this ); const TQColorGroup &cg = colorGroup(); -#if !defined( QT_NO_TEXTSTREAM ) && !defined( Q_WS_MACX ) +#if !defined( TQT_NO_TEXTSTREAM ) && !defined( Q_WS_MACX ) # define SAVE_CHECKBOX_PIXMAPS #endif #if defined(SAVE_CHECKBOX_PIXMAPS) diff --git a/src/widgets/qcombobox.cpp b/src/widgets/qcombobox.cpp index 59f23b50..db1c4b49 100644 --- a/src/widgets/qcombobox.cpp +++ b/src/widgets/qcombobox.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqcombobox.h" -#ifndef QT_NO_COMBOBOX +#ifndef TQT_NO_COMBOBOX #include "ntqpopupmenu.h" #include "ntqlistbox.h" #include "ntqpainter.h" @@ -1503,7 +1503,7 @@ void TQComboBox::focusOutEvent( TQFocusEvent * e ) /*!\reimp */ -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void TQComboBox::wheelEvent( TQWheelEvent *e ) { if ( d->poppedUp ) { @@ -1641,7 +1641,7 @@ void TQComboBox::popup() lb->blockSignals( block ); lb->setVScrollBarMode(TQScrollView::Auto); -#ifndef QT_NO_EFFECTS +#ifndef TQT_NO_EFFECTS if ( TQApplication::isEffectEnabled( UI_AnimateCombo ) ) { if ( lb->y() < mapToGlobal(TQPoint(0,0)).y() ) qScrollEffect( lb, TQEffects::UpScroll ); @@ -2335,4 +2335,4 @@ void TQComboBox::hide() d->popup()->hide(); } -#endif // QT_NO_COMBOBOX +#endif // TQT_NO_COMBOBOX diff --git a/src/widgets/qdatetimeedit.cpp b/src/widgets/qdatetimeedit.cpp index ccee2adc..a4e892f7 100644 --- a/src/widgets/qdatetimeedit.cpp +++ b/src/widgets/qdatetimeedit.cpp @@ -40,7 +40,7 @@ #include "ntqdatetimeedit.h" -#ifndef QT_NO_DATETIMEEDIT +#ifndef TQT_NO_DATETIMEEDIT #include "../kernel/qinternal_p.h" #include "../kernel/qrichtext_p.h" @@ -434,7 +434,7 @@ public: } protected: -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void wheelEvent( TQWheelEvent *e ) { TQDateTimeEditor *editor = (TQDateTimeEditor*)editWidget()->tqt_cast( "TQDateTimeEditor" ); diff --git a/src/widgets/qdial.cpp b/src/widgets/qdial.cpp index 683a634f..36fdbb9d 100644 --- a/src/widgets/qdial.cpp +++ b/src/widgets/qdial.cpp @@ -40,7 +40,7 @@ #include "ntqdial.h" -#ifndef QT_NO_DIAL +#ifndef TQT_NO_DIAL #include "ntqpainter.h" #include "ntqpointarray.h" @@ -467,7 +467,7 @@ void TQDial::mouseMoveEvent( TQMouseEvent * e ) /*! \reimp */ -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void TQDial::wheelEvent( TQWheelEvent *e ) { setValue( value() - e->delta() / 120 ); diff --git a/src/widgets/qdialogbuttons.cpp b/src/widgets/qdialogbuttons.cpp index 4153fb59..c248d2e0 100644 --- a/src/widgets/qdialogbuttons.cpp +++ b/src/widgets/qdialogbuttons.cpp @@ -37,16 +37,16 @@ **********************************************************************/ #include "qdialogbuttons_p.h" -#ifndef QT_NO_DIALOGBUTTONS +#ifndef TQT_NO_DIALOGBUTTONS #include <ntqapplication.h> #include <ntqpushbutton.h> #include <ntqguardedptr.h> #include <ntqmap.h> #include <ntqvariant.h> -#ifndef QT_NO_DIALOG +#ifndef TQT_NO_DIALOG #include <ntqdialog.h> -#endif // QT_NO_DIALOG +#endif // TQT_NO_DIALOG #include <ntqlayout.h> #include <ntqstyle.h> #include <ntqmap.h> @@ -62,7 +62,7 @@ struct TQDialogButtonsPrivate bool questionMode; }; -#ifndef QT_NO_DIALOG +#ifndef TQT_NO_DIALOG TQDialogButtons::TQDialogButtons(TQDialog *parent, bool autoConnect, TQ_UINT32 buttons, Orientation orient, const char *name ) : TQWidget(parent, name) { @@ -72,7 +72,7 @@ TQDialogButtons::TQDialogButtons(TQDialog *parent, bool autoConnect, TQ_UINT32 b TQObject::connect(this, SIGNAL(rejectClicked()), parent, SLOT(reject())); } } -#endif // QT_NO_DIALOG +#endif // TQT_NO_DIALOG TQDialogButtons::TQDialogButtons(TQWidget *parent, TQ_UINT32 buttons, Orientation orient, const char *name ) : TQWidget(parent, name) @@ -183,12 +183,12 @@ TQDialogButtons::setDefaultButton(Button button) return; } if(d->def != button) { -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES if(d->buttons.contains(d->def)) d->buttons[d->def]->setProperty("default", TQVariant(FALSE,0)); #endif d->def = button; -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES if(d->buttons.contains(d->def)) d->buttons[d->def]->setProperty("default", TQVariant(FALSE,0)); #endif @@ -205,7 +205,7 @@ void TQDialogButtons::setButtonText(Button button, const TQString &str) { d->text[button] = str; -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES if(d->buttons.contains(button)) d->buttons[button]->setProperty("text", TQVariant(str)); #endif @@ -412,7 +412,7 @@ TQDialogButtons::layoutButtons() if(w) { if(b == d->def) { w->setFocus(); -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES w->setProperty("default", TQVariant(TRUE,0)); #endif } diff --git a/src/widgets/qdialogbuttons_p.h b/src/widgets/qdialogbuttons_p.h index 85507ec1..90e645b8 100644 --- a/src/widgets/qdialogbuttons_p.h +++ b/src/widgets/qdialogbuttons_p.h @@ -45,7 +45,7 @@ #endif // QT_H #endif -#ifndef QT_NO_DIALOGBUTTONS +#ifndef TQT_NO_DIALOGBUTTONS struct TQDialogButtonsPrivate; class @@ -54,10 +54,10 @@ TQDialogButtons : public TQWidget TQ_OBJECT public: enum Button { None=0, Accept=0x01, Reject=0x02, Help=0x04, Apply=0x08, All=0x10, Abort=0x20, Retry=0x40, Ignore=0x80 }; -#ifndef QT_NO_DIALOG +#ifndef TQT_NO_DIALOG TQDialogButtons(TQDialog *parent, bool autoConnect = TRUE, TQ_UINT32 buttons = Accept | Reject, Orientation orient = Horizontal, const char *name = NULL); -#endif // QT_NO_DIALOG +#endif // TQT_NO_DIALOG TQDialogButtons(TQWidget *parent, TQ_UINT32 buttons = Accept | Reject, Orientation orient = Horizontal, const char *name = NULL); ~TQDialogButtons(); @@ -115,5 +115,5 @@ private: TQDialogButtonsPrivate *d; void init(TQ_UINT32, Orientation); }; -#endif //QT_NO_DIALOGBUTTONS +#endif //TQT_NO_DIALOGBUTTONS #endif //TQDIALOGBUTTONS_P_H diff --git a/src/widgets/qdockarea.cpp b/src/widgets/qdockarea.cpp index e0764a32..233279ab 100644 --- a/src/widgets/qdockarea.cpp +++ b/src/widgets/qdockarea.cpp @@ -40,7 +40,7 @@ #include "ntqdockarea.h" -#ifndef QT_NO_MAINWINDOW +#ifndef TQT_NO_MAINWINDOW #include "ntqsplitter.h" #include "ntqlayout.h" #include "ntqptrvector.h" @@ -1221,7 +1221,7 @@ bool TQDockArea::isLastDockWindow( TQDockWindow *dw ) return FALSE; } -#ifndef QT_NO_TEXTSTREAM +#ifndef TQT_NO_TEXTSTREAM /*! \relates TQDockArea @@ -1319,4 +1319,4 @@ TQTextStream &operator>>( TQTextStream &ts, TQDockArea &dockArea ) } #endif -#endif //QT_NO_MAINWINDOW +#endif //TQT_NO_MAINWINDOW diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp index d4cd0b12..76900503 100644 --- a/src/widgets/qdockwindow.cpp +++ b/src/widgets/qdockwindow.cpp @@ -40,7 +40,7 @@ #include "ntqdockwindow.h" -#ifndef QT_NO_MAINWINDOW +#ifndef TQT_NO_MAINWINDOW #include "ntqdesktopwidget.h" #include "ntqdockarea.h" #include "qwidgetresizehandler_p.h" @@ -119,12 +119,12 @@ void TQDockWindowResizeHandle::setOrientation( TQt::Orientation o ) { orient = o; if ( o == TQDockArea::Horizontal ) { -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR setCursor( splitVCursor ); #endif setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); } else { -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR setCursor( splitHCursor ); #endif setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding ) ); @@ -336,7 +336,7 @@ protected: void mouseDoubleClickEvent( TQMouseEvent *e ); void keyPressEvent( TQKeyEvent *e ); void keyReleaseEvent( TQKeyEvent *e ); -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE void styleChange( TQStyle& ); #endif @@ -507,7 +507,7 @@ void TQDockWindowHandle::updateGui() { if ( !closeButton ) { closeButton = new TQToolButton( this, "qt_close_button1" ); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR closeButton->setCursor( arrowCursor ); #endif closeButton->setPixmap( style().stylePixmap( TQStyle::SP_DockWindowCloseButton, closeButton ) ); @@ -534,7 +534,7 @@ void TQDockWindowHandle::updateGui() } } -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE void TQDockWindowHandle::styleChange( TQStyle& ) { if ( closeButton ) @@ -2012,10 +2012,10 @@ void TQDockWindow::setCaption( const TQString &s ) titleBar->setCaption( s ); verHandle->update(); horHandle->update(); -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA TQFrame::setCaption( s ); #endif -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP TQToolTip::remove( horHandle ); TQToolTip::remove( verHandle ); if ( !s.isEmpty() ) { @@ -2098,7 +2098,7 @@ bool TQDockWindow::event( TQEvent *e ) return TQFrame::event( e ); } -#ifdef QT_NO_WIDGET_TOPEXTRA +#ifdef TQT_NO_WIDGET_TOPEXTRA TQString TQDockWindow::caption() const { return titleBar->caption(); @@ -2120,4 +2120,4 @@ void TQDockWindow::contextMenuEvent( TQContextMenuEvent *e ) #include "qdockwindow.moc" -#endif //QT_NO_MAINWINDOW +#endif //TQT_NO_MAINWINDOW diff --git a/src/widgets/qeffects.cpp b/src/widgets/qeffects.cpp index d431f21b..40170dbe 100644 --- a/src/widgets/qeffects.cpp +++ b/src/widgets/qeffects.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqapplication.h" -#ifndef QT_NO_EFFECTS +#ifndef TQT_NO_EFFECTS #include "ntqwidget.h" #include "qeffects_p.h" #include "ntqpixmap.h" @@ -191,7 +191,7 @@ bool TQAlphaWidget::eventFilter( TQObject* o, TQEvent* e ) if ( o != widget ) break; case TQEvent::MouseButtonPress: -#ifndef QT_NO_SCROLLVIEW +#ifndef TQT_NO_SCROLLVIEW if ( ::tqt_cast<TQScrollView*>(o) ) break; #endif @@ -443,7 +443,7 @@ bool TQRollEffect::eventFilter( TQObject* o, TQEvent* e ) scroll(); break; case TQEvent::MouseButtonPress: -#ifndef QT_NO_SCROLLVIEW +#ifndef TQT_NO_SCROLLVIEW if ( ::tqt_cast<TQScrollView*>(o) ) break; #endif @@ -672,4 +672,4 @@ void qFadeEffect( TQWidget* w, int time ) q_blend->run( time ); } -#endif //QT_NO_EFFECTS +#endif //TQT_NO_EFFECTS diff --git a/src/widgets/qeffects_p.h b/src/widgets/qeffects_p.h index aecfe423..918dca0b 100644 --- a/src/widgets/qeffects_p.h +++ b/src/widgets/qeffects_p.h @@ -59,7 +59,7 @@ #include "ntqnamespace.h" #endif // QT_H -#ifndef QT_NO_EFFECTS +#ifndef TQT_NO_EFFECTS class TQWidget; struct TQEffects @@ -76,6 +76,6 @@ struct TQEffects extern void Q_EXPORT qScrollEffect( TQWidget*, TQEffects::DirFlags dir = TQEffects::DownScroll, int time = -1 ); extern void Q_EXPORT qFadeEffect( TQWidget*, int time = -1 ); -#endif // QT_NO_EFFECTS +#endif // TQT_NO_EFFECTS #endif // TQEFFECTS_P_H diff --git a/src/widgets/qframe.cpp b/src/widgets/qframe.cpp index 2af74737..e5ccda02 100644 --- a/src/widgets/qframe.cpp +++ b/src/widgets/qframe.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqframe.h" -#ifndef QT_NO_FRAME +#ifndef TQT_NO_FRAME #include "ntqpainter.h" #include "ntqdrawutil.h" #include "ntqframe.h" @@ -568,13 +568,13 @@ void TQFrame::drawFrame( TQPainter *p ) TQRect r = frameRect(); int type = fstyle & MShape; int cstyle = fstyle & MShadow; -#ifdef QT_NO_DRAWUTIL +#ifdef TQT_NO_DRAWUTIL p->setPen( black ); // #### p->drawRect( r ); //### a bit too simple #else const TQColorGroup & g = colorGroup(); -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE TQStyleOption opt(lineWidth(),midLineWidth()); TQStyle::SFlags flags = TQStyle::Style_Default; @@ -588,7 +588,7 @@ void TQFrame::drawFrame( TQPainter *p ) flags |= TQStyle::Style_HasFocus; if (hasMouse()) flags |= TQStyle::Style_MouseOver; -#endif // QT_NO_STYLE +#endif // TQT_NO_STYLE switch ( type ) { @@ -613,28 +613,28 @@ void TQFrame::drawFrame( TQPainter *p ) break; case MenuBarPanel: -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE style().drawPrimitive(TQStyle::PE_PanelMenuBar, p, r, g, flags, opt); break; -#endif // fall through to Panel if QT_NO_STYLE +#endif // fall through to Panel if TQT_NO_STYLE case ToolBarPanel: -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE style().drawPrimitive( TQStyle::PE_PanelDockWindow, p, rect(), g, flags, opt); break; -#endif // fall through to Panel if QT_NO_STYLE +#endif // fall through to Panel if TQT_NO_STYLE case StyledPanel: -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE if ( cstyle == Plain ) qDrawPlainRect( p, r, g.foreground(), lwidth ); else style().drawPrimitive(TQStyle::PE_Panel, p, r, g, flags, opt); break; -#endif // fall through to Panel if QT_NO_STYLE +#endif // fall through to Panel if TQT_NO_STYLE case PopupPanel: -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE { int vextra = style().pixelMetric(TQStyle::PM_PopupMenuFrameVerticalExtra, this), hextra = style().pixelMetric(TQStyle::PM_PopupMenuFrameHorizontalExtra, this); @@ -665,7 +665,7 @@ void TQFrame::drawFrame( TQPainter *p ) style().drawPrimitive(TQStyle::PE_PanelPopup, p, r, g, flags, opt); break; } -#endif // fall through to Panel if QT_NO_STYLE +#endif // fall through to Panel if TQT_NO_STYLE case Panel: if ( cstyle == Plain ) @@ -701,7 +701,7 @@ void TQFrame::drawFrame( TQPainter *p ) lwidth, midLineWidth() ); break; } -#endif // QT_NO_DRAWUTIL +#endif // TQT_NO_DRAWUTIL } @@ -751,4 +751,4 @@ void TQFrame::styleChange( TQStyle& old ) TQWidget::styleChange( old ); } -#endif //QT_NO_FRAME +#endif //TQT_NO_FRAME diff --git a/src/widgets/qgrid.cpp b/src/widgets/qgrid.cpp index 97ab089e..7e4cc589 100644 --- a/src/widgets/qgrid.cpp +++ b/src/widgets/qgrid.cpp @@ -36,7 +36,7 @@ #include "ntqgrid.h" -#ifndef QT_NO_GRID +#ifndef TQT_NO_GRID #include "ntqlayout.h" #include "ntqapplication.h" diff --git a/src/widgets/qgridview.cpp b/src/widgets/qgridview.cpp index e854d3df..8776ba84 100644 --- a/src/widgets/qgridview.cpp +++ b/src/widgets/qgridview.cpp @@ -41,7 +41,7 @@ #include "ntqgridview.h" -#ifndef QT_NO_GRIDVIEW +#ifndef TQT_NO_GRIDVIEW #include "ntqpainter.h" @@ -366,4 +366,4 @@ void TQGridView::dimensionChange( int, int ) {} */ -#endif // QT_NO_GRIDVIEW +#endif // TQT_NO_GRIDVIEW diff --git a/src/widgets/qgroupbox.cpp b/src/widgets/qgroupbox.cpp index 39f43a47..1a8a1d1b 100644 --- a/src/widgets/qgroupbox.cpp +++ b/src/widgets/qgroupbox.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqgroupbox.h" -#ifndef QT_NO_GROUPBOX +#ifndef TQT_NO_GROUPBOX #include "ntqlayout.h" #include "ntqpainter.h" #include "ntqbitmap.h" @@ -188,7 +188,7 @@ void TQGroupBox::init() { align = AlignAuto; setFrameStyle( TQFrame::GroupBoxPanel | TQFrame::Sunken ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL accel = 0; #endif vbox = 0; @@ -212,7 +212,7 @@ void TQGroupBox::setTextSpacer() TQFontMetrics fm = fontMetrics(); int fh = fm.height(); if ( isCheckable() ) { -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX fh = d->checkbox->sizeHint().height() + 2; w = d->checkbox->sizeHint().width() + 2*fm.width( "xx" ); #endif @@ -245,7 +245,7 @@ void TQGroupBox::setTitle( const TQString &title ) if ( str == title ) // no change return; str = title; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL if ( accel ) delete accel; accel = 0; @@ -256,7 +256,7 @@ void TQGroupBox::setTitle( const TQString &title ) this, SLOT(fixFocus()) ); } #endif -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX if ( d->checkbox ) { d->checkbox->setText( str ); updateCheckBoxGeometry(); @@ -312,7 +312,7 @@ void TQGroupBox::setTitle( const TQString &title ) void TQGroupBox::setAlignment( int alignment ) { align = alignment; -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX updateCheckBoxGeometry(); #endif update(); @@ -323,7 +323,7 @@ void TQGroupBox::setAlignment( int alignment ) void TQGroupBox::resizeEvent( TQResizeEvent *e ) { TQFrame::resizeEvent(e); -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX if ( align & AlignRight || align & AlignCenter || ( TQApplication::reverseLayout() && !(align & AlignLeft) ) ) updateCheckBoxGeometry(); @@ -370,7 +370,7 @@ void TQGroupBox::paintEvent( TQPaintEvent *event ) style().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, colorGroup(), isEnabled(), 0, str, -1, ownPalette() ? 0 : &pen ); paint.setClipRegion( event->region().subtract( r ) ); // clip everything but title -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX } else if ( d->checkbox ) { TQRect cbClip = d->checkbox->geometry(); TQFontMetrics fm = paint.fontMetrics(); @@ -581,7 +581,7 @@ void TQGroupBox::setColumnLayout(int strips, Orientation direction) while( (w=(TQWidget *)it.current()) != 0 ) { ++it; if ( w->isWidgetType() -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX && w != d->checkbox #endif ) @@ -605,7 +605,7 @@ void TQGroupBox::childEvent( TQChildEvent *c ) if ( !c->inserted() || !c->child()->isWidgetType() ) return; TQWidget *w = (TQWidget*)c->child(); -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX if ( d->checkbox ) { if ( w == d->checkbox ) return; @@ -677,7 +677,7 @@ void TQGroupBox::fixFocus() if ( p == this && ( w->focusPolicy() & TabFocus ) == TabFocus && w->isVisibleTo(this) ) { if ( w->hasFocus() -#ifndef QT_NO_RADIOBUTTON +#ifndef TQT_NO_RADIOBUTTON || ( !best && ::tqt_cast<TQRadioButton*>(w) && ((TQRadioButton*)w)->isChecked() ) #endif @@ -725,7 +725,7 @@ void TQGroupBox::calculateFrame() return; } } else if ( isCheckable() ) { -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX TQRect r = rect(); int va = style().styleHint(TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this); if( va & AlignVCenter ) @@ -756,7 +756,7 @@ void TQGroupBox::focusInEvent( TQFocusEvent * ) void TQGroupBox::fontChange( const TQFont & oldFont ) { TQWidget::fontChange( oldFont ); -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX updateCheckBoxGeometry(); #endif calculateFrame(); @@ -772,7 +772,7 @@ TQSize TQGroupBox::sizeHint() const TQFontMetrics fm( font() ); int tw, th; if ( isCheckable() ) { -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX tw = d->checkbox->sizeHint().width() + 2*fm.width( "xx" ); th = d->checkbox->sizeHint().height() + fm.width( TQChar(' ') ); #endif @@ -833,7 +833,7 @@ void TQGroupBox::setFlat( bool b ) checkbox, and isCheckable() controls whether the checkbox is checked or not. */ -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX void TQGroupBox::setCheckable( bool b ) { if ( (d->checkbox != 0) == b ) @@ -862,11 +862,11 @@ void TQGroupBox::setCheckable( bool b ) setTextSpacer(); update(); } -#endif //QT_NO_CHECKBOX +#endif //TQT_NO_CHECKBOX bool TQGroupBox::isCheckable() const { -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX return ( d->checkbox != 0 ); #else return FALSE; @@ -876,7 +876,7 @@ bool TQGroupBox::isCheckable() const bool TQGroupBox::isChecked() const { -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX return d->checkbox && d->checkbox->isChecked(); #else return FALSE; @@ -901,7 +901,7 @@ bool TQGroupBox::isChecked() const are enabled. If the checkbox is unchecked the children are disabled. */ -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX void TQGroupBox::setChecked( bool b ) { if ( d->checkbox ) @@ -922,7 +922,7 @@ void TQGroupBox::setChildrenEnabled( bool b ) while( (o = it.current()) ) { ++it; if ( o->isWidgetType() -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX && o != d->checkbox #endif ) { @@ -947,7 +947,7 @@ void TQGroupBox::setEnabled(bool on) if ( !d->checkbox || !on ) return; -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX // we are being enabled - disable children if ( !d->checkbox->isChecked() ) setChildrenEnabled( FALSE ); @@ -957,7 +957,7 @@ void TQGroupBox::setEnabled(bool on) /* recalculates and sets the checkbox setGeometry */ -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX void TQGroupBox::updateCheckBoxGeometry() { if ( d->checkbox ) { @@ -984,7 +984,7 @@ void TQGroupBox::updateCheckBoxGeometry() d->checkbox->setGeometry( cbRect ); } } -#endif //QT_NO_CHECKBOX +#endif //TQT_NO_CHECKBOX -#endif //QT_NO_GROUPBOX +#endif //TQT_NO_GROUPBOX diff --git a/src/widgets/qhbox.cpp b/src/widgets/qhbox.cpp index 89465fd4..117164cf 100644 --- a/src/widgets/qhbox.cpp +++ b/src/widgets/qhbox.cpp @@ -35,7 +35,7 @@ **********************************************************************/ #include "ntqhbox.h" -#ifndef QT_NO_HBOX +#ifndef TQT_NO_HBOX #include "ntqlayout.h" #include "ntqapplication.h" #include "ntqobjectlist.h" diff --git a/src/widgets/qhbuttongroup.cpp b/src/widgets/qhbuttongroup.cpp index 2a72f76e..62027f69 100644 --- a/src/widgets/qhbuttongroup.cpp +++ b/src/widgets/qhbuttongroup.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqhbuttongroup.h" -#ifndef QT_NO_HBUTTONGROUP +#ifndef TQT_NO_HBUTTONGROUP /*! \class TQHButtonGroup ntqhbuttongroup.h diff --git a/src/widgets/qheader.cpp b/src/widgets/qheader.cpp index 29c0306b..f764b653 100644 --- a/src/widgets/qheader.cpp +++ b/src/widgets/qheader.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqheader.h" -#ifndef QT_NO_HEADER +#ifndef TQT_NO_HEADER #include "ntqpainter.h" #include "ntqdrawutil.h" #include "ntqpixmap.h" @@ -735,7 +735,7 @@ void TQHeader::mouseReleaseEvent( TQMouseEvent *e ) handleColumnResize( handleIdx, c - d->pressDelta, TRUE ); } break; case Moving: { -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR unsetCursor(); #endif int section = d->i2s[handleIdx]; @@ -784,7 +784,7 @@ void TQHeader::mouseMoveEvent( TQMouseEvent *e ) switch( state ) { case Idle: -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR if ( handleAt(c) < 0 ) unsetCursor(); else if ( orient == Horizontal ) @@ -799,7 +799,7 @@ void TQHeader::mouseMoveEvent( TQMouseEvent *e ) if ( TQABS( c - clickPos ) > 4 && d->move ) { state = Moving; moveToIdx = -1; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR if ( orient == Horizontal ) setCursor( sizeHorCursor ); else @@ -2046,4 +2046,4 @@ void TQHeader::fontChange( const TQFont &oldFont ) TQWidget::fontChange( oldFont ); } -#endif // QT_NO_HEADER +#endif // TQT_NO_HEADER diff --git a/src/widgets/qhgroupbox.cpp b/src/widgets/qhgroupbox.cpp index 79324ee5..1a37a958 100644 --- a/src/widgets/qhgroupbox.cpp +++ b/src/widgets/qhgroupbox.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqhgroupbox.h" -#ifndef QT_NO_HGROUPBOX +#ifndef TQT_NO_HGROUPBOX /*! \class TQHGroupBox ntqhgroupbox.h diff --git a/src/widgets/qiconview.cpp b/src/widgets/qiconview.cpp index b7305d03..6e801ccb 100644 --- a/src/widgets/qiconview.cpp +++ b/src/widgets/qiconview.cpp @@ -46,7 +46,7 @@ #include "ntqiconview.h" -#ifndef QT_NO_ICONVIEW +#ifndef TQT_NO_ICONVIEW #include "ntqfontmetrics.h" #include "ntqpainter.h" @@ -164,7 +164,7 @@ static TQPixmap *get_qiv_buffer_pixmap( const TQSize &s ) return qiv_buffer_pixmap; } -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP class Q_EXPORT TQIconDragData { @@ -223,7 +223,7 @@ public: TQIconView::Arrangement arrangement; TQIconView::ResizeMode resizeMode; TQSize oldSize; -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP TQValueList<TQIconDragDataItem> iconDragData; #endif int numDragItems, cachedW, cachedH; @@ -231,7 +231,7 @@ public: TQPoint dragStart; TQString currInputString; TQIconView::ItemTextPos itemTextPos; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQCursor oldCursor; #endif int cachedContentsX, cachedContentsY; @@ -313,7 +313,7 @@ static int cmpIconViewItems( const void *n1, const void *n2 ) #endif -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP class TQIconViewToolTip : public TQToolTip { public: @@ -366,7 +366,7 @@ public: TQIconViewPrivate::ItemContainer *container1, *container2; }; -#ifndef QT_NO_TEXTEDIT +#ifndef TQT_NO_TEXTEDIT class TQIconViewItemLineEdit : public TQTextEdit { @@ -437,7 +437,7 @@ void TQIconViewItemLineEdit::focusOutEvent( TQFocusEvent *e ) } #endif -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP /*! @@ -897,7 +897,7 @@ TQIconViewItem::TQIconViewItem( TQIconView *parent, TQIconViewItem *after, parent using \a text as the text and \a picture as the icon. */ -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE TQIconViewItem::TQIconViewItem( TQIconView *parent, const TQString &text, const TQPicture &picture ) : view( parent ), itemText( text ), itemIcon( 0 ) @@ -925,7 +925,7 @@ TQIconViewItem::TQIconViewItem( TQIconView *parent, TQIconViewItem *after, */ void TQIconViewItem::init( TQIconViewItem *after -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE , TQPicture *pic #endif ) @@ -940,10 +940,10 @@ void TQIconViewItem::init( TQIconViewItem *after visible = TRUE; selected = FALSE; selectable = TRUE; -#ifndef QT_NO_TEXTEDIT +#ifndef TQT_NO_TEXTEDIT renameBox = 0; #endif -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE itemPic = pic; #endif if ( view ) { @@ -963,7 +963,7 @@ void TQIconViewItem::init( TQIconViewItem *after TQIconViewItem::~TQIconViewItem() { -#ifndef QT_NO_TEXTEDIT +#ifndef TQT_NO_TEXTEDIT removeRenameBox(); #endif if ( view && !view->d->clearing ) @@ -971,7 +971,7 @@ TQIconViewItem::~TQIconViewItem() view = 0; if ( itemIcon && itemIcon->serialNumber() != unknown_icon->serialNumber() ) delete itemIcon; -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE delete itemPic; #endif delete d; @@ -1109,7 +1109,7 @@ void TQIconViewItem::setPixmap( const TQPixmap &icon ) \sa picture() */ -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE void TQIconViewItem::setPicture( const TQPicture &icon ) { // clear assigned pixmap if any @@ -1304,7 +1304,7 @@ TQPixmap *TQIconViewItem::pixmap() const \sa setPicture() */ -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE TQPicture *TQIconViewItem::picture() const { return itemPic; @@ -1723,7 +1723,7 @@ bool TQIconViewItem::acceptDrop( const TQMimeSource * ) const return FALSE; } -#ifndef QT_NO_TEXTEDIT +#ifndef TQT_NO_TEXTEDIT /*! Starts in-place renaming of an icon, if allowed. @@ -1780,7 +1780,7 @@ int TQIconViewItem::compare( TQIconViewItem *i ) const return key().localeAwareCompare( i->key() ); } -#ifndef QT_NO_TEXTEDIT +#ifndef TQT_NO_TEXTEDIT /*! This private function is called when the user pressed Return during in-place renaming. @@ -1864,7 +1864,7 @@ void TQIconViewItem::calcRect( const TQString &text_ ) int pw = 0; int ph = 0; -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE if ( picture() ) { TQRect br = picture()->boundingRect(); pw = br.width() + 2; @@ -1970,7 +1970,7 @@ void TQIconViewItem::paintItem( TQPainter *p, const TQColorGroup &cg ) calcTmpText(); -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE if ( picture() ) { TQPicture *pic = picture(); if ( isSelected() ) { @@ -2104,7 +2104,7 @@ void TQIconViewItem::paintFocus( TQPainter *, const TQColorGroup & ) reimplement this function. */ -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void TQIconViewItem::dropped( TQDropEvent *, const TQValueList<TQIconDragItem> & ) { } @@ -2752,7 +2752,7 @@ TQIconView::TQIconView( TQWidget *parent, const char *name, WFlags f ) d->adjustTimer = new TQTimer( this, "iconview adjust timer" ); d->isIconDrag = FALSE; d->inMenuMode = FALSE; -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP d->iconDragData.clear(); #endif d->numDragItems = 0; @@ -2766,7 +2766,7 @@ TQIconView::TQIconView( TQWidget *parent, const char *name, WFlags f ) d->rearrangeEnabled = TRUE; d->itemTextPos = Bottom; d->reorderItemsWhenInsert = TRUE; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR d->oldCursor = arrowCursor; #endif d->resortItemsWhenInsert = FALSE; @@ -2809,7 +2809,7 @@ TQIconView::TQIconView( TQWidget *parent, const char *name, WFlags f ) viewport()->setFocusProxy( this ); viewport()->setFocusPolicy( TQWidget::WheelFocus ); -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP d->toolTip = new TQIconViewToolTip( viewport(), this ); #endif d->showTips = TRUE; @@ -2897,7 +2897,7 @@ TQIconView::~TQIconView() d->backBuffer = 0; delete d->fm; d->fm = 0; -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP delete d->toolTip; d->toolTip = 0; #endif @@ -4487,7 +4487,7 @@ void TQIconView::contentsMousePressEventEx( TQMouseEvent *e ) if ( item ) d->selectAnchor = item; -#ifndef QT_NO_TEXTEDIT +#ifndef TQT_NO_TEXTEDIT if ( d->renamingItem ) d->renamingItem->renameItem(); #endif @@ -4508,7 +4508,7 @@ void TQIconView::contentsMousePressEventEx( TQMouseEvent *e ) if ( !item->renameEnabled() ) { d->mousePressed = TRUE; -#ifndef QT_NO_TEXTEDIT +#ifndef TQT_NO_TEXTEDIT } else { ensureItemVisible( item ); setCurrentItem( item ); @@ -4724,7 +4724,7 @@ void TQIconView::contentsMouseMoveEvent( TQMouseEvent *e ) if ( ( d->dragStartPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() ) { d->mousePressed = FALSE; d->cleared = FALSE; -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP startDrag(); #endif if ( d->tmpCurrentItem ) @@ -4768,7 +4768,7 @@ void TQIconView::contentsMouseDoubleClickEvent( TQMouseEvent *e ) \reimp */ -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void TQIconView::contentsDragEnterEvent( TQDragEnterEvent *e ) { d->dragging = TRUE; @@ -5039,7 +5039,7 @@ void TQIconView::keyPressEvent( TQKeyEvent *e ) case Key_Escape: e->ignore(); break; -#ifndef QT_NO_TEXTEDIT +#ifndef TQT_NO_TEXTEDIT case Key_F2: { if ( d->currentItem->renameEnabled() ) { d->currentItem->renameItem(); @@ -5575,7 +5575,7 @@ void TQIconView::drawRubber( TQPainter *p ) \sa TQIconDrag */ -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP TQDragObject *TQIconView::dragObject() { if ( !d->currentItem ) @@ -5750,7 +5750,7 @@ void TQIconView::emitRenamed( TQIconViewItem *item ) void TQIconView::drawDragShapes( const TQPoint &pos ) { -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP if ( pos == TQPoint( -1, -1 ) ) return; @@ -5802,7 +5802,7 @@ void TQIconView::drawDragShapes( const TQPoint &pos ) drag data (e.g. shapes of icons which are dragged), etc. */ -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void TQIconView::initDragEnter( TQDropEvent *e ) { if ( TQIconDrag::canDecode( e ) ) { @@ -6641,7 +6641,7 @@ void TQIconView::windowActivationChange( bool oldActive ) bool TQIconView::isRenaming() const { -#ifndef QT_NO_TEXTEDIT +#ifndef TQT_NO_TEXTEDIT return d->renamingItem && d->renamingItem->renameBox; #else return FALSE; @@ -6668,4 +6668,4 @@ int TQIconView::visibleHeightSB() const return TQMAX( 0, visibleHeight() - offset ); } -#endif // QT_NO_ICONVIEW +#endif // TQT_NO_ICONVIEW diff --git a/src/widgets/qlabel.cpp b/src/widgets/qlabel.cpp index 314bfe21..ff647ab2 100644 --- a/src/widgets/qlabel.cpp +++ b/src/widgets/qlabel.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqlabel.h" -#ifndef QT_NO_LABEL +#ifndef TQT_NO_LABEL #include "ntqpainter.h" #include "ntqdrawutil.h" #include "ntqaccel.h" @@ -196,7 +196,7 @@ TQLabel::TQLabel( TQWidget *buddy, const TQString &text, : TQFrame( parent, name, f | WMouseNoMask ) { init(); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL setBuddy( buddy ); #endif setText( text ); @@ -216,15 +216,15 @@ TQLabel::~TQLabel() void TQLabel::init() { lpixmap = 0; -#ifndef QT_NO_MOVIE +#ifndef TQT_NO_MOVIE lmovie = 0; #endif -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL lbuddy = 0; accel = 0; #endif lpixmap = 0; -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE lpicture = 0; #endif align = AlignAuto | AlignVCenter | ExpandTabs; @@ -232,7 +232,7 @@ void TQLabel::init() autoresize = FALSE; scaledcontents = FALSE; textformat = TQt::AutoText; -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT doc = 0; #endif @@ -273,18 +273,18 @@ void TQLabel::setText( const TQString &text ) if ( ltext == text ) return; TQSize osh = sizeHint(); -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT bool hadRichtext = doc != 0; #endif clearContents(); ltext = text; -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT bool useRichText = (textformat == RichText || ( ( textformat == AutoText ) && TQStyleSheet::mightBeRichText(ltext) ) ); #else bool useRichText = TRUE; #endif -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL // ### Setting accelerators for rich text labels will not work. // Eg. <b>>Hello</b> will return ALT+G which is clearly // not intended. @@ -298,7 +298,7 @@ void TQLabel::setText( const TQString &text ) } } #endif -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT if ( useRichText ) { if ( !hadRichtext ) align |= WordBreak; @@ -351,7 +351,7 @@ void TQLabel::setPixmap( const TQPixmap &pixmap ) updateLabel( osh ); } -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE /*! Sets the label contents to \a picture. Any previous content is cleared. @@ -369,7 +369,7 @@ void TQLabel::setPicture( const TQPicture &picture ) updateLabel( osh ); } -#endif // QT_NO_PICTURE +#endif // TQT_NO_PICTURE /*! Sets the label contents to plain text containing the textual @@ -440,14 +440,14 @@ void TQLabel::setAlignment( int alignment ) if ( alignment == align ) return; TQSize osh = sizeHint(); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL if ( lbuddy ) align = alignment | ShowPrefix; else #endif align = alignment; -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT TQString t = ltext; if ( !t.isNull() ) { ltext = TQString::null; @@ -531,12 +531,12 @@ TQSize TQLabel::sizeForWidth( int w ) const { TQRect br; TQPixmap *pix = pixmap(); -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE TQPicture *pic = picture(); #else const int pic = 0; #endif -#ifndef QT_NO_MOVIE +#ifndef TQT_NO_MOVIE TQMovie *mov = movie(); #else const int mov = 0; @@ -560,15 +560,15 @@ TQSize TQLabel::sizeForWidth( int w ) const if ( pix ) br = pix->rect(); -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE else if ( pic ) br = pic->boundingRect(); #endif -#ifndef QT_NO_MOVIE +#ifndef TQT_NO_MOVIE else if ( mov ) br = mov->framePixmap().rect(); #endif -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT else if ( doc ) { int oldW = doc->width(); if ( align & WordBreak ) { @@ -608,7 +608,7 @@ TQSize TQLabel::sizeForWidth( int w ) const int TQLabel::heightForWidth( int w ) const { if ( -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT doc || #endif (align & WordBreak) ) @@ -642,7 +642,7 @@ TQSize TQLabel::minimumSizeHint() const TQSize sz( -1, -1 ); if ( -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT !doc && #endif (align & WordBreak) == 0 ) { @@ -669,7 +669,7 @@ void TQLabel::resizeEvent( TQResizeEvent* e ) { TQFrame::resizeEvent( e ); -#ifdef QT_NO_RICHTEXT +#ifdef TQT_NO_RICHTEXT static const bool doc = FALSE; #endif @@ -731,12 +731,12 @@ void TQLabel::drawContents( TQPainter *p ) TQRect cr = contentsRect(); TQPixmap *pix = pixmap(); -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE TQPicture *pic = picture(); #else const int pic = 0; #endif -#ifndef QT_NO_MOVIE +#ifndef TQT_NO_MOVIE TQMovie *mov = movie(); #else const int mov = 0; @@ -759,7 +759,7 @@ void TQLabel::drawContents( TQPainter *p ) } } -#ifndef QT_NO_MOVIE +#ifndef TQT_NO_MOVIE if ( mov ) { // ### should add movie to qDrawItem TQRect r = style().itemRect( p, cr, align, isEnabled(), &(mov->framePixmap()), @@ -769,7 +769,7 @@ void TQLabel::drawContents( TQPainter *p ) } else #endif -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT if ( doc ) { doc->setWidth(p, cr.width() ); int rh = doc->height(); @@ -796,7 +796,7 @@ void TQLabel::drawContents( TQPainter *p ) doc->draw(p, cr.x(), cr.y()+yo, cr, cg, 0); } else #endif -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE if ( pic ) { TQRect br = pic->boundingRect(); int rw = br.width(); @@ -804,7 +804,7 @@ void TQLabel::drawContents( TQPainter *p ) if ( scaledcontents ) { p->save(); p->translate( cr.x(), cr.y() ); -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS p->scale( (double)cr.width()/rw, (double)cr.height()/rh ); #endif p->drawPicture( -br.x(), -br.y(), *pic ); @@ -825,7 +825,7 @@ void TQLabel::drawContents( TQPainter *p ) } else #endif { -#ifndef QT_NO_IMAGE_SMOOTHSCALE +#ifndef TQT_NO_IMAGE_SMOOTHSCALE if ( scaledcontents && pix ) { if ( !d->img ) d->img = new TQImage( lpixmap->convertToImage() ); @@ -876,7 +876,7 @@ void TQLabel::updateLabel( TQSize oldSizeHint ) Internal slot, used to set focus for accelerator labels. */ -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL void TQLabel::acceleratorSlot() { if ( !lbuddy ) @@ -900,7 +900,7 @@ void TQLabel::acceleratorSlot() Internal slot, used to clean up if the buddy widget dies. */ -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL void TQLabel::buddyDied() // I can't remember if I cried. { lbuddy = 0; @@ -955,7 +955,7 @@ void TQLabel::setBuddy( TQWidget *buddy ) if ( !lbuddy ) return; -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT if ( !( textformat == RichText || (textformat == AutoText && TQStyleSheet::mightBeRichText(ltext) ) ) ) #endif @@ -983,10 +983,10 @@ TQWidget * TQLabel::buddy() const { return lbuddy; } -#endif //QT_NO_ACCEL +#endif //TQT_NO_ACCEL -#ifndef QT_NO_MOVIE +#ifndef TQT_NO_MOVIE void TQLabel::movieUpdated(const TQRect& rect) { TQMovie *mov = movie(); @@ -1034,7 +1034,7 @@ void TQLabel::setMovie( const TQMovie& movie ) updateLabel( osh ); // resize/update signals will come soon enough } -#endif // QT_NO_MOVIE +#endif // TQT_NO_MOVIE /*! \internal @@ -1044,14 +1044,14 @@ void TQLabel::setMovie( const TQMovie& movie ) void TQLabel::clearContents() { -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT delete doc; doc = 0; #endif delete lpixmap; lpixmap = 0; -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE delete lpicture; lpicture = 0; #endif @@ -1061,11 +1061,11 @@ void TQLabel::clearContents() d->pix = 0; ltext = TQString::null; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL if ( accel ) accel->clear(); #endif -#ifndef QT_NO_MOVIE +#ifndef TQT_NO_MOVIE if ( lmovie ) { lmovie->disconnectResize(this, SLOT(movieResized(const TQSize&))); lmovie->disconnectUpdate(this, SLOT(movieUpdated(const TQRect&))); @@ -1076,7 +1076,7 @@ void TQLabel::clearContents() } -#ifndef QT_NO_MOVIE +#ifndef TQT_NO_MOVIE /*! Returns a pointer to the label's movie, or 0 if no movie has been @@ -1090,7 +1090,7 @@ TQMovie* TQLabel::movie() const return lmovie; } -#endif // QT_NO_MOVIE +#endif // TQT_NO_MOVIE /*! \property TQLabel::backgroundMode @@ -1137,7 +1137,7 @@ void TQLabel::setTextFormat( TQt::TextFormat format ) void TQLabel::fontChange( const TQFont & ) { if ( !ltext.isEmpty() ) { -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT if ( doc ) doc->setDefaultFont( font() ); #endif @@ -1145,7 +1145,7 @@ void TQLabel::fontChange( const TQFont & ) } } -#ifndef QT_NO_IMAGE_SMOOTHSCALE +#ifndef TQT_NO_IMAGE_SMOOTHSCALE /*! \property TQLabel::scaledContents \brief whether the label will scale its contents to fill all @@ -1177,7 +1177,7 @@ void TQLabel::setScaledContents( bool enable ) update( contentsRect() ); } -#endif // QT_NO_IMAGE_SMOOTHSCALE +#endif // TQT_NO_IMAGE_SMOOTHSCALE /*! Sets the font used on the TQLabel to font \a f. @@ -1188,4 +1188,4 @@ void TQLabel::setFont( const TQFont &f ) TQFrame::setFont( f ); } -#endif // QT_NO_LABEL +#endif // TQT_NO_LABEL diff --git a/src/widgets/qlcdnumber.cpp b/src/widgets/qlcdnumber.cpp index c284da3e..57d39687 100644 --- a/src/widgets/qlcdnumber.cpp +++ b/src/widgets/qlcdnumber.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqlcdnumber.h" -#ifndef QT_NO_LCDNUMBER +#ifndef TQT_NO_LCDNUMBER #include "ntqbitarray.h" #include "ntqpainter.h" @@ -1167,4 +1167,4 @@ TQSize TQLCDNumber::sizeHint() const return TQSize( 10 + 9 * (numDigits() + (smallDecimalPoint() ? 0 : 1)), 23 ); } -#endif // QT_NO_LCDNUMBER +#endif // TQT_NO_LCDNUMBER diff --git a/src/widgets/qlineedit.cpp b/src/widgets/qlineedit.cpp index 196e097c..b2348683 100644 --- a/src/widgets/qlineedit.cpp +++ b/src/widgets/qlineedit.cpp @@ -39,10 +39,10 @@ **********************************************************************/ #include "ntqlineedit.h" -#ifndef QT_NO_LINEEDIT +#ifndef TQT_NO_LINEEDIT // Keep this position to avoid patch rejection -#ifndef QT_NO_IM +#ifndef TQT_NO_IM #include "ntqinputcontext.h" #endif @@ -70,7 +70,7 @@ #include "ntqaccessible.h" #endif -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL #include "ntqkeysequence.h" #define ACCEL_KEY(k) "\t" + TQString(TQKeySequence( TQt::CTRL | TQt::Key_ ## k )) #else @@ -95,7 +95,7 @@ struct TQLineEditPrivate : public TQt hscroll(0), validator(0), maskData(0), undoState(0), selstart(0), selend(0), imstart(0), imend(0), imselstart(0), imselend(0) -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP ,dndTimer(0) #endif {} @@ -245,7 +245,7 @@ struct TQLineEditPrivate : public TQt inline bool hasSelectedText() const { return !text.isEmpty() && selend > selstart; } inline void deselect() { selDirty |= (selend > selstart); selstart = selend = 0; } void removeSelectedText(); -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD void copy( bool clipboard = TRUE ) const; #endif inline bool inSelection( int x ) const @@ -278,7 +278,7 @@ struct TQLineEditPrivate : public TQt TQRect cursorRect() const; void updateMicroFocusHint(); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP // drag and drop TQPoint dndPos; int dndTimer; @@ -1115,7 +1115,7 @@ void TQLineEdit::setDragEnabled( bool b ) */ bool TQLineEdit::hasAcceptableInput() const { -#ifndef QT_NO_VALIDATOR +#ifndef TQT_NO_VALIDATOR TQString text = d->text; int cursor = d->cursor; if ( d->validator && d->validator->validate( text, cursor ) != TQValidator::Acceptable ) @@ -1319,14 +1319,14 @@ bool TQLineEdit::isReadOnly() const void TQLineEdit::setReadOnly( bool enable ) { d->readOnly = enable; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR setCursor( enable ? arrowCursor : ibeamCursor ); #endif update(); } -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD /*! Copies the selected text to the clipboard and deletes it, if there is any, and if echoMode() is \c Normal. @@ -1385,7 +1385,7 @@ void TQLineEditPrivate::copy( bool clipboard ) const } } -#endif // !QT_NO_CLIPBOARD +#endif // !TQT_NO_CLIPBOARD /*!\reimp */ @@ -1451,7 +1451,7 @@ bool TQLineEdit::event( TQEvent * e ) if ( timerId == d->cursorTimer ) { if(!hasSelectedText() || style().styleHint( TQStyle::SH_BlinkCursorWhenTextSelected )) d->setCursorVisible( !d->cursorVisible ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP } else if ( timerId == d->dndTimer ) { if( !d->drag() ) return TRUE; @@ -1479,7 +1479,7 @@ void TQLineEdit::mousePressEvent( TQMouseEvent* e ) } bool mark = e->state() & ShiftButton; int cursor = d->xToPos( e->pos().x() ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP if ( !mark && d->dragEnabled && d->echoMode == Normal && e->button() == LeftButton && d->inSelection( e->pos().x() ) ) { d->cursor = cursor; @@ -1501,10 +1501,10 @@ void TQLineEdit::mouseMoveEvent( TQMouseEvent * e ) { if ( sendMouseEventToInputContext( e ) ) return; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR if ( ( e->state() & MouseButtonMask ) == 0 ) { if ( !d->readOnly && d->dragEnabled -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS && !TQWhatsThis::inWhatsThisMode() #endif ) @@ -1513,7 +1513,7 @@ void TQLineEdit::mouseMoveEvent( TQMouseEvent * e ) #endif if ( e->state() & LeftButton ) { -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP if ( d->dndTimer ) { if ( ( d->dndPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() ) d->drag(); @@ -1531,7 +1531,7 @@ void TQLineEdit::mouseReleaseEvent( TQMouseEvent* e ) { if ( sendMouseEventToInputContext( e ) ) return; -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP if ( e->button() == LeftButton ) { if ( d->dndTimer ) { killTimer( d->dndTimer ); @@ -1541,7 +1541,7 @@ void TQLineEdit::mouseReleaseEvent( TQMouseEvent* e ) } } #endif -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD if (TQApplication::clipboard()->supportsSelection() ) { if ( e->button() == LeftButton ) { d->copy( FALSE ); @@ -1601,7 +1601,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e ) if ( hasAcceptableInput() ) { emit returnPressed(); } -#ifndef QT_NO_VALIDATOR +#ifndef TQT_NO_VALIDATOR else if ( v && v->validate( d->text, d->cursor ) != TQValidator::Acceptable ) { TQString vstr = d->text; v->fixup( vstr ); @@ -1654,7 +1654,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e ) case Key_B: cursorForward( e->state() & ShiftButton, -1 ); break; -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD case Key_C: copy(); break; @@ -1690,7 +1690,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e ) clear(); break; #endif -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD case Key_V: if ( !d->readOnly ) paste(); @@ -1799,7 +1799,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e ) if ( !d->readOnly ) undo(); break; -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD case Key_F16: // Copy key on Sun keyboards copy(); break; @@ -1836,7 +1836,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e ) */ bool TQLineEdit::sendMouseEventToInputContext( TQMouseEvent *e ) { -#ifndef QT_NO_IM +#ifndef TQT_NO_IM if ( d->composeMode() ) { int cursor = d->xToPosInternal( e->pos().x(), TQTextItem::OnCharacters ); int mousePos = cursor - d->imstart; @@ -2119,7 +2119,7 @@ void TQLineEdit::drawContents( TQPainter *p ) } -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP /*!\reimp */ void TQLineEdit::dragMoveEvent( TQDragMoveEvent *e ) @@ -2203,13 +2203,13 @@ bool TQLineEditPrivate::drag() removeSelectedText(); finishChange( priorState ); } -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR q->setCursor( readOnly ? arrowCursor : ibeamCursor ); #endif return TRUE; } -#endif // QT_NO_DRAGANDDROP +#endif // TQT_NO_DRAGANDDROP enum { IdUndo, IdRedo, IdSep1, IdCut, IdCopy, IdPaste, IdClear, IdSep2, IdSelectAll }; @@ -2217,8 +2217,8 @@ enum { IdUndo, IdRedo, IdSep1, IdCut, IdCopy, IdPaste, IdClear, IdSep2, IdSelect */ void TQLineEdit::contextMenuEvent( TQContextMenuEvent * e ) { -#ifndef QT_NO_POPUPMENU -#ifndef QT_NO_IM +#ifndef TQT_NO_POPUPMENU +#ifndef TQT_NO_IM if ( d->composeMode() ) return; #endif @@ -2238,7 +2238,7 @@ void TQLineEdit::contextMenuEvent( TQContextMenuEvent * e ) case IdSelectAll: selectAll(); break; case IdUndo: undo(); break; case IdRedo: redo(); break; -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD case IdCut: cut(); break; case IdCopy: copy(); break; case IdPaste: paste(); break; @@ -2247,7 +2247,7 @@ void TQLineEdit::contextMenuEvent( TQContextMenuEvent * e ) ; // nothing selected or lineedit destroyed. Be careful. } } -#endif //QT_NO_POPUPMENU +#endif //TQT_NO_POPUPMENU } /*! @@ -2260,7 +2260,7 @@ void TQLineEdit::contextMenuEvent( TQContextMenuEvent * e ) TQPopupMenu *TQLineEdit::createPopupMenu() { -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU TQPopupMenu *popup = new TQPopupMenu( this, "qt_edit_menu" ); int id = d->menuId = popup->insertItem( tr( "&Undo" ) + ACCEL_KEY( Z ) ); popup->insertItem( tr( "&Redo" ) + ACCEL_KEY( Y ) ); @@ -2276,7 +2276,7 @@ TQPopupMenu *TQLineEdit::createPopupMenu() #endif ); -#ifndef QT_NO_IM +#ifndef TQT_NO_IM TQInputContext *qic = getInputContext(); if ( qic ) qic->addMenusTo( popup ); @@ -2284,7 +2284,7 @@ TQPopupMenu *TQLineEdit::createPopupMenu() popup->setItemEnabled( id - IdUndo, d->isUndoAvailable() ); popup->setItemEnabled( id - IdRedo, d->isRedoAvailable() ); -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD popup->setItemEnabled( id - IdCut, !d->readOnly && d->hasSelectedText() ); popup->setItemEnabled( id - IdCopy, d->hasSelectedText() ); popup->setItemEnabled( id - IdPaste, !d->readOnly && !TQApplication::clipboard()->text().isEmpty() ); @@ -2375,7 +2375,7 @@ void TQLineEdit::clipboardChanged() void TQLineEditPrivate::init( const TQString& txt ) { -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR q->setCursor( readOnly ? arrowCursor : ibeamCursor ); #endif q->setFocusPolicy( TQWidget::StrongFocus ); @@ -2513,7 +2513,7 @@ void TQLineEditPrivate::finishChange( int validateFromState, bool setModified ) // do validation bool wasValidInput = validInput; validInput = TRUE; -#ifndef QT_NO_VALIDATOR +#ifndef TQT_NO_VALIDATOR if ( validator && validateFromState >= 0 ) { TQString textCopy = text; int cursorCopy = cursor; @@ -2956,4 +2956,4 @@ int TQLineEditPrivate::findInMask( int pos, bool forward, bool findSeparator, TQ } -#endif // QT_NO_LINEEDIT +#endif // TQT_NO_LINEEDIT diff --git a/src/widgets/qlistbox.cpp b/src/widgets/qlistbox.cpp index 2e5e059f..5ccedf40 100644 --- a/src/widgets/qlistbox.cpp +++ b/src/widgets/qlistbox.cpp @@ -45,7 +45,7 @@ #endif #include "ntqlistbox.h" -#ifndef QT_NO_LISTBOX +#ifndef TQT_NO_LISTBOX #include "ntqmemarray.h" #include "ntqfontmetrics.h" #include "ntqpainter.h" @@ -4690,4 +4690,4 @@ int TQListBoxItem::rtti() const return RTTI; } -#endif // QT_NO_LISTBOX +#endif // TQT_NO_LISTBOX diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp index c4a97436..22c04e03 100644 --- a/src/widgets/qlistview.cpp +++ b/src/widgets/qlistview.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqlistview.h" -#ifndef QT_NO_LISTVIEW +#ifndef TQT_NO_LISTVIEW #include "ntqtimer.h" #include "ntqheader.h" #include "ntqpainter.h" @@ -260,7 +260,7 @@ struct TQListViewPrivate TQListView::ResizeMode resizeMode; }; -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP class TQListViewToolTip : public TQToolTip { public: @@ -1125,7 +1125,7 @@ bool TQListViewItem::acceptDrop( const TQMimeSource * ) const return FALSE; } -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP /*! This function is called when something was dropped on the item. \a e @@ -2089,7 +2089,7 @@ void TQListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, ci->truncated = TRUE; ci->tmpText = qEllipsisText( t, fm, width - pw, align ); } else if ( mlenabled && fm.width( t ) + pw > width ) { -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST TQStringList list = TQStringList::split( TQChar('\n'), t, TRUE ); for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { TQString z = *it; @@ -2678,7 +2678,7 @@ void TQListView::init() d->useDoubleBuffer = FALSE; d->startDragItem = 0; d->toolTips = TRUE; -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP d->toolTip = new TQListViewToolTip( viewport(), this ); #endif d->updateHeader = FALSE; @@ -2835,7 +2835,7 @@ TQListView::~TQListView() d->drawables = 0; delete d->vci; d->vci = 0; -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP delete d->toolTip; d->toolTip = 0; #endif @@ -4694,7 +4694,7 @@ void TQListView::contentsMouseMoveEvent( TQMouseEvent * e ) } if ( ( d->dragStartPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() ) { d->buttonDown = FALSE; -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP startDrag(); #endif } @@ -7216,7 +7216,7 @@ void TQListView::openFocusItem() static const int autoopenTime = 750; -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP /*! \reimp */ @@ -7329,7 +7329,7 @@ void TQListView::startDrag() drag->drag(); } -#endif // QT_NO_DRAGANDDROP +#endif // TQT_NO_DRAGANDDROP /*! \property TQListView::defaultRenameAction @@ -8203,4 +8203,4 @@ void TQListView::adjustColumn( int col ) } } -#endif // QT_NO_LISTVIEW +#endif // TQT_NO_LISTVIEW diff --git a/src/widgets/qmainwindow.cpp b/src/widgets/qmainwindow.cpp index f2069485..f196a1d3 100644 --- a/src/widgets/qmainwindow.cpp +++ b/src/widgets/qmainwindow.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqmainwindow.h" -#ifndef QT_NO_MAINWINDOW +#ifndef TQT_NO_MAINWINDOW #include "ntqtimer.h" #include "ntqlayout.h" @@ -88,7 +88,7 @@ public: { } -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR TQMenuBar * mb; #else TQWidget * mb; @@ -285,7 +285,7 @@ TQLayoutIterator TQMainWindowLayout::iterator() TQHideToolTip and TQHideDock - minimized dock */ -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP class TQHideToolTip : public TQToolTip { public: @@ -310,13 +310,13 @@ public: pressed = FALSE; setMouseTracking( TRUE ); win = parent; -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP tip = new TQHideToolTip( this ); #endif } ~TQHideDock() { -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP delete tip; #endif } @@ -471,13 +471,13 @@ private: TQMainWindow *win; int pressedHandle; bool pressed; -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP TQHideToolTip *tip; friend class TQHideToolTip; #endif }; -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP void TQHideToolTip::maybeTip( const TQPoint &pos ) { if ( !parentWidget() ) @@ -921,7 +921,7 @@ TQMainWindow::~TQMainWindow() delete d; } -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR /*! Sets this main window to use the menu bar \a newMenuBar. @@ -970,7 +970,7 @@ TQMenuBar * TQMainWindow::menuBar() const ((TQMainWindow *)this)->triggerLayout(); return b; } -#endif // QT_NO_MENUBAR +#endif // TQT_NO_MENUBAR /*! Sets this main window to use the status bar \a newStatusBar. @@ -993,7 +993,7 @@ void TQMainWindow::setStatusBar( TQStatusBar * newStatusBar ) if ( d->sb ) delete d->sb; d->sb = newStatusBar; -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP // ### this code can cause unnecessary creation of a tool tip group connect( toolTipGroup(), SIGNAL(showTip(const TQString&)), d->sb, SLOT(message(const TQString&)) ); @@ -1034,7 +1034,7 @@ TQStatusBar * TQMainWindow::statusBar() const } -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP /*! Sets this main window to use the tool tip group \a newToolTipGroup. @@ -1275,7 +1275,7 @@ void TQMainWindow::addDockWindow( TQDockWindow * dockWindow, const TQString &lab Dock edge, bool newLine ) { addDockWindow( dockWindow, edge, newLine ); -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR TQToolBar *tb = ::tqt_cast<TQToolBar*>(dockWindow); if ( tb ) tb->setLabel( label ); @@ -1426,7 +1426,7 @@ void TQMainWindow::removeDockWindow( TQDockWindow * dockWindow ) void TQMainWindow::setUpLayout() { -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR if ( !d->mb ) { // slightly evil hack here. reconsider this TQObjectList * l @@ -1456,7 +1456,7 @@ void TQMainWindow::setUpLayout() delete item; } -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR if ( d->mb && d->mb->isVisibleTo( this ) ) { d->tll->setMenuBar( d->mb ); if (style().styleHint(TQStyle::SH_MainWindow_SpaceBelowMenuBar, this)) @@ -1851,7 +1851,7 @@ void TQMainWindow::triggerLayout( bool deleteLayout ) */ void TQMainWindow::whatsThis() { -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS TQWhatsThis::enterWhatsThisMode(); #endif } @@ -1907,7 +1907,7 @@ bool TQMainWindow::getLocation( TQDockWindow *dw, Dock &dock, int &index, bool & return TRUE; } -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR /*! Returns a list of all the toolbars which are in the \a dock dock area, regardless of their state. @@ -2214,7 +2214,7 @@ void TQMainWindow::menuAboutToShow() empty = TRUE; -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR if ( dockWindows == AllDockWindows || dockWindows == OnlyToolBars ) { for ( o = l->first(); o; o = l->next() ) { TQToolBar *tb = ::tqt_cast<TQToolBar*>(o); @@ -2280,7 +2280,7 @@ void TQMainWindow::slotPlaceChanged() TQDockWindow *dw = ::tqt_cast<TQDockWindow*>(obj); if ( dw ) emit dockWindowPositionChanged( dw ); -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR TQToolBar *tb = ::tqt_cast<TQToolBar*>(obj); if ( tb ) emit toolBarPositionChanged( tb ); @@ -2442,7 +2442,7 @@ void TQMainWindow::setAppropriate( TQDockWindow *dw, bool a ) d->appropriate.replace( dw, a ); } -#ifndef QT_NO_TEXTSTREAM +#ifndef TQT_NO_TEXTSTREAM static void saveDockArea( TQTextStream &ts, TQDockArea *a ) { TQPtrList<TQDockWindow> l = a->dockWindowList(); diff --git a/src/widgets/qmenubar.cpp b/src/widgets/qmenubar.cpp index 8ee3cad2..b9acce9c 100644 --- a/src/widgets/qmenubar.cpp +++ b/src/widgets/qmenubar.cpp @@ -42,7 +42,7 @@ // ### could be reorganised by discarding INCLUDE_MENUITEM_DEF and put // the relevant declarations in a private header? #include "ntqmainwindow.h" -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR #include "ntqmenubar.h" #include "ntqpopupmenu.h" #include "ntqaccel.h" @@ -271,7 +271,7 @@ TQMenuBar::TQMenuBar( TQWidget *parent, const char *name ) macCreateNativeMenubar(); #endif isMenuBar = TRUE; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL autoaccel = 0; #endif irects = 0; @@ -331,7 +331,7 @@ void TQMenuBar::styleChange( TQStyle& old ) TQMenuBar::~TQMenuBar() { -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL delete autoaccel; #endif #if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE) @@ -382,7 +382,7 @@ void TQMenuBar::performDelayedContentsChanged() { pendingDelayedContentsChanges = 0; // here the part the can be delayed -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL // if performDelayedStateChanged() will be called too, // it will call setupAccelerators() too, no need to do it twice if( !pendingDelayedStateChanges ) @@ -391,14 +391,14 @@ void TQMenuBar::performDelayedContentsChanged() calculateRects(); if ( isVisible() ) { update(); -#ifndef QT_NO_MAINWINDOW +#ifndef TQT_NO_MAINWINDOW TQMainWindow *mw = ::tqt_cast<TQMainWindow*>(parent()); if ( mw ) { mw->triggerLayout(); mw->update(); } #endif -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT if ( parentWidget() && parentWidget()->layout() ) parentWidget()->layout()->activate(); #endif @@ -425,7 +425,7 @@ void TQMenuBar::performDelayedStateChanged() { pendingDelayedStateChanges = 0; // here the part that can be delayed -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL setupAccelerators(); // ### when we have a good solution for the accel vs. focus // widget problem, remove that. That is only a workaround // if you remove this, see performDelayedContentsChanged() @@ -514,7 +514,7 @@ void TQMenuBar::languageChange() bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event ) { if ( object == parent() && object -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR && !::tqt_cast<TQToolBar*>(object) #endif && event->type() == TQEvent::Resize ) { @@ -558,7 +558,7 @@ bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event ) } TQKeyEvent * ke = (TQKeyEvent *) event; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL // look for Alt press and Alt-anything press if ( event->type() == TQEvent::Accel ) { TQWidget * f = ((TQWidget *)object)->focusWidget(); @@ -661,7 +661,7 @@ void TQMenuBar::subHighlighted( int id ) \internal Receives signals from menu accelerator. */ -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL void TQMenuBar::accelActivated( int id ) { #if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE) @@ -680,7 +680,7 @@ void TQMenuBar::accelActivated( int id ) This slot receives signals from menu accelerator when it is about to be destroyed. */ -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL void TQMenuBar::accelDestroyed() { autoaccel = 0; // don't delete it twice! @@ -812,7 +812,7 @@ void TQMenuBar::hidePopups() void TQMenuBar::show() { -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL setupAccelerators(); #endif @@ -842,7 +842,7 @@ void TQMenuBar::show() TQWidget::show(); #endif -#ifndef QT_NO_MAINWINDOW +#ifndef TQT_NO_MAINWINDOW TQMainWindow *mw = ::tqt_cast<TQMainWindow*>(parent()); if ( mw ) //### ugly workaround mw->triggerLayout(); @@ -860,7 +860,7 @@ void TQMenuBar::hide() TQWidget::hide(); setAltMode( FALSE ); hidePopups(); -#ifndef QT_NO_MAINWINDOW +#ifndef TQT_NO_MAINWINDOW TQMainWindow *mw = ::tqt_cast<TQMainWindow*>(parent()); if ( mw ) //### ugly workaround mw->triggerLayout(); @@ -1526,7 +1526,7 @@ void TQMenuBar::setAltMode( bool enable ) /*! Sets up keyboard accelerators for the menu bar. */ -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL void TQMenuBar::setupAccelerators() { @@ -1629,7 +1629,7 @@ TQSize TQMenuBar::sizeHint() const TQSize TQMenuBar::minimumSize() const { -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR TQToolBar *tb = ::tqt_cast<TQToolBar*>(parent()); if ( tb ) return sizeHint(); @@ -1680,4 +1680,4 @@ void TQMenuBar::activateItemAt( int index ) goodbye( FALSE ); } -#endif // QT_NO_MENUBAR +#endif // TQT_NO_MENUBAR diff --git a/src/widgets/qmenudata.cpp b/src/widgets/qmenudata.cpp index ef385ab1..f55ca509 100644 --- a/src/widgets/qmenudata.cpp +++ b/src/widgets/qmenudata.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqmenudata.h" -#ifndef QT_NO_MENUDATA +#ifndef TQT_NO_MENUDATA #include "ntqpopupmenu.h" #include "ntqmenubar.h" #include "ntqapplication.h" @@ -281,7 +281,7 @@ int TQMenuData::insertAny( const TQString *text, const TQPixmap *pixmap, newText.truncate( newText.findRev( '\t' ) ); mi->text_data = newText.isEmpty()?TQString():newText; #endif -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL mi->accel_key = TQt::Key_unknown; #endif if ( pixmap && !pixmap->isNull() ) @@ -424,7 +424,7 @@ int TQMenuData::insertItem( const TQString &text, { int actualID = insertAny( &text, 0, 0, 0, id, index ); connectItem( actualID, receiver, member ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL if ( accel ) setAccel( accel, actualID ); #endif @@ -452,7 +452,7 @@ int TQMenuData::insertItem( const TQIconSet& icon, { int actualID = insertAny( &text, 0, 0, &icon, id, index ); connectItem( actualID, receiver, member ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL if ( accel ) setAccel( accel, actualID ); #endif @@ -481,7 +481,7 @@ int TQMenuData::insertItem( const TQPixmap &pixmap, { int actualID = insertAny( 0, &pixmap, 0, 0, id, index ); connectItem( actualID, receiver, member ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL if ( accel ) setAccel( accel, actualID ); #endif @@ -514,7 +514,7 @@ int TQMenuData::insertItem( const TQIconSet& icon, { int actualID = insertAny( 0, &pixmap, 0, &icon, id, index ); connectItem( actualID, receiver, member ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL if ( accel ) setAccel( accel, actualID ); #endif @@ -857,7 +857,7 @@ void TQMenuData::clear() menuContentsChanged(); } -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL /*! Returns the accelerator key that has been defined for the menu @@ -931,7 +931,7 @@ void TQMenuData::setAccel( const TQKeySequence& key, int id ) } } -#endif // QT_NO_ACCEL +#endif // TQT_NO_ACCEL /*! Returns the icon set that has been set for menu item \a id, or 0 @@ -1019,7 +1019,7 @@ void TQMenuData::changeItem( int id, const TQString &text ) mi->pixmap_data = 0; } mi->text_data = text; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL if ( !mi->accel_key && text.find( '\t' ) != -1 ) mi->accel_key = TQt::Key_unknown; #endif @@ -1144,7 +1144,7 @@ void TQMenuData::setItemEnabled( int id, bool enable ) TQMenuItem *mi = findItem( id, &parent ); if ( mi && (bool)mi->is_enabled != enable ) { mi->is_enabled = enable; -#if !defined(QT_NO_ACCEL) && !defined(QT_NO_POPUPMENU) +#if !defined(TQT_NO_ACCEL) && !defined(TQT_NO_POPUPMENU) if ( mi->popup() ) mi->popup()->enableAccel( enable ); #endif @@ -1191,7 +1191,7 @@ void TQMenuData::setItemChecked( int id, bool check ) TQMenuItem *mi = findItem( id, &parent ); if ( mi && (bool)mi->is_checked != check ) { mi->is_checked = check; -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU if ( parent->isPopupMenu && !((TQPopupMenu *)parent)->isCheckable() ) ((TQPopupMenu *)parent)->setCheckable( TRUE ); #endif @@ -1280,7 +1280,7 @@ TQMenuItem * TQMenuData::findItem( int id, TQMenuData ** parent ) const it.toFirst(); while ( (mi=it.current()) ) { // search submenus ++it; -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU if ( mi->popup_menu ) { TQPopupMenu *p = mi->popup_menu; if (!p->avoid_circularity) { @@ -1587,13 +1587,13 @@ bool TQCustomMenuItem::isSeparator() const */ void TQMenuData::activateItemAt( int index ) { -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR if ( isMenuBar ) ( (TQMenuBar*)this )->activateItemAt( index ); else #endif { -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU if ( isPopupMenu ) ( (TQPopupMenu*)this )->activateItemAt( index ); #endif diff --git a/src/widgets/qmultilineedit.cpp b/src/widgets/qmultilineedit.cpp index e34d3f9b..09fe86a6 100644 --- a/src/widgets/qmultilineedit.cpp +++ b/src/widgets/qmultilineedit.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqmultilineedit.h" -#ifndef QT_NO_MULTILINEEDIT +#ifndef TQT_NO_MULTILINEEDIT #include "ntqpainter.h" #include "ntqscrollbar.h" #include "ntqcursor.h" diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp index a851abb2..79812185 100644 --- a/src/widgets/qpopupmenu.cpp +++ b/src/widgets/qpopupmenu.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqpopupmenu.h" -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU #include "ntqmenubar.h" #include "ntqaccel.h" #include "ntqpainter.h" @@ -123,7 +123,7 @@ static void popupSubMenuLater( int msec, TQPopupMenu * receiver ) { static bool preventAnimation = FALSE; -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS extern void qWhatsThisBDH(); static TQMenuItem* whatsThisItem = 0; #endif @@ -281,7 +281,7 @@ TQPopupMenu::TQPopupMenu( TQWidget *parent, const char *name ) d->scroll.scrolltimer = 0; d->hasmouse = 0; isPopupMenu = TRUE; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL autoaccel = 0; accelDisabled = FALSE; #endif @@ -387,7 +387,7 @@ void TQPopupMenu::performDelayedContentsChanged() { pendingDelayedContentsChanges = 0; // here the part the can be delayed -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL // if performDelayedStateChanged() will be called too, // it will call updateAccel() too, no need to do it twice if( !pendingDelayedStateChanges ) @@ -424,7 +424,7 @@ void TQPopupMenu::performDelayedStateChanged() { pendingDelayedStateChanges = 0; // here the part that can be delayed -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL updateAccel( 0 ); // ### when we have a good solution for the accel vs. focus widget problem, remove that. That is only a workaround // if you remove this, see performDelayedContentsChanged() #endif @@ -570,7 +570,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint ) y = sy; } #ifdef Q_WS_X11 -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR TQMenuData *top = this; // find top level while ( top->parentMenu ) top = top->parentMenu; @@ -648,7 +648,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint ) motion=0; actItem = -1; -#ifndef QT_NO_EFFECTS +#ifndef TQT_NO_EFFECTS int hGuess = tqApp->reverseLayout() ? TQEffects::LeftScroll : TQEffects::RightScroll; int vGuess = TQEffects::DownScroll; if ( tqApp->reverseLayout() ) { @@ -663,7 +663,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint ) hGuess = TQEffects::LeftScroll; } -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR if ( ( snapToMouse && ( y + h/2 < mouse.y() ) ) || ( parentMenu && parentMenu->isMenuBar && ( y + h/2 < ((TQMenuBar*)parentMenu)->mapToGlobal( ((TQMenuBar*)parentMenu)->pos() ).y() ) ) ) @@ -733,7 +733,7 @@ void TQPopupMenu::subHighlighted( int id ) static bool fromAccel = FALSE; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL void TQPopupMenu::accelActivated( int id ) { TQMenuItem *mi = findItem( id ); @@ -751,7 +751,7 @@ void TQPopupMenu::accelDestroyed() // accel about to be deleted { autoaccel = 0; // don't delete it twice! } -#endif //QT_NO_ACCEL +#endif //TQT_NO_ACCEL void TQPopupMenu::popupDestroyed( TQObject *o ) { @@ -767,7 +767,7 @@ void TQPopupMenu::actSig( int id, bool inwhatsthis ) TQAccessible::updateAccessibility( this, indexOf(id)+1, TQAccessible::MenuCommand ); #endif } else { -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS TQRect r( itemGeometry( indexOf( id ) ) ); TQPoint p( r.center().x(), r.bottom() ); TQString whatsThis = findItem( id )->whatsThis(); @@ -830,7 +830,7 @@ void TQPopupMenu::hideAllPopups() top = top->parentMenu; ((TQPopupMenu*)top)->hide(); // cascade from top level -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS if (whatsThisItem) { qWhatsThisBDH(); whatsThisItem = 0; @@ -876,7 +876,7 @@ bool TQPopupMenu::tryMenuBar( TQMouseEvent *e ) register TQMenuData *top = this; // find top level while ( top->parentMenu ) top = top->parentMenu; -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR return top->isMenuBar ? ((TQMenuBar *)top)->tryMouseEvent( this, e ) : ((TQPopupMenu*)top)->tryMouseEvent(this, e ); @@ -908,13 +908,13 @@ bool TQPopupMenu::tryMouseEvent( TQPopupMenu *p, TQMouseEvent * e) void TQPopupMenu::byeMenuBar() { -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR register TQMenuData *top = this; // find top level while ( top->parentMenu ) top = top->parentMenu; #endif hideAllPopups(); -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR if ( top->isMenuBar ) ((TQMenuBar *)top)->goodbye(); #endif @@ -1069,7 +1069,7 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize) } if(badSize || force_update) { -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL updateAccel( 0 ); #endif int height = 0; @@ -1248,7 +1248,7 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize) } -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL /*! \internal The \a parent is 0 when it is updated when a menu item has @@ -1300,7 +1300,7 @@ void TQPopupMenu::updateAccel( TQWidget *parent ) TQKeySequence k = mi->key(); if ( (int)k ) { int id = autoaccel->insertItem( k, mi->id() ); -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS autoaccel->setWhatsThis( id, mi->whatsThis() ); #endif } @@ -1422,7 +1422,7 @@ void TQPopupMenu::hide() #if defined(QT_ACCESSIBILITY_SUPPORT) TQAccessible::updateAccessibility( this, 0, TQAccessible::PopupMenuEnd ); #endif -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR TQMenuData *top = this; // find top level while ( top->parentMenu ) top = top->parentMenu; @@ -1712,13 +1712,13 @@ void TQPopupMenu::mouseReleaseEvent( TQMouseEvent *e ) } } TQPopupMenu *popup = mi->popup(); -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS bool b = TQWhatsThis::inWhatsThisMode(); #else const bool b = FALSE; #endif if ( !mi->isEnabledAndVisible() ) { -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS if ( b ) { actItem = -1; updateItem( mi->id() ); @@ -1869,7 +1869,7 @@ void TQPopupMenu::keyPressEvent( TQKeyEvent *e ) - ((e->state() & ControlButton) ? CTRL : 0) | - ((e->state() & AltButton) ? ALT : 0)); - - - #ifndef QT_NO_ACCEL + - #ifndef TQT_NO_ACCEL - if (mi) - setAccel(modifier + e->key(), mi->id()); - #endif @@ -1918,7 +1918,7 @@ void TQPopupMenu::keyPressEvent( TQKeyEvent *e ) { TQMenuData* p = parentMenu; hide(); -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR if ( p && p->isMenuBar ) ((TQMenuBar*) p)->goodbye( TRUE ); #endif @@ -1979,7 +1979,7 @@ void TQPopupMenu::keyPressEvent( TQKeyEvent *e ) { if ( actItem < 0 ) break; -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS bool b = TQWhatsThis::inWhatsThisMode(); #else const bool b = FALSE; @@ -2007,7 +2007,7 @@ void TQPopupMenu::keyPressEvent( TQKeyEvent *e ) } } break; -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS case Key_F1: if ( actItem < 0 || e->state() != ShiftButton) break; @@ -2076,7 +2076,7 @@ void TQPopupMenu::keyPressEvent( TQKeyEvent *e ) popup->setFirstItemActive(); } else { byeMenuBar(); -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS bool b = TQWhatsThis::inWhatsThisMode(); #else const bool b = FALSE; @@ -2099,7 +2099,7 @@ void TQPopupMenu::keyPressEvent( TQKeyEvent *e ) dy = indexOf( firstAfterCurrent->id() ) - actItem; } } -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR if ( !ok_key ) { // send to menu bar register TQMenuData *top = this; // find top level while ( top->parentMenu ) @@ -2584,7 +2584,7 @@ void TQPopupMenu::setActiveItem( int i ) } if ( mi->id() != -1 ) hilitSig( mi->id() ); -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS if (whatsThisItem && whatsThisItem != mi) { qWhatsThisBDH(); } @@ -2753,7 +2753,7 @@ void TQPopupMenu::toggleTearOff() TQPopupMenu* p = new TQPopupMenu( parentWidget(), "tear off menu" ); connect( p, SIGNAL( activated(int) ), this, SIGNAL( activated(int) ) ); connect( p, SIGNAL( highlighted(int) ), this, SIGNAL( highlighted(int) ) ); -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA p->setCaption( caption() ); #endif p->setCheckable( isCheckable() ); @@ -2799,13 +2799,13 @@ void TQPopupMenu::activateItemAt( int index ) } else { byeMenuBar(); // deactivate menu bar -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS bool b = TQWhatsThis::inWhatsThisMode(); #else const bool b = FALSE; #endif if ( !mi->isEnabledAndVisible() ) { -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS if ( b ) { actItem = -1; updateItem( mi->id() ); @@ -2833,7 +2833,7 @@ void TQPopupMenu::activateItemAt( int index ) } else { TQMenuData* p = parentMenu; hide(); -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR if ( p && p->isMenuBar ) ((TQMenuBar*) p)->goodbye( TRUE ); #endif @@ -2910,5 +2910,5 @@ int TQPopupMenu::menuItemHeight( TQMenuItem *mi, TQFontMetrics fm ) return h; } -#endif // QT_NO_POPUPMENU +#endif // TQT_NO_POPUPMENU diff --git a/src/widgets/qprogressbar.cpp b/src/widgets/qprogressbar.cpp index ec5424c3..0271ee68 100644 --- a/src/widgets/qprogressbar.cpp +++ b/src/widgets/qprogressbar.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqprogressbar.h" -#ifndef QT_NO_PROGRESSBAR +#ifndef TQT_NO_PROGRESSBAR #include "ntqpainter.h" #include "ntqdrawutil.h" #include "ntqpixmap.h" diff --git a/src/widgets/qpushbutton.cpp b/src/widgets/qpushbutton.cpp index e43ff240..469eb802 100644 --- a/src/widgets/qpushbutton.cpp +++ b/src/widgets/qpushbutton.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqpushbutton.h" -#ifndef QT_NO_PUSHBUTTON +#ifndef TQT_NO_PUSHBUTTON #include "ntqdialog.h" #include "ntqfontmetrics.h" #include "ntqpainter.h" @@ -260,11 +260,11 @@ public: {} ~TQPushButtonPrivate() { -#ifndef QT_NO_ICONSET +#ifndef TQT_NO_ICONSET delete iconset; #endif } -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU TQGuardedPtr<TQPopupMenu> popup; #endif TQIconSet* iconset; @@ -307,7 +307,7 @@ TQPushButton::TQPushButton( const TQString &text, TQWidget *parent, The \a parent and \a name arguments are sent to the TQWidget constructor. */ -#ifndef QT_NO_ICONSET +#ifndef TQT_NO_ICONSET TQPushButton::TQPushButton( const TQIconSet& icon, const TQString &text, TQWidget *parent, const char *name ) : TQButton( parent, name ) @@ -334,7 +334,7 @@ void TQPushButton::init() lastEnabled = FALSE; hasMenuArrow = FALSE; flt = FALSE; -#ifndef QT_NO_DIALOG +#ifndef TQT_NO_DIALOG autoDefButton = ::tqt_cast<TQDialog*>(topLevelWidget()) != 0; #else autoDefButton = FALSE; @@ -388,7 +388,7 @@ void TQPushButton::setDefault( bool enable ) if ( (bool)defButton == enable ) return; // no change defButton = enable; -#ifndef QT_NO_DIALOG +#ifndef TQT_NO_DIALOG if ( defButton && ::tqt_cast<TQDialog*>(topLevelWidget()) ) ((TQDialog*)topLevelWidget())->setMainDefault( this ); #endif @@ -409,7 +409,7 @@ TQSize TQPushButton::sizeHint() const int w = 0, h = 0; // calculate contents size... -#ifndef QT_NO_ICONSET +#ifndef TQT_NO_ICONSET if ( iconSet() && !iconSet()->isNull() ) { int iw = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4; int ih = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).height(); @@ -614,7 +614,7 @@ void TQPushButton::focusInEvent( TQFocusEvent *e ) { if (autoDefButton && !defButton) { defButton = TRUE; -#ifndef QT_NO_DIALOG +#ifndef TQT_NO_DIALOG if ( defButton && ::tqt_cast<TQDialog*>(topLevelWidget()) ) ((TQDialog*)topLevelWidget())->setDefault( this ); #endif @@ -627,7 +627,7 @@ void TQPushButton::focusInEvent( TQFocusEvent *e ) */ void TQPushButton::focusOutEvent( TQFocusEvent *e ) { -#ifndef QT_NO_DIALOG +#ifndef TQT_NO_DIALOG if ( defButton && autoDefButton ) { if ( ::tqt_cast<TQDialog*>(topLevelWidget()) ) ((TQDialog*)topLevelWidget())->setDefault( 0 ); @@ -635,14 +635,14 @@ void TQPushButton::focusOutEvent( TQFocusEvent *e ) #endif TQButton::focusOutEvent( e ); -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU if ( popup() && popup()->isVisible() ) // restore pressed status setDown( TRUE ); #endif } -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU /*! Associates the popup menu \a popup with this push button. This turns the button into a menu button. @@ -662,8 +662,8 @@ void TQPushButton::setPopup( TQPopupMenu* popup ) d->popup = popup; setIsMenuButton( popup != 0 ); } -#endif //QT_NO_POPUPMENU -#ifndef QT_NO_ICONSET +#endif //TQT_NO_POPUPMENU +#ifndef TQT_NO_ICONSET void TQPushButton::setIconSet( const TQIconSet& icon ) { if ( !d ) @@ -687,8 +687,8 @@ TQIconSet* TQPushButton::iconSet() const { return d ? d->iconset : 0; } -#endif // QT_NO_ICONSET -#ifndef QT_NO_POPUPMENU +#endif // TQT_NO_ICONSET +#ifndef TQT_NO_POPUPMENU /*! Returns the button's associated popup menu or 0 if no popup menu has been set. @@ -707,7 +707,7 @@ void TQPushButton::popupPressed() if ( isDown() && popup ) { bool horizontal = TRUE; bool topLeft = TRUE; // ### always TRUE -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR TQToolBar *tb = ::tqt_cast<TQToolBar*>(parentWidget()); if ( tb && tb->orientation() == Vertical ) horizontal = FALSE; diff --git a/src/widgets/qradiobutton.cpp b/src/widgets/qradiobutton.cpp index 10bbc8be..4d98e8a6 100644 --- a/src/widgets/qradiobutton.cpp +++ b/src/widgets/qradiobutton.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqradiobutton.h" -#ifndef QT_NO_RADIOBUTTON +#ifndef TQT_NO_RADIOBUTTON #include "ntqbuttongroup.h" #include "ntqpainter.h" #include "ntqdrawutil.h" @@ -138,7 +138,7 @@ void TQRadioButton::init() { setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); setToggleButton( TRUE ); -#ifndef QT_NO_BUTTONGROUP +#ifndef TQT_NO_BUTTONGROUP TQButtonGroup *bgrp = ::tqt_cast<TQButtonGroup*>(parentWidget()); if ( bgrp ) bgrp->setRadioButtonExclusive( TRUE ); @@ -197,7 +197,7 @@ void TQRadioButton::drawButton( TQPainter *paint ) TQRect irect = TQStyle::visualRect( style().subRect(TQStyle::SR_RadioButtonIndicator, this), this ); const TQColorGroup &cg = colorGroup(); -#if !defined( QT_NO_TEXTSTREAM ) && !defined( Q_WS_MACX ) +#if !defined( TQT_NO_TEXTSTREAM ) && !defined( Q_WS_MACX ) # define SAVE_RADIOBUTTON_PIXMAPS #endif #if defined(SAVE_RADIOBUTTON_PIXMAPS) diff --git a/src/widgets/qrangecontrol.cpp b/src/widgets/qrangecontrol.cpp index 7f1701ff..2aa8f86c 100644 --- a/src/widgets/qrangecontrol.cpp +++ b/src/widgets/qrangecontrol.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqrangecontrol.h" -#ifndef QT_NO_RANGECONTROL +#ifndef TQT_NO_RANGECONTROL #include "ntqglobal.h" #include <limits.h> diff --git a/src/widgets/qscrollbar.cpp b/src/widgets/qscrollbar.cpp index ecaa3b3f..b234f1f2 100644 --- a/src/widgets/qscrollbar.cpp +++ b/src/widgets/qscrollbar.cpp @@ -39,13 +39,13 @@ **********************************************************************/ #include "ntqscrollbar.h" -#ifndef QT_NO_SCROLLBAR +#ifndef TQT_NO_SCROLLBAR #include "ntqpainter.h" #include "ntqbitmap.h" #include "ntqapplication.h" #include "ntqtimer.h" #include "ntqstyle.h" -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR #include <ntqcursor.h> #endif #if defined(QT_ACCESSIBILITY_SUPPORT) @@ -452,7 +452,7 @@ void TQScrollBar::rangeChange() void TQScrollBar::doAutoRepeat() { bool sendRepeat = clickedAt; -#if !defined( QT_NO_CURSOR ) && !defined( QT_NO_STYLE ) +#if !defined( TQT_NO_CURSOR ) && !defined( TQT_NO_STYLE ) if(sendRepeat && (pressedControl == TQStyle::SC_ScrollBarAddPage || pressedControl == TQStyle::SC_ScrollBarSubPage) && style().styleHint(TQStyle::SH_ScrollBar_StopMouseOverSlider, this) && @@ -502,7 +502,7 @@ void TQScrollBar::stopAutoRepeat() /*! \reimp */ -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void TQScrollBar::wheelEvent( TQWheelEvent *e ) { static float offset = 0; diff --git a/src/widgets/qscrollview.cpp b/src/widgets/qscrollview.cpp index 1938ff23..c759a995 100644 --- a/src/widgets/qscrollview.cpp +++ b/src/widgets/qscrollview.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqwidget.h" -#ifndef QT_NO_SCROLLVIEW +#ifndef TQT_NO_SCROLLVIEW #include "ntqscrollbar.h" #include "ntqobjectlist.h" #include "ntqpainter.h" @@ -128,7 +128,7 @@ public: clipped_viewport( 0 ), flags( vpwflags ), vx( 0 ), vy( 0 ), vwidth( 1 ), vheight( 1 ), -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP autoscroll_timer( parent, "scrollview autoscroll timer" ), drag_autoscroll( TRUE ), #endif @@ -194,7 +194,7 @@ public: TQScrollView::ResizePolicy policy; TQScrollView::ScrollBarMode vMode; TQScrollView::ScrollBarMode hMode; -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP TQPoint cpDragStart; TQTimer autoscroll_timer; int autoscroll_time; @@ -585,7 +585,7 @@ TQScrollView::TQScrollView( TQWidget *parent, const char *name, WFlags f ) : WFlags flags = WResizeNoErase | (f&WPaintClever) | (f&WRepaintNoErase) | (f&WStaticContents); d = new TQScrollViewData( this, flags ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP connect( &d->autoscroll_timer, SIGNAL( timeout() ), this, SLOT( doDragAutoScroll() ) ); #endif @@ -1178,7 +1178,7 @@ void TQScrollView::mouseMoveEvent( TQMouseEvent *e ) //#### remove for 4.0 /*! \reimp */ -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void TQScrollView::wheelEvent( TQWheelEvent *e ) { TQWheelEvent ce( viewport()->mapFromGlobal( e->globalPos() ), @@ -1515,7 +1515,7 @@ bool TQScrollView::eventFilter( TQObject *obj, TQEvent *e ) if ( ((TQMouseEvent*)e)->isAccepted() ) return TRUE; break; -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP case TQEvent::DragEnter: viewportDragEnterEvent( (TQDragEnterEvent*)e ); break; @@ -1541,7 +1541,7 @@ bool TQScrollView::eventFilter( TQObject *obj, TQEvent *e ) stopDragAutoScroll(); viewportDropEvent( (TQDropEvent*)e ); break; -#endif // QT_NO_DRAGANDDROP +#endif // TQT_NO_DRAGANDDROP case TQEvent::ContextMenu: viewportContextMenuEvent( (TQContextMenuEvent*)e ); if ( ((TQContextMenuEvent*)e)->isAccepted() ) @@ -1610,7 +1610,7 @@ void TQScrollView::contentsMouseMoveEvent( TQMouseEvent* e ) e->ignore(); } -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP /*! This event handler is called whenever the TQScrollView receives a @@ -1648,14 +1648,14 @@ void TQScrollView::contentsDropEvent( TQDropEvent * ) { } -#endif // QT_NO_DRAGANDDROP +#endif // TQT_NO_DRAGANDDROP /*! This event handler is called whenever the TQScrollView receives a wheelEvent() in \a{e}: the mouse position is translated to be a point on the contents. */ -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void TQScrollView::contentsWheelEvent( TQWheelEvent * e ) { e->ignore(); @@ -1789,7 +1789,7 @@ void TQScrollView::viewportMouseMoveEvent( TQMouseEvent* e ) e->ignore(); } -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP /*!\internal @@ -1849,7 +1849,7 @@ void TQScrollView::viewportDropEvent( TQDropEvent* e ) e->setPoint(contentsToViewport(e->pos())); } -#endif // QT_NO_DRAGANDDROP +#endif // TQT_NO_DRAGANDDROP /*!\internal @@ -1859,7 +1859,7 @@ void TQScrollView::viewportDropEvent( TQDropEvent* e ) \sa TQWidget::wheelEvent() */ -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void TQScrollView::viewportWheelEvent( TQWheelEvent* e ) { /* @@ -2743,7 +2743,7 @@ void TQScrollView::drawContents( TQPainter * ) { } -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP /*! \internal @@ -2827,7 +2827,7 @@ bool TQScrollView::dragAutoScroll() const return d->drag_autoscroll; } -#endif // QT_NO_DRAGANDDROP +#endif // TQT_NO_DRAGANDDROP /*!\internal */ @@ -2851,4 +2851,4 @@ TQSize TQScrollView::cachedSizeHint() const return d->use_cached_size_hint ? d->cachedSizeHint : TQSize(); } -#endif // QT_NO_SCROLLVIEW +#endif // TQT_NO_SCROLLVIEW diff --git a/src/widgets/qslider.cpp b/src/widgets/qslider.cpp index fd8c3658..883065e0 100644 --- a/src/widgets/qslider.cpp +++ b/src/widgets/qslider.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqslider.h" -#ifndef QT_NO_SLIDER +#ifndef TQT_NO_SLIDER #include "ntqpainter.h" #include "ntqdrawutil.h" #include "ntqtimer.h" @@ -511,7 +511,7 @@ void TQSlider::mouseMoveEvent( TQMouseEvent *e ) /*! \reimp */ -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void TQSlider::wheelEvent( TQWheelEvent * e ) { if ( e->orientation() != orientation() && !rect().contains(e->pos()) ) diff --git a/src/widgets/qspinbox.cpp b/src/widgets/qspinbox.cpp index 44692688..a79b18d7 100644 --- a/src/widgets/qspinbox.cpp +++ b/src/widgets/qspinbox.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqspinbox.h" -#ifndef QT_NO_SPINBOX +#ifndef TQT_NO_SPINBOX #include "ntqcursor.h" #include "ntqpushbutton.h" @@ -710,7 +710,7 @@ void TQSpinBox::resizeEvent( TQResizeEvent* ) /*! \reimp */ -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void TQSpinBox::wheelEvent( TQWheelEvent * e ) { e->accept(); diff --git a/src/widgets/qspinwidget.cpp b/src/widgets/qspinwidget.cpp index 9c0b2cbb..7ea124cc 100644 --- a/src/widgets/qspinwidget.cpp +++ b/src/widgets/qspinwidget.cpp @@ -38,7 +38,7 @@ #include "ntqrangecontrol.h" -#ifndef QT_NO_SPINWIDGET +#ifndef TQT_NO_SPINWIDGET #include "ntqrect.h" #include "ntqtimer.h" @@ -292,7 +292,7 @@ void TQSpinWidget::mouseMoveEvent( TQMouseEvent *e ) /*! The event is passed in \a e. */ -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void TQSpinWidget::wheelEvent( TQWheelEvent *e ) { e->accept(); diff --git a/src/widgets/qsplashscreen.cpp b/src/widgets/qsplashscreen.cpp index 3aec8a23..a62fe745 100644 --- a/src/widgets/qsplashscreen.cpp +++ b/src/widgets/qsplashscreen.cpp @@ -38,7 +38,7 @@ #include "ntqsplashscreen.h" -#ifndef QT_NO_SPLASHSCREEN +#ifndef TQT_NO_SPLASHSCREEN #include "ntqapplication.h" #include "ntqpainter.h" @@ -268,4 +268,4 @@ void TQSplashScreen::drawContents( TQPainter *painter ) painter->drawText( r, d->currAlign, d->currStatus ); } -#endif //QT_NO_SPLASHSCREEN +#endif //TQT_NO_SPLASHSCREEN diff --git a/src/widgets/qsplitter.cpp b/src/widgets/qsplitter.cpp index f179a7ae..c9475762 100644 --- a/src/widgets/qsplitter.cpp +++ b/src/widgets/qsplitter.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqsplitter.h" -#ifndef QT_NO_SPLITTER +#ifndef TQT_NO_SPLITTER #include "ntqlayout.h" #include "../kernel/qlayoutengine_p.h" @@ -105,7 +105,7 @@ TQSize TQSplitterHandle::sizeHint() const void TQSplitterHandle::setOrientation( Orientation o ) { orient = o; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR setCursor( o == TQSplitter::Horizontal ? splitHCursor : splitVCursor ); #endif } @@ -1271,7 +1271,7 @@ void TQSplitter::updateHandles() recalc( isVisible() ); } -#ifndef QT_NO_TEXTSTREAM +#ifndef TQT_NO_TEXTSTREAM /*! \relates TQSplitter diff --git a/src/widgets/qstatusbar.cpp b/src/widgets/qstatusbar.cpp index 557d7ef7..d3d294d2 100644 --- a/src/widgets/qstatusbar.cpp +++ b/src/widgets/qstatusbar.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqstatusbar.h" -#ifndef QT_NO_STATUSBAR +#ifndef TQT_NO_STATUSBAR #include "ntqptrlist.h" #include "ntqlayout.h" @@ -127,7 +127,7 @@ public: TQBoxLayout * box; TQTimer * timer; -#ifndef QT_NO_SIZEGRIP +#ifndef TQT_NO_SIZEGRIP TQSizeGrip * resizer; #endif @@ -149,7 +149,7 @@ TQStatusBar::TQStatusBar( TQWidget * parent, const char *name ) d->box = 0; d->timer = 0; -#ifndef QT_NO_SIZEGRIP +#ifndef TQT_NO_SIZEGRIP d->resizer = 0; setSizeGripEnabled(TRUE); // causes reformat() #else @@ -260,7 +260,7 @@ void TQStatusBar::removeWidget( TQWidget* widget ) bool TQStatusBar::isSizeGripEnabled() const { -#ifdef QT_NO_SIZEGRIP +#ifdef TQT_NO_SIZEGRIP return FALSE; #else return !!d->resizer; @@ -269,7 +269,7 @@ bool TQStatusBar::isSizeGripEnabled() const void TQStatusBar::setSizeGripEnabled(bool enabled) { -#ifndef QT_NO_SIZEGRIP +#ifndef TQT_NO_SIZEGRIP if ( !enabled != !d->resizer ) { if ( enabled ) { d->resizer = new TQSizeGrip( this, "TQStatusBar::resizer" ); @@ -328,7 +328,7 @@ void TQStatusBar::reformat() item = d->items.next(); } l->addSpacing( 4 ); -#ifndef QT_NO_SIZEGRIP +#ifndef TQT_NO_SIZEGRIP if ( d->resizer ) { maxH = TQMAX( maxH, d->resizer->sizeHint().height() ); d->box->addSpacing( 1 ); @@ -451,7 +451,7 @@ void TQStatusBar::paintEvent( TQPaintEvent * ) TQPainter p( this ); TQStatusBarPrivate::SBItem* item = d->items.first(); -#ifndef QT_NO_SIZEGRIP +#ifndef TQT_NO_SIZEGRIP int psx = ( d->resizer && d->resizer->isVisible() ) ? d->resizer->x() : width()-12; #else int psx = width() - 12; @@ -502,7 +502,7 @@ bool TQStatusBar::event( TQEvent *e ) item = d->items.next(); } -#ifndef QT_NO_SIZEGRIP +#ifndef TQT_NO_SIZEGRIP if ( d->resizer ) maxH = TQMAX( maxH, d->resizer->sizeHint().height() ); #endif diff --git a/src/widgets/qsyntaxhighlighter.cpp b/src/widgets/qsyntaxhighlighter.cpp index 6c97ac51..e33f0113 100644 --- a/src/widgets/qsyntaxhighlighter.cpp +++ b/src/widgets/qsyntaxhighlighter.cpp @@ -41,7 +41,7 @@ #include "ntqsyntaxhighlighter.h" #include "private/qsyntaxhighlighter_p.h" -#ifndef QT_NO_SYNTAXHIGHLIGHTER +#ifndef TQT_NO_SYNTAXHIGHLIGHTER #include "../kernel/qrichtext_p.h" #include "ntqtextedit.h" #include "ntqtimer.h" diff --git a/src/widgets/qsyntaxhighlighter_p.h b/src/widgets/qsyntaxhighlighter_p.h index 594a73e5..156cc932 100644 --- a/src/widgets/qsyntaxhighlighter_p.h +++ b/src/widgets/qsyntaxhighlighter_p.h @@ -41,7 +41,7 @@ #ifndef TQSYNTAXHIGHLIGHTER_P_H #define TQSYNTAXHIGHLIGHTER_P_H -#ifndef QT_NO_SYNTAXHIGHLIGHTER +#ifndef TQT_NO_SYNTAXHIGHLIGHTER #include "ntqsyntaxhighlighter.h" #include "private/qrichtext_p.h" @@ -93,5 +93,5 @@ private: friend class TQTextEdit; }; -#endif // QT_NO_SYNTAXHIGHLIGHTER +#endif // TQT_NO_SYNTAXHIGHLIGHTER #endif // TQSYNTAXHIGHLIGHTER_P_H diff --git a/src/widgets/qtabbar.cpp b/src/widgets/qtabbar.cpp index db08012c..08e5f24f 100644 --- a/src/widgets/qtabbar.cpp +++ b/src/widgets/qtabbar.cpp @@ -37,7 +37,7 @@ **********************************************************************/ #include "ntqtabbar.h" -#ifndef QT_NO_TABBAR +#ifndef TQT_NO_TABBAR #include "ntqaccel.h" #include "ntqbitmap.h" #include "ntqtoolbutton.h" @@ -237,7 +237,7 @@ class TQTabBarToolTip; struct TQTabPrivate { int id; int focus; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQAccel * a; #endif TQTab *pressed; @@ -249,7 +249,7 @@ struct TQTabPrivate { TQTabBarToolTip * toolTips; }; -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP /* \internal */ class TQTabBarToolTip : public TQToolTip @@ -296,7 +296,7 @@ protected: if ( tb->d->scrolls && (rectL.contains( p ) || rectR.contains( p )) ) return; -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP // find and show the tool tip for the tab under the point p TQMapIterator<TQTab *, TQString> it; for ( it = tabTips.begin(); it != tabTips.end(); ++it ) { @@ -342,7 +342,7 @@ TQTabBar::TQTabBar( TQWidget * parent, const char *name ) d->id = 0; d->focus = 0; d->toolTips = 0; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL d->a = new TQAccel( this, "tab accelerators" ); connect( d->a, SIGNAL(activated(int)), this, SLOT(setCurrentTab(int)) ); connect( d->a, SIGNAL(activatedAmbiguously(int)), this, SLOT(setCurrentTab(int)) ); @@ -370,7 +370,7 @@ TQTabBar::TQTabBar( TQWidget * parent, const char *name ) TQTabBar::~TQTabBar() { -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP if ( d->toolTips ) delete d->toolTips; #endif @@ -434,7 +434,7 @@ int TQTabBar::insertTab( TQTab * newTab, int index ) updateArrowButtons(); makeVisible( tab( currentTab() ) ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL int p = TQAccel::shortcutKey( newTab->label ); if ( p ) d->a->insertItem( p, newTab->id ); @@ -450,11 +450,11 @@ int TQTabBar::insertTab( TQTab * newTab, int index ) void TQTabBar::removeTab( TQTab * t ) { //#### accelerator labels?? -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP if ( d->toolTips ) d->toolTips->remove( t ); #endif -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL if ( d->a ) d->a->removeItem( t->id ); #endif @@ -492,7 +492,7 @@ void TQTabBar::setTabEnabled( int id, bool enabled ) if ( t && t->id == id ) { if ( t->enabled != enabled ) { t->enabled = enabled; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL d->a->setItemEnabled( t->id, enabled ); #endif TQRect r( t->r ); @@ -1334,7 +1334,7 @@ void TQTabBar::updateArrowButtons() */ void TQTabBar::removeToolTip( int index ) { -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP TQTab * tab = tabAt( index ); if ( !tab || !d->toolTips ) return; @@ -1348,7 +1348,7 @@ void TQTabBar::removeToolTip( int index ) */ void TQTabBar::setToolTip( int index, const TQString & tip ) { -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP TQTab * tab = tabAt( index ); if ( !tab ) return; @@ -1363,7 +1363,7 @@ void TQTabBar::setToolTip( int index, const TQString & tip ) */ TQString TQTabBar::toolTip( int index ) const { -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP if ( d->toolTips ) return d->toolTips->tipForTab( tabAt( index ) ); else @@ -1378,7 +1378,7 @@ void TQTab::setText( const TQString& text ) { label = text; if ( tb ) { -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL tb->d->a->removeItem( id ); int p = TQAccel::shortcutKey( text ); if ( p ) diff --git a/src/widgets/qtabwidget.cpp b/src/widgets/qtabwidget.cpp index 43c9c76d..21436881 100644 --- a/src/widgets/qtabwidget.cpp +++ b/src/widgets/qtabwidget.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqtabwidget.h" -#ifndef QT_NO_TABWIDGET +#ifndef TQT_NO_TABWIDGET #include "ntqobjectlist.h" #include "ntqtabbar.h" #include "ntqapplication.h" diff --git a/src/widgets/qtextbrowser.cpp b/src/widgets/qtextbrowser.cpp index 3449fada..0cc40aa6 100644 --- a/src/widgets/qtextbrowser.cpp +++ b/src/widgets/qtextbrowser.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqtextbrowser.h" -#ifndef QT_NO_TEXTBROWSER +#ifndef TQT_NO_TEXTBROWSER #include "../kernel/qrichtext_p.h" #include "ntqapplication.h" @@ -227,7 +227,7 @@ void TQTextBrowser::reload() void TQTextBrowser::setSource(const TQString& name) { -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR if ( isVisible() ) tqApp->setOverrideCursor( waitCursor ); #endif @@ -262,7 +262,7 @@ void TQTextBrowser::setSource(const TQString& name) TQString firstTag = txt.left( txt.find( '>' ) + 1 ); if ( firstTag.left( 3 ) == "<qt" && firstTag.contains( "type" ) && firstTag.contains( "detail" ) ) { popupDetail( txt, TQCursor::pos() ); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR tqApp->restoreOverrideCursor(); #endif return; @@ -302,7 +302,7 @@ void TQTextBrowser::setSource(const TQString& name) else setContentsPos( 0, 0 ); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR if ( isVisible() ) tqApp->restoreOverrideCursor(); #endif @@ -552,4 +552,4 @@ void TQTextBrowser::emitLinkClicked( const TQString &s ) setSource( s ); } -#endif // QT_NO_TEXTBROWSER +#endif // TQT_NO_TEXTBROWSER diff --git a/src/widgets/qtextedit.cpp b/src/widgets/qtextedit.cpp index 67703f34..598093fb 100644 --- a/src/widgets/qtextedit.cpp +++ b/src/widgets/qtextedit.cpp @@ -40,10 +40,10 @@ #include "ntqtextedit.h" -#ifndef QT_NO_TEXTEDIT +#ifndef TQT_NO_TEXTEDIT // Keep this position to avoid patch rejection -#ifndef QT_NO_IM +#ifndef TQT_NO_IM #include "ntqinputcontext.h" #endif @@ -78,7 +78,7 @@ #include "private/qsyntaxhighlighter_p.h" #include <ntqguardedptr.h> -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL #include <ntqkeysequence.h> #define ACCEL_KEY(k) "\t" + TQString(TQKeySequence( TQt::CTRL | TQt::Key_ ## k )) #else @@ -100,7 +100,7 @@ public: TQTextEditPrivate() :preeditStart(-1),preeditLength(-1),ensureCursorVisibleInShowEvent(FALSE), tabChangesFocus(FALSE), -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD clipboard_mode( TQClipboard::Clipboard ), #endif #ifdef QT_TEXTEDIT_OPTIMIZATION @@ -123,7 +123,7 @@ public: TQString scrollToAnchor; // used to deferr scrollToAnchor() until the show event when we are resized TQString pressedName; TQString onName; -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD TQClipboard::Mode clipboard_mode; #endif TQTimer *trippleClickTimer; @@ -137,7 +137,7 @@ public: uint autoFormatting; }; -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME class TQRichTextDrag : public TQTextDrag { public: @@ -983,7 +983,7 @@ void TQTextEdit::init() setKeyCompression( TRUE ); viewport()->setMouseTracking( TRUE ); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor ); #endif cursor = new TQTextCursor( doc ); @@ -1007,7 +1007,7 @@ void TQTextEdit::init() connect( blinkTimer, SIGNAL( timeout() ), this, SLOT( blinkCursor() ) ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP dragStartTimer = new TQTimer( this ); connect( dragStartTimer, SIGNAL( timeout() ), this, SLOT( startDrag() ) ); @@ -1287,7 +1287,7 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e ) // Ctrl-Enter inserts a line break in rich text mode insert( TQString( TQChar( 0x2028) ), TRUE, FALSE ); } else { -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor ); #endif clearUndoRedoInfo = FALSE; @@ -1573,7 +1573,7 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e ) */ bool TQTextEdit::sendMouseEventToInputContext( TQMouseEvent *e ) { -#ifndef QT_NO_IM +#ifndef TQT_NO_IM if ( d->composeMode() ) { TQTextCursor c( doc ); if ( c.place( e->pos(), doc->firstParagraph(), FALSE, FALSE, FALSE ) ) { @@ -1843,7 +1843,7 @@ void TQTextEdit::doKeyboardAction( KeyboardAction action ) void TQTextEdit::readFormats( TQTextCursor &c1, TQTextCursor &c2, TQTextString &text, bool fillStyles ) { -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM TQDataStream styleStream( undoRedoInfo.styleInformation, IO_WriteOnly ); #endif c2.restoreState(); @@ -1852,7 +1852,7 @@ void TQTextEdit::readFormats( TQTextCursor &c1, TQTextCursor &c2, TQTextString & if ( c1.paragraph() == c2.paragraph() ) { for ( int i = c1.index(); i < c2.index(); ++i ) text.insert( lastIndex + i - c1.index(), c1.paragraph()->at( i ), TRUE ); -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM if ( fillStyles ) { styleStream << (int) 1; c1.paragraph()->writeStyleInformation( styleStream ); @@ -1872,7 +1872,7 @@ void TQTextEdit::readFormats( TQTextCursor &c1, TQTextCursor &c2, TQTextString & for ( i = 0; i < c2.index(); ++i ) text.insert( i + lastIndex, c2.paragraph()->at( i ), TRUE ); -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM if ( fillStyles ) { styleStream << num; for ( TQTextParagraph *p = c1.paragraph(); --num >= 0; p = p->next() ) @@ -1948,7 +1948,7 @@ void TQTextEdit::removeSelectedText( int selNum ) if ( contentsHeight() < visibleHeight() ) viewport()->repaint( 0, contentsHeight(), visibleWidth(), visibleHeight() - contentsHeight(), TRUE ); #endif -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor ); #endif updateMicroFocusHint(); @@ -2036,7 +2036,7 @@ void TQTextEdit::moveCursor( CursorAction action, bool select ) repaintChanged(); ensureCursorVisible(); drawCursor( TRUE ); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor ); #endif } @@ -2232,7 +2232,7 @@ enum { /*! \reimp */ -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void TQTextEdit::contentsWheelEvent( TQWheelEvent *e ) { if ( isReadOnly() ) { @@ -2303,7 +2303,7 @@ void TQTextEdit::contentsMousePressEvent( TQMouseEvent *e ) } } -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP if ( doc->inSelection( TQTextDocument::Standard, e->pos() ) ) { mightStartDrag = TRUE; drawCursor( TRUE ); @@ -2337,7 +2337,7 @@ void TQTextEdit::contentsMousePressEvent( TQMouseEvent *e ) drawCursor( TRUE ); } else { repaintChanged(); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor ); #endif } @@ -2347,7 +2347,7 @@ void TQTextEdit::contentsMousePressEvent( TQMouseEvent *e ) drawCursor( TRUE ); } else { repaintChanged(); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor ); #endif } @@ -2372,7 +2372,7 @@ void TQTextEdit::contentsMouseMoveEvent( TQMouseEvent *e ) if ( sendMouseEventToInputContext( e ) ) { // don't return from here to avoid cursor vanishing } else if ( mousePressed ) { -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP if ( mightStartDrag ) { dragStartTimer->stop(); if ( ( e->pos() - dragStartPos ).manhattanLength() > TQApplication::startDragDistance() ) { @@ -2381,7 +2381,7 @@ void TQTextEdit::contentsMouseMoveEvent( TQMouseEvent *e ) if (guard.isNull()) // we got deleted during the dnd return; } -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR if ( !isReadOnly() ) viewport()->setCursor( ibeamCursor ); #endif @@ -2393,7 +2393,7 @@ void TQTextEdit::contentsMouseMoveEvent( TQMouseEvent *e ) oldMousePos = mousePos; } -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR if ( !isReadOnly() && !mousePressed ) { if ( doc->hasSelection( TQTextDocument::Standard ) && doc->inSelection( TQTextDocument::Standard, e->pos() ) ) viewport()->setCursor( arrowCursor ); @@ -2406,7 +2406,7 @@ void TQTextEdit::contentsMouseMoveEvent( TQMouseEvent *e ) void TQTextEdit::copyToClipboard() { -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD if (TQApplication::clipboard()->supportsSelection()) { d->clipboard_mode = TQClipboard::Selection; @@ -2444,7 +2444,7 @@ void TQTextEdit::contentsMouseReleaseEvent( TQMouseEvent * e ) TQTextCursor oldCursor = *cursor; if ( scrollTimer->isActive() ) scrollTimer->stop(); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP if ( dragStartTimer->isActive() ) dragStartTimer->stop(); if ( mightStartDrag ) { @@ -2457,7 +2457,7 @@ void TQTextEdit::contentsMouseReleaseEvent( TQMouseEvent * e ) mousePressed = FALSE; copyToClipboard(); } -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD else if ( e->button() == MidButton && !isReadOnly() ) { // only do middle-click pasting on systems that have selections (ie. X11) if (TQApplication::clipboard()->supportsSelection()) { @@ -2479,7 +2479,7 @@ void TQTextEdit::contentsMouseReleaseEvent( TQMouseEvent * e ) drawCursor( TRUE ); } else { repaintChanged(); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR viewport()->setCursor( ibeamCursor ); #endif } @@ -2495,7 +2495,7 @@ void TQTextEdit::contentsMouseReleaseEvent( TQMouseEvent * e ) updateCurrentFormat(); inDoubleClick = FALSE; -#ifndef QT_NO_NETWORKPROTOCOL +#ifndef TQT_NO_NETWORKPROTOCOL if ( ( (!onLink.isEmpty() && onLink == pressedLink) || (!d->onName.isEmpty() && d->onName == d->pressedName)) && linksEnabled() && mouseWasPressed ) { @@ -2612,7 +2612,7 @@ void TQTextEdit::contentsMouseDoubleClickEvent( TQMouseEvent * e ) emit doubleClicked( para, index ); } -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP /*! \reimp @@ -2707,7 +2707,7 @@ void TQTextEdit::contentsDropEvent( TQDropEvent *e ) doc->removeSelection( TQTextDocument::Standard ); } else { doc->removeSelection( TQTextDocument::Standard ); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor ); #endif } @@ -2721,7 +2721,7 @@ void TQTextEdit::contentsDropEvent( TQDropEvent *e ) if ( e->provides( "application/x-qrichtext" ) ) subType = "x-qrichtext"; } -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD pasteSubType( subType.latin1(), e ); #endif // emit appropriate signals. @@ -2744,7 +2744,7 @@ void TQTextEdit::contentsDropEvent( TQDropEvent *e ) void TQTextEdit::contentsContextMenuEvent( TQContextMenuEvent *e ) { e->accept(); -#ifndef QT_NO_IM +#ifndef TQT_NO_IM if ( d->composeMode() ) return; #endif @@ -2752,7 +2752,7 @@ void TQTextEdit::contentsContextMenuEvent( TQContextMenuEvent *e ) clearUndoRedo(); mousePressed = FALSE; -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU TQGuardedPtr<TQTextEdit> that = this; TQGuardedPtr<TQPopupMenu> popup = createPopupMenu( e->pos() ); if ( !popup ) @@ -2769,7 +2769,7 @@ void TQTextEdit::contentsContextMenuEvent( TQContextMenuEvent *e ) clear(); else if ( r == d->id[ IdSelectAll ] ) { selectAll(); -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD // if the clipboard support selections, put the newly selected text into // the clipboard if (TQApplication::clipboard()->supportsSelection()) { @@ -2789,7 +2789,7 @@ void TQTextEdit::contentsContextMenuEvent( TQContextMenuEvent *e ) undo(); else if ( r == d->id[ IdRedo ] ) redo(); -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD else if ( r == d->id[ IdCut ] ) cut(); else if ( r == d->id[ IdCopy ] ) @@ -3287,7 +3287,7 @@ void TQTextEdit::undo() for ( int i = 0; i < (int)doc->numSelections(); ++i ) doc->removeSelection( i ); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor ); #endif @@ -3338,7 +3338,7 @@ void TQTextEdit::redo() for ( int i = 0; i < (int)doc->numSelections(); ++i ) doc->removeSelection( i ); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor ); #endif @@ -3372,7 +3372,7 @@ void TQTextEdit::redo() void TQTextEdit::paste() { -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD if ( isReadOnly() ) return; TQString subType = "plain"; @@ -3420,7 +3420,7 @@ void TQTextEdit::repaintChanged() paintDocument( FALSE, &p, contentsX(), contentsY(), visibleWidth(), visibleHeight() ); } -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME TQTextDrag *TQTextEdit::dragObject( TQWidget *parent ) const { if ( !doc->hasSelection( TQTextDocument::Standard ) || @@ -3456,14 +3456,14 @@ void TQTextEdit::cut() void TQTextEdit::normalCopy() { -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME TQTextDrag *drag = dragObject(); if ( !drag ) return; -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD TQApplication::clipboard()->setData( drag, d->clipboard_mode ); -#endif // QT_NO_MIMECLIPBOARD -#endif // QT_NO_MIME +#endif // TQT_NO_MIMECLIPBOARD +#endif // TQT_NO_MIME } /*! @@ -3474,7 +3474,7 @@ void TQTextEdit::normalCopy() void TQTextEdit::copy() { -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD # ifdef QT_TEXTEDIT_OPTIMIZATION if ( d->optimMode && optimHasSelection() ) TQApplication::clipboard()->setText( optimSelectedText(), d->clipboard_mode ); @@ -4051,7 +4051,7 @@ bool TQTextEdit::find( const TQString &expr, bool cs, bool wo, bool forward, return optimFind( expr, cs, wo, forward, para, index ); #endif drawCursor( FALSE ); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor ); #endif TQTextCursor findcur = *cursor; @@ -4524,7 +4524,7 @@ int TQTextEdit::alignment() const void TQTextEdit::startDrag() { -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP mousePressed = FALSE; inDoubleClick = FALSE; TQDragObject *drag = dragObject( viewport() ); @@ -4565,7 +4565,7 @@ void TQTextEdit::selectAll( bool select ) repaintChanged(); emit copyAvailable( doc->hasSelection( TQTextDocument::Standard ) ); emit selectionChanged(); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor ); #endif } @@ -4730,7 +4730,7 @@ bool TQTextEdit::linkUnderline() const \sa mimeSourceFactory() */ -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME void TQTextEdit::setMimeSourceFactory( TQMimeSourceFactory* factory ) { doc->setMimeSourceFactory( factory ); @@ -4896,7 +4896,7 @@ bool TQTextEdit::handleReadOnlyKeyEvent( TQKeyEvent *e ) case Key_F16: // Copy key on Sun keyboards copy(); break; -#ifndef QT_NO_NETWORKPROTOCOL +#ifndef TQT_NO_NETWORKPROTOCOL case Key_Return: case Key_Enter: case Key_Space: { @@ -4920,7 +4920,7 @@ bool TQTextEdit::handleReadOnlyKeyEvent( TQKeyEvent *e ) } } } -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor ); #endif } @@ -5083,7 +5083,7 @@ void TQTextEdit::setDocument( TQTextDocument *dc ) lastFormatted = 0; } -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD /*! Pastes the text with format \a subtype from the clipboard into the @@ -5098,7 +5098,7 @@ void TQTextEdit::setDocument( TQTextDocument *dc ) void TQTextEdit::pasteSubType( const TQCString &subtype ) { -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD TQMimeSource *m = TQApplication::clipboard()->data( d->clipboard_mode ); pasteSubType( subtype, m ); #endif @@ -5108,7 +5108,7 @@ void TQTextEdit::pasteSubType( const TQCString &subtype ) void TQTextEdit::pasteSubType( const TQCString& subtype, TQMimeSource *m ) { -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME TQCString st = subtype; if ( subtype != "x-qrichtext" ) st.prepend( "text/" ); @@ -5213,10 +5213,10 @@ void TQTextEdit::pasteSubType( const TQCString& subtype, TQMimeSource *m ) if ( !t.isEmpty() ) insert( t, FALSE, TRUE ); } -#endif //QT_NO_MIME +#endif //TQT_NO_MIME } -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD /*! Prompts the user to choose a type from a list of text types available, then copies text from the clipboard (if there is any) @@ -5231,11 +5231,11 @@ void TQTextEdit::pasteSpecial( const TQPoint& pt ) pasteSubType( st ); } #endif -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME TQCString TQTextEdit::pickSpecial( TQMimeSource* ms, bool always_ask, const TQPoint& pt ) { if ( ms ) { -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU TQPopupMenu popup( this, "qt_pickspecial_menu" ); TQString fmt; int n = 0; @@ -5273,8 +5273,8 @@ TQCString TQTextEdit::pickSpecial( TQMimeSource* ms, bool always_ask, const TQPo } return TQCString(); } -#endif // QT_NO_MIME -#endif // QT_NO_CLIPBOARD +#endif // TQT_NO_MIME +#endif // TQT_NO_CLIPBOARD /*! \enum TQTextEdit::WordWrap @@ -5641,14 +5641,14 @@ bool TQTextEdit::getParagraphFormat( int para, TQFont *font, TQColor *color, TQPopupMenu *TQTextEdit::createPopupMenu( const TQPoint& pos ) { Q_UNUSED( pos ) -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU TQPopupMenu *popup = new TQPopupMenu( this, "qt_edit_menu" ); if ( !isReadOnly() ) { d->id[ IdUndo ] = popup->insertItem( tr( "&Undo" ) + ACCEL_KEY( Z ) ); d->id[ IdRedo ] = popup->insertItem( tr( "&Redo" ) + ACCEL_KEY( Y ) ); popup->insertSeparator(); } -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD if ( !isReadOnly() ) d->id[ IdCut ] = popup->insertItem( tr( "Cu&t" ) + ACCEL_KEY( X ) ); d->id[ IdCopy ] = popup->insertItem( tr( "&Copy" ) + ACCEL_KEY( C ) ); @@ -5665,7 +5665,7 @@ TQPopupMenu *TQTextEdit::createPopupMenu( const TQPoint& pos ) d->id[ IdSelectAll ] = popup->insertItem( tr( "Select All" ) + ACCEL_KEY( A ) ); #endif -#ifndef QT_NO_IM +#ifndef TQT_NO_IM TQInputContext *qic = getInputContext(); if ( qic ) qic->addMenusTo( popup ); @@ -5673,7 +5673,7 @@ TQPopupMenu *TQTextEdit::createPopupMenu( const TQPoint& pos ) popup->setItemEnabled( d->id[ IdUndo ], !isReadOnly() && doc->commands()->isUndoAvailable() ); popup->setItemEnabled( d->id[ IdRedo ], !isReadOnly() && doc->commands()->isRedoAvailable() ); -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD popup->setItemEnabled( d->id[ IdCut ], !isReadOnly() && doc->hasSelection( TQTextDocument::Standard, TRUE ) ); #ifdef QT_TEXTEDIT_OPTIMIZATION popup->setItemEnabled( d->id[ IdCopy ], d->optimMode ? optimHasSelection() : doc->hasSelection( TQTextDocument::Standard, TRUE ) ); @@ -5897,7 +5897,7 @@ void TQTextEdit::setReadOnly( bool b ) if ( (bool) readonly == b ) return; readonly = b; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR if ( readonly ) viewport()->setCursor( arrowCursor ); else @@ -6085,7 +6085,7 @@ void TQTextEdit::updateCursor( const TQPoint & pos ) TQTextCursor c = *cursor; placeCursor( pos, &c, TRUE ); -#ifndef QT_NO_NETWORKPROTOCOL +#ifndef TQT_NO_NETWORKPROTOCOL bool insideParagRect = TRUE; if (c.paragraph() == doc->lastParagraph() && c.paragraph()->rect().y() + c.paragraph()->rect().height() < pos.y()) @@ -6105,14 +6105,14 @@ void TQTextEdit::updateCursor( const TQPoint & pos ) d->onName = TQString::null; if (!c.paragraph()->at( c.index() )->anchorHref().isEmpty() ) { -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR viewport()->setCursor( onLink.isEmpty() ? arrowCursor : pointingHandCursor ); #endif TQUrl u( doc->context(), onLink, TRUE ); emitHighlighted( u.toString( FALSE, FALSE ) ); } } else { -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor ); #endif onLink = TQString::null; @@ -6137,7 +6137,7 @@ void TQTextEdit::placeCursor( const TQPoint &pos, TQTextCursor *c ) /*! \internal */ void TQTextEdit::clipboardChanged() { -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD // don't listen to selection changes disconnect( TQApplication::clipboard(), SIGNAL(selectionChanged()), this, 0); #endif @@ -7474,4 +7474,4 @@ TQSyntaxHighlighter * TQTextEdit::syntaxHighlighter() const return 0; } -#endif //QT_NO_TEXTEDIT +#endif //TQT_NO_TEXTEDIT diff --git a/src/widgets/qtextview.cpp b/src/widgets/qtextview.cpp index 475236dc..b672bee3 100644 --- a/src/widgets/qtextview.cpp +++ b/src/widgets/qtextview.cpp @@ -40,7 +40,7 @@ #include "ntqtextview.h" -#ifndef QT_NO_TEXTVIEW +#ifndef TQT_NO_TEXTVIEW /*! \class TQTextView \brief The TQTextView class provides a rich-text viewer. diff --git a/src/widgets/qtitlebar.cpp b/src/widgets/qtitlebar.cpp index 8fc3ca46..d06e3dab 100644 --- a/src/widgets/qtitlebar.cpp +++ b/src/widgets/qtitlebar.cpp @@ -42,7 +42,7 @@ #include "qtitlebar_p.h" -#ifndef QT_NO_TITLEBAR +#ifndef TQT_NO_TITLEBAR #include <ntqcursor.h> #include "ntqapplication.h" @@ -55,14 +55,14 @@ #include "ntqpainter.h" #include "ntqstyle.h" #include "private/qinternal_p.h" -#ifndef QT_NO_WORKSPACE +#ifndef TQT_NO_WORKSPACE #include "ntqworkspace.h" #endif #if defined(Q_WS_WIN) #include "qt_windows.h" #endif -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP class TQTitleBarTip : public TQToolTip { public: @@ -120,7 +120,7 @@ public: break; } } -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA if ( tipstring.isEmpty() ) { if ( t->visibleText() != t->caption() ) tipstring = t->caption(); @@ -149,7 +149,7 @@ public: bool pressed :1; bool autoraise :1; TQString cuttext; -#ifdef QT_NO_WIDGET_TOPEXTRA +#ifdef TQT_NO_WIDGET_TOPEXTRA TQString cap; #endif }; @@ -159,7 +159,7 @@ TQTitleBar::TQTitleBar(TQWidget* w, TQWidget* parent, const char* name) { d = new TQTitleBarPrivate(); -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP d->toolTip = new TQTitleBarTip( this ); #endif d->window = w; @@ -169,7 +169,7 @@ TQTitleBar::TQTitleBar(TQWidget* w, TQWidget* parent, const char* name) setWFlags( ((TQTitleBar*)w)->getWFlags() | WNoAutoErase ); if ( w->minimumSize() == w->maximumSize() ) clearWFlags( WStyle_Maximize ); -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA setCaption( w->caption() ); #endif } else { @@ -183,7 +183,7 @@ TQTitleBar::TQTitleBar(TQWidget* w, TQWidget* parent, const char* name) TQTitleBar::~TQTitleBar() { -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP delete d->toolTip; #endif @@ -402,7 +402,7 @@ void TQTitleBar::mouseMoveEvent( TQMouseEvent * e) if ( d->buttonDown == TQStyle::SC_TitleBarLabel && d->movable && d->pressed ) { if ( (d->moveOffset - mapToParent( e->pos() ) ).manhattanLength() >= 4 ) { TQPoint p = mapFromGlobal(e->globalPos()); -#ifndef QT_NO_WORKSPACE +#ifndef TQT_NO_WORKSPACE if(d->window && d->window->parentWidget()->inherits("TQWorkspaceChild")) { TQWorkspace *workspace = ::tqt_cast<TQWorkspace*>(d->window->parentWidget()->parentWidget()); if(workspace) { @@ -505,7 +505,7 @@ void TQTitleBar::mouseDoubleClickEvent( TQMouseEvent *e ) } } -#ifdef QT_NO_WIDGET_TOPEXTRA +#ifdef TQT_NO_WIDGET_TOPEXTRA // We provide one, since titlebar is useless otherwise. TQString TQTitleBar::caption() const { @@ -537,7 +537,7 @@ void TQTitleBar::setCaption( const TQString& title ) { if( caption() == title) return; -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA TQWidget::setCaption( title ); #else d->cap = title; @@ -550,8 +550,8 @@ void TQTitleBar::setCaption( const TQString& title ) void TQTitleBar::setIcon( const TQPixmap& icon ) { -#ifndef QT_NO_WIDGET_TOPEXTRA -#ifndef QT_NO_IMAGE_SMOOTHSCALE +#ifndef TQT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_IMAGE_SMOOTHSCALE TQRect menur = style().querySubControlMetrics(TQStyle::CC_TitleBar, this, TQStyle::SC_TitleBarSysMenu); @@ -668,4 +668,4 @@ TQSize TQTitleBar::sizeHint() const return TQSize( menur.width(), style().pixelMetric( TQStyle::PM_TitleBarHeight, this ) ); } -#endif //QT_NO_TITLEBAR +#endif //TQT_NO_TITLEBAR diff --git a/src/widgets/qtitlebar_p.h b/src/widgets/qtitlebar_p.h index 2317b8da..d45ec071 100644 --- a/src/widgets/qtitlebar_p.h +++ b/src/widgets/qtitlebar_p.h @@ -60,7 +60,7 @@ #include "ntqlabel.h" #endif // QT_H -#if !defined(QT_NO_TITLEBAR) +#if !defined(TQT_NO_TITLEBAR) class TQToolTip; class TQTitleBarPrivate; @@ -90,7 +90,7 @@ public: TQSize sizeHint() const; -#ifdef QT_NO_WIDGET_TOPEXTRA +#ifdef TQT_NO_WIDGET_TOPEXTRA // We provide one, since titlebar is useless otherwise. TQString caption() const; #endif diff --git a/src/widgets/qtoolbar.cpp b/src/widgets/qtoolbar.cpp index 518d81c4..79b13a80 100644 --- a/src/widgets/qtoolbar.cpp +++ b/src/widgets/qtoolbar.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqtoolbar.h" -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR #include "ntqmainwindow.h" #include "ntqtooltip.h" @@ -631,7 +631,7 @@ void TQToolBar::createPopup() continue; } TQWidget *w = (TQWidget*)it.current(); -#ifndef QT_NO_COMBOBOX +#ifndef TQT_NO_COMBOBOX if ( ::tqt_cast<TQComboBox*>(w) ) j = 1; #endif @@ -672,11 +672,11 @@ void TQToolBar::createPopup() d->extensionPopup->setItemChecked( id, b->isOn() ); if ( !b->isEnabled() ) d->extensionPopup->setItemEnabled( id, FALSE ); -#ifndef QT_NO_COMBOBOX +#ifndef TQT_NO_COMBOBOX } else if ( ::tqt_cast<TQComboBox*>(w) ) { TQComboBox *c = (TQComboBox*)w; if ( c->count() != 0 ) { -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA TQString s = c->caption(); #else TQString s; @@ -706,7 +706,7 @@ void TQToolBar::createPopup() } } } -#endif //QT_NO_COMBOBOX +#endif //TQT_NO_COMBOBOX } } ++it; diff --git a/src/widgets/qtoolbox.cpp b/src/widgets/qtoolbox.cpp index d1c30012..40bfb6de 100644 --- a/src/widgets/qtoolbox.cpp +++ b/src/widgets/qtoolbox.cpp @@ -40,7 +40,7 @@ #include "ntqtoolbox.h" -#ifndef QT_NO_TOOLBOX +#ifndef TQT_NO_TOOLBOX #include <ntqbutton.h> #include <ntqlayout.h> @@ -690,4 +690,4 @@ void TQToolBox::itemRemoved( int index ) Q_UNUSED(index) } -#endif //QT_NO_TOOLBOX +#endif //TQT_NO_TOOLBOX diff --git a/src/widgets/qtoolbutton.cpp b/src/widgets/qtoolbutton.cpp index aa4ae4c1..74f3f4ad 100644 --- a/src/widgets/qtoolbutton.cpp +++ b/src/widgets/qtoolbutton.cpp @@ -40,7 +40,7 @@ #undef TQT_NO_COMPAT #include "ntqtoolbutton.h" -#ifndef QT_NO_TOOLBUTTON +#ifndef TQT_NO_TOOLBUTTON #include "ntqdrawutil.h" #include "ntqpainter.h" @@ -61,7 +61,7 @@ class TQToolButtonPrivate { // ### add tool tip magic here public: -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU TQGuardedPtr<TQPopupMenu> popup; TQTimer* popupTimer; int delay; @@ -143,7 +143,7 @@ TQToolButton::TQToolButton( TQWidget * parent, const char *name ) : TQButton( parent, name ) { init(); -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR TQToolBar* tb = ::tqt_cast<TQToolBar*>(parent); if ( tb ) { setAutoRaise( TRUE ); @@ -192,7 +192,7 @@ void TQToolButton::init() { d = new TQToolButtonPrivate; d->textPos = Under; -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU d->delay = 600; d->popup = 0; d->popupTimer = 0; @@ -215,7 +215,7 @@ void TQToolButton::init() setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); } -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR /*! Constructs a tool button called \a name, that is a child of \a @@ -249,7 +249,7 @@ TQToolButton::TQToolButton( const TQIconSet& iconSet, const TQString &textLabel, } else { setUsesBigPixmap( FALSE ); } -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP if ( !textLabel.isEmpty() ) { if ( !grouptext.isEmpty() && parent->mainWindow() ) TQToolTip::add( this, textLabel, @@ -271,7 +271,7 @@ TQToolButton::TQToolButton( const TQIconSet& iconSet, const TQString &textLabel, TQToolButton::~TQToolButton() { -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU d->popupTimer = 0; d->popup = 0; #endif @@ -352,7 +352,7 @@ TQSize TQToolButton::sizeHint() const } } -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU if ( popup() && ! popupDelay() ) w += style().pixelMetric(TQStyle::PM_MenuButtonIndicator, this); #endif @@ -467,7 +467,7 @@ void TQToolButton::drawButton( TQPainter * p ) if (isDown()) active |= TQStyle::SC_ToolButton; -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU if (d->popup && !d->delay) { controls |= TQStyle::SC_ToolButtonMenu; if (d->instantPopup || isDown()) @@ -585,7 +585,7 @@ void TQToolButton::mousePressEvent( TQMouseEvent *e ) TQStyle::SC_ToolButtonMenu), this ); d->instantPopup = (popupr.isValid() && popupr.contains(e->pos())); -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU if ( d->discardNextMouseEvent ) { d->discardNextMouseEvent = FALSE; d->instantPopup = FALSE; @@ -607,7 +607,7 @@ void TQToolButton::mousePressEvent( TQMouseEvent *e ) */ bool TQToolButton::eventFilter( TQObject *o, TQEvent *e ) { -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU if ( o != d->popup ) return TQButton::eventFilter( o, e ); switch ( e->type() ) { @@ -638,7 +638,7 @@ bool TQToolButton::uses3D() const { return style().styleHint(TQStyle::SH_ToolButton_Uses3D) && (!autoRaise() || ( hasMouse() && isEnabled() ) -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU || ( d->popup && d->popup->isVisible() && d->delay <= 0 ) || d->instantPopup #endif ); @@ -670,7 +670,7 @@ void TQToolButton::setTextLabel( const TQString &newLabel , bool tipToo ) if ( tl == newLabel ) return; -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP if ( tipToo ) { TQToolTip::remove( this ); TQToolTip::add( this, newLabel ); @@ -836,7 +836,7 @@ TQIconSet TQToolButton::iconSet( bool /* on */ ) const #endif -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU /*! Associates the popup menu \a popup with this tool button. @@ -911,7 +911,7 @@ void TQToolButton::popupTimerDone() d->repeat = autoRepeat(); setAutoRepeat( FALSE ); bool horizontal = TRUE; -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR TQToolBar *tb = ::tqt_cast<TQToolBar*>(parentWidget()); if ( tb && tb->orientation() == Vertical ) horizontal = FALSE; @@ -1029,7 +1029,7 @@ void TQToolButton::setText( const TQString &txt ) } } -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE /*! \reimp */ diff --git a/src/widgets/qtooltip.cpp b/src/widgets/qtooltip.cpp index 93091437..5d3cae19 100644 --- a/src/widgets/qtooltip.cpp +++ b/src/widgets/qtooltip.cpp @@ -37,7 +37,7 @@ **********************************************************************/ #include "ntqtooltip.h" -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP #include "ntqlabel.h" #include "ntqptrdict.h" #include "ntqapplication.h" @@ -570,7 +570,7 @@ void TQTipManager::showTip() if ( label->text().length() ) { label->move( p ); -#ifndef QT_NO_EFFECTS +#ifndef TQT_NO_EFFECTS if ( TQApplication::isEffectEnabled( UI_AnimateTooltip ) == FALSE || previousTip || preventAnimation ) label->show(); diff --git a/src/widgets/qvalidator.cpp b/src/widgets/qvalidator.cpp index 20c86bfc..c2397254 100644 --- a/src/widgets/qvalidator.cpp +++ b/src/widgets/qvalidator.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqvalidator.h" -#ifndef QT_NO_VALIDATOR +#ifndef TQT_NO_VALIDATOR #include <limits.h> #include <math.h> @@ -346,7 +346,7 @@ void TQIntValidator::setTop( int top ) } -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP /*! \class TQDoubleValidator diff --git a/src/widgets/qvbox.cpp b/src/widgets/qvbox.cpp index 975c2416..8236c1a4 100644 --- a/src/widgets/qvbox.cpp +++ b/src/widgets/qvbox.cpp @@ -40,7 +40,7 @@ #include "ntqvbox.h" -#ifndef QT_NO_VBOX +#ifndef TQT_NO_VBOX /*! \class TQVBox ntqvbox.h diff --git a/src/widgets/qvbuttongroup.cpp b/src/widgets/qvbuttongroup.cpp index c817d3c9..206d7cd7 100644 --- a/src/widgets/qvbuttongroup.cpp +++ b/src/widgets/qvbuttongroup.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqvbuttongroup.h" -#ifndef QT_NO_VBUTTONGROUP +#ifndef TQT_NO_VBUTTONGROUP /*! \class TQVButtonGroup ntqvbuttongroup.h diff --git a/src/widgets/qvgroupbox.cpp b/src/widgets/qvgroupbox.cpp index 5ae77bab..de48909b 100644 --- a/src/widgets/qvgroupbox.cpp +++ b/src/widgets/qvgroupbox.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqvgroupbox.h" -#ifndef QT_NO_VGROUPBOX +#ifndef TQT_NO_VGROUPBOX /*! \class TQVGroupBox ntqvgroupbox.h diff --git a/src/widgets/qwhatsthis.cpp b/src/widgets/qwhatsthis.cpp index 2a61fec8..cd87acd5 100644 --- a/src/widgets/qwhatsthis.cpp +++ b/src/widgets/qwhatsthis.cpp @@ -37,7 +37,7 @@ **********************************************************************/ #include "ntqwhatsthis.h" -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS #include "ntqapplication.h" #include "ntqpaintdevicemetrics.h" #include "ntqpixmap.h" @@ -163,7 +163,7 @@ protected: private: TQString text; -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT TQSimpleRichText* doc; #endif TQString anchor; @@ -247,7 +247,7 @@ TQWhatsThat::TQWhatsThat( TQWidget* w, const TQString& txt, TQWidget* parent, co setBackgroundMode( NoBackground ); setPalette( TQToolTip::palette() ); setMouseTracking( TRUE ); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR setCursor( arrowCursor ); #endif @@ -256,7 +256,7 @@ TQWhatsThat::TQWhatsThat( TQWidget* w, const TQString& txt, TQWidget* parent, co TQRect r; -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT doc = 0; if ( TQStyleSheet::mightBeRichText( text ) ) { TQFont f = TQApplication::font( this ); @@ -291,7 +291,7 @@ TQWhatsThat::~TQWhatsThat() { if ( wt && wt->whatsThat == this ) wt->whatsThat = 0; -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT if ( doc ) delete doc; #endif @@ -309,7 +309,7 @@ void TQWhatsThat::mousePressEvent( TQMouseEvent* e ) { pressed = TRUE; if ( e->button() == LeftButton && rect().contains( e->pos() ) ) { -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT if ( doc ) anchor = doc->anchorAt( e->pos() - TQPoint( hMargin, vMargin) ); #endif @@ -322,7 +322,7 @@ void TQWhatsThat::mouseReleaseEvent( TQMouseEvent* e ) { if ( !pressed ) return; -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT if ( e->button() == LeftButton && doc && rect().contains( e->pos() ) ) { TQString a = doc->anchorAt( e->pos() - TQPoint( hMargin, vMargin ) ); TQString href; @@ -341,8 +341,8 @@ void TQWhatsThat::mouseReleaseEvent( TQMouseEvent* e ) void TQWhatsThat::mouseMoveEvent( TQMouseEvent* e) { -#ifndef QT_NO_RICHTEXT -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_RICHTEXT +#ifndef TQT_NO_CURSOR if ( !doc ) return; TQString a = doc->anchorAt( e->pos() - TQPoint( hMargin, vMargin ) ); @@ -402,7 +402,7 @@ void TQWhatsThat::paintEvent( TQPaintEvent* ) p.setPen( colorGroup().foreground() ); r.addCoords( hMargin, vMargin, -hMargin, -vMargin ); -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT if ( doc ) { doc->draw( &p, r.x(), r.y(), r, colorGroup(), 0 ); } @@ -471,7 +471,7 @@ void TQWhatsThisButton::mouseReleased() { if ( wt->state == TQWhatsThisPrivate::Inactive && isOn() ) { TQWhatsThisPrivate::setUpWhatsThis(); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQApplication::setOverrideCursor( whatsThisCursor, FALSE ); #endif wt->state = TQWhatsThisPrivate::Waiting; @@ -501,7 +501,7 @@ TQWhatsThisPrivate::TQWhatsThisPrivate() TQWhatsThisPrivate::~TQWhatsThisPrivate() { -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR if ( state == Waiting && tqApp ) TQApplication::restoreOverrideCursor(); #endif @@ -639,7 +639,7 @@ void TQWhatsThisPrivate::leaveWhatsThisMode() ++it; b->setOn( FALSE ); } -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQApplication::restoreOverrideCursor(); #endif state = Inactive; @@ -919,7 +919,7 @@ void TQWhatsThis::enterWhatsThisMode() TQWhatsThisPrivate::setUpWhatsThis(); if ( wt->state == TQWhatsThisPrivate::Inactive ) { wt->enterWhatsThisMode(); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQApplication::setOverrideCursor( whatsThisCursor, FALSE ); #endif wt->state = TQWhatsThisPrivate::Waiting; diff --git a/src/widgets/qwidgetinterface_p.h b/src/widgets/qwidgetinterface_p.h index 38505841..5cfd43e4 100644 --- a/src/widgets/qwidgetinterface_p.h +++ b/src/widgets/qwidgetinterface_p.h @@ -56,7 +56,7 @@ #include "ntqiconset.h" #endif // QT_H -#ifndef QT_NO_WIDGETPLUGIN +#ifndef TQT_NO_WIDGETPLUGIN class TQWidget; @@ -141,5 +141,5 @@ public: }; #endif // QT_CONTAINER_CUSTOM_WIDGETS -#endif // QT_NO_WIDGETPLUGIN +#endif // TQT_NO_WIDGETPLUGIN #endif // TQWIDGETINTERFACE_P_H diff --git a/src/widgets/qwidgetplugin.cpp b/src/widgets/qwidgetplugin.cpp index 58c1e2c0..7d73ef96 100644 --- a/src/widgets/qwidgetplugin.cpp +++ b/src/widgets/qwidgetplugin.cpp @@ -40,7 +40,7 @@ #include "ntqwidgetplugin.h" -#ifndef QT_NO_WIDGETPLUGIN +#ifndef TQT_NO_WIDGETPLUGIN #include "qwidgetinterface_p.h" #include "ntqobjectcleanuphandler.h" #include "ntqwidget.h" @@ -726,4 +726,4 @@ TQString TQWidgetContainerPlugin::createCode( const TQString &, const TQString & #endif // QT_CONTAINER_CUSTOM_WIDGETS -#endif //QT_NO_WIDGETPLUGIN +#endif //TQT_NO_WIDGETPLUGIN diff --git a/src/widgets/qwidgetresizehandler.cpp b/src/widgets/qwidgetresizehandler.cpp index 80339a4f..f1bc7362 100644 --- a/src/widgets/qwidgetresizehandler.cpp +++ b/src/widgets/qwidgetresizehandler.cpp @@ -40,7 +40,7 @@ #include "qwidgetresizehandler_p.h" -#ifndef QT_NO_RESIZEHANDLER +#ifndef TQT_NO_RESIZEHANDLER #include "ntqframe.h" #include "ntqapplication.h" #include "ntqcursor.h" @@ -113,7 +113,7 @@ bool TQWidgetResizeHandler::eventFilter( TQObject *o, TQEvent *ee ) TQWidget *w = childOf( widget, (TQWidget*)o ); if ( !w -#ifndef QT_NO_SIZEGRIP +#ifndef TQT_NO_SIZEGRIP || ::tqt_cast<TQSizeGrip*>(o) #endif || tqApp->activePopupWidget() ) { @@ -200,7 +200,7 @@ void TQWidgetResizeHandler::mouseMoveEvent( TQMouseEvent *e ) if ( widget->isMinimized() || !isActive(Resize) ) mode = Center; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR setMouseCursor( mode ); #endif return; @@ -315,7 +315,7 @@ void TQWidgetResizeHandler::mouseMoveEvent( TQMouseEvent *e ) void TQWidgetResizeHandler::setMouseCursor( MousePosition m ) { -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR switch ( m ) { case TopLeft: case BottomRight: @@ -365,7 +365,7 @@ void TQWidgetResizeHandler::keyPressEvent( TQKeyEvent * e ) mode = BottomLeft; else if ( mode == TopRight ) mode = TopLeft; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR setMouseCursor( mode ); widget->grabMouse( widget->cursor() ); #else @@ -390,7 +390,7 @@ void TQWidgetResizeHandler::keyPressEvent( TQKeyEvent * e ) mode = BottomRight; else if ( mode == TopLeft ) mode = TopRight; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR setMouseCursor( mode ); widget->grabMouse( widget->cursor() ); #else @@ -415,7 +415,7 @@ void TQWidgetResizeHandler::keyPressEvent( TQKeyEvent * e ) mode = TopLeft; else if ( mode == BottomRight ) mode = TopRight; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR setMouseCursor( mode ); widget->grabMouse( widget->cursor() ); #else @@ -440,7 +440,7 @@ void TQWidgetResizeHandler::keyPressEvent( TQKeyEvent * e ) mode = BottomLeft; else if ( mode == TopRight ) mode = BottomRight; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR setMouseCursor( mode ); widget->grabMouse( widget->cursor() ); #else @@ -484,7 +484,7 @@ void TQWidgetResizeHandler::doResize() mode = BottomRight; } invertedMoveOffset = widget->rect().bottomRight() - moveOffset; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR setMouseCursor( mode ); widget->grabMouse( widget->cursor() ); #else @@ -505,7 +505,7 @@ void TQWidgetResizeHandler::doMove() buttonDown = TRUE; moveOffset = widget->mapFromGlobal( TQCursor::pos() ); invertedMoveOffset = widget->rect().bottomRight() - moveOffset; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR widget->grabMouse( SizeAllCursor ); #else widget->grabMouse(); @@ -513,4 +513,4 @@ void TQWidgetResizeHandler::doMove() widget->grabKeyboard(); } -#endif //QT_NO_RESIZEHANDLER +#endif //TQT_NO_RESIZEHANDLER diff --git a/src/widgets/qwidgetresizehandler_p.h b/src/widgets/qwidgetresizehandler_p.h index c86ada5d..c65f47bd 100644 --- a/src/widgets/qwidgetresizehandler_p.h +++ b/src/widgets/qwidgetresizehandler_p.h @@ -56,7 +56,7 @@ #ifndef QT_H #include "ntqobject.h" #endif // QT_H -#ifndef QT_NO_RESIZEHANDLER +#ifndef TQT_NO_RESIZEHANDLER class TQMouseEvent; class TQKeyEvent; @@ -133,5 +133,5 @@ private: // Disabled copy constructor and operator= }; -#endif //QT_NO_RESIZEHANDLER +#endif //TQT_NO_RESIZEHANDLER #endif diff --git a/src/widgets/qwidgetstack.cpp b/src/widgets/qwidgetstack.cpp index d6adf42d..8024901f 100644 --- a/src/widgets/qwidgetstack.cpp +++ b/src/widgets/qwidgetstack.cpp @@ -41,7 +41,7 @@ #include "ntqwidgetstack.h" #include "ntqlayout.h" #include "../kernel/qlayoutengine_p.h" -#ifndef QT_NO_WIDGETSTACK +#ifndef TQT_NO_WIDGETSTACK #include "ntqobjectlist.h" #include "ntqfocusdata.h" @@ -559,7 +559,7 @@ TQSize TQWidgetStack::sizeHint() const sh.rwidth() = 0; if ( w->sizePolicy().verData() == TQSizePolicy::Ignored ) sh.rheight() = 0; -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT size = size.expandedTo( sh ).expandedTo( qSmartMinSize(w) ); #endif } @@ -589,7 +589,7 @@ TQSize TQWidgetStack::minimumSizeHint() const sh.rwidth() = 0; if ( w->sizePolicy().verData() == TQSizePolicy::Ignored ) sh.rheight() = 0; -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT size = size.expandedTo( sh ).expandedTo( w->minimumSize() ); #endif } |