From 4d188198ba395743b6cd829e925bcda69243d223 Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Sun, 25 May 2008 07:22:45 +0000 Subject: [PATCH] Fix MSVC link error. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24929 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiApplication.cpp | 7 ------- src/frontends/qt4/GuiClipboard.cpp | 11 +++++------ src/frontends/qt4/GuiClipboard.h | 5 +++++ 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp index a4504fc7b2..d57c910753 100644 --- a/src/frontends/qt4/GuiApplication.cpp +++ b/src/frontends/qt4/GuiApplication.cpp @@ -105,18 +105,11 @@ using namespace lyx::support; 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); } - namespace frontend { class SocketNotifier : public QSocketNotifier diff --git a/src/frontends/qt4/GuiClipboard.cpp b/src/frontends/qt4/GuiClipboard.cpp index d0a580969b..c56b1f4462 100644 --- a/src/frontends/qt4/GuiClipboard.cpp +++ b/src/frontends/qt4/GuiClipboard.cpp @@ -53,14 +53,13 @@ using namespace lyx::support; 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 { +char const * lyx_mime_type = "application/x-lyx"; +char const * pdf_mime_type = "application/pdf"; +char const * emf_mime_type = "image/x-emf"; +char const * wmf_mime_type = "image/x-wmf"; + GuiClipboard::GuiClipboard() { diff --git a/src/frontends/qt4/GuiClipboard.h b/src/frontends/qt4/GuiClipboard.h index a04226a146..67c404a1ba 100644 --- a/src/frontends/qt4/GuiClipboard.h +++ b/src/frontends/qt4/GuiClipboard.h @@ -58,6 +58,11 @@ private: bool has_graphics_contents_; }; +extern char const * lyx_mime_type; +extern char const * pdf_mime_type; +extern char const * emf_mime_type; +extern char const * wmf_mime_type; + } // namespace frontend } // namespace lyx -- 2.39.2