From d479daee57f586dcd10d91270e0d1a8ebe41a494 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 15 Nov 2011 18:51:46 -0600 Subject: Rename KDE_VERSION to TDE_VERSION --- kbstateapplet/kdeexportfix.h | 2 +- kmag/kmag.cpp | 8 ++++---- kmousetool/kmousetool/kmousetool.cpp | 2 +- ksayit/Freeverb_plugin/kdeexportfix.h | 2 +- ksayit/KTTSD_Lib/kdeexportfix.h | 2 +- kttsd/filters/xmltransformer/xmltransformerproc.cpp | 2 +- kttsd/kttsd/ssmlconvert.cpp | 2 +- kttsd/kttsmgr/kttsmgr.cpp | 4 ++-- kttsd/libkttsd/kdeexportfix.h | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/kbstateapplet/kdeexportfix.h b/kbstateapplet/kdeexportfix.h index 172dd94..af01c25 100644 --- a/kbstateapplet/kdeexportfix.h +++ b/kbstateapplet/kdeexportfix.h @@ -16,7 +16,7 @@ ***************************************************************************/ #include -#if KDE_VERSION < KDE_MAKE_VERSION (3,3,2) +#if TDE_VERSION < KDE_MAKE_VERSION (3,3,2) #undef KDE_EXPORT #define KDE_EXPORT #endif diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp index c97fcb8..92e888a 100644 --- a/kmag/kmag.cpp +++ b/kmag/kmag.cpp @@ -31,7 +31,7 @@ #include // include files for KDE -#if KDE_VERSION > 300 +#if TDE_VERSION > 300 #include #else #include @@ -56,7 +56,7 @@ #include #include -#if KDE_VERSION < 220 +#if TDE_VERSION < 220 #include #else #include @@ -803,7 +803,7 @@ void KmagApp::slotFilePrint() bool toggled(false); -#if KDE_VERSION < 220 +#if TDE_VERSION < 220 TQPrinter printer; #else KPrinter printer; @@ -817,7 +817,7 @@ void KmagApp::slotFilePrint() const TQPixmap pixmap(m_zoomView->getPixmap()); -#if KDE_VERSION >= 220 +#if TDE_VERSION >= 220 // use some AI to get the best orientation if(pixmap.width() > pixmap.height()) { printer.setOrientation(KPrinter::Landscape); diff --git a/kmousetool/kmousetool/kmousetool.cpp b/kmousetool/kmousetool/kmousetool.cpp index e7744af..3df4b68 100644 --- a/kmousetool/kmousetool/kmousetool.cpp +++ b/kmousetool/kmousetool/kmousetool.cpp @@ -273,7 +273,7 @@ KMouseTool::KMouseTool(TQWidget *parent, const char *name) : KMouseToolUI(parent connect(buttonHelp, TQT_SIGNAL(clicked()), this, TQT_SLOT(helpSelected())); buttonClose->setGuiItem(KStdGuiItem::close()); connect(buttonClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeSelected())); -#if KDE_VERSION >= KDE_MAKE_VERSION (3,1,90) +#if TDE_VERSION >= KDE_MAKE_VERSION (3,1,90) buttonQuit->setGuiItem(KStdGuiItem::quit()); #endif // KDE 3.2 connect(buttonQuit, TQT_SIGNAL(clicked()), this, TQT_SLOT(quitSelected())); diff --git a/ksayit/Freeverb_plugin/kdeexportfix.h b/ksayit/Freeverb_plugin/kdeexportfix.h index 172dd94..af01c25 100644 --- a/ksayit/Freeverb_plugin/kdeexportfix.h +++ b/ksayit/Freeverb_plugin/kdeexportfix.h @@ -16,7 +16,7 @@ ***************************************************************************/ #include -#if KDE_VERSION < KDE_MAKE_VERSION (3,3,2) +#if TDE_VERSION < KDE_MAKE_VERSION (3,3,2) #undef KDE_EXPORT #define KDE_EXPORT #endif diff --git a/ksayit/KTTSD_Lib/kdeexportfix.h b/ksayit/KTTSD_Lib/kdeexportfix.h index 172dd94..af01c25 100644 --- a/ksayit/KTTSD_Lib/kdeexportfix.h +++ b/ksayit/KTTSD_Lib/kdeexportfix.h @@ -16,7 +16,7 @@ ***************************************************************************/ #include -#if KDE_VERSION < KDE_MAKE_VERSION (3,3,2) +#if TDE_VERSION < KDE_MAKE_VERSION (3,3,2) #undef KDE_EXPORT #define KDE_EXPORT #endif diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.cpp b/kttsd/filters/xmltransformer/xmltransformerproc.cpp index eeb6e91..b8784cd 100644 --- a/kttsd/filters/xmltransformer/xmltransformerproc.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerproc.cpp @@ -230,7 +230,7 @@ bool XmlTransformerProc::init(KConfig* config, const TQString& configGroup) text.replace(TQRegExp("&(?!amp;)"),"&"); *wstream << text; inFile.close(); -#if KDE_VERSION >= KDE_MAKE_VERSION (3,3,0) +#if TDE_VERSION >= KDE_MAKE_VERSION (3,3,0) inFile.sync(); #endif diff --git a/kttsd/kttsd/ssmlconvert.cpp b/kttsd/kttsd/ssmlconvert.cpp index 5c8a6b4..d696ac5 100644 --- a/kttsd/kttsd/ssmlconvert.cpp +++ b/kttsd/kttsd/ssmlconvert.cpp @@ -220,7 +220,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 KDE_VERSION >= KDE_MAKE_VERSION (3,3,0) +#if TDE_VERSION >= KDE_MAKE_VERSION (3,3,0) inFile.sync(); #endif diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp index cd3a0c1..d06e3cd 100644 --- a/kttsd/kttsmgr/kttsmgr.cpp +++ b/kttsd/kttsmgr/kttsmgr.cpp @@ -80,7 +80,7 @@ int main (int argc, char *argv[]) KUniqueApplication app; -#if KDE_VERSION >= KDE_MAKE_VERSION (3,3,90) +#if TDE_VERSION >= KDE_MAKE_VERSION (3,3,90) TQPixmap icon = KGlobal::iconLoader()->loadIcon("kttsd", KIcon::Panel); aboutdata.setProgramLogo(icon.convertToImage()); #endif @@ -118,7 +118,7 @@ int main (int argc, char *argv[]) else app.setMainWidget(&dlg); if (showMainWindowOnStartup) -#if KDE_VERSION < KDE_MAKE_VERSION (3,3,0) +#if TDE_VERSION < KDE_MAKE_VERSION (3,3,0) dlg.show(); #else { diff --git a/kttsd/libkttsd/kdeexportfix.h b/kttsd/libkttsd/kdeexportfix.h index 7c80d9c..fa20ac3 100644 --- a/kttsd/libkttsd/kdeexportfix.h +++ b/kttsd/libkttsd/kdeexportfix.h @@ -19,7 +19,7 @@ #define _KDEEXPORTFIX_H_ #include -#if KDE_VERSION < KDE_MAKE_VERSION (3,3,2) +#if TDE_VERSION < KDE_MAKE_VERSION (3,3,2) #undef KDE_EXPORT #define KDE_EXPORT #endif -- cgit v1.2.3