Commit 4b122d2a authored by Dennis Nienhüser's avatar Dennis Nienhüser

Remove MarbleWidget (superseded by MarbleQuickItem). Use namespace.

parent b1a77d2e
......@@ -53,7 +53,7 @@ void MarbleDeclarativePlugin::registerTypes( const char *uri )
qmlRegisterType<Bookmarks>( uri, 0, 20, "Bookmarks" );
qmlRegisterType<Tracking>( uri, 0, 20, "Tracking" );
qmlRegisterType<Marble::Routing>( uri, 0, 20, "Routing" );
qmlRegisterType<Navigation>( uri, 0, 20, "Navigation" );
qmlRegisterType<Marble::Navigation>( uri, 0, 20, "Navigation" );
qmlRegisterType<Search>( uri, 0, 20, "Find" );
qmlRegisterType<CloudSync>( uri, 0, 20, "CloudSync" );
qmlRegisterType<Marble::MergeItem>( uri, 0, 20, "MergeItem" );
......
This diff is collapsed.
......@@ -16,19 +16,15 @@
class QAbstractItemModel;
class MarbleWidget;
namespace Marble {
class MarbleQuickItem;
class MarbleModel;
}
class NavigationPrivate;
class Navigation : public QObject
{
Q_OBJECT
Q_PROPERTY(MarbleWidget* map READ map WRITE setMap NOTIFY mapChanged)
Q_PROPERTY(Marble::MarbleQuickItem * marbleQuickItem READ marbleQuickItem WRITE setMarbleQuickItem NOTIFY marbleQuickItemChanged)
Q_PROPERTY(bool guidanceModeEnabled READ guidanceModeEnabled WRITE setGuidanceModeEnabled NOTIFY guidanceModeEnabledChanged)
Q_PROPERTY(bool muted READ muted WRITE setMuted NOTIFY mutedChanged)
......@@ -49,10 +45,6 @@ public:
~Navigation();
MarbleWidget* map();
void setMap( MarbleWidget* widget );
bool guidanceModeEnabled() const;
void setGuidanceModeEnabled( bool enabled );
......@@ -131,4 +123,6 @@ private:
NavigationPrivate* const d;
};
}
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment