merging from plugins branch

1 files changed, 4 insertions, 7 deletions

diff --git a/cpp/src/Ice/PropertiesI.h b/cpp/src/Ice/PropertiesI.h
index d23457d59c5..5c1ea0656a2 100644
--- a/cpp/src/Ice/PropertiesI.h
+++ b/cpp/src/Ice/PropertiesI.h
@@ -29,23 +29,20 @@ public:
     virtual StringSeq getProperties(const std::string&);
     virtual void setProperty(const std::string&, const std::string&);
     virtual StringSeq getCommandLineOptions();
+    virtual StringSeq parseCommandLineOptions(const std::string&, const StringSeq&);
+    virtual void load(const std::string&);
     virtual PropertiesPtr clone();
-    static void addArgumentPrefix(const std::string&);
 
 private:
 
+    PropertiesI();
     PropertiesI(int&, char*[]);
-    PropertiesI(int&, char*[], const std::string& file);
+    friend ICE_API PropertiesPtr createProperties();
     friend ICE_API PropertiesPtr createProperties(int&, char*[]);
-    friend ICE_API PropertiesPtr createPropertiesFromFile(int&, char*[], const std::string&);
 
-    void parseArgs(int&, char*[]);
-    void load(const std::string&);
-    void parse(std::istream&);
     void parseLine(const std::string&);
 
     std::map<std::string, std::string> _properties;
-    static std::set<std::string> _argumentPrefixes;
 };
 
 }