Ticket #5559: mythmainwindow.diff

mythmainwindow.cpp

@@ -105 +105 @@
 class MythMainWindowPrivate
 {
   public:
+        MythMainWindowPrivate();
+        ~MythMainWindowPrivate();
     int TranslateKeyNum(QKeyEvent *e);
 
     float wmult, hmult;
@@ -170 +172 @@
     QWidget *paintwin;
 };
 
+MythMainWindowPrivate::MythMainWindowPrivate()
+
+#ifdef USING_APPLEREMOTE
+:appleRemote(AppleRemote::instance())
+#endif
+{
+}
+
+MythMainWindowPrivate::~MythMainWindowPrivate()
+{
+}
+
 // Make keynum in QKeyEvent be equivalent to what's in QKeySequence
 int MythMainWindowPrivate::TranslateKeyNum(QKeyEvent* e)
 {
@@ -343 +357 @@
 #ifdef USING_APPLEREMOTE
     d->appleRemoteListener = NULL;
     d->appleRemoteListener = new AppleRemoteListener(this);
-    d->appleRemote = AppleRemote(AppleRemote::instance());
 
     d->appleRemote.setListener(d->appleRemoteListener);
     d->appleRemote.startListening();
@@ -436 +449 @@
 #endif
 
 #ifdef USING_APPLEREMOTE
-    if (d->AppleRemote.isRunning())
+    if (d->appleRemote.isRunning())
     {
-        d->AppleRemote.stopListening();
+        d->appleRemote.stopListening();
         //d->AppleRemote.terminate();
         //d->AppleRemote.wait();
     }
@@ -1333 +1346 @@
         {
             QKeyEvent *ke = dynamic_cast<QKeyEvent*>(e);
 
+            // Work around weird GCC run-time bug. Only manifest on Mac OS X
+            if (!ke)
+                ke = (QKeyEvent *)e;
+
             if (currentWidget())
             {
                 ke->accept();