From: Mateusz Półrola <mateusz.polrola@comarch.pl>
Date: Thu, 5 Aug 2010 10:15:39 +0000 (+0200)
Subject: Merge branch 'xdxf'
X-Git-Tag: 0.4~100^2~8
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=f72cd19cb3119da143eaa23e0b9cb7ec46fd8a40;p=mdictionary

Merge branch 'xdxf'

Conflicts:
	trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
	trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.h
---

f72cd19cb3119da143eaa23e0b9cb7ec46fd8a40
diff --cc trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
index 5ead482,4e42a97..be0e716
--- a/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
@@@ -2,7 -2,7 +2,8 @@@
  #include <QDebug>
  #include <QFile>
  #include <QXmlStreamReader>
 +#include <QtPlugin>
+ #include "TranslationXdxf.h"
  
  XdxfPlugin::XdxfPlugin(QObject *parent) : CommonDictInterface(parent),
                      _langFrom(tr("")), _langTo(tr("")),_name(tr("")),
diff --cc trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.h
index fbc78f6,a1244af..8f3fbf5
--- a/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.h
+++ b/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.h
@@@ -5,9 -5,9 +5,10 @@@
  #include <QObject>
  #include <QDialog>
  #include <QRegExp>
- #include "TranslationXdxf.h"
 +#include <QTime>
  
+ class TranslationXdxf;
+ 
  class XdxfPlugin : public CommonDictInterface
  {
      Q_OBJECT