Merge branch 'xdxf'

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

diff --cc trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
index 5ead482,4e42a97..be0e716
--- 1/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
--- 2/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
--- 1/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.h
--- 2/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