[Marble-commits] Re: KDE/kdeedu/marble/src

[Bernhard Beschow]

Hi Marco,

after your commit I get the following error message when I start Marble, leading to empty menus:

  marble(8029) KXMLGUIClient::setXMLFile: cannot find .rc file "marble_part.rc" for component "marble"

Could you please get that fixed? Thanks a lot!

Greetings,
Bernhard

> SVN commit 1217937 by mart:
> 
> remove the use of deprecated kpart functions
> http://svn.reviewboard.kde.org/r/6413/
> 
> 
>  M  +1 -1      KdeMainWindow.cpp  
>  M  +8 -8      marble_part.cpp  
>  M  +1 -1      marble_part.h  
> 
> 
> --- trunk/KDE/kdeedu/marble/src/KdeMainWindow.cpp #1217936:1217937
> @@ -36,7 +36,7 @@
>  MainWindow::MainWindow( const QString& marbleDataPath, QWidget *parent )
>      : KXmlGuiWindow( parent )
>  {
> -    m_part = new MarblePart( this, this, QStringList() << marbleDataPath );
> +    m_part = new MarblePart( this, this, QVariantList() << marbleDataPath );
>  
>      setCentralWidget( m_part->widget() );
>  
> --- trunk/KDE/kdeedu/marble/src/marble_part.cpp #1217936:1217937
> @@ -29,6 +29,7 @@
>  #include <QtNetwork/QNetworkProxy>
>  
>  // KDE
> +#include <kaboutdata.h>
>  #include <kaction.h>
>  #include <kactioncollection.h>
>  #include <kapplication.h>
> @@ -37,9 +38,10 @@
>  #include <kdeversion.h>
>  #include <kfiledialog.h>
>  #include <kicon.h>
> +#include <klocale.h>
>  #include <kmenu.h>
>  #include <kmessagebox.h>
> -#include <kparts/genericfactory.h>
> +#include <kpluginfactory.h>
>  #include <kparts/statusbarextension.h>
>  #include <kstandardaction.h>
>  #include <kstatusbar.h>
> @@ -106,10 +108,10 @@
>      const char* DATETIME_STRING =  "Time: %1";
>  }
>  
> -typedef KParts::GenericFactory< MarblePart > MarblePartFactory;
> -K_EXPORT_COMPONENT_FACTORY( libmarble_part, MarblePartFactory )
> +K_PLUGIN_FACTORY(MarblePartFactory, registerPlugin<MarblePart>();)
> +K_EXPORT_PLUGIN(MarblePartFactory("marble"))
>  
> -MarblePart::MarblePart( QWidget *parentWidget, QObject *parent, const QStringList &arguments )
> +MarblePart::MarblePart( QWidget *parentWidget, QObject *parent, const QVariantList &arguments )
>    : KParts::ReadOnlyPart( parent ),
>      m_sunControlDialog( 0 ),
>      m_timeControlDialog( 0 ),
> @@ -122,8 +124,8 @@
>      m_distanceLabel( 0 )
>  {
>      // only set marble data path when a path was given
> -    if ( arguments.count() != 0 && !arguments.first().isEmpty() )
> -        MarbleDirs::setMarbleDataPath( arguments.first() );
> +    if ( arguments.count() != 0 && !arguments.first().toString().isEmpty() )
> +        MarbleDirs::setMarbleDataPath( arguments.first().toString() );
>  
>      // Setting measure system to provide nice standards for all unit questions.
>      // This has to happen before any initialization so plugins (for example) can
> @@ -139,8 +141,6 @@
>  
>      m_controlView = new ControlView( parentWidget );
>  
> -    setComponentData( MarblePartFactory::componentData() );
> -
>      setWidget( m_controlView );
>  
>      setupActions();
> --- trunk/KDE/kdeedu/marble/src/marble_part.h #1217936:1217937
> @@ -51,7 +51,7 @@
>    Q_OBJECT
>  
>    public:
> -    MarblePart( QWidget *parentWidget, QObject *parent, const QStringList& );
> +    MarblePart( QWidget *parentWidget, QObject *parent, const QVariantList& );
>      virtual ~MarblePart();
>  
>      ControlView *controlView() const;
>