Skip to content

Commit bd37f44

Browse files
committed
Revert "Add lots of stupid code and subclassing QApplication just to support file opening in PropellerIDE, because Mac."
This reverts commit 526e2ff.
1 parent 526e2ff commit bd37f44

File tree

6 files changed

+1
-76
lines changed

6 files changed

+1
-76
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,3 @@ Makefile*
3838
src/propelleride/propelleride
3939
src/terminal/propterm
4040
build/
41-
42-
.DS_Store

src/propelleride/application.cpp

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/propelleride/application.h

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/propelleride/main.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
1-
#include <QtGlobal>
2-
3-
#ifdef Q_OS_MAC
4-
#include "application.h"
5-
#else
61
#include <QApplication>
7-
#endif
8-
92
#include <QDebug>
103
#include <QMessageBox>
114
#include <QStyleFactory>
@@ -62,11 +55,7 @@ int main(int argc, char *argv[])
6255
qInstallMessageHandler(messageHandler);
6356
#endif
6457

65-
#ifdef Q_OS_MAC
66-
Application app(argc, argv);
67-
#else
6858
QApplication app(argc, argv);
69-
#endif
7059

7160
QCoreApplication::setOrganizationName("Parallax");
7261
QCoreApplication::setOrganizationDomain("www.parallax.com");

src/propelleride/mainwindow.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,6 @@ MainWindow::MainWindow(QWidget *parent)
4545
QSplitterHandle *hndl = ui.splitter->handle(1);
4646
hndl->setEnabled(false);
4747

48-
49-
#ifdef Q_OS_MAC
50-
connect(qApp, SIGNAL(fileOpened(const QString &)), ui.editorTabs, SLOT(openFile(const QString &)));
51-
#endif
52-
5348
connect(ui.editorTabs, SIGNAL(fileUpdated(int)), this, SLOT(setProject()));
5449

5550
// File Menu

src/propelleride/propelleride.pro

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ SOURCES += \
3434
preferences.cpp \
3535
logging.cpp \
3636

37-
HEADERS += \
37+
HEADERS += \
3838
buildmanager.h \
3939
clickable.h \
4040
colorchooser.h \
@@ -52,11 +52,6 @@ HEADERS += \
5252
templates/Singleton.h \
5353
logging.h \
5454

55-
macx {
56-
SOURCES += application.cpp
57-
HEADERS += application.h
58-
}
59-
6055
OTHER_FILES +=
6156

6257
FORMS += \

0 commit comments

Comments
 (0)