From e5ab3b0900a98445c52ec7ac0dcb9de13b927584 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sun, 26 Apr 2015 20:06:29 -0400 Subject: [PATCH] Tracker: move deprecated cruft to FBCPadding.cpp. The Be Book [1] states that these are supposed to be C functions, but the comment (see diff) said they were deprecated, and the fact that they were in a .cpp file (and I checked with "nm") made them C++ functions. I can't recall any applications failing to start because these symbols were unresolved, so we might be able to just remove them... [1]: https://www.haiku-os.org/legacy-docs/bebook/BFilePanel_Overview.html --- src/kits/tracker/FBCPadding.cpp | 13 +++++++++++++ src/kits/tracker/FilePanel.cpp | 21 --------------------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/src/kits/tracker/FBCPadding.cpp b/src/kits/tracker/FBCPadding.cpp index 78d98f1dc9..fef24af868 100644 --- a/src/kits/tracker/FBCPadding.cpp +++ b/src/kits/tracker/FBCPadding.cpp @@ -96,6 +96,19 @@ void BFilePanel::_ReservedFilePanel8() {} #if __GNUC__ && __GNUC__ < 3 extern "C" { +_EXPORT void +run_open_panel__Fv() +{ + (new TFilePanel())->Show(); +} + + +_EXPORT void +run_save_panel__Fv() +{ + (new TFilePanel(B_SAVE_PANEL))->Show(); +} + _EXPORT BFilePanel* __10BFilePanel15file_panel_modeP10BMessengerP9entry_refUlbP8BMessageP10BRefFilterT5T5 (void* self, diff --git a/src/kits/tracker/FilePanel.cpp b/src/kits/tracker/FilePanel.cpp index f0ffeab62b..539b7eaf5c 100644 --- a/src/kits/tracker/FilePanel.cpp +++ b/src/kits/tracker/FilePanel.cpp @@ -53,27 +53,6 @@ All rights reserved. #ifndef _IMPEXP_ROOT # define _IMPEXP_ROOT #endif -#ifndef _IMPEXP_TRACKER -# define _IMPEXP_TRACKER -#endif - -// these two calls are deprecated -extern _IMPEXP_TRACKER void run_open_panel(); -extern _IMPEXP_TRACKER void run_save_panel(); - - -void -run_open_panel() -{ - (new TFilePanel())->Show(); -} - - -void -run_save_panel() -{ - (new TFilePanel(B_SAVE_PANEL))->Show(); -} // #pragma mark - BFilePanel