From: Michael J. <mrm...@ho...> - 2008-01-18 20:11:49
|
> > And for STRINGS(BLAH) should the T_ macro be used, or a different one ?= > STRINGS?Sorry my bad, STRING(BLAH), looking though most end up getting co= nverted via Text::toT anyway so i've used the T_ macro for them. Some don't though mainly in HubFrame.cpp, e.g. speak(ADD_STATUS_LINE, STRING(REDIRECT_ALREADY_CONNECTED)); =20 > > Also what macro should be used in the dcpp area ?> same as win32 Okay, just that most in dcpp use STRING, only 7 in ADLSearch.h and 1 in Uti= l.cpp use either TSTRING or CTSTRING e.g. tstring SourceTypeToDisplayString(SourceType t) { switch(t) { default: = case OnlyFile: return TSTRING(FILENAME); case OnlyDirectory: return TSTRI= NG(DIRECTORY); case FullPath: return TSTRING(ADLS_FULL_PATH); } } =20 So for them wouldn't it be better to use STRING (for now), and let the win3= 2 area deal with converting them to a tstring ? Since they are getting converted to a "DisplayString" i would have thought = that's win32's job.=20 =20 As for this from Util.cpp _sntprintf(buf, 128, _T("%s %s"), buf, CTSTRING(B)); =20 i've changed it to this on my working copy _sntprintf(buf, 128, _T("%s %s"), buf, Text::toT(STRING(B)).c_str()); =20 If that's acceptable, and same as moving the ones in ADLSearch that'll leav= e no TSTRING and CTSTRING in the dcpp area. :) =20 thanks MikeJJ _________________________________________________________________ Get Hotmail on your mobile, text MSN to 63463! http://mobile.uk.msn.com/pc/mail.aspx= |