Update of /cvsroot/mahogany/M/include/adb
In directory usw-pr-cvs1:/tmp/cvs-serv7348/include/adb
Modified Files:
AdbDataProvider.h AdbEntry.h AdbExport.h AdbImport.h
AdbModule.h ProvPalm.h
Log Message:
Unicode fixes
Index: AdbDataProvider.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/adb/AdbDataProvider.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -u -2 -r1.8 -r1.9
--- AdbDataProvider.h 6 Jul 1999 00:46:45 -0000 1.8
+++ AdbDataProvider.h 13 Sep 2002 01:27:46 -0000 1.9
@@ -59,9 +59,9 @@
static struct AdbProviderInfo
{
- const char *szName; // internal name
+ const wxChar *szName; // internal name
bool bSupportsCreation; // do we support creating new address books?
AdbNameFormat nameFormat; // to know what ask the user for...
- const char *szFmtName; // NB: this name is shown to the user
+ const wxChar *szFmtName; // NB: this name is shown to the user
Constructor CreateProvider;
@@ -69,6 +69,6 @@
AdbProviderInfo *pNext;
- AdbProviderInfo(const char *name, Constructor ctor,
- bool canCreate, const char *formatName,
+ AdbProviderInfo(const wxChar *name, Constructor ctor,
+ bool canCreate, const wxChar *formatName,
AdbNameFormat adbFormat);
} *ms_listProviders;
@@ -121,5 +121,5 @@
String name::GetProviderName() const { return #name; } \
AdbDataProvider *ConstructorFor##name() { return new name; } \
- AdbDataProvider::AdbProviderInfo name::ms_info(#name, ConstructorFor##name, \
+ AdbDataProvider::AdbProviderInfo name::ms_info(_T(#name), ConstructorFor##name, \
bCanCreate, userName, \
AdbDataProvider::fmt)
Index: AdbEntry.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/adb/AdbEntry.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -b -u -2 -r1.25 -r1.26
--- AdbEntry.h 12 Sep 2002 02:36:48 -0000 1.25
+++ AdbEntry.h 13 Sep 2002 01:27:46 -0000 1.26
@@ -225,5 +225,5 @@
/// find entry by name (returns NULL if not found)
- virtual AdbEntry *FindEntry(const char *szName) = 0;
+ virtual AdbEntry *FindEntry(const wxChar *szName) = 0;
// misc
@@ -252,5 +252,5 @@
virtual void ClearDirty() { m_bDirty = FALSE; }
virtual bool IsDirty() const { return m_bDirty; }
- virtual int Matches(const char *str, int where, int how) const;
+ virtual int Matches(const wxChar *str, int where, int how) const;
protected:
Index: AdbExport.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/adb/AdbExport.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -u -2 -r1.4 -r1.5
--- AdbExport.h 19 May 2000 17:15:59 -0000 1.4
+++ AdbExport.h 13 Sep 2002 01:27:46 -0000 1.5
@@ -25,5 +25,5 @@
// the interface we implement
-#define ADB_EXPORTER_INTERFACE "AdbExporter"
+#define ADB_EXPORTER_INTERFACE _T("AdbExporter")
// ----------------------------------------------------------------------------
Index: AdbImport.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/adb/AdbImport.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -u -2 -r1.10 -r1.11
--- AdbImport.h 19 May 2000 15:56:00 -0000 1.10
+++ AdbImport.h 13 Sep 2002 01:27:46 -0000 1.11
@@ -26,5 +26,5 @@
// the interface we implement
-#define ADB_IMPORTER_INTERFACE "AdbImporter"
+#define ADB_IMPORTER_INTERFACE _T("AdbImporter")
// ----------------------------------------------------------------------------
Index: AdbModule.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/adb/AdbModule.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -2 -r1.7 -r1.8
--- AdbModule.h 12 Sep 2002 02:36:48 -0000 1.7
+++ AdbModule.h 13 Sep 2002 01:27:46 -0000 1.8
@@ -70,5 +70,5 @@
// ctor for the struct
- AdbModuleInfo(const char *name, Constructor ctor, const char *desc);
+ AdbModuleInfo(const wxChar *name, Constructor ctor, const wxChar *desc);
#endif // USE_ADB_MODULES/!USE_ADB_MODULES
};
@@ -76,5 +76,5 @@
// access the linked list of AdbModuleInfo, you must call FreeAdbModuleInfo()
// after you have used the list
- static AdbModuleInfo *GetAdbModuleInfo(const char *kind);
+ static AdbModuleInfo *GetAdbModuleInfo(const wxChar *kind);
static void FreeAdbModuleInfo(AdbModuleInfo *info);
@@ -82,16 +82,16 @@
// to create import objects) and the descriptions (to show to the user);
// returns the number of different importers
- static size_t EnumModules(const char *kind,
+ static size_t EnumModules(const wxChar *kind,
wxArrayString& names, wxArrayString& descs);
// get importer by name (it's a new pointer, caller must DecRef() it)
- static AdbModule *GetModuleByName(const char *kind, const String& name);
+ static AdbModule *GetModuleByName(const wxChar *kind, const String& name);
// get the name and description (shown to the user) of the format imported
// by this class (these functions are automatically generated during
// IMPLEMENT_ADB_MODULE macro expansion
- virtual const char *GetName() const = 0;
- virtual const char *GetFormatDesc() const = 0;
- virtual const char *GetDescription() const = 0;
+ virtual const wxChar *GetName() const = 0;
+ virtual const wxChar *GetFormatDesc() const = 0;
+ virtual const wxChar *GetDescription() const = 0;
private:
@@ -109,5 +109,5 @@
// MMODULE_DEFINE macro
#define DECLARE_ADB_MODULE() \
- virtual const char *GetFormatDesc() const; \
+ virtual const wxChar *GetFormatDesc() const; \
DEFAULT_ENTRY_FUNC \
MMODULE_DEFINE()
@@ -124,5 +124,5 @@
MMODULE_PROP("adbformat", format) \
MMODULE_END_IMPLEMENT(cname) \
- const char *cname::GetFormatDesc() const \
+ const wxChar *cname::GetFormatDesc() const \
{ \
return GetMModuleProperty(ms_properties, "adbformat"); \
@@ -138,13 +138,13 @@
#define DECLARE_ADB_MODULE() \
- const char *GetName() const; \
- const char *GetFormatDesc() const; \
- const char *GetDescription() const; \
+ const wxChar *GetName() const; \
+ const wxChar *GetFormatDesc() const; \
+ const wxChar *GetDescription() const; \
static AdbModuleInfo ms_info
#define IMPLEMENT_ADB_MODULE(modint, name, desc, format, author) \
- const char *name::GetName() const { return #name; } \
- const char *name::GetFormatDesc() const { return _(format); } \
- const char *name::GetDescription() const { return _(desc); } \
+ const wxChar *name::GetName() const { return #name; } \
+ const wxChar *name::GetFormatDesc() const { return _(format); } \
+ const wxChar *name::GetDescription() const { return _(desc); } \
AdbModule *ConstructorFor##name() { return new name; } \
AdbModule::AdbModuleInfo \
Index: ProvPalm.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/adb/ProvPalm.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -2 -r1.7 -r1.8
--- ProvPalm.h 15 Feb 2002 21:29:10 -0000 1.7
+++ ProvPalm.h 13 Sep 2002 01:27:46 -0000 1.8
@@ -60,5 +60,5 @@
// an easier to use GetName()
- const char *GetName() const { return m_astrFields[0]; }
+ const wxChar *GetName() const { return m_astrFields[0]; }
// if it's not, we will be deleted, so it really must be something fatal
@@ -109,5 +109,5 @@
virtual void DeleteGroup(const String& strName);
- virtual AdbEntry *FindEntry(const char *szName);
+ virtual AdbEntry *FindEntry(const wxChar *szName);
virtual bool IsReadOnly() const
{
@@ -176,5 +176,5 @@
{ m_pRootGroup->DeleteGroup(strName); }
- virtual AdbEntry *FindEntry(const char *szName)
+ virtual AdbEntry *FindEntry(const wxChar *szName)
{ return m_pRootGroup->FindEntry(szName); }
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
