On 03/10/2012 05:07 PM, David C. Rankin wrote:
On 03/10/2012 04:38 PM, David C. Rankin wrote:
On 03/10/2012 04:32 PM, David C. Rankin wrote:
No, we're seeing the same thing:
16:30 nirvana:~/tde/tde/main> grep qt_cast tdelibs/tdefx/kstyle.cpp if ( TQFrame *frame = ::tqqt_cast< TQFrame* >( widget ) ) { if ( TQFrame *frame = ::tqqt_cast< TQFrame* >( widget ) ) { && (frame = ::tqqt_cast<TQFrame*>(object)) ) TQToolBar *toolbar = ::tqqt_cast< TQToolBar *>( frame ); if (::tqqt_cast<TQPopupMenu*>(p)) kstyle->renderMenuBlendPixmap( blendPix, cg, ::tqqt_cast<TQPopupMenu*>(p) ); if (::tqqt_cast<TQPopupMenu*>(p)) ::tqqt_cast<TQPopupMenu*>(p) );
This is what I SHOULD have -- right?
Hold on -- I just kicked off another build after manually cleaning the chroot. I think since I didn't increment the pkgversion variables, that it might have pulled in an old file.
NO, something is broken. I just started from scratch again and:
[ 4%] Building CXX object tdefx/CMakeFiles/tdefx-shared.dir/kstyle.cpp.o /build/src/tdelibs/tdefx/kstyle.cpp: In member function 'virtual void KStyle::polish(TQWidget*)': /build/src/tdelibs/tdefx/kstyle.cpp:266:25: error: '::tqt_cast' has not been declared /build/src/tdelibs/tdefx/kstyle.cpp:266:45: error: expected primary-expression before '*' token /build/src/tdelibs/tdefx/kstyle.cpp:266:47: error: expected primary-expression before '>' token /build/src/tdelibs/tdefx/kstyle.cpp: In member function 'virtual void KStyle::unPolish(TQWidget*)': /build/src/tdelibs/tdefx/kstyle.cpp:287:25: error: '::tqt_cast' has not been declared /build/src/tdelibs/tdefx/kstyle.cpp:287:45: error: expected primary-expression before '*' token /build/src/tdelibs/tdefx/kstyle.cpp:287:47: error: expected primary-expression before '>' token /build/src/tdelibs/tdefx/kstyle.cpp: In member function 'virtual bool KStyle::eventFilter(TQObject*, TQEvent*)': /build/src/tdelibs/tdefx/kstyle.cpp:1905:17: error: '::tqt_cast' has not been declared /build/src/tdelibs/tdefx/kstyle.cpp:1905:36: error: expected primary-expression before '*' token /build/src/tdelibs/tdefx/kstyle.cpp:1905:37: error: expected primary-expression before '>' token /build/src/tdelibs/tdefx/kstyle.cpp:1912:25: error: '::tqt_cast' has not been declared /build/src/tdelibs/tdefx/kstyle.cpp:1912:48: error: expected primary-expression before '*' token /build/src/tdelibs/tdefx/kstyle.cpp:1912:49: error: expected primary-expression before '>' token /build/src/tdelibs/tdefx/kstyle.cpp: In member function 'void {anonymous}::TransparencyHandler::blendToPixmap(const TQColorGroup&, const TQWidget*)': /build/src/tdelibs/tdefx/kstyle.cpp:2295:6: error: '::tqt_cast' has not been declared /build/src/tdelibs/tdefx/kstyle.cpp:2295:29: error: expected primary-expression before '*' token /build/src/tdelibs/tdefx/kstyle.cpp:2295:30: error: expected primary-expression before '>' token /build/src/tdelibs/tdefx/kstyle.cpp:2296:48: error: '::tqt_cast' has not been declared /build/src/tdelibs/tdefx/kstyle.cpp:2296:71: error: expected primary-expression before '*' token /build/src/tdelibs/tdefx/kstyle.cpp:2296:72: error: expected primary-expression before '>' token /build/src/tdelibs/tdefx/kstyle.cpp: In member function 'void {anonymous}::TransparencyHandler::XRenderBlendToPixmap(const TQWidget*)': /build/src/tdelibs/tdefx/kstyle.cpp:2317:6: error: '::tqt_cast' has not been declared /build/src/tdelibs/tdefx/kstyle.cpp:2317:29: error: expected primary-expression before '*' token /build/src/tdelibs/tdefx/kstyle.cpp:2317:30: error: expected primary-expression before '>' token /build/src/tdelibs/tdefx/kstyle.cpp:2319:7: error: '::tqt_cast' has not been declared /build/src/tdelibs/tdefx/kstyle.cpp:2319:30: error: expected primary-expression before '*' token /build/src/tdelibs/tdefx/kstyle.cpp:2319:31: error: expected primary-expression before '>' token make[2]: *** [tdefx/CMakeFiles/tdefx-shared.dir/kstyle.cpp.o] Error 1 make[1]: *** [tdefx/CMakeFiles/tdefx-shared.dir/all] Error 2 make: *** [all] Error 2
Just redid the git-pull and cleaned the chroot again. Same error - is there a possibility that some of the collisions between commits that we were worried about yesterday actually happened? Because, the code I have is this:
17:44 nirvana:~/tde/scr> grep qt_cast ../tde/main/tdelibs/tdefx/kstyle.cpp if ( TQFrame *frame = ::tqqt_cast< TQFrame* >( widget ) ) { if ( TQFrame *frame = ::tqqt_cast< TQFrame* >( widget ) ) { && (frame = ::tqqt_cast<TQFrame*>(object)) ) TQToolBar *toolbar = ::tqqt_cast< TQToolBar *>( frame ); if (::tqqt_cast<TQPopupMenu*>(p)) kstyle->renderMenuBlendPixmap( blendPix, cg, ::tqqt_cast<TQPopupMenu*>(p) ); if (::tqqt_cast<TQPopupMenu*>(p)) ::tqqt_cast<TQPopupMenu*>(p) );
but the error I get is this:
/build/src/tdelibs/tdefx/kstyle.cpp: In member function 'virtual void KStyle::polish(TQWidget*)': /build/src/tdelibs/tdefx/kstyle.cpp:266:25: error: '::tqt_cast' has not been declared <snip>
Looking at the tqtinterface code for qt_cast, I see:
17:59 nirvana:~/tde/tde/main> grep -r qt_cast dependencies/tqtinterface/ dependencies/tqtinterface/qtinterface/tqt.h.cmake:#define tqqt_cast tqt_cast dependencies/tqtinterface/qtinterface/tqt.h.cmake:#define tqqt_cast qt_cast dependencies/tqtinterface/qtinterface/tqt.h.cmake:#define tqt_cast qt_cast dependencies/tqtinterface/qtinterface/tqt.h.cmake:#define tqqt_cast qobject_cast dependencies/tqtinterface/qtinterface/convert_qt_tqt2:find ./ -type f -iname "*.c*" -exec sed -i 's/::qt_cast/tqqt_cast/g' {} ;
Is this correct?