Revert "Add lots of stupid code and subclassing QApplication just to …

…support file opening in PropellerIDE, because Mac." This reverts commit 526e2ff.
parallaxinc · Apr 24, 2016 · bd37f44 · bd37f44
1 parent 526e2ff
commit bd37f44
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 76 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,5 +38,3 @@ Makefile*
 src/propelleride/propelleride
 src/terminal/propterm
 build/
-
-.DS_Store
diff --git a/src/propelleride/application.cpp b/src/propelleride/application.cpp
diff --git a/src/propelleride/application.h b/src/propelleride/application.h
diff --git a/src/propelleride/main.cpp b/src/propelleride/main.cpp
@@ -1,11 +1,4 @@
-#include <QtGlobal>
-
-#ifdef Q_OS_MAC
-#include "application.h"
-#else
 #include <QApplication>
-#endif
-
 #include <QDebug>
 #include <QMessageBox>
 #include <QStyleFactory>
@@ -62,11 +55,7 @@ int main(int argc, char *argv[])
     qInstallMessageHandler(messageHandler);
 #endif
 
-#ifdef Q_OS_MAC
-    Application app(argc, argv);
-#else
     QApplication app(argc, argv);
-#endif
 
     QCoreApplication::setOrganizationName("Parallax");
     QCoreApplication::setOrganizationDomain("www.parallax.com");

diff --git a/src/propelleride/mainwindow.cpp b/src/propelleride/mainwindow.cpp
@@ -45,11 +45,6 @@ MainWindow::MainWindow(QWidget *parent)
     QSplitterHandle *hndl = ui.splitter->handle(1);
     hndl->setEnabled(false);
 
-
-#ifdef Q_OS_MAC
-    connect(qApp, SIGNAL(fileOpened(const QString &)), ui.editorTabs, SLOT(openFile(const QString &)));
-#endif
-
     connect(ui.editorTabs, SIGNAL(fileUpdated(int)),    this,   SLOT(setProject()));
 
     // File Menu

diff --git a/src/propelleride/propelleride.pro b/src/propelleride/propelleride.pro
@@ -34,7 +34,7 @@ SOURCES += \
     preferences.cpp \
     logging.cpp \
 
-HEADERS += \
+HEADERS  += \
     buildmanager.h \
     clickable.h \
     colorchooser.h \
@@ -52,11 +52,6 @@ HEADERS += \
     templates/Singleton.h \
     logging.h \
 
-macx {
-    SOURCES += application.cpp
-    HEADERS += application.h
-}
-
 OTHER_FILES +=
 
 FORMS += \