From 6a7458cba9b900db03a9f295c2b5ba33960d17b0 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 13 May 2024 18:29:37 +0900 Subject: [PATCH] Fix FTBFS described in issue #25 Signed-off-by: Michele Calgaro (cherry picked from commit 4d735aa1f67364f0637f4a3186c942faafb56221) --- lib/pilot.h | 22 +++++++++++----------- lib/pilotDateEntry.cpp | 2 +- lib/plugin.h | 8 ++++---- lib/pluginfactory.h | 7 ++----- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/lib/pilot.h b/lib/pilot.h index 8cdb6b1..9aa44dc 100644 --- a/lib/pilot.h +++ b/lib/pilot.h @@ -60,7 +60,7 @@ class PilotCategoryInfo; // ... and category information * as mapping user-visible strings from UTF8 (KDE side) to * the encoding used on the handheld. */ -namespace Pilot TDE_EXPORT +namespace Pilot { /** Maximum size of an AppInfo block, taken roughly from the pilot-link source. */ static const int MAX_APPINFO_SIZE=8192; @@ -84,7 +84,7 @@ namespace Pilot TDE_EXPORT * a Unicode string. Converts the @p len characters in @p c * to a Unicode string. */ - TQString fromPilot( const char *c, int len ); + TDE_EXPORT TQString fromPilot( const char *c, int len ); /** Static translation function mapping a NUL-terminated * string from the handheld's encoding to UTF-8. @@ -92,15 +92,15 @@ namespace Pilot TDE_EXPORT * @return TQString (UTF-8) value of @p c * @note NUL-terminated strings are rare on the handheld. */ - TQString fromPilot( const char *c ); + TDE_EXPORT TQString fromPilot( const char *c ); /** Static translation function that maps a TQString onto the * native 8 bit encoding of the handheld. Writes the result into * the buffer @p buf which has size @p len. Returns the length * of the result. Zero-fills the buffer as needed. */ - int toPilot( const TQString &s, char *buf, int len); - int toPilot( const TQString &s, unsigned char *buf, int len); + TDE_EXPORT int toPilot( const TQString &s, char *buf, int len); + TDE_EXPORT int toPilot( const TQString &s, unsigned char *buf, int len); /** Static translation function that maps a TQString onto the * native 8 bit encoding of the handheld. @@ -108,7 +108,7 @@ namespace Pilot TDE_EXPORT * @param s String to encode * @return Encoded string in a TQCString */ - TQCString toPilot( const TQString &s ); + TDE_EXPORT TQCString toPilot( const TQString &s ); /** Create a codec for translating handheld native 8 bit to Unicode, * using the given codec @p name -- this will often be latin1, but @@ -117,15 +117,15 @@ namespace Pilot TDE_EXPORT * * @return @c true on success, @c false otherwise */ - bool setupPilotCodec(const TQString &name); + TDE_EXPORT bool setupPilotCodec(const TQString &name); /** Returns the name of the codec being used. */ - TQString codecName(); + TDE_EXPORT TQString codecName(); /** For debugging, display category names for the given AppInfo * structure. Called by dump(). You must pass a valid reference. */ - void dumpCategories(const struct CategoryAppInfo *info); + TDE_EXPORT void dumpCategories(const struct CategoryAppInfo *info); /** Check that a given category number is valid. This * restricts the range of integers to [0..CATEGORY_COUNT-1] @@ -198,7 +198,7 @@ namespace Pilot TDE_EXPORT * @p unknownIsUnfiled is true. * */ - int findCategory(const struct CategoryAppInfo *info, const TQString &name, bool unknownIsUnfiled); + TDE_EXPORT int findCategory(const struct CategoryAppInfo *info, const TQString &name, bool unknownIsUnfiled); /** Search for the given category @p name in the list * of categories; returns the category number. If @p unknownIsUnfiled @@ -218,7 +218,7 @@ namespace Pilot TDE_EXPORT * are all full. * */ - int insertCategory(struct CategoryAppInfo *info, const TQString &label, bool unknownIsUnfiled); + TDE_EXPORT int insertCategory(struct CategoryAppInfo *info, const TQString &label, bool unknownIsUnfiled); /** The handheld also holds data about each database * in a DBInfo structure; check if the database described diff --git a/lib/pilotDateEntry.cpp b/lib/pilotDateEntry.cpp index 18897d3..dfa6379 100644 --- a/lib/pilotDateEntry.cpp +++ b/lib/pilotDateEntry.cpp @@ -77,7 +77,7 @@ PilotDateEntry::PilotDateEntry(PilotRecord * rec) : { // Construct a fake pi_buffer for unpack_Appointment. // No ownership changes occur here. - pi_buffer_t b = { (unsigned char *) rec->data(), rec->size(), rec->size() } ; + pi_buffer_t b = { (unsigned char*)rec->data(), (size_t)rec->size(), (size_t)rec->size() } ; unpack_Appointment(&fAppointmentInfo, &b, datebook_v1); } return; diff --git a/lib/plugin.h b/lib/plugin.h index 9187212..2a452a0 100644 --- a/lib/plugin.h +++ b/lib/plugin.h @@ -388,7 +388,7 @@ protected: } ; /** A namespace containing only static helper methods. */ -namespace PluginUtility TDE_EXPORT +namespace PluginUtility { /** Searches the argument list for --foo=bar and returns bar, TQString() if not found. * Don't include the -- in the argname. */ @@ -402,14 +402,14 @@ namespace PluginUtility TDE_EXPORT * The current approach is to ask the DCOP server if the application * has registered. */ - bool isRunning(const TQCString &appName); + TDE_EXPORT bool isRunning(const TQCString &appName); /** * Check a given library for its version, returning 0 if no * version symbol is found. */ - unsigned long pluginVersion(const KLibrary *); - TQString pluginVersionString(const KLibrary *); + TDE_EXPORT unsigned long pluginVersion(const KLibrary *); + TDE_EXPORT TQString pluginVersionString(const KLibrary *); } /** diff --git a/lib/pluginfactory.h b/lib/pluginfactory.h index e9be090..b5f1fbc 100644 --- a/lib/pluginfactory.h +++ b/lib/pluginfactory.h @@ -32,12 +32,9 @@ #include #include -#include "options.h" - -/** @file Defines a template class for factories for KPilot's conduits. */ - -class KPilotLink; +#include +#include "options.h" /** Template class that defines a conduit's factory. */