diff options
| -rw-r--r-- | configure.in.in | 2 | ||||
| -rw-r--r-- | src/kmplayer_koffice_part.cpp | 11 | ||||
| -rw-r--r-- | src/kmplayer_koffice_part.h | 17 |
3 files changed, 19 insertions, 11 deletions
diff --git a/configure.in.in b/configure.in.in index 7fbf532..509b6d2 100644 --- a/configure.in.in +++ b/configure.in.in @@ -20,7 +20,7 @@ else AC_MSG_RESULT(no) fi], [AC_MSG_RESULT(no); want_koffice_plugin="no"]) -KDE_CHECK_HEADER(koDocument.h, +KDE_CHECK_HEADER(KoDocument.h, have_koffice=yes, have_koffice=no) diff --git a/src/kmplayer_koffice_part.cpp b/src/kmplayer_koffice_part.cpp index 55faaa2..61e9876 100644 --- a/src/kmplayer_koffice_part.cpp +++ b/src/kmplayer_koffice_part.cpp @@ -53,7 +53,7 @@ #include <tqlayout.h> #include <tqptrlist.h> #include <tqpainter.h> -#include <koFrame.h> +#include <KoFrame.h> class KMPlayerFactory : public KParts::Factory { public: @@ -94,7 +94,7 @@ KParts::Part *KMPlayerFactory::createPartObject KOfficeMPlayer::KOfficeMPlayer (TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, bool singleViewMode) : KoDocument (parentWidget, widgetName, parent, name, singleViewMode), m_config (new TDEConfig ("kmplayerrc")), - m_player (new KMPlayer (parentWidget, 0L, 0L, 0L, m_config)) + m_player (new KMPlayer::PartBase (parentWidget, 0L, 0L, 0L, m_config)) { setInstance (KMPlayerFactory::instance (), false); setReadWrite (false); @@ -111,7 +111,7 @@ void KOfficeMPlayer::paintContent (TQPainter& p, const TQRect& r, bool, double, p.fillRect (r, TQBrush (TQColor (0, 0, 0))); } -bool KOfficeMPlayer::initDoc() { +bool KOfficeMPlayer::initDoc(InitDocFlags flags, TQWidget* parentWidget) { kdDebug() << "KOfficeMPlayer::initDoc" << endl; return true; } @@ -133,6 +133,11 @@ bool KOfficeMPlayer::loadOasis (const TQDomDocument &, KoOasisStyles &, const TQ return true; } +bool KOfficeMPlayer::saveOasis( KoStore* store, KoXmlWriter* manifestWriter ) +{ + return true; +} + TQDomDocument KOfficeMPlayer::saveXML() { TQDomDocument doc = createDomDocument ("kmplayer", TQString::number(1.0)); TQDomElement docelm = doc.documentElement(); diff --git a/src/kmplayer_koffice_part.h b/src/kmplayer_koffice_part.h index cae4250..5a68560 100644 --- a/src/kmplayer_koffice_part.h +++ b/src/kmplayer_koffice_part.h @@ -25,8 +25,8 @@ #include <tdeparts/factory.h> #include <kurl.h> #ifdef HAVE_KOFFICE -#include <koDocument.h> -#include <koView.h> +#include <KoDocument.h> +#include <KoView.h> #endif //HAVE_KOFFICE #include <tqobject.h> #include <tqvaluelist.h> @@ -39,10 +39,12 @@ class TDEProcess; class TDEAboutData; -class KMPlayer; class TDEInstance; class TDEConfig; class TQIODevice; +namespace KMPlayer { + class PartBase; +} #ifdef HAVE_KOFFICE class KOfficeMPlayer; @@ -64,22 +66,23 @@ class KOfficeMPlayer : public KoDocument { public: KOfficeMPlayer (TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false); - ~KOfficeMPlayer (); + virtual ~KOfficeMPlayer (); virtual void paintContent (TQPainter& painter, const TQRect& rect, bool transparent = false, double zoomX = 1.0, double zoomY = 1.0); - virtual bool initDoc (); + virtual bool initDoc (InitDocFlags flags, TQWidget* parentWidget=0); virtual bool loadXML (TQIODevice *, const TQDomDocument &); virtual bool loadOasis (const TQDomDocument &, KoOasisStyles &, const TQDomDocument &, KoStore *); + virtual bool saveOasis( KoStore *store, KoXmlWriter *manifestWriter ); virtual TQDomDocument saveXML (); virtual TQCString mimeType() const { return "application/x-kmplayer"; } - KMPlayer * player () const { return m_player; } + KMPlayer::PartBase * player () const { return m_player; } protected: virtual KoView* createViewInstance (TQWidget* parent, const char* name); private: TDEConfig * m_config; - KMPlayer * m_player; + KMPlayer::PartBase * m_player; KOfficeMPlayerView * m_view; }; #endif //HAVE_KOFFICE |