From 997aa1672a07ce33c6696bd4a4124bfff97036e1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 15 Nov 2011 18:58:56 -0600 Subject: Rename KDE_VERSION to TDE_VERSION --- configure.in.in | 2 +- kimagemapeditor/kimagemapeditor.cpp | 6 +++--- kimagemapeditor/kimagemapeditor.h | 4 ++-- kimagemapeditor/kimecommands.cpp | 14 +++++++------- kimagemapeditor/kimecommands.h | 14 +++++++------- kimagemapeditor/kimeshell.cpp | 4 ++-- quanta/parts/kafka/configure.in.in | 2 +- quanta/utility/tagaction.cpp | 4 ++-- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/configure.in.in b/configure.in.in index 4e58ca89..c0ab3941 100644 --- a/configure.in.in +++ b/configure.in.in @@ -199,7 +199,7 @@ AC_DEFUN([QUANTA_CHECK_MDI], #include ], [ - #if KDE_VERSION < ((3<<16) | (3<<8) | (92)) + #if TDE_VERSION < ((3<<16) | (3<<8) | (92)) KDE_choke me #endif ], diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp index 5a57b250..6dbb1a32 100644 --- a/kimagemapeditor/kimagemapeditor.cpp +++ b/kimagemapeditor/kimagemapeditor.cpp @@ -201,7 +201,7 @@ KImageMapEditor::KImageMapEditor(TQWidget *parentWidget, const char *, KImageMapEditor::~KImageMapEditor() { writeConfig(); - #if KDE_VERSION < 300 + #if TDE_VERSION < 300 delete accel; #endif delete areas; @@ -628,7 +628,7 @@ void KImageMapEditor::setupActions() "Click this to remove points from a polygon.")); removePointAction->setExclusiveGroup("drawing"); -#if KDE_VERSION < 300 +#if TDE_VERSION < 300 KAction *cancelAction = #endif new KAction(i18n("Cancel Drawing"), Key_Escape, this, TQT_SLOT( slotCancelDrawing() ), @@ -657,7 +657,7 @@ void KImageMapEditor::setupActions() decreaseHeightAction = new KAction(i18n("Decrease Height"), Key_Down + SHIFT, this, TQT_SLOT( slotDecreaseHeight() ), actionCollection() , "decreaseheight" ); -#if KDE_VERSION < 300 +#if TDE_VERSION < 300 accel = new KAccel(widget()); cancelAction->plugAccel(accel, true); moveLeftAction->plugAccel(accel, true); diff --git a/kimagemapeditor/kimagemapeditor.h b/kimagemapeditor/kimagemapeditor.h index e3a3655a..a2839a7f 100644 --- a/kimagemapeditor/kimagemapeditor.h +++ b/kimagemapeditor/kimagemapeditor.h @@ -111,7 +111,7 @@ class KSelectAction; class KRadioAction; class KRecentFilesAction; class KAction; -#if KDE_VERSION < 300 +#if TDE_VERSION < 300 class KAccel; #endif ///class TQListViewItem; @@ -309,7 +309,7 @@ private: KRecentFilesAction* recentFilesAction; - #if KDE_VERSION < 300 + #if TDE_VERSION < 300 KAccel *accel; #endif diff --git a/kimagemapeditor/kimecommands.cpp b/kimagemapeditor/kimecommands.cpp index e47f1b8f..817d8b7d 100644 --- a/kimagemapeditor/kimecommands.cpp +++ b/kimagemapeditor/kimecommands.cpp @@ -25,7 +25,7 @@ CutCommand::CutCommand(KImageMapEditor * document, const AreaSelection & a) : -#if KDE_VERSION < 300 +#if TDE_VERSION < 300 KCommand #else KNamedCommand @@ -79,7 +79,7 @@ DeleteCommand::DeleteCommand(KImageMapEditor * document, const AreaSelection & a PasteCommand::PasteCommand(KImageMapEditor *document, const AreaSelection & a) : -#if KDE_VERSION < 300 +#if TDE_VERSION < 300 KCommand #else KNamedCommand @@ -124,7 +124,7 @@ void PasteCommand::unexecute() MoveCommand::MoveCommand (KImageMapEditor *document, AreaSelection * a, const TQPoint & oldPoint) : -#if KDE_VERSION < 300 +#if TDE_VERSION < 300 KCommand #else KNamedCommand @@ -186,7 +186,7 @@ void MoveCommand::unexecute() ResizeCommand::ResizeCommand (KImageMapEditor *document, AreaSelection *a, Area *oldArea) : -#if KDE_VERSION < 300 +#if TDE_VERSION < 300 KCommand #else KNamedCommand @@ -233,7 +233,7 @@ void ResizeCommand::unexecute() AddPointCommand::AddPointCommand (KImageMapEditor *document, AreaSelection *a, const TQPoint & p) : -#if KDE_VERSION < 300 +#if TDE_VERSION < 300 KCommand #else KNamedCommand @@ -282,7 +282,7 @@ void AddPointCommand::unexecute() RemovePointCommand::RemovePointCommand (KImageMapEditor *document, AreaSelection *a, Area *oldArea) : -#if KDE_VERSION < 300 +#if TDE_VERSION < 300 KCommand #else KNamedCommand @@ -335,7 +335,7 @@ void RemovePointCommand::unexecute() CreateCommand::CreateCommand (KImageMapEditor *document, Area *area) : -#if KDE_VERSION < 300 +#if TDE_VERSION < 300 KCommand #else KNamedCommand diff --git a/kimagemapeditor/kimecommands.h b/kimagemapeditor/kimecommands.h index 87b5b87b..48ab352c 100644 --- a/kimagemapeditor/kimecommands.h +++ b/kimagemapeditor/kimecommands.h @@ -30,7 +30,7 @@ class AreaSelection; class CutCommand : public -#if KDE_VERSION < 300 +#if TDE_VERSION < 300 KCommand #else KNamedCommand @@ -61,7 +61,7 @@ class DeleteCommand : public CutCommand }; class PasteCommand : public -#if KDE_VERSION < 300 +#if TDE_VERSION < 300 KCommand #else KNamedCommand @@ -83,7 +83,7 @@ KNamedCommand }; class MoveCommand : public -#if KDE_VERSION < 300 +#if TDE_VERSION < 300 KCommand #else KNamedCommand @@ -106,7 +106,7 @@ KNamedCommand }; class ResizeCommand : public -#if KDE_VERSION < 300 +#if TDE_VERSION < 300 KCommand #else KNamedCommand @@ -128,7 +128,7 @@ KNamedCommand }; class AddPointCommand : public -#if KDE_VERSION < 300 +#if TDE_VERSION < 300 KCommand #else KNamedCommand @@ -150,7 +150,7 @@ KNamedCommand }; class RemovePointCommand : public -#if KDE_VERSION < 300 +#if TDE_VERSION < 300 KCommand #else KNamedCommand @@ -173,7 +173,7 @@ KNamedCommand class CreateCommand : public -#if KDE_VERSION < 300 +#if TDE_VERSION < 300 KCommand #else KNamedCommand diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp index 7d92e8fb..70e97757 100644 --- a/kimagemapeditor/kimeshell.cpp +++ b/kimagemapeditor/kimeshell.cpp @@ -247,7 +247,7 @@ void KimeShell::optionsConfigureKeys() { void KimeShell::optionsConfigureToolbars() { #if defined(KDE_MAKE_VERSION) -# if KDE_VERSION >= KDE_MAKE_VERSION(3,1,0) +# if TDE_VERSION >= KDE_MAKE_VERSION(3,1,0) saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); # else saveMainWindowSettings(KGlobal::config() ); @@ -266,7 +266,7 @@ void KimeShell::optionsConfigureToolbars() void KimeShell::applyNewToolbarConfig() { #if defined(KDE_MAKE_VERSION) -# if KDE_VERSION >= KDE_MAKE_VERSION(3,1,0) +# if TDE_VERSION >= KDE_MAKE_VERSION(3,1,0) applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); # else applyMainWindowSettings(KGlobal::config()); diff --git a/quanta/parts/kafka/configure.in.in b/quanta/parts/kafka/configure.in.in index 967fc332..7d4624c2 100644 --- a/quanta/parts/kafka/configure.in.in +++ b/quanta/parts/kafka/configure.in.in @@ -15,7 +15,7 @@ AC_DEFUN([QUANTA_CHECK_VPL], #include ], [ - #if KDE_VERSION < ((3<<16) | (1<<8) | (90)) + #if TDE_VERSION < ((3<<16) | (1<<8) | (90)) KDE_choke me #endif ], diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp index 4a559962..f782ea9e 100644 --- a/quanta/utility/tagaction.cpp +++ b/quanta/utility/tagaction.cpp @@ -92,7 +92,7 @@ TagAction::TagAction( TQDomElement *element, KMainWindow *parentMainWindow, bool setIcon(s); m_file = 0L; loopStarted = false; -#if KDE_VERSION >= KDE_MAKE_VERSION(3,4,0) +#if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0) connect(this, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)), TQT_SLOT(slotActionActivated(KAction::ActivationReason, TQt::ButtonState))); #else @@ -113,7 +113,7 @@ TQString TagAction::type() return tag.attribute("type",""); } -#if KDE_VERSION >= KDE_MAKE_VERSION(3,4,0) +#if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0) bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::ButtonState /*state*/) { QuantaView *view = ViewManager::ref()->activeView(); -- cgit v1.2.3