fix compiletion warnings.

diff --git a/taskjuggler/Operation.cpp b/taskjuggler/Operation.cpp
index e83e12c..bb75f04 100644 (file)
--- a/taskjuggler/Operation.cpp
+++ b/taskjuggler/Operation.cpp
@@ -129,7 +129,7 @@ Operation::evalFunction(ExpressionTree* et) const
         return EFT.getFunction(name)->longCall(et, ops);
     }
     else
-        qFatal("Unknown function %s", name.data());
+        qFatal("Unknown function %s", qPrintable(name));
 
     return 0;
 }

diff --git a/taskjuggler/Project.cpp b/taskjuggler/Project.cpp
index d8780bd..18418cc 100644 (file)
--- a/taskjuggler/Project.cpp
+++ b/taskjuggler/Project.cpp
@@ -186,7 +186,7 @@ Project::getScenario(int sc) const
     return 0;
 }
 
-const QString&
+const QString
 Project::getScenarioName(int sc) const
 {
     int i = 0;
@@ -197,7 +197,7 @@ Project::getScenarioName(int sc) const
     return QString::null;
 }
 
-const QString&
+const QString
 Project::getScenarioId(int sc) const
 {
     int i = 0;

diff --git a/taskjuggler/Project.h b/taskjuggler/Project.h
index da74cd8..b0341db 100644 (file)
--- a/taskjuggler/Project.h
+++ b/taskjuggler/Project.h
@@ -119,12 +119,12 @@ public:
      * Returns a pointer to the scenario with index sc.
      * @param sc Index of the scenario in the project scenario list.
      */
-    const QString& getScenarioId(int sc) const;
+    const QString getScenarioId(int sc) const;
     /**
      * Returns the name of a scenario.
      * @param sc Index of the scenario in the project scenario list.
      */
-    const QString& getScenarioName(int sc) const;
+    const QString getScenarioName(int sc) const;
     /**
      * Returns the index of the scenario. The index of the first item in the
      * list is 1, not 0! If the scenario is unknown -1 is returned.
@@ -383,7 +383,7 @@ public:
      * Returns the name of the first vacation that the given date falls into.
      * If no vacation is found QString::Null is returned.
      */
-    const QString& vacationName(time_t vd) const
+    const QString vacationName(time_t vd) const
     {
         return vacationList.vacationName(vd);
     }

diff --git a/taskjuggler/ProjectFile.cpp b/taskjuggler/ProjectFile.cpp
index 5aebf83..35c9e93 100644 (file)
--- a/taskjuggler/ProjectFile.cpp
+++ b/taskjuggler/ProjectFile.cpp
@@ -1059,7 +1059,7 @@ ProjectFile::nextToken(QString& buf)
     return tt;
 }
 
-const QString&
+const QString
 ProjectFile::getTaskPrefix()
 {
     if (openFiles.isEmpty())

diff --git a/taskjuggler/ProjectFile.h b/taskjuggler/ProjectFile.h
index 65979b8..eb957cc 100644 (file)
--- a/taskjuggler/ProjectFile.h
+++ b/taskjuggler/ProjectFile.h
@@ -106,7 +106,7 @@ public:
 
     bool moreFiles() { return !openFiles.isEmpty(); }
 
-    const QString& getTaskPrefix();
+    const QString getTaskPrefix();
 
     bool generateMakeDepList(const QString& fileName, bool append) const;
 

diff --git a/taskjuggler/SVGGanttTaskReport.cpp b/taskjuggler/SVGGanttTaskReport.cpp
index 1272ef5..40a0946 100644 (file)
--- a/taskjuggler/SVGGanttTaskReport.cpp
+++ b/taskjuggler/SVGGanttTaskReport.cpp
@@ -544,4 +544,4 @@ void SVGGanttTaskReport::inheritValues()
     }
 }
 
-#endif
\ No newline at end of file
+#endif

diff --git a/taskjuggler/SVGReport.cpp b/taskjuggler/SVGReport.cpp
index 544b516..86bc40e 100644 (file)
--- a/taskjuggler/SVGReport.cpp
+++ b/taskjuggler/SVGReport.cpp
@@ -56,4 +56,4 @@ void SVGReport::inheritValues()
     }
 }
 
-#endif
\ No newline at end of file
+#endif

diff --git a/taskjuggler/SVGTimeTimeReport.cpp b/taskjuggler/SVGTimeTimeReport.cpp
index d342162..5043558 100644 (file)
--- a/taskjuggler/SVGTimeTimeReport.cpp
+++ b/taskjuggler/SVGTimeTimeReport.cpp
@@ -567,4 +567,4 @@ void SVGTimeTimeReport::inheritValues()
     }
 }
 
-#endif
\ No newline at end of file
+#endif

diff --git a/taskjuggler/VacationList.cpp b/taskjuggler/VacationList.cpp
index b3896de..93bf8b6 100644 (file)
--- a/taskjuggler/VacationList.cpp
+++ b/taskjuggler/VacationList.cpp
@@ -53,7 +53,7 @@ VacationList::isVacation(time_t date) const
     return false;
 }
 
-const QString&
+const QString
 VacationList::vacationName(time_t date) const
 {
     for (VacationList::Iterator vli(*this); *vli != 0; ++vli)

diff --git a/taskjuggler/VacationList.h b/taskjuggler/VacationList.h
index 7049ea8..bf87e67 100644 (file)
--- a/taskjuggler/VacationList.h
+++ b/taskjuggler/VacationList.h
@@ -36,7 +36,7 @@ public:
     void add(const QString& name, const Interval& i);
     void add(VacationInterval* vi);
     bool isVacation(time_t date) const;
-    const QString& vacationName(time_t date) const;
+    const QString vacationName(time_t date) const;
 
 protected:
     virtual int compareItems(Q3PtrCollection::Item i1, Q3PtrCollection::Item i2);