From c322141e5ad478b3da9dfb1e3ec6bdf04932d10c Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 5 May 2024 17:48:14 +0900 Subject: [PATCH] Replace KDE_[NO_]EXPORT with TDE_[NO_]EXPORT Signed-off-by: Michele Calgaro --- kiten/asyndeta.h | 2 +- kiten/deinf.h | 2 +- kiten/dict.h | 18 +++++++++--------- kiten/kiten.h | 2 +- kiten/rad.h | 6 +++--- kiten/widgets.h | 6 +++--- kmplot/kmplot/MainDlg.cpp | 2 +- kvoctrain/kvoctrain/common-dialogs/prefs.kcfgc | 2 +- .../kvoctrain/common-dialogs/profilesdialog.h | 4 ++-- kvoctrain/kvoctrain/kvt-core/LineList.h | 2 +- kvoctrain/kvoctrain/kvt-core/MultipleChoice.h | 2 +- kvoctrain/kvoctrain/kvt-core/QueryManager.h | 2 +- kvoctrain/kvoctrain/kvt-core/UsageManager.h | 2 +- kvoctrain/kvoctrain/kvt-core/grammarmanager.h | 8 ++++---- kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp | 2 +- kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h | 2 +- kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h | 2 +- kvoctrain/kvoctrain/kvt-core/langset.h | 2 +- libtdeedu/extdate/extdatepicker.h | 2 +- libtdeedu/extdate/extdatetime.cpp | 8 ++++---- libtdeedu/extdate/extdatetime.h | 4 ++-- libtdeedu/extdate/extdatetimeedit.h | 4 ++-- libtdeedu/extdate/extdatewidget.h | 2 +- libtdeedu/tdeeducore/keduvocdata.h | 4 ++-- libtdeedu/tdeeduplot/kplotaxis.h | 2 +- libtdeedu/tdeeduplot/kplotobject.h | 6 +++--- libtdeedu/tdeeduplot/kplotwidget.h | 2 +- libtdeedu/tdeeduui/tdeeduglossary.h | 6 +++--- 28 files changed, 54 insertions(+), 54 deletions(-) diff --git a/kiten/asyndeta.h b/kiten/asyndeta.h index d4946e17..ae35900e 100644 --- a/kiten/asyndeta.h +++ b/kiten/asyndeta.h @@ -28,7 +28,7 @@ namespace Dict class Index; } -class KDE_EXPORT Asyndeta +class TDE_EXPORT Asyndeta { public: // creates index diff --git a/kiten/deinf.h b/kiten/deinf.h index ca776289..98c7cb8e 100644 --- a/kiten/deinf.h +++ b/kiten/deinf.h @@ -34,7 +34,7 @@ struct Conjugation unsigned int num; }; -class KDE_EXPORT Index +class TDE_EXPORT Index { public: Index(); diff --git a/kiten/dict.h b/kiten/dict.h index 0b3f04a2..25db6d0e 100644 --- a/kiten/dict.h +++ b/kiten/dict.h @@ -42,7 +42,7 @@ namespace Dict enum TextType { Text_Kanji, Text_Kana, Text_Latin }; // returns the TextType of the first part of the text -KDE_EXPORT TextType textType(const TQString &text); +TDE_EXPORT TextType textType(const TQString &text); // File needs to be able to give out Arrays based on its mmap'd data. // But, we don't want the users of the arrays to have to remember to @@ -106,7 +106,7 @@ private: bool valid; }; -class KDE_EXPORT Entry +class TDE_EXPORT Entry { public: // EDict ctor @@ -161,7 +161,7 @@ struct SearchResult enum SearchType { Search_Beginning, Search_FullWord, Search_Anywhere }; enum DictionaryType { Edict, Kanjidict }; -class KDE_EXPORT Index : public TQObject +class TDE_EXPORT Index : public TQObject { TQ_OBJECT @@ -193,12 +193,12 @@ private: }; // lotsa helper functions -KDE_EXPORT TQString prettyKanjiReading(TQStringList); -KDE_EXPORT TQString prettyMeaning(TQStringList); -KDE_EXPORT Entry parse(const TQString &); -KDE_EXPORT Entry kanjiParse(const TQString &); -KDE_EXPORT Dict::Entry firstEntry(Dict::SearchResult); -KDE_EXPORT TQString firstEntryText(Dict::SearchResult); +TDE_EXPORT TQString prettyKanjiReading(TQStringList); +TDE_EXPORT TQString prettyMeaning(TQStringList); +TDE_EXPORT Entry parse(const TQString &); +TDE_EXPORT Entry kanjiParse(const TQString &); +TDE_EXPORT Dict::Entry firstEntry(Dict::SearchResult); +TDE_EXPORT TQString firstEntryText(Dict::SearchResult); int eucStringCompare(const char *str1, const char *str2); bool isEUC(unsigned char c); diff --git a/kiten/kiten.h b/kiten/kiten.h index dc71da38..728b0fee 100644 --- a/kiten/kiten.h +++ b/kiten/kiten.h @@ -38,7 +38,7 @@ class TDEListAction; class Learn; class ResultView; -class KDE_EXPORT TopLevel : public TDEMainWindow +class TDE_EXPORT TopLevel : public TDEMainWindow { TQ_OBJECT diff --git a/kiten/rad.h b/kiten/rad.h index dd956847..1ac7a477 100644 --- a/kiten/rad.h +++ b/kiten/rad.h @@ -33,7 +33,7 @@ class KPushButton; class TDEListBox; class TQButtonGroup; -class KDE_EXPORT Radical +class TDE_EXPORT Radical { public: Radical(TQString = TQString(), unsigned int = 0); @@ -50,7 +50,7 @@ class KDE_EXPORT Radical TQString Kanji; }; -class KDE_EXPORT Rad : public TQObject +class TDE_EXPORT Rad : public TQObject { TQ_OBJECT @@ -72,7 +72,7 @@ class KDE_EXPORT Rad : public TQObject bool loaded; }; -class KDE_EXPORT RadWidget : public TQWidget +class TDE_EXPORT RadWidget : public TQWidget { TQ_OBJECT diff --git a/kiten/widgets.h b/kiten/widgets.h index d1643d08..2319b4d0 100644 --- a/kiten/widgets.h +++ b/kiten/widgets.h @@ -34,7 +34,7 @@ class KStatusBar; #include "dict.h" #include "rad.h" -class KDE_EXPORT ResultView : public KTextBrowser +class TDE_EXPORT ResultView : public KTextBrowser { TQ_OBJECT @@ -64,7 +64,7 @@ class KDE_EXPORT ResultView : public KTextBrowser bool basicMode; }; -class KDE_EXPORT eEdit : public TDEMainWindow +class TDE_EXPORT eEdit : public TDEMainWindow { TQ_OBJECT @@ -90,7 +90,7 @@ class KDE_EXPORT eEdit : public TDEMainWindow bool isMod; }; -class KDE_EXPORT EditAction : public TDEAction +class TDE_EXPORT EditAction : public TDEAction { TQ_OBJECT diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp index f9cf4ec1..5202a98c 100644 --- a/kmplot/kmplot/MainDlg.cpp +++ b/kmplot/kmplot/MainDlg.cpp @@ -807,7 +807,7 @@ TDEInstance* KmPlotPartFactory::instance() extern "C" { - KDE_EXPORT void* init_libkmplotpart() + TDE_EXPORT void* init_libkmplotpart() { return new KmPlotPartFactory; } diff --git a/kvoctrain/kvoctrain/common-dialogs/prefs.kcfgc b/kvoctrain/kvoctrain/common-dialogs/prefs.kcfgc index 6aeff9c7..8a5732e8 100644 --- a/kvoctrain/kvoctrain/common-dialogs/prefs.kcfgc +++ b/kvoctrain/kvoctrain/common-dialogs/prefs.kcfgc @@ -4,4 +4,4 @@ File=kvoctrain.kcfg ClassName=Prefs Singleton=true Mutators=true -Visibility=KDE_EXPORT \ No newline at end of file +Visibility=TDE_EXPORT \ No newline at end of file diff --git a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h index 9835ce08..7a131d9b 100644 --- a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h +++ b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h @@ -31,7 +31,7 @@ class QueryManager; class GroupOptions; -class KDE_EXPORT SettingsProfile +class TDE_EXPORT SettingsProfile { public: SettingsProfile(); @@ -43,7 +43,7 @@ public: TQString block_set; }; -class KDE_EXPORT ProfilesDialog : public KDialogBase +class TDE_EXPORT ProfilesDialog : public KDialogBase { TQ_OBJECT diff --git a/kvoctrain/kvoctrain/kvt-core/LineList.h b/kvoctrain/kvoctrain/kvt-core/LineList.h index a0bb1b24..baf040ac 100644 --- a/kvoctrain/kvoctrain/kvt-core/LineList.h +++ b/kvoctrain/kvoctrain/kvt-core/LineList.h @@ -33,7 +33,7 @@ #include using namespace std; -class KDE_EXPORT LineList { +class TDE_EXPORT LineList { public: LineList (const TQString &multilines = ""); diff --git a/kvoctrain/kvoctrain/kvt-core/MultipleChoice.h b/kvoctrain/kvoctrain/kvt-core/MultipleChoice.h index c1fddd8c..af69cd06 100644 --- a/kvoctrain/kvoctrain/kvt-core/MultipleChoice.h +++ b/kvoctrain/kvoctrain/kvt-core/MultipleChoice.h @@ -32,7 +32,7 @@ #define MAX_MULTIPLE_CHOICE 5 // select one out of x -class KDE_EXPORT MultipleChoice +class TDE_EXPORT MultipleChoice { public: diff --git a/kvoctrain/kvoctrain/kvt-core/QueryManager.h b/kvoctrain/kvoctrain/kvt-core/QueryManager.h index 4c2f2175..124e4dad 100644 --- a/kvoctrain/kvoctrain/kvt-core/QueryManager.h +++ b/kvoctrain/kvoctrain/kvt-core/QueryManager.h @@ -105,7 +105,7 @@ struct QueryEntryRef { typedef vector > QuerySelection; -class KDE_EXPORT QueryManager +class TDE_EXPORT QueryManager { public: // donīt change the order/remove one of these, diff --git a/kvoctrain/kvoctrain/kvt-core/UsageManager.h b/kvoctrain/kvoctrain/kvt-core/UsageManager.h index 522c4ae8..2f674808 100644 --- a/kvoctrain/kvoctrain/kvt-core/UsageManager.h +++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.h @@ -108,7 +108,7 @@ struct UsageRelation }; -class KDE_EXPORT UsageManager +class TDE_EXPORT UsageManager { public: diff --git a/kvoctrain/kvoctrain/kvt-core/grammarmanager.h b/kvoctrain/kvoctrain/kvt-core/grammarmanager.h index c37b0dbb..03f1a4d1 100644 --- a/kvoctrain/kvoctrain/kvt-core/grammarmanager.h +++ b/kvoctrain/kvoctrain/kvt-core/grammarmanager.h @@ -47,7 +47,7 @@ using namespace std; #define UL_USER_TENSE "#" // designates number of user tense -class KDE_EXPORT Article +class TDE_EXPORT Article { public: @@ -76,7 +76,7 @@ protected: }; -class KDE_EXPORT Comparison +class TDE_EXPORT Comparison { public: @@ -106,7 +106,7 @@ protected: }; -class KDE_EXPORT TenseRelation +class TDE_EXPORT TenseRelation { public: @@ -122,7 +122,7 @@ class KDE_EXPORT TenseRelation }; -class KDE_EXPORT Conjugation +class TDE_EXPORT Conjugation { public: diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp index 067fe6bd..f1f13f89 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp @@ -33,7 +33,7 @@ #include using namespace std; -KDE_EXPORT vector getCsvOrderStatic(kvoctrainDoc *doc) +TDE_EXPORT vector getCsvOrderStatic(kvoctrainDoc *doc) { vector csv_order; TQStringList lang_order = Prefs::pasteOrder(); diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h index 30e45a7f..e208a530 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h +++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h @@ -250,7 +250,7 @@ class MultipleChoice; * This class contains the expressions of your vocabulary ************************************************************/ -class KDE_EXPORT kvoctrainDoc : public TQObject +class TDE_EXPORT kvoctrainDoc : public TQObject { TQ_OBJECT diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h index 72ff266f..21712e71 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h +++ b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h @@ -71,7 +71,7 @@ typedef unsigned short count_t; * translations **************************************************************/ -class KDE_EXPORT kvoctrainExpr +class TDE_EXPORT kvoctrainExpr { public: diff --git a/kvoctrain/kvoctrain/kvt-core/langset.h b/kvoctrain/kvoctrain/kvt-core/langset.h index 26935408..4b11c3f2 100644 --- a/kvoctrain/kvoctrain/kvt-core/langset.h +++ b/kvoctrain/kvoctrain/kvt-core/langset.h @@ -36,7 +36,7 @@ using namespace std; #include -class KDE_EXPORT LangSet +class TDE_EXPORT LangSet { public: diff --git a/libtdeedu/extdate/extdatepicker.h b/libtdeedu/extdate/extdatepicker.h index 4f70f296..8e8d18d5 100644 --- a/libtdeedu/extdate/extdatepicker.h +++ b/libtdeedu/extdate/extdatepicker.h @@ -49,7 +49,7 @@ class ExtDateTable; * * @short A date selection widget. **/ -class KDE_EXPORT ExtDatePicker: public TQFrame +class TDE_EXPORT ExtDatePicker: public TQFrame { TQ_OBJECT diff --git a/libtdeedu/extdate/extdatetime.cpp b/libtdeedu/extdate/extdatetime.cpp index 60d6ea56..9c12c248 100644 --- a/libtdeedu/extdate/extdatetime.cpp +++ b/libtdeedu/extdate/extdatetime.cpp @@ -1121,12 +1121,12 @@ ExtDateTime ExtDateTime::fromString( const TQString& s, TQt::DateFormat f ) #ifndef TQT_NO_DATASTREAM -KDE_EXPORT TQDataStream &operator<<( TQDataStream & ostream, const ExtDate & date) +TDE_EXPORT TQDataStream &operator<<( TQDataStream & ostream, const ExtDate & date) { return ostream << (TQ_UINT32)(date.jd()); } -KDE_EXPORT TQDataStream &operator>>( TQDataStream & ostream, ExtDate & date) +TDE_EXPORT TQDataStream &operator>>( TQDataStream & ostream, ExtDate & date) { TQ_UINT32 julday; ostream >> julday; @@ -1134,14 +1134,14 @@ KDE_EXPORT TQDataStream &operator>>( TQDataStream & ostream, ExtDate & date) return ostream; } -KDE_EXPORT TQDataStream &operator<<( TQDataStream & ostream, const ExtDateTime & dt) +TDE_EXPORT TQDataStream &operator<<( TQDataStream & ostream, const ExtDateTime & dt) { ostream << dt.d; ostream << dt.t; return ostream; } -KDE_EXPORT TQDataStream &operator>>( TQDataStream & ostream, ExtDateTime & dt) +TDE_EXPORT TQDataStream &operator>>( TQDataStream & ostream, ExtDateTime & dt) { ostream >> dt.d >> dt.t; return ostream; diff --git a/libtdeedu/extdate/extdatetime.h b/libtdeedu/extdate/extdatetime.h index 7e0a64b0..0cadade4 100644 --- a/libtdeedu/extdate/extdatetime.h +++ b/libtdeedu/extdate/extdatetime.h @@ -34,7 +34,7 @@ extern void test2_unit(int y, int m, int d); class ExtDateTime; -class KDE_EXPORT ExtDate +class TDE_EXPORT ExtDate { public: ExtDate() : m_jd(INVALID_DAY), m_year(0), m_month(0), m_day(0) {} @@ -121,7 +121,7 @@ private: ExtDateTime class *****************************************************************************/ -class KDE_EXPORT ExtDateTime +class TDE_EXPORT ExtDateTime { public: ExtDateTime() {} // set null date and null time diff --git a/libtdeedu/extdate/extdatetimeedit.h b/libtdeedu/extdate/extdatetimeedit.h index f149d0b0..6c252731 100644 --- a/libtdeedu/extdate/extdatetimeedit.h +++ b/libtdeedu/extdate/extdatetimeedit.h @@ -61,7 +61,7 @@ private: class ExtDateEditPrivate; -class KDE_EXPORT ExtDateEdit : public ExtDateTimeEditBase +class TDE_EXPORT ExtDateEdit : public ExtDateTimeEditBase { TQ_OBJECT @@ -230,7 +230,7 @@ private: class ExtDateTimeEditPrivate; -class KDE_EXPORT ExtDateTimeEdit : public TQWidget +class TDE_EXPORT ExtDateTimeEdit : public TQWidget { TQ_OBJECT diff --git a/libtdeedu/extdate/extdatewidget.h b/libtdeedu/extdate/extdatewidget.h index 04f8d314..acc02713 100644 --- a/libtdeedu/extdate/extdatewidget.h +++ b/libtdeedu/extdate/extdatewidget.h @@ -32,7 +32,7 @@ * @short A pushbutton to display or allow user selection of a date. * @version $Id$ */ -class KDE_EXPORT ExtDateWidget : public TQWidget +class TDE_EXPORT ExtDateWidget : public TQWidget { TQ_OBJECT diff --git a/libtdeedu/tdeeducore/keduvocdata.h b/libtdeedu/tdeeducore/keduvocdata.h index b8ac6676..4310dacc 100644 --- a/libtdeedu/tdeeducore/keduvocdata.h +++ b/libtdeedu/tdeeducore/keduvocdata.h @@ -23,7 +23,7 @@ #include #include -class KDE_EXPORT KEduVocDataItem +class TDE_EXPORT KEduVocDataItem { public: KEduVocDataItem(); @@ -42,7 +42,7 @@ private: typedef TQValueList KEduVocDataItemList; -class KDE_EXPORT KEduVocData +class TDE_EXPORT KEduVocData { public: static KEduVocDataItemList parse(const TQString &fileName); diff --git a/libtdeedu/tdeeduplot/kplotaxis.h b/libtdeedu/tdeeduplot/kplotaxis.h index 3209b18c..e0d791a0 100644 --- a/libtdeedu/tdeeduplot/kplotaxis.h +++ b/libtdeedu/tdeeduplot/kplotaxis.h @@ -27,7 +27,7 @@ *@author Andreas Nicolai *@version 1.0 */ -class KDE_EXPORT KPlotAxis { +class TDE_EXPORT KPlotAxis { public: /**@short Default constructor, creates a default axis. */ diff --git a/libtdeedu/tdeeduplot/kplotobject.h b/libtdeedu/tdeeduplot/kplotobject.h index f1074cb6..a38d4be7 100644 --- a/libtdeedu/tdeeduplot/kplotobject.h +++ b/libtdeedu/tdeeduplot/kplotobject.h @@ -29,7 +29,7 @@ class TQPainter; *@author Jason Harris *@version 1.0 */ -class KDE_EXPORT DRect { +class TDE_EXPORT DRect { public: DRect() { DRect( 0.0, 0.0, 1.0, 1.0 ); } DRect( double x, double y, double w, double h ) { X = x; Y = y; W = w; H = h; } @@ -56,7 +56,7 @@ private: *@author Jason Harris *@version 1.0 */ -class KDE_EXPORT DPoint { +class TDE_EXPORT DPoint { public: DPoint() { DPoint( 0.0, 0.0 ); } DPoint( double x, double y ) { setX( x ); setY( y ); } @@ -87,7 +87,7 @@ private: *about the object's appearance, depending on its type. There is a draw function *for plotting the object on a KPlotWidget's TQPainter. */ -class KDE_EXPORT KPlotObject{ +class TDE_EXPORT KPlotObject{ public: /**@enum PTYPE *The Type classification of the KPlotObject diff --git a/libtdeedu/tdeeduplot/kplotwidget.h b/libtdeedu/tdeeduplot/kplotwidget.h index d76ef473..98566edd 100644 --- a/libtdeedu/tdeeduplot/kplotwidget.h +++ b/libtdeedu/tdeeduplot/kplotwidget.h @@ -38,7 +38,7 @@ class TQPixmap; *tickmarks and labels and a list of KPlotObjects to be drawn. */ -class KDE_EXPORT KPlotWidget : public TQWidget { +class TDE_EXPORT KPlotWidget : public TQWidget { TQ_OBJECT public: diff --git a/libtdeedu/tdeeduui/tdeeduglossary.h b/libtdeedu/tdeeduui/tdeeduglossary.h index b8e839c4..cef411b5 100644 --- a/libtdeedu/tdeeduui/tdeeduglossary.h +++ b/libtdeedu/tdeeduui/tdeeduglossary.h @@ -34,7 +34,7 @@ class GlossaryItem; * This class stores all items to be displayed. It also * has access-methods to the items */ -class KDE_EXPORT Glossary +class TDE_EXPORT Glossary { public: Glossary(); @@ -176,7 +176,7 @@ class KDE_EXPORT Glossary * a number of pictures or references associated to it. * These are stored as TQStringLists. */ -class KDE_EXPORT GlossaryItem +class TDE_EXPORT GlossaryItem { public: GlossaryItem(){} @@ -237,7 +237,7 @@ class KDE_EXPORT GlossaryItem * @author Pino Toscano * @author Carsten Niehaus */ -class KDE_EXPORT GlossaryDialog : public KDialogBase +class TDE_EXPORT GlossaryDialog : public KDialogBase { TQ_OBJECT