trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: February 2012

Re: [trinity-devel] Patch for building tdegraphics

From: "Timothy Pearson" <kb9vqf@...>
Date: Tue, 21 Feb 2012 13:35:44 -0600
> Recently I reported that tdegraphics failed to build against TQt3 but
> built without error against Qt3.
>
> I patched tdegraphics and now can build tdegraphics against both.
>
> Although the patch works I'm uncomfortable pushing to GIT without peer
> review. I would appreciate somebody else reviewing and committing the
> patch.
>
> Here is the patch:
>
> =======================================================
> diff -urN tdesdk/cervisia/qttableview.cpp
> tdesdk.new/cervisia/qttableview.cpp
> --- tdesdk/cervisia/qttableview.cpp 2011-12-25 01:15:21.000000000 -0600
> +++ tdesdk.new/cervisia/qttableview.cpp 2012-02-20 22:27:57.000000000
> -0600
> @@ -1073,7 +1073,7 @@
>      coveringCornerSquare = enable;
>      if ( !cornerSquare && enable ) {
>   cornerSquare = new TQCornerSquare( this );
> - Q_CHECK_PTR( cornerSquare );
> + TQ_CHECK_PTR( cornerSquare );
>   cornerSquare->setGeometry( maxViewX() + frameWidth() + 1,
>            maxViewY() + frameWidth() + 1,
>                                     VSBEXT,
> @@ -1448,7 +1448,7 @@
>   sb->setCursor( arrowCursor );
>  #endif
>          sb->resize( sb->sizeHint() ); // height is irrelevant
> - Q_CHECK_PTR(sb);
> + TQ_CHECK_PTR(sb);
>   sb->setTracking( FALSE );
>   sb->setFocusPolicy( TQ_NoFocus );
>   connect( sb, TQT_SIGNAL(valueChanged(int)),
> @@ -1480,7 +1480,7 @@
>  #endif
>   sb->resize( sb->sizeHint() ); // width is irrelevant
>   sb->setFocusPolicy( TQ_NoFocus );
> - Q_CHECK_PTR(sb);
> + TQ_CHECK_PTR(sb);
>   sb->setTracking( FALSE );
>   connect( sb, TQT_SIGNAL(valueChanged(int)),
>      TQT_SLOT(horSbValue(int)));
> =======================================================
>
> Thanks.
>
> Darrell

Hi Darrell,

I am still trying to rebuild TDE myself, fixing build failures as I go. :-)

In this case, this was fixed yesterday in GIT hash 19c822c4, so I can
state that your proposed fix was correct.

Tim