- Fix gcc compile errors on linux

- Make player usable on linux (X windows sytem weirdness)

diff --git a/lib/anidbudpclient/client.cpp b/lib/anidbudpclient/client.cpp
index c2da3cbf1b07bec43bfcdf09b4619ed253f5434f..89c29a5cdf914509cb783a670ea15497b359c14d 100644 (file)
--- a/lib/anidbudpclient/client.cpp
+++ b/lib/anidbudpclient/client.cpp
@@ -26,7 +26,6 @@ Client::Client(QObject *parent) : QObject(parent)
 qDebug() << "Api instance init!";
 
        m_error = NoError;
-       m_errorString;
        m_idlePolicy = DoNothingIdlePolicy;
 
        disconnecting = false;

diff --git a/src/menu.cpp b/src/menu.cpp
index 4d92cfa1cdfb9e5dc3eb3ffba7cc047e1ea4a566..4b27ad86df07c43cbc03accc9d82f03b7b471cb3 100644 (file)
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -18,11 +18,7 @@
 Menu::Menu(QWidget *parent)
        : QMainWindow(parent), ui(new Ui::MenuClass), dragged(false)
 {
-#ifdef Q_WS_X11
-       setWindowFlags(Qt::Tool | Qt::X11BypassWindowManagerHint);
-#else
        setWindowFlags(Qt::Tool);
-#endif
        setAttribute(Qt::WA_QuitOnClose);
 
        ui->setupUi(this);

diff --git a/src/seekslider.h b/src/seekslider.h
index e9ed5b258ac25ffc0f754c382d4525a63632668f..45e7f4c82bd6771b97bfce255235db6cdb101389 100644 (file)
--- a/src/seekslider.h
+++ b/src/seekslider.h
@@ -3,7 +3,11 @@
 
 #include <QSlider>
 #include <QPointer>
-#include <Phonon/MediaObject>
+#ifdef KDE_PHONON
+#      include <phonon/mediaobject.h>
+#else
+#      include <Phonon/MediaObject>
+#endif
 #include <QQueue>
 
 class SeekSlider : public QWidget

diff --git a/src/videowidget.cpp b/src/videowidget.cpp
index 96bcd8f2209382b19966384c56f1d599b443fca5..606ee36128ef3b19979908220d87786b2afc744d 100644 (file)
--- a/src/videowidget.cpp
+++ b/src/videowidget.cpp
@@ -20,9 +20,11 @@ void VideoWidget::mousePressEvent(QMouseEvent *event)
 {
        if (event->button() == Qt::LeftButton)
                emit menuToggleRequested();
-#ifndef GRAPHICS_VIEW_VIDEO
+#ifndef Q_WS_X11
+#      ifndef GRAPHICS_VIEW_VIDEO
        else if (event->button() == Qt::RightButton)
                toggleFullScreen();
+#      endif
 #endif
        else
                Phonon::VideoWidget::mousePressEvent(event);

diff --git a/src/videowindow.cpp b/src/videowindow.cpp
index 4b143f64dde7223a8a166b100b8295d809cd7103..788efb03994029478bf6af6325254764d46c1cde 100644 (file)
--- a/src/videowindow.cpp
+++ b/src/videowindow.cpp
@@ -299,16 +299,21 @@ void VideoWindow::resizeToVideo()
 void VideoWindow::setPinMenu(bool pinned)
 {
        setMenuPinned(pinned);
+#ifdef Q_WS_X11
+       if (!isFullScreen())
+#endif
        if (pinned)
                moveWithMenu();
 }
 
 void VideoWindow::toggleStayOnTop()
 {
-       if (windowFlags() & Qt::WindowStaysOnTopHint)
-               setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
-       else
-               setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
+       setWindowFlags(windowFlags() ^ Qt::WindowStaysOnTopHint);
+#ifdef Q_WS_X11
+       bool menuVisible = menu->isVisible();
+       menu->setWindowFlags(menu->windowFlags() ^ Qt::WindowStaysOnTopHint);
+       menu->setVisible(menuVisible);
+#endif
        show();
 }
 
@@ -434,8 +439,13 @@ void VideoWindow::mousePressEvent(QMouseEvent *event)
                        videoSceneMenu->setVisible(menu->isVisible());
                        menu->hide();
                }
+#else
+#ifdef Q_WS_X11
+               setWindowState(windowState() ^ Qt::WindowFullScreen);
 #else
                videoPlayer->videoWidget()->toggleFullScreen();
+#endif
+
                event->accept();
 #endif
        }
@@ -466,31 +476,6 @@ void VideoWindow::resizeEvent(QResizeEvent *event)
        windowMoving = false;
 }
 
-#ifdef Q_WS_X11
-void VideoWindow::focusInEvent(QFocusEvent *event)
-{
-       if (event->gotFocus() && videoWidget->isFullScreen())
-       {
-               menu->setVisible(menuVisible);
-               event->accept();
-               return;
-       }
-       QMainWindow::focusInEvent(event);
-}
-
-void VideoWindow::focusOutEvent(QFocusEvent *event)
-{
-       if (event->lostFocus() && videoWidget->isFullScreen())
-       {
-               menuVisible = menu->isVisible();
-               menu->hide();
-               event->accept();
-               return;
-       }
-       QMainWindow::focusOutEvent(event);
-}
-#endif
-
 void VideoWindow::wheelEvent(QWheelEvent *event)
 {
        // Wheel Up

diff --git a/src/videowindow.h b/src/videowindow.h
index 70581e7bdf470da6911d647f74491d8c828c7355..e6cc20d2452268308bc09289912440cb4d6b08bf 100644 (file)
--- a/src/videowindow.h
+++ b/src/videowindow.h
@@ -84,10 +84,6 @@ protected:
 
        virtual void moveEvent(QMoveEvent *event);
        virtual void resizeEvent(QResizeEvent *event);
-#ifdef Q_WS_X11
-       virtual void focusInEvent(QFocusEvent *event);
-       virtual void focusOutEvent(QFocusEvent *event);
-#endif
        virtual void wheelEvent(QWheelEvent *event);
 
        void updateMenuPosition();