constify some of this

4 files changed, 14 insertions, 15 deletions

diff --git a/lingucomponent/source/languageguessing/guess.cxx b/lingucomponent/source/languageguessing/guess.cxx
index 3885a417a82a..dc0a743829ed 100644
--- a/lingucomponent/source/languageguessing/guess.cxx
+++ b/lingucomponent/source/languageguessing/guess.cxx
@@ -51,7 +51,7 @@ Guess::Guess()
 *
 */
 
-Guess::Guess(char * guess_str)
+Guess::Guess(const char * guess_str)
 {
     Guess();
 
@@ -108,7 +108,9 @@ Guess::Guess(char * guess_str)
     }
 }
 
-Guess::~Guess(){}
+Guess::~Guess()
+{
+}
 
 string Guess::GetLanguage()
 {
diff --git a/lingucomponent/source/languageguessing/guess.hxx b/lingucomponent/source/languageguessing/guess.hxx
index 5b601ed7c6e9..50e7b005c674 100644
--- a/lingucomponent/source/languageguessing/guess.hxx
+++ b/lingucomponent/source/languageguessing/guess.hxx
@@ -53,7 +53,7 @@ class Guess{
         /**
          * Init from a string like [en-UK-utf8] and the rank
          */
-        Guess(char * guess_str);
+        Guess(const char * guess_str);
 
         ~Guess();
 
diff --git a/lingucomponent/source/languageguessing/simpleguesser.cxx b/lingucomponent/source/languageguessing/simpleguesser.cxx
index eab9f2ae16a6..0b8e59f7783c 100644
--- a/lingucomponent/source/languageguessing/simpleguesser.cxx
+++ b/lingucomponent/source/languageguessing/simpleguesser.cxx
@@ -112,7 +112,7 @@ SimpleGuesser::~SimpleGuesser()
 /*!
     \fn SimpleGuesser::GuessLanguage(char* text)
  */
-vector<Guess> SimpleGuesser::GuessLanguage(char* text)
+vector<Guess> SimpleGuesser::GuessLanguage(const char* text)
 {
     vector<Guess> guesses;
 
@@ -125,7 +125,7 @@ vector<Guess> SimpleGuesser::GuessLanguage(char* text)
     if (len > MAX_STRING_LENGTH_TO_ANALYSE)
         len = MAX_STRING_LENGTH_TO_ANALYSE;
 
-    char *guess_list = textcat_Classify(h, text, len);
+    const char *guess_list = textcat_Classify(h, text, len);
 
     if (strcmp(guess_list, _TEXTCAT_RESULT_SHORT) == 0)
         return guesses;
@@ -134,11 +134,11 @@ vector<Guess> SimpleGuesser::GuessLanguage(char* text)
 
     for(int i = 0; guess_list[current_pointer] != '\0'; i++)
     {
-        while(guess_list[current_pointer] != GUESS_SEPARATOR_OPEN && guess_list[current_pointer] != '\0')
+        while (guess_list[current_pointer] != GUESS_SEPARATOR_OPEN && guess_list[current_pointer] != '\0')
             current_pointer++;
         if(guess_list[current_pointer] != '\0')
         {
-            Guess g((char*)(guess_list + current_pointer));
+            Guess g(guess_list + current_pointer);
 
             guesses.push_back(g);
 
@@ -152,15 +152,12 @@ vector<Guess> SimpleGuesser::GuessLanguage(char* text)
 /*!
     \fn SimpleGuesser::GuessPrimaryLanguage(char* text)
  */
-Guess SimpleGuesser::GuessPrimaryLanguage(char* text)
+Guess SimpleGuesser::GuessPrimaryLanguage(const char* text)
 {
     vector<Guess> ret = GuessLanguage(text);
-    if(!ret.empty()){
+    if (!ret.empty())
         return GuessLanguage(text)[0];
-    }
-    else{
-        return Guess();
-    }
+    return Guess();
 }
 /**
  * Is used to know wich language is available, unavailable or both
diff --git a/lingucomponent/source/languageguessing/simpleguesser.hxx b/lingucomponent/source/languageguessing/simpleguesser.hxx
index 4a164c7e35da..2863a6ed8dd8 100644
--- a/lingucomponent/source/languageguessing/simpleguesser.hxx
+++ b/lingucomponent/source/languageguessing/simpleguesser.hxx
@@ -61,14 +61,14 @@ public:
      * @param char* text is the text to analyze
      * @return the list of guess
      */
-    vector<Guess> GuessLanguage(char* text);
+    vector<Guess> GuessLanguage(const char* text);
 
     /**
      * Analyze a text and return the most probable language of the text
      * @param char* text is the text to analyze
      * @return the guess (containing language)
      */
-    Guess GuessPrimaryLanguage(char* text);
+    Guess GuessPrimaryLanguage(const char* text);
 
     /**
      * List all available languages (possibly to be in guesses)