From fb72ac689ca4832fca215edc942ae01592ecfff8 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 7 Dec 2009 11:46:13 +0100 Subject: *: remove most of remaining const string& params Signed-off-by: Denys Vlasenko --- lib/Plugins/Bugzilla.cpp | 2 +- lib/Plugins/Bugzilla.h | 2 +- lib/Plugins/Catcut.cpp | 2 +- lib/Plugins/Catcut.h | 2 +- lib/Plugins/KerneloopsReporter.cpp | 2 +- lib/Plugins/KerneloopsReporter.h | 4 ++-- lib/Plugins/Logger.cpp | 5 +++-- lib/Plugins/Logger.h | 2 +- lib/Plugins/Mailx.cpp | 5 +++-- lib/Plugins/Mailx.h | 2 +- lib/Plugins/TicketUploader.cpp | 3 ++- lib/Plugins/TicketUploader.h | 2 +- lib/Utils/Reporter.h | 2 +- 13 files changed, 19 insertions(+), 16 deletions(-) (limited to 'lib') diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp index 8a318d30..fecbd270 100644 --- a/lib/Plugins/Bugzilla.cpp +++ b/lib/Plugins/Bugzilla.cpp @@ -323,7 +323,7 @@ CReporterBugzilla::~CReporterBugzilla() std::string CReporterBugzilla::Report(const map_crash_report_t& pCrashReport, const map_plugin_settings_t& pSettings, - const std::string& pArgs) + const char *pArgs) { int32_t bug_id = -1; std::string Login; diff --git a/lib/Plugins/Bugzilla.h b/lib/Plugins/Bugzilla.h index 9130a698..ee6bc6a5 100644 --- a/lib/Plugins/Bugzilla.h +++ b/lib/Plugins/Bugzilla.h @@ -22,7 +22,7 @@ class CReporterBugzilla : public CReporter virtual std::string Report(const map_crash_report_t& pCrashReport, const map_plugin_settings_t& pSettings, - const std::string& pArgs); + const char *pArgs); virtual void SetSettings(const map_plugin_settings_t& pSettings); virtual const map_plugin_settings_t& GetSettings(); diff --git a/lib/Plugins/Catcut.cpp b/lib/Plugins/Catcut.cpp index 7add58c0..9974faa9 100644 --- a/lib/Plugins/Catcut.cpp +++ b/lib/Plugins/Catcut.cpp @@ -436,7 +436,7 @@ CReporterCatcut::~CReporterCatcut() string CReporterCatcut::Report(const map_crash_report_t& pCrashReport, const map_plugin_settings_t& pSettings, - const string& pArgs) + const char *pArgs) { update_client(_("Creating new bug...")); try diff --git a/lib/Plugins/Catcut.h b/lib/Plugins/Catcut.h index 4fb89e22..00f486c0 100644 --- a/lib/Plugins/Catcut.h +++ b/lib/Plugins/Catcut.h @@ -22,7 +22,7 @@ class CReporterCatcut : public CReporter virtual std::string Report(const map_crash_report_t& pCrashReport, const map_plugin_settings_t& pSettings, - const std::string& pArgs); + const char *Args); }; #endif /* CATCUT_H_ */ diff --git a/lib/Plugins/KerneloopsReporter.cpp b/lib/Plugins/KerneloopsReporter.cpp index 376db25a..29094e85 100644 --- a/lib/Plugins/KerneloopsReporter.cpp +++ b/lib/Plugins/KerneloopsReporter.cpp @@ -95,7 +95,7 @@ CKerneloopsReporter::CKerneloopsReporter() : std::string CKerneloopsReporter::Report(const map_crash_report_t& pCrashReport, const map_plugin_settings_t& pSettings, - const std::string& pArgs) + const char *pArgs) { int ret = -1; diff --git a/lib/Plugins/KerneloopsReporter.h b/lib/Plugins/KerneloopsReporter.h index af82afbe..10e5e644 100644 --- a/lib/Plugins/KerneloopsReporter.h +++ b/lib/Plugins/KerneloopsReporter.h @@ -44,8 +44,8 @@ class CKerneloopsReporter : public CReporter //ok to delete? // virtual const map_plugin_settings_t& GetSettings(); virtual std::string Report(const map_crash_report_t& pCrashReport, - const map_plugin_settings_t& pSettings, - const std::string& pArgs); + const map_plugin_settings_t& pSettings, + const char *pArgs); }; #endif diff --git a/lib/Plugins/Logger.cpp b/lib/Plugins/Logger.cpp index 9f261a38..35f042c7 100644 --- a/lib/Plugins/Logger.cpp +++ b/lib/Plugins/Logger.cpp @@ -60,7 +60,8 @@ void CLogger::SetSettings(const map_plugin_settings_t& pSettings) //} std::string CLogger::Report(const map_crash_report_t& pCrashReport, - const map_plugin_settings_t& pSettings, const std::string& pArgs) + const map_plugin_settings_t& pSettings, + const char *pArgs) { update_client(_("Creating a report...")); @@ -84,7 +85,7 @@ std::string CLogger::Report(const map_crash_report_t& pCrashReport, return "file://" + m_sLogPath; } - throw CABRTException(EXCEP_PLUGIN, "Can't open file '%s'", m_sLogPath); + throw CABRTException(EXCEP_PLUGIN, "Can't open file '%s'", m_sLogPath.c_str()); } PLUGIN_INFO(REPORTER, diff --git a/lib/Plugins/Logger.h b/lib/Plugins/Logger.h index 285e25ba..c7d76798 100644 --- a/lib/Plugins/Logger.h +++ b/lib/Plugins/Logger.h @@ -39,7 +39,7 @@ class CLogger : public CReporter // virtual const map_plugin_settings_t& GetSettings(); virtual std::string Report(const map_crash_report_t& pCrashReport, const map_plugin_settings_t& pSettings, - const std::string& pArgs); + const char *pArgs); }; #endif /* LOGGER_H_ */ diff --git a/lib/Plugins/Mailx.cpp b/lib/Plugins/Mailx.cpp index dc6e2b0e..26b6ec41 100644 --- a/lib/Plugins/Mailx.cpp +++ b/lib/Plugins/Mailx.cpp @@ -84,7 +84,8 @@ static char** append_str_to_vector(char **vec, unsigned &size, const char *str) } std::string CMailx::Report(const map_crash_report_t& pCrashReport, - const map_plugin_settings_t& pSettings, const std::string& pArgs) + const map_plugin_settings_t& pSettings, + const char *pArgs) { char **args = NULL; unsigned arg_size = 0; @@ -156,7 +157,7 @@ std::string CMailx::Report(const map_crash_report_t& pCrashReport, emailBody += '\n'; args = append_str_to_vector(args, arg_size, "-s"); - args = append_str_to_vector(args, arg_size, (pArgs != "" ? pArgs.c_str() : m_sSubject.c_str())); + args = append_str_to_vector(args, arg_size, (pArgs[0] != '\0' ? pArgs : m_sSubject.c_str())); args = append_str_to_vector(args, arg_size, "-r"); args = append_str_to_vector(args, arg_size, m_sEmailFrom.c_str()); args = append_str_to_vector(args, arg_size, m_sEmailTo.c_str()); diff --git a/lib/Plugins/Mailx.h b/lib/Plugins/Mailx.h index d6d66bd8..1ddb5ff0 100644 --- a/lib/Plugins/Mailx.h +++ b/lib/Plugins/Mailx.h @@ -43,7 +43,7 @@ class CMailx : public CReporter // virtual const map_plugin_settings_t& GetSettings(); virtual std::string Report(const map_crash_report_t& pCrashReport, const map_plugin_settings_t& pSettings, - const std::string& pArgs); + const char *pArgs); }; #endif diff --git a/lib/Plugins/TicketUploader.cpp b/lib/Plugins/TicketUploader.cpp index 687e7062..6d281312 100644 --- a/lib/Plugins/TicketUploader.cpp +++ b/lib/Plugins/TicketUploader.cpp @@ -156,7 +156,8 @@ void CTicketUploader::SendFile(const char *pURL, const char *pFilename) string CTicketUploader::Report(const map_crash_report_t& pCrashReport, - const map_plugin_settings_t& pSettings, const string& pArgs) + const map_plugin_settings_t& pSettings, + const char *pArgs) { update_client(_("Creating an TicketUploader report...")); diff --git a/lib/Plugins/TicketUploader.h b/lib/Plugins/TicketUploader.h index 2a7c98af..e00596f2 100644 --- a/lib/Plugins/TicketUploader.h +++ b/lib/Plugins/TicketUploader.h @@ -51,7 +51,7 @@ class CTicketUploader : public CReporter virtual std::string Report(const map_crash_report_t& pCrashReport, const map_plugin_settings_t& pSettings, - const std::string& pArgs); + const char *pArgs); }; #endif diff --git a/lib/Utils/Reporter.h b/lib/Utils/Reporter.h index f2788993..0a06a7c9 100644 --- a/lib/Utils/Reporter.h +++ b/lib/Utils/Reporter.h @@ -42,7 +42,7 @@ class CReporter : public CPlugin */ virtual std::string Report(const map_crash_report_t& pCrashReport, const map_plugin_settings_t& pSettings, - const std::string& pArgs) = 0; + const char *pArgs) = 0; }; #endif /* REPORTER_H_ */ -- cgit