From e91a27dff0360a98759364751ac727a4741ed51b Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 20 Mar 2026 22:39:19 +0900 Subject: Remove use of TDE_VERSION Signed-off-by: Michele Calgaro --- kbstateapplet/Makefile.am | 2 +- kbstateapplet/kbstate.cpp | 1 - kbstateapplet/kdeexportfix.h | 22 ----------------- kmag/kmag.cpp | 14 ----------- kmousetool/kmousetool/kmousetool.cpp | 2 -- ksayit/Freeverb_plugin/Makefile.am | 2 +- ksayit/Freeverb_plugin/kdeexportfix.h | 22 ----------------- ksayit/KTTSD_Lib/Makefile.am | 2 +- ksayit/KTTSD_Lib/kdeexportfix.h | 22 ----------------- ksayit/KTTSD_Lib/kttsdlib.h | 1 - kttsd/configure.in.in | 28 ---------------------- .../filters/xmltransformer/xmltransformerproc.cpp | 3 --- kttsd/kttsd/ssmlconvert.cpp | 3 --- kttsd/kttsmgr/kttsmgr.cpp | 8 ------- kttsd/libkttsd/Makefile.am | 1 - kttsd/libkttsd/filterconf.h | 1 - kttsd/libkttsd/filterproc.h | 1 - kttsd/libkttsd/kdeexportfix.h | 27 --------------------- kttsd/libkttsd/player.h | 1 - kttsd/libkttsd/pluginconf.h | 1 - kttsd/libkttsd/pluginproc.h | 1 - kttsd/libkttsd/stretcher.h | 1 - kttsd/libkttsd/talkercode.h | 1 - kttsd/libkttsd/testplayer.h | 1 - kttsd/libkttsd/utils.h | 1 - kttsd/players/akodeplayer/akodeplayer.h | 2 -- kttsd/players/alsaplayer/alsaplayer.h | 1 - kttsd/players/artsplayer/artsplayer.h | 1 - 28 files changed, 3 insertions(+), 170 deletions(-) delete mode 100644 kbstateapplet/kdeexportfix.h delete mode 100644 ksayit/Freeverb_plugin/kdeexportfix.h delete mode 100644 ksayit/KTTSD_Lib/kdeexportfix.h delete mode 100644 kttsd/libkttsd/kdeexportfix.h diff --git a/kbstateapplet/Makefile.am b/kbstateapplet/Makefile.am index 6024f74..48e0a95 100644 --- a/kbstateapplet/Makefile.am +++ b/kbstateapplet/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kbstate_panelapplet.la kbstate_panelapplet_la_SOURCES = kbstate.cpp METASOURCES = AUTO -noinst_HEADERS = kbstate.h kdeexportfix.h +noinst_HEADERS = kbstate.h lnkdir = $(kde_datadir)/kicker/applets lnk_DATA = kbstateapplet.desktop diff --git a/kbstateapplet/kbstate.cpp b/kbstateapplet/kbstate.cpp index 79bc216..7d49f2c 100644 --- a/kbstateapplet/kbstate.cpp +++ b/kbstateapplet/kbstate.cpp @@ -36,7 +36,6 @@ #include #include #include -#include "kdeexportfix.h" #include "kbstate.h" #include "kbstate.moc" diff --git a/kbstateapplet/kdeexportfix.h b/kbstateapplet/kdeexportfix.h deleted file mode 100644 index 8ec6f7b..0000000 --- a/kbstateapplet/kdeexportfix.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - tdelibs < 3.3.2 had a bug in the TDE_EXPORT macro. This file fixes this - by undefining it. - ------------------- - Copyright : (C) 2005 by Gary Cramblitt - ------------------- - Original author: Gary Cramblitt - ******************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; version 2 of the License. * - * * - ***************************************************************************/ - -#include -#if TDE_VERSION < TDE_MAKE_VERSION (3,3,2) -#undef TDE_EXPORT -#define TDE_EXPORT -#endif diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp index 20eca71..a24a4ea 100644 --- a/kmag/kmag.cpp +++ b/kmag/kmag.cpp @@ -28,8 +28,6 @@ #include #include -#include - // include files for KDE #include #include @@ -50,12 +48,7 @@ #include #include #include - -#if TDE_VERSION < 220 -#include -#else #include -#endif // application specific includes #include "kmag.moc" @@ -781,12 +774,7 @@ void KmagApp::slotFilePrint() #ifndef TQT_NO_PRINTER bool toggled(false); - -#if TDE_VERSION < 220 - TQPrinter printer; -#else KPrinter printer; -#endif // stop refresh temporarily if (m_zoomView->getRefreshStatus()) { @@ -796,14 +784,12 @@ void KmagApp::slotFilePrint() const TQPixmap pixmap(m_zoomView->getPixmap()); -#if TDE_VERSION >= 220 // use some AI to get the best orientation if(pixmap.width() > pixmap.height()) { printer.setOrientation(KPrinter::Landscape); } else { printer.setOrientation(KPrinter::Portrait); } -#endif if (printer.setup(this)) { TQPainter paint; diff --git a/kmousetool/kmousetool/kmousetool.cpp b/kmousetool/kmousetool/kmousetool.cpp index 2710100..acac166 100644 --- a/kmousetool/kmousetool/kmousetool.cpp +++ b/kmousetool/kmousetool/kmousetool.cpp @@ -272,9 +272,7 @@ KMouseTool::KMouseTool(TQWidget *parent, const char *name) : KMouseToolUI(parent connect(buttonHelp, TQ_SIGNAL(clicked()), this, TQ_SLOT(helpSelected())); buttonClose->setGuiItem(KStdGuiItem::close()); connect(buttonClose, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeSelected())); -#if TDE_VERSION >= TDE_MAKE_VERSION (3,1,90) buttonQuit->setGuiItem(KStdGuiItem::quit()); -#endif // KDE 3.2 connect(buttonQuit, TQ_SIGNAL(clicked()), this, TQ_SLOT(quitSelected())); // When we first start, it's nice to not click immediately. diff --git a/ksayit/Freeverb_plugin/Makefile.am b/ksayit/Freeverb_plugin/Makefile.am index a24bd53..8a9e78a 100644 --- a/ksayit/Freeverb_plugin/Makefile.am +++ b/ksayit/Freeverb_plugin/Makefile.am @@ -8,6 +8,6 @@ libFreeverb_plugin_la_LDFLAGS = -avoid-version -module -no-undefined \ $(all_libraries) libFreeverb_plugin_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TQT) -lartskde -lartsflow -lartsflow_idl -lartsmoduleseffects -lsoundserver_idl \ -lartsmodules -noinst_HEADERS = freeverbsetupimpl.h ksayitfreeverblib.h kdeexportfix.h +noinst_HEADERS = freeverbsetupimpl.h ksayitfreeverblib.h libFreeverb_plugin_la_SOURCES = freeverbsetupimpl.cpp freeverb_setup.ui \ ksayitfreeverblib.cpp diff --git a/ksayit/Freeverb_plugin/kdeexportfix.h b/ksayit/Freeverb_plugin/kdeexportfix.h deleted file mode 100644 index 8ec6f7b..0000000 --- a/ksayit/Freeverb_plugin/kdeexportfix.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - tdelibs < 3.3.2 had a bug in the TDE_EXPORT macro. This file fixes this - by undefining it. - ------------------- - Copyright : (C) 2005 by Gary Cramblitt - ------------------- - Original author: Gary Cramblitt - ******************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; version 2 of the License. * - * * - ***************************************************************************/ - -#include -#if TDE_VERSION < TDE_MAKE_VERSION (3,3,2) -#undef TDE_EXPORT -#define TDE_EXPORT -#endif diff --git a/ksayit/KTTSD_Lib/Makefile.am b/ksayit/KTTSD_Lib/Makefile.am index 85546c6..39f58e3 100644 --- a/ksayit/KTTSD_Lib/Makefile.am +++ b/ksayit/KTTSD_Lib/Makefile.am @@ -6,7 +6,7 @@ METASOURCES = AUTO libKTTSD_Lib_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 0:1 lib_LTLIBRARIES = libKTTSD_Lib.la libKTTSD_Lib_la_LIBADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) -lDCOP -noinst_HEADERS = kttsdlib.h kttsdlibsetupimpl.h kttsdlibtalker2.h kdeexportfix.h +noinst_HEADERS = kttsdlib.h kttsdlibsetupimpl.h kttsdlibtalker2.h kspeech_DIR = $(KTTS_KSPEECH_DIR) kspeechsink_DIR = $(KTTS_KSPEECH_DIR) diff --git a/ksayit/KTTSD_Lib/kdeexportfix.h b/ksayit/KTTSD_Lib/kdeexportfix.h deleted file mode 100644 index 8ec6f7b..0000000 --- a/ksayit/KTTSD_Lib/kdeexportfix.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - tdelibs < 3.3.2 had a bug in the TDE_EXPORT macro. This file fixes this - by undefining it. - ------------------- - Copyright : (C) 2005 by Gary Cramblitt - ------------------- - Original author: Gary Cramblitt - ******************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; version 2 of the License. * - * * - ***************************************************************************/ - -#include -#if TDE_VERSION < TDE_MAKE_VERSION (3,3,2) -#undef TDE_EXPORT -#define TDE_EXPORT -#endif diff --git a/ksayit/KTTSD_Lib/kttsdlib.h b/ksayit/KTTSD_Lib/kttsdlib.h index b2d2663..c84c852 100644 --- a/ksayit/KTTSD_Lib/kttsdlib.h +++ b/ksayit/KTTSD_Lib/kttsdlib.h @@ -22,7 +22,6 @@ using namespace std; #include #include -#include "kdeexportfix.h" // KDE includes #include diff --git a/kttsd/configure.in.in b/kttsd/configure.in.in index bca8abb..24edfd6 100644 --- a/kttsd/configure.in.in +++ b/kttsd/configure.in.in @@ -265,31 +265,3 @@ if test "$KTTS_KSPEECH_DIR" = ""; then AC_SUBST(KTTS_KSPEECH_INCLUDE) AC_SUBST(KTTS_INTERFACES_DIR) fi - -dnl ================================================================================ - -# --- Check for KDE < 3.5 --- -# If so, install icons. - -AC_MSG_CHECKING([for KDE version]) - -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -tdeversion_save_CXXFLAGS="$CXXFLAGS" -tdeversion_save_LIBS="$LIBS" -LIBS="$LIBS $X_EXTRA_LIBS" -CXXFLAGS="$CXXFLAGS $all_includes" - -KTTS_ICONS_DIR="icons" - -CXXFLAGS="$tdeversion_save_CXXFLAGS" -LIBS="$tdeversion_save_LIBS" -AC_LANG_RESTORE - -if test "$KTTS_ICONS_DIR" = ""; then - AC_MSG_RESULT([KDE 3.4.x or less]) -else - AC_MSG_RESULT([KDE 3.5 or later]) -fi - -AC_SUBST(KTTS_ICONS_DIR) diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.cpp b/kttsd/filters/xmltransformer/xmltransformerproc.cpp index f1b0b2d..abcf173 100644 --- a/kttsd/filters/xmltransformer/xmltransformerproc.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerproc.cpp @@ -26,7 +26,6 @@ #include // KDE includes. -#include #include #include #include @@ -230,9 +229,7 @@ bool XmlTransformerProc::init(TDEConfig* config, const TQString& configGroup) text.replace(TQRegExp("&(?!amp;)"),"&"); *wstream << text; inFile.close(); -#if TDE_VERSION >= TDE_MAKE_VERSION (3,3,0) inFile.sync(); -#endif // Get a temporary output file name. KTempFile outFile(locateLocal("tmp", "kttsd-"), ".output"); diff --git a/kttsd/kttsd/ssmlconvert.cpp b/kttsd/kttsd/ssmlconvert.cpp index 3206e3a..52579ab 100644 --- a/kttsd/kttsd/ssmlconvert.cpp +++ b/kttsd/kttsd/ssmlconvert.cpp @@ -27,7 +27,6 @@ #include // KDE includes. -#include #include #include #include @@ -220,9 +219,7 @@ bool SSMLConvert::transform(const TQString &text, const TQString &xsltFilename) // not wrap it in such. But maybe this should be handled by SpeechData::setText()? *wstream << text; inFile.close(); -#if TDE_VERSION >= TDE_MAKE_VERSION (3,3,0) inFile.sync(); -#endif // Get a temporary output file name. KTempFile outFile(locateLocal("tmp", "kttsd-"), ".output"); diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp index 52bf832..b028358 100644 --- a/kttsd/kttsmgr/kttsmgr.cpp +++ b/kttsd/kttsmgr/kttsmgr.cpp @@ -37,7 +37,6 @@ #include #include #include -#include // KTTSMgr includes. #include "kspeech.h" @@ -79,11 +78,8 @@ int main (int argc, char *argv[]) } TDEUniqueApplication app; - -#if TDE_VERSION >= TDE_MAKE_VERSION (3,3,90) TQPixmap icon = TDEGlobal::iconLoader()->loadIcon("kttsd", TDEIcon::Panel); aboutdata.setProgramLogo(icon.convertToImage()); -#endif // The real work of KTTS Manager is done in the KControl Module kcmkttsd. KCMultiDialog dlg(KCMultiDialog::Plain, i18n("TDE Text-to-Speech Manager"), 0, "kttsmgrdlg", false); @@ -118,16 +114,12 @@ int main (int argc, char *argv[]) else app.setMainWidget(&dlg); if (showMainWindowOnStartup) -#if TDE_VERSION < TDE_MAKE_VERSION (3,3,0) - dlg.show(); -#else { if (embedInSysTray) tray->setActive(); else dlg.show(); } -#endif int result = app.exec(); delete tray; return result; diff --git a/kttsd/libkttsd/Makefile.am b/kttsd/libkttsd/Makefile.am index 5095806..3386436 100644 --- a/kttsd/libkttsd/Makefile.am +++ b/kttsd/libkttsd/Makefile.am @@ -37,7 +37,6 @@ noinst_HEADERS = \ stretcher.h \ talkercode.h \ utils.h \ - kdeexportfix.h \ selecttalkerdlg.h # This library is installed as a service. diff --git a/kttsd/libkttsd/filterconf.h b/kttsd/libkttsd/filterconf.h index 2b9fbcc..d74155d 100644 --- a/kttsd/libkttsd/filterconf.h +++ b/kttsd/libkttsd/filterconf.h @@ -32,7 +32,6 @@ #include #include #include -#include "kdeexportfix.h" class TDE_EXPORT KttsFilterConf : public TQWidget{ TQ_OBJECT diff --git a/kttsd/libkttsd/filterproc.h b/kttsd/libkttsd/filterproc.h index 3e7ce5d..eea05cd 100644 --- a/kttsd/libkttsd/filterproc.h +++ b/kttsd/libkttsd/filterproc.h @@ -31,7 +31,6 @@ // KDE includes. #include -#include "kdeexportfix.h" class TalkerCode; class TDEConfig; diff --git a/kttsd/libkttsd/kdeexportfix.h b/kttsd/libkttsd/kdeexportfix.h deleted file mode 100644 index c4f53b6..0000000 --- a/kttsd/libkttsd/kdeexportfix.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - tdelibs < 3.3.2 had a bug in the TDE_EXPORT macro. This file fixes this - by undefining it. - ------------------- - Copyright : (C) 2005 by Gary Cramblitt - ------------------- - Original author: Gary Cramblitt - ******************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; version 2 of the License. * - * * - ***************************************************************************/ - -#ifndef _KDEEXPORTFIX_H_ -#define _KDEEXPORTFIX_H_ - -#include -#if TDE_VERSION < TDE_MAKE_VERSION (3,3,2) -#undef TDE_EXPORT -#define TDE_EXPORT -#endif - -#endif // _KDEEXPORTFIX_H_ diff --git a/kttsd/libkttsd/player.h b/kttsd/libkttsd/player.h index 8bbb741..f525507 100644 --- a/kttsd/libkttsd/player.h +++ b/kttsd/libkttsd/player.h @@ -19,7 +19,6 @@ #include #include #include -#include "kdeexportfix.h" #include "tdeglobal.h" #include "tdelocale.h" diff --git a/kttsd/libkttsd/pluginconf.h b/kttsd/libkttsd/pluginconf.h index 039a19b..059e13b 100644 --- a/kttsd/libkttsd/pluginconf.h +++ b/kttsd/libkttsd/pluginconf.h @@ -25,7 +25,6 @@ #include #include #include -#include "kdeexportfix.h" // KTTS includes. #include "testplayer.h" diff --git a/kttsd/libkttsd/pluginproc.h b/kttsd/libkttsd/pluginproc.h index 473fdd0..77c3a9e 100644 --- a/kttsd/libkttsd/pluginproc.h +++ b/kttsd/libkttsd/pluginproc.h @@ -22,7 +22,6 @@ #include #include #include -#include "kdeexportfix.h" #include /** diff --git a/kttsd/libkttsd/stretcher.h b/kttsd/libkttsd/stretcher.h index 7c07f25..9176c3a 100644 --- a/kttsd/libkttsd/stretcher.h +++ b/kttsd/libkttsd/stretcher.h @@ -27,7 +27,6 @@ #define _STRETCHER_H_ #include -#include "kdeexportfix.h" class TDEProcess; diff --git a/kttsd/libkttsd/talkercode.h b/kttsd/libkttsd/talkercode.h index 7b8e6f6..e41e626 100644 --- a/kttsd/libkttsd/talkercode.h +++ b/kttsd/libkttsd/talkercode.h @@ -29,7 +29,6 @@ // TQt includes. #include #include -#include "kdeexportfix.h" #include class TDE_EXPORT TalkerCode diff --git a/kttsd/libkttsd/testplayer.h b/kttsd/libkttsd/testplayer.h index 04cd654..664eab2 100644 --- a/kttsd/libkttsd/testplayer.h +++ b/kttsd/libkttsd/testplayer.h @@ -26,7 +26,6 @@ #define _TESTPLAYER_H_ #include -#include "kdeexportfix.h" class Player; class Stretcher; diff --git a/kttsd/libkttsd/utils.h b/kttsd/libkttsd/utils.h index a9de3e7..5601f22 100644 --- a/kttsd/libkttsd/utils.h +++ b/kttsd/libkttsd/utils.h @@ -19,7 +19,6 @@ #define UTILS_H #include -#include "kdeexportfix.h" class TQString; class TQComboBox; diff --git a/kttsd/players/akodeplayer/akodeplayer.h b/kttsd/players/akodeplayer/akodeplayer.h index b3099fc..6635b51 100644 --- a/kttsd/players/akodeplayer/akodeplayer.h +++ b/kttsd/players/akodeplayer/akodeplayer.h @@ -20,8 +20,6 @@ #include "config.h" #endif -#include "kdeexportfix.h" - #include #include "player.h" diff --git a/kttsd/players/alsaplayer/alsaplayer.h b/kttsd/players/alsaplayer/alsaplayer.h index 9c30341..efe12ae 100644 --- a/kttsd/players/alsaplayer/alsaplayer.h +++ b/kttsd/players/alsaplayer/alsaplayer.h @@ -41,7 +41,6 @@ // KDE includes. #include -#include "kdeexportfix.h" #include // AlsaPlayer includes. diff --git a/kttsd/players/artsplayer/artsplayer.h b/kttsd/players/artsplayer/artsplayer.h index c14014c..0ea3915 100644 --- a/kttsd/players/artsplayer/artsplayer.h +++ b/kttsd/players/artsplayer/artsplayer.h @@ -24,7 +24,6 @@ #endif #include -#include "kdeexportfix.h" #include "player.h" -- cgit v1.2.3