remove some old cruft (unused OS X specific code)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16278 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiApplication.C b/src/frontends/qt4/GuiApplication.C
index b752ad39887f6557af6e74828a75474c2a86debe..b97e7bc5beaaab1f39f627ac905cf5fc0b7762df 100644 (file)
--- a/src/frontends/qt4/GuiApplication.C
+++ b/src/frontends/qt4/GuiApplication.C
@@ -58,7 +58,7 @@ using std::endl;
 extern void initEncodings();
 
 ///////////////////////////////////////////////////////////////
-// You can find other X11 and MACX specific stuff
+// You can find other X11 specific stuff
 // at the end of this file...
 ///////////////////////////////////////////////////////////////
 
@@ -124,23 +124,6 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
                        << "Could not find  Qt translations for locale "
                        << fromqstr(language_name) << std::endl;
 
-/*#ifdef Q_WS_MACX
-       // These translations are meant to break Qt/Mac menu merging
-       // algorithm on some entries. It lists the menu names that
-       // should not be moved to the LyX menu
-       QTranslator aqua_trans(0);
-       aqua_trans.insert(QTranslatorMessage("QMenuBar", "Setting", 0,
-                                            "do_not_merge_me"));
-       aqua_trans.insert(QTranslatorMessage("QMenuBar", "Config", 0,
-                                            "do_not_merge_me"));
-       aqua_trans.insert(QTranslatorMessage("QMenuBar", "Options", 0,
-                                            "do_not_merge_me"));
-       aqua_trans.insert(QTranslatorMessage("QMenuBar", "Setup", 0,
-                                            "do_not_merge_me"));
-
-       qApp->installTranslator(&aqua_trans);
-#endif
-*/
        using namespace lyx::graphics;
 
        Image::newImage = boost::bind(&QLImage::newImage);

diff --git a/src/frontends/qt4/GuiApplication.h b/src/frontends/qt4/GuiApplication.h
index af495688f01579ce3ada9f9499537d1c98220af8..b22f6bcf0b1667300ddf6374db9c5cb8486d4610 100644 (file)
--- a/src/frontends/qt4/GuiApplication.h
+++ b/src/frontends/qt4/GuiApplication.h
@@ -23,14 +23,6 @@
 
 #include <QApplication>
 
-///////////////////////////////////////////////////////////////
-// Specific stuff
-
-#ifdef Q_WS_MACX
-#include <Carbon/Carbon.h>
-#endif
-///////////////////////////////////////////////////////////////
-
 namespace lyx {
 
 class BufferView;