# # # rename "src/Guitone.cpp" # to "src/GuitoneStandalone.cpp" # # rename "src/Guitone.h" # to "src/GuitoneStandalone.h" # # patch "guitone.pro" # from [357b1d79e4869690b7e60e437a4d765690ffbe4a] # to [ee6dcd0c31b6a08692c4b9fc1bfbd406097b402c] # # patch "res/i18n/guitone_de.ts" # from [1ac99422749af61e6a8323f6fefad0bd01c7183a] # to [6f00fe4a42c57a07d72abeac204f12b5001834f4] # # patch "res/osx/Info.plist.in" # from [aa1e6bdaf5d5eb91ef6381aecf3b6771f84f2927] # to [9617529f934ca113ee7e114f5168c32bb51ae5b6] # # patch "src/GuitoneStandalone.cpp" # from [22dcaeed1615785dd5370bab52797265d1634610] # to [d1c87799d80bcc79191ac80aa795230555692fd2] # # patch "src/GuitoneStandalone.h" # from [58b322d7d904b8d40ac3199c369d2f26e9e8caa1] # to [3d2741fae99e6b327fbe4534742c0e2ab61d0a19] # # patch "src/main.cpp" # from [60049867487708f7eb18c012c34641041114aec8] # to [a9ef5aad2b31530f7758ea915cc0c95aeee7a114] # # patch "src/model/AutomateCommand.cpp" # from [cb33a7922177d9b07d46bc81ecc1453f92c96c8e] # to [d60e44ba49f434b8c99e59b127c8590077e2b510] # # patch "src/monotone/FileExporter.cpp" # from [d66aabfa3ab17e27a8464b4721ff0d47f2a5cf56] # to [36bd5b1d10304860014f5cf41c42b89304608141] # # patch "src/monotone/MonotoneUtil.cpp" # from [337414f278e2f74e22c73a134de0e40d475a7af9] # to [1f852ae56f420b550a5a1bc9c0a787a12ea46eec] # # patch "src/view/AttributesView.cpp" # from [1a9ca66bb8fcee26e941b962d4f3d9efe975b417] # to [5e587e36bb8e4c98bec0f095748979c387cf946d] # # patch "src/view/DatabaseWindow.cpp" # from [301858460154bc94a7d4b433f40f2654716299bd] # to [53a5313109e0dfbfbc32ca8572ac4d6655de13b1] # # patch "src/view/MainWindow.cpp" # from [9234140581c324011828a21086196827bbda2605] # to [0c76f127b9aade762a6f5db477d6049480e69231] # # patch "src/view/WorkspaceWindow.cpp" # from [2af2e9a9dac69191b72ea1ff6c67aa5ca8359016] # to [a7744828493d81e4875a1cf62765cb7f8419b7d5] # # patch "src/view/dialogs/Preferences.cpp" # from [e3b7d8f1a25f1d24124d6231e9553c983a979a82] # to [351eafe6e4744dff3978eefdbea7814ec255232a] # # patch "src/view/dialogs/WorkspaceDialogManager.cpp" # from [052fef6ee22f29c32c391a7ba659852f78328496] # to [abfaee7978ee13a369f98693b2087e940b01755d] # # patch "src/vocab.h" # from [4e71a34556bdba331e84d2e13221f1d6220c8832] # to [dbf25bf791128d4133a26be9f0698e6efb638ce7] # ============================================================ --- guitone.pro 357b1d79e4869690b7e60e437a4d765690ffbe4a +++ guitone.pro ee6dcd0c31b6a08692c4b9fc1bfbd406097b402c @@ -89,7 +89,9 @@ HEADERS = src/view/TreeView.h \ src/util/TreeBuilder.h \ src/util/DebugLog.h \ src/util/StdioParser.h \ - src/Guitone.h \ + src/GuitoneCore.h \ + src/GuitoneStandalone.h \ + src/GuitoneDriver.h \ src/vocab.h SOURCES += src/view/TreeView.cpp \ src/view/Splitter.cpp \ @@ -161,7 +163,9 @@ SOURCES += src/view/TreeView.cpp \ src/util/TreeBuilder.cpp \ src/util/DebugLog.cpp \ src/util/StdioParser.cpp \ - src/Guitone.cpp \ + src/GuitoneCore.cpp \ + src/GuitoneStandalone.cpp \ + src/GuitoneDriver.cpp \ src/main.cpp FORMS += res/forms/select_revision.ui \ ============================================================ --- res/i18n/guitone_de.ts 1ac99422749af61e6a8323f6fefad0bd01c7183a +++ res/i18n/guitone_de.ts 6f00fe4a42c57a07d72abeac204f12b5001834f4 @@ -131,22 +131,22 @@ AttributesView - + add new attribute Neues Attribut hinzufÃ¼gen - + edit attribute Attribut editieren - + drop attribute Attribut lÃ¶schen - + drop all attributes Alle Attribute lÃ¶schen @@ -937,7 +937,7 @@ In jedem Fall sollte der derzeitige Arbe Error - Fehler + Fehler @@ -962,54 +962,114 @@ In jedem Fall sollte der derzeitige Arbe The path to the monotone binary is either invalid or points to a version of monotone with which guitone can't work with. Guitone requires monotone with an interface version between '%1' and '%2'. Your installation has the interface version '%3'. - Der Pfad zur ausfÃ¼hrbaren Datei von monotone ist entweder ungÃ¼ltig oder zeigt auf eine Version von monotone, mit der guitone nicht arbeiten kann. Guitone benÃ¶tigt ein monotone mit einer Interface-Version zwischen '%1' und '%2'. Ihre monotone-Installation hat die Interface-Version '%3'. + Der Pfad zur ausfÃ¼hrbaren Datei von monotone ist entweder ungÃ¼ltig oder zeigt auf eine Version von monotone, mit der guitone nicht arbeiten kann. Guitone benÃ¶tigt ein monotone mit einer Interface-Version zwischen '%1' und '%2'. Ihre monotone-Installation hat die Interface-Version '%3'. Non-existant path '%1' - Nicht-existierender Pfad '%1' + Nicht-existierender Pfad '%1' Path is neither a file nor a directory - Pfad ist weder eine Datei noch ein Verzeichnis + Pfad ist weder eine Datei noch ein Verzeichnis Failed to load workspace - Konnte Arbeitsbereich nicht laden + Konnte Arbeitsbereich nicht laden The workspace could not be loaded: %1 - Der Arbeitsbereich konnte nicht geladen werden: + Der Arbeitsbereich konnte nicht geladen werden: %1 Failed to load database - Konnte Datenbank nicht laden + Konnte Datenbank nicht laden The database could not be loaded: %1 - Die Datenbank konnte nicht geladen werden: + Die Datenbank konnte nicht geladen werden: %1 No updates available - Keine Aktualisierungen verfÃ¼gbar + Keine Aktualisierungen verfÃ¼gbar Your version of guitone (%1) is already up-to-date. - Ihre Version von guitone (%1) ist bereits aktuell. + Ihre Version von guitone (%1) ist bereits aktuell. + GuitoneCore + + + Error + Fehler + + + + The path to the monotone binary is either invalid or points to a version of monotone with which guitone can't work with. Guitone requires monotone with an interface version between '%1' and '%2'. Your installation has the interface version '%3'. + Der Pfad zur ausfÃ¼hrbaren Datei von monotone ist entweder ungÃ¼ltig oder zeigt auf eine Version von monotone, mit der guitone nicht arbeiten kann. Guitone benÃ¶tigt ein monotone mit einer Interface-Version zwischen '%1' und '%2'. Ihre monotone-Installation hat die Interface-Version '%3'. + + + + No updates available + Keine Aktualisierungen verfÃ¼gbar + + + + Your version of guitone (%1) is already up-to-date. + Ihre Version von guitone (%1) ist bereits aktuell. + + + + GuitoneStandalone + + + Non-existant path '%1' + Nicht-existierender Pfad '%1' + + + + Path is neither a file nor a directory + Pfad ist weder eine Datei noch ein Verzeichnis + + + + Failed to load workspace + Konnte Arbeitsbereich nicht laden + + + + The workspace could not be loaded: +%1 + Der Arbeitsbereich konnte nicht geladen werden: +%1 + + + + Failed to load database + Konnte Datenbank nicht laden + + + + The database could not be loaded: +%1 + Die Datenbank konnte nicht geladen werden: +%1 + + + Inventory ============================================================ --- res/osx/Info.plist.in aa1e6bdaf5d5eb91ef6381aecf3b6771f84f2927 +++ res/osx/Info.plist.in 9617529f934ca113ee7e114f5168c32bb51ae5b6 @@ -1,33 +1,33 @@ - CFBundleDevelopmentRegion - English - CFBundleExecutable - guitone - CFBundleGetInfoString - guitone - a monotone frontend - (c) Thomas Keller 2006-2007 - CFBundleIconFile - guitone.icns - CFBundleIdentifier - biz.thomaskeller.guitone - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - guitone - CFBundlePackageType - APPL - CFBundleShortVersionString - @@version@@ - CFBundleSignature - MQAC - CFBundleVersion - @@version@@ - LSMinimumSystemVersion - 10.4.0 - SUFeedURL - http://guitone.thomaskeller.biz/appcast.xml + CFBundleDevelopmentRegion + English + CFBundleExecutable + guitone + CFBundleGetInfoString + guitone - a monotone frontend - (c) Thomas Keller 2006-2007 + CFBundleIconFile + guitone.icns + CFBundleIdentifier + biz.thomaskeller.guitone + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + guitone + CFBundlePackageType + APPL + CFBundleShortVersionString + @@version@@ + CFBundleSignature + MQAC + CFBundleVersion + @@version@@ + LSMinimumSystemVersion + 10.4.0 + SUFeedURL + http://guitone.thomaskeller.biz/appcast.xml CFBundleDocumentTypes ============================================================ --- src/Guitone.cpp 22dcaeed1615785dd5370bab52797265d1634610 +++ src/GuitoneStandalone.cpp d1c87799d80bcc79191ac80aa795230555692fd2 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007 by Thomas Keller * + * Copyright (C) 2008 by Thomas Keller * * address@hidden * * * * This program is free software; you can redistribute it and/or modify * @@ -18,117 +18,43 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "Guitone.h" +#include "GuitoneStandalone.h" #include "WorkspaceWindow.h" #include "DatabaseWindow.h" -#include "Preferences.h" #include "Settings.h" -#ifdef Q_WS_MACX -#include "CocoaUtil.h" -#endif - +#include #include -#include -#include #include #include #include #include -Guitone::Guitone(int & argc, char** argv) - : QApplication(argc, argv), openPrompt(0), - monotoneManager(0), somethingLoaded(false) +GuitoneStandalone::GuitoneStandalone(int & argc, char** argv) + : GuitoneCore(argc, argv, QApplication::GuiClient), + openPrompt(0), somethingLoaded(false) { -#ifndef Q_WS_MACX - updateDialog = 0; -#else - CocoaUtil::initialize(); -#endif - setQuitOnLastWindowClosed(false); - - // check for updates immediatly on launch - if (Settings::getBool("CheckForUpdates", true)) - { - checkForApplicationUpdates(true); - } - - monotoneManager = new MonotoneManager(); - - // Try to load something given on the command line - // or found in one of the recent items lists as soon as - // the manager got a valid binary path set - // We need a queued, rather than direct connection to give - // Qt the chance to process other events as well, so we - // do receive f.e. FileOpen events properly + D(QString("type: %1").arg(type())); connect( this, SIGNAL(monotoneBinaryPathSet()), this, SLOT(loadSomething()), Qt::QueuedConnection ); - - QTimer::singleShot(0, this, SLOT(setMonotoneBinaryPath())); } -Guitone::~Guitone() +GuitoneStandalone::~GuitoneStandalone() { - delete monotoneManager; I(openWindows.size() == 0); if (openPrompt) delete openPrompt; -#ifndef Q_WS_MACX - if (updateDialog) delete updateDialog; -#endif } -void Guitone::setMonotoneBinaryPath() +void GuitoneStandalone::loadSomething() { - if (monotoneManager->monotoneBinaryPathSet()) - { - W("monotone binary path already set"); - } - - QString installedVersion; - if (!monotoneManager->setMonotoneBinaryPath( - Settings::getMtnBinaryPath(), - Settings::getBool("RelaxedVersionCheck", false), - installedVersion)) - { - QMessageBox::critical( - NULL, - tr("Error"), - tr("The path to the monotone binary is either invalid " - "or points to a version of monotone with which guitone can't " - "work with. Guitone requires monotone with an interface version " - "between '%1' and '%2'. Your installation has the interface " - "version '%3'.") - .arg(MonotoneManager::MinInterfaceVersion) - .arg(MonotoneManager::MaxInterfaceVersion) - .arg(installedVersion), - QMessageBox::Ok, 0, 0 - ); - - // note: the pref dialog tries to set the mtn binary path on its - // own again and can only be accepted successfully, if the user - // enters/selects a valid monotone binary path - Preferences dialog(NULL); - - // the user has rejected the dialog, i.e. made no new settings - if (dialog.exec() == QDialog::Rejected) - { - return; - } - } - D("binary path was set"); - emit monotoneBinaryPathSet(); -} - -void Guitone::loadSomething() -{ // if something was already loaded, skip this if (somethingLoaded) return; - I(monotoneManager->monotoneBinaryPathSet()); + I(manager()->monotoneBinaryPathSet()); D("checking command line arguments and file open requests"); @@ -177,7 +103,7 @@ void Guitone::loadSomething() openPrompt->show(); } -bool Guitone::tryLoadSomething(const QString & path) +bool GuitoneStandalone::tryLoadSomething(const QString & path) { bool loaded = true; try @@ -195,7 +121,7 @@ bool Guitone::tryLoadSomething(const QSt } // this code is borrowed and adapted from QDesigner - thanks to the Trolls! -bool Guitone::event(QEvent * ev) +bool GuitoneStandalone::event(QEvent * ev) { bool eaten; switch (ev->type()) @@ -205,7 +131,7 @@ bool Guitone::event(QEvent * ev) D("got FileOpen event"); QString file = static_cast(ev)->file(); - I(monotoneManager->monotoneBinaryPathSet()); + I(manager()->monotoneBinaryPathSet()); if (tryLoadSomething(file)) { @@ -215,13 +141,13 @@ bool Guitone::event(QEvent * ev) break; } default: - eaten = QApplication::event(ev); + eaten = QCoreApplication::event(ev); break; } return eaten; } -void Guitone::loadFromPath(const QString & path) +void GuitoneStandalone::loadFromPath(const QString & path) { QMutexLocker locker(&lock); @@ -269,7 +195,7 @@ void Guitone::loadFromPath(const QString } } -void Guitone::loadWorkspace(const QString & path) +void GuitoneStandalone::loadWorkspace(const QString & path) { try { @@ -295,7 +221,7 @@ void Guitone::loadWorkspace(const QStrin } } -void Guitone::loadDatabase(const QString & path) +void GuitoneStandalone::loadDatabase(const QString & path) { try { @@ -321,7 +247,7 @@ void Guitone::loadDatabase(const QString } } -void Guitone::windowClosed(MainWindow * wnd) +void GuitoneStandalone::windowClosed(MainWindow * wnd) { QMutexLocker locker(&lock); int i = openWindows.indexOf(wnd); @@ -337,7 +263,7 @@ void Guitone::windowClosed(MainWindow * triggerUpdateWindowList(); } -void Guitone::triggerUpdateWindowList() +void GuitoneStandalone::triggerUpdateWindowList() { QStringList list; foreach (MainWindow * win, openWindows) @@ -347,7 +273,7 @@ void Guitone::triggerUpdateWindowList() emit updateWindowList(list); } -bool Guitone::closeAllWindows() +bool GuitoneStandalone::closeAllWindows() { // do we need to close any windows? if (openWindows.size() > 0) @@ -367,47 +293,18 @@ bool Guitone::closeAllWindows() return true; } -void Guitone::quit() +void GuitoneStandalone::quit() { if (!closeAllWindows()) return; - Settings::sync(); - QApplication::quit(); + GuitoneCore::quit(); } -void Guitone::checkForApplicationUpdates(bool silent) -{ -#ifdef Q_WS_MACX - CocoaUtil::checkForUpdates(silent); -#else - if (!updateDialog) - { - updateDialog = new ApplicationUpdate(NULL); - } - - if (!updateDialog->updateAvailable()) - { - if (!silent) - { - QMessageBox::information( - NULL, - tr("No updates available"), - tr("Your version of guitone (%1) is already up-to-date.") - .arg(GUITONE_VERSION), - QMessageBox::Ok - ); - } - return; - } - updateDialog->show(); -#endif -} - /*! Ensures somewhat that new windows do not overdraw current ones by adding a little x/y offset the original position of the window opened before this window */ -void Guitone::ensureCascadedWindowPlacement(MainWindow * window) +void GuitoneStandalone::ensureCascadedWindowPlacement(MainWindow * window) { int curIdx = openWindows.indexOf(window); @@ -416,7 +313,7 @@ void Guitone::ensureCascadedWindowPlacem MainWindow * prevWnd = openWindows.at(curIdx - 1); I(prevWnd); - QDesktopWidget * desk = desktop(); + QDesktopWidget * desk = QApplication::desktop(); int cascade = 20; QRect geom = desk->availableGeometry(prevWnd); @@ -433,7 +330,7 @@ void Guitone::ensureCascadedWindowPlacem } } -void Guitone::activateWindow(int idx) +void GuitoneStandalone::activateWindow(int idx) { if (idx < 0 || idx > openWindows.size() - 1) return; @@ -443,7 +340,7 @@ void Guitone::activateWindow(int idx) wnd->raise(); } -void Guitone::raiseAllWindows() +void GuitoneStandalone::raiseAllWindows() { for (int i=0, j=openWindows.size(); i #include -#include #include class Monotone; -class Guitone : public QApplication +class GuitoneStandalone : public GuitoneCore { Q_OBJECT public: - Guitone(int &, char**); - ~Guitone(); - inline MonotoneManager * manager() { return monotoneManager; } + GuitoneStandalone(int &, char**); + ~GuitoneStandalone(); signals: void updateWindowList(const QStringList &); void updateRecentLists(); - void monotoneBinaryPathSet(); public slots: - void checkForApplicationUpdates(bool silent = false); - void loadWorkspace(const QString &); void loadDatabase(const QString &); @@ -64,7 +53,6 @@ private slots: private slots: void windowClosed(MainWindow *); - void setMonotoneBinaryPath(); void loadSomething(); private: @@ -76,14 +64,9 @@ private: bool event(QEvent *); OpenPrompt * openPrompt; - MonotoneManager * monotoneManager; QList openWindows; QMutex lock; bool somethingLoaded; - -#ifndef Q_WS_MACX - ApplicationUpdate * updateDialog; -#endif }; #endif ============================================================ --- src/main.cpp 60049867487708f7eb18c012c34641041114aec8 +++ src/main.cpp a9ef5aad2b31530f7758ea915cc0c95aeee7a114 @@ -19,7 +19,9 @@ ***************************************************************************/ #include "DebugLog.h" -#include "Guitone.h" +#include "GuitoneCore.h" +#include "GuitoneStandalone.h" +#include "GuitoneDriver.h" #include #include @@ -70,11 +72,22 @@ int main(int argc, char** argv) .arg(locale)); } - Guitone app(argc, argv); + GuitoneCore * guitone; + if (argc > 1 && strcmp(argv[1], "exec") == 0) + { + guitone = new GuitoneDriver(argc, argv); + } + else + { + guitone = new GuitoneStandalone(argc, argv); + } - app.installTranslator(&appTranslator); - app.installTranslator(&qtTranslator); + guitone->installTranslator(&appTranslator); + guitone->installTranslator(&qtTranslator); - return app.exec(); + int retValue = guitone->exec(); + delete guitone; + + return retValue; } ============================================================ --- src/model/AutomateCommand.cpp cb33a7922177d9b07d46bc81ecc1453f92c96c8e +++ src/model/AutomateCommand.cpp d60e44ba49f434b8c99e59b127c8590077e2b510 @@ -19,7 +19,7 @@ ***************************************************************************/ #include "AutomateCommand.h" -#include "Guitone.h" +#include "GuitoneCore.h" AutomateCommand::AutomateCommand(AutomateCommandHelper * helper) { ============================================================ --- src/monotone/FileExporter.cpp d66aabfa3ab17e27a8464b4721ff0d47f2a5cf56 +++ src/monotone/FileExporter.cpp 36bd5b1d10304860014f5cf41c42b89304608141 @@ -26,7 +26,7 @@ // a) refactor this class into a QThread // b) use signals to let the GUI thread now the state of the action // -#include "Guitone.h" +#include "GuitoneCore.h" #include FileExporter::FileExporter(const DatabaseFile & database, const QString & rev, const QDir & dir) ============================================================ --- src/monotone/MonotoneUtil.cpp 337414f278e2f74e22c73a134de0e40d475a7af9 +++ src/monotone/MonotoneUtil.cpp 1f852ae56f420b550a5a1bc9c0a787a12ea46eec @@ -19,7 +19,7 @@ ***************************************************************************/ #include "MonotoneUtil.h" -#include "Guitone.h" +#include "GuitoneCore.h" #include "BasicIOParser.h" MonotoneUtil::MonotoneUtil(MonotoneThread * thread, const MonotoneTask & in) ============================================================ --- src/view/AttributesView.cpp 1a9ca66bb8fcee26e941b962d4f3d9efe975b417 +++ src/view/AttributesView.cpp 5e587e36bb8e4c98bec0f095748979c387cf946d @@ -21,7 +21,6 @@ #include "vocab.h" #include "AttributesView.h" #include "AddEditAttribute.h" -#include "Guitone.h" #include ============================================================ --- src/view/DatabaseWindow.cpp 301858460154bc94a7d4b433f40f2654716299bd +++ src/view/DatabaseWindow.cpp 53a5313109e0dfbfbc32ca8572ac4d6655de13b1 @@ -21,7 +21,7 @@ #include "DatabaseWindow.h" #include "DatabaseMenuBar.h" #include "DatabaseDialogManager.h" -#include "Guitone.h" +#include "GuitoneCore.h" #include "Settings.h" #include ============================================================ --- src/view/MainWindow.cpp 9234140581c324011828a21086196827bbda2605 +++ src/view/MainWindow.cpp 0c76f127b9aade762a6f5db477d6049480e69231 @@ -21,8 +21,8 @@ #include "MainWindow.h" #include "WorkspaceMenuBar.h" #include "DatabaseMenuBar.h" -#include "Guitone.h" #include "Settings.h" +#include "GuitoneStandalone.h" #include #include @@ -65,43 +65,45 @@ void MainWindow::init() this, SLOT(close()) ); + GuitoneStandalone * app = reinterpret_cast(APP); + connect( this, SIGNAL(windowClosed(MainWindow *)), - APP, SLOT(windowClosed(MainWindow *)) + app, SLOT(windowClosed(MainWindow *)) ); connect( menuBar, SIGNAL(loadWorkspace(const QString &)), - APP, SLOT(loadWorkspace(const QString &)) + app, SLOT(loadWorkspace(const QString &)) ); connect( menuBar, SIGNAL(loadDatabase(const QString &)), - APP, SLOT(loadDatabase(const QString &)) + app, SLOT(loadDatabase(const QString &)) ); connect( menuBar, SIGNAL(checkForApplicationUpdates()), - APP, SLOT(checkForApplicationUpdates()) + app, SLOT(checkForApplicationUpdates()) ); connect( menuBar, SIGNAL(activateWindow(int)), - APP, SLOT(activateWindow(int)) + app, SLOT(activateWindow(int)) ); connect( menuBar, SIGNAL(raiseAllWindows()), - APP, SLOT(raiseAllWindows()) + app, SLOT(raiseAllWindows()) ); connect( - APP, SIGNAL(updateRecentLists()), + app, SIGNAL(updateRecentLists()), menuBar, SLOT(updateRecentLists()) ); connect( - APP, SIGNAL(updateWindowList(const QStringList &)), + app, SIGNAL(updateWindowList(const QStringList &)), menuBar, SLOT(updateWindowList(const QStringList &)) ); ============================================================ --- src/view/WorkspaceWindow.cpp 2af2e9a9dac69191b72ea1ff6c67aa5ca8359016 +++ src/view/WorkspaceWindow.cpp a7744828493d81e4875a1cf62765cb7f8419b7d5 @@ -19,9 +19,9 @@ ***************************************************************************/ #include "WorkspaceWindow.h" +#include "GuitoneCore.h" #include "Settings.h" #include "Platform.h" -#include "Guitone.h" #include "MonotoneUtil.h" #include "InventoryItem.h" ============================================================ --- src/view/dialogs/Preferences.cpp e3b7d8f1a25f1d24124d6231e9553c983a979a82 +++ src/view/dialogs/Preferences.cpp 351eafe6e4744dff3978eefdbea7814ec255232a @@ -22,7 +22,7 @@ #include "MonotoneManager.h" #include "Settings.h" #include "DebugLog.h" -#include "Guitone.h" +#include "GuitoneCore.h" #include #include ============================================================ --- src/view/dialogs/WorkspaceDialogManager.cpp 052fef6ee22f29c32c391a7ba659852f78328496 +++ src/view/dialogs/WorkspaceDialogManager.cpp abfaee7978ee13a369f98693b2087e940b01755d @@ -20,7 +20,7 @@ #include "WorkspaceDialogManager.h" #include "MonotoneUtil.h" -#include "Guitone.h" +#include "GuitoneCore.h" WorkspaceDialogManager::WorkspaceDialogManager(QWidget * parent) : DatabaseDialogManager(parent), commitRevision(0), ============================================================ --- src/vocab.h 4e71a34556bdba331e84d2e13221f1d6220c8832 +++ src/vocab.h dbf25bf791128d4133a26be9f0698e6efb638ce7 @@ -5,10 +5,9 @@ // global macros and defines // -// if you use any of those two, you also have to include Guitone.h -class Guitone; -#define APP reinterpret_cast(qApp) -#define MTN(arg) APP->getMonotoneInstance(arg) +// if you use APP, you also have to include GuitoneCore.h +class GuitoneCore; +#define APP reinterpret_cast(qApp) #include "DebugLog.h" #ifdef QT_NO_DEBUG