diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-07-09 23:09:59 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-07-09 23:09:59 +0900 |
commit | 83991febd2b98788a0a018e187de0dfb7d95b500 (patch) | |
tree | ec363502a3d11082cc54d17b7969f8ba605e1f01 /src/widgets | |
parent | 48ea22d00b58a37508567756b2955582cd9efe5a (diff) | |
download | tqt3-83991febd2b98788a0a018e187de0dfb7d95b500.tar.gz tqt3-83991febd2b98788a0a018e187de0dfb7d95b500.zip |
Remove Qt4 related stuff
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/ntqtextedit.h | 3 | ||||
-rw-r--r-- | src/widgets/ntqtoolbutton.h | 3 | ||||
-rw-r--r-- | src/widgets/qaction.cpp | 3 | ||||
-rw-r--r-- | src/widgets/qbutton.cpp | 3 | ||||
-rw-r--r-- | src/widgets/qpopupmenu.cpp | 16 | ||||
-rw-r--r-- | src/widgets/qscrollview.cpp | 7 | ||||
-rw-r--r-- | src/widgets/qtextedit.cpp | 4 | ||||
-rw-r--r-- | src/widgets/qwidgetstack.cpp | 5 |
8 files changed, 0 insertions, 44 deletions
diff --git a/src/widgets/ntqtextedit.h b/src/widgets/ntqtextedit.h index 6e9a3861f..b103cc29d 100644 --- a/src/widgets/ntqtextedit.h +++ b/src/widgets/ntqtextedit.h @@ -458,9 +458,6 @@ protected: protected slots: virtual void doChangeInterval(); void sliderReleased(); // ### make virtual in 4.0 -#if (TQT_VERSION >= 0x040000) -#error "Some functions need to be changed to virtual for TQt 4.0" -#endif private slots: void formatMore(); diff --git a/src/widgets/ntqtoolbutton.h b/src/widgets/ntqtoolbutton.h index 0ece3a9fc..48d222f94 100644 --- a/src/widgets/ntqtoolbutton.h +++ b/src/widgets/ntqtoolbutton.h @@ -139,9 +139,6 @@ protected: // ### Make virtual in 4.0, maybe act like TQPushButton with // regards to setFlat() instead? Andy bool uses3D() const; -#if (TQT_VERSION >= 0x040000) -#error "Some functions need to be changed to virtual for TQt 4.0" -#endif bool eventFilter( TQObject *o, TQEvent *e ); diff --git a/src/widgets/qaction.cpp b/src/widgets/qaction.cpp index 7498b4730..14bb57433 100644 --- a/src/widgets/qaction.cpp +++ b/src/widgets/qaction.cpp @@ -958,9 +958,6 @@ void TQAction::setVisible( bool visible ) return; d->visible = visible; d->update( TQActionPrivate::Visibility ); -#if (TQT_VERSION-0 >= 0x040000) -#error "TQAction::setVisible function wants to be virtual. Also add virtual change() function" -#endif if ( d->d_group ) //### this function wants to be virtual in 4.0 d->d_group->update( (TQActionGroup*) this ); } diff --git a/src/widgets/qbutton.cpp b/src/widgets/qbutton.cpp index e5d172f32..00d90fc94 100644 --- a/src/widgets/qbutton.cpp +++ b/src/widgets/qbutton.cpp @@ -675,9 +675,6 @@ bool TQButton::hitButton( const TQPoint &pos ) const \sa drawButtonLabel(), paintEvent() */ -#if (TQT_VERSION-0 >= 0x040000) -#error "TQButton. Make pure virtual" -#endif void TQButton::drawButton( TQPainter * ) { return; diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp index 61f144f6e..051ef6d0b 100644 --- a/src/widgets/qpopupmenu.cpp +++ b/src/widgets/qpopupmenu.cpp @@ -502,22 +502,6 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint ) return; #endif -#if (TQT_VERSION-0 >= 0x040000) -#error "Fix this now" - // #### should move to TQWidget - anything might need this functionality, - // #### since anything can have WType_Popup window flag. - // #### This includes stuff in TQPushButton and some stuff for setting - // #### the geometry of TQDialog. - // TQPopupMenu - // ::exec() - // ::popup() - // TQPushButton (shouldn't require TQMenuPopup) - // ::popupPressed - // Some stuff in qwidget.cpp for dialogs... can't remember exactly. - // Also the code here indicatets the parameter should be a rect, not a - // point. -#endif - TQRect screen = screenRect( geometry().center()); TQRect screen2 = screenRect( TQApplication::reverseLayout() ? pos+TQPoint(width(),0) : pos ); diff --git a/src/widgets/qscrollview.cpp b/src/widgets/qscrollview.cpp index c759a9952..67bf56fea 100644 --- a/src/widgets/qscrollview.cpp +++ b/src/widgets/qscrollview.cpp @@ -2097,13 +2097,6 @@ void TQScrollView::moveContents(int x, int y) d->hideOrShowAll(this, TRUE ); } -#if (TQT_VERSION-0 >= 0x040000) -#if defined(Q_CC_GNU) -#warning "Should rename contents{X,Y,Width,Height} to viewport{...}" -#endif -// Because it's the viewport rectangle that is "moving", not the contents. -#endif - /*! \property TQScrollView::contentsX \brief the X coordinate of the contents that are at the left edge of diff --git a/src/widgets/qtextedit.cpp b/src/widgets/qtextedit.cpp index 598093fbc..fac5ca2b9 100644 --- a/src/widgets/qtextedit.cpp +++ b/src/widgets/qtextedit.cpp @@ -5014,10 +5014,6 @@ void TQTextEdit::scrollToAnchor( const TQString& name ) } } -#if (TQT_VERSION-0 >= 0x040000) -#error "function anchorAt(const TQPoint& pos) should be merged into function anchorAt(const TQPoint& pos, AnchorAttribute attr)" -#endif - /*! \overload diff --git a/src/widgets/qwidgetstack.cpp b/src/widgets/qwidgetstack.cpp index 8024901f1..457376191 100644 --- a/src/widgets/qwidgetstack.cpp +++ b/src/widgets/qwidgetstack.cpp @@ -67,11 +67,6 @@ public: }; -#if (TQT_VERSION-0 >= 0x040000) -#if defined(Q_CC_GNU) -#warning "Remove TQWidgetStackEventFilter" -#endif -#endif class TQWidgetStackEventFilter : public TQObject { /* For binary compatibility, since we cannot implement virtual |