diff options
| author | gregory guy <gregory-tde@laposte.net> | 2020-10-12 15:43:57 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2020-11-05 18:49:06 +0100 |
| commit | f84a48543b2471121d36334e094e0f85f9b9c431 (patch) | |
| tree | 82d605f1f611a679bce6848d71ddaaf783be9287 /src/electronics/gpsimprocessor.cpp | |
| parent | 33040db93b91f5ca502dcc682d944fcfe4cd331a (diff) | |
| download | ktechlab-f84a48543b2471121d36334e094e0f85f9b9c431.tar.gz ktechlab-f84a48543b2471121d36334e094e0f85f9b9c431.zip | |
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 <gregory-tde@laposte.net>
(cherry picked from commit a9c86866c380e503dd75797b5c2d129bfb622a9e)
Diffstat (limited to 'src/electronics/gpsimprocessor.cpp')
| -rw-r--r-- | src/electronics/gpsimprocessor.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/electronics/gpsimprocessor.cpp b/src/electronics/gpsimprocessor.cpp index c5ad638..c048cff 100644 --- a/src/electronics/gpsimprocessor.cpp +++ b/src/electronics/gpsimprocessor.cpp @@ -8,7 +8,14 @@ * (at your option) any later version. * ***************************************************************************/ +#if defined(QT_NO_STL) +# define DISABLE_QT_NO_STL +# undef QT_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 QT_NO_STL +#if defined(DISABLE_QT_NO_STL) +# undef DISABLE_QT_NO_STL +# define QT_NO_STL #endif |