Fixed merge bug in translation widget

diff --git a/debian/files b/debian/files
deleted file mode 100644 (file)
index 3ff624b..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-mdictionary_1.0.0-2_armel.deb user/education optional

diff --git a/trunk/src/base/gui/TranslationWidget.cpp b/trunk/src/base/gui/TranslationWidget.cpp
index 8b2e564..39cc238 100644 (file)
--- a/trunk/src/base/gui/TranslationWidget.cpp
+++ b/trunk/src/base/gui/TranslationWidget.cpp
@@ -101,13 +101,7 @@ QString TranslationWidget::XslConversion(QString translation)
     return result;
 }
 
-void TranslationWidget::initializeUI() {
-
-    zoomInToolButton = new QToolButton;
-    zoomInToolButton->setIcon(QIcon::fromTheme("pdf_zoomin"));
 
-    zoomOutToolButton = new QToolButton;
-    zoomOutToolButton->setIcon(QIcon::fromTheme("pdf_zoomout"));
 #ifdef Q_WS_MAEMO_5
 void TranslationWidget::initButtons() {