|
From: Joachim E. <joa...@gm...> - 2005-01-12 08:16:19
|
Hi Phil,
Your problem is compiler-specific: (gcc<=2.96?)
Change lines 465-467 like this:
caption = ( f1.isEmpty()? QString("") : ".../"+f1 );
caption += QString(caption.isEmpty() || f2.isEmpty() ? QString("") : " <-> ")
+ ( f2.isEmpty()? QString("") : ".../"+f2 );
caption += QString(caption.isEmpty() || f3.isEmpty() ? QString("") : " <-> ")
+ ( f3.isEmpty()? QString("") : ".../"+f3 ) ;
If any similar errors occur: Cast the char-string to a QString as was done
above.
Cheers,
Joachim
On Wednesday 12 January 2005 01:37, Robert Orr wrote:
> Hi Joachim,
>
> Getting a little compile error using qt-3.3.3
> Maybe I should try Qt 3.1???
>
> Maybe you already know what it is with 3.3.3 that is
> causing the problem in pdiff.cpp?
>
> Phil
>
> make -f Makefile.qt
> g++ -c -Wall -W -O2 -D_REENTRANT -DQT_NO_DEBUG
> -DQT_THREAD_SUPPORT
> -DQT_SHARED
> -I/export/users/reyes/temp/mntnaz7/Qt/qt-x11-free-3.3.3/mkspecs/default
> -I. -I. -Ikreplacements
> -I/u/reyes/temp/mntnaz7/Qt/Qt_mt_Dyn/include -o
> pdiff.o pdiff.cpp
> pdiff.cpp: In method `void KDiff3App::init(bool =
> false,
> TotalDiffStatus * = 0)':
> pdiff.cpp:465: ambiguous overload for `bool ? const
> char[1] : const
> QString'
> pdiff.cpp:465: candidates are: operator ?:(bool,
> QString, QString)
> <builtin>
> pdiff.cpp:465: operator ?:(bool,
> basic_string<char,string_char_traits<char>,__default_alloc_template<false,0
>>
>
> >, string)
>
> <builtin>
> pdiff.cpp:465: operator ?:(bool, const
> char *, const
> char *) <builtin>
> pdiff.cpp:466: ambiguous overload for `bool ? const
> char[1] : const
> QString'
> pdiff.cpp:466: candidates are: operator ?:(bool,
> QString, QString)
> <builtin>
> pdiff.cpp:466: operator ?:(bool,
> basic_string<char,string_char_traits<char>,__default_alloc_template<false,0
>>
>
> >, string)
>
> <builtin>
> pdiff.cpp:466: operator ?:(bool, const
> char *, const
> char *) <builtin>
> pdiff.cpp:467: ambiguous overload for `bool ? const
> char[1] : const
> QString'
> pdiff.cpp:467: candidates are: operator ?:(bool,
> QString, QString)
> <builtin>
> pdiff.cpp:467: operator ?:(bool,
> basic_string<char,string_char_traits<char>,__default_alloc_template<false,0
>>
>
> >, string)
>
> <builtin>
> pdiff.cpp:467: operator ?:(bool, const
> char *, const
> char *) <builtin>
> pdiff.cpp:470: ambiguous overload for `bool ? const
> char[7] : const
> QString'
> pdiff.cpp:470: candidates are: operator ?:(bool,
> QString, QString)
> <builtin>
> pdiff.cpp:470: operator ?:(bool,
> basic_string<char,string_char_traits<char>,__default_alloc_template<false,0
>>
>
> >, string)
>
> <builtin>
> pdiff.cpp:470: operator ?:(bool, const
> char *, const
> char *) <builtin>
> pdiff.cpp: In function `void
> mergeChooseGlobal(KDiff3App *,
> MergeResultWindow *, int, bool, bool)':
> pdiff.cpp:1444: warning: unused parameter `class
> KDiff3App * pThis'
> make: *** [pdiff.o] Error 1
>
>
>
>
> __________________________________________________
> Do You Yahoo!?
> Tired of spam? Yahoo! Mail has the best spam protection around
> http://mail.yahoo.com
>
>
> -------------------------------------------------------
> The SF.Net email is sponsored by: Beat the post-holiday blues
> Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
> It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user
|