[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bgluon=5D_engine=3A_Add_loadFromFile=28=29_method_wi?=
From:       Laszlo Papp <djszapi () archlinux ! us>
Date:       2011-01-30 15:26:28
Message-ID: 20110130152628.D5C54A60B4 () git ! kde ! org
[Download RAW message or body]

Git commit c1f1c859549fdb49831154095966714c7f310818 by Laszlo Papp.
Pushed by lpapp into branch 'master'.

Add loadFromFile() method with QString arguments to hide the details again.

M  +11   -4    engine/gameproject.cpp     
M  +1    -0    engine/gameproject.h     

http://commits.kde.org/fad2ae7b/c1f1c859549fdb49831154095966714c7f310818

diff --git a/engine/gameproject.cpp b/engine/gameproject.cpp
index cc7e52f..87a7cb5 100644
--- a/engine/gameproject.cpp
+++ b/engine/gameproject.cpp
@@ -188,9 +188,16 @@ GameProject::loadFromFile()
 }
 
 bool
-GameProject::loadFromFile( QUrl filename )
+GameProject::loadFromFile( QUrl fileUrl )
 {
-    setFilename( filename );
+    setFilename( fileUrl );
+    return loadFromFile();
+}
+
+bool
+GameProject::loadFromFile( QString fileName )
+{
+    setFilename( fileName );
     return loadFromFile();
 }
 
@@ -239,9 +246,9 @@ GameProject::filename() const
 }
 
 void
-GameProject::setFilename( QUrl newFileUrl )
+GameProject::setFilename( QUrl fileUrl )
 {
-    d->filename = newFileUrl;
+    d->filename = fileUrl;
 }
 
 void
diff --git a/engine/gameproject.h b/engine/gameproject.h
index 740aec6..554c31a 100644
--- a/engine/gameproject.h
+++ b/engine/gameproject.h
@@ -94,6 +94,7 @@ namespace GluonEngine
             bool saveToFile() const;
             bool loadFromFile();
             bool loadFromFile( QUrl fileUrl );
+            bool loadFromFile( QString fileName );
 
             /******************************************************************
              * Property Getter-setters

[prev in list] [next in list] [prev in thread] [next in thread]