Changeset 78 for trunk/src/IDocument.cxx

Timestamp:

04/17/06 07:28:50 (3 years ago)

Author:

jordi

Message:

Since version 0.5.0 and up doesn't support the old Xpdf header files and because the CairoOutputDev?.h file is not installed on version 0.5.1, I now use Poppler's glib wrapper for PDF loading.

The glib wrapper needs an URI instead of a filename (why?), so the path to the file must be specified as an absolute path to be able to convert it to an URI (file:///dir1/dir2/file.pdf). This also means that the tests files had to be changed to use absolute paths. I added a function (that I'll change to a common utils source) that transform the filename to an absolute path.

Files:

• trunk/src/IDocument.cxx (modified) (13 diffs)

trunk/src/IDocument.cxx

@@ -131 +131 @@
     m_Format = NULL;
     m_Keywords = NULL;
-    m_Linearized = FALSE;
+    m_Linearized = NULL;
     m_ModifiedDate = NULL;
     m_PageLayout = PageLayoutUnset;
@@ -156 +156 @@
     g_free (m_Format);
     g_free (m_Keywords);
+    g_free (m_Linearized);
     g_free (m_ModifiedDate);
     g_free (m_Password);
@@ -182 +183 @@
 /// @brief Sets the document's title.
 ///
-/// @param title The title of the document.
-///
-void
-IDocument::setTitle (const gchar *title)
+/// @param title The title of the document. IDocument will free it.
+///
+void
+IDocument::setTitle (gchar *title)
 {
     g_free (m_Title);
-    m_Title = g_strdup (title);
+    m_Title = title;
 }
 
@@ -210 +211 @@
 /// @brief Sets the document's author.
 ///
-/// @param author The name of the document's author.
-///
-void
-IDocument::setAuthor (const gchar *author)
+/// @param author The name of the document's author. IDocument will free it.
+///
+void
+IDocument::setAuthor (gchar *author)
 {
     g_free (m_Author);
-    m_Author = g_strdup (author);
+    m_Author = author;
 }
 
@@ -238 +239 @@
 /// @brief Sets the document's subject.
 ///
-/// @param subject The subject of the document.
-///
-void
-IDocument::setSubject (const gchar *subject)
+/// @param subject The subject of the document. IDocument will free it.
+///
+void
+IDocument::setSubject (gchar *subject)
 {
     g_free (m_Subject);
-    m_Subject = g_strdup (subject);
+    m_Subject = subject;
 }
 
@@ -266 +267 @@
 /// @brief Sets the document's keywords.
 ///
-/// @param keywords A white space separated list of keywords.
-///
-void
-IDocument::setKeywords (const gchar *keywords)
+/// @param keywords A white space separated list of keywords. IDocument will
+///                 free it.
+///
+void
+IDocument::setKeywords (gchar *keywords)
 {
     g_free (m_Keywords);
-    m_Keywords = g_strdup (keywords);
+    m_Keywords = keywords;
 }
 
@@ -295 +297 @@
 ///
 /// @param creator The name of the software that created the document.
-///
-void
-IDocument::setCreator (const gchar *creator)
+///                IDocument will free it.
+///
+void
+IDocument::setCreator (gchar *creator)
 {
     g_free (m_Creator);
-    m_Creator = g_strdup (creator);
+    m_Creator = creator;
 }
 ///
@@ -322 +325 @@
 ///
 /// @param producer The name of the software that converted the document.
-///
-void
-IDocument::setProducer (const gchar *producer)
+///                 IDocument will free it.
+///
+void
+IDocument::setProducer (gchar *producer)
 {
     g_free (m_Producer);
-    m_Producer = g_strdup (producer);
+    m_Producer = producer;
 }
 
@@ -350 +354 @@
 /// @brief Sets the document's format.
 ///
-/// @param format Set the format in which the document is.
-///
-void
-IDocument::setFormat (const gchar *format)
+/// @param format Set the format in which the document is. IDocument will free
+///               it.
+///
+void
+IDocument::setFormat (gchar *format)
 {
     g_free (m_Format);
-    m_Format = g_strdup (format);
+    m_Format = format;
 }
 
@@ -369 +374 @@
 IDocument::getLinearized ()
 {
-    if ( m_Linearized )
-    {
-        return "Yes";
-    }
-    return "No";
+    if ( NULL == m_Linearized )
+    {
+        return "No";
+    }
+    return m_Linearized;
 }
 
@@ -379 +384 @@
 /// @brief Sets if the document is linearised.
 ///
-/// @param linearized Set to TRUE if the document is linearized. 
-///                   FALSE otherwise.
-///
-void
-IDocument::setLinearized (gboolean linearized)
-{
+/// @param linearized Set to "Yes" if the document is linearized. "No"
+///                   otherwise. IDocument will free it.
+///
+void
+IDocument::setLinearized (gchar *linearized)
+{
+    g_free (m_Linearized);
     m_Linearized = linearized;
 }
@@ -408 +414 @@
 ///
 /// @param date The date and time the document was created in format
-///             'Y-M-D H:M:s'.
-///
-void
-IDocument::setCreationDate (const gchar *date)
+///             'Y-M-D H:M:s'. IDocument will free it.
+///
+void
+IDocument::setCreationDate (gchar *date)
 {
     g_free (m_CreationDate);
-    m_CreationDate = g_strdup (date);
+    m_CreationDate = date;
 }
 
@@ -437 +443 @@
 ///
 /// @param date The date and time the document was modified in format 
-///             'Y-M-D H:M:s'.
-///
-void
-IDocument::setModifiedDate (const gchar *date)
+///             'Y-M-D H:M:s'. IDocument will free it.
+///
+void
+IDocument::setModifiedDate (gchar *date)
 {
     g_free (m_ModifiedDate);
-    m_ModifiedDate = g_strdup (date);
-    
+    m_ModifiedDate = date;
 }