From 9d5a06450578afd0550fb8cb8a1bc0722a318680 Mon Sep 17 00:00:00 2001 From: "hyatt%netscape.com" Date: Wed, 1 Dec 1999 08:17:42 +0000 Subject: [PATCH] Adjusting some names of variables. r=travis --- chrome/src/nsChromeRegistry.cpp | 55 ++++++++++++++++++++++------ rdf/chrome/public/nsIChromeEntry.idl | 5 ++- rdf/chrome/src/nsChromeEntry.cpp | 16 +++++--- rdf/chrome/src/nsChromeRegistry.cpp | 55 ++++++++++++++++++++++------ 4 files changed, 99 insertions(+), 32 deletions(-) diff --git a/chrome/src/nsChromeRegistry.cpp b/chrome/src/nsChromeRegistry.cpp index f5af62c2b1a..e38dc6d67e1 100644 --- a/chrome/src/nsChromeRegistry.cpp +++ b/chrome/src/nsChromeRegistry.cpp @@ -74,9 +74,13 @@ DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, content); DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, locale); DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, base); DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, main); -DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, archive); -DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, theme); DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, name); +DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, archive); +DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, text); +DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, version); +DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, author); +DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, siteURL); +DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, previewImageURL); // XXX This nasty function should disappear when we land Necko completely and // change chrome://global/skin/foo to chrome://skin@global/foo @@ -297,9 +301,15 @@ public: static nsIRDFResource* kCHROME_locale; static nsIRDFResource* kCHROME_base; static nsIRDFResource* kCHROME_main; - static nsIRDFResource* kCHROME_archive; + static nsIRDFResource* kCHROME_name; - static nsIRDFResource* kCHROME_theme; + static nsIRDFResource* kCHROME_archive; + static nsIRDFResource* kCHROME_text; + static nsIRDFResource* kCHROME_version; + static nsIRDFResource* kCHROME_author; + static nsIRDFResource* kCHROME_siteURL; + static nsIRDFResource* kCHROME_previewImageURL; + static nsSupportsHashtable *mDataSourceTable; protected: @@ -353,9 +363,13 @@ nsIRDFResource* nsChromeRegistry::kCHROME_content = nsnull; nsIRDFResource* nsChromeRegistry::kCHROME_locale = nsnull; nsIRDFResource* nsChromeRegistry::kCHROME_base = nsnull; nsIRDFResource* nsChromeRegistry::kCHROME_main = nsnull; -nsIRDFResource* nsChromeRegistry::kCHROME_archive = nsnull; nsIRDFResource* nsChromeRegistry::kCHROME_name = nsnull; -nsIRDFResource* nsChromeRegistry::kCHROME_theme = nsnull; +nsIRDFResource* nsChromeRegistry::kCHROME_archive = nsnull; +nsIRDFResource* nsChromeRegistry::kCHROME_text = nsnull; +nsIRDFResource* nsChromeRegistry::kCHROME_version = nsnull; +nsIRDFResource* nsChromeRegistry::kCHROME_author = nsnull; +nsIRDFResource* nsChromeRegistry::kCHROME_siteURL = nsnull; +nsIRDFResource* nsChromeRegistry::kCHROME_previewImageURL = nsnull; //////////////////////////////////////////////////////////////////////////////// @@ -391,13 +405,25 @@ nsChromeRegistry::nsChromeRegistry() rv = gRDFService->GetResource(kURICHROME_main, &kCHROME_main); NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource"); - rv = gRDFService->GetResource(kURICHROME_archive, &kCHROME_archive); - NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource"); - rv = gRDFService->GetResource(kURICHROME_name, &kCHROME_name); NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource"); - rv = gRDFService->GetResource(kURICHROME_theme, &kCHROME_theme); + rv = gRDFService->GetResource(kURICHROME_archive, &kCHROME_archive); + NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource"); + + rv = gRDFService->GetResource(kURICHROME_text, &kCHROME_text); + NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource"); + + rv = gRDFService->GetResource(kURICHROME_version, &kCHROME_version); + NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource"); + + rv = gRDFService->GetResource(kURICHROME_author, &kCHROME_author); + NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource"); + + rv = gRDFService->GetResource(kURICHROME_siteURL, &kCHROME_siteURL); + NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource"); + + rv = gRDFService->GetResource(kURICHROME_previewImageURL, &kCHROME_previewImageURL); NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource"); } } @@ -414,9 +440,14 @@ nsChromeRegistry::~nsChromeRegistry() NS_IF_RELEASE(kCHROME_locale); NS_IF_RELEASE(kCHROME_base); NS_IF_RELEASE(kCHROME_main); - NS_IF_RELEASE(kCHROME_archive); - NS_IF_RELEASE(kCHROME_theme); NS_IF_RELEASE(kCHROME_name); + NS_IF_RELEASE(kCHROME_archive); + NS_IF_RELEASE(kCHROME_text); + NS_IF_RELEASE(kCHROME_author); + NS_IF_RELEASE(kCHROME_version); + NS_IF_RELEASE(kCHROME_siteURL); + NS_IF_RELEASE(kCHROME_previewImageURL); + delete mDataSourceTable; if (gRDFService) { diff --git a/rdf/chrome/public/nsIChromeEntry.idl b/rdf/chrome/public/nsIChromeEntry.idl index aff979ed09d..f79b67937d6 100644 --- a/rdf/chrome/public/nsIChromeEntry.idl +++ b/rdf/chrome/public/nsIChromeEntry.idl @@ -26,8 +26,9 @@ interface nsIChromeEntry : nsISupports { attribute wstring name; - attribute wstring displayText; - attribute wstring versionNumber; + attribute wstring archive; + attribute wstring text; + attribute wstring version; attribute wstring author; attribute wstring siteURL; attribute wstring previewImageURL; diff --git a/rdf/chrome/src/nsChromeEntry.cpp b/rdf/chrome/src/nsChromeEntry.cpp index e11ca247075..cd4b1a739fc 100644 --- a/rdf/chrome/src/nsChromeEntry.cpp +++ b/rdf/chrome/src/nsChromeEntry.cpp @@ -53,13 +53,17 @@ NS_IMPL_ISUPPORTS1(nsChromeEntry, nsIChromeEntry) NS_IMETHODIMP nsChromeEntry::GetName(PRUnichar * *aName) { return NS_OK; } NS_IMETHODIMP nsChromeEntry::SetName(const PRUnichar * aName) { return NS_OK; } -/* attribute wstring displayText; */ -NS_IMETHODIMP nsChromeEntry::GetDisplayText(PRUnichar * *aDisplayText) { return NS_OK; } -NS_IMETHODIMP nsChromeEntry::SetDisplayText(const PRUnichar * aDisplayText) { return NS_OK; } +/* attribute wstring Archive; */ +NS_IMETHODIMP nsChromeEntry::GetArchive(PRUnichar * *aName) { return NS_OK; } +NS_IMETHODIMP nsChromeEntry::SetArchive(const PRUnichar * aName) { return NS_OK; } -/* attribute wstring versionNumber; */ -NS_IMETHODIMP nsChromeEntry::GetVersionNumber(PRUnichar * *aVersionNumber) { return NS_OK; } -NS_IMETHODIMP nsChromeEntry::SetVersionNumber(const PRUnichar * aVersionNumber) { return NS_OK; } +/* attribute wstring Text; */ +NS_IMETHODIMP nsChromeEntry::GetText(PRUnichar * *aText) { return NS_OK; } +NS_IMETHODIMP nsChromeEntry::SetText(const PRUnichar * aText) { return NS_OK; } + +/* attribute wstring Version; */ +NS_IMETHODIMP nsChromeEntry::GetVersion(PRUnichar * *aVersion) { return NS_OK; } +NS_IMETHODIMP nsChromeEntry::SetVersion(const PRUnichar * aVersion) { return NS_OK; } /* attribute wstring author; */ NS_IMETHODIMP nsChromeEntry::GetAuthor(PRUnichar * *aAuthor) { return NS_OK; } diff --git a/rdf/chrome/src/nsChromeRegistry.cpp b/rdf/chrome/src/nsChromeRegistry.cpp index f5af62c2b1a..e38dc6d67e1 100644 --- a/rdf/chrome/src/nsChromeRegistry.cpp +++ b/rdf/chrome/src/nsChromeRegistry.cpp @@ -74,9 +74,13 @@ DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, content); DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, locale); DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, base); DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, main); -DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, archive); -DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, theme); DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, name); +DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, archive); +DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, text); +DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, version); +DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, author); +DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, siteURL); +DEFINE_RDF_VOCAB(CHROME_NAMESPACE_URI, CHROME, previewImageURL); // XXX This nasty function should disappear when we land Necko completely and // change chrome://global/skin/foo to chrome://skin@global/foo @@ -297,9 +301,15 @@ public: static nsIRDFResource* kCHROME_locale; static nsIRDFResource* kCHROME_base; static nsIRDFResource* kCHROME_main; - static nsIRDFResource* kCHROME_archive; + static nsIRDFResource* kCHROME_name; - static nsIRDFResource* kCHROME_theme; + static nsIRDFResource* kCHROME_archive; + static nsIRDFResource* kCHROME_text; + static nsIRDFResource* kCHROME_version; + static nsIRDFResource* kCHROME_author; + static nsIRDFResource* kCHROME_siteURL; + static nsIRDFResource* kCHROME_previewImageURL; + static nsSupportsHashtable *mDataSourceTable; protected: @@ -353,9 +363,13 @@ nsIRDFResource* nsChromeRegistry::kCHROME_content = nsnull; nsIRDFResource* nsChromeRegistry::kCHROME_locale = nsnull; nsIRDFResource* nsChromeRegistry::kCHROME_base = nsnull; nsIRDFResource* nsChromeRegistry::kCHROME_main = nsnull; -nsIRDFResource* nsChromeRegistry::kCHROME_archive = nsnull; nsIRDFResource* nsChromeRegistry::kCHROME_name = nsnull; -nsIRDFResource* nsChromeRegistry::kCHROME_theme = nsnull; +nsIRDFResource* nsChromeRegistry::kCHROME_archive = nsnull; +nsIRDFResource* nsChromeRegistry::kCHROME_text = nsnull; +nsIRDFResource* nsChromeRegistry::kCHROME_version = nsnull; +nsIRDFResource* nsChromeRegistry::kCHROME_author = nsnull; +nsIRDFResource* nsChromeRegistry::kCHROME_siteURL = nsnull; +nsIRDFResource* nsChromeRegistry::kCHROME_previewImageURL = nsnull; //////////////////////////////////////////////////////////////////////////////// @@ -391,13 +405,25 @@ nsChromeRegistry::nsChromeRegistry() rv = gRDFService->GetResource(kURICHROME_main, &kCHROME_main); NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource"); - rv = gRDFService->GetResource(kURICHROME_archive, &kCHROME_archive); - NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource"); - rv = gRDFService->GetResource(kURICHROME_name, &kCHROME_name); NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource"); - rv = gRDFService->GetResource(kURICHROME_theme, &kCHROME_theme); + rv = gRDFService->GetResource(kURICHROME_archive, &kCHROME_archive); + NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource"); + + rv = gRDFService->GetResource(kURICHROME_text, &kCHROME_text); + NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource"); + + rv = gRDFService->GetResource(kURICHROME_version, &kCHROME_version); + NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource"); + + rv = gRDFService->GetResource(kURICHROME_author, &kCHROME_author); + NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource"); + + rv = gRDFService->GetResource(kURICHROME_siteURL, &kCHROME_siteURL); + NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource"); + + rv = gRDFService->GetResource(kURICHROME_previewImageURL, &kCHROME_previewImageURL); NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource"); } } @@ -414,9 +440,14 @@ nsChromeRegistry::~nsChromeRegistry() NS_IF_RELEASE(kCHROME_locale); NS_IF_RELEASE(kCHROME_base); NS_IF_RELEASE(kCHROME_main); - NS_IF_RELEASE(kCHROME_archive); - NS_IF_RELEASE(kCHROME_theme); NS_IF_RELEASE(kCHROME_name); + NS_IF_RELEASE(kCHROME_archive); + NS_IF_RELEASE(kCHROME_text); + NS_IF_RELEASE(kCHROME_author); + NS_IF_RELEASE(kCHROME_version); + NS_IF_RELEASE(kCHROME_siteURL); + NS_IF_RELEASE(kCHROME_previewImageURL); + delete mDataSourceTable; if (gRDFService) {