diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2022-06-18 22:59:25 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2022-07-10 17:59:48 +0900 |
commit | 5161d40d204dc6dbd9c34b5be0052243240f15b1 (patch) | |
tree | 5ccc61290c25f3c1f18a1e821ea59f90df97518e /src/include | |
parent | e46a8b8db6082f7d5e293407d654f127c48a0256 (diff) | |
download | tderadio-5161d40d204dc6dbd9c34b5be0052243240f15b1.tar.gz tderadio-5161d40d204dc6dbd9c34b5be0052243240f15b1.zip |
CMake conversion.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit bc7518bdba609f90ee89de8b4e7ddaa1e567b1a8)
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/alarm.h | 3 | ||||
-rw-r--r-- | src/include/debug-profiler.h | 9 | ||||
-rw-r--r-- | src/include/fileringbuffer.h | 3 | ||||
-rw-r--r-- | src/include/frequencyradiostation.h | 4 | ||||
-rw-r--r-- | src/include/frequencyseekhelper.h | 9 | ||||
-rw-r--r-- | src/include/interfaces.h | 2 | ||||
-rw-r--r-- | src/include/internetradiostation.h | 3 | ||||
-rw-r--r-- | src/include/multibuffer.h | 3 | ||||
-rw-r--r-- | src/include/pluginmanager.h | 5 | ||||
-rw-r--r-- | src/include/plugins.h | 18 | ||||
-rw-r--r-- | src/include/radiostation-config.h | 29 | ||||
-rw-r--r-- | src/include/radiostation-listview.h | 4 | ||||
-rw-r--r-- | src/include/radiostation.h | 6 | ||||
-rw-r--r-- | src/include/ringbuffer.h | 3 | ||||
-rw-r--r-- | src/include/seekhelper.h | 6 | ||||
-rw-r--r-- | src/include/soundformat.h | 2 | ||||
-rw-r--r-- | src/include/soundstreamid.h | 4 | ||||
-rw-r--r-- | src/include/standardscandialog.h | 11 | ||||
-rw-r--r-- | src/include/station-drag-object.h | 3 | ||||
-rw-r--r-- | src/include/stationlist.h | 5 | ||||
-rw-r--r-- | src/include/stationselector.h | 11 | ||||
-rw-r--r-- | src/include/widgetplugins.h | 2 |
22 files changed, 82 insertions, 63 deletions
diff --git a/src/include/alarm.h b/src/include/alarm.h index 14b4abc..ae28f4a 100644 --- a/src/include/alarm.h +++ b/src/include/alarm.h @@ -23,13 +23,14 @@ #endif #include <tqdatetime.h> +#include <kdemacros.h> #include <vector> /** *@author Martin Witte */ -class Alarm +class KDE_EXPORT Alarm { public: diff --git a/src/include/debug-profiler.h b/src/include/debug-profiler.h index 7ceb50d..1e46111 100644 --- a/src/include/debug-profiler.h +++ b/src/include/debug-profiler.h @@ -24,6 +24,7 @@ #include <tqstring.h> #include <tqmap.h> +#include <kdemacros.h> #if (defined __i386__) || (defined __x86_64__) static __inline__ unsigned long long int rdtsc() @@ -39,7 +40,7 @@ static __inline__ unsigned long long int rdtsc() } #endif -class Profiler +class KDE_EXPORT Profiler { public: Profiler(); @@ -76,14 +77,14 @@ protected: }; -class TimeProfiler : public Profiler +class KDE_EXPORT TimeProfiler : public Profiler { protected: long long getCounter() const { return rdtsc(); } }; -class MemProfiler : public Profiler +class KDE_EXPORT MemProfiler : public Profiler { protected: long long getCounter() const; @@ -95,7 +96,7 @@ extern MemProfiler global_mem_profiler; -class BlockProfiler +class KDE_EXPORT BlockProfiler { public: BlockProfiler(const TQString &descr); diff --git a/src/include/fileringbuffer.h b/src/include/fileringbuffer.h index 2978bec..0622af9 100644 --- a/src/include/fileringbuffer.h +++ b/src/include/fileringbuffer.h @@ -23,9 +23,10 @@ #endif #include <tqstring.h> +#include <kdemacros.h> #include <stdio.h> -class FileRingBuffer +class KDE_EXPORT FileRingBuffer { public: FileRingBuffer(const TQString &filename, TQ_UINT64 max_size); diff --git a/src/include/frequencyradiostation.h b/src/include/frequencyradiostation.h index 75c6ecd..eb62e4d 100644 --- a/src/include/frequencyradiostation.h +++ b/src/include/frequencyradiostation.h @@ -22,6 +22,8 @@ #include <config.h> #endif +#include <kdemacros.h> + #include "radiostation.h" /** @@ -35,7 +37,7 @@ // Kopenhagener Wellenplan: 9kHz #define STATION_FREQ_INTERVAL_AM 0.009 -class FrequencyRadioStation : public RadioStation { +class KDE_EXPORT FrequencyRadioStation : public RadioStation { public: FrequencyRadioStation (); FrequencyRadioStation (float frequency); diff --git a/src/include/frequencyseekhelper.h b/src/include/frequencyseekhelper.h index 68ffe78..9fbdd87 100644 --- a/src/include/frequencyseekhelper.h +++ b/src/include/frequencyseekhelper.h @@ -23,15 +23,16 @@ #endif #include <tqobject.h> +#include <kdemacros.h> #include "radiodevice_interfaces.h" #include "seekhelper.h" -class FrequencySeekHelper : public TQObject, - public SeekHelper, - public IFrequencyRadioClient +class KDE_EXPORT FrequencySeekHelper : public TQObject, + public SeekHelper, + public IFrequencyRadioClient { Q_OBJECT - + public: FrequencySeekHelper(ISeekRadio &parent); diff --git a/src/include/interfaces.h b/src/include/interfaces.h index 0ed4a59..a969ef6 100644 --- a/src/include/interfaces.h +++ b/src/include/interfaces.h @@ -401,7 +401,7 @@ private: #define INTERFACE(IF, cmplIF) \ class IF; \ class cmplIF; \ - class IF : public InterfaceBase<IF, cmplIF> \ + class KDE_EXPORT IF : public InterfaceBase<IF, cmplIF> \ #define IF_CON_DESTRUCTOR(IF, n) \ IF() : BaseClass((n)) {} \ diff --git a/src/include/internetradiostation.h b/src/include/internetradiostation.h index 716dba2..4389ee0 100644 --- a/src/include/internetradiostation.h +++ b/src/include/internetradiostation.h @@ -26,12 +26,13 @@ // KDE includes #include <kurl.h> +#include <kdemacros.h> /** * @author Klas Kalass, Ernst Martin Witte */ -class InternetRadioStation : public RadioStation { +class KDE_EXPORT InternetRadioStation : public RadioStation { public: InternetRadioStation(); InternetRadioStation(KURL const &url); diff --git a/src/include/multibuffer.h b/src/include/multibuffer.h index e0ed05c..bebbac8 100644 --- a/src/include/multibuffer.h +++ b/src/include/multibuffer.h @@ -24,8 +24,9 @@ #include <tqsemaphore.h> #include <tqstring.h> +#include <kdemacros.h> -class MultiBuffer +class KDE_EXPORT MultiBuffer { public: MultiBuffer(size_t n_buffers, size_t buffersize); diff --git a/src/include/pluginmanager.h b/src/include/pluginmanager.h index 3bf13f4..8c3dc86 100644 --- a/src/include/pluginmanager.h +++ b/src/include/pluginmanager.h @@ -24,6 +24,7 @@ #include <tqstring.h> #include <tqptrdict.h> +#include <kdemacros.h> #include "plugins.h" @@ -42,10 +43,10 @@ class TQMenuData; class TDERadioApp; -class PluginManager : public TQObject +class KDE_EXPORT PluginManager : public TQObject { Q_OBJECT - + public : PluginManager(const TQString &name, TDERadioApp *app, diff --git a/src/include/plugins.h b/src/include/plugins.h index c39b65e..cb79d14 100644 --- a/src/include/plugins.h +++ b/src/include/plugins.h @@ -80,7 +80,7 @@ struct ConfigPageInfo typedef ConfigPageInfo AboutPageInfo; -class PluginBase : public IErrorLogClient +class KDE_EXPORT PluginBase : public IErrorLogClient { friend class PluginManager; public : @@ -135,22 +135,22 @@ protected : #define PLUGIN_LIBRARY_FUNCTIONS(class_name, i18nName, description) \ -extern "C" void TDERadioPlugin_LoadLibrary() \ +extern "C" KDE_EXPORT void TDERadioPlugin_LoadLibrary() \ { \ TDEGlobal::locale()->insertCatalogue(i18nName); \ } \ \ -extern "C" void TDERadioPlugin_UnloadLibrary() \ +extern "C" KDE_EXPORT void TDERadioPlugin_UnloadLibrary() \ { \ TDEGlobal::locale()->removeCatalogue(i18nName); \ } \ \ -extern "C" void TDERadioPlugin_GetAvailablePlugins(TQMap<TQString, TQString> &info) \ +extern "C" KDE_EXPORT void TDERadioPlugin_GetAvailablePlugins(TQMap<TQString, TQString> &info) \ { \ info.insert(#class_name, (description)); \ } \ \ -extern "C" PluginBase *TDERadioPlugin_CreatePlugin(const TQString &type, const TQString &object_name) \ +extern "C" KDE_EXPORT PluginBase *TDERadioPlugin_CreatePlugin(const TQString &type, const TQString &object_name) \ { \ if (type == #class_name) { \ return new class_name(object_name); \ @@ -161,23 +161,23 @@ extern "C" PluginBase *TDERadioPlugin_CreatePlugin(const TQString &type, const T #define PLUGIN_LIBRARY_FUNCTIONS2(class_name1, i18nName, description1, class_name2, description2) \ -extern "C" void TDERadioPlugin_LoadLibrary() \ +extern "C" KDE_EXPORT void TDERadioPlugin_LoadLibrary() \ { \ TDEGlobal::locale()->insertCatalogue(i18nName); \ } \ \ -extern "C" void TDERadioPlugin_UnloadLibrary() \ +extern "C" KDE_EXPORT void TDERadioPlugin_UnloadLibrary() \ { \ TDEGlobal::locale()->removeCatalogue(i18nName); \ } \ \ -extern "C" void TDERadioPlugin_GetAvailablePlugins(TQMap<TQString, TQString> &info) \ +extern "C" KDE_EXPORT void TDERadioPlugin_GetAvailablePlugins(TQMap<TQString, TQString> &info) \ { \ info.insert(#class_name1, (description1)); \ info.insert(#class_name2, (description2)); \ } \ \ -extern "C" PluginBase *TDERadioPlugin_CreatePlugin(const TQString &type, const TQString &object_name) \ +extern "C" KDE_EXPORT PluginBase *TDERadioPlugin_CreatePlugin(const TQString &type, const TQString &object_name) \ { \ if (type == #class_name1) { \ return new class_name1(object_name); \ diff --git a/src/include/radiostation-config.h b/src/include/radiostation-config.h index 2efad05..8cf3132 100644 --- a/src/include/radiostation-config.h +++ b/src/include/radiostation-config.h @@ -23,32 +23,33 @@ #endif #include <tqwidget.h> +#include <kdemacros.h> class RadioStation; -class RadioStationConfig : public TQWidget +class KDE_EXPORT RadioStationConfig : public TQWidget { Q_OBJECT - + public: - RadioStationConfig(TQWidget *parent); + RadioStationConfig(TQWidget *parent); ~RadioStationConfig(); virtual void setStationData (const RadioStation &rs) = 0; virtual void storeStationData (RadioStation &rs) = 0; signals: - virtual void changed(RadioStationConfig *); + virtual void changed(RadioStationConfig *); }; -class UndefinedRadioStationConfig : public RadioStationConfig +class KDE_EXPORT UndefinedRadioStationConfig : public RadioStationConfig { Q_OBJECT - + public: - UndefinedRadioStationConfig (TQWidget *parent); - ~UndefinedRadioStationConfig(); + UndefinedRadioStationConfig (TQWidget *parent); + ~UndefinedRadioStationConfig(); virtual void setStationData (const RadioStation &rs); virtual void storeStationData (RadioStation &rs); @@ -58,23 +59,23 @@ public: class TQSpinBox; -class FrequencyRadioStationConfig : public RadioStationConfig +class KDE_EXPORT FrequencyRadioStationConfig : public RadioStationConfig { Q_OBJECT - + public: - FrequencyRadioStationConfig (TQWidget *parent); - ~FrequencyRadioStationConfig(); + FrequencyRadioStationConfig (TQWidget *parent); + ~FrequencyRadioStationConfig(); virtual void setStationData (const RadioStation &rs); virtual void storeStationData (RadioStation &rs); protected slots: - virtual void slotValueChanged(int); + virtual void slotValueChanged(int); protected: - TQSpinBox *m_editFrequency; + TQSpinBox *m_editFrequency; }; diff --git a/src/include/radiostation-listview.h b/src/include/radiostation-listview.h index 2ecb86f..f96269f 100644 --- a/src/include/radiostation-listview.h +++ b/src/include/radiostation-listview.h @@ -28,10 +28,10 @@ class RadioStation; class StationList; -class RadioStationListView : public TDEListView +class KDE_EXPORT RadioStationListView : public TDEListView { Q_OBJECT - + public: RadioStationListView(TQWidget *parent=0, const char *name=0); virtual ~RadioStationListView(); diff --git a/src/include/radiostation.h b/src/include/radiostation.h index 68d0325..8534bf0 100644 --- a/src/include/radiostation.h +++ b/src/include/radiostation.h @@ -67,7 +67,7 @@ extern struct RegisterStationClass {} registerStationClass; class RadioStationConfig; -class RadioStation +class KDE_EXPORT RadioStation { protected: RadioStation (RegisterStationClass, const TQString &classname); @@ -142,7 +142,7 @@ private: -class UndefinedRadioStation : public RadioStation +class KDE_EXPORT UndefinedRadioStation : public RadioStation { public: UndefinedRadioStation (RegisterStationClass) : RadioStation (registerStationClass, getClassName()) {} @@ -159,6 +159,6 @@ public: }; -extern const UndefinedRadioStation undefinedRadioStation; +extern "C" const UndefinedRadioStation undefinedRadioStation; #endif diff --git a/src/include/ringbuffer.h b/src/include/ringbuffer.h index 1f545ca..d82c546 100644 --- a/src/include/ringbuffer.h +++ b/src/include/ringbuffer.h @@ -23,8 +23,9 @@ #endif #include <sys/types.h> +#include <kdemacros.h> -class RingBuffer +class KDE_EXPORT RingBuffer { public: RingBuffer(size_t size); diff --git a/src/include/seekhelper.h b/src/include/seekhelper.h index f61ad9d..76f0e81 100644 --- a/src/include/seekhelper.h +++ b/src/include/seekhelper.h @@ -22,12 +22,14 @@ #include <config.h> #endif +#include <kdemacros.h> + #include "radiodevice_interfaces.h" #include "soundstreamclient_interfaces.h" -class SeekHelper : public IRadioDeviceClient, - public ISoundStreamClient +class KDE_EXPORT SeekHelper : public IRadioDeviceClient, + public ISoundStreamClient { public: typedef enum { off, searchWorse, searchBest } state_t; diff --git a/src/include/soundformat.h b/src/include/soundformat.h index 0f07d9a..566cddc 100644 --- a/src/include/soundformat.h +++ b/src/include/soundformat.h @@ -26,7 +26,7 @@ #include <tqstring.h> #include <tdeconfig.h> -struct SoundFormat { +struct KDE_EXPORT SoundFormat { unsigned m_SampleRate; unsigned m_Channels; unsigned m_SampleBits; diff --git a/src/include/soundstreamid.h b/src/include/soundstreamid.h index e7aa4d5..b801e6b 100644 --- a/src/include/soundstreamid.h +++ b/src/include/soundstreamid.h @@ -22,7 +22,9 @@ #include <config.h> #endif -class SoundStreamID { +#include <kdemacros.h> + +class KDE_EXPORT SoundStreamID { SoundStreamID(int _id, int _phys_id); public: diff --git a/src/include/standardscandialog.h b/src/include/standardscandialog.h index 2be7c74..ef16d2f 100644 --- a/src/include/standardscandialog.h +++ b/src/include/standardscandialog.h @@ -29,14 +29,15 @@ #include <tqtimer.h> #include <tqdatetime.h> +#include <kdemacros.h> -class StandardScanDialog : public StandardScanDialogUI, - public ISeekRadioClient, -// public IRadioSoundClient, - public IRadioClient +class KDE_EXPORT StandardScanDialog : public StandardScanDialogUI, + public ISeekRadioClient, +// public IRadioSoundClient, + public IRadioClient { Q_OBJECT - + public: StandardScanDialog(TQWidget *parent); ~StandardScanDialog(); diff --git a/src/include/station-drag-object.h b/src/include/station-drag-object.h index 5796dd0..2e39653 100644 --- a/src/include/station-drag-object.h +++ b/src/include/station-drag-object.h @@ -19,8 +19,9 @@ #define KRADIO_STATION_DRAG_OBJECT_H #include <tqdragobject.h> +#include <kdemacros.h> -class StationDragObject : public TQStoredDrag +class KDE_EXPORT StationDragObject : public TQStoredDrag { public: StationDragObject(const TQStringList &stationIDs, TQWidget *dragSource = NULL, const char * name = NULL); diff --git a/src/include/stationlist.h b/src/include/stationlist.h index dcacdca..0c8a6ff 100644 --- a/src/include/stationlist.h +++ b/src/include/stationlist.h @@ -26,6 +26,7 @@ #include "errorlog-interfaces.h" #include <tqptrlist.h> +#include <kdemacros.h> class RadioStation; class KURL; @@ -52,7 +53,7 @@ class KURL; */ -class RawStationList : public TQPtrList<RadioStation> +class KDE_EXPORT RawStationList : public TQPtrList<RadioStation> { public: @@ -100,7 +101,7 @@ protected: * @author Klas Kalass, Ernst Martin Witte */ -class StationList { +class KDE_EXPORT StationList { public: StationList(); StationList(const StationList &sl); diff --git a/src/include/stationselector.h b/src/include/stationselector.h index 009293e..3f83f90 100644 --- a/src/include/stationselector.h +++ b/src/include/stationselector.h @@ -23,6 +23,7 @@ #endif #include <tqstringlist.h> +#include <kdemacros.h> #include "radio_interfaces.h" #include "stationselection_interfaces.h" @@ -34,12 +35,12 @@ class RadioStationListView; -class StationSelector : public StationSelectorUI, - public IRadioClient, - public IStationSelectionClient +class KDE_EXPORT StationSelector : public StationSelectorUI, + public IRadioClient, + public IStationSelectionClient { Q_OBJECT - + public : StationSelector (TQWidget *parent); ~StationSelector (); @@ -62,7 +63,7 @@ public : void saveState (TDEConfig *) const; void restoreState (TDEConfig *); - + bool isDirty () const { return m_dirty; } protected slots: diff --git a/src/include/widgetplugins.h b/src/include/widgetplugins.h index 69bb0bf..c29bc2f 100644 --- a/src/include/widgetplugins.h +++ b/src/include/widgetplugins.h @@ -26,7 +26,7 @@ class TQWidget; -class WidgetPluginBase : public PluginBase +class KDE_EXPORT WidgetPluginBase : public PluginBase { public : WidgetPluginBase(const TQString &name, const TQString &description); |