Scenery3dMgr.hpp   Scenery3dMgr.hpp 
skipping to change at line 18 skipping to change at line 18
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA. * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/ */
#ifndef _SCENERY3DMGR_HPP_ #ifndef _SCENERY3DMGR_HPP_
#define _SCENERY3DMGR_HPP_ #define _SCENERY3DMGR_HPP_
#include <QMap> #include <QMap>
#include <QStringList> #include <QStringList>
#include <QFont> #include <QFont>
#include <QtConcurrent> #include <QtConcurrent>
skipping to change at line 245 skipping to change at line 245
//! @return The loaded SceneInfo. Check SceneInfo::isValid to make sure loading was successful. //! @return The loaded SceneInfo. Check SceneInfo::isValid to make sure loading was successful.
SceneInfo loadScenery3dByName(const QString& name); SceneInfo loadScenery3dByName(const QString& name);
//! This starts the scene loading process. This is asynchronous, this m ethod returns after metadata loading. //! This starts the scene loading process. This is asynchronous, this m ethod returns after metadata loading.
//! @param id a valid scene id/folder path //! @param id a valid scene id/folder path
//! @return The loaded SceneInfo. Check SceneInfo::isValid to make sure loading was successful. //! @return The loaded SceneInfo. Check SceneInfo::isValid to make sure loading was successful.
SceneInfo loadScenery3dByID(const QString& id); SceneInfo loadScenery3dByID(const QString& id);
QString getDefaultScenery3dID() const { return defaultScenery3dID; } QString getDefaultScenery3dID() const { return defaultScenery3dID; }
void setDefaultScenery3dID(const QString& id); void setDefaultScenery3dID(const QString& id);
//! Changes the current view to the given view //! Changes the current view to the given view. JD is updated only if v
void setView(const StoredView& view); iew contains valid data and setDate is true
void setView(const StoredView& view, const bool setDate);
//! Returns a StoredView that represents the current observer position + view direction. //! Returns a StoredView that represents the current observer position + view direction.
//! Label and description are empty. //! Label and description are empty.
StoredView getCurrentView(); StoredView getCurrentView();
private slots: private slots:
void clearMessage(); void clearMessage();
void loadSceneCompleted(); void loadSceneCompleted();
void progressReceive(const QString& str, int val, int min, int max); void progressReceive(const QString& str, int val, int min, int max);
void loadScene(const SceneInfo& scene); void loadScene(const SceneInfo& scene);
 End of changes. 2 change blocks. 
3 lines changed or deleted 4 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/