SF.net SVN: mahogany:[7539] trunk/M
[email protected] Thu, 07 Aug 2008 23:22:48 +0000
| Newsgroups | gmane.mail.mahogany.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision: 7539
http://mahogany.svn.sourceforge.net/mahogany/?rev=7539&view=rev
Author: vadz
Date: 2008-08-07 23:22:46 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
get rid of more _T()s
Modified Paths:
--------------
trunk/M/include/MInterface.cpp.m4
trunk/M/include/MInterface.h.m4
trunk/M/include/MInterface.mid
trunk/M/include/gui/wxMDialogs.h
trunk/M/src/gui/wxDialogLayout.cpp
trunk/M/src/gui/wxMApp.cpp
trunk/M/src/gui/wxMDialogs.cpp
trunk/M/src/gui/wxMFolderDialogs.cpp
trunk/M/src/gui/wxMIMETreeDialog.cpp
trunk/M/src/mail/SendMessageCC.cpp
trunk/M/src/util/strutil.cpp
trunk/M/src/util/upgrade.cpp
Modified: trunk/M/include/MInterface.cpp.m4
===================================================================
--- trunk/M/include/MInterface.cpp.m4 2008-08-07 22:47:22 UTC (rev 7538)
+++ trunk/M/include/MInterface.cpp.m4 2008-08-07 23:22:46 UTC (rev 7539)
@@ -116,9 +116,9 @@
virtual void MessageDialog (
-const wxChar * message, const wxWindow * parent,
-const wxChar * title,
-const wxChar * configPath )
+const String & message, const wxWindow * parent,
+const String & title,
+const char * configPath )
{
Modified: trunk/M/include/MInterface.h.m4
===================================================================
--- trunk/M/include/MInterface.h.m4 2008-08-07 22:47:22 UTC (rev 7538)
+++ trunk/M/include/MInterface.h.m4 2008-08-07 23:22:46 UTC (rev 7539)
@@ -86,9 +86,9 @@
virtual void MessageDialog (
-const wxChar * message , const wxWindow * parent =NULL,
-const wxChar * title =MDIALOG_MSGTITLE,
-const wxChar * configPath =NULL )
+const wxString & message , const wxWindow * parent =NULL,
+const wxString & title =MDIALOG_MSGTITLE,
+const char * configPath =NULL )
= 0;
Modified: trunk/M/include/MInterface.mid
===================================================================
--- trunk/M/include/MInterface.mid 2008-08-07 22:47:22 UTC (rev 7538)
+++ trunk/M/include/MInterface.mid 2008-08-07 23:22:46 UTC (rev 7539)
@@ -71,9 +71,9 @@
')
FUNCTION(MessageDialog, void , (
-ARG(STRING, message), ARG(const wxWindow *, parent, =NULL),
-ARG(STRING, title, =MDIALOG_MSGTITLE),
-ARG(STRING, configPath, =NULL) )
+ARG(const String &, message), ARG(const wxWindow *, parent, =NULL),
+ARG(const String &, title, =MDIALOG_MSGTITLE),
+ARG(STRINGA, configPath, =NULL) )
,
`
MDialog_Message(message,parent,title,configPath);
Modified: trunk/M/include/gui/wxMDialogs.h
===================================================================
--- trunk/M/include/gui/wxMDialogs.h 2008-08-07 22:47:22 UTC (rev 7538)
+++ trunk/M/include/gui/wxMDialogs.h 2008-08-07 23:22:46 UTC (rev 7539)
@@ -133,9 +133,9 @@
@param title title for message box window
@param modal true to make messagebox modal
*/
-void MDialog_ErrorMessage(wxChar const *message,
+void MDialog_ErrorMessage(const wxString& message,
const wxWindow *parent = NULL,
- wxChar const *title = MDIALOG_ERRTITLE,
+ const wxString& title = MDIALOG_ERRTITLE,
bool modal = false);
/** display system error message:
@@ -144,9 +144,9 @@
@param title title for message box window
@param modal true to make messagebox modal
*/
-void MDialog_SystemErrorMessage(wxChar const *message,
+void MDialog_SystemErrorMessage(const wxString& message,
const wxWindow *parent = NULL,
- wxChar const *title = MDIALOG_SYSERRTITLE,
+ const wxString& title = MDIALOG_SYSERRTITLE,
bool modal = false);
/** display error message and exit application
@@ -154,9 +154,9 @@
@param title title for message box window
@param parent the parent frame
*/
-void MDialog_FatalErrorMessage(wxChar const *message,
+void MDialog_FatalErrorMessage(const wxString& message,
const wxWindow *parent = NULL,
- wxChar const *title = MDIALOG_FATALERRTITLE);
+ const wxString& title = MDIALOG_FATALERRTITLE);
/** display normal message and, if configPath != NULL, give a user a checkbox
"don't show this message again" which allows not to show the same message
@@ -168,10 +168,10 @@
@return TRUE if Ok was pressed, FALSE if Cancel
*/
-bool MDialog_Message(wxChar const *message,
+bool MDialog_Message(const wxString& message,
const wxWindow *parent = NULL,
- wxChar const *title = MDIALOG_MSGTITLE,
- const wxChar *configPath = NULL,
+ const wxString& title = MDIALOG_MSGTITLE,
+ const char *configPath = NULL,
int flags = 0);
/** profile-aware Yes/No dialog: if persMsg is not NULL, it has a "don't show
@@ -187,9 +187,9 @@
@return true if yes was selected
*/
-bool MDialog_YesNoDialog(wxChar const *message,
+bool MDialog_YesNoDialog(const wxString& message,
const wxWindow *parent = NULL,
- wxChar const *title = MDIALOG_YESNOTITLE,
+ const wxString& title = MDIALOG_YESNOTITLE,
int flags = M_DLG_YES_DEFAULT,
const MPersMsgBox *persMsg = NULL,
const wxChar *folderName = NULL);
@@ -206,9 +206,9 @@
@return M_DLG_ if yes was chosen, 0 if no and -1 if cancel
*/
-MDlgResult MDialog_YesNoCancel(wxChar const *message,
+MDlgResult MDialog_YesNoCancel(const wxString& message,
const wxWindow *parent = NULL,
- wxChar const *title = MDIALOG_YESNOTITLE,
+ const wxString& title = MDIALOG_YESNOTITLE,
int flags = M_DLG_YES_DEFAULT,
const MPersMsgBox *persMsg = NULL);
@@ -220,8 +220,8 @@
and size and may be NULL
*/
void MDialog_ShowText(wxWindow *parent,
- const wxChar *title,
- const wxChar *text,
+ const wxString& title,
+ const wxString& text,
const char *configPath = NULL);
} // extern "C"
@@ -237,11 +237,11 @@
@return TRUE if Ok was pressed, FALSE if Cancel
*/
-bool MDialog_Message(wxChar const *message,
+bool MDialog_Message(const wxString& message,
const wxWindow *parent,
const MPersMsgBox *persMsg,
int flags = 0,
- wxChar const *title = MDIALOG_MSGTITLE);
+ const wxString& title = MDIALOG_MSGTITLE);
/** File requester dialog: asks user for a file name
@param message the text to display
@@ -274,7 +274,7 @@
String MDialog_DirRequester(const String& message,
const String& path = NULLstring,
wxWindow *parent = NULL,
- const wxChar *configPath = NULL);
+ const char *configPath = NULL);
/**
Ask the user to enter some text and remember the last value in the "Prompt"
@@ -414,8 +414,9 @@
/// Accept or reject certificate
extern "C"
{
- int AcceptCertificateDialog(const wxChar *subject, const wxChar *issuer,
- const wxChar *fingerprint);
+ int AcceptCertificateDialog(const wxString& subject,
+ const wxString& issuer,
+ const wxString& fingerprint);
}
#endif
Modified: trunk/M/src/gui/wxDialogLayout.cpp
===================================================================
--- trunk/M/src/gui/wxDialogLayout.cpp 2008-08-07 22:47:22 UTC (rev 7538)
+++ trunk/M/src/gui/wxDialogLayout.cpp 2008-08-07 23:22:46 UTC (rev 7539)
@@ -1658,7 +1658,7 @@
MDialog_Message(_("Some of the changes to the program options will\n"
"only take effect when the progam will be run the\n"
"next time and not during this session."),
- this, MDIALOG_MSGTITLE, _T("WarnRestartOpt"));
+ this, MDIALOG_MSGTITLE, "WarnRestartOpt");
m_bRestartWarning = FALSE;
}
Modified: trunk/M/src/gui/wxMApp.cpp
===================================================================
--- trunk/M/src/gui/wxMApp.cpp 2008-08-07 22:47:22 UTC (rev 7538)
+++ trunk/M/src/gui/wxMApp.cpp 2008-08-07 23:22:46 UTC (rev 7539)
@@ -1996,7 +1996,7 @@
MDialog_Message(_("Dial-Up network connection established."),
m_topLevelFrame,
_("Information"),
- _T("DialUpConnectedMsg"));
+ "DialUpConnectedMsg");
}
void
@@ -2009,7 +2009,7 @@
MDialog_Message(_("Dial-Up network shut down."),
m_topLevelFrame,
_("Information"),
- _T("DialUpDisconnectedMsg"));
+ "DialUpDisconnectedMsg");
}
void
Modified: trunk/M/src/gui/wxMDialogs.cpp
===================================================================
--- trunk/M/src/gui/wxMDialogs.cpp 2008-08-07 22:47:22 UTC (rev 7538)
+++ trunk/M/src/gui/wxMDialogs.cpp 2008-08-07 23:22:46 UTC (rev 7539)
@@ -529,9 +529,9 @@
// other functions
// ----------------------------------------------------------------------------
void
-MDialog_ErrorMessage(const wxChar *msg,
+MDialog_ErrorMessage(const wxString& msg,
const wxWindow *parent,
- const wxChar *title,
+ const wxString& title,
bool /* modal */)
{
//MGuiLocker lock;
@@ -550,9 +550,9 @@
@param modal true to make messagebox modal
*/
void
-MDialog_SystemErrorMessage(const wxChar *message,
+MDialog_SystemErrorMessage(const wxString& message,
const wxWindow *parent,
- const wxChar *title,
+ const wxString& title,
bool modal)
{
String
@@ -571,9 +571,9 @@
@param parent the parent frame
*/
void
-MDialog_FatalErrorMessage(const wxChar *message,
+MDialog_FatalErrorMessage(const wxString& message,
const wxWindow *parent,
- const wxChar *title)
+ const wxString& title)
{
String msg = String(message) + _("\nExiting application...");
@@ -589,10 +589,10 @@
@param modal true to make messagebox modal
*/
bool
-MDialog_Message(const wxChar *message,
+MDialog_Message(const wxString& message,
const wxWindow *parent,
- const wxChar *title,
- const wxChar *configPath,
+ const wxString& title,
+ const char *configPath,
int flags)
{
// if the msg box is disabled, don't make the splash disappear, return
@@ -623,11 +623,11 @@
) != wxCANCEL;
}
-bool MDialog_Message(wxChar const *message,
+bool MDialog_Message(const wxString& message,
const wxWindow *parent,
const MPersMsgBox *persMsg,
int flags,
- wxChar const *title)
+ const wxString& title)
{
String configPath;
if ( persMsg )
@@ -635,12 +635,13 @@
return MDialog_Message(message, parent, title,
persMsg ? configPath.c_str()
- : (const wxChar *)NULL, flags);
+ : (const char *)NULL,
+ flags);
}
-MDlgResult MDialog_YesNoCancel(wxChar const *message,
+MDlgResult MDialog_YesNoCancel(const wxString& message,
const wxWindow *parent,
- wxChar const *title,
+ const wxString& title,
int flags,
const MPersMsgBox *persMsg)
{
@@ -690,9 +691,9 @@
@return true if Yes was selected
*/
bool
-MDialog_YesNoDialog(const wxChar *message,
+MDialog_YesNoDialog(const wxString& message,
const wxWindow *parent,
- const wxChar *title,
+ const wxString& title,
int flags,
const MPersMsgBox *msgBox,
const wxChar *folderName)
@@ -826,7 +827,7 @@
String MDialog_DirRequester(const String& message,
const String& pathOrig,
wxWindow *parent,
- const wxChar *confpath)
+ const wxString& confpath)
{
return wxPDirSelector(confpath, message, pathOrig, parent);
}
@@ -2134,8 +2135,9 @@
/// Accept or reject certificate
extern "C"
{
- int AcceptCertificateDialog(const wxChar *subject, const wxChar *issuer,
- const wxChar *fingerprint)
+ int AcceptCertificateDialog(const wxString& subject,
+ const wxString& issuer,
+ const wxString& fingerprint)
{
wxString info;
info << _("The server presents the following certificate:\n")
Modified: trunk/M/src/gui/wxMFolderDialogs.cpp
===================================================================
--- trunk/M/src/gui/wxMFolderDialogs.cpp 2008-08-07 22:47:22 UTC (rev 7538)
+++ trunk/M/src/gui/wxMFolderDialogs.cpp 2008-08-07 23:22:46 UTC (rev 7539)
@@ -1542,7 +1542,7 @@
"contain any mail messages at all, but only other folders) these\n"
"values will be used as defaults for all folders created under\n"
"this group folder."),
- this, _("Group folders hint"), _T("FolderGroupHint"));
+ this, _("Group folders hint"), "FolderGroupHint");
}
// set the defaults for this kind of folder
Modified: trunk/M/src/gui/wxMIMETreeDialog.cpp
===================================================================
--- trunk/M/src/gui/wxMIMETreeDialog.cpp 2008-08-07 22:47:22 UTC (rev 7538)
+++ trunk/M/src/gui/wxMIMETreeDialog.cpp 2008-08-07 23:22:46 UTC (rev 7539)
@@ -384,7 +384,7 @@
_("Choose directory to save attachments to:"),
wxEmptyString,
this,
- _T("MimeSave")
+ "MimeSave"
);
if ( dir.empty() )
{
Modified: trunk/M/src/mail/SendMessageCC.cpp
===================================================================
--- trunk/M/src/mail/SendMessageCC.cpp 2008-08-07 22:47:22 UTC (rev 7538)
+++ trunk/M/src/mail/SendMessageCC.cpp 2008-08-07 23:22:46 UTC (rev 7539)
@@ -118,7 +118,7 @@
// ----------------------------------------------------------------------------
// trace mask for message sending/queuing operations
-#define TRACE_SEND _T("send")
+#define TRACE_SEND "send"
// ----------------------------------------------------------------------------
// private functions
@@ -243,7 +243,7 @@
const Message *message,
wxFrame *frame)
{
- CHECK( message, NULL, _T("no Message in SendMessage::CreateResent()") );
+ CHECK( message, NULL, "no Message in SendMessage::CreateResent()" );
SendMessageCC *msg = new SendMessageCC(profile, Prot_Default, frame, message);
if ( msg )
@@ -259,7 +259,7 @@
wxFrame *frame,
const wxArrayInt *partsToOmit)
{
- CHECK( message, NULL, _T("no Message in SendMessage::CreateFromMsg()") );
+ CHECK( message, NULL, "no Message in SendMessage::CreateFromMsg()" );
SendMessageCC *msg = new SendMessageCC(profile, protocol, frame, message);
if ( msg )
@@ -326,7 +326,7 @@
if ( !profile )
{
- FAIL_MSG( _T("SendMessageCC::Create() requires profile") );
+ FAIL_MSG( "SendMessageCC::Create() requires profile" );
profile = mApplication->GetProfile();
}
@@ -341,7 +341,7 @@
{
// autodetect protocol:
String tmp;
- if ( message->GetHeaderLine(_T("Newsgroups"), tmp) )
+ if ( message->GetHeaderLine("Newsgroups", tmp) )
protocol = Prot_NNTP;
}
@@ -361,7 +361,7 @@
switch ( m_Protocol )
{
default:
- FAIL_MSG( _T("unknown SendMessage protocol") );
+ FAIL_MSG( "unknown SendMessage protocol" );
// fall through
case Prot_SMTP:
@@ -461,9 +461,9 @@
void SendMessageCC::InitResent(const Message *message)
{
- CHECK_RET( message, _T("message being resent can't be NULL") );
+ CHECK_RET( message, "message being resent can't be NULL" );
- CHECK_RET( m_Envelope, _T("envelope must be created in InitResent") );
+ CHECK_RET( m_Envelope, "envelope must be created in InitResent" );
// get the original message header and copy it to remail envelope field
// almost without any changes except that we have to mask the transport
@@ -496,11 +496,11 @@
#define STARTS_WITH(p, what) (!(wxStrnicmp((p), (what), wxStrlen(what))))
- if ( STARTS_WITH(p, _T("Delivered-To:")) ||
- STARTS_WITH(p, _T("Received:")) ||
- STARTS_WITH(p, _T("Resent-")) )
+ if ( STARTS_WITH(p, "Delivered-To:") ||
+ STARTS_WITH(p, "Received:") ||
+ STARTS_WITH(p, "Resent-") )
{
- hdr += _T("X-");
+ hdr += "X-";
}
#undef STARTS_WITH
@@ -572,7 +572,7 @@
case Prot_NNTP:
{
String newsgroups;
- if ( message->GetHeaderLine(_T("Newsgroups"), newsgroups) )
+ if ( message->GetHeaderLine("Newsgroups", newsgroups) )
SetNewsgroups(newsgroups);
}
break;
@@ -580,7 +580,7 @@
// make gcc happy
case Prot_Illegal:
default:
- FAIL_MSG(_T("unknown protocol"));
+ FAIL_MSG("unknown protocol");
}
// next deal with the remaining headers
@@ -658,7 +658,7 @@
SendMessageCC::GetPassword(String& password) const
{
ASSERT_MSG( !m_UserName.empty(),
- _T("password shouldn't be needed if no login") );
+ "password shouldn't be needed if no login" );
if ( m_Password.empty() )
{
@@ -774,7 +774,7 @@
if ( adr )
{
// Return-Path (it is used as SMTP "MAIL FROM: <>" argument)
- ASSERT_MSG( m_Envelope->return_path == NIL, _T("Return-Path already set?") );
+ ASSERT_MSG( m_Envelope->return_path == NIL, "Return-Path already set?" );
m_Envelope->return_path = mail_newaddr();
m_Envelope->return_path->mailbox = cpystr(adr->mailbox);
@@ -785,7 +785,7 @@
void
SendMessageCC::SetAddressField(ADDRESS **pAdr, const String& address)
{
- ASSERT_MSG( !*pAdr, _T("shouldn't be called twice") );
+ ASSERT_MSG( !*pAdr, "shouldn't be called twice" );
if ( address.empty() )
{
@@ -812,7 +812,7 @@
{
adrPrev->next = adr->next;
- DBGMESSAGE((_T("Invalid recipient address '%s' ignored."),
+ DBGMESSAGE(("Invalid recipient address '%s' ignored.",
AddressCC(adr).GetAddress().c_str()));
// prevent mail_free_address() from freeing the entire list tail
@@ -850,7 +850,7 @@
// TODO-NEWS: we should support sending and posting the message, doing
// it separately if necessary
- ASSERT_MSG( m_Protocol == Prot_NNTP, _T("can't post and send message") );
+ ASSERT_MSG( m_Protocol == Prot_NNTP, "can't post and send message" );
if ( !groups.empty() )
{
@@ -948,14 +948,14 @@
if ( IsAddressHeader(name) )
{
- FAIL_MSG( _T("Address headers not supported here, use SetFrom() &c!") );
+ FAIL_MSG( "Address headers not supported here, use SetFrom() &c!" );
}
else if ( !HeaderCanBeSetByUser(name) )
{
ERRORMESSAGE((_("The value of the header '%s' cannot be modified."),
nameIn.c_str()));
}
- else if ( name == _T("SUBJECT") )
+ else if ( name == "SUBJECT" )
{
SetSubject(value);
}
@@ -978,7 +978,7 @@
SendMessageCC::RemoveHeaderEntry(const String& name)
{
MessageHeadersList::iterator i = FindHeaderEntry(name);
- CHECK_RET( i != m_extraHeaders.end(), _T("RemoveHeaderEntry(): no such header") );
+ CHECK_RET( i != m_extraHeaders.end(), "RemoveHeaderEntry(): no such header" );
(void)m_extraHeaders.erase(i);
}
@@ -1015,10 +1015,10 @@
s_numInSec = 0;
}
- return String::Format(_T("<Mahogany-%s-%lu-%s.%02u@%s>"),
+ return String::Format("<Mahogany-%s-%lu-%s.%02u@%s>",
M_VERSION,
s_pid,
- dt.Format(_T("%Y%m%d-%H%M%S")).c_str(),
+ dt.Format("%Y%m%d-%H%M%S").c_str(),
s_numInSec,
hostname);
}
@@ -1131,7 +1131,7 @@
// Date:
//
- if ( m_Envelope->remail && !HasHeaderEntry(_T("Date")) )
+ if ( m_Envelope->remail && !HasHeaderEntry("Date") )
{
char tmpbuf[MAILTMPLEN];
rfc822_date (tmpbuf);
@@ -1165,7 +1165,7 @@
{
// The X-BCC will be converted back to BCC by Send()
if ( m_Envelope->bcc )
- AddHeaderEntry(_T("X-BCC"), m_Bcc);
+ AddHeaderEntry("X-BCC", m_Bcc);
}
else // send, not store
{
@@ -1174,18 +1174,18 @@
might have come from the Outbox queue, so we translate X-BCC
back to a proper bcc setting:
*/
- if ( HasHeaderEntry(_T("X-BCC")) )
+ if ( HasHeaderEntry("X-BCC") )
{
if ( m_Envelope->bcc )
{
mail_free_address(&m_Envelope->bcc);
}
- SetAddressField(&m_Envelope->bcc, GetHeaderEntry(_T("X-BCC")));
+ SetAddressField(&m_Envelope->bcc, GetHeaderEntry("X-BCC"));
// don't send X-BCC field or the recipient would still see the BCC
// contents (which is highly undesirable!)
- RemoveHeaderEntry(_T("X-BCC"));
+ RemoveHeaderEntry("X-BCC");
}
char tmpbuf[MAILTMPLEN];
@@ -1409,7 +1409,7 @@
// some encodings should be encoded in QP as they typically contain
// only a small number of non printable characters while others
// should be encoded in Base64 as almost all characters used in them
- // are outside basic Ascii set
+ // are outside basic ASCII set
switch ( MIME::GetEncodingForFontEncoding(enc) )
{
case MIME::Encoding_Unknown:
@@ -1419,7 +1419,7 @@
break;
default:
- FAIL_MSG( _T("unknown MIME encoding") );
+ FAIL_MSG( "unknown MIME encoding" );
// fall through
case MIME::Encoding_Base64:
@@ -1460,12 +1460,12 @@
par = mail_newbody_parameter();
String name = i->name;
- if ( name.Lower() == _T("charset") )
+ if ( name.Lower() == "charset" )
{
if ( hasCharset )
{
// although not fatal, this shouldn't happen
- wxLogDebug(_T("Multiple CHARSET parameters!"));
+ wxLogDebug("Multiple CHARSET parameters!");
}
hasCharset = true;
@@ -1486,7 +1486,7 @@
{
// plain text messages should be in US_ASCII as all clients should be
// able to show them and some might complain [even] about iso8859-1
- cs = _T("US-ASCII");
+ cs = "US-ASCII";
}
else // 8bit message
{
@@ -1599,7 +1599,7 @@
i != m_FccList.end();
i++ )
{
- wxLogTrace(TRACE_SEND, _T("FCCing message to %s"), (*i)->c_str());
+ wxLogTrace(TRACE_SEND, "FCCing message to %s", (*i)->c_str());
WriteToFolder(**i);
}
@@ -1642,7 +1642,7 @@
bool
SendMessageCC::Send(int flags)
{
- ASSERT_MSG( m_wasBuilt, _T("Build() must have been called!") );
+ ASSERT_MSG( m_wasBuilt, "Build() must have been called!" );
if ( !MailFolder::Init() )
return false;
@@ -1670,7 +1670,7 @@
// use authentication if the user name is specified
if ( !m_UserName.empty() )
{
- server << _T("/user=\"") << m_UserName << _T('"');
+ server << "/user=\"" << m_UserName << '"';
String password;
if ( !GetPassword(password) )
@@ -1707,7 +1707,7 @@
{
if ( useSSL == SSLSupport_None )
{
- server << _T("/notls");
+ server << "/notls";
}
else // do use SSL/TLS
{
@@ -1715,7 +1715,7 @@
{
if ( useSSL != SSLSupport_TLSIfAvailable )
{
- ERRORMESSAGE((_T("SSL support is unavailable; try disabling SSL/TLS.")));
+ ERRORMESSAGE(("SSL support is unavailable; try disabling SSL/TLS."));
return false;
}
@@ -1725,15 +1725,15 @@
switch ( useSSL )
{
case SSLSupport_SSL:
- server << _T("/ssl");
+ server << "/ssl";
break;
case SSLSupport_TLS:
- server << _T("/tls");
+ server << "/tls";
break;
default:
- FAIL_MSG( _T("unknown value of SSLSupport") );
+ FAIL_MSG( "unknown value of SSLSupport" );
// fall through
case SSLSupport_TLSIfAvailable:
@@ -1743,7 +1743,7 @@
if ( acceptUnsigned )
{
- server << _T("/novalidate-cert");
+ server << "/novalidate-cert";
}
}
}
@@ -1787,7 +1787,7 @@
case Prot_SMTP:
{
wxLogTrace(TRACE_SEND,
- _T("Trying to open connection to SMTP server '%s'"),
+ "Trying to open connection to SMTP server \"%s\"",
m_ServerHost.c_str());
if ( READ_CONFIG(m_profile, MP_SMTP_USE_8BIT) )
@@ -1820,7 +1820,8 @@
break;
case Prot_NNTP:
- wxLogTrace(TRACE_SEND, _T("Trying to open connection to NNTP server '%s'"),
+ wxLogTrace(TRACE_SEND,
+ "Trying to open connection to NNTP server \"%s\"",
m_ServerHost.c_str());
stream = nntp_open(hostlist, options);
@@ -1881,7 +1882,7 @@
MDialog_Message(_("Message sent."),
m_frame, // parent window
MDIALOG_MSGTITLE,
- _T("MailSentMessage"));
+ "MailSentMessage");
}
}
else
@@ -1900,7 +1901,7 @@
// make gcc happy
case Prot_Illegal:
default:
- FAIL_MSG(_T("illegal protocol"));
+ FAIL_MSG("illegal protocol");
}
bool success;
@@ -1925,7 +1926,7 @@
// make gcc happy
case Prot_Illegal:
default:
- FAIL_MSG(_T("illegal protocol"));
+ FAIL_MSG("illegal protocol");
success = false;
}
@@ -1937,7 +1938,7 @@
: _("Article posted."),
m_frame, // parent window
MDIALOG_MSGTITLE,
- _T("MailSentMessage"));
+ "MailSentMessage");
}
return true;
@@ -1953,7 +1954,7 @@
// always show the server reply but do it first so it's not the top most
// message show
- ERRORMESSAGE((_T("%s"), reply.c_str()));
+ ERRORMESSAGE(("%s", reply.c_str()));
}
// give the general error message anyhow
@@ -1964,14 +1965,14 @@
const String explanation = log.GuessError();
if ( explanation.empty() )
{
- err += _T(".");
+ err += ".";
}
else // have explanation
{
- err += _T(":\n\n") + explanation;
+ err += ":\n\n" + explanation;
}
- ERRORMESSAGE((_T("%s"), err.c_str()));
+ ERRORMESSAGE(("%s", err.c_str()));
return false;
}
@@ -2005,7 +2006,7 @@
if ( !WriteMessage(write_str_output, &output) )
{
- ERRORMESSAGE ((_T("Can't write message to string.")));
+ ERRORMESSAGE(("Failed to create the message text."));
return false;
}
@@ -2165,7 +2166,7 @@
else
{
// just in case MRC decides to change it in the future...
- wxFAIL_MSG(_T("cclient message header doesn't have terminating blank line?"));
+ wxFAIL_MSG("cclient message header doesn't have terminating blank line?");
}
// save the pointer as rfc822_address_line() modifies it
Modified: trunk/M/src/util/strutil.cpp
===================================================================
--- trunk/M/src/util/strutil.cpp 2008-08-07 22:47:22 UTC (rev 7538)
+++ trunk/M/src/util/strutil.cpp 2008-08-07 23:22:46 UTC (rev 7539)
@@ -871,7 +871,7 @@
"so that we can fix it."),
NULL,
_("Missing feature"),
- _T("EncryptionAlgoBroken"));
+ "EncryptionAlgoBroken");
strutil_has_twofish = FALSE;
}
else
Modified: trunk/M/src/util/upgrade.cpp
===================================================================
--- trunk/M/src/util/upgrade.cpp 2008-08-07 22:47:22 UTC (rev 7538)
+++ trunk/M/src/util/upgrade.cpp 2008-08-07 23:22:46 UTC (rev 7539)
@@ -3372,7 +3372,7 @@
msg << _("Sent email message to:\n")
<< me
<< _("\n\nPlease check whether it arrives.");
- MDialog_Message(msg, NULL, _("Testing your configuration"), _T("TestMailSent"));
+ MDialog_Message(msg, NULL, _("Testing your configuration"), "TestMailSent");
return true; // till we know something better
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/