diff options
| author | Marius Kintel <marius@kintel.net> | 2013-10-04 07:20:03 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-10-04 07:20:03 (GMT) |
| commit | 0404a921af67a05f236f9f846243d4ffb1f74474 (patch) | |
| tree | 132607d2cbf85b9c42a35993d6d44d2c443f8bcc /src/mainwin.cc | |
| parent | 94070f7b51e54f64d977be90339c77521705b444 (diff) | |
| parent | 5ed3e28b7a2e3eccb084cd582e4148a7aebb3b86 (diff) | |
Merge pull request #499 from openscad/issue480
Issue480
Diffstat (limited to 'src/mainwin.cc')
| -rw-r--r-- | src/mainwin.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/mainwin.cc b/src/mainwin.cc index fd1c552..65c511f 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -27,7 +27,6 @@ #include "PolySetCache.h" #include "ModuleCache.h" #include "MainWindow.h" -#include "openscad.h" // examplesdir #include "parsersettings.h" #include "Preferences.h" #include "printutils.h" @@ -103,10 +102,9 @@ #include "boosty.h" -extern QString examplesdir; - // Global application state unsigned int GuiLocker::gui_locked = 0; +QString MainWindow::qexamplesdir; #define QUOTE(x__) # x__ #define QUOTED(x__) QUOTE(x__) @@ -253,10 +251,9 @@ MainWindow::MainWindow(const QString &filename) this->menuOpenRecent->addAction(this->fileActionClearRecent); connect(this->fileActionClearRecent, SIGNAL(triggered()), this, SLOT(clearRecentFiles())); - - if (!examplesdir.isEmpty()) { + if (!qexamplesdir.isEmpty()) { bool found_example = false; - QStringList examples = QDir(examplesdir).entryList(QStringList("*.scad"), + QStringList examples = QDir(qexamplesdir).entryList(QStringList("*.scad"), QDir::Files | QDir::Readable, QDir::Name); foreach (const QString &ex, examples) { this->menuExamples->addAction(ex, this, SLOT(actionOpenExample())); @@ -985,7 +982,7 @@ void MainWindow::actionOpenExample() { QAction *action = qobject_cast<QAction *>(sender()); if (action) { - openFile(examplesdir + QDir::separator() + action->text()); + openFile(qexamplesdir + QDir::separator() + action->text()); } } |