Clean-up / commenting

src/core/main.cpp

@@ -99,15 +99,6 @@ int main(int argc, char *argv[])
 
     qInstallMessageHandler(ub_message_output);
 
-
-    /*
-     * setGraphicsSystem is obsolete in Qt5, made redundant by the QPA framework.
-     * TODO: check if this works ok, if not, explore how to use QPA framework
-#if defined(Q_OS_LINUX)
-    qDebug() << "Setting GraphicsSystem to raster";
-    QApplication::setGraphicsSystem("raster");
-#endif
-    */
     UBApplication app("OpenBoard", argc, argv);
 
     QStringList args = app.arguments();
@@ -136,7 +127,6 @@ int main(int argc, char *argv[])
         }
     }
 
-    //app.initialize(false); // should not be needed anymore
 
     QObject::connect(&app, SIGNAL(messageReceived(const QString&, QObject*)), &app, SLOT(handleOpenMessage(const QString&)));
 

src/domain/UBGraphicsMediaItem.cpp

@@ -65,7 +65,13 @@ UBGraphicsMediaItem::UBGraphicsMediaItem(const QUrl& pMediaFileUrl, QGraphicsIte
 
         mMediaObject->setNotifyInterval(50);
 
-        mDummyVideoWidget = new QWidget(); // owned and destructed by the scene ...
+        /* A dummy widget is used to keep the old functionality (when a Phonon video widget
+         * was used) with the current implementation, such as maintaining a clickable area
+         * above the video to move it around, etc.
+         * The whole class could be cleaned up, and the inheritance of QGraphicsProxyWidget
+         * abandoned, to make for a cleaner solution; for now, this works ok.
+        */
+        mDummyVideoWidget = new QWidget();
         mDummyVideoWidget->resize(320,240);
         mDummyVideoWidget->setMinimumSize(320, 240);
         mDummyVideoWidget->setWindowOpacity(0.0);

src/podcast/UBPodcastController.cpp

@@ -799,7 +799,7 @@ QStringList UBPodcastController::audioRecordingDevices()
     QStringList devices;
 
 #ifdef Q_OS_WIN
-    //devices = UBWaveRecorder::waveInDevices();
+    devices = UBWaveRecorder::waveInDevices();
 #elif defined(Q_OS_OSX)
     devices = UBAudioQueueRecorder::waveInDevices();
 #endif

src/tools/UBGraphicsTriangle.cpp

@@ -297,8 +297,8 @@ void UBGraphicsTriangle::paint(QPainter *painter, const QStyleOptionGraphicsItem
 
     mCloseSvgItem->setPos(closeButtonRect().topLeft());
 
-    qDebug() << "UBGraphicsTriangle Paint"<<"closeButtonRect().topLeft()="
-    <<closeButtonRect().topLeft();
+    //qDebug() << "UBGraphicsTriangle Paint"<<"closeButtonRect().topLeft()="
+    //<<closeButtonRect().topLeft();
 
     mHFlipSvgItem->setPos(hFlipRect().topLeft());
     mVFlipSvgItem->setPos(vFlipRect().topLeft());
@@ -321,7 +321,7 @@ QPainterPath UBGraphicsTriangle::shape() const
     QPainterPath tShape;
     QPolygonF tPolygon;
 
-    qDebug() << "UBGraphicsTriangle shape()"<<"A1 ="<<A1<<"B1 ="<<B1<<"C1 ="<<C1;
+    //qDebug() << "UBGraphicsTriangle shape()"<<"A1 ="<<A1<<"B1 ="<<B1<<"C1 ="<<C1;
 
     tPolygon << A1 << B1 << C1;
     tShape.addPolygon(tPolygon);
@@ -331,8 +331,8 @@ QPainterPath UBGraphicsTriangle::shape() const
     tShape.addPolygon(tPolygon);
     tPolygon.clear();
 
-    qDebug() << "UBGraphicsTriangle shape()"<<"A1 ="<<A1<<"B1 ="<<B1<<"C1 ="<<C1;
-    qDebug() << "UBGraphicsTriangle shape()"<<"A2 ="<<A2<<"B2 ="<<B2<<"C2 ="<<C2;
+    //qDebug() << "UBGraphicsTriangle shape()"<<"A1 ="<<A1<<"B1 ="<<B1<<"C1 ="<<C1;
+    //qDebug() << "UBGraphicsTriangle shape()"<<"A2 ="<<A2<<"B2 ="<<B2<<"C2 ="<<C2;
 
     return tShape;
 }