Update of /cvsroot/mahogany/M/src/adb
In directory sc8-pr-cvs1:/tmp/cvs-serv21540/src/adb
Modified Files:
AdbDialogs.cpp AdbFrame.cpp ExportText.cpp ImportEudora.cpp
ImportMailrc.cpp ImportPine.cpp ImportText.cpp ImportVCard.cpp
ImportXFMail.cpp ProvDummy.cpp
Log Message:
fixes for VC++ 6 warnings not disabled any more in wx/defs.h
Index: AdbDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/AdbDialogs.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -b -u -2 -r1.23 -r1.24
--- AdbDialogs.cpp 28 Dec 2002 02:28:33 -0000 1.23
+++ AdbDialogs.cpp 22 Jul 2003 22:01:39 -0000 1.24
@@ -111,4 +111,5 @@
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxAdbImportDialog)
};
@@ -164,4 +165,5 @@
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxAdbExpandDialog)
};
@@ -488,5 +490,5 @@
}
-void wxAdbExpandDialog::OnBtnMore(wxCommandEvent& event)
+void wxAdbExpandDialog::OnBtnMore(wxCommandEvent&)
{
size_t nEntryCount = m_aMoreEntries.GetCount();
Index: AdbFrame.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/AdbFrame.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -b -u -2 -r1.106 -r1.107
--- AdbFrame.cpp 20 Jul 2003 17:20:25 -0000 1.106
+++ AdbFrame.cpp 22 Jul 2003 22:01:39 -0000 1.107
@@ -424,4 +424,6 @@
AdbManager *m_pManager; // we keep it during all our lifetime
+
+ DECLARE_NO_COPY_CLASS(AdbTreeRoot)
};
@@ -568,7 +570,11 @@
Append(WXMENU_ADBBOOK_PROP, _("Properties..."));
}
+
+ private:
+ DECLARE_NO_COPY_CLASS(AdbTreeMenu)
} *m_menu;
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxAdbTree)
};
@@ -604,4 +610,6 @@
*m_checkSub;
wxTextCtrl *m_textWhat;
+
+ DECLARE_NO_COPY_CLASS(wxADBFindDialog)
};
@@ -626,4 +634,6 @@
wxTextCtrl *m_textName;
wxCheckBox *m_checkGroup;
+
+ DECLARE_NO_COPY_CLASS(wxADBCreateDialog)
};
@@ -645,4 +655,6 @@
*m_textFileName,
*m_textDescription;
+
+ DECLARE_NO_COPY_CLASS(wxADBPropertiesDialog)
};
@@ -868,4 +880,5 @@
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxAdbEditFrame)
};
@@ -916,4 +929,6 @@
bool m_bDirty; // has the currently selected entry been changed?
bool m_bReadOnly; // is the current entry read-only?
+
+ DECLARE_NO_COPY_CLASS(wxAdbNotebook)
};
@@ -965,4 +980,5 @@
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxAdbPage)
};
@@ -974,4 +990,7 @@
: wxAdbPage(notebook, _T("General"), wxAdbNotebook::General,
AdbField_NamePageFirst, AdbField_NamePageLast) { }
+
+private:
+ DECLARE_NO_COPY_CLASS(wxAdbNamePage)
};
@@ -1004,4 +1023,5 @@
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxAdbEMailPage)
};
@@ -1012,4 +1032,7 @@
wxAdbAddrPage(wxNotebook *notebook, const wxChar *title,
int idImage, bool bOffice);
+
+private:
+ DECLARE_NO_COPY_CLASS(wxAdbAddrPage)
};
@@ -1020,4 +1043,7 @@
wxAdbOfficeAddrPage(wxNotebook *notebook)
: wxAdbAddrPage(notebook, _T("Office"), wxAdbNotebook::Work, TRUE) { }
+
+private:
+ DECLARE_NO_COPY_CLASS(wxAdbOfficeAddrPage)
};
@@ -1028,4 +1054,7 @@
wxAdbHomeAddrPage(wxNotebook *notebook)
: wxAdbAddrPage(notebook, _T("Home"), wxAdbNotebook::Home, FALSE) { }
+
+private:
+ DECLARE_NO_COPY_CLASS(wxAdbHomeAddrPage)
};
Index: ExportText.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ExportText.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -u -2 -r1.8 -r1.9
--- ExportText.cpp 13 Sep 2002 01:27:47 -0000 1.8
+++ ExportText.cpp 22 Jul 2003 22:01:39 -0000 1.9
@@ -123,4 +123,5 @@
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxAdbTextExporterConfigDialog)
};
@@ -279,5 +280,6 @@
}
-bool AdbTextExporter::Export(const AdbEntry& entry, const String& dest)
+bool AdbTextExporter::Export(const AdbEntry& /* entry */,
+ const String& /* dest */)
{
// TODO
Index: ImportEudora.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportEudora.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -u -2 -r1.5 -r1.6
--- ImportEudora.cpp 8 Sep 2002 19:23:08 -0000 1.5
+++ ImportEudora.cpp 22 Jul 2003 22:01:39 -0000 1.6
@@ -77,4 +77,6 @@
{
public:
+ AdbEudoraImporter() { }
+
// implement base class pure virtuals
virtual bool CanImport(const String& filename);
@@ -103,4 +105,6 @@
wxArrayInt m_lineNumbers;
wxTextFile m_textfile;
+
+ DECLARE_NO_COPY_CLASS(AdbEudoraImporter)
};
@@ -358,12 +362,15 @@
// top level
size_t AdbEudoraImporter::GetGroupNames(const String& path,
- wxArrayString& groups) const
+ wxArrayString& /* groups */) const
{
- ASSERT_MSG( !path, _T("where did this path come from?") );
+ if ( !path.empty() )
+ {
+ FAIL_MSG( _T("where did this path come from?") );
+ }
return 0;
}
-bool AdbEudoraImporter::ImportEntry(const String& path,
+bool AdbEudoraImporter::ImportEntry(const String& /* path */,
size_t index,
AdbEntry *entry)
Index: ImportMailrc.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportMailrc.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- ImportMailrc.cpp 8 Sep 2002 19:23:08 -0000 1.6
+++ ImportMailrc.cpp 22 Jul 2003 22:01:39 -0000 1.7
@@ -49,4 +49,6 @@
{
public:
+ AdbMailrcImporter() { }
+
// implement base class pure virtuals
virtual String GetDefaultFilename() const;
@@ -80,4 +82,6 @@
// the first "interesting" (i.e. non blank, non comment) line in the file
size_t m_nLineStart;
+
+ DECLARE_NO_COPY_CLASS(AdbMailrcImporter)
};
@@ -324,12 +328,15 @@
size_t AdbMailrcImporter::GetGroupNames(const String& path,
- wxArrayString& groups) const
+ wxArrayString& /* groups */) const
{
- ASSERT_MSG( !path, _T("where did this path come from?") );
+ if ( !path.empty() )
+ {
+ FAIL_MSG( _T("where did this path come from?") );
+ }
return 0;
}
-bool AdbMailrcImporter::ImportEntry(const String& path,
+bool AdbMailrcImporter::ImportEntry(const String& /* path */,
size_t index,
AdbEntry *entry)
Index: ImportPine.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportPine.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -u -2 -r1.8 -r1.9
--- ImportPine.cpp 12 Sep 2002 02:36:49 -0000 1.8
+++ ImportPine.cpp 22 Jul 2003 22:01:39 -0000 1.9
@@ -47,4 +47,6 @@
{
public:
+ AdbPineImporter() { }
+
// implement base class pure virtuals
virtual bool CanImport(const String& filename);
@@ -118,4 +120,6 @@
// the data
wxTextFile m_textfile;
+
+ DECLARE_NO_COPY_CLASS(AdbPineImporter)
};
Index: ImportText.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportText.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -u -2 -r1.8 -r1.9
--- ImportText.cpp 12 Sep 2002 02:36:49 -0000 1.8
+++ ImportText.cpp 22 Jul 2003 22:01:39 -0000 1.9
@@ -91,4 +91,5 @@
DECLARE_ADB_IMPORTER();
+ DECLARE_NO_COPY_CLASS(AdbTextImporter)
};
@@ -283,6 +284,6 @@
}
-size_t AdbTextImporter::GetGroupNames(const String& path,
- wxArrayString& groups) const
+size_t AdbTextImporter::GetGroupNames(const String& /* path */,
+ wxArrayString& /* groups */) const
{
// the "mailing list" info is lost when exporting into CSV format, there are
@@ -292,5 +293,5 @@
}
-bool AdbTextImporter::ImportEntry(const String& path,
+bool AdbTextImporter::ImportEntry(const String& /* path */,
size_t index,
AdbEntry *entry)
Index: ImportVCard.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportVCard.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- ImportVCard.cpp 12 Sep 2002 02:36:49 -0000 1.6
+++ ImportVCard.cpp 22 Jul 2003 22:01:39 -0000 1.7
@@ -174,6 +174,6 @@
}
-size_t AdbVCardImporter::GetGroupNames(const String& path,
- wxArrayString& groups) const
+size_t AdbVCardImporter::GetGroupNames(const String& /* path */,
+ wxArrayString& /* groups */) const
{
// there are no groups in a vCard
Index: ImportXFMail.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportXFMail.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -2 -r1.7 -r1.8
--- ImportXFMail.cpp 8 Sep 2002 19:23:08 -0000 1.7
+++ ImportXFMail.cpp 22 Jul 2003 22:01:39 -0000 1.8
@@ -44,4 +44,6 @@
{
public:
+ AdbXFMailImporter() { }
+
// implement base class pure virtuals
virtual String GetDefaultFilename() const;
@@ -61,4 +63,6 @@
wxArrayInt m_lineNumbers;
wxTextFile m_textfile;
+
+ DECLARE_NO_COPY_CLASS(AdbXFMailImporter)
};
@@ -203,5 +207,5 @@
size_t AdbXFMailImporter::GetGroupNames(const String& path,
- wxArrayString& groups) const
+ wxArrayString& /* groups */) const
{
ASSERT_MSG( !path, _T("where did this path come from?") );
@@ -211,5 +215,5 @@
}
-bool AdbXFMailImporter::ImportEntry(const String& path,
+bool AdbXFMailImporter::ImportEntry(const String& /* path */,
size_t index,
AdbEntry *entry)
Index: ProvDummy.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvDummy.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -b -u -2 -r1.22 -r1.23
--- ProvDummy.cpp 28 Dec 2002 02:28:33 -0000 1.22
+++ ProvDummy.cpp 22 Jul 2003 22:01:39 -0000 1.23
@@ -269,5 +269,7 @@
}
-int DummyEntry::Matches(const wxChar *what, int where, int how) const
+int DummyEntry::Matches(const wxChar * /* what */,
+ int /* where */,
+ int /* how */) const
{
return 0;
@@ -302,5 +304,5 @@
}
-AdbEntry *DummyEntryGroup::GetEntry(const String& name) const
+AdbEntry *DummyEntryGroup::GetEntry(const String& /* name */) const
{
return new DummyEntry((DummyEntryGroup *)this, _T("Dummy entry"));
@@ -312,5 +314,5 @@
}
-AdbEntryGroup *DummyEntryGroup::GetGroup(const String& name) const
+AdbEntryGroup *DummyEntryGroup::GetGroup(const String& /* name */) const
{
return NULL;
@@ -327,15 +329,15 @@
}
-void DummyEntryGroup::DeleteEntry(const String& strName)
+void DummyEntryGroup::DeleteEntry(const String& /* strName */)
{
wxFAIL_MSG(_T("Not implemented"));
}
-void DummyEntryGroup::DeleteGroup(const String& strName)
+void DummyEntryGroup::DeleteGroup(const String& /* strName */)
{
wxFAIL_MSG(_T("Not implemented"));
}
-AdbEntry *DummyEntryGroup::FindEntry(const wxChar *szName)
+AdbEntry *DummyEntryGroup::FindEntry(const wxChar * /* szName */)
{
return NULL;
@@ -407,5 +409,5 @@
}
-bool DummyDataProvider::EnumBooks(wxArrayString& aNames)
+bool DummyDataProvider::EnumBooks(wxArrayString& /* aNames */)
{
return FALSE;
@@ -421,9 +423,12 @@
return MDialog_YesNoDialog(str);
#else
+ name;
+ test;
+
return FALSE;
#endif
}
-bool DummyDataProvider::DeleteBook(AdbBook *book)
+bool DummyDataProvider::DeleteBook(AdbBook * /* book */)
{
return FALSE;
-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines at the
same time. Free trial click here: http://www.vmware.com/wl/offer/345/0
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
