[qet] qet/qet: [5830] Fix fail to build for mac osx

[ Thread Index | Date Index | More lists.tuxfamily.org/qet Archives ]


Revision: 5830
Author:   blacksun
Date:     2019-04-10 20:11:24 +0200 (Wed, 10 Apr 2019)
Log Message:
-----------
Fix fail to build for mac osx

Modified Paths:
--------------
    trunk/sources/main.cpp

Added Paths:
-----------
    trunk/sources/utils/macosxopenevent.cpp
    trunk/sources/utils/macosxopenevent.h

Modified: trunk/sources/main.cpp
===================================================================
--- trunk/sources/main.cpp	2019-04-08 09:53:38 UTC (rev 5829)
+++ trunk/sources/main.cpp	2019-04-10 18:11:24 UTC (rev 5830)
@@ -18,33 +18,8 @@
 #include "qetapp.h"
 #include "singleapplication.h"
 #include "qet.h"
-#include <QFileOpenEvent>
+#include "macosxopenevent.h"
 
-class MacOSXOpenEvent : public QObject
-{
-		Q_OBJECT
-
-	public:
-		MacOSXOpenEvent(QObject *parent = nullptr) :
-			QObject(parent)
-		{}
-
-		~MacOSXOpenEvent(){}
-
-		bool eventFilter(QObject *obj, QEvent *event)
-		{
-			if (event->type() == QEvent::FileOpen)
-			{
-				SingleApplication *app = dynamic_cast<SingleApplication *>(obj);
-				QFileOpenEvent *open_event = static_cast<QFileOpenEvent*>(event);
-				QString message = "launched-with-args: " + open_event->file();
-				app->sendMessage(message.toUtf8());
-				return true;
-			}
-			return false;
-		}
-};
-
 /**
  * @brief main
  * Main function of QElectroTech
@@ -71,7 +46,7 @@
 		//Handle the opening of QET when user double click on a .qet .elmt .tbt file
 		//or drop these same files to the QET icon of the dock
 	MacOSXOpenEvent open_event;
-	app.installEventFilter(open_event);
+	app.installEventFilter(&open_event);
 #endif
 	
 	if (app.isSecondary())

Added: trunk/sources/utils/macosxopenevent.cpp
===================================================================
--- trunk/sources/utils/macosxopenevent.cpp	                        (rev 0)
+++ trunk/sources/utils/macosxopenevent.cpp	2019-04-10 18:11:24 UTC (rev 5830)
@@ -0,0 +1,37 @@
+/*
+        Copyright 2006-2019 The QElectroTech Team
+        This file is part of QElectroTech.
+
+        QElectroTech is free software: you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation, either version 2 of the License, or
+        (at your option) any later version.
+
+        QElectroTech is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "macosxopenevent.h"
+#include "singleapplication.h"
+#include <QFileOpenEvent>
+
+MacOSXOpenEvent::MacOSXOpenEvent(QObject *parent) :
+    QObject(parent)
+{}
+
+bool MacOSXOpenEvent::eventFilter(QObject *watched, QEvent *event)
+{
+    if (event->type() == QEvent::FileOpen)
+    {
+        SingleApplication *app = dynamic_cast<SingleApplication *>(watched);
+        QFileOpenEvent *open_event = static_cast<QFileOpenEvent*>(event);
+        QString message = "launched-with-args: " + open_event->file();
+        app->sendMessage(message.toUtf8());
+        return true;
+    }
+    return false;
+}

Added: trunk/sources/utils/macosxopenevent.h
===================================================================
--- trunk/sources/utils/macosxopenevent.h	                        (rev 0)
+++ trunk/sources/utils/macosxopenevent.h	2019-04-10 18:11:24 UTC (rev 5830)
@@ -0,0 +1,31 @@
+/*
+        Copyright 2006-2019 The QElectroTech Team
+        This file is part of QElectroTech.
+
+        QElectroTech is free software: you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation, either version 2 of the License, or
+        (at your option) any later version.
+
+        QElectroTech is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef MACOSXOPENEVENT_H
+#define MACOSXOPENEVENT_H
+
+#include <QObject>
+
+class MacOSXOpenEvent : public QObject
+{
+     Q_OBJECT
+    public:
+        explicit MacOSXOpenEvent(QObject *parent = nullptr);
+        bool eventFilter(QObject *watched, QEvent *event) override;
+};
+
+#endif // MACOSXOPENEVENT_H


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/