diff --git a/src/debug-profiler.cpp b/src/debug-profiler.cpp index f8262dd..90f18a2 100644 --- a/src/debug-profiler.cpp +++ b/src/debug-profiler.cpp @@ -21,8 +21,8 @@ #include -KDE_EXPORT TimeProfiler global_time_profiler; -KDE_EXPORT MemProfiler global_mem_profiler; +TDE_EXPORT TimeProfiler global_time_profiler; +TDE_EXPORT MemProfiler global_mem_profiler; Profiler::Profiler() { diff --git a/src/include/alarm.h b/src/include/alarm.h index ae28f4a..7dcf237 100644 --- a/src/include/alarm.h +++ b/src/include/alarm.h @@ -30,7 +30,7 @@ *@author Martin Witte */ -class KDE_EXPORT Alarm +class TDE_EXPORT Alarm { public: diff --git a/src/include/debug-profiler.h b/src/include/debug-profiler.h index 1e46111..ae78e43 100644 --- a/src/include/debug-profiler.h +++ b/src/include/debug-profiler.h @@ -40,7 +40,7 @@ static __inline__ unsigned long long int rdtsc() } #endif -class KDE_EXPORT Profiler +class TDE_EXPORT Profiler { public: Profiler(); @@ -77,14 +77,14 @@ protected: }; -class KDE_EXPORT TimeProfiler : public Profiler +class TDE_EXPORT TimeProfiler : public Profiler { protected: long long getCounter() const { return rdtsc(); } }; -class KDE_EXPORT MemProfiler : public Profiler +class TDE_EXPORT MemProfiler : public Profiler { protected: long long getCounter() const; @@ -96,7 +96,7 @@ extern MemProfiler global_mem_profiler; -class KDE_EXPORT BlockProfiler +class TDE_EXPORT BlockProfiler { public: BlockProfiler(const TQString &descr); diff --git a/src/include/fileringbuffer.h b/src/include/fileringbuffer.h index 0622af9..a0d0c2b 100644 --- a/src/include/fileringbuffer.h +++ b/src/include/fileringbuffer.h @@ -26,7 +26,7 @@ #include #include -class KDE_EXPORT FileRingBuffer +class TDE_EXPORT FileRingBuffer { public: FileRingBuffer(const TQString &filename, TQ_UINT64 max_size); diff --git a/src/include/frequencyradiostation.h b/src/include/frequencyradiostation.h index eb62e4d..305e032 100644 --- a/src/include/frequencyradiostation.h +++ b/src/include/frequencyradiostation.h @@ -37,7 +37,7 @@ // Kopenhagener Wellenplan: 9kHz #define STATION_FREQ_INTERVAL_AM 0.009 -class KDE_EXPORT FrequencyRadioStation : public RadioStation { +class TDE_EXPORT FrequencyRadioStation : public RadioStation { public: FrequencyRadioStation (); FrequencyRadioStation (float frequency); diff --git a/src/include/frequencyseekhelper.h b/src/include/frequencyseekhelper.h index 893f211..56940e7 100644 --- a/src/include/frequencyseekhelper.h +++ b/src/include/frequencyseekhelper.h @@ -27,7 +27,7 @@ #include "radiodevice_interfaces.h" #include "seekhelper.h" -class KDE_EXPORT FrequencySeekHelper : public TQObject, +class TDE_EXPORT FrequencySeekHelper : public TQObject, public SeekHelper, public IFrequencyRadioClient { diff --git a/src/include/interfaces.h b/src/include/interfaces.h index 853933e..3c96281 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 KDE_EXPORT IF : public InterfaceBase \ + class TDE_EXPORT IF : public InterfaceBase \ #define IF_CON_DESTRUCTOR(IF, n) \ IF() : BaseClass((n)) {} \ diff --git a/src/include/internetradiostation.h b/src/include/internetradiostation.h index 4389ee0..f6cf674 100644 --- a/src/include/internetradiostation.h +++ b/src/include/internetradiostation.h @@ -32,7 +32,7 @@ * @author Klas Kalass, Ernst Martin Witte */ -class KDE_EXPORT InternetRadioStation : public RadioStation { +class TDE_EXPORT InternetRadioStation : public RadioStation { public: InternetRadioStation(); InternetRadioStation(KURL const &url); diff --git a/src/include/multibuffer.h b/src/include/multibuffer.h index bebbac8..014ca83 100644 --- a/src/include/multibuffer.h +++ b/src/include/multibuffer.h @@ -26,7 +26,7 @@ #include #include -class KDE_EXPORT MultiBuffer +class TDE_EXPORT MultiBuffer { public: MultiBuffer(size_t n_buffers, size_t buffersize); diff --git a/src/include/pluginmanager.h b/src/include/pluginmanager.h index 253e7eb..47fc051 100644 --- a/src/include/pluginmanager.h +++ b/src/include/pluginmanager.h @@ -43,7 +43,7 @@ class TQMenuData; class TDERadioApp; -class KDE_EXPORT PluginManager : public TQObject +class TDE_EXPORT PluginManager : public TQObject { TQ_OBJECT diff --git a/src/include/plugins.h b/src/include/plugins.h index cb79d14..d27575c 100644 --- a/src/include/plugins.h +++ b/src/include/plugins.h @@ -80,7 +80,7 @@ struct ConfigPageInfo typedef ConfigPageInfo AboutPageInfo; -class KDE_EXPORT PluginBase : public IErrorLogClient +class TDE_EXPORT PluginBase : public IErrorLogClient { friend class PluginManager; public : @@ -135,22 +135,22 @@ protected : #define PLUGIN_LIBRARY_FUNCTIONS(class_name, i18nName, description) \ -extern "C" KDE_EXPORT void TDERadioPlugin_LoadLibrary() \ +extern "C" TDE_EXPORT void TDERadioPlugin_LoadLibrary() \ { \ TDEGlobal::locale()->insertCatalogue(i18nName); \ } \ \ -extern "C" KDE_EXPORT void TDERadioPlugin_UnloadLibrary() \ +extern "C" TDE_EXPORT void TDERadioPlugin_UnloadLibrary() \ { \ TDEGlobal::locale()->removeCatalogue(i18nName); \ } \ \ -extern "C" KDE_EXPORT void TDERadioPlugin_GetAvailablePlugins(TQMap &info) \ +extern "C" TDE_EXPORT void TDERadioPlugin_GetAvailablePlugins(TQMap &info) \ { \ info.insert(#class_name, (description)); \ } \ \ -extern "C" KDE_EXPORT PluginBase *TDERadioPlugin_CreatePlugin(const TQString &type, const TQString &object_name) \ +extern "C" TDE_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" KDE_EXPORT PluginBase *TDERadioPlugin_CreatePlugin(const TQString &ty #define PLUGIN_LIBRARY_FUNCTIONS2(class_name1, i18nName, description1, class_name2, description2) \ -extern "C" KDE_EXPORT void TDERadioPlugin_LoadLibrary() \ +extern "C" TDE_EXPORT void TDERadioPlugin_LoadLibrary() \ { \ TDEGlobal::locale()->insertCatalogue(i18nName); \ } \ \ -extern "C" KDE_EXPORT void TDERadioPlugin_UnloadLibrary() \ +extern "C" TDE_EXPORT void TDERadioPlugin_UnloadLibrary() \ { \ TDEGlobal::locale()->removeCatalogue(i18nName); \ } \ \ -extern "C" KDE_EXPORT void TDERadioPlugin_GetAvailablePlugins(TQMap &info) \ +extern "C" TDE_EXPORT void TDERadioPlugin_GetAvailablePlugins(TQMap &info) \ { \ info.insert(#class_name1, (description1)); \ info.insert(#class_name2, (description2)); \ } \ \ -extern "C" KDE_EXPORT PluginBase *TDERadioPlugin_CreatePlugin(const TQString &type, const TQString &object_name) \ +extern "C" TDE_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 603e3ee..be0b48e 100644 --- a/src/include/radiostation-config.h +++ b/src/include/radiostation-config.h @@ -27,7 +27,7 @@ class RadioStation; -class KDE_EXPORT RadioStationConfig : public TQWidget +class TDE_EXPORT RadioStationConfig : public TQWidget { TQ_OBJECT @@ -43,7 +43,7 @@ signals: }; -class KDE_EXPORT UndefinedRadioStationConfig : public RadioStationConfig +class TDE_EXPORT UndefinedRadioStationConfig : public RadioStationConfig { TQ_OBJECT @@ -59,7 +59,7 @@ public: class TQSpinBox; -class KDE_EXPORT FrequencyRadioStationConfig : public RadioStationConfig +class TDE_EXPORT FrequencyRadioStationConfig : public RadioStationConfig { TQ_OBJECT diff --git a/src/include/radiostation-listview.h b/src/include/radiostation-listview.h index 71a56e3..05d41ed 100644 --- a/src/include/radiostation-listview.h +++ b/src/include/radiostation-listview.h @@ -28,7 +28,7 @@ class RadioStation; class StationList; -class KDE_EXPORT RadioStationListView : public TDEListView +class TDE_EXPORT RadioStationListView : public TDEListView { TQ_OBJECT diff --git a/src/include/radiostation.h b/src/include/radiostation.h index 8534bf0..2033a6a 100644 --- a/src/include/radiostation.h +++ b/src/include/radiostation.h @@ -67,7 +67,7 @@ extern struct RegisterStationClass {} registerStationClass; class RadioStationConfig; -class KDE_EXPORT RadioStation +class TDE_EXPORT RadioStation { protected: RadioStation (RegisterStationClass, const TQString &classname); @@ -142,7 +142,7 @@ private: -class KDE_EXPORT UndefinedRadioStation : public RadioStation +class TDE_EXPORT UndefinedRadioStation : public RadioStation { public: UndefinedRadioStation (RegisterStationClass) : RadioStation (registerStationClass, getClassName()) {} diff --git a/src/include/ringbuffer.h b/src/include/ringbuffer.h index d82c546..3877334 100644 --- a/src/include/ringbuffer.h +++ b/src/include/ringbuffer.h @@ -25,7 +25,7 @@ #include #include -class KDE_EXPORT RingBuffer +class TDE_EXPORT RingBuffer { public: RingBuffer(size_t size); diff --git a/src/include/seekhelper.h b/src/include/seekhelper.h index 76f0e81..b633555 100644 --- a/src/include/seekhelper.h +++ b/src/include/seekhelper.h @@ -28,7 +28,7 @@ #include "soundstreamclient_interfaces.h" -class KDE_EXPORT SeekHelper : public IRadioDeviceClient, +class TDE_EXPORT SeekHelper : public IRadioDeviceClient, public ISoundStreamClient { public: diff --git a/src/include/soundformat.h b/src/include/soundformat.h index 566cddc..51fb9c4 100644 --- a/src/include/soundformat.h +++ b/src/include/soundformat.h @@ -26,7 +26,7 @@ #include #include -struct KDE_EXPORT SoundFormat { +struct TDE_EXPORT SoundFormat { unsigned m_SampleRate; unsigned m_Channels; unsigned m_SampleBits; diff --git a/src/include/soundstreamid.h b/src/include/soundstreamid.h index b801e6b..9623695 100644 --- a/src/include/soundstreamid.h +++ b/src/include/soundstreamid.h @@ -24,7 +24,7 @@ #include -class KDE_EXPORT SoundStreamID { +class TDE_EXPORT SoundStreamID { SoundStreamID(int _id, int _phys_id); public: diff --git a/src/include/standardscandialog.h b/src/include/standardscandialog.h index 5797fae..30cd7ea 100644 --- a/src/include/standardscandialog.h +++ b/src/include/standardscandialog.h @@ -31,7 +31,7 @@ #include #include -class KDE_EXPORT StandardScanDialog : public StandardScanDialogUI, +class TDE_EXPORT StandardScanDialog : public StandardScanDialogUI, public ISeekRadioClient, // public IRadioSoundClient, public IRadioClient diff --git a/src/include/station-drag-object.h b/src/include/station-drag-object.h index 2e39653..510e0af 100644 --- a/src/include/station-drag-object.h +++ b/src/include/station-drag-object.h @@ -21,7 +21,7 @@ #include #include -class KDE_EXPORT StationDragObject : public TQStoredDrag +class TDE_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 0c8a6ff..7193992 100644 --- a/src/include/stationlist.h +++ b/src/include/stationlist.h @@ -53,7 +53,7 @@ class KURL; */ -class KDE_EXPORT RawStationList : public TQPtrList +class TDE_EXPORT RawStationList : public TQPtrList { public: @@ -101,7 +101,7 @@ protected: * @author Klas Kalass, Ernst Martin Witte */ -class KDE_EXPORT StationList { +class TDE_EXPORT StationList { public: StationList(); StationList(const StationList &sl); diff --git a/src/include/stationselector.h b/src/include/stationselector.h index 4e1ccaa..4a5d557 100644 --- a/src/include/stationselector.h +++ b/src/include/stationselector.h @@ -35,7 +35,7 @@ class RadioStationListView; -class KDE_EXPORT StationSelector : public StationSelectorUI, +class TDE_EXPORT StationSelector : public StationSelectorUI, public IRadioClient, public IStationSelectionClient { diff --git a/src/include/widgetplugins.h b/src/include/widgetplugins.h index c29bc2f..743fd73 100644 --- a/src/include/widgetplugins.h +++ b/src/include/widgetplugins.h @@ -26,7 +26,7 @@ class TQWidget; -class KDE_EXPORT WidgetPluginBase : public PluginBase +class TDE_EXPORT WidgetPluginBase : public PluginBase { public : WidgetPluginBase(const TQString &name, const TQString &description); diff --git a/src/radiostation.cpp b/src/radiostation.cpp index ba72c44..e61ebad 100644 --- a/src/radiostation.cpp +++ b/src/radiostation.cpp @@ -42,8 +42,8 @@ TQDict *RadioStation::stationClassRegistry = 0; ///////////////////////////////////////////////////////////////////////////// -KDE_EXPORT RegisterStationClass registerStationClass; -extern "C" const KDE_EXPORT UndefinedRadioStation undefinedRadioStation (registerStationClass); +TDE_EXPORT RegisterStationClass registerStationClass; +extern "C" const TDE_EXPORT UndefinedRadioStation undefinedRadioStation (registerStationClass); ///////////////////////////////////////////////////////////////////////////// diff --git a/src/stationlist.cpp b/src/stationlist.cpp index 6dc8643..8c5544b 100644 --- a/src/stationlist.cpp +++ b/src/stationlist.cpp @@ -32,7 +32,7 @@ ////////////////////////////////////////////////////////////////////////////// -const KDE_EXPORT StationList emptyStationList; +const TDE_EXPORT StationList emptyStationList; ////////////////////////////////////////////////////////////////////////////// diff --git a/src/stationselector-ui.ui b/src/stationselector-ui.ui index 6391158..5bdcfbd 100644 --- a/src/stationselector-ui.ui +++ b/src/stationselector-ui.ui @@ -168,5 +168,5 @@ kpushbutton.h radiostation-listview.h -KDE_EXPORT +TDE_EXPORT