From 3ddfbb8cc0918d38c65449372bf74566bd0bceea Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Sat, 24 May 2008 22:04:58 +0000 Subject: [PATCH] define mime strings at one place only git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24928 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiApplication.cpp | 11 ++++++----- src/frontends/qt4/GuiClipboard.cpp | 10 ++++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp index e1ade12d33..a4504fc7b2 100644 --- a/src/frontends/qt4/GuiApplication.cpp +++ b/src/frontends/qt4/GuiApplication.cpp @@ -102,14 +102,15 @@ using namespace std; using namespace lyx::support; -// FIXME: These strings are also used in GuiClipboard.cpp. -static char const * const lyx_mime_type = "application/x-lyx"; -static char const * const pdf_mime_type = "application/pdf"; -static char const * const emf_mime_type = "image/x-emf"; -static char const * const wmf_mime_type = "image/x-wmf"; namespace lyx { +// defined in GuiClipboard.cpp. +extern char const * const lyx_mime_type; +extern char const * const pdf_mime_type; +extern char const * const emf_mime_type; +extern char const * const wmf_mime_type; + frontend::Application * createApplication(int & argc, char * argv[]) { return new frontend::GuiApplication(argc, argv); diff --git a/src/frontends/qt4/GuiClipboard.cpp b/src/frontends/qt4/GuiClipboard.cpp index 803da9a8ee..d0a580969b 100644 --- a/src/frontends/qt4/GuiClipboard.cpp +++ b/src/frontends/qt4/GuiClipboard.cpp @@ -50,13 +50,15 @@ using namespace std; using namespace lyx::support; -static char const * const lyx_mime_type = "application/x-lyx"; -static char const * const pdf_mime_type = "application/pdf"; -static char const * const emf_mime_type = "image/x-emf"; -static char const * const wmf_mime_type = "image/x-wmf"; namespace lyx { +char const * const lyx_mime_type = "application/x-lyx"; +char const * const pdf_mime_type = "application/pdf"; +char const * const emf_mime_type = "image/x-emf"; +char const * const wmf_mime_type = "image/x-wmf"; + + namespace frontend { -- 2.39.2