From a9c86866c380e503dd75797b5c2d129bfb622a9e Mon Sep 17 00:00:00 2001 From: gregory guy Date: Mon, 12 Oct 2020 15:43:57 +0200 Subject: Conversion to the cmake building system. Added man pages taken from the Debian packaging system. Move the ktechlab.desktop file into XDG_APPS_INSTALL_DIR directory, see TDE/tde#26 and bug 2408. Signed-off-by: gregory guy --- src/electronics/gpsimprocessor.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'src/electronics/gpsimprocessor.cpp') diff --git a/src/electronics/gpsimprocessor.cpp b/src/electronics/gpsimprocessor.cpp index c5ad638..38e9c89 100644 --- a/src/electronics/gpsimprocessor.cpp +++ b/src/electronics/gpsimprocessor.cpp @@ -8,7 +8,14 @@ * (at your option) any later version. * ***************************************************************************/ +#if defined(TQT_NO_STL) +# define DISABLE_TQT_NO_STL +# undef TQT_NO_STL +#endif + +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #ifndef NO_GPSIM #include "asmparser.h" @@ -50,8 +57,8 @@ void initialize_ConsoleUI(); extern void initialize_readline(); extern void gui_main(void); extern void cli_main(); -void gpsim_version() {}; -void quit_gui() {}; +KDE_EXPORT void gpsim_version() {}; +KDE_EXPORT void quit_gui() {}; //BEGIN class GpsimProcessor @@ -788,7 +795,6 @@ void RegisterSet::update() //END class RegisterSet - //BEGIN class RegisterInfo RegisterInfo::RegisterInfo( Register * reg ) { @@ -815,7 +821,6 @@ RegisterInfo::RegisterInfo( Register * reg ) m_type = Invalid; break; } - m_name = m_pRegister->baseName(); } @@ -880,7 +885,11 @@ DebugLine::DebugLine() } //END class DebugLine - #include "gpsimprocessor.moc" +#endif +// restore TQT_NO_STL +#if defined(DISABLE_TQT_NO_STL) +# undef DISABLE_TQT_NO_STL +# define TQT_NO_STL #endif -- cgit v1.2.3