Do not override menu font size, use font as defined in Appearance settings, and fixed compiler warning

2 files changed, 2 insertions, 11 deletions

diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp
index cc88555..93348f4 100644
--- a/core/apps/embeddedkonsole/TEWidget.cpp
+++ b/core/apps/embeddedkonsole/TEWidget.cpp
@@ -806,13 +806,13 @@ void TEWidget::mouseMoveEvent(QMouseEvent* ev)
 
 void TEWidget::mouseReleaseEvent(QMouseEvent* ev)
 {
 //printf("release [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button());
   if ( ev->button() == LeftButton)
   {
-    if (QABS(ev->x() - mouse_down_x) < 3 
+    if (QABS(ev->x() - mouse_down_x) < 3
 	&& QABS(ev->y() - mouse_down_y) < 3
 	&& ev->y() < qApp->desktop()->height()/8) {
       emit setFullScreen(false);
     }
 
     if ( actSel > 1 ) emit endSelectionSignal(preserve_line_breaks);
@@ -1386,13 +1386,13 @@ void TEWidget::dropEvent(QDropEvent* event)
     // Paste it
   }
 }
 #endif
 
 
-void TEWidget::drop_menu_activated(int item)
+void TEWidget::drop_menu_activated(int /*item*/)
 {
 #ifndef QT_NO_DRAGANDDROP
   switch (item)
   {
     case 0: // paste
       currentSession->getEmulation()->sendString(dropText.local8Bit());
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index c5df47f..cbea7bd 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -507,21 +507,12 @@ void Konsole::init(const char* _pgm, QStrList & _args)
     setToolBarsMovable( FALSE );
     menuToolBar = new QToolBar( this );
     menuToolBar->setHorizontalStretchable( TRUE );
 
     QMenuBar *menuBar = new QMenuBar( menuToolBar );
 
-    bool c7xx = false;
-    if (qApp->desktop()->width() > 600 || qApp->desktop()->height() > 600)
-    {
-        c7xx = true;
-    }
-    QFont menuFont;
-    menuFont.setPointSize(c7xx? 18 : 10);
-    qApp->setFont(menuFont, true);
-
     setFont(cfont);
 
     configMenu = new QPopupMenu( this);
     colorMenu = new QPopupMenu( this);
     scrollMenu = new QPopupMenu( this);
     editCommandListMenu = new QPopupMenu( this);