Rename KDE_VERSION to TDE_VERSION

pull/1/head
Timothy Pearson 13 years ago
parent 89b151579c
commit 997aa1672a

@ -199,7 +199,7 @@ AC_DEFUN([QUANTA_CHECK_MDI],
#include <kdeversion.h> #include <kdeversion.h>
], ],
[ [
#if KDE_VERSION < ((3<<16) | (3<<8) | (92)) #if TDE_VERSION < ((3<<16) | (3<<8) | (92))
KDE_choke me KDE_choke me
#endif #endif
], ],

@ -201,7 +201,7 @@ KImageMapEditor::KImageMapEditor(TQWidget *parentWidget, const char *,
KImageMapEditor::~KImageMapEditor() { KImageMapEditor::~KImageMapEditor() {
writeConfig(); writeConfig();
#if KDE_VERSION < 300 #if TDE_VERSION < 300
delete accel; delete accel;
#endif #endif
delete areas; delete areas;
@ -628,7 +628,7 @@ void KImageMapEditor::setupActions()
"Click this to remove points from a polygon.")); "Click this to remove points from a polygon."));
removePointAction->setExclusiveGroup("drawing"); removePointAction->setExclusiveGroup("drawing");
#if KDE_VERSION < 300 #if TDE_VERSION < 300
KAction *cancelAction = KAction *cancelAction =
#endif #endif
new KAction(i18n("Cancel Drawing"), Key_Escape, this, TQT_SLOT( slotCancelDrawing() ), 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() ), decreaseHeightAction = new KAction(i18n("Decrease Height"), Key_Down + SHIFT, this, TQT_SLOT( slotDecreaseHeight() ),
actionCollection() , "decreaseheight" ); actionCollection() , "decreaseheight" );
#if KDE_VERSION < 300 #if TDE_VERSION < 300
accel = new KAccel(widget()); accel = new KAccel(widget());
cancelAction->plugAccel(accel, true); cancelAction->plugAccel(accel, true);
moveLeftAction->plugAccel(accel, true); moveLeftAction->plugAccel(accel, true);

@ -111,7 +111,7 @@ class KSelectAction;
class KRadioAction; class KRadioAction;
class KRecentFilesAction; class KRecentFilesAction;
class KAction; class KAction;
#if KDE_VERSION < 300 #if TDE_VERSION < 300
class KAccel; class KAccel;
#endif #endif
///class TQListViewItem; ///class TQListViewItem;
@ -309,7 +309,7 @@ private:
KRecentFilesAction* recentFilesAction; KRecentFilesAction* recentFilesAction;
#if KDE_VERSION < 300 #if TDE_VERSION < 300
KAccel *accel; KAccel *accel;
#endif #endif

@ -25,7 +25,7 @@
CutCommand::CutCommand(KImageMapEditor * document, const AreaSelection & a) CutCommand::CutCommand(KImageMapEditor * document, const AreaSelection & a)
: :
#if KDE_VERSION < 300 #if TDE_VERSION < 300
KCommand KCommand
#else #else
KNamedCommand KNamedCommand
@ -79,7 +79,7 @@ DeleteCommand::DeleteCommand(KImageMapEditor * document, const AreaSelection & a
PasteCommand::PasteCommand(KImageMapEditor *document, const AreaSelection & a) PasteCommand::PasteCommand(KImageMapEditor *document, const AreaSelection & a)
: :
#if KDE_VERSION < 300 #if TDE_VERSION < 300
KCommand KCommand
#else #else
KNamedCommand KNamedCommand
@ -124,7 +124,7 @@ void PasteCommand::unexecute()
MoveCommand::MoveCommand (KImageMapEditor *document, AreaSelection * a, const TQPoint & oldPoint) MoveCommand::MoveCommand (KImageMapEditor *document, AreaSelection * a, const TQPoint & oldPoint)
: :
#if KDE_VERSION < 300 #if TDE_VERSION < 300
KCommand KCommand
#else #else
KNamedCommand KNamedCommand
@ -186,7 +186,7 @@ void MoveCommand::unexecute()
ResizeCommand::ResizeCommand (KImageMapEditor *document, AreaSelection *a, Area *oldArea) ResizeCommand::ResizeCommand (KImageMapEditor *document, AreaSelection *a, Area *oldArea)
: :
#if KDE_VERSION < 300 #if TDE_VERSION < 300
KCommand KCommand
#else #else
KNamedCommand KNamedCommand
@ -233,7 +233,7 @@ void ResizeCommand::unexecute()
AddPointCommand::AddPointCommand (KImageMapEditor *document, AreaSelection *a, const TQPoint & p) AddPointCommand::AddPointCommand (KImageMapEditor *document, AreaSelection *a, const TQPoint & p)
: :
#if KDE_VERSION < 300 #if TDE_VERSION < 300
KCommand KCommand
#else #else
KNamedCommand KNamedCommand
@ -282,7 +282,7 @@ void AddPointCommand::unexecute()
RemovePointCommand::RemovePointCommand (KImageMapEditor *document, AreaSelection *a, Area *oldArea) RemovePointCommand::RemovePointCommand (KImageMapEditor *document, AreaSelection *a, Area *oldArea)
: :
#if KDE_VERSION < 300 #if TDE_VERSION < 300
KCommand KCommand
#else #else
KNamedCommand KNamedCommand
@ -335,7 +335,7 @@ void RemovePointCommand::unexecute()
CreateCommand::CreateCommand (KImageMapEditor *document, Area *area) CreateCommand::CreateCommand (KImageMapEditor *document, Area *area)
: :
#if KDE_VERSION < 300 #if TDE_VERSION < 300
KCommand KCommand
#else #else
KNamedCommand KNamedCommand

@ -30,7 +30,7 @@ class AreaSelection;
class CutCommand : public class CutCommand : public
#if KDE_VERSION < 300 #if TDE_VERSION < 300
KCommand KCommand
#else #else
KNamedCommand KNamedCommand
@ -61,7 +61,7 @@ class DeleteCommand : public CutCommand
}; };
class PasteCommand : public class PasteCommand : public
#if KDE_VERSION < 300 #if TDE_VERSION < 300
KCommand KCommand
#else #else
KNamedCommand KNamedCommand
@ -83,7 +83,7 @@ KNamedCommand
}; };
class MoveCommand : public class MoveCommand : public
#if KDE_VERSION < 300 #if TDE_VERSION < 300
KCommand KCommand
#else #else
KNamedCommand KNamedCommand
@ -106,7 +106,7 @@ KNamedCommand
}; };
class ResizeCommand : public class ResizeCommand : public
#if KDE_VERSION < 300 #if TDE_VERSION < 300
KCommand KCommand
#else #else
KNamedCommand KNamedCommand
@ -128,7 +128,7 @@ KNamedCommand
}; };
class AddPointCommand : public class AddPointCommand : public
#if KDE_VERSION < 300 #if TDE_VERSION < 300
KCommand KCommand
#else #else
KNamedCommand KNamedCommand
@ -150,7 +150,7 @@ KNamedCommand
}; };
class RemovePointCommand : public class RemovePointCommand : public
#if KDE_VERSION < 300 #if TDE_VERSION < 300
KCommand KCommand
#else #else
KNamedCommand KNamedCommand
@ -173,7 +173,7 @@ KNamedCommand
class CreateCommand : public class CreateCommand : public
#if KDE_VERSION < 300 #if TDE_VERSION < 300
KCommand KCommand
#else #else
KNamedCommand KNamedCommand

@ -247,7 +247,7 @@ void KimeShell::optionsConfigureKeys() {
void KimeShell::optionsConfigureToolbars() void KimeShell::optionsConfigureToolbars()
{ {
#if defined(KDE_MAKE_VERSION) #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()); saveMainWindowSettings(KGlobal::config(), autoSaveGroup());
# else # else
saveMainWindowSettings(KGlobal::config() ); saveMainWindowSettings(KGlobal::config() );
@ -266,7 +266,7 @@ void KimeShell::optionsConfigureToolbars()
void KimeShell::applyNewToolbarConfig() void KimeShell::applyNewToolbarConfig()
{ {
#if defined(KDE_MAKE_VERSION) #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()); applyMainWindowSettings(KGlobal::config(), autoSaveGroup());
# else # else
applyMainWindowSettings(KGlobal::config()); applyMainWindowSettings(KGlobal::config());

@ -15,7 +15,7 @@ AC_DEFUN([QUANTA_CHECK_VPL],
#include <kdeversion.h> #include <kdeversion.h>
], ],
[ [
#if KDE_VERSION < ((3<<16) | (1<<8) | (90)) #if TDE_VERSION < ((3<<16) | (1<<8) | (90))
KDE_choke me KDE_choke me
#endif #endif
], ],

@ -92,7 +92,7 @@ TagAction::TagAction( TQDomElement *element, KMainWindow *parentMainWindow, bool
setIcon(s); setIcon(s);
m_file = 0L; m_file = 0L;
loopStarted = false; 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)), connect(this, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)),
TQT_SLOT(slotActionActivated(KAction::ActivationReason, TQt::ButtonState))); TQT_SLOT(slotActionActivated(KAction::ActivationReason, TQt::ButtonState)));
#else #else
@ -113,7 +113,7 @@ TQString TagAction::type()
return tag.attribute("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*/) bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::ButtonState /*state*/)
{ {
QuantaView *view = ViewManager::ref()->activeView(); QuantaView *view = ViewManager::ref()->activeView();

Loading…
Cancel
Save