From 39ceb508884c437f8d40d411b6ae68a70b908391 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Tue, 12 Jul 2011 15:54:25 +0000 Subject: [PATCH] Create a proper header file for the exported functions from vncviewer.cxx. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4579 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- vncviewer/CConn.cxx | 3 +-- vncviewer/DesktopWindow.cxx | 3 +-- vncviewer/ServerDialog.cxx | 3 +-- vncviewer/Viewport.cxx | 4 +--- vncviewer/vncviewer.h | 25 +++++++++++++++++++++++++ 5 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 vncviewer/vncviewer.h diff --git a/vncviewer/CConn.cxx b/vncviewer/CConn.cxx index 8d233f05..31ceff1c 100644 --- a/vncviewer/CConn.cxx +++ b/vncviewer/CConn.cxx @@ -38,6 +38,7 @@ #include "OptionsDialog.h" #include "i18n.h" #include "parameters.h" +#include "vncviewer.h" #ifdef WIN32 #include "win32.h" @@ -47,8 +48,6 @@ using namespace rdr; using namespace rfb; using namespace std; -extern void exit_vncviewer(); - static rfb::LogWriter vlog("CConn"); static const PixelFormat mediumColourPF(8,3,0,1,1,1,1,2,1,0); diff --git a/vncviewer/DesktopWindow.cxx b/vncviewer/DesktopWindow.cxx index 859d2b63..14f720cf 100644 --- a/vncviewer/DesktopWindow.cxx +++ b/vncviewer/DesktopWindow.cxx @@ -27,6 +27,7 @@ #include "OptionsDialog.h" #include "i18n.h" #include "parameters.h" +#include "vncviewer.h" #include #include @@ -41,8 +42,6 @@ using namespace rfb; -extern void exit_vncviewer(); - static rfb::LogWriter vlog("DesktopWindow"); DesktopWindow::DesktopWindow(int w, int h, const char *name, diff --git a/vncviewer/ServerDialog.cxx b/vncviewer/ServerDialog.cxx index e65cbadb..9d0d1572 100644 --- a/vncviewer/ServerDialog.cxx +++ b/vncviewer/ServerDialog.cxx @@ -26,8 +26,7 @@ #include "OptionsDialog.h" #include "fltk_layout.h" #include "i18n.h" - -extern void about_vncviewer(); +#include "vncviewer.h" ServerDialog::ServerDialog() : Fl_Window(400, 112, _("VNC Viewer: Connection Details")) diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx index 80b48545..5ff9bf46 100644 --- a/vncviewer/Viewport.cxx +++ b/vncviewer/Viewport.cxx @@ -42,6 +42,7 @@ #include "fltk_layout.h" #include "parameters.h" #include "keysym2ucs.h" +#include "vncviewer.h" #include #include @@ -53,9 +54,6 @@ using namespace rfb; using namespace rdr; -extern void exit_vncviewer(); -extern void about_vncviewer(); - static rfb::LogWriter vlog("Viewport"); // Menu constants diff --git a/vncviewer/vncviewer.h b/vncviewer/vncviewer.h new file mode 100644 index 00000000..ab16b689 --- /dev/null +++ b/vncviewer/vncviewer.h @@ -0,0 +1,25 @@ +/* Copyright 2011 Pierre Ossman for Cendio AB + * + * This is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +#ifndef __VNCVIEWER_H__ +#define __VNCVIEWER_H__ + +void exit_vncviewer(); +void about_vncviewer(); + +#endif -- 2.39.5