TDE
/
tdeaccessibility
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdeaccessibility
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove use of TDE_VERSION

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
master
Michele Calgaro 2 weeks ago
parent 89e1a9e891
commit e91a27dff0
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
28 changed files with 3 additions and 170 deletions
Show Stats Download Patch File Download Diff File

2
kbstateapplet/Makefile.am
Unescape Escape View File

@ -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

1
kbstateapplet/kbstate.cpp
Unescape Escape View File

@ -36,7 +36,6 @@
#include <kkeynative.h>
#include <tdemacros.h>
#include <tdeprocess.h>
#include "kdeexportfix.h"
#include "kbstate.h"
#include "kbstate.moc"

22
kbstateapplet/kdeexportfix.h
Unescape Escape View File

@ -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 <garycramblitt@comcast.net>
-------------------
Original author: Gary Cramblitt <garycramblitt@comcast.net>
******************************************************************************/
/***************************************************************************
* *
* 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 <tdeversion.h>
#if TDE_VERSION < TDE_MAKE_VERSION (3,3,2)
#undef TDE_EXPORT
#define TDE_EXPORT
#endif

14
kmag/kmag.cpp
Unescape Escape View File

@ -28,8 +28,6 @@
#include <tqtooltip.h>
#include <tqpopupmenu.h>
#include <tdeversion.h>
// include files for KDE
#include <tdeapplication.h>
#include <kkeydialog.h>
@ -50,12 +48,7 @@
#include <tdepopupmenu.h>
#include <kedittoolbar.h>
#include <twin.h>
#if TDE_VERSION < 220
#include <tqprinter.h>
#else
#include <kprinter.h>
#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;

2
kmousetool/kmousetool/kmousetool.cpp
Unescape Escape View File

@ -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.

2
ksayit/Freeverb_plugin/Makefile.am
Unescape Escape View File

@ -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

22
ksayit/Freeverb_plugin/kdeexportfix.h
Unescape Escape View File

@ -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 <garycramblitt@comcast.net>
-------------------
Original author: Gary Cramblitt <garycramblitt@comcast.net>
******************************************************************************/
/***************************************************************************
* *
* 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 <tdeversion.h>
#if TDE_VERSION < TDE_MAKE_VERSION (3,3,2)
#undef TDE_EXPORT
#define TDE_EXPORT
#endif

2
ksayit/KTTSD_Lib/Makefile.am
Unescape Escape View File

@ -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)

22
ksayit/KTTSD_Lib/kdeexportfix.h
Unescape Escape View File

@ -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 <garycramblitt@comcast.net>
-------------------
Original author: Gary Cramblitt <garycramblitt@comcast.net>
******************************************************************************/
/***************************************************************************
* *
* 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 <tdeversion.h>
#if TDE_VERSION < TDE_MAKE_VERSION (3,3,2)
#undef TDE_EXPORT
#define TDE_EXPORT
#endif

1
ksayit/KTTSD_Lib/kttsdlib.h
Unescape Escape View File

@ -22,7 +22,6 @@ using namespace std;
#include <tqframe.h>
#include <tdemacros.h>
#include "kdeexportfix.h"
// KDE includes
#include <tdeapplication.h>

28
kttsd/configure.in.in
Unescape Escape View File

@ -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)

3
kttsd/filters/xmltransformer/xmltransformerproc.cpp
Unescape Escape View File

@ -26,7 +26,6 @@
#include <tqregexp.h>
// KDE includes.
#include <tdeversion.h>
#include <tdeconfig.h>
#include <tdetempfile.h>
#include <tdestandarddirs.h>
@ -230,9 +229,7 @@ bool XmlTransformerProc::init(TDEConfig* config, const TQString& configGroup)
text.replace(TQRegExp("&(?!amp;)"),"&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");

3
kttsd/kttsd/ssmlconvert.cpp
Unescape Escape View File

@ -27,7 +27,6 @@
#include <tqtextstream.h>
// KDE includes.
#include <tdeversion.h>
#include <tdestandarddirs.h>
#include <tdeprocess.h>
#include <tdetempfile.h>
@ -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");

8
kttsd/kttsmgr/kttsmgr.cpp
Unescape Escape View File

@ -37,7 +37,6 @@
#include <tdepopupmenu.h>
#include <tdeaboutapplication.h>
#include <dcopclient.h>
#include <tdeversion.h>
// 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;

1
kttsd/libkttsd/Makefile.am
Unescape Escape View File

@ -37,7 +37,6 @@ noinst_HEADERS = \
stretcher.h \
talkercode.h \
utils.h \
kdeexportfix.h \
selecttalkerdlg.h
# This library is installed as a service.

1
kttsd/libkttsd/filterconf.h
Unescape Escape View File

@ -32,7 +32,6 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <tdemacros.h>
#include "kdeexportfix.h"
class TDE_EXPORT KttsFilterConf : public TQWidget{
TQ_OBJECT

1
kttsd/libkttsd/filterproc.h
Unescape Escape View File

@ -31,7 +31,6 @@
// KDE includes.
#include <tdemacros.h>
#include "kdeexportfix.h"
class TalkerCode;
class TDEConfig;

27
kttsd/libkttsd/kdeexportfix.h
Unescape Escape View File

@ -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 <garycramblitt@comcast.net>
-------------------
Original author: Gary Cramblitt <garycramblitt@comcast.net>
******************************************************************************/
/***************************************************************************
* *
* 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 <tdeversion.h>
#if TDE_VERSION < TDE_MAKE_VERSION (3,3,2)
#undef TDE_EXPORT
#define TDE_EXPORT
#endif
#endif // _KDEEXPORTFIX_H_

1
kttsd/libkttsd/player.h
Unescape Escape View File

@ -19,7 +19,6 @@
#include <tqobject.h>
#include <tqstringlist.h>
#include <tdemacros.h>
#include "kdeexportfix.h"
#include "tdeglobal.h"
#include "tdelocale.h"

1
kttsd/libkttsd/pluginconf.h
Unescape Escape View File

@ -25,7 +25,6 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <tdemacros.h>
#include "kdeexportfix.h"
// KTTS includes.
#include "testplayer.h"

1
kttsd/libkttsd/pluginproc.h
Unescape Escape View File

@ -22,7 +22,6 @@
#include <tqobject.h>
#include <tqstring.h>
#include <tdemacros.h>
#include "kdeexportfix.h"
#include <tdeconfig.h>
/**

1
kttsd/libkttsd/stretcher.h
Unescape Escape View File

@ -27,7 +27,6 @@
#define _STRETCHER_H_
#include <tdemacros.h>
#include "kdeexportfix.h"
class TDEProcess;

1
kttsd/libkttsd/talkercode.h
Unescape Escape View File

@ -29,7 +29,6 @@
// TQt includes.
#include <tqstring.h>
#include <tdemacros.h>
#include "kdeexportfix.h"
#include <tqvaluelist.h>
class TDE_EXPORT TalkerCode

1
kttsd/libkttsd/testplayer.h
Unescape Escape View File

@ -26,7 +26,6 @@
#define _TESTPLAYER_H_
#include <tdemacros.h>
#include "kdeexportfix.h"
class Player;
class Stretcher;

1
kttsd/libkttsd/utils.h
Unescape Escape View File

@ -19,7 +19,6 @@
#define UTILS_H
#include <tdemacros.h>
#include "kdeexportfix.h"
class TQString;
class TQComboBox;

2
kttsd/players/akodeplayer/akodeplayer.h
Unescape Escape View File

@ -20,8 +20,6 @@
#include "config.h"
#endif
#include "kdeexportfix.h"
#include <tqstring.h>
#include "player.h"

1
kttsd/players/alsaplayer/alsaplayer.h
Unescape Escape View File

@ -41,7 +41,6 @@
// KDE includes.
#include <tdemacros.h>
#include "kdeexportfix.h"
#include <kurl.h>
// AlsaPlayer includes.

1
kttsd/players/artsplayer/artsplayer.h
Unescape Escape View File

@ -24,7 +24,6 @@
#endif
#include <tdemacros.h>
#include "kdeexportfix.h"
#include "player.h"

Write Preview
Loading…
Cancel
Save