1 files changed, 12 insertions, 29 deletions

diff --git a/lib/Plugins/TicketUploader.h b/lib/Plugins/TicketUploader.h
index 92e33872..2a7c98af 100644
--- a/lib/Plugins/TicketUploader.h
+++ b/lib/Plugins/TicketUploader.h
@@ -29,46 +29,29 @@
 #include "Reporter.h"
 #include "CrashTypes.h"
 
-typedef std::string string;
-
 class CTicketUploader : public CReporter
 {
     private:
-    string m_sCustomer;
-    string m_sTicket;
-    string m_sURL;
-    bool   m_bEncrypt;
-    bool   m_bUpload;
-
-    int m_nRetryCount;
-    int m_nRetryDelay;
-
-    void Error(string func, string msg);
-    void CopyFile(const std::string& pSourceName, const std::string& pDestName);
-    // Wrappers around popen/system
-    // the wrapper in each case handles errors,
-    // and converts from string->char*
-    // RunCommand - a wrapper around system(cmd)
-    void   RunCommand(string cmd);
-    // ReadCommand - a wrapper around popen(cmd,"r")
-    string ReadCommand(string cmd);
-    // WriteCommand  - a wrapper around popen(cmd,"w")
-    void   WriteCommand(string cmd, string input );
+        std::string m_sCustomer;
+        std::string m_sTicket;
+        std::string m_sURL;
+        bool m_bEncrypt;
+        bool m_bUpload;
+        int m_nRetryCount;
+        int m_nRetryDelay;
 
-    void SendFile(const std::string& pURL,
-                  const std::string& pFilename);
+        void SendFile(const char *pURL, const char *pFilename);
 
     public:
         CTicketUploader();
         virtual ~CTicketUploader();
-        virtual map_plugin_settings_t GetSettings();
+//ok to delete?
+//        virtual const map_plugin_settings_t& GetSettings();
         virtual void SetSettings(const map_plugin_settings_t& pSettings);
 
-        virtual string Report(const map_crash_report_t& pCrashReport,
+        virtual std::string Report(const map_crash_report_t& pCrashReport,
                               const map_plugin_settings_t& pSettings,
                               const std::string& pArgs);
-
-
 };
 
-#endif /* TICKETUPLOADER_H_ */
+#endif