Updating to trunk

(bzr r8254.1.54)

1 files changed, 3 insertions, 21 deletions

diff --git a/src/extension/implementation/script.h b/src/extension/implementation/script.h
index e0b6701bf..f37f27966 100644
--- a/src/extension/implementation/script.h
+++ b/src/extension/implementation/script.h
@@ -115,31 +115,14 @@ private:
       */
     Glib::ustring helper_extension;
 
-    /**
-     * Just a quick function to find and resolve relative paths for
-     * the incoming scripts
-     */
-    Glib::ustring solve_reldir (Inkscape::XML::Node *reprin);
-
-    /**
-     *
-     */
-    bool check_existance (const Glib::ustring &command);
-
-    /**
-     *
-     */
+    std::string solve_reldir (Inkscape::XML::Node *reprin);
+    bool check_existence (const std::string &command);
     void copy_doc (Inkscape::XML::Node * olddoc,
                    Inkscape::XML::Node * newdoc);
-
-    /**
-     *
-     */
     void checkStderr (const Glib::ustring &filename,
                       Gtk::MessageType type,
                       const Glib::ustring &message);
 
-
     class file_listener {
         Glib::ustring _string;
         sigc::connection _conn;
@@ -184,7 +167,6 @@ private:
             return true;
         };
 
-        // Note, doing a copy here, on purpose
         Glib::ustring string (void) { return _string; };
 
         bool toFile (const Glib::ustring &name) {
@@ -215,7 +197,7 @@ private:
     };
     static interpreter_t const interpreterTab[];
 
-    Glib::ustring resolveInterpreterExecutable(const Glib::ustring &interpNameArg);
+    std::string resolveInterpreterExecutable(const Glib::ustring &interpNameArg);
 
 }; // class Script