[qet] qet/qet: [5483] Try to fix macOS FTBFS

[subversion@xxxxxxxxxxxxx]

Revision: 5483
Author:   scorpio810
Date:     2018-08-16 03:59:51 +0200 (Thu, 16 Aug 2018)
Log Message:
-----------
Try to fix macOS FTBFS

Modified Paths:
--------------
    trunk/SingleApplication/singleapplication_p.cpp
    trunk/sources/qetapp.cpp
    trunk/sources/qetapp.h

Modified: trunk/SingleApplication/singleapplication_p.cpp
===================================================================
--- trunk/SingleApplication/singleapplication_p.cpp	2018-08-16 00:21:07 UTC (rev 5482)
+++ trunk/SingleApplication/singleapplication_p.cpp	2018-08-16 01:59:51 UTC (rev 5483)
@@ -110,8 +110,7 @@
         } else {
             appData.addData( QStandardPaths::standardLocations( QStandardPaths::HomeLocation ).join("").toUtf8() );
         }
-#endif
-#ifdef Q_OS_UNIX
+#else
         QProcess process;
         process.start( "whoami" );
         if( process.waitForFinished( 100 ) &&

Modified: trunk/sources/qetapp.cpp
===================================================================
--- trunk/sources/qetapp.cpp	2018-08-16 00:21:07 UTC (rev 5482)
+++ trunk/sources/qetapp.cpp	2018-08-16 01:59:51 UTC (rev 5483)
@@ -1755,23 +1755,23 @@
 	every_editor_reduced = every_element_reduced && every_diagram_reduced;
 }
 
-#ifdef Q_OS_DARWIN
-/**
-	Gere les evenements, en particulier l'evenement FileOpen sous MacOs.
-	@param e Evenement a gerer
-*/
-bool QETApp::event(QEvent *e) {
-	// gere l'ouverture de fichiers (sous MacOs)
-	if (e -> type() == QEvent::FileOpen) {
-		// nom du fichier a ouvrir
-		QString filename = static_cast<QFileOpenEvent *>(e) -> file();
-		openFiles(QStringList() << filename);
-		return(true);
-	} else {
-		return(QApplication::event(e));
-	}
-}
-#endif
+//#ifdef Q_OS_DARWIN
+///**
+//	Gere les evenements, en particulier l'evenement FileOpen sous MacOs.
+//	@param e Evenement a gerer
+//*/
+//bool QETApp::event(QEvent *e) {
+//	// gere l'ouverture de fichiers (sous MacOs)
+//	if (e -> type() == QEvent::FileOpen) {
+//		// nom du fichier a ouvrir
+//		QString filename = static_cast<QFileOpenEvent *>(e) -> file();
+//		openFiles(QStringList() << filename);
+//		return(true);
+//	} else {
+//		return(QApplication::event(e));
+//	}
+//}
+//#endif
 
 /**
 	Affiche l'aide et l'usage sur la sortie standard

Modified: trunk/sources/qetapp.h
===================================================================
--- trunk/sources/qetapp.h	2018-08-16 00:21:07 UTC (rev 5482)
+++ trunk/sources/qetapp.h	2018-08-16 01:59:51 UTC (rev 5483)
@@ -142,7 +142,7 @@
 	protected:
 		
 #ifdef Q_OS_DARWIN
-	bool event(QEvent *);
+    //bool event(QEvent *);
 #endif
 	
 		// attributes